new release

5 files changed, 113 insertions, 6 deletions

diff --git a/app-arch/advancecomp/ChangeLog b/app-arch/advancecomp/ChangeLog
index c1e4313a1978..bd274aa4cb65 100644
--- a/app-arch/advancecomp/ChangeLog
+++ b/app-arch/advancecomp/ChangeLog
@@ -1,6 +1,11 @@
 # 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.5 2004/03/27 17:10:33 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/ChangeLog,v 1.6 2004/05/24 17:10:36 taviso Exp $
+
+*advancecomp-1.10 (24 May 2004)
+
+  24 May 2004; Tavis Ormandy <taviso@gentoo.org> advancecomp-1.10.ebuild:
+  #51877, new release
 
   27 Mar 2004; Tavis Ormandy <taviso@gentoo.org> advancecomp-1.9.ebuild:
   stable on x86
diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest
index 06b79b107bed..0e0dc59d5992 100644
--- a/app-arch/advancecomp/Manifest
+++ b/app-arch/advancecomp/Manifest
@@ -1,7 +1,9 @@
-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 c594574f67c1b350a2e774f085802e5c ChangeLog 899
 MD5 a136ec84e37c46b4c7d6af93f05f032c advancecomp-1.8.ebuild 912
-MD5 52b587de750eaf83b62c0205f5a890a0 metadata.xml 371
+MD5 ea73bf95fc93b1c54c9cdee619f32939 advancecomp-1.10.ebuild 985
 MD5 2a27278b7fd58a15fd2476faa698764c advancecomp-1.9.ebuild 941
+MD5 c594574f67c1b350a2e774f085802e5c ChangeLog 899
+MD5 52b587de750eaf83b62c0205f5a890a0 metadata.xml 371
+MD5 9d834207835ed921e599c4bfd613eceb files/digest-advancecomp-1.10 68
+MD5 c59beca247b09c82acb8f42bf94e844c files/digest-advancecomp-1.8 67
+MD5 af4caf0aa672db45114300c2dae905d9 files/digest-advancecomp-1.9 67
+MD5 32520f6c0bf186c37ac3922dd4ac828b files/advancecomp-bzip2-compile-plz-k-thx.diff 3811
diff --git a/app-arch/advancecomp/advancecomp-1.10.ebuild b/app-arch/advancecomp/advancecomp-1.10.ebuild
new file mode 100644
index 000000000000..51fae6f15d93
--- /dev/null
+++ b/app-arch/advancecomp/advancecomp-1.10.ebuild
@@ -0,0 +1,37 @@
+# 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.1 2004/05/24 17:10:36 taviso Exp $
+
+inherit eutils
+
+IUSE="png"
+
+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 ~ppc"
+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
+}
+
+src_compile() {
+	econf --enable-bzip2 || die
+	emake || die
+}
+
+src_install() {
+	dobin advdef advzip
+	use png && dobin advpng advmng
+
+	dodoc HISTORY AUTHORS COPYING INSTALL README
+
+	doman doc/advdef.1 doc/advzip.1
+	use png && doman doc/advmng.1 doc/advpng.1
+}
diff --git a/app-arch/advancecomp/files/advancecomp-1.10-bzip2-compile-plz-k-thx.diff b/app-arch/advancecomp/files/advancecomp-1.10-bzip2-compile-plz-k-thx.diff
new file mode 100644
index 000000000000..c3f89e9c81d1
--- /dev/null
+++ b/app-arch/advancecomp/files/advancecomp-1.10-bzip2-compile-plz-k-thx.diff
@@ -0,0 +1,62 @@
+diff -ruNd advancecomp-1.10.orig/compress.cc advancecomp-1.10/compress.cc
+--- advancecomp-1.10.orig/compress.cc	2004-04-02 16:43:52.000000000 +0100
++++ advancecomp-1.10/compress.cc	2004-05-24 17:56:18.940619088 +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 -ruNd advancecomp-1.10.orig/compress.h advancecomp-1.10/compress.h
+--- advancecomp-1.10.orig/compress.h	2003-11-02 20:09:41.000000000 +0000
++++ advancecomp-1.10/compress.h	2004-05-24 17:56:18.941618936 +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 -ruNd advancecomp-1.10.orig/stamp-h1 advancecomp-1.10/stamp-h1
+--- advancecomp-1.10.orig/stamp-h1	1970-01-01 01:00:00.000000000 +0100
++++ advancecomp-1.10/stamp-h1	2004-05-24 17:56:18.942618784 +0100
+@@ -0,0 +1 @@
++timestamp for config.h
+diff -ruNd advancecomp-1.10.orig/zipsh.cc advancecomp-1.10/zipsh.cc
+--- advancecomp-1.10.orig/zipsh.cc	2004-04-02 17:13:02.000000000 +0100
++++ advancecomp-1.10/zipsh.cc	2004-05-24 17:56:18.943618632 +0100
+@@ -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())) {
+ 			data_free(uncompressed_data);
+ 			throw error() << "Invalid compressed data on file " << name_get();
+ 		}
+@@ -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.10 b/app-arch/advancecomp/files/digest-advancecomp-1.10
new file mode 100644
index 000000000000..00a25a1e4bfd
--- /dev/null
+++ b/app-arch/advancecomp/files/digest-advancecomp-1.10
@@ -0,0 +1 @@
+MD5 757f6ed0f528a1d44991802361b61e13 advancecomp-1.10.tar.gz 353727