diff options
| author |   David Michael <fedora.dm0@gmail.com> | 2021-01-22 15:09:32 -0500 |
|---|---|---|
| committer |   Mike Gilbert <floppym@gentoo.org> | 2021-01-24 16:11:14 -0500 |
| commit | 724438290ff1fd616c221c707955e1dbd219dd5c (patch) | |
| tree | bf1737cc3119f448424b156e2f9e0dd217c8d3ba | |
| parent | sys-kernel/gentoo-sources: Clean-up of 4.14.X series (diff) | |
| download | gentoo-724438290ff1fd616c221c707955e1dbd219dd5c.tar.gz gentoo-724438290ff1fd616c221c707955e1dbd219dd5c.tar.bz2 gentoo-724438290ff1fd616c221c707955e1dbd219dd5c.zip | |
media-libs/jbigkit: EAPI 7
Closes: https://bugs.gentoo.org/766579
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: David Michael <fedora.dm0@gmail.com>
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
| -rw-r--r-- | media-libs/jbigkit/files/jbigkit-2.1-build.patch | 12 | ||||
| -rw-r--r-- | media-libs/jbigkit/jbigkit-2.1.ebuild | 23 |
2 files changed, 18 insertions, 17 deletions
diff --git a/media-libs/jbigkit/files/jbigkit-2.1-build.patch b/media-libs/jbigkit/files/jbigkit-2.1-build.patch index a7bc7ae761de..087ac3c544d8 100644 --- a/media-libs/jbigkit/files/jbigkit-2.1-build.patch +++ b/media-libs/jbigkit/files/jbigkit-2.1-build.patch @@ -1,7 +1,7 @@ This patch has been mailed to upstream. No reply at this time. Status unknown. ---- libjbig/Makefile -+++ libjbig/Makefile +--- a/libjbig/Makefile ++++ b/libjbig/Makefile @@ -1,28 +1,58 @@ # Unix makefile for the JBIG-KIT library @@ -70,8 +70,8 @@ This patch has been mailed to upstream. No reply at this time. Status unknown. jbig.o: jbig.c jbig.h jbig_ar.h jbig85.o: jbig85.c jbig85.h jbig_ar.h ---- Makefile -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -1,10 +1,10 @@ # Unix makefile for JBIG-KIT @@ -94,8 +94,8 @@ This patch has been mailed to upstream. No reply at this time. Status unknown. tar cvaf jbigkit-$(VERSION).tar.gz jbigkit-$(VERSION) release: ---- pbmtools/Makefile -+++ pbmtools/Makefile +--- a/pbmtools/Makefile ++++ b/pbmtools/Makefile @@ -1,11 +1,11 @@ # Unix makefile for the JBIG-KIT PBM tools diff --git a/media-libs/jbigkit/jbigkit-2.1.ebuild b/media-libs/jbigkit/jbigkit-2.1.ebuild index aabec623cbc0..58cb0a9b89a1 100644 --- a/media-libs/jbigkit/jbigkit-2.1.ebuild +++ b/media-libs/jbigkit/jbigkit-2.1.ebuild @@ -1,23 +1,27 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils multilib toolchain-funcs multilib-minimal +inherit multilib multilib-minimal toolchain-funcs DESCRIPTION="data compression algorithm for bi-level high-resolution images" HOMEPAGE="http://www.cl.cam.ac.uk/~mgk25/jbigkit/" SRC_URI="http://www.cl.cam.ac.uk/~mgk25/download/${P}.tar.gz" LICENSE="GPL-2" -SLOT="0/2.1" # Since we install libjbig.so and libjbig85.so without version, use ${PV} like 2.1 +SLOT="0/${PV}" # Since we install unversioned libraries, use ${PV} subslots. KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" DOCS="ANNOUNCE CHANGES TODO libjbig/*.txt pbmtools/*.txt" +PATCHES=( + "${FILESDIR}"/${P}-build.patch +) + src_prepare() { - epatch "${FILESDIR}"/${P}-build.patch + default multilib_copy_sources tc-export AR CC RANLIB } @@ -27,9 +31,7 @@ multilib_src_compile() { LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ $(multilib_is_native_abi || echo lib) - if use static-libs; then - cd libjbig && emake static - fi + use static-libs && emake -C libjbig static } multilib_src_test() { @@ -42,8 +44,7 @@ multilib_src_install() { doman pbmtools/jbgtopbm.1 pbmtools/pbmtojbg.1 fi - insinto /usr/include - doins libjbig/*.h - dolib libjbig/libjbig{,85}$(get_libname) - use static-libs && dolib libjbig/libjbig{,85}.a + doheader libjbig/*.h + dolib.so libjbig/libjbig{,85}$(get_libname) + use static-libs && dolib.a libjbig/libjbig{,85}.a } |