do not prestrip files, bug #243836; respect CC variable

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27.3 i686

4 files changed, 26 insertions, 9 deletions

diff --git a/media-gfx/tuxpaint/ChangeLog b/media-gfx/tuxpaint/ChangeLog
index a0254d7abfdf..0e3a67403b25 100644
--- a/media-gfx/tuxpaint/ChangeLog
+++ b/media-gfx/tuxpaint/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/tuxpaint
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.43 2008/10/21 20:25:04 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.44 2008/10/25 13:14:14 maekke Exp $
+
+  25 Oct 2008; Markus Meier <maekke@gentoo.org>
+  +files/tuxpaint-0.9.19-strip.patch, tuxpaint-0.9.19.ebuild:
+  do not prestrip files, bug #243836; respect CC variable
 
   21 Oct 2008; Thomas Anderson <gentoofan23@gentoo.org>
   tuxpaint-0.9.19.ebuild:
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 58840a269bf3..adf9db4818ca 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -7,6 +7,7 @@ AUX tuxpaint-0.9.17-printing.patch 1523 RMD160 9ec54087ac22b8de0e439bf014f1b6908
 AUX tuxpaint-0.9.18-gentoo.patch 6612 RMD160 ddcf3bdab81b12eac05fc6d7fbee451ae9579099 SHA1 14f373b5b5e590b186b4f8e58d2e4db1145ef773 SHA256 df5351c00515150006b2cda92d5c68e306a130c2de4ae425d577c5031bf981c5
 AUX tuxpaint-0.9.19-gentoo.patch 6972 RMD160 967654628f2e05b86d6e60d7b726073ea9cf0cfd SHA1 e162721aeb0601511493fb9b7d0d648fd5b52f6e SHA256 a82ec54f4c33e1c399b7637a49e0e91e939e28a6aef7703655f8fb98bc8a612e
 AUX tuxpaint-0.9.19-libpng.patch 455 RMD160 5d1dce369310631b6b167d2917b4267dc2fd8382 SHA1 06dd0ad8b667aa0dc54e13ca62c119d026e7b374 SHA256 e689db548f3341e17487e4676ebe7863286d535fdd18ec977f3eb25ba3073695
+AUX tuxpaint-0.9.19-strip.patch 384 RMD160 4b44c5cb539cca93ec52fce8eed5ce8290a47ccf SHA1 67a0c9e65f7c9ced3dfbce0fd1ed575056bbae71 SHA256 56a132de3cf40ab3037b0dbf23a526e098df308fa4a1d810371839e68e7da9ed
 DIST tuxpaint-0.9.16.tar.gz 6785134 RMD160 f263455fa3bd4d51e7280a5451d7cc021b2c9639 SHA1 7c09582abe69d0fc6f0e1077c839b8931899fbe7 SHA256 af2dd9dcac7c7377e344bb964b8a523402aeffde877522c844f98c9e1e5881e0
 DIST tuxpaint-0.9.17.tar.gz 7570223 RMD160 c7cf3636875cad87646cda4df978f9adbbf18630 SHA1 88e42d19339bb1faa03bce45a28d3fe11fbe05b4 SHA256 d01159625fa475739f79f6a5cb2a7dd65e486d165c52d6d8d56cf5222a6fe1ad
 DIST tuxpaint-0.9.18.tar.gz 8243665 RMD160 2d6f7063c65aa073b9af1553a9b5914373e847ee SHA1 34c59dc7789e4bd85ba5b34f3e173227b5879e5b SHA256 7fe48a8c2fd39bc4485eeb5e6c55567f48f50960b3132c091a06e0067d91b9b9
@@ -14,13 +15,13 @@ DIST tuxpaint-0.9.19.tar.gz 8474855 RMD160 52a21da2c8e5c15af4a06f4592245434dfdba
 EBUILD tuxpaint-0.9.16-r1.ebuild 1337 RMD160 741dd82d5ab85bcbc0ab1ce2caed9e90bba31705 SHA1 0ddf2f0db2d52dbc44618b672847f658626fca9c SHA256 247982f464ce8b3bf173dd3175fce95512e9be365fa06f4211360656a5642c9b
 EBUILD tuxpaint-0.9.17-r1.ebuild 1514 RMD160 6daee04c9a6d0ea127b5c86b6b288f51c739bb86 SHA1 2a0ecd64d9ca9bc230bd076eab79d14b24c5a6d1 SHA256 b67d922f0157b73fce8f89b7833f79d3cac18029a9f571039491e26c04bd314c
 EBUILD tuxpaint-0.9.18.ebuild 1443 RMD160 2e3585d106a67e260be2346463b9477d7ff2dc52 SHA1 d112dc718cad59e36f0f7c5593442a21b477e859 SHA256 9027e68306427619ea0ea11353e166e8cc995d59f6ac5b60bf1873ec042b0d24
-EBUILD tuxpaint-0.9.19.ebuild 1619 RMD160 0d5ea1646172d4d267044d06653102e7dff0abcd SHA1 30bd474791ca91c4acc9679a2d740f1e34f13787 SHA256 7c4a9c789f1e0b7500172faa30dc1d88459a21c28de3a07a13e7126ec4012cc2
-MISC ChangeLog 6883 RMD160 a5eb9d3cd9644da7ddc114527acc3b44174bba81 SHA1 d83256aabb6a20eed9b5e97d852c722d4bf5e6d0 SHA256 586162864a2011324c534ada0c3743649810cb00220d62f0e8d8d62d385451bd
+EBUILD tuxpaint-0.9.19.ebuild 1686 RMD160 4b61d6b60a8e514dde242c5221e3a97d3d6ea1ee SHA1 28efe47b2c80a26e4e01e6745cb9c10bd17fa668 SHA256 940c63b2872123df364fc7375c25c08f58029303178b0f02c11fc88e3649b985
+MISC ChangeLog 7047 RMD160 efeacc387dc61f8c7a232faf380bd397740f0d42 SHA1 42468c0e5a45c8abee3ba296bd0b68036b966e33 SHA256 8d18c2fedefdf1b32ec84b3e5abb788763ae74d65019cba9e99203c1987a6842
 MISC metadata.xml 648 RMD160 9637df32ab38d7c4e98c32194c34393eae4786fb SHA1 710e2dfd4045a91e222ac33769adf2d74512ac86 SHA256 5f951324251b981f6dd24414b0b34a590a8ff051f29f2f24a6e1d08c71c82025
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkj+OqkACgkQF6yMcaBxwHmHBgCfdXcADMOd6sAIF6/T77bd+3+u
-yqIAnjkb2Ns9pIqCm1gRJhJ0P5eNdcZp
-=D2si
+iEYEARECAAYFAkkDHAEACgkQkKaRLQcq0GKWcQCeJHP9+UP4p82yM+i1FD9OgdKc
+yu8An3FatukKYPv5A4UVxB+yZrxNCzaX
+=0IEJ
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.19-strip.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.19-strip.patch
new file mode 100644
index 000000000000..8e031c537add
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.19-strip.patch
@@ -0,0 +1,11 @@
+diff -ru tuxpaint-0.9.19.orig/magic/Makefile tuxpaint-0.9.19/magic/Makefile
+--- tuxpaint-0.9.19.orig/magic/Makefile	2008-10-25 14:58:57.000000000 +0200
++++ tuxpaint-0.9.19/magic/Makefile	2008-10-25 14:59:13.000000000 +0200
+@@ -50,7 +50,6 @@
+ 	shift.$(SO_TYPE) \
+ 	calligraphy.$(SO_TYPE) \
+ 	distortion.$(SO_TYPE)
+-	@strip *.$(SO_TYPE)
+ 
+ install:
+ 	cd .. ; make install-magic-plugins
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.19.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.19.ebuild
index d72c95c3a370..d1b83714b22d 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.19.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.19.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/tuxpaint-0.9.19.ebuild,v 1.3 2008/10/21 20:25:04 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/tuxpaint-0.9.19.ebuild,v 1.4 2008/10/25 13:14:14 maekke Exp $
 
-inherit eutils gnome2-utils multilib
+inherit eutils gnome2-utils multilib toolchain-funcs
 
 DESCRIPTION="Drawing program designed for young children"
 HOMEPAGE="http://www.tuxpaint.org/"
@@ -34,6 +34,7 @@ src_unpack() {
 	# Sanitize the Makefile and correct a few other issues.
 	epatch "${FILESDIR}/${P}-gentoo.patch"
 	epatch "${FILESDIR}/${P}-libpng.patch"
+	epatch "${FILESDIR}/${P}-strip.patch"
 
 	# Make multilib-strict compliant, see bug #200740
 	sed -i -e "s:/GET_LIBDIR/:/$(get_libdir)/:" Makefile || die "sed failed"
@@ -46,7 +47,7 @@ src_compile() {
 	use svg || myopts="${myopts} nosvg"
 
 	# emake may break things
-	make ${myopts} || die "Compilation failed"
+	make CC="$(tc-getCC)" ${myopts} || die "Compilation failed"
 }
 
 src_install () {