clean out old, vulnerable ebuild (bug #255217)

(Portage version: 2.1.6.7/cvs/Linux i686)

4 files changed, 6 insertions, 112 deletions

diff --git a/media-libs/devil/ChangeLog b/media-libs/devil/ChangeLog
index 130c5c4fa97f..14f6255e2f6b 100644
--- a/media-libs/devil/ChangeLog
+++ b/media-libs/devil/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/devil
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/ChangeLog,v 1.35 2009/02/25 16:15:59 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/ChangeLog,v 1.36 2009/02/25 16:24:24 mr_bones_ Exp $
+
+  25 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/devil-1.6.7-png-types.patch, -files/devil-1.6.7-sdl-checks.patch,
+  -devil-1.6.7-r2.ebuild:
+  clean out old, vulnerable ebuild (bug #255217)
 
   25 Feb 2009; Tobias Scherbaum <dertobi123@gentoo.org> devil-1.7.7.ebuild:
   ppc stable, bug #255217
diff --git a/media-libs/devil/devil-1.6.7-r2.ebuild b/media-libs/devil/devil-1.6.7-r2.ebuild
deleted file mode 100644
index 44c3d264d093..000000000000
--- a/media-libs/devil/devil-1.6.7-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/devil-1.6.7-r2.ebuild,v 1.3 2008/11/29 16:42:39 tupone Exp $
-
-inherit autotools eutils
-
-DESCRIPTION="DevIL image library"
-HOMEPAGE="http://openil.sourceforge.net/"
-SRC_URI="mirror://sourceforge/openil/DevIL-${PV}.tar.gz
-	mirror://gentoo/${P}-gcc42.patch.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc sparc x86"
-IUSE="gif jpeg mng png tiff xpm allegro opengl sdl X"
-
-RDEPEND="gif? ( media-libs/giflib )
-	jpeg? ( media-libs/jpeg )
-	mng? ( media-libs/libmng )
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	xpm? ( x11-libs/libXpm )
-	allegro? ( media-libs/allegro )
-	opengl? ( virtual/glu )
-	sdl? ( media-libs/libsdl )
-	X? ( x11-libs/libXext )"
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xextproto )"
-
-S=${WORKDIR}/DevIL-${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch \
-		"${FILESDIR}"/${P}-png-types.patch \
-		"${FILESDIR}"/${P}-sdl-checks.patch \
-		"${WORKDIR}"/${P}-gcc42.patch
-	sed -i \
-		-e 's/<il/<IL/' \
-		include/IL/il_wrap.h \
-		|| die "sed failed"
-	eautoconf
-}
-
-src_compile() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable gif) \
-		$(use_enable jpeg) \
-		$(use_enable mng) \
-		$(use_enable png) \
-		$(use_enable tiff) \
-		$(use_enable xpm) \
-		$(use_enable allegro) \
-		$(use_enable opengl) \
-		$(use_enable sdl) \
-		$(use_with X x) \
-		--disable-directx \
-		--disable-win32 \
-		--enable-static \
-		|| die
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS BUGS CREDITS ChangeLog* NEWS* README*
-}
diff --git a/media-libs/devil/files/devil-1.6.7-png-types.patch b/media-libs/devil/files/devil-1.6.7-png-types.patch
deleted file mode 100644
index 41bf7c868865..000000000000
--- a/media-libs/devil/files/devil-1.6.7-png-types.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Make sure the internal types match that of png.
-
-http://bugs.gentoo.org/83603
-
---- src-IL/src/il_png.c
-+++ src-IL/src/il_png.c
-@@ -284,7 +284,8 @@
- {
- 	ILuint		i;
- 	png_bytepp	row_pointers = NULL;
--	ILuint		width, height, channels;
-+	ILuint		channels;
-+	png_uint_32	width, height;
- 	ILdouble	screen_gamma = 1.0, image_gamma;
- 	ILuint		bit_depth;
- 
diff --git a/media-libs/devil/files/devil-1.6.7-sdl-checks.patch b/media-libs/devil/files/devil-1.6.7-sdl-checks.patch
deleted file mode 100644
index 263ed311a5dc..000000000000
--- a/media-libs/devil/files/devil-1.6.7-sdl-checks.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Disable SDL if not used
-
-Patch by Henrik Dohlmann
-
-http://bugs.gentoo.org/113441
-
---- configure.in
-+++ configure.in
-@@ -587,9 +587,14 @@
- dnl
- 
- dnl Check for SDL
--AM_PATH_SDL(1.2.5,,)
--HSDL="$SDL_CFLAGS"
--LIBSDL="$SDL_LIBS"
-+if test "$use_sdl" = "yes" ; then
-+  AM_PATH_SDL(1.2.5,,)
-+  HSDL="$SDL_CFLAGS"
-+  LIBSDL="$SDL_LIBS"
-+else
-+  HSDL=""
-+  LIBSDL=""
-+fi
- AC_SUBST(LIBSDL)
- AC_SUBST(HSDL)
-