Fix bug #410537 to respect CFLAGS. Thanks to Michael (kensington) for the report and the ebuild patch.

Package-Manager: portage-2.1.10.49/cvs/Linux i686

4 files changed, 18 insertions, 9 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index d8f4b0a77653..e363e0250d8d 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.288 2012/04/05 19:16:33 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.289 2012/04/28 17:12:59 billie Exp $
+
+  28 Apr 2012; Daniel Pielmeier <billie@gentoo.org> cdrtools-3.00.ebuild,
+  cdrtools-3.01_alpha07.ebuild:
+  Fix bug #410537 to respect CFLAGS. Thanks to Michael (kensington) for the
+  report and the ebuild patch.
 
   05 Apr 2012; Daniel Pielmeier <billie@gentoo.org>
   -cdrtools-3.01_alpha06.ebuild:
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 8b6c8eaf196c..26fc14d96293 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -3,14 +3,14 @@ Hash: SHA256
 
 DIST cdrtools-3.00.tar.bz2 1978563 RMD160 210684ab5e286ef59b788b49bd0b74d88f6435f4 SHA1 6464844d6b936d4f43ee98a04d637cd91131de4e SHA256 7f9cb64820055573b880f77b2f16662a512518336ba95ab49228a1617973423d
 DIST cdrtools-3.01a07.tar.bz2 2043525 RMD160 b8331d826bf64de8bd26c041624a3e41648b6952 SHA1 ee4b540e4897ee6637837a097658305d18345999 SHA256 cc54fefaf4ed5b6b49b996da1d1ebb1c44e88bbfada5c60e8f76c3a082591428
-EBUILD cdrtools-3.00.ebuild 4181 RMD160 4ade7ea77743f4064c6f487fc5dd04a77047e886 SHA1 4d66ec130204b7db128d0517c6ba65841e48d071 SHA256 f44d1a7b8dcea33bfc39686ac5c6a5c66294610b618ffcf96dabc41577f69fdb
-EBUILD cdrtools-3.01_alpha07.ebuild 4029 RMD160 33fe231fd2e6ef8b71acb1f11151981a3cfd547b SHA1 79dcd245724ce30a1bda676bdf0edcc5c0c7d6a5 SHA256 a3281cc27403b164168579da7d0836762cfe833a82d5905c1233eb989e736e81
-MISC ChangeLog 45097 RMD160 69db366b32cc21f10b29f047617e41f0ed17169d SHA1 2b2d31cc856b450efd46d4ed7cd9815cb1c3650e SHA256 a83fbda1f40546e35184780e2409c0e9e6d9bc995d2b1f1b25f3f7b6f9a14d26
+EBUILD cdrtools-3.00.ebuild 4233 RMD160 0531c95e5c1dfc5687fd71847c7cb35485771ec0 SHA1 7eba6e1808ccdb7110ce0409528e24456b1cc8a8 SHA256 7e1485000afb1dc66c2907b1a182788eefe2087cbbe474aae57035a438ab2198
+EBUILD cdrtools-3.01_alpha07.ebuild 4081 RMD160 6ad7fa6f19d8be01cb599d9ebb6926f717fdfc90 SHA1 fc300014310863ce888e413ce0572ccfb2b68aa8 SHA256 7bd1ab5bd35d5b6fc89533560db63f06346895092784dcaa564bb360ea51014d
+MISC ChangeLog 45311 RMD160 9da7e79ff749f9dc69a517c6ebc287f87dac3311 SHA1 6281e89b6ff593d14474d5b2695fe48dd3cdd9ef SHA256 121be3027463b0f96a732a4d7e0f16faec94e515abbcd480ae4861e2dba7ab20
 MISC metadata.xml 344 RMD160 a34ca9abb9d6e97a232f4b7d183e5350bbf2c978 SHA1 4f4dd69accee941e41b7d46e9038c50dce8e534f SHA256 1827502e9d2cfa583db6a17f065462b760bf3770fcac22a0145d6a560b2b34f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk9975wACgkQlcuUeyFa0U1j1ACgxgCTLe1w6yqIHbxJVJl7ZET9
-81YAoPh4BR4YBBmmxERU3tLL7YJx3NmR
-=1dYD
+iEYEAREIAAYFAk+cJSUACgkQlcuUeyFa0U3LeACePx9bYFVvSoXzifGHJcwIdUb8
+OEEAoPXeAUqcOw4BKRK3lCz6rZY29AKy
+=jlA9
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/cdrtools/cdrtools-3.00.ebuild b/app-cdr/cdrtools/cdrtools-3.00.ebuild
index f6bff0bd1815..4684c5838122 100644
--- a/app-cdr/cdrtools/cdrtools-3.00.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.00.ebuild,v 1.15 2012/04/05 19:16:33 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.00.ebuild,v 1.16 2012/04/28 17:12:59 billie Exp $
 
 EAPI=2
 
@@ -56,6 +56,8 @@ src_prepare() {
 		rules1.top || die "sed rules1.top"
 	sed -i -e "/^\(CC\|DYNLD\|LDCC\|MKDEP\)/s|gcc|${tcCC}|" \
 		-e "/^\(CC++\|DYNLDC++\|LDCC++\|MKC++DEP\)/s|g++|${tcCXX}|" \
+		-e "/COPTOPT=/s/-O//" \
+		-e 's/$(GCCOPTOPT)//' \
 		cc-gcc.rul || die "sed cc-gcc.rul"
 	sed -i -e "s|^#CONFFLAGS +=\t-cc=\$(XCC_COM)$|CONFFLAGS +=\t-cc=${tcCC}|g" \
 		rules.cnf || die "sed rules.cnf"
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha07.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha07.ebuild
index ff9773249665..66932d28f28e 100644
--- a/app-cdr/cdrtools/cdrtools-3.01_alpha07.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha07.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha07.ebuild,v 1.2 2012/04/05 19:16:33 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha07.ebuild,v 1.3 2012/04/28 17:12:59 billie Exp $
 
 EAPI=4
 
@@ -55,6 +55,8 @@ src_prepare() {
 		rules1.top || die "sed rules1.top"
 	sed -i -e "/^\(CC\|DYNLD\|LDCC\|MKDEP\)/s|gcc|${tcCC}|" \
 		-e "/^\(CC++\|DYNLDC++\|LDCC++\|MKC++DEP\)/s|g++|${tcCXX}|" \
+		-e "/COPTOPT=/s/-O//" \
+		-e 's/$(GCCOPTOPT)//' \
 		cc-gcc.rul || die "sed cc-gcc.rul"
 	sed -i -e "s|^#CONFFLAGS +=\t-cc=\$(XCC_COM)$|CONFFLAGS +=\t-cc=${tcCC}|g" \
 		rules.cnf || die "sed rules.cnf"