gentoo resync : 07.10.2018

5 files changed, 1 insertions, 351 deletions

diff --git a/mate-extra/mate-screensaver/Manifest b/mate-extra/mate-screensaver/Manifest
index 2f48ae32c817..264d886839d1 100644
--- a/mate-extra/mate-screensaver/Manifest
+++ b/mate-extra/mate-screensaver/Manifest
@@ -1,10 +1,4 @@
 AUX xss-conversion.txt 1026 BLAKE2B 4675ecb7d7ce45b28183ff503739b5d3853e8a68adfb8e4bf92274944c034d4f043c8854cc54a801ad72160bf452c645dfc5a0d35a71b967c9094f2a8464e59a SHA512 149d28bf7ff9dffe75f0a59408d91eff6537ec27a9457bf2419efe78e9b39a11796b341176e6ba4b1a183cc3ead080abe0ba85f51a3d57b0ff54dae8a3ec312a
-DIST mate-screensaver-1.12.0.tar.xz 4868924 BLAKE2B b523e18eed64c7f4521e6ac5fb656479fc9ac15652ca6bb5a832b66944a52ac429bb9dcc73a6ac50fda49fc2ba22beda0ad3e58a7b5e44d96282066ab7d1a151 SHA512 01bdef496560eb8e9118b0ff66863568aaa6df872e7947d0a92fe9fcb1d305618b28928ea95c65a3367e3e4e79e9bdab7a8266287c8e3db2a5210b955d412c8d
-DIST mate-screensaver-1.14.1.tar.xz 4912772 BLAKE2B b317bd9e40d423fc16ec53966a5ca813dd07f250bee171dbbd351bfa14d33f4b28a2c98e71311903eea607c7059c75c12d38b09d91c55a13052bbe5026b46eec SHA512 28b5834450da9d7d2fd3a77504f244e69212e751435bd41a957f30a5231db312dba37ee39442c63a40098bb3d1e1fade81ea423f9d59b29fc5d1201522d1d8f8
-DIST mate-screensaver-1.16.1.tar.xz 4916316 BLAKE2B 0918082568752c52f8e03f52c8423f6d053327868eebca77615e22fcb5bab1225f0cbccdad2f66ec01325ba3b67fa67db617509855a27618be71e8cd9f76d60c SHA512 ac481226ccec9a2785321ecc18ef3ed7ec188ba3fcb6e31515bca97b86b68955b1b1e08d4f72dbb683552877240e2f294b48af6bdea36f23d39a0853e1620085
 DIST mate-screensaver-1.18.2.tar.xz 4926748 BLAKE2B 7790a579991886617accd3f38146b624c81145c588fbc93fe78b0015669ca53e493aca0689e157fc0c11b86248bbc3d00b479ad8c4c1c01288e853c1ef3dd40c SHA512 b8ec5705f1810ecb1b887d1c9ad2a5eca2a39f7a093154d45c8cfdbcef664520b09be0ed4ab5992b001a4445e71e4eefd4e28d83e22c7536788c9d32f703283e
-EBUILD mate-screensaver-1.12.0-r1.ebuild 3080 BLAKE2B eaa79327da7d0696a8a8b5386ba3ec7275331d40f53818272d10e3c72f3f131007e9d5992613f111537320bc7d03d30771277b68748d3afdb771fef96d71bfec SHA512 365e3055e344971d0ffff2a1df404c68e10cfeb9aa7faf1ee62a6e4d259690d50de88d01d83a85384a56a15fc91a78ded3a5599884fda4603e98a1c45bf69da2
-EBUILD mate-screensaver-1.14.1.ebuild 3122 BLAKE2B 6db2403634b30bd9ebcbc74d1b9a95a39f16263b9a74b1664edde9bf832bfb2bd7273d1616dc76836e7ad7b1ce9e55a03614c39c77fc1532f20f7b308578bb8a SHA512 c4a5617cbafc141883ca7885fa75b1aac9d57cf886ce8b297602a6a9d88093adb20f6b45e58992944593362f0c5cf804e44968c43db4e71731fbf8de69526c94
-EBUILD mate-screensaver-1.16.1.ebuild 3122 BLAKE2B 6db2403634b30bd9ebcbc74d1b9a95a39f16263b9a74b1664edde9bf832bfb2bd7273d1616dc76836e7ad7b1ce9e55a03614c39c77fc1532f20f7b308578bb8a SHA512 c4a5617cbafc141883ca7885fa75b1aac9d57cf886ce8b297602a6a9d88093adb20f6b45e58992944593362f0c5cf804e44968c43db4e71731fbf8de69526c94
 EBUILD mate-screensaver-1.18.2.ebuild 3027 BLAKE2B 4fcaa0fc8c5ba82d31fcb8594b46033964ce8aeb71aedbc5f2876bb61bbc7a1681006e3752145d6b072ea5e5f8aeba59e89e8fa7ca52a89ec1411713d0a3754e SHA512 7aff1f0f02fa1a3095405716d53bea7d380bd9acb931bc7bff5dc9775aea9aa7684742f95a4626a506c3731c655a1ce75ef8074c530979ae8d05bfca56ef2e3f
-MISC metadata.xml 508 BLAKE2B 0e4b0470e1a7c5259930d95e36a39314b708d0f9ae46e761fbbc03b6d4594e792f8f894f92787474097bdf012f561ae4952116189b2cf6d1ac982b72eb7d5527 SHA512 03f079381cf35a7c0d33ec93f9aba9e8924dd010e1d67ea64508d1fca59fe56685ccc06b2a721006c1144e16a217b32156b67205c9ee8e8d39410406612cc3e2
+MISC metadata.xml 447 BLAKE2B febc277d7b427ae9a48c3c6e318b779f8a3fb9e27f896b17a3ebafec9bc8b03c4af3f30de7881fcc7feff674fdc0106d0b46f91d72d7267d4c4eeffb1dbe341a SHA512 29d7b99ddd69b2503d91f185679e1811403ba34443e20e2b17782878ee509565dcd62c2e3339709b3d29f568168c9c5c5a9284823d0187392220e781792b73e8
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.12.0-r1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.12.0-r1.ebuild
deleted file mode 100644
index d9b6e3f486be..000000000000
--- a/mate-extra/mate-screensaver/mate-screensaver-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate multilib readme.gentoo-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug consolekit gtk3 kernel_linux libnotify opengl pam systemd"
-
-DOC_CONTENTS="
-	Information for converting screensavers is located in
-	/usr/share/doc/${PF}/xss-conversion.txt*
-"
-
-RDEPEND="
-	>=dev-libs/dbus-glib-0.71:0
-	>=dev-libs/glib-2.36:2
-	gnome-base/dconf:0
-	>=mate-base/libmatekbd-1.7.1[gtk3(-)=]
-	>=mate-base/mate-desktop-1.9.4[gtk3(-)=]
-	>=mate-base/mate-menus-1.6
-	>=mate-base/mate-session-manager-1.6
-	>=sys-apps/dbus-0.30:0
-	>=x11-libs/gdk-pixbuf-2.14:2
-	>=x11-libs/libX11-1:0
-	x11-libs/cairo:0
-	x11-libs/libXext:0
-	x11-libs/libXrandr:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXxf86misc:0
-	x11-libs/libXxf86vm:0
-	x11-libs/libxklavier:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	consolekit? ( sys-auth/consolekit:0 )
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	opengl? ( virtual/opengl:0 )
-	pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 )
-	!pam? ( kernel_linux? ( sys-apps/shadow:0 ) )
-	systemd? ( sys-apps/systemd:0= )
-	!!<gnome-extra/gnome-screensaver-3:0"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--enable-locking \
-		--with-kbd-layout-indicator \
-		--with-xf86gamma-ext \
-		--with-xscreensaverdir=/usr/share/xscreensaver/config \
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with consolekit console-kit) \
-		$(use_with libnotify) \
-		$(use_with opengl libgl) \
-		$(use_with systemd) \
-		$(use_enable debug) \
-		$(use_enable pam)
-}
-
-src_install() {
-	mate_src_install
-
-	# Install the conversion script in the documentation.
-	dodoc "${S}"/data/migrate-xscreensaver-config.sh
-	dodoc "${S}"/data/xscreensaver-config.xsl
-	dodoc "${FILESDIR}"/xss-conversion.txt
-
-	# Non PAM users will need this suid to read the password hashes.
-	# OpenPAM users will probably need this too when
-	# https://bugzilla.gnome.org/show_bug.cgi?id=370847
-	# is fixed.
-	if ! use pam ; then
-		fperms u+s /usr/libexec/mate-screensaver-dialog
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
-		ewarn "You have a too old xorg-server installation. This will cause"
-		ewarn "mate-screensaver to eat up your CPU. Please consider upgrading."
-		echo
-	fi
-
-	if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
-		ewarn "You have xscreensaver installed, you probably want to disable it."
-		ewarn "To prevent a duplicate screensaver entry in the menu, you need to"
-		ewarn "build xscreensaver with -gnome in the USE flags."
-		ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
-		echo
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.14.1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.14.1.ebuild
deleted file mode 100644
index a2f6cdf98a7a..000000000000
--- a/mate-extra/mate-screensaver/mate-screensaver-1.14.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate multilib readme.gentoo-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug consolekit gtk3 kernel_linux libnotify opengl pam systemd"
-
-DOC_CONTENTS="
-	Information for converting screensavers is located in
-	/usr/share/doc/${PF}/xss-conversion.txt*
-"
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.71:0
-	>=dev-libs/glib-2.36:2
-	gnome-base/dconf:0
-	>=mate-base/libmatekbd-1.7.1[gtk3(-)=]
-	>=mate-base/mate-desktop-1.9.4[gtk3(-)=]
-	>=mate-base/mate-menus-1.6
-	>=sys-apps/dbus-0.30:0
-	>=x11-libs/gdk-pixbuf-2.14:2
-	>=x11-libs/libX11-1:0
-	x11-libs/cairo:0
-	x11-libs/libXext:0
-	x11-libs/libXrandr:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXxf86misc:0
-	x11-libs/libXxf86vm:0
-	x11-libs/libxklavier:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	consolekit? ( sys-auth/consolekit:0 )
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	opengl? ( virtual/opengl:0 )
-	pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 )
-	!pam? ( kernel_linux? ( sys-apps/shadow:0 ) )
-	systemd? ( sys-apps/systemd:0= )
-	!!<gnome-extra/gnome-screensaver-3:0"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-session-manager-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--enable-locking \
-		--with-kbd-layout-indicator \
-		--with-xf86gamma-ext \
-		--with-xscreensaverdir=/usr/share/xscreensaver/config \
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with consolekit console-kit) \
-		$(use_with libnotify) \
-		$(use_with opengl libgl) \
-		$(use_with systemd) \
-		$(use_enable debug) \
-		$(use_enable pam)
-}
-
-src_install() {
-	mate_src_install
-
-	# Install the conversion script in the documentation.
-	dodoc "${S}"/data/migrate-xscreensaver-config.sh
-	dodoc "${S}"/data/xscreensaver-config.xsl
-	dodoc "${FILESDIR}"/xss-conversion.txt
-
-	# Non PAM users will need this suid to read the password hashes.
-	# OpenPAM users will probably need this too when
-	# https://bugzilla.gnome.org/show_bug.cgi?id=370847
-	# is fixed.
-	if ! use pam ; then
-		fperms u+s /usr/libexec/mate-screensaver-dialog
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
-		ewarn "You have a too old xorg-server installation. This will cause"
-		ewarn "mate-screensaver to eat up your CPU. Please consider upgrading."
-		echo
-	fi
-
-	if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
-		ewarn "You have xscreensaver installed, you probably want to disable it."
-		ewarn "To prevent a duplicate screensaver entry in the menu, you need to"
-		ewarn "build xscreensaver with -gnome in the USE flags."
-		ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
-		echo
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.16.1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.16.1.ebuild
deleted file mode 100644
index a2f6cdf98a7a..000000000000
--- a/mate-extra/mate-screensaver/mate-screensaver-1.16.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate multilib readme.gentoo-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug consolekit gtk3 kernel_linux libnotify opengl pam systemd"
-
-DOC_CONTENTS="
-	Information for converting screensavers is located in
-	/usr/share/doc/${PF}/xss-conversion.txt*
-"
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.71:0
-	>=dev-libs/glib-2.36:2
-	gnome-base/dconf:0
-	>=mate-base/libmatekbd-1.7.1[gtk3(-)=]
-	>=mate-base/mate-desktop-1.9.4[gtk3(-)=]
-	>=mate-base/mate-menus-1.6
-	>=sys-apps/dbus-0.30:0
-	>=x11-libs/gdk-pixbuf-2.14:2
-	>=x11-libs/libX11-1:0
-	x11-libs/cairo:0
-	x11-libs/libXext:0
-	x11-libs/libXrandr:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXxf86misc:0
-	x11-libs/libXxf86vm:0
-	x11-libs/libxklavier:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	consolekit? ( sys-auth/consolekit:0 )
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	opengl? ( virtual/opengl:0 )
-	pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 )
-	!pam? ( kernel_linux? ( sys-apps/shadow:0 ) )
-	systemd? ( sys-apps/systemd:0= )
-	!!<gnome-extra/gnome-screensaver-3:0"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-session-manager-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--enable-locking \
-		--with-kbd-layout-indicator \
-		--with-xf86gamma-ext \
-		--with-xscreensaverdir=/usr/share/xscreensaver/config \
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with consolekit console-kit) \
-		$(use_with libnotify) \
-		$(use_with opengl libgl) \
-		$(use_with systemd) \
-		$(use_enable debug) \
-		$(use_enable pam)
-}
-
-src_install() {
-	mate_src_install
-
-	# Install the conversion script in the documentation.
-	dodoc "${S}"/data/migrate-xscreensaver-config.sh
-	dodoc "${S}"/data/xscreensaver-config.xsl
-	dodoc "${FILESDIR}"/xss-conversion.txt
-
-	# Non PAM users will need this suid to read the password hashes.
-	# OpenPAM users will probably need this too when
-	# https://bugzilla.gnome.org/show_bug.cgi?id=370847
-	# is fixed.
-	if ! use pam ; then
-		fperms u+s /usr/libexec/mate-screensaver-dialog
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
-		ewarn "You have a too old xorg-server installation. This will cause"
-		ewarn "mate-screensaver to eat up your CPU. Please consider upgrading."
-		echo
-	fi
-
-	if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
-		ewarn "You have xscreensaver installed, you probably want to disable it."
-		ewarn "To prevent a duplicate screensaver entry in the menu, you need to"
-		ewarn "build xscreensaver with -gnome in the USE flags."
-		ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
-		echo
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/mate-extra/mate-screensaver/metadata.xml b/mate-extra/mate-screensaver/metadata.xml
index a0d6c3ac7d57..4be378966bcd 100644
--- a/mate-extra/mate-screensaver/metadata.xml
+++ b/mate-extra/mate-screensaver/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="consolekit">Enable support for 
 			<pkg>sys-auth/consolekit</pkg></flag>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-screensaver</remote-id>