[gentoo-commits] repo/gentoo:master commit in: media-video/aravis/

[Joonas Niilola]

commit:     63825f50cc3cc9b574364d3cddb557263ad65557
Author:     Bernardo Meurer <meurerbernardo <AT> gmail <DOT> com>
AuthorDate: Thu Oct 17 07:18:21 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Nov  1 13:27:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63825f50

media-video/aravis: bump 0.7.2

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Bernardo Meurer <bernardo <AT> standard.ai>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-video/aravis/Manifest                        |  1 +
 .../{aravis-9999.ebuild => aravis-0.7.2.ebuild}    | 24 ++--------------------
 media-video/aravis/aravis-9999.ebuild              | 24 ++--------------------
 3 files changed, 5 insertions(+), 44 deletions(-)

diff --git a/media-video/aravis/Manifest b/media-video/aravis/Manifest
index 5deae26c664..568548bd4d0 100644
--- a/media-video/aravis/Manifest
+++ b/media-video/aravis/Manifest
@@ -1 +1,2 @@
 DIST aravis-0.6.4.tar.gz 2972111 BLAKE2B b7f1c4da08bb4e7d11faffcd4ef90b7215b803e5e74ba1730388e04304685b761024ffea49b082c94e3fddc9dc65201545167a277b1088ad7273d41d50fae5b0 SHA512 6090fd730ad9fe8e1641e48c52189e8961bf03a88cefb57135a2de985c2ca607c21b05d472a60586976aa1e05ba2121246b06b75179dd3241e1f703aad8dd7be
+DIST aravis-0.7.2.tar.gz 940928 BLAKE2B 67b6772aaf6195e393caf2f3fcf6d24acace9d7160023c801f93d479e9d488e4082dcd11d40a8db18dea6cd516e0b24cb78e46de09d455a3c822208d9f33af5b SHA512 5cc6c01f77462c595a87a5899df752a5018e72b4de108fc3bcebbb39542482fc535401a7f10732270d98998fe807c929ae9e7750cc7ac0ce089763d1eb148e2a

diff --git a/media-video/aravis/aravis-9999.ebuild b/media-video/aravis/aravis-0.7.2.ebuild
similarity index 64%
copy from media-video/aravis/aravis-9999.ebuild
copy to media-video/aravis/aravis-0.7.2.ebuild
index 5ffb500be0c..f2dd9137fe0 100644
--- a/media-video/aravis/aravis-9999.ebuild
+++ b/media-video/aravis/aravis-0.7.2.ebuild
@@ -36,7 +36,7 @@ BDEPEND="
 	introspection? ( dev-libs/gobject-introspection:= )
 "
 DEPEND="
-	>=dev-libs/glib-2.34:2
+	dev-libs/glib:2[gtk-doc?]
 	dev-libs/libxml2:2
 	sys-libs/zlib
 	gstreamer? ( ${GST_DEPEND} )
@@ -44,7 +44,7 @@ DEPEND="
 	usb? ( virtual/libusb:1 )
 	viewer? (
 		${GST_DEPEND}
-		>=x11-libs/gtk+-3.12:3
+		x11-libs/gtk+:3
 		x11-libs/libnotify
 	)
 "
@@ -66,23 +66,3 @@ src_configure() {
 	)
 	meson_src_configure
 }
-
-src_install() {
-	meson_src_install
-	# Aravis appends the major and min versions (but not the patch) to it's
-	# binaries and it's folder in /usr/share. Things then end up like
-	# `arv-tool-0.6`. We use this little hack to find out the version of the
-	# current build in a way that works even for a -9999 ebuild.
-	local install_pv="$(ls ${ED}/usr/share | grep aravis- | cut -f 2 -d '-')"
-	local install_p="${PN}-${install_pv}"
-
-	# Properly place icons
-	if use viewer; then
-		cp -r "${ED}/usr/share/${install_p}/icons" "${ED}/usr/share" || die "Failed to copy icons"
-	fi
-
-	# Symlink versioned binaries to non-versioned
-	dosym "arv-tool-${install_pv}" "usr/bin/arv-tool"
-	dosym "arv-fake-gv-camera-${install_pv}" "usr/bin/arv-fake-gv-camera"
-	use viewer && dosym "arv-viewer-${install_pv}" "usr/bin/arv-viewer"
-}

diff --git a/media-video/aravis/aravis-9999.ebuild b/media-video/aravis/aravis-9999.ebuild
index 5ffb500be0c..f2dd9137fe0 100644
--- a/media-video/aravis/aravis-9999.ebuild
+++ b/media-video/aravis/aravis-9999.ebuild
@@ -36,7 +36,7 @@ BDEPEND="
 	introspection? ( dev-libs/gobject-introspection:= )
 "
 DEPEND="
-	>=dev-libs/glib-2.34:2
+	dev-libs/glib:2[gtk-doc?]
 	dev-libs/libxml2:2
 	sys-libs/zlib
 	gstreamer? ( ${GST_DEPEND} )
@@ -44,7 +44,7 @@ DEPEND="
 	usb? ( virtual/libusb:1 )
 	viewer? (
 		${GST_DEPEND}
-		>=x11-libs/gtk+-3.12:3
+		x11-libs/gtk+:3
 		x11-libs/libnotify
 	)
 "
@@ -66,23 +66,3 @@ src_configure() {
 	)
 	meson_src_configure
 }
-
-src_install() {
-	meson_src_install
-	# Aravis appends the major and min versions (but not the patch) to it's
-	# binaries and it's folder in /usr/share. Things then end up like
-	# `arv-tool-0.6`. We use this little hack to find out the version of the
-	# current build in a way that works even for a -9999 ebuild.
-	local install_pv="$(ls ${ED}/usr/share | grep aravis- | cut -f 2 -d '-')"
-	local install_p="${PN}-${install_pv}"
-
-	# Properly place icons
-	if use viewer; then
-		cp -r "${ED}/usr/share/${install_p}/icons" "${ED}/usr/share" || die "Failed to copy icons"
-	fi
-
-	# Symlink versioned binaries to non-versioned
-	dosym "arv-tool-${install_pv}" "usr/bin/arv-tool"
-	dosym "arv-fake-gv-camera-${install_pv}" "usr/bin/arv-fake-gv-camera"
-	use viewer && dosym "arv-viewer-${install_pv}" "usr/bin/arv-viewer"
-}