19 files changed, 16 insertions, 308 deletions
diff --git a/media-libs/faac/Manifest b/media-libs/faac/Manifest
index a658d88e7eca..2a35c0cf6bc2 100644
--- a/media-libs/faac/Manifest
+++ b/media-libs/faac/Manifest
@@ -1,21 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b9cba2deca9cefed6c2bcd68cd5a8b47 ChangeLog 4211
-MD5 376eff56e5468e5e556e185136b498a0 faac-1.23.5.ebuild 855
+MD5 f20741ae24f6bae336b16b8703df260e ChangeLog 4361
 MD5 bf33170043aee274cbc63755f1339254 faac-1.24-r1.ebuild 905
 MD5 3870d2e5e634da7382012e17f24c69ad faac-1.24.ebuild 854
-MD5 3c7304d2a11a89df8123f8c096d11725 files/digest-faac-1.23.5 63
 MD5 927d4973537500e758398d0dd1daae88 files/digest-faac-1.24 61
 MD5 927d4973537500e758398d0dd1daae88 files/digest-faac-1.24-r1 61
 MD5 af9d89575787d0f3507d3c710b588924 files/faac-1.24-faad.patch 885
-MD5 cdd79fb009d4c52796f1b1e31bf6ed20 files/fix-linefeeds.sh 122
-MD5 049efb5435eb21d0c652a01219932747 files/libsndfile-1.0.diff 1368
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDptQoAiZjviIA2XgRAmABAKCWrnBv0g2pofGCGMI9DyVr8ohOHACeI09v
-h0BB0dbsvCuksSlgEEwNv+c=
-=E/Q3
------END PGP SIGNATURE-----
diff --git a/media-libs/speex/ChangeLog b/media-libs/speex/ChangeLog
index 386e2a677975..4bee4cdfddfd 100644
--- a/media-libs/speex/ChangeLog
+++ b/media-libs/speex/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/speex
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/ChangeLog,v 1.42 2006/01/03 09:28:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/ChangeLog,v 1.43 2006/01/15 23:39:33 flameeyes Exp $
+
+  15 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/speex-1.1.10-sse.patch, -speex-1.0.2.ebuild, -speex-1.0.3.ebuild,
+  -speex-1.1.5.ebuild, -speex-1.1.10.ebuild:
+  Drop old versions.
 
   03 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> speex-1.1.11.1.ebuild:
   Fix issues with parallel make.
diff --git a/media-libs/speex/files/digest-speex-1.0.2 b/media-libs/speex/files/digest-speex-1.0.2
deleted file mode 100644
index 601eb05085f0..000000000000
--- a/media-libs/speex/files/digest-speex-1.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a14e671c789ff3a2f9abbc4f2576910d speex-1.0.2.tar.gz 397968
diff --git a/media-libs/speex/files/digest-speex-1.0.3 b/media-libs/speex/files/digest-speex-1.0.3
deleted file mode 100644
index 679ec9125f09..000000000000
--- a/media-libs/speex/files/digest-speex-1.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9b16492ae39afbf72d8bb46b2f258476 speex-1.0.3.tar.gz 398002
diff --git a/media-libs/speex/files/digest-speex-1.1.10 b/media-libs/speex/files/digest-speex-1.1.10
deleted file mode 100644
index 46bc91cc40b5..000000000000
--- a/media-libs/speex/files/digest-speex-1.1.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b739b19d41d3a4c6342a7021af4da166 speex-1.1.10.tar.gz 623254
diff --git a/media-libs/speex/files/digest-speex-1.1.5 b/media-libs/speex/files/digest-speex-1.1.5
deleted file mode 100644
index 8f3a2b7ab8a8..000000000000
--- a/media-libs/speex/files/digest-speex-1.1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 416dbe6c41aabfd289b6d7d4522a8d93 speex-1.1.5.tar.gz 600280
diff --git a/media-libs/speex/files/speex-1.1.10-sse.patch b/media-libs/speex/files/speex-1.1.10-sse.patch
deleted file mode 100644
index ba67a69b94bf..000000000000
--- a/media-libs/speex/files/speex-1.1.10-sse.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- speex-1.1.10/libspeex/vq.c	2005-06-04 05:57:12.000000000 +0200
-+++ speex-patched/libspeex/vq.c	2005-10-08 12:26:57.000000000 +0200
-@@ -40,6 +40,7 @@
- 
- #ifdef _USE_SSE
- #include <xmmintrin.h>
-+#include <vq_sse.h> 
- #elif defined(SHORTCUTS) && (defined(ARM4_ASM) || defined(ARM5E_ASM))
- #include "vq_arm4.h"
- #elif defined(BFIN_ASM)
diff --git a/media-libs/speex/speex-1.0.2.ebuild b/media-libs/speex/speex-1.0.2.ebuild
deleted file mode 100644
index c9bb38e21fa7..000000000000
--- a/media-libs/speex/speex-1.0.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/speex-1.0.2.ebuild,v 1.9 2005/04/26 13:02:56 flameeyes Exp $
-
-IUSE="ogg sse"
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Speex - Speech encoding library"
-HOMEPAGE="http://www.speex.org"
-SRC_URI="http://www.speex.org/download/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD as-is"
-KEYWORDS="x86 hppa amd64 sparc"
-
-DEPEND="virtual/libc
-	ogg? ( >=media-libs/libogg-1.0 )"
-
-src_compile() {
-	local myconf
-	use ogg && myconf="--enable-ogg=yes --with-ogg-dir=/usr" \
-		|| myconf="--enable-ogg=no"
-	if [ "${ARCH}" != "amd64" ]
-	then
-		use sse && myconf="${myconf} --enable-sse"
-	fi
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install () {
-	einstall || die
-	rm -rf ${D}/usr/share/doc/*
-
-	insinto /usr/share/doc/${P}
-	doins ${S}/doc/manual.pdf
-	dodoc AUTHORS ChangeLog README TODO NEWS
-}
-
diff --git a/media-libs/speex/speex-1.0.3.ebuild b/media-libs/speex/speex-1.0.3.ebuild
deleted file mode 100644
index 92220bc9e154..000000000000
--- a/media-libs/speex/speex-1.0.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/speex-1.0.3.ebuild,v 1.8 2005/04/26 13:02:56 flameeyes Exp $
-
-IUSE="ogg sse"
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Speex - Speech encoding library"
-HOMEPAGE="http://www.speex.org"
-SRC_URI="http://www.speex.org/download/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD as-is"
-KEYWORDS="~x86 ~hppa amd64 alpha ia64"
-
-DEPEND="virtual/libc
-	ogg? ( >=media-libs/libogg-1.0 )"
-
-src_compile() {
-	local myconf
-	use ogg && myconf="--enable-ogg=yes --with-ogg-dir=/usr" \
-		|| myconf="--enable-ogg=no"
-	if [ "${ARCH}" != "amd64" ]
-	then
-		use sse && myconf="${myconf} --enable-sse"
-	fi
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install () {
-	einstall || die
-	rm -rf ${D}/usr/share/doc/*
-
-	insinto /usr/share/doc/${P}
-	doins ${S}/doc/manual.pdf
-	dodoc AUTHORS ChangeLog README TODO NEWS
-}
-
diff --git a/media-libs/speex/speex-1.1.10.ebuild b/media-libs/speex/speex-1.1.10.ebuild
deleted file mode 100644
index 9b5b86743eba..000000000000
--- a/media-libs/speex/speex-1.1.10.ebuild
+++ /dev/null
@@ -1,43 +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/speex/speex-1.1.10.ebuild,v 1.3 2006/01/13 12:43:04 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="Speech encoding library"
-HOMEPAGE="http://www.speex.org/"
-SRC_URI="http://downloads.xiph.org/releases/speex/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86"
-IUSE="ogg sse"
-
-DEPEND="virtual/libc
-	ogg? ( >=media-libs/libogg-1.0 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-sse.patch
-}
-
-src_compile() {
-	local myconf
-
-	# cannot --without-ogg
-	# use ogg \
-	#	&& myconf="--with-ogg=/usr" \
-	#	|| myconf="--without-ogg"
-
-	myconf="${myconf} $(use_enable sse)"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog README TODO NEWS
-}
diff --git a/media-libs/speex/speex-1.1.5.ebuild b/media-libs/speex/speex-1.1.5.ebuild
deleted file mode 100644
index 2cd96c4c006e..000000000000
--- a/media-libs/speex/speex-1.1.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/speex-1.1.5.ebuild,v 1.7 2005/04/26 13:02:56 flameeyes Exp $
-
-IUSE="ogg sse"
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Speex - Speech encoding library"
-HOMEPAGE="http://www.speex.org"
-SRC_URI="http://www.speex.org/download/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD as-is"
-KEYWORDS="~x86 ~hppa ~amd64 ~alpha ~ia64 ~ppc ~sparc ppc64"
-
-DEPEND="virtual/libc
-	ogg? ( >=media-libs/libogg-1.0 )"
-
-src_compile() {
-	local myconf
-	use ogg && myconf="--enable-ogg=yes --with-ogg-dir=/usr" \
-		|| myconf="--enable-ogg=no"
-	if [ "${ARCH}" != "amd64" ]
-	then
-		use sse && myconf="${myconf} --enable-sse"
-	fi
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install () {
-	einstall || die
-	rm -rf ${D}/usr/share/doc/*
-
-	insinto /usr/share/doc/${P}
-	doins ${S}/doc/manual.pdf
-	dodoc AUTHORS ChangeLog README TODO NEWS
-}
-
diff --git a/media-libs/zvbi/ChangeLog b/media-libs/zvbi/ChangeLog
index ba963f615229..adee0807cfcf 100644
--- a/media-libs/zvbi/ChangeLog
+++ b/media-libs/zvbi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/zvbi
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/ChangeLog,v 1.15 2005/12/21 22:24:52 flameeyes Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/ChangeLog,v 1.16 2006/01/15 23:34:40 flameeyes Exp $
+
+  15 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> -zvbi-0.2.1-r1.ebuild,
+  zvbi-0.2.4.ebuild, -zvbi-0.2.8.ebuild, -zvbi-0.2.16.ebuild:
+  Drop old versions.
 
   21 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> zvbi-0.2.17.ebuild:
   Add modular x dependencies, general ebuild cleanup.
diff --git a/media-libs/zvbi/files/digest-zvbi-0.2.1-r1 b/media-libs/zvbi/files/digest-zvbi-0.2.1-r1
deleted file mode 100644
index 23216abdc248..000000000000
--- a/media-libs/zvbi/files/digest-zvbi-0.2.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c70bdead60b42427e3c58cd721e9a8e5 zvbi-0.2.1.tar.bz2 561416
diff --git a/media-libs/zvbi/files/digest-zvbi-0.2.16 b/media-libs/zvbi/files/digest-zvbi-0.2.16
deleted file mode 100644
index f9950df72ff5..000000000000
--- a/media-libs/zvbi/files/digest-zvbi-0.2.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6ed822ae5d0766129bfa1508394b6ac0 zvbi-0.2.16.tar.bz2 699343
diff --git a/media-libs/zvbi/files/digest-zvbi-0.2.8 b/media-libs/zvbi/files/digest-zvbi-0.2.8
deleted file mode 100644
index 0fdfebd0c1ac..000000000000
--- a/media-libs/zvbi/files/digest-zvbi-0.2.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8701d3e4387cd896ff8b68831b57d814 zvbi-0.2.8.tar.bz2 533340
diff --git a/media-libs/zvbi/zvbi-0.2.1-r1.ebuild b/media-libs/zvbi/zvbi-0.2.1-r1.ebuild
deleted file mode 100644
index 61c294c4441b..000000000000
--- a/media-libs/zvbi/zvbi-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,35 +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/zvbi/zvbi-0.2.1-r1.ebuild,v 1.10 2004/07/14 20:39:45 agriffis Exp $
-
-IUSE="nls"
-
-DESCRIPTION="VBI Decoding Library for Zapping"
-SRC_URI="mirror://sourceforge/zapping/${P}.tar.bz2"
-HOMEPAGE="http://zapping.sourceforge.net"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc ~ppc "
-
-DEPEND="virtual/x11
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-
-	local myconf
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	econf ${myconf} || die
-
-	cp doc/zdoc-scan doc/zdoc-scan.orig
-	sed -e 's:usr/local/share/gtk-doc:usr/share/gtk-doc:' \
-		doc/zdoc-scan.orig > doc/zdoc-scan
-	emake || die
-}
-
-src_install () {
-	einstall || die
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
-}
diff --git a/media-libs/zvbi/zvbi-0.2.16.ebuild b/media-libs/zvbi/zvbi-0.2.16.ebuild
deleted file mode 100644
index c3b9ea2a3e5d..000000000000
--- a/media-libs/zvbi/zvbi-0.2.16.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/zvbi-0.2.16.ebuild,v 1.2 2005/06/25 13:57:07 swegener Exp $
-
-IUSE="X nls v4l dvb doc"
-
-DESCRIPTION="VBI Decoding Library for Zapping"
-SRC_URI="mirror://sourceforge/zapping/${P}.tar.bz2"
-HOMEPAGE="http://zapping.sourceforge.net"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~alpha ~ia64"
-
-DEPEND="X? ( virtual/x11 )
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )"
-
-src_compile() {
-	local myconf="`use_enable nls` \
-		`use_enable v4l` \
-		`use_enable dvb` "
-
-	use X && myconf="${myconf} --with-x"
-	use X || myconf="${myconf} --without-x"
-
-	econf ${myconf} || die
-
-	cp doc/zdoc-scan doc/zdoc-scan.orig
-	sed -e 's:usr/local/share/gtk-doc:usr/share/gtk-doc:' \
-		doc/zdoc-scan.orig > doc/zdoc-scan
-	emake || die
-}
-
-src_install () {
-	einstall || die
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
-	use doc && dohtml -a png,gif,html,css doc/html/*
-}
diff --git a/media-libs/zvbi/zvbi-0.2.4.ebuild b/media-libs/zvbi/zvbi-0.2.4.ebuild
index 5012ba02368d..827066c01e1b 100644
--- a/media-libs/zvbi/zvbi-0.2.4.ebuild
+++ b/media-libs/zvbi/zvbi-0.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/zvbi-0.2.4.ebuild,v 1.6 2004/07/14 20:39:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/zvbi-0.2.4.ebuild,v 1.7 2006/01/15 23:34:40 flameeyes Exp $
 
 IUSE="nls"
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://zapping.sourceforge.net"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc ~ppc amd64 alpha ia64"
+KEYWORDS="alpha amd64 ia64 ~ppc sparc x86"
 
 DEPEND="virtual/x11
 	nls? ( sys-devel/gettext )"
diff --git a/media-libs/zvbi/zvbi-0.2.8.ebuild b/media-libs/zvbi/zvbi-0.2.8.ebuild
deleted file mode 100644
index 4bc88d87a99c..000000000000
--- a/media-libs/zvbi/zvbi-0.2.8.ebuild
+++ /dev/null
@@ -1,30 +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/zvbi/zvbi-0.2.8.ebuild,v 1.1 2004/08/29 11:36:56 mholzer Exp $
-
-IUSE="nls"
-
-DESCRIPTION="VBI Decoding Library for Zapping"
-SRC_URI="mirror://sourceforge/zapping/${P}.tar.bz2"
-HOMEPAGE="http://zapping.sourceforge.net"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~alpha ~ia64"
-
-DEPEND="virtual/x11
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	econf `use_enable nls` || die
-
-	cp doc/zdoc-scan doc/zdoc-scan.orig
-	sed -e 's:usr/local/share/gtk-doc:usr/share/gtk-doc:' \
-		doc/zdoc-scan.orig > doc/zdoc-scan
-	emake || die
-}
-
-src_install () {
-	einstall || die
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
-}