gentoo auto-resync : 29:05:2023 - 03:16:09

4 files changed, 78 insertions, 8 deletions

diff --git a/media-gfx/ueberzugpp/Manifest b/media-gfx/ueberzugpp/Manifest
index b288e79c475f..800f66128c6e 100644
--- a/media-gfx/ueberzugpp/Manifest
+++ b/media-gfx/ueberzugpp/Manifest
@@ -1,5 +1,7 @@
 DIST ueberzugpp-2.8.4.tar.gz 43906 BLAKE2B db36ea8dc74713673ac7ea9f62f12fd9d4f77e12030db3920eb193523599f6bd6f520faa821cacb18192c699439cae35f18bb208056f4c92d6f50b02f5fac014 SHA512 402887a8734bb034c3cd0975ddd6e584f865f6545726d5bf033f59552e0a026883dd845080cccee5340217d1782c70fb2e309bfda36207627d0455c5cc7b75db
 DIST ueberzugpp-2.8.5.tar.gz 48985 BLAKE2B 046e72786f51c0ece068a1046532ea7e5acfa01ee4880a9db8c9dd38aed229b66f56ee18831e82efd84fef20183bea160dc7f3194507e253aa46cad85f76a280 SHA512 f4d1ad45d121521ae158fe5c7ff845a7ac0150b4effdd0d856f9cab69c0f5bfeb34648113323a3c98412630c945c96825132e805b2bacb037a8c88762dd799ea
+DIST ueberzugpp-2.8.6.tar.gz 51156 BLAKE2B 8eb661f86c55a0dcd0bc78e70437a59df4783919769e8e3514fa385e30ee44c8bdf58e47824882d11eb9bf94be2836c44b983b8d67bc2e576f60432a65dcb70d SHA512 86f10e593277d240d5d348acd81ffdf23814250d694fd34f06bd461c908fba81cfdfdb1b3b104a851b3703a1e186ef57f5bf14eda9a59a9305894e8998247fb3
 EBUILD ueberzugpp-2.8.4.ebuild 1271 BLAKE2B 52ca5ba8a99ea787bbed19226dafa6922a06b0d3f47badf9e5007933249da7e43aff5524258f5d3531dcf255ad0b5eed65cf658bd9aae9429389cbb7cc7dc1ee SHA512 f8e512c21415536428ecb00c607ade458adefbd8d078b2dac5e38ffe2c263131b6bdaf020b887d568a38935ba4f5604b0f580bc2bfd07600cbf78928800bde79
-EBUILD ueberzugpp-2.8.5.ebuild 1443 BLAKE2B df1580d2a45b433d8e7ab86ddd05560f6eadd06eb8a958b55e0be2c74fa0c58090b09d23df09a2d28fd763d9e27a527b085b70e58e2028e322d4817bd4e0690e SHA512 08c59e56b181e34adeef0b0112c504d14806a0e3163fe4e0c371f3579d35cead88a00d4dadc3153d63ddf6fc2ea2627eb48f0ce23896a68001e8f7dc9bae057b
-MISC metadata.xml 546 BLAKE2B 799aec60c10714c7c4a35d7b8f914bf03a5bd8d9522c67ad17545669b06ccf9280fd44ccbeb06103829b05f04244eab734e7331cb3da4d8bca59956adb8b0570 SHA512 b103cd4ae2d86baa204d230e5a8cabcee55bfe3254fbc5dcc88c2d8e5698d760c6174a0208b4074679a95fdf5ef5d95fee58fc0b009316dda9cb44c5b478a4a0
+EBUILD ueberzugpp-2.8.5.ebuild 1458 BLAKE2B e690a5ec3c4feb9673e2fd4431e90e31e812888bfaf1e71a7418540582d13fa273ed5dffc1dde74e0e266cc6720ae077d249f795914da03ad5bc8004a2400ddf SHA512 5ca856a373f8a31468166e87a9056241c88536d0fa1b3b2458a97b5987625516c6dd33839365f17d6daa86b99265b1f02344a82b762b58fad01019bc0d5224bb
+EBUILD ueberzugpp-2.8.6.ebuild 1475 BLAKE2B e24459bb64d7ef33f88926fc8dc554e12537d8212eaefb7e5744253c5ee2a362bc3192343c3ffb5a868521294c983a13a6a634d9605a2fbf94ddde0d45db9b36 SHA512 48d2b8d33ce1212dcb6bf69470c69d82e45648822af416cbfdde5ab1978909bc85602052c45d0ed4408cf2b7d898581382dccb53c04765ce49723cee98ff64b4
+MISC metadata.xml 569 BLAKE2B 6d4c0691acfb86d3db9f51a4e95608cff4d1ab484623fdebb2da8ea30ee8bf27344be2dc1e811b430f87468d82d875158883b08c736d656e1c29ee754a88b4a8 SHA512 348813a74227241734cc1ad907e21dc8fc9c1010ac05d8d5480416acc3fd2ed3e12d7c7feb36029b13237d07fb24ae04b17d95d7f7b550472196fc8467494171
diff --git a/media-gfx/ueberzugpp/metadata.xml b/media-gfx/ueberzugpp/metadata.xml
index 407eee6aebee..3099100a6dd7 100644
--- a/media-gfx/ueberzugpp/metadata.xml
+++ b/media-gfx/ueberzugpp/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="opencv">Use <pkg>media-libs/opencv</pkg> for additional image formats and OpenCL accelerated scaling</flag>
-		<flag name="sway">Enable support for <pkg>gui-wm/sway</pkg> on wayland</flag>
+		<flag name="wayland">Enable wayland support (only usable with some wlroots-based compositors)</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">jstkdng/ueberzugpp</remote-id>
diff --git a/media-gfx/ueberzugpp/ueberzugpp-2.8.5.ebuild b/media-gfx/ueberzugpp/ueberzugpp-2.8.5.ebuild
index 3d6109418aae..076a995df926 100644
--- a/media-gfx/ueberzugpp/ueberzugpp-2.8.5.ebuild
+++ b/media-gfx/ueberzugpp/ueberzugpp-2.8.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jstkdng/ueberzugpp/archive/refs/tags/v${PV}.tar.gz -
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="X opencv sway"
+IUSE="X opencv wayland"
 
 RDEPEND="
 	dev-cpp/tbb:=
@@ -29,7 +29,7 @@ RDEPEND="
 		x11-libs/xcb-util-image
 	)
 	opencv? ( media-libs/opencv:= )
-	sway? ( dev-libs/wayland )
+	wayland? ( dev-libs/wayland )
 	!media-gfx/ueberzug"
 DEPEND="
 	${RDEPEND}
@@ -37,9 +37,9 @@ DEPEND="
 	dev-cpp/ms-gsl
 	dev-cpp/nlohmann_json
 	X? ( x11-base/xorg-proto )
-	sway? ( dev-libs/wayland-protocols )"
+	wayland? ( dev-libs/wayland-protocols )"
 BDEPEND="
-	sway? (
+	wayland? (
 		dev-util/wayland-scanner
 		kde-frameworks/extra-cmake-modules
 	)"
@@ -49,7 +49,7 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_SWAY=$(usex sway)
+		-DENABLE_SWAY=$(usex wayland)
 		-DENABLE_TURBOBASE64=no # not packaged
 		-DENABLE_X11=$(usex X)
 		-DFETCHCONTENT_FULLY_DISCONNECTED=yes
diff --git a/media-gfx/ueberzugpp/ueberzugpp-2.8.6.ebuild b/media-gfx/ueberzugpp/ueberzugpp-2.8.6.ebuild
new file mode 100644
index 000000000000..e1196341687e
--- /dev/null
+++ b/media-gfx/ueberzugpp/ueberzugpp-2.8.6.ebuild
@@ -0,0 +1,68 @@
+# 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 wayland"
+
+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
+	)
+	opencv? ( media-libs/opencv:= )
+	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() {
+	local mycmakeargs=(
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_TURBOBASE64=no # not packaged
+		-DENABLE_WLROOTS=$(usex wayland)
+		-DENABLE_X11=$(usex X)
+		-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
+}