Update to EAPI5 and python-r1.eclass. Drop obsolete versions. Add patch to avoid build-time dependency on networkmanager to fix a dependency loop (bug #467696, thanks to Ling Kun).

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

12 files changed, 118 insertions, 595 deletions

diff --git a/net-libs/libproxy/ChangeLog b/net-libs/libproxy/ChangeLog
index 079cae9597dd..324df5d78b9f 100644
--- a/net-libs/libproxy/ChangeLog
+++ b/net-libs/libproxy/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-libs/libproxy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.99 2013/03/25 01:32:50 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.100 2013/04/30 03:46:47 tetromino Exp $
+
+*libproxy-0.4.11-r1 (30 Apr 2013)
+
+  30 Apr 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -libproxy-0.4.6-r3.ebuild, -libproxy-0.4.7.ebuild, -libproxy-0.4.10.ebuild,
+  libproxy-0.4.10-r1.ebuild, libproxy-0.4.11.ebuild,
+  +libproxy-0.4.11-r1.ebuild, -files/libproxy-0.4.6-backports.patch,
+  -files/libproxy-0.4.6-flags-mixing.patch,
+  -files/libproxy-0.4.6-mozjs-link_directory.patch,
+  -files/libproxy-0.4.6-xulrunner-2.patch, -files/libproxy-0.4.7-gcc-4.7.patch,
+  +files/libproxy-0.4.11-avoid-nm-build-dep.patch:
+  Update to EAPI5 and python-r1.eclass. Drop obsolete versions. Add patch to
+  avoid build-time dependency on networkmanager to fix a dependency loop (bug
+  #467696, thanks to Ling Kun).
 
 *libproxy-0.4.11 (25 Mar 2013)
 
diff --git a/net-libs/libproxy/files/libproxy-0.4.11-avoid-nm-build-dep.patch b/net-libs/libproxy/files/libproxy-0.4.11-avoid-nm-build-dep.patch
new file mode 100644
index 000000000000..59e368b696eb
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.11-avoid-nm-build-dep.patch
@@ -0,0 +1,60 @@
+From 518214ee85e10c5bc99d3b115ae7ac9cc3fc14fc Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 29 Apr 2013 23:02:25 -0400
+Subject: [PATCH] Avoid build-time dependency on NetworkManager
+
+Needed to prevent a dependency loop:
+nm -> libsoup -> glib-networking -> libproxy -> nm
+
+https://bugs.gentoo.org/467696
+---
+ libproxy/cmake/modules/network_networkmanager.cmk |  4 ++--
+ libproxy/modules/network_networkmanager.cpp       | 21 ++++++++++++++++++++-
+ 2 files changed, 22 insertions(+), 3 deletions(-)
+
+diff --git a/libproxy/cmake/modules/network_networkmanager.cmk b/libproxy/cmake/modules/network_networkmanager.cmk
+index d9f9588..2586bbd 100644
+--- a/libproxy/cmake/modules/network_networkmanager.cmk
++++ b/libproxy/cmake/modules/network_networkmanager.cmk
+@@ -1,3 +1,3 @@
+ if (NOT WIN32 AND NOT APPLE)
+-  px_check_modules(NM NetworkManager dbus-1)
+-endif()
+\ No newline at end of file
++  px_check_modules(NM dbus-1)
++endif()
+diff --git a/libproxy/modules/network_networkmanager.cpp b/libproxy/modules/network_networkmanager.cpp
+index 564c275..a03425b 100644
+--- a/libproxy/modules/network_networkmanager.cpp
++++ b/libproxy/modules/network_networkmanager.cpp
+@@ -23,7 +23,26 @@
+ using namespace libproxy;
+ 
+ #include <dbus/dbus.h>
+-#include <NetworkManager/NetworkManager.h>
++
++
++/*
++ * copy-pasted from NetworkManager-0.9.6.4's NetworkManager.h to prevent
++ * a circular dependency; https://bugs.gentoo.org/467696
++ */
++#define	NM_DBUS_PATH                        "/org/freedesktop/NetworkManager"
++#define	NM_DBUS_INTERFACE                   "org.freedesktop.NetworkManager"
++typedef enum {
++	NM_STATE_UNKNOWN          = 0,
++	NM_STATE_ASLEEP           = 10,
++	NM_STATE_DISCONNECTED     = 20,
++	NM_STATE_DISCONNECTING    = 30,
++	NM_STATE_CONNECTING       = 40,
++	NM_STATE_CONNECTED_LOCAL  = 50,
++	NM_STATE_CONNECTED_SITE   = 60,
++	NM_STATE_CONNECTED_GLOBAL = 70
++} NMState;
++#define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL
++
+ 
+ class networkmanager_network_extension : public network_extension {
+ public:
+-- 
+1.8.2.1
+
diff --git a/net-libs/libproxy/files/libproxy-0.4.6-backports.patch b/net-libs/libproxy/files/libproxy-0.4.6-backports.patch
deleted file mode 100644
index bf76350eaede..000000000000
--- a/net-libs/libproxy/files/libproxy-0.4.6-backports.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-# Backport from upstream source: svn revs: 769,771,776,777,778,780,781,782
-Index: libproxy/url.cpp
-===================================================================
---- libproxy/url.cpp.orig
-+++ libproxy/url.cpp
-@@ -36,12 +36,9 @@
- 
- #ifdef WIN32
- #include <io.h>
--#define pfsize(st) (st.st_size)
- #define close _close
- #define read _read
- #define SHUT_RDWR SD_BOTH
--#else
--#define pfsize(st) (st.st_blksize * st.st_blocks)
- #endif
- 
- #include "url.hpp"
-@@ -56,13 +53,6 @@ using namespace std;
- // This is the maximum pac size (to avoid memory attacks)
- #define PAC_MAX_SIZE 102400
- 
--const string url::GENERIC_DELIMITERS(":/?#[]@");
--const string url::SUBCOMPONENT_DELIMITERS("!$&'()*+,;=");
--const string url::ALLOWED_IN_USERINFO_ELEMENT(url::SUBCOMPONENT_DELIMITERS);
--const string url::ALLOWED_IN_USERINFO(url::ALLOWED_IN_USERINFO_ELEMENT + ":");
--const string url::ALLOWED_IN_PATH_ELEMENT(url::SUBCOMPONENT_DELIMITERS + ":@");
--const string url::ALLOWED_IN_PATH(url::ALLOWED_IN_PATH_ELEMENT + "/");
--
- static inline int get_default_port(string scheme) {
- 	struct servent *serv;
- 	size_t plus = scheme.find('+');
-@@ -109,8 +99,8 @@ bool url::is_valid(const string url_) {
- 
- string url::encode(const string &data, const string &valid_reserved) {
- 	ostringstream encoded;
--	for (int i=0; data[i]; i++) {
--		if (isalnum(data[i])
-+	for (unsigned int i=0; i < data.size(); i++) {
-+		if (isalnum((unsigned char)data[i])
- 				|| valid_reserved.find(data[i]) != string::npos
- 				|| string("-._~").find(data[i]) != string::npos)
- 			encoded << data[i];
-@@ -211,7 +201,8 @@ url::url(const string &url) throw(parse_
- 			host_start = userinfo_end + 1;
- 
- 		/* Check for IPv6 IP */
--		if (hier_part[host_start] == '[') {
-+		if (host_start < hier_part.size()
-+                    && hier_part[host_start] == '[') {
- 			host_end = hier_part.find(']', host_start);
- 			if (host_end == string::npos)
- 				throw parse_error("Invalid URL: " + url);
-@@ -232,7 +223,7 @@ url::url(const string &url) throw(parse_
- 		/* Get port */
- 		m_port = get_default_port(m_scheme);
- 
--		if (host_end != hier_part.size()
-+		if (host_end < hier_part.size()
- 			&& hier_part[host_end] == ':') {
- 			size_t port_start = host_end + 1;
- 			m_port = atoi(hier_part.c_str() + port_start);
-@@ -400,10 +391,12 @@ char* url::get_pac() {
- 		struct stat st;
- 		if ((sock = ::open(m_path.c_str(), O_RDONLY)) < 0)
- 			return NULL;
--		if (!fstat(sock, &st) && pfsize(st) < PAC_MAX_SIZE) {
--			buffer = new char[pfsize(st)+1];
--			if (read(sock, buffer, pfsize(st)) == 0) {
--				delete buffer;
-+
-+		if (!fstat(sock, &st) && st.st_size < PAC_MAX_SIZE) {
-+			buffer = new char[st.st_size+1];
-+			memset(buffer, 0, st.st_size+1);
-+			if (read(sock, buffer, st.st_size) == 0) {
-+				delete[] buffer;
- 				buffer = NULL;
- 			}
- 		}
-Index: libproxy/modules/config_gnome.cpp
-===================================================================
---- libproxy/modules/config_gnome.cpp.orig
-+++ libproxy/modules/config_gnome.cpp
-@@ -102,10 +102,8 @@ static int popen2(const char *program, F
- 		if (dup2(rpipe[1], STDOUT_FILENO) != STDOUT_FILENO) _exit(2);
- 
- 		// Close unneeded fds
--		close(rpipe[0]);
--		close(rpipe[1]);
--		close(wpipe[0]);
--		close(wpipe[1]);
-+		for (int i = 3; i < sysconf(_SC_OPEN_MAX); i++)
-+			close(i);
- 
- 		// Exec
- 		execl("/bin/sh", "sh", "-c", program, (char*) NULL);
-@@ -194,8 +192,8 @@ public:
- 		else if (this->data[PROXY_MODE] == "manual") {
- 			string type, host, port;
- 			bool       auth = this->data[PROXY_USE_AUTHENTICATION] == "true";
--			string username = url::encode(this->data[PROXY_AUTH_USER], url::ALLOWED_IN_USERINFO_ELEMENT);
--			string password = url::encode(this->data[PROXY_AUTH_PASSWORD], url::ALLOWED_IN_USERINFO_ELEMENT);
-+			string username = url::encode(this->data[PROXY_AUTH_USER], URL_ALLOWED_IN_USERINFO_ELEMENT);
-+			string password = url::encode(this->data[PROXY_AUTH_PASSWORD], URL_ALLOWED_IN_USERINFO_ELEMENT);
- 			bool same_proxy = this->data[PROXY_SAME_FOR_ALL] == "true"; 
- 
- 			// If socks is set use it (except when same_proxy is set)
-Index: libproxy/proxy.cpp
-===================================================================
---- libproxy/proxy.cpp.orig
-+++ libproxy/proxy.cpp
-@@ -164,7 +164,7 @@ proxy_factory::proxy_factory() {
- proxy_factory::~proxy_factory() {
- 	lock();
- 
--	if (this->pac) delete this->pac;
-+	if (this->pac) delete[] this->pac;
- 	if (this->pacurl) delete this->pacurl;
- 	
- 	unlock();
-Index: libproxy/url.hpp
-===================================================================
---- libproxy/url.hpp.orig
-+++ libproxy/url.hpp
-@@ -27,6 +27,13 @@
- 
- #include "config.hpp"
- 
-+#define URL_GENERIC_DELIMITERS          ":/?#[]@"
-+#define URL_SUBCOMPONENT_DELIMITERS     "!$&'()*+,;="
-+#define URL_ALLOWED_IN_USERINFO_ELEMENT URL_SUBCOMPONENT_DELIMITERS
-+#define URL_ALLOWED_IN_USERINFO         URL_ALLOWED_IN_USERINFO_ELEMENT ":"
-+#define URL_ALLOWED_IN_PATH_ELEMENT     URL_SUBCOMPONENT_DELIMITERS ":@"
-+#define URL_ALLOWED_IN_PATH             URL_ALLOWED_IN_PATH_ELEMENT "/"
-+
- namespace libproxy {
- 
- using namespace std;
-@@ -38,13 +45,6 @@ public:
- 
- class DLL_PUBLIC url {
- public:
--	static const string ALLOWED_IN_PATH;
--	static const string ALLOWED_IN_PATH_ELEMENT;
--	static const string ALLOWED_IN_USERINFO;
--	static const string ALLOWED_IN_USERINFO_ELEMENT;
--	static const string GENERIC_DELIMITERS;
--	static const string SUBCOMPONENT_DELIMITERS;
--
- 	static bool is_valid(const string url);
- 	static string encode(const string &data, const string &valid_reserved = "");
- 
diff --git a/net-libs/libproxy/files/libproxy-0.4.6-flags-mixing.patch b/net-libs/libproxy/files/libproxy-0.4.6-flags-mixing.patch
deleted file mode 100644
index 47bd96f22cfc..000000000000
--- a/net-libs/libproxy/files/libproxy-0.4.6-flags-mixing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- bindings/perl/src/CMakeLists.txt~	2010-09-01 22:23:34.000000000 +0200
-+++ bindings/perl/src/CMakeLists.txt	2011-06-05 12:04:19.000000000 +0200
-@@ -10,9 +10,6 @@
- 
- set(Libproxy_LIB_SRCS Libproxy.c)
- 
--set(CMAKE_C_COMPILER ${CMAKE_CXX_COMPILER})
--set(CMAKE_C_FLAGS ${PERL_CXX_FLAGS} )
--
- set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/perl/blib/arch/auto/Net)
- add_library(PLlibproxy SHARED ${Libproxy_LIB_SRCS})
- 
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
deleted file mode 100644
index cab138e2eaed..000000000000
--- a/net-libs/libproxy/files/libproxy-0.4.6-mozjs-link_directory.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
-
diff --git a/net-libs/libproxy/files/libproxy-0.4.6-xulrunner-2.patch b/net-libs/libproxy/files/libproxy-0.4.6-xulrunner-2.patch
deleted file mode 100644
index 5f3de3ca5b10..000000000000
--- a/net-libs/libproxy/files/libproxy-0.4.6-xulrunner-2.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-http://bugs.gentoo.org/359879
-http://code.google.com/p/libproxy/issues/detail?id=158
-
---- libproxy/cmake/modules/pacrunner_mozjs.cmk
-+++ libproxy/cmake/modules/pacrunner_mozjs.cmk
-@@ -7,16 +7,23 @@
-     include_directories("${MOZJS_INCLUDE_DIR}")
-   endif()
- elseif(NOT APPLE)
--  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})
--    if(MOZJS_FOUND)
--      include_directories(${MOZJS_INCLUDE_DIRS})
--      link_directories(${MOZJS_LIBRARY_DIRS})
--    else()
--      set(MOZJS_FOUND 0)
--    endif()
-+    foreach(MOZJSLIB ${MOZJS_SEARCH_ORDER})
-+      pkg_search_module(MOZJS ${MOZJSLIB})
-+      if(MOZJS_FOUND)
-+        include_directories(${MOZJS_INCLUDE_DIRS})
-+        link_directories(${MOZJS_LIBRARY_DIRS})
-+        pkg_search_module(MOZJS2 ${MOZJSLIB}>=2.0b10)
-+        if(MOZJS2_FOUND)
-+          add_definitions(-DHAVE_MOZJS_2)
-+        endif(MOZJS2_FOUND)
-+        break()
-+      else()
-+        set(MOZJS_FOUND 0)
-+      endif()
-+    endforeach()
-   else()
-     set(MOZJS_FOUND 0)
-   endif()
---- libproxy/modules/pacrunner_mozjs.cpp
-+++ libproxy/modules/pacrunner_mozjs.cpp
-@@ -42,12 +42,12 @@
- #define INET6_ADDRSTRLEN 46
- #endif
- 
--static JSBool dnsResolve(JSContext *cx, JSObject * /*obj*/, uintN /*argc*/, jsval *argv, jsval *rval) {
-+static JSBool dnsResolve_(JSContext *cx, jsval hostname, jsval *vp) {
- 	// Get hostname argument
--	char *tmp = JS_strdup(cx, JS_GetStringBytes(JS_ValueToString(cx, argv[0])));
-+	char *tmp = JS_EncodeString(cx, JS_ValueToString(cx, hostname));
- 
- 	// Set the default return value
--	*rval = JSVAL_NULL;
-+	JS_SET_RVAL(cx, vp, JSVAL_NULL);
- 
- 	// Look it up
- 	struct addrinfo *info = NULL;
-@@ -66,7 +66,7 @@
- 					NI_NUMERICHOST)) goto out;
- 
- 	// We succeeded
--	*rval = STRING_TO_JSVAL(JS_NewString(cx, tmp, strlen(tmp)));
-+	JS_SET_RVAL(cx, vp, STRING_TO_JSVAL(JS_NewStringCopyN(cx, tmp, strlen(tmp))));
- 	tmp = NULL;
- 
- 	out:
-@@ -75,15 +75,20 @@
- 		return true;
- }
- 
--static JSBool myIpAddress(JSContext *cx, JSObject *obj, uintN /*argc*/, jsval * /*argv*/, jsval *rval) {
-+static JSBool dnsResolve(JSContext *cx, uintN /*argc*/, jsval *vp) {
-+	jsval *argv = JS_ARGV(cx, vp);
-+	return dnsResolve_(cx, argv[0], vp);
-+}
-+
-+static JSBool myIpAddress(JSContext *cx, uintN /*argc*/, jsval *vp) {
- 	char *hostname = (char *) JS_malloc(cx, 1024);
- 	if (!gethostname(hostname, 1023)) {
--		JSString *myhost = JS_NewString(cx, hostname, strlen(hostname));
-+		JSString *myhost = JS_NewStringCopyN(cx, hostname, strlen(hostname));
- 		jsval arg = STRING_TO_JSVAL(myhost);
--		return dnsResolve(cx, obj, 1, &arg, rval);
-+		return dnsResolve_(cx, 1, &arg);
- 	}
- 	JS_free(cx, hostname);
--	*rval = JSVAL_NULL;
-+	JS_SET_RVAL(cx, vp, JSVAL_NULL);
- 	return true;
- }
- 
-@@ -91,7 +96,7 @@
- // This MUST be a static global
- static JSClass cls = {
- 		"global", JSCLASS_GLOBAL_FLAGS,
--		JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
-+		JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
- 		JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub,
- 		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
- };
-@@ -111,7 +116,11 @@
- 	    //JS_SetOptions(this->jsctx, JSOPTION_VAROBJFIX);
- 	    //JS_SetVersion(this->jsctx, JSVERSION_LATEST);
- 	    //JS_SetErrorReporter(cx, reportError);
-+		#ifdef HAVE_MOZJS_2
-+		if (!(this->jsglb = JS_NewCompartmentAndGlobalObject(this->jsctx, &cls, NULL))) goto error;
-+		#else
- 		if (!(this->jsglb = JS_NewObject(this->jsctx, &cls, NULL, NULL))) goto error;
-+		#endif
- 		if (!JS_InitStandardClasses(this->jsctx, this->jsglb))            goto error;
- 
- 		// Define Javascript functions
-@@ -147,15 +156,19 @@
- 			throw bad_alloc();
- 		}
- 		jsval args[2] = {
--			STRING_TO_JSVAL(JS_NewString(this->jsctx, tmpurl, strlen(tmpurl))),
--			STRING_TO_JSVAL(JS_NewString(this->jsctx, tmphost, strlen(tmphost)))
-+			STRING_TO_JSVAL(JS_NewStringCopyN(this->jsctx, tmpurl, strlen(tmpurl))),
-+			STRING_TO_JSVAL(JS_NewStringCopyN(this->jsctx, tmphost, strlen(tmphost)))
- 		};
- 
- 		// Find the proxy (call FindProxyForURL())
- 		jsval rval;
- 		JSBool result = JS_CallFunctionName(this->jsctx, this->jsglb, "FindProxyForURL", 2, args, &rval);
- 		if (!result) return "";
--		string answer = string(JS_GetStringBytes(JS_ValueToString(this->jsctx, rval)));
-+		
-+		char * tmpanswer = JS_EncodeString(this->jsctx, JS_ValueToString(this->jsctx, rval));
-+		string answer = string(tmpanswer);
-+		JS_free(this->jsctx, tmpanswer);
-+
- 		if (answer == "undefined") return "";
- 		return answer;
- 	}
diff --git a/net-libs/libproxy/files/libproxy-0.4.7-gcc-4.7.patch b/net-libs/libproxy/files/libproxy-0.4.7-gcc-4.7.patch
deleted file mode 100644
index 5a7bba61d22f..000000000000
--- a/net-libs/libproxy/files/libproxy-0.4.7-gcc-4.7.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 8dbcf9b358f50f7a7c1f1368d167999c31b1e86b Mon Sep 17 00:00:00 2001
-From: "dominique.leuenberger@gmail.com"
- <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56>
-Date: Fri, 9 Mar 2012 17:47:15 +0000
-Subject: [PATCH] Fix build with gcc 4.7. Fixes issue 173
-
-git-svn-id: http://libproxy.googlecode.com/svn/trunk@833 c587cffe-e639-0410-9787-d7902ae8ed56
----
- libproxy/modules/config_sysconfig.cpp |    3 +++
- libproxy/modules/pacrunner_mozjs.cpp  |    1 +
- libproxy/modules/pacrunner_natus.cpp  |    1 +
- libproxy/modules/pacrunner_webkit.cpp |    1 +
- libproxy/url.cpp                      |    1 +
- 5 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/libproxy/modules/config_sysconfig.cpp b/libproxy/modules/config_sysconfig.cpp
-index 616585a..6e97ae8 100644
---- a/libproxy/modules/config_sysconfig.cpp
-+++ b/libproxy/modules/config_sysconfig.cpp
-@@ -21,6 +21,9 @@
- #include <cstdlib>
- #include <map>
- #include <fstream>
-+#include <unistd.h>
-+#include <sys/types.h>
-+
- 
- #include "../extension_config.hpp"
- using namespace libproxy;
-diff --git a/libproxy/modules/pacrunner_mozjs.cpp b/libproxy/modules/pacrunner_mozjs.cpp
-index 3283e91..abb4b9d 100644
---- a/libproxy/modules/pacrunner_mozjs.cpp
-+++ b/libproxy/modules/pacrunner_mozjs.cpp
-@@ -18,6 +18,7 @@
-  ******************************************************************************/
- 
- #include <cstring> // ?
-+#include <unistd.h> // gethostname
- 
- #include "../extension_pacrunner.hpp"
- using namespace libproxy;
-diff --git a/libproxy/modules/pacrunner_natus.cpp b/libproxy/modules/pacrunner_natus.cpp
-index f7bd4fc..ce79943 100644
---- a/libproxy/modules/pacrunner_natus.cpp
-+++ b/libproxy/modules/pacrunner_natus.cpp
-@@ -18,6 +18,7 @@
-  ******************************************************************************/
- 
- #include "../extension_pacrunner.hpp"
-+#include <unistd.h> // gethostname
- using namespace libproxy;
- 
- #define I_ACKNOWLEDGE_THAT_NATUS_IS_NOT_STABLE
-diff --git a/libproxy/modules/pacrunner_webkit.cpp b/libproxy/modules/pacrunner_webkit.cpp
-index b9abf34..c51b869 100644
---- a/libproxy/modules/pacrunner_webkit.cpp
-+++ b/libproxy/modules/pacrunner_webkit.cpp
-@@ -18,6 +18,7 @@
-  ******************************************************************************/
- 
- #include "../extension_pacrunner.hpp"
-+#include <unistd.h> // gethostname
- using namespace libproxy;
- 
- #ifdef __APPLE__
-diff --git a/libproxy/url.cpp b/libproxy/url.cpp
-index df75022..cd781df 100644
---- a/libproxy/url.cpp
-+++ b/libproxy/url.cpp
-@@ -33,6 +33,7 @@
- #include <cstdlib>    // For atoi()
- #include <sys/stat.h> // For stat()
- #include <algorithm> // For transform()
-+#include <unistd.h>  // For read() close()
- 
- #ifdef WIN32
- #include <io.h>
--- 
-1.7.8.6
-
diff --git a/net-libs/libproxy/libproxy-0.4.10-r1.ebuild b/net-libs/libproxy/libproxy-0.4.10-r1.ebuild
index 717c9f29cbd6..336df63e5e3e 100644
--- a/net-libs/libproxy/libproxy-0.4.10-r1.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.10-r1.ebuild,v 1.12 2013/02/25 08:45:34 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.10-r1.ebuild,v 1.13 2013/04/30 03:46:47 tetromino Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2:2.6"
@@ -21,13 +21,15 @@ IUSE="gnome kde mono networkmanager perl python spidermonkey test webkit"
 RDEPEND="gnome? ( >=dev-libs/glib-2.26:2 )
 	kde? ( >=kde-base/kdelibs-4.4.5 )
 	mono? ( dev-lang/mono )
-	networkmanager? ( net-misc/networkmanager )
+	networkmanager? ( sys-apps/dbus )
 	perl? (	dev-lang/perl )
 	spidermonkey? ( >=dev-lang/spidermonkey-1.8.5 )
 	webkit? ( >=net-libs/webkit-gtk-1.6:3 )"
 DEPEND="${RDEPEND}
 	kde? ( dev-util/automoc )
 	virtual/pkgconfig"
+# avoid dependency loop, bug #467696
+PDEPEND="networkmanager? ( net-misc/networkmanager )"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README"
@@ -48,6 +50,9 @@ src_prepare() {
 
 	# Fix building with cmake-2.8.10 and USE=mono; in next release; bug #444204
 	epatch "${FILESDIR}/${P}-cmake-2.8.10.patch"
+
+	# prevent dependency loop with networkmanager, libsoup, glib-networking; bug #467696
+	epatch "${FILESDIR}/${PN}-0.4.11-avoid-nm-build-dep.patch"
 }
 
 src_configure() {
diff --git a/net-libs/libproxy/libproxy-0.4.10.ebuild b/net-libs/libproxy/libproxy-0.4.11-r1.ebuild
index b0c7788661d9..565f95cdc6ec 100644
--- a/net-libs/libproxy/libproxy-0.4.10.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.11-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.10.ebuild,v 1.9 2012/10/21 03:57:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.11-r1.ebuild,v 1.1 2013/04/30 03:46:47 tetromino Exp $
 
-EAPI=4
-PYTHON_DEPEND="python? 2:2.6"
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit cmake-utils eutils mono python
+inherit cmake-utils eutils flag-o-matic mono python-r1
 
 DESCRIPTION="Library for automatic proxy configuration management"
 HOMEPAGE="http://code.google.com/p/libproxy/"
@@ -13,7 +13,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="gnome kde mono networkmanager perl python spidermonkey test webkit"
 
 # NOTE: mozjs/spidermonkey might still cause problems like #373397 ?
@@ -21,32 +21,34 @@ IUSE="gnome kde mono networkmanager perl python spidermonkey test webkit"
 RDEPEND="gnome? ( >=dev-libs/glib-2.26:2 )
 	kde? ( >=kde-base/kdelibs-4.4.5 )
 	mono? ( dev-lang/mono )
-	networkmanager? ( net-misc/networkmanager )
+	networkmanager? ( sys-apps/dbus )
 	perl? (	dev-lang/perl )
-	spidermonkey? ( >=dev-lang/spidermonkey-1.8.5 )
-	webkit? ( >=net-libs/webkit-gtk-1.6:3 )"
+	python? ( ${PYTHON_DEPS} )
+	spidermonkey? ( >=dev-lang/spidermonkey-1.8.5:= )
+	webkit? ( >=net-libs/webkit-gtk-1.6:3= )"
 DEPEND="${RDEPEND}
+	kde? ( dev-util/automoc )
 	virtual/pkgconfig"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
+# avoid dependency loop, bug #467696
+PDEPEND="networkmanager? ( net-misc/networkmanager )"
 
 src_prepare() {
-	# Gentoo's spidermonkey doesn't set Version: in mozjs185.pc
-	epatch "${FILESDIR}/${PN}-0.4.10-mozjs185.pc.patch"
+	# Gentoo's spidermonkey doesn't set Version: in mozjs18[57].pc
+	epatch "${FILESDIR}/${P}-mozjs.pc.patch"
 
 	# get-pac-test freezes when run by the ebuild, succeeds when building
 	# manually; virtualx.eclass doesn't help :(
 	epatch "${FILESDIR}/${PN}-0.4.10-disable-pac-test.patch"
+
+	epatch "${FILESDIR}"/${P}-macosx.patch
+
+	# prevent dependency loop with networkmanager, libsoup, glib-networking; bug #467696
+	epatch "${FILESDIR}/${PN}-0.4.11-avoid-nm-build-dep.patch"
 }
 
 src_configure() {
+	[[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
+
 	# WITH_VALA just copies the .vapi file over and needs no deps,
 	# hence always enable it unconditionally
 	local mycmakeargs=(
@@ -65,13 +67,15 @@ src_configure() {
 			-DWITH_VALA=ON
 			$(cmake-utils_use test BUILD_TESTING)
 	)
+	use python && python_export_best
 	cmake-utils_src_configure
 }
 
-pkg_postinst() {
-	use python && python_mod_optimize ${PN}.py
-}
+src_install() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	cmake-utils_src_install
 
-pkg_postrm() {
-	use python && python_mod_cleanup ${PN}.py
+	if use python; then
+		python_foreach_impl python_domodule bindings/python/libproxy.py || die
+	fi
 }
diff --git a/net-libs/libproxy/libproxy-0.4.11.ebuild b/net-libs/libproxy/libproxy-0.4.11.ebuild
index 5bc4e42fec99..e3e7b02e8a96 100644
--- a/net-libs/libproxy/libproxy-0.4.11.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.11.ebuild,v 1.1 2013/03/25 01:32:50 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.11.ebuild,v 1.2 2013/04/30 03:46:47 tetromino Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2:2.6"
@@ -21,13 +21,15 @@ IUSE="gnome kde mono networkmanager perl python spidermonkey test webkit"
 RDEPEND="gnome? ( >=dev-libs/glib-2.26:2 )
 	kde? ( >=kde-base/kdelibs-4.4.5 )
 	mono? ( dev-lang/mono )
-	networkmanager? ( net-misc/networkmanager )
+	networkmanager? ( sys-apps/dbus )
 	perl? (	dev-lang/perl )
 	spidermonkey? ( >=dev-lang/spidermonkey-1.8.5 )
 	webkit? ( >=net-libs/webkit-gtk-1.6:3 )"
 DEPEND="${RDEPEND}
 	kde? ( dev-util/automoc )
 	virtual/pkgconfig"
+# avoid dependency loop, bug #467696
+PDEPEND="networkmanager? ( net-misc/networkmanager )"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README"
@@ -47,6 +49,9 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-0.4.10-disable-pac-test.patch"
 
 	epatch "${FILESDIR}"/${P}-macosx.patch
+
+	# prevent dependency loop with networkmanager, libsoup, glib-networking; bug #467696
+	epatch "${FILESDIR}/${PN}-0.4.11-avoid-nm-build-dep.patch"
 }
 
 src_configure() {
diff --git a/net-libs/libproxy/libproxy-0.4.6-r3.ebuild b/net-libs/libproxy/libproxy-0.4.6-r3.ebuild
deleted file mode 100644
index c6628b5531f5..000000000000
--- a/net-libs/libproxy/libproxy-0.4.6-r3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.6-r3.ebuild,v 1.12 2012/10/16 08:04:33 tetromino Exp $
-
-EAPI=3
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit cmake-utils mono python
-
-DESCRIPTION="Library for automatic proxy configuration management"
-HOMEPAGE="http://code.google.com/p/libproxy/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-linux"
-IUSE="gnome kde mono networkmanager perl python test"
-
-# FIXME: Disable webkit support due problems like bug #366791
-# FIXME: Also disable xulrunner support due bug #360893, will be readded
-# in the future when only spidermonkey mozjs is provided.
-
-RDEPEND="gnome? ( gnome-base/gconf:2 )
-	kde? ( >=kde-base/kdelibs-4.4.5 )
-	mono? ( dev-lang/mono )
-	networkmanager? ( net-misc/networkmanager )
-	perl? (	dev-lang/perl )"
-#	xulrunner? ( >=net-libs/xulrunner-1.9.1:1.9 )
-#	webkit? ( net-libs/webkit-gtk:2 )
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${P}-mozjs-link_directory.patch
-		"${FILESDIR}"/${P}-flags-mixing.patch
-		"${FILESDIR}"/${P}-backports.patch )
-
-	# http://code.google.com/p/libproxy/source/detail?r=791
-#	has_version ">=net-libs/xulrunner-2" && \
-#		PATCHES+=( "${FILESDIR}"/${P}-xulrunner-2.patch )
-
-	DOCS="AUTHORS ChangeLog NEWS README"
-
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_configure() {
-	# WITH_VALA just copies the .vapi file over and needs no deps,
-	# hence always enable it unconditionally
-	local mycmakeargs=(
-			-DPERL_VENDORINSTALL=ON
-			-DCMAKE_C_FLAGS="${CFLAGS}"
-			-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-			$(cmake-utils_use_with gnome GNOME)
-			$(cmake-utils_use_with kde KDE4)
-			$(cmake-utils_use_with mono DOTNET)
-			$(cmake-utils_use_with networkmanager NM)
-			$(cmake-utils_use_with perl PERL)
-			$(cmake-utils_use_with python PYTHON)
-			-DWITH_VALA=ON
-			-DWITH_WEBKIT=OFF
-			-DWITH_MOZJS=OFF
-			$(cmake-utils_use test BUILD_TESTING)
-	)
-			#$(cmake-utils_use_with webkit WEBKIT)
-			#$(cmake-utils_use_with xulrunner MOZJS)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize ${PN}.py
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup ${PN}.py
-}
diff --git a/net-libs/libproxy/libproxy-0.4.7.ebuild b/net-libs/libproxy/libproxy-0.4.7.ebuild
deleted file mode 100644
index ffb69d791e57..000000000000
--- a/net-libs/libproxy/libproxy-0.4.7.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.7.ebuild,v 1.12 2012/10/16 08:04:33 tetromino Exp $
-
-EAPI=4
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit cmake-utils eutils mono python
-
-DESCRIPTION="Library for automatic proxy configuration management"
-HOMEPAGE="http://code.google.com/p/libproxy/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-linux"
-IUSE="gnome kde mono networkmanager perl python test"
-
-# FIXME: Disable webkit support due problems like bug #366791
-# FIXME: Also disable xulrunner support due bug #360893, will be readded
-# in the future when only spidermonkey mozjs is provided.
-# NOTE: USE=xulrunner also causes problems like bug 373397, re-add carefully.
-
-RDEPEND="gnome? ( >=dev-libs/glib-2.26:2 )
-	kde? ( >=kde-base/kdelibs-4.4.5 )
-	mono? ( dev-lang/mono )
-	networkmanager? ( net-misc/networkmanager )
-	perl? (	dev-lang/perl )"
-#	xulrunner? ( >=net-libs/xulrunner-1.9.1:1.9 )
-#	webkit? ( net-libs/webkit-gtk:2 )
-# Since 0.4.7, webkit gtk3 support is also available
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc-4.7.patch"
-}
-
-src_configure() {
-	# WITH_VALA just copies the .vapi file over and needs no deps,
-	# hence always enable it unconditionally
-	local mycmakeargs=(
-			-DPERL_VENDORINSTALL=ON
-			-DCMAKE_C_FLAGS="${CFLAGS}"
-			-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-			$(cmake-utils_use_with gnome GNOME)
-			$(cmake-utils_use_with gnome GNOME3)
-			$(cmake-utils_use_with kde KDE4)
-			$(cmake-utils_use_with mono DOTNET)
-			$(cmake-utils_use_with networkmanager NM)
-			$(cmake-utils_use_with perl PERL)
-			$(cmake-utils_use_with python PYTHON)
-			-DWITH_VALA=ON
-			-DWITH_WEBKIT=OFF
-			-DWITH_WEBKIT3=OFF
-			-DWITH_MOZJS=OFF
-			$(cmake-utils_use test BUILD_TESTING)
-	)
-			#$(cmake-utils_use_with webkit WEBKIT)
-			#$(cmake-utils_use_with xulrunner MOZJS)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize ${PN}.py
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup ${PN}.py
-}