1 |
ssuominen 10/11/02 09:30:26 |
2 |
|
3 |
Modified: ChangeLog libproxy-0.4.6.ebuild |
4 |
Added: libproxy-0.4.6-r1.ebuild |
5 |
Log: |
6 |
Disable dev-lang/vala support because it's not ready to be stabilized wrt #343737. |
7 |
|
8 |
(Portage version: 2.2.0_alpha3/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.42 net-libs/libproxy/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/ChangeLog?rev=1.42&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/ChangeLog?rev=1.42&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/ChangeLog?r1=1.41&r2=1.42 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v |
20 |
retrieving revision 1.41 |
21 |
retrieving revision 1.42 |
22 |
diff -u -r1.41 -r1.42 |
23 |
--- ChangeLog 28 Oct 2010 09:20:32 -0000 1.41 |
24 |
+++ ChangeLog 2 Nov 2010 09:30:25 -0000 1.42 |
25 |
@@ -1,6 +1,13 @@ |
26 |
# ChangeLog for net-libs/libproxy |
27 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.41 2010/10/28 09:20:32 ssuominen Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.42 2010/11/02 09:30:25 ssuominen Exp $ |
30 |
+ |
31 |
+*libproxy-0.4.6-r1 (02 Nov 2010) |
32 |
+ |
33 |
+ 02 Nov 2010; Samuli Suominen <ssuominen@g.o> libproxy-0.4.6.ebuild, |
34 |
+ +libproxy-0.4.6-r1.ebuild: |
35 |
+ Disable dev-lang/vala support because it's not ready to be stabilized wrt |
36 |
+ #343737. |
37 |
|
38 |
28 Oct 2010; Samuli Suominen <ssuominen@g.o> |
39 |
files/libproxy-0.4.6-mozjs-link_directory.patch: |
40 |
|
41 |
|
42 |
|
43 |
1.3 net-libs/libproxy/libproxy-0.4.6.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/libproxy-0.4.6.ebuild?rev=1.3&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/libproxy-0.4.6.ebuild?rev=1.3&content-type=text/plain |
47 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/libproxy-0.4.6.ebuild?r1=1.2&r2=1.3 |
48 |
|
49 |
Index: libproxy-0.4.6.ebuild |
50 |
=================================================================== |
51 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.6.ebuild,v |
52 |
retrieving revision 1.2 |
53 |
retrieving revision 1.3 |
54 |
diff -u -r1.2 -r1.3 |
55 |
--- libproxy-0.4.6.ebuild 30 Sep 2010 18:08:02 -0000 1.2 |
56 |
+++ libproxy-0.4.6.ebuild 2 Nov 2010 09:30:25 -0000 1.3 |
57 |
@@ -1,6 +1,6 @@ |
58 |
# Copyright 1999-2010 Gentoo Foundation |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.6.ebuild,v 1.2 2010/09/30 18:08:02 ssuominen Exp $ |
61 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.6.ebuild,v 1.3 2010/11/02 09:30:25 ssuominen Exp $ |
62 |
|
63 |
EAPI="2" |
64 |
PYTHON_DEPEND="python? 2:2.5" |
65 |
@@ -14,7 +14,7 @@ |
66 |
LICENSE="LGPL-2.1" |
67 |
SLOT="0" |
68 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" |
69 |
-IUSE="gnome kde mono networkmanager perl python test vala webkit xulrunner" |
70 |
+IUSE="gnome kde mono networkmanager perl python test webkit xulrunner" |
71 |
|
72 |
RDEPEND=" |
73 |
gnome? ( gnome-base/gconf ) |
74 |
@@ -22,7 +22,6 @@ |
75 |
mono? ( dev-lang/mono ) |
76 |
networkmanager? ( net-misc/networkmanager ) |
77 |
perl? ( dev-lang/perl ) |
78 |
- vala? ( dev-lang/vala ) |
79 |
webkit? ( net-libs/webkit-gtk ) |
80 |
xulrunner? ( >=net-libs/xulrunner-1.9.1:1.9 )" |
81 |
|
82 |
@@ -50,11 +49,12 @@ |
83 |
$(cmake-utils_use_with networkmanager NM) |
84 |
$(cmake-utils_use_with perl PERL) |
85 |
$(cmake-utils_use_with python PYTHON) |
86 |
- $(cmake-utils_use_with vala VALA) |
87 |
+ -DWITH_VALA=OFF |
88 |
$(cmake-utils_use_with webkit WEBKIT) |
89 |
$(cmake-utils_use_with xulrunner MOZJS) |
90 |
$(cmake-utils_use test BUILD_TESTING) |
91 |
- ) |
92 |
+ ) |
93 |
+ |
94 |
cmake-utils_src_configure |
95 |
} |
96 |
|
97 |
|
98 |
|
99 |
|
100 |
1.1 net-libs/libproxy/libproxy-0.4.6-r1.ebuild |
101 |
|
102 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/libproxy-0.4.6-r1.ebuild?rev=1.1&view=markup |
103 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/libproxy-0.4.6-r1.ebuild?rev=1.1&content-type=text/plain |
104 |
|
105 |
Index: libproxy-0.4.6-r1.ebuild |
106 |
=================================================================== |
107 |
# Copyright 1999-2010 Gentoo Foundation |
108 |
# Distributed under the terms of the GNU General Public License v2 |
109 |
# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.6-r1.ebuild,v 1.1 2010/11/02 09:30:25 ssuominen Exp $ |
110 |
|
111 |
EAPI="2" |
112 |
PYTHON_DEPEND="python? 2:2.5" |
113 |
|
114 |
inherit cmake-utils eutils multilib python portability |
115 |
|
116 |
DESCRIPTION="Library for automatic proxy configuration management" |
117 |
HOMEPAGE="http://code.google.com/p/libproxy/" |
118 |
SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz" |
119 |
|
120 |
LICENSE="LGPL-2.1" |
121 |
SLOT="0" |
122 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" |
123 |
IUSE="gnome kde mono networkmanager perl python test vala webkit xulrunner" |
124 |
|
125 |
RDEPEND=" |
126 |
gnome? ( gnome-base/gconf ) |
127 |
kde? ( >=kde-base/kdelibs-4.3 ) |
128 |
mono? ( dev-lang/mono ) |
129 |
networkmanager? ( net-misc/networkmanager ) |
130 |
perl? ( dev-lang/perl ) |
131 |
vala? ( dev-lang/vala ) |
132 |
webkit? ( net-libs/webkit-gtk ) |
133 |
xulrunner? ( >=net-libs/xulrunner-1.9.1:1.9 )" |
134 |
|
135 |
DEPEND="${RDEPEND} |
136 |
>=dev-util/pkgconfig-0.19" |
137 |
|
138 |
DOCS="AUTHORS NEWS README ChangeLog" |
139 |
|
140 |
PATCHES=( "${FILESDIR}"/${P}-mozjs-link_directory.patch ) |
141 |
|
142 |
pkg_setup() { |
143 |
if use python; then |
144 |
python_set_active_version 2 |
145 |
fi |
146 |
} |
147 |
|
148 |
src_configure() { |
149 |
mycmakeargs=( |
150 |
-DPERL_VENDORINSTALL=ON |
151 |
-DCMAKE_C_FLAGS="${CFLAGS}" |
152 |
-DCMAKE_CXX_FLAGS="${CXXFLAGS}" |
153 |
$(cmake-utils_use_with gnome GNOME) |
154 |
$(cmake-utils_use_with kde KDE4) |
155 |
$(cmake-utils_use_with mono DOTNET) |
156 |
$(cmake-utils_use_with networkmanager NM) |
157 |
$(cmake-utils_use_with perl PERL) |
158 |
$(cmake-utils_use_with python PYTHON) |
159 |
$(cmake-utils_use_with vala VALA) |
160 |
$(cmake-utils_use_with webkit WEBKIT) |
161 |
$(cmake-utils_use_with xulrunner MOZJS) |
162 |
$(cmake-utils_use test BUILD_TESTING) |
163 |
) |
164 |
cmake-utils_src_configure |
165 |
} |
166 |
|
167 |
src_compile() { |
168 |
# Prevent access violation when building with mono support |
169 |
export MONO_SHARED_DIR="${T}/shared" |
170 |
cmake-utils_src_compile |
171 |
} |
172 |
|
173 |
pkg_preinst() { |
174 |
preserve_old_lib /usr/$(get_libdir)/libproxy.so.0 |
175 |
} |
176 |
|
177 |
pkg_postinst() { |
178 |
preserve_old_lib_notify /usr/$(get_libdir)/libproxy.so.0 |
179 |
|
180 |
if use python; then |
181 |
python_need_rebuild |
182 |
python_mod_optimize $(python_get_sitedir)/${PN}.py |
183 |
fi |
184 |
} |
185 |
|
186 |
pkg_postrm() { |
187 |
if use python; then |
188 |
python_mod_cleanup $(python_get_sitedir)/${PN}.py |
189 |
fi |
190 |
} |