gentoo resync : 20.03.2022

6 files changed, 16 insertions, 86 deletions

diff --git a/media-gfx/apngasm/Manifest b/media-gfx/apngasm/Manifest
index 75f58e984692..70c89eb1eea9 100644
--- a/media-gfx/apngasm/Manifest
+++ b/media-gfx/apngasm/Manifest
@@ -1,7 +1,4 @@
-AUX apngasm-2.91-makefile.patch 585 BLAKE2B 8972e2c3b59f4d128f522309496ed643046a18684e003503046927db4e1be06219a9c6818b75bcb0497c7ef5057a91c5f4bee837abca95c89eb79fa8da0fa39e SHA512 f3b9b89ee3071c01bdc08f8a09864956d258abf14aac147a754f6259297ce8a479a067ee5d37225b7dee0f4f419bef53e127266ae770063cdafa478c78d6eda2
-AUX apngasm-3.1.10-static.patch 2156 BLAKE2B 872543f75d9824d7263653d92b9c83971397f36a46b7deeda2e804f7138dec932d2ca5969d802e211772138d63247763ee89e73cb904d0c71fe7c0d5474f8144 SHA512 3b79954d89f77dd8e49c3657babebb43598bbbb185a25d8617cbadd4c3a7e6179366ee8ece03bde5cec34bb39bbb36c3210fdf8b4c1e38147668028aa1d894cd
-DIST apngasm-2.91-src.zip 597267 BLAKE2B a34a765fef49aa0ac29973b8dc450bfcdfe7aa83dffe19919f916a136db3d0bfebf3c1fac79bfb81a3900cee87afd888469e5432500d181a9539696b4573a42b SHA512 2415389a989f7a7ff7f3e1328f7920c7515c9a492c89ef216ff53db68fe2f1a674ff60d5f4bfd5a8c710f625456557ae7d5b25f486ac826e3113976cd9fc11dc
+AUX apngasm-3.1.10-static.patch 2385 BLAKE2B aa44e300ece7c3d0efe86d6298211d8973455c7130817a8130c7dd9ddcdd858e963267edb1c656753ae2992569b75390171c87b632e294824c2b06c56e293aa0 SHA512 50cf959dc47c823d69697c7ea7c13605fa57451fcf5e845542d706bc501e4075cae3dccef4d3c56b4f8e8a697f056bd01872c69e025cb7cefaf32a8ae88d02a2
 DIST apngasm-3.1.10.tar.gz 620031 BLAKE2B 6885b87815e76e8b9eed58548568bf821dfdf61579f83fc1aa977638f34c2112ebbfebba3454b0a2cfc01b465e570a7976e0fb8046a0762e9d35cf30e3d3f4cd SHA512 670d75251ddc771f9b2b4a1f401066f2012a6814bec781b918f1d9e8960835654c66c3d19b4c8920d5186d85af12cdc4bba8b61c8f3d349b4fc70513d8ecb34e
-EBUILD apngasm-2.91-r1.ebuild 968 BLAKE2B 8b3580b03305a191fdda6d50cf8304f36acdb7acecae1bb4334d43942ec9d3361353b3cd03151d4a7c4bc413b010fcc86203d03f91b1288c9d92cf444a7b2f62 SHA512 d16cfe2ce71647e54e7ee4f1e33948ee6c30f3391b214c0784392a615aeda7758163facdee2c755833bac357121789d46b80f2b6b5c14084256a0b5f0b45ca13
-EBUILD apngasm-3.1.10.ebuild 738 BLAKE2B 806de8d8f336f18a1135ec5a8f7dac6d5db3a219386929e6476433dac32b84e38de1597f79d02d886d5a2656f4373e7e8a12f81d759477dea27829f7c933c246 SHA512 769ffbdfdb0e4f939bcfdb5f9477b818c51b17cf91c408335373cc194721644d812a7d8cc8426d07b0dbf157e2d137c600b67a2eecd006fb155f8542009a7c5a
-MISC metadata.xml 388 BLAKE2B 8f335a73605bdeb3d10c3417a9dbe2ca4d770e74a05fc89ab8fd89046c124dd0015850aacb7c7127549b1468098695a1ac8119747f2b897e6dd3fc13c132e9d3 SHA512 cf91d94546a2414239fd21cad04a026a7a40e72d7133966e20a098c81ce9ec8cfc190136534c9363b62d450e59d8b77f0bed85dd7d7a86efd8496bd0a56df77a
+EBUILD apngasm-3.1.10.ebuild 736 BLAKE2B 5bad70f229c826ad33c230c5f01ae536843890c78866b54d7bfcf8eaa257840fee2657115c19089fca577fb784a273cca0b5a4d22114fa78eb7e40cea23e0014 SHA512 e9c9760f062c0493ffa0c8af0601564b8ac93c4e3d818fafe4aa622c2f34f255acbc49fa827712e760f599c1a7ca8def17a1a84ab2d9ff2ce07fdd59454709b6
+MISC metadata.xml 245 BLAKE2B d5646f7765d15049bac6a19a46470bb3ba3c1198764b8f2ab40e2bfc6df3877c555163a85d0d410aa2b62bb83b85ee1865c0ab3c8ffd19f0071f797e3f5046fb SHA512 1173393301e862bc2513bd15ab8f24661ce574f530f36707e57c8a33e5b4efe01b561184a70fc1e464a7954b16b8bfbec80721a987e8eb01cef356effce10238
diff --git a/media-gfx/apngasm/apngasm-2.91-r1.ebuild b/media-gfx/apngasm/apngasm-2.91-r1.ebuild
deleted file mode 100644
index ef084fbd4c98..000000000000
--- a/media-gfx/apngasm/apngasm-2.91-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="create an APNG from multiple PNG files"
-HOMEPAGE="https://sourceforge.net/projects/apngasm/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-src.zip"
-
-LICENSE="ZLIB 7z? ( LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="7z zopfli"
-
-RDEPEND="media-libs/libpng:0=
-	sys-libs/zlib
-	zopfli? ( app-arch/zopfli:= )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_prepare() {
-	default
-
-	# remove bundled libs
-	rm -r zopfli zlib libpng || die
-
-	if use 7z; then
-		append-cflags -DFEATURE_7ZIP
-	else
-		sed -i '/^SRC_DIRS\s\+=/s/7z//' Makefile || die
-	fi
-
-	if use zopfli; then
-		append-cflags -DFEATURE_ZOPFLI
-		sed -i '/^LIBS\s\+=/s/$/ -lzopfli/' Makefile || die
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc readme.txt
-}
diff --git a/media-gfx/apngasm/apngasm-3.1.10.ebuild b/media-gfx/apngasm/apngasm-3.1.10.ebuild
index 15fc7a28415d..9200bae2d260 100644
--- a/media-gfx/apngasm/apngasm-3.1.10.ebuild
+++ b/media-gfx/apngasm/apngasm-3.1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.t
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-libs/boost:=
diff --git a/media-gfx/apngasm/files/apngasm-2.91-makefile.patch b/media-gfx/apngasm/files/apngasm-2.91-makefile.patch
deleted file mode 100644
index b9fb9c20ee89..000000000000
--- a/media-gfx/apngasm/files/apngasm-2.91-makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- apngasm-2.91-src/Makefile
-+++ apngasm-2.91-src/Makefile
-@@ -1,8 +1,7 @@
- PACKAGE    = apngasm
- CC         = gcc
--SRC_DIRS   = . 7z zopfli
--CFLAGS     = -Wall -pedantic -DFEATURE_7ZIP -DFEATURE_ZOPFLI
--CFLAGS_OPT = -O2
-+SRC_DIRS   = . 7z
-+CFLAGS     += -Wall -pedantic
- CFLAGS_7Z  = -Wno-sign-compare -Wno-reorder -Wno-maybe-uninitialized -Wno-parentheses
- LIBS       = -lstdc++ -lm -lpng -lz
- 
-@@ -16,7 +15,7 @@
- all : $(PACKAGE)
- 
- $(PACKAGE) : objdirs $(OBJECTS)
--	$(CC) -o $@ $(OBJECTS) -s $(LIBS)
-+	$(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(LIBS)
- 
- objdirs :
- 	mkdir -p $(OBJ_DIRS)
diff --git a/media-gfx/apngasm/files/apngasm-3.1.10-static.patch b/media-gfx/apngasm/files/apngasm-3.1.10-static.patch
index a624d03278f3..fdc4f5ea41e8 100644
--- a/media-gfx/apngasm/files/apngasm-3.1.10-static.patch
+++ b/media-gfx/apngasm/files/apngasm-3.1.10-static.patch
@@ -1,3 +1,14 @@
+--- a/cli/CMakeLists.txt
++++ b/cli/CMakeLists.txt
+@@ -51,7 +51,7 @@ set_target_properties(apngasm-cli
+ 
+ # Link to built apngasm library
+ target_link_libraries(apngasm-cli
+-  apngasm
++  apngasm-dynamic
+   ${Boost_LIBRARIES}
+ )
+ 
 --- a/lib/CMakeLists.txt
 +++ b/lib/CMakeLists.txt
 @@ -55,18 +55,6 @@ set_target_properties(${APNGASM_DYNAMIC_LIB_TARGET}
diff --git a/media-gfx/apngasm/metadata.xml b/media-gfx/apngasm/metadata.xml
index d31bd859a4ec..cff2266b257f 100644
--- a/media-gfx/apngasm/metadata.xml
+++ b/media-gfx/apngasm/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<use>
-		<flag name="7z">Enable support for 7zip compression</flag>
-		<flag name="zopfli">Enable support for Zopfli compression</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">apngasm</remote-id>
 	</upstream>