Revert "gentoo resync : 13.09.2019"

This reverts commit a1392efe64137262023d92492396ca9156d22396.

3 files changed, 2 insertions, 99 deletions

diff --git a/app-text/docbook-dsssl-stylesheets/Manifest b/app-text/docbook-dsssl-stylesheets/Manifest
index 0d4f1bd8fdbc..ca966e4da5d3 100644
--- a/app-text/docbook-dsssl-stylesheets/Manifest
+++ b/app-text/docbook-dsssl-stylesheets/Manifest
@@ -1,4 +1,3 @@
 DIST docbook-dsssl-1.79.tar.bz2 277650 BLAKE2B 6a12f46965ee705096f679b672610395b24f151e3bf3cb05f7d920c052b7a3fdafb4f5ee4526dbf765bbab6b7d4ca9f021277c6f35926f47edc61d0f835afdbb SHA512 fad71e67227b54b0a7c31a351b4d5c0695517b3687714807d7b144d239dc6f7e0d556520e705eb75581c82e0deea4b32ccfde1eccad2718337b757eddd64843e
 EBUILD docbook-dsssl-stylesheets-1.79-r3.ebuild 1551 BLAKE2B d1f490d4cbee15aab1a5902bf143b791c7cff874a1b5726ade3bb84c3431491a15b84e165f547cf456c3fba1104009fd0c4f32dfcfe555d023d2241a8bb3bdee SHA512 222a78a676a75071ad75d58c7c78904ff8fe0345e6a2f0c0088482926b60089fba5ab4a5937fbf22d658b8bdcdc91a7a1b790e2a08dc0f33bad661495fe42837
-EBUILD docbook-dsssl-stylesheets-1.79-r4.ebuild 2454 BLAKE2B b808b29e1b654329853dfbfdf293e5ae3fd4ec116a650ba98ce2399289d54d4ba6eec92a314a4e4359369b30f237111665c66f85ccc3ab40e589f4c4e6b82822 SHA512 c773f6f1ed2f86a85f519111f6cb192238a1ea228381f3dd31c9ec7b05d351e394d0785c21550b62afd821b588606ca896f03de157248014654c61669a60c751
-MISC metadata.xml 377 BLAKE2B 035eb23363be52cbeb11b0ca2fbcedbb608dad9d4b26dbd2155a538db51cafe7296614f5005c0460ec4ce02a35378d98f2c7834fe2f098d7b05ef835bdbf520b SHA512 c965e64e4582a7452d8cf7eb46b794788cc8ccd9d93a48ab14e7ef606979cee706f682545bfebc2c5e380e9e18db0b671ce0f9ad935a0812472fc1586c989c28
+MISC metadata.xml 297 BLAKE2B 33f8b636a483011e6561d078c58c16a477925ea41543b150c11ea7ecb3465151a5404689d8cf263a6e9f6ede4d2d5a55fc8fd02fa89814c7b7b0e93e7c6077aa SHA512 e5cc7a9b4aea0e6cd29246bb44f1bd2713495d58b243bc78bceb760c827c415ec30459f5b9acf2ddab615e39d9ab5c4a9d4eb41e7bd53684032a08f7a4fbce3e
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
deleted file mode 100644
index 8603dfc7f360..000000000000
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit sgml-catalog-r1
-
-MY_P=${P/-stylesheets/}
-DESCRIPTION="DSSSL Stylesheets for DocBook"
-HOMEPAGE="https://github.com/docbook/wiki/wiki"
-SRC_URI="https://downloads.sourceforge.net/project/docbook/docbook-dsssl/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE=""
-
-RDEPEND="
-	app-text/docbook-sgml-dtd:3.0
-"
-
-DOCS=( BUGS ChangeLog README RELEASE-NOTES.txt WhatsNew )
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	local d catdir=/usr/share/sgml/docbook/dsssl-stylesheets-${PV}
-
-	dobin bin/collateindex.pl
-
-	insinto "${catdir}"
-	doins catalog VERSION
-
-	insinto "${catdir}"/common
-	doins common/*.{dsl,ent}
-
-	insinto "${catdir}"/images
-	doins images/*.gif
-
-	for d in html lib olink print; do
-		insinto "${catdir}/${d}"
-		doins "${d}"/*.dsl
-	done
-
-	for d in dbdsssl html imagelib olink; do
-		insinto "${catdir}/dtds/${d}"
-		doins "dtds/${d}"/*.dtd
-	done
-
-	insinto "${catdir}/dtds/html"
-	doins dtds/html/*.{dcl,gml}
-
-	insinto /etc/sgml
-	newins - dsssl-docbook-stylesheets.cat <<-EOF
-		CATALOG "${EPREFIX}/usr/share/sgml/docbook/dsssl-stylesheets-${PV}/catalog"
-	EOF
-
-	dodoc "${DOCS[@]}"
-}
-
-pkg_preinst() {
-	# work-around old revision removing it
-	cp "${ED}"/etc/sgml/dsssl-docbook-stylesheets.cat "${T}" || die
-}
-
-pkg_postinst() {
-	if [[ ! -f ${EROOT}/etc/sgml/dsssl-docbook-stylesheets.cat ]]; then
-		cp "${T}"/dsssl-docbook-stylesheets.cat "${EROOT}"/etc/sgml/ || die
-	fi
-	# this one's shared with openjade, so we need to do it in postinst
-	if ! grep -q -s dsssl-docbook-stylesheets.cat \
-			"${EROOT}"/etc/sgml/sgml-docbook.cat; then
-		ebegin "Adding dsssl-docbook-stylesheets.cat to /etc/sgml/sgml-docbook.cat"
-		cat >> "${EROOT}"/etc/sgml/sgml-docbook.cat <<-EOF
-			CATALOG "${EPREFIX}/etc/sgml/dsssl-docbook-stylesheets.cat"
-		EOF
-		eend
-	fi
-	sgml-catalog-r1_pkg_postinst
-}
-
-pkg_postrm() {
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		ebegin "Removing dsssl-docbook-stylesheets.cat from /etc/sgml/sgml-docbook.cat"
-		sed -i -e '/dsssl-docbook-stylesheets/d' \
-			"${EROOT}"/etc/sgml/sgml-docbook.cat
-		eend
-		if [[ ! -s ${EROOT}/etc/sgml/sgml-docbook.cat ]]; then
-			rm -f "${EROOT}"/etc/sgml/sgml-docbook.cat
-		fi
-	fi
-	sgml-catalog-r1_pkg_postrm
-}
diff --git a/app-text/docbook-dsssl-stylesheets/metadata.xml b/app-text/docbook-dsssl-stylesheets/metadata.xml
index 9842e9a0785d..df1f6e962108 100644
--- a/app-text/docbook-dsssl-stylesheets/metadata.xml
+++ b/app-text/docbook-dsssl-stylesheets/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">docbook/dsssl</remote-id>
 		<remote-id type="sourceforge">docbook</remote-id>