gentoo auto-resync : 02:07:2024 - 08:01:06

7 files changed, 15 insertions, 99 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 259e566617ce..6c7b4fc6cbf1 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index 83f5ee5912cf..1e4072fa25e4 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -1,6 +1,4 @@
 DIST lightdm-gentoo-patch-2.tar.gz 695543 BLAKE2B 62e21dd413b90053160f774663d89c81b3c9d8c4a040023f4ce50bf775a2f036e0be6ed16ae767eb5b04586a27fdbf41eb56f777340b2d56633738a126c3d575 SHA512 8d9bfdee71ab1871de33e134b11bba409cc493876e5ae9534956100ff6af6c8748b29de9082ecf8b771ccac4c8c2024e15e93332165171dfe93eb99c9a834274
-DIST lightdm-gtk-greeter-2.0.8.tar.gz 583426 BLAKE2B ae06ebbc07efe5c0131c07b293671f24683699eb84f12222de8165428e935b98bbf9d1e107eaeca8f10e725a6a11c97d4f4c3d415ada0b0876b0b0a99f21d1ee SHA512 59cad69fd7f17b6a416944804be80f306ed51ee0c55826975c8564f432e8098043b677f6452e9afa290c6ef37ebdc632cd8b79e7a0a712a3407ddbf9f200b0db
 DIST lightdm-gtk-greeter-2.0.9.tar.gz 602540 BLAKE2B 33c7df912ee9faa46c97e7a458f400b13d7d746521de58b1c63ec845574c45374a27fe21718ac78a33a729617941cff01802c4736d1d3066d001065a57acc264 SHA512 05d786d31e447cacc28ddb06e89e91623b137665badcebd82ac7f9e8ff745a01aadf406e25ebd2c6594915fe8a90a242ef065ad46fd9ee73cd6e8c2879f70158
-EBUILD lightdm-gtk-greeter-2.0.8-r1.ebuild 2138 BLAKE2B c8d205d90c95f389faf5e460ca0722dc9bff1e541950bac4068b6e466f8662afa792cd453c688a6f2d0f3b0a98af3f492c4c6ccaad738f1be15dcf03d9f87aeb SHA512 422b0b321ae0851c7a77a8ed24fe5c8ce50401873b0249676196750fd50cc015923e97671f4cdebfe74762dae928bc78c4dbda99b5845aa9af51980e32b155c8
-EBUILD lightdm-gtk-greeter-2.0.9.ebuild 2138 BLAKE2B c8d205d90c95f389faf5e460ca0722dc9bff1e541950bac4068b6e466f8662afa792cd453c688a6f2d0f3b0a98af3f492c4c6ccaad738f1be15dcf03d9f87aeb SHA512 422b0b321ae0851c7a77a8ed24fe5c8ce50401873b0249676196750fd50cc015923e97671f4cdebfe74762dae928bc78c4dbda99b5845aa9af51980e32b155c8
+EBUILD lightdm-gtk-greeter-2.0.9.ebuild 2131 BLAKE2B f94039109d50c56d5c3723650a1b72bbf5bd194a8bca51337933888346ee2bb542038ec4f9a622f7167d3d54a9814489e36fad393a98a3b79ea772727c2e5f5f SHA512 c577e64987e0728d6d3ff6e2b20c5d8ccc8d21e495cfdc9d337e5b6ebc83be9aac0f62294422324d27bf23763f047e883fa48386d55298d77c36897bffa34754
 MISC metadata.xml 694 BLAKE2B 479c8b556330eb4716e77779c95c3a92155fd8d779b3cf479ebf4374e9b4b5a39aed51d42ca9aad62a59984d0855cb2ae0284da6f3df0c7012ee15354ac48097 SHA512 4b20993f0791a146557e2c2e27b06f9f35feea8af49c29cd6ce691dc916766dfc53c02563d6c871578fee2c71e6bf9c351abf0ae7b04925ccec37e260fc36b77
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8-r1.ebuild
deleted file mode 100644
index 3d8d49a1c38b..000000000000
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools xdg-utils
-
-DESCRIPTION="LightDM GTK+ Greeter"
-HOMEPAGE="https://github.com/Xubuntu/lightdm-gtk-greeter"
-SRC_URI="https://github.com/Xubuntu/${PN}/releases/download/${P}/${P}.tar.gz
-	branding? ( https://dev.gentoo.org/~marecki/dists/x11-misc/lightdm-gtk-greeter/lightdm-gentoo-patch-2.tar.gz )"
-
-LICENSE="GPL-3 LGPL-3
-	branding? ( CC-BY-3.0 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-IUSE="appindicator branding"
-
-DEPEND="x11-libs/gtk+:3
-	>=x11-misc/lightdm-1.2.2
-	appindicator? (
-		dev-libs/ayatana-ido
-		dev-libs/libayatana-indicator:3
-	)"
-
-BDEPEND="
-	dev-build/xfce4-dev-tools
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-RDEPEND="${DEPEND}
-	x11-themes/gnome-themes-standard
-	>=x11-themes/adwaita-icon-theme-3.14.1"
-
-GENTOO_BG="gentoo-bg_65.jpg"
-
-src_prepare() {
-	# Ok, this has to be fixed in the tarball but I am too lazy to do it.
-	# I will fix this once I decide to update the tarball with a new gentoo
-	# background
-	# Bug #404467
-	if use branding; then
-		sed \
-			-e "/xft-hintstyle/s:slight:hintslight:" \
-			-e "/background/s:=.*:=/usr/share/lightdm/backgrounds/${GENTOO_BG}:" \
-			-i "${WORKDIR}"/${PN}.conf || die
-		# Add back the reboot/shutdown buttons
-		echo 'indicators=~host;~spacer;~clock;~spacer;~session;~language;~a11y;~power;~' \
-			>> "${WORKDIR}"/${PN}.conf || die
-	fi
-	default
-
-	# Fix docdir
-	sed "/^docdir/s@${PN}@${PF}@" -i data/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-kill-on-sigterm
-		--enable-at-spi-command="${EPREFIX}/usr/libexec/at-spi-bus-launcher --launch-immediately"
-		--with-libindicator=ayatana
-		$(use_enable appindicator libindicator)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use branding; then
-		insinto /etc/lightdm/
-		doins "${WORKDIR}"/${PN}.conf
-		insinto /usr/share/lightdm/backgrounds/
-		doins "${WORKDIR}"/${GENTOO_BG}
-		newdoc "${WORKDIR}"/README.txt README-background.txt
-	fi
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.9.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.9.ebuild
index 3d8d49a1c38b..ed46841470d6 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.9.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.9.ebuild
@@ -8,7 +8,7 @@ inherit autotools xdg-utils
 DESCRIPTION="LightDM GTK+ Greeter"
 HOMEPAGE="https://github.com/Xubuntu/lightdm-gtk-greeter"
 SRC_URI="https://github.com/Xubuntu/${PN}/releases/download/${P}/${P}.tar.gz
-	branding? ( https://dev.gentoo.org/~marecki/dists/x11-misc/lightdm-gtk-greeter/lightdm-gentoo-patch-2.tar.gz )"
+	branding? ( https://dev.gentoo.org/~ceamac/x11-misc/lightdm-gtk-greeter/lightdm-gentoo-patch-2.tar.gz )"
 
 LICENSE="GPL-3 LGPL-3
 	branding? ( CC-BY-3.0 )"
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 5ad8efc9ba9a..d6546fb8c6ce 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -7,6 +7,6 @@ DIST sddm-0.21.0-pam.tar.xz 676 BLAKE2B 06a79f74a5833eca9877df4be8639311382d1306
 DIST sddm-0.21.0.tar.gz 3557266 BLAKE2B 849cb8b06b9510e5366ea28ef322c242db7d5a77d94c0a5a727f468209880a717055ad8b0c2f5a857852202a4d6bc1f68281fe0e0ab3c6a32327b5a4219af3a0 SHA512 2e8e460e7f318f20a406dcbb1a9fa1dc78b6a5b8d888bfbbaae22b9c642dbc49cf2ac682b4ea9ed847bbafa9bdc361ba08795e59cad970088b370caaaa70f458
 DIST sddm-0.21.0_p20240302.tar.gz 3555893 BLAKE2B 2c0d6b5185088750f3e656f593b1f9cd212e76d250c6285e03c8d86fad99412dce4a784dd8dfdd8cf7759552101ce36971b6c292f8ce51e9aecc3e9a1a785daa SHA512 0e0a143ec2007b09c406773ff81a5d722b9a7fadd0c5c6c8ef23d67623c16f8327cf54617dcc273b0b690ca5447b6707ff1dd48a8a563a6efed8d9aac70bd522
 EBUILD sddm-0.18.1-r8.ebuild 4014 BLAKE2B 9905d591d59827c1097c9cafa56f399d1f9099fa7a69fb3c9966d797355d2c03ed647d69e9309c369a820cfc15345e2cb4d98596507c4c1b9ffaf4c45101938b SHA512 2015d988c8b12066e7ee9e410b151a5677a8ea2663840ae04162db132ceca79f7699026bd2d8ac198996ece2499d8fb4071af0e708900525104b3c294adb5379
-EBUILD sddm-0.21.0.ebuild 4024 BLAKE2B d695587f3241548b50c08d0f5d248e44aa20fe8092973f07aa8dee6f576e9333ede1b4c8f53da02c8c89e77f22b5e591b54d417295e0ccf1cb910f9167792613 SHA512 1fd90733b702dc49f15b0946924e5e4043318244df0e66438ffa1dd22189a012e760deb5632d8de2f3cbef1e976c20c24e147647e5c9e1a1c11144d8d80dbab9
-EBUILD sddm-0.21.0_p20240302.ebuild 3818 BLAKE2B 5b787789ad1a1a5dc66342ac0ee943556733805f7f77a5571e695183c6d5f9af828519be953993cb084d261a0f6253ebdbca0463e7207f276ef4f3673c9fb10c SHA512 b929f3f334d96a43f7231ae1cf6aa69bce71db9605a09f568cb5b759087052777474f827056ef4f7914f98c9be08a2f6127d35acf7038a1a0a544187a986aa10
+EBUILD sddm-0.21.0.ebuild 4035 BLAKE2B d3259f31587e7226764e3ac25bd2f1ebd5f8a96ae497a5c12c202a06cc4be8acec675e083bd7409d0743b709c1d09d5834c7d9273b9e6ae2fa721c0b1117888b SHA512 ef4eedf18db0cd96927e93b9f56281798a933b9588f97c71c4fa149a59bd99a40df4afbeeffa1e8836cbb0ccfcab43980e92453afee0d49d197f093b651a6c67
+EBUILD sddm-0.21.0_p20240302.ebuild 3963 BLAKE2B 83f2f3df8a2019ad0531ccd74ddc08182f6cb09ab11e5f3250a17bcede589cb85054b7a7471c28ca372295ac32b1352e5894d4e2c706590a6a84bfef2b19cabf SHA512 666e881c76f83f813de8a25b6be44e7a5106a85456350fb43549989d2cd555382ae45261071ccaaa4c7576c2a239f31f55baea74b5fd5f9de1e5cf7ce2677e02
 MISC metadata.xml 722 BLAKE2B fc34c0b25b7f3e6ab876c99a30f475dc90cc4b319f497a2ba4bd2beac1dc1189d3d9611999c0c3b078254db23c4c9b2ef0416da41e706c1a1db96d5bbec28177 SHA512 c1fa48632080e295272df6e7ceb7c0a1ad64a41155c7d53d91728f072cb7abf618e7bf4d5cced2ca0b198bbbf5ed1e72c5bfc9ea9d590064e5f5494747d32b0d
diff --git a/x11-misc/sddm/sddm-0.21.0.ebuild b/x11-misc/sddm/sddm-0.21.0.ebuild
index 6aa0a5118fe9..ca86d169665e 100644
--- a/x11-misc/sddm/sddm-0.21.0.ebuild
+++ b/x11-misc/sddm/sddm-0.21.0.ebuild
@@ -145,8 +145,8 @@ pkg_postinst() {
 		elog "  to the troubleshooting section."
 	fi
 
-	optfeature "Weston DisplayServer support (EXPERIMENTAL)" dev-libs/weston
-	optfeature "KWin DisplayServer support (EXPERIMENTAL)" kde-plasma/kwin
+	optfeature "Weston DisplayServer support (EXPERIMENTAL)" "dev-libs/weston[kiosk]"
+	optfeature "KWin DisplayServer support (EXPERIMENTAL)" "kde-plasma/kwin"
 
 	systemd_reenable sddm.service
 }
diff --git a/x11-misc/sddm/sddm-0.21.0_p20240302.ebuild b/x11-misc/sddm/sddm-0.21.0_p20240302.ebuild
index 3b25d24a2128..4999e5d18ab3 100644
--- a/x11-misc/sddm/sddm-0.21.0_p20240302.ebuild
+++ b/x11-misc/sddm/sddm-0.21.0_p20240302.ebuild
@@ -15,7 +15,7 @@ else
 fi
 
 QTMIN=6.7.1
-inherit cmake linux-info pam systemd tmpfiles
+inherit cmake linux-info optfeature pam systemd tmpfiles
 
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm"
@@ -36,12 +36,14 @@ COMMON_DEPEND="
 	sys-libs/pam
 	x11-libs/libXau
 	x11-libs/libxcb:=
-	elogind? ( sys-auth/elogind[pam] )
+	elogind? (
+		sys-auth/elogind[pam]
+		sys-power/upower
+	)
 	systemd? ( sys-apps/systemd:=[pam] )
-	!systemd? ( sys-power/upower )
 "
 DEPEND="${COMMON_DEPEND}
-	test? ( >=dev-qt/qtbase-${QTMIN}:6[network,test] )
+	test? ( >=dev-qt/qtbase-${QTMIN}:6 )
 "
 RDEPEND="${COMMON_DEPEND}
 	X? ( x11-base/xorg-server )
@@ -144,5 +146,8 @@ pkg_postinst() {
 		elog "  to the troubleshooting section."
 	fi
 
+	optfeature "Weston DisplayServer support (EXPERIMENTAL)" "dev-libs/weston[kiosk]"
+	optfeature "KWin DisplayServer support (EXPERIMENTAL)" "kde-plasma/kwin"
+
 	systemd_reenable sddm.service
 }