Version bump; fixes buffer overflow (bug #438146, CVE-2012-4504, thanks to Agostino Sarubbo). Re-add USE=webkit since it now works correctly (bug #412573, thanks to Lucian Muresan) and it enable by default to provide PAC and WPAD support. Alternatively, spidermonkey could be used for PAC instead (but might lead to firefox crashes, see bug #373397). Update license.

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

8 files changed, 180 insertions, 24 deletions

diff --git a/net-libs/libproxy/ChangeLog b/net-libs/libproxy/ChangeLog
index 429ac1bbadfe..dbb7c0fe451e 100644
--- a/net-libs/libproxy/ChangeLog
+++ b/net-libs/libproxy/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-libs/libproxy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.79 2012/05/26 08:57:11 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.80 2012/10/16 08:04:33 tetromino Exp $
+
+*libproxy-0.4.10 (16 Oct 2012)
+
+  16 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libproxy-0.4.6-r3.ebuild, libproxy-0.4.7.ebuild, +libproxy-0.4.10.ebuild,
+  +files/libproxy-0.4.10-disable-pac-test.patch,
+  +files/libproxy-0.4.10-mozjs185.pc.patch, metadata.xml:
+  Version bump; fixes buffer overflow (bug #438146, CVE-2012-4504, thanks to
+  Agostino Sarubbo). Re-add USE=webkit since it now works correctly (bug
+  #412573, thanks to Lucian Muresan) and it enable by default to provide PAC
+  and WPAD support. Alternatively, spidermonkey could be used for PAC instead
+  (but might lead to firefox crashes, see bug #373397). Update license.
 
   26 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   libproxy-0.4.7.ebuild, +files/libproxy-0.4.7-gcc-4.7.patch:
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index dc2c8678b284..06a3cd1c8c3a 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1,25 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX libproxy-0.4.6-backports.patch 5508 RMD160 0b508fb85301831ccde12a266aae13b9d6f1e2a1 SHA1 56abab45bd504c53100e2f0b828d4e84e53525cc SHA256 d549840659c19a0d39d208928c1fe67aa7cffec9448b3c123951d3ec59049609
-AUX libproxy-0.4.6-flags-mixing.patch 415 RMD160 41dfeee7ec15c58b3e65326b71f959cb11f65985 SHA1 10dd9c12e16039cff52a2420637353843ba6ad6b SHA256 ac57bb007b3e7fe665e684da51f2fb3c767a3ca3221fa940a97e545061a72b1b
-AUX libproxy-0.4.6-mozjs-link_directory.patch 1365 RMD160 4ba7b7f923a8d48575db2f13c86482d78e54ae1c SHA1 0a083243f29571e5e971de6df6e4c81b9cf6444f SHA256 783bc34d685ddf3ba6e6c85003417412f2bb87e9fc87c4ca5c9c56bf5e99aea5
-AUX libproxy-0.4.6-xulrunner-2.patch 4763 RMD160 66210bdb6497b14358fd73037b6e9813ffd55de3 SHA1 a0ee71fc9b6cd15176b53601655ee6c0d760651b SHA256 e4bd9cb3c43249593015c1fe2b6630e999627e01ca1091455a70ec32d0233525
-AUX libproxy-0.4.7-gcc-4.7.patch 2740 RMD160 7b01c5f4a77eb99265d8bf5334cadb34cf24ad24 SHA1 f62172660faae91669f32d85bdc4836d436f2359 SHA256 ab7e1a21a884abdf6192718c5fe53c79febf3728cdefe5fceac056a4a0727aa5
-DIST libproxy-0.4.6.tar.gz 82483 RMD160 f5f03c84ad2d87fe728869fadc669628737c639e SHA1 6e9745c87b774f34bf53f07a54284c0d72020e94 SHA256 9ad912e63b1efca98fb442240a2bc7302e6021c1d0b1b9363327729f29462f30
-DIST libproxy-0.4.7.tar.gz 91092 RMD160 a09c8320cbabed23c84ceddf3c9b572cf89c9c0e SHA1 b01ebbdf837babf63f38ee34e261d76f23dad319 SHA256 8fe0a58810139ba3c2e186deccf3e68adcd127aa0e972b0862b30b3dde493797
-EBUILD libproxy-0.4.6-r3.ebuild 2365 RMD160 abf85eae87a1b271f3ac9348c851eb70b5ed92aa SHA1 df4c7c45fd5d1e23ec744f97a5f32c69b62c09f3 SHA256 731033a5af3bcbd7470a6688234091b0d4b6d4b03b55714699b5182c397565c0
-EBUILD libproxy-0.4.7.ebuild 2337 RMD160 5886a1a2bdc3ab58366b3ee76e945e7646094bce SHA1 5b93af9d5cd231aeca5b452e84fab3ad398b1eb3 SHA256 6d05d7159e5022daee6c8ebddadc4a8bb55a56f19fc6e7b60f9d85843ffbf70e
-MISC ChangeLog 12146 RMD160 f640635d510fb14d67dd3b20af92cd66db551640 SHA1 2919d564a6cb3abdd2b18eea90bee545fcfe1524 SHA256 b308954a1ec83c776198de715cc3da72ad7efcbfc189ae21f1dd2594989604bd
-MISC metadata.xml 492 RMD160 47f4fe7dbbb838e69d769ff2bfea6f6f701aa7d7 SHA1 aefb7808bcb2a50c11cfda970bc750be6e7e38ba SHA256 7a397e71aa5b15f596b4643a0d40fa5eb4ae48a1a67e51e8d3d38930c7257311
+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.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.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.ebuild 2447 SHA256 a87ca607c3aa97678449d735b453d779bd962a71370a28684199eb8f264562ca SHA512 8064feaf3a69c1a8a19be7ee06eb409a415996c75ae539f77ac8bb99f44b698a33d0d7be3eab3fab783b53ad9008818fb2aa0beab5e1722e67d259c5102847ee WHIRLPOOL c16fdebf3c0f02825ee417554e542c675b2a373f0fd85f8e76ce42494b87a937972f21000213d4e02225d07c7417c2732cde8450260d70dc39a4bb35a01b69bc
+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 12798 SHA256 9836d74833c4b8d3c6b72f883abaa41367ae0c4d652cfd04d7518a3d2fa05f42 SHA512 7e6532513ceb6753f00ede88ff42f9785b7f57773b4734493830145f46bddfefb9c2e1db8b130adb85ccf8334f7d060eae07206bb6953eb9179b4ca50bf76b3b WHIRLPOOL 13462c7f26fab0559d590cb184fd8e81b424d5e6414a88cd546e7505b9c0b543962e4e5581cfceca4898bff9722c623dd3ad8a00bfd2f6c525a93f350c4c290c
+MISC metadata.xml 805 SHA256 43c4f55a378dc64ed76fbd47ce2b41eaec75e9221e3043f50c570e5bed6999dd SHA512 77f08013e40ed60426c2ecb50efbf15dfa09495e1971cb2f4b5f643b2478dfaca28e466b3576d218dfbff6877b417fc5437c75cef65d2ca3d454f616fc18f75c WHIRLPOOL 3ca36cea259cca6c83efd347f7e1e8a5ec63eeeffb0505193571c4250b28156b9094791f50bec2157ef45d0b9324874797eec34b25ca7b33cfbaff57f6142458
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPwJrtAAoJEJ0WA1zPCt1hhIMH/A8WPAy0zgoXJSMeRc6/yzXV
-mVyxjZ0vZsCEuglZgzvFBDSwMVA373W+cpCPS+qIXHVf0lVZHesUhur+dfu6ICwL
-YzzRQu+vt5NYBj9Qd7DYLt3Anpr9P7eiFyhGEMxkb0vrTB9yw/Ih1mRSoimV+dAw
-I3RMY6iuAqQtdhoMC0TCi3O7I0nwtor5PhgMf5PYZXyeLCkUmzyozKH2pkTKnDb/
-KRarPaSe2DPWhNw2jyOd0sA2cZxpEbQnEUnikSo7CRXkVJX2JH8KgVSHfB8PukNc
-KTV2nQBtdBoWBeNZi5vzGtB9q1MdPg6Sk9KxSJ3c6ycx3rX3wlRFjCpqspZ9L6c=
-=1oj8
+iQEcBAEBCAAGBQJQfRUSAAoJEJ0WA1zPCt1hX8kH/1xhpLY9LMedW3lhVsQOp2b1
+IuQ4YfjTgDbXs08yedDH/srf3IyKCiGxrZgQwpgFV5PiJ9exdA21BC2zeVfOqucE
+aZtRMtUEdRIYUXhC9VT9dUwCiLiGupLXZBvHKNn1DFOaHgFZ51nc1treKJsC3Zxe
+rsScRpmbJoIFVe59CRXN0mr9rBZIsSfUbWNk/xFwYKyM34L3JjiLd/q+xV8QjWLo
+tslWvnXnugxjkbnVg5TNq2mp0/KkLzLbUx8YJOL+eEeAsL0LrVoEZNr1t9c0RAqO
+Ejms9UgDuKfs+5ObKp8PDbk4mkKC7Nq2yxHrpTXDe3gqR5QUj061Zt5f91RZYbg=
+=kQjp
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libproxy/files/libproxy-0.4.10-disable-pac-test.patch b/net-libs/libproxy/files/libproxy-0.4.10-disable-pac-test.patch
new file mode 100644
index 000000000000..91658574134e
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.10-disable-pac-test.patch
@@ -0,0 +1,29 @@
+From 5a1a8d2b920006e54d9de971999b443073f50843 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 16 Oct 2012 03:30:50 -0400
+Subject: [PATCH] Disable PAC test
+
+get-pac-test freezes when run from the ebuild, but succeeds when
+building manually. Using Xemake/virtualx.eclass doesn't seem to help.
+---
+ libproxy/test/CMakeLists.txt | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/libproxy/test/CMakeLists.txt b/libproxy/test/CMakeLists.txt
+index 8894425..69543a4 100644
+--- a/libproxy/test/CMakeLists.txt
++++ b/libproxy/test/CMakeLists.txt
+@@ -17,10 +17,3 @@ if(WIN32)
+   target_link_libraries(url-encode ws2_32)
+ endif()
+ add_test(NAME url-encode COMMAND ${CMAKE_CURRENT_BINARY_DIR}/url-encode)
+-
+-# Get PAC
+-if (NOT WIN32)
+-add_executable(get-pac-test ${CMAKE_CURRENT_SOURCE_DIR}/get-pac-test.cpp ${PROJECT_SOURCE_DIR}/url.cpp)
+-target_link_libraries(get-pac-test pthread)
+-add_test(NAME get-pac-test COMMAND ${CMAKE_CURRENT_BINARY_DIR}/get-pac-test)
+-endif()
+-- 
+1.7.12.3
+
diff --git a/net-libs/libproxy/files/libproxy-0.4.10-mozjs185.pc.patch b/net-libs/libproxy/files/libproxy-0.4.10-mozjs185.pc.patch
new file mode 100644
index 000000000000..1ccbdd4e2a2f
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.10-mozjs185.pc.patch
@@ -0,0 +1,25 @@
+From dd09f546f0287cfeae587c723c98f70f3de65ab8 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 16 Oct 2012 03:03:48 -0400
+Subject: [PATCH] Gentoo's mozjs185.pc doesn't set Version:
+
+---
+ libproxy/cmake/modules/pacrunner_mozjs.cmk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libproxy/cmake/modules/pacrunner_mozjs.cmk b/libproxy/cmake/modules/pacrunner_mozjs.cmk
+index 636bcc1..21072db 100644
+--- a/libproxy/cmake/modules/pacrunner_mozjs.cmk
++++ b/libproxy/cmake/modules/pacrunner_mozjs.cmk
+@@ -9,7 +9,7 @@ if(WIN32)
+ elseif(NOT APPLE)
+   option(WITH_MOZJS "Search for MOZJS package" ON)
+   if (WITH_MOZJS)
+-    pkg_search_module(MOZJS mozjs185>=1.8.5)
++    pkg_search_module(MOZJS mozjs185)
+     if(MOZJS_FOUND)
+       include_directories(${MOZJS_INCLUDE_DIRS})
+       link_directories(${MOZJS_LIBRARY_DIRS})
+-- 
+1.7.12.3
+
diff --git a/net-libs/libproxy/libproxy-0.4.10.ebuild b/net-libs/libproxy/libproxy-0.4.10.ebuild
new file mode 100644
index 000000000000..46de508df12b
--- /dev/null
+++ b/net-libs/libproxy/libproxy-0.4.10.ebuild
@@ -0,0 +1,80 @@
+# 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.10.ebuild,v 1.1 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 +pac perl python spidermonkey test +webkit"
+REQUIRED_USE="pac? ( || ( spidermonkey webkit ) )"
+
+# NOTE: mozjs/spidermonkey might still cause problems like #373397 ?
+# NOTE: webkit-gtk:3, not :2, needed for libjavascriptcoregtk support
+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 )
+	pac? (
+		spidermonkey? ( >=dev-lang/spidermonkey-1.8.5 )
+		webkit? ( >=net-libs/webkit-gtk-1.6:3 )
+	)"
+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() {
+	# Gentoo's spidermonkey doesn't set Version: in mozjs185.pc
+	epatch "${FILESDIR}/${PN}-0.4.10-mozjs185.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"
+}
+
+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 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)
+			$(cmake-utils_use_with spidermonkey MOZJS)
+			$(cmake-utils_use_with webkit WEBKIT)
+			$(cmake-utils_use_with webkit WEBKIT3)
+			-DWITH_VALA=ON
+			$(cmake-utils_use test BUILD_TESTING)
+	)
+	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.6-r3.ebuild b/net-libs/libproxy/libproxy-0.4.6-r3.ebuild
index c12212a4cc17..c6628b5531f5 100644
--- a/net-libs/libproxy/libproxy-0.4.6-r3.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.6-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.11 2012/05/05 02:54:29 jdhore Exp $
+# $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"
@@ -11,7 +11,7 @@ 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"
+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"
diff --git a/net-libs/libproxy/libproxy-0.4.7.ebuild b/net-libs/libproxy/libproxy-0.4.7.ebuild
index d7a6d88a1c63..ffb69d791e57 100644
--- a/net-libs/libproxy/libproxy-0.4.7.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.7.ebuild
@@ -1,6 +1,6 @@
 # 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.11 2012/05/26 08:57:11 tetromino Exp $
+# $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"
@@ -11,7 +11,7 @@ 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"
+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"
diff --git a/net-libs/libproxy/metadata.xml b/net-libs/libproxy/metadata.xml
index 5143ad097e69..d09e931d4e5a 100644
--- a/net-libs/libproxy/metadata.xml
+++ b/net-libs/libproxy/metadata.xml
@@ -9,6 +9,12 @@
 		<flag name="gnome">Enable support for reading proxy settings from
 		GNOME</flag>
 		<flag name="kde">Enable support for reading proxy settings from KDE</flag>
+		<flag name="pac">Enable support for PAC and WPAD (proxy auto-config and
+			autodiscovery)</flag>
+		<flag name="spidermonkey">Use libmozjs from
+			<pkg>dev-lang/spidermonkey</pkg> for PAC parsing</flag>
+		<flag name="webkit">Use libjavascriptcoregtk from
+			<pkg>net-libs/webkit-gtk</pkg> for PAC parsing</flag>
 	</use>
 	<upstream>
 		<remote-id type="google-code">libproxy</remote-id>