gentoo xmass resync : 25.12.2021

4 files changed, 101 insertions, 3 deletions

diff --git a/media-gfx/apngasm/Manifest b/media-gfx/apngasm/Manifest
index 49b90f68badb..75f58e984692 100644
--- a/media-gfx/apngasm/Manifest
+++ b/media-gfx/apngasm/Manifest
@@ -1,4 +1,7 @@
 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
-EBUILD apngasm-2.91.ebuild 974 BLAKE2B 40fa7aad5e2fde3388968668a956a1adc6a161de1e32271334a4f938f82adf5665e37ff77db5c56f97e757bb1f5c326cccb1f6085fa6d82e80e1f66625802480 SHA512 0f5a60881ca232d9efea50d3feda4501e5394a52e0411addc61171d248e8b8b309936c8e59ba10bc2104138268f5b9418a7408852861f013d254fc3f63b0bd55
+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
diff --git a/media-gfx/apngasm/apngasm-2.91.ebuild b/media-gfx/apngasm/apngasm-2.91-r1.ebuild
index f9c2fdf64fb9..ef084fbd4c98 100644
--- a/media-gfx/apngasm/apngasm-2.91.ebuild
+++ b/media-gfx/apngasm/apngasm-2.91-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="7z zopfli"
 
-RDEPEND="media-libs/libpng:0=[apng]
+RDEPEND="media-libs/libpng:0=
 	sys-libs/zlib
 	zopfli? ( app-arch/zopfli:= )"
 DEPEND="${RDEPEND}
diff --git a/media-gfx/apngasm/apngasm-3.1.10.ebuild b/media-gfx/apngasm/apngasm-3.1.10.ebuild
new file mode 100644
index 000000000000..15fc7a28415d
--- /dev/null
+++ b/media-gfx/apngasm/apngasm-3.1.10.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="create an APNG from multiple PNG files"
+HOMEPAGE="https://github.com/apngasm/apngasm"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/boost:=
+	media-libs/libpng:0=
+	sys-libs/zlib:=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1.10-static.patch"
+)
+
+src_prepare() {
+	sed -i -e 's|man/man1|share/man/man1|g' cli/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR=$(get_libdir)
+		-DJAVA=OFF
+		-DRUBY=OFF
+	)
+	cmake_src_configure
+}
diff --git a/media-gfx/apngasm/files/apngasm-3.1.10-static.patch b/media-gfx/apngasm/files/apngasm-3.1.10-static.patch
new file mode 100644
index 000000000000..a624d03278f3
--- /dev/null
+++ b/media-gfx/apngasm/files/apngasm-3.1.10-static.patch
@@ -0,0 +1,55 @@
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -55,18 +55,6 @@ set_target_properties(${APNGASM_DYNAMIC_LIB_TARGET}
+   CXX_STANDARD 20
+ )
+ 
+-# Add the static library/archive
+-set(APNGASM_STATIC_LIB_TARGET apngasm-static)
+-add_library(${APNGASM_STATIC_LIB_TARGET}
+-  ${APNGASM_SOURCES}
+-)
+-set_target_properties(${APNGASM_STATIC_LIB_TARGET}
+-  PROPERTIES
+-  POSITION_INDEPENDENT_CODE TRUE
+-  OUTPUT_NAME apngasm
+-  CXX_STANDARD 20
+-)
+-
+ # Add libraries/includes
+ #target_link_libraries(${APNGASM_DYNAMIC_LIB_TARGET} stdc++fs)
+ #target_link_libraries(${APNGASM_STATIC_LIB_TARGET} stdc++fs)
+@@ -74,11 +62,9 @@ set_target_properties(${APNGASM_STATIC_LIB_TARGET}
+ find_package(PNG REQUIRED)
+ include_directories(${PNG_INCLUDE_DIR})
+ target_link_libraries(${APNGASM_DYNAMIC_LIB_TARGET} ${PNG_LIBRARY})
+-target_link_libraries(${APNGASM_STATIC_LIB_TARGET} ${PNG_LIBRARY})
+ message(${PNG_VERSION_STRING})
+ 
+ target_link_libraries(${APNGASM_DYNAMIC_LIB_TARGET} ${ZLIB_LIBRARIES})
+-target_link_libraries(${APNGASM_STATIC_LIB_TARGET} ${ZLIB_LIBRARIES})
+ 
+ #if (APPLE OR WIN32)
+ #    set(Boost_USE_STATIC_LIBS ON)
+@@ -88,13 +74,10 @@ target_link_libraries(${APNGASM_STATIC_LIB_TARGET} ${ZLIB_LIBRARIES})
+ find_package(Boost REQUIRED COMPONENTS program_options regex system)
+ include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
+ target_link_libraries(${APNGASM_DYNAMIC_LIB_TARGET} Boost::program_options Boost::regex Boost::system)
+-target_link_libraries(${APNGASM_STATIC_LIB_TARGET} Boost::program_options Boost::regex Boost::system)
+ 
+ get_target_property(APNGASM_DYNAMIC_LIB_TARGET_NAME ${APNGASM_DYNAMIC_LIB_TARGET} OUTPUT_NAME)
+-get_target_property(APNGASM_STATIC_LIB_TARGET_NAME ${APNGASM_STATIC_LIB_TARGET} OUTPUT_NAME)
+ set(APNGASM_LIBRARIES
+   ${PROJECT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${APNGASM_DYNAMIC_LIB_TARGET_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
+-  ${PROJECT_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${APNGASM_STATIC_LIB_TARGET_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ )
+ 
+ # Installation
+@@ -107,7 +90,6 @@ endif ()
+ install(
+   TARGETS
+     ${APNGASM_DYNAMIC_LIB_TARGET}
+-    ${APNGASM_STATIC_LIB_TARGET}
+   DESTINATION ${LIB_INSTALL_DIR}
+ )
+