Update to upstream patch wrt #339216 by Nicolas Dufresne.

Package-Manager: portage-2.2.0_alpha1/cvs/Linux x86_64

3 files changed, 36 insertions, 22 deletions

diff --git a/net-libs/libproxy/ChangeLog b/net-libs/libproxy/ChangeLog
index 937c9e21701a..bd5c04580af2 100644
--- a/net-libs/libproxy/ChangeLog
+++ b/net-libs/libproxy/ChangeLog
@@ -1,6 +1,10 @@
 # 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.40 2010/09/30 18:08:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.41 2010/10/28 09:20:32 ssuominen Exp $
+
+  28 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
+  files/libproxy-0.4.6-mozjs-link_directory.patch:
+  Update to upstream patch wrt #339216 by Nicolas Dufresne.
 
   30 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> libproxy-0.4.6.ebuild,
   +files/libproxy-0.4.6-mozjs-link_directory.patch:
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index cd89283999d8..72d09a2842d3 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -6,12 +6,12 @@ AUX libproxy-0.2.3-fix-python-automagic.patch 858 RMD160 ec182cb70c84ffbf7faa8a1
 AUX libproxy-0.2.3-implicit-declaration.patch 206 RMD160 12d2d0507a2d0c163b7c2d16d7d42ab5d0d7eb8f SHA1 b17dabc232bf9140629a5d987279800b3d2d19d8 SHA256 1ff409011d9a826999dd1478632a5ac18f793bb3d0028e83f89f78463ee88bf5
 AUX libproxy-0.4.2-glibc212.patch 464 RMD160 6a73720f5e2c6adcfd4aed7583cf308ee0cdf4cb SHA1 8b8ceb5196c45d2893c3ccf1593177d2ea1994c8 SHA256 20f1d8f5b6790db54c5fb3a254fc8b0b71e3fbfb8ad857b8d451d2d01f9bd3f3
 AUX libproxy-0.4.2-mozjs-search-order.patch 585 RMD160 1827d193e1de890e018f5c1be65404001e55ecbb SHA1 97804cc97898b52be018e13c60ffa84bb54b2b5f SHA256 22b7ce5be7ec9143200ff3748767677fdbed9ae81136962aa89bda540f8f0859
-AUX libproxy-0.4.6-mozjs-link_directory.patch 705 RMD160 8b7ddbf7c57c0bdfabbbfbbc62b82d609a0e2021 SHA1 76ebacd9675ac1b2136bb6095bbcc8e5fbdeac60 SHA256 1e8e7f5c597ab78532de7e936f12744e20e8bd17ea966132eac73700d71ccafb
+AUX libproxy-0.4.6-mozjs-link_directory.patch 1365 RMD160 4ba7b7f923a8d48575db2f13c86482d78e54ae1c SHA1 0a083243f29571e5e971de6df6e4c81b9cf6444f SHA256 783bc34d685ddf3ba6e6c85003417412f2bb87e9fc87c4ca5c9c56bf5e99aea5
 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
 DIST libproxy-0.4.6.tar.gz 82483 RMD160 f5f03c84ad2d87fe728869fadc669628737c639e SHA1 6e9745c87b774f34bf53f07a54284c0d72020e94 SHA256 9ad912e63b1efca98fb442240a2bc7302e6021c1d0b1b9363327729f29462f30
 EBUILD libproxy-0.2.3-r3.ebuild 2677 RMD160 f234bb926d25459c3a65d2acd8a366f9c1918c2c SHA1 378b08d384ba2c6d846c7c3cf495e1e300b858ac SHA256 af1a37c687737148425cbdf45ced8bb715b3124b2b552f415df868d0fca463cd
 EBUILD libproxy-0.4.2.ebuild 2255 RMD160 16d6089c36e9f378c6a534235714411682274d65 SHA1 507723b2de0e27c2d0a311a5d343f91b7e479f6f SHA256 c64d6e66ba47adfa44b5483e8c842cf86ecd316bc703b7a34111741c384a1e4e
 EBUILD libproxy-0.4.6.ebuild 2205 RMD160 500ea4d855476cf61639c498205c992b09c1ee5b SHA1 e0eabb87483bf7b1c9acc6d7d1e2f2ae48c2fd31 SHA256 a6af9ee728bd8519687e28fffde20063ee82ec800dd7f0b18d3296cd90174af3
-MISC ChangeLog 6839 RMD160 d45137a35118fddd1f04941761f6bb04643fece6 SHA1 1e34ed89e95622f942cff4bf426ecede8a14809b SHA256 0039880e88fdfb25c0715e500ed04506cca58c14049ae4d3e927b01f1103ca78
+MISC ChangeLog 7005 RMD160 92ae4d22773d071d79258957e3bc363bb5df8641 SHA1 40239f7c835c3c9825a2f8ca198dcb897407ed74 SHA256 4d3b8dcadd8dc67cf8663f1fc03e7ba6b105d1d48e4367efb3cfd5afc9638af3
 MISC metadata.xml 657 RMD160 dd64d804f866b7da2ab5fa84229938df8e9c8af4 SHA1 997f9c36e65f1e4778980317a993cf23da805226 SHA256 3193dc9e8933a0ee548e865ca33e76d27bcff750419087cb9c8c53eb8bb905ec
diff --git a/net-libs/libproxy/files/libproxy-0.4.6-mozjs-link_directory.patch b/net-libs/libproxy/files/libproxy-0.4.6-mozjs-link_directory.patch
index 6c24f29edd5d..cab138e2eaed 100644
--- a/net-libs/libproxy/files/libproxy-0.4.6-mozjs-link_directory.patch
+++ b/net-libs/libproxy/files/libproxy-0.4.6-mozjs-link_directory.patch
@@ -1,20 +1,30 @@
-http://bugs.gentoo.org/339216
+From 18fbf794ffc2cab9f4b8df3c4132b094fc4ef281 Mon Sep 17 00:00:00 2001
+From: nicolas.dufresne <nicolas.dufresne@c587cffe-e639-0410-9787-d7902ae8ed56>
+Date: Tue, 12 Oct 2010 17:39:18 +0000
+Subject: [PATCH 1/2] Disable transient linking
+
+As explained at
+http://www.cmake.org/Wiki/CMake_FAQ#Why_do_I_have_unwanted_semicolons_.3B_in_my_compiler_flags.3F
+if CMake links A to B and B to C, all the flags from A will be appended when
+C is linked. This behaviour is wrong, but CMake provides a workaround which
+is implemented in this patch.
+
+git-svn-id: https://libproxy.googlecode.com/svn/trunk@774 c587cffe-e639-0410-9787-d7902ae8ed56
+---
+ libproxy/cmake/libproxy.cmk |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/libproxy/cmake/libproxy.cmk b/libproxy/cmake/libproxy.cmk
+index 5625d4e..dc9fa0f 100644
+--- a/libproxy/cmake/libproxy.cmk
++++ b/libproxy/cmake/libproxy.cmk
+@@ -18,5 +18,6 @@ endif()
+ set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp
+              PROPERTY COMPILE_DEFINITIONS MODULEDIR="${MODULEDIR}";BUILTIN_MODULES=${BUILTIN_MODULES})
+ set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1)
++set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "")
+ install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR})
+ install(FILES   proxy.h  DESTINATION ${INCLUDE_INSTALL_DIR})
+-- 
+1.7.2.3
 
---- bindings/perl/src/CMakeLists.txt
-+++ bindings/perl/src/CMakeLists.txt
-@@ -1,5 +1,5 @@
- include_directories( ${PERL_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/libproxy )
--link_directories(${LIBPROXY_LIBRARY_DIRS})
-+link_directories(${LIBPROXY_LIBRARY_DIRS} ${MOZJS_LIBRARY_DIRS})
- 
- # Run doxsubpp.pl to run xsubpp on Libproxy.xs
- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Libproxy.c
---- utils/CMakeLists.txt
-+++ utils/CMakeLists.txt
-@@ -1,5 +1,5 @@
- include_directories("../libproxy")
--link_directories(${LIBPROXY_LIBRARY_DIRS})
-+link_directories(${LIBPROXY_LIBRARY_DIRS} ${MOZJS_LIBRARY_DIRS})
- 
- add_executable(proxy proxy.c)
- target_link_libraries(proxy libproxy)