commit: 6a1d76b6138e6a7150e8d6228b6d43e9be997158 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Mon Dec 28 11:50:13 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Mon Dec 28 11:50:13 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a1d76b6
app-text/barcode: Port to EAPI 7 Closes: https://bugs.gentoo.org/707686 Package-Manager: Portage-3.0.9, Repoman-3.0.1 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> Signed-off-by: David Seifert <soap <AT> gentoo.org> app-text/barcode/barcode-0.99.ebuild | 13 ++++------- app-text/barcode/files/0.98-info.patch | 14 ------------ .../barcode/files/barcode-0.99-fno-common.patch | 25 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 23 deletions(-) diff --git a/app-text/barcode/barcode-0.99.ebuild b/app-text/barcode/barcode-0.99.ebuild index ce0692e849f..bd58bc146e1 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 740458f88ed..00000000000 --- 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 00000000000..5abb8a26824 --- /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
