Respect CXX, CXXFLAGS and LDFLAGS wrt #240838.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 93 insertions, 8 deletions

diff --git a/media-video/atomicparsley/ChangeLog b/media-video/atomicparsley/ChangeLog
index 496f790145fd..ab991bf60305 100644
--- a/media-video/atomicparsley/ChangeLog
+++ b/media-video/atomicparsley/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/atomicparsley
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/atomicparsley/ChangeLog,v 1.15 2009/07/21 21:55:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/atomicparsley/ChangeLog,v 1.16 2009/07/21 22:22:32 ssuominen Exp $
+
+  21 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  atomicparsley-0.9.0.ebuild, +files/atomicparsley-0.9.0-environment.patch:
+  Respect CXX, CXXFLAGS and LDFLAGS wrt #240838.
 
   21 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
   atomicparsley-0.9.0.ebuild, +files/atomicparsley-0.9.0-glibc-2.10.patch:
diff --git a/media-video/atomicparsley/Manifest b/media-video/atomicparsley/Manifest
index 2e26713b8bf7..8205a4c732d1 100644
--- a/media-video/atomicparsley/Manifest
+++ b/media-video/atomicparsley/Manifest
@@ -1,5 +1,6 @@
+AUX atomicparsley-0.9.0-environment.patch 6195 RMD160 673cee75505a616d6522e0bf6d4c4c202ffccabf SHA1 ffcf59c0ac743fdff3fb150a55020fc66f5b7238 SHA256 842fe5f974962c5a768dc7cb500e153cdfd1d59f07734b70a39a93d6796b3f5c
 AUX atomicparsley-0.9.0-glibc-2.10.patch 1988 RMD160 3d9f1404b605f7d989c8432febb5d9ef907dffd5 SHA1 fdedb38654a7573e4e4d93cb7939db86ddc0a769 SHA256 9e0895bcfd2a056e837a58471c62f7ac51d56bbce33eb8d11eddc68a41085b0e
 DIST AtomicParsley-source-0.9.0.zip 172616 RMD160 c83afb09518e89d3a5dc317bcf46e2f8e23a7a7a SHA1 5b647324a6f460a3e48665717593ca7910936a1b SHA256 1344a66170e1f324eb43618763dbcfe984ca84c64ea8baf81e99e59657e082f7
-EBUILD atomicparsley-0.9.0.ebuild 910 RMD160 9c2f6d7949d76f4a84c442b75d5bfa55a448c49e SHA1 a51345eaa045e1005ee355dae70e906a943111b9 SHA256 4ac261df3c00a5797c0fb96f1b941c5d448dbabf560ae87a002e1d87c610f5db
-MISC ChangeLog 2023 RMD160 7147a1d423f29d5b79cbfe91c48de4f4a63b7a79 SHA1 6f0e69a228bfa0caa0633a82e4baecff03519605 SHA256 2f080e5b6c4f3d9cbb5caa20ada3c19d6ebb1bb71cabe2c9dab1c9f9d28473c1
+EBUILD atomicparsley-0.9.0.ebuild 892 RMD160 68bb21a4f1fa2fec592c02da881e177528e79171 SHA1 e19358039e7f81a7b4449e3e2f4e3600251b0152 SHA256 33f926725a6ae12948c9d149aa07f6a05deca4fc5ae8e5876699d656670dff1d
+MISC ChangeLog 2203 RMD160 c24001fc0da695fc09b745c65f552f02a75aeb08 SHA1 fd3a3388594918e47d0200730da77418ce8e1ed7 SHA256 4f807e88cc755fc45e63c7226a0898e7b03d4cc5fe90d28e5f53ce1ac7fe982f
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
diff --git a/media-video/atomicparsley/atomicparsley-0.9.0.ebuild b/media-video/atomicparsley/atomicparsley-0.9.0.ebuild
index 2022e2acd137..bc5724652398 100644
--- a/media-video/atomicparsley/atomicparsley-0.9.0.ebuild
+++ b/media-video/atomicparsley/atomicparsley-0.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/atomicparsley/atomicparsley-0.9.0.ebuild,v 1.12 2009/07/21 21:55:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/atomicparsley/atomicparsley-0.9.0.ebuild,v 1.13 2009/07/21 22:22:32 ssuominen Exp $
 
 EAPI=2
 MY_P=AtomicParsley-source-${PV}
@@ -16,17 +16,17 @@ KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=""
-DEPEND="app-arch/unzip
-	sys-apps/sed"
+DEPEND="app-arch/unzip"
 
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
-	sed -i -e "s:g++:$(tc-getCXX):g" build || die "sed failed"
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch \
+		"${FILESDIR}"/${P}-environment.patch
 }
 
 src_compile() {
+	tc-export CXX
 	./build || die "build failed"
 }
 
diff --git a/media-video/atomicparsley/files/atomicparsley-0.9.0-environment.patch b/media-video/atomicparsley/files/atomicparsley-0.9.0-environment.patch
new file mode 100644
index 000000000000..6db9c79a3275
--- /dev/null
+++ b/media-video/atomicparsley/files/atomicparsley-0.9.0-environment.patch
@@ -0,0 +1,80 @@
+diff -ur AtomicParsley-source-0.9.0.orig/build AtomicParsley-source-0.9.0/build
+--- AtomicParsley-source-0.9.0.orig/build	2006-09-10 18:02:58.000000000 +0300
++++ AtomicParsley-source-0.9.0/build	2009-07-22 01:19:39.000000000 +0300
+@@ -39,45 +39,45 @@
+ 
+ echo "Compiling AP_commons.cpp ..."
+ 
+-g++ -g -O2 -Wall -MT obj_files/AP_commons.o -MD -MP -MF "./obj_files/AP_commons.Tpo" -c -o obj_files/AP_commons.o AP_commons.cpp
++${CXX} ${CXXFLAGS} -Wall -MT obj_files/AP_commons.o -MD -MP -MF "./obj_files/AP_commons.Tpo" -c -o obj_files/AP_commons.o AP_commons.cpp
+ 
+ echo "Compiling AtomicParsley_genres.cpp ..."
+ 
+-g++ -g -O2 -Wall -MT obj_files/AtomicParsley_genres.o -MD -MP -MF "./obj_files/AtomicParsley_genres.Tpo" -c -o obj_files/AtomicParsley_genres.o AtomicParsley_genres.cpp
++${CXX} ${CXXFLAGS} -Wall -MT obj_files/AtomicParsley_genres.o -MD -MP -MF "./obj_files/AtomicParsley_genres.Tpo" -c -o obj_files/AtomicParsley_genres.o AtomicParsley_genres.cpp
+ 
+ echo "Compiling AP_iconv.cpp ..."
+ 
+-g++ -g -O2 -Wall $EXTRA_CPP_FLAGS -MT AP_iconv.o -MD -MP -MF "./obj_files/AP_iconv.Tpo" -c -o obj_files/AP_iconv.o AP_iconv.cpp
++${CXX} ${CXXFLAGS} -Wall $EXTRA_CPP_FLAGS -MT AP_iconv.o -MD -MP -MF "./obj_files/AP_iconv.Tpo" -c -o obj_files/AP_iconv.o AP_iconv.cpp
+ 
+ if test $OS = Darwin ; then
+   echo "Compiling AP_NSFile_utils.mm ..."
+ 
+-  g++ -g -O2 -Wall -MT obj_files/AP_NSFile_utils.o -MD -MP -MF "./obj_files/AP_NSFile_utils.Tpo" -c -o obj_files/AP_NSFile_utils.o AP_NSFile_utils.mm
++  ${CXX} ${CXXFLAGS} -Wall -MT obj_files/AP_NSFile_utils.o -MD -MP -MF "./obj_files/AP_NSFile_utils.Tpo" -c -o obj_files/AP_NSFile_utils.o AP_NSFile_utils.mm
+ 
+   echo "Compiling AP_NSImage.mm ..."
+ 
+-  g++ -g -O2 -Wall -MT obj_files/AP_NSImage.o -MD -MP -MF "./obj_files/AP_NSImage.Tpo" -c -o obj_files/AP_NSImage.o AP_NSImage.mm
++  ${CXX} ${CXXFLAGS} -Wall -MT obj_files/AP_NSImage.o -MD -MP -MF "./obj_files/AP_NSImage.Tpo" -c -o obj_files/AP_NSImage.o AP_NSImage.mm
+ fi
+ 
+ echo "Compiling AtomicParsley.cpp ..."
+ 
+-g++ -g -O2 -Wall -Wno-unused $EXTRA_CPP_FLAGS -MT obj_files/AtomicParsley.o -MD -MP -MF "./obj_files/AtomicParsley.Tpo" -c -o obj_files/AtomicParsley.o AtomicParsley.cpp
++${CXX} ${CXXFLAGS} -Wall -Wno-unused $EXTRA_CPP_FLAGS -MT obj_files/AtomicParsley.o -MD -MP -MF "./obj_files/AtomicParsley.Tpo" -c -o obj_files/AtomicParsley.o AtomicParsley.cpp
+ 
+ echo "Compiling AP_AtomExtracts.cpp ..."
+ 
+-g++ -g -O2 -Wall $EXTRA_CPP_FLAGS -I../AtomicParsley -MT obj_files/AP_AtomExtracts.o -MD -MP -MF "./obj_files/AP_AtomExtracts.Tpo" -c -o obj_files/AP_AtomExtracts.o AP_AtomExtracts.cpp
++${CXX} ${CXXFLAGS} -Wall $EXTRA_CPP_FLAGS -I../AtomicParsley -MT obj_files/AP_AtomExtracts.o -MD -MP -MF "./obj_files/AP_AtomExtracts.Tpo" -c -o obj_files/AP_AtomExtracts.o AP_AtomExtracts.cpp
+ 
+ echo "Compiling APar_sha1.cpp ..."
+ 
+-g++ -g -O2 -Wall $EXTRA_CPP_FLAGS -I../AtomicParsley -MT obj_files/APar_sha1.o -MD -MP -MF "./obj_files/APar_sha1.Tpo" -c -o obj_files/APar_sha1.o APar_sha1.cpp
++${CXX} ${CXXFLAGS} -Wall $EXTRA_CPP_FLAGS -I../AtomicParsley -MT obj_files/APar_sha1.o -MD -MP -MF "./obj_files/APar_sha1.Tpo" -c -o obj_files/APar_sha1.o APar_sha1.cpp
+ 
+ echo "Compiling APar_uuid.cpp ..."
+ 
+-g++ -g -O2 -Wall $EXTRA_CPP_FLAGS -I../AtomicParsley -MT obj_files/APar_uuid.o -MD -MP -MF "./obj_files/APar_uuid.Tpo" -c -o obj_files/APar_uuid.o APar_uuid.cpp
++${CXX} ${CXXFLAGS} -Wall $EXTRA_CPP_FLAGS -I../AtomicParsley -MT obj_files/APar_uuid.o -MD -MP -MF "./obj_files/APar_uuid.Tpo" -c -o obj_files/APar_uuid.o APar_uuid.cpp
+ 
+ echo "Compiling main.cpp ..."
+ 
+-g++ -g -O2 -Wall $EXTRA_CPP_FLAGS -I../AtomicParsley -MT obj_files/main.o -MD -MP -MF "./obj_files/main.Tpo" -c -o obj_files/main.o main.cpp
++${CXX} ${CXXFLAGS} -Wall $EXTRA_CPP_FLAGS -I../AtomicParsley -MT obj_files/main.o -MD -MP -MF "./obj_files/main.Tpo" -c -o obj_files/main.o main.cpp
+ 
+ #---------------------------------------------#
+ #                  Linking                    #
+@@ -85,16 +85,16 @@
+ echo "Linking AtomicParsley..."
+ 
+ if test $OS = Darwin ; then
+-  g++ -g -O2 -Wall -framework Cocoa -o AtomicParsley obj_files/APar_sha1.o obj_files/APar_uuid.o obj_files/AP_commons.o obj_files/AtomicParsley_genres.o obj_files/AP_iconv.o obj_files/AP_NSFile_utils.o obj_files/AP_NSImage.o obj_files/AP_AtomExtracts.o obj_files/AtomicParsley.o obj_files/main.o
++  ${CXX} ${LDFLAGS} -Wall -framework Cocoa -o AtomicParsley obj_files/APar_sha1.o obj_files/APar_uuid.o obj_files/AP_commons.o obj_files/AtomicParsley_genres.o obj_files/AP_iconv.o obj_files/AP_NSFile_utils.o obj_files/AP_NSImage.o obj_files/AP_AtomExtracts.o obj_files/AtomicParsley.o obj_files/main.o
+ 
+ elif test $OS = Linux ; then
+-  g++ -O2 -Wall -o AtomicParsley obj_files/APar_sha1.o obj_files/APar_uuid.o obj_files/AP_commons.o obj_files/AtomicParsley_genres.o obj_files/AP_iconv.o obj_files/AP_AtomExtracts.o obj_files/AtomicParsley.o obj_files/main.o
++  ${CXX} ${LDFLAGS} -Wall -o AtomicParsley obj_files/APar_sha1.o obj_files/APar_uuid.o obj_files/AP_commons.o obj_files/AtomicParsley_genres.o obj_files/AP_iconv.o obj_files/AP_AtomExtracts.o obj_files/AtomicParsley.o obj_files/main.o
+ 
+ elif test $OS = CYGWIN ; then
+-  g++ -g -O2 -Wall -o AtomicParsley.exe obj_files/APar_sha1.o obj_files/APar_uuid.o  obj_files/AP_commons.o obj_files/AtomicParsley_genres.o obj_files/AP_iconv.o obj_files/AP_AtomExtracts.o obj_files/AtomicParsley.o obj_files/main.o -lgcc 
++  ${CXX} ${LDFLAGS} -Wall -o AtomicParsley.exe obj_files/APar_sha1.o obj_files/APar_uuid.o  obj_files/AP_commons.o obj_files/AtomicParsley_genres.o obj_files/AP_iconv.o obj_files/AP_AtomExtracts.o obj_files/AtomicParsley.o obj_files/main.o -lgcc 
+ 
+ else
+-  g++ -g -O2 -Wall -o AtomicParsley.exe obj_files/APar_sha1.o obj_files/APar_uuid.o obj_files/AP_commons.o obj_files/AtomicParsley_genres.o obj_files/AP_iconv.o obj_files/AP_AtomExtracts.o obj_files/AtomicParsley.o obj_files/main.o
++  ${CXX} ${CXXFLAGS} -Wall -o AtomicParsley.exe obj_files/APar_sha1.o obj_files/APar_uuid.o obj_files/AP_commons.o obj_files/AtomicParsley_genres.o obj_files/AP_iconv.o obj_files/AP_AtomExtracts.o obj_files/AtomicParsley.o obj_files/main.o
+ fi
+ 
+ #---------------------------------------------#