gentoo resync : 28.04.2018

3 files changed, 2 insertions, 30 deletions

diff --git a/x11-proto/scrnsaverproto/Manifest b/x11-proto/scrnsaverproto/Manifest
index 832855b47e87..cbb585a234a0 100644
--- a/x11-proto/scrnsaverproto/Manifest
+++ b/x11-proto/scrnsaverproto/Manifest
@@ -1,4 +1,2 @@
-DIST scrnsaverproto-1.2.2.tar.bz2 118820 BLAKE2B 96bcf9e37b2d2a7f646691f08d376e8307954a0e95ae557a4688e94406ef4c1ea841d5ac3373a00a6e368bf09139aaf1421f6d584961bd8e482c241b252ecc01 SHA512 e74a512a6101967983a1d713d22a1f456f77519998116ef0f0a9e4b44ae4730ecd41eb9c0f7fa53e9f5c94967541daf10693d701af832597f5347461c5990ebc
-EBUILD scrnsaverproto-1.2.2-r1.ebuild 619 BLAKE2B 10acbba094d48f3054254a42272608a055d1d3c46d7e6ec306a7fec051e0d22510f45c0666255570f90debcf7574939cb8997be22ce3d7f3c41dcd3b6cc050ef SHA512 8eb6cbb95abce876a93794f149b658c5ff6b6815eb3c65367bdbac64690713fba4beefec4eaa41d345eac9d1b6058a60c2dde7d9e7338a226541ee5b1694ac3c
-EBUILD scrnsaverproto-1.2.2-r2.ebuild 522 BLAKE2B 894573e455f9cec5a4c7c0196c161db6a61f1539e7a3772bfe16a13f301a5c243012784b8bd7f6131978694af8363e83464775fadb74002891d214e4ab222ce8 SHA512 a474b5adf17f697d22a1f34fffe65c6fc72e9f82610b32c5ec3a9715e52db16045d3f44f3b51b2bfa1ddcb28bd8a88aec4f0d84e0798ff4ab5202a484e965fc7
+EBUILD scrnsaverproto-1.2.2-r2.ebuild 521 BLAKE2B ca5c46871d72838db0aa7ded72d24c326deb274f9b7486cb13c09424d9ba262e9778bcb87e1699fb938fccd331f7abbc98094f09bc6c5494c9b103967c03251d SHA512 6770a2c75caed1bdac6f4817cbfb6df376fd847b141b7c692dd517d1d0c6b0b0d92ba609b4ad637d8f95ebff36a126cbc51ae1d3fa5f8254b46b18abb73f1cdf
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r1.ebuild b/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r1.ebuild
deleted file mode 100644
index 44e90ea0376e..000000000000
--- a/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org ScrnSaver protocol headers"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<x11-libs/libXScrnSaver-1.2"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc specs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-}
diff --git a/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r2.ebuild b/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r2.ebuild
index 9a10cefdbd84..fb2f4fdfa04d 100644
--- a/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r2.ebuild
+++ b/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""