Adjust fop SLOT. Fix bug 555144.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

3 files changed, 137 insertions, 9 deletions

diff --git a/app-misc/freemind/ChangeLog b/app-misc/freemind/ChangeLog
index 5f07268c686b..a933fade8ea4 100644
--- a/app-misc/freemind/ChangeLog
+++ b/app-misc/freemind/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/freemind
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.74 2015/06/29 07:59:59 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.75 2015/07/17 13:01:29 monsieurp Exp $
+
+*freemind-1.0.1-r2 (17 Jul 2015)
+
+  17 Jul 2015; Patrice Clement <monsieurp@gentoo.org> +freemind-1.0.1-r2.ebuild:
+  Adjust fop SLOT. Fix bug 555144.
 
   29 Jun 2015; Patrice Clement <monsieurp@gentoo.org> freemind-1.0.1-r1.ebuild:
   Correct classpath by adjusting fop SLOT. Fix bug 553394.
diff --git a/app-misc/freemind/Manifest b/app-misc/freemind/Manifest
index 0e9eabdba515..458344bfe606 100644
--- a/app-misc/freemind/Manifest
+++ b/app-misc/freemind/Manifest
@@ -3,16 +3,17 @@ Hash: SHA256
 
 DIST freemind-src-1.0.1.tar.gz 31617138 SHA256 018285126b27eae7392b8c3bfb513f25bd70b9907440e5eb8209f20b4fbd8619 SHA512 f3b7bd526da3075e883292fc88dd5b01f5b0112c58cfeae25a6be9c7dbf4a5444839821e3e2554303032d832b4520fa742894c09ded2705270f51aca98167fb5 WHIRLPOOL 5c3e1c795060bb92bced84fcf785c721c0ecf2ea8fcd8440cfe4935255bb4685c78dc4ad5991ee425a3c7d37589a8698ee9e1b3e4c63d362bc172edbe4e281da
 EBUILD freemind-1.0.1-r1.ebuild 3163 SHA256 2dc8c830fdfb70a9d12b8b3e68eb9e795b0c34fa642f76dc2209841a9f883f91 SHA512 7aeb5101053926b4aa412d70ee1a73e6dbf50524ae025f18b9f6f903b419f664ccbaf640c1998cbe4f7b01e0450cd190e01c3f1c6df0cbab9142963d2e52f1b7 WHIRLPOOL a90fe2a0b461312311918b47fd3880639ed8fa917d46e422c3e6f0ef5d560381f281f703520d0ea719c89cb965c0972a07b2a789fa6ae8bc282d2202a404db86
-MISC ChangeLog 11594 SHA256 a54a0a363f0b29b20e57564e078fa172107e18c93ae5c31e5ceed24d07c8f7e9 SHA512 33a0fe20be8e8e0dadbb7f05d0c7b6041e347604b047797649b8975ea9f25beea989a27f316de186deb2fd1a76d5b6e5ae49445837131be6b3fdc1b7ef8eab6f WHIRLPOOL 912d35c9b08bc5fe0f45677638a65ce3f7eff65113319269a61294ba5235011a386cdc04c20ddc13cd5572786102d7b2c8a6999c52bd5f8592783a4cbbbba608
+EBUILD freemind-1.0.1-r2.ebuild 3165 SHA256 b875428da0b1df6eabf230e9df625cf0e399b67ac8e894b8b07800635c019577 SHA512 7111baedf323646aaf485146a9a8207a1f4087761a39fad6ac57e187f4f0d41a72af7768b476aaa12784e86f0f6cabd8f77b8fd1cdbe8bbf3434eb4042f694f7 WHIRLPOOL d33ce38f021002459c39e29eac402b5cd4fc33672a8257c9f162a6eb436b6d901573680165a922df1f2111b4e562e8bf6f884bb95044d2c95208adfbf10d3d57
+MISC ChangeLog 11745 SHA256 c1c33b9d3bcd4740e897e2918dd435f101e63417b204a3ddb4c4d1700b33b7d2 SHA512 a4e3627ae29369e20b855ad6e6318fcfbf995c3ebadf7cb7314bad5066d6e3fefff924bcc30034fa79b10d2e591f538c897c5393ec1570fdd68bdcb56d8bf5b9 WHIRLPOOL c90810085854180992a0eae4f4d9fcbb65ecba6f62af46c00308a6c0da8ed082a7fd3aceac42e7e253768b6e384d0d80993337cd2e4f9bc3a045e09c86bd4437
 MISC metadata.xml 565 SHA256 579c12143a284d3ea16369b083549bfe8039bf0c9624a0b0a4fd4d8b8fe385bc SHA512 c715022b1ffca940962ff38698b7771eb7aa38f076a975b8beeaa59d9799af936cc8c6605d2c6432be79e21a7f04c2c365c4cfb00b84909817cf8ebcee3e333d WHIRLPOOL 77d73169d072f3d7480e922ec8a433745a0ad218b15168fee1878789c20be8441901ec2faed722505fee0bc47a75bdfed5cb96d545ceea06b82b214873b3d871
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVkQmLAAoJEJGRpfGTSRu4HqMH/1K78UByJHygK+q4MwLATOgN
-pTfGC0BEJi+5pGfME8T21TQrit9A3qH/Xqi04PoPu9N0djgI0rqkgSEYgHsYlPF1
-QGAksjLptDql+7B2f0RhvWuiAWUZWfc7CR1i+3mbC+3Vp/VLuqlOuozKDq4Ms3MS
-GeXHMj8eD0hHfrACFvvpIjJSL1eVVVFi9j+Yo8kGHlNA4WWt2G1X5W0BTxpoFHvh
-FE04XAIJil99f7i8pwoseuaIcsS3QxD2KmgMIlE2qxfqZbfiJTjndvod0QBmiVoM
-Zn5674Td9qD2Q4Z4beohjazs1E4/PbER+EgN6/alj7BocTCVKilWdwdU+hqRR3A=
-=jO0Y
+iQEcBAEBCAAGBQJVqQr8AAoJEJGRpfGTSRu4EGcH/3y8z5buVHpwPCh4mGcfA3wD
+Nlni/JsM8Uh4wJfv2Dr7s2WMqiiahMXi3sqfT72gyctPDEa+Gab+IgMGzAi/oxUv
+KxuHHxjGZbj6xGz0/PclLd40eaB7dCFdr/BwPUPXjNJKnyIXUqiiq8KGUPcFxBpf
+XFPSUhPCQ54x/igoY8FlVeUoE0YMry3LAfuuDEFOILSB27q1wrlMB5pJF8EQ31RV
+7oxUf8B0kbAk7RO7Pay1ZUzGOdeWJjwx/Ep+BpCdxUEvAtFLgsp78EzstV4MM5JW
+pOxJ+bzmYu4zDIFVFm0IcMqoSaN5Gj7Qcfi+c35Jh1D6anaooT/vyv7Wnvs7chI=
+=7FmT
 -----END PGP SIGNATURE-----
diff --git a/app-misc/freemind/freemind-1.0.1-r2.ebuild b/app-misc/freemind/freemind-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..68e163648905
--- /dev/null
+++ b/app-misc/freemind/freemind-1.0.1-r2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-1.0.1-r2.ebuild,v 1.1 2015/07/17 13:01:29 monsieurp 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 ~x86"
+IUSE="groovy latex pdf svg"
+
+CDEPEND="
+	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.8
+		dev-java/fop:2
+	)
+	svg? (
+		dev-java/batik:1.8
+		dev-java/fop:0
+	)"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	pdf? ( dev-java/avalon-framework:4.2 )
+	svg? ( dev-java/avalon-framework:4.2 )"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+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
+
+	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.8,fop-2"
+		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 || die
+	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
+}