gentoo resync : 03.01.2018

3 files changed, 3 insertions, 51 deletions

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
-}