commit: 219120cf4476f46efbd0f7ca256811f1816fe548
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 12 22:11:22 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Apr 15 20:58:57 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=219120cf
dev-libs/gjs: 1.38.1 → 1.40.0
---
.../gjs/{gjs-9999.ebuild => gjs-1.40.0.ebuild} | 23 +++++++++++-----------
dev-libs/gjs/gjs-9999.ebuild | 10 ++++++----
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/dev-libs/gjs/gjs-9999.ebuild b/dev-libs/gjs/gjs-1.40.0.ebuild
similarity index 77%
copy from dev-libs/gjs/gjs-9999.ebuild
copy to dev-libs/gjs/gjs-1.40.0.ebuild
index 105f53c..a2b3e58 100644
--- a/dev-libs/gjs/gjs-9999.ebuild
+++ b/dev-libs/gjs/gjs-1.40.0.ebuild
@@ -6,37 +6,35 @@ EAPI="5"
GCONF_DEBUG="no"
inherit gnome2 pax-utils virtualx
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="Javascript bindings for GNOME"
HOMEPAGE="http://live.gnome.org/Gjs";
LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
SLOT="0"
-IUSE="+cairo examples test"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
+IUSE="+cairo examples gtk test"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND="
>=dev-libs/glib-2.36:2
- >=dev-libs/gobject-introspection-1.38
+ >=dev-libs/gobject-introspection-1.39.3
sys-libs/readline
- dev-lang/spidermonkey:17
+ dev-lang/spidermonkey:24
virtual/libffi
cairo? ( x11-libs/cairo )
+ gtk? ( x11-libs/gtk+:3 )
"
DEPEND="${RDEPEND}
+ gnome-base/gnome-common
sys-devel/gettext
virtual/pkgconfig
test? ( sys-apps/dbus )
"
+# Large amount of tests are broken even in master.
+RESTRICT="test"
+
src_configure() {
# FIXME: add systemtap/dtrace support, like in glib:2
# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
@@ -45,7 +43,8 @@ src_configure() {
--disable-systemtap \
--disable-dtrace \
--disable-coverage \
- $(use_with cairo cairo)
+ $(use_with cairo cairo) \
+ $(use_with gtk)
}
src_test() {
diff --git a/dev-libs/gjs/gjs-9999.ebuild b/dev-libs/gjs/gjs-9999.ebuild
index 105f53c..6284717 100644
--- a/dev-libs/gjs/gjs-9999.ebuild
+++ b/dev-libs/gjs/gjs-9999.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://live.gnome.org/Gjs";
LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
SLOT="0"
-IUSE="+cairo examples test"
+IUSE="+cairo examples gtk test"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -24,12 +24,13 @@ fi
RDEPEND="
>=dev-libs/glib-2.36:2
- >=dev-libs/gobject-introspection-1.38
+ >=dev-libs/gobject-introspection-1.39.3
sys-libs/readline
- dev-lang/spidermonkey:17
+ dev-lang/spidermonkey:24
virtual/libffi
cairo? ( x11-libs/cairo )
+ gtk? ( x11-libs/gtk+:3 )
"
DEPEND="${RDEPEND}
sys-devel/gettext
@@ -45,7 +46,8 @@ src_configure() {
--disable-systemtap \
--disable-dtrace \
--disable-coverage \
- $(use_with cairo cairo)
+ $(use_with cairo cairo) \
+ $(use_with gtk)
}
src_test() {
