From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 24 Dec 2018 14:11:38 +0000
Subject: gentoo resync : 24.12.2018

---
 app-arch/advancecomp/Manifest               |  6 +++--
 app-arch/advancecomp/advancecomp-2.0.ebuild |  2 +-
 app-arch/advancecomp/advancecomp-2.1.ebuild | 36 +++++++++++++++++++++++++++++
 app-arch/advancecomp/metadata.xml           |  6 ++---
 4 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 app-arch/advancecomp/advancecomp-2.1.ebuild

(limited to 'app-arch/advancecomp')

diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest
index 4d6673ca702c..4cf6d4529808 100644
--- a/app-arch/advancecomp/Manifest
+++ b/app-arch/advancecomp/Manifest
@@ -1,3 +1,5 @@
 DIST advancecomp-2.0.tar.gz 1292164 BLAKE2B 16f24820ac8f6de517edc91237b743935673894fd784271ab7ef7c1b5e7ff11fb4087dffa4e99b0b5b5ef550514f7267962cfcc7dde2976db69a28c68398c8ac SHA512 e324cdf1687d3a92d3416d07269b3d03087ccece9cf636cd4cd0075fbededcd27da5c84a2d77cc1265800f252fcd75a841459fcc55dd9d5eee3ea3fa48d9f906
-EBUILD advancecomp-2.0.ebuild 914 BLAKE2B 93d773556cd4ca17e0ccf8acc4c5cb789841168d7ea67740ac585e4560e8e51d68664af2b97b17858f090a7f8962c44bebb65753a8ec497f0b1c4d550852a0b8 SHA512 49fe538efb6bcf76c29ff4532a6d8059e546f592b62abe872b6558bbd9f5f0f433a480276edc18441b638fb2bf1da4ccba191e60cb56d197c04c40f9c5e9f3f7
-MISC metadata.xml 521 BLAKE2B 84acb45e5f88abc50bd2e45d1b03a98b62623c52a7ba5fe1a6b54cb6f481c6328418d23920b55fb570c633223a115a36b1c89992f95b9673c9986a449c1765be SHA512 48bd30d199f5dae792a18e564454c3bf6707767a15a752aaaa28e2f8507e0824ccc348a9478531d03db839176742f00beabc95f532540ded145b734d2f4b3c45
+DIST advancecomp-2.1.tar.gz 1292135 BLAKE2B 0ad0586298c396f64dda1db3dd5865159b0897d5ee1485809531cad4e11fc9ab634f77c50e70065cf9d827fe4fad4a9d99a5e2587d0f3a8aaa55fe82dff008c1 SHA512 62abc585b282483bf5994491db3965463f4a54db642e489460d678f95faefc5d62f80bcd9e5a2a2ba3cd708d5cda7457a2b773be1a65385ef5528324e2d2949b
+EBUILD advancecomp-2.0.ebuild 933 BLAKE2B bbf30e3d04be41ad781a48a4ae63d317744d74b214e6a31eb76e4a7c5527d4e7c66a75794e38ee3f471b9039dde5bad6e27d9515c09fc34aafc3a23c7fcb06a8 SHA512 70a941e00ea917af6405208db3747d5939a4b7ecc65a7189f6ed34922309af480873c39a4bdf3e533cdf5297d27d4ea0fa0ad04f082fd378218f4bed714591db
+EBUILD advancecomp-2.1.ebuild 831 BLAKE2B 9ffb94c49e1846010b929613bf5ea7d015820948c648361ef83330074b40eb8d6e4f9e72840d7eb1c23091a80c2342fb895806d9e888f95ef224bcdddb3e31f0 SHA512 1d972f93e781077c3ca403c07d9a3130ac4282b3bdf8c79cab9702eb4c0c8919cb564c61f727032a3084de11ff1c205d33ed880cbc5570689387caa67601e8f3
+MISC metadata.xml 525 BLAKE2B 7b701e8291c27054417e28405eae6e285a384f80e96801fa7b088115a40abe3d35f2db1104a1b77a9a5e486327cdc91327427605172e4f00c61b515c91b0ef8c SHA512 4bde385cbadadb14a594602dddec98f079cf1f970138c63296ef1c634bdd9f352c9662b0064f3738017e9ee24bff5662e7e02df19797ae0276c7e889376857a7
diff --git a/app-arch/advancecomp/advancecomp-2.0.ebuild b/app-arch/advancecomp/advancecomp-2.0.ebuild
index 1e620391529f..4fb17e83d9b8 100644
--- a/app-arch/advancecomp/advancecomp-2.0.ebuild
+++ b/app-arch/advancecomp/advancecomp-2.0.ebuild
@@ -9,7 +9,7 @@ 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"
+LICENSE="GPL-2+ Apache-2.0 LGPL-2.1+ MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="mng png test"
diff --git a/app-arch/advancecomp/advancecomp-2.1.ebuild b/app-arch/advancecomp/advancecomp-2.1.ebuild
new file mode 100644
index 000000000000..5c2d7fe463cf
--- /dev/null
+++ b/app-arch/advancecomp/advancecomp-2.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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-2+ Apache-2.0 LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="app-arch/bzip2:=
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+
+# Tests seem to rely on exact output:
+# https://sourceforge.net/p/advancemame/bugs/270/
+RESTRICT="test"
+
+src_configure() {
+	local myconf=(
+		--enable-bzip2
+		# (--disable-* arguments are mishandled)
+		# --disable-debug
+		# --disable-valgrind
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dodoc HISTORY
+}
diff --git a/app-arch/advancecomp/metadata.xml b/app-arch/advancecomp/metadata.xml
index df2737613e88..559473ad2e25 100644
--- a/app-arch/advancecomp/metadata.xml
+++ b/app-arch/advancecomp/metadata.xml
@@ -1,9 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
 	</maintainer>
 	<longdescription lang="en">
 		AdvanceCOMP is a set of recompression utilities for .PNG, .MNG, .ZIP
-- 
cgit v1.2.3