gentoo resync : 18.11.2018

4 files changed, 8 insertions, 144 deletions

diff --git a/xfce-extra/xfce4-screensaver/Manifest b/xfce-extra/xfce4-screensaver/Manifest
index 472cc225e574..bedfca556aa2 100644
--- a/xfce-extra/xfce4-screensaver/Manifest
+++ b/xfce-extra/xfce4-screensaver/Manifest
@@ -1,7 +1,3 @@
-DIST xfce4-screensaver-0.1.0.tar.bz2 525080 BLAKE2B be1b4add2f72cf7d93bcb651852bb398c38e7d4637c03d90ea277dc3ea50147e8bca9a870b8b5fe2353fd71ad180684214cdeb0e18808f3ced234f9a03b2bf13 SHA512 a925deada7313e3d156d4b19fd38e50538e2ac429c657f9f29b727c4c20ccd83a07dafdc4fa14fca26bcc09961ee42700685097260473a5fdec8877114a8a048
-DIST xfce4-screensaver-0.1.1.tar.bz2 599282 BLAKE2B efa5addab9ed3ec92a71ee129ad36d5491107c5352999bcd42c2e147c914095c343ced7adfc9d814cb0fcd3b880efd3fa76e6f5171f62d2432639f9be6b857df SHA512 b494810dbad3ae23676d4a403a8b00da7d33f5fc0520c59cf6b612626e0b4d1f642c9ed47c24c7ea2c051d9a1077396dacb807d623852c599d1538d089833071
 DIST xfce4-screensaver-0.1.2.tar.bz2 598959 BLAKE2B 63ea3e6268cbd49ba72e43fb37c947c63fb0051ca62da9369806988ed1624ac20e8ece76b3ea2849d6e0b0049c0c10775285f1fd9b11c4856d7d842ce9c7ffc1 SHA512 9460ae8a3dec27df5e67bb078f8f52fb298769e572ae75c7a6ae4f0f5f7b93e430e505f99dce4caea0c6c885f9087270700e294150cdcfeadce5046049e44f6f
-EBUILD xfce4-screensaver-0.1.0.ebuild 1595 BLAKE2B 32f30569e00da8b078a257e6c1a2dfd5c7f9af435a3f00f06cb55ea27ca3ec09ab23dea8f8c34dc1c63229c12e5d67a34b203cc81dda88befda86e8290732f5e SHA512 f72a210038490c280299494a071d42056b8b809f6b6249a1628c7940dd8f57da42744e7239abde0a703c52018658d245cbe7a33eacbdadfaec080062963ba7df
-EBUILD xfce4-screensaver-0.1.1.ebuild 1595 BLAKE2B 32f30569e00da8b078a257e6c1a2dfd5c7f9af435a3f00f06cb55ea27ca3ec09ab23dea8f8c34dc1c63229c12e5d67a34b203cc81dda88befda86e8290732f5e SHA512 f72a210038490c280299494a071d42056b8b809f6b6249a1628c7940dd8f57da42744e7239abde0a703c52018658d245cbe7a33eacbdadfaec080062963ba7df
-EBUILD xfce4-screensaver-0.1.2.ebuild 1595 BLAKE2B 32f30569e00da8b078a257e6c1a2dfd5c7f9af435a3f00f06cb55ea27ca3ec09ab23dea8f8c34dc1c63229c12e5d67a34b203cc81dda88befda86e8290732f5e SHA512 f72a210038490c280299494a071d42056b8b809f6b6249a1628c7940dd8f57da42744e7239abde0a703c52018658d245cbe7a33eacbdadfaec080062963ba7df
+EBUILD xfce4-screensaver-0.1.2-r1.ebuild 1658 BLAKE2B 35dd424d48dce6c91ecd6171ac752538c3ed0986130eecf643188f3760ecda18265e669dee1ff772c7fc3a700fdd3710a3ddf79fd0f5486c20504d583d12588d SHA512 2f8082f388e9e218496843ad042d422a617e15af4001b698761176265b9b7f526567a075fe061660c7c6978e381136ea9715c3a90935fdd693ca17c08f2086f1
 MISC metadata.xml 349 BLAKE2B b9a70b461f2064eeeec11db52c92d2e6b0a018dc4ed7ffb390f8ce72fca6c92802cb376f82e47a6b53bec0c1bf715e59cdea836dea514de05fb352279ff28407 SHA512 e655e51231b6f407bda45915fa7a9e1db53aa122f1609a1c4c78020ca7465ea13279bf6dc440d5d66de73aad42c1f20c4678f8100f0551211d9818618c356d95
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.1.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.1.ebuild
deleted file mode 100644
index 33e37d91f142..000000000000
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="~amd64 ~x86"
-IUSE="consolekit +locking opengl pam systemd"
-
-# Xrandr: optional but automagic
-RDEPEND="
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.50:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libICE:=
-	x11-libs/libX11:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXext:=
-	x11-libs/libXxf86misc:=
-	x11-libs/libXxf86vm:=
-	>=x11-libs/libXrandr-1.3:=
-	>=x11-libs/libxklavier-5.2:=
-	x11-misc/xscreensaver
-	>=xfce-base/garcon-0.5.0:=
-	>=xfce-base/libxfce4ui-4.12.1:=
-	>=xfce-base/libxfce4util-4.12.1:=
-	>=xfce-base/xfconf-4.12.1:=
-	consolekit? ( sys-auth/consolekit )
-	locking? (
-		pam? ( virtual/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
-
-		$(use_with opengl libgl)
-		$(use_enable locking)
-		$(use_enable pam)
-		$(use_with consolekit console-kit)
-		$(use_with systemd)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.0.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.2-r1.ebuild
index 33e37d91f142..8340110b2f9d 100644
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.0.ebuild
+++ b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -59,6 +59,12 @@ src_configure() {
 		$(use_with systemd)
 	)
 
+	if use pam; then
+
+	myconf+=( --with-pam-auth-type=system )
+
+	fi
+
 	econf "${myconf[@]}"
 }
 
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.2.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.2.ebuild
deleted file mode 100644
index 33e37d91f142..000000000000
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="~amd64 ~x86"
-IUSE="consolekit +locking opengl pam systemd"
-
-# Xrandr: optional but automagic
-RDEPEND="
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.50:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libICE:=
-	x11-libs/libX11:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXext:=
-	x11-libs/libXxf86misc:=
-	x11-libs/libXxf86vm:=
-	>=x11-libs/libXrandr-1.3:=
-	>=x11-libs/libxklavier-5.2:=
-	x11-misc/xscreensaver
-	>=xfce-base/garcon-0.5.0:=
-	>=xfce-base/libxfce4ui-4.12.1:=
-	>=xfce-base/libxfce4util-4.12.1:=
-	>=xfce-base/xfconf-4.12.1:=
-	consolekit? ( sys-auth/consolekit )
-	locking? (
-		pam? ( virtual/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
-
-		$(use_with opengl libgl)
-		$(use_enable locking)
-		$(use_enable pam)
-		$(use_with consolekit console-kit)
-		$(use_with systemd)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}