Fix bug 275127 -- fix mozjs detection to work cleaner, and with seamonkey too

(Portage version: 2.2_rc33/cvs/Linux i686)

4 files changed, 30 insertions, 32 deletions

diff --git a/net-libs/libproxy/ChangeLog b/net-libs/libproxy/ChangeLog
index b787206c56a6..45dc54aa38ce 100644
--- a/net-libs/libproxy/ChangeLog
+++ b/net-libs/libproxy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/libproxy
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.12 2009/05/20 19:17:21 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.13 2009/06/24 13:58:13 nirbheek Exp $
+
+*libproxy-0.2.3-r1 (24 Jun 2009)
+
+  24 Jun 2009; <nirbheek@gentoo.org> +libproxy-0.2.3-r1.ebuild,
+  -files/libproxy-0.2.3-fix-libxul-cflags.patch,
+  +files/libproxy-0.2.3-fix-mozjs-cflags.patch:
+  Fix bug 275127 -- fix mozjs detection to work cleaner, and with seamonkey
+  too
 
   20 May 2009; Brent Baude <ranger@gentoo.org> libproxy-0.2.3.ebuild:
   Marking libproxy-0.2.3 ~ppc64 for bug 268529
diff --git a/net-libs/libproxy/files/libproxy-0.2.3-fix-libxul-cflags.patch b/net-libs/libproxy/files/libproxy-0.2.3-fix-libxul-cflags.patch
deleted file mode 100644
index 0ee34f0408a9..000000000000
--- a/net-libs/libproxy/files/libproxy-0.2.3-fix-libxul-cflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
- configure.ac |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index bfea453..844896b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -23,6 +23,7 @@ PKG_CHECK_MODULES(mozjs, xulrunner-js, have_mozjs=yes,
- PKG_CHECK_MODULES(NetworkManager, NetworkManager, 
- 					have_networkmanager=yes, have_networkmanager=no)
- PKG_CHECK_MODULES(dbus, dbus-1, have_dbus=yes, have_dbus=no)
-+PKG_CHECK_MODULES(libxul_unstable, libxul-unstable, have_mozjs=yes, have_mozjs=no)
- 
- # Environmental Variable
- AC_ARG_WITH([envvar],
-@@ -117,8 +118,8 @@ AC_ARG_WITH([mozjs],
-             [test x$have_mozjs == xyes && with_mozjs=yes])
- if test x$with_mozjs = xyes; then
- 	if test x$have_mozjs == xyes; then
--		MOZJS_CFLAGS="$mozjs_CFLAGS"
--		MOZJS_LIBS="$mozjs_LIBS"
-+		MOZJS_CFLAGS="$mozjs_CFLAGS $libxul_unstable_CFLAGS"
-+		MOZJS_LIBS="$mozjs_LIBS $libxul_unstable_LIBS"
- 		AC_SUBST(MOZJS_CFLAGS)
- 		AC_SUBST(MOZJS_LIBS)
- 	else
diff --git a/net-libs/libproxy/files/libproxy-0.2.3-fix-mozjs-cflags.patch b/net-libs/libproxy/files/libproxy-0.2.3-fix-mozjs-cflags.patch
new file mode 100644
index 000000000000..33c0b5b4585c
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.2.3-fix-mozjs-cflags.patch
@@ -0,0 +1,14 @@
+--- configure.ac-old	2008-06-05 15:56:16.000000000 -0500
++++ configure.ac	2009-06-22 23:00:28.582633887 -0500
+@@ -17,8 +17,10 @@
+ PKG_CHECK_MODULES(gconf, gconf-2.0, have_gconf=yes, have_gconf=no)
+ PKG_CHECK_MODULES(webkit, webkit-1.0, have_webkit=yes, have_webkit=no)
+ PKG_CHECK_MODULES(mozjs, xulrunner-js, have_mozjs=yes, 
++		[PKG_CHECK_MODULES(mozjs, libxul-unstable, have_mozjs=yes,
++		[PKG_CHECK_MODULES(mozjs, seamonkey-js , have_mozjs=yes,
+ 		[PKG_CHECK_MODULES(mozjs, firefox-js, have_mozjs=yes,
+-		[PKG_CHECK_MODULES(mozjs, mozilla-js, have_mozjs=yes, have_mozjs=no)])])
++		[PKG_CHECK_MODULES(mozjs, mozilla-js, have_mozjs=yes, have_mozjs=no)])])])])
+ PKG_CHECK_MODULES(NetworkManager, NetworkManager, 
+ 					have_networkmanager=yes, have_networkmanager=no)
+ 
diff --git a/net-libs/libproxy/libproxy-0.2.3.ebuild b/net-libs/libproxy/libproxy-0.2.3-r1.ebuild
index f0d53722ebd3..67630cb35c2c 100644
--- a/net-libs/libproxy/libproxy-0.2.3.ebuild
+++ b/net-libs/libproxy/libproxy-0.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.2.3.ebuild,v 1.11 2009/05/20 19:17:21 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.2.3-r1.ebuild,v 1.1 2009/06/24 13:58:13 nirbheek Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="gnome kde networkmanager python webkit xulrunner"
 
 RDEPEND="
@@ -26,7 +26,9 @@ RDEPEND="
 	networkmanager? ( net-misc/networkmanager )
 	python? ( >=dev-lang/python-2.5 )
 	webkit? ( net-libs/webkit-gtk )
-	xulrunner? ( >=net-libs/xulrunner-1.9 )
+	xulrunner? (
+		|| ( >=net-libs/xulrunner-1.9
+			 www-client/seamonkey ) )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.19"
@@ -41,8 +43,8 @@ src_prepare() {
 	# http://code.google.com/p/libproxy/issues/detail?id=25
 	epatch "${FILESDIR}/${P}-fix-as-needed-problem.patch"
 
-	# http://bugs.gentoo.org/show_bug.cgi?id=259178
-	epatch "${FILESDIR}/${P}-fix-libxul-cflags.patch"
+	# http://bugs.gentoo.org/show_bug.cgi?id=275127
+	epatch "${FILESDIR}/${P}-fix-mozjs-cflags.patch"
 
 	# Fix implicit declaration QA, bug #268546
 	epatch "${FILESDIR}/${P}-implicit-declaration.patch"