gentoo resync : 03.03.2021

3 files changed, 57 insertions, 9 deletions

diff --git a/media-libs/jbig2enc/Manifest b/media-libs/jbig2enc/Manifest
index cbccbef084de..00fb81841ef8 100644
--- a/media-libs/jbig2enc/Manifest
+++ b/media-libs/jbig2enc/Manifest
@@ -1,4 +1,6 @@
 AUX jbig2enc-0.28-leptonica-1.70.patch 1681 BLAKE2B 78de2dd85258d277114c9fdd60e587bdf833211cb8cbcf12856ad3a26647e20c9b713f77a9dc84f983f0d19e38b59a086bf514a0ee81df186b7bad4760ea669c SHA512 2c9999dde1156df91616e42e051b5e0b81339cb818a9c0fd0592c0d77c4b741c80ac876576a7bc87b990e09af587df5e095c87d8893308100b37188e9640d738
 DIST jbig2enc-0.28.tar.gz 39879 BLAKE2B 08cbb2f2a5277085a592d18a8db529d2e5f79f69eaa5392f2b06b920f7d1651c3c73795ba2e43ae843fd5720a1406633b5429ab0b1fe260a6308da4cf10868b9 SHA512 81d194fb648fe7a866302796fd5e2adbb213d52193a279a94dbc5918ce3480561ea204e8497125eed5d6c6e4c6d089f7f35a89ef98bc484ca753ffde23e444c6
-EBUILD jbig2enc-0.28-r1.ebuild 869 BLAKE2B 37989321c52ae5ecc7a10e4aec1ae8ae2775c5d84fb4ce99e2f9437b2d075c32be9911656a79f08e28cd70f6412d5deded9db1b7485444576fc02bfc53433f04 SHA512 4c24a01da97958fdbf11ad6c14b1d06f96a1726ebe1024bc72f11d814d074ed92d7e51de06684eb7197490f3db54f64a4b02acf9f1c74c6f58f623beeac83380
+DIST jbig2enc-0.29.tar.gz 1108212 BLAKE2B 44efc2afecb2ca581711c58e9abfed7ae790053e6a725012cb6e68c5c52b6d89d071a115bf1fb9ea2c15de64e03e889dd47d9d36a0e707f039de55029d33633a SHA512 aa50cdaf61ef0ae473c8139d8da2a4c374450f8d0d31e2260031e8086dab9201c303c86d50cd51427135bef500718cbc3a53baabf2bf505f8908c22a3d361c51
+EBUILD jbig2enc-0.28-r1.ebuild 929 BLAKE2B 9b6a77d22c87b1a8f8ab12cb9eb13944c878497fe0f0c7dfaf1cf793f8fa4a8d8a94f2f3a1faa27fcb1207846be51e0eb3219e26d82ac4a9877c4b50875cdd24 SHA512 1daa8bec55140e1213b8be8dce06095bfac67ff01a9377846b07997547c7a9a6cd4008b64c235ebc974544bce6ab23307a7d951de60f21707e413d43eb8c3217
+EBUILD jbig2enc-0.29.ebuild 917 BLAKE2B 3d0b491b62495946f654d84da08ba167d9c0080696b5c8d156b95502d31dd192a20e62afbecde41b8988de7f24a6fe70754e6f8863172c22bc6aaa1419bcde94 SHA512 8b6ad914ef83ae2d3bd0b15b7cb3b0f2a2ba89963a2cc23cd3d02717a1eacd89a85c54397b4f54c5bc0e49ee40972b2f282e7f08dc61be814eec1cb12ba1e3d2
 MISC metadata.xml 324 BLAKE2B 6b82651c0b2513c62e014a8fd6f931c7edc95c84ed88dcd9fa18396a8ec59306c3bb4a08914dbae815530b031f3b66c97d909da57ba4a6d13177a44e226345d4 SHA512 6a6bdbd18023007787f6790a5004e782c4fd136c64aeb261655f743fd8619b35d280e74e806540156e3ac75ed15cf7053fefffd298b119a43cf430e57d1384be
diff --git a/media-libs/jbig2enc/jbig2enc-0.28-r1.ebuild b/media-libs/jbig2enc/jbig2enc-0.28-r1.ebuild
index b1e25014dafb..f6949b5e887e 100644
--- a/media-libs/jbig2enc/jbig2enc-0.28-r1.ebuild
+++ b/media-libs/jbig2enc/jbig2enc-0.28-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="JBIG2 Encoder and libs"
 HOMEPAGE="https://github.com/agl/jbig2enc"
@@ -13,19 +12,29 @@ SRC_URI="https://github.com/agl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86 ~ppc-macos"
-
-IUSE="gif jpeg png static-libs tiff webp"
+IUSE="gif jpeg png tiff webp"
 
 RDEPEND="media-libs/leptonica[gif?,jpeg?,png?,tiff?,webp?]"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-leptonica-1.70.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-leptonica-1.70.patch"
+)
 
 src_prepare() {
+	default
+
 	# remove -Werror
 	sed -i -e '/AM_INIT_AUTOMAKE/s/-Werror//' configure.ac || die 'sed on configure.ac failed'
 	# prevent static linking and QA notice about insecure RUNPATHs
 	sed -i -e '/jbig2_LDFLAGS/d' src/Makefile.am || die 'sed on src/Makefile.am failed'
 
-	autotools-utils_src_prepare
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -name '*.a' -delete || die
 }
diff --git a/media-libs/jbig2enc/jbig2enc-0.29.ebuild b/media-libs/jbig2enc/jbig2enc-0.29.ebuild
new file mode 100644
index 000000000000..632ea5cccd30
--- /dev/null
+++ b/media-libs/jbig2enc/jbig2enc-0.29.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="JBIG2 Encoder and libs"
+HOMEPAGE="https://github.com/agl/jbig2enc"
+SRC_URI="https://github.com/agl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-macos"
+IUSE="gif jpeg png tiff webp"
+
+RDEPEND="media-libs/leptonica[gif?,jpeg?,png?,tiff?,webp?]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# remove -Werror
+	sed -i -e '/AM_INIT_AUTOMAKE/s/-Werror//' configure.ac || die 'sed on configure.ac failed'
+	# prevent static linking and QA notice about insecure RUNPATHs
+	# TODO: --disable-rpath (new in 0.29)?
+	sed -i -e '/jbig2_LDFLAGS/d' src/Makefile.am || die 'sed on src/Makefile.am failed'
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -name '*.a' -delete || die
+}