gentoo resync : 06.12.2017

3 files changed, 2 insertions, 98 deletions

diff --git a/app-text/docbook-xsl-stylesheets/Manifest b/app-text/docbook-xsl-stylesheets/Manifest
index 7e0c16fd0ed8..f88b2436a060 100644
--- a/app-text/docbook-xsl-stylesheets/Manifest
+++ b/app-text/docbook-xsl-stylesheets/Manifest
@@ -1,5 +1,4 @@
 AUX nonrecursive-string-subst.patch 1205 BLAKE2B 0c7bb8e3ba646a137bc0b50722448c65437881672a4bbb3f3dc7a181e5074f667fca0fbcb4475b83f04ac63bdddbf3dae800b7a7094b5d9aea270faeb81d9e50 SHA512 6a26838078a3ce28273dddfa1af6a378cffc28b6d1ba48a4cfc839addd7bf58ce217d6584b735f9c75381954744ab2386c75fa3c593858b6e27882be55c00d04
 DIST docbook-xsl-1.79.1.tar.bz2 21967928 BLAKE2B 42b7e989616d16fa100c2dad713830ecedf6c7e26f56f99a9bf9330385c753f282cea1033e689196352bd41f9dca59a06ff09fc4638051cb478a630df9bfeb0b SHA512 83325cbaf1545da6b9b8b77f5f0e6fdece26e3c455164b300a1aa3d19e3bd29ae71fd563553a714a5394968d1a65684c6c7987c77524469358d18b8c227025c7
-EBUILD docbook-xsl-stylesheets-1.79.1-r1.ebuild 2122 BLAKE2B b1a124e1349a4a6f0e267be4a57d1ef9a88d3c49570107fa8ec56cea286c242f31b34b3b05b80150fab519ea50d51587a84284ab44fb6ec5dd3b107f413c1311 SHA512 69c1f46596e62747f2011d69def968960f8243393998b5897f83dd4a641931e25dfe496ae502ee5c83714bc887b5c8023b8f208b1b3897d6f472eae134c2b2b3
-EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2204 BLAKE2B 698270179dc6ddfe8ee606832d30ef19a54c96bec803ae204ac593e378b3868b3d7d8591dd93c5e535b8a78ccf035e5e2724d459ccee2b183fa1ce93c80a8744 SHA512 01115efcec06425a1e1fbe0be634c474b757b10ca26e3b6e765a4d362cc1e1b39d5fb4ac2d938f83cd2806f0b7bf7dd2e65063322a972da88dbfe95725de8d1d
+EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2192 BLAKE2B 94f7538707bf5c9a8af189ef1aefcc80e0179769e29f5544afb65558b714aced8fe2b398785c0899a9339441bf69eb18c0f3ebb0ac47c95546e2229607637116 SHA512 2941be8fa4651d201cda5d1ff36f007d267ebf1c34a2227459ca32c38d824c3432b406912bc4c1fc80d755fc3efd19cee2eff5b7e0d121c45093a02942788945
 MISC metadata.xml 413 BLAKE2B c4ba1418a2d7499d953111afac5907a4dd53c183f8a2613218aa0f0f510f1b75d04c6839c5407f20703ebab963d505dc09e081cfb053970147b07001caea6920 SHA512 7c32b5261d0bfe9f552efd08854233b47958d04cab7b932ddb67cfe163319f8f8ea82d1b169203b9e2158d3a436862d7050dcc762d3b525ba806690640ad3892
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r1.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r1.ebuild
deleted file mode 100644
index f31e0f944d4f..000000000000
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-inherit ruby-single
-
-DOCBOOKDIR="/usr/share/sgml/${PN/-//}"
-MY_PN="${PN%-stylesheets}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="XSL Stylesheets for Docbook"
-HOMEPAGE="http://wiki.docbook.org/DocBookXslStylesheets"
-SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ruby"
-
-RDEPEND=">=app-text/build-docbook-catalog-1.1
-	ruby? ( ${RUBY_DEPS} )"
-
-S="${WORKDIR}/${MY_P}"
-
-# Makefile is broken since 1.76.0
-RESTRICT=test
-
-src_prepare() {
-	# Delete the unnecessary Java-related stuff and other tools as they
-	# bloat the stage3 tarballs massively. See bug #575818.
-	rm -rv extensions/ tools/ || die
-	find \( -name build.xml -o -name build.properties \) \
-		 -printf "removed %p\n" -delete || die
-
-	if ! use ruby; then
-	   rm -rv epub/ || die
-	fi
-}
-
-# The makefile runs tests, not builds.
-src_compile() { :; }
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	# The changelog is now zipped, and copied as the RELEASE-NOTES, so we
-	# don't need to install it
-	dodoc AUTHORS BUGS NEWS README RELEASE-NOTES.txt TODO
-
-	insinto ${DOCBOOKDIR}
-	doins VERSION VERSION.xsl
-
-	local i
-	for i in */; do
-		i=${i%/}
-
-		cd "${S}"/${i}
-		for doc in ChangeLog README; do
-			if [ -e "$doc" ]; then
-				mv ${doc} ${doc}.${i}
-				dodoc ${doc}.${i}
-				rm ${doc}.${i}
-			fi
-		done
-
-		doins -r "${S}"/${i}
-	done
-
-	if use ruby; then
-		local cmd="dbtoepub${MY_PN#docbook-xsl}"
-
-		# we can't use a symlink or it'll look for the library in the
-		# wrong path.
-		dodir /usr/bin
-		cat - > "${D}"/usr/bin/${cmd} <<EOF
-#!/usr/bin/env ruby
-
-load "${DOCBOOKDIR}/epub/bin/dbtoepub"
-EOF
-		fperms 0755 /usr/bin/${cmd}
-	fi
-}
-
-pkg_postinst() {
-	build-docbook-catalog
-}
-
-pkg_postrm() {
-	build-docbook-catalog
-}
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
index b1fa7e4e9acb..c58f037e311b 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ruby"
 
 RDEPEND=">=app-text/build-docbook-catalog-1.1