gentoo resync : 29.05.2018

5 files changed, 2 insertions, 159 deletions

diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest
index e4e1af069326..4d6673ca702c 100644
--- a/app-arch/advancecomp/Manifest
+++ b/app-arch/advancecomp/Manifest
@@ -1,8 +1,3 @@
-AUX advancecomp-1.13-bzip2-compile-plz-k-thx.diff 3555 BLAKE2B 13c47c770d360ce889db53abca909b06fc6b2b64fd49782a4518540a5a55fd9fbdec2ea6a1d28cf88eb883efe815428c2277aa757923525ef9bf589012a406d2 SHA512 b23595378f58c918b207964fb723508f551517919c5fae797620ef2c77b6c1d19fdc76a7dc8212ffdea4696af2908e701648f89ea03dc9a43e085d3d7c5861f8
-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
-EBUILD advancecomp-1.15.ebuild 919 BLAKE2B 765d9dc15ce846b70c0d29548b65343f8a47ebe8757e1881b38dba191aa1afeaaf7f1b975147e086712a5290031fda36b8400ac793dbec942a4aba1948c32060 SHA512 a4ef58fbf394c95cd311a27195480b7f054c46c8890ae7ecd3527969ebe8a060ef2081c1820ce8761796c9768e76d741ff3783aa98032b6587c98c51b2a382e1
-EBUILD advancecomp-1.23.ebuild 916 BLAKE2B 203186b5cfad20b2df8ea1ae4608b7b2290f3a6d2868581a6b3c373fffbe073266e84253e71a4d5db4afa9c1fd53affd74f285df385d5e247b26a4a63db377fa SHA512 0d103571a0f9d4d5d4a6144401e86e9e48dd293a9c4767250e7fa845b0da917e032340930edb4bc70b895ef5015f3f154dd20644c154dd55b9cbfd550fb70593
-EBUILD advancecomp-2.0.ebuild 915 BLAKE2B 451c776fe4e417379ce26cbe1ec9f46bb26489178bee833249c26864dcc64131dfa42142c015926521323da3a4ac39c2ba8390c706e3ea6b982d189efe01f086 SHA512 90e5805a3f37c7e7d480d34ba565fea28af048dac3f7e1749e6f027d1e671ae718628936e25ab8696f64862094c83349710e748ed25aadc738db23eca2842eb5
+EBUILD advancecomp-2.0.ebuild 914 BLAKE2B 93d773556cd4ca17e0ccf8acc4c5cb789841168d7ea67740ac585e4560e8e51d68664af2b97b17858f090a7f8962c44bebb65753a8ec497f0b1c4d550852a0b8 SHA512 49fe538efb6bcf76c29ff4532a6d8059e546f592b62abe872b6558bbd9f5f0f433a480276edc18441b638fb2bf1da4ccba191e60cb56d197c04c40f9c5e9f3f7
 MISC metadata.xml 521 BLAKE2B 84acb45e5f88abc50bd2e45d1b03a98b62623c52a7ba5fe1a6b54cb6f481c6328418d23920b55fb570c633223a115a36b1c89992f95b9673c9986a449c1765be SHA512 48bd30d199f5dae792a18e564454c3bf6707767a15a752aaaa28e2f8507e0824ccc348a9478531d03db839176742f00beabc95f532540ded145b734d2f4b3c45
diff --git a/app-arch/advancecomp/advancecomp-1.15.ebuild b/app-arch/advancecomp/advancecomp-1.15.ebuild
deleted file mode 100644
index ec5089773317..000000000000
--- 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/advancecomp-1.23.ebuild b/app-arch/advancecomp/advancecomp-1.23.ebuild
deleted file mode 100644
index da4307230c37..000000000000
--- a/app-arch/advancecomp/advancecomp-1.23.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Recompress ZIP, PNG and MNG, considerably improving compression"
-HOMEPAGE="http://www.advancemame.it/comp-readme.html"
-SRC_URI="https://github.com/amadvance/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="mng png test"
-
-RDEPEND="app-arch/bzip2
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-#	test? ( dev-util/valgrind )
-#   test? ( app-text/tofrodos )
-
-RESTRICT="test" #282441, #523212
-
-src_configure() {
-	econf --enable-bzip2 \
-		$(use_enable test valgrind)
-}
-
-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/advancecomp-2.0.ebuild b/app-arch/advancecomp/advancecomp-2.0.ebuild
index 02c4e4276dc0..1e620391529f 100644
--- a/app-arch/advancecomp/advancecomp-2.0.ebuild
+++ b/app-arch/advancecomp/advancecomp-2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/amadvance/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-3 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="mng png test"
 
 RDEPEND="app-arch/bzip2
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 f20bba3373a2..000000000000
--- 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;
- 			}