[gentoo-commits] proj/musl:master commit in: media-video/guvcview/

[Jory Pratt]

commit:     39bb953ab3b80b797d58c2398fba8fca03987e44
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 21 00:12:00 2020 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri Aug 21 00:12:00 2020 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=39bb953a

media-video/guvcview: Sync with ::gentoo

Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 ...cview-2.0.6.ebuild => guvcview-2.0.6-r1.ebuild} | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/media-video/guvcview/guvcview-2.0.6.ebuild b/media-video/guvcview/guvcview-2.0.6-r1.ebuild
similarity index 84%
rename from media-video/guvcview/guvcview-2.0.6.ebuild
rename to media-video/guvcview/guvcview-2.0.6-r1.ebuild
index 1b2304c..e6a8e86 100644
--- a/media-video/guvcview/guvcview-2.0.6.ebuild
+++ b/media-video/guvcview/guvcview-2.0.6-r1.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit autotools flag-o-matic qmake-utils toolchain-funcs
+EAPI=7
 
 MY_P=${PN}-src-${PV}
+inherit autotools flag-o-matic qmake-utils toolchain-funcs
 
 DESCRIPTION="Simple Qt5 or GTK+3 interface for capturing and viewing video from v4l2 devices"
 HOMEPAGE="http://guvcview.sourceforge.net/"
@@ -14,20 +13,24 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="gsl libav pulseaudio qt5"
+IUSE="gsl pulseaudio qt5"
 
+BDEPEND="
+	dev-util/intltool
+	sys-devel/autoconf-archive
+	sys-devel/gettext
+	virtual/pkgconfig
+"
 RDEPEND="
 	>=dev-libs/glib-2.10
 	media-libs/libpng:0=
 	media-libs/libsdl2
 	media-libs/libv4l
 	>=media-libs/portaudio-19_pre
-	virtual/ffmpeg
+	>=media-video/ffmpeg-2.8:0=
 	virtual/libusb:1
 	virtual/udev
 	gsl? ( >=sci-libs/gsl-1.15 )
-	!libav? ( >=media-video/ffmpeg-2.8:0= )
-	libav? ( media-video/libav:= )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
 	qt5? (
 		dev-qt/qtcore:5
@@ -38,21 +41,18 @@ RDEPEND="
 "
 # linux-headers: bug 448260
 DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/autoconf-archive
-	sys-devel/gettext
 	>=sys-kernel/linux-headers-3.4-r2
 	virtual/os-headers
-	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.4-musl.patch"
+)
+
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	default
-	# Fix for MUSL
-	epatch "${FILESDIR}/${PN}-2.0.4-musl.patch"
-
 	sed -i '/^docdir/,/^$/d' Makefile.am || die
 	echo "guvcview/gui_qt5_audioctrls.cpp" >> po/POTFILES.skip || die # bug 630984
 	eautoreconf
@@ -77,5 +77,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }