[gentoo-commits] repo/gentoo:master commit in: app-arch/advancecomp/, app-arch/advancecomp/files/

[Johannes Huber]

commit:     1c88070676070531d518c90d4410182043bcb1e3
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 11:29:16 2018 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat May 26 11:30:09 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c880706

app-arch/advancecomp: Remove 1.15

Uses deprecated EAPI 4 and overshadowed by 2.0.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-arch/advancecomp/Manifest                      |  1 -
 app-arch/advancecomp/advancecomp-1.15.ebuild       | 46 ----------------
 .../advancecomp-1.13-bzip2-compile-plz-k-thx.diff  | 61 ----------------------
 3 files changed, 108 deletions(-)

diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest
index 3454e85b39f..1675d81b481 100644
--- a/app-arch/advancecomp/Manifest
+++ b/app-arch/advancecomp/Manifest
@@ -1,3 +1,2 @@
-DIST advancecomp-1.15.tar.gz 259340 BLAKE2B 64be369b56962b8612d46190a1ee2ccd3d3cae32867891a2dcec6fc24c1ea76c41fb3eb3980d1e43d642011d43250ad49a75f98ba4cb86f8e511c130ab2678a4 SHA512 18d6abb4c739c16e340bad2e87f89b545d0ecb660897a109a038b2a236bab6ce3d3b3ad572839fb4ce7981c5f150d8ed2447654291a8d808bbb85e70152e47ba
 DIST advancecomp-1.23.tar.gz 1288937 BLAKE2B 48044f8e896e29ec41518f50daee50bd10e43d474a966f3a9d5ff1c567fb21366f09b1b7ead51323ec5a959fceafd4df247e469c4ba015ad3cfdb9b2f187bfdd SHA512 2218d8677787d3f72434e2d5dd3f6b21f69de7042c7533ad29625522adedd56d765e70e4749bbfac14973b9b2bb6958db2900e62b26e5242106caf760cbc2236
 DIST advancecomp-2.0.tar.gz 1292164 BLAKE2B 16f24820ac8f6de517edc91237b743935673894fd784271ab7ef7c1b5e7ff11fb4087dffa4e99b0b5b5ef550514f7267962cfcc7dde2976db69a28c68398c8ac SHA512 e324cdf1687d3a92d3416d07269b3d03087ccece9cf636cd4cd0075fbededcd27da5c84a2d77cc1265800f252fcd75a841459fcc55dd9d5eee3ea3fa48d9f906

diff --git a/app-arch/advancecomp/advancecomp-1.15.ebuild b/app-arch/advancecomp/advancecomp-1.15.ebuild
deleted file mode 100644
index ec508977331..00000000000
--- a/app-arch/advancecomp/advancecomp-1.15.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="Recompress ZIP, PNG and MNG, 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="~alpha amd64 ~arm hppa ~ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="png mng"
-
-DEPEND="sys-libs/zlib
-	app-arch/bzip2"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test" #282441
-
-src_prepare() {
-	# bzip2 support wont compile, here's a quick patch.
-	epatch "${FILESDIR}"/${PN}-1.13-bzip2-compile-plz-k-thx.diff
-}
-
-src_configure() {
-	econf --enable-bzip2
-}
-
-src_install() {
-	dobin advdef advzip
-
-	if use png; then
-		dobin advpng
-		doman doc/advpng.1
-	fi
-
-	if use mng; then
-		dobin advmng
-		doman doc/advmng.1
-	fi
-
-	dodoc HISTORY AUTHORS README
-	doman doc/advdef.1 doc/advzip.1
-}

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
deleted file mode 100644
index f20bba3373a..00000000000
--- a/app-arch/advancecomp/files/advancecomp-1.13-bzip2-compile-plz-k-thx.diff
+++ /dev/null
@@ -1,61 +0,0 @@
---- 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;
- 			}