Dependencies bump wrt fop and batik.

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, 139 insertions, 19 deletions

diff --git a/app-misc/freemind/ChangeLog b/app-misc/freemind/ChangeLog
index 84bb7c1d8c0e..4b304d431c68 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.69 2015/06/09 11:40:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.70 2015/06/26 23:33:18 monsieurp Exp $
+
+*freemind-1.0.1-r1 (27 Jun 2015)
+
+  27 Jun 2015; Patrice Clement <monsieurp@gentoo.org> +freemind-1.0.1-r1.ebuild:
+  Dependencies bump wrt fop and batik.
 
   09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Updating remote-id in metadata.xml
diff --git a/app-misc/freemind/Manifest b/app-misc/freemind/Manifest
index 26239074658e..3e1be721194e 100644
--- a/app-misc/freemind/Manifest
+++ b/app-misc/freemind/Manifest
@@ -1,30 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST freemind-src-0.9.0.tar.gz 15195546 SHA256 aef65c79d315c2055651f4adaa9fd0cd27514aa49dde6aca470d80ce5f19a5e1 SHA512 c03b6854b735a66022d36bc09a31cd3e0c2b8f4f0031a05cf8f50f0b740a43560c20551b8f08d6e0efe126fcf81a7958809f52166c3b0b0bce5229a2f9f49f4e WHIRLPOOL 9b86230b50c564c9375d6becdf1ec88e56244b79a6f9ba49f05783bf23e5a11bae9773a1d34bacca14f3b53230c27b56afca7d8985ff4e6f52131d41c4b54400
 DIST freemind-src-1.0.0.tar.gz 31444914 SHA256 27daa9c9dd13129d79f9e0eb956d22f68039074199ed3569f62edcb070ccb686 SHA512 a4e8d328f01c990521a8ed891bf80e5dbdc89bef2d2ba3c07d47a22e41e8f18fdf4f6e7b0feca351311fc420d23fb1b45152e9ab782e97185899e6b053c8586b WHIRLPOOL e3465fadb96a7c2cdf98805da20557db0956f8ed41d692d714759fd94b3d71ccf48f79af28633cbcfe7d0209b1b19f76f44660f2fa3a52c02ef0c0bdebfefd93
 DIST freemind-src-1.0.1.tar.gz 31617138 SHA256 018285126b27eae7392b8c3bfb513f25bd70b9907440e5eb8209f20b4fbd8619 SHA512 f3b7bd526da3075e883292fc88dd5b01f5b0112c58cfeae25a6be9c7dbf4a5444839821e3e2554303032d832b4520fa742894c09ded2705270f51aca98167fb5 WHIRLPOOL 5c3e1c795060bb92bced84fcf785c721c0ecf2ea8fcd8440cfe4935255bb4685c78dc4ad5991ee425a3c7d37589a8698ee9e1b3e4c63d362bc172edbe4e281da
 EBUILD freemind-0.9.0-r1.ebuild 3804 SHA256 ee3f81d2666ac146e4922db98f26519a1c0c08b7461e6e9926285c303e6d1771 SHA512 005dead644fb49c47dd915d07a24ae26a33646a0466c91ed55b0b41026ee1524d1572abc8f93d4ec6993815da7159d572866a5ddc1b88a6ea2b80ed937754d98 WHIRLPOOL a764081aed63931507446a7f5fd9575553ef83be057ead9f2a4b79979d9373f1a8e3c3bf43cf33ba1224de367f19d7772053b4fa2df6971e79263742e4acc3d0
 EBUILD freemind-1.0.0-r1.ebuild 3172 SHA256 4e90cad36354895e4ae9071da3ce40607377df68ce7e8f93677b4f3b23db1563 SHA512 a5463265dff47ba53267c61585a4b9bf9ae967ea911679e323678afe3958e4f8fdce8e990eb6d5777c8848d346184a63827175d218d88044778985227481f062 WHIRLPOOL 10c0e67851c01c77f9da6a45b9f6e6f00cc2cd65f46dd1f67c40c79927076375db6560fe03a67d630dd4ce6dd79beb0a1fbf0b19137e2b5ed75e509f5d9bb692
+EBUILD freemind-1.0.1-r1.ebuild 3163 SHA256 0548bc0de7cf2737e1e8b9df72eb14701df165e4f0cdfd2347da0c46e201d8ea SHA512 eb9e78308a9eab4e86e80bff02c4970ff685d4889ca82e67859fdfad7e57354880ca4ee574bb5ad585cf335fa83367a1fb17412e001817b9e94ae6075b3d9bcd WHIRLPOOL 9bf4e73debe803352713c43f1e88c7c3dd86e1d99d8f7e086e3832a825370ad9b65a17996eb11c2a99f177b5228fd24f2f2e6f3998e4ccdfb1a8d7573514e8f6
 EBUILD freemind-1.0.1.ebuild 3168 SHA256 fe5d249556566e65bd97b14c352a532fc7babb2358367f2784696438c70beb04 SHA512 1735f855232cdb9a40e4e7653e1dcc6b5c6e18354986f60353f0a439cacd2ec6b1ff47cad374878477978d5000224d59128b45acc01cbe21616c7a63afa42ae6 WHIRLPOOL f1c8944487c7e32c5972e61060ae52f705c6054754486980cd9d6266f2df3e9ca0eba131c9616b53fd796865b6ebc1ed22526296b31cc4977cb50ffdab2e6ee3
-MISC ChangeLog 10923 SHA256 8ee2c3c53002bc6b2e657a654b5188e22d7b7529905fed21e019ac5ff7a0a927 SHA512 e42432247bbb48f5a23fea674bef77c482bdf48af674dcfee5034128c77c5795e81d065e729e50809ee8441ff53ed404d4b90db97f31414f017af1e92e49c0f2 WHIRLPOOL b58a5b72b644f0235b8c99cc18064f49f9b9b086910b08e5a07835e4cde6b57abf23c243fd8079fc0b2a4d59052d360be2914c0f264a475bc1084c6895f349a4
+MISC ChangeLog 11083 SHA256 f218ddc2f67ccec8f555779885ef3647747e3dd776d203f9fc4e50a8df44e5a5 SHA512 17ce418bbd14052004e28820e53c130bb81fe5d746b2ec1b26aa36af7fb01b1ddf5a6e6e72881ded928b71c877e930fbf51115f0a368ac26e5c3a61215120c41 WHIRLPOOL 4e3a8fe93b640ea01240471bd106eba7a6357eb805639a7877ba86d65dc90e89b4137bc53470e7e29498f5b3beb05bcddf3b741c447548d7cfb9cabd670c8cb7
 MISC metadata.xml 565 SHA256 579c12143a284d3ea16369b083549bfe8039bf0c9624a0b0a4fd4d8b8fe385bc SHA512 c715022b1ffca940962ff38698b7771eb7aa38f076a975b8beeaa59d9799af936cc8c6605d2c6432be79e21a7f04c2c365c4cfb00b84909817cf8ebcee3e333d WHIRLPOOL 77d73169d072f3d7480e922ec8a433745a0ad218b15168fee1878789c20be8441901ec2faed722505fee0bc47a75bdfed5cb96d545ceea06b82b214873b3d871
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdtCmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiMo4P/1kM/x1qB++idSpwJDf8nT9P
-mipIWORWpQyrjxNnXGqNazq33sU4ZSQ4sVGdKYOYl8kkrNudWmwl/MonhU8qWkBT
-lvi/3TyqFQV/SR0ENNEN4VaYKOEFcFgdbGaJErFfWrSc/7LS4URq1rfE83VAm8gb
-ZrRCt4PjsatggLQfY0+FHXxhCNw1sQjbBkUPkRucxHT3GDklbq26yVp+sZ004txK
-ON63JX3fzYCclo+JYCve5LN8tSGrREp2HRJG4fMF/YtkxRkkdu+pyJB8k3aRjkMv
-LTSnABqBVK1+JsvyU3+khMUvcjoeXFsa9AaQhT6ChQGDpjLjNHYehjGCoK4USBWZ
-xGwl9R/LNlE/bAYhgaSh3GQwxWFPv903UyX5S3mluBi3YW6C/7MYz9n9ZCvgAeRr
-JMWSDyj60cDG1x6ZbnGJ0yU82pnnwhpMEOJCG+LfhHVH4R0OL5hhkreK9tpCdzOU
-nD0tYlfFHUYbErqDq+9/rRQcaof7XE8FagVlB5482eUo8YqM+7V7m5deLMBpj+To
-ZsD3YzJg/UQGxHd3r9VLaFx5mPaPdF0fXBlXb016Jj24IA7Nfgm6kh/ENzc40Pfi
-xWKPguKWWlVJxqafOBAnOUEA70Z4itdrS5sKUfeX6XfgUNO7OeKdVRub2y9srCvi
-cxn1NL74TLgVNAvr0jGg
-=icf/
+iQEcBAEBCAAGBQJVje+tAAoJEJGRpfGTSRu4dIgH+wQ2f2NpgEantZyACSXK7eqL
+QdQFojdU0cQoHqWmpXEFrEMqYbdjQeC9H2glNU+Ra9N3nAgRO8Zws04pI8uAYmfp
+eR4X+ih8m7RnGhNcw650UXXFLOH5vYGAlSyghQXXYgSWDpBVml4wY6FXzVkBrZOp
+y/+erRcPCczkFQJvQWwKEsValgPLljwQTkpJGGKBeYUfP7MXFXD7ovNb1gZYt3V/
+J9Zf6ugHlu9reg3kqw50Zyrsw+2+P27VkP52fpSoKZhcSeVhq782Nlv8YZri8hhp
+JRHT0dP43HbG5Ql5a9QUfEnEPMhf5sgwIV16lytCW9duHa1AngGRmT5Hm5+4tiQ=
+=Rd5C
 -----END PGP SIGNATURE-----
diff --git a/app-misc/freemind/freemind-1.0.1-r1.ebuild b/app-misc/freemind/freemind-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..77cadc8df668
--- /dev/null
+++ b/app-misc/freemind/freemind-1.0.1-r1.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-r1.ebuild,v 1.1 2015/06/26 23:33:18 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:2
+	)"
+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"
+		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
+}