git: 0482926a54ac - main - x11/libei: temporarily drop subpackages

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0482926a54acf27476e244fe560a1e14ce82c33c

commit 0482926a54acf27476e244fe560a1e14ce82c33c
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-01-29 15:24:28 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-01-29 15:24:59 +0000

    x11/libei: temporarily drop subpackages
    
    Whole tree builds fail to parse subpackage syntax in *_DEPENDS.
    
    $ poudriere bulk -j 132amd64 -a
    [...]
    [00:02:31] Error: compute_deps_pkg failed to lookup pkgname for x11/libei~basu processing package xwayland-devel-21.0.99.1.664_1 from x11-servers/xwayland-devel -- Is SUBDIR+=libei missing in x11/Makefile?
    
    $ make index
    [...]
    make_index: xwayland-devel-21.0.99.1.664_1: no entry for /usr/ports/x11/libei~basu
    make_index: xwayland-devel-21.0.99.1.664_1: no entry for /usr/ports/x11/libei~basu
    
    Reported by:    David Wolfskill
    
    This reverts commit 367a49562bc9dcda92e4e49fa1fcd2ba1277cf8c.
---
 x11-servers/xwayland-devel/Makefile | 11 +++--------
 x11/libei/Makefile                  |  6 +-----
 x11/libei/pkg-descr.basu            |  8 --------
 x11/libei/pkg-plist                 | 10 +++++-----
 4 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile
index 6132a9e6bb1d..9759fc744065 100644
--- a/x11-servers/xwayland-devel/Makefile
+++ b/x11-servers/xwayland-devel/Makefile
@@ -2,7 +2,6 @@ PORTNAME=	xwayland
 DISTVERSIONPREFIX=	xorg-server-
 DISTVERSION=	21.0.99.1-664
 DISTVERSIONSUFFIX=	-g133e0d651
-PORTREVISION=	1
 CATEGORIES=	x11-servers
 PKGNAMESUFFIX=	-devel
 
@@ -65,18 +64,14 @@ DEFAULT_FONTPATH_LIST= \
 	${FONTPATH_ROOT}/75dpi/ \
 	catalogue:${FONTPATHD}
 
-OPTIONS_DEFINE=	BASU CSD EI NVIDIA
-OPTIONS_DEFAULT=BASU CSD EI
-
-BASU_DESC=		Emulated input via libei portal
-BASU_LIB_DEPENDS=	liboeffis.so:x11/libei~basu
-BASU_IMPLIES=		EI
+OPTIONS_DEFINE=	CSD EI NVIDIA
+OPTIONS_DEFAULT=CSD EI
 
 CSD_DESC=		Client-side decorations via libdecor
 CSD_LIB_DEPENDS=	libdecor-0.so:x11-toolkits/libdecor
 CSD_MESON_TRUE=		libdecor
 
-EI_DESC=		Emulated input via libei socket
+EI_DESC=		Emulated input via libei
 EI_LIB_DEPENDS=		libei.so:x11/libei
 EI_MESON_OFF=		-Dxwayland_ei=false
 
diff --git a/x11/libei/Makefile b/x11/libei/Makefile
index a72acda75bca..a1940a290588 100644
--- a/x11/libei/Makefile
+++ b/x11/libei/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	libei
 DISTVERSION=	1.2.0
-PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -35,10 +34,7 @@ OPTIONS_DEFAULT=BASU
 OPTIONS_SUB=	yes
 
 BASU_DESC=		XDG RemoteDesktop portal via basu
-BASU_SUBPACKAGES=	basu
-COMMENT.basu=		${BASU_DESC}
-LIB_DEPENDS.basu=	libbasu.so:devel/basu \
-			libepoll-shim.so:devel/libepoll-shim
+BASU_LIB_DEPENDS=	libbasu.so:devel/basu
 BASU_MESON_ENABLED=	liboeffis
 
 .ifdef GH_TUPLE
diff --git a/x11/libei/pkg-descr.basu b/x11/libei/pkg-descr.basu
deleted file mode 100644
index b3e9dad0fc37..000000000000
--- a/x11/libei/pkg-descr.basu
+++ /dev/null
@@ -1,8 +0,0 @@
-libei is a library for Emulated Input, primarily aimed at the Wayland
-stack. It provides three parts:
-- EI (Emulated Input) for the client side (libei)
-- EIS (Emulated Input Server) for the server side (libeis)
-- oeffis is an optional helper library for DBus communication with the
-  XDG RemoteDesktop portal (liboeffis)
-
-This package provides liboeffis.
diff --git a/x11/libei/pkg-plist b/x11/libei/pkg-plist
index c2a818793748..c6f1f0580429 100644
--- a/x11/libei/pkg-plist
+++ b/x11/libei/pkg-plist
@@ -1,16 +1,16 @@
 bin/ei-debug-events
 include/libei-1.0/libei.h
 include/libei-1.0/libeis.h
-%%BASU%%@@basu@@include/libei-1.0/liboeffis.h
+%%BASU%%include/libei-1.0/liboeffis.h
 lib/libei.so
 lib/libei.so.1
 lib/libei.so.1.2.0
 lib/libeis.so
 lib/libeis.so.1
 lib/libeis.so.1.2.0
-%%BASU%%@@basu@@lib/liboeffis.so
-%%BASU%%@@basu@@lib/liboeffis.so.1
-%%BASU%%@@basu@@lib/liboeffis.so.1.2.0
+%%BASU%%lib/liboeffis.so
+%%BASU%%lib/liboeffis.so.1
+%%BASU%%lib/liboeffis.so.1.2.0
 libdata/pkgconfig/libei-1.0.pc
 libdata/pkgconfig/libeis-1.0.pc
-%%BASU%%@@basu@@libdata/pkgconfig/liboeffis-1.0.pc
+%%BASU%%libdata/pkgconfig/liboeffis-1.0.pc