gentoo auto-resync : 18:03:2023 - 00:29:05

7 files changed, 18 insertions, 161 deletions

diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index f58b2ef0aa68..c4c97d188245 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/xfce4-power-manager/Manifest b/xfce-base/xfce4-power-manager/Manifest
index 001eb186bbe0..251e4bdea118 100644
--- a/xfce-base/xfce4-power-manager/Manifest
+++ b/xfce-base/xfce4-power-manager/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-power-manager-4.18.0.tar.bz2 1239515 BLAKE2B 1fc2ffcde64e873693322694ef638cc1e3e0773cc3dec663a03bfb7c4833e410e96ab2726fd5b7600149257e8add17ce51da6db5f31895c66007a83ed1837e18 SHA512 5cfa5285b479a0341b4afbf3141f773ff217cd1003cee55087a33f27e392dacf4930bc08b4faa7296dfe9e738d114a56efcecca32145a4cf68856d5d6feb9d24
 DIST xfce4-power-manager-4.18.1.tar.bz2 1217727 BLAKE2B bbd2a70cdb4fbac6146a28895b17896a10aff4a8d5e32ab82852e034977e9d1872d78eca6f8181ff16c74fcdd65ef27d891682bb93ef7ea4d846ccfee07ab034 SHA512 bb84f5a35058fa4aaa8cbe871acd898afb86885172c74d4b811d5b2c1204c0f7865c8488064622c364350c47d9aaecd07f1b65b56f72a547325e6e73bc2eb4ff
-EBUILD xfce4-power-manager-4.18.0.ebuild 1614 BLAKE2B 82efd4979b75e696e36d075481a8461586945b9b4769edfbd9da931e75cdab10e09344cc643e4bb71880d73bc026cc3bfb3135259224a33cf0f2365d91821d41 SHA512 1d0e097580e2b33edb446c6036dd6a442d7beb94840b0318d3b38afae9f21a3637a028c45e6557c8e871a9b6b2e1b93e6bbbdf3a54ee231d4830e2e13e113f6e
-EBUILD xfce4-power-manager-4.18.1.ebuild 1620 BLAKE2B a8504c1bd2f57892d0137ce8ab02e7e85cef26dc861f3349c5ba77ec83ae82baed036bcb6130955f50fdab65b340701a5114311fa97d7aa1a5088e879ffa6e18 SHA512 d97810b2394e0b5d5df72fbf8eef8e9c9848cb6641cb5795e667d599039b35a5b72f920d733318dc25854783d784a9a274e4e128add7f5cbac3e224eb356798f
+EBUILD xfce4-power-manager-4.18.1.ebuild 1616 BLAKE2B a300c82827b7aa4b7a1e9e0187c9b41a31e18c13dcd551964d7c14f3317356baad8ea0e7e379f198e61fbb912a0d9a0dc3ff481c76df240fdf0a4d2c4bac965f SHA512 cf09f2cf76eab1b55cb6ed24b20afb5b58dce76ee847462b3a921516107322429fb43aef9bc0de8d315ef041c8bd5c2c3339a466c3514b9b26ea215399078686
 MISC metadata.xml 361 BLAKE2B 0cd2ec9e6643d7379a8c37fc9ae3b3902396c94732182f4a3c7d50bef85e555c9d69b6c8ed13d127167c44e687d356b171f46d071acfa4c26b623835df9d94f6 SHA512 ca556c6a8e5df8b0e897fe64e04fdf23b23518b86db0e29568131d2d17329122f2aa012b2b2a7fb5811bd17a230c1d5a6065ce747532b4eb868cab4eb9d9dcd7
diff --git a/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.0.ebuild b/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.0.ebuild
deleted file mode 100644
index 042ca9d73c09..000000000000
--- a/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="Power manager for the Xfce desktop environment"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/xfce4-power-manager/start
-	https://gitlab.xfce.org/xfce/xfce4-power-manager/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
-IUSE="networkmanager +panel-plugin policykit"
-
-DEPEND="
-	>=dev-libs/glib-2.66.0
-	>=sys-power/upower-0.99.0
-	>=x11-libs/gtk+-3.24.0:3
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	>=x11-libs/libXrandr-1.2
-	x11-libs/libXext
-	x11-libs/libXtst
-	>=xfce-base/xfconf-4.12:=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:=
-	panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= )
-	policykit? ( >=sys-auth/polkit-0.112 )
-"
-RDEPEND="
-	${DEPEND}
-	networkmanager? ( net-misc/networkmanager )
-"
-DEPEND+="
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable policykit polkit)
-		$(use_enable networkmanager network-manager)
-		$(use_enable panel-plugin xfce4panel)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-
-	if ! has_version sys-apps/systemd && ! has_version sys-auth/elogind
-	then
-		elog "Suspend/hibernate support requires a logind provider installed"
-		elog "(sys-apps/systemd or sys-auth/elogind)"
-	fi
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.1.ebuild b/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.1.ebuild
index 7f3644cc57d8..f43d4b21779c 100644
--- a/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.1.ebuild
+++ b/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
 IUSE="networkmanager +panel-plugin policykit"
 
 DEPEND="
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index dc0f263b1164..f157f83bbeb9 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,5 +1,5 @@
-DIST xfce4-session-4.18.0.tar.bz2 853627 BLAKE2B e2a4d2dfcdab677b738d2fc3857bb7db07a0918af5bd4977e0f04210d52d4fc94551187b0ff2e3b5289823aeba0e12dc00344043da0fed2b3b2207afda423731 SHA512 00fcae02004675a26e6d73998403cf0e3a36dfd3596315ee98567d302a10c344cc1b64dac782e02416f11f6db3c730792e8de7d2d0ea1a6e0f2b2b7dbee74f4c
+DIST xfce4-session-4.18.1-mem1.patch 6533 BLAKE2B 2ba8b073e4ac8d38b452f65c6b7b481bf40313a9e6590f6c78ee663d176d7ebb627ce3b26a856a69b0a32e608cd2b31bb97c2f98a816cfa4b8fe0dbcd8298bce SHA512 17cdab96b509e6a7ecac16b9a7c4924b2fa8795e9e0db9cf619d264e15c66686be0456fdb6afd02bbdffb79ee47de74ee05a3ea37e63859c5e933addefe24ee6
+DIST xfce4-session-4.18.1-mem2.patch 2363 BLAKE2B 509f69e9f440aec41c4ef9366af5152469862b0e6ff3e20588f0ffec9a360bf22ff16cfb202ccbb9cff62db1a0c568a35e0e8cdaae7913d2af12b3a243818bb1 SHA512 0b8f693ceebd0c6f292ee244fc97e8e2a1a7c1008b651ac078336a2356d4c604546bb9a1220981fd00076aabbf16e9aeb73789d0b6f1306d2f104c421f99b82b
 DIST xfce4-session-4.18.1.tar.bz2 872771 BLAKE2B e9c0b972e1dc2b324d15c17dd317f151d7d4d169533752222f8347be36c1d070f888993be8ef8f590fda5632f66c5a6c973ed91dd95afe06418656c8ec129d54 SHA512 6e6a55138380b6e7ce98508f4d3a52a596882b2f244a1ebd0d1a4b7dd1814c93e6e27453b500cb9178889790f067e28c7c4479b39963511d8e579831a44ef973
-EBUILD xfce4-session-4.18.0.ebuild 1511 BLAKE2B 60283009f9d1e6ae909433277c64771c426d46e6c1c6c94143a2d3f783e5a9d5366855888ef55faf9c31b7ab7f84e9c091b43e35efa754ef5ca8771a8c530a11 SHA512 659b67853f4919f2de3c97f3dbaa760901ca1ce7aad86e915fdeb2de4e03c5e2e4a46853c6d01ec991d87c76fe98a6b6b735aa569c9e684f7548b07910278434
-EBUILD xfce4-session-4.18.1.ebuild 1515 BLAKE2B bb152f448c5c289bda8d2d33e0ccbb17ba29653f1fdc441374ca1add1163d9b1d75946e5a7902482c4c5016692ced0de554278f79f02e94d74e4bca5f4da585d SHA512 aae3e333b695bd8642c45902083034f80bdf6032324a1e10d26e254e58f0be225f6273c5a0ba8c1a37e8d780fc0f989b00cb97a3f0c667bad98bf5d8134aa151
+EBUILD xfce4-session-4.18.1-r1.ebuild 1829 BLAKE2B 254edaa91fa8b9d0115442ff5fb65e816f644369ef2405cfb09663de85910bbdfcb0044e62b9192e7fe05b963e15e981d485bacfb8c1093b1847233e9f346e1a SHA512 fe07d88f0f1b72a3ce03ef301aad22b20026a2821fe531c64f74a7c918f734c0180dae5b480ffce4ffed4dd794ffed300e3db378a721e120eb24dd9f2f732616
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-base/xfce4-session/xfce4-session-4.18.0.ebuild b/xfce-base/xfce4-session/xfce4-session-4.18.1-r1.ebuild
index 2522c6b76a1e..64b3da774983 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.18.0.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.18.1-r1.ebuild
@@ -10,7 +10,13 @@ HOMEPAGE="
 	https://docs.xfce.org/xfce/xfce4-session/start
 	https://gitlab.xfce.org/xfce/xfce4-session
 "
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="
+	https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2
+	https://gitlab.xfce.org/xfce/xfce4-session/-/commit/911f5b8101dec6a6d28f7601768588a2f0fd4aaf.patch
+		-> ${P}-mem1.patch
+	https://gitlab.xfce.org/xfce/xfce4-session/-/commit/cff23d0fadd502f7db9230f9ebbc02c00853f825.patch
+		-> ${P}-mem2.patch
+"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -24,7 +30,7 @@ DEPEND="
 	x11-libs/libwnck:3
 	x11-libs/libX11
 	>=xfce-base/libxfce4util-4.15.2:=
-	>=xfce-base/libxfce4ui-4.15.1:=
+	>=xfce-base/libxfce4ui-4.18.2:=
 	>=xfce-base/xfconf-4.12:=
 	policykit? ( >=sys-auth/polkit-0.102 )
 "
@@ -47,6 +53,11 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${DISTDIR}/${P}-mem1.patch"
+	"${DISTDIR}/${P}-mem2.patch"
+)
+
 src_configure() {
 	local myconf=(
 		$(use_enable policykit polkit)
diff --git a/xfce-base/xfce4-session/xfce4-session-4.18.1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.18.1.ebuild
deleted file mode 100644
index ae01eb28e109..000000000000
--- a/xfce-base/xfce4-session/xfce4-session-4.18.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="A session manager for the Xfce desktop environment"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/xfce4-session/start
-	https://gitlab.xfce.org/xfce/xfce4-session
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="nls policykit +xscreensaver"
-
-DEPEND="
-	>=dev-libs/glib-2.66.0
-	>=x11-libs/gtk+-3.24.0:3
-	x11-libs/libSM
-	x11-libs/libwnck:3
-	x11-libs/libX11
-	>=xfce-base/libxfce4util-4.15.2:=
-	>=xfce-base/libxfce4ui-4.18.2:=
-	>=xfce-base/xfconf-4.12:=
-	policykit? ( >=sys-auth/polkit-0.102 )
-"
-RDEPEND="
-	${DEPEND}
-	x11-apps/iceauth
-	x11-apps/xrdb
-	nls? ( x11-misc/xdg-user-dirs )
-	xscreensaver? (
-		|| (
-			xfce-extra/xfce4-screensaver
-			>=x11-misc/xscreensaver-5.26
-			x11-misc/light-locker
-		)
-	)
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable policykit polkit)
-		--with-xsession-prefix="${EPREFIX}"/usr
-		ICEAUTH="${EPREFIX}"/usr/bin/iceauth
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	exeinto /etc/X11/Sessions
-	newexe - Xfce4 <<-EOF
-		startxfce4
-	EOF
-	dosym Xfce4 /etc/X11/Sessions/Xfce
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}