diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2010-05-31 21:56:30 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2010-05-31 21:56:30 +0000 |
| commit | 22dade7ee11ff3827a49b5a0d058f853b3950659 (patch) | |
| tree | 867ef6fd109a0b16d346bdd2aacb937b3fa1a06b /net-libs/libproxy | |
| parent | Version bump. (diff) | |
| download | gentoo-2-22dade7ee11ff3827a49b5a0d058f853b3950659.tar.gz gentoo-2-22dade7ee11ff3827a49b5a0d058f853b3950659.tar.bz2 gentoo-2-22dade7ee11ff3827a49b5a0d058f853b3950659.zip | |
Preserve old lib, bug #320511. Install perl binding in vendor directory, bug #321807. Improve python binding handling, bug #315319.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/libproxy')
| -rw-r--r-- | net-libs/libproxy/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/libproxy/libproxy-0.4.2.ebuild | 25 |
2 files changed, 25 insertions, 6 deletions
diff --git a/net-libs/libproxy/ChangeLog b/net-libs/libproxy/ChangeLog index b1cf980a4629..9a1b18438ab2 100644 --- a/net-libs/libproxy/ChangeLog +++ b/net-libs/libproxy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-libs/libproxy # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.32 2010/05/24 15:47:52 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.33 2010/05/31 21:56:30 eva Exp $ + + 31 May 2010; Gilles Dartiguelongue <eva@gentoo.org> libproxy-0.4.2.ebuild: + Preserve old lib, bug #320511. Install perl binding in vendor directory, + bug #321807. Improve python binding handling, bug #315319. 23 May 2010; <nixnut@gentoo.org> libproxy-0.2.3-r3.ebuild: ppc stable #314007 diff --git a/net-libs/libproxy/libproxy-0.4.2.ebuild b/net-libs/libproxy/libproxy-0.4.2.ebuild index 3a7529329718..b4a13b95bc10 100644 --- a/net-libs/libproxy/libproxy-0.4.2.ebuild +++ b/net-libs/libproxy/libproxy-0.4.2.ebuild @@ -1,11 +1,12 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.2.ebuild,v 1.1 2010/05/21 14:35:03 tester Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.2.ebuild,v 1.2 2010/05/31 21:56:30 eva Exp $ EAPI="2" CMAKE_MIN_VERSION="2.8" +PYTHON_DEPEND="python? 2:2.5" -inherit cmake-utils eutils python portability +inherit cmake-utils eutils multilib python portability DESCRIPTION="Library for automatic proxy configuration management" HOMEPAGE="http://code.google.com/p/libproxy/" @@ -21,7 +22,6 @@ RDEPEND=" kde? ( >=kde-base/kdelibs-4.3 ) networkmanager? ( net-misc/networkmanager ) perl? ( dev-lang/perl ) - python? ( >=dev-lang/python-2.5 ) vala? ( dev-lang/vala ) webkit? ( net-libs/webkit-gtk ) xulrunner? ( >=net-libs/xulrunner-1.9.0.11-r1:1.9 )" @@ -31,6 +31,12 @@ DEPEND="${RDEPEND} DOCS="AUTHORS NEWS README ChangeLog" +pkg_setup() { + if use python; then + python_set_active_version 2 + fi +} + src_prepare() { base_src_prepare if use debug; then @@ -42,6 +48,7 @@ src_prepare() { src_configure() { mycmakeargs=( + -DPERL_VENDORINSTALL=ON -DCMAKE_CXX_FLAGS="${CXXFLAGS}" -DCMAKE_LD_FLAGS="${CXXFLAGS}" $(cmake-utils_use_with gnome GNOME) @@ -56,13 +63,21 @@ src_configure() { cmake-utils_src_configure } +pkg_preinst() { + preserve_old_lib /usr/$(get_libdir)/libproxy.so.0 +} + pkg_postinst() { + preserve_old_lib_notify /usr/$(get_libdir)/libproxy.so.0 + if use python; then python_need_rebuild - python_mod_optimize "$(python_get_sitedir)/${PN}.py" + python_mod_optimize $(python_get_sitedir)/${PN}.py fi } pkg_postrm() { - python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/${PN}.py + if use python; then + python_mod_cleanup $(python_get_sitedir)/${PN}.py + fi } |