| 1 |
commit: c71e13b8f81d5be04ad3cfc642449cd7c4867ce0 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 3 15:41:55 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 3 15:45:39 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c71e13b8 |
| 7 |
|
| 8 |
media-video/aravis: EAPI-7 bump |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 11 |
|
| 12 |
media-video/aravis/aravis-0.5.10.ebuild | 25 +++++++----------- |
| 13 |
media-video/aravis/aravis-9999.ebuild | 46 ++++++++++++++++----------------- |
| 14 |
2 files changed, 33 insertions(+), 38 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-video/aravis/aravis-0.5.10.ebuild b/media-video/aravis/aravis-0.5.10.ebuild |
| 17 |
index eb90789b01a..ed18bd2b634 100644 |
| 18 |
--- a/media-video/aravis/aravis-0.5.10.ebuild |
| 19 |
+++ b/media-video/aravis/aravis-0.5.10.ebuild |
| 20 |
@@ -1,17 +1,14 @@ |
| 21 |
# Copyright 1999-2018 Gentoo Foundation |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
-EAPI=6 |
| 25 |
+EAPI=7 |
| 26 |
|
| 27 |
-inherit versionator |
| 28 |
- |
| 29 |
-KEYWORDS="~amd64" |
| 30 |
- |
| 31 |
-if [[ ${PV} == "9999" ]]; then |
| 32 |
- KEYWORDS="" |
| 33 |
- EGIT_REPO_URI="git://git.gnome.org/aravis" |
| 34 |
- EGIT_COMMIT="${aravis_LIVE_COMMIT:-master}" |
| 35 |
- inherit git-2 autotools |
| 36 |
+if [[ ${PV} = *9999 ]]; then |
| 37 |
+ EGIT_REPO_URI="https://github.com/AravisProject/aravis.git" |
| 38 |
+ inherit git-r3 autotools |
| 39 |
+else |
| 40 |
+ SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz" |
| 41 |
+ KEYWORDS="~amd64" |
| 42 |
fi |
| 43 |
|
| 44 |
DESCRIPTION="Library for video acquisition using Genicam cameras" |
| 45 |
@@ -19,7 +16,6 @@ HOMEPAGE="https://live.gnome.org/Aravis" |
| 46 |
|
| 47 |
LICENSE="LGPL-2.1" |
| 48 |
SLOT="0" |
| 49 |
- |
| 50 |
IUSE="X gstreamer caps" |
| 51 |
|
| 52 |
GST_DEPEND="media-libs/gstreamer:1.0 |
| 53 |
@@ -42,14 +38,13 @@ DEPEND="${RDEPEND} |
| 54 |
virtual/pkgconfig |
| 55 |
dev-libs/gobject-introspection" |
| 56 |
|
| 57 |
-if [[ -z ${EGIT_COMMIT} ]]; then |
| 58 |
- SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.xz" |
| 59 |
-else |
| 60 |
+if [[ ${PV} != *9999 ]]; then |
| 61 |
DEPEND+=" dev-util/gtk-doc dev-util/intltool" |
| 62 |
fi |
| 63 |
|
| 64 |
src_prepare() { |
| 65 |
- if [[ -n ${EGIT_COMMIT} ]]; then |
| 66 |
+ default |
| 67 |
+ if [[ ${PV} = *9999 ]]; then |
| 68 |
intltoolize || die |
| 69 |
gtkdocize || die |
| 70 |
eautoreconf |
| 71 |
|
| 72 |
diff --git a/media-video/aravis/aravis-9999.ebuild b/media-video/aravis/aravis-9999.ebuild |
| 73 |
index 5d0d72cf022..ed18bd2b634 100644 |
| 74 |
--- a/media-video/aravis/aravis-9999.ebuild |
| 75 |
+++ b/media-video/aravis/aravis-9999.ebuild |
| 76 |
@@ -1,17 +1,14 @@ |
| 77 |
-# Copyright 1999-2014 Gentoo Foundation |
| 78 |
+# Copyright 1999-2018 Gentoo Foundation |
| 79 |
# Distributed under the terms of the GNU General Public License v2 |
| 80 |
|
| 81 |
-EAPI=4 |
| 82 |
+EAPI=7 |
| 83 |
|
| 84 |
-inherit versionator |
| 85 |
- |
| 86 |
-KEYWORDS="~amd64" |
| 87 |
- |
| 88 |
-if [[ ${PV} == "9999" ]]; then |
| 89 |
- KEYWORDS="" |
| 90 |
- EGIT_REPO_URI="git://git.gnome.org/aravis" |
| 91 |
- EGIT_COMMIT="${aravis_LIVE_COMMIT:-master}" |
| 92 |
- inherit git-2 autotools |
| 93 |
+if [[ ${PV} = *9999 ]]; then |
| 94 |
+ EGIT_REPO_URI="https://github.com/AravisProject/aravis.git" |
| 95 |
+ inherit git-r3 autotools |
| 96 |
+else |
| 97 |
+ SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz" |
| 98 |
+ KEYWORDS="~amd64" |
| 99 |
fi |
| 100 |
|
| 101 |
DESCRIPTION="Library for video acquisition using Genicam cameras" |
| 102 |
@@ -19,33 +16,35 @@ HOMEPAGE="https://live.gnome.org/Aravis" |
| 103 |
|
| 104 |
LICENSE="LGPL-2.1" |
| 105 |
SLOT="0" |
| 106 |
+IUSE="X gstreamer caps" |
| 107 |
|
| 108 |
-IUSE="X gstreamer" |
| 109 |
+GST_DEPEND="media-libs/gstreamer:1.0 |
| 110 |
+ media-libs/gst-plugins-base:1.0" |
| 111 |
|
| 112 |
-GST_DEPEND="media-libs/gstreamer:0.10 |
| 113 |
- media-libs/gst-plugins-base:0.10" |
| 114 |
- |
| 115 |
-RDEPEND=">=dev-libs/glib-2.22 |
| 116 |
+RDEPEND=">=dev-libs/glib-2.26 |
| 117 |
dev-libs/libxml2 |
| 118 |
X? ( |
| 119 |
- >=x11-libs/gtk+-2.12:2 |
| 120 |
+ >=x11-libs/gtk+-3.12:3 |
| 121 |
${GST_DEPEND} |
| 122 |
- media-libs/gst-plugins-base:0.10 |
| 123 |
- media-plugins/gst-plugins-xvideo:0.10 |
| 124 |
+ media-libs/gst-plugins-base:1.0 |
| 125 |
+ x11-libs/libnotify |
| 126 |
+ ) |
| 127 |
+ caps? ( |
| 128 |
+ sys-libs/libcap-ng |
| 129 |
+ sys-process/audit |
| 130 |
) |
| 131 |
gstreamer? ( ${GST_DEPEND} )" |
| 132 |
DEPEND="${RDEPEND} |
| 133 |
virtual/pkgconfig |
| 134 |
dev-libs/gobject-introspection" |
| 135 |
|
| 136 |
-if [[ -z ${EGIT_COMMIT} ]]; then |
| 137 |
- SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.xz" |
| 138 |
-else |
| 139 |
+if [[ ${PV} != *9999 ]]; then |
| 140 |
DEPEND+=" dev-util/gtk-doc dev-util/intltool" |
| 141 |
fi |
| 142 |
|
| 143 |
src_prepare() { |
| 144 |
- if [[ -n ${EGIT_COMMIT} ]]; then |
| 145 |
+ default |
| 146 |
+ if [[ ${PV} = *9999 ]]; then |
| 147 |
intltoolize || die |
| 148 |
gtkdocize || die |
| 149 |
eautoreconf |
| 150 |
@@ -58,6 +57,7 @@ src_configure() { |
| 151 |
--disable-static \ |
| 152 |
$(use_enable X viewer) \ |
| 153 |
$(use_enable gstreamer gst-plugin) \ |
| 154 |
+ $(use_enable caps packet-socket) \ |
| 155 |
--enable-introspection |
| 156 |
} |
Archives