gentoo resync : 12.05.2022

4 files changed, 26 insertions, 114 deletions

diff --git a/media-libs/devil/Manifest b/media-libs/devil/Manifest
index 219c859f696e..4333680f6900 100644
--- a/media-libs/devil/Manifest
+++ b/media-libs/devil/Manifest
@@ -6,6 +6,5 @@ AUX devil-1.7.8-libpng14.patch 1221 BLAKE2B 970fa563cbfc333b7529392d52d1cd640ed7
 AUX devil-1.7.8-nvtt-glut.patch 2493 BLAKE2B 4f96f75a6a49c1cdd4b3b89101be693ce4aa851c54aed3d09db752cece3c909085a53ef26e530dad70c70c00b522656ee4b2d6f5c3f83a22244d7eb4999d6566 SHA512 c9adacd0b2c2c1d8980ee87b69b27f0bd3f7f3285ef695499ee90bf4aff55cd8f65c990590478a45d02257c8bb9f01ccc463afe9313efe31a02ee67e15b3207f
 AUX devil-1.7.8-restrict.patch 587 BLAKE2B 265496bb262c945812182764903497d3b4b851eb48980d32197a7d732337ded032272544f7aef1cd725a796093ed274bf38b43bb4138b3bf199de2601a9c5732 SHA512 9370a94406e98979266d027857d7dd04069eefb6e2ccfb52d254b9eb658d932e5e7e9bd3a38aad57099b870c54aaa0a2d8b337f9bad42d06f6521c10d0a6f8db
 DIST DevIL-1.7.8.tar.gz 2051993 BLAKE2B 7c06549f7d90965fe6dcd7c6b460119a8491ca50f3103c745195fa5483885878717e9ae417eda51f25cbb60c0a96be180b12727115212709199ded13156ecb3e SHA512 a67e1488d6cb366431d9fcb460b8fe5b8a1dd79426ac77f8abd0db4a5aad7512697f72ef0c49ddb0e806469cc37ba1319e10ccd2ebd73942332df2c3c507458e
-EBUILD devil-1.7.8-r2.ebuild 2142 BLAKE2B d9ef2e6223ea2de918726a6f73f6cb342aea5a092be8a2e0ead630bcf0ef31af3f6ef79ef043c0e9eca2b8701d9ce2462b801bb8405acc92f0c6aacfc1dab14a SHA512 0539a865a64ffc14e0afec959e28277c81bd83f1c4e31155bd43b24429000e983e839e71c8b8639b2145ee374d94ec2c0501b9752b9bb01483c87d5f910331e4
-EBUILD devil-1.7.8-r3.ebuild 2160 BLAKE2B 570703c1faf8fb03c0b112e36b7246cdbdfd3e7bdb6257c5e7470bfbb855b8871687e35455c0305127fe52a9c02ed4429eb2aab7cb65d3591d80935afe8f462d SHA512 91b32333c10c9dc2e35018660d1165b88e2a3d236806d8ccc4bc9cbfaf04295147aa993db6675fbf632123be4dac4d76005deb9a4d8267cb2a92b1b50c716b83
-MISC metadata.xml 500 BLAKE2B ea23c56af001f0fc76e8f5a1e718a7fe7f011139bed10081f9a1b220b82f43da353722fe3e6a80fa8de7162d7c55da109617df50f428a0b973ddf1bfe27158d5 SHA512 7902a135b51029e4cf8fe5f9baf5e38250d5e471d820b98b9440a0be72c90902694b89e8d32de1d8e595384642ade6a7435aeba85c928e6d3f4cacde72925dc6
+EBUILD devil-1.7.8-r4.ebuild 2131 BLAKE2B 85c969d64a766a4141b6f9140fae95a2742c522eb9461af896bfd863e2faf363466451c8c5856d5f99148611551ea6f817f09e0780a0f3ac80077cbc2907003a SHA512 4acf8115f3238d73d84b1c7fbef9ca0b4893baaa0fd6f7eddf2d0fe1e440e05a0bff089f4365e52042489b27d30b972bb10dafd03d31cd3658ebb86192d119ce
+MISC metadata.xml 399 BLAKE2B 2c15e4e1bc8e8252fdf09f8a8efd4e0f5ad5c50b4680854dc971535afc4685b20f271d3a172176694911d7bdd57e8f61e390cbf06cecf19b3f00f3c50cda0e53 SHA512 2fc67e0217b66285f8b29157ae9630245b59bfd0e989b045705e54fe95b86d870933db9f820932ddbbb51b230433a12a98a57f52baa6f9944325c5f34835e3f1
diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild b/media-libs/devil/devil-1.7.8-r2.ebuild
deleted file mode 100644
index 2e70bc70215e..000000000000
--- a/media-libs/devil/devil-1.7.8-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MY_P=DevIL-${PV}
-
-DESCRIPTION="DevIL image library"
-HOMEPAGE="http://openil.sourceforge.net/"
-SRC_URI="mirror://sourceforge/openil/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv x86"
-IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg mng nvtt openexr opengl png sdl static-libs tiff X xpm"
-
-RDEPEND="
-	allegro? ( media-libs/allegro:0 )
-	gif? ( media-libs/giflib:= )
-	glut? ( media-libs/freeglut )
-	jpeg? ( virtual/jpeg:0 )
-	mng? ( media-libs/libmng:= )
-	nvtt? ( media-gfx/nvidia-texture-tools )
-	openexr? ( media-libs/openexr:= )
-	opengl? ( virtual/opengl
-		virtual/glu )
-	png? ( media-libs/libpng:0= )
-	sdl? ( media-libs/libsdl )
-	tiff? ( media-libs/tiff:0 )
-	X? ( x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXrender )
-	xpm? ( x11-libs/libXpm )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-PATCHES=(
-	"${FILESDIR}/${P}"-CVE-2009-3994.patch
-	"${FILESDIR}/${P}"-libpng14.patch
-	"${FILESDIR}/${P}"-nvtt-glut.patch
-	"${FILESDIR}/${P}"-ILUT.patch
-	"${FILESDIR}/${P}"-restrict.patch
-	"${FILESDIR}/${P}"-fix-test.patch
-	"${FILESDIR}/${P}"-jasper-remove-uchar.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--disable-lcms \
-		--enable-ILU \
-		--enable-ILUT \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable openexr exr) \
-		$(use_enable gif) \
-		$(use_enable jpeg) \
-		--enable-jp2 \
-		$(use_enable mng) \
-		$(use_enable png) \
-		$(use_enable tiff) \
-		$(use_enable xpm) \
-		$(use_enable allegro) \
-		--disable-directx8 \
-		--disable-directx9 \
-		$(use_enable opengl) \
-		$(use_enable sdl) \
-		$(use_enable X x11) \
-		$(use_enable X shm) \
-		$(use_enable X render) \
-		$(use_enable glut) \
-		$(use_with X x) \
-		$(use_with nvtt)
-}
-
-src_install() {
-	default
-
-	# package provides .pc files
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/devil/devil-1.7.8-r3.ebuild b/media-libs/devil/devil-1.7.8-r4.ebuild
index 113a199ada8a..4abab857c9b5 100644
--- a/media-libs/devil/devil-1.7.8-r3.ebuild
+++ b/media-libs/devil/devil-1.7.8-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/openil/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv x86"
-IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg mng nvtt opengl png sdl static-libs tiff X xpm"
+IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg mng opengl png sdl static-libs tiff X xpm"
 
 # OpenEXR support dropped b/c no support for OpenEXR 3
 # See bug #833833
@@ -22,21 +22,25 @@ RDEPEND="
 	allegro? ( media-libs/allegro:0 )
 	gif? ( media-libs/giflib:= )
 	glut? ( media-libs/freeglut )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	mng? ( media-libs/libmng:= )
-	nvtt? ( media-gfx/nvidia-texture-tools )
-	opengl? ( virtual/opengl
-		virtual/glu )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+	)
 	png? ( media-libs/libpng:0= )
 	sdl? ( media-libs/libsdl )
 	tiff? ( media-libs/tiff:0 )
-	X? ( x11-libs/libXext
+	X? (
+		x11-libs/libXext
 		x11-libs/libX11
-		x11-libs/libXrender )
+		x11-libs/libXrender
+	)
 	xpm? ( x11-libs/libXpm )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
+DEPEND="
+	${RDEPEND}
 	X? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${P}"-CVE-2009-3994.patch
@@ -80,7 +84,7 @@ src_configure() {
 		$(use_enable X render) \
 		$(use_enable glut) \
 		$(use_with X x) \
-		$(use_with nvtt)
+		--without-nvtt
 }
 
 src_install() {
diff --git a/media-libs/devil/metadata.xml b/media-libs/devil/metadata.xml
index 58783541108a..5b50790d86f4 100644
--- a/media-libs/devil/metadata.xml
+++ b/media-libs/devil/metadata.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="allegro">Add support for Allegro</flag>
-    <flag name="nvtt">Add support for <pkg>media-gfx/nvidia-texture-tools</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">openil</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="allegro">Add support for Allegro</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">openil</remote-id>
+	</upstream>
 </pkgmetadata>