gentoo resync : 28.04.2021

5 files changed, 27 insertions, 27 deletions

diff --git a/app-accessibility/nfbtrans/Manifest b/app-accessibility/nfbtrans/Manifest
index a263c74f9e2a..0736dc758edd 100644
--- a/app-accessibility/nfbtrans/Manifest
+++ b/app-accessibility/nfbtrans/Manifest
@@ -1,6 +1,6 @@
-AUX nfbtrans-7.74-gentoo-fix.patch 309 BLAKE2B 8246335ca9643e3202347445214c932fc000317e375678c6adb6a619afc169b2eaccb83ed9eebce4d7ecc19d7d11d00351f27d9d7c6122225cadb518f9c5519a SHA512 7f739a15ab8edd8853702b897e9b00f34256f62b98ae2cb0a17bea487b81f4925f85f0eab77c119a8182965b69c18b6369954121620af288da27bc8f9b122167
-AUX nfbtrans-7.74-getline-fix.patch 957 BLAKE2B 0efd12522c9eec47146f2d084b9c4198be339f06f4a9fe5a98fa097abc34ab60800863a9f7e1b1b80220bb6015b759bfd3a874588005b2c6af9f725439f0c3c8 SHA512 35a57c029f2c54f04fe0e9be66df39da11e7415095959c2d13b5b9e66b223d15c9b72f4a392092dc4075e4753fad542f33f2cb59e83702378505e3ecc6885cbc
-AUX nfbtrans-7.74-respect-ldflags.patch 692 BLAKE2B 36afb2c45f7982fd21df2d23fcae9f32d05ce629b1e24275aa1e2bf8c9f64808b2700fe94b62cfd14716c7ef509ecee0dbef72cfa23576bc6791e414cbc6eb59 SHA512 d93ec7be4119c4b129558d0d6c688cca9edc25129c487250f57071916bc41ab2306fccafae5e7d4b9e911250527be01dfefbcb87c111743f5a6829cd14a3ec82
+AUX nfbtrans-7.74-gentoo-fix.patch 237 BLAKE2B 79966d78a265660633d8e6ad89c2f10a30c94ff5cfaff0cb9e336f0bcdc7d40b2c031b5f69c6b470e1407fd785325bbfdf5c446c3cd3f7766693fd364a20e397 SHA512 9ecd42454f7ef9f00e0a3c1a4eccd8a3dd3df02bb0653acf5fd9b570b2d7d49f126b0db19a3f571d0d1130d73670d317bea42b0e1d894ff785ad8b8f6dc3cef7
+AUX nfbtrans-7.74-getline-fix.patch 880 BLAKE2B 67afefad755a077d949cb492a37af44f275693be3291218882a475059103fc8cf526d67a153c671b51a6f8e80e72ebb4b739e68680285f6b70c2a044f962c078 SHA512 bec4b16259ffb15a396542525ddb5dd8a72da5d4a73b108ee41dd005d00c978d3991d69a5b4cacc963c27a8b186305c619fc3c41860d40fbcaa41843d2fc168d
+AUX nfbtrans-7.74-respect-ldflags.patch 620 BLAKE2B 672883ec0b74c2eb0657756d56f2ee862c676844192a293e4139d0dd76548b6e6c047eb530e96f66eb4e398ffc4304c124d50ba59ebcf440cde59ad219c39ec3 SHA512 65f6c0752ea4ca8badfad0322b8709f7f55cb1e55a57ba2bc4edb0a748584a9c725a9cf9836a67df02d7b9b158f8b46ddae711a1b5d368ed56728a2495272eb1
 DIST nfbtr774.zip 470847 BLAKE2B 54dd9b612c6dda0734d5b21c1ed8b0d428663d2b442406cb36276afd1a6c0b742ddcb4848954a0bbdd29cb300dab6a55dd9b3bafeb603b08ef6a7e678c0d9a86 SHA512 58fa72c53d88d11fa005572f4e2ebd81d21afaec2fac0e986bfad66b42c194ec3573199e2f2b863725001c1cb777b60881605a1533f7eb73e31e24a244673c2c
-EBUILD nfbtrans-7.74-r2.ebuild 929 BLAKE2B 5f88036d7a450d51c1ff094b6294dd57c3ca2b65206cd328d752158ec2ca4eefbf252cf2cd6e2007743575e09b15a4c0bf4ff85d2643b66eb3195f50c788fdf3 SHA512 0ae4e262332f93b69c6525da0647d711bd70c62df894a09c0576abecc0ee3c8690dcbac301af7ad955080c97c4c529ce32fde87489105c413207049abf76763f
+EBUILD nfbtrans-7.74-r2.ebuild 924 BLAKE2B 9c7f88e573ad76d1a2deb29486acda7f04ec0328930a3d66cb4c3bfaafe8fb44e0d17f6f0ebd651e241241afa8bf91d51d8512468ec9aecaf006ad86d6357777 SHA512 3714e597237398e6ea5271d3e12081f41f548f396de4ecd5a47b6c1fd3d6e5c2d67e556658020a32e00cfc4cd2f79f47f1319dfa67a09132fa214d9b7c3be957
 MISC metadata.xml 345 BLAKE2B 73e4cf90f6b94e74e7fcf0e89ecca76f346b0ea8f2651a42617b136b47aec01457a21406ce360f4924e1d8bdf9027763e6198e1a363be471e2a81401f6f6f1d2 SHA512 d034cf8435010ee64e6186cb7e14f559d3e43eec3b3b31e0cec4da133c65cd8c34a00cc4c66958fb13fc1470ef0fa5307331032cde328a443b877be6f3d4c44c
diff --git a/app-accessibility/nfbtrans/files/nfbtrans-7.74-gentoo-fix.patch b/app-accessibility/nfbtrans/files/nfbtrans-7.74-gentoo-fix.patch
index 7040de343db0..5dbdcd504fd7 100644
--- a/app-accessibility/nfbtrans/files/nfbtrans-7.74-gentoo-fix.patch
+++ b/app-accessibility/nfbtrans/files/nfbtrans-7.74-gentoo-fix.patch
@@ -1,5 +1,5 @@
---- a/nfbtrans.c	2004-09-21 19:52:34.341784094 -0500
-+++ b/nfbtrans.c	2004-09-21 19:54:07.005727168 -0500
+--- a/NFBTRANS.C
++++ b/NFBTRANS.C
 @@ -6,7 +6,7 @@
  #define LINT_ARGS
  #define DOS
diff --git a/app-accessibility/nfbtrans/files/nfbtrans-7.74-getline-fix.patch b/app-accessibility/nfbtrans/files/nfbtrans-7.74-getline-fix.patch
index 14c13c063246..fba828479ed0 100644
--- a/app-accessibility/nfbtrans/files/nfbtrans-7.74-getline-fix.patch
+++ b/app-accessibility/nfbtrans/files/nfbtrans-7.74-getline-fix.patch
@@ -1,7 +1,5 @@
-diff --git a/nfbtrans.c.orig b/nfbtrans.c
-index e697393..9a2944e 100644
---- a/nfbtrans.c.orig
-+++ b/nfbtrans.c
+--- a/NFBTRANS.C
++++ b/NFBTRANS.C
 @@ -534,7 +534,7 @@ void compact_line(char *);
  void length_error(char *);
  void do_lop_op(foptype *);
diff --git a/app-accessibility/nfbtrans/files/nfbtrans-7.74-respect-ldflags.patch b/app-accessibility/nfbtrans/files/nfbtrans-7.74-respect-ldflags.patch
index 61c991c8a368..37434681833a 100644
--- a/app-accessibility/nfbtrans/files/nfbtrans-7.74-respect-ldflags.patch
+++ b/app-accessibility/nfbtrans/files/nfbtrans-7.74-respect-ldflags.patch
@@ -1,5 +1,5 @@
---- a/Makefile	2017-06-13 11:08:23.428114301 -0500
-+++ b/Makefile	2017-06-13 11:09:01.084376256 -0500
+--- a/Makefile
++++ b/Makefile
 @@ -28,10 +28,10 @@
  djgppall: nfbtrans.exe

  

diff --git a/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild b/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild
index c458fcee9dcd..8509d2d383e6 100644
--- a/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild
+++ b/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild
@@ -1,41 +1,43 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
-DESCRIPTION="braille translator from the National Federation of the Blind"
+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"
+S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
-DEPEND=" >=app-arch/unzip-5.50-r2"
-RDEPEND=""
-
-S=${WORKDIR}
+BDEPEND=" >=app-arch/unzip-5.50-r2"
 
 PATCHES=(
-"${FILESDIR}"/${P}-gentoo-fix.patch
-"${FILESDIR}"/${P}-getline-fix.patch
-"${FILESDIR}"/${P}-respect-ldflags.patch
+	"${FILESDIR}"/${P}-gentoo-fix.patch
+	"${FILESDIR}"/${P}-getline-fix.patch
+	"${FILESDIR}"/${P}-respect-ldflags.patch
 )
 
 src_prepare() {
 	mv MAKEFILE Makefile || die
 	mv SPANISH.ZIP spanish.zip || die
-	emake lowercase
+
 	default
+
+	emake lowercase
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) \
+	emake \
+		CC="$(tc-getCC)" \
 		LIBS= \
-		CFLAGS="${CFLAGS} -DLINUX" LDFLAGS="${LDFLAGS}" all
+		CFLAGS="${CFLAGS} -DLINUX" \
+		LDFLAGS="${LDFLAGS}" \
+		all
 }
 
 src_install() {