From df6df8463e8a28a9d8964b3bdb82f06e424e5622 Mon Sep 17 00:00:00 2001 From: Ralph Sennhauser Date: Thu, 21 Jun 2012 15:41:40 +0000 Subject: Fix hardcoded version in wrapper script. #422741 (Portage version: 2.1.10.65/cvs/Linux x86_64) --- dev-java/ant-core/ChangeLog | 7 +- dev-java/ant-core/ant-core-1.8.4-r1.ebuild | 107 +++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 dev-java/ant-core/ant-core-1.8.4-r1.ebuild (limited to 'dev-java/ant-core') diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog index 53e90f1122c8..c349f93e2da7 100644 --- a/dev-java/ant-core/ChangeLog +++ b/dev-java/ant-core/ChangeLog @@ -1,11 +1,16 @@ # ChangeLog for dev-java/ant-core # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.119 2012/06/11 13:04:06 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.120 2012/06/21 15:41:40 sera Exp $ # Ant-core blocks lower/older versions of ant-tasks, # since it will not run when there is a version mismatch betwean the 2 packages # Please unemerge ant-tasks when updating ant-core. +*ant-core-1.8.4-r1 (21 Jun 2012) + + 21 Jun 2012; Ralph Sennhauser +ant-core-1.8.4-r1.ebuild: + Fix hardcoded version in wrapper script. #422741 + 11 Jun 2012; Johannes Huber ant-core-1.8.4.ebuild: Stable for x86, wrt bug #417909 diff --git a/dev-java/ant-core/ant-core-1.8.4-r1.ebuild b/dev-java/ant-core/ant-core-1.8.4-r1.ebuild new file mode 100644 index 000000000000..63640f6dac40 --- /dev/null +++ b/dev-java/ant-core/ant-core-1.8.4-r1.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.8.4-r1.ebuild,v 1.1 2012/06/21 15:41:40 sera Exp $ + +EAPI="4" + +# don't depend on itself +JAVA_ANT_DISABLE_ANT_CORE_DEP=true +# rewriting build.xml files for the testcases has no reason atm +JAVA_PKG_BSFIX_ALL=no +JAVA_PKG_IUSE="doc source" +inherit eutils java-pkg-2 java-ant-2 prefix versionator + +MY_P="apache-ant-${PV}" + +DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files." +HOMEPAGE="http://ant.apache.org/" +SRC_URI="mirror://apache/ant/source/${MY_P}-src.tar.bz2 + http://dev.gentoo.org/~sera/distfiles/ant-${PV}-r1-gentoo.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND=">=virtual/jdk-1.4 + !dev-java/ant-tasks + !dev-java/ant-optional" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches/" + eprefixify "${WORKDIR}/ant" + + # use our split-ant build.xml + mv -f "${WORKDIR}/build.xml" . || die + + # bug #196080 + java-ant_bsfix_one build.xml + java-pkg-2_src_prepare +} + +src_compile() { + export ANT_HOME="" + + local bsyscp + + # this ensures that when building ant with bootstrapped ant, + # only the source is used for resolving references, and not + # the classes in bootstrapped ant + # but jikes in kaffe has issues with this... + if ! java-pkg_current-vm-matches kaffe; then + bsyscp="-Dbuild.sysclasspath=ignore" + fi + + CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars-core internal_dist \ + $(use_doc javadocs) || die "build failed" +} + +src_install() { + dodir /usr/share/ant/lib + for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do + java-pkg_dojar build/lib/${jar} + dosym /usr/share/${PN}/lib/${jar} /usr/share/ant/lib/${jar} + done + + dobin "${WORKDIR}/ant" || die "failed to install wrapper" + dodir /usr/share/${PN}/bin + for each in antRun antRun.pl runant.pl runant.py complete-ant-cmd.pl ; do + dobin "${S}/src/script/${each}" + dosym /usr/bin/${each} /usr/share/${PN}/bin/${each} + done + dosym /usr/share/${PN}/bin /usr/share/ant/bin + + insinto /usr/share/${PN} + doins -r dist/etc + dosym /usr/share/${PN}/etc /usr/share/ant/etc + + echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant" + doenvd "${T}/20ant" || die "failed to install env.d file" + + dodoc NOTICE README WHATSNEW KEYS || die + + if use doc; then + dohtml -r manual/* + java-pkg_dojavadoc --symlink manual/api build/javadocs + fi + + use source && java-pkg_dosrc src/main/* +} + +pkg_postinst() { + if [[ -n ${REPLACING_VERSIONS} ]]; then + if ! version_is_at_least 1.7.0 ${REPLACING_VERSIONS}; then + elog "The way of packaging ant in Gentoo has changed significantly since" + elog "the 1.7.0 version, For more information, please see:" + elog "http://www.gentoo.org/proj/en/java/ant-guide.xml" + fi + + if ! version_is_at_least 1.7.1 ${REPLACING_VERSIONS}; then + elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE" + elog "flags have been moved to dev-java/ant." + fi + fi +} -- cgit v1.2.3-65-gdbad