[gentoo-commits] repo/gentoo:master commit in: media-libs/devil/

[David Seifert]

commit:     fedbebb26ce07664502175740d5d8dfd34725785
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed May 11 14:14:40 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed May 11 14:14:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fedbebb2

media-libs/devil: remove USE=nvtt

Bug: https://bugs.gentoo.org/770760
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...devil-1.7.8-r3.ebuild => devil-1.7.8-r4.ebuild} | 24 +++++++++++++---------
 media-libs/devil/metadata.xml                      | 21 +++++++++----------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/media-libs/devil/devil-1.7.8-r3.ebuild b/media-libs/devil/devil-1.7.8-r4.ebuild
similarity index 86%
rename from media-libs/devil/devil-1.7.8-r3.ebuild
rename to 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@g.o</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@g.o</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>