gentoo auto-resync : 11:10:2023 - 00:10:45

7 files changed, 21 insertions, 89 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 3d0a3024f399..f7fe1f4f5c2a 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/realesrgan-ncnn-vulkan/Manifest b/media-gfx/realesrgan-ncnn-vulkan/Manifest
index b1f162362bca..14fe253a29ba 100644
--- a/media-gfx/realesrgan-ncnn-vulkan/Manifest
+++ b/media-gfx/realesrgan-ncnn-vulkan/Manifest
@@ -1,5 +1,5 @@
 AUX realesrgan-ncnn-vulkan-default-realesrgan-x4plus-model.patch 1479 BLAKE2B 9d34821ed2af85ba048c9a9c9abae3c40b0568c723fec0db95b3a84f706a69ef2fddf31a3e613adb9d06481616b2f3681b304e77c205c4563a6ae315b6bac6bf SHA512 541dc5ae5c657caceb3e0a248428eeeb8fce58c52f8c43cfaeab47171a86532547ecbf6773faa2634be2934a659cdb913a0898f9d6a2db900baca292b073ca59
 DIST realesrgan-ncnn-vulkan-0.2.0.tar.gz 138744 BLAKE2B ec74388e789efbf6ea82a88428ff5745aa65d38b3d490b80858f91e21ff0f50333f791dadf2a626a4bee1ca88c808e41a413afce1f85d5a82aa824ecab673838 SHA512 5c845ad2fbea45eba1899582f3ca69bea679107cc4b3c49a94649b5a954117269a5b7d65ffeb8943531c71fff2ca749c06d0e3e0fd9c155ad3196f48c548d7cd
 DIST realesrgan-ncnn-vulkan-models.tar.xz 69216524 BLAKE2B ed9a1f019a48b81828221eb1cad38d0a710dfae15a13729276b040aed33bba0d326906fb0e9e162ce0ea4dc6f1bbcae92c08c4479fc3b09e854c2d5718b62c04 SHA512 4ac10f031688b18ac0920a0d848520a1fe4818a4141914ab4f4d36505abb271f4dbc538b41c3bc34586d7485773d86df2446c4af41f6d00cf4b140975ce21eda
-EBUILD realesrgan-ncnn-vulkan-0.2.0-r1.ebuild 1293 BLAKE2B 6d99a04669faab1258893517b64f7b3a03d7b2f626a9f569d3a156eedab667b895e1835141673e509dff61359f1c8d3f345a2e7fffa0d011940eb9ec9ccbc8c6 SHA512 c03f33ffcb59cc432fb6512317cdeca555075c0ae182ae1b8cf6e60ad5b1477df0b7ca3a40d84d02acc4f5472318f700b1f3c32a9001a2eb957a044931548741
+EBUILD realesrgan-ncnn-vulkan-0.2.0-r1.ebuild 1282 BLAKE2B 191ea0b7d1302a0fa6744c3843823c5ba824dfca69ac7db3fa8ca3792bbbba1e4f882f832c1340417c8f3002937a4bd4ce668f696478d3da9ef41fbc15f2d5ce SHA512 742d93ad0cb52d2c0e23439d0c31a15be49c20ca98cb1b82407d0e109c758abbea6352e9e91c9c91423c28ed702c16860cf89a63ed6502dbd70009be762c3934
 MISC metadata.xml 342 BLAKE2B 04b8955b1e0c980600685a6748eb4173cae733c9aeeb705c58119ede5d47b7552a81813baa21f6d49b8dc9453f4240dc77bf0a077810600d19b36b9a6f58c4f8 SHA512 9bc43c6ff21c64facfce322777ceac1422cc444e9bf3c97036ddc85d51b180c847803417a9c96d709cfff03b586ed92d1f55af04d495f1b692bedd39b925ce1c
diff --git a/media-gfx/realesrgan-ncnn-vulkan/realesrgan-ncnn-vulkan-0.2.0-r1.ebuild b/media-gfx/realesrgan-ncnn-vulkan/realesrgan-ncnn-vulkan-0.2.0-r1.ebuild
index 56946abc7263..6a38c35e4cc2 100644
--- a/media-gfx/realesrgan-ncnn-vulkan/realesrgan-ncnn-vulkan-0.2.0-r1.ebuild
+++ b/media-gfx/realesrgan-ncnn-vulkan/realesrgan-ncnn-vulkan-0.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,38 +8,40 @@ inherit cmake
 DESCRIPTION="NCNN implementation of Real-ESRGAN"
 HOMEPAGE="https://github.com/xinntao/Real-ESRGAN-ncnn-vulkan"
 SRC_URI="
-	https://github.com/xinntao/Real-ESRGAN-ncnn-vulkan/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${PN}-models.tar.xz
+	https://github.com/xinntao/Real-ESRGAN-ncnn-vulkan/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}-models.tar.xz
 "
+S=${WORKDIR}/Real-ESRGAN-ncnn-vulkan-${PV}
 
 LICENSE="MIT BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-libs/ncnn:=[vulkan]
 	media-libs/libwebp:=
-	media-libs/vulkan-loader"
+	media-libs/vulkan-loader
+"
 DEPEND="
 	${RDEPEND}
 	dev-util/glslang
-	dev-util/vulkan-headers"
+	dev-util/vulkan-headers
+"
 
 PATCHES=(
-	"${FILESDIR}"/"${PN}"-default-realesrgan-x4plus-model.patch
+	"${FILESDIR}"/${PN}-default-realesrgan-x4plus-model.patch
 )
 
-S="${WORKDIR}/Real-ESRGAN-ncnn-vulkan-${PV}"
-
 src_prepare() {
-	rm -rf "src/libwebp" "src/ncnn"
-
 	CMAKE_USE_DIR=${S}/src
 	cmake_src_prepare
 
 	# Update all paths to match installation for models.
 	sed "s%PATHSTR(\"models\")%PATHSTR(\"${EPREFIX}/usr/share/${PN}/models\")%g" \
 		-i src/main.cpp || die
+
+	rm -r src/libwebp src/ncnn || die
 }
 
 src_configure() {
diff --git a/media-gfx/ueberzugpp/Manifest b/media-gfx/ueberzugpp/Manifest
index ad3b0bd05130..78c43873201d 100644
--- a/media-gfx/ueberzugpp/Manifest
+++ b/media-gfx/ueberzugpp/Manifest
@@ -1,5 +1,3 @@
-DIST ueberzugpp-2.9.1.tar.gz 65961 BLAKE2B a7aa8536d15d992004ffd783b0b87ec57528b4a6b6e24d0d63588d74436e055d1ed37d36683f663c35809d6e84b7b9dca11c660c64a11c9ca0125cae0dfba2a3 SHA512 a1dadf4cbbd602edbff88855289b6d4a75093fa7d6130c90affb2c54ca71866d73b0d2be3acaa40c1459165609f08511ffb507e0ee7ae09363c97d69a4bad879
 DIST ueberzugpp-2.9.2.tar.gz 66310 BLAKE2B cef413922765f10cea65616c935e67b8a7c86d51f04be5a7383cc009dc238005ffa68638a7099f3c6dcf1a9a4bb3d874806e5ea90cabc53939da499692e5de82 SHA512 560a61a861eea7cd33b9a97819a9d97f2b8686640d366152cdfb677ee7d8e094e21ace923e9c83ef2a71a672df6e7d286633fc48da5f3e546d130d40723e0dde
-EBUILD ueberzugpp-2.9.1.ebuild 1520 BLAKE2B 8167a370dd6acb6915a95963ecc2361d77620f9a360b4a7182664cc5a8aeecea22f559b3c06b45eaea4f96b80e646a1f9780381097e252c33b299cbed225fa00 SHA512 d245ff16e09604273f7f79a33a30dfc9d70b17025b01f285145584e36cee0c287a152ffa3c8215ba1a8a9ac4fd40e028b852d8e544ad30789b00e80c19404ea9
 EBUILD ueberzugpp-2.9.2.ebuild 1520 BLAKE2B 8167a370dd6acb6915a95963ecc2361d77620f9a360b4a7182664cc5a8aeecea22f559b3c06b45eaea4f96b80e646a1f9780381097e252c33b299cbed225fa00 SHA512 d245ff16e09604273f7f79a33a30dfc9d70b17025b01f285145584e36cee0c287a152ffa3c8215ba1a8a9ac4fd40e028b852d8e544ad30789b00e80c19404ea9
 MISC metadata.xml 694 BLAKE2B e39b88b981e8c6d55a41714197b03c014a6ffd95522eb0ff92559a178b193419bd587903c75271167fba097593ac15ecacdba3b0f23e7859c3f1fd9569b4f6c2 SHA512 e86e8942c84ec38c198b513b0eaf63d522017665d559a1843c08030ec6bc6a32d7f32651d5b283e3d82784b81ea15b7d81889ab0c68850f88733ae90add17060
diff --git a/media-gfx/ueberzugpp/ueberzugpp-2.9.1.ebuild b/media-gfx/ueberzugpp/ueberzugpp-2.9.1.ebuild
deleted file mode 100644
index 828290c2ec13..000000000000
--- a/media-gfx/ueberzugpp/ueberzugpp-2.9.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Drop in replacement for ueberzug written in C++"
-HOMEPAGE="https://github.com/jstkdng/ueberzugpp/"
-SRC_URI="
-	https://github.com/jstkdng/ueberzugpp/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="X opencv opengl wayland xcb-errors"
-REQUIRED_USE="xcb-errors? ( X )"
-
-RDEPEND="
-	dev-cpp/tbb:=
-	dev-libs/glib:2
-	dev-libs/libfmt:=
-	dev-libs/openssl:=
-	dev-libs/spdlog:=
-	media-gfx/chafa
-	media-libs/libsixel
-	media-libs/vips:=
-	X? (
-		x11-libs/libxcb:=
-		x11-libs/xcb-util-image
-		xcb-errors? ( x11-libs/xcb-util-errors )
-	)
-	opencv? ( media-libs/opencv:= )
-	opengl? ( media-libs/libglvnd )
-	wayland? ( dev-libs/wayland )
-	!media-gfx/ueberzug
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/cli11
-	dev-cpp/ms-gsl
-	dev-cpp/nlohmann_json
-	X? ( x11-base/xorg-proto )
-	wayland? ( dev-libs/wayland-protocols )
-"
-BDEPEND="
-	wayland? (
-		dev-util/wayland-scanner
-		kde-frameworks/extra-cmake-modules
-	)
-"
-
-src_configure() {
-	# TODO?: wayfire plugin is skipped for now (needs wlroots which is
-	# likely to be messier), but could be handled if there is a demand
-
-	local mycmakeargs=(
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_TURBOBASE64=no # not packaged
-		-DENABLE_WAYLAND=$(usex wayland)
-		-DENABLE_X11=$(usex X)
-		-DENABLE_XCB_ERRORS=$(usex xcb-errors)
-		-DFETCHCONTENT_FULLY_DISCONNECTED=yes
-	)
-
-	cmake_src_configure
-}
diff --git a/media-gfx/waifu2x-ncnn-vulkan/Manifest b/media-gfx/waifu2x-ncnn-vulkan/Manifest
index 740c46252bce..89f55ac7f9fd 100644
--- a/media-gfx/waifu2x-ncnn-vulkan/Manifest
+++ b/media-gfx/waifu2x-ncnn-vulkan/Manifest
@@ -1,4 +1,4 @@
 AUX waifu2x-ncnn-vulkan-20210521-no-lto.patch 600 BLAKE2B a4fa9601b48d103c15ed8e93658e633cb0d63f304a5d5ad9336f0b1cdc05e58001fa80cd4ab50cb688d50037560446dd051256617dae51578dabd110586f13ab SHA512 c6bc6b33b26c9d4dbe6728685c9ff68b2b7b8bd1afdeae1e0d3283bc292eb1ccc81d7ba0cd7baaccdf4b367876140ed939e84b0dfe63e1eb1c1100094265e333
 DIST waifu2x-ncnn-vulkan-20220728.tar.gz 34076924 BLAKE2B 6ed310d57af52286a288b151f67a989ac41f8e248b2ad5f05392781a429c9f0ff1d79e8816c8c464cb5686692c2b4fe5dc2d50c4fc713a4887d044ee3cfda199 SHA512 ea17cbbcb7318586793222c6c7139f67395c49c567b601969b829fc426eb517308509b7c1da69171fcbf8e68baa5cec3e52e98159e3c5e6c35ce47a8514dadb7
-EBUILD waifu2x-ncnn-vulkan-20220728.ebuild 1096 BLAKE2B 44d7249858ebca3b5b08cfdddc40ba14ec1ff97da8d91076209d7bebfcabbf0ed647886f366e4a2981ff14b4e92710d2ff01f712d5f148a5f67f15ef3a708438 SHA512 c205ed9c61a7f761615ed346ac9b7302421bc8b3b10346e7a7a0c3d98325abd3dfd8a806dc11ff0b2997072700ba702eecefd7a3e2a302100629b08174e767ae
+EBUILD waifu2x-ncnn-vulkan-20220728.ebuild 1097 BLAKE2B eccda35ac9815d03c96177700816463a29e84d701e22217b55120a54c2f4515bbb078938a673cbdf2315ef838b8a0bf1ecf2899f90be5f4a2de0c14b7654dac6 SHA512 99da1941014e2627b8479d7b1f1a4488f178e530cd3aa6e436fb4fb0c0cbf152782252c97aa95f76adb62ed7d38fb14c23024d2fcc04286fa4e70a7fc58408dd
 MISC metadata.xml 336 BLAKE2B 9ec633b675b5bef317783ecb8249fb8621728f29ed7b3cb064292f4ef7ff4176b819975b7353f976eb9ead35bbef6a000dd91cd7fa81f9d4fa5942fc15de4dba SHA512 af5220b2144e3d08778dbee6389eaf2e2e743f76064afce713fa96ff1f596af6559d7aabad097beff1b059c5230ce0943a84f01ccfdb4c41949ff717e6bdf832
diff --git a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20220728.ebuild b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20220728.ebuild
index 640620c62e2e..d67e89271687 100644
--- a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20220728.ebuild
+++ b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20220728.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,16 +11,18 @@ SRC_URI="https://github.com/nihui/waifu2x-ncnn-vulkan/archive/${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-libs/ncnn:=[vulkan]
 	media-libs/libwebp:=
-	media-libs/vulkan-loader"
+	media-libs/vulkan-loader
+"
 DEPEND="
 	${RDEPEND}
 	dev-util/glslang
-	dev-util/vulkan-headers"
+	dev-util/vulkan-headers
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-20210521-no-lto.patch