gentoo resync : 09.06.2018

3 files changed, 93 insertions, 24 deletions

diff --git a/media-video/aravis/Manifest b/media-video/aravis/Manifest
index 6b437f0e30e1..eaa0b56f5ec3 100644
--- a/media-video/aravis/Manifest
+++ b/media-video/aravis/Manifest
@@ -1,6 +1,8 @@
 DIST aravis-0.1.14.tar.xz 414932 BLAKE2B ea4c443297c5b8d2caf1cc944519bb274998acd6a6e6074ef1099a505296bd92fc264dcdb304bd34b75b3347a7522aedbad6cbc16cbef875627252a856691509 SHA512 d84fe519074a69e679b08e0c0933bce191e50cfcdd1b46b743aa68ba33445a3a87cbd1701ba424666b638949f9faf531ec668acbe5d22017712f70cfa9620ea9
 DIST aravis-0.1.15.tar.xz 448348 BLAKE2B 0a20aab1e434999ab1d08ae55c2654ca4809be2f9d64b65729ce14977b724ba864513dcb652c6ccda3d768b9fe47e5c4cc3951ee716a4d34915768651a814830 SHA512 f6a2e1f7fa4f712bea6a91f896bbc92afb3dcf3146109f3f7aee2ad6812a69f0b47a0f2116062cba6163dc058c7981a01a6eec395d4af633da666fe186291929
+DIST aravis-0.5.10.tar.xz 540700 BLAKE2B f12a2bfa2bf8ac1875b28ec0549e5ebe3e5eb1cd646e417acc52a760546343893e19d7fb13741799346286dc69d9ecf2a7d7a3c9ada6ffefafab5c6450468848 SHA512 27a182a8fce66416e14baa16609b91307683613fab9324c96f94b9a7dd956ba0d60f5c966b2ec5184374ab8f9f527ad4d7733dffd2c40faa409ff196c344eb29
 EBUILD aravis-0.1.14.ebuild 1399 BLAKE2B 81c3740a05a4452044da379d3d2c1d0018bc28a6788313ce6a06d58179f299bd5a8505f1602f3327783b9a5859e55c533665bc75bb6d2305b45159cff49f0b64 SHA512 7bc823b724cc4db6d0129291c46a296b147f29d8c076e6476145fd68315e35af77d67c57a40bbdacec4fb7708ee728ef02b0d79a69662b280ac17d58f23d8d0e
 EBUILD aravis-0.1.15.ebuild 1399 BLAKE2B 81c3740a05a4452044da379d3d2c1d0018bc28a6788313ce6a06d58179f299bd5a8505f1602f3327783b9a5859e55c533665bc75bb6d2305b45159cff49f0b64 SHA512 7bc823b724cc4db6d0129291c46a296b147f29d8c076e6476145fd68315e35af77d67c57a40bbdacec4fb7708ee728ef02b0d79a69662b280ac17d58f23d8d0e
-EBUILD aravis-9999.ebuild 1399 BLAKE2B 81c3740a05a4452044da379d3d2c1d0018bc28a6788313ce6a06d58179f299bd5a8505f1602f3327783b9a5859e55c533665bc75bb6d2305b45159cff49f0b64 SHA512 7bc823b724cc4db6d0129291c46a296b147f29d8c076e6476145fd68315e35af77d67c57a40bbdacec4fb7708ee728ef02b0d79a69662b280ac17d58f23d8d0e
+EBUILD aravis-0.5.10.ebuild 1390 BLAKE2B 58a5a35064bcd74edafa67032ff6c0d15dc4a646a938a903820c0a84c23729edf4f5be56881760416fe95e0750f7be22aa4fc885efd64be21d87fa210be1f879 SHA512 70fb3d42abaed577cf0db2b56e4386e8671456260ec7ad8f4db760b610692a82f19666fa9e8d6b432409ede58f373582fc6462b0be0ca212ab205cb0440eb98c
+EBUILD aravis-9999.ebuild 1390 BLAKE2B 58a5a35064bcd74edafa67032ff6c0d15dc4a646a938a903820c0a84c23729edf4f5be56881760416fe95e0750f7be22aa4fc885efd64be21d87fa210be1f879 SHA512 70fb3d42abaed577cf0db2b56e4386e8671456260ec7ad8f4db760b610692a82f19666fa9e8d6b432409ede58f373582fc6462b0be0ca212ab205cb0440eb98c
 MISC metadata.xml 664 BLAKE2B 95779521829c716f4efdc591e0422c62be595b83c3eb3fd9d947314381cc92b8a74d62ce8f2338f073ab99f62a9e696a18e17d70fe4ea6f77664d47ea48af8cd SHA512 023c02e3a69fad5c7302d2dc857fa0de23096ecb80640f9adba7d12ab10e969be2a10f1183e44cf3a3afc6e57ec1585826b73907103490b78052bd10b0857cac
diff --git a/media-video/aravis/aravis-0.5.10.ebuild b/media-video/aravis/aravis-0.5.10.ebuild
new file mode 100644
index 000000000000..ed18bd2b6343
--- /dev/null
+++ b/media-video/aravis/aravis-0.5.10.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/AravisProject/aravis.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Library for video acquisition using Genicam cameras"
+HOMEPAGE="https://live.gnome.org/Aravis"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="X gstreamer caps"
+
+GST_DEPEND="media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0"
+
+RDEPEND=">=dev-libs/glib-2.26
+	dev-libs/libxml2
+	X? (
+		>=x11-libs/gtk+-3.12:3
+		${GST_DEPEND}
+		media-libs/gst-plugins-base:1.0
+		x11-libs/libnotify
+	)
+	caps? (
+		sys-libs/libcap-ng
+		sys-process/audit
+	)
+	gstreamer? ( ${GST_DEPEND} )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-libs/gobject-introspection"
+
+if [[ ${PV} != *9999 ]]; then
+	DEPEND+=" dev-util/gtk-doc dev-util/intltool"
+fi
+
+src_prepare() {
+	default
+	if [[ ${PV} = *9999 ]]; then
+		intltoolize || die
+		gtkdocize || die
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		--disable-silent-rules \
+		--disable-static \
+		$(use_enable X viewer) \
+		$(use_enable gstreamer gst-plugin) \
+		$(use_enable caps packet-socket) \
+		--enable-introspection
+}
+
+src_install() {
+	emake install DESTDIR="${D}" aravisdocdir="/usr/share/doc/${PF}"
+	find "${D}" -name '*.la' -delete
+}
diff --git a/media-video/aravis/aravis-9999.ebuild b/media-video/aravis/aravis-9999.ebuild
index 5d0d72cf0220..ed18bd2b6343 100644
--- a/media-video/aravis/aravis-9999.ebuild
+++ b/media-video/aravis/aravis-9999.ebuild
@@ -1,17 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit versionator
-
-KEYWORDS="~amd64"
-
-if [[ ${PV} == "9999" ]]; then
-	KEYWORDS=""
-	EGIT_REPO_URI="git://git.gnome.org/aravis"
-	EGIT_COMMIT="${aravis_LIVE_COMMIT:-master}"
-	inherit git-2 autotools
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/AravisProject/aravis.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Library for video acquisition using Genicam cameras"
@@ -19,33 +16,35 @@ HOMEPAGE="https://live.gnome.org/Aravis"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
+IUSE="X gstreamer caps"
 
-IUSE="X gstreamer"
+GST_DEPEND="media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0"
 
-GST_DEPEND="media-libs/gstreamer:0.10
-	media-libs/gst-plugins-base:0.10"
-
-RDEPEND=">=dev-libs/glib-2.22
+RDEPEND=">=dev-libs/glib-2.26
 	dev-libs/libxml2
 	X? (
-		>=x11-libs/gtk+-2.12:2
+		>=x11-libs/gtk+-3.12:3
 		${GST_DEPEND}
-		media-libs/gst-plugins-base:0.10
-		media-plugins/gst-plugins-xvideo:0.10
+		media-libs/gst-plugins-base:1.0
+		x11-libs/libnotify
+	)
+	caps? (
+		sys-libs/libcap-ng
+		sys-process/audit
 	)
 	gstreamer? ( ${GST_DEPEND} )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	dev-libs/gobject-introspection"
 
-if [[ -z ${EGIT_COMMIT} ]]; then
-	SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.xz"
-else
+if [[ ${PV} != *9999 ]]; then
 	DEPEND+=" dev-util/gtk-doc dev-util/intltool"
 fi
 
 src_prepare() {
-	if [[ -n ${EGIT_COMMIT} ]]; then
+	default
+	if [[ ${PV} = *9999 ]]; then
 		intltoolize || die
 		gtkdocize || die
 		eautoreconf
@@ -58,6 +57,7 @@ src_configure() {
 		--disable-static \
 		$(use_enable X viewer) \
 		$(use_enable gstreamer gst-plugin) \
+		$(use_enable caps packet-socket) \
 		--enable-introspection
 }