new version, marking 1.10 stable on x86

8 files changed, 155 insertions, 12 deletions

diff --git a/app-arch/advancecomp/ChangeLog b/app-arch/advancecomp/ChangeLog
index 4dc60337be72..1b5f255d14e1 100644
--- a/app-arch/advancecomp/ChangeLog
+++ b/app-arch/advancecomp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-arch/advancecomp
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/ChangeLog,v 1.10 2004/07/03 14:48:21 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/ChangeLog,v 1.11 2004/08/24 21:58:57 taviso Exp $
+
+*advancecomp-1.11 (24 Aug 2004)
+
+  24 Aug 2004; Tavis Ormandy <taviso@gentoo.org>
+  +files/advancecomp-1.11-64bit.diff,
+  +files/advancecomp-1.11-bzip2-compile-plz-k-thx.diff,
+  advancecomp-1.10.ebuild, +advancecomp-1.11.ebuild, -advancecomp-1.8.ebuild:
+  new version, mark 1.10 stable on x86.
+  mng is a global USE flag now, used in 1.11.
 
   03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> advancecomp-1.9.ebuild:
   Stable on alpha.
diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest
index 99160b4f708b..16f6bbb7d0f4 100644
--- a/app-arch/advancecomp/Manifest
+++ b/app-arch/advancecomp/Manifest
@@ -1,9 +1,11 @@
 MD5 2c015cb75d7e58f7d9d95a0aa6176b34 advancecomp-1.8.ebuild 913
+MD5 eeb1c0ae44a2c8e3144787e3c04e4ff5 advancecomp-1.11.ebuild 1059
 MD5 6dcc6e201642d7c207c86c1cdcfb3144 advancecomp-1.10.ebuild 1013
 MD5 d39a404d5e025f4c10fddc7a987a806b advancecomp-1.9.ebuild 932
 MD5 2faf41aa30cdb603a6a80ddcb4e646f5 ChangeLog 1272
 MD5 52b587de750eaf83b62c0205f5a890a0 metadata.xml 371
 MD5 9d834207835ed921e599c4bfd613eceb files/digest-advancecomp-1.10 68
+MD5 af712efe453f77541521dac6bfd98fb1 files/digest-advancecomp-1.11 68
 MD5 c4ee8a7020e9f5b73d86620830dc3825 files/advancecomp-1.10-64bit.diff 1397
 MD5 30d064db7f588a0ec0566436c363af83 files/advancecomp-1.10-bzip2-compile-plz-k-thx.diff 3836
 MD5 c59beca247b09c82acb8f42bf94e844c files/digest-advancecomp-1.8 67
diff --git a/app-arch/advancecomp/advancecomp-1.10.ebuild b/app-arch/advancecomp/advancecomp-1.10.ebuild
index a9824a1d24da..91ff98311dda 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 Foundation
 # 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.5 2004/06/24 21:26:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/advancecomp-1.10.ebuild,v 1.6 2004/08/24 21:58:57 taviso Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~amd64"
+KEYWORDS="x86 ~ppc ~alpha ~amd64"
 IUSE="png"
 
 DEPEND="sys-libs/zlib
diff --git a/app-arch/advancecomp/advancecomp-1.8.ebuild b/app-arch/advancecomp/advancecomp-1.11.ebuild
index f391a8d6acf9..df04da339aef 100644
--- a/app-arch/advancecomp/advancecomp-1.8.ebuild
+++ b/app-arch/advancecomp/advancecomp-1.11.ebuild
@@ -1,25 +1,27 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/advancecomp-1.8.ebuild,v 1.7 2004/06/24 21:26:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/advancecomp-1.11.ebuild,v 1.1 2004/08/24 21:58:57 taviso Exp $
 
 inherit eutils
 
-DESCRIPTION="Recompress ZIP, PNG and MNGs using the Deflate 7-Zip implementation"
+DESCRIPTION="Recompress ZIP, PNG and MNG using deflate 7-Zip, considerably improving compression"
 HOMEPAGE="http://advancemame.sourceforge.net/comp-readme.html"
 SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="x86 alpha"
-IUSE=""
+KEYWORDS="~x86"
+IUSE="png mng"
 
 DEPEND="sys-libs/zlib app-arch/bzip2"
 
 src_unpack() {
 	unpack ${A}
-
+	
 	# bzip2 support wont compile, heres a quick patch.
-	cd ${S}; epatch ${FILESDIR}/${PN}-bzip2-compile-plz-k-thx.diff
+	cd ${S}; epatch ${FILESDIR}/${P}-bzip2-compile-plz-k-thx.diff
+
+	epatch ${FILESDIR}/${P}-64bit.diff
 }
 
 src_compile() {
@@ -28,7 +30,18 @@ src_compile() {
 }
 
 src_install() {
-	dobin advdef advmng advpng advzip || die
+	dobin advdef advzip
+
+	use png && {
+		dobin advpng 
+		doman doc/advpng.1
+	}
+
+	use mng && {
+		dobin advmng
+		doman doc/advmng.1
+	}
+
 	dodoc HISTORY AUTHORS INSTALL README
-	doman doc/advdef.1 doc/advmng.1 doc/advpng.1 doc/advzip.1
+	doman doc/advdef.1 doc/advzip.1
 }
diff --git a/app-arch/advancecomp/files/advancecomp-1.11-64bit.diff b/app-arch/advancecomp/files/advancecomp-1.11-64bit.diff
new file mode 100644
index 000000000000..57e27d37f975
--- /dev/null
+++ b/app-arch/advancecomp/files/advancecomp-1.11-64bit.diff
@@ -0,0 +1,57 @@
+diff -ruN advancecomp-1.11.orig/utility.cc advancecomp-1.11/utility.cc
+--- advancecomp-1.11.orig/utility.cc	2004-04-06 19:02:25.000000000 +0100
++++ advancecomp-1.11/utility.cc	2004-08-24 22:52:00.817157760 +0100
+@@ -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
diff --git a/app-arch/advancecomp/files/advancecomp-1.11-bzip2-compile-plz-k-thx.diff b/app-arch/advancecomp/files/advancecomp-1.11-bzip2-compile-plz-k-thx.diff
new file mode 100644
index 000000000000..9348eb305ef9
--- /dev/null
+++ b/app-arch/advancecomp/files/advancecomp-1.11-bzip2-compile-plz-k-thx.diff
@@ -0,0 +1,62 @@
+diff -ruN advancecomp-1.11.orig/compress.cc advancecomp-1.11/compress.cc
+--- advancecomp-1.11.orig/compress.cc	2004-04-02 16:43:52.000000000 +0100
++++ advancecomp-1.11/compress.cc	2004-08-24 22:50:41.000291768 +0100
+@@ -179,14 +179,14 @@
+ }
+ 
+ #if USE_BZIP2
+-bool compress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int blocksize, int workfactor) {
+-	return BZ2_bzBuffToBuffCompress(out_data,&out_size,const_cast<unsigned char*>(in_data),in_size,blocksize,0,workfactor) == BZ_OK;
++bool compress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned& out_size, int blocksize, int workfactor) {
++	return BZ2_bzBuffToBuffCompress(out_data,&out_size,const_cast<char*>(in_data),in_size,blocksize,0,workfactor) == BZ_OK;
+ }
+ 
+-bool decompress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size) {
++bool decompress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned out_size) {
+ 	unsigned size = out_size;
+ 
+-	if (BZ2_bzBuffToBuffDecompress(out_data,&size,const_cast<unsigned char*>(in_data),in_size,0,0)!=BZ_OK)
++	if (BZ2_bzBuffToBuffDecompress(out_data,&size,const_cast< char*>(in_data),in_size,0,0)!=BZ_OK)
+ 		return false;
+ 
+ 	if (size != out_size)
+diff -ruN advancecomp-1.11.orig/compress.h advancecomp-1.11/compress.h
+--- advancecomp-1.11.orig/compress.h	2003-11-02 20:09:41.000000000 +0000
++++ advancecomp-1.11/compress.h	2004-08-24 22:50:41.000291768 +0100
+@@ -40,8 +40,8 @@
+ bool decompress_deflate_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size);
+ bool compress_deflate_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int compression_level, int strategy, int mem_level);
+ 
+-bool decompress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size);
+-bool compress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int blocksize, int workfactor);
++bool decompress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned out_size);
++bool compress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned& out_size, int blocksize, int workfactor);
+ 
+ bool decompress_rfc1950_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size);
+ bool compress_rfc1950_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int compression_level, int strategy, int mem_level);
+diff -ruN advancecomp-1.11.orig/stamp-h1 advancecomp-1.11/stamp-h1
+--- advancecomp-1.11.orig/stamp-h1	1970-01-01 01:00:00.000000000 +0100
++++ advancecomp-1.11/stamp-h1	2004-08-24 22:50:41.000291768 +0100
+@@ -0,0 +1 @@
++timestamp for config.h
+diff -ruN advancecomp-1.11.orig/zipsh.cc advancecomp-1.11/zipsh.cc
+--- advancecomp-1.11.orig/zipsh.cc	2004-07-22 21:35:47.000000000 +0100
++++ advancecomp-1.11/zipsh.cc	2004-08-24 22:50:41.001291616 +0100
+@@ -38,7 +38,7 @@
+ 		}
+ #ifdef USE_BZIP2
+ 	} else if (info.compression_method == ZIP_METHOD_BZIP2) {
+-		if (!decompress_bzip2(data,compressed_size_get(),uncompressed_data,uncompressed_size_get())) {
++		if (!decompress_bzip2((char *)data,compressed_size_get(),(char *)uncompressed_data,uncompressed_size_get())) {
+ 			throw error() << "Invalid compressed data on file " << name_get();
+ 		}
+ #endif
+@@ -243,7 +243,7 @@
+ 			c1_met = ZIP_METHOD_BZIP2;
+ 			c1_fla = 0;
+ 
+-			if (!compress_bzip2(uncompressed_data,uncompressed_size_get(),c1_data,c1_size,bzip2_level,bzip2_workfactor)) {
++			if (!compress_bzip2((char *)uncompressed_data,uncompressed_size_get(),(char *)c1_data,c1_size,bzip2_level,bzip2_workfactor)) {
+ 				data_free(c1_data);
+ 				c1_data = 0;
+ 			}
diff --git a/app-arch/advancecomp/files/digest-advancecomp-1.11 b/app-arch/advancecomp/files/digest-advancecomp-1.11
new file mode 100644
index 000000000000..834af1f5a097
--- /dev/null
+++ b/app-arch/advancecomp/files/digest-advancecomp-1.11
@@ -0,0 +1 @@
+MD5 e400c79e88d5d30af2017b95e2115bb1 advancecomp-1.11.tar.gz 354546
diff --git a/app-arch/advancecomp/files/digest-advancecomp-1.8 b/app-arch/advancecomp/files/digest-advancecomp-1.8
deleted file mode 100644
index da8d6f3ec607..000000000000
--- a/app-arch/advancecomp/files/digest-advancecomp-1.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eb98f9ff5e5bf061d6b73b4f604f21df advancecomp-1.8.tar.gz 585627