commit: 2bbedc7f3e2f2e5c4711b17c334a58a902bf244c
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 15:54:58 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 10 15:57:16 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2bbedc7f
dev-libs/libpeas: 1.12.1-r1 → 1.14.0
.../{libpeas-9999.ebuild => libpeas-1.14.0.ebuild} | 44 +++++++++++-----------
dev-libs/libpeas/libpeas-9999.ebuild | 30 ++++++++++-----
2 files changed, 41 insertions(+), 33 deletions(-)
diff --git a/dev-libs/libpeas/libpeas-9999.ebuild
b/dev-libs/libpeas/libpeas-1.14.0.ebuild
similarity index 73%
copy from dev-libs/libpeas/libpeas-9999.ebuild
copy to dev-libs/libpeas/libpeas-1.14.0.ebuild
index 0a8665d..c5edaf4 100644
--- a/dev-libs/libpeas/libpeas-9999.ebuild
+++ b/dev-libs/libpeas/libpeas-1.14.0.ebuild
@@ -1,40 +1,34 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
inherit gnome2 multilib python-r1 virtualx
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="A GObject plugins library"
HOMEPAGE="http://developer.gnome.org/libpeas/stable/";
LICENSE="LGPL-2+"
SLOT="0"
-IUSE="+gtk glade +python seed"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="+gtk glade jit lua +python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ?? ( $(python_gen_useflags
'python3*') ) )"
-if [[ ${PV} = 9999 ]]; then
- IUSE="${IUSE} doc"
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-fi
RDEPEND="
- >=dev-libs/glib-2.32:2
+ >=dev-libs/glib-2.38:2
>=dev-libs/gobject-introspection-1.39
glade? ( >=dev-util/glade-3.9.1:3.10 )
gtk? ( >=x11-libs/gtk+-3:3[introspection] )
+ lua? (
+ dev-lua/lgi
+ jit? ( >=dev-lang/luajit-2 )
+ !jit? ( >=dev-lang/lua-5.1 ) )
python? (
${PYTHON_DEPS}
- >=dev-python/pygobject-3.0.0:3[${PYTHON_USEDEP}] )
- seed? ( >=dev-libs/seed-2.91.91 )
+ >=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}] )
"
DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.11
@@ -42,23 +36,27 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
"
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND} doc? ( >=dev-util/gtk-doc-1.11 )"
-fi
-
src_configure() {
+ # Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
+ # What do we do about gdb, valgrind, gcov, etc?
local myconf=(
$(use_enable glade glade-catalog)
$(use_enable gtk)
- $(use_enable seed)
- --disable-deprecation
--disable-static
# possibly overriden below
--disable-python{2,3}
+ --disable-lua5.1
+ --disable-luajit
)
- # Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
- # What do we do about gdb, valgrind, gcov, etc?
+
+ if use lua ; then
+ if use jit ; then
+ myconf+=( --enable-luajit )
+ else
+ myconf+=( --enable-lua5.1 )
+ fi
+ fi
python_configure() {
local v
diff --git a/dev-libs/libpeas/libpeas-9999.ebuild
b/dev-libs/libpeas/libpeas-9999.ebuild
index 0a8665d..7f4aaeb 100644
--- a/dev-libs/libpeas/libpeas-9999.ebuild
+++ b/dev-libs/libpeas/libpeas-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
inherit gnome2 multilib python-r1 virtualx
@@ -17,7 +16,7 @@ HOMEPAGE="http://developer.gnome.org/libpeas/stable/";
LICENSE="LGPL-2+"
SLOT="0"
-IUSE="+gtk glade +python seed"
+IUSE="+gtk glade jit lua +python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ?? ( $(python_gen_useflags
'python3*') ) )"
if [[ ${PV} = 9999 ]]; then
IUSE="${IUSE} doc"
@@ -27,14 +26,17 @@ else
fi
RDEPEND="
- >=dev-libs/glib-2.32:2
+ >=dev-libs/glib-2.38:2
>=dev-libs/gobject-introspection-1.39
glade? ( >=dev-util/glade-3.9.1:3.10 )
gtk? ( >=x11-libs/gtk+-3:3[introspection] )
+ lua? (
+ dev-lua/lgi
+ jit? ( >=dev-lang/luajit-2 )
+ !jit? ( >=dev-lang/lua-5.1 ) )
python? (
${PYTHON_DEPS}
- >=dev-python/pygobject-3.0.0:3[${PYTHON_USEDEP}] )
- seed? ( >=dev-libs/seed-2.91.91 )
+ >=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}] )
"
DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.11
@@ -47,18 +49,26 @@ if [[ ${PV} = 9999 ]]; then
fi
src_configure() {
+ # Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
+ # What do we do about gdb, valgrind, gcov, etc?
local myconf=(
$(use_enable glade glade-catalog)
$(use_enable gtk)
- $(use_enable seed)
- --disable-deprecation
--disable-static
# possibly overriden below
--disable-python{2,3}
+ --disable-lua5.1
+ --disable-luajit
)
- # Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
- # What do we do about gdb, valgrind, gcov, etc?
+
+ if use lua ; then
+ if use jit ; then
+ myconf+=( --enable-luajit )
+ else
+ myconf+=( --enable-lua5.1 )
+ fi
+ fi
python_configure() {
local v
