Gentoo Archives: gentoo-commits

From: "Petteri Raty (betelgeuse)" <betelgeuse@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-misc/freemind: freemind-0.8.0-r3.ebuild ChangeLog
Date: Sun, 05 Oct 2008 13:35:04
Message-Id: E1KmTlF-0002AQ-QP@stork.gentoo.org
1 betelgeuse 08/10/05 13:35:01
2
3 Modified: freemind-0.8.0-r3.ebuild ChangeLog
4 Log:
5 Builds with jdk-1.6 so fix DEPEND. Fixes bug #239502.
6 (Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686)
7
8 Revision Changes Path
9 1.7 app-misc/freemind/freemind-0.8.0-r3.ebuild
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/freemind/freemind-0.8.0-r3.ebuild?rev=1.7&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/freemind/freemind-0.8.0-r3.ebuild?rev=1.7&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/freemind/freemind-0.8.0-r3.ebuild?r1=1.6&r2=1.7
14
15 Index: freemind-0.8.0-r3.ebuild
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.8.0-r3.ebuild,v
18 retrieving revision 1.6
19 retrieving revision 1.7
20 diff -u -r1.6 -r1.7
21 --- freemind-0.8.0-r3.ebuild 29 Feb 2008 17:46:35 -0000 1.6
22 +++ freemind-0.8.0-r3.ebuild 5 Oct 2008 13:35:01 -0000 1.7
23 @@ -1,6 +1,6 @@
24 # Copyright 1999-2008 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 -# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.8.0-r3.ebuild,v 1.6 2008/02/29 17:46:35 carlo Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.8.0-r3.ebuild,v 1.7 2008/10/05 13:35:01 betelgeuse Exp $
28
29 inherit java-pkg-2 java-ant-2 eutils
30
31 @@ -13,22 +13,17 @@
32 SLOT="0"
33 KEYWORDS="amd64 ppc x86"
34 IUSE="doc"
35 -# FIXME doesn't like compiling with Java 1.6 for some reason
36 -DEPEND="|| (
37 - =virtual/jdk-1.5*
38 - =virtual/jdk-1.4*
39 - )
40 - dev-java/ant-core
41 +DEPEND=">=virtual/jdk-1.4
42 app-arch/unzip"
43 RDEPEND=">=virtual/jre-1.4"
44
45 S="${WORKDIR}/${PN}"
46
47 src_unpack() {
48 - unpack "${A}"
49 + unpack ${A}
50 cd "${S}"
51 # patch for JDK 1.6 (see bug #109678)
52 - epatch ${FILESDIR}/${P}-source.patch
53 + epatch "${FILESDIR}/${P}-source.patch"
54 }
55
56 src_compile() {
57 @@ -44,14 +39,14 @@
58
59 java-pkg_regjar /opt/${PN}/lib/${PN}.jar
60
61 - cp -R ${S}/doc ${D}/opt/${PN}
62 + cp -R "${S}/doc" "${D}/opt/${PN}"
63 use doc && java-pkg_dojavadoc doc/javadoc
64
65 into /opt
66 java-pkg_dolauncher ${PN} --pwd /opt/${PN} --jar /opt/${PN}/lib/${PN}.jar
67
68 - mv ${S}/images/FreeMindWindowIcon.png ${S}/images/freemind.png
69 - doicon ${S}/images/freemind.png
70 + mv "${S}/images/FreeMindWindowIcon.png" "${S}/images/freemind.png"
71 + doicon "${S}/images/freemind.png"
72
73 make_desktop_entry freemind Freemind freemind Utility
74 }
75
76
77
78 1.42 app-misc/freemind/ChangeLog
79
80 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/freemind/ChangeLog?rev=1.42&view=markup
81 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/freemind/ChangeLog?rev=1.42&content-type=text/plain
82 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/freemind/ChangeLog?r1=1.41&r2=1.42
83
84 Index: ChangeLog
85 ===================================================================
86 RCS file: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v
87 retrieving revision 1.41
88 retrieving revision 1.42
89 diff -u -r1.41 -r1.42
90 --- ChangeLog 28 Apr 2008 21:06:48 -0000 1.41
91 +++ ChangeLog 5 Oct 2008 13:35:01 -0000 1.42
92 @@ -1,6 +1,10 @@
93 # ChangeLog for app-misc/freemind
94 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
95 -# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.41 2008/04/28 21:06:48 betelgeuse Exp $
96 +# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.42 2008/10/05 13:35:01 betelgeuse Exp $
97 +
98 + 05 Oct 2008; Petteri Räty <betelgeuse@g.o>
99 + freemind-0.8.0-r3.ebuild:
100 + Builds with jdk-1.6 so fix DEPEND. Fixes bug #239502.
101
102 28 Apr 2008; Petteri Räty <betelgeuse@g.o>
103 -freemind-0.9.0_beta9.ebuild, -freemind-0.9.0_beta15.ebuild: