bump

6 files changed, 180 insertions, 6 deletions

diff --git a/app-arch/advancecomp/ChangeLog b/app-arch/advancecomp/ChangeLog
index 79209a6468d4..abfb3e4e3010 100644
--- a/app-arch/advancecomp/ChangeLog
+++ b/app-arch/advancecomp/ChangeLog
@@ -1,6 +1,11 @@
 # 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.16 2004/10/05 10:59:23 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/ChangeLog,v 1.17 2004/12/17 10:45:42 taviso Exp $
+
+  17 Dec 2004; Tavis Ormandy <taviso@gentoo.org>
+  +files/advancecomp-1.13-64bit.diff,
+  +files/advancecomp-1.13-bzip2-compile-plz-k-thx.diff:
+  bump #44265
 
   05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   advancecomp-1.10.ebuild:
diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest
index e3663d2449f8..0e8a206bee93 100644
--- a/app-arch/advancecomp/Manifest
+++ b/app-arch/advancecomp/Manifest
@@ -1,11 +1,15 @@
-MD5 f2a45b2499a43028da7f793842b8a6f4 ChangeLog 2181
-MD5 e22c9bb97fef4fa558997e4ddf6e2d72 advancecomp-1.10.ebuild 1010
 MD5 73e35f3b39f189750a5f114e24ec4ac3 advancecomp-1.11.ebuild 1033
+MD5 73e35f3b39f189750a5f114e24ec4ac3 advancecomp-1.13.ebuild 1033
+MD5 e22c9bb97fef4fa558997e4ddf6e2d72 advancecomp-1.10.ebuild 1010
+MD5 f2a45b2499a43028da7f793842b8a6f4 ChangeLog 2181
 MD5 52b587de750eaf83b62c0205f5a890a0 metadata.xml 371
+MD5 9d834207835ed921e599c4bfd613eceb files/digest-advancecomp-1.10 68
+MD5 af712efe453f77541521dac6bfd98fb1 files/digest-advancecomp-1.11 68
+MD5 f0385606d50630dd8e8c63b2371e2828 files/digest-advancecomp-1.13 68
+MD5 a0b79d09e483a266acd8b6ef895fe450 files/advancecomp-1.11-bzip2-compile-plz-k-thx.diff 3806
 MD5 c4ee8a7020e9f5b73d86620830dc3825 files/advancecomp-1.10-64bit.diff 1397
 MD5 30d064db7f588a0ec0566436c363af83 files/advancecomp-1.10-bzip2-compile-plz-k-thx.diff 3836
+MD5 20b77a8d8e7dea44fb75a6dbc8f85ef6 files/advancecomp-1.13-bzip2-compile-plz-k-thx.diff 3555
 MD5 22ed492b7309c1f953fcc6a7f1fb4ab6 files/advancecomp-1.11-64bit.diff 1468
-MD5 a0b79d09e483a266acd8b6ef895fe450 files/advancecomp-1.11-bzip2-compile-plz-k-thx.diff 3806
+MD5 5cab2e3e3245584e09efe472ed141427 files/advancecomp-1.13-64bit.diff 1391
 MD5 32520f6c0bf186c37ac3922dd4ac828b files/advancecomp-bzip2-compile-plz-k-thx.diff 3811
-MD5 9d834207835ed921e599c4bfd613eceb files/digest-advancecomp-1.10 68
-MD5 af712efe453f77541521dac6bfd98fb1 files/digest-advancecomp-1.11 68
diff --git a/app-arch/advancecomp/advancecomp-1.13.ebuild b/app-arch/advancecomp/advancecomp-1.13.ebuild
new file mode 100644
index 000000000000..a2b6fb1cb6ec
--- /dev/null
+++ b/app-arch/advancecomp/advancecomp-1.13.ebuild
@@ -0,0 +1,47 @@
+# 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.13.ebuild,v 1.1 2004/12/17 10:45:42 taviso Exp $
+
+inherit eutils
+
+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="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}/${P}-bzip2-compile-plz-k-thx.diff
+
+	epatch ${FILESDIR}/${P}-64bit.diff
+}
+
+src_compile() {
+	econf --enable-bzip2 || die
+	emake || die
+}
+
+src_install() {
+	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/advzip.1
+}
diff --git a/app-arch/advancecomp/files/advancecomp-1.13-64bit.diff b/app-arch/advancecomp/files/advancecomp-1.13-64bit.diff
new file mode 100644
index 000000000000..d1934c23e5e8
--- /dev/null
+++ b/app-arch/advancecomp/files/advancecomp-1.13-64bit.diff
@@ -0,0 +1,56 @@
+--- advancecomp-1.13.orig/file.cc	2004-12-16 23:19:17.778775072 -0200
++++ advancecomp-1.13/file.cc	2004-12-16 23:28:55.382965888 -0200
+@@ -295,7 +295,7 @@
+ {
+ 	ostringstream os;
+ 
+-	unsigned pos = path.rfind('.');
++	string::size_type pos = path.rfind('.');
+ 
+ 	if (pos == string::npos) 
+ 		os << path << ".";
+@@ -312,7 +312,7 @@
+  */
+ string file_dir(const string& path) throw ()
+ {
+-	unsigned pos = path.rfind('/');
++	string::size_type pos = path.rfind('/');
+ 	if (pos == string::npos) {
+ 		return "";
+ 	} else {
+@@ -325,7 +325,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 {
+@@ -338,7 +338,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
+@@ -351,7 +351,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
+@@ -364,7 +364,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.13-bzip2-compile-plz-k-thx.diff b/app-arch/advancecomp/files/advancecomp-1.13-bzip2-compile-plz-k-thx.diff
new file mode 100644
index 000000000000..f20bba3373a2
--- /dev/null
+++ b/app-arch/advancecomp/files/advancecomp-1.13-bzip2-compile-plz-k-thx.diff
@@ -0,0 +1,61 @@
+--- advancecomp-1.13.orig/compress.cc	2004-12-16 23:19:17.779774920 -0200
++++ advancecomp-1.13/compress.cc	2004-12-16 23:36:05.356599960 -0200
+@@ -181,16 +181,17 @@
+ }
+ 
+ #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)
++
++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<unsigned char*>(in_data), in_size, blocksize, 0, workfactor) == BZ_OK;
++	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)
+--- advancecomp-1.13.orig/compress.h	2004-12-16 23:19:17.778775072 -0200
++++ advancecomp-1.13/compress.h	2004-12-16 23:37:00.178265800 -0200
+@@ -37,8 +37,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);
+--- advancecomp-1.13.orig/stamp-h1	1969-12-31 21:00:00.000000000 -0300
++++ advancecomp-1.13/stamp-h1	2004-12-16 23:37:46.906162080 -0200
+@@ -0,0 +1 @@
++timestamp for config.h
+--- advancecomp-1.13.orig/zipsh.cc	2004-12-16 23:19:17.779774920 -0200
++++ advancecomp-1.13/zipsh.cc	2004-12-16 23:39:30.099474312 -0200
+@@ -39,7 +39,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() << "Invalid compressed data on file " << name_get();
+ 		}
+ #endif
+@@ -247,7 +247,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.13 b/app-arch/advancecomp/files/digest-advancecomp-1.13
new file mode 100644
index 000000000000..97792003a5b2
--- /dev/null
+++ b/app-arch/advancecomp/files/digest-advancecomp-1.13
@@ -0,0 +1 @@
+MD5 14f9e37e25aec35133e886caaf746226 advancecomp-1.13.tar.gz 256677