Minor patch to compile when both 1.8 and 1.9 slots of xulrunner are present.

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

diff --git a/net-libs/libproxy/ChangeLog b/net-libs/libproxy/ChangeLog
index 9a1b18438ab2fc74016693fec6f32448cc67b79e..d65bf78adedf807431748efa08901d6da23d6dd3 100644 (file)
--- a/net-libs/libproxy/ChangeLog
+++ b/net-libs/libproxy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libproxy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.33 2010/05/31 21:56:30 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.34 2010/06/29 21:52:17 robbat2 Exp $
+
+  29 Jun 2010; Robin H. Johnson <robbat2@gentoo.org> libproxy-0.4.2.ebuild,
+  +files/libproxy-0.4.2-mozjs-search-order.patch:
+  Minor patch to compile when both 1.8 and 1.9 slots of xulrunner are
+  present.
 
   31 May 2010; Gilles Dartiguelongue <eva@gentoo.org> libproxy-0.4.2.ebuild:
   Preserve old lib, bug #320511. Install perl binding in vendor directory,

diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index fb2f5b6a24b4d79e7625ffdf8f9af1b967e6343f..aa539508d84d8e60ca7509e12b889f809645c36f 100644 (file)
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1,23 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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-automagic-mozjs.patch 2332 RMD160 f89abdb6fb1cf7fb5682e6440bb1c489ede270f4 SHA1 88239372df7fd3c5dadf1f0bc0f61fc9163f250d SHA256 52691a7a910655a3c5c0015038311a325885b1552d94ee67d60bc8a138e197fe
 AUX libproxy-0.2.3-fix-dbus-includes.patch 1387 RMD160 ae39dca04f17f58f1a0c36208ceed8190af82d95 SHA1 f43e6d39ecaf7847c3f11255f56d205383e982e6 SHA256 31be2886acd191a80d86a75c9aec090998dd2b21ec23e64d0cda51e73b71d60e
 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
+AUX libproxy-0.4.2-mozjs-search-order.patch 585 RMD160 1827d193e1de890e018f5c1be65404001e55ecbb SHA1 97804cc97898b52be018e13c60ffa84bb54b2b5f SHA256 22b7ce5be7ec9143200ff3748767677fdbed9ae81136962aa89bda540f8f0859
 DIST libproxy-0.2.3.tar.gz 378773 RMD160 c86c4f8403cb879380e101d074af469c960b5c1c SHA1 2b2b00a179740548035a1145bbae600db9b0a2ce SHA256 59ded160b3547d29e37cc9d06359f7f37d94112214e4532430cd65e704c1339a
 DIST libproxy-0.4.2.tar.gz 71300 RMD160 4b4234b94634f38c1292c9220c26761aa6de2917 SHA1 0715d92398b554e97c18c98c3ac67a4c41b16abc SHA256 fd49d2e994fe75672702bb86f2fdb192bdd1e528316c9011946b90f3f535f59a
 EBUILD libproxy-0.2.3-r2.ebuild 2827 RMD160 3a968c39169dab9119ee535da207f41774e06eb8 SHA1 d73a858ea864fd69fa46de6c579a1e8eb287c8e4 SHA256 a59467e8cbb39df8cf269c953b3851eb68eaa28117cbb832767e381905daae28
 EBUILD libproxy-0.2.3-r3.ebuild 2681 RMD160 3e9c879db69969b42aa2812977891b0635a326e2 SHA1 925bfc3b41c0f9777d0c476d64ac3f224867d420 SHA256 98a6365fbe874b089dc66334a7e4fe83ec8f03c06490cd8b5014c5e3b152eabd
-EBUILD libproxy-0.4.2.ebuild 2084 RMD160 3f53fb76a097865aef3f401287cf0b73f811d212 SHA1 942e68846bbdcdb6bee588ce1e9580245c28e5ce SHA256 3f06371b6ad787a295d7392119003202175bbf48eb8075a413755c7da3da0214
-MISC ChangeLog 5586 RMD160 9b7e46461e86af2715b8e4b27278c9adab700e0a SHA1 510d9f0905490ded3fb02b95d5b3b0fc0d28467f SHA256 c4571f05076b8d5d0d0163025fff63220cdb8b680087e83a5fe43907f06750ce
+EBUILD libproxy-0.4.2.ebuild 2202 RMD160 e56a82621c2eb43e6014aafb374b071170576fd3 SHA1 f4b8326e4b02990a95bcd89813df53557680139d SHA256 631cb9104a4d2542dbfa2619172085476607460f7f3ec8cc3a644fcdb402d0f0
+MISC ChangeLog 5798 RMD160 8eb37c1ac1d4ae70bddc56b693ae4dfae0d1618b SHA1 b549e05735eae12708089d44d8bf3a6c7dd07070 SHA256 957ba47e09a032992e9ee0e406ff10a8b2f5df39d93c6da5df8c28ee027d8b04
 MISC metadata.xml 657 RMD160 dd64d804f866b7da2ab5fa84229938df8e9c8af4 SHA1 997f9c36e65f1e4778980317a993cf23da805226 SHA256 3193dc9e8933a0ee548e865ca33e76d27bcff750419087cb9c8c53eb8bb905ec
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwETLUACgkQ1fmVwcYIWAbp3wCgmBoIs3zq3GyRlIpWdnB84yn1
-IxsAni0H/A2+LuxLCpoyrIL2sAPMuNiO
-=NQJz
------END PGP SIGNATURE-----

diff --git a/net-libs/libproxy/files/libproxy-0.4.2-mozjs-search-order.patch b/net-libs/libproxy/files/libproxy-0.4.2-mozjs-search-order.patch
new file mode 100644 (file)
index 0000000..60ca82b
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.2-mozjs-search-order.patch
@@ -0,0 +1,11 @@
+--- libproxy/CMakeLists.txt    2010/05/23 23:05:55     1.1
++++ libproxy/CMakeLists.txt    2010/05/23 23:06:33
+@@ -84,7 +84,7 @@ else()
+     px_check_modules(NM          NetworkManager dbus-1)
+     px_check_modules(WEBKIT      webkit-1.0)
+ 
+-    set(MOZJS_SEARCH_ORDER "xulrunner-js;firefox-js;mozilla-js;seamonkey-js" CACHE STRING "MozJS search order")
++    set(MOZJS_SEARCH_ORDER "mozilla-js;xulrunner-js;firefox-js;seamonkey-js" CACHE STRING "MozJS search order")
+     option(WITH_MOZJS "Search for MOZJS package" ON)
+     if (WITH_MOZJS)
+       pkg_search_module(MOZJS ${MOZJS_SEARCH_ORDER})

diff --git a/net-libs/libproxy/libproxy-0.4.2.ebuild b/net-libs/libproxy/libproxy-0.4.2.ebuild
index b4a13b95bc1034b53b583ef22eb1d3a07aa3e1a4..803b6bcb53db16b8e33e77a7453949adfdb81071 100644 (file)
--- a/net-libs/libproxy/libproxy-0.4.2.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.2.ebuild,v 1.2 2010/05/31 21:56:30 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.2.ebuild,v 1.3 2010/06/29 21:52:17 robbat2 Exp $
 
 EAPI="2"
 CMAKE_MIN_VERSION="2.8"
@@ -44,6 +44,8 @@ src_prepare() {
        else
          sed "s/-g -Wall -Werror / /" CMakeLists.txt -i
        fi
+       # Stop using xulrunner 1.8 when both are installed
+       epatch "${FILESDIR}"/libproxy-0.4.2-mozjs-search-order.patch
 }
 
 src_configure() {