Gentoo Archives: gentoo-commits

From: "William Thomson (wltjr)" <wltjr@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/jruby: jruby-1.0.0.ebuild ChangeLog jruby-0.7.0-r1.ebuild
Date: Wed, 24 Oct 2007 05:29:52
Message-Id: E1IkYoN-0004qO-AR@stork.gentoo.org
1 wltjr 07/10/24 05:29:47
2
3 Modified: jruby-1.0.0.ebuild ChangeLog
4 Removed: jruby-0.7.0-r1.ebuild
5 Log:
6 Removed java gen 1 ebuild, quoted vars.
7 (Portage version: 2.1.3.15)
8
9 Revision Changes Path
10 1.3 dev-java/jruby/jruby-1.0.0.ebuild
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/jruby-1.0.0.ebuild?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/jruby-1.0.0.ebuild?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/jruby-1.0.0.ebuild?r1=1.2&r2=1.3
15
16 Index: jruby-1.0.0.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.0.0.ebuild,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- jruby-1.0.0.ebuild 11 Jul 2007 19:58:37 -0000 1.2
23 +++ jruby-1.0.0.ebuild 24 Oct 2007 05:29:46 -0000 1.3
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2007 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.0.0.ebuild,v 1.2 2007/07/11 19:58:37 mr_bones_ Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.0.0.ebuild,v 1.3 2007/10/24 05:29:46 wltjr Exp $
29
30 JAVA_PKG_IUSE="doc source test"
31 inherit eutils java-pkg-2 java-ant-2
32 @@ -64,15 +64,15 @@
33
34 src_unpack() {
35 unpack ${A}
36 - cd ${S}
37 + cd "${S}"
38 # prevents /root/.jruby being created at build time with
39 # FEATURES="-userpriv"
40 # see http://bugs.gentoo.org/show_bug.cgi?id=170058
41 - epatch ${FILESDIR}/${PN}-0.9.8-sandbox.patch
42 + epatch "${FILESDIR}"/${PN}-0.9.8-sandbox.patch
43 # search only lib, kills jdk1.4+ property which we set manually
44 java-ant_ignore-system-classes
45
46 - cd ${S}/lib
47 + cd "${S}"/lib
48 rm -v *.jar || die
49
50 java-pkg_jar-from --build-only ant-core ant.jar
51 @@ -87,7 +87,7 @@
52 if use bsf; then
53 java-pkg_jar-from --build-only bsf-2.3
54 else
55 - cd ${S}
56 + cd "${S}"
57 # testcases depending on bsf
58 rm test/org/jruby/test/TestAdoptedThreading.java || die
59 rm test/org/jruby/javasupport/test/TestBSF.java || die
60 @@ -99,7 +99,7 @@
61 }
62
63 src_compile() {
64 - eant jar $(use_doc create-apidocs) -Djruby.home=${T}/.jruby -Djdk1.4+=true
65 + eant jar $(use_doc create-apidocs) -Djruby.home="${T}"/.jruby -Djdk1.4+=true
66 }
67
68 src_test() {
69 @@ -121,18 +121,18 @@
70 java-pkg_dolauncher ${PN} \
71 --main 'org.jruby.Main' \
72 --java_args '-Djruby.base=/usr/share/jruby -Djruby.home=/usr/share/jruby -Djruby.lib=/usr/share/jruby/lib -Djruby.script=jruby -Djruby.shell=/bin/sh'
73 - dobin ${S}/bin/jirb
74 + dobin "${S}"/bin/jirb
75
76 dodir "/usr/share/${PN}/lib"
77 insinto "/usr/share/${PN}/lib"
78 doins -r "${S}/lib/ruby"
79
80 # Share gems with regular ruby
81 - rm -r ${D}/usr/share/${PN}/lib/ruby/gems || die
82 + rm -r "${D}"/usr/share/${PN}/lib/ruby/gems || die
83 dosym /usr/lib/ruby/gems /usr/share/${PN}/lib/ruby/gems || die
84
85 # Share site_ruby with regular ruby
86 - rm -r ${D}/usr/share/${PN}/lib/ruby/site_ruby || die
87 + rm -r "${D}"/usr/share/${PN}/lib/ruby/site_ruby || die
88 dosym /usr/lib/ruby/site_ruby /usr/share/${PN}/lib/ruby/site_ruby || die
89 }
90
91
92
93
94 1.31 dev-java/jruby/ChangeLog
95
96 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/ChangeLog?rev=1.31&view=markup
97 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/ChangeLog?rev=1.31&content-type=text/plain
98 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jruby/ChangeLog?r1=1.30&r2=1.31
99
100 Index: ChangeLog
101 ===================================================================
102 RCS file: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v
103 retrieving revision 1.30
104 retrieving revision 1.31
105 diff -u -r1.30 -r1.31
106 --- ChangeLog 21 Sep 2007 16:28:21 -0000 1.30
107 +++ ChangeLog 24 Oct 2007 05:29:46 -0000 1.31
108 @@ -1,6 +1,10 @@
109 # ChangeLog for dev-java/jruby
110 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
111 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.30 2007/09/21 16:28:21 opfer Exp $
112 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.31 2007/10/24 05:29:46 wltjr Exp $
113 +
114 + 24 Oct 2007; William L. Thomson Jr. <wltjr@g.o>
115 + -jruby-0.7.0-r1.ebuild, jruby-1.0.0.ebuild:
116 + Removed java gen 1 ebuild, quoted vars.
117
118 21 Sep 2007; Christian Faulhammer <opfer@g.o>
119 jruby-0.7.0-r1.ebuild:
120
121
122
123 --
124 gentoo-commits@g.o mailing list