Move gjs from gnome overlay to the tree

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

5 files changed, 294 insertions, 0 deletions

diff --git a/dev-libs/gjs/ChangeLog b/dev-libs/gjs/ChangeLog
new file mode 100644
index 000000000000..c7f87fc7adf1
--- /dev/null
+++ b/dev-libs/gjs/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for dev-libs/gjs
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/ChangeLog,v 1.1 2011/05/01 15:40:39 nirbheek Exp $
+
+*gjs-0.7.14 (01 May 2011)
+
+  01 May 2011; Nirbheek Chauhan <nirbheek@gentoo.org> +gjs-0.7.14.ebuild,
+  +files/gjs-drop-js-config.patch, +metadata.xml:
+  Move gjs from gnome overlay to the tree
+
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
new file mode 100644
index 000000000000..4c7d8bd315d1
--- /dev/null
+++ b/dev-libs/gjs/Manifest
@@ -0,0 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gjs-drop-js-config.patch 6799 RMD160 13fdc474874d8adda08dda4191df77a2539834b8 SHA1 fa7dfbe4191c6987fd9156919b4e5d9da45be1cd SHA256 cc50fa4e1a6fd2ba6759fab56362085ecc0438cefb2426eee11b1314b93586cf
+DIST gjs-0.7.14.tar.bz2 515857 RMD160 f3183aaf98c6b37c6bf445e6309cd7f1f516a915 SHA1 d9955428f5cbe7a6714197da1e4dbe5d6d60360d SHA256 3af6f449a505c419d4a0e5938737da8d1b9b09b33710cc1ac1edee2eaa86e348
+EBUILD gjs-0.7.14.ebuild 1701 RMD160 46605db1245af117796499a26f48bb1a909c993f SHA1 0b697d32c500b5de55383d84d575240694146b72 SHA256 0a0b62d96019aa77cdc298bdc2d68333cc4fcdab173ff8af79c72f3a5b1f5ca4
+MISC ChangeLog 393 RMD160 4123ae8fb31991d1c54f4466aae3845a84a3b43e SHA1 4c97ef53386add6bc96c8646a7a95151189fd883 SHA256 fd48daf6bce6932cf877cfd2c524e63a57ded8e85cea04892fcaa764fdd6fb8b
+MISC metadata.xml 285 RMD160 829826c3a3edd13d82bf87a4e6c1c08719f1549f SHA1 03e8b2cfc1956cfea91e8cedfa2451e68b2bf8e5 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNvX8AAAoJEO/kOhxWD91k9F4QAIrVmMX1VsTQPhkZzQwAxHkZ
+9zSOgLcgsEodjyACKgHwWQFV3uuAbkl8hFsBTNpGLKV3cb2zkVsWrZZolOD42Mzh
++rst4m8y5gluyTnGIN9uSnDS4aFEbWocx7A8Uu/T79eGqxyN8aH7GnU3uENXW8ew
+GHWtJtvELE0H+OMaSxseWp9uXVJU8wqtrQLe2xtyaRfyMLFUpCf2m4AcAfHRcLeD
+0V5WZGJHmVE1yDOXV00T7+eMhtE65Cwbef12zCgmdLcIkBtEsSQt1bR1pbuXuNch
+qRdkMf0F2r0vBTMFed3M5Opdwh6q6GcgOWgobYROj/zdCgMOv+NMU7y+cPyhDEeO
++d7sc3ablv/pbJYdWa6GczJOrWzLi2gnZ3JtpuO5Y6G0/HwHxn6aPz46saEp1rQS
+QbTD1yvN+pp/6yBVTxKhKcubnLVukm4iIrj8VZH7BAF/O9u+T2elxryhP/mkAaEr
+vJ2cGEIaHs4xarkBIh6i+AWHx1t8oSOjoL2vON6gJ9CHvNpQMBI6z9EaFTOLKwkc
+lBhRbpjm3FD7Ijb1Zu/SpReOOuBcCpRKqkvvr8z1UGVKwNT3oGaurxc6ql9ky0Gz
+8/E+q9SdqDKx3NW+dfi5aLYpl9jULe1jaEzA6XKYFsUoc6DB8x/kP/hjkLfD0ynA
+y2i+dSXia7a+bRh1nBWp
+=OsoC
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/gjs/files/gjs-drop-js-config.patch b/dev-libs/gjs/files/gjs-drop-js-config.patch
new file mode 100644
index 000000000000..0a8609ab523a
--- /dev/null
+++ b/dev-libs/gjs/files/gjs-drop-js-config.patch
@@ -0,0 +1,183 @@
+From 4de63456b411ae2b16cdb813cf021e3f2e19e5f3 Mon Sep 17 00:00:00 2001
+From: Nirbheek Chauhan <nirbheek@gentoo.org>
+Date: Thu, 17 Mar 2011 05:07:06 +0530
+Subject: [PATCH] build: drop js-config support and xulrunner-1.8/1.9 cruft
+
+In addition, add JS_LIBS to gjs_console_LDADD so that the
+mozjs library in libdir from pkg-config is picked up first instead of
+the library in /usr/lib which may be from a system install of spidermonkey
+---
+ Makefile.am             |    1 +
+ configure.ac            |  114 +++++++---------------------------------------
+ gjs-internals-1.0.pc.in |    2 +-
+ 3 files changed, 20 insertions(+), 97 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index b4814d6..3363ff5 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -121,6 +121,7 @@ gjs_console_CFLAGS = 		\
+ 	$(AM_CFLAGS)		\
+         $(GOBJECT_CFLAGS)
+ gjs_console_LDADD =		\
++         $(JS_LIBS)		\
+          $(GOBJECT_LIBS)           \
+          libgjs.la
+ gjs_console_LDFLAGS = -R $(FIREFOX_JS_LIBDIR) -rdynamic
+diff --git a/configure.ac b/configure.ac
+index 715f2c3..1903cc6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -91,54 +91,26 @@ m4_define(gobject_required_version, 2.18.0)
+ AC_CHECK_HEADERS([malloc.h])
+ AC_CHECK_FUNCS(mallinfo)
+ 
+-# Look for Spidermonkey. If js-config exists, use that;
+-# otherwise we try some pkgconfig files from various distributions.
++## mozilla-js: Gecko 1.9 and 2.0, all distributions
++PKG_CHECK_EXISTS([mozilla-js], [JS_PACKAGE=mozilla-js],)
++PKG_CHECK_MODULES(JS, $JS_PACKAGE)
+ 
+-AC_ARG_VAR([JS_CONFIG], [The js-config program to use])
+-if test "$ac_cv_env_JS_CONFIG_set" != "set"; then
+-    AC_PATH_PROG([JS_CONFIG], [js-config], [])
+-fi
+-
+-if test -n "$JS_CONFIG"; then
+-    JS_CFLAGS="$($JS_CONFIG --cflags)"
+-    JS_LIBS="$($JS_CONFIG --libs)"
+-    FIREFOX_JS_LIBDIR="$($JS_CONFIG --libdir)"
+-    JS_PACKAGE=
++## some flavors of Firefox .pc only set sdkdir, not libdir
++FIREFOX_JS_SDKDIR=`$PKG_CONFIG --variable=sdkdir $JS_PACKAGE`
++FIREFOX_JS_LIBDIR=`$PKG_CONFIG --variable=libdir $JS_PACKAGE`
+ 
+-    # js-config gives almost usable CFLAGS, we must define one of XP_BEOS,
+-    # XP_OS2, XP_WIN or XP_UNIX
+-    JS_CFLAGS="$JS_CFLAGS -DXP_UNIX"
+-else
+-    ## spidermonkey .pc file name varies across distributions and Gecko version
+-    ##
+-    ## mozilla-js: Gecko 1.9, all distributions
+-    ## xulrunner-js: Gecko 1.8 (and earlier?) Debian/Ubuntu
+-    ## firefox-js: ???
+-    ##
+-    ## Checking for mozilla-js first will hopefully get us the newest version
+-    ## of spidermonkey.
+-    PKG_CHECK_EXISTS([mozilla-js], [JS_PACKAGE=mozilla-js],
+-                     [PKG_CHECK_EXISTS([xulrunner-js], [JS_PACKAGE=xulrunner-js], [JS_PACKAGE=firefox-js])])
+-
+-    PKG_CHECK_MODULES(JS, $JS_PACKAGE)
+-
+-    ## some flavors of Firefox .pc only set sdkdir, not libdir
+-    FIREFOX_JS_SDKDIR=`$PKG_CONFIG --variable=sdkdir $JS_PACKAGE`
+-    FIREFOX_JS_LIBDIR=`$PKG_CONFIG --variable=libdir $JS_PACKAGE`
+-
+-    ## Ubuntu does not set libdir in mozilla-js.pc
+-    if test x"$FIREFOX_JS_LIBDIR" = x ; then
+-       ## Ubuntu returns xulrunner-devel as the sdkdir, but for the
+-       ## libdir we want the runtime location on the target system,
+-       ## so can't use -devel.
+-       ## The library is in the non-devel directory also.
+-       ## Don't ask me why it's in two places.
+-       FIREFOX_JS_LIBDIR=`echo "$FIREFOX_JS_SDKDIR" | sed -e 's/-devel//g'`
+-
+-       if ! test -d "$FIREFOX_JS_LIBDIR" ; then
+-           FIREFOX_JS_LIBDIR=
+-       fi
+-    fi
++## Ubuntu does not set libdir in mozilla-js.pc
++if test x"$FIREFOX_JS_LIBDIR" = x ; then
++   ## Ubuntu returns xulrunner-devel as the sdkdir, but for the
++   ## libdir we want the runtime location on the target system,
++   ## so can't use -devel.
++   ## The library is in the non-devel directory also.
++   ## Don't ask me why it's in two places.
++   FIREFOX_JS_LIBDIR=`echo "$FIREFOX_JS_SDKDIR" | sed -e 's/-devel//g'`
++
++   if ! test -d "$FIREFOX_JS_LIBDIR" ; then
++       FIREFOX_JS_LIBDIR=
++   fi
+ fi
+ 
+ if test x"$FIREFOX_JS_LIBDIR" = x ; then
+@@ -179,35 +151,6 @@ else
+   AC_MSG_RESULT([no])
+ fi
+ 
+-## workaround for Ubuntu Hardy bug where mozilla-js.pc gives CFLAGS
+-## -I.../stable while jsapi.h is in .../unstable
+-AC_MSG_CHECKING([if SpiderMonkey needs extra compiler flags])
+-save_CFLAGS="$CFLAGS"
+-CFLAGS="$CFLAGS $JS_CFLAGS"
+-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <jsapi.h>]])],
+-    [js_extra_cflags_needed=no],
+-    [js_extra_cflags_needed=yes])
+-CFLAGS="$save_CFLAGS"
+-AC_MSG_RESULT([$js_extra_cflags_needed])
+-
+-JS_EXTRA_CFLAGS=
+-if test "$js_extra_cflags_needed" = yes; then
+-    try_cflags="-I`$PKG_CONFIG --variable=includedir $JS_PACKAGE`/unstable"
+-    AC_MSG_CHECKING([if $try_cflags works])
+-    save_CFLAGS="$CFLAGS"
+-    CFLAGS="$CFLAGS $JS_CFLAGS $try_cflags"
+-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <jsapi.h>]])],
+-        [AC_MSG_RESULT([yes])
+-         JS_EXTRA_CFLAGS="$try_cflags"],
+-        [AC_MSG_RESULT([no])])
+-    CFLAGS="$save_CFLAGS"
+-
+-    if test x"$JS_EXTRA_CFLAGS" = x; then
+-        AC_MSG_ERROR([Unable to determine extra compiler flags needed])
+-    fi
+-fi
+-AC_SUBST([JS_EXTRA_CFLAGS])
+-
+ AC_MSG_CHECKING([whether JSLocaleToUnicode takes a const char*])
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $JS_CFLAGS -Wno-unused -Werror"
+@@ -258,27 +201,6 @@ PKG_CHECK_MODULES([GJSTESTS], [$gjstests_packages])
+ GI_DATADIR=$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0)
+ AC_SUBST(GI_DATADIR)
+ 
+-if test x"$JS_PACKAGE" = x; then
+-    # if JS_PACKAGE is undefined, pkg-config modules don't include
+-    # SpiderMonkey and we need to deal with it ourselves
+-    GJS_CFLAGS="$GJS_CFLAGS $JS_CFLAGS"
+-    GJS_LIBS="$GJS_LIBS $JS_LIBS"
+-    GJS_GI_CFLAGS="$GJS_GI_CFLAGS $JS_CFLAGS"
+-    GJS_GI_LIBS="$GJS_GI_LIBS $JS_LIBS"
+-    GJS_CAIRO_CFLAGS="$GJS_CAIRO_CFLAGS $JS_CFLAGS"
+-    GJS_CAIRO_LIBS="$GJS_CAIRO_LIBS $JS_LIBS"
+-    GJS_DBUS_CFLAGS="$GJS_DBUS_CFLAGS $JS_CFLAGS"
+-    GJS_DBUS_LIBS="$GJS_DBUS_LIBS $JS_LIBS"
+-    GJSTESTS_CFLAGS="$GJSTESTS_CFLAGS $JS_CFLAGS"
+-    GJSTESTS_LIBS="$GJSTEST_LIBS $JS_LIBS"
+-fi
+-
+-GJS_CFLAGS="$GJS_CFLAGS $JS_EXTRA_CFLAGS"
+-GJS_GI_CFLAGS="$GJS_GI_CFLAGS $JS_EXTRA_CFLAGS"
+-GJS_CAIRO_CFLAGS="$GJS_CAIRO_CFLAGS $JS_EXTRA_CFLAGS"
+-GJS_DBUS_CFLAGS="$GJS_DBUS_CFLAGS $JS_EXTRA_CFLAGS"
+-GJSTESTS_CFLAGS="$GJSTESTS_CFLAGS $JS_EXTRA_CFLAGS"
+-
+ # readline
+ LIBS_no_readline=$LIBS
+ 
+diff --git a/gjs-internals-1.0.pc.in b/gjs-internals-1.0.pc.in
+index 701dd42..e4517cb 100644
+--- a/gjs-internals-1.0.pc.in
++++ b/gjs-internals-1.0.pc.in
+@@ -10,7 +10,7 @@ jsdir=@gjsjsdir@
+ jsnativedir=@gjsnativedir@
+ mozjslibdir=@FIREFOX_JS_LIBDIR@
+ 
+-Cflags: -I${includedir}/gjs-1.0 @JS_EXTRA_CFLAGS@
++Cflags: -I${includedir}/gjs-1.0
+ Libs: -Wl,--rpath=${mozjslibdir}
+ Requires: gjs-1.0 gobject-introspection-1.0 @JS_PACKAGE@
+ 
+-- 
+1.7.3.4
+
diff --git a/dev-libs/gjs/gjs-0.7.14.ebuild b/dev-libs/gjs/gjs-0.7.14.ebuild
new file mode 100644
index 000000000000..32577dbc06e2
--- /dev/null
+++ b/dev-libs/gjs/gjs-0.7.14.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-0.7.14.ebuild,v 1.1 2011/05/01 15:40:39 nirbheek Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2"
+
+inherit autotools eutils gnome2 python virtualx
+
+DESCRIPTION="Javascript bindings for GNOME"
+HOMEPAGE="http://live.gnome.org/Gjs"
+
+LICENSE="MIT MPL-1.1 LGPL-2 GPL-2"
+SLOT="0"
+IUSE="examples test"
+KEYWORDS="~amd64 ~x86"
+
+# Things are untested and broken with anything other than xulrunner-2.0
+# FIXME: https://bugzilla.mozilla.org/show_bug.cgi?id=628723 instead of libxul
+RDEPEND=">=dev-libs/glib-2.18:2
+	>=dev-libs/gobject-introspection-0.10.1
+	>=net-libs/xulrunner-2.0:1.9
+
+	dev-libs/dbus-glib
+	sys-libs/readline
+	x11-libs/cairo"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	!dev-lang/spidermonkey"
+# HACK HACK: gjs-tests picks up /usr/lib/libmozjs.so with spidermonkey installed
+
+src_prepare() {
+	# AUTHORS, ChangeLog are empty
+	DOCS="NEWS README"
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	# XXX: Do NOT enable coverage, completely useless for portage installs
+	G2CONF="${G2CONF}
+		--disable-systemtap
+		--disable-dtrace
+		--disable-coverage"
+
+	# https://bugs.gentoo.org/353941
+	epatch "${FILESDIR}/${PN}-drop-js-config.patch"
+
+	eautoreconf
+
+	gnome2_src_prepare
+	python_convert_shebangs 2 "${S}"/scripts/make-tests
+}
+
+src_test() {
+	# Tests need dbus
+	Xemake check || die
+}
+
+src_install() {
+	# installation sometimes fails in parallel
+	gnome2_src_install -j1
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins ${S}/examples/* || die "doins examples failed!"
+	fi
+}
diff --git a/dev-libs/gjs/metadata.xml b/dev-libs/gjs/metadata.xml
new file mode 100644
index 000000000000..e86947c98b6e
--- /dev/null
+++ b/dev-libs/gjs/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+  <use>
+    <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+      for introspection</flag>
+  </use>
+</pkgmetadata>