gentoo auto-resync : 22:12:2022 - 01:55:45

9 files changed, 62 insertions, 98 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 8baf00e6f15e..470cbe9fe804 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 5dfddfb97f55..32e7c03eeb08 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,4 +1,5 @@
+AUX 3.12.2-libraw-0.21.patch 2037 BLAKE2B c70fce8223c08c4bb9dafa5c03251314a30e28aa0ce51672f8677fcd55451c29a96f9c92ad3fc383a867435737069e07a701a30dbc2ecbc6b1cdcf69a1a3d8c5 SHA512 eb8b83ca35612abf8433f1ad87b0e50defe4ed3dff3140c6de95df79842f5ecc1f6620d935cdf087a1fd3dd9efc035a2d36c21953f876a7f33933b386d5a6240
 AUX 3.12.2-link-with-x11.patch 419 BLAKE2B f13fc6aead441d83ba55fafd3528a96691c18bca894c5aed6f8e6e1a9084059ec1843668ef8f76697a866979de4d2aaed944ca1729dd6f49d0aa1af316ecb7cc SHA512 667aed7e8dae78b19e0df37ca7f03b565d87a2ffa05a8ef3e3460c3cc491c263ba29781b0659c9a57595e735d38d27ae78f37898011189514ff6a1c237d2b1bb
 DIST gthumb-3.12.2.tar.xz 7585700 BLAKE2B 9fb4fd934975fb775b82cf17028abd6d4ac3c31ee30458c377d36d3af97e59218e621d09768eebec096c64e3d01697bd3080409fd2191c2af29d84c9b53508c1 SHA512 5304b5cfefa4ced6a244db5a6e2880dad4f5a598654c9ea6c7707ddc0a766bdfa108f827a74e400168dbc338e35db519fffb7ac7382e0ee564771d56af3ac97c
-EBUILD gthumb-3.12.2-r4.ebuild 2652 BLAKE2B a41952e340a9bd5d0c75c808a3eb8dc88a21ece0906626bc426ec93e106f744c02b8c58162bdc1709a911f7a463aa5eb8819e353b875853d7bf89b1ad56c49ea SHA512 053b68ec83e7bca0f8b9fa320e753c41eef18bf9e98e7d8cd174d4480b67e89914b55eb0431ad899fd141d6cbc00008143495fd38d38c72c31ab6d20b6365f1d
+EBUILD gthumb-3.12.2-r4.ebuild 2691 BLAKE2B dbe19dcdb90f914d3b40c8d54661ff43b427080b7204f15c9d5eaabc5ee83aa91946b49ad6e909ff1818d16857d0b5454b31713e1b3a93fa844e82263d1ea1f4 SHA512 d2bd2a51629fc11339e6d472025ec4414da3f52be0d8af2b8f456cc9fe1d80d2800d36031db5c92ca528ee0fdbe59370ad49082adb67a36fb5c45ca604d60b2d
 MISC metadata.xml 713 BLAKE2B c66bef72062d57003de32cdd78ace96eb94cdf99ff488c4f9a84df450ca4753cace58656925ae1632d6ea4e32b460afbdd2fb9a20996a3e2d0014d8938415972 SHA512 f2895a3f2d081a11d8a83982b733a1f74fa51dae3e09fdadfdeebd7ee4db27a4cbdecab9e8d5814bd5044b4425a6e0e6db7481d4e75da90ed0b98ee8b3168b1e
diff --git a/media-gfx/gthumb/files/3.12.2-libraw-0.21.patch b/media-gfx/gthumb/files/3.12.2-libraw-0.21.patch
new file mode 100644
index 000000000000..4fef16dc9843
--- /dev/null
+++ b/media-gfx/gthumb/files/3.12.2-libraw-0.21.patch
@@ -0,0 +1,55 @@
+https://bugs.gentoo.org/887769
+https://gitlab.gnome.org/GNOME/gthumb/-/merge_requests/42
+
+From 2133520496afd179702953a5d07aa99b5209f9cf Mon Sep 17 00:00:00 2001
+From: Chris Mayo <aklhfex@gmail.com>
+Date: Wed, 21 Dec 2022 19:21:12 +0000
+Subject: [PATCH] raw: make compatible with LibRaw 0.21.0 release
+
+Memory error callback removed
+https://github.com/LibRaw/LibRaw/blob/979160ff13/Changelog.txt#L127
+
+Typo in LIBRAW_OPTIONS_* flag names fixed
+https://github.com/LibRaw/LibRaw/blob/979160ff13/Changelog.txt#L170
+--- a/extensions/raw_files/gth-metadata-provider-raw.c
++++ b/extensions/raw_files/gth-metadata-provider-raw.c
+@@ -62,7 +62,11 @@ gth_metadata_provider_raw_read (GthMetadataProvider *self,
+ 	if (!_g_mime_type_is_raw (gth_file_data_get_mime_type (file_data)))
+ 		return;
+ 
++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
++	raw_data = libraw_init (LIBRAW_OPTIONS_NO_DATAERR_CALLBACK);
++#else
+ 	raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
++#endif
+ 	if (raw_data == NULL)
+ 		goto fatal_error;
+ 
+--- a/extensions/raw_files/main.c
++++ b/extensions/raw_files/main.c
+@@ -213,7 +213,11 @@ _cairo_image_surface_create_from_raw (GInputStream  *istream,
+ 	size_t         size;
+ 	GthImage      *image = NULL;
+ 
++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
++	raw_data = libraw_init (LIBRAW_OPTIONS_NO_DATAERR_CALLBACK);
++#else
+ 	raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
++#endif
+ 	if (raw_data == NULL) {
+ 		_libraw_set_gerror (error, errno);
+ 		goto fatal_error;
+@@ -300,7 +304,11 @@ _cairo_image_surface_create_from_raw (GInputStream  *istream,
+ 		if ((original_width != NULL) && (original_height != NULL)) {
+ 			libraw_close (raw_data);
+ 
++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
++			raw_data = libraw_init (LIBRAW_OPTIONS_NO_DATAERR_CALLBACK);
++#else
+ 			raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
++#endif
+ 			if (raw_data == NULL)
+ 				goto fatal_error;
+ 
+-- 
+GitLab
diff --git a/media-gfx/gthumb/gthumb-3.12.2-r4.ebuild b/media-gfx/gthumb/gthumb-3.12.2-r4.ebuild
index f7c6ddec1cc9..9b101beaf8d0 100644
--- a/media-gfx/gthumb/gthumb-3.12.2-r4.ebuild
+++ b/media-gfx/gthumb/gthumb-3.12.2-r4.ebuild
@@ -69,6 +69,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-link-with-x11.patch
+	"${FILESDIR}"/${PV}-libraw-0.21.patch
 )
 
 src_configure() {
diff --git a/media-gfx/igal/Manifest b/media-gfx/igal/Manifest
index b814a4e81e50..14862e58d9e4 100644
--- a/media-gfx/igal/Manifest
+++ b/media-gfx/igal/Manifest
@@ -1,5 +1,3 @@
 DIST igal-3.1.tar.gz 29372 BLAKE2B bb83a13b082d4d94b0ff186ef34e9c670b5a49ba74ccd40675db6820931132697b886e58db9da7e620322fdb29a59437acd817d6ef69ea4cebdaa408d1fbe567 SHA512 28f036a5450d05c2d795355f52e0e3f5720d94e5e9d82d4b6bd53ff8ce5ea08352e3ec85ddbcca754e986a06fd205b1667b102981484c783add4496c50c102fe
-DIST igal2-2.0.tar.gz 27206 BLAKE2B 64683d32d0fc3c16d4e27f6dcd1acb3d1e1b55de8e4362065bda9b9b27e6d54409e115af46da2505dfe79f00e5004ebfb395dc4fe71d91b557c43a0c4d4f01e1 SHA512 663bc4f05fbb226c55c3304126ceb480f050715499a2849567ad1d33da568ed02f85b64ad176f6e1cb1c99c8f50650676a7323f0d0497880802a245274a77a0f
-EBUILD igal-2.0-r1.ebuild 873 BLAKE2B 044dbb37ce303cd88754f29c59f22dbff42d528f84df0d6dd7b3593092f4f86ea87ca90bc3e03e5c882069783eb3b12b4c9f017179f7c1b1582b7084bb624299 SHA512 00d0181d625e5d801c7e4da3fdcad6adbf2599a937586dcdc38f8a0da3f4e9abea462fa96961e96d6089e0cd5c982c20cca90d92f5504c897d762cf8c2eb1f20
 EBUILD igal-3.1.ebuild 943 BLAKE2B 3c54eb77a65145f013af10a26a94664aa9561763fa1d47e0df97cf7b8e28003c9a4b1d29e6c676d5fb8df1e09bfae9ebf6cb507e2be4b94a5e5049829da306e7 SHA512 9fa947d7e95c8814576642e3d74c145cf2356a64caa6e73aa1a39a59a35781bd0213251bab207b8a1fe0af54f1a68c13147fe23448d7a8bfc0db0df42e848e48
-MISC metadata.xml 424 BLAKE2B b23a44dc7349f80162b9ba66db70da14b3eebd76d33aaccaea95b944f58d96eba754710354901b711b6a5d58d631486b22b5bd5a715d913e16fb255e663793d3 SHA512 dfea71b53cc223a91d5dea1ac7cead82d3b2e63cd242f2d192c79747d88ebbea9e08758bc7e31aa3958fa81eb79ff91977ffc7fbf8f12f353c97ceb949df5489
+MISC metadata.xml 500 BLAKE2B 50fa9ff754f053fa91db809979df2795378981c629800d1251c6dbb87df4fc8349bed04528a22e8002a611beb12133950901fdc7cd90dc3c7e784695e57aec6b SHA512 2960a7bf9f00a0da16ad7ee6ba5b049c7386c7c6abd44dc902944ca41d2e55e2022cdb95a694dd9015f67fc7315224f4b2ce14c75b4c802d99870933515ac2ff
diff --git a/media-gfx/igal/igal-2.0-r1.ebuild b/media-gfx/igal/igal-2.0-r1.ebuild
deleted file mode 100644
index 233dd6c64dce..000000000000
--- a/media-gfx/igal/igal-2.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=${PN}2-${PV}
-
-DESCRIPTION="Static HTML image gallery generator"
-HOMEPAGE="https://igal.trexler.at"
-SRC_URI="https://${PN}.trexler.at/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="
-	dev-lang/perl
-	virtual/imagemagick-tools
-	virtual/jpeg"
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -e "s:/usr/local/lib/igal2:/usr/share/igal2:g" \
-		-i igal2 -i igal2.1 || die
-	sed -i -e "s:/usr/local/bin/igal2:/usr/bin/igal2:" \
-		utilities/igal2.sh || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	dobin igal2 utilities/igal2.sh
-	dosym igal2 /usr/bin/igal
-	doman igal2.1
-	dodoc ChangeLog README
-	insinto /usr/share/igal2
-	doins *.html tile.png igal2.css
-}
diff --git a/media-gfx/igal/metadata.xml b/media-gfx/igal/metadata.xml
index ea3db2787b18..39c6f34b0f9c 100644
--- a/media-gfx/igal/metadata.xml
+++ b/media-gfx/igal/metadata.xml
@@ -7,4 +7,7 @@
 		picture show (static HTML slides, thumbnails and index page) with just
 		one command line invocation in a Linux or Unix environment.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">solbu/igal2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index 29289d198748..a75e20f7f53f 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -4,8 +4,6 @@ AUX xfig-3.2.6a-urwfonts.patch 4933 BLAKE2B eb1edf6b30966864dbdf3e932f2cde231ff5
 AUX xfig-3.2.7b-ghostscript.patch 615 BLAKE2B 374bf50e43980ce3de7e60bdc0ddad5ded9306dfff137e2b644ed21dd201c34ab5b2c3ae57eaf102585333321e217a9d09936db247592b0d559f6bc5744235ad SHA512 7343433ce589495dcf653df678bf364d190dad28bd49d4608d589ab9fe6e385ac0c1e3ca040dacf75503dce9441fb741500cbb1143e248fe1893542c970e7d86
 AUX xfig-3.2.8b-Fix-build-with-flto.patch 1577 BLAKE2B 538e4db451dab09dadb96563f23d43f420a67e59ec2e4f52aff2d274b614bd7806492270bcffebe5c8c1e10394c2dbdb05cc16f92124217fea27014a34a61caa SHA512 3a89b8aa93ae3ff13cf6478d2c85e44519560df7e18bc3f15799c31cc0248dd7c01e510a0f2b8516ba57d9dda4e37c3d0eb04fcdbf90ed402a881b516e7fbb2f
 AUX xfig-3.2.8b-app-defaults.patch 508 BLAKE2B 1d36345fd7b203a7dff8b13a73ae5abf298fc3b7ecfdfbc74068c626002c4b09d9278bafa5ed2b062757097b5fceb75e2baa4f5d6e7bc00505114b147f7bd893 SHA512 fb2e9113740dd93e25d9fbe0afea10538660059318eec0794d300a8fc5c8c9cda9a29302c2d5f285c38a5927994a96b96b68fb231f0f668ba1490fe87b888643
-DIST xfig-3.2.7b.tar.xz 5059984 BLAKE2B a22465e16019e9887e302ea308e250ad5d7ba0c49aec8f554a73d3b4489d803a05041cb7d267c543a7c0d3b78eac25077c628283f82767932afcc9d9750ce883 SHA512 f3396ebf8a5961909e58b05b60117fd7bbc8c24fabbd47f108eaea9586f4180af572faffe077b1a5dcbf669ebd69b1c2791f302c126dea62a44aa1592de66f73
 DIST xfig-3.2.8b.tar.xz 5382524 BLAKE2B 94963d165664c6451776fcbc3e332a7933c00d4b43e3d4196f15883a9873171f7a0791e6fa41cbb6e8d07958f9ddcceb9578a62a9893cf2f436c07dcbe3e7f37 SHA512 5cc5e61977f97956baca77bf4bce09d0f47ea6fafb10055d0523f7cccd72d7af80e706daa62ae16df3fc54338b4f6cd4a6b71dc460311e65be749ec84fa662b3
-EBUILD xfig-3.2.7b-r3.ebuild 1281 BLAKE2B 079eb43d9f1e771c69c11f7b9b75dedf929b52258d298154cb87ebd60772132e089e219f3acfa138a3f03110b6de13c656d81b009cce82362650d279ccb3db81 SHA512 93e6e35b336d8f365c62adad0f46183bc6c36128fe23e52435d45891ecdb91579496ec086e847297d1305ddba9e98668b3c0b4faaffac6c9af2edd2a13fb6a9d
 EBUILD xfig-3.2.8b-r1.ebuild 1312 BLAKE2B 149ba4c6bf77fcdfdf0c4a71c9b88fffc3d900b6565897d7793fa7cde1c2a57485dad521b71b8cb1d4e413d5a740e09804b8448d86ca7fed3290d264c412349b SHA512 5dd810075dd68636de593c66242761270d877f7d10575934610ea675873526f6330997e67a42775d61fedddbe56ee9dc7f414c24dd70b9772b2134a54601b256
 MISC metadata.xml 239 BLAKE2B 7318d5b7bc5c4e143cab638973eb637b4d3b5e7d8ff039231251371b0574f12e318412fd306c2bcf7b6b3d5b04a7b103ca5e74c4f8088f944fa79b15f271a51f SHA512 f6816d8f304e955fa8f8e188f0ea7f0e20c2a13f19e5f5832d1e7ec7dda03c644196b762e5b76de6c19efc02fbafc4fc7add41627d36bcce537f7ec877a0ce3b
diff --git a/media-gfx/xfig/xfig-3.2.7b-r3.ebuild b/media-gfx/xfig/xfig-3.2.7b-r3.ebuild
deleted file mode 100644
index 4f24ee215a3e..000000000000
--- a/media-gfx/xfig/xfig-3.2.7b-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window"
-HOMEPAGE="http://mcj.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/project/mcj/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="jpeg nls postscript"
-
-RDEPEND="
-	x11-libs/libXaw
-	x11-libs/libXaw3d
-	x11-libs/libXi
-	x11-libs/libXt
-	media-libs/libpng:0=
-	media-fonts/font-misc-misc
-	media-fonts/urw-fonts
-	>=media-gfx/transfig-3.2.5-r1
-	media-libs/netpbm
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	nls? ( x11-libs/libXaw3d[unicode(+)] )
-	postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.2.6a-urwfonts.patch"
-	"${FILESDIR}/${PN}-3.2.6a-solaris.patch"
-	"${FILESDIR}/${PN}-3.2.6a-app-defaults.patch"
-	"${FILESDIR}/${PN}-3.2.7b-ghostscript.patch"
-)
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable nls i18n)
-		$(use_enable jpeg)
-		$(use_with postscript gs)
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}" # it expects docdir...
-	)
-	econf "${myeconfargs[@]}"
-}