gentoo auto-resync : 28:04:2023 - 05:11:40

6 files changed, 49 insertions, 10 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 54689cbca019..719a4ff9e73b 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/apng2gif/Manifest b/media-gfx/apng2gif/Manifest
index 3f07601e0c9a..b1f7f5f402e1 100644
--- a/media-gfx/apng2gif/Manifest
+++ b/media-gfx/apng2gif/Manifest
@@ -1,5 +1,5 @@
 AUX apng2gif-1.8-makefile.patch 454 BLAKE2B 0ba1973820249c62481e2446d9449c5d9ca47209e0dd927b8924c6af80b210eb67a2687d76406e75d6888aa98751c2d242f4659cee0703bb15debe5fa2d16529 SHA512 4a95faf9a272f887e47981e7d426227f13c5c6a0212850b611a3d244a57fe93ed3da9e7cf57fa795d8743055ac92cbc9f3ecb7247884130a5afd553a52709847
 AUX apng2gif-1.8-zlib.patch 313 BLAKE2B 46f274dde43fe5c93dd58433cdfc201aeea5e3cf4968acb93580599c1408c5fe01bbe6e7a3037f63f8d0f6470f54ebb4881d230bd2276be9ebad3784f3501357 SHA512 7b3501e6a9f0640aee5afbc3abaa13ee53829081bd800edd007b69af65132b3ee51e4c10c7b8bde748dafe944d478be8b3f0125ec8d3c6ff96836be1c92f00c2
 DIST apng2gif-1.8-src.zip 476207 BLAKE2B 5c0aeb2a9e05fc5aac87650684419a2fab55d393186454491d13fd88251949282ee27b03a7d26b8892a5b17596a320ce7c7983385246fac8ca87e14d4a5c37fb SHA512 54fee0bf1e5448531298a816562a611cb5f2f661d40ade622e2d24e58a30de96fa69254ee891c5329e8b065c999b95620215d6e1ae276f0c596ffe69b0b31cda
-EBUILD apng2gif-1.8.ebuild 651 BLAKE2B 8c0d1c6ad9e1c4fb063026bf1d9bcf35c5c1bf60e14ee6d261fe9ad94b8a659472eebe9c89afd517c80ae308efb115cc471171c1f3a1d7a93f92c247c1117c27 SHA512 7fcb961abee160a1f009640ff4947316936f42ed54262aa731de1873cff46884b22b396f6c497b1ed408342fc5c98fa3e315073fd00ad0667e6860f2b367ee0f
+EBUILD apng2gif-1.8.ebuild 650 BLAKE2B 10115c64fbfc590c668df50c483346a753a33d06c35bc68475b904df304ace016ea278e09a7d1061e51aca0af6380c61a123cdb93416df5aa8caf4a4d4a9215d SHA512 aacec9e75b661057f2098dd686f29bc0337bf3555c822df01ab59e2719fafba3f7e5696e615e320c1febda32a2ffaa7761a6984261817926010c09c33197f4e9
 MISC metadata.xml 246 BLAKE2B a96fc5a8a87a504441c96e78df4909f18339a6e8ceb661578f5d751b2a2939e7d3f8ad78209ad393ae37d5f4fe9c64844381a49f8b88a54c5b96f9533ebd0530 SHA512 8ea71571d234394054be7b6b080db23726b97440f2a98813c27cc19bdb6faceb95ca7f78b2bc435ddf991c02fe5b3a425806658103cd0e61534a31386f9f10ba
diff --git a/media-gfx/apng2gif/apng2gif-1.8.ebuild b/media-gfx/apng2gif/apng2gif-1.8.ebuild
index 83fb20c4a942..fdd53201bacd 100644
--- a/media-gfx/apng2gif/apng2gif-1.8.ebuild
+++ b/media-gfx/apng2gif/apng2gif-1.8.ebuild
@@ -1,24 +1,22 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
-DESCRIPTION="create a GIF from an APNG"
+DESCRIPTION="Create a GIF from an APNG"
 HOMEPAGE="https://sourceforge.net/projects/apng2gif/"
 SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-src.zip"
+S="${WORKDIR}"
 
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="media-libs/libpng:0="
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-makefile.patch
diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest
index 5b4e4173bf75..4364049bf0c3 100644
--- a/media-gfx/opentoonz/Manifest
+++ b/media-gfx/opentoonz/Manifest
@@ -1,3 +1,4 @@
+AUX opentoonz-1.6.0-gcc13.patch 1152 BLAKE2B 931f7c7f5a98e53fdd93fa86c55fa6dcaaf8d6dbb51634439370e00444ba8d5e6cceeff9bc81289dfafee24153432124e62c54a80d31f82f2af1f3073a5d1364 SHA512 3862135ecaf850bad8bf8ad09c3f25ca5d00201acf98549cc68a2f3c5cf8b3db99369a61d9bf4a28761dee67043d9e5b961fcaa272d8ff1b3a4ef4fbdfe5a57b
 DIST opentoonz-1.6.0.tar.gz 55011226 BLAKE2B e7e27d530ee8356071d38bb3d58de89edcdc6e7e0b28cdb9ba8f7681eda929e13211664a5502499aa3eccfcf090ad81970e9caef365e762b53b7a57f19310afe SHA512 5ee7b724d51f058867d2c7e9c540e68ee3cb6d1350e32c5fd817b10b92ad79cc2a106d36dccc9234503e62788903e6058841dcd8dc39450c889393d0300636e9
-EBUILD opentoonz-1.6.0.ebuild 1964 BLAKE2B 6afa50e8c6b720d2ce925c7f9f1fc8a7979fc92b3a758daa49cadf4ce4913dd2945cfa2c75dff3c12649f540af3fd38c36eeb520cc0fa4a78756a37e53512dae SHA512 e8c0dba3ee7d940d47d6efe8b7ea7fc8aa04b9399d3f15155dbaa745f7cec9787772bae2156db77e565b100b7ce6b66bc7cc3c89ebd96dcf9dd88861b5fed4f3
+EBUILD opentoonz-1.6.0.ebuild 2016 BLAKE2B b35ec70960dd2c28aaf5251caab031b76dc2cbcfb08f9897c8e8b9a5ab861ab76fc76a0ea611d1a45dcf0e7c10fe95c1785f31280c7c0c7b82701376f29c1cc4 SHA512 4ab0f301e677416cc6fb09683d919196436d4fdbeed14f1c053e43c1d1dea7025091ff834cf75cccef2b64b1e4185dd5c40c72102d998f5240adcdb7ed149cfd
 MISC metadata.xml 484 BLAKE2B 3850af092b035bf6ef637fcf1d09fa79526011ab3629a6e918f952bba06de73b21a0ca3dcb2e6532faaab444404d3e767bff25d59c042650a4ab9b356c1f5a2e SHA512 5daa54628d2d677dc10934d3d43b1df1972f5515461bdaaa0684d4f9f26fb2b065f3fa64a3f0eed8403570ab64a919b7831269dcc68638b7da2e3d40730c01dd
diff --git a/media-gfx/opentoonz/files/opentoonz-1.6.0-gcc13.patch b/media-gfx/opentoonz/files/opentoonz-1.6.0-gcc13.patch
new file mode 100644
index 000000000000..cd9f936f4a88
--- /dev/null
+++ b/media-gfx/opentoonz/files/opentoonz-1.6.0-gcc13.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/899748
+https://github.com/opentoonz/opentoonz/issues/4738
+https://github.com/opentoonz/opentoonz/pull/4739
+
+From d28d005d2a8fcb81461516a37e30526063aba448 Mon Sep 17 00:00:00 2001
+From: Grillo <11585030+grillo-delmal@users.noreply.github.com>
+Date: Mon, 6 Feb 2023 20:48:32 -0300
+Subject: [PATCH] Clarify size_t origin for tgc::hash::BucketNode
+
+--- a/toonz/sources/include/tcg/hash.h
++++ b/toonz/sources/include/tcg/hash.h
+@@ -21,6 +21,11 @@ class hash {
+   typedef T value_type;
+   typedef Hash_functor hash_type;
+ 
++  struct BucketNode;
++  typedef typename tcg::list<BucketNode>::size_t size_t;
++  typedef typename tcg::list<BucketNode>::iterator iterator;
++  typedef typename tcg::list<BucketNode>::const_iterator const_iterator;
++
+   struct BucketNode {
+     K m_key;
+     T m_val;
+@@ -34,11 +39,6 @@ class hash {
+     ~BucketNode() {}
+   };
+ 
+-  typedef typename tcg::list<BucketNode>::size_t size_t;
+-
+-  typedef typename tcg::list<BucketNode>::iterator iterator;
+-  typedef typename tcg::list<BucketNode>::const_iterator const_iterator;
+-
+ private:
+   std::vector<size_t> m_bucketsIdx;
+   tcg::list<BucketNode> m_items;
+
diff --git a/media-gfx/opentoonz/opentoonz-1.6.0.ebuild b/media-gfx/opentoonz/opentoonz-1.6.0.ebuild
index 455a47d16a18..7e44462107c5 100644
--- a/media-gfx/opentoonz/opentoonz-1.6.0.ebuild
+++ b/media-gfx/opentoonz/opentoonz-1.6.0.ebuild
@@ -50,6 +50,10 @@ DEPEND="${RDEPEND}"
 
 CMAKE_USE_DIR="${S}"/toonz/sources
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-gcc13.patch
+)
+
 src_configure() {
 	# bug #859778
 	append-flags -fno-strict-aliasing