Call java-pkg-opt-2_pkg_setup in pkg_setup to fix bug #228715.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 i686

4 files changed, 22 insertions, 6 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index d688f5dd23ff..2d2e4dfc5d0c 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.121 2008/06/21 21:13:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.122 2008/06/29 15:39:55 betelgeuse Exp $
+
+  29 Jun 2008; Petteri Räty <betelgeuse@gentoo.org>
+  xulrunner-1.8.1.14.ebuild, xulrunner-1.9-r2.ebuild:
+  Call java-pkg-opt-2_pkg_setup in pkg_setup to fix bug #228715.
 
   21 Jun 2008; Raúl Porcel <armin76@gentoo.org> xulrunner-1.8.1.14.ebuild:
   Add check for pango and cairo to be built with X, bug #228801
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index b9b95487e395..d2e885684e42 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xulrunner.conf 113 RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 SHA1 62cce7ee5b1e51343c3dbc388894011da913d9d4 SHA256 9ac56b42cfb48854d23c299330ad327af5f0815140dcb7fdee905b660cd9a8a3
 DIST xulrunner-1.8.1.11-patches-0.3.tar.bz2 62521 RMD160 06cb96500076ed532e5eead97b9fa4b10039baf9 SHA1 aac43a59f72343d4e7a5ff93fbb08ff683288176 SHA256 7211b85d309039907a4acb320f6434ddca36e600cf52ea709f4faf7a89a20eed
 DIST xulrunner-1.8.1.11-source.tar.bz2 35475483 RMD160 d2edc6abb2733942bbe37709644bddae2f17362b SHA1 87e005deaf13ef4bdc36a2a818a6ae847fde33be SHA256 072fb6dea5f4bc06c94ec237a97b23dabeecc5e6a74754b4259dbf2eb9c00945
@@ -6,7 +9,14 @@ DIST xulrunner-1.8.1.14-source.tar.bz2 35394629 RMD160 1fe5ef106d4ada9c407f1571b
 DIST xulrunner-1.9-patches-0.1.tar.bz2 5880 RMD160 bd5475536e06b81f08aaa9d43e8ff2f7afa380ed SHA1 399989329935c2b31797e2eb363684dba5eef908 SHA256 b0ae8dd3ac55a0caf720e3fe162d758f58d30e8ce874e9b7d87de23377896007
 DIST xulrunner-1.9.tar.bz2 34035285 RMD160 0cbc3e76c1ac43858375ab88610e5b68b2620d62 SHA1 091a1bf39c8b57b579fadb01c6377f357427cd90 SHA256 5a17a5e138fe5f3a39d6ad44eb9cba076360b7e1809e4b647c4ae4f316d8a2ee
 EBUILD xulrunner-1.8.1.11.ebuild 4858 RMD160 17de41e45e8b18be49bcbdc12d70ff06ced7ce60 SHA1 0e12768437e8dca58af17cc0330e003bca575e76 SHA256 d8fc4b0b29beecbd73135ed4d51bed81476dde139eb604e1a20fe3725dc453ab
-EBUILD xulrunner-1.8.1.14.ebuild 5232 RMD160 f4378e94c66cddf0302c3aed0bf718722a1deaec SHA1 fe7223fda751dd8cd24371297b9949be5da4164d SHA256 7171fa43a878bb17b9ec27d20554714f950253ef3464f14b6514ce2fa46b7f3e
-EBUILD xulrunner-1.9-r2.ebuild 5416 RMD160 023eaf46507125e49f32f2220f3e2ab3ae280a7e SHA1 faf5a1e9e66455895c30f3c2a26cc9f1367d4526 SHA256 7952e6172f685362e696720569a66fafd994c8eafa214a09cce47e270d85efa4
-MISC ChangeLog 15195 RMD160 56827147e7ce42e66fcaa92281f264e76a3d643d SHA1 feea98dcc7886e2e64e2f013940feef6e2c0b47a SHA256 2deb94f701ee52da50923a7bfa3eea34c895dc348d64141a17809b5d807c345b
+EBUILD xulrunner-1.8.1.14.ebuild 5261 RMD160 47a4e205603c2762583d716404e99d6d0c4a6669 SHA1 8308ec47b1e945f36e77dd5bae6f6953d6ef3638 SHA256 772c1445b81c1b513b18758a68dd8172a7c01939d065ab4f344ff74b61b2ebfa
+EBUILD xulrunner-1.9-r2.ebuild 5445 RMD160 5b4b56b34b1d307966d93903a440369b7a93933a SHA1 ffc5896c47c528cff47efbb1dbc5213cac38cbf3 SHA256 e2cfeed1abba9d0f7cef1db84b6718410433fe151eeb1454e0aa021dff5feabd
+MISC ChangeLog 15371 RMD160 cc061b3cc8df5e7e1967d78a00d624b21bd9bb97 SHA1 b3af3d0814e957196de7015a060f725e8251c099 SHA256 77923b68f961fc3b70cee2f511a6cabd87cc6645727032360ed05c4cafc54690
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhnrNkACgkQcxLzpIGCsLScqwCff53UmzEWPQCW/t+XVEJ90hBL
+MfMAoI6JC56QiIJHLl8zDyhzcNbVXim3
+=paKx
+-----END PGP SIGNATURE-----
diff --git a/net-libs/xulrunner/xulrunner-1.8.1.14.ebuild b/net-libs/xulrunner/xulrunner-1.8.1.14.ebuild
index 5176384d0e24..960026426a94 100644
--- a/net-libs/xulrunner/xulrunner-1.8.1.14.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.8.1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.8.1.14.ebuild,v 1.7 2008/06/21 21:13:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.8.1.14.ebuild,v 1.8 2008/06/29 15:39:55 betelgeuse Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -48,6 +48,7 @@ pkg_setup(){
 		eerror "Please add 'X' to your USE flags, and re-emerge pango."
 		die "Pango needs X"
 	fi
+	java-pkg-opt-2_pkg_setup
 }
 
 src_unpack() {
diff --git a/net-libs/xulrunner/xulrunner-1.9-r2.ebuild b/net-libs/xulrunner/xulrunner-1.9-r2.ebuild
index ff39013c3fe4..c7021430eb14 100644
--- a/net-libs/xulrunner/xulrunner-1.9-r2.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9-r2.ebuild,v 1.4 2008/06/20 15:03:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9-r2.ebuild,v 1.5 2008/06/29 15:39:55 betelgeuse Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -50,6 +50,7 @@ pkg_setup(){
 		eerror "Please add 'X' to your USE flags, and re-emerge pango."
 		die "Pango needs X"
 	fi
+	java-pkg-opt-2_pkg_setup
 }
 
 src_unpack() {