summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-10-23 12:54:22 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-10-23 12:54:22 +0000
commit0b4a082679984cf34f36b6b8ffb7d4399dec5e2b (patch)
treeac95cc94ea7318a16f3bfa4c6bcd1faef3d790b5 /media-sound
parentalpha/ia64/sh/sparc stable wrt #379423 (diff)
downloadhistorical-0b4a082679984cf34f36b6b8ffb7d4399dec5e2b.tar.gz
historical-0b4a082679984cf34f36b6b8ffb7d4399dec5e2b.tar.bz2
historical-0b4a082679984cf34f36b6b8ffb7d4399dec5e2b.zip
Revert last, and invalid commit which only made installing static archives optional, instead of disabling them at build time too.
Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/cdparanoia/ChangeLog6
-rw-r--r--media-sound/cdparanoia/cdparanoia-3.10.2-r3.ebuild15
2 files changed, 8 insertions, 13 deletions
diff --git a/media-sound/cdparanoia/ChangeLog b/media-sound/cdparanoia/ChangeLog
index f4f0bf4e10eb..4724000c240d 100644
--- 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 037baad45ae5..789590a512a6 100644
--- 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
}