gentoo resync : 22.05.2018

4 files changed, 2 insertions, 67 deletions

diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index 157cfc0330b5..d800bbc8021d 100644
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@@ -1,7 +1,3 @@
-DIST build-docbook-catalog-1.19.1.tar.xz 4552 BLAKE2B ac15bf349be35d1a5c7f4b58e5c295d3b4e7adffa000ce845060990f7c2603549f0ae696143bd4924e81f210131be3e82fb4c80190ac366303da15941f320fb3 SHA512 9c4b1a30d8b2f820046cf987296035a1418fa55f47c2adc6702cdaa3a01efc8584bdc6804889cf13a85bb1f30b129af5c62ecf8a7376d56d0738f717619ddcc3
-DIST build-docbook-catalog-1.20.tar.xz 4620 BLAKE2B d927e451e5cdc3635ec85f3d283bcd3bf1ec3a65f53b7eb21e22cc3d27bbb04a34e5ab43ba7786e76f7ca08c6a63b41ac5b1f2b6da0c9bbdb10855a8e66ac53a SHA512 65656c78709a8da01cfedc786a31da2de125eeb65bdaa3d2e49ed3a0a7ff4429280d5d384f23dca0ab540b74f7c9b2ed4b80e970905a7d2838a841c81925b3f6
 DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc
-EBUILD build-docbook-catalog-1.19.1.ebuild 761 BLAKE2B 56ddbfc1f8cdd9d6531452671b1bc92b3a81eb9ab4af31980af6a82207b23c260c09ea26f4f2f9d535e78159f7868838b10d69b96207ff067e55582d0ab659b5 SHA512 32814eae6c8dd46b00d1567922631e38d000930bbd4b7aecd7c97c9d404439938e70f27dfbfbfbf0d138d119026b9eb239ce0877f24f37fbc179beca71cd718b
-EBUILD build-docbook-catalog-1.20.ebuild 1140 BLAKE2B b7c3f81d3a899d34ff27dad7e726f288fdbe781e8d359918abf726eafdcfc67f9565df9a7f0ef92c7a226036c42069f5c6c1cf56de6a571770759968f7c97626 SHA512 0330a064028c41aa8d2386118e7eb27a7a0c5e24f76cb3f619bd704244a058315692a7452694f8f3d4dc942f1be86bc65e3901654b7a7073d4b9116d081cd5a0
-EBUILD build-docbook-catalog-1.21.ebuild 1094 BLAKE2B f373349d788a83417374c2c461b9c04ed57f0054e907ef7afe66663cfe6f3746255ee6578ba8db4db1f22e267e960d0859f61e7463010cfde615c467a2f2cfc3 SHA512 ec083b7344a4557a202ea322ac18c8861268bc065404ede142f35228265d85f15b3fc004cfc6a0481bab48b3b9f69b9267630473ebd72a306d03bcca97d20df4
+EBUILD build-docbook-catalog-1.21.ebuild 1090 BLAKE2B 353dde30a03468cae9cda862842a51a2a6033f49af44ae071676a218cf95ed3f9fdd805c782ee39225c858ea989d91b2de939ae95a6bf2986ee27a6635e2a22e SHA512 a0e597a8b6cb90257d2820ffa21c42df559fb40270d82be3c1f7b0653692c5cebb9a54bdebd47ddc8e7aa8c2b743812a53f9f8a3d837166e0561af76c13783ed
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.19.1.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.19.1.ebuild
deleted file mode 100644
index 2708edbc650b..000000000000
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.19.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="DocBook XML catalog auto-updater"
-HOMEPAGE="https://sources.gentoo.org/gentoo-src/build-docbook-catalog/"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~floppym/distfiles/${P}.tar.xz
-	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="userland_BSD"
-
-RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
-	!<app-text/docbook-xsl-stylesheets-1.73.1
-	userland_BSD? ( sys-apps/flock )
-	dev-libs/libxml2"
-DEPEND=""
-
-pkg_postinst() {
-	# New version -> regen files
-	build-docbook-catalog
-}
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.20.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.20.ebuild
deleted file mode 100644
index 8b81fcfc967a..000000000000
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.20.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="DocBook XML catalog auto-updater"
-HOMEPAGE="https://sources.gentoo.org/gentoo-src/build-docbook-catalog/"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~floppym/distfiles/${P}.tar.xz
-	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
-	!<app-text/docbook-xsl-stylesheets-1.73.1
-	dev-libs/libxml2"
-DEPEND=""
-
-pkg_setup() {
-	# export for bug #490754
-	export MAKEOPTS+=" EPREFIX=${EPREFIX}"
-}
-
-src_prepare() {
-	sed -i -e "/^EPREFIX=/s:=.*:='${EPREFIX}':" build-docbook-catalog || die
-	has_version sys-apps/util-linux || sed -i -e '/^GETOPT=/s/getopt/&-long/' build-docbook-catalog || die
-}
-
-pkg_postinst() {
-	# New version -> regen files
-	build-docbook-catalog
-}
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
index 97c8ea14cf59..68f0e171cef7 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )