gentoo new year resync : 01.01.2021

4 files changed, 31 insertions, 25 deletions

diff --git a/app-text/barcode/Manifest b/app-text/barcode/Manifest
index c221cf4febec..73448d25d6d9 100644
--- a/app-text/barcode/Manifest
+++ b/app-text/barcode/Manifest
@@ -1,4 +1,4 @@
-AUX 0.98-info.patch 441 BLAKE2B 2e334be2e36e00a0528d220244affcd000da4ca7b4576501c34b210134ad9e5ff8af99c467d3be3ee34173b651690f8f0ec9a5584ceec60337b4abd1d7a4f825 SHA512 694c4ccd03baa7a17c0512b55b9a39fb2de34afef61194833fe5a481ba13c22f1d21217f53908ca8ad4cea536fbd9a6453486ba2778349e6b1651d2c67513ad7
+AUX barcode-0.99-fno-common.patch 650 BLAKE2B 27fce20565dfa526b4240c5817ab45735bba98a7445160ba5f7ff368f0befa2332e423f31732ea27a104b3f5f7db0fa8a954d465116a38fd445cd1ebc1209242 SHA512 1cacd446234f9b0d841803f3627a7b0775da22cc74fcf09ee45ee95317ed6816bc545e61555707f7c7a5cee743b33b241088182b01d6cdcd49e047f050d29c68
 DIST barcode-0.99.tar.gz 890730 BLAKE2B 4695a9baaa2d95c898f0078fc7d49e642fdd5b21e3b0c92d1f275252c78b94e5bdfc78084e6dd8d28231748bf6c567678cf996e309fc1e4a1db53bb2ceb0eb5a SHA512 f500dbe7eaa657ed6879316835557533e0972c8740a8bb61bea46efdd4120827a3c412ca24fec6e1833395191521425dae272f10d8553a252896b363290118b1
-EBUILD barcode-0.99.ebuild 669 BLAKE2B cc82321c88a8244c01cffc963dcdc1467993d8120a6045bb68a3a74ebb76d8edd7efdcfe3288fe835d33c83d79ffe6d8b27b6e67049ab3d8dc5ca40c632d376d SHA512 6bb90e786b10fc142ee1ce0a4dc732b1b80c864bf44d47e0fc08cb4b98ffd28f6d7a419e6a9ea3fbb0a9feb3c974de0682a29fcbf523680caf1385ce5a9b248a
+EBUILD barcode-0.99.ebuild 629 BLAKE2B a3795836c93717f841a18ffb16e362b3a7d9b97f312476c70684c525e7f482b580fb357a76ed9291341730a36ffac9687abbed2fbc67406c0e27f51a4fc6355e SHA512 9833f89fa9197e0f4031979000a9c9993e41e322c8e8642d6452ee3b8858050b48db02d3b64f7d5cdcb944046a42133e27fe54ebc78cfd997bf330cfc213d87c
 MISC metadata.xml 243 BLAKE2B c7e8ffa98061b37b0107cea12e59f7779ed014b1b83b008c1f8baa888fca120d4ba508078f2182c27c1bff0e8c2dea07bf3b33a3b086fdfbd7421cbf57b2494c SHA512 dbdb824584151c0ccb600c9fa433898cb613604bc97c7305b7a0809d22574007bc9ee3037b3922ee5256471519fd27510c3168b24ca3f75ab63e5c3051502d3f
diff --git a/app-text/barcode/barcode-0.99.ebuild b/app-text/barcode/barcode-0.99.ebuild
index ce0692e849f4..bd58bc146e16 100644
--- a/app-text/barcode/barcode-0.99.ebuild
+++ b/app-text/barcode/barcode-0.99.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit eutils multilib
+EAPI=7
 
 DESCRIPTION="barcode generator"
 HOMEPAGE="https://www.gnu.org/software/barcode/"
@@ -12,10 +10,12 @@ SRC_URI="mirror://gnu/barcode/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
+
 RDEPEND="app-text/libpaper"
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
 src_prepare() {
 	sed -i -e '/^LDFLAGS =/s:=:+=:' \
 		-e "/^aLIBDIR/s:lib:$(get_libdir):" \
@@ -25,8 +25,3 @@ src_prepare() {
 
 	default
 }
-
-src_install() {
-	default
-	dodoc ChangeLog README TODO
-}
diff --git a/app-text/barcode/files/0.98-info.patch b/app-text/barcode/files/0.98-info.patch
deleted file mode 100644
index 740458f88ed4..000000000000
--- a/app-text/barcode/files/0.98-info.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- doc/barcode.info.old	2003-10-26 19:08:39.000000000 -0800
-+++ doc/barcode.info	2003-10-26 19:58:42.179447512 -0800
-@@ -1,6 +1,11 @@
- This is barcode.info, produced by makeinfo version 4.0 from
- barcode.texinfo.
- 
-+INFO-DIR-SECTION Miscellaneous
-+START-INFO-DIR-ENTRY
-+* Barcode: (barcode).                     Barcode generation library.
-+END-INFO-DIR-ENTRY
-+
-    This file is the User's Manual for the barcode library (version
- 0.98).
- 
diff --git a/app-text/barcode/files/barcode-0.99-fno-common.patch b/app-text/barcode/files/barcode-0.99-fno-common.patch
new file mode 100644
index 000000000000..5abb8a26824f
--- /dev/null
+++ b/app-text/barcode/files/barcode-0.99-fno-common.patch
@@ -0,0 +1,25 @@
+Taken from: https://sources.debian.org/patches/barcode/0.99-4/0006-Fix-FTBFS-with-gcc-10.patch/
+Author: https://sources.debian.org/patches/barcode/0.99-4/0006-Fix-FTBFS-with-gcc-10.patch/
+--- a/barcode.h
++++ b/barcode.h
+@@ -123,6 +123,6 @@ extern int Barcode_Version(char *versionname);
+ }
+ #endif
+ 
+-int streaming;
++extern int streaming;
+ 
+ #endif /* _BARCODE_H_ */
+diff --git a/library.c b/library.c
+index 30946ff..5390a2b 100644
+--- a/library.c
++++ b/library.c
+@@ -30,6 +30,8 @@
+ #endif
+ #include <errno.h>
+ 
++int streaming;
++
+ /*
+  * This function allocates a barcode structure and strdup()s the
+  * text string. It returns NULL in case of error