gentoo auto-resync : 04:07:2024 - 08:06:07

5 files changed, 132 insertions, 22 deletions

diff --git a/gui-wm/dwl/Manifest b/gui-wm/dwl/Manifest
index 67cef888a453..a8360c9ce599 100644
--- a/gui-wm/dwl/Manifest
+++ b/gui-wm/dwl/Manifest
@@ -1,5 +1,6 @@
 DIST dwl-v0.5.tar.gz 57363 BLAKE2B 6dce89cbfa1aa1946983897bed5ac16619ac237e0f7092b588847315b849392b83643839dc5386c5bd73a36e5da55a281696a6ef13dcaec8345cb4e495c5e3b7 SHA512 7bd292559b0ecafc54bf1c1ba0c3b6b0417e8bd03bb0058f492b87295c92b50932e25621cc5f804c38ad06ffadad7bb8017872fade4a04bf617b1d4f1993aae8
+EBUILD dwl-0.5-r1.ebuild 1588 BLAKE2B 500464dc26cca333d9e506363ba356d4e6772caec2001a29cb1eca59793258238e06aa682791395961e4c4a378504b6d99d1661c8724585a3b94910955c835b6 SHA512 e461e1bf39962269890465a3a4e2774b3d772613d559f7319357a91b2a891f5a82797483c1727f7f9877661af2accfc060659cd93dd72db54ad5d1175a2d2b7f
 EBUILD dwl-0.5.ebuild 1465 BLAKE2B eca80af80978fe2d80de59f39daec8a923b6ec5d9bce6e19b08e453885e80c3852b3de3ab4f2612b8a8cd2d453adf4a312fb69a00c19414ff40690617d148f81 SHA512 efe1d7a11f10b4779aa87167f2422ef4c878c8546b1ed3557f0bc9ce61f0b1d6e56d784bbe6f646e6a885fdf85ddf7d959b4b37e7820e112af27f53f00211c89
-EBUILD dwl-9999-r1.ebuild 1451 BLAKE2B 7da77261c947a648319091376d23308d38887d502880a112766d34649e3788027eb548484ef7510b4511ceeef04a25733677bbe03fd39b26dff2ff3c79de6434 SHA512 a0737102d2484a1ed8cb8e83ddf450a47a3a4bbba379713d6ce5270c8fc08398022466f34323c3c9ec3a86862fc41a7f15ae240041f86cb86c1c654b62818f55
-EBUILD dwl-9999.ebuild 1451 BLAKE2B 90d98dbcbbfb432ab542a8ce130bd8646096a6a47454fd2b9eb281c0880754ab5afa6bd8034c5548ead7cb3b6fd7478e5bb75f3a41101ddc8b7f091acf615023 SHA512 d170795f1651f9fa4c8e5b4db6ab261203f44a0d510b5b71c4312bb3a5dcb605eb9933e8164041186aa53c6b0a3ba4803043c598d2b9b9adb41d04e0f2a6e5e2
-MISC metadata.xml 517 BLAKE2B 6705dda9af1df60cdfa76bd74ec7334354aaa56d701c86ab79e7fd21d2896f50498d71dd4d3349fa14874d2eb4e0a81e1b077db13a22e98791a55cd90b00cac7 SHA512 be8dad40e1c0441375b2c7233c3bb5db4e2bdb995eee13d116f437de1e646fd58185b4e36c783c02db79fd84e94a90b766802736187ac307c2e614c7b376eb04
+EBUILD dwl-9999-r1.ebuild 1595 BLAKE2B f3236da4e40f84d3bd772cfbcbfab966653b8b918b14e0fbd5e953d0dfcd28c2a36119579456946b92d513d210db7125ac1a14f73f940d7a79977628aba5ad6b SHA512 a07c5c101b8470c2a27c822aab001fd0670e25c3557c48c1af4fd7ac553641c26dd6967da9b584b8d52c202df27535ca00fb7a176317c24ca4f4e7e53ba6b833
+EBUILD dwl-9999.ebuild 1588 BLAKE2B 500464dc26cca333d9e506363ba356d4e6772caec2001a29cb1eca59793258238e06aa682791395961e4c4a378504b6d99d1661c8724585a3b94910955c835b6 SHA512 e461e1bf39962269890465a3a4e2774b3d772613d559f7319357a91b2a891f5a82797483c1727f7f9877661af2accfc060659cd93dd72db54ad5d1175a2d2b7f
+MISC metadata.xml 607 BLAKE2B 05185e10615acd19020f558e6d05305ea1df831ddb9703516bf8789108c2d5bc5d90ca75fd261674aa15f41be6518b49d45898866faa10848dafb0a28fada899 SHA512 c70b7a100380b1771385a7e398f256be391a2650df620499e43ead3acec46765c646c55671885a6bbfef7f3a87c488c135ec5f34c87bb4f2dfdb8f6c7a8f2ed8
diff --git a/gui-wm/dwl/dwl-0.5-r1.ebuild b/gui-wm/dwl/dwl-0.5-r1.ebuild
new file mode 100644
index 000000000000..f94a2aa83609
--- /dev/null
+++ b/gui-wm/dwl/dwl-0.5-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit savedconfig toolchain-funcs
+
+MY_P="${PN}-v${PV}"
+
+WLROOTS_DEP="
+	>=gui-libs/wlroots-0.17:=[libinput,session,X?]
+	<gui-libs/wlroots-0.18:=
+"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://codeberg.org/dwl/dwl.git"
+	inherit git-r3
+
+	# 9999-r0: main (latest stable wlroots release)
+	# 9999-r1: wlroots-next (wlroots-9999)
+	case ${PVR} in
+		9999)
+			EGIT_BRANCH=main
+			;;
+		9999-r1)
+			EGIT_BRANCH=wlroots-next
+			WLROOTS_DEP="~gui-libs/wlroots-9999:=[libinput,session,X?]"
+			;;
+	esac
+else
+	SRC_URI="https://codeberg.org/${PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="dwm for Wayland"
+HOMEPAGE="https://codeberg.org/dwl/dwl"
+
+LICENSE="CC0-1.0 GPL-3+ MIT"
+SLOT="0"
+IUSE="X"
+
+CDEPEND="
+	${WLROOTS_DEP}
+	dev-libs/libinput:=
+	dev-libs/wayland
+	x11-libs/libxkbcommon
+	X? (
+		x11-libs/libxcb:=
+		x11-libs/xcb-util-wm
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	X? (
+		x11-base/xwayland
+	)
+"
+# uses <linux/input-event-codes.h>
+DEPEND="
+	${CDEPEND}
+	sys-kernel/linux-headers
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.32
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	restore_config config.h
+
+	default
+}
+
+src_compile() {
+	emake PKG_CONFIG="$(tc-getPKG_CONFIG)" CC="$(tc-getCC)" \
+		XWAYLAND="$(usev X -DXWAYLAND)" XLIBS="$(usev X "xcb xcb-icccm")" dwl
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	dodoc CHANGELOG.md README.md
+
+	save_config config.h
+}
diff --git a/gui-wm/dwl/dwl-9999-r1.ebuild b/gui-wm/dwl/dwl-9999-r1.ebuild
index 4c1020cf5d30..631ff290e732 100644
--- a/gui-wm/dwl/dwl-9999-r1.ebuild
+++ b/gui-wm/dwl/dwl-9999-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,12 @@ EAPI=8
 inherit savedconfig toolchain-funcs
 
 MY_P="${PN}-v${PV}"
-WLROOTS_SLOT="0/18"
+
+WLROOTS_DEP="
+	>=gui-libs/wlroots-0.18:=[libinput,session,X?]
+	<gui-libs/wlroots-0.19:=
+"
+
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://codeberg.org/dwl/dwl.git"
 	inherit git-r3
@@ -19,13 +24,13 @@ if [[ ${PV} == *9999* ]]; then
 			;;
 		9999-r1)
 			EGIT_BRANCH=wlroots-next
-			WLROOTS_SLOT="0/9999"
+			WLROOTS_DEP="~gui-libs/wlroots-9999:=[libinput,session,X?]"
 			;;
 	esac
 else
 	SRC_URI="https://codeberg.org/${PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="dwm for Wayland"
@@ -35,25 +40,30 @@ LICENSE="CC0-1.0 GPL-3+ MIT"
 SLOT="0"
 IUSE="X"
 
-RDEPEND="
+CDEPEND="
+	${WLROOTS_DEP}
 	dev-libs/libinput:=
 	dev-libs/wayland
-	gui-libs/wlroots:${WLROOTS_SLOT}[libinput,session,X?]
 	x11-libs/libxkbcommon
 	X? (
 		x11-libs/libxcb:=
 		x11-libs/xcb-util-wm
 	)
 "
-
+RDEPEND="
+	${CDEPEND}
+	X? (
+		x11-base/xwayland
+	)
+"
 # uses <linux/input-event-codes.h>
 DEPEND="
-	${RDEPEND}
+	${CDEPEND}
 	sys-kernel/linux-headers
 "
 BDEPEND="
 	>=dev-libs/wayland-protocols-1.32
-	dev-util/wayland-scanner
+	>=dev-util/wayland-scanner-1.23
 	virtual/pkgconfig
 "
 
diff --git a/gui-wm/dwl/dwl-9999.ebuild b/gui-wm/dwl/dwl-9999.ebuild
index f54f72310522..f94a2aa83609 100644
--- a/gui-wm/dwl/dwl-9999.ebuild
+++ b/gui-wm/dwl/dwl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,12 @@ EAPI=8
 inherit savedconfig toolchain-funcs
 
 MY_P="${PN}-v${PV}"
-WLROOTS_SLOT="0/17"
+
+WLROOTS_DEP="
+	>=gui-libs/wlroots-0.17:=[libinput,session,X?]
+	<gui-libs/wlroots-0.18:=
+"
+
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://codeberg.org/dwl/dwl.git"
 	inherit git-r3
@@ -19,13 +24,13 @@ if [[ ${PV} == *9999* ]]; then
 			;;
 		9999-r1)
 			EGIT_BRANCH=wlroots-next
-			WLROOTS_SLOT="0/9999"
+			WLROOTS_DEP="~gui-libs/wlroots-9999:=[libinput,session,X?]"
 			;;
 	esac
 else
 	SRC_URI="https://codeberg.org/${PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="dwm for Wayland"
@@ -35,20 +40,25 @@ LICENSE="CC0-1.0 GPL-3+ MIT"
 SLOT="0"
 IUSE="X"
 
-RDEPEND="
+CDEPEND="
+	${WLROOTS_DEP}
 	dev-libs/libinput:=
 	dev-libs/wayland
-	gui-libs/wlroots:${WLROOTS_SLOT}[libinput,session,X?]
 	x11-libs/libxkbcommon
 	X? (
 		x11-libs/libxcb:=
 		x11-libs/xcb-util-wm
 	)
 "
-
+RDEPEND="
+	${CDEPEND}
+	X? (
+		x11-base/xwayland
+	)
+"
 # uses <linux/input-event-codes.h>
 DEPEND="
-	${RDEPEND}
+	${CDEPEND}
 	sys-kernel/linux-headers
 "
 BDEPEND="
diff --git a/gui-wm/dwl/metadata.xml b/gui-wm/dwl/metadata.xml
index 3d26f0e133bf..52a2184de8fb 100644
--- a/gui-wm/dwl/metadata.xml
+++ b/gui-wm/dwl/metadata.xml
@@ -7,7 +7,10 @@
         <description>Additionally the upstream maintainer</description>
     </maintainer>
     <maintainer type="project" proxied="proxy">
-      <email>proxy-maint@gentoo.org</email>
-      <name>Proxy Maintainers</name>
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
     </maintainer>
+    <upstream>
+        <remote-id type="codeberg">dwl/dwl</remote-id>
+    </upstream>
 </pkgmetadata>