gentoo (valentine's day) resync : 14.02.2021

3 files changed, 2 insertions, 83 deletions

diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index db99fdb7ce6c..d455ad362feb 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,5 +1,3 @@
-DIST tiff-4.1.0.tar.gz 2421581 BLAKE2B 1f9b92d08dc95633bb005a635bbcecd8fa5e4f30c14f059b42aafbb4a52b4fb1b84b1e97cea33f3102f5808cb28f93bc8fcbae2b041c6227c97f90b4f9b8e631 SHA512 fd541dcb11e3d5afaa1ec2f073c9497099727a52f626b338ef87dc93ca2e23ca5f47634015a4beac616d4e8f05acf7b7cd5797fb218758cc2ad31b390491c5a6
 DIST tiff-4.2.0.tar.gz 2809373 BLAKE2B 62178da595e7ff4041f33643a87698580cd3a32d4536b5c60c414c9497616258686cf61514e1d4e0f062cb1333190c39ce86896bf07c01532c07454745d89cd9 SHA512 d7d42e6e6dbda9604c638f28e6cfa4705191a4e8ea276d18031d50dbab0931ac91141e57a2cf294124487f1a2e6dfcb9be62431c1b69de5acf4d0e632f3322e5
-EBUILD tiff-4.1.0.ebuild 2056 BLAKE2B e6c3f2878ae89232c7b47eace14c36641a0609cfe4766e171c87c0355a0f989ed66e9b8271b57f23fe152c29f892be849a6296bc364387d3536e823a6b26d46c SHA512 85ad2d18abecf9a69c8e757663736697a0ea8fe0c16e967058ae2c59930535b1a53a43af79baf90fce0098e77f40c7407261f19ce369704bb7e2811d72e02f6f
-EBUILD tiff-4.2.0.ebuild 2058 BLAKE2B a9025eb795f2d699b7e8483f76ca1e767bb795350c139dea789f5cb2b3878a55f04a271c173a660acb95d1f229b67882dbd04bd08ff9fcae44d0603a5c83e2ce SHA512 d948a87d2e6c4f21139cefe099cbae1c19b4fb757c5e59a559edbf3c6b03c9ce71ec9195544b49630d6c63a2c74d3852a9ee49c16789107100aba0ee7871116c
+EBUILD tiff-4.2.0.ebuild 2056 BLAKE2B e6c3f2878ae89232c7b47eace14c36641a0609cfe4766e171c87c0355a0f989ed66e9b8271b57f23fe152c29f892be849a6296bc364387d3536e823a6b26d46c SHA512 85ad2d18abecf9a69c8e757663736697a0ea8fe0c16e967058ae2c59930535b1a53a43af79baf90fce0098e77f40c7407261f19ce369704bb7e2811d72e02f6f
 MISC metadata.xml 559 BLAKE2B c7f72104f0c49114e27a3db9548edfc112b6bb04881c980d5f4175835abd46a7be088cd9e8c2eae8311bd1656064d975d50579547a96e814b1affef54a17befe SHA512 95ca6b5655637f4cfacb224a77532ea958634e208b3f7d39cf2be778033b99f77af7947bce9db1e633dbcbc721ea2fba60e5a18a4c0e32a9019fcb95f568cce8
diff --git a/media-libs/tiff/tiff-4.1.0.ebuild b/media-libs/tiff/tiff-4.1.0.ebuild
deleted file mode 100644
index 69bb47338e2a..000000000000
--- a/media-libs/tiff/tiff-4.1.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools libtool 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
-}
diff --git a/media-libs/tiff/tiff-4.2.0.ebuild b/media-libs/tiff/tiff-4.2.0.ebuild
index c93faafcf23f..69bb47338e2a 100644
--- a/media-libs/tiff/tiff-4.2.0.ebuild
+++ b/media-libs/tiff/tiff-4.2.0.ebuild
@@ -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 )"