1 |
patrick 12/07/30 07:56:39 |
2 |
|
3 |
Modified: nodejs-0.8.4.ebuild ChangeLog |
4 |
Added: nodejs-0.8.4-r1.ebuild nodejs-0.9.0-r1.ebuild |
5 |
Log: |
6 |
Fixes to make npm etc. work better, thanks to jbergstroem |
7 |
|
8 |
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.2 net-libs/nodejs/nodejs-0.8.4.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nodejs/nodejs-0.8.4.ebuild?rev=1.2&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nodejs/nodejs-0.8.4.ebuild?rev=1.2&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nodejs/nodejs-0.8.4.ebuild?r1=1.1&r2=1.2 |
16 |
|
17 |
Index: nodejs-0.8.4.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.8.4.ebuild,v |
20 |
retrieving revision 1.1 |
21 |
retrieving revision 1.2 |
22 |
diff -u -r1.1 -r1.2 |
23 |
--- nodejs-0.8.4.ebuild 27 Jul 2012 03:12:19 -0000 1.1 |
24 |
+++ nodejs-0.8.4.ebuild 30 Jul 2012 07:56:39 -0000 1.2 |
25 |
@@ -1,12 +1,12 @@ |
26 |
# Copyright 1999-2012 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.8.4.ebuild,v 1.1 2012/07/27 03:12:19 patrick Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.8.4.ebuild,v 1.2 2012/07/30 07:56:39 patrick Exp $ |
30 |
|
31 |
EAPI=3 |
32 |
|
33 |
PYTHON_DEPEND="2" |
34 |
|
35 |
-inherit python eutils pax-utils |
36 |
+inherit python eutils multilib pax-utils |
37 |
|
38 |
# omgwtf |
39 |
RESTRICT="test" |
40 |
@@ -36,7 +36,8 @@ |
41 |
# http://code.google.com/p/gyp/issues/detail?id=260 |
42 |
sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die |
43 |
# Hardcoded braindamage extraction helper |
44 |
- sed -i -e 's:wafdir = join(prefix, "lib", "node"):wafdir = "/lib/node/":' tools/node-waf || die |
45 |
+ #sed -i -e 's:wafdir = join(prefix, "lib", "node"):wafdir = "/lib/node/":' tools/node-waf || die |
46 |
+ python_convert_shebangs 2 tools/node-waf || die |
47 |
} |
48 |
|
49 |
src_configure() { |
50 |
@@ -49,25 +50,21 @@ |
51 |
} |
52 |
|
53 |
src_install() { |
54 |
- # there are no words to describe the epic idiocy of ... |
55 |
- # NOT using make but a JavaScript thingy to try to install things ... to the wrong place |
56 |
- # WHY U NO MAEK SENSE?! |
57 |
- #emake DESTDIR="${D}" install || die |
58 |
- |
59 |
+ local MYLIB=$(get_libdir) |
60 |
mkdir -p "${ED}"/usr/include/node |
61 |
mkdir -p "${ED}"/usr/bin |
62 |
- mkdir -p "${ED}"/lib/node_modules/npm |
63 |
- mkdir -p "${ED}"/lib/node |
64 |
- cp 'src/node.h' 'src/node_buffer.h' 'src/node_object_wrap.h' 'src/node_version.h' "${ED}"/usr/include/node || die "Failed to copy stuff" |
65 |
- cp 'deps/uv/include/ares.h' 'deps/uv/include/ares_version.h' "${ED}"/usr/include/node || die "Failed to copy stuff" |
66 |
+ mkdir -p "${ED}"/usr/"${MYLIB}"/node_modules/npm |
67 |
+ mkdir -p "${ED}"/usr/"${MYLIB}"/node |
68 |
+ cp 'src/eio-emul.h' 'src/ev-emul.h' 'src/node.h' 'src/node_buffer.h' 'src/node_object_wrap.h' 'src/node_version.h' "${ED}"/usr/include/node || die "Failed to copy stuff" |
69 |
+ cp -R deps/uv/include/* "${ED}"/usr/include/node || die "Failed to copy stuff" |
70 |
cp 'out/Release/node' "${ED}"/usr/bin/node || die "Failed to copy stuff" |
71 |
- cp -R deps/npm/* "${ED}"/lib/node_modules/npm || die "Failed to copy stuff" |
72 |
- cp -R tools/wafadmin "${ED}"/lib/node/ || die "Failed to copy stuff" |
73 |
+ cp -R deps/npm/* "${ED}"/usr/"${MYLIB}"/node_modules/npm || die "Failed to copy stuff" |
74 |
+ cp -R tools/wafadmin "${ED}"/usr/"${MYLIB}"/node/ || die "Failed to copy stuff" |
75 |
cp 'tools/node-waf' "${ED}"/usr/bin/ || die "Failed to copy stuff" |
76 |
|
77 |
# now add some extra stupid just because we can |
78 |
# needs to be a symlink because of hardcoded paths ... no es bueno! |
79 |
- dosym /lib/node_modules/npm/bin/npm-cli.js /bin/npm |
80 |
+ dosym /usr/"${MYLIB}"/node_modules/npm/bin/npm-cli.js /usr/bin/npm |
81 |
pax-mark -m "${ED}"/usr/bin/node |
82 |
} |
83 |
|
84 |
|
85 |
|
86 |
|
87 |
1.52 net-libs/nodejs/ChangeLog |
88 |
|
89 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nodejs/ChangeLog?rev=1.52&view=markup |
90 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nodejs/ChangeLog?rev=1.52&content-type=text/plain |
91 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nodejs/ChangeLog?r1=1.51&r2=1.52 |
92 |
|
93 |
Index: ChangeLog |
94 |
=================================================================== |
95 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/nodejs/ChangeLog,v |
96 |
retrieving revision 1.51 |
97 |
retrieving revision 1.52 |
98 |
diff -u -r1.51 -r1.52 |
99 |
--- ChangeLog 30 Jul 2012 02:18:02 -0000 1.51 |
100 |
+++ ChangeLog 30 Jul 2012 07:56:39 -0000 1.52 |
101 |
@@ -1,6 +1,13 @@ |
102 |
# ChangeLog for net-libs/nodejs |
103 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
104 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/ChangeLog,v 1.51 2012/07/30 02:18:02 patrick Exp $ |
105 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/ChangeLog,v 1.52 2012/07/30 07:56:39 patrick Exp $ |
106 |
+ |
107 |
+*nodejs-0.9.0-r1 (30 Jul 2012) |
108 |
+*nodejs-0.8.4-r1 (30 Jul 2012) |
109 |
+ |
110 |
+ 30 Jul 2012; Patrick Lauer <patrick@g.o> +nodejs-0.8.4-r1.ebuild, |
111 |
+ +nodejs-0.9.0-r1.ebuild, nodejs-0.8.4.ebuild: |
112 |
+ Fixes to make npm etc. work better, thanks to jbergstroem |
113 |
|
114 |
*nodejs-0.9.0 (30 Jul 2012) |
115 |
|
116 |
|
117 |
|
118 |
|
119 |
1.1 net-libs/nodejs/nodejs-0.8.4-r1.ebuild |
120 |
|
121 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nodejs/nodejs-0.8.4-r1.ebuild?rev=1.1&view=markup |
122 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nodejs/nodejs-0.8.4-r1.ebuild?rev=1.1&content-type=text/plain |
123 |
|
124 |
Index: nodejs-0.8.4-r1.ebuild |
125 |
=================================================================== |
126 |
# Copyright 1999-2012 Gentoo Foundation |
127 |
# Distributed under the terms of the GNU General Public License v2 |
128 |
# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.8.4-r1.ebuild,v 1.1 2012/07/30 07:56:39 patrick Exp $ |
129 |
|
130 |
EAPI=3 |
131 |
|
132 |
PYTHON_DEPEND="2" |
133 |
|
134 |
inherit python eutils multilib pax-utils |
135 |
|
136 |
# omgwtf |
137 |
RESTRICT="test" |
138 |
|
139 |
DESCRIPTION="Evented IO for V8 Javascript" |
140 |
HOMEPAGE="http://nodejs.org/" |
141 |
SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz" |
142 |
|
143 |
LICENSE="GPL-2" |
144 |
SLOT="0" |
145 |
KEYWORDS="~amd64 ~x86 ~x64-macos" |
146 |
IUSE="" |
147 |
|
148 |
DEPEND=">=dev-lang/v8-3.11.10 |
149 |
dev-libs/openssl" |
150 |
RDEPEND="${DEPEND}" |
151 |
|
152 |
S=${WORKDIR}/node-v${PV} |
153 |
|
154 |
pkg_setup() { |
155 |
python_set_active_version 2 |
156 |
python_pkg_setup |
157 |
} |
158 |
|
159 |
src_prepare() { |
160 |
# fix compilation on Darwin |
161 |
# http://code.google.com/p/gyp/issues/detail?id=260 |
162 |
sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die |
163 |
# Hardcoded braindamage extraction helper |
164 |
#sed -i -e 's:wafdir = join(prefix, "lib", "node"):wafdir = "/lib/node/":' tools/node-waf || die |
165 |
python_convert_shebangs 2 tools/node-waf || die |
166 |
} |
167 |
|
168 |
src_configure() { |
169 |
# this is an autotools lookalike confuserator |
170 |
./configure --shared-v8 --prefix="${EPREFIX}"/usr --shared-v8-includes="${EPREFIX}"/usr/include --openssl-use-sys --shared-zlib || die |
171 |
} |
172 |
|
173 |
src_compile() { |
174 |
emake || die |
175 |
} |
176 |
|
177 |
src_install() { |
178 |
local MYLIB=$(get_libdir) |
179 |
mkdir -p "${ED}"/usr/include/node |
180 |
mkdir -p "${ED}"/usr/bin |
181 |
mkdir -p "${ED}"/usr/"${MYLIB}"/node_modules/npm |
182 |
mkdir -p "${ED}"/usr/"${MYLIB}"/node |
183 |
cp 'src/eio-emul.h' 'src/ev-emul.h' 'src/node.h' 'src/node_buffer.h' 'src/node_object_wrap.h' 'src/node_version.h' "${ED}"/usr/include/node || die "Failed to copy stuff" |
184 |
cp -R deps/uv/include/* "${ED}"/usr/include/node || die "Failed to copy stuff" |
185 |
cp 'out/Release/node' "${ED}"/usr/bin/node || die "Failed to copy stuff" |
186 |
cp -R deps/npm/* "${ED}"/usr/"${MYLIB}"/node_modules/npm || die "Failed to copy stuff" |
187 |
cp -R tools/wafadmin "${ED}"/usr/"${MYLIB}"/node/ || die "Failed to copy stuff" |
188 |
cp 'tools/node-waf' "${ED}"/usr/bin/ || die "Failed to copy stuff" |
189 |
|
190 |
# now add some extra stupid just because we can |
191 |
# needs to be a symlink because of hardcoded paths ... no es bueno! |
192 |
dosym /usr/"${MYLIB}"/node_modules/npm/bin/npm-cli.js /usr/bin/npm |
193 |
pax-mark -m "${ED}"/usr/bin/node |
194 |
} |
195 |
|
196 |
src_test() { |
197 |
emake test || die |
198 |
} |
199 |
|
200 |
|
201 |
|
202 |
1.1 net-libs/nodejs/nodejs-0.9.0-r1.ebuild |
203 |
|
204 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nodejs/nodejs-0.9.0-r1.ebuild?rev=1.1&view=markup |
205 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nodejs/nodejs-0.9.0-r1.ebuild?rev=1.1&content-type=text/plain |
206 |
|
207 |
Index: nodejs-0.9.0-r1.ebuild |
208 |
=================================================================== |
209 |
# Copyright 1999-2012 Gentoo Foundation |
210 |
# Distributed under the terms of the GNU General Public License v2 |
211 |
# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.9.0-r1.ebuild,v 1.1 2012/07/30 07:56:39 patrick Exp $ |
212 |
|
213 |
EAPI=3 |
214 |
|
215 |
PYTHON_DEPEND="2" |
216 |
|
217 |
inherit python eutils multilib pax-utils |
218 |
|
219 |
# omgwtf |
220 |
RESTRICT="test" |
221 |
|
222 |
DESCRIPTION="Evented IO for V8 Javascript" |
223 |
HOMEPAGE="http://nodejs.org/" |
224 |
SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz" |
225 |
|
226 |
LICENSE="GPL-2" |
227 |
SLOT="0" |
228 |
KEYWORDS="~amd64 ~x86 ~x64-macos" |
229 |
IUSE="" |
230 |
|
231 |
DEPEND=">=dev-lang/v8-3.11.10 |
232 |
dev-libs/openssl" |
233 |
RDEPEND="${DEPEND}" |
234 |
|
235 |
S=${WORKDIR}/node-v${PV} |
236 |
|
237 |
pkg_setup() { |
238 |
python_set_active_version 2 |
239 |
python_pkg_setup |
240 |
} |
241 |
|
242 |
src_prepare() { |
243 |
# fix compilation on Darwin |
244 |
# http://code.google.com/p/gyp/issues/detail?id=260 |
245 |
sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die |
246 |
# Hardcoded braindamage extraction helper |
247 |
#sed -i -e 's:wafdir = join(prefix, "lib", "node"):wafdir = "/lib/node/":' tools/node-waf || die |
248 |
python_convert_shebangs 2 tools/node-waf || die |
249 |
} |
250 |
|
251 |
src_configure() { |
252 |
# this is an autotools lookalike confuserator |
253 |
./configure --shared-v8 --prefix="${EPREFIX}"/usr --shared-v8-includes="${EPREFIX}"/usr/include --openssl-use-sys --shared-zlib || die |
254 |
} |
255 |
|
256 |
src_compile() { |
257 |
emake || die |
258 |
} |
259 |
|
260 |
src_install() { |
261 |
local MYLIB=$(get_libdir) |
262 |
mkdir -p "${ED}"/usr/include/node |
263 |
mkdir -p "${ED}"/usr/bin |
264 |
mkdir -p "${ED}"/usr/"${MYLIB}"/node_modules/npm |
265 |
mkdir -p "${ED}"/usr/"${MYLIB}"/node |
266 |
cp 'src/eio-emul.h' 'src/ev-emul.h' 'src/node.h' 'src/node_buffer.h' 'src/node_object_wrap.h' 'src/node_version.h' "${ED}"/usr/include/node || die "Failed to copy stuff" |
267 |
cp -R deps/uv/include/* "${ED}"/usr/include/node || die "Failed to copy stuff" |
268 |
cp 'out/Release/node' "${ED}"/usr/bin/node || die "Failed to copy stuff" |
269 |
cp -R deps/npm/* "${ED}"/usr/"${MYLIB}"/node_modules/npm || die "Failed to copy stuff" |
270 |
cp -R tools/wafadmin "${ED}"/usr/"${MYLIB}"/node/ || die "Failed to copy stuff" |
271 |
cp 'tools/node-waf' "${ED}"/usr/bin/ || die "Failed to copy stuff" |
272 |
|
273 |
# now add some extra stupid just because we can |
274 |
# needs to be a symlink because of hardcoded paths ... no es bueno! |
275 |
dosym /usr/"${MYLIB}"/node_modules/npm/bin/npm-cli.js /usr/bin/npm |
276 |
pax-mark -m "${ED}"/usr/bin/node |
277 |
} |
278 |
|
279 |
src_test() { |
280 |
emake test || die |
281 |
} |