- some buggy distcc or cpp does not seem to like unbalenced /* comments */ within...

Package-Manager: portage-2.0.53_rc6

diff --git a/app-portage/portage-utils/ChangeLog b/app-portage/portage-utils/ChangeLog
index 34ba6415d687db2a60697acc66a2a17cc2602170..66d9ace1038dcd6aad980a3bdc19a78902519f09 100644 (file)
--- a/app-portage/portage-utils/ChangeLog
+++ b/app-portage/portage-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-portage/portage-utils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/ChangeLog,v 1.12 2005/10/30 13:42:19 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/ChangeLog,v 1.13 2005/10/31 13:21:54 solar Exp $
+
+  31 Oct 2005; <solar@gentoo.org> +files/portage-utils-0.1.7-comments.patch,
+  portage-utils-0.1.7.ebuild:
+  - some buggy distcc or cpp does not seem to like unbalenced /* comments */
+  within #ifdef 0
 
 *portage-utils-0.1.7 (30 Oct 2005)
 

diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 8a7b7a80b0f901fb6a8beb60cf30b1022cd134dd..280862d52de08149edc9fe7c7c14d18f46f7aa4f 100644 (file)
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,23 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3363d1bf2ca901df4e7cfbe446e8b6ac ChangeLog 3378
+MD5 5a3dbca03e855b37381285f70a4f1bec ChangeLog 3581
 MD5 1615b1578be97e8f81929f74dd5a46b3 files/digest-portage-utils-0.1.3-r1 71
 MD5 94c74037aa33c81773132f6ec58ae6f9 files/digest-portage-utils-0.1.5 71
 MD5 c64bd950024c5c5e66a5e2cd4185b66e files/digest-portage-utils-0.1.6 71
 MD5 f642faf86b03b301275874bc61827157 files/digest-portage-utils-0.1.7 71
 MD5 cc752ef17b8160f632e9503e3c6812d2 files/portage-utils-0.1.3-qdepends.patch 643
+MD5 799ad33f9d7aac4e82ed65beab6735a4 files/portage-utils-0.1.7-comments.patch 628
 MD5 5a808b54f37942c1de1ff75edc43f69d metadata.xml 281
 MD5 7869453952ef3568061cbf4f006868d9 portage-utils-0.1.3-r1.ebuild 750
 MD5 31f1c4e671fb8bbcd0c656a6965ec200 portage-utils-0.1.5.ebuild 662
 MD5 363720a7b5ad48e6bfac533b444540b2 portage-utils-0.1.6.ebuild 659
-MD5 f694311a04f0516041ca4caa8499ec5e portage-utils-0.1.7.ebuild 668
+MD5 194b78febb527db4b55cc408b1abacce portage-utils-0.1.7.ebuild 757
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iQCVAwUBQ2TNyJ4WFLgrx1GWAQLh7wP9FfmfYixVsgdG2IM3bFsJjBnnvu4LA/sk
-bT8o3NwiT4P0FYpvnU21WmimjKjXJxs+WbXxgrIW8e8S4tX8AaGcPPATZthVj9Uz
-B6rstZoCyL0/2P/wabOt600DWzVL4wiMgaBxb4KsHnwXWHHB3JjDZbN3CY1Vh1Aa
-k9OyG+KWXjs=
-=prsd
+iQCVAwUBQ2Yafp4WFLgrx1GWAQL93AQAteHeGKzK05U08iSelGTyHzMzrtR1FRDP
+jtjoUcoTYwD00COSUYZJr5XqJvOnGvMUwX54a5OEmArE1JrUMDjVVRX3jTqqsjXj
+0PRF6kReZp9pmtFreEuzwLTnhajpqv29WtLbYhOE9WopeWFkXaQZQjzdirrv9ID4
+APbQkx66DJY=
+=ofcP
 -----END PGP SIGNATURE-----

diff --git a/app-portage/portage-utils/files/portage-utils-0.1.7-comments.patch b/app-portage/portage-utils/files/portage-utils-0.1.7-comments.patch
new file mode 100644 (file)
index 0000000..caa981d
--- /dev/null
+++ b/app-portage/portage-utils/files/portage-utils-0.1.7-comments.patch
@@ -0,0 +1,21 @@
+Index: libq/virtuals.c
+===================================================================
+RCS file: /var/cvsroot/gentoo-projects/portage-utils/libq/virtuals.c,v
+retrieving revision 1.6
+diff -u -b -B -w -p -r1.6 virtuals.c
+--- libq/virtuals.c    30 Oct 2005 00:48:51 -0000      1.6
++++ libq/virtuals.c    31 Oct 2005 13:06:36 -0000
+@@ -12,13 +12,6 @@
+ 
+ #include <stdio.h>
+ #include <unistd.h>
+-
+-#if 0
+- <jstubbs> portage/{,profile/}virtuals should both behave the same now.
+- <jstubbs> but it's /etc/portage/.../virtuals ; /var/db/pkg/*/*/PROVIDE ; /etc/make.profile stacking ; */
+-#endif
+-
+-
+ #include <stdlib.h>
+ #include <string.h>
+ 

diff --git a/app-portage/portage-utils/portage-utils-0.1.7.ebuild b/app-portage/portage-utils/portage-utils-0.1.7.ebuild
index db90e1519dc29c6cf6b0cc57ba108e73dafc84c9..b6e9862d5dd5791458151508a50105a9185f5e13 100644 (file)
--- a/app-portage/portage-utils/portage-utils-0.1.7.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.1.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/portage-utils-0.1.7.ebuild,v 1.1 2005/10/30 13:42:19 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/portage-utils-0.1.7.ebuild,v 1.2 2005/10/31 13:21:54 solar Exp $
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
 DESCRIPTION="small and fast portage helper tools written in C"
 HOMEPAGE="http://www.gentoo.org/"
@@ -15,6 +15,12 @@ IUSE=""
 
 DEPEND=""
 
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       epatch "${FILESDIR}"/${P}-comments.patch
+}
+
 src_install() {
        dobin q || die "dobin failed"
        doman man/*.[0-9]