* [gentoo-commits] gentoo-x86 commit in net-libs/libproxy: libproxy-0.4.10-r1.ebuild libproxy-0.4.11-r1.ebuild ChangeLog libproxy-0.4.11.ebuild libproxy-0.4.7.ebuild libproxy-0.4.6-r3.ebuild libproxy-0.4.10.ebuild
@ 2013-04-30 3:46 Alexandre Rostovtsev (tetromino)
0 siblings, 0 replies; only message in thread
From: Alexandre Rostovtsev (tetromino) @ 2013-04-30 3:46 UTC (permalink / raw
To: gentoo-commits
tetromino 13/04/30 03:46:47
Modified: libproxy-0.4.10-r1.ebuild ChangeLog
libproxy-0.4.11.ebuild
Added: libproxy-0.4.11-r1.ebuild
Removed: libproxy-0.4.7.ebuild libproxy-0.4.6-r3.ebuild
libproxy-0.4.10.ebuild
Log:
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)
Revision Changes Path
1.13 net-libs/libproxy/libproxy-0.4.10-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/libproxy-0.4.10-r1.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/libproxy-0.4.10-r1.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/libproxy-0.4.10-r1.ebuild?r1=1.12&r2=1.13
Index: libproxy-0.4.10-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.10-r1.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libproxy-0.4.10-r1.ebuild 25 Feb 2013 08:45:34 -0000 1.12
+++ libproxy-0.4.10-r1.ebuild 30 Apr 2013 03:46:47 -0000 1.13
@@ -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 @@
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 @@
# 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() {
1.100 net-libs/libproxy/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/ChangeLog?rev=1.100&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/ChangeLog?rev=1.100&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/ChangeLog?r1=1.99&r2=1.100
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- ChangeLog 25 Mar 2013 01:32:50 -0000 1.99
+++ ChangeLog 30 Apr 2013 03:46:47 -0000 1.100
@@ -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)
1.2 net-libs/libproxy/libproxy-0.4.11.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/libproxy-0.4.11.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/libproxy-0.4.11.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/libproxy-0.4.11.ebuild?r1=1.1&r2=1.2
Index: libproxy-0.4.11.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.11.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libproxy-0.4.11.ebuild 25 Mar 2013 01:32:50 -0000 1.1
+++ libproxy-0.4.11.ebuild 30 Apr 2013 03:46:47 -0000 1.2
@@ -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 @@
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 @@
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() {
1.1 net-libs/libproxy/libproxy-0.4.11-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/libproxy-0.4.11-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/libproxy-0.4.11-r1.ebuild?rev=1.1&content-type=text/plain
Index: libproxy-0.4.11-r1.ebuild
===================================================================
# 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-r1.ebuild,v 1.1 2013/04/30 03:46:47 tetromino Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
inherit cmake-utils eutils flag-o-matic mono python-r1
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-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 ?
# 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? ( sys-apps/dbus )
perl? ( dev-lang/perl )
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"
# avoid dependency loop, bug #467696
PDEPEND="networkmanager? ( net-misc/networkmanager )"
src_prepare() {
# 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=(
-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)
)
use python && python_export_best
cmake-utils_src_configure
}
src_install() {
DOCS="AUTHORS ChangeLog NEWS README"
cmake-utils_src_install
if use python; then
python_foreach_impl python_domodule bindings/python/libproxy.py || die
fi
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-04-30 3:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-30 3:46 [gentoo-commits] gentoo-x86 commit in net-libs/libproxy: libproxy-0.4.10-r1.ebuild libproxy-0.4.11-r1.ebuild ChangeLog libproxy-0.4.11.ebuild libproxy-0.4.7.ebuild libproxy-0.4.6-r3.ebuild libproxy-0.4.10.ebuild Alexandre Rostovtsev (tetromino)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox