version bump; remove old and vulnerable versions; thanks to testing in #112496

(Portage version: 2.1_pre7-r5)

22 files changed, 35 insertions, 304 deletions

diff --git a/media-libs/libextractor/ChangeLog b/media-libs/libextractor/ChangeLog
index 4799a6216ab1..7052a81cfd98 100644
--- a/media-libs/libextractor/ChangeLog
+++ b/media-libs/libextractor/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-libs/libextractor
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/ChangeLog,v 1.26 2006/01/17 02:31:24 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/ChangeLog,v 1.27 2006/04/25 05:10:17 squinky86 Exp $
+
+*libextractor-0.5.12 (25 Apr 2006)
+
+  25 Apr 2006; Jon Hood <squinky86@gentoo.org>
+  -files/libextractor-0.2.2-vorbisfile.patch,
+  -files/libextractor-0.5.0-autotools.patch, -libextractor-0.2.2.ebuild,
+  -libextractor-0.3.3.ebuild, -libextractor-0.3.5.ebuild,
+  -libextractor-0.3.7.ebuild, -libextractor-0.4.2.ebuild,
+  -libextractor-0.5.0.ebuild, -libextractor-0.5.4.ebuild,
+  -libextractor-0.5.6a.ebuild, +libextractor-0.5.12.ebuild:
+  Version bump. Remove old and vulnerable versions.
 
   17 Jan 2006; Jason Wever <weeve@gentoo.org> libextractor-0.5.9.ebuild:
   Stable on SPARC wrt security bug #118665.
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index 8b36045eb827..303cdda56365 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -1,22 +1,18 @@
-MD5 9dea765f1d45b0564d1e4cff95c28d98 ChangeLog 5626
-MD5 b90f0423c61f6eb4c163b2c40074012d files/digest-libextractor-0.2.2 71
-MD5 1ea1d4b11ffc88ff52337b6be2c18bdd files/digest-libextractor-0.3.3 72
-MD5 d23f8f18934cc39aac8c79d79103427c files/digest-libextractor-0.3.5 72
-MD5 50b33c38f49cd6a827c2763e19f572c5 files/digest-libextractor-0.3.7 72
-MD5 3ba510126b95cfdc0c77bfd3a03a9243 files/digest-libextractor-0.4.2 72
-MD5 9dcd1291fbfdc404ff1bb00b71258aa2 files/digest-libextractor-0.5.0 72
-MD5 d34bd3053ea54d9b482af8ff31d43f01 files/digest-libextractor-0.5.4 71
-MD5 7c027835ee6a775fac1af3ade942137a files/digest-libextractor-0.5.6a 72
-MD5 2e86a19d705ad7bf42ff30bc1d58b693 files/digest-libextractor-0.5.9 71
-MD5 32663ad54db490287bc8276e29dea25b files/libextractor-0.2.2-vorbisfile.patch 499
-MD5 5b364c8b7c41b3fe78817bbcbded91c0 files/libextractor-0.5.0-autotools.patch 1958
-MD5 16626e3d2d350009e96954cff4c80120 libextractor-0.2.2.ebuild 939
-MD5 fd2dfd00c6f5692cc629a7fd2dffbef7 libextractor-0.3.3.ebuild 886
-MD5 a69ca7351ffd2909b443664fd2d804ca libextractor-0.3.5.ebuild 805
-MD5 2e30b7243f3b6fd1c2748f57e8fd8658 libextractor-0.3.7.ebuild 807
-MD5 5b9850bc18e28f1f2d60761e88138797 libextractor-0.4.2.ebuild 796
-MD5 0ba45599949666ec40b0e75fda81b006 libextractor-0.5.0.ebuild 951
-MD5 275f7c9aaa1c1943b858fb4ace3561f6 libextractor-0.5.4.ebuild 1013
-MD5 ffe3b4684abca90a34dfbcf66b77e2e4 libextractor-0.5.6a.ebuild 1011
+MD5 204598966f37be2e794d68a36c46170b ChangeLog 6115
+RMD160 23743ba5ffb4880c9531379bfa79ad0467861112 ChangeLog 6115
+SHA256 31d1c9c4da9c584620f56f3f552c88bcc0da929442fe3cabca1b014089edcc9a ChangeLog 6115
+MD5 b74f900da231e7c6c8ae518ca0d2ccd6 files/digest-libextractor-0.5.12 262
+RMD160 8a22a020ea51abe9791836e9d3f591cb6aa0798b files/digest-libextractor-0.5.12 262
+SHA256 e50f29ea2427aadc8394984700dee7cb8980adc192e2024080c6d34fd5053aca files/digest-libextractor-0.5.12 262
+MD5 04946a27fbbe28393456a9c13d351f98 files/digest-libextractor-0.5.9 259
+RMD160 eb17228432a85698e1f526b0427d49802da4e33b files/digest-libextractor-0.5.9 259
+SHA256 faad31458d3f8289d353bdbe6b85ef6bd032e6987740d06e666288f3d013f089 files/digest-libextractor-0.5.9 259
+MD5 b75f699e468a3b2a634b2f29ea78be6f libextractor-0.5.12.ebuild 1013
+RMD160 c517576d170c3894e6bd6db422081194006925e0 libextractor-0.5.12.ebuild 1013
+SHA256 cbf58ee69326444e761014f013e0d4ad69b6f3426a75befd699a75491568fcff libextractor-0.5.12.ebuild 1013
 MD5 067eff0026d6d578e0d3228007e315b1 libextractor-0.5.9.ebuild 1011
+RMD160 079c4c98ce4b07531f97500a6d4bdd91fdc0b7aa libextractor-0.5.9.ebuild 1011
+SHA256 299d422994fd10ab3ec34dfdb6d9a2a19da1f0fe738ac49e875eb379ef1ac136 libextractor-0.5.9.ebuild 1011
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
+RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160
+SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f metadata.xml 160
diff --git a/media-libs/libextractor/files/digest-libextractor-0.2.2 b/media-libs/libextractor/files/digest-libextractor-0.2.2
deleted file mode 100644
index 8113460a7056..000000000000
--- a/media-libs/libextractor/files/digest-libextractor-0.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6a617614dfe4606c1772d3ceac557dcb libextractor-0.2.2.tar.bz2 336286
diff --git a/media-libs/libextractor/files/digest-libextractor-0.3.3 b/media-libs/libextractor/files/digest-libextractor-0.3.3
deleted file mode 100644
index 97d7ac4129fe..000000000000
--- a/media-libs/libextractor/files/digest-libextractor-0.3.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 74e76aa0f61d1ae36fb73d1144385606 libextractor-0.3.3.tar.bz2 6031542
diff --git a/media-libs/libextractor/files/digest-libextractor-0.3.5 b/media-libs/libextractor/files/digest-libextractor-0.3.5
deleted file mode 100644
index abf2f343dfb9..000000000000
--- a/media-libs/libextractor/files/digest-libextractor-0.3.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 13c5a5b65e61c2603508b26b362d9ac1 libextractor-0.3.5.tar.bz2 6172797
diff --git a/media-libs/libextractor/files/digest-libextractor-0.3.7 b/media-libs/libextractor/files/digest-libextractor-0.3.7
deleted file mode 100644
index 3f05452ec04f..000000000000
--- a/media-libs/libextractor/files/digest-libextractor-0.3.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fa725036acb6c12b5ea30651e36e84e0 libextractor-0.3.7.tar.bz2 6223770
diff --git a/media-libs/libextractor/files/digest-libextractor-0.4.2 b/media-libs/libextractor/files/digest-libextractor-0.4.2
deleted file mode 100644
index 058364fd9776..000000000000
--- a/media-libs/libextractor/files/digest-libextractor-0.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1f9c71b0b7ab517bfc433c146aedfefa libextractor-0.4.2.tar.bz2 6278342
diff --git a/media-libs/libextractor/files/digest-libextractor-0.5.0 b/media-libs/libextractor/files/digest-libextractor-0.5.0
deleted file mode 100644
index f1e3ccf3da63..000000000000
--- a/media-libs/libextractor/files/digest-libextractor-0.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b7c1288a63a08c35ba8ba9ec7df9c2ae libextractor-0.5.0.tar.bz2 6303024
diff --git a/media-libs/libextractor/files/digest-libextractor-0.5.12 b/media-libs/libextractor/files/digest-libextractor-0.5.12
new file mode 100644
index 000000000000..3678ccdf5798
--- /dev/null
+++ b/media-libs/libextractor/files/digest-libextractor-0.5.12
@@ -0,0 +1,3 @@
+MD5 a60e580e309f505d363f88d1a8cee2ff libextractor-0.5.12.tar.gz 7750212
+RMD160 e47260222069c78d8f842e689ea4e3ddac038136 libextractor-0.5.12.tar.gz 7750212
+SHA256 adc4cce999918cb20565888d656482aa7a9e0198642ceaad3ec1318addf14424 libextractor-0.5.12.tar.gz 7750212
diff --git a/media-libs/libextractor/files/digest-libextractor-0.5.4 b/media-libs/libextractor/files/digest-libextractor-0.5.4
deleted file mode 100644
index b08cd1fb7cb1..000000000000
--- a/media-libs/libextractor/files/digest-libextractor-0.5.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 06a4de60b3a26ea15e18ed3429b54dd7 libextractor-0.5.4.tar.gz 6018957
diff --git a/media-libs/libextractor/files/digest-libextractor-0.5.6a b/media-libs/libextractor/files/digest-libextractor-0.5.6a
deleted file mode 100644
index a5ab9f708bd4..000000000000
--- a/media-libs/libextractor/files/digest-libextractor-0.5.6a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1e8022f10d58cc9f83ca3700b6645263 libextractor-0.5.6a.tar.gz 6115101
diff --git a/media-libs/libextractor/files/digest-libextractor-0.5.9 b/media-libs/libextractor/files/digest-libextractor-0.5.9
index 2da5581957b1..5b06c8182106 100644
--- a/media-libs/libextractor/files/digest-libextractor-0.5.9
+++ b/media-libs/libextractor/files/digest-libextractor-0.5.9
@@ -1 +1,3 @@
 MD5 21c22bf2653a3200968417d6642b6662 libextractor-0.5.9.tar.gz 6138887
+RMD160 d96aaa1e42b589d37318b8f746f4d6a7b2f59ca1 libextractor-0.5.9.tar.gz 6138887
+SHA256 99a837dbe267d1d18267f9cdb5ee3b1583447c935765b32bb939a1c23edd2ea0 libextractor-0.5.9.tar.gz 6138887
diff --git a/media-libs/libextractor/files/libextractor-0.2.2-vorbisfile.patch b/media-libs/libextractor/files/libextractor-0.2.2-vorbisfile.patch
deleted file mode 100644
index 7cdda6202995..000000000000
--- a/media-libs/libextractor/files/libextractor-0.2.2-vorbisfile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r libextractor-0.2.2a/src/plugins/Makefile.in libextractor-0.2.2/src/plugins/Makefile.in
---- libextractor-0.2.2a/src/plugins/Makefile.in	2003-02-26 09:24:44.000000000 +0000
-+++ libextractor-0.2.2/src/plugins/Makefile.in	2003-04-01 21:36:19.000000000 +0100
-@@ -161,7 +161,7 @@
- @HAVE_OGG_TRUE@  oggextractor.c
- 
- @HAVE_OGG_TRUE@libextractor_ogg_la_LDFLAGS = \
--@HAVE_OGG_TRUE@  -lvorbis -logg
-+@HAVE_OGG_TRUE@  -lvorbis -lvorbisfile -logg
- 
- 
- @HAVE_RPM_TRUE@libextractor_rpm_la_SOURCES = \
diff --git a/media-libs/libextractor/files/libextractor-0.5.0-autotools.patch b/media-libs/libextractor/files/libextractor-0.5.0-autotools.patch
deleted file mode 100644
index ffed458e97e4..000000000000
--- a/media-libs/libextractor/files/libextractor-0.5.0-autotools.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Naur libextractor-0.5.0.orig/src/main/Makefile.am libextractor-0.5.0/src/main/Makefile.am
---- libextractor-0.5.0.orig/src/main/Makefile.am	2005-05-21 20:06:00.000000000 +0200
-+++ libextractor-0.5.0/src/main/Makefile.am	2005-05-29 22:57:09.380579760 +0200
-@@ -54,6 +54,8 @@
-   getopt.h \
-   getopt1.c 
- 
-+extract_LDFLAGS = -L./
-+
- install-exec-local:
- 	python libextractor_python_setup.py $(libdir) build
- 	python libextractor_python_setup.py $(libdir) install --prefix=$(PYTHON_PREFIX)
-
---- libextractor-0.5.0/src/plugins/ole2/Makefile.am.orig	2005-04-23 02:16:51.000000000 +0200
-+++ libextractor-0.5.0/src/plugins/ole2/Makefile.am	2005-05-29 22:44:03.497052216 +0200
-@@ -24,7 +24,7 @@
-   $(top_builddir)/src/main/libextractor.la
- # Ok, linking this one is complicated, see Mantis #787.
- libextractor_ole2_la_LDFLAGS = \
--  -Wl,-Bstatic -Wl,-lgobject-2.0 -Wl,-lglib-2.0 -Wl,-Bdynamic \
-+  -Wl,-lgobject-2.0 -Wl,-lglib-2.0 -Wl,-Bdynamic \
-   -Wl,-Bsymbolic -avoid-version -module
- # Note that we're NOT using PLUGINFLAGS here to avoid -export-dynamic!
- libextractor_ole2_la_SOURCES =  \
-
---- libextractor-0.5.0.orig/src/main/Makefile.am	2005-05-29 23:14:51.000000000 +0200
-+++ libextractor-0.5.0/src/main/Makefile.am	2005-05-29 23:30:06.340036240 +0200
-@@ -58,4 +58,4 @@
- 
- install-exec-local:
- 	python libextractor_python_setup.py $(libdir) build
--	python libextractor_python_setup.py $(libdir) install --prefix=$(PYTHON_PREFIX)
-+	python libextractor_python_setup.py $(libdir) install --prefix=$(DESTDIR)$(PYTHON_PREFIX)
-
---- libextractor-0.5.0.orig/src/main/libextractor_python_setup.py	2005-05-13 00:45:03.000000000 +0200
-+++ libextractor-0.5.0/src/main/libextractor_python_setup.py	2005-05-31 00:23:56.614163440 +0200
-@@ -5,7 +5,6 @@
- sys.argv = sys.argv[1:]
- 
- cmod = Extension("extractor",["libextractor_python.c"],
--                 libraries=["extractor"],
-                  include_dirs=["../include"],
-                  library_dirs=[path])
- 
diff --git a/media-libs/libextractor/libextractor-0.2.2.ebuild b/media-libs/libextractor/libextractor-0.2.2.ebuild
deleted file mode 100644
index b8ca9e0ac86a..000000000000
--- a/media-libs/libextractor/libextractor-0.2.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/libextractor-0.2.2.ebuild,v 1.5 2006/01/16 23:06:11 mkay Exp $
-
-inherit libtool eutils
-
-DESCRIPTION="A simple library for keyword extraction"
-HOMEPAGE="http://www.ovmj.org/~samanta/libextractor"
-SRC_URI="http://www.ovmj.org/~samanta/libextractor/download/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 sparc"
-IUSE="vorbis static"
-
-# does not work with rpm-4.2
-DEPEND=">=sys-devel/libtool-1.4.1
-	<app-arch/rpm-4.2
-	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-
-src_unpack() {
-	unpack ${A}
-	# patch their half baked attempt at supporting ogg vorbis
-	epatch ${FILESDIR}/${P}-vorbisfile.patch
-}
-
-src_compile() {
-	elibtoolize
-
-	export CPPFLAGS="-I/usr/include/rpm"
-	econf `use_enable static` || die
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/media-libs/libextractor/libextractor-0.3.3.ebuild b/media-libs/libextractor/libextractor-0.3.3.ebuild
deleted file mode 100644
index f7c116ad0826..000000000000
--- a/media-libs/libextractor/libextractor-0.3.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/libextractor-0.3.3.ebuild,v 1.5 2006/01/16 23:06:11 mkay Exp $
-
-inherit libtool
-
-IUSE="vorbis static"
-DESCRIPTION="A simple library for keyword extraction"
-HOMEPAGE="http://www.ovmj.org/~samanta/libextractor"
-SRC_URI="http://www.ovmj.org/~samanta/libextractor/download/${P}.tar.bz2"
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ~sparc ~amd64 ~ppc"
-DEPEND=">=sys-devel/libtool-1.4.1
-	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-
-src_compile() {
-	elibtoolize
-
-	myconf="--with-gnu-ld"
-	use static \
-		&& myconf="${myconf} --enable-static" \
-		|| myconf="${myconf} --disable-static"
-	econf ${myconf} || die "econf failed"
-	make || die "compile failed"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "install failed"
-}
diff --git a/media-libs/libextractor/libextractor-0.3.5.ebuild b/media-libs/libextractor/libextractor-0.3.5.ebuild
deleted file mode 100644
index 91e9e668128e..000000000000
--- a/media-libs/libextractor/libextractor-0.3.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/libextractor-0.3.5.ebuild,v 1.6 2006/01/16 23:06:11 mkay Exp $
-
-inherit libtool
-
-IUSE="vorbis static"
-DESCRIPTION="A simple library for keyword extraction"
-HOMEPAGE="http://www.ovmj.org/~samanta/libextractor"
-SRC_URI="http://www.ovmj.org/~samanta/libextractor/download/${P}.tar.bz2"
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 sparc ~amd64 ~ppc"
-DEPEND="virtual/libc
-	>=sys-devel/libtool-1.4.1
-	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-
-src_compile() {
-	elibtoolize
-	econf --with-gnu-ld \
-		`use_enable static` || die "econf failed"
-	make || die "compile failed"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "install failed"
-}
diff --git a/media-libs/libextractor/libextractor-0.3.7.ebuild b/media-libs/libextractor/libextractor-0.3.7.ebuild
deleted file mode 100644
index b10d6cc5603c..000000000000
--- a/media-libs/libextractor/libextractor-0.3.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/libextractor-0.3.7.ebuild,v 1.4 2006/01/16 23:06:11 mkay Exp $
-
-inherit libtool
-
-IUSE="vorbis static"
-DESCRIPTION="A simple library for keyword extraction"
-HOMEPAGE="http://www.ovmj.org/~samanta/libextractor"
-SRC_URI="http://www.ovmj.org/~samanta/libextractor/download/${P}.tar.bz2"
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
-DEPEND="virtual/libc
-	>=sys-devel/libtool-1.4.1
-	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-
-src_compile() {
-	elibtoolize
-	econf --with-gnu-ld \
-		`use_enable static` || die "econf failed"
-	make || die "compile failed"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "install failed"
-}
diff --git a/media-libs/libextractor/libextractor-0.4.2.ebuild b/media-libs/libextractor/libextractor-0.4.2.ebuild
deleted file mode 100644
index 44bc62afb917..000000000000
--- a/media-libs/libextractor/libextractor-0.4.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/libextractor-0.4.2.ebuild,v 1.3 2006/01/16 23:06:11 mkay Exp $
-
-inherit libtool
-
-IUSE="vorbis static"
-DESCRIPTION="A simple library for keyword extraction"
-HOMEPAGE="http://www.ovmj.org/~samanta/libextractor"
-SRC_URI="http://gnunet.org/libextractor/download/${P}.tar.bz2"
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
-DEPEND="virtual/libc
-	>=sys-devel/libtool-1.4.1
-	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-
-src_compile() {
-	elibtoolize
-	econf --with-gnu-ld \
-		`use_enable static` || die "econf failed"
-	make || die "compile failed"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "install failed"
-}
diff --git a/media-libs/libextractor/libextractor-0.5.0.ebuild b/media-libs/libextractor/libextractor-0.5.0.ebuild
deleted file mode 100644
index 7dd912d5381e..000000000000
--- a/media-libs/libextractor/libextractor-0.5.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/libextractor-0.5.0.ebuild,v 1.5 2006/01/16 23:06:11 mkay Exp $
-
-inherit libtool eutils
-
-IUSE="vorbis static"
-DESCRIPTION="A simple library for keyword extraction"
-HOMEPAGE="http://www.ovmj.org/~samanta/libextractor"
-SRC_URI="http://gnunet.org/libextractor/download/${P}.tar.bz2"
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ~sparc ~amd64 ~ppc"
-# Disabled tests because they dont work (tester@g.o)
-RESTRICT=test
-DEPEND="virtual/libc
-	>=sys-devel/libtool-1.4.1
-	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-autotools.patch
-}
-
-src_compile() {
-	elibtoolize
-	econf --with-gnu-ld \
-		`use_enable static` || die "econf failed"
-	make || die "compile failed"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "install failed"
-}
diff --git a/media-libs/libextractor/libextractor-0.5.6a.ebuild b/media-libs/libextractor/libextractor-0.5.12.ebuild
index ddeace16e6e4..435258ab5804 100644
--- a/media-libs/libextractor/libextractor-0.5.6a.ebuild
+++ b/media-libs/libextractor/libextractor-0.5.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/libextractor-0.5.6a.ebuild,v 1.5 2006/01/16 23:06:11 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/libextractor-0.5.12.ebuild,v 1.1 2006/04/25 05:10:17 squinky86 Exp $
 
 inherit libtool eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnunet.org/libextractor"
 SRC_URI="http://gnunet.org/${PN}/download/${P}.tar.gz"
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~ppc sparc x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 # Disabled tests because they dont work (tester@g.o)
 RESTRICT="test"
 DEPEND="virtual/libc
diff --git a/media-libs/libextractor/libextractor-0.5.4.ebuild b/media-libs/libextractor/libextractor-0.5.4.ebuild
deleted file mode 100644
index f8b8fbb3575b..000000000000
--- a/media-libs/libextractor/libextractor-0.5.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/libextractor-0.5.4.ebuild,v 1.3 2006/01/16 23:06:11 mkay Exp $
-
-inherit libtool eutils
-
-IUSE="gtk nls static vorbis zlib"
-DESCRIPTION="A simple library for keyword extraction"
-HOMEPAGE="http://www.gnunet.org/libextractor"
-SRC_URI="mirror://gnu//${PN}/${P}.tar.gz"
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
-# Disabled tests because they dont work (tester@g.o)
-RESTRICT="test"
-DEPEND="virtual/libc
-	>=sys-devel/libtool-1.4.1
-	>=dev-libs/glib-1.2.10
-	nls? ( sys-devel/gettext )
-	gtk? ( >=x11-libs/gtk+-2.6.10 )
-	zlib? ( sys-libs/zlib )
-	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-
-src_compile() {
-	elibtoolize
-	econf --with-gnu-ld --enable-glib --enable-exiv2 \
-		`use_enable static` `use_enable nls` || die "econf failed"
-	make || die "compile failed"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "install failed"
-}