gentoo resync : 26.12.2017

5 files changed, 2 insertions, 83 deletions

diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index ebd7c6d1e1b8..bd4c7f1e9a54 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/nfbtrans/Manifest b/app-accessibility/nfbtrans/Manifest
index dc14afbc3f53..c96643f9facc 100644
--- a/app-accessibility/nfbtrans/Manifest
+++ b/app-accessibility/nfbtrans/Manifest
@@ -2,7 +2,5 @@ AUX nfbtrans-7.74-gentoo-fix.patch 309 BLAKE2B 8246335ca9643e3202347445214c932fc
 AUX nfbtrans-7.74-getline-fix.patch 957 BLAKE2B 0efd12522c9eec47146f2d084b9c4198be339f06f4a9fe5a98fa097abc34ab60800863a9f7e1b1b80220bb6015b759bfd3a874588005b2c6af9f725439f0c3c8 SHA512 35a57c029f2c54f04fe0e9be66df39da11e7415095959c2d13b5b9e66b223d15c9b72f4a392092dc4075e4753fad542f33f2cb59e83702378505e3ecc6885cbc
 AUX nfbtrans-7.74-respect-ldflags.patch 692 BLAKE2B 36afb2c45f7982fd21df2d23fcae9f32d05ce629b1e24275aa1e2bf8c9f64808b2700fe94b62cfd14716c7ef509ecee0dbef72cfa23576bc6791e414cbc6eb59 SHA512 d93ec7be4119c4b129558d0d6c688cca9edc25129c487250f57071916bc41ab2306fccafae5e7d4b9e911250527be01dfefbcb87c111743f5a6829cd14a3ec82
 DIST nfbtr774.zip 470847 BLAKE2B 54dd9b612c6dda0734d5b21c1ed8b0d428663d2b442406cb36276afd1a6c0b742ddcb4848954a0bbdd29cb300dab6a55dd9b3bafeb603b08ef6a7e678c0d9a86 SHA512 58fa72c53d88d11fa005572f4e2ebd81d21afaec2fac0e986bfad66b42c194ec3573199e2f2b863725001c1cb777b60881605a1533f7eb73e31e24a244673c2c
-EBUILD nfbtrans-7.74-r1.ebuild 877 BLAKE2B 6ecb46210680e4163bc6e7c9c1d4fe389fe1092781469aff81dc064a7fe8f69e67eb405b4b9477989b87ac4186caf3a6d4e8f058008ae383c205012b27039833 SHA512 aa665495ce093fdeadf09507e60bc8f187e85a08b1ddd7bc577f2aaa85ac993223cb0d413acbba822319f2068972adb0c615a961645ba13c6be7e973712a4d90
-EBUILD nfbtrans-7.74-r2.ebuild 918 BLAKE2B 9791269ee9754c7ead56aee3f1948d295f5628d25b6825e7cdf7b7cf9c1076ac8a2a95a288caee4edb580d1ed9f03deb81e29bfe060f1c7105c55551dd8a6c41 SHA512 fee889b4032cc5fd62265801544f39d5fcb5b38ac6f9c322c3e0f1b8051207541560e5fcd0c2f1af654b3d92037084a67bcddda68dbda0ed685ed9fbd8ec7968
-EBUILD nfbtrans-7.74.ebuild 850 BLAKE2B cc6b290dfe69d034948c35a2f1789147a6eaaf30211836082363c5b1268be10103aa0a9dbf33ae0a4672bd20bc401ef7c5d2e93489f1675a9ea47e2ca6382211 SHA512 668d12d267b3bbd1c915ec470ed79764ae1d177469b594a1ac853b905938e33609577cc50b101a71cdfda4581b56de03596b893a169820b0e060bf87b9695c76
+EBUILD nfbtrans-7.74-r2.ebuild 916 BLAKE2B b321b58663e89c3092f1561840dcf60685839c539f041ee728d76edbb7b7becb1d7cebf7df094800ff23301fd44ceed28f1fa12d49dbb56148647fe8aa85a49c SHA512 f89dd1f3499667fe5d4f40d3dc147bce0d8abefffe730a87d285c5a28ff13fd4ce615bb1e7abf9c83356d018efd6bd5421907f86c1004878633d35ef8c4dda19
 MISC metadata.xml 345 BLAKE2B 73e4cf90f6b94e74e7fcf0e89ecca76f346b0ea8f2651a42617b136b47aec01457a21406ce360f4924e1d8bdf9027763e6198e1a363be471e2a81401f6f6f1d2 SHA512 d034cf8435010ee64e6186cb7e14f559d3e43eec3b3b31e0cec4da133c65cd8c34a00cc4c66958fb13fc1470ef0fa5307331032cde328a443b877be6f3d4c44c
diff --git a/app-accessibility/nfbtrans/nfbtrans-7.74-r1.ebuild b/app-accessibility/nfbtrans/nfbtrans-7.74-r1.ebuild
deleted file mode 100644
index 6b5b3fe9191e..000000000000
--- a/app-accessibility/nfbtrans/nfbtrans-7.74-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils
-
-DESCRIPTION="braille translator from the National Federation of the Blind"
-HOMEPAGE="http://www.nfb.org/nfbtrans"
-SRC_URI="http://www.nfb.org/Images/nfb/Products_Technology/nfbtr774.zip"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND=" >=app-arch/unzip-5.50-r2"
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_prepare() {
-	mv MAKEFILE Makefile
-	mv SPANISH.ZIP spanish.zip
-	make lowercase || die
-	epatch "${FILESDIR}"/${P}-gentoo-fix.patch
-	epatch "${FILESDIR}"/${P}-getline-fix.patch
-}
-
-src_compile() {
-	make CC=$(tc-getCC) \
-		LIBS= \
-		CFLAGS="${CFLAGS} -DLINUX" LDFLAGS="${LDFLAGS}" all || die
-}
-
-src_install() {
-	dobin nfbtrans || die
-	dodoc *fmt readme.txt makedoc
-	insinto /etc/nfbtrans
-	doins *cnf *tab *dic spell.dat *zip
-}
diff --git a/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild b/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild
index 6a94deb4fc29..5a275017973a 100644
--- a/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild
+++ b/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nfb.org/Images/nfb/Products_Technology/nfbtr774.zip"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND=" >=app-arch/unzip-5.50-r2"
diff --git a/app-accessibility/nfbtrans/nfbtrans-7.74.ebuild b/app-accessibility/nfbtrans/nfbtrans-7.74.ebuild
deleted file mode 100644
index 384f8bbb2942..000000000000
--- a/app-accessibility/nfbtrans/nfbtrans-7.74.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils
-
-DESCRIPTION="braille translator from the National Federation of the Blind"
-HOMEPAGE="http://www.nfb.org/nfbtrans"
-SRC_URI="http://www.nfb.org/Images/nfb/Products_Technology/nfbtr774.zip"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-DEPEND=" >=app-arch/unzip-5.50-r2"
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-	mv MAKEFILE Makefile
-	mv SPANISH.ZIP spanish.zip
-	make lowercase || die
-	epatch "${FILESDIR}"/${P}-gentoo-fix.patch
-	epatch "${FILESDIR}"/${P}-getline-fix.patch
-}
-
-src_compile() {
-	make CC=$(tc-getCC) LIBS= CFLAGS="${CFLAGS} -DLINUX" all || die
-}
-
-src_install() {
-	dobin nfbtrans || die
-	dodoc *fmt readme.txt makedoc
-	insinto /etc/nfbtrans
-	doins *cnf *tab *dic spell.dat *zip
-}