stable!

5 files changed, 2 insertions, 56 deletions

diff --git a/media-libs/sdl-image/files/digest-sdl-image-1.2.2 b/media-libs/sdl-image/files/digest-sdl-image-1.2.2
deleted file mode 100644
index 5d2832c9506d..000000000000
--- a/media-libs/sdl-image/files/digest-sdl-image-1.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d07cb8f3f0e8bbb645ef8369d96eb7db SDL_image-1.2.2.tar.gz 649146
diff --git a/media-libs/sdl-image/files/digest-sdl-image-1.2.3 b/media-libs/sdl-image/files/digest-sdl-image-1.2.3
deleted file mode 100644
index d6b396b2d69e..000000000000
--- a/media-libs/sdl-image/files/digest-sdl-image-1.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d55826ffbd2bdc48b09cc64a9ed9e59e SDL_image-1.2.3.tar.gz 636747
diff --git a/media-libs/sdl-image/sdl-image-1.2.2.ebuild b/media-libs/sdl-image/sdl-image-1.2.2.ebuild
deleted file mode 100644
index 9f4712d2b099..000000000000
--- a/media-libs/sdl-image/sdl-image-1.2.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-image/sdl-image-1.2.2.ebuild,v 1.13 2004/07/14 20:26:46 agriffis Exp $
-
-MY_P="${P/sdl-/SDL_}"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="image file loading library"
-SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_image/index.html"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="x86 ppc sparc amd64"
-IUSE=""
-
-DEPEND=">=media-libs/libpng-1.2.1
-	>=media-libs/jpeg-6b
-	>=media-libs/libsdl-1.2"
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/media-libs/sdl-image/sdl-image-1.2.3-r1.ebuild b/media-libs/sdl-image/sdl-image-1.2.3-r1.ebuild
index 8b7447aa9003..80079cb657ad 100644
--- a/media-libs/sdl-image/sdl-image-1.2.3-r1.ebuild
+++ b/media-libs/sdl-image/sdl-image-1.2.3-r1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-image/sdl-image-1.2.3-r1.ebuild,v 1.4 2004/08/12 00:36:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-image/sdl-image-1.2.3-r1.ebuild,v 1.5 2004/11/03 00:15:41 vapier Exp $
 
 inherit gnuconfig
 
-
 MY_P="${P/sdl-/SDL_}"
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="image file loading library"
@@ -13,7 +12,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ppc64"
+KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
 IUSE="gif jpeg tiff png"
 
 DEPEND="sys-libs/zlib
diff --git a/media-libs/sdl-image/sdl-image-1.2.3.ebuild b/media-libs/sdl-image/sdl-image-1.2.3.ebuild
deleted file mode 100644
index 6ecc2555b3cc..000000000000
--- a/media-libs/sdl-image/sdl-image-1.2.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-image/sdl-image-1.2.3.ebuild,v 1.10 2004/10/17 11:29:29 absinthe Exp $
-
-MY_P="${P/sdl-/SDL_}"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="image file loading library"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_image/index.html"
-SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc alpha hppa amd64 ~mips"
-IUSE=""
-
-DEPEND=">=media-libs/libpng-1.2.1
-	>=media-libs/jpeg-6b
-	>=media-libs/libsdl-1.2.4
-	sys-libs/zlib"
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc CHANGES README
-}