gentoo resync : 28.04.2018

4 files changed, 2 insertions, 55 deletions

diff --git a/x11-proto/fontsproto/Manifest b/x11-proto/fontsproto/Manifest
index 4c2f763b0d1c..95e579ec5d8d 100644
--- a/x11-proto/fontsproto/Manifest
+++ b/x11-proto/fontsproto/Manifest
@@ -1,6 +1,2 @@
-DIST fontsproto-2.1.2.tar.bz2 141990 BLAKE2B 788d9029784b79baf8f5ac3ed76aecd750e67d008fe22dbf4f01df8a5afb55b4d3f2bcff2d03c92c99f3b8ba736d230bdfd3fbecbf8726d344a168fddedb156d SHA512 728d4df6d65b811cc2516cddcd1ba53aadf75521450baaad27ae10448e8eda66c4898369b4cff13874c26b5541cbac231190f7f32f873939aa6d4a72ee720050
-DIST fontsproto-2.1.3.tar.bz2 154087 BLAKE2B 44c64781e856a5c074faa38e9b68870d57162a57b73d681e9ce388b140700d14c57fd62a77cca095f59c9230ec6bc9aecec852d2590333e748ce62194b29420d SHA512 f46d5b733aa48644aa3aa75d4ed47231ef78cb60f747f7200d82331a1ba566190bf37b5b9926c690dec6356043ce7c85a5b59fc1b4b11667ef432518b5d4cc87
-EBUILD fontsproto-2.1.2.ebuild 573 BLAKE2B 3961edb359ae88ba048e0799f8fa0544a10cc4ae9d7511f9a72bd35b004c99f43c859caedd37ce5d383365e420af8b1e672b79b0fcb3bf79605b0590cc570088 SHA512 274d635551c32926928c706b0c16d4339506c5f0569e454e7cd93e1abec9d0b2ddfaec3cdd9ce429e31fc031c280e2f24fa3a0d101f03f3183d2a8a7325499cb
-EBUILD fontsproto-2.1.3-r1.ebuild 540 BLAKE2B 4bf4983e801a6110c1e345eb996eb136dd3859f9b80b8f1723ae1009bce346d053dbc2ec84af85644b0504a0c53b2637c049323e9ed72e0349d15e3a00ae0f07 SHA512 5e2565d994efe69ae97bfa9c025166c394bbb01373eef05f662cbc581604088055d764a33769f3d749952eec268ce6d249ac90e55a3aeeb18c49a9fad5e52e68
-EBUILD fontsproto-2.1.3.ebuild 589 BLAKE2B 759c58d1a32ef08dc8cfd2e45cc907fe294b7d379f4aec0df8a7aa0305643d7bd82e1cf60b2051810a8d279189a9155cfa2802471ac0ac3be4b7219db2a16dd4 SHA512 624d6a596e3e7913505409cd36ed06e78a502f34d39c2bf8d7449fc39f5815223028f5caad7d05e78df2c7515e08ed48eb086c8cf4356b1b09a563a9829e7e2d
+EBUILD fontsproto-2.1.3-r1.ebuild 539 BLAKE2B b6743869746e6a8a82a61551289c71b74080ef1a477ce5308a52dfbac841fa5d9a1715a320da4511f1116cfcdf859adfb9d9c937a582feb3da999d6b30ab66b4 SHA512 6d82a0fe3f9bd88bcd27fd7aa6b6308efa4a8063d8af92bae331e9ca1339a9d2ba5325fb5f33bb216e5af63a3ee2e5e53db2ca22512a4e6f47597bde1dd4c1b8
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/fontsproto/fontsproto-2.1.2.ebuild b/x11-proto/fontsproto/fontsproto-2.1.2.ebuild
deleted file mode 100644
index 3bf074a35744..000000000000
--- a/x11-proto/fontsproto/fontsproto-2.1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-XORG_DOC=doc
-inherit xorg-2
-
-DESCRIPTION="X.Org Fonts protocol headers"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=""
-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/fontsproto/fontsproto-2.1.3-r1.ebuild b/x11-proto/fontsproto/fontsproto-2.1.3-r1.ebuild
index 3bca86cca5b6..39a241368fc4 100644
--- a/x11-proto/fontsproto/fontsproto-2.1.3-r1.ebuild
+++ b/x11-proto/fontsproto/fontsproto-2.1.3-r1.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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/fontsproto/fontsproto-2.1.3.ebuild b/x11-proto/fontsproto/fontsproto-2.1.3.ebuild
deleted file mode 100644
index 9e03d6f36b2d..000000000000
--- a/x11-proto/fontsproto/fontsproto-2.1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-inherit xorg-2
-
-DESCRIPTION="X.Org Fonts protocol headers"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc specs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-	xorg-2_src_configure
-}