dev-libs/gjs: 1.33.10 → 1.33.14

4 files changed, 8 insertions, 42 deletions

diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 7cea53cc..ddac3a12 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,4 +1,3 @@
-AUX gjs-1.33.10-gold.patch 1132 SHA256 de57c293de64507e8d83966145de427327204353383fa6d53a04580f851fb718 SHA512 6e964c589b00f3c1ab402f6a0ca55c9636f3ace8ef13f1f862dc46ba1e6c194316bd81d6a5766af92943f869ab2987276a22b97a73ed7d823a80a6194c21fca3 WHIRLPOOL 60d61667b4e3a1a24f014ff0d9ba5c35a6a6cfc40a20c49a27660b0345880a3cd6b82479aa46b376bbfb877b4dda773cfe61ea61dfd7d7a9b84b475656f2b9ea
-DIST gjs-1.33.10.tar.xz 473420 SHA256 b856e329eac8208e6618d7e5a7176828ffcc8bb8bb72cf13c34d66524d0ecafd SHA512 f7bc46e4b37338173bbe6143ada30f336651208985c3193f3616ce8e5561adec1318619e70af2417fb8b30c717b5ef5815434c75740d9b374a5fa6acfd9dbb55 WHIRLPOOL b6d6a14f498e63ca93a6d7b414bb47ee5706e916b180df022546527c4460b6882e7428aebccf34391614465503c765a9b894ab6a0e02663349b28d6c646a5df2
-EBUILD gjs-1.33.10.ebuild 1793 SHA256 f6e980ee2aea9789bee66e6c04b46ade7a802608dc9e6a7cbf460cff5d1d1e55 SHA512 8fa5e9ffe913012d95f1c6c9159d98d69d0a24e8b7fd26c1f8626dac07f057b8fd716732688548c6f5e5a356118bea7fdfcb2a4c991c3cd94e4cad543b2462a9 WHIRLPOOL 53374757a72d8c7b2f315853c10e8cc676cfdbdb853c2f81d0f599a46631c0fa21b363f348d33dd8126ffddad72176b815e2f5c0f8ec68aa9a4ad702c9880c82
-EBUILD gjs-9999.ebuild 1665 SHA256 0afcbf8663009b01e532b15d0754b8643db068b5b4c02f9236b1d22bc1989587 SHA512 db6466745bb8e9e3a6c2696b9325997e63468dd26e0b36ee47348acf719f731924e5ea444b793c149f2edfa6b3dcb7b6c97cf84d296499e518e67ca3b61170ea WHIRLPOOL f27e5db64b651f948072b0bf090a319c0e646a6618054c5daf201514d5c4a0bcc5cb8ecc41d1ea0396d68515c1fa4f6a69210f45b55fc9bf289e0b551d32da93
+DIST gjs-1.33.14.tar.xz 473472 SHA256 e7c4865dadf39bb0e87cd3a613d364214c8e90fa5488e12474b1cb1fd7487c96 SHA512 9cdc30316ba5c98def2bab03c33a6d10885ea903f3b8c15a433d9c44f4c6d796985515c5624db153df5085ae6e9068fb37c47f000f07c48f99e26d34fc097481 WHIRLPOOL 8a9b7fd4ed8433de0c8b53e93b636f4f220dcff4af17425b2f2b8c78f2adf64c68d81a375ad4a0cab79f5e85b130ed48c35a8d040fd184813dbff4ebe6de9870
+EBUILD gjs-1.33.14.ebuild 1696 SHA256 0b8cbf35073512263c5129b64f4e26c5f259408584552be54962bfb8ee89821d SHA512 d0b7169c08e9ba031836a2cb12ae4839bcae6cf5c1ba72c3cb6f59f2fd4e6cde0705b6f13783a0262ce21972126b4f98c1ed12da160bd058f4bf8b8493189966 WHIRLPOOL 9cbcf42e4bc03390296412a9c78ecc3fd0ee32a096e05f59f2db1f53939fba3ddd8239bf3e5f623cf71f0fd3a32afc737d31ec28f6dbcb6fb28a17fcdee243de
+EBUILD gjs-9999.ebuild 1696 SHA256 0b8cbf35073512263c5129b64f4e26c5f259408584552be54962bfb8ee89821d SHA512 d0b7169c08e9ba031836a2cb12ae4839bcae6cf5c1ba72c3cb6f59f2fd4e6cde0705b6f13783a0262ce21972126b4f98c1ed12da160bd058f4bf8b8493189966 WHIRLPOOL 9cbcf42e4bc03390296412a9c78ecc3fd0ee32a096e05f59f2db1f53939fba3ddd8239bf3e5f623cf71f0fd3a32afc737d31ec28f6dbcb6fb28a17fcdee243de
diff --git a/dev-libs/gjs/files/gjs-1.33.10-gold.patch b/dev-libs/gjs/files/gjs-1.33.10-gold.patch
deleted file mode 100644
index a2da173a..00000000
--- a/dev-libs/gjs/files/gjs-1.33.10-gold.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 27969620b7c357bbe7db76a0582638723e417ca7 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 15 Sep 2012 00:56:14 -0400
-Subject: [PATCH] build: Explicitly require libffi
-
-In >=gobject-introspection-1.33.2, libffi was moved from Requires to
-Requires.private. Since gjs directly uses ffi functions, a missing
-PKG_CHECK_MODULES for libffi results in build failure when using GNU
-gold as the linker.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=684064
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5c13722..9564a33 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -121,7 +121,7 @@ CFLAGS="$save_CFLAGS"
- GOBJECT_INTROSPECTION_REQUIRE([1.33.10])
- 
- common_packages="gmodule-2.0 gthread-2.0 gio-2.0 >= glib_required_version mozjs185"
--gjs_packages="gobject-introspection-1.0 $common_packages"
-+gjs_packages="gobject-introspection-1.0 libffi $common_packages"
- gjs_cairo_gobject_packages="cairo-gobject $common_packages"
- gjs_cairo_packages="cairo $common_packages"
- gjs_dbus_packages="dbus-glib-1 $common_packages"
--- 
-1.7.12
-
diff --git a/dev-libs/gjs/gjs-1.33.10.ebuild b/dev-libs/gjs/gjs-1.33.14.ebuild
index 45ba3fdc..bf4249e5 100644
--- a/dev-libs/gjs/gjs-1.33.10.ebuild
+++ b/dev-libs/gjs/gjs-1.33.14.ebuild
@@ -32,6 +32,7 @@ RDEPEND=">=dev-libs/glib-2.32:2
 	x11-libs/cairo
 	>=dev-lang/spidermonkey-1.8.5"
 DEPEND="${RDEPEND}
+	virtual/libffi
 	sys-devel/gettext
 	virtual/pkgconfig"
 
@@ -51,9 +52,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=684064
-	epatch "${FILESDIR}/${PN}-1.33.10-gold.patch"
-	eautoreconf
 	gnome2_src_prepare
 	python_convert_shebangs 2 "${S}"/scripts/make-tests
 }
diff --git a/dev-libs/gjs/gjs-9999.ebuild b/dev-libs/gjs/gjs-9999.ebuild
index 767438d5..bf4249e5 100644
--- a/dev-libs/gjs/gjs-9999.ebuild
+++ b/dev-libs/gjs/gjs-9999.ebuild
@@ -7,7 +7,7 @@ GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2"
 
-inherit gnome2 pax-utils python virtualx
+inherit autotools eutils gnome2 pax-utils python virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -25,13 +25,14 @@ else
 fi
 
 RDEPEND=">=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.33.2
+	>=dev-libs/gobject-introspection-1.33.10
 
 	dev-libs/dbus-glib
 	sys-libs/readline
 	x11-libs/cairo
 	>=dev-lang/spidermonkey-1.8.5"
 DEPEND="${RDEPEND}
+	virtual/libffi
 	sys-devel/gettext
 	virtual/pkgconfig"
 
@@ -45,8 +46,7 @@ pkg_setup() {
 		--disable-systemtap
 		--disable-dtrace
 		--disable-coverage
-		$(use_enable test tests)
-		"
+		$(use_enable test tests)"
 	python_set_active_version 2
 	python_pkg_setup
 }