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).

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

13 files changed, 130 insertions, 615 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/Manifest b/net-libs/libproxy/Manifest
index c40842051a49..723e2c888eeb 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -4,32 +4,24 @@ Hash: SHA256
 AUX libproxy-0.4.10-cmake-2.8.10.patch 1279 SHA256 6a0fa494c384367c59d5931836de9f44cdf0f981b06ad6a1738d72858db96b78 SHA512 e9deeef1650639e7d278c6ccaacbee16c8d412d944e24bd067526da92a5ee69c6f41906cac3557b8b8e856cc0e3640c7f411cb12df236a8da0f8df4923d3e500 WHIRLPOOL d95ae9778d9fee18723c205c6f862cc7e861af04652e79814d029a28e00dae7a60b9c9ee6c91bb6c4091a240fef19ca687410290bc4890247a834530390aabab
 AUX libproxy-0.4.10-disable-pac-test.patch 1017 SHA256 5aaf8c3795b8377e4e71137db2e948de98680288a1fdf544d31d9086c980d9e0 SHA512 a0fa6520c60489675176ca7d5d750d0f54e020592743a3437c184939314b71be68803a7f1cb8cb584fb7ad6ee884c85bfb7905d4bb3e0536d535e990981e9ba9 WHIRLPOOL 09889493958b9bbc0c3cd160d84512955cb63f925edffc7caf827ffe2d5f6c1ff7e3a5de32e842b642e11fbd813194656bba1d597140bee0d759836e0021ec80
 AUX libproxy-0.4.10-mozjs185.pc.patch 884 SHA256 bd6ceb23919ee6e7619a90bf9aac9295e7904c310e876f64b3bac9aff3d0a5be SHA512 e626d327dd7f681049442e2bd90fb76e2e8803d0ebe94944250a61aa7672259241006f0f71320693701c131855a2f9b40940e84024b92867d81600ed2a0a9848 WHIRLPOOL 48f9c1dd920ec777558ad6b38506cb389721d7cd4805190b2f038d70262e1cbedd2f66fd569dabdb2cec0b3967fbd868d3da376c36d4c2ea73e7b60edc773fb0
+AUX libproxy-0.4.11-avoid-nm-build-dep.patch 2062 SHA256 568cdc25ab6193d7e352682f28a1b9a7db14fd10216dcd644df8fa54edba21dd SHA512 eb4b7e0b79ae89e611b3f3472cd17d2e05732e806c8fb85b7fb4afbb67e1653bab0706b4a29efd5079283372f975b2a1e1f987ffd2a099ce28ba7fe5362214b5 WHIRLPOOL ccd304cfd757e2717a17012df45b884e6e86017f9688c5c8bad8cb31ba9b55b9194bbb76cbe81c215ed85c8b614a247c602ba2217a1d7b3b7681fc366fccb3fb
 AUX libproxy-0.4.11-macosx.patch 3915 SHA256 28e19ac546c32500f3de0f90e4e1ea843fc03278cf625b86540325db5e087af1 SHA512 c5f3e3190390c21a4343c62963a1d6cd32c132e62922085fbe6de61598a33a924072a42813c227d7054862fab40d654f23eb29e36a0fb34ce07b9976ca37c9c7 WHIRLPOOL ed0970c0a088e0d5312576553f0e41c9266c2e501be7b116476ff3f9efdaf6d68e500efdda64af07cf8153e349fc35215c0e0481b86245c0b193e0d7ae25a350
 AUX libproxy-0.4.11-mozjs.pc.patch 821 SHA256 fe53c11a149ea2738b082d36a966f80a4ad17c28b9c3ab1bf1bdb54f9501ac52 SHA512 6185df5686ca8a0cebbcc07b013323d0cac5ece4ec5866b424be5c3d6b3d15a5909de390204e18d45344dc67490514e261cbdc54c11e6715214cbb6ca2e24e37 WHIRLPOOL a29344f159660da9a5f54b336f247803a53809d7599a445eb668cf426f9579b407d05dc410fbb1d6016162f554a1c5969c874c7b698288cc71cda856241afcf8
-AUX libproxy-0.4.6-backports.patch 5508 SHA256 d549840659c19a0d39d208928c1fe67aa7cffec9448b3c123951d3ec59049609 SHA512 0bbd39482a1ee7764addec5e0b460c6f646f4b3a30fec254b38792d7e9effe19c455bc09853e4c9ef7f1ea03b669156aecfbcb7377985e3ecce1184148031cd6 WHIRLPOOL 78b3c80650fbac613b3f4b647201c019bf59a369ee62264e6de5ad86ecefd2ab664096a9e73df3c7ffaea5a56c05983f18f1bbe853f6e3805bff75144b670a41
-AUX libproxy-0.4.6-flags-mixing.patch 415 SHA256 ac57bb007b3e7fe665e684da51f2fb3c767a3ca3221fa940a97e545061a72b1b SHA512 7107abb0e79ae9fa07ebba86e0b0454f9317eba5f9391c9fec7f3b65dba162fd63a6ccc7a66888d5ed767ce9e2cb5d5e8edc568c7fc6696c16110d3c8d338000 WHIRLPOOL cf21e26545b87867c6ffd06acbbe8707b63885f569d5fbe9cce1b7e830d911835c43ab99e54be93d0938d440572992f6f3ecf941389f7d4f005395e1b3e0b78c
-AUX libproxy-0.4.6-mozjs-link_directory.patch 1365 SHA256 783bc34d685ddf3ba6e6c85003417412f2bb87e9fc87c4ca5c9c56bf5e99aea5 SHA512 9271057714ff85c7cc29199764525e4835962b345ab4245aecba1ef57c98d900b93e1455eb1d5fc41a9f7d64f2bb0a46fb2b8ba6102a32a7b4b73312efb75cf3 WHIRLPOOL 56d5b1b24376253ece2781b42e2a3acd6d4e05932efe92f9be3ebe883cf6fb09e342f59d67efde06af00cbd2fea438f6602c6d8d96309c9a9492f0cfa237dbb0
-AUX libproxy-0.4.6-xulrunner-2.patch 4763 SHA256 e4bd9cb3c43249593015c1fe2b6630e999627e01ca1091455a70ec32d0233525 SHA512 a200124d55f34f025aa10fbe08df921df3f04739b01947e69b32fc0166ab7b3a5b88599d562380b0a61139547a703247a1963f082333a885f48ead09ee937147 WHIRLPOOL 878ce9855372e7e83dd69eea22fa7360103bfa9f485a18450f171732b3f4514a7b3fd18b3f601357a029f80bbdc5080ab6e0efb4aa5d1f7b2514ffdaecf57d40
-AUX libproxy-0.4.7-gcc-4.7.patch 2740 SHA256 ab7e1a21a884abdf6192718c5fe53c79febf3728cdefe5fceac056a4a0727aa5 SHA512 d1bfa808ad230797840c4eccf3a34fa5bab2481413e3aa43bf3172db8e803e45fd98648d7d5310865d886f0d57c26433a8c143ab424c884faa82d80a160d43dd WHIRLPOOL 52283b6fae516a0aba9c1032ed7e4a62d0c22105f6b25ad11895f3f12859bcdea41ddeeed026b372b340b95293c02c8328f3e4e127a4eb518f1e13c7aa1e0c27
 DIST libproxy-0.4.10.tar.gz 378318 SHA256 023e3c1023c522333ac4c414e9cb6db05bc564d3e5d30570e2db07aac100c635 SHA512 d7400740290bffb66ced317692f6b6fdb3e9973e48af1287df51dd3813706164ac6ee6970bde0f7b28beed4a6b6086bf957d85ec8c543e4c0af7044defb88e82 WHIRLPOOL 9dc72362eddd2152a3dfb0185ccdeef4cdbae5c500a18d4ec64bfaacfb4ee66132c0175d837b8ed88cb210a35753546b06735a33a85f3fdd5bf12d5e71b57b06
 DIST libproxy-0.4.11.tar.gz 93757 SHA256 dc3f33de54163718f82b3e7c496a7de97f8862578414b8ecaad3cbfe4821864b SHA512 563a837946a73c41e0773cec93332c6308245c0b807a40a0fb052c2445deae4a117ba2780a350c799717fd11c4dbe410183a38ea050a4f04db0b1adcb6f9ad98 WHIRLPOOL 2165fcb9a43592e1112539ff7fdd79963fc6c00821edb5d5f04d92d7d1bd884362019a2a2cd12cb412dfaee25ad8e1554a568e9818910861000666bfe81ca479
-DIST libproxy-0.4.6.tar.gz 82483 SHA256 9ad912e63b1efca98fb442240a2bc7302e6021c1d0b1b9363327729f29462f30 SHA512 4ed64addf5a41b4c0e24cd0988707a73d608d57833d0f7da955bcb9a567ec8fa37b7407c2e9c2ff50057a24b56d17509c944325d2d1d8b7e5e6aa64e624fcd88 WHIRLPOOL 8f32238b57f6b4c142756664248d0449e292fb44a940b059bffc7c9408e825ed96a1dbe2f0e8c3a8caaf059449225999d7ec966812b54ad6b84037b83767c132
-DIST libproxy-0.4.7.tar.gz 91092 SHA256 8fe0a58810139ba3c2e186deccf3e68adcd127aa0e972b0862b30b3dde493797 SHA512 a0a5f4f8faa2724ca88fb52f3f683f7270235536151089bfb34dd0f4164923abc586c7b621eb70bf0f53a0bf5a9807d3b31061803a0891c70d8e6dad1bbfe48d WHIRLPOOL 665486341b517c324c15a06f37366b834b249b1820cbac6bc0aa39586b9933e0f6519e4963790ce0992eed95dd46bc965b76e2832e8ec4eaddb1e2e4e3e0fa20
-EBUILD libproxy-0.4.10-r1.ebuild 2531 SHA256 c3ecaf946ac3d123176bbe3f09f0861ddde05aa395da84b10ed375c0b7778beb SHA512 5eb05883702d9dc152a44d96a1a7d4c780c4542af601866c9d9277eaef539420c6ce50d75b87f90dab2f600a9918a7248d7a5a5dbadd98dc2b893a953c635cd9 WHIRLPOOL e0fef0777cadd9c9e9e95400d5444fdbe4a7f5b28572dbea4a507cb43f85635ee05b49ab5f1aee9653190201ace9a38f27a2a280757b24272816cf6a7a8e340b
-EBUILD libproxy-0.4.10.ebuild 2371 SHA256 9dc0d1f254e880627d46261b7592562cb93e9e93abcc0ff5ceb75c50f32248af SHA512 75fc1117599e0f0e5f3a3bae6cc683222b6e2d206ec1a4228eeb9e3b3d4872be4e84942f6b500ed2aa451f9263013e9e366a8118af979764649563f61392f994 WHIRLPOOL 8c9ff0a61452d9924598b38ca8a660d080f6ddaeedc2c353d82536b60ab501be41661e328efa5ee1ea4fd6c6fd2f36245bac4de71cac6a1ef7c8d9b6e381c6f6
-EBUILD libproxy-0.4.11.ebuild 2620 SHA256 fb3ec086aad3c4c9ce8186b744a999acc53cfecbb9c75c41b3082d2fd0e76979 SHA512 82ac511d80dfb864ea54a2021b49fac10e07ab6073d135ea1570922af9579853ca32da7490d11e9d36f04fbd12dcc99407761ebcdd9715043c56a1f55e507f44 WHIRLPOOL 5b04273270609851129ecbdaaf0e4821a051b5814e1fd96989dcdf2c1d235cb87e47b7877f65012fab5031a14f848308a3761f567a42378e074adb50b6f39a47
-EBUILD libproxy-0.4.6-r3.ebuild 2369 SHA256 a8d9395c1ab0bfe74fa7d162807fbdd56c7bbacf178767e99033891807ea3887 SHA512 1bb8e552b9375544815fb5f1ee8b78db9080ec43c0dbbb3bf88c21f0b0587158e1599454137b14203b067a1023f46783f97cfaffa925caa9e3150dc5d07c85aa WHIRLPOOL 49d42e72fe6e4bac2696f5f9dff1e8a1d1cd219283aa372522ac45f6117fb78b588616dd616ea72878f642279339ee01eeae6f09872725203d4db22227611461
-EBUILD libproxy-0.4.7.ebuild 2338 SHA256 125a4e2067e3f17aa759b43ef95cfdeae2a3245023d8d73daba50e53fdb21bb9 SHA512 700d7d7824abac057d68deae929bf05c7f2d36da4366c6d4e4ec8de15586c326cbc4cf813087d7fe8d7d65539ff68a0f098624568411f345e99971ae473478d2 WHIRLPOOL 825bcdfb952a5ce47b687afa3135811d6a7879639c334dc92d86dd39fd363e67406076a1883462250738361dde9d3e8930f5c3ef466b2df75c8c4e6febd68d44
-MISC ChangeLog 15759 SHA256 f1225c049ca6da8c63e88067b99893e94540135c08e5ec856e05a0253b795372 SHA512 7c8f178d63a241084ae97ba8c0e2daa70c62992613a0e8a58c9215363d34ef778e3348d798ab1f0c78d208c2c6cf67c3a56a32bf66a5f72629dedf42eac3f5eb WHIRLPOOL 2a2efa88adb402f18f747032a0c7993984d3031ea2eac17228330243fbf06483dc1c1d40306a659d55ecdb577ee42162cc01a9763f7cbbb04f692fae4dd70403
+EBUILD libproxy-0.4.10-r1.ebuild 2761 SHA256 155ede5f73e04eabe3012ebef526e028b6dcc58b0ac0e968a943bfba3f36371d SHA512 a9feebbcbc4d28ca1efeabad1f5d5fceb98dcf7a3dfb41e38f0f9652511cff74e7b6065a03f4fa87b75da2f81c1fa90430b3f61f2e70ca8a2692d3c4cdd7547e WHIRLPOOL ed6a1c69c8b76df74dc33c8980a04c0aacb8ef84bb34ef1b77266a9dbcb1c400e38d925910f4ec6d459c70dc76483bebd90ced7e8fb9b7ebbe5e92316421ed00
+EBUILD libproxy-0.4.11-r1.ebuild 2852 SHA256 2910b92da39d8763602cfbd1775bdf40ef47a579d47dd5519a4b3ff5ba52413b SHA512 1f012c24f9968797cada399b7c8e517e10cdf1cedf11f8c63f5e0756fe104fa9e096aaecc77a0542c1a45dbe5643136c427ce6c40366381dfd949ec57a8583d4 WHIRLPOOL 62b50a9b21089fabe55857d3cd9746e0c2b5e155128948427e76a4b317dc66b016cc9a3818c309b2f9cb239edbee4aa44bb1ca63d1305ad243b1d8d16d8998d3
+EBUILD libproxy-0.4.11.ebuild 2851 SHA256 d1695702dc46087b8a98f8053fb0d85e92ffcc10f962ba30ae9010e2d388f59f SHA512 10e57986678d1eaf92d19c75e782877993ba2bad01694f8be1a3f63d56ba84b784dddab6f7c43cf45821292d2f9e4ad431e2d4294ff8531e4902a5da3f88917e WHIRLPOOL ce6e1e6e04d692d678675975fab6ff307b523981e57d6792c635839b6ebbee42cc4a5afcf64eee47bb70dbf9e2ea268ff9dcd32ab83cbcd12ac0eb983d0ed548
+MISC ChangeLog 16472 SHA256 19a9afbbc7dbd2fc716fb8ccc9d0e3db68d0a02d389ef0269e4dce683a02cfa5 SHA512 03ed6f91961b00dacb2f6d123b183d5c9bbe2718a5a044b1d3b48883d4e403bb43045232f59a1253e7efb833e00d0ec22ab849ec75d9ea042771c465635428eb WHIRLPOOL 740bd9baa59ee1841f413bf9b84cc0de3b6f36bf014fe0f9fc78da873c660dd0d83e5cb9060d234718d5488324b98de798ef05968ffb436227257e8745f768ce
 MISC metadata.xml 706 SHA256 f036003c89fb0aabecfc402e08129ab1a698642bc16ddc577909f6fb73d9ca9b SHA512 5699fa2ea9005031934cf7f66d7b51c814309c1f2b3b972ca12983dcdd8d6175e677f0c1d141db4c7d8e3252546b7b25ec3d660cd6a96a9e731f9e42f10f4f1b WHIRLPOOL 7f1dca48d567d95157be0b5e6a5a7612d41772207dac31a48b12012d77519d01c5ce49711ec9c563bf5f188623c85a6a1bda0b39365a25c3493eb64ed4449f67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRT6lDAAoJEOeBhlrCAAWG38wH/064d819MhIsXslANjfHFhcb
-2HGS2426wZTcwmE4Ziru90B1Lv9VexCqdTRdpN9pT6Vjq7PRvuLXim0v72emHc/T
-LN22LTqf/wStUGxM2OJp+ZWaHDVAZuqo4RkqXy/ImuejvGtKFyNpdco7Vf/+8sU6
-ahoh5p5V+w1HdmBoovltQnMLcm81mJFh8ETJs7HOoxOxj33RFSvzaY/sbhgamx7z
-joGf9/9oyUexgNCelADiHetjmYimsDxYMg8gqWUpMAp/LdPNT8HPOykYX7AqcSNS
-el4H0Ov3ckIX0ZnYMbVo3ho6Fdyr+06ZB+GrR4JoTz9bbNxPONXZyGJ/5eYEV7o=
-=zZkV
+iQEcBAEBCAAGBQJRfz6oAAoJEJ0WA1zPCt1hbnMH/26SRsN8G7a6s8dYXItIk3WF
+VKS/NL8RuzyViZ+BVTC3bg6Yei7aR4rCwar0WQmWnIky8KyTdEoUsavTK1pr74oG
+4TWm+ntCF0g3+h7QubbDxCGl0zjrQNe2l321xEHX9DT6x1AqLfPJTTxE2iopzrl3
+bNRMoaKqAGJ7tMacz1RBLNsN9A1k7YUHXJM2TFilSU6YvQ0QfULHszu4104BJVNs
+nOvnKWYecAyJU1lRrh1TJurpxjGMQ4aoDXJCwwzlhLu2xfPTnXl9siLPlRyPQnw6
+iJZGVYhukEAGILQNGbmDQyKZYqOwxUXi/m87JiBWcZr49RlBu291IeARXYaAI14=
+=c/c5
 -----END PGP SIGNATURE-----
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
-}