gentoo resync : 29.05.2018

4 files changed, 5 insertions, 55 deletions

diff --git a/app-text/bibclean/Manifest b/app-text/bibclean/Manifest
index 4dce7ea8d991..a3c67e74a889 100644
--- a/app-text/bibclean/Manifest
+++ b/app-text/bibclean/Manifest
@@ -1,6 +1,3 @@
-AUX bibclean-2.11.4-ldflags.patch 545 BLAKE2B f90df2a07207fa37e08caad1f6464e5cff8a0495f07d5f74188c18b811a3ea56a0c2878d0e08faf290001d7d8b8552783600529760f9b787ecfce99a87f727bd SHA512 29640b1fd56da829c58d9643964bd5d556bc45c82d16370e7bb4cc24a5772bd76c8f8c8e817fbfb52b61846d4184f258c44cbac3011f897c4796648900374669
-DIST bibclean-2.11.4.tar.bz2 1244790 BLAKE2B d899753aa5c792f8713966e2d50f0658a0d3de8ba05cf4d490af30e9832dbe5d41e142dbc647ab046851822653e42bfdb7e64d23723ab81f2e285d345c708864 SHA512 e04f785ca017148600984a852e3093b86eb3ca1c67f41427556d2b08e57e11f05502db5a5beb868a33780a12ee06dc7f5eb9cf794c8f7346cfce582e4761ce14
 DIST bibclean-2.17.tar.bz2 2253830 BLAKE2B 4d707f8d07f04c45c44fbea2b12bfffc7636cef2a847d90e62f339cb8fdadbb416cd89c2ba1cb04b0fc9c736dd7ca8480a2cbd4dab9c27b1f6804ddd18fc5419 SHA512 5f0d6b315ecc98c47f48c1e5fe7bcbd374cf97dec5cc97ce4438300a7419e6b2f1efae313efdf9d21211e9cd658c1f4bac10aa3b0d55dfa8a5783d982b1dde0f
-EBUILD bibclean-2.11.4.ebuild 726 BLAKE2B b1923402370077c8e0a25c599d2db7c74f6f20d61357ee5490e90080a818bced84a59d767fbc405db26c2f2910a034ba2d3ff5255bd54a64d1aa373a999f17a3 SHA512 f509c9189b625b3f08e14e4633774899949af5583665cc4d9217a42b5ac62228e1be2fb0c2b4d6eac87e2547455b10e83f9da803168cc0fb9447abb50cb029b8
-EBUILD bibclean-2.17.ebuild 600 BLAKE2B 61d88453e0d7b421ce37c6b07c13625749fa7b6229416e3418b2139da9ad90252f38c12c47f44549faed068c0f65dd671918527c457d923618ec17aa70051f3d SHA512 165fc67decc61eab8ea889c9652933ed741f7ddec7cb0a7a6c166a51878d229143d3b77e950667da55a68f937ae4f68cbbd729528372b2732cddb7e88e85db68
+EBUILD bibclean-2.17.ebuild 593 BLAKE2B 01d318e8467d69d1d1cce3da545808b10e3c2717a61f4261526145e908b9e2e63200e0bc0af2061501ddfbf4c78c3b6f368cd018f1334420477b894c4827adc7 SHA512 d18ba47f1afefcae8711f1d450a26cbadef08c45a57f4ff971d10d15cd12afa342ccc17c0eda7fa3f3ff32a821ca7f83b61fd101494083857df72a2d18241ba6
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/bibclean/bibclean-2.11.4.ebuild b/app-text/bibclean/bibclean-2.11.4.ebuild
deleted file mode 100644
index d71a0f6dc5ca..000000000000
--- a/app-text/bibclean/bibclean-2.11.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="BibTeX bibliography prettyprinter and syntax checker"
-SRC_URI="http://www.math.utah.edu/pub/bibclean/${P}.tar.bz2"
-HOMEPAGE="http://www.math.utah.edu/pub/bibclean/"
-
-# http://packages.debian.org/changelogs/pool/main/b/bibclean/bibclean_2.11.4-5/bibclean.copyright
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-SLOT="0"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-ldflags.patch"
-}
-
-src_compile() {
-	tc-export CC CXX
-	econf
-	emake LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	dobin bibclean
-	newman bibclean.man bibclean.1
-}
diff --git a/app-text/bibclean/bibclean-2.17.ebuild b/app-text/bibclean/bibclean-2.17.ebuild
index 5e81ffbd2ceb..fc8d456dd364 100644
--- a/app-text/bibclean/bibclean-2.17.ebuild
+++ b/app-text/bibclean/bibclean-2.17.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="BibTeX bibliography prettyprinter and syntax checker"
 SRC_URI="http://www.math.utah.edu/pub/bibclean/${P}.tar.bz2"
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.math.utah.edu/pub/bibclean/"
 
 # http://packages.debian.org/changelogs/pool/main/b/bibclean/bibclean_2.11.4-5/bibclean.copyright
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 SLOT="0"
diff --git a/app-text/bibclean/files/bibclean-2.11.4-ldflags.patch b/app-text/bibclean/files/bibclean-2.11.4-ldflags.patch
deleted file mode 100644
index e93c3be91030..000000000000
--- a/app-text/bibclean/files/bibclean-2.11.4-ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: bibclean-2.11.4/Makefile.in
-===================================================================
---- bibclean-2.11.4.orig/Makefile.in
-+++ bibclean-2.11.4/Makefile.in
-@@ -343,7 +343,7 @@ BIBCLEAN-OBJS   = bibclean.o chek.o do.o
- 		  $(LIBOBJS)
- 
- bibclean:         $(BIBCLEAN-OBJS)
--	$(CC) -o bibclean $(CFLAGS) $(BIBCLEAN-OBJS) $(LIBS)
-+	$(CC) $(LDFLAGS) -o bibclean $(CFLAGS) $(BIBCLEAN-OBJS) $(LIBS)
- 
- # This target converts the option descriptions from the manual pages
- # to C code for inclusion in bibclean.c.  The first awk command