gentoo resync : 22.05.2021

3 files changed, 24 insertions, 3 deletions

diff --git a/app-text/barcode/Manifest b/app-text/barcode/Manifest
index 73448d25d6d9..4e81086eb3d6 100644
--- a/app-text/barcode/Manifest
+++ b/app-text/barcode/Manifest
@@ -1,4 +1,5 @@
 AUX barcode-0.99-fno-common.patch 650 BLAKE2B 27fce20565dfa526b4240c5817ab45735bba98a7445160ba5f7ff368f0befa2332e423f31732ea27a104b3f5f7db0fa8a954d465116a38fd445cd1ebc1209242 SHA512 1cacd446234f9b0d841803f3627a7b0775da22cc74fcf09ee45ee95317ed6816bc545e61555707f7c7a5cee743b33b241088182b01d6cdcd49e047f050d29c68
+AUX barcode-0.99-install-static-lib.patch 331 BLAKE2B 72b6a5a31ce3c450587ae7603f802bdd9e8c467f9095538fb819f2742703be1abe749af7faf340f908ee8e5979277f7fc65cc8230685f060253c08e31a5641f8 SHA512 2033f6edcdf98efcb17296845be76d1c2cfc3504fcee965d68536e209f949d26d6ef2326858fe673492e36a5c3aebd14eb3e0ef96355ca43d25a23f19b612d01
 DIST barcode-0.99.tar.gz 890730 BLAKE2B 4695a9baaa2d95c898f0078fc7d49e642fdd5b21e3b0c92d1f275252c78b94e5bdfc78084e6dd8d28231748bf6c567678cf996e309fc1e4a1db53bb2ceb0eb5a SHA512 f500dbe7eaa657ed6879316835557533e0972c8740a8bb61bea46efdd4120827a3c412ca24fec6e1833395191521425dae272f10d8553a252896b363290118b1
-EBUILD barcode-0.99.ebuild 629 BLAKE2B a3795836c93717f841a18ffb16e362b3a7d9b97f312476c70684c525e7f482b580fb357a76ed9291341730a36ffac9687abbed2fbc67406c0e27f51a4fc6355e SHA512 9833f89fa9197e0f4031979000a9c9993e41e322c8e8642d6452ee3b8858050b48db02d3b64f7d5cdcb944046a42133e27fe54ebc78cfd997bf330cfc213d87c
+EBUILD barcode-0.99-r1.ebuild 720 BLAKE2B 448c0d1acba6731d26bb8734937a491604b6befcb16c3c26f9443aff1e51ff83126de45a2386d4654f601409faa3a5bb6ed09db8f9f7d0717d563765184c16e4 SHA512 544c3edbf21c639e980961814d71ae9167e452e320d0d081b4b359ae9b8c3868c9d13495dbcb9aee36d8bcb57a9fa41480e5505af3e418fe882c4f2779ea9510
 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-r1.ebuild
index bd58bc146e16..9defd1531f06 100644
--- a/app-text/barcode/barcode-0.99.ebuild
+++ b/app-text/barcode/barcode-0.99-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,10 @@ KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 RDEPEND="app-text/libpaper"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-install-static-lib.patch
+)
 
 src_prepare() {
 	sed -i -e '/^LDFLAGS =/s:=:+=:' \
@@ -25,3 +28,7 @@ src_prepare() {
 
 	default
 }
+
+src_configure() {
+	econf --disable-shared
+}
diff --git a/app-text/barcode/files/barcode-0.99-install-static-lib.patch b/app-text/barcode/files/barcode-0.99-install-static-lib.patch
new file mode 100644
index 000000000000..44d32d059ce9
--- /dev/null
+++ b/app-text/barcode/files/barcode-0.99-install-static-lib.patch
@@ -0,0 +1,13 @@
+--- barcode-0.99_orig/Makefile.am	2020-12-06 15:39:43.270943391 +0100
++++ barcode-0.99/Makefile.am	2020-12-06 15:40:26.723942515 +0100
+@@ -25,7 +25,9 @@
+ 
+ bin_PROGRAMS = barcode sample
+ 
+-noinst_LTLIBRARIES = libbarcode.la
++lib_LTLIBRARIES = libbarcode.la
++
++include_HEADERS = barcode.h lib/gettext.h
+ 
+ ACLOCAL_AMFLAGS = -I m4
+