Remove old versions, leave one ebuild for mips wrt #204405

(Portage version: 2.1.4_rc14)

8 files changed, 16 insertions, 153 deletions

diff --git a/media-libs/speex/ChangeLog b/media-libs/speex/ChangeLog
index 68192606f7c5..01aef6fb9940 100644
--- a/media-libs/speex/ChangeLog
+++ b/media-libs/speex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/speex
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/ChangeLog,v 1.74 2008/01/09 16:37:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/ChangeLog,v 1.75 2008/01/10 14:58:30 drac Exp $
+
+  10 Jan 2008; Samuli Suominen <drac@gentoo.org> speex-1.1.7.ebuild,
+  -speex-1.1.11.1.ebuild, -speex-1.2_beta2.ebuild:
+  Remove old versions, leave one ebuild for mips wrt #204405
 
   09 Jan 2008; Jeroen Roovers <jer@gentoo.org> speex-1.2_beta3.ebuild:
   Stable for HPPA (bug #204405).
diff --git a/media-libs/speex/files/digest-speex-1.1.11.1 b/media-libs/speex/files/digest-speex-1.1.11.1
deleted file mode 100644
index f6b9264f7487..000000000000
--- a/media-libs/speex/files/digest-speex-1.1.11.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5282d23ea605232be05b537cca7af242 speex-1.1.11.1.tar.gz 720528
-RMD160 6287327d6a3d5f45637af516cab568249e765160 speex-1.1.11.1.tar.gz 720528
-SHA256 b32000d4ca4e6f3cf02eeca90de765e759efa53c33f8ada8500df73fa55cda1f speex-1.1.11.1.tar.gz 720528
diff --git a/media-libs/speex/files/digest-speex-1.2_beta2 b/media-libs/speex/files/digest-speex-1.2_beta2
deleted file mode 100644
index 388f14df64f0..000000000000
--- a/media-libs/speex/files/digest-speex-1.2_beta2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5480fa53a7451603ecb57ff815c87ac0 speex-1.2beta2.tar.gz 997255
-RMD160 6e86dec0b56bae8d65cf3b6476f6d5cb3a74b1ec speex-1.2beta2.tar.gz 997255
-SHA256 e57573e86276972080b5d82746d0968492859f35eaa265e79b5cfb130b26e3da speex-1.2beta2.tar.gz 997255
diff --git a/media-libs/speex/files/speex-1.2_beta2-optional-ogg-and-cflags.patch b/media-libs/speex/files/speex-1.2_beta2-optional-ogg-and-cflags.patch
deleted file mode 100644
index 210715b35290..000000000000
--- a/media-libs/speex/files/speex-1.2_beta2-optional-ogg-and-cflags.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur speex-1.2beta2.orig/configure.ac speex-1.2beta2/configure.ac
---- speex-1.2beta2.orig/configure.ac	2007-05-17 17:14:35.000000000 +0300
-+++ speex-1.2beta2/configure.ac	2007-08-27 17:49:26.000000000 +0300
-@@ -67,9 +67,6 @@
- 
- AC_CHECK_HEADERS(sys/soundcard.h sys/audioio.h)
- 
--XIPH_PATH_OGG([src="src"], [src=""])
--AC_SUBST(src)
--
- AC_CHECK_LIB(m, sin)
- 
- # Check for getopt_long; if not found, use included source.
-@@ -89,6 +86,12 @@
- AC_DEFINE_UNQUOTED(SPEEX_MICRO_VERSION, ${SPEEX_MICRO_VERSION}, [Version micro])
- AC_DEFINE_UNQUOTED(SPEEX_EXTRA_VERSION, "${SPEEX_EXTRA_VERSION}", [Version extra])
- 
-+AC_ARG_ENABLE(ogg, [  --enable-ogg       Enable OGG],
-+[if test "$enableval" = yes; then
-+  XIPH_PATH_OGG([src="src"], [src=""])
-+  AC_SUBST(src)
-+fi])
-+
- AC_ARG_ENABLE(wideband, [  --disable-wideband      Disable wideband codec],
- [if test "$enableval" = no; then
-   AC_DEFINE([DISABLE_WIDEBAND], , [Disable wideband codec])
-@@ -106,7 +109,7 @@
- 
- AC_ARG_ENABLE(sse, [  --enable-sse            Enable SSE support], [if test "$enableval" = yes; then
- AC_DEFINE([_USE_SSE], , [Enable SSE support])
--CFLAGS="$CFLAGS -O3 -msse"
-+CFLAGS="$CFLAGS -msse"
- fi
- ])
- 
diff --git a/media-libs/speex/speex-1.1.11.1.ebuild b/media-libs/speex/speex-1.1.11.1.ebuild
deleted file mode 100644
index a83f6da00155..000000000000
--- a/media-libs/speex/speex-1.1.11.1.ebuild
+++ /dev/null
@@ -1,51 +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.11.1.ebuild,v 1.6 2007/03/01 16:26:40 genstef Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils autotools libtool
-
-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 ~ppc64 ~sh ~sparc ~x86"
-IUSE="ogg sse"
-
-RDEPEND="ogg? ( >=media-libs/libogg-1.0 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	sys-devel/automake
-	sys-devel/libtool"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# This is needed to fix parallel make issues.
-	# As this changes the Makefile.am, need to rebuild autotools.
-	sed -i -e 's:\$(top_builddir)/libspeex/libspeex.la:libspeex.la:' \
-		${S}/libspeex/Makefile.am
-
-	eautoreconf
-
-	# Better being safe
-	elibtoolize
-}
-
-src_compile() {
-	# ogg autodetect only
-	econf $(use_enable sse) || 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.12.ebuild b/media-libs/speex/speex-1.1.12.ebuild
index ef5f130b496d..f83750337e84 100644
--- a/media-libs/speex/speex-1.1.12.ebuild
+++ b/media-libs/speex/speex-1.1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/speex-1.1.12.ebuild,v 1.11 2007/10/26 06:05:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/speex-1.1.12.ebuild,v 1.12 2008/01/10 14:58:30 drac Exp $
 
 inherit eutils autotools libtool
 
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.xiph.org/releases/speex/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="ogg sse vorbis-psy"
 
 RDEPEND="ogg? ( >=media-libs/libogg-1.0 )"
diff --git a/media-libs/speex/speex-1.1.7.ebuild b/media-libs/speex/speex-1.1.7.ebuild
index e0b6fd818ca3..10521fa1978a 100644
--- a/media-libs/speex/speex-1.1.7.ebuild
+++ b/media-libs/speex/speex-1.1.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/speex-1.1.7.ebuild,v 1.8 2007/03/01 16:26:40 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/speex-1.1.7.ebuild,v 1.9 2008/01/10 14:58:30 drac Exp $
 
 MY_P=${P/_/}
 S=${WORKDIR}/${MY_P}
@@ -11,10 +11,10 @@ SRC_URI="http://www.speex.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
+KEYWORDS="mips"
 IUSE="ogg sse"
 
-DEPEND="ogg? ( >=media-libs/libogg-1.0 )"
+DEPEND="ogg? ( >=media-libs/libogg-1 )"
 
 src_compile() {
 	local myconf
@@ -25,15 +25,15 @@ src_compile() {
 	then
 		use sse && myconf="${myconf} --enable-sse"
 	fi
-	econf ${myconf} || die
-	emake || die
+	econf ${myconf} || die "econf failed."
+	emake || die "emake failed."
 }
 
 src_install () {
-	einstall || die
-	rm -rf ${D}/usr/share/doc/*
+	einstall || die "einstall failed."
+	rm -rf "${D}"/usr/share/doc/*
 
 	insinto /usr/share/doc/${P}
-	doins ${S}/doc/manual.pdf
+	doins "${S}"/doc/manual.pdf
 	dodoc AUTHORS ChangeLog README TODO NEWS
 }
diff --git a/media-libs/speex/speex-1.2_beta2.ebuild b/media-libs/speex/speex-1.2_beta2.ebuild
deleted file mode 100644
index d46457624cf8..000000000000
--- a/media-libs/speex/speex-1.2_beta2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/speex-1.2_beta2.ebuild,v 1.8 2007/11/23 22:10:25 drac Exp $
-
-EAPI=1
-
-inherit autotools eutils flag-o-matic
-
-MY_P=${P/_/}
-
-DESCRIPTION="Audio compression format designed for speech."
-HOMEPAGE="http://www.speex.org"
-SRC_URI="http://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~x86-fbsd"
-IUSE="doc ogg sse vorbis-psy +wideband"
-
-RDEPEND="ogg? ( >=media-libs/libogg-1 )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-optional-ogg-and-cflags.patch
-	eautoreconf
-	_elibtoolize
-}
-
-src_compile() {
-	# Add largefile support.
-	append-flags -D_FILE_OFFSET_BITS=64
-
-	econf $(use_enable vorbis-psy) $(use_enable sse) \
-		$(use_enable ogg) $(use_enable wideband)
-	emake || die "emake failed."
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README* TODO
-
-	# Install manual.pdf to correct location.
-	rm -f "${D}"/usr/share/doc/speex-1.2beta2/manual.pdf
-	use doc && dodoc doc/manual.pdf
-}