Revert last, and invalid commit which only made installing static archives optional...

Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64

diff --git a/media-sound/cdparanoia/ChangeLog b/media-sound/cdparanoia/ChangeLog
index f4f0bf4e10eb25c684a728d2cf70b1f757dc2fc4..4724000c240d8c5e1e15ce8ebff81fac1c8eabd1 100644 (file)
--- a/media-sound/cdparanoia/ChangeLog
+++ b/media-sound/cdparanoia/ChangeLog
@@ -1,10 +1,6 @@
 # ChangeLog for media-sound/cdparanoia
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.103 2011/10/23 12:00:55 scarabeus Exp $
-
-  23 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
-  cdparanoia-3.10.2-r3.ebuild:
-  Bump to eapi4 and punt static libs.
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.104 2011/10/23 12:54:22 ssuominen Exp $
 
   21 Jan 2010; Jonathan Callen <abcd@gentoo.org>
   cdparanoia-3.10.2-r3.ebuild:

diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r3.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r3.ebuild
index 037baad45ae5d1a65547a3babedb56a7bcf9289f..789590a512a6f8ec61c62c0c5c19e475bbf0a7ff 100644 (file)
--- a/media-sound/cdparanoia/cdparanoia-3.10.2-r3.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.10.2-r3.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.10.2-r3.ebuild,v 1.11 2011/10/23 12:00:55 scarabeus Exp $
-
-EAPI=4
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.10.2-r3.ebuild,v 1.12 2011/10/23 12:54:22 ssuominen Exp $
 
+EAPI=2
 inherit autotools eutils flag-o-matic libtool toolchain-funcs versionator
 
 MY_P=${PN}-III-$(get_version_component_range 2-3)
@@ -15,7 +14,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${MY_P}.src.tgz
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
+IUSE=""
 
 S=${WORKDIR}/${MY_P}
 
@@ -25,7 +24,7 @@ src_prepare() {
        mv configure.guess config.guess
        mv configure.sub config.sub
 
-       sed -i -e '/configure.\(guess\|sub\)/d' configure.in || die "sed failed"
+       sed -i -e '/configure.\(guess\|sub\)/d' configure.in || die
 
        eautoconf
        elibtoolize
@@ -38,10 +37,10 @@ src_configure() {
 }
 
 src_compile() {
-       emake OPT="${CFLAGS}"
+       emake OPT="${CFLAGS}" || die
 }
 
 src_install() {
-       default
-       use static-libs || find "${ED}" -name '*.a' -exec rm -f {} +
+       emake DESTDIR="${D}" install || die
+       dodoc README
 }