Remove elibtoolize because eautoreconf includes running it. Fix SRC_URI wrt #256500.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

7 files changed, 19 insertions, 167 deletions

diff --git a/media-libs/libmpcdec/ChangeLog b/media-libs/libmpcdec/ChangeLog
index 013b7c87e644..29b3d462b65a 100644
--- a/media-libs/libmpcdec/ChangeLog
+++ b/media-libs/libmpcdec/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libmpcdec
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpcdec/ChangeLog,v 1.39 2008/11/10 11:36:22 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpcdec/ChangeLog,v 1.40 2009/05/11 09:02:10 ssuominen Exp $
+
+  11 May 2009; Samuli Suominen <ssuominen@gentoo.org> -libmpcdec-1.2.ebuild,
+  -libmpcdec-1.2.2.ebuild, -libmpcdec-1.2.5.ebuild, -libmpcdec-1.2.6.ebuild,
+  -libmpcdec-1.2.6-r1.ebuild, libmpcdec-1.2.6-r2.ebuild:
+  Remove elibtoolize because eautoreconf includes running it. Fix SRC_URI
+  wrt #256500.
 
   10 Nov 2008; Raúl Porcel <armin76@gentoo.org> libmpcdec-1.2.6-r2.ebuild:
   arm/sh stable
diff --git a/media-libs/libmpcdec/libmpcdec-1.2.2.ebuild b/media-libs/libmpcdec/libmpcdec-1.2.2.ebuild
deleted file mode 100644
index 8f60b66f7998..000000000000
--- a/media-libs/libmpcdec/libmpcdec-1.2.2.ebuild
+++ /dev/null
@@ -1,25 +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/libmpcdec/libmpcdec-1.2.2.ebuild,v 1.13 2007/02/11 11:03:56 vapier Exp $
-
-DESCRIPTION="Musepack decoder library"
-HOMEPAGE="http://www.musepack.net"
-SRC_URI="http://files2.musepack.net/source/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc static"
-
-src_compile() {
-	econf \
-		$(use_enable static) \
-		$(use_enable !static shared) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README
-	use doc && dohtml docs/html/*
-}
diff --git a/media-libs/libmpcdec/libmpcdec-1.2.5.ebuild b/media-libs/libmpcdec/libmpcdec-1.2.5.ebuild
deleted file mode 100644
index ad19011a9a68..000000000000
--- a/media-libs/libmpcdec/libmpcdec-1.2.5.ebuild
+++ /dev/null
@@ -1,35 +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/libmpcdec/libmpcdec-1.2.5.ebuild,v 1.1 2007/03/12 23:49:21 aballier Exp $
-
-inherit autotools
-
-DESCRIPTION="Musepack decoder library"
-HOMEPAGE="http://www.musepack.net"
-SRC_URI="http://files2.musepack.net/source/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		--enable-static \
-		--enable-shared \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README
-	use doc && dohtml docs/html/*
-}
diff --git a/media-libs/libmpcdec/libmpcdec-1.2.6-r1.ebuild b/media-libs/libmpcdec/libmpcdec-1.2.6-r1.ebuild
deleted file mode 100644
index 492e51f3d3b0..000000000000
--- a/media-libs/libmpcdec/libmpcdec-1.2.6-r1.ebuild
+++ /dev/null
@@ -1,37 +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/libmpcdec/libmpcdec-1.2.6-r1.ebuild,v 1.1 2008/01/19 13:07:24 flameeyes Exp $
-
-inherit eutils libtool autotools
-
-DESCRIPTION="Musepack decoder library"
-HOMEPAGE="http://www.musepack.net"
-SRC_URI="http://files2.musepack.net/source/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-riceitdown.patch"
-
-	eautoreconf
-	elibtoolize
-}
-
-src_compile() {
-	econf \
-		--enable-static \
-		--enable-shared \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/media-libs/libmpcdec/libmpcdec-1.2.6-r2.ebuild b/media-libs/libmpcdec/libmpcdec-1.2.6-r2.ebuild
index 9fea8d2784b4..42aacbc4fae1 100644
--- a/media-libs/libmpcdec/libmpcdec-1.2.6-r2.ebuild
+++ b/media-libs/libmpcdec/libmpcdec-1.2.6-r2.ebuild
@@ -1,40 +1,33 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpcdec/libmpcdec-1.2.6-r2.ebuild,v 1.8 2008/11/10 11:36:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpcdec/libmpcdec-1.2.6-r2.ebuild,v 1.9 2009/05/11 09:02:10 ssuominen Exp $
 
-inherit eutils libtool autotools
+EAPI=2
+inherit autotools eutils
 
 DESCRIPTION="Musepack decoder library"
 HOMEPAGE="http://www.musepack.net"
-SRC_URI="http://files2.musepack.net/source/${P}.tar.bz2"
+SRC_URI="http://files.musepack.net/source/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-riceitdown.patch"
-	epatch "${FILESDIR}/${P}+libtool22.patch"
-
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-riceitdown.patch \
+		"${FILESDIR}"/${P}+libtool22.patch
 	eautoreconf
-	elibtoolize
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		--enable-static \
-		--enable-shared \
-		|| die "econf failed"
-	emake || die "emake failed"
+		--enable-shared
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog README
-
 	find "${D}" -name '*.la' -delete
 }
diff --git a/media-libs/libmpcdec/libmpcdec-1.2.6.ebuild b/media-libs/libmpcdec/libmpcdec-1.2.6.ebuild
deleted file mode 100644
index 34ad9fe93655..000000000000
--- a/media-libs/libmpcdec/libmpcdec-1.2.6.ebuild
+++ /dev/null
@@ -1,25 +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/libmpcdec/libmpcdec-1.2.6.ebuild,v 1.10 2008/02/12 23:37:14 coldwind Exp $
-
-DESCRIPTION="Musepack decoder library"
-HOMEPAGE="http://www.musepack.net"
-SRC_URI="http://files2.musepack.net/source/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-src_compile() {
-	econf \
-		--enable-static \
-		--enable-shared \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/media-libs/libmpcdec/libmpcdec-1.2.ebuild b/media-libs/libmpcdec/libmpcdec-1.2.ebuild
deleted file mode 100644
index 47abfbe7ca6b..000000000000
--- a/media-libs/libmpcdec/libmpcdec-1.2.ebuild
+++ /dev/null
@@ -1,25 +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/libmpcdec/libmpcdec-1.2.ebuild,v 1.7 2006/02/02 19:41:25 corsair Exp $
-
-DESCRIPTION="Musepack decoder library"
-HOMEPAGE="http://www.musepack.net"
-SRC_URI="http://musepack.net/files/source/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc x86"
-IUSE="doc static"
-
-src_compile() {
-	econf \
-		$(use_enable static) \
-		$(use_enable !static shared) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README
-	use doc && dohtml docs/html/*
-}