gentoo auto-resync : 14:05:2023 - 04:00:22

9 files changed, 10 insertions, 197 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index a79f9168b265..6e7ef62fe222 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index e321ab04cf98..c46fd8974cb3 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -4,7 +4,5 @@ AUX tiff-4.5.0-CVE-2023-0800-CVE-2023-0801-CVE-2023-0802-CVE-2023-0803-CVE-2023-
 AUX tiff-4.5.0_rc1-skip-tools-tests-multilib.patch 1477 BLAKE2B d6daf36a65fcd2afbec2fd5e5f3b75fa4547f32079c0709e98a48b0ba28d993346dfc597ef46b37db5242f2e28c7dd87a1616fe9324ca2d9659a97040bcd23db SHA512 0c7b69ddd772d73fde800e610ed533804392d0ea4ddefa409f52abcf174cc77cd1f4160a03076043d654533e98812d642d5166030d97b273ec80f5288bf3eda3
 DIST tiff-4.5.0.tar.xz 2320900 BLAKE2B c69801ba9d55b1ed27a92d31d8cd16937fe69299fbf5450efb4a6caa60245b72ddade110daae78f2198613640383623f76ec2265ba785375d0a85c7909b73fe9 SHA512 c6c866064c2dd5d1711c6ece7bafe5f011f5ce26c0aeaecbff79c05b5671f44150324bea95a0665cc43331883114de855ee1cd87ed733bff0f4d0814515b9f10
 DIST tiff-4.5.0.tar.xz.sig 310 BLAKE2B bbe7f9600061416227276424eb220714a1375d3e295cb0c5b7f76074324c1a2698a5029dde3e734331e9caf02d8a086273ded2ab09285857dbbfe3ad83506912 SHA512 8cef09755f4efe68db69591967e495852cf63c2d8113a877a2254f536d38c60b6dc864c07089249cd8109a8408672a297ae9e59d8233687bc2796dc158ccfb32
-EBUILD tiff-4.5.0-r1.ebuild 2708 BLAKE2B 4fd2681bfed4dae10cbafc85014b8b9167b52a033cfc3f70b65669d7794c70f90c0e2e0342c32d6bcf62f0d500514f198e0b313df60aa0cea38448c09130a1dd SHA512 8f9749eae6275f6c24de3908f11dbf04ce2b3437414a34647a5eba0ee026c37c8fdcbee532d150d2a32fd997f18658a03885e3ccb4acae17097f4f3ac5e358e4
 EBUILD tiff-4.5.0-r2.ebuild 2906 BLAKE2B e66af91aae12e8300061eabd86dec0427e5c7656db93b632048724e701a8680a3f35c7f5353fe7f8360ca02c1b3859414911366de601f6767a2ce06235505911 SHA512 49bd486daa852706a2eb40207b36bccc706778c38ce6ff5b3a5fda231850ff09a07a868c52728dd5e6de1e7e7182ac55cc67883de12a8e6753cbaadd436195ef
-EBUILD tiff-4.5.0.ebuild 2652 BLAKE2B 88e1bf84ab026017b08f58e2086e2a9a13d06516f2e8981840494e5e3b1d4e532bf7d98b9347bcf4be3c37d68a425f52d125e546024e26712b383bb8c8f43bae SHA512 c97fcf9aa837999e3b9f15480c1bb1fe60c2688d3e7b06da4c8923cc0aa421089e7f5f9fa6d928920654e713d51b417f92e34dd10f246da383a071ca13566803
 MISC metadata.xml 615 BLAKE2B b76f8c2714111fe539c2d15b56361bc3b2bc7469b3cd74cf933a9dad4ac8577b7bb1a2bc010ceb3623640778d1dbc912433988e938db7df8f8fca67c51003c2c SHA512 81b22e0e2763fbcd573d2c1fee362785c15c7c33cc00d0f7ce89eb9f95f55e64aee78eefc51de6d7270aa966102b744f070620828becbbb03012cc22e3e99469
diff --git a/media-libs/tiff/tiff-4.5.0-r1.ebuild b/media-libs/tiff/tiff-4.5.0-r1.ebuild
deleted file mode 100644
index bbbf78771312..000000000000
--- a/media-libs/tiff/tiff-4.5.0-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QA_PKGCONFIG_VERSION="$(ver_cut 1-3)"
-
-# Release signer can vary per version but not clear if others will be doing
-# them in future, so gone with Even Rouault for now as he does other geosci
-# stuff too like PROJ, GDAL. Previous release manager of TIFF was
-# GraphicsMagick maintainer Bob Friesenhahn. Please be careful when verifying
-# who made releases.
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/rouault.asc
-inherit autotools multilib-minimal verify-sig flag-o-matic
-
-MY_P="${P/_rc/rc}"
-DESCRIPTION="Tag Image File Format (TIFF) library"
-HOMEPAGE="http://libtiff.maptools.org"
-SRC_URI="https://download.osgeo.org/libtiff/${MY_P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://download.osgeo.org/libtiff/${MY_P}.tar.xz.sig )"
-S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
-
-LICENSE="libtiff"
-SLOT="0/6"
-if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
-RESTRICT="!test? ( test )"
-
-# bug #483132
-REQUIRED_USE="test? ( jpeg )"
-
-RDEPEND="jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
-	jpeg? ( media-libs/libjpeg-turbo:=[${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}"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-evenrouault )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/tiffconf.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.5.0_rc1-skip-tools-tests-multilib.patch
-	"${FILESDIR}"/${PN}-4.5.0-CVE-2022-48281.patch
-)
-
-src_prepare() {
-	default
-
-	# Added to fix cross-compilation
-	#elibtoolize
-
-	# For skip-tools-tests-multilib.patch
-	eautoreconf
-}
-
-multilib_src_configure() {
-	append-lfs-flags
-
-	local myeconfargs=(
-		--disable-sphinx
-		--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 test tests)
-		$(use_enable webp)
-		$(use_enable zlib)
-		$(use_enable zstd)
-
-		$(multilib_native_enable docs)
-		$(multilib_native_enable contrib)
-		$(multilib_native_enable tools)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name '*.la' -delete || die
-	rm "${ED}"/usr/share/doc/${PF}/{README*,RELEASE-DATE,TODO,VERSION} || die
-}
diff --git a/media-libs/tiff/tiff-4.5.0.ebuild b/media-libs/tiff/tiff-4.5.0.ebuild
deleted file mode 100644
index 0e31fbfa8e30..000000000000
--- a/media-libs/tiff/tiff-4.5.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QA_PKGCONFIG_VERSION="$(ver_cut 1-3)"
-
-# Release signer can vary per version but not clear if others will be doing
-# them in future, so gone with Even Rouault for now as he does other geosci
-# stuff too like PROJ, GDAL. Previous release manager of TIFF was
-# GraphicsMagick maintainer Bob Friesenhahn. Please be careful when verifying
-# who made releases.
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/rouault.asc
-inherit autotools multilib-minimal verify-sig flag-o-matic
-
-MY_P="${P/_rc/rc}"
-DESCRIPTION="Tag Image File Format (TIFF) library"
-HOMEPAGE="http://libtiff.maptools.org"
-SRC_URI="https://download.osgeo.org/libtiff/${MY_P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://download.osgeo.org/libtiff/${MY_P}.tar.xz.sig )"
-S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
-
-LICENSE="libtiff"
-SLOT="0/6"
-if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
-RESTRICT="!test? ( test )"
-
-# bug #483132
-REQUIRED_USE="test? ( jpeg )"
-
-RDEPEND="jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
-	jpeg? ( media-libs/libjpeg-turbo:=[${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}"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-evenrouault )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/tiffconf.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.5.0_rc1-skip-tools-tests-multilib.patch
-)
-
-src_prepare() {
-	default
-
-	# Added to fix cross-compilation
-	#elibtoolize
-
-	# For skip-tools-tests-multilib.patch
-	eautoreconf
-}
-
-multilib_src_configure() {
-	append-lfs-flags
-
-	local myeconfargs=(
-		--disable-sphinx
-		--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 test tests)
-		$(use_enable webp)
-		$(use_enable zlib)
-		$(use_enable zstd)
-
-		$(multilib_native_enable docs)
-		$(multilib_native_enable contrib)
-		$(multilib_native_enable tools)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name '*.la' -delete || die
-	rm "${ED}"/usr/share/doc/${PF}/{README*,RELEASE-DATE,TODO,VERSION} || die
-}
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index f9bce808b146..f8689ccd2a8b 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -8,7 +8,7 @@ AUX vigra-1.11.1-python-syntax.patch 2590 BLAKE2B 4465e2eecaddc0d8b74f62143fe9fc
 AUX vigra-1.11.1-python3.7.patch 1254 BLAKE2B 24e23db29992efa86154edb402e250c782160ba5208fd7b2dd1c1eb0526b51633014cd488b5f8abd808bb2fc54b20866111281447fc45683d70a9a8bd93f0854 SHA512 9cbaacf2b6e3bd892b930c48d2371fe96b9cfecc69c8d0c982972c412f1157a73648672f42e73df1cd5ce0753c69907faaca38e35bdd54952a753af7054e17fe
 AUX vigra-1.11.1-sphinx.ext.pngmath.patch 1411 BLAKE2B 6ffdd2f40ac982d693a6e71a89754d453202ba70e6ae65b3b45d64add3d2cc7a9710773e94b0604cb67dadb53ea27912ccce7fe844e6264f7c989bb96149cbcc SHA512 4e0ade84985ecc9c7c45afd949671b9cbc041db486c29732b17c1b62eadfdf6e299396a18686c03c3ed4e2b3ac6d830a8e224c56e3b8d20361c2f5e5fcc14650
 DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
-EBUILD vigra-1.11.1-r8.ebuild 3738 BLAKE2B 11e22c648ae55e79e22dc210e31476b8f48aa157a2c2d60bec4142ef35c445c114933d9add0259d18a0e3eaad6232b134fc83f4166f1af84fde89ad1a3c7dcc1 SHA512 883d9ae51f5568f248a2ac6c1ebbc6f339031a6ad8bb63885b9b0b31452efc29c1f5d6e206695c9fff1bddff4a0ad14ae1d4bed1b565647c2c7d818d8f9ff4c2
-EBUILD vigra-1.11.1-r9.ebuild 3778 BLAKE2B 88f60aac93c5ab50dc69d43cdce9f9cefde5e532ce226a2683c450a90aaeff04a72b32c40105a1c32c80392cabe1e9f3d80f2ff5d240952279e58f5968dde476 SHA512 0a1fe6b69c8827251175e6b42edd44d5d32cf62b6045f4d21ad309410cfd155d448f0d0a45c6728a41b7f252a058b110e927488c923a4cc01ad6c00316363404
-EBUILD vigra-9999.ebuild 3518 BLAKE2B de41149d0c91867186d55b778d6fd5d27359ba6273ac4aa6543f881cc168a95ebdef13f4591bf797bc5b17951f2d4fe05c3d1b7f777d11ebbfd2ed22ad366eb3 SHA512 c6968e79b8a14b77a32039113f18c422c3ac1169217cce14e43353989c9370d69bd5c8145e87659f862091daa645b4be0d0a5626b5eeb881230701b3bbf0d7e2
-MISC metadata.xml 414 BLAKE2B bcbbb527644261523508734e3c7b317cbb77ea247c72941e92cf9eaa711e74ad86ee75126d9c719814ee1f006a2778a92c6e393de24ab30844a78bc86f3ff525 SHA512 aab36cff2d1cec9819f81da7cd1580d9bcffb93ad90d0f499462913b7e85ebc953b5bccc036d329d8246102fd4a9663c48688246c7bcf7c8da18937721a3e821
+EBUILD vigra-1.11.1-r8.ebuild 3704 BLAKE2B 43e7b0d410d2c74a97d84beb7793d606eb9d4d39e281dbcf78bb7b81aa834cf0adb0d926377cbbc270afade683e692e9b18ef878daf0ef3e8f4b0b9b0fcce447 SHA512 5ea96276ca6653e126a6e5996106ddfbde61b749e6159bd3d7dc75cc655d9551bc0c3a14514ded0a41a338a28e58667972273edb30ef763fddeed2ff3fd479d2
+EBUILD vigra-1.11.1-r9.ebuild 3744 BLAKE2B fdda5deaf313364556ddaea8afcfab18b402f4e6f2d8354bb07fa96ef10478c32d58d02d8724c7561299a4fcc13e2002d6143183ce88ea5a2429700f931654be SHA512 85b48dfc3901e8fbc021c9ce3772b0209df84fddc6be655e3f8e08104849a343ff636964f4217517abf6943688420c85c1831bce79df5351ddad9c26d93f9b86
+EBUILD vigra-9999.ebuild 3484 BLAKE2B 134148a0e733cb4c3f6f9a952908feb924842bdf33e27135ad24faa3d528316bd16d0ad2d8a71e276805f7b11225bef3346aa92f651d342057c0f13edc30fe8c SHA512 10eaa67a2c72f9139a85f4540cbe59f3a59366288ad38ecb7aa7fb4ff46c0abcff8ae77cc3b8bb4856b2898e3acaabe5b2e9e0482069e7193809e4759bdc11b0
+MISC metadata.xml 338 BLAKE2B ce8cddf2fde724bf72d4e61054b4cbe18f40a34e02b34326d227a184d9eac1133bffc48a373f8d2bcc5c5d13de30263c3029a566db9fd6d4442f779be8e97ef7 SHA512 e4242661592f929fdba417b1fa4c176db354d82c7eeb9324a3a6102d3fb405267411e27313666fd9201af1da49de9c1319179c42017273932365113ddcd5a4a5
diff --git a/media-libs/vigra/metadata.xml b/media-libs/vigra/metadata.xml
index 14449893ddbe..42f024b353cf 100644
--- a/media-libs/vigra/metadata.xml
+++ b/media-libs/vigra/metadata.xml
@@ -5,9 +5,6 @@
 		<email>printing@gentoo.org</email>
 		<name>Gentoo Printing Project</name>
 	</maintainer>
-	<use>
-		<flag name="valgrind">Enable valgrind in make check</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">ukoethe/vigra</remote-id>
 	</upstream>
diff --git a/media-libs/vigra/vigra-1.11.1-r8.ebuild b/media-libs/vigra/vigra-1.11.1-r8.ebuild
index 2c819e907573..8e05bebbabd4 100644
--- a/media-libs/vigra/vigra-1.11.1-r8.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r8.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
+IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff +zlib"
 
 REQUIRED_USE="
 	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
@@ -29,7 +29,6 @@ REQUIRED_USE="
 BDEPEND="
 	test? (
 		>=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
-		valgrind? ( dev-util/valgrind )
 	)
 "
 # runtime dependency on python is required by the vigra-config script
@@ -113,7 +112,7 @@ src_configure() {
 			-DDOCINSTALL="share/doc/${PF}/html"
 			-DWITH_HDF5=$(usex hdf5)
 			-DWITH_OPENEXR=$(usex openexr)
-			-DWITH_VALGRIND=$(usex valgrind)
+			-DWITH_VALGRIND=OFF # only used for tests
 			-DWITH_VIGRANUMPY=$(usex python)
 		)
 		cmake_src_configure
diff --git a/media-libs/vigra/vigra-1.11.1-r9.ebuild b/media-libs/vigra/vigra-1.11.1-r9.ebuild
index beb3622e9ca0..ef5236cfe1b7 100644
--- a/media-libs/vigra/vigra-1.11.1-r9.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r9.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
+IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff +zlib"
 
 REQUIRED_USE="
 	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
@@ -29,7 +29,6 @@ REQUIRED_USE="
 BDEPEND="
 	test? (
 		>=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
-		valgrind? ( dev-util/valgrind )
 	)
 "
 # runtime dependency on python is required by the vigra-config script
@@ -114,7 +113,7 @@ src_configure() {
 			-DDOCINSTALL="share/doc/${PF}/html"
 			-DWITH_HDF5=$(usex hdf5)
 			-DWITH_OPENEXR=$(usex openexr)
-			-DWITH_VALGRIND=$(usex valgrind)
+			-DWITH_VALGRIND=OFF # only used for tests
 			-DWITH_VIGRANUMPY=$(usex python)
 		)
 		cmake_src_configure
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 9d414e9529c7..5a2feab44ca9 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
+IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff +zlib"
 
 REQUIRED_USE="
 	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
@@ -29,7 +29,6 @@ REQUIRED_USE="
 BDEPEND="
 	test? (
 		>=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
-		valgrind? ( dev-util/valgrind )
 	)
 "
 # runtime dependency on python is required by the vigra-config script
@@ -107,7 +106,7 @@ src_configure() {
 			-DDOCINSTALL="share/doc/${PF}/html"
 			-DWITH_HDF5=$(usex hdf5)
 			-DWITH_OPENEXR=$(usex openexr)
-			-DWITH_VALGRIND=$(usex valgrind)
+			-DWITH_VALGRIND=OFF # only used for tests
 			-DWITH_VIGRANUMPY=$(usex python)
 		)
 		cmake_src_configure