gentoo resync : 25.11.2020

4 files changed, 89 insertions, 6 deletions

diff --git a/xfce-extra/xfce4-screensaver/Manifest b/xfce-extra/xfce4-screensaver/Manifest
index 77a2cc2274d7..00f60c75dfab 100644
--- a/xfce-extra/xfce4-screensaver/Manifest
+++ b/xfce-extra/xfce4-screensaver/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-screensaver-0.1.10.tar.bz2 665624 BLAKE2B 9af4a821bcbb461462cf620dbd2c064a32b904f0d6887095cd00939f857244d69612e18559c0cf0be93e9044047d0e3dba8c756acc16fe9e3e136a718beb3942 SHA512 a04842697c7a8f84ee937f0371b3d1413163b59d1a54b9adf0b904dd501d6328ab645160567ff79afbe063cc113a488567ec5d8df4d6ed2db354738275c00b2e
-EBUILD xfce4-screensaver-0.1.10.ebuild 1729 BLAKE2B c3b3fbe262b1b62b1cea549e320066ec28800d4c466b75d8ebd698e3222e3ed8cb1775ed3e22e77d031ef08eecbced0aad6441bf1ca479c94ca8ac0b90c70242 SHA512 8f1adef3c5dd461e2c971551260a1aafc8a5d8c3662061e66b3dfc3834fb6ce5ca0b37b4075239d15d0304ba9e190b4b4ba32d276c0e1043d3342459d9b397ee
-MISC metadata.xml 350 BLAKE2B ac551b0c67875b795ea6640c67d2a5968a7c7ad19cb12c0103a900fbca8adde364eb32110d92150b677d1fb8089fdd35dfb7cee6fc40d30633a663191d77321d SHA512 88f3dbe07292eae938727232450e5b6a2b7b54766dc095541e6afa451d1261bc0a657467a90f0815c7a3cc4db11cf667cbc5e41f7ba3cefa6354630019fd1742
+DIST xfce4-screensaver-0.1.11.tar.bz2 699642 BLAKE2B 5fbb5b5c923e82070e429fcf65c8c5b5b9b0d78cba9fd128c84490a6a0927a0620b41af7ffb7356cd13ccfe48f2e1841f90e980c4bfbd15fa8f50e0f1fed7e75 SHA512 f692e31cba00d65887b90857eb4c1075000859f85db7dac7f421cc0d9812c6e8d517fcdfcac7546a6818375f9a7222a2afb80ae7076e62953bc8dcc7af9be174
+EBUILD xfce4-screensaver-0.1.10.ebuild 1668 BLAKE2B e9e364d64eb3d8fb63a1dd6af77a3f2a21a2724a57d8a17ebd64e1d71d02b268b85712d045bcbb72bc539198f4a2ef3f84214014f693a2aa475abed29212623b SHA512 73575cae9e37ad1b9f2c2135952980f5390530e149b6ae017d2001a25d9e13b82883b46d52e448aa915e70d6c19c5787f99af8fd2597bc8a419cb5c8a65fd561
+EBUILD xfce4-screensaver-0.1.11.ebuild 1773 BLAKE2B acc6f65695cbe248582c55c1e3f534544b7f67284e134925ed7d53077b6b037b4d4db166e72a0de6fc5f0beedebbb571359b44d88b384b8e70a43ab910e47ef8 SHA512 e38e88ece647764399414a42b669289cf48ffcf2837e6798c970ef7bd9f185f3c4d92932748c7786339a56ab2638720d92c8e7bc7dc06349e94e7707caa481bc
+MISC metadata.xml 291 BLAKE2B 533c3c70954a738e8b239f8ab6ce7b45702bf87d7151e8182ae6142cf8a1611c9d24ab4e6e95ad8d71606e802369536a669e313493e3527d6daa8d1e5a61ecdd SHA512 f86de2f82f08b0a0372ec018cdbebbf87e6c0e7e4f4e4c78c1cbeba0a2cc6ef26f17a8f84b85195961af8a690bf3eb2b45bf415be43e3d9a791e296d7f4a74e1
diff --git a/xfce-extra/xfce4-screensaver/metadata.xml b/xfce-extra/xfce4-screensaver/metadata.xml
index bc30ef334656..43b2b0675580 100644
--- a/xfce-extra/xfce4-screensaver/metadata.xml
+++ b/xfce-extra/xfce4-screensaver/metadata.xml
@@ -5,7 +5,6 @@
 		<email>xfce@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='consolekit'>Enable ConsoleKit support</flag>
 		<flag name='locking'>Enable screen locking support</flag>
 	</use>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild
index e06a050f578c..da385e71b5ca 100644
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild
+++ b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 x86"
-IUSE="consolekit elogind +locking opengl pam systemd"
+IUSE="elogind +locking opengl pam systemd"
 
 # Xrandr: optional but automagic
 RDEPEND="
@@ -29,7 +29,6 @@ RDEPEND="
 	>=xfce-base/libxfce4ui-4.12.1:=
 	>=xfce-base/libxfce4util-4.12.1:=
 	>=xfce-base/xfconf-4.12.1:=
-	consolekit? ( sys-auth/consolekit )
 	elogind? ( sys-auth/elogind )
 	locking? (
 		pam? ( sys-libs/pam )
@@ -51,11 +50,11 @@ src_configure() {
 		# xscreensaver dirs autodetection doesn't seem to work
 		--with-xscreensaverdir=/usr/share/xscreensaver/config
 		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
+		--without-console-kit
 
 		$(use_with opengl libgl)
 		$(use_enable locking)
 		$(use_enable pam)
-		$(use_with consolekit console-kit)
 		$(use_with elogind)
 		$(use_with systemd)
 	)
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.11.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.11.ebuild
new file mode 100644
index 000000000000..948b2c2e6f96
--- /dev/null
+++ b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.11.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="Screen saver and locker (port of MATE screensaver)"
+HOMEPAGE="https://git.xfce.org/apps/xfce4-screensaver/about/"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="elogind +locking opengl pam systemd"
+
+# Xrandr: optional but automagic
+RDEPEND="
+	>=dev-libs/dbus-glib-0.30
+	>=dev-libs/glib-2.50:2
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/libwnck-3.20:3
+	x11-libs/libICE:=
+	x11-libs/libX11:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXext:=
+	x11-libs/libXxf86vm:=
+	>=x11-libs/libXrandr-1.3:=
+	>=x11-libs/libxklavier-5.2:=
+	>=xfce-base/garcon-0.5.0:=
+	>=xfce-base/libxfce4ui-4.12.1:=
+	>=xfce-base/libxfce4util-4.12.1:=
+	>=xfce-base/xfconf-4.12.1:=
+	elogind? ( sys-auth/elogind )
+	locking? (
+		pam? ( sys-libs/pam )
+	)
+	opengl? ( virtual/opengl )
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	dev-util/intltool
+	sys-apps/dbus
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		# disable docbook for now
+		ac_cv_path_XMLTO=no
+
+		# xscreensaver dirs autodetection doesn't seem to work
+		--with-xscreensaverdir=/usr/share/xscreensaver/config
+		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
+		--without-console-kit
+
+		$(use_with opengl libgl)
+		$(use_enable locking)
+		$(use_enable pam)
+		$(use_with elogind)
+		$(use_with systemd)
+	)
+
+	if use pam; then
+		myconf+=( --with-pam-auth-type=system )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}