gentoo resync : 10.11.2019

7 files changed, 7 insertions, 139 deletions

diff --git a/app-text/docbook-xml-simple-dtd/Manifest b/app-text/docbook-xml-simple-dtd/Manifest
index 9f9be36debab..7a1ea5347639 100644
--- a/app-text/docbook-xml-simple-dtd/Manifest
+++ b/app-text/docbook-xml-simple-dtd/Manifest
@@ -4,10 +4,7 @@ AUX docbook-xml-simple-dtd-4.1.2.5.catalog 1728 BLAKE2B a5ba21fb9f622b7427adf142
 DIST docbook-simple-1.0.zip 31173 BLAKE2B b19054783553be68eaa2a689cb673bb4a270f546e7c45416b3176cf413bd3be46b1b7321ff9360018c93d7f2eb2db904c9d194dcb3b4de6eff4ea33dcbd228f1 SHA512 5be8a2fb48b95912412eb250d2dad6126c78f81155b7eb115d175d32831430ede285d5f4bbebd0d8a50a1a3159fe1b7d133adf84ff8447111ca88a441b415643
 DIST sdb4124.zip 35199 BLAKE2B bee2de887a662978b6f0bf8b9ae663d37c4da1859f07a09e869cff91943bd65946dfd493b9bbe9244ffb8794f3cc5c828c647ab00b183326b63e179540765664 SHA512 b5c158cfcaaa4150d5ee719d11f3fc2b5a207cace241a147b39ab4a9f721cae2a894a88cd3dd944ecd24feae850b387faa03c669747b02de839f5d6a3ff0821f
 DIST simple4125.zip 29839 BLAKE2B 83f2b65e5192334bf6a9b5b5388a77d8b566a924837d041329d16f0ab864d5e69b7ea0a60b70fec4affcf0161fb724c5ed99fe16dd230dc0984100e40642709c SHA512 21c8d411f5b37c82442283dadbde99352778efe90fcf7eab7cc6a74fe9b702f14ffa5bd39e058d8f29fada7dbcdb197d5c880c29b207e3509ba856c5d19cfef1
-EBUILD docbook-xml-simple-dtd-1.0-r2.ebuild 991 BLAKE2B ec8220e283eda21a08bde22fd990526a5dd7f756b874a554c44b236bd5169902753d0e286bf0a2dea1e2c476d3fab6f9f951b39a389e890ab822857f7e005efc SHA512 7e3da43114a8554d887921b5e5f0888446524c4c105de57cebaca1c6ae27e6589730330e796e0a41384bef85c3d16f22e7ad6ed5d68508b38acb50f8fe88a2d8
-EBUILD docbook-xml-simple-dtd-1.0-r3.ebuild 1326 BLAKE2B b3e9a38a1bb74b1fc6f53865511aa8664372cc8eeff4956c1ad7f6704d6484b0566191058a4b8547c2b53166ae2aef7354178e5bbca2ef98846b23a59b2711ec SHA512 430a3fc636209eef191bb68182ba3790076dcaab3fefaaf5a09c4dc5b3a84ffd12465b9e6c8e291ea06455045d5721959991558200efab03237488bd9773c9fc
-EBUILD docbook-xml-simple-dtd-4.1.2.4-r3.ebuild 1047 BLAKE2B 222732b5fdf3bd8909b55521da64d945b0dbce6ff2e7f0adce99c0fd1b0ab276a5f654387104474307ef9275738c1aee48f696da0cce2cf3b386d847e0e1bd1b SHA512 d903e1e18c25c7754b28a534a9c5b251ea9db22b16eb813d63e9eff740b49d34f0ae490a7f142f0a395cd1a40b39ed5f7af69ee8575196e75af99df3660a39c6
-EBUILD docbook-xml-simple-dtd-4.1.2.4-r4.ebuild 1356 BLAKE2B 1e3924e51bdce18b7dbb77f1e95759ef1554a064d6db92a3989b0d6b5e72e083ef790ad99b3a05f4706cf6522d6771961b73d417fabfc5682471469b22683aee SHA512 afead15a67e7f33974fa86ec2f922ddd6a2593bc37decaf55513a3838363819cf66d1996f5656fcaf65cf83f0395e3d46743a74b5e4984b0ea013c2dc91f3496
-EBUILD docbook-xml-simple-dtd-4.1.2.5-r2.ebuild 983 BLAKE2B 39691ba0d295337040f90fdfdd4b25b71e8704ab5e0535214e177c6bbd7194f197a181ee29d97967d2fcf9854a6ef7411ec509870fa596952200cd6006684a98 SHA512 f03d3b47009356acac7631342c480a2789066cdd42653f60845d34882038c96797e427106d3f3ca467e5af95643f5c4972da36291ea1dafca7e061b85a2fd429
-EBUILD docbook-xml-simple-dtd-4.1.2.5-r3.ebuild 1343 BLAKE2B 8bdc8b34e5253b346475bc6784538609aea908217f466739017df1389f0859b7ee772cdf1c0060b7df5b2ebdbecca799ed848e72bce962aea3d99adae1408b0e SHA512 82313d3aa2e17c88466c32464318c26bef9bb88b58ca147906a188d34b017a36c3e04b703f5ad851c175f9665ba54de1a4cdc0f24683eb6dbd710ab3021b428b
+EBUILD docbook-xml-simple-dtd-1.0-r3.ebuild 1323 BLAKE2B 3008cab742172dc1e3baff033502f9bf6ed3ee391b3a845d823ca7c282c1ae4e7f2cdeeae018d0d99d136f64c435a038a2f2f1231da9a8a24add0557dee1cde4 SHA512 432c865a5fe5ae45cc745efbcee0cb9c29a0d9908b7b7b8a1d593b5ad50db5ffe32e0a83ae8448f70806276fb6033fa874a963c0f5bd3b64b3043bde3f6d2dfe
+EBUILD docbook-xml-simple-dtd-4.1.2.4-r4.ebuild 1353 BLAKE2B 9a338c67e9814e0e123dcf38e8dd311ac5607c56e17156e014bcc0700adce84c9d07dd3afe86a893d040221cf610f85ba49785db0aae35f52094ae4aea1873d3 SHA512 ade069cf5e2701d1242bc6f1b49b0feb27c263de41a3e5741ed4ec4122353751cb746cb4ed1aee320ec07e7af281bb51ff906f55320385fd0d19ca52ceb0e38f
+EBUILD docbook-xml-simple-dtd-4.1.2.5-r3.ebuild 1341 BLAKE2B feae5cbe3f3c1a2811d6b33f73816d06c1540e6978f8f7736643e8f52a7dfa9b1f090e7db07aed82e2f51be076b394a7da2b45b6ec1ea27f41e79e5989024e37 SHA512 fe978e28186aab7b8ec18262cd6b1815866c12d6a8748e14d44bc5751f54931c86c59b0f618d342c65f49865841291f39188eac92fe8de38c0d540c07c00f12e
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild
deleted file mode 100644
index ec43ec743d07..000000000000
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit sgml-catalog
-
-MY_PN="docbook-simple"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Simplified Docbook DTD for XML"
-HOMEPAGE="http://www.oasis-open.org/docbook/"
-SRC_URI="http://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
-
-LICENSE="docbook"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND=">=app-text/build-docbook-catalog-1.6"
-DEPEND=">=app-arch/unzip-5.41"
-
-S=${WORKDIR}
-
-sgml-catalog_cat_include "/etc/sgml/xml-simple-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/${P#docbook-}/catalog"
-
-src_install() {
-	insinto /usr/share/sgml/docbook/${P#docbook-}
-	doins *.dtd *.mod *.css
-
-	newins "${FILESDIR}"/${P}.cat catalog
-}
-
-pkg_postinst() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postrm
-}
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
index e51cdbd75e99..404b48682f1a 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
deleted file mode 100644
index dd68fe5fec25..000000000000
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit sgml-catalog
-
-MY_P="sdb4124"
-DESCRIPTION="Docbook DTD for XML"
-HOMEPAGE="http://www.oasis-open.org/docbook/"
-SRC_URI="mirror://gentoo/${MY_P}.zip"
-
-LICENSE="docbook"
-SLOT="4.1.2.4"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND=">=app-text/build-docbook-catalog-1.6"
-DEPEND=">=app-arch/unzip-5.41"
-
-sgml-catalog_cat_include "/etc/sgml/xml-simple-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/${P#docbook-}/catalog"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/sgml/docbook/${P#docbook-}
-	doins *.dtd *.mod *.css
-
-	newins "${FILESDIR}"/${P}.catalog catalog
-
-	insinto /usr/share/sgml/docbook/${P#docbook-}/ent
-	doins ent/*.ent
-
-	dodoc README ChangeLog LostLog COPYRIGHT
-}
-
-pkg_postinst() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postrm
-}
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
index 16021b838e23..4e87683f310f 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r2.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r2.ebuild
deleted file mode 100644
index 608fba36798f..000000000000
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit sgml-catalog
-
-DESCRIPTION="Simplified Docbook DTD for XML"
-HOMEPAGE="http://www.oasis-open.org/docbook/xml/simple/4.1.2.5/"
-SRC_URI="http://www.nwalsh.com/docbook/simple/${PV}/simple4125.zip"
-
-LICENSE="docbook"
-SLOT="4.1.2.5"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND=">=app-text/build-docbook-catalog-1.6"
-DEPEND=">=app-arch/unzip-5.41"
-
-S=${WORKDIR}
-
-sgml-catalog_cat_include "/etc/sgml/xml-simple-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/${P#docbook-}/catalog"
-
-src_install() {
-	insinto /usr/share/sgml/docbook/${P#docbook-}
-	doins *.dtd *.mod *.css
-
-	newins "${FILESDIR}"/${P}.catalog catalog
-}
-
-pkg_postinst() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postrm
-}
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
index 8206fbebb25e..dbb2560ee386 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
@@ -6,12 +6,12 @@ inherit sgml-catalog-r1
 
 MY_P=simple${PV//./}
 DESCRIPTION="Simplified Docbook DTD for XML"
-HOMEPAGE="http://www.oasis-open.org/docbook/xml/simple/4.1.2.5/"
+HOMEPAGE="https://www.oasis-open.org/docbook/xml/simple/4.1.2.5/"
 SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"