gentoo auto-resync : 20:12:2022 - 19:52:06

11 files changed, 34 insertions, 133 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 642ec07feba4..cfc081bce4aa 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 45674e9a6dd8..f01bfa096155 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,6 +1,7 @@
 AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc34064c659a3cf48d12a539c3029dd70f17b0b48a7398b68de6a937adff3af0c2d4a47d0f84fdc7746ec612fb05272d963f SHA512 f16885a72cd5f8f250b03903062c70190367ed409c2582d579bfb1e6ab09514df7f96214ce236e33bb8eec2f3872d887f9c3152f4e524b1719250a9064bf719c
+AUX krita-5.1.4-libraw-0.21.patch 1005 BLAKE2B e667bf866d00f3081f04be0cdddcc3fa291480c8a573a215c2e69ba1e0a823e7bf34ee65b37f1c662ffa0080dec2d588f37c1d9ccce1f609a2db1d3babdadeaf SHA512 9fd29dd0f05f8345f0ab01034808874c0938478f5aee4980ca65a6e09518f1e1b8e0d4a8a932d81b3fc4f7918f2eec0c3a8b1e3b45320ce8e4933286d8af5d83
 DIST krita-5.1.3.tar.xz 185166464 BLAKE2B 2fa93e06cd4b5b68016bc1af83464c3e44e1ece0e786734def030bf8e333086ed9d36b23d56dc8b742ceef85273b9d88d754286e85d2d1384ffc92a3592693fd SHA512 4025033cbbe48f2e0d52961320c08920691a3c5b48029c67560c3c28e699cec6a02432bc1ec706204b1f5f3199c7fc66e10c01607ce06b113211cae0194f5d88
 DIST krita-5.1.4.tar.xz 184969232 BLAKE2B 3452504c1ce973d0670508b143ee45d2a75fe72d87f1a3fdddd94a56c4b36f4a179e2a651a0663a04aab8e75484065a78140b3c8c51fda1215c14924a4895be5 SHA512 316b9333f416a4d8739a7201910069211d1da1b0f2eebfc48de08f6cf4736f3e7b8fa242bc97eebe8536e483c214cb584d459f26f8ce7bd10e36da467eb67446
 EBUILD krita-5.1.3-r3.ebuild 3499 BLAKE2B 1b5fd28250e8a81834b83e6437ecf5dd25cbcad0fb5390a4b47ce9cc07ca780f925a003d54c4c4b884b68f254f29b3601237344f063e3d65cb32b6df0c861b49 SHA512 714319672cb6ef5d9f03a18dda8d0cdff4249739d5a3292a2fedc98590570448e8d887a4d88def2bff9bb7f144a0ab5f694aff385b18867fea651a2c3fbd4616
-EBUILD krita-5.1.4-r1.ebuild 3473 BLAKE2B 92523c8760700b084a843a435ce206139d96545fc4cb01dd733e15a0c2c37a08c8d586805cdba399508029612634d92b284712a3e883515117493186b9a21241 SHA512 988e7790ca4ed649f4e7280e106cc6ae6a2eb63d82ffde4280bbd2cb5466a7de606f8f8ae681296d7039034ea2563950a5d43ee8248fade452266663a62e02ce
+EBUILD krita-5.1.4-r1.ebuild 3525 BLAKE2B 685760c68b9a85f162cee0bbcb41b0255843f5ce8ba10d181a01eef0846ed0a041aa1b14075f85141bde62ad23466080986b539be7ae7ddc2b805626ca24b675 SHA512 db8dc59540f24b4063d490c70e6c47d4a024e762d5bca2a71f530d5fd89bc7f7fee6597d499174496586c59d93d28b524e8ad5c71d549189cad7c2fdeb56843a
 MISC metadata.xml 836 BLAKE2B 65b987895464bd55fa59611396638b4826c858d3a0ad8cbe2f9b24dea7e32465b43974a967d2a766faa3128dd5ceb7a5b161a79ec3e179976d31478a2f52fbbb SHA512 a3b74e3f3de6500651308d4820e2d5e6504000085d634c561821bcd3f454aa1b89926a6ef9dac63378627e86d337b946e469af944dbd68e4a6349bfb8a76dc3a
diff --git a/media-gfx/krita/files/krita-5.1.4-libraw-0.21.patch b/media-gfx/krita/files/krita-5.1.4-libraw-0.21.patch
new file mode 100644
index 000000000000..9cdd0a9f8161
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.1.4-libraw-0.21.patch
@@ -0,0 +1,28 @@
+From e753d2453d1614b65b288e49fa5d5371764feaa8 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sun, 18 Dec 2022 16:28:38 +0100
+Subject: [PATCH] Fix build with libraw 0.21
+
+---
+ plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
+index dcaecc6fa7..71425f909c 100644
+--- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
++++ b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
+@@ -383,7 +383,11 @@ bool KDcraw::extractRAWData(const QString& filePath, QByteArray& rawData, DcrawI
+     d->setProgress(0.3);
+ 
+     raw.imgdata.params.output_bps  = 16;
++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
++    raw.imgdata.rawparams.shot_select = shotSelect;
++#else
+     raw.imgdata.params.shot_select = shotSelect;
++#endif
+     ret                            = raw.unpack();
+ 
+     if (ret != LIBRAW_SUCCESS)
+-- 
+GitLab
+
diff --git a/media-gfx/krita/krita-5.1.4-r1.ebuild b/media-gfx/krita/krita-5.1.4-r1.ebuild
index abf1cf77bf49..86ce7588ec21 100644
--- a/media-gfx/krita/krita-5.1.4-r1.ebuild
+++ b/media-gfx/krita/krita-5.1.4-r1.ebuild
@@ -85,7 +85,10 @@ BDEPEND="
 	sys-devel/gettext
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
+	"${FILESDIR}"/${P}-libraw-0.21.patch # bug 887473
+)
 
 pkg_setup() {
 	python-single-r1_pkg_setup
diff --git a/media-gfx/netpaint/Manifest b/media-gfx/netpaint/Manifest
deleted file mode 100644
index b9fcd2405eb4..000000000000
--- a/media-gfx/netpaint/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST netpaint-1.1.2.tar.gz 427241 BLAKE2B 7884dadf63849bf45caf84bc009da818bdf3277660411c486b32333bf0caf9e0e03ab6f56f77add68456896e4d16520b803c51e19c4dc6b01ef1227f0bd90a28 SHA512 f998714fe176c84074aaa710e2950c83d5c3ac0819e69c6bbbd93e19f6415a66f8ef21e0799d3112a7c468c1a99383a878ac1837157b079089aaf072c664ee53
-EBUILD netpaint-1.1.2.ebuild 711 BLAKE2B 7e4a5c5456c2124a8aa9738515711007a2a6ba9fce33afebccb5eac76aba85622067b575453a60ea576ded2f94c287640c80f8b11640b74f1329b8d334082f2e SHA512 83c1f6670c2a7f39ec7820421e7d78f56b4a884f1df1bbf03ffe29a2b2acb2dd1a412af1a183f1fa554d27077f405a8c74069c269e874b7234bff57358aa87ca
-MISC metadata.xml 414 BLAKE2B 3471f7a585441ffaa9cf1f78bbb557a04ba46d1704e77a0d387972963739e65a56ba08a521670ae009bc750523881f5b9c8f292a30aaad5e5a97da59315d81b6 SHA512 5bbeda40be60faa7d2409932dd62b1bd3f8b82c2944adfbf08b98685a863c40cf31867aad5083b58559e22a2289728d602488183ed3b05cc92e0a55bf43b158e
diff --git a/media-gfx/netpaint/metadata.xml b/media-gfx/netpaint/metadata.xml
deleted file mode 100644
index 65be4a236db7..000000000000
--- a/media-gfx/netpaint/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <maintainer type="person">
-        <email>monsieurp@gentoo.org</email>
-        <name>Patrice Clement</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>shell-tools@gentoo.org</email>
-        <name>Gentoo Shell Tools Project</name>
-    </maintainer>
-</pkgmetadata>
diff --git a/media-gfx/netpaint/netpaint-1.1.2.ebuild b/media-gfx/netpaint/netpaint-1.1.2.ebuild
deleted file mode 100644
index e44b6241f74d..000000000000
--- a/media-gfx/netpaint/netpaint-1.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-MY_PN="NetPaint"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="curses-based drawing tool"
-HOMEPAGE="https://github.com/SyntheticDreams/NetPaint"
-SRC_URI="https://github.com/SyntheticDreams/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	mv netpaint.py netpaint || die
-	sed -e 's#netpaint\.py#netpaint#g;' \
-		-i setup.py || die "can't patch setup.py"
-}
diff --git a/media-gfx/xzgv/Manifest b/media-gfx/xzgv/Manifest
deleted file mode 100644
index 0d23b6ce1b52..000000000000
--- a/media-gfx/xzgv/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xzgv-0.9-asneeded-and-cflags.patch 1002 BLAKE2B 7278103cadc14e2c52b9df5bddee761a757c363e7bfd46ebcfa83048b46ea0b0da19f8bba5380f535f92957b640ce977c207577db91fbf45104f012256608aea SHA512 b0afc6e73042bffc94f8fcdd83deff1dc182d5150a0b5da81ecead0ad5e2852c4aa4ce6be6e9334312ab9983df27af90fb9f81fc7529615a8e3d8c9de5ad47f9
-DIST xzgv-0.9.1.tar.gz 163419 BLAKE2B 6b97136a8e9b8228f849d5f905af6654a876b044e39dbacfeb01e89ac64d03920cd9f0bf17ff2e2ad4a59cb690d601db34488c72280fc0743799e7ed0c0288a0 SHA512 e57d0eb3f34bc63cb9f2d033856eefdeb6363ce55589b8bc52a8c253e211a4e36d3c0691b4559581d4052810fde445c6ec1832b964c40c5365c3869ce72f7361
-EBUILD xzgv-0.9.1.ebuild 677 BLAKE2B 7ffad5441432d8f944e23a2039656fdb21530537b8bf397aa8d14adb3290d23d91848748dc1991685eca45e51f7a756ec9031faf0c9673f1f6e7cae16c270de4 SHA512 e1d31ad4ad8ede88f11811fd3fb7f9099aec8b0e617cab925b95aee1d975bf4e13b76910023869713f2ef79c07ec0b9b3a7ac19a5755f3e9eb1e04d519873d62
-MISC metadata.xml 242 BLAKE2B 059aa8de0dc60bc8864b081011146b7171cc7508406cb9ff0c10a46b77fbdb1fdfb3261efaaf204faa28b9a702c23a0d109be0cbb13c724eb4e0f76d997bdf17 SHA512 af5bb53813e8dc456710169cffa1862c983978f09d950676a640bf961d3658d526a002586dc9546e714c86cafc5c10b1d494548577817f370c9d0601ba119c68
diff --git a/media-gfx/xzgv/files/xzgv-0.9-asneeded-and-cflags.patch b/media-gfx/xzgv/files/xzgv-0.9-asneeded-and-cflags.patch
deleted file mode 100644
index 344f283d7663..000000000000
--- a/media-gfx/xzgv/files/xzgv-0.9-asneeded-and-cflags.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-http://bugs.gentoo.org/500692
-
---- a/config.mk
-+++ b/config.mk
-@@ -7,7 +7,7 @@
- # This is likely to be what you'll want for most systems:
- #
- CC=gcc
--CFLAGS=-O2 -Wall
-+CFLAGS+=-Wall
- 
- # Set the awk interpreter to use for a script used while compiling.
- # (This should be a `new' awk, such as gawk or mawk.)
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -9,8 +9,8 @@
- # This gets definitions for CC, CFLAGS, BINDIR etc.
- include ../config.mk
- 
--CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0`
--LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0`
-+CFLAGS+=`${PKG_CONFIG} --cflags gtk+-2.0` `${PKG_CONFIG} --cflags gdk-pixbuf-2.0` `${PKG_CONFIG} --cflags x11`
-+LIBS=`${PKG_CONFIG} --libs gtk+-2.0` `${PKG_CONFIG} --libs gdk-pixbuf-2.0` `${PKG_CONFIG} --libs x11` -lm
- 
- all: xzgv
- 
-@@ -23,7 +23,7 @@
- 	backend.o
- 
- xzgv: $(OBJS)
--	$(CC) $(LDFLAGS) -o xzgv $(OBJS)
-+	$(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o xzgv
- 
- installdirs:
- 	/bin/sh ../mkinstalldirs $(BINDIR)
diff --git a/media-gfx/xzgv/metadata.xml b/media-gfx/xzgv/metadata.xml
deleted file mode 100644
index 2b146aacad21..000000000000
--- a/media-gfx/xzgv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">xzgv</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/xzgv/xzgv-0.9.1.ebuild b/media-gfx/xzgv/xzgv-0.9.1.ebuild
deleted file mode 100644
index 912f0a805616..000000000000
--- a/media-gfx/xzgv/xzgv-0.9.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Fast and simple GTK+ image viewer"
-HOMEPAGE="https://sourceforge.net/projects/xzgv"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-apps/texinfo
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P/.1}-asneeded-and-cflags.patch
-)
-
-src_compile() {
-	tc-export PKG_CONFIG
-
-	emake CC="$(tc-getCC)"
-	emake -C doc CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake PREFIX="${D}/usr" install
-	dodoc AUTHORS NEWS README TODO
-}