From da4c01edea4c0cdde1d6d6be59c78448e23a0a4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ctibor=20Bran=C4=8D=C3=ADk?= <ctibor@brancik.cz>
Date: Sun, 12 Jan 2020 21:17:27 +0100
Subject: Update media-video/aravis with ebuild from main portage tree

---
 media-video/aravis/Manifest            |  2 +-
 media-video/aravis/aravis-0.6.4.ebuild | 94 +++++++++++++++++++++-------------
 2 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/media-video/aravis/Manifest b/media-video/aravis/Manifest
index 2788443..ae828b3 100644
--- a/media-video/aravis/Manifest
+++ b/media-video/aravis/Manifest
@@ -1 +1 @@
-DIST ARAVIS_0_6_4.tar.gz 2972111 SHA256 591feae4d75a9f89d181efc1a7c3f07f8a5605600d6fe27bca0427820f80c0a3 SHA512 6090fd730ad9fe8e1641e48c52189e8961bf03a88cefb57135a2de985c2ca607c21b05d472a60586976aa1e05ba2121246b06b75179dd3241e1f703aad8dd7be WHIRLPOOL 34ee0ac9d7abdb9dec71870e792a201ae0ff90400818ec5edd2f48122c520683bd7898e3aa872cb4d04eed656864dc2f99e141d4429e306abac5a867de51a740
+DIST aravis-0.6.4.tar.gz 2972111 SHA256 591feae4d75a9f89d181efc1a7c3f07f8a5605600d6fe27bca0427820f80c0a3 SHA512 6090fd730ad9fe8e1641e48c52189e8961bf03a88cefb57135a2de985c2ca607c21b05d472a60586976aa1e05ba2121246b06b75179dd3241e1f703aad8dd7be WHIRLPOOL 34ee0ac9d7abdb9dec71870e792a201ae0ff90400818ec5edd2f48122c520683bd7898e3aa872cb4d04eed656864dc2f99e141d4429e306abac5a867de51a740
diff --git a/media-video/aravis/aravis-0.6.4.ebuild b/media-video/aravis/aravis-0.6.4.ebuild
index 8ea305e..f2dd913 100644
--- a/media-video/aravis/aravis-0.6.4.ebuild
+++ b/media-video/aravis/aravis-0.6.4.ebuild
@@ -1,48 +1,68 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=5
-
-inherit autotools versionator
-
-KEYWORDS="~amd64 ~x86"
-
-MY_PV="$(replace_all_version_separators '_')"
-
-MY_PN="${PN^^}"
-
-SRC_URI="https://github.com/AravisProject/${PN}/archive/${MY_PN}_${MY_PV}.tar.gz"
+EAPI=7
+inherit meson xdg
 
 DESCRIPTION="Library for video acquisition using Genicam cameras"
-
 HOMEPAGE="https://github.com/AravisProject/aravis"
 
-LICENSE="LGPL-2"
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/AravisProject/${PN}"
+else
+	MY_P="${PN^^}_${PV//./_}"
+	SRC_URI="https://github.com/AravisProject/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
+LICENSE="LGPL-2+"
 SLOT="0"
-
-IUSE="X gstreamer"
-
-GST_DEPEND="media-libs/gstreamer:0.10
-	media-libs/gst-plugins-base:0.10"
-
-RDEPEND=">=dev-libs/glib-2.22
-	dev-libs/libxml2
-	X? (
-		>=x11-libs/gtk+-2.12:2
+# FIXME: As of right now tests are always built, once that changes a USE flag
+# should be added. c.f. https://github.com/AravisProject/aravis/issues/286
+IUSE="gtk-doc fast-heartbeat gstreamer introspection packet-socket usb viewer"
+
+GST_DEPEND="
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3
+	)
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+DEPEND="
+	dev-libs/glib:2[gtk-doc?]
+	dev-libs/libxml2:2
+	sys-libs/zlib
+	gstreamer? ( ${GST_DEPEND} )
+	packet-socket? ( sys-process/audit )
+	usb? ( virtual/libusb:1 )
+	viewer? (
 		${GST_DEPEND}
-		media-libs/gst-plugins-base:0.10
-		media-plugins/gst-plugins-xvideo:0.10
+		x11-libs/gtk+:3
+		x11-libs/libnotify
 	)
-	gstreamer? ( ${GST_DEPEND} )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-libs/gobject-introspection"
-
-S="${WORKDIR}/${PN}-${MY_PN}_${MY_PV}"
-
-src_prepare() {
-	eautoreconf
+"
+RDEPEND="${DEPEND}"
+
+if [[ ${PV} != 9999 ]]; then
+	S="${WORKDIR}/${PN}-${MY_P}"
+fi
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc documentation)
+		$(meson_use fast-heartbeat)
+		$(meson_use gstreamer gst-plugin)
+		$(meson_use introspection)
+		$(meson_use packet-socket)
+		$(meson_use usb)
+		$(meson_use viewer)
+	)
+	meson_src_configure
 }
-- 
cgit v1.2.3