From a6266c63b23ed0ee16865627ca53e4f5353f0a5c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 17 Jul 2022 02:30:06 +0100
Subject: gentoo auto-resync : 17:07:2022 - 02:30:06

---
 media-video/oxine/Manifest              |  2 +-
 media-video/oxine/oxine-0.7.1-r5.ebuild | 60 ++++++++++++++++++---------------
 2 files changed, 33 insertions(+), 29 deletions(-)

(limited to 'media-video/oxine')

diff --git a/media-video/oxine/Manifest b/media-video/oxine/Manifest
index 47d839ea5d38..e9849a8ed1ee 100644
--- a/media-video/oxine/Manifest
+++ b/media-video/oxine/Manifest
@@ -1,3 +1,3 @@
 DIST oxine-0.7.1.tar.gz 3653511 BLAKE2B 33f9e213d1bd379b3faca0d8bba01c656838109a1b47c4dde87aa385c5ecf478e3655b3fd4fffecf6d01d0f95a138d926d55124846f581450c5635eadd9722a9 SHA512 96f6851f6277d97530b1f4d95d0f0843c9c3262d1a97ccc431e8a674441e06ca8fc24a65f83be5735f54e089d636e60fb297fa7958279b24004eecbc1711a257
-EBUILD oxine-0.7.1-r5.ebuild 1795 BLAKE2B 29ea98b40b58c135833a6a7c308437fd68aac50e348e314d9a442b98179d4bff776dc87757fc8d99ce0bd51254633d2202525df33609db5d17203aa681c8f2cf SHA512 5fad6f80c3949b0900cf6d18f39513e600118b4970c3cdd5e3fdaff1dfd25ba7e91d06e14df2de5aab3b936d9c9640cd7fab7c698ac062d2b117c36ccaa1d1f3
+EBUILD oxine-0.7.1-r5.ebuild 1814 BLAKE2B ad6ac862cc631305802c54c337919ab8568cc1d17c8cda35955fdfe636502fe7717e9cac776504ecbd4deb77d575b7d31317ef59e16e28eb56e95c901f9f6a43 SHA512 b4c6de9cecffb86b8cec8b1fa64d94cf1144ce5e221a56808e520391fcd7360f94af409e04fed1ac95bded45539006ce288d64625fe4994f91da777c9a3faa13
 MISC metadata.xml 307 BLAKE2B a1f867899fb89719d20c336c4452db7298d0dafd16c20203e4f188e89c8c3da6428456ceb91fac343f8a9b1233c979ef6e7e3229b3ca6af2aabe95128352e8e4 SHA512 ba9be1c84f47a0200720c51cec4d0a069c3711b7f56482222ebf4391fc344be6f24754785f4471d0b1a67ed97b5bd71510d813707de7fe92f35a5ea7d888fb0c
diff --git a/media-video/oxine/oxine-0.7.1-r5.ebuild b/media-video/oxine/oxine-0.7.1-r5.ebuild
index 6cbda902137b..0232ae70dec6 100644
--- a/media-video/oxine/oxine-0.7.1-r5.ebuild
+++ b/media-video/oxine/oxine-0.7.1-r5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit flag-o-matic
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="curl debug dvb exif joystick jpeg lirc nls png v4l X"
 
-COMMON_DEPEND="
+DEPEND="
 	dev-libs/libcdio
 	media-libs/xine-lib[v4l?,X,imagemagick]
 	virtual/libcrypt:=
@@ -22,9 +22,9 @@ COMMON_DEPEND="
 	dvb? ( media-libs/xine-lib[v4l] )
 	joystick? ( media-libs/libjsw )
 	jpeg? (
-		media-gfx/imagemagick
 		media-libs/netpbm[jpeg,zlib(+)]
 		media-video/mjpegtools
+		virtual/imagemagick-tools[jpeg]
 	)
 	lirc? ( app-misc/lirc )
 	nls? (
@@ -32,52 +32,56 @@ COMMON_DEPEND="
 		sys-devel/gettext
 	)
 	png? (
-		media-gfx/imagemagick
 		media-libs/netpbm[png,zlib(+)]
 		media-video/mjpegtools
+		virtual/imagemagick-tools[png]
 	)
 	X? (
 		x11-libs/libXext
 		x11-libs/libX11
-	)"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/util-linux"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
+	)
+"
+RDEPEND="
+	${DEPEND}
+	sys-apps/util-linux
+"
+BDEPEND="virtual/pkgconfig"
 
 HTML_DOCS=( doc/README.html )
 
 src_configure() {
 	# Fix underlinking by falling back to
-	# GNU89 inline semantics, bug 590946
+	# GNU89 inline semantics, bug #590946
 	append-cflags -std=gnu89
 
+	local myeconfargs=(
+		--disable-hal
+		--disable-rpath
+		--disable-extractor
+		$(use_with curl)
+		$(use_enable debug)
+		$(use_enable dvb)
+		$(use_enable exif)
+		$(use_enable joystick)
+		$(use_enable lirc)
+		$(use_enable nls)
+		$(use_enable v4l)
+		$(use_with X x)
+	)
+
 	# Note on images: Image support will be automatically disabled if
 	# netpbm, imagemagick or mjpegtools is not installed, regardless
 	# of what the USE flags are set to.
 	# If one of the image USE flags is unset, disable image support
-	local myconf=()
-	if use !png || use !jpeg; then
-		myconf+=( --disable-images )
+	if ! use png || ! use jpeg; then
+		myeconfargs+=( --disable-images )
 	fi
 
-	econf \
-		--disable-hal \
-		--disable-rpath \
-		--disable-extractor \
-		$(use_with curl) \
-		$(use_enable debug) \
-		$(use_enable dvb) \
-		$(use_enable exif) \
-		$(use_enable joystick) \
-		$(use_enable lirc) \
-		$(use_enable nls) \
-		$(use_enable v4l) \
-		$(use_with X x) \
-		"${myconf[@]}"
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
+
 	dodoc doc/keymapping.pdf
 }
-- 
cgit v1.2.3