commit: ef23f9e95d00fc97891a358409903a0fdf834f9c
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 15:21:11 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 10 15:39:51 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=ef23f9e9
dev-libs/gobject-introspection: 1.42.0-r1 → 1.44.0
....ebuild => gobject-introspection-1.44.0.ebuild} | 24 +++++-----------------
.../gobject-introspection-9999.ebuild | 8 ++++----
2 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild
b/dev-libs/gobject-introspection/gobject-introspection-1.44.0.ebuild
similarity index 76%
copy from dev-libs/gobject-introspection/gobject-introspection-9999.ebuild
copy to dev-libs/gobject-introspection/gobject-introspection-1.44.0.ebuild
index dcc8587..ed9480e 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.44.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -8,9 +8,6 @@ PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="xml"
inherit gnome2 python-single-r1 toolchain-funcs versionator
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="Introspection infrastructure for generating gobject library
bindings for various languages"
HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection";
@@ -22,18 +19,13 @@ REQUIRED_USE="
${PYTHON_REQUIRED_USE}
test? ( cairo )
"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
- IUSE="${IUSE} doc"
-else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
~sparc64-solaris ~x64-solaris ~x86-solaris"
# virtual/pkgconfig needed at runtime, bug #505408
# We force glib and goi to be in sync by this way as explained in bug #518424
RDEPEND="
>=dev-libs/gobject-introspection-common-${PV}
- >=dev-libs/glib-9999:2
+ >=dev-libs/glib-2.$(get_version_component_range 2):2
doctool? ( dev-python/mako )
virtual/libffi:=
virtual/pkgconfig
@@ -46,12 +38,6 @@ DEPEND="${RDEPEND}
sys-devel/bison
sys-devel/flex
"
-
-if [[ ${PV} == 9999 ]]; then
- DEPEND="${DEPEND}
- doc? ( >=dev-util/gtk-doc-1.19 )"
-fi
-
# PDEPEND to avoid circular dependencies, bug #391213
PDEPEND="cairo? ( x11-libs/cairo[glib] )"
@@ -70,8 +56,8 @@ src_configure() {
# To prevent crosscompiling problems, bug #414105
gnome2_src_configure \
--disable-static \
- CC=$(tc-getCC) \
- YACC=$(type -p yacc) \
+ CC="$(tc-getCC)" \
+ YACC="$(type -p yacc)" \
$(use_with cairo) \
$(use_enable doctool)
}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild
b/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild
index dcc8587..2c81cf5 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -26,7 +26,7 @@ if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
IUSE="${IUSE} doc"
else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
# virtual/pkgconfig needed at runtime, bug #505408
@@ -70,8 +70,8 @@ src_configure() {
# To prevent crosscompiling problems, bug #414105
gnome2_src_configure \
--disable-static \
- CC=$(tc-getCC) \
- YACC=$(type -p yacc) \
+ CC="$(tc-getCC)" \
+ YACC="$(type -p yacc)" \
$(use_with cairo) \
$(use_enable doctool)
}
