Fix collision error on AMD64 archs, per bug #169429

Package-Manager: portage-2.1.3_rc6

4 files changed, 52 insertions, 5 deletions

diff --git a/app-doc/doc++/ChangeLog b/app-doc/doc++/ChangeLog
index 314c09ae82c8..48634bb81f46 100644
--- a/app-doc/doc++/ChangeLog
+++ b/app-doc/doc++/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-doc/doc++
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doc++/ChangeLog,v 1.21 2007/05/11 18:16:25 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doc++/ChangeLog,v 1.22 2007/07/03 15:18:32 anant Exp $
+
+*doc++-3.4.10-r2 (03 Jul 2007)
+
+  03 Jul 2007; Anant Narayanan <anant@gentoo.org> +doc++-3.4.10-r2.ebuild:
+  Fix collision error on AMD64 archs, per bug #169429
 
   11 May 2007; Thilo Bangert <bangert@gentoo.org> +metadata.xml,
   doc++-3.4.10-r1.ebuild:
diff --git a/app-doc/doc++/Manifest b/app-doc/doc++/Manifest
index 5276edbd7f29..b239b5521fe4 100644
--- a/app-doc/doc++/Manifest
+++ b/app-doc/doc++/Manifest
@@ -7,14 +7,18 @@ EBUILD doc++-3.4.10-r1.ebuild 703 RMD160 767697006ea2d4f11fe2bec175a545b206e9425
 MD5 815a9a4034c72a918aab6ed54e790892 doc++-3.4.10-r1.ebuild 703
 RMD160 767697006ea2d4f11fe2bec175a545b206e9425d doc++-3.4.10-r1.ebuild 703
 SHA256 d9ed0b495d2b84780b63097484a32258ebeb36d1098213494a988173752278f4 doc++-3.4.10-r1.ebuild 703
+EBUILD doc++-3.4.10-r2.ebuild 754 RMD160 fb31dd6a5e7a5ddb6926ecac15759312db4cf3fe SHA1 9a82891849394de9ba1b228e042a71f8d465d091 SHA256 0794f6bf493df4a3b30064543fea61c48d71b1425eb38c34d2e68c33314231e3
+MD5 1f94e6616138c4d3336fcec35425844c doc++-3.4.10-r2.ebuild 754
+RMD160 fb31dd6a5e7a5ddb6926ecac15759312db4cf3fe doc++-3.4.10-r2.ebuild 754
+SHA256 0794f6bf493df4a3b30064543fea61c48d71b1425eb38c34d2e68c33314231e3 doc++-3.4.10-r2.ebuild 754
 EBUILD doc++-3.4.10.ebuild 626 RMD160 d05ff2ec7251951a5c3d6603646a4c34b6a20c72 SHA1 a4a532a70c1c53c5234a3ea47297d98dc30cbe42 SHA256 faa76d31116d471200ae3fef6785a28c08902cf9cf3a68a3fee751941a176b90
 MD5 2f3a4ad911f878cc201ec2307ab838c2 doc++-3.4.10.ebuild 626
 RMD160 d05ff2ec7251951a5c3d6603646a4c34b6a20c72 doc++-3.4.10.ebuild 626
 SHA256 faa76d31116d471200ae3fef6785a28c08902cf9cf3a68a3fee751941a176b90 doc++-3.4.10.ebuild 626
-MISC ChangeLog 2219 RMD160 681e3392b6e0c0fc677992396271579d20e77a08 SHA1 8788434916822ce6e17a19ce9c666621efda4a67 SHA256 b47eeb42c7b42f0919e998cbc86bd3110e51cbc9e8823d8b0e695f24f7938081
-MD5 d0b29b049c43b5279b381d2f6b846453 ChangeLog 2219
-RMD160 681e3392b6e0c0fc677992396271579d20e77a08 ChangeLog 2219
-SHA256 b47eeb42c7b42f0919e998cbc86bd3110e51cbc9e8823d8b0e695f24f7938081 ChangeLog 2219
+MISC ChangeLog 2379 RMD160 1bd1919386102ac52aa1c286a730e8590f7b3718 SHA1 b09e46728a04c0978cecc2c0e4bae157771fb28e SHA256 e56f81463582f6f9ac3d9442643e6711f3f978fb2bf0cb7d9f7d2aa48708da19
+MD5 c3eadb16f459ed991d1f844c2c833be3 ChangeLog 2379
+RMD160 1bd1919386102ac52aa1c286a730e8590f7b3718 ChangeLog 2379
+SHA256 e56f81463582f6f9ac3d9442643e6711f3f978fb2bf0cb7d9f7d2aa48708da19 ChangeLog 2379
 MISC metadata.xml 402 RMD160 ea102e574aaf63a7f1b05728a9bfff22dcf8e893 SHA1 4e5077ec0b16d5aad0105b0f5f9e05528097c29a SHA256 39ac405a7f67b6308e8dac8f65742ed75fe7c36c2fa358eefd3442b333ba55c2
 MD5 290ab3a5f27760b83d4cc120ca87f5df metadata.xml 402
 RMD160 ea102e574aaf63a7f1b05728a9bfff22dcf8e893 metadata.xml 402
@@ -25,3 +29,6 @@ SHA256 cd9a3a04827d6e1d0181bfc6abef22c21c873674884f9fe8fb1632209f28926f files/di
 MD5 a730185d4d236d7f6a92af9d45696956 files/digest-doc++-3.4.10-r1 238
 RMD160 dfff23f2ca626517a17cdbd928fd64db4f790e23 files/digest-doc++-3.4.10-r1 238
 SHA256 cd9a3a04827d6e1d0181bfc6abef22c21c873674884f9fe8fb1632209f28926f files/digest-doc++-3.4.10-r1 238
+MD5 a730185d4d236d7f6a92af9d45696956 files/digest-doc++-3.4.10-r2 238
+RMD160 dfff23f2ca626517a17cdbd928fd64db4f790e23 files/digest-doc++-3.4.10-r2 238
+SHA256 cd9a3a04827d6e1d0181bfc6abef22c21c873674884f9fe8fb1632209f28926f files/digest-doc++-3.4.10-r2 238
diff --git a/app-doc/doc++/doc++-3.4.10-r2.ebuild b/app-doc/doc++/doc++-3.4.10-r2.ebuild
new file mode 100644
index 000000000000..27a4c70ef8e7
--- /dev/null
+++ b/app-doc/doc++/doc++-3.4.10-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doc++/doc++-3.4.10-r2.ebuild,v 1.1 2007/07/03 15:18:32 anant Exp $
+
+inherit eutils
+
+DESCRIPTION="Documentation system for C, C++, IDL and Java"
+HOMEPAGE="http://docpp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/docpp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/flex.patch
+	sed -i -e "s/locale.alias//g" ${S}/intl/Makefile.in
+}
+
+src_compile() {
+	econf || die
+	emake all || die
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+	dodoc CREDITS INSTALL NEWS PLATFORMS REPORTING-BUGS
+}
diff --git a/app-doc/doc++/files/digest-doc++-3.4.10-r2 b/app-doc/doc++/files/digest-doc++-3.4.10-r2
new file mode 100644
index 000000000000..f82ec0260e77
--- /dev/null
+++ b/app-doc/doc++/files/digest-doc++-3.4.10-r2
@@ -0,0 +1,3 @@
+MD5 095c7a3a822f00a33033b8bb40147445 doc++-3.4.10.tar.gz 408887
+RMD160 85b14d32e2932ceb465f1bab16eb8389cd22d72d doc++-3.4.10.tar.gz 408887
+SHA256 f69e23d643e0b01c8fc84eb33ee067a397798a01bddd0f8916653c443bfd6744 doc++-3.4.10.tar.gz 408887