Version bump #497974

Remove old

(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 3C5CF75A)

5 files changed, 128 insertions, 82 deletions

diff --git a/app-misc/freemind/ChangeLog b/app-misc/freemind/ChangeLog
index c970c483a324..35ad6eff8f07 100644
--- a/app-misc/freemind/ChangeLog
+++ b/app-misc/freemind/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/freemind
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.60 2013/09/05 19:22:45 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.61 2014/01/20 19:09:48 sera Exp $
+
+*freemind-1.0.0 (20 Jan 2014)
+
+  20 Jan 2014; Ralph Sennhauser <sera@gentoo.org> -freemind-0.8.0-r3.ebuild,
+  -files/freemind-0.8.0-source.patch,
+  -files/freemind-0.9.0_rc1-build.xml.patch, +freemind-1.0.0.ebuild:
+  Version bump #497974
+  Remove old
 
   05 Sep 2013; Agostino Sarubbo <ago@gentoo.org> freemind-0.9.0-r1.ebuild:
   Stable for x86, wrt bug #481950
diff --git a/app-misc/freemind/files/freemind-0.8.0-source.patch b/app-misc/freemind/files/freemind-0.8.0-source.patch
deleted file mode 100644
index 2a3a62a07900..000000000000
--- a/app-misc/freemind/files/freemind-0.8.0-source.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur f1/freemind/freemind/controller/Controller.java f2/freemind/freemind/controller/Controller.java
---- f1/freemind/freemind/controller/Controller.java	2005-06-14 22:38:06.000000000 +0200
-+++ f2/freemind/freemind/controller/Controller.java	2007-02-09 21:13:16.000000000 +0100
-@@ -1191,7 +1191,7 @@
- 			options.buildPanel();
- 			options.setProperties(getFrame().getProperties());
- 			dialog.setTitle("Freemind Properties");
--			dialog.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
-+			dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
- 			dialog.addWindowListener(new WindowAdapter(){
- 			    public void windowClosing(WindowEvent event) {
- 			        options.closeWindow();
diff --git a/app-misc/freemind/files/freemind-0.9.0_rc1-build.xml.patch b/app-misc/freemind/files/freemind-0.9.0_rc1-build.xml.patch
deleted file mode 100644
index 3c6efec30666..000000000000
--- a/app-misc/freemind/files/freemind-0.9.0_rc1-build.xml.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- build.xml	2008-12-22 20:03:53.000000000 +0100
-+++ build.xml	2008-12-22 20:04:28.000000000 +0100
-@@ -32,11 +32,11 @@
- 	<property name="java_target_version" value="1.4" />
- 	<property name="build.compiler" value="modern" />
- 	<property name="jarbundler.jar" value = "jarbundler-2.0.0.jar"/>
--
-+<!--
- 	<taskdef name="jarbundler"
-                classpath="${src}/lib/${jarbundler.jar}"
-                classname="net.sourceforge.jarbundler.JarBundler" />
--
-+-->
- 
- 	<!-- begin generator part -->
- 	<property name="jibxhome" value="lib/jibx"/>
diff --git a/app-misc/freemind/freemind-0.8.0-r3.ebuild b/app-misc/freemind/freemind-0.8.0-r3.ebuild
deleted file mode 100644
index 7d0d74d1bfd6..000000000000
--- a/app-misc/freemind/freemind-0.8.0-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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.7 2008/10/05 13:35:01 betelgeuse Exp $
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_PV=${PV//./_}
-
-DESCRIPTION="Mind-mapping software written in Java"
-HOMEPAGE="http://freemind.sf.net"
-SRC_URI="mirror://sourceforge/freemind/${PN}-src-${MY_PV}.zip"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# patch for JDK 1.6 (see bug #109678)
-	epatch "${FILESDIR}/${P}-source.patch"
-}
-
-src_compile() {
-	eant dist browser $(use_doc doc)
-}
-
-src_install() {
-	cd "${WORKDIR}/bin/dist"
-
-	insinto /opt/${PN}/
-	doins -r lib/ browser/ plugins/
-	doins -r accessories/ user.properties patterns.xml
-
-	java-pkg_regjar /opt/${PN}/lib/${PN}.jar
-
-	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"
-
-	make_desktop_entry freemind Freemind freemind Utility
-}
diff --git a/app-misc/freemind/freemind-1.0.0.ebuild b/app-misc/freemind/freemind-1.0.0.ebuild
new file mode 100644
index 000000000000..64c11eacfef6
--- /dev/null
+++ b/app-misc/freemind/freemind-1.0.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-1.0.0.ebuild,v 1.1 2014/01/20 19:09:48 sera Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Mind-mapping software written in Java"
+HOMEPAGE="http://freemind.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="groovy latex pdf svg"
+
+COMMON_DEP="
+	dev-java/javahelp:0
+	dev-java/jgoodies-forms:0
+	dev-java/jibx:0
+	dev-java/jortho:0
+	>=dev-java/simplyhtml-0.13.1:0
+	groovy? ( dev-java/groovy )
+	latex? ( dev-java/hoteqn:0 )
+	pdf? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 )
+	svg? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 )"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4
+	pdf? ( dev-java/avalon-framework:4.2 )
+	svg? ( dev-java/avalon-framework:4.2 )"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+
+S="${WORKDIR}/${PN}"
+
+java_prepare() {
+	chmod +x check_for_duplicate_resources.sh || die
+
+	# someone got it all wrong (set/unset vs. bool)
+	sed -i -e 's|<property name="include_latex" value="false"/>||' plugins/build.xml || die
+
+	# disable dmg build on Mac OS X
+	sed -i -e 's:<antcall target="dist_\(macos\|icon\)"/>::p' 'build.xml' || die
+
+	java-ant_remove-taskdefs --name jarbundler # macOS only
+
+	use groovy || rm plugins/build_scripting.xml || die
+	use latex || rm plugins/build_latex.xml || die
+	use pdf || use svg || rm plugins/build_svg.xml || die
+	# not compatible with releases of jmapviewer
+	rm plugins/build_map.xml || die
+
+	rm -v $(find "${WORKDIR}" -name '*.jar' -o -name '*.zip') || die
+}
+
+src_configure() {
+	local build_files=( $(find "${S}" -name 'build*.xml') )
+	JAVA_PKG_BSFIX_NAME="${build_files[@]##*/}"
+	JAVA_ANT_REWRITE_CLASSPATH="yes"
+	JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+	JAVA_ANT_ENCODING="utf-8"
+	java-ant-2_src_configure
+}
+
+src_compile() {
+	local svg_deps svg_build_deps
+	if use pdf || use svg; then
+		svg_deps="batik-1.7,fop"
+		svg_build_deps=":$(java-pkg_getjars --build-only avalon-framework-4.2)"
+	fi
+	EANT_GENTOO_CLASSPATH="
+		jgoodies-forms,jibx,javahelp,jortho,simplyhtml
+		$(usex groovy groovy '')
+		$(usex latex hoteqn '')
+		${svg_deps}"
+	EANT_GENTOO_CLASSPATH_EXTRA="lib/bindings.jar${svg_build_deps}"
+	EANT_BUILD_TARGET="dist"
+	EANT_DOC_TARGET="doc"
+	EANT_ANT_TASKS="jibx"
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	cd "${WORKDIR}/bin/dist"
+	local dest="/usr/share/${PN}/"
+
+	java-pkg_dojar lib/*.jar
+
+	if use doc; then
+		java-pkg_dojavadoc doc/javadoc
+		rm -r doc/javadoc
+	fi
+
+	insinto "${dest}"
+	doins -r accessories browser doc plugins patterns.xml
+
+	# register plugins for java-dep-check
+	local plugins="help"
+	use groovy && plugins+=" script"
+	use latex && plugins+=" latex"
+	if use pdf || use svg; then
+		plugins+=" svg"
+	fi
+	local plugin
+	for plugin in ${plugins}; do
+		java-pkg_regjar "${ED}"${dest}/plugins/${plugin}/*jar
+	done
+
+	java-pkg_dolauncher ${PN} --java_args "-Dfreemind.base.dir=${EPREFIX}${dest}" \
+		--pwd "${EPREFIX}${dest}" --main freemind.main.FreeMindStarter
+
+	newicon "${S}/images/FreeMindWindowIcon.png" freemind.png
+
+	make_desktop_entry freemind Freemind freemind Utility
+}