gentoo resync : 03.01.2018

7 files changed, 6 insertions, 139 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index dc8223583dbc..680a5a4cde2a 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/sgml-common/Manifest b/app-text/sgml-common/Manifest
index 7c61c5cb42f2..df6acffb8dbf 100644
--- a/app-text/sgml-common/Manifest
+++ b/app-text/sgml-common/Manifest
@@ -1,6 +1,5 @@
 AUX sgml-common-0.6.3-install-catalog.in 5064 BLAKE2B 2400dd32a80a64c89ded54d898a2331b649a35269bd3389e6c71c9f161b5b02b857230a6c7f4807cb975ff4c7d6a99a5576d2bb79190e5914c9faf9488e1d11a SHA512 85fbcdd7aceb28256e08ca1a5b6472247d81499e604d6a45edabf662bc32b72a22326db907e2a408b1a6da02deccd89606749e3fc8e42594ad6402ab29d501b9
 AUX sgml-common-0.6.3-prefix.patch 664 BLAKE2B 5b82b66824547c0cbae10f12c94eaccaa0789c1ff68a20c3ace00cc1620dc0e2d7c81cf906db8fac82104b9d1c5ea29af42746b200f1c1a5a9e9728052f5859c SHA512 62758c7ccb4e86e91292757546e6a1f932cf8282abfc2d9ccfe2e68008bbcc995d0a4eeac3f0c8584c4dfae552a42000b438defe38dc911b770a9e8e72b310ef
 DIST sgml-common-0.6.3-gentoo.tar.gz 128903 BLAKE2B 3b374179fe85cf6f098649d2014f9d34349ddccd17ae0ac4c5502414507601c545eaf27f7c76fafd63c36041068205d3b82309a204989f3b106c04c7adf14875 SHA512 c8de573d707ccf524407c9be9a6e7740341eb88ecb6bee69d6d11a2658ef74e6acfb7495afa33c9983ab015c3c925aac98278a4e01ee217892a9fb99e60798ce
-EBUILD sgml-common-0.6.3-r5.ebuild 2477 BLAKE2B 3e47604d7ce2b484b275d91660761767ba35308981cd9bbdb5c9ab3cd7daa07a5ade3610d1b46d170ca2d650290bff622debd01ab02e3360096f096893448913 SHA512 0ea375e2fd3a481f59656f488aa9e5702d6755019a909cbe7f091e836cb9d99f3f19fda10e9ec03bc66033b234891aca1b71a81ddb15b74cd271da816358ee78
-EBUILD sgml-common-0.6.3-r6.ebuild 2505 BLAKE2B 2eef658940467bdba05148f74b48e804401fa2e17780048c12a6bc8dfba303bd910feb27fa203c351fa1a0c0ac25fe77e1572d48ea9e2a743c0930f08c239846 SHA512 f48aadbd88101c24d40ed78ff9abb7fe65df52101f5aaaec966d8be36c2aacfc8c6e8749718d4de41c0ecf64d52a2f8296f834b70f9e0d2bb63310928b604058
+EBUILD sgml-common-0.6.3-r6.ebuild 2492 BLAKE2B c01eaea91a3c14375fb9b4a9c13baebdb789e887d88bdc2f13da45c2e45aa7bb2d5a112974ae9670e5704822f6e5f3b47843948cdcf73cdfb7e66899acebac82 SHA512 4f27888405ea7dee650c81743efe2aff75c124c8339ea09b0a3ba72b5c9710bfb8cc0435261c2f1c576787b9093a103a08e6a0c0f60ce50ba2e83b8f1ceb3072
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild
deleted file mode 100644
index adb5d0c161d5..000000000000
--- a/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils prefix
-
-DESCRIPTION="Base ISO character entities and utilities for SGML"
-HOMEPAGE="http://www.iso.ch/cate/3524030.html"
-#SRC_URI="mirror://kde/devel/docbook/SOURCES/${P}.tgz"
-SRC_URI="https://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz"
-
-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 ~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=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	# We use a hacked version of install-catalog that supports the ROOT
-	# variable, puts quotes around the CATALOG files, and can be prefixed.
-	cp "${FILESDIR}/${P}-install-catalog.in" "${S}/bin/install-catalog.in"
-
-	epatch "${FILESDIR}"/${P}-prefix.patch
-	eprefixify bin/install-catalog.in bin/sgmlwhich config/sgml.conf
-}
-
-src_configure() {
-	econf --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
-
-pkg_postinst() {
-	local installer="${EROOT}usr/bin/install-catalog"
-	if [[ ! -x ${installer} ]]; then
-		eerror "install-catalog not found! Something went wrong!"
-		die "install-catalog not found! Something went wrong!"
-	fi
-
-	einfo "Installing Catalogs..."
-	"$installer" --add \
-		"${EPREFIX}"/etc/sgml/sgml-ent.cat \
-		"${EPREFIX}"/usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-	"$installer" --add \
-		"${EPREFIX}"/etc/sgml/sgml-docbook.cat \
-		"${EPREFIX}"/etc/sgml/sgml-ent.cat
-
-	local file
-	for file in `find "${EROOT}etc/sgml/" -name "*.cat"` "${EROOT}etc/sgml/catalog"
-	do
-		einfo "Fixing ${file}"
-		awk '/"$/ { print $1 " " $2 }
-			! /"$/ { print $1 " \"" $2 "\"" }' ${file} > ${file}.new
-		mv ${file}.new ${file}
-	done
-}
-
-pkg_prerm() {
-	cp "${EROOT}usr/bin/install-catalog" "${T}"
-}
-
-pkg_postrm() {
-	if [ ! -x  "${T}/install-catalog" ]; then
-		return
-	fi
-
-	einfo "Removing Catalogs..."
-	if [ -e "${EROOT}etc/sgml/sgml-ent.cat" ]; then
-		"${T}"/install-catalog --remove \
-			"${EPREFIX}"/etc/sgml/sgml-ent.cat \
-			"${EPREFIX}"/usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-	fi
-
-	if [ -e "${EROOT}etc/sgml/sgml-docbook.cat" ]; then
-		"${T}"/install-catalog --remove \
-			"${EPREFIX}"/etc/sgml/sgml-docbook.cat \
-			"${EPREFIX}"/etc/sgml/sgml-ent.cat
-	fi
-}
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild
index 15b981208087..3b696030d5bf 100644
--- a/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild
+++ b/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz"
 
 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 ~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=""
 
 DEPEND=""
diff --git a/app-text/xindy/Manifest b/app-text/xindy/Manifest
index 432ad10bdfcb..d4cedd8697d3 100644
--- a/app-text/xindy/Manifest
+++ b/app-text/xindy/Manifest
@@ -3,6 +3,5 @@ AUX xindy-2.4-locale.patch 679 BLAKE2B b67f436e0aa67b8474336bfa1f70f6da52199871b
 AUX xindy-2.4-nogrep.patch 431 BLAKE2B 97543e7eeff2cb4c23c8b9cc0d5673fca2c3f682553a8a3d25bc39253a371320a2a423fef63294be32f5c36b5bac30717766b3a9a4c75663535ce0a6bd8e13bc SHA512 fdcc109b89a6e56c86624f348ebe1c98f574b9f788e3f307e3b110fc2b93643af087e16711b3f0bc6604dbdcfae06080693e4976d8ebec5816e68fb73f89fa6c
 AUX xindy-2.4-perl5.26.patch 337 BLAKE2B c869adcd80cc93bbfe46a385effab94a920f3fb76441c653ea269962071ad5f9269961caebd13d6fce38f3f4dea485291b510db6e884aefc5edbd22cf4b9bd4a SHA512 3f3abc9654e3c7c9de12a542241e107d80046bc26d0eed336e046835a221ea190d526b37c85f91b722e6cac89f140e38b0cebaf208a2391d8d7a42a2ca4b8459
 DIST xindy-2.4.tar.gz 498024 BLAKE2B 67cc7f96e4937e8130c66449226d581f121e7b06a82bde40f3f880e48e48e49805856e39c7670a34080731168ee7386beffe52fa6c3e8142a3d66f4c7ebb8ce3 SHA512 d718954c0c9efcf36dcc99518542b45b3fbbb922b98989c56feb542b00944003adb5834656add0aa88b1983f98e1d9d76e5355aaf9e6ad39f3e0dd109a18ade4
-EBUILD xindy-2.4-r1.ebuild 1007 BLAKE2B 2d71e8c9b779df33973629c81948078400ca26c887e5810b259928188c6bdbe63cb6ba4946dc558c87f2892bc7d61cbb11da4db9d51c520ddab34dfdffbecfbf SHA512 2b633d8821a4a08e80f67c59fd8011239a959b8abbbd8352720ac1118038db28c3de70ad1e096d820e52eb431c053e4d06ff32754f75820614d208f563059078
-EBUILD xindy-2.4.ebuild 1075 BLAKE2B d1b4d3612d63e591b2221ff703ed40dcd57335ad15dfe85f1b4976b1b0f914d5bc033252f030813a702310f4c1f5671a142a5ff96f17f8a8ec324df555e2ff7f SHA512 7194f8db2fe566b8e4dc6d5d373c1e981bdef1eff12d8de5889690117d3900212f4f97e836030a039566787881040158af587fd47e5419a2b69c6273f03095eb
+EBUILD xindy-2.4-r1.ebuild 1002 BLAKE2B e2b1887ee564815620afe80d0dd7f808a6fce163e1c8f7455df693c0be9db93795d42f09814a620317965965bec7338fee1a76fd00a4e328d2d57f326317b078 SHA512 b7976ed3df8bde1f81e4a7af174ca6a7022759886c00a9fdaba36f2ebe03c0d1f234ed17438810169e06e4fc7b60a7be7018b11bb513f72b518c0ccece1d72f8
 MISC metadata.xml 1118 BLAKE2B 1bb41c8208737b0ad0d3545143cedd0b70aa2cdf632905f1572ca2c2aaa2eb35e712eb5971b4e4bd8a66a3130ebc1f21c8d6ad194056fe5a1c15c522e1d57219 SHA512 ef09dceddfc91214cf575c58f9ffa8f82ec10bfa7274caec809a00c83b9a07668139eca7e420e04c5fe38bbca9084bfcb6fafd10bc91092138726dfa1dc4cced
diff --git a/app-text/xindy/xindy-2.4-r1.ebuild b/app-text/xindy/xindy-2.4-r1.ebuild
index 890b05bc030c..a418beffd96f 100644
--- a/app-text/xindy/xindy-2.4-r1.ebuild
+++ b/app-text/xindy/xindy-2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="http://www.xindy.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
+KEYWORDS="alpha amd64 ia64 ppc x86"
 IUSE="doc"
 
 RDEPEND="virtual/latex-base
diff --git a/app-text/xindy/xindy-2.4.ebuild b/app-text/xindy/xindy-2.4.ebuild
deleted file mode 100644
index 0352e0f329aa..000000000000
--- a/app-text/xindy/xindy-2.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit eutils autotools
-
-DESCRIPTION="A Flexible Indexing System"
-HOMEPAGE="http://www.xindy.org/ https://github.com/jschrod/xindy.ctan"
-SRC_URI="http://www.xindy.org/${P}.tar.gz"
-
-# The latest development is now on the TeXlive SVN. 
-# The author jschrod backports it from time to time to his github repo.
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc x86"
-IUSE="doc"
-
-RDEPEND="virtual/latex-base
-	dev-texlive/texlive-fontsrecommended
-	>=dev-lisp/clisp-2.44.1-r1
-	dev-texlive/texlive-langcyrillic"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/flex"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-configure.patch
-	epatch "${FILESDIR}"/${P}-locale.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable doc docs)
-}
-
-src_compile() {
-	VARTEXFONTS="${T}/fonts" emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog.Gour NEWS README
-}