Bump to 1.30.0, from gnome-next, make it spidermonkey-only

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

diff --git a/dev-libs/gjs/ChangeLog b/dev-libs/gjs/ChangeLog
index 44be977124e7ce3dcaf857ce28753206b9f354d9..e64e15f25c5cd3aef8483f82d56f80adb12974ed 100644 (file)
--- a/dev-libs/gjs/ChangeLog
+++ b/dev-libs/gjs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.2 2011/06/14 13:19:59 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/ChangeLog,v 1.3 2011/09/30 14:49:28 nirbheek Exp $
+
+*gjs-1.30.0 (30 Sep 2011)
+
+  30 Sep 2011; Nirbheek Chauhan <nirbheek@gentoo.org> -gjs-1.29.0.ebuild,
+  +gjs-1.30.0.ebuild:
+  Bump to 1.30.0, from gnome-next, make it spidermonkey-only
 
 *gjs-1.29.0 (14 Jun 2011)
 

diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 23e7605214963ba23ad566f9ef8ee8da74f21f9a..655655ca1127f4a05aed950c1141a60fa3b82aef 100644 (file)
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -3,25 +3,25 @@ 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
-DIST gjs-1.29.0.tar.xz 431552 RMD160 8ac905f6919557efefec8e98a5e1b76bf702a150 SHA1 2d1da94bc56f35beedbdd703c65a2d60beb08cb6 SHA256 eda776568847ea598b74fa1d4b8b851fb183732d1c1e9832b2b2bef19416c1ef
+DIST gjs-1.30.0.tar.xz 454672 RMD160 e5126353596bd5c8d0ecb7afa49871f52f64315b SHA1 2061401687717f4bf4e11ef20ff039a250700b43 SHA256 ffe01980dd183abd96b2cc861d2e86ef12751d0a1af86daa4c491b82c74ac7b9
 EBUILD gjs-0.7.14.ebuild 1703 RMD160 d1c1df54f4e5805b87914eebcd11c8425e7f42ae SHA1 e18c001d85be4d3a6be9b0212d4be429d14772f4 SHA256 d4ffce987fab08a23636777219ca523641e602c4d7027267565f8a625bbd83e3
-EBUILD gjs-1.29.0.ebuild 1540 RMD160 5b0ca89c0736700dda013aff8a920c630f3c363e SHA1 3bfce9c2f31316fc82052c645df8760046506be2 SHA256 26b2a6934327759ff7cc41398050639e5aba1cb882d96b2569f02b2e27a39057
-MISC ChangeLog 535 RMD160 4879b06e3b1e03c57f5af6508c63b25e4899e7ec SHA1 e239b1c169aa6cc13c529145802f1b39d55d14c5 SHA256 7de0111d879ff2f532bd96d1ac9764095a7f093ee0badc3820531e3610e694bf
+EBUILD gjs-1.30.0.ebuild 1476 RMD160 67f2e53cbf1fca08f9d564966778da4a7318b45d SHA1 fcbc3515b24ad1cc946333c8c82671e7605bf704 SHA256 d566e0a5e9e2ce1819635611be465033d37e3afc64192d8a24220ce5eeabb989
+MISC ChangeLog 720 RMD160 22dedd9fd1fd13d28b6e8ab791789fc29a23e31a SHA1 bb2b91b5976e093f968c76a3d861c931943798dc SHA256 d12c9b469c6c3e25da6419049a6c54da7561cdf24cacfc9e7971a3f2bb1fe480
 MISC metadata.xml 160 RMD160 2b0d347221b384d4765ecdcccefbc74b0ae502ef SHA1 ae1b892a3e72888c5b66b520f15f740576f607ec SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJN92AFAAoJEO/kOhxWD91kpnsQALY+RSVQw7E1lf65Gxe4xm5m
-nQ+XN2ESiFHDSO+0c0gm+JYLhz9jGK2a8zK5Vq4NfcOh1uGUQdfaTAyF3hh5rECG
-ku2xfXDUWh+Gm7yd8JN/fqDyRaX4m8jCeaFOViVlVgROAVgTCsTIFsfZURQ7P+1V
-nwrnEHJ1R9SnondA4ziA37w0hddaIWvAAUxDYtpJpq38d6r0dfEAaTjgjWyO6XcG
-TYfuV4HulT55Qbx7vaaSglR93gqJSPMF673DOONGX/RXNd/FBZYxbdGluwDxiI3s
-YUCJ+m/NrX/hfyTsA6ZNItIpQHH+NucC4+HleNES44QzEBtFrCNligm+I/Y76BG+
-5oSrqEagdvp+qsoAqoyDtYyiuf5r5rTVIStBkQRAE5eSnIKowm2rGYs3UtMiO49t
-g5dJwZfcgg8+cF6mICPkkOIQ3iMUUKK0mAMxE5Fu314ZMa9WamXMQE+mfyYqVonJ
-w87BYxJnAeZecOOUoSST/QJmrc2A82ACsPqetLLKVLQq7mzXgzjcI6Y65papd/QA
-fmrljJ10H8H0qtCeJVAnBUPP8biSZDghQmOddyXd4Hv3NwiLvvEhcTdD40Ap8DkO
-LlJZrzyG8L/zhauCPdKnPYlLLqOvSoBPQC0YLSxpMIHC4kfWc9J4Lr9Uh08JrJ2W
-7fFsS5EAoe56QM67sMAc
-=HrhQ
+iQIcBAEBAgAGBQJOhdb8AAoJEO/kOhxWD91k4vMP/25BqMrDNDfyEADGLhaNj2wH
+J3Ul4hhhftfHt9UXn9SQzEgJ3w4OQnz6z1yoMyo+23SU1tOXpyogXXaKYHHkVQzO
+zPFFqXJg90R/NHHOUEeyiD8LdnAgjPcrog1/HEiZV7uxGo/tLj50H98NKJuy1V57
+CSaFrMGqNlhGnzYnMQj686OYavDDavZKdaw62tBo0m/ltfpe+JxDRkhIGjAtiI2M
+EJhXFzvBXu3bjTev+AjAinw1LZBkDARibVJdOjrKbhuxDXviiGxFPMyg3nJ+bIJM
+WU/2+LZ4QGrOgqkdjl8J25q2rrFiWeV64tJhK0DtbUsNuYNVRnwPkks4o7gV4f7d
+XvUv5SH0Xe4HyPxDISxAB+rHyb+O0+gLV7xABtRRqO53EuZ8V3PQA08SlN/lnP3A
+YUOadtec1c7HyoazHYISoUua+Kll53S0tjJ1txn2nkRBaQ+VvcGNKgUYziXHadpx
+2/fZYyCEKFEn3forUp1tq51Uj2iX4/74mmgTcxxYLpC8SxZQmNcos+xblWlL+eAD
+v9quaj5oH38Ksti0f8czJqu01nLNU1x3A0v9Wj5waF6bB9cLxAnG0seU75yjto5J
+eOlrRnoJ8Bydw2qmEOlca1eKKYNmlWlGrjsOwPw4eSmUqPqjGbYThf5uqmLNEIWB
+ZOuHNcSrr2wwopMfldLi
+=t6qc
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/gjs/gjs-1.29.0.ebuild b/dev-libs/gjs/gjs-1.30.0.ebuild
similarity index 72%
rename from dev-libs/gjs/gjs-1.29.0.ebuild
rename to dev-libs/gjs/gjs-1.30.0.ebuild
index 14a7724326639fb60f77d5ae5d5aafe23be87e6b..f8230b82e608a944ac90b923da12f6fbac914fdf 100644 (file)
--- a/dev-libs/gjs/gjs-1.29.0.ebuild
+++ b/dev-libs/gjs/gjs-1.30.0.ebuild
@@ -1,6 +1,6 @@
 # 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-1.29.0.ebuild,v 1.1 2011/06/14 13:19:59 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.30.0.ebuild,v 1.1 2011/09/30 14:49:28 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -8,7 +8,7 @@ GNOME_TARBALL_SUFFIX="xz"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2"
 
-inherit eutils gnome2 python virtualx
+inherit gnome2 python virtualx
 
 DESCRIPTION="Javascript bindings for GNOME"
 HOMEPAGE="http://live.gnome.org/Gjs"
@@ -18,30 +18,31 @@ SLOT="0"
 IUSE="examples test"
 KEYWORDS="~amd64 ~x86"
 
-# Things are untested and broken with anything other than xulrunner-2.0
 RDEPEND=">=dev-libs/glib-2.18:2
-       >=dev-libs/gobject-introspection-0.10.1
+       >=dev-libs/gobject-introspection-1.29.16
 
        dev-libs/dbus-glib
        sys-libs/readline
        x11-libs/cairo
-       >=net-libs/xulrunner-2.0:1.9"
+       >=dev-lang/spidermonkey-1.8.5"
 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
+       >=dev-util/pkgconfig-0.9"
 
-src_prepare() {
+pkg_setup() {
        # AUTHORS, ChangeLog are empty
        DOCS="NEWS README"
        # FIXME: add systemtap/dtrace support, like in glib:2
+       # FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
        # XXX: Do NOT enable coverage, completely useless for portage installs
        G2CONF="${G2CONF}
+               --with-js-package=mozjs185
                --disable-systemtap
                --disable-dtrace
                --disable-coverage"
+}
 
+src_prepare() {
        gnome2_src_prepare
        python_convert_shebangs 2 "${S}"/scripts/make-tests
 }