Preserve old lib, bug #320511. Install perl binding in vendor directory, bug #321807...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-libs/libproxy/ChangeLog b/net-libs/libproxy/ChangeLog
index b1cf980a462939082d18acdfd9a6215db3d23a87..9a1b18438ab2fc74016693fec6f32448cc67b79e 100644 (file)
--- 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/Manifest b/net-libs/libproxy/Manifest
index 9b75fa188bbb845a32b9112033b870f3f6077956..fb2f5b6a24b4d79e7625ffdf8f9af1b967e6343f 100644 (file)
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libproxy-0.2.3-fbsd.patch 2316 RMD160 961c67621cb34a3f08904d362bd76fbb754a928c SHA1 ca2ae2649f69f5b0988d0b06d1771befce074cc0 SHA256 c07673422ba2592c6092914c92fa932702838ddf0ac5345fb7785b624e66121d
 AUX libproxy-0.2.3-fix-as-needed-problem.patch 574 RMD160 dfd95508caf9a19a73fac5b12cc43fa697c91abd SHA1 63ff8823cedb350d7cd0a3ed26886c1079dddd18 SHA256 9bbc0275b1a78db7ba4966c8169af1269154dc3d9bf716035ba193861bf4869d
 AUX libproxy-0.2.3-fix-automagic-mozjs.patch 2332 RMD160 f89abdb6fb1cf7fb5682e6440bb1c489ede270f4 SHA1 88239372df7fd3c5dadf1f0bc0f61fc9163f250d SHA256 52691a7a910655a3c5c0015038311a325885b1552d94ee67d60bc8a138e197fe
@@ -8,6 +11,13 @@ DIST libproxy-0.2.3.tar.gz 378773 RMD160 c86c4f8403cb879380e101d074af469c960b5c1
 DIST libproxy-0.4.2.tar.gz 71300 RMD160 4b4234b94634f38c1292c9220c26761aa6de2917 SHA1 0715d92398b554e97c18c98c3ac67a4c41b16abc SHA256 fd49d2e994fe75672702bb86f2fdb192bdd1e528316c9011946b90f3f535f59a
 EBUILD libproxy-0.2.3-r2.ebuild 2827 RMD160 3a968c39169dab9119ee535da207f41774e06eb8 SHA1 d73a858ea864fd69fa46de6c579a1e8eb287c8e4 SHA256 a59467e8cbb39df8cf269c953b3851eb68eaa28117cbb832767e381905daae28
 EBUILD libproxy-0.2.3-r3.ebuild 2681 RMD160 3e9c879db69969b42aa2812977891b0635a326e2 SHA1 925bfc3b41c0f9777d0c476d64ac3f224867d420 SHA256 98a6365fbe874b089dc66334a7e4fe83ec8f03c06490cd8b5014c5e3b152eabd
-EBUILD libproxy-0.4.2.ebuild 1850 RMD160 a7954d958174cab66b6852133e123d686b4c4b1b SHA1 dc1c90aeedb4f0fda3b901231dd0af20a5985e45 SHA256 e5669a2a413949b99de062daa64f9146d6140d1072543b5fc5de01a77e0cbafc
-MISC ChangeLog 5375 RMD160 1b01a1882bfab6c78282d83b45f4bcced9f10d02 SHA1 d7e9e50f509f309521f40fca9aacb8ac5f4b6c5e SHA256 2e454368ec116a42168c3ee9d71f250a6d7c9c3205da3a388d76f2841cdcf7cd
+EBUILD libproxy-0.4.2.ebuild 2084 RMD160 3f53fb76a097865aef3f401287cf0b73f811d212 SHA1 942e68846bbdcdb6bee588ce1e9580245c28e5ce SHA256 3f06371b6ad787a295d7392119003202175bbf48eb8075a413755c7da3da0214
+MISC ChangeLog 5586 RMD160 9b7e46461e86af2715b8e4b27278c9adab700e0a SHA1 510d9f0905490ded3fb02b95d5b3b0fc0d28467f SHA256 c4571f05076b8d5d0d0163025fff63220cdb8b680087e83a5fe43907f06750ce
 MISC metadata.xml 657 RMD160 dd64d804f866b7da2ab5fa84229938df8e9c8af4 SHA1 997f9c36e65f1e4778980317a993cf23da805226 SHA256 3193dc9e8933a0ee548e865ca33e76d27bcff750419087cb9c8c53eb8bb905ec
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwETLUACgkQ1fmVwcYIWAbp3wCgmBoIs3zq3GyRlIpWdnB84yn1
+IxsAni0H/A2+LuxLCpoyrIL2sAPMuNiO
+=NQJz
+-----END PGP SIGNATURE-----

diff --git a/net-libs/libproxy/libproxy-0.4.2.ebuild b/net-libs/libproxy/libproxy-0.4.2.ebuild
index 3a7529329718a75d1378b0a4faae4b10dd162fe6..b4a13b95bc1034b53b583ef22eb1d3a07aa3e1a4 100644 (file)
--- 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
 }