summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Pielmeier <billie@gentoo.org>2010-05-18 19:16:13 +0000
committerDaniel Pielmeier <billie@gentoo.org>2010-05-18 19:16:13 +0000
commit0e329e316022cb770b09ebb43e705a45f428a6ed (patch)
treef132edaf62676c08bedfdb212d8b5291bfc4e353 /app-cdr/cdrtools
parentVersion bump, bug 320095. ChangeLog: http://releases.xfce.org/feeds/project/m... (diff)
downloadgentoo-2-0e329e316022cb770b09ebb43e705a45f428a6ed.tar.gz
gentoo-2-0e329e316022cb770b09ebb43e705a45f428a6ed.tar.bz2
gentoo-2-0e329e316022cb770b09ebb43e705a45f428a6ed.zip
Backport as-needed fix to older versions.
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'app-cdr/cdrtools')
-rw-r--r--app-cdr/cdrtools/ChangeLog6
-rw-r--r--app-cdr/cdrtools/cdrtools-2.01.01_alpha75.ebuild11
-rw-r--r--app-cdr/cdrtools/cdrtools-2.01.01_alpha78.ebuild11
3 files changed, 19 insertions, 9 deletions
diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 72861ac20ed8..9d3f5a498974 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-cdr/cdrtools
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.260 2010/05/18 18:59:25 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.261 2010/05/18 19:16:13 billie Exp $
+
+ 18 May 2010; Daniel Pielmeier <billie@gentoo.org>
+ cdrtools-2.01.01_alpha75.ebuild, cdrtools-2.01.01_alpha78.ebuild:
+ Backport as-needed fix to older versions.
*cdrtools-2.01.01_alpha79 (18 May 2010)
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha75.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha75.ebuild
index 76b006d5eec2..0b022b3d074a 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha75.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha75.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha75.ebuild,v 1.7 2010/05/16 17:32:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha75.ebuild,v 1.8 2010/05/18 19:16:13 billie Exp $
EAPI=2
@@ -101,13 +101,16 @@ src_compile() {
# If not built with -j1, "sometimes" cdda2wav will not be built. Bug?
emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \
- LDOPTX="${LDFLAGS}" LINKMODE="dynamic" LIB_ACL_TEST="${acl}" \
- GMAKE_NOWARN="true" || die "emake"
+ LDOPTX="${LDFLAGS}" LIB_ACL_TEST="${acl}" \
+ INS_BASE="${D}/usr/" INS_RBASE="${D}" MANDIR="share/man" \
+ LINKMODE="dynamic" GMAKE_NOWARN="true" || die "emake"
}
src_install() {
# If not built with -j1, "sometimes" manpages are not installed. Bug?
- emake -j1 INS_BASE="${D}/usr/" INS_RBASE="${D}" MANDIR="share/man" \
+ emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \
+ LDOPTX="${LDFLAGS}" LIB_ACL_TEST="${acl}" \
+ INS_BASE="${D}/usr/" INS_RBASE="${D}" MANDIR="share/man" \
LINKMODE="dynamic" GMAKE_NOWARN="true" install || die "emake install"
# These symlinks are for compat with cdrkit.
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha78.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha78.ebuild
index 357e8fb14e19..b6c19971da23 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha78.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha78.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha78.ebuild,v 1.2 2010/04/27 20:27:26 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha78.ebuild,v 1.3 2010/05/18 19:16:13 billie Exp $
EAPI=2
@@ -98,13 +98,16 @@ src_compile() {
# If not built with -j1, "sometimes" cdda2wav will not be built. Bug?
emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \
- LDOPTX="${LDFLAGS}" LINKMODE="dynamic" \
- GMAKE_NOWARN="true" || die "emake"
+ LDOPTX="${LDFLAGS}" \
+ INS_BASE="${D}/usr/" INS_RBASE="${D}" MANDIR="share/man" \
+ LINKMODE="dynamic" GMAKE_NOWARN="true" || die "emake"
}
src_install() {
# If not built with -j1, "sometimes" manpages are not installed. Bug?
- emake -j1 INS_BASE="${D}/usr/" INS_RBASE="${D}" MANDIR="share/man" \
+ emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \
+ LDOPTX="${LDFLAGS}" \
+ INS_BASE="${D}/usr/" INS_RBASE="${D}" MANDIR="share/man" \
LINKMODE="dynamic" GMAKE_NOWARN="true" install || die "emake install"
# These symlinks are for compat with cdrkit.