Fix bug #275318

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 23 insertions, 12 deletions

diff --git a/net-libs/libproxy/ChangeLog b/net-libs/libproxy/ChangeLog
index 0d8f25b1ff16..3e9cfc2c833d 100644
--- a/net-libs/libproxy/ChangeLog
+++ b/net-libs/libproxy/ChangeLog
@@ -1,6 +1,10 @@
 # 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.14 2009/06/24 15:43:08 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.15 2009/06/25 20:53:37 mrpouet Exp $
+
+  25 Jun 2009; Romain Perier <mrpouet@gentoo.org>
+  files/libproxy-0.2.3-fix-mozjs-cflags.patch:
+  Fix bug #275318
 
   24 Jun 2009; <nirbheek@gentoo.org> libproxy-0.2.3-r1.ebuild:
   Re-add alpha stable, it was added as a mistake initially, but we're going
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 58aebddf3fb1..a189378ccdc1 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1,10 +1,10 @@
 AUX libproxy-0.2.3-fbsd.patch 2316 RMD160 961c67621cb34a3f08904d362bd76fbb754a928c SHA1 ca2ae2649f69f5b0988d0b06d1771befce074cc0 SHA256 c07673422ba2592c6092914c92fa932702838ddf0ac5345fb7785b624e66121d
 AUX libproxy-0.2.3-fix-as-needed-problem.patch 574 RMD160 dfd95508caf9a19a73fac5b12cc43fa697c91abd SHA1 63ff8823cedb350d7cd0a3ed26886c1079dddd18 SHA256 9bbc0275b1a78db7ba4966c8169af1269154dc3d9bf716035ba193861bf4869d
 AUX libproxy-0.2.3-fix-dbus-includes.patch 1387 RMD160 ae39dca04f17f58f1a0c36208ceed8190af82d95 SHA1 f43e6d39ecaf7847c3f11255f56d205383e982e6 SHA256 31be2886acd191a80d86a75c9aec090998dd2b21ec23e64d0cda51e73b71d60e
-AUX libproxy-0.2.3-fix-mozjs-cflags.patch 770 RMD160 f261942d1328dafae7313add34b493d3024bd09d SHA1 9583d25a074b68e43efd97af8bc1282a007e1bb6 SHA256 3495d5abd7da88dca2da22e1d0e409cd2f6f6030a8feeb9462ac47fbd2b55130
+AUX libproxy-0.2.3-fix-mozjs-cflags.patch 1085 RMD160 91f182250e8d15f6339c839dd72681a88d3e5b2c SHA1 2601fc5fa725feda0adc173862f62a40cf8dff85 SHA256 a931ee62c7f85f89b781b3831756e5cb2826d31e3a5254ff4b284c43896a27f7
 AUX libproxy-0.2.3-fix-python-automagic.patch 858 RMD160 ec182cb70c84ffbf7faa8a1ff8f68b95b2e57155 SHA1 842170203e449b6fcd704fa1183956d1a079bab8 SHA256 0d21b238b2476920c4fcdcff238526ddac4ab3022d359a918aab0e3315f105a4
 AUX libproxy-0.2.3-implicit-declaration.patch 206 RMD160 12d2d0507a2d0c163b7c2d16d7d42ab5d0d7eb8f SHA1 b17dabc232bf9140629a5d987279800b3d2d19d8 SHA256 1ff409011d9a826999dd1478632a5ac18f793bb3d0028e83f89f78463ee88bf5
 DIST libproxy-0.2.3.tar.gz 378773 RMD160 c86c4f8403cb879380e101d074af469c960b5c1c SHA1 2b2b00a179740548035a1145bbae600db9b0a2ce SHA256 59ded160b3547d29e37cc9d06359f7f37d94112214e4532430cd65e704c1339a
 EBUILD libproxy-0.2.3-r1.ebuild 2377 RMD160 9fcb85ddeb6d7c2bfc9f5d5456fad7732c64f0ef SHA1 3d8ea111e0093af366baa31bfae75875e2b90d73 SHA256 022c94033d2b6bb0af23437a965491eddf4d70b524c4370c46ad53444d0e8038
-MISC ChangeLog 2912 RMD160 c9cfd33c7e7e116fffce4c4d8fdbec5f7b58a591 SHA1 5225bd7b8998f02a4b658a786a7b1ed75e73504d SHA256 6cd4f9c271e024ffe344f20f5a591897efcf96e83cbcbd497e6ef57c4521865e
+MISC ChangeLog 3027 RMD160 7afcac4dd739087ffb1c6a8ce7371e7eea78bb29 SHA1 aa52e919359115346af81f27c871fd7217c5c3c7 SHA256 05368138fe14f10c94440ce3c4185f8089b7dd45e3ad4937946c2f4a21540ddf
 MISC metadata.xml 582 RMD160 333479b481893ba9bf6aff3d2b36e3ed676ab7e8 SHA1 0a267d1e753216b35fee81b47793be3e62d3dd75 SHA256 f71eab2416b0db74fbae2c452b485a8d5b19dd7a3e6638e29790c18a22049a26
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
index 33c0b5b4585c..df1c3b704a05 100644
--- 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
@@ -1,14 +1,21 @@
---- 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 @@
+ configure.ac |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index bfea453..16b114a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,9 +17,10 @@ PKG_CHECK_MODULES(x11, x11, have_x11=yes, have_x11=no)
+ PKG_CHECK_MODULES(xmu, xmu, have_xmu=yes, have_xmu=no)
  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, xulrunner-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(mozjs, xulrunner-js, have_mozjs=yes,
++	 	[PKG_CHECK_MODULES(mozjs, libxul-unstable mozilla-js, have_mozjs=yes,
++		[PKG_CHECK_MODULES(mozjs, seamonkey-js, have_mozjs=yes,
++		[PKG_CHECK_MODULES(mozjs, firefox-js, have_mozjs=yes, have_mozjs=no)])])])
  PKG_CHECK_MODULES(NetworkManager, NetworkManager, 
  					have_networkmanager=yes, have_networkmanager=no)
- 
+ PKG_CHECK_MODULES(dbus, dbus-1, have_dbus=yes, have_dbus=no)