gentoo resync : 28.04.2021

4 files changed, 86 insertions, 4 deletions

diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index d455ad362feb..810610bd5198 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,3 +1,5 @@
 DIST tiff-4.2.0.tar.gz 2809373 BLAKE2B 62178da595e7ff4041f33643a87698580cd3a32d4536b5c60c414c9497616258686cf61514e1d4e0f062cb1333190c39ce86896bf07c01532c07454745d89cd9 SHA512 d7d42e6e6dbda9604c638f28e6cfa4705191a4e8ea276d18031d50dbab0931ac91141e57a2cf294124487f1a2e6dfcb9be62431c1b69de5acf4d0e632f3322e5
-EBUILD tiff-4.2.0.ebuild 2056 BLAKE2B e6c3f2878ae89232c7b47eace14c36641a0609cfe4766e171c87c0355a0f989ed66e9b8271b57f23fe152c29f892be849a6296bc364387d3536e823a6b26d46c SHA512 85ad2d18abecf9a69c8e757663736697a0ea8fe0c16e967058ae2c59930535b1a53a43af79baf90fce0098e77f40c7407261f19ce369704bb7e2811d72e02f6f
-MISC metadata.xml 559 BLAKE2B c7f72104f0c49114e27a3db9548edfc112b6bb04881c980d5f4175835abd46a7be088cd9e8c2eae8311bd1656064d975d50579547a96e814b1affef54a17befe SHA512 95ca6b5655637f4cfacb224a77532ea958634e208b3f7d39cf2be778033b99f77af7947bce9db1e633dbcbc721ea2fba60e5a18a4c0e32a9019fcb95f568cce8
+DIST tiff-4.3.0.tar.gz 2808254 BLAKE2B 433a087249541f6142dd25b6dc807018639908175b0d73b4af3aa301af2dee3d76184e4689e7b2f1f9b73567ac78d50456ee94fffe00bad6da05375cf2d94d92 SHA512 e04a4a6c542e58a174c1e9516af3908acf1d3d3e1096648c5514f4963f73e7af27387a76b0fbabe43cf867a18874088f963796a7cd6e45deb998692e3e235493
+EBUILD tiff-4.2.0.ebuild 2049 BLAKE2B 3698f96feeafe136a25898946f7b5a003fd40e62eea9463696831d97f12bdfb2ad6e916a9d2adb5e5e59eec6ad8648887b5dd1b26a5f0fe9da28c29d072b1b16 SHA512 3748ebce45e493316c50e99491be799ee9faf78fae345bc5791f6788fdb9a9a2e79bf9ebf801baa2ff6cf0732cc9e70ab3b3a848d73e89d96d1884527d433765
+EBUILD tiff-4.3.0.ebuild 2057 BLAKE2B cddf05f09143cc28fe2c0976bc470839b5751755e548b2d243ff0f227439be6e19bb91b0fb50528dcb8a4cafca9cd1c0a381063eaf32aeaba64f4f5fed0f7201 SHA512 c9b8412855f06e5b4883240d00017312dde09ade494276b6f298cc4ddee26059bbf39e169d24eb7f1851d317b822cb72e2faa9428430b92e3fe5854eae897d2c
+MISC metadata.xml 614 BLAKE2B 65a0c3386b69b69a980f6f6c9d2e18cc2e98c0f5a319af7e61763cea5a584a456715360e2106330b439981e09375701685ddc94f5062c7e206245944282a7b84 SHA512 f7b29a08c37621126390ddb9d8dc42a757da0d228151d725625fe603a26751294895d8795ebfa851ee36863f459c67d04c235a953304d48dca429d24de72761a
diff --git a/media-libs/tiff/metadata.xml b/media-libs/tiff/metadata.xml
index 7cc4f8fccac4..a6ae642d2e86 100644
--- a/media-libs/tiff/metadata.xml
+++ b/media-libs/tiff/metadata.xml
@@ -10,6 +10,7 @@
 		support, but also used by GIS and other imaging tools.
 	</longdescription>
 	<upstream>
+		<remote-id type="gitlab">libtiff/libtiff</remote-id>
 		<remote-id type="cpe">cpe:/a:libtiff:libtiff</remote-id>
 		<remote-id type="cpe">cpe:/a:libtiff_project:libtiff</remote-id>
 	</upstream>
diff --git a/media-libs/tiff/tiff-4.2.0.ebuild b/media-libs/tiff/tiff-4.2.0.ebuild
index 69bb47338e2a..714507392efe 100644
--- a/media-libs/tiff/tiff-4.2.0.ebuild
+++ b/media-libs/tiff/tiff-4.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools libtool multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="Tag Image File Format (TIFF) library"
 HOMEPAGE="http://libtiff.maptools.org"
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
 
 LICENSE="libtiff"
 SLOT="0"
-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"
+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="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/tiff/tiff-4.3.0.ebuild b/media-libs/tiff/tiff-4.3.0.ebuild
new file mode 100644
index 000000000000..49ce9bf164b9
--- /dev/null
+++ b/media-libs/tiff/tiff-4.3.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Tag Image File Format (TIFF) library"
+HOMEPAGE="http://libtiff.maptools.org"
+SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
+
+LICENSE="libtiff"
+SLOT="0"
+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="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zstd? ( >=app-arch/zstd-1.3.7-r1:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="test? ( jpeg )" #483132
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/tiffconf.h
+)
+
+src_prepare() {
+	default
+
+	# tiffcp-thumbnail.sh fails as thumbnail binary doesn't get built anymore since tiff-4.0.7
+	sed '/tiffcp-thumbnail\.sh/d' -i test/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--without-x
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable cxx)
+		$(use_enable jbig)
+		$(use_enable jpeg)
+		$(use_enable lzma)
+		$(use_enable static-libs static)
+		$(use_enable webp)
+		$(use_enable zlib)
+		$(use_enable zstd)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	# remove useless subdirs
+	if ! multilib_is_native_abi ; then
+		sed -i \
+			-e 's/ tools//' \
+			-e 's/ contrib//' \
+			-e 's/ man//' \
+			-e 's/ html//' \
+			Makefile || die
+	fi
+}
+
+multilib_src_test() {
+	if ! multilib_is_native_abi ; then
+		emake -C tools
+	fi
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} || die
+}