Version bump #497974

Remove old

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0x3C5CF75A

6 files changed, 140 insertions, 102 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/Manifest b/app-misc/freemind/Manifest
index 26f064a34d00..a39a5b94bb09 100644
--- a/app-misc/freemind/Manifest
+++ b/app-misc/freemind/Manifest
@@ -1,28 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX freemind-0.8.0-source.patch 707 SHA256 95172076011a2b98eeaaa1d4267926abf0c2a9828ba27abf254450757b33fa8f SHA512 e40fb7fd43e7192c2ecb7273212c7d170d715f881f9aed032972be403c7dae434f65991e208015c8a47ec2e84c38582f3d29bc1801d3d33932650adfee6e7bff WHIRLPOOL 80d75af9afcc516836a38bfddca341bbf4c5d088e7d582485732ea00204765a494e7a1d534546d98076b5acdf659add911fbd49c8b6c0c1b1138fb5444d72264
-AUX freemind-0.9.0_rc1-build.xml.patch 544 SHA256 596923100e78e983b19890dd5e3c3c211c54fc0a91a9741f10bca9b20f5811b1 SHA512 ae4d617955f4d73beb1ed958253506435d8ab5b36bffa138862b0d751905585a63b10933dabf9ccb0ccb4f1a535a2bb0cac096e44602265dd6a01dbbb32d59ba WHIRLPOOL 4e70f0dd757e1af3b40297de2318cb86ffc0caf91a9544491ccf34af4eb6271941fd7175be5703d142112a784553471bd2c949c639e4b203c37db1a68cceb490
 DIST freemind-src-0.9.0.tar.gz 15195546 SHA256 aef65c79d315c2055651f4adaa9fd0cd27514aa49dde6aca470d80ce5f19a5e1 SHA512 c03b6854b735a66022d36bc09a31cd3e0c2b8f4f0031a05cf8f50f0b740a43560c20551b8f08d6e0efe126fcf81a7958809f52166c3b0b0bce5229a2f9f49f4e WHIRLPOOL 9b86230b50c564c9375d6becdf1ec88e56244b79a6f9ba49f05783bf23e5a11bae9773a1d34bacca14f3b53230c27b56afca7d8985ff4e6f52131d41c4b54400
-DIST freemind-src-0_8_0.zip 9857214 SHA256 c28902151f0089ddd1270c662820b6e33a85a686083c53dcfe6dd7205493da78 SHA512 900dfbcac5a38af42968ca868f5c51dbe17d9f2d58a861a2f9c3fdf43b2d5bb4651e09f4c0d53a3831a65baa87a752521b5b55aeaa545f033a0a748c26cbf47e WHIRLPOOL b7cd566667e978e2894be98d65c00304147fbfdf7f7986ed7c26832da8c830002bcd0bef7a3ccb091b44e9feb4df211df22b58879e8cffa300233cd5767640d7
-EBUILD freemind-0.8.0-r3.ebuild 1283 SHA256 cb794f1bad8af6eaec891321547ddb12e307cb212927281d74ac26d4ccfb3e54 SHA512 9b015a8588e53968568b07a5772370dceffc536f69d172e6854e0dc7df67cd6aa54e7c6ae710423241c47986c3cdd1cf49beeee58560026ca053ede508ba3d1e WHIRLPOOL a72345836e093ac02b1cc6752458aa7ee7eb3ab33be3a0c261933742ac7ec65d1fabd9d94172758e37c6681ddacdd5181c8573e1bcb37205fcf1089fead6d96a
+DIST freemind-src-1.0.0.tar.gz 31444914 SHA256 27daa9c9dd13129d79f9e0eb956d22f68039074199ed3569f62edcb070ccb686 SHA512 a4e8d328f01c990521a8ed891bf80e5dbdc89bef2d2ba3c07d47a22e41e8f18fdf4f6e7b0feca351311fc420d23fb1b45152e9ab782e97185899e6b053c8586b WHIRLPOOL e3465fadb96a7c2cdf98805da20557db0956f8ed41d692d714759fd94b3d71ccf48f79af28633cbcfe7d0209b1b19f76f44660f2fa3a52c02ef0c0bdebfefd93
 EBUILD freemind-0.9.0-r1.ebuild 3014 SHA256 a12cce1b80e24af61949961a1e39a47250ea974ad26601d974b29ec5b8a74fd0 SHA512 626e1fd44814f059af3d8ba301e64a6d6ecdf7102ec6a83c1f8e91352eb8f7fb9d68a5d46d7255b609ca7a83e6fceab75ace8fde3fbf2177f369b9e3f0446586 WHIRLPOOL b44a1e0245530e45ea2f5147415102b09271d28b5c937b522aa81f31e52d23b9f9f8d4734d53a20643840e91528d804793c864ade5973e0df45a25ac07c0efb1
-MISC ChangeLog 9504 SHA256 57b319fb03a13c4f4a09ff6d32b9dfb0b5eac19bf78bbaeeda4dc83042df3f9b SHA512 1b194820b94c53d765d4535790c5d8dc384847741b08f53a3d23a3256e6a1931745840a4535da738bff74d1f75db2b7699a60d9f2e75225d6f28831c63e14763 WHIRLPOOL 94667bed947e2576800497c55e953a1175d202ffefae6cd900d5f5852a2b340eb7c553beab646d31823864c72811ea4d5150a6d3e70c261a93d6d41941c4b4b8
+EBUILD freemind-1.0.0.ebuild 3214 SHA256 12b217b08523febbaba382da28e3b6511c637cfc6bbf01a53493adc44cc8e801 SHA512 cb2bb15c1050cf9764cd3e47800df4ede99b1c448535305af6f187a9d336862a4775d92396d465725c561d5f20808ec611ef99f0cc81bda102ffbfbbfa859be4 WHIRLPOOL 29cff65c6ebf899013dc6cc389f1187f00036a38b03fb329834e46bc0d06ba2dbf9278bdf5f490cd04e469dd1ab5b05258302570df90dd188f161130a838dd16
+MISC ChangeLog 9757 SHA256 a67e0109d544a8bcfac420c27c2f77c5d2bfd20ac5214e466c70bf3c5e40b883 SHA512 55bc6993a40900f3fd3a1a3fe363d782b0e1037791cbe648527afe9ee34b6533dad80ede47e9516165c268266322ddf676feb872afe98cf21d61ce43c1b3a60e WHIRLPOOL 6698a214f28ac32061a44be3b1ff4582b7ed726227ebd18b884f811e24ee0df9322199d29ca7fd00bbc6047d01dc9ce2b58126e5730739cf298595088316e680
 MISC metadata.xml 498 SHA256 0fbff5fdf47275d3a532869de6e5064f613cf929bdbab2ed74ef9ff5fe1949a9 SHA512 4abcc613d14e5f34c78a24c2786fe4f878f7fcbd3c7ad24137d2aa84a0cd487bc783fdf2d42418e98e97b4910ea6779641f118fd4a956b90b42de516a5a44078 WHIRLPOOL bb7637d1996adcf1a13725e137355f6b2b1fa64db0199079839047ee957718dcefc010e603100e698e3d1b7e9f7506907e37ca57a69b042dd7305adb071d2492
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSKNn8AAoJELp701BxlEWfR0QP/jg7lzKtTXuWBuJHEfS3m78x
-SeDK9IadfVJeBlgZoa8rSAZbs1ZCMadHcLGqnYDlgDplqjwPGuDBse+6QN/aJUGW
-SD/D4F4E51YBWnZ5RKReDtueiorMizBogWkuupIxKd3siDdxuG0hqDOMBMltmQIV
-+kkwTPtcBSEoiD+P/+mng/oy30OqQPFABOICNW1DrgI495ByjiF+3O3OpjFXpZZ8
-XL7bEYvKk5cc8qBDtfTzvkt1bRXEKC1IXwMRfRIcXRgg9kXe9mPv8Pt57Mc6b4ZW
-lBu/nOfcSOwZwdgW31AW6JsXGNMBC6ZymrdiMkuPuM5Y1CZxfqBdzM9XaLSf+4Fb
-+WmeKPXhaSCwYvpsy6DQjeaiuW09cMc8IfsZhvQPVVTePhxP38PEnov7urRyqFuH
-XnijW7tYAtZRZ/ej1G2JGP1ZM7MBySpFXCnq8dmjvT72HRPKfN6lr2YtA3dwIqA3
-9TIUTHRH78Cn966nNM7emTWLFghsql/siblcOK1/ZOuBzkuUsP7jHtdWBNnvbZra
-w98kByj4amKqkK+vtC2fJwu7v9D0YCl0D5Un2o3IyQHJuyxfq9Meqr7RuZey4zqa
-Aix0gt7qPyoFhItylviza9czbu7DSfP0xAD6ZWBbkGFmuR/SXPTcC9OXkYIRf72W
-4wXh0hmbchBkQzKXNKzH
-=sTur
+iQEcBAEBCAAGBQJS3XSJAAoJELjwI6Q8XPdajrYH/2c/9g1Rw7RU6zaOIKcee4U8
+A71MfcXWC3Zs5uvIVSn8F4D9/K8DbeUJkCOUxFVD17yTiCSvgYThneWGxKLNhW0c
+aAhqY80xEySObcpAMbEYk42dICshi8TCWvaR2PbtvTMaeliyMBPLt4H7W8/cG0Ly
+Q+MQng4VpjIlUDicJJ8nASX16XDXZpANdMulk+nzkpS+72ShhNN9a4FyVyG0yQk6
++IbiNPU+Mb009Q0yxae+sBOITVmMGvuieN0EOhwYFA7Cgof/LgiOcnLPOsjjlE4G
+Y0d0rh0NPXgFywaPtiMnIpKU8J3gpT899LEvCDYyS8nfbWthiqY5knasttxFXws=
+=qzhE
 -----END PGP SIGNATURE-----
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
+}