gentoo auto-resync : 12:05:2023 - 11:48:47

8 files changed, 139 insertions, 34 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 2144601a6312..8aafbb4e6b98 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/ueberzug/Manifest b/media-gfx/ueberzug/Manifest
index 241c1b890690..e5b05699b9fd 100644
--- a/media-gfx/ueberzug/Manifest
+++ b/media-gfx/ueberzug/Manifest
@@ -1,5 +1,3 @@
-DIST ueberzug-18.1.9.tar.gz 36411 BLAKE2B 96a925cc2212512dcbf05aa47015c2611f9f36bcf3dcf65d62dc6212c567165faeb798abff55b092f174fd57ff5740734dde74006af8cd7e974598813c8c3adb SHA512 ac28081a26ad025f8caf34d694c0b56efccaac376d7cd181ab7df3f3b435fd521a263defcd749bd3b2fff62cc3139e26054cccfe0fc76bd9cd2ccaaf34a7e0ed
 DIST ueberzug-18.2.0.tar.gz 56774 BLAKE2B cc843433ba01de1bfa65ac0bc5632094bd2b0a4dbc8d2638a21dceffb6f9019257b7116198802d822477c3e10c9d2a82c52d136697a58cbace01666b7188f20e SHA512 c2b93841c9d31b164dc23a841e4dc93d768c4a3b848fedbc56e4d80ec8a96c15af8d924948783da2bb57a42cd61320845d2a3d14899e156d06dc08713b42e5bd
-EBUILD ueberzug-18.1.9-r1.ebuild 720 BLAKE2B 1d7cb82565d9ba2942e1b30adf8c5e9329b9b425b267d66b6ad0d85eb61fc93a3cfd3bfd95cef264d905f99c0fab8f8c38cdd9cb85cb575912e61fb49e74165f SHA512 b3efe1f32166977d5792bcfffec5558f9d6341566d97d6e7cf4ab444462c67ecf9752298841147953f3d0f0e5e328056a675ed49e3b7e4cb604686896579cb63
-EBUILD ueberzug-18.2.0.ebuild 914 BLAKE2B e7b21d2ac666268b79c0874c8d6b1cf4a1cea050e36c26e3d14844309738203974aa3ba3557e02cb11dc86ebf69b4f2bfe7c53898852264306f269e5c2c83c4f SHA512 a93d6141d20b13f217703869fa3383d72b94a99318c5b5ddba220aaf7b858e511093f8c5b4b7c590d5e7616564c5d296d31ce795ccc79c49b3047e5e0c956a95
+EBUILD ueberzug-18.2.0.ebuild 937 BLAKE2B 87d1a7dba106276c0ff24551ac1e29c9b00abba671ca5cfa3759a92b56841f1d86a982f1ee718f65f00c0d44c94dae17e43e62ef4da169b264e30f0a0ae80596 SHA512 a4962867ac32efdf263c0537ad6d38abe07f8e83fcca7695ff70e4df7eb456532be69bcdf7b8e0f685f1df31a80955b2ef39ec97b99ce4cce5eb6ac61bd29ef3
 MISC metadata.xml 331 BLAKE2B 44d4e01eb445cdd5ecc879970295dccd3ba4c6d171d7e9cb41042200f5dc1ca01fc12b0c44c940d3e7045f5e44ad1ad4392125a62030bfd16edc3509a6689912 SHA512 b6ccd68127b77599f1008e595258583978523ebc200266eb234ec8732f914cc16d056fd84bec6feba5e455fade8ae7f963928e830c4a645c9b9a7c8b702eb4ac
diff --git a/media-gfx/ueberzug/ueberzug-18.1.9-r1.ebuild b/media-gfx/ueberzug/ueberzug-18.1.9-r1.ebuild
deleted file mode 100644
index 9d3012706040..000000000000
--- a/media-gfx/ueberzug/ueberzug-18.1.9-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
-
-DESCRIPTION="Command line util to draw images on terminals by using child windows"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	x11-libs/libX11
-	x11-libs/libXext"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/docopt[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/python-xlib[${PYTHON_USEDEP}]"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-base/xorg-proto"
diff --git a/media-gfx/ueberzug/ueberzug-18.2.0.ebuild b/media-gfx/ueberzug/ueberzug-18.2.0.ebuild
index ce363066903c..fb0b67e0a113 100644
--- a/media-gfx/ueberzug/ueberzug-18.2.0.ebuild
+++ b/media-gfx/ueberzug/ueberzug-18.2.0.ebuild
@@ -24,7 +24,8 @@ RDEPEND="
 	${COMMON_DEPEND}
 	dev-python/attrs[${PYTHON_USEDEP}]
 	dev-python/docopt[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]"
+	dev-python/pillow[${PYTHON_USEDEP}]
+	!media-gfx/ueberzugpp"
 DEPEND="
 	${COMMON_DEPEND}
 	x11-base/xorg-proto"
diff --git a/media-gfx/ueberzugpp/Manifest b/media-gfx/ueberzugpp/Manifest
new file mode 100644
index 000000000000..a7f3cd09042a
--- /dev/null
+++ b/media-gfx/ueberzugpp/Manifest
@@ -0,0 +1,5 @@
+DIST ueberzugpp-2.8.0.tar.gz 38768 BLAKE2B 80c879196339e3ce8fc5aeb2a87df8d3785021f72e5c0e47c55026d5cefc8cd3caa2174fea8413c642f54190970480488a6ec09d93e765b59dcf6616369dfbb7 SHA512 a5fceec97300cc3ada6c087fadc3b2d70f574207c5fd3f682c1a56b877c2b76ff40abe0ae76767e22ae82742be2bedee782e0ec86d200d28a15061bc1b4c2696
+DIST ueberzugpp-2.8.1.tar.gz 41270 BLAKE2B 249c10aafe33d83ceedd9632d2518fdbf724e07f49539704a6dd2ef0c3c942017c64b9ade3142cefa45ac19299176cd0a91b5a49f7467e2b04466e901b2a5c73 SHA512 d7f7e08a713c7e882f6de37f0d39913fdd6d3ca2c40e4520bac56a01cfcdbf6cc7095128602f15ec95b824b240e91ad231ac85fe651216708ba378ae5eeff7a1
+EBUILD ueberzugpp-2.8.0.ebuild 1238 BLAKE2B b10de4db4902c52b219d7229b62e20cc988b05cd653509972768bfdbd029dc015fd1e60ee96c98fbd6b7d3c61d24fb8edcd50576054f8019f7028da556a49c5c SHA512 c114375fb795459c74552ac407b72d0902152c9c24b7eefb2d854499392fdb65f3142992f9e7bef1ebd677e2b95045a0acffddbfdbe61b3717eb4ea41129f6d5
+EBUILD ueberzugpp-2.8.1.ebuild 1309 BLAKE2B bf9a43a9f4c05f7203339d809a45a93a7f2e14d87db534986b3b6093ff0cd1ceaa057f34299b480d73cc587fdfedff4031907b0ff8cb6eefd8801c55191f2ac4 SHA512 2ee570cd4fa446e899b52c5e5969ebd601acab0da904aeac6fe73a867888272416190b6e05636bf2c9d866bf9fa8fecb2de5f5e827954f74bbf545d72f6b824a
+MISC metadata.xml 466 BLAKE2B 1b66e3eafc1ae675c7474eb49d83cde60bad83cdf26d12d360ca3226aa4a7053053618bfa0e84ab8f7a0f5f89a0bfcf6eed1720b72c55e194fed9d81f0f07fbc SHA512 f67164b9c0678fc88d7017ecc241584e955ff0735aff0c58708f2211a56164f07cb3fc5e5ad727fa230d13f0550ec076f83e827ee2675684119caee7d5234a8f
diff --git a/media-gfx/ueberzugpp/metadata.xml b/media-gfx/ueberzugpp/metadata.xml
new file mode 100644
index 000000000000..19342d5360ec
--- /dev/null
+++ b/media-gfx/ueberzugpp/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<use>
+		<flag name="opencv">Use <pkg>media-libs/opencv</pkg> for additional image formats and OpenCL accelerated scaling</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">jstkdng/ueberzugpp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-gfx/ueberzugpp/ueberzugpp-2.8.0.ebuild b/media-gfx/ueberzugpp/ueberzugpp-2.8.0.ebuild
new file mode 100644
index 000000000000..f096268d66ed
--- /dev/null
+++ b/media-gfx/ueberzugpp/ueberzugpp-2.8.0.ebuild
@@ -0,0 +1,58 @@
+# 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"
+
+RDEPEND="
+	dev-cpp/tbb:=
+	dev-libs/glib:2
+	dev-libs/libfmt:=
+	dev-libs/openssl:=
+	dev-libs/spdlog:=
+	media-libs/libsixel
+	media-libs/vips:=
+	net-libs/zeromq:=
+	X? (
+		x11-libs/libxcb:=
+		x11-libs/xcb-util-image
+	)
+	opencv? ( media-libs/opencv:= )
+	!media-gfx/ueberzug"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/cli11
+	dev-cpp/nlohmann_json
+	net-libs/cppzmq
+	X? ( x11-base/xorg-proto )"
+
+src_configure() {
+	CMAKE_BUILD_TYPE=Release # install target wants this
+
+	local mycmakeargs=(
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_X11=$(usex X)
+		-DENABLE_TURBOBASE64=no # not packaged
+		-DFETCHCONTENT_FULLY_DISCONNECTED=yes
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# not handled by cmake, but upstream creates the pp symlink in their
+	# self-maintained AUR package and some scripts like ytfzf look for it
+	dosym ueberzug /usr/bin/${PN}
+}
diff --git a/media-gfx/ueberzugpp/ueberzugpp-2.8.1.ebuild b/media-gfx/ueberzugpp/ueberzugpp-2.8.1.ebuild
new file mode 100644
index 000000000000..a4af8962ba58
--- /dev/null
+++ b/media-gfx/ueberzugpp/ueberzugpp-2.8.1.ebuild
@@ -0,0 +1,59 @@
+# 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"
+# unkeyworded for testing, contains code refactoring and seem to have issues
+KEYWORDS=""
+IUSE="X opencv"
+
+RDEPEND="
+	dev-cpp/tbb:=
+	dev-libs/glib:2
+	dev-libs/libfmt:=
+	dev-libs/openssl:=
+	dev-libs/spdlog:=
+	media-libs/libsixel
+	media-libs/vips:=
+	net-libs/zeromq:=
+	X? (
+		x11-libs/libxcb:=
+		x11-libs/xcb-util-image
+	)
+	opencv? ( media-libs/opencv:= )
+	!media-gfx/ueberzug"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/cli11
+	dev-cpp/nlohmann_json
+	net-libs/cppzmq
+	X? ( x11-base/xorg-proto )"
+
+src_configure() {
+	CMAKE_BUILD_TYPE=Release # install target wants this
+
+	local mycmakeargs=(
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_X11=$(usex X)
+		-DENABLE_TURBOBASE64=no # not packaged
+		-DFETCHCONTENT_FULLY_DISCONNECTED=yes
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# not handled by cmake, but upstream creates the pp symlink in their
+	# self-maintained AUR package and some scripts like ytfzf look for it
+	dosym ueberzug /usr/bin/${PN}
+}