gentoo resync : 29.01.2021

3 files changed, 20 insertions, 19 deletions

diff --git a/media-libs/jbigkit/Manifest b/media-libs/jbigkit/Manifest
index 28d5d8553cc6..47445caea970 100644
--- a/media-libs/jbigkit/Manifest
+++ b/media-libs/jbigkit/Manifest
@@ -1,4 +1,4 @@
-AUX jbigkit-2.1-build.patch 8817 BLAKE2B 5eb1137c933cf4079378dce30b9996bc698a3a8852f35131f9d138cd171c146cfd3b8267abafea3e6bd3a30a2029a7b73b149d5d8c560354ac8ae24bc2cc6c7c SHA512 d8f7c94676452cd36641240e6120972cdb7d03f62dcfdc3920ebc5971fe39c623a50cc7f5020c9458eaebadbb40ff1f2d8bfab2c0de7f9a138e7f0d88be86a07
+AUX jbigkit-2.1-build.patch 8829 BLAKE2B f50d73770d13dff06f2627026f2b2d75bb5d4ef5cc7c4785f0b31e83c5a5057371b4334c0ae6b39fa49a1f1e46ca4db711e0d92cbe275093a228471eb90302c4 SHA512 2cdf2f93c91835880166198a1eed0e2f6438c52f4f7ee5f4370ac417613f7425f0db3420e44f8afe384867d330ee6433a14d9e12a5f6e0143f7311f9255aa926
 DIST jbigkit-2.1.tar.gz 438710 BLAKE2B 7bd82f0e10a2d3794739ee85b77c5407d58753a00e014e937735f9af3043347de88a6e567609bc26de488887a6d61b0a162387fb72732b9be7e550e3f9b9539e SHA512 c4127480470ef90db1ef3bd2caa444df10b50ed8df0bc9997db7612cb48b49278baf44965028f1807a21028eb965d677e015466306b44683c4ec75a23e1922cf
-EBUILD jbigkit-2.1.ebuild 1407 BLAKE2B 250912766d153216e717e62b630af89a14003822f31e667ed5b9713391dd3153460113cf471aee4fd173c17e50b5844992f22ba7b2adaa1f95ab8aa0727df715 SHA512 a5003623970e21dd392d8c67a0636a13dd5abed2eb647affe9e30320d84900c6b8d3590dd210050d1aab231c13ea9c136fa42a23411526b8772103a101de74a5
+EBUILD jbigkit-2.1.ebuild 1367 BLAKE2B 1a87e64bb111bd0c8523f3e946949d5a7a82437f0a05e84a1630da691eac182fa33d4c11cf413b2eebe377520710009cfb4805cac233369c6d393ee74da4e6ea SHA512 4b1776141a70b5664e4e676102e44df5ca54ae4011c546a70316aa6811086ddb70fb986c22bab265345f2f613c90d347b901d9e122f136fbcba904010ae74653
 MISC metadata.xml 373 BLAKE2B 02b125f44ea8401eb695a1b3fff8584c38f50cf9f359cf70e209955babbd749fcfbcd14415a757281f8fd4c0970ba5efbd67b937b81b45b2152a79093d141a34 SHA512 663285ac228539d95ca401d530b53cdb58e2f01e3ee4187622afd1c8bf6ca0ae76bbbdaeb92742408502f4b55dd269464ac2f21231d987ab73f949f6abb92882
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
 }