gentoo auto-resync : 17:09:2023 - 17:03:44

5 files changed, 83 insertions, 68 deletions

diff --git a/media-gfx/apngopt/Manifest b/media-gfx/apngopt/Manifest
index b4223d63b3b6..93dbc3e381e4 100644
--- a/media-gfx/apngopt/Manifest
+++ b/media-gfx/apngopt/Manifest
@@ -1,4 +1,4 @@
-AUX apngopt-1.4-makefile.patch 714 BLAKE2B 9755b035d1b8a0515f9713d6a63ba36da25812491ce8e9982b4d25ae6649651470480172c6c2e0ca1c45f1df0ac4ecdb92fcd7af2ec8b6a07d52a259d6bdb590 SHA512 5a6366bc4810295810bd1bd3f0a709f0e78d4d7ac8f3e3ca0b10d8aeb5fd89115a41c835a7d6c2ae878b68ca7dccc5ce1cea96f5e6b4e75c191357e4d4e6a0f1
+AUX apngopt-1.4-r1-makefile.patch 1204 BLAKE2B 7cbd9710f83ed3f561d63db17bcc671761470f1d6eb008e2984b60d059cbe58d8ce497c8904f056740a12cdbf4a707c9cd968b54ff04b86cb668a2b8b4347627 SHA512 85acb194d2f559ec0ebdf076dcc2385ab54cff09ae4879ed6983f17b9560135f7b6fa654027e98331352531ceb1c4ca5d668436d86f99a2ad6918435cd2c4496
 DIST apngopt-1.4-src.zip 577703 BLAKE2B 14aaa3fcd7fcd18fedb026248d3d46c774affc09112512a11ac2e51141c4337d130c42cc2a42d044d7ed638732d4e1ae2f04d5c59578c379a55ceeb1cc7425c0 SHA512 8dd97ca6fdd10b1285c3a850ab0f6e14113df0b4a607877a6fb7c5bacded02432504e3af87a43c4aa660bad7226f300af8e0967368ca1eef00c9df7f624d578c
-EBUILD apngopt-1.4.ebuild 670 BLAKE2B 38859b34ebfd3332de18e079b5f5b9825f8d86e5dff5278b17d582423c53fdf6840dfd9e0eaf4c280793075eec62e8a907bb7fcd0512087602f2644821bc2835 SHA512 684bdc63e0fa407734b9c427c8eb5beb3474c6934cc4b7a35afc5f597639d3202abf3416bb5bca3b90347e7be85d7c6fa6b92ac971ad3fb87decca86863c4bdc
+EBUILD apngopt-1.4-r1.ebuild 654 BLAKE2B 988c40c5abba7587eb2bc30d6ca3c87b2ae8e0e28ef1139fdc3d0362c3b91ad5b14510359c6ac4016e31889f4509ff6edf5860138da5581d9d105ebf4201d714 SHA512 532b4bd6b9f5a99611628bee369b50f9a6eec9b83a4478159d567daa1ea024a4c9a0c75b64e81e012e97dd218c19bdb5e3c19b9aad69088b495f07c8f2a97db3
 MISC metadata.xml 242 BLAKE2B a923925d425b5784d43ea8c39db73c3b93b91f362e640ad7c0051348ab4195048576a38bfc92cefdda1416e4efc22ecb7be9e20a2f94e1a0eb762daca40b643f SHA512 52374ba3baf71bc51f4042e9eb9687029c3fc62cf752728479a282d9733c22cae9799ccf3535f9602f5ae076deb769a63c3c83c5d184610a670e06b5ffe26569
diff --git a/media-gfx/apngopt/apngopt-1.4-r1.ebuild b/media-gfx/apngopt/apngopt-1.4-r1.ebuild
new file mode 100644
index 000000000000..9a1255fc6ef8
--- /dev/null
+++ b/media-gfx/apngopt/apngopt-1.4-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Optimize APNG images"
+HOMEPAGE="https://sourceforge.net/projects/apng/"
+SRC_URI="mirror://sourceforge/apng/${P}-src.zip"
+S="${WORKDIR}"
+
+LICENSE="LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-arch/zopfli:=
+	media-libs/libpng:=
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
+
+PATCHES=( "${FILESDIR}"/${PF}-makefile.patch )
+
+src_prepare() {
+	default
+	rm -rf libpng zlib zopfli || die
+}
+
+src_configure() {
+	tc-export CXX
+}
+
+src_install() {
+	dobin apngopt
+	dodoc readme.txt
+}
diff --git a/media-gfx/apngopt/apngopt-1.4.ebuild b/media-gfx/apngopt/apngopt-1.4.ebuild
deleted file mode 100644
index d8c6b4c2f53b..000000000000
--- a/media-gfx/apngopt/apngopt-1.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="optimize APNG images"
-HOMEPAGE="https://sourceforge.net/projects/apng/"
-SRC_URI="mirror://sourceforge/apng/${P}-src.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-libs/zlib
-	>=app-arch/zopfli-1.0.1-r2:=
-	media-libs/libpng:0="
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_prepare() {
-	default
-	rm -rf libpng zlib zopfli || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" ${PN}
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc readme.txt
-}
diff --git a/media-gfx/apngopt/files/apngopt-1.4-makefile.patch b/media-gfx/apngopt/files/apngopt-1.4-makefile.patch
deleted file mode 100644
index 4ec6084139a0..000000000000
--- a/media-gfx/apngopt/files/apngopt-1.4-makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Use system zopfli library and respect CFLAGS.
-
---- apngopt-1.4-src/Makefile
-+++ apngopt-1.4-src/Makefile
-@@ -1,10 +1,10 @@
- PACKAGE    = apngopt
- CC         = gcc
--SRC_DIRS   = . 7z zopfli
-+SRC_DIRS   = . 7z
- CFLAGS     = -Wall -pedantic
--CFLAGS_OPT = -O2
-+#CFLAGS_OPT = -O2
- CFLAGS_7Z  = -Wno-sign-compare -Wno-reorder -Wno-maybe-uninitialized -Wno-parentheses
--LIBS       = -lstdc++ -lm -lpng -lz
-+LIBS       = -lstdc++ -lm -lpng -lz -lzopfli
- 
- INCUDE_DIRS := $(addprefix -I./, $(SRC_DIRS))
- OBJ_DIRS := $(addprefix obj/, $(SRC_DIRS))
-@@ -16,7 +16,7 @@
- all : $(PACKAGE)
- 
- $(PACKAGE) : objdirs $(OBJECTS)
--	$(CC) -o $@ $(OBJECTS) -s $(LIBS)
-+	$(CC) -o $@ $(OBJECTS) $(LIBS)
- 
- objdirs :
- 	mkdir -p $(OBJ_DIRS)
diff --git a/media-gfx/apngopt/files/apngopt-1.4-r1-makefile.patch b/media-gfx/apngopt/files/apngopt-1.4-r1-makefile.patch
new file mode 100644
index 000000000000..0726f81db4a2
--- /dev/null
+++ b/media-gfx/apngopt/files/apngopt-1.4-r1-makefile.patch
@@ -0,0 +1,43 @@
+Use system zopfli library and respect CFLAGS.
+
+--- a/Makefile
++++ b/Makefile
+@@ -1,10 +1,9 @@
+ PACKAGE    = apngopt
+-CC         = gcc
+-SRC_DIRS   = . 7z zopfli
+-CFLAGS     = -Wall -pedantic
+-CFLAGS_OPT = -O2
+-CFLAGS_7Z  = -Wno-sign-compare -Wno-reorder -Wno-maybe-uninitialized -Wno-parentheses
+-LIBS       = -lstdc++ -lm -lpng -lz
++
++SRC_DIRS   = . 7z
++CXXFLAGS   += -Wall -pedantic
++CXXFLAGS_7Z = -Wno-sign-compare -Wno-reorder -Wno-maybe-uninitialized -Wno-parentheses
++LIBS       += -lm -lpng -lz -lzopfli
+ 
+ INCUDE_DIRS := $(addprefix -I./, $(SRC_DIRS))
+ OBJ_DIRS := $(addprefix obj/, $(SRC_DIRS))
+@@ -16,19 +15,16 @@
+ all : $(PACKAGE)
+ 
+ $(PACKAGE) : objdirs $(OBJECTS)
+-	$(CC) -o $@ $(OBJECTS) -s $(LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS)
+ 
+ objdirs :
+ 	mkdir -p $(OBJ_DIRS)
+ 
+ obj/%.o : %.cpp
+-	$(CC) -o $@ -c $< $(INCUDE_DIRS) $(CFLAGS) $(CFLAGS_OPT)
+-
+-obj/%.o : %.c
+-	$(CC) -o $@ -c $< $(INCUDE_DIRS) $(CFLAGS) $(CFLAGS_OPT)
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $< $(INCUDE_DIRS)
+ 
+ obj/%.o : %.cc
+-	$(CC) -o $@ -c $< $(INCUDE_DIRS) $(CFLAGS) $(CFLAGS_OPT) $(CFLAGS_7Z)
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $< $(INCUDE_DIRS) $(CXXFLAGS_7Z)
+ 
+ .PHONY : clean
+