From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7069F138334 for ; Sun, 3 Jun 2018 15:46:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74272E0A8D; Sun, 3 Jun 2018 15:46:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1DB86E0A8D for ; Sun, 3 Jun 2018 15:46:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E4C09335C60 for ; Sun, 3 Jun 2018 15:46:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 22CAB29E for ; Sun, 3 Jun 2018 15:46:01 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1528040739.c71e13b8f81d5be04ad3cfc642449cd7c4867ce0.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/aravis/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/aravis/aravis-0.5.10.ebuild media-video/aravis/aravis-9999.ebuild X-VCS-Directories: media-video/aravis/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c71e13b8f81d5be04ad3cfc642449cd7c4867ce0 X-VCS-Branch: master Date: Sun, 3 Jun 2018 15:46:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4fc5b890-1fd9-46cc-bddf-eff85fc0bbc3 X-Archives-Hash: a26ed6d4fcd6a116c6dade5bf1e9988a commit: c71e13b8f81d5be04ad3cfc642449cd7c4867ce0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 3 15:41:55 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 3 15:45:39 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c71e13b8 media-video/aravis: EAPI-7 bump Package-Manager: Portage-2.3.40, Repoman-2.3.9 media-video/aravis/aravis-0.5.10.ebuild | 25 +++++++----------- media-video/aravis/aravis-9999.ebuild | 46 ++++++++++++++++----------------- 2 files changed, 33 insertions(+), 38 deletions(-) diff --git a/media-video/aravis/aravis-0.5.10.ebuild b/media-video/aravis/aravis-0.5.10.ebuild index eb90789b01a..ed18bd2b634 100644 --- a/media-video/aravis/aravis-0.5.10.ebuild +++ b/media-video/aravis/aravis-0.5.10.ebuild @@ -1,17 +1,14 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +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,7 +16,6 @@ HOMEPAGE="https://live.gnome.org/Aravis" LICENSE="LGPL-2.1" SLOT="0" - IUSE="X gstreamer caps" GST_DEPEND="media-libs/gstreamer:1.0 @@ -42,14 +38,13 @@ 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 diff --git a/media-video/aravis/aravis-9999.ebuild b/media-video/aravis/aravis-9999.ebuild index 5d0d72cf022..ed18bd2b634 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 }