summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2008-10-05 13:35:01 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2008-10-05 13:35:01 +0000
commitec9b0f05f4a0a3303f336e1833edfa70e3720001 (patch)
treea7b2c795702ebe92f9d64e7b183bf4f351562238 /app-misc
parentStable on alpha, bug #238072 (diff)
downloadhistorical-ec9b0f05f4a0a3303f336e1833edfa70e3720001.tar.gz
historical-ec9b0f05f4a0a3303f336e1833edfa70e3720001.tar.bz2
historical-ec9b0f05f4a0a3303f336e1833edfa70e3720001.zip
Builds with jdk-1.6 so fix DEPEND. Fixes bug #239502.
Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/freemind/ChangeLog6
-rw-r--r--app-misc/freemind/freemind-0.8.0-r3.ebuild19
2 files changed, 12 insertions, 13 deletions
diff --git a/app-misc/freemind/ChangeLog b/app-misc/freemind/ChangeLog
index dbafe7508014..343dae4ecaa5 100644
--- a/app-misc/freemind/ChangeLog
+++ b/app-misc/freemind/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-misc/freemind
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.41 2008/04/28 21:06:48 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.42 2008/10/05 13:35:01 betelgeuse Exp $
+
+ 05 Oct 2008; Petteri Räty <betelgeuse@gentoo.org>
+ freemind-0.8.0-r3.ebuild:
+ Builds with jdk-1.6 so fix DEPEND. Fixes bug #239502.
28 Apr 2008; Petteri Räty <betelgeuse@gentoo.org>
-freemind-0.9.0_beta9.ebuild, -freemind-0.9.0_beta15.ebuild:
diff --git a/app-misc/freemind/freemind-0.8.0-r3.ebuild b/app-misc/freemind/freemind-0.8.0-r3.ebuild
index 6aebc1dabc22..7d0d74d1bfd6 100644
--- a/app-misc/freemind/freemind-0.8.0-r3.ebuild
+++ b/app-misc/freemind/freemind-0.8.0-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
inherit java-pkg-2 java-ant-2 eutils
@@ -13,22 +13,17 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE="doc"
-# FIXME doesn't like compiling with Java 1.6 for some reason
-DEPEND="|| (
- =virtual/jdk-1.5*
- =virtual/jdk-1.4*
- )
- dev-java/ant-core
+DEPEND=">=virtual/jdk-1.4
app-arch/unzip"
RDEPEND=">=virtual/jre-1.4"
S="${WORKDIR}/${PN}"
src_unpack() {
- unpack "${A}"
+ unpack ${A}
cd "${S}"
# patch for JDK 1.6 (see bug #109678)
- epatch ${FILESDIR}/${P}-source.patch
+ epatch "${FILESDIR}/${P}-source.patch"
}
src_compile() {
@@ -44,14 +39,14 @@ src_install() {
java-pkg_regjar /opt/${PN}/lib/${PN}.jar
- cp -R ${S}/doc ${D}/opt/${PN}
+ cp -R "${S}/doc" "${D}/opt/${PN}"
use doc && java-pkg_dojavadoc doc/javadoc
into /opt
java-pkg_dolauncher ${PN} --pwd /opt/${PN} --jar /opt/${PN}/lib/${PN}.jar
- mv ${S}/images/FreeMindWindowIcon.png ${S}/images/freemind.png
- doicon ${S}/images/freemind.png
+ mv "${S}/images/FreeMindWindowIcon.png" "${S}/images/freemind.png"
+ doicon "${S}/images/freemind.png"
make_desktop_entry freemind Freemind freemind Utility
}