gentoo auto-resync : 24:06:2023 - 01:25:35

4 files changed, 13 insertions, 80 deletions

diff --git a/media-gfx/ueberzugpp/Manifest b/media-gfx/ueberzugpp/Manifest
index 3435e7d526f4..cca765d67e4d 100644
--- a/media-gfx/ueberzugpp/Manifest
+++ b/media-gfx/ueberzugpp/Manifest
@@ -1,7 +1,5 @@
-DIST ueberzugpp-2.8.4.tar.gz 43906 BLAKE2B db36ea8dc74713673ac7ea9f62f12fd9d4f77e12030db3920eb193523599f6bd6f520faa821cacb18192c699439cae35f18bb208056f4c92d6f50b02f5fac014 SHA512 402887a8734bb034c3cd0975ddd6e584f865f6545726d5bf033f59552e0a026883dd845080cccee5340217d1782c70fb2e309bfda36207627d0455c5cc7b75db
-DIST ueberzugpp-2.8.6.tar.gz 51156 BLAKE2B 8eb661f86c55a0dcd0bc78e70437a59df4783919769e8e3514fa385e30ee44c8bdf58e47824882d11eb9bf94be2836c44b983b8d67bc2e576f60432a65dcb70d SHA512 86f10e593277d240d5d348acd81ffdf23814250d694fd34f06bd461c908fba81cfdfdb1b3b104a851b3703a1e186ef57f5bf14eda9a59a9305894e8998247fb3
 DIST ueberzugpp-2.8.7.tar.gz 53658 BLAKE2B 7d6c8ea082360f98bcce90cdc0eb0d8c5fc6e4765eece225be778c07f1cf91e6550e2c74b75f4edb1eaa8eaf5fd1861493c05610343693aafc428adb1d784fda SHA512 e418576f1c01919cd8997d8bcc4169405ef85f6ae74f28790e37a1ad82bbdb1ee3296396243e5ea9d3b99ffb40a9608d0345c51650cbb4b097191c3ce64f578d
-EBUILD ueberzugpp-2.8.4.ebuild 1271 BLAKE2B 52ca5ba8a99ea787bbed19226dafa6922a06b0d3f47badf9e5007933249da7e43aff5524258f5d3531dcf255ad0b5eed65cf658bd9aae9429389cbb7cc7dc1ee SHA512 f8e512c21415536428ecb00c607ade458adefbd8d078b2dac5e38ffe2c263131b6bdaf020b887d568a38935ba4f5604b0f580bc2bfd07600cbf78928800bde79
-EBUILD ueberzugpp-2.8.6.ebuild 1475 BLAKE2B e24459bb64d7ef33f88926fc8dc554e12537d8212eaefb7e5744253c5ee2a362bc3192343c3ffb5a868521294c983a13a6a634d9605a2fbf94ddde0d45db9b36 SHA512 48d2b8d33ce1212dcb6bf69470c69d82e45648822af416cbfdde5ab1978909bc85602052c45d0ed4408cf2b7d898581382dccb53c04765ce49723cee98ff64b4
+DIST ueberzugpp-2.8.8.tar.gz 56141 BLAKE2B 9faea08c400822db86ea3963c653581e9ab8ec76989107cd072df8071ba238395a57fd820d3dc9a51d55e1820adbd7c67dc0dcce9a60aab3596e885bb1d15f50 SHA512 4354d00a3d07ddb68132a0581aeec182fce61873123d2a78f32d83db3c0227be80c5430b00bebcbda863e8fc23a35d65247a463d3f411ea09ad7b9d6cff39f92
 EBUILD ueberzugpp-2.8.7.ebuild 1174 BLAKE2B efcc29c6cff95318d31ec0427a2750e7e0f449b34b5f318417f7a713d0df753c784bba82617dfed29744a9a266d2fdd54d1d74cdb6123bf5298804ec3bfd5e36 SHA512 179148fbf94788572c466994a40d800a3a02e8ee1c60beaab2c7da1e65b2b95eb54939245becdfd23b361ed0dacc45e8451e3dbce7ff622f240ce1434fc9ebd9
-MISC metadata.xml 587 BLAKE2B f2f61d4bb44f3218a61897efcd92af977da2b595de6734e5e0f5a8284e6097e91d2f4a9078025125123ad0a36db95841d7b1ae4c0c0dff231862da5cf8feb907 SHA512 f3c85ab99d15536d70f5b951b14eb2693277168c59cadc5afaa3bd3222eb4c8dfd8f9b350d116fd75c22ada205c2b9a8d6185393b2b9083e8a83d7f5eeb6ae19
+EBUILD ueberzugpp-2.8.8.ebuild 1453 BLAKE2B 78720debf3407c3b0efd4019467a34f3bbe9c0397f44ada45159f28c02938998d2464dadd434648cd71ea01ace73ee8cffdd634047c96ff7063e9d04e3cfb48e SHA512 d0a25a98c718464b7719603bb4322b3a1f721682894476525237aab74bcba655463a95e26e114f910eb872ad69f72fa5ea56d5000fb7f6349defc6431ee9d793
+MISC metadata.xml 694 BLAKE2B e39b88b981e8c6d55a41714197b03c014a6ffd95522eb0ff92559a178b193419bd587903c75271167fba097593ac15ecacdba3b0f23e7859c3f1fd9569b4f6c2 SHA512 e86e8942c84ec38c198b513b0eaf63d522017665d559a1843c08030ec6bc6a32d7f32651d5b283e3d82784b81ea15b7d81889ab0c68850f88733ae90add17060
diff --git a/media-gfx/ueberzugpp/metadata.xml b/media-gfx/ueberzugpp/metadata.xml
index 8728c0dd5768..fc6c73e0ed27 100644
--- a/media-gfx/ueberzugpp/metadata.xml
+++ b/media-gfx/ueberzugpp/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="opencv">Use <pkg>media-libs/opencv</pkg> for additional image formats and OpenCL accelerated scaling</flag>
 		<flag name="wayland">Enable wayland support (proper window positioning is only supported with some compositors)</flag>
+		<flag name="xcb-errors">Use <pkg>x11-libs/xcb-util-errors</pkg> for better error reporting with X</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">jstkdng/ueberzugpp</remote-id>
diff --git a/media-gfx/ueberzugpp/ueberzugpp-2.8.4.ebuild b/media-gfx/ueberzugpp/ueberzugpp-2.8.4.ebuild
deleted file mode 100644
index 86718aa1b41b..000000000000
--- a/media-gfx/ueberzugpp/ueberzugpp-2.8.4.ebuild
+++ /dev/null
@@ -1,60 +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"
-
-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:=
-	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/ms-gsl
-	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.6.ebuild b/media-gfx/ueberzugpp/ueberzugpp-2.8.8.ebuild
index e1196341687e..245e11f2f9c0 100644
--- a/media-gfx/ueberzugpp/ueberzugpp-2.8.6.ebuild
+++ b/media-gfx/ueberzugpp/ueberzugpp-2.8.8.ebuild
@@ -11,8 +11,10 @@ SRC_URI="https://github.com/jstkdng/ueberzugpp/archive/refs/tags/v${PV}.tar.gz -
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="X opencv wayland"
+# unkeyworded for now given X backend fails with ytfzf (needs investigation)
+#KEYWORDS="~amd64"
+IUSE="X opencv opengl wayland xcb-errors"
+REQUIRED_USE="xcb-errors? ( X )"
 
 RDEPEND="
 	dev-cpp/tbb:=
@@ -26,8 +28,10 @@ RDEPEND="
 	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="
@@ -46,23 +50,13 @@ BDEPEND="
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENGL=$(usex opengl)
 		-DENABLE_TURBOBASE64=no # not packaged
-		-DENABLE_WLROOTS=$(usex wayland)
+		-DENABLE_WAYLAND=$(usex wayland)
 		-DENABLE_X11=$(usex X)
+		-DENABLE_XCB_ERRORS=$(usex xcb-errors)
 		-DFETCHCONTENT_FULLY_DISCONNECTED=yes
 	)
 
 	cmake_src_configure
 }
-
-src_install() {
-	# cmake install target is basic (misses the man page and symlinks) and
-	# is gated behind CMAKE_BUILD_TYPE, simpler to do manual for now
-	dobin "${BUILD_DIR}"/ueberzug
-	dosym ueberzug /usr/bin/${PN}
-
-	doman docs/${PN}.1
-	dosym ${PN}.1 /usr/share/man/man1/ueberzug.1
-
-	einstalldocs
-}