Fixed BUG #52347.

4 files changed, 63 insertions, 5 deletions

diff --git a/app-arch/advancecomp/ChangeLog b/app-arch/advancecomp/ChangeLog
index 07ec15c36ec1..77dff22f266d 100644
--- a/app-arch/advancecomp/ChangeLog
+++ b/app-arch/advancecomp/ChangeLog
@@ -1,9 +1,9 @@
 # ChangeLog for app-arch/advancecomp
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/ChangeLog,v 1.7 2004/05/30 00:50:56 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/ChangeLog,v 1.8 2004/05/30 00:56:56 kugelfang Exp $
 
   30 May 2004; Danny van Dyk <kugelfang@gentoo.org> advancecomp-1.10.ebuild:
-  Marked ~amd64.
+  Marked ~amd64, added 64bit patch (String-size problems). Fixed BUG #52347.
 
 *advancecomp-1.10 (24 May 2004)
 
diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest
index 6d78699392c0..41d0dc89c493 100644
--- a/app-arch/advancecomp/Manifest
+++ b/app-arch/advancecomp/Manifest
@@ -1,10 +1,11 @@
-MD5 8d4676bdf3deed586ec83fbad14409a4 ChangeLog 1127
+MD5 c204a799548384c219f1517e359d7710 ChangeLog 1187
 MD5 e8209c76bcec89d1a2d94dbdfe12dc9b advancecomp-1.8.ebuild 915
 MD5 2a27278b7fd58a15fd2476faa698764c advancecomp-1.9.ebuild 941
 MD5 52b587de750eaf83b62c0205f5a890a0 metadata.xml 371
-MD5 42c971648f48a0a522ac8c9fcaa6c4cd advancecomp-1.10.ebuild 994
+MD5 f5fdf3ece477e73f3a4dbaa9c8ad8d12 advancecomp-1.10.ebuild 1030
 MD5 32520f6c0bf186c37ac3922dd4ac828b files/advancecomp-bzip2-compile-plz-k-thx.diff 3811
 MD5 c59beca247b09c82acb8f42bf94e844c files/digest-advancecomp-1.8 67
 MD5 af4caf0aa672db45114300c2dae905d9 files/digest-advancecomp-1.9 67
 MD5 30d064db7f588a0ec0566436c363af83 files/advancecomp-1.10-bzip2-compile-plz-k-thx.diff 3836
 MD5 9d834207835ed921e599c4bfd613eceb files/digest-advancecomp-1.10 68
+MD5 c4ee8a7020e9f5b73d86620830dc3825 files/advancecomp-1.10-64bit.diff 1397
diff --git a/app-arch/advancecomp/advancecomp-1.10.ebuild b/app-arch/advancecomp/advancecomp-1.10.ebuild
index 079e8610f90c..3f297946d0f3 100644
--- a/app-arch/advancecomp/advancecomp-1.10.ebuild
+++ b/app-arch/advancecomp/advancecomp-1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/advancecomp-1.10.ebuild,v 1.2 2004/05/30 00:50:56 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/advancecomp-1.10.ebuild,v 1.3 2004/05/30 00:56:56 kugelfang Exp $
 
 inherit eutils
 
@@ -18,6 +18,7 @@ DEPEND="sys-libs/zlib app-arch/bzip2"
 src_unpack() {
 	unpack ${A}
 	# bzip2 support wont compile, heres a quick patch.
+	epatch ${FILESDIR}/${P}-64bit.diff
 	cd ${S}; epatch ${FILESDIR}/${P}-bzip2-compile-plz-k-thx.diff
 }
 
diff --git a/app-arch/advancecomp/files/advancecomp-1.10-64bit.diff b/app-arch/advancecomp/files/advancecomp-1.10-64bit.diff
new file mode 100644
index 000000000000..e7e36872991f
--- /dev/null
+++ b/app-arch/advancecomp/files/advancecomp-1.10-64bit.diff
@@ -0,0 +1,56 @@
+--- advancecomp-1.10.orig/utility.cc	2004-04-06 20:02:25.000000000 +0200
++++ advancecomp-1.10/utility.cc	2004-05-29 17:33:00.098153880 +0200
+@@ -416,7 +416,7 @@
+ {
+ 	ostringstream os;
+ 
+-	unsigned pos = path.rfind('.');
++	string::size_type pos = path.rfind('.');
+ 
+ 	if (pos == string::npos) 
+ 		os << path << ".";
+@@ -433,7 +433,7 @@
+  */
+ string file_dir(const string& path) throw ()
+ {
+-	unsigned pos = path.rfind('/');
++	string::size_type pos = path.rfind('/');
+ 	if (pos == string::npos) {
+ 		return "";
+ 	} else {
+@@ -446,7 +446,7 @@
+  */
+ string file_name(const string& path) throw ()
+ {
+-	unsigned pos = path.rfind('/');
++	string::size_type pos = path.rfind('/');
+ 	if (pos == string::npos) {
+ 		return path;
+ 	} else {
+@@ -459,7 +459,7 @@
+  */
+ string file_basepath(const string& path) throw ()
+ {
+-	unsigned dot = path.rfind('.');
++	string::size_type dot = path.rfind('.');
+ 	if (dot == string::npos)
+ 		return path;
+ 	else
+@@ -472,7 +472,7 @@
+ string file_basename(const string& path) throw ()
+ { 
+ 	string name = file_name(path);
+-	unsigned dot = name.rfind('.');
++	string::size_type dot = name.rfind('.');
+ 	if (dot == string::npos)
+ 		return name;
+ 	else
+@@ -485,7 +485,7 @@
+ string file_ext(const string& path) throw ()
+ { 
+ 	string name = file_name(path);
+-	unsigned dot = name.rfind('.');
++	string::size_type dot = name.rfind('.');
+ 	if (dot == string::npos)
+ 		return "";
+ 	else