Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Petteri Raty (betelgeuse)" <betelgeuse@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/sun-jre-bin: sun-jre-bin-1.6.0.03.ebuild ChangeLog sun-jre-bin-1.4.2.16.ebuild sun-jre-bin-1.5.0.13.ebuild
Date: Fri, 05 Oct 2007 10:45:13
Message-Id: E1IdkXB-0003WM-Vk@stork.gentoo.org
1 betelgeuse 07/10/05 10:35:53
2
3 Modified: sun-jre-bin-1.6.0.03.ebuild ChangeLog
4 sun-jre-bin-1.4.2.16.ebuild
5 sun-jre-bin-1.5.0.13.ebuild
6 Log:
7 Add quoting for variables.
8 (Portage version: 2.1.3.9)
9
10 Revision Changes Path
11 1.3 dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild?rev=1.3&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild?rev=1.3&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild?r1=1.2&r2=1.3
16
17 Index: sun-jre-bin-1.6.0.03.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild,v
20 retrieving revision 1.2
21 retrieving revision 1.3
22 diff -u -r1.2 -r1.3
23 --- sun-jre-bin-1.6.0.03.ebuild 4 Oct 2007 18:44:41 -0000 1.2
24 +++ sun-jre-bin-1.6.0.03.ebuild 5 Oct 2007 10:35:53 -0000 1.3
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2007 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild,v 1.2 2007/10/04 18:44:41 opfer Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild,v 1.3 2007/10/05 10:35:53 betelgeuse Exp $
30
31 inherit versionator pax-utils eutils java-vm-2
32
33 @@ -57,7 +57,7 @@
34 sh ${DISTDIR}/${A} --accept-license --unpack || die "Failed to unpack"
35
36 cd ..
37 - bash ${FILESDIR}/construct-1.6.sh bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
38 + bash "${FILESDIR}/construct-1.6.sh" bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
39 }
40
41 src_install() {
42 @@ -95,9 +95,9 @@
43 sed -e "s/\(Name=Java\)/\1 Control Panel for Sun JRE ${SLOT}/" \
44 -e "s#Exec=.*#Exec=/opt/${P}/bin/ControlPanel#" \
45 -e "s#Icon=.*#Icon=/opt/${P}/plugin/desktop/sun_java.png#" \
46 - ${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
47 - ${T}/sun_jre-${SLOT}.desktop || die
48 - domenu ${T}/sun_jre-${SLOT}.desktop || die
49 + "${D}/opt/${P}/plugin/desktop/sun_java.desktop" > \
50 + "${T}/sun_jre-${SLOT}.desktop" || die
51 + domenu "${T}/sun_jre-${SLOT}.desktop" || die
52 fi
53
54 # bug #56444
55
56
57
58 1.112 dev-java/sun-jre-bin/ChangeLog
59
60 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jre-bin/ChangeLog?rev=1.112&view=markup
61 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jre-bin/ChangeLog?rev=1.112&content-type=text/plain
62 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jre-bin/ChangeLog?r1=1.111&r2=1.112
63
64 Index: ChangeLog
65 ===================================================================
66 RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v
67 retrieving revision 1.111
68 retrieving revision 1.112
69 diff -u -r1.111 -r1.112
70 --- ChangeLog 4 Oct 2007 18:44:41 -0000 1.111
71 +++ ChangeLog 5 Oct 2007 10:35:53 -0000 1.112
72 @@ -1,6 +1,11 @@
73 # ChangeLog for dev-java/sun-jre-bin
74 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
75 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.111 2007/10/04 18:44:41 opfer Exp $
76 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.112 2007/10/05 10:35:53 betelgeuse Exp $
77 +
78 + 05 Oct 2007; Petteri Räty <betelgeuse@g.o>
79 + sun-jre-bin-1.4.2.16.ebuild, sun-jre-bin-1.5.0.13.ebuild,
80 + sun-jre-bin-1.6.0.03.ebuild:
81 + Add quoting for variables.
82
83 04 Oct 2007; Christian Faulhammer <opfer@g.o>
84 sun-jre-bin-1.6.0.03.ebuild:
85
86
87
88 1.3 dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild
89
90 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild?rev=1.3&view=markup
91 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild?rev=1.3&content-type=text/plain
92 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild?r1=1.2&r2=1.3
93
94 Index: sun-jre-bin-1.4.2.16.ebuild
95 ===================================================================
96 RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild,v
97 retrieving revision 1.2
98 retrieving revision 1.3
99 diff -u -r1.2 -r1.3
100 --- sun-jre-bin-1.4.2.16.ebuild 4 Oct 2007 18:36:36 -0000 1.2
101 +++ sun-jre-bin-1.4.2.16.ebuild 5 Oct 2007 10:35:53 -0000 1.3
102 @@ -1,6 +1,6 @@
103 # Copyright 1999-2007 Gentoo Foundation
104 # Distributed under the terms of the GNU General Public License v2
105 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild,v 1.2 2007/10/04 18:36:36 opfer Exp $
106 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild,v 1.3 2007/10/05 10:35:53 betelgeuse Exp $
107
108 inherit eutils pax-utils java-vm-2
109
110 @@ -102,17 +102,17 @@
111 # create dir for system preferences
112 dodir /opt/${P}/.systemPrefs
113 # Create files used as storage for system preferences.
114 - touch ${D}/opt/${P}/.systemPrefs/.system.lock
115 - chmod 644 ${D}/opt/${P}/.systemPrefs/.system.lock
116 - touch ${D}/opt/${P}/.systemPrefs/.systemRootModFile
117 - chmod 644 ${D}/opt/${P}/.systemPrefs/.systemRootModFile
118 + touch "${D}/opt/${P}/.systemPrefs/.system.lock"
119 + chmod 644 "${D}/opt/${P}/.systemPrefs/.system.lock"
120 + touch "${D}/opt/${P}/.systemPrefs/.systemRootModFile"
121 + chmod 644 "${D}/opt/${P}/.systemPrefs/.systemRootModFile"
122
123 # install control panel for Gnome/KDE
124 sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}/" \
125 -e "s/\(Name=Java\)/\1 Control Panel/" \
126 - ${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
127 - ${T}/sun_java-jre.desktop
128 - domenu ${T}/sun_java-jre.desktop
129 + "${D}/opt/${P}/plugin/desktop/sun_java.desktop" > \
130 + "${T}/sun_java-jre.desktop"
131 + domenu "${T}/sun_java-jre.desktop"
132
133 set_java_env
134 }
135
136
137
138 1.3 dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild
139
140 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild?rev=1.3&view=markup
141 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild?rev=1.3&content-type=text/plain
142 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild?r1=1.2&r2=1.3
143
144 Index: sun-jre-bin-1.5.0.13.ebuild
145 ===================================================================
146 RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild,v
147 retrieving revision 1.2
148 retrieving revision 1.3
149 diff -u -r1.2 -r1.3
150 --- sun-jre-bin-1.5.0.13.ebuild 4 Oct 2007 18:39:13 -0000 1.2
151 +++ sun-jre-bin-1.5.0.13.ebuild 5 Oct 2007 10:35:53 -0000 1.3
152 @@ -1,6 +1,6 @@
153 # Copyright 1999-2007 Gentoo Foundation
154 # Distributed under the terms of the GNU General Public License v2
155 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild,v 1.2 2007/10/04 18:39:13 opfer Exp $
156 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild,v 1.3 2007/10/05 10:35:53 betelgeuse Exp $
157
158 inherit pax-utils eutils java-vm-2
159
160 @@ -50,7 +50,7 @@
161 sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack"
162
163 cd ..
164 - bash ${FILESDIR}/construct.sh bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
165 + bash "${FILESDIR}/construct.sh" bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
166 }
167
168 src_install() {
169
170
171
172 --
173 gentoo-commits@g.o mailing list
Report Message
Find on MARC Find on Google Groups