Add myself as a maintainer, bug #234312. Backport patch from svn 617.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64

5 files changed, 28 insertions, 6 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index 918f702c0a8b..5e1f92b8ae8c 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/distcc
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.175 2008/10/18 16:21:59 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.176 2008/10/19 14:45:22 matsuu Exp $
+
+*distcc-3.0-r1 (19 Oct 2008)
+
+  19 Oct 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/distcc-3.0-svn617.patch, metadata.xml, -distcc-3.0.ebuild,
+  +distcc-3.0-r1.ebuild:
+  Add myself as a maintainer, bug #234312. Backport patch from svn 617.
 
 *distcc-3.0 (18 Oct 2008)
 
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 5f9233f4ee54..bc98d507f054 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -7,6 +7,7 @@ AUX 3.0/conf 1286 RMD160 52f0fb469fc83b2f28f032c81515773d09add0d5 SHA1 4860a6e2e
 AUX 3.0/distcc-config 4827 RMD160 cdd402bbd605825a713073956a295c02af266a5d SHA1 8231f4337c6cf0b890f50a33ad02dd93bf5cb582 SHA256 c1db689b74dbab2ce8c8dae1053205cdc748b3470d8bb70c3b8f9b432b377e7d
 AUX 3.0/init 618 RMD160 a11c5cb400ed91bc6f1e94cdc5017741cbbdb7d3 SHA1 a56616c6b0d9306f8b5d95ca506ef64f8b01d430 SHA256 f29c6bc97b9215e89116ddf0d6fedad6946fb2d9979304e50f83b406b5829805
 AUX distcc-3.0-gentoo.patch 1225 RMD160 5c305052c9ee62c7d60377b26e53f69a67438b39 SHA1 7114da1f2ddda38498d19a685782da48a8b37f30 SHA256 ba1895fa906ba18490b722f9eda07a96459949d879412c2aba0218f8854ca7cc
+AUX distcc-3.0-svn617.patch 533 RMD160 64c8712a9290b1fef776ca5517074748a0ec9255 SHA1 7b9b661b21aea2e1a338b3ed890c6bd7dc8064e3 SHA256 902d6715f443fceb7c799bcf4f82d637569db2da900be5e36bb40b57a3e9fa84
 AUX distcc-as-needed.patch 558 RMD160 faebf24490e3dd2a5247cfb6914dc88fb7b98e35 SHA1 5e5547032b6492f9f8b0511fd621a005dbd455a2 SHA256 9e87d3b0487ffc52ccf6362866e967dff9c2a85681175096ece11413f8c91e54
 AUX distcc-avahi-configure.patch 1263 RMD160 de3ba2d651b5a76d5ee71cde79a2555f77a70b1b SHA1 eddae708be95f4bbd7cbfed53439e2dc38a979e8 SHA256 9d967456da6631845b4262ae7508948d629764149fd568c367e76e89168bb132
 AUX distcc-config 4874 RMD160 07bd612fc11c785691bd56e4e7bb7994a2e4dbb8 SHA1 85b5f38d6024e4f454bfa07d96c13b4749ce3e2a SHA256 c6a7bb74eb235fd7896ca101c033a2e9faf80afeb7232bff3afe22f8a6268a5c
@@ -22,6 +23,6 @@ EBUILD distcc-2.18.3-r10.ebuild 4991 RMD160 a226c12d97f1e212c5bf703cd32e476ee4e2
 EBUILD distcc-2.18.3-r11.ebuild 5684 RMD160 4e7232be695e39b41017bda3a1df5b5fa269ed75 SHA1 b34c8080941f221549e11ac23974c68b33c853e9 SHA256 2c9bbaae12891f56918065cfb18c3d3666845b52b8331ef03c7fa3b87e2168f6
 EBUILD distcc-2.18.3-r12.ebuild 5639 RMD160 c70f35d9cf254d407a5d48688b09ce4f4ddc1271 SHA1 618ff9a60867cfdbd08f537ee35f41c28b9ce370 SHA256 d937b713f022bb4675ac1b1d0cdf0ae5a8ec683a523c3a5b9f948545cb960516
 EBUILD distcc-2.18.3-r13.ebuild 5686 RMD160 c875bd6c6260a61dbf487f53d7ac3f090e3f23c8 SHA1 5f17f8e6343fe2401f688090ddea3f5c183a8cf8 SHA256 fb5f9b7bb5230f8de7e87914abba720b2dc57940e27a0264e012fa39225bd843
-EBUILD distcc-3.0.ebuild 4301 RMD160 71a677aa9f2cf2e05f3ed7718d02ee5cefbd969b SHA1 4a0006b6197271258cf293e2e21ff30894bec096 SHA256 eb2ddca451cf3ce70c22dd692af9a486e538f160570167326c135da73a15288a
-MISC ChangeLog 32394 RMD160 405445033749227f99904723fd311fa87e225820 SHA1 0bbd434f28bd1a1a4870aa676bbc787450586bd6 SHA256 420ca932834d598a95104c86af4d3068b81d5bcb71a2438ac4ce4237a7cbcb08
-MISC metadata.xml 379 RMD160 420726180bf16a6ecc3f4be5f57ed0841926fb9c SHA1 cec305f87acbaeea3c2c106df48c9654451ab346 SHA256 fdee311afe18ec1446a2da7b4cf5c59189e7adb5b3c3f2955762d01b04bb6ad9
+EBUILD distcc-3.0-r1.ebuild 4344 RMD160 8a52788f83bde596d2b69c3e095cfe8f61da74ce SHA1 0eeb9c23bcd41d7703aeaf56ce1d6072812c8683 SHA256 cdc7289057b1cae9c7f899799a3d7c5265801847f2e8b87b14d6783ff01564e1
+MISC ChangeLog 32639 RMD160 a446bb738c109c2e7c8ca0af4c5af5fba3ea0640 SHA1 9c13666783382056f4d58a38e9e903f962a7fdd9 SHA256 b5839287276aaacda4c24bdb892891aee48d51551b14342f9a8d191d58858aea
+MISC metadata.xml 375 RMD160 71766089deafcc906533d0dc537a46646f36b50a SHA1 c188ca1cdd4d1bc82f372608e8ad7fc473cb47e5 SHA256 adb92971f6939e55ce103e1c42d3ce3dfe82823d038db0e9cf9b08d9be888e1a
diff --git a/sys-devel/distcc/distcc-3.0.ebuild b/sys-devel/distcc/distcc-3.0-r1.ebuild
index c87a5b1e57f1..6229a9123266 100644
--- a/sys-devel/distcc/distcc-3.0.ebuild
+++ b/sys-devel/distcc/distcc-3.0-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/sys-devel/distcc/distcc-3.0.ebuild,v 1.1 2008/10/18 16:21:59 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.0-r1.ebuild,v 1.1 2008/10/19 14:45:22 matsuu Exp $
 
 # If you change this in any way please email lisa@gentoo.org and make an
 # entry in the ChangeLog (this means you spanky :P). (2004-04-11) Lisa Seelye
@@ -52,6 +52,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-svn617.patch"
 }
 
 src_compile() {
diff --git a/sys-devel/distcc/files/distcc-3.0-svn617.patch b/sys-devel/distcc/files/distcc-3.0-svn617.patch
new file mode 100644
index 000000000000..54f55dcea15a
--- /dev/null
+++ b/sys-devel/distcc/files/distcc-3.0-svn617.patch
@@ -0,0 +1,13 @@
+Index: src/arg.c
+===================================================================
+--- src/arg.c	(revision 616)
++++ src/arg.c	(revision 617)
+@@ -453,7 +453,7 @@
+         dest_argv[i] = strdup(opt);
+         if (!dest_argv[i]) return EXIT_OUT_OF_MEMORY;
+         i++;
+-        if (strcmp(opt, "-MD") == 0 || strcmp(opt, "-MMD")) {
++        if (strcmp(opt, "-MD") == 0 || strcmp(opt, "-MMD") == 0) {
+             char *filename;
+             if (!comma) {
+                 rs_log_warning("'-Wp,-MD' or '-Wp,-MMD' option is missing "
diff --git a/sys-devel/distcc/metadata.xml b/sys-devel/distcc/metadata.xml
index 8b54c2f67269..7b9fb7530e45 100644
--- a/sys-devel/distcc/metadata.xml
+++ b/sys-devel/distcc/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>hp-cluster</herd>
 	<maintainer>
-		<email>betelgeuse@gentoo.org</email>
+		<email>matsuu@gentoo.org</email>
 	</maintainer>
 	<longdescription lang="en">
 		Distcc is a program to distribute compilation of C code across several