From 0eca3438300c8bfb0783696d2b3957f2bed19c35 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Sun, 28 Feb 2010 11:40:44 +0000 Subject: Version bump. Fix building with Ant 1.8.0 (broken by basedir handling change) with a sed call, compatible with Ant 1.7.1 too. Bug #305929. Package-Manager: portage-2.2_rc63/cvs/Linux x86_64 --- app-misc/freemind/ChangeLog | 12 +++- app-misc/freemind/Manifest | 8 +-- app-misc/freemind/freemind-0.9.0_rc4-r1.ebuild | 93 ------------------------ app-misc/freemind/freemind-0.9.0_rc6.ebuild | 6 +- app-misc/freemind/freemind-0.9.0_rc7.ebuild | 97 ++++++++++++++++++++++++++ 5 files changed, 114 insertions(+), 102 deletions(-) delete mode 100644 app-misc/freemind/freemind-0.9.0_rc4-r1.ebuild create mode 100644 app-misc/freemind/freemind-0.9.0_rc7.ebuild (limited to 'app-misc') diff --git a/app-misc/freemind/ChangeLog b/app-misc/freemind/ChangeLog index d1b8eb7b52a7..f848a41f2d4c 100644 --- a/app-misc/freemind/ChangeLog +++ b/app-misc/freemind/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-misc/freemind -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.50 2009/10/25 10:22:48 caster Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.51 2010/02/28 11:40:44 caster Exp $ + +*freemind-0.9.0_rc7 (28 Feb 2010) + + 28 Feb 2010; Vlastimil Babka + -freemind-0.9.0_rc4-r1.ebuild, freemind-0.9.0_rc6.ebuild, + +freemind-0.9.0_rc7.ebuild: + Version bump. Fix building with Ant 1.8.0 (broken by basedir handling + change) with a sed call, compatible with Ant 1.7.1 too. Bug #305929. *freemind-0.9.0_rc6 (25 Oct 2009) diff --git a/app-misc/freemind/Manifest b/app-misc/freemind/Manifest index fba690c41b4c..1792917247ef 100644 --- a/app-misc/freemind/Manifest +++ b/app-misc/freemind/Manifest @@ -1,10 +1,10 @@ AUX freemind-0.8.0-source.patch 707 RMD160 564bee084b34c484d36819b5ccfafd2691b3cd4a SHA1 0afdbf3b0a0e2ebecb3e3de00c4f4ed85816c5ea SHA256 95172076011a2b98eeaaa1d4267926abf0c2a9828ba27abf254450757b33fa8f AUX freemind-0.9.0_rc1-build.xml.patch 544 RMD160 719b67738a53478fa6467004a15d86adad079094 SHA1 c86c38eb1c2ffef25806c33653cc79c1d2cb69e2 SHA256 596923100e78e983b19890dd5e3c3c211c54fc0a91a9741f10bca9b20f5811b1 -DIST freemind-src-0.9.0_RC_4.tar.gz 15171201 RMD160 8f654b0635d55d1f10c4abd80dd5b091d16a3cdf SHA1 5902227cc45609a0bd4fbc91d65a67f0f971c0ab SHA256 1d689f6edca35d9731987a1b09e51f2e7485bc3fbf280fe6fb2579ea82c0748a DIST freemind-src-0.9.0_RC_6.tar.gz 15053570 RMD160 480fac3035ae986f83dac1eb35d267065ae37013 SHA1 81691b0175f9ea27ff503b964794c789803d3d8a SHA256 ee596875118eb0032730f7cc04442d5d43d0eb67cf1cf80762a875b22ae6b763 +DIST freemind-src-0.9.0_RC_7.tar.gz 15066873 RMD160 3324c03a5e95504985c2db60a00b01c5c8da9a67 SHA1 624f032c2caeea1cc66f85782ace7bcccbb7b069 SHA256 782f217bb2abe2aedd9b822c302cea09ac028214cbb33f59086fa1dea62dea16 DIST freemind-src-0_8_0.zip 9857214 RMD160 df7f47aedef7b761c94f938f7c851f0b8ed32e04 SHA1 17c65bdc65b292d7d62fe7a8d633a24c2ad618df SHA256 c28902151f0089ddd1270c662820b6e33a85a686083c53dcfe6dd7205493da78 EBUILD freemind-0.8.0-r3.ebuild 1283 RMD160 11986ad9bc8d8a2567f13bfcaee10efcd2b1f938 SHA1 37942f230701e445b855e49d680a316d5e171d9a SHA256 cb794f1bad8af6eaec891321547ddb12e307cb212927281d74ac26d4ccfb3e54 -EBUILD freemind-0.9.0_rc4-r1.ebuild 2636 RMD160 769f253a7cfa6bd7717b1aae44e47fa038a5ee4b SHA1 4d3204e87bcf5fa5c8654d50178b5c0a45fa4b0f SHA256 b8e4c9f668149498fbe3036fa76510c640f531b5a069e7e2da553a6206b91431 -EBUILD freemind-0.9.0_rc6.ebuild 2632 RMD160 930161e97963fc4649262d1ba7ae1712f80fd454 SHA1 e304f119a9dab15873c7bd6fed96207e727683d4 SHA256 2093c219809e68fd80d0737ee0adf8ece4d160020e61af7e2776440500e5bb3c -MISC ChangeLog 7763 RMD160 e481356b915e758038f50e93637057ec717c1085 SHA1 7de9113fec70d91417a5460c788d23269ad0b056 SHA256 c68519b1c201e5907b5b995c45eacdee7de833544fd20d7c7bc612081efea32a +EBUILD freemind-0.9.0_rc6.ebuild 2651 RMD160 b778f9c317efafb8272b173023b1597fac04644d SHA1 1cb85619ad5908af7a33daf7d45f565fe8ccb2b2 SHA256 dbe53f9985d6ee7e6bd7eeeaae5e6be688d48a79a9dc5854cde027b7fbdc3a7b +EBUILD freemind-0.9.0_rc7.ebuild 2861 RMD160 12cb30e8d6a72c9b30a9633e30e4cf7639af069c SHA1 1b21c79595a39ae10afe82fea43933dcfd72cf38 SHA256 0504c6f3e51e680b68ab2a3bf6bc69cbf35343b8488104d3101bbe5c448afcc5 +MISC ChangeLog 8083 RMD160 782603cf44f380883a2f41797ede2e2810d62661 SHA1 71c27b2e6fc2198a28238a090b456d5b7f2b4cf1 SHA256 6323d67eac784673d946b44b25b2e1a93748e61165001dae125239a8a46f2fba MISC metadata.xml 498 RMD160 3257462313db1947676502aee3f039f8885289b9 SHA1 0dfcc245809419a94c5399ecdccaec3429895ab6 SHA256 0fbff5fdf47275d3a532869de6e5064f613cf929bdbab2ed74ef9ff5fe1949a9 diff --git a/app-misc/freemind/freemind-0.9.0_rc4-r1.ebuild b/app-misc/freemind/freemind-0.9.0_rc4-r1.ebuild deleted file mode 100644 index 0f36ba515796..000000000000 --- a/app-misc/freemind/freemind-0.9.0_rc4-r1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.9.0_rc4-r1.ebuild,v 1.2 2009/07/30 07:38:55 elvanor Exp $ - -EAPI="2" - -# will handle rewriting myself -JAVA_PKG_BSFIX="off" -WANT_ANT_TASKS="ant-nodeps ant-trax" -inherit java-pkg-2 java-ant-2 eutils - -MY_PV=${PV//beta/Beta_} -MY_PV=${MY_PV//rc/RC_} - -DESCRIPTION="Mind-mapping software written in Java" -HOMEPAGE="http://freemind.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${MY_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 - 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 )" -DEPEND=">=virtual/jdk-1.4 - dev-java/xsd2jibx:0 - app-arch/unzip - ${COMMON_DEP}" -RDEPEND=">=virtual/jre-1.4 - ${COMMON_DEP}" - -S="${WORKDIR}/${PN}" - -java_prepare() { - # kill the jarbundler taskdef - epatch "${FILESDIR}/${PN}-0.9.0_rc1-build.xml.patch" - - 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 - - local xml - for xml in $(find . -name 'build*.xml'); do - java-ant_rewrite-classpath ${xml} - java-ant_bsfix_one ${xml} - done - - rm -v lib/*.jar lib/*.zip lib/*/*.jar \ - plugins/*/*.jar plugins/*/*/*.jar || die -} - -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" - 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}" dist browser $(use_doc doc) -} - -src_install() { - cd "${WORKDIR}/bin/dist" - local dest="/usr/share/${PN}/" - - java-pkg_dojar lib/*.jar - - insinto "${dest}" - doins -r accessories browser/ doc/ plugins/ patterns.xml || die - - use doc && java-pkg_dojavadoc doc/javadoc - - java-pkg_dolauncher ${PN} --java_args "-Dfreemind.base.dir=${dest}" \ - --pwd "${dest}" --main freemind.main.FreeMindStarter - - newicon "${S}/images/FreeMindWindowIcon.png" freemind.png - - make_desktop_entry freemind Freemind freemind Utility -} diff --git a/app-misc/freemind/freemind-0.9.0_rc6.ebuild b/app-misc/freemind/freemind-0.9.0_rc6.ebuild index 2a5f637a5389..950a551228ec 100644 --- a/app-misc/freemind/freemind-0.9.0_rc6.ebuild +++ b/app-misc/freemind/freemind-0.9.0_rc6.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.9.0_rc6.ebuild,v 1.1 2009/10/25 10:22:48 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.9.0_rc6.ebuild,v 1.2 2010/02/28 11:40:44 caster Exp $ EAPI="2" @@ -70,7 +70,7 @@ src_compile() { 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}" dist browser $(use_doc doc) + -Dgentoo.classpath="${gcp}" -Dbasedir="${PWD}" dist browser $(use_doc doc) } src_install() { diff --git a/app-misc/freemind/freemind-0.9.0_rc7.ebuild b/app-misc/freemind/freemind-0.9.0_rc7.ebuild new file mode 100644 index 000000000000..6de926994811 --- /dev/null +++ b/app-misc/freemind/freemind-0.9.0_rc7.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2010 Gentoo Foundation +# 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" + +# will handle rewriting myself +JAVA_PKG_BSFIX="off" +WANT_ANT_TASKS="ant-nodeps ant-trax" +inherit java-pkg-2 java-ant-2 eutils + +MY_PV=${PV//beta/Beta_} +MY_PV=${MY_PV//rc/RC_} + +DESCRIPTION="Mind-mapping software written in Java" +HOMEPAGE="http://freemind.sourceforge.net" +SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${MY_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 + 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 )" +DEPEND=">=virtual/jdk-1.4 + dev-java/xsd2jibx:0 + app-arch/unzip + ${COMMON_DEP}" +RDEPEND=">=virtual/jre-1.4 + ${COMMON_DEP}" + +S="${WORKDIR}/${PN}" + +java_prepare() { + # kill the jarbundler taskdef + epatch "${FILESDIR}/${PN}-0.9.0_rc1-build.xml.patch" + + # 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 + + 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 + + local xml + for xml in $(find . -name 'build*.xml'); do + java-ant_rewrite-classpath ${xml} + java-ant_bsfix_one ${xml} + done + + rm -v lib/*.jar lib/*.zip lib/*/*.jar \ + plugins/*/*.jar plugins/*/*/*.jar || die +} + +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" + 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) +} + +src_install() { + cd "${WORKDIR}/bin/dist" + local dest="/usr/share/${PN}/" + + java-pkg_dojar lib/*.jar + + insinto "${dest}" + doins -r accessories browser/ doc/ plugins/ patterns.xml || die + + use doc && java-pkg_dojavadoc doc/javadoc + + java-pkg_dolauncher ${PN} --java_args "-Dfreemind.base.dir=${dest}" \ + --pwd "${dest}" --main freemind.main.FreeMindStarter + + newicon "${S}/images/FreeMindWindowIcon.png" freemind.png + + make_desktop_entry freemind Freemind freemind Utility +} -- cgit v1.2.3-65-gdbad