| 1 |
eva 10/05/31 21:56:30 |
| 2 |
|
| 3 |
Modified: ChangeLog libproxy-0.4.2.ebuild |
| 4 |
Log: |
| 5 |
Preserve old lib, bug #320511. Install perl binding in vendor directory, bug #321807. Improve python binding handling, bug #315319. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.33 net-libs/libproxy/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/ChangeLog?rev=1.33&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/ChangeLog?rev=1.33&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/ChangeLog?r1=1.32&r2=1.33 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v |
| 18 |
retrieving revision 1.32 |
| 19 |
retrieving revision 1.33 |
| 20 |
diff -u -r1.32 -r1.33 |
| 21 |
--- ChangeLog 24 May 2010 15:47:52 -0000 1.32 |
| 22 |
+++ ChangeLog 31 May 2010 21:56:30 -0000 1.33 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for net-libs/libproxy |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.32 2010/05/24 15:47:52 nixnut Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.33 2010/05/31 21:56:30 eva Exp $ |
| 28 |
+ |
| 29 |
+ 31 May 2010; Gilles Dartiguelongue <eva@g.o> libproxy-0.4.2.ebuild: |
| 30 |
+ Preserve old lib, bug #320511. Install perl binding in vendor directory, |
| 31 |
+ bug #321807. Improve python binding handling, bug #315319. |
| 32 |
|
| 33 |
23 May 2010; <nixnut@g.o> libproxy-0.2.3-r3.ebuild: |
| 34 |
ppc stable #314007 |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 net-libs/libproxy/libproxy-0.4.2.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/libproxy-0.4.2.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/libproxy-0.4.2.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/libproxy-0.4.2.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: libproxy-0.4.2.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.2.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- libproxy-0.4.2.ebuild 21 May 2010 14:35:03 -0000 1.1 |
| 51 |
+++ libproxy-0.4.2.ebuild 31 May 2010 21:56:30 -0000 1.2 |
| 52 |
@@ -1,11 +1,12 @@ |
| 53 |
# Copyright 1999-2010 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.2.ebuild,v 1.1 2010/05/21 14:35:03 tester Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.2.ebuild,v 1.2 2010/05/31 21:56:30 eva Exp $ |
| 57 |
|
| 58 |
EAPI="2" |
| 59 |
CMAKE_MIN_VERSION="2.8" |
| 60 |
+PYTHON_DEPEND="python? 2:2.5" |
| 61 |
|
| 62 |
-inherit cmake-utils eutils python portability |
| 63 |
+inherit cmake-utils eutils multilib python portability |
| 64 |
|
| 65 |
DESCRIPTION="Library for automatic proxy configuration management" |
| 66 |
HOMEPAGE="http://code.google.com/p/libproxy/" |
| 67 |
@@ -21,7 +22,6 @@ |
| 68 |
kde? ( >=kde-base/kdelibs-4.3 ) |
| 69 |
networkmanager? ( net-misc/networkmanager ) |
| 70 |
perl? ( dev-lang/perl ) |
| 71 |
- python? ( >=dev-lang/python-2.5 ) |
| 72 |
vala? ( dev-lang/vala ) |
| 73 |
webkit? ( net-libs/webkit-gtk ) |
| 74 |
xulrunner? ( >=net-libs/xulrunner-1.9.0.11-r1:1.9 )" |
| 75 |
@@ -31,6 +31,12 @@ |
| 76 |
|
| 77 |
DOCS="AUTHORS NEWS README ChangeLog" |
| 78 |
|
| 79 |
+pkg_setup() { |
| 80 |
+ if use python; then |
| 81 |
+ python_set_active_version 2 |
| 82 |
+ fi |
| 83 |
+} |
| 84 |
+ |
| 85 |
src_prepare() { |
| 86 |
base_src_prepare |
| 87 |
if use debug; then |
| 88 |
@@ -42,6 +48,7 @@ |
| 89 |
|
| 90 |
src_configure() { |
| 91 |
mycmakeargs=( |
| 92 |
+ -DPERL_VENDORINSTALL=ON |
| 93 |
-DCMAKE_CXX_FLAGS="${CXXFLAGS}" |
| 94 |
-DCMAKE_LD_FLAGS="${CXXFLAGS}" |
| 95 |
$(cmake-utils_use_with gnome GNOME) |
| 96 |
@@ -56,13 +63,21 @@ |
| 97 |
cmake-utils_src_configure |
| 98 |
} |
| 99 |
|
| 100 |
+pkg_preinst() { |
| 101 |
+ preserve_old_lib /usr/$(get_libdir)/libproxy.so.0 |
| 102 |
+} |
| 103 |
+ |
| 104 |
pkg_postinst() { |
| 105 |
+ preserve_old_lib_notify /usr/$(get_libdir)/libproxy.so.0 |
| 106 |
+ |
| 107 |
if use python; then |
| 108 |
python_need_rebuild |
| 109 |
- python_mod_optimize "$(python_get_sitedir)/${PN}.py" |
| 110 |
+ python_mod_optimize $(python_get_sitedir)/${PN}.py |
| 111 |
fi |
| 112 |
} |
| 113 |
|
| 114 |
pkg_postrm() { |
| 115 |
- python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/${PN}.py |
| 116 |
+ if use python; then |
| 117 |
+ python_mod_cleanup $(python_get_sitedir)/${PN}.py |
| 118 |
+ fi |
| 119 |
} |
Archives