diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-10-18 22:06:27 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-10-18 22:06:27 +0000 |
| commit | 02b3219bdd4793db72e8db9c3980a215c7ba494b (patch) | |
| tree | d39bfdcf479a9f4e2c44ba92607d445989bb5529 /net-libs | |
| parent | sci-libs/gts: Remove virtual/fortran and always call fortran-2_pkg_setup as i... (diff) | |
| download | gentoo-2-02b3219bdd4793db72e8db9c3980a215c7ba494b.tar.gz gentoo-2-02b3219bdd4793db72e8db9c3980a215c7ba494b.tar.bz2 gentoo-2-02b3219bdd4793db72e8db9c3980a215c7ba494b.zip | |
Turns out we shouldn't enable webkit by default, it creates a dependency loop: libproxy[webkit] -> webkit-gtk -> libsoup -> glib-networking[libproxy] -> libproxy.
(Portage version: 2.2.0_alpha137/cvs/Linux x86_64)
Diffstat (limited to 'net-libs')
| -rw-r--r-- | net-libs/libproxy/ChangeLog | 8 | ||||
| -rw-r--r-- | net-libs/libproxy/libproxy-0.4.10.ebuild | 11 | ||||
| -rw-r--r-- | net-libs/libproxy/metadata.xml | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/net-libs/libproxy/ChangeLog b/net-libs/libproxy/ChangeLog index 402c28185aff..e8bfa5acf842 100644 --- a/net-libs/libproxy/ChangeLog +++ b/net-libs/libproxy/ChangeLog @@ -1,6 +1,12 @@ # 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.84 2012/10/17 19:07:17 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.85 2012/10/18 22:06:27 tetromino Exp $ + + 18 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + libproxy-0.4.10.ebuild, metadata.xml: + Turns out we shouldn't enable webkit by default, it creates a dependency + loop: libproxy[webkit] -> webkit-gtk -> libsoup -> glib-networking[libproxy] + -> libproxy. 17 Oct 2012; Markus Meier <maekke@gentoo.org> libproxy-0.4.10.ebuild: arm stable, bug #438146 diff --git a/net-libs/libproxy/libproxy-0.4.10.ebuild b/net-libs/libproxy/libproxy-0.4.10.ebuild index 2615bc54771c..d7e625a0aaf8 100644 --- a/net-libs/libproxy/libproxy-0.4.10.ebuild +++ b/net-libs/libproxy/libproxy-0.4.10.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.10.ebuild,v 1.5 2012/10/17 19:07:17 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.10.ebuild,v 1.6 2012/10/18 22:06:27 tetromino Exp $ EAPI=4 PYTHON_DEPEND="python? 2:2.6" @@ -14,8 +14,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" -IUSE="gnome kde mono networkmanager +pac perl python spidermonkey test +webkit" -REQUIRED_USE="pac? ( || ( spidermonkey webkit ) )" +IUSE="gnome kde mono networkmanager perl python spidermonkey test webkit" # NOTE: mozjs/spidermonkey might still cause problems like #373397 ? # NOTE: webkit-gtk:3, not :2, needed for libjavascriptcoregtk support @@ -24,10 +23,8 @@ RDEPEND="gnome? ( >=dev-libs/glib-2.26:2 ) 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 ) - )" + spidermonkey? ( >=dev-lang/spidermonkey-1.8.5 ) + webkit? ( >=net-libs/webkit-gtk-1.6:3 )" DEPEND="${RDEPEND} virtual/pkgconfig" diff --git a/net-libs/libproxy/metadata.xml b/net-libs/libproxy/metadata.xml index d09e931d4e5a..08abb8af342a 100644 --- a/net-libs/libproxy/metadata.xml +++ b/net-libs/libproxy/metadata.xml @@ -9,8 +9,6 @@ <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 |