fix build with distcc instead of disabling it, by David Leverton <levertond@googlemail.com>, bug #245333

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27.5 x86_64

4 files changed, 24 insertions, 9 deletions

diff --git a/media-gfx/sam2p/ChangeLog b/media-gfx/sam2p/ChangeLog
index 925369dc0409..a53d9dfbc91b 100644
--- a/media-gfx/sam2p/ChangeLog
+++ b/media-gfx/sam2p/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/sam2p
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/ChangeLog,v 1.32 2008/10/07 06:02:21 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/ChangeLog,v 1.33 2008/11/14 09:15:30 aballier Exp $
+
+  14 Nov 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/sam2p-0.45-distcc.patch, sam2p-0.45-r1.ebuild:
+  fix build with distcc instead of disabling it, by David Leverton
+  <levertond@googlemail.com>, bug #245333
 
   07 Oct 2008; Zac Medico <zmedico@gentoo.org> sam2p-0.45-r1.ebuild:
   Bug #239671 - Fix the distcc workaround so it also works when ccache is
diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index 8c07421b87e5..808075f4a4f8 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA1
 
 AUX sam2p-0.45-cflags.patch 1294 RMD160 eeadcc13c88f1685cdbb15d50fe49ccc738f2a15 SHA1 0218fa834218e51937625b9e0168c709db5fb7a0 SHA256 31fec5d1396185336d33e0ed2d0b005264f4af6b8c63b6b39a2947d07e69ca9e
+AUX sam2p-0.45-distcc.patch 324 RMD160 aea15d4ffccc99041ead74b1ca9bb6419e72a8dc SHA1 c4154ffee146c66ba72114f0e5a84cc3c35a9619 SHA256 5226cc74693dac083b26fb608f29c040f43f19b3c5898b82a8a7727421264d5b
 AUX sam2p-0.45-fbsd.patch 319 RMD160 7f4afe0d92224471aa2ad96eeefe9e9fa05c2db1 SHA1 24522fb8171c52249cbb57c52d16ae9e6196cc5a SHA256 44944d770cb7dc515c54b325d46451edefb89b73ac3b407374d18b7639a26d80
 AUX sam2p-0.45-nostrip.patch 346 RMD160 31f61d64c0013f8e35711068e3fcd8e878a320ae SHA1 2ea36b9fe1441246cb7b0443ac528932e82188f3 SHA256 5bb2ed5ac221bc2e27459b66510e3ca4c521f460f4fe4539439d582b35af9188
 AUX sam2p-0.45-parallelmake.patch 3736 RMD160 d012738ea178ea8ec945bc36ca165b09dce3c1af SHA1 78849b017bc330d08e975155ee61bda22138044b SHA256 97f48c3e9a6f9dbc1b741a5c70e037c0ccd3a343cef0582a4496f5a7b5cfc4d7
 DIST sam2p-0.45.tar.bz2 434746 RMD160 122e81208f241a7e9d33bddd7df17780b306b305 SHA1 7bba06220ff755c9c68632644afa8ef2f26cab6f SHA256 ed109acb74445e926f39757d7f133b72903d92017da46f8ccb4f26624eb797ff
-EBUILD sam2p-0.45-r1.ebuild 1203 RMD160 34f4cd1ec1ef8f8c0c67f7d4f623f5ce00a07885 SHA1 25e87036f5bc6ebf4500f26845bc330a530aca4c SHA256 00b62112aae04fa9bff17b33001bdeaa28222640e085d3549f70280767d09a65
+EBUILD sam2p-0.45-r1.ebuild 1177 RMD160 3e36f80d0baf24a703bada14fabf00154d496af9 SHA1 4d4538430a33f6fca7b1edbe26367ed060d4fdd7 SHA256 85d081f6a0c8a9fc9b89547b26c9a8696037b4e142b64d134786d48e7587bdcc
 EBUILD sam2p-0.45.ebuild 842 RMD160 7ddf418effff8fb228b8605a6a5dd4e6d15e6e3a SHA1 40cf407a14afeb7b0a7b1da11040a5d3aa95bda7 SHA256 14c270e1b6e155ee688548a461bc9c924897241277dde352de6aae6f7b241e64
-MISC ChangeLog 4378 RMD160 e6cb2d17e592768c7fadf2ecbd76bee5e67f5d77 SHA1 908dfbabeb3a7ffa65ce2311b25664a7e7bb753e SHA256 dfd70723fc48b3700024821bd5aff05a4efd981d70bb3fb3ef549b65d52e34c1
+MISC ChangeLog 4597 RMD160 582a16b0392dacb1dada88784aec97196f3a7244 SHA1 4d4ebe602fab88318d40393cb99a65cde392053f SHA256 53641ae6c42b1bb467f69665cb2689fe6006831c0c911a12bf675569d121aa9d
 MISC metadata.xml 157 RMD160 e666a9e73ee48e70d6fc6ea78049d38b1fcde7c2 SHA1 43a0c32101f0c6ffd8fa1aa620c8032d194a9e3a SHA256 18238fb417d8677a0495cdaba9b043526174ba63b51494b88b10aa7dd903124c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjq+3MACgkQ/ejvha5XGaPk8QCg7lpw7W8gOBxwQw6QqumezgUs
-NqQAoJY0lQhUgll1RPCxIRKU0fFCXRmJ
-=m3Ul
+iEYEARECAAYFAkkdQbgACgkQvFcC4BYPU0q6DgCdHdXCqbUq/v6nyqIUHDTjr8bB
+ZB0An2ojvsTQYOT6SX0Gxn8fp/yAl2O/
+=8iKO
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/sam2p/files/sam2p-0.45-distcc.patch b/media-gfx/sam2p/files/sam2p-0.45-distcc.patch
new file mode 100644
index 000000000000..b99fb95ed292
--- /dev/null
+++ b/media-gfx/sam2p/files/sam2p-0.45-distcc.patch
@@ -0,0 +1,10 @@
+--- sam2p-0.45/ccdep.pl~	2005-01-06 09:59:39.000000000 +0000
++++ sam2p-0.45/ccdep.pl	2008-11-02 22:16:57.000000000 +0000
+@@ -224,6 +224,7 @@
+   } elsif ($S=~/: No such file or directory$/) {
+     # ^^^ gcc-3.3
+     undef $included_from;
++  } elsif ($S=~/^distcc\[/) {
+   } else {
+     die "$0: invalid depret: [$S]\n";
+   }
diff --git a/media-gfx/sam2p/sam2p-0.45-r1.ebuild b/media-gfx/sam2p/sam2p-0.45-r1.ebuild
index edb0167b6627..f911c161b04e 100644
--- a/media-gfx/sam2p/sam2p-0.45-r1.ebuild
+++ b/media-gfx/sam2p/sam2p-0.45-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/sam2p-0.45-r1.ebuild,v 1.9 2008/10/07 06:02:21 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/sam2p-0.45-r1.ebuild,v 1.10 2008/11/14 09:15:30 aballier Exp $
 
 inherit toolchain-funcs eutils autotools
 
@@ -24,13 +24,12 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-nostrip.patch"
 	epatch "${FILESDIR}/${P}-cflags.patch"
 	epatch "${FILESDIR}/${P}-parallelmake.patch"
+	epatch "${FILESDIR}/${P}-distcc.patch"
 	eautoreconf
 }
 
 src_compile() {
 	tc-export CXX
-	# Makedep fails with distcc
-	PATH=${PATH/\/usr\/lib\/distcc\/bin:}
 	econf --enable-lzw $(use_enable gif) || die "econf failed"
 	emake || die "make failed"
 }