From 350846f1b04c91d469f2d7094a0b79c617e38c4e Mon Sep 17 00:00:00 2001 From: Daniel Pielmeier Date: Tue, 18 May 2010 19:16:13 +0000 Subject: [PATCH] Backport as-needed fix to older versions. Package-Manager: portage-2.1.8.3/cvs/Linux i686 --- app-cdr/cdrtools/ChangeLog | 6 +++++- app-cdr/cdrtools/Manifest | 6 +++--- app-cdr/cdrtools/cdrtools-2.01.01_alpha75.ebuild | 11 +++++++---- app-cdr/cdrtools/cdrtools-2.01.01_alpha78.ebuild | 11 +++++++---- 4 files changed, 22 insertions(+), 12 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 + 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/Manifest b/app-cdr/cdrtools/Manifest index d6efdf5488dd..9cafa8775405 100644 --- a/app-cdr/cdrtools/Manifest +++ b/app-cdr/cdrtools/Manifest @@ -1,8 +1,8 @@ DIST cdrtools-2.01.01a75.tar.bz2 1922616 RMD160 784e6ffda7082f9a1f25c67647a148271445ab40 SHA1 eaef1c4b20763301e1c10139ad51923bb161de3e SHA256 49c84695ab01c4b34df7405bcdadb64b244dcccac7908dbcb97972f623ba23fe DIST cdrtools-2.01.01a78.tar.bz2 1928976 RMD160 8fcaf22c1032e1cc88426804530ee6f971b6625e SHA1 39643e00a37b1a2c38e6190675251b793ca97225 SHA256 7a7a2a56c5d8cd978bb12a78347c43595252b2808bacc17712853f17e3ed2e2c DIST cdrtools-2.01.01a79.tar.bz2 1946150 RMD160 250a5792fd07cadf76415b29e27ad93342158fc8 SHA1 8f78c45597894ce6cf413f0e8c59e5be9ba03217 SHA256 2129ea2bb7803ebaa02a567a52e788caabfa356f5f83fa11fb5f097b7edf7867 -EBUILD cdrtools-2.01.01_alpha75.ebuild 3908 RMD160 9e5761543a13be6f407571861c6a7c462afc6583 SHA1 e3919387490faeaaf06bbc710a1ee31ddc18f116 SHA256 1cca349320ee7e3bc3290357b71136d5f4368a4f0427ba2f44d7ea5f6e72f192 -EBUILD cdrtools-2.01.01_alpha78.ebuild 3875 RMD160 ec09b5946603df358b146c109bc9dc600097c813 SHA1 bac93beac90f9a25e588131dd74e3126a2e5d488 SHA256 ad8e92335dc9cc37fed0279d292f935d88f0a9440eccae1a5f2c519263b8e83d +EBUILD cdrtools-2.01.01_alpha75.ebuild 4076 RMD160 5a12972583bba4093a8676ff74b46e75fa4309b3 SHA1 90c1c82e068233a7dcc49789f4faa6b33ade008e SHA256 9156e314e8a4ae5d4ef9b51fca6e1ebd15bdcedaa3a2568005566b418f61e31d +EBUILD cdrtools-2.01.01_alpha78.ebuild 4021 RMD160 da0273dab88ced01d8edc275058e3df4a0e3212e SHA1 275a6c46332c955190149f5f6cc9303a622e7b7e SHA256 31f40e601d71e609124c4778823e032e5434f5e2903fc20955adff07a6e38239 EBUILD cdrtools-2.01.01_alpha79.ebuild 4042 RMD160 1595dc117ec6bf85cfe7416719e1834d0f0efe79 SHA1 75af31a10a1abad454ee0eabb22f734cf4127844 SHA256 9ef225be0032781e17c0bd5325677f2cb9efa63711908d286aadc8e72bc8498b -MISC ChangeLog 40968 RMD160 bddb980922a0e6f81599fc910c3dd0f18dc2d00f SHA1 770ae86527ec91c8ac33687deca94b97bc485bc2 SHA256 f0ed48e612bcb0e8429fa8e089570596ca61ac5acb82c789e2d16b9d9e876813 +MISC ChangeLog 41133 RMD160 4534dcb34029850825aeedc05c46c9b80fde5607 SHA1 f6e814c049a312d3c3b782c78c7473e6b6a74970 SHA256 b933c4cb6bb278d6a9d8d7a5537e404d310a045bd52f2af56d808489ae5524ba MISC metadata.xml 344 RMD160 a34ca9abb9d6e97a232f4b7d183e5350bbf2c978 SHA1 4f4dd69accee941e41b7d46e9038c50dce8e534f SHA256 1827502e9d2cfa583db6a17f065462b760bf3770fcac22a0145d6a560b2b34f8 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. -- 2.26.2