[patch] Ebuild patch against version 0.9.0_rc7

freemind-0.9.0.ebuild.patch (text/plain), 4.82 KB, created by Ralph Sennhauser (RETIRED) on 2011-10-21 09:09:59 UTC

Author: Ralph Sennhauser (sera)

Major spring cleaning. Make better use of eclasses.
Fix deps, tasks, targets
Register plugins, mostly for java-dep-check
Only install javadocs once
Drop my MY_PV - currently it would need to be Alpha
Drop basedir hack.
Fix plugin/build.xml

--- freemind-0.9.0_rc7.ebuild
+++ freemind-0.9.0.ebuild
@@ -2,37 +2,33 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.9.0_rc7.ebuild,v 1.1 2010/02/28 11:40:44 caster Exp $
 
-EAPI="2"
+EAPI="4"
 
-# will handle rewriting myself
-JAVA_PKG_BSFIX="off"
-WANT_ANT_TASKS="ant-nodeps ant-trax"
-inherit java-pkg-2 java-ant-2 eutils
+JAVA_PKG_IUSE="doc"
 
-MY_PV=${PV//beta/Beta_}
-MY_PV=${MY_PV//rc/RC_}
+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-${MY_PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc groovy latex pdf svg"
-COMMON_DEP="dev-java/jgoodies-forms:0
+IUSE="groovy latex pdf svg"
+
+COMMON_DEP="
+	dev-java/javahelp:0
+	dev-java/jgoodies-forms:0
 	dev-java/jibx:0
 	>=dev-java/simplyhtml-0.13.1:0
-	dev-java/commons-lang:2.1
-	dev-java/javahelp: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 )"
+	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=">=virtual/jdk-1.4
-	dev-java/xsd2jibx:0
-	app-arch/unzip
+	pdf? ( dev-java/avalon-framework:4.2 )
+	svg? ( dev-java/avalon-framework:4.2 )
 	${COMMON_DEP}"
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEP}"
@@ -40,41 +36,41 @@
 S="${WORKDIR}/${PN}"
 
 java_prepare() {
-	# kill the jarbundler taskdef
-	epatch "${FILESDIR}/${PN}-0.9.0_rc1-build.xml.patch"
+	# someone got it all wrong (set/unset vs. bool)
+	sed -i -e 's|<property name="include_latex" value="false"/>||' plugins/build.xml || die
 
-	# Ant 1.8.0 changed basedir handling in some subtle ways and probably
-	# correcly. This change does not break ant 1.7.1 builds. Bug #305929
-	sed -i 's/basedir="\."/basedir="\.\."/' plugins/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
-	if ! use pdf && ! use svg ; then
-		rm plugins/build_svg.xml || die
-	fi
+	use pdf || use svg || rm plugins/build_svg.xml || die
 
-	local xml
-	for xml in $(find . -name 'build*.xml'); do
-		java-ant_rewrite-classpath ${xml}
-		java-ant_bsfix_one ${xml}
-	done
+	rm -v $(find "${WORKDIR}" -name '*.jar' -o -name '*.zip') || die
+}
 
-	rm -v lib/*.jar lib/*.zip lib/*/*.jar \
-		plugins/*/*.jar plugins/*/*/*.jar || die
+src_configure() {
+	local build_files=( $(find "${S}" -name 'build*.xml') )
+	JAVA_PKG_BSFIX_NAME="${build_files[@]##*/}"
+	JAVA_ANT_REWRITE_CLASSPATH="yes"
+	java-ant-2_src_configure
 }
 
 src_compile() {
-	local jibxlibs="$(java-pkg_getjars --build-only --with-dependencies xsd2jibx)"
-	local gcp="jgoodies-forms,jibx,commons-lang-2.1,javahelp,simplyhtml"
-	use groovy && gcp="${gcp},groovy"
-	use latex && gcp="${gcp},hoteqn"
-	if use pdf || use svg ; then
-		# there is both direct batik usage and through fop
-		gcp="${gcp},batik-1.7,fop"
+	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
-	local gcp="$(java-pkg_getjars --with-dependencies ${gcp}):lib/bindings.jar"
-	ANT_TASKS="${WANT_ANT_TASKS} jibx xsd2jibx" eant -Djibxlibs="${jibxlibs}" \
-		-Dgentoo.classpath="${gcp}" -Dbasedir="${PWD}" dist browser $(use_doc doc)
+	EANT_GENTOO_CLASSPATH="
+		jgoodies-forms,jibx,javahelp,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() {
@@ -83,10 +79,25 @@
 
 	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 || die
+	doins -r accessories browser doc plugins patterns.xml
 
-	use doc && java-pkg_dojavadoc doc/javadoc
+	# 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=${dest}" \
 		--pwd "${dest}" --main freemind.main.FreeMindStarter