bump #83034

Package-Manager: portage-2.0.51.18

8 files changed, 23 insertions, 208 deletions

diff --git a/app-arch/advancecomp/ChangeLog b/app-arch/advancecomp/ChangeLog
index e2f0d6e2021d..e4d2448ea195 100644
--- a/app-arch/advancecomp/ChangeLog
+++ b/app-arch/advancecomp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-arch/advancecomp
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/ChangeLog,v 1.21 2005/02/06 23:41:43 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/ChangeLog,v 1.22 2005/03/02 20:52:53 taviso Exp $
+
+*advancecomp-1.14 (02 Mar 2005)
+
+  02 Mar 2005; Tavis Ormandy <taviso@gentoo.org>
+  -files/advancecomp-1.11-64bit.diff,
+  -files/advancecomp-1.11-bzip2-compile-plz-k-thx.diff,
+  -advancecomp-1.11.ebuild, +advancecomp-1.14.ebuild:
+  bump, #83034.
+  remove stale ebuilds.
 
   07 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
   advancecomp-1.13.ebuild:
diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest
index 46d7f9b0ac22..c8fffd6ba1a2 100644
--- a/app-arch/advancecomp/Manifest
+++ b/app-arch/advancecomp/Manifest
@@ -1,25 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 b77ed1c8c1793ef8ee942a7721bf425e advancecomp-1.13.ebuild 1033
 MD5 7f9fbc70c2da2b26d8f3991577c3aa77 advancecomp-1.10.ebuild 1012
-MD5 7fb7db14285f327b6d4cf3bdf02026fb ChangeLog 2636
+MD5 8abd87f0399572cdd7711a880046e092 ChangeLog 2907
 MD5 52b587de750eaf83b62c0205f5a890a0 metadata.xml 371
-MD5 b77ed1c8c1793ef8ee942a7721bf425e advancecomp-1.13.ebuild 1033
-MD5 b3ab5139811654355857b0ae45b5d1cc advancecomp-1.11.ebuild 1037
+MD5 e5ab284e75fef1bb201c28899d9bd18b advancecomp-1.14.ebuild 1048
+MD5 9d834207835ed921e599c4bfd613eceb files/digest-advancecomp-1.10 68
 MD5 f0385606d50630dd8e8c63b2371e2828 files/digest-advancecomp-1.13 68
-MD5 32520f6c0bf186c37ac3922dd4ac828b files/advancecomp-bzip2-compile-plz-k-thx.diff 3811
-MD5 a0b79d09e483a266acd8b6ef895fe450 files/advancecomp-1.11-bzip2-compile-plz-k-thx.diff 3806
-MD5 20b77a8d8e7dea44fb75a6dbc8f85ef6 files/advancecomp-1.13-bzip2-compile-plz-k-thx.diff 3555
-MD5 5cab2e3e3245584e09efe472ed141427 files/advancecomp-1.13-64bit.diff 1391
+MD5 6c4f3bbaa1165127f7eb67bcd19f166b files/digest-advancecomp-1.14 68
 MD5 c4ee8a7020e9f5b73d86620830dc3825 files/advancecomp-1.10-64bit.diff 1397
-MD5 9d834207835ed921e599c4bfd613eceb files/digest-advancecomp-1.10 68
 MD5 30d064db7f588a0ec0566436c363af83 files/advancecomp-1.10-bzip2-compile-plz-k-thx.diff 3836
-MD5 22ed492b7309c1f953fcc6a7f1fb4ab6 files/advancecomp-1.11-64bit.diff 1468
-MD5 af712efe453f77541521dac6bfd98fb1 files/digest-advancecomp-1.11 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCBqtFugEuf3OQ0akRAiJjAJ9TvCCpMD+iDBHa6hvIfJPB6MN/PwCdGdkA
-yKIn+Q7d+l+QzcA4jDSYQQw=
-=RdDS
------END PGP SIGNATURE-----
+MD5 20b77a8d8e7dea44fb75a6dbc8f85ef6 files/advancecomp-1.13-bzip2-compile-plz-k-thx.diff 3555
+MD5 5cab2e3e3245584e09efe472ed141427 files/advancecomp-1.13-64bit.diff 1391
diff --git a/app-arch/advancecomp/advancecomp-1.11.ebuild b/app-arch/advancecomp/advancecomp-1.14.ebuild
index adf968194f0f..05f9fadb1904 100644
--- a/app-arch/advancecomp/advancecomp-1.11.ebuild
+++ b/app-arch/advancecomp/advancecomp-1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/advancecomp-1.11.ebuild,v 1.6 2005/01/01 11:40:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/advancecomp-1.14.ebuild,v 1.1 2005/03/02 20:52:53 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 alpha"
+KEYWORDS="~x86 ~alpha"
 IUSE="png mng"
 
 DEPEND="sys-libs/zlib app-arch/bzip2"
@@ -18,10 +18,10 @@ 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
+	# bzip2 support wont compile, here's a quick patch.
+	cd ${S}; epatch ${FILESDIR}/${PN}-1.13-bzip2-compile-plz-k-thx.diff
 
-	epatch ${FILESDIR}/${P}-64bit.diff
+	epatch ${FILESDIR}/${PN}-1.13-64bit.diff
 }
 
 src_compile() {
diff --git a/app-arch/advancecomp/files/advancecomp-1.11-64bit.diff b/app-arch/advancecomp/files/advancecomp-1.11-64bit.diff
deleted file mode 100644
index 57e27d37f975..000000000000
--- a/app-arch/advancecomp/files/advancecomp-1.11-64bit.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-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
deleted file mode 100644
index 9348eb305ef9..000000000000
--- a/app-arch/advancecomp/files/advancecomp-1.11-bzip2-compile-plz-k-thx.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-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/advancecomp-bzip2-compile-plz-k-thx.diff b/app-arch/advancecomp/files/advancecomp-bzip2-compile-plz-k-thx.diff
deleted file mode 100644
index b8741c544749..000000000000
--- a/app-arch/advancecomp/files/advancecomp-bzip2-compile-plz-k-thx.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -ruN advancecomp-1.8/compress.cc advancecomp-1.8.new/compress.cc
---- advancecomp-1.8/compress.cc	2003-10-05 18:59:02.000000000 +0100
-+++ advancecomp-1.8.new/compress.cc	2003-10-31 19:32:12.000000000 +0000
-@@ -177,14 +177,14 @@
- }
- 
- #ifdef 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.8/compress.h advancecomp-1.8.new/compress.h
---- advancecomp-1.8/compress.h	2003-10-05 18:59:10.000000000 +0100
-+++ advancecomp-1.8.new/compress.h	2003-10-31 19:31:25.000000000 +0000
-@@ -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.8/stamp-h1 advancecomp-1.8.new/stamp-h1
---- advancecomp-1.8/stamp-h1	1970-01-01 01:00:00.000000000 +0100
-+++ advancecomp-1.8.new/stamp-h1	2003-10-31 19:32:35.000000000 +0000
-@@ -0,0 +1 @@
-+timestamp for config.h
-diff -ruN advancecomp-1.8/zipsh.cc advancecomp-1.8.new/zipsh.cc
---- advancecomp-1.8/zipsh.cc	2003-02-10 19:25:05.000000000 +0000
-+++ advancecomp-1.8.new/zipsh.cc	2003-10-31 19:34:31.000000000 +0000
-@@ -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())) {
- 			data_free(uncompressed_data);
- 			throw error() << "Invalid compressed data on file " << name_get();
- 		}
-@@ -246,7 +246,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
deleted file mode 100644
index 834af1f5a097..000000000000
--- a/app-arch/advancecomp/files/digest-advancecomp-1.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e400c79e88d5d30af2017b95e2115bb1 advancecomp-1.11.tar.gz 354546
diff --git a/app-arch/advancecomp/files/digest-advancecomp-1.14 b/app-arch/advancecomp/files/digest-advancecomp-1.14
new file mode 100644
index 000000000000..41ef98ad67f1
--- /dev/null
+++ b/app-arch/advancecomp/files/digest-advancecomp-1.14
@@ -0,0 +1 @@
+MD5 6d3b0f3b1e52199214626dcfec05c821 advancecomp-1.14.tar.gz 259552