[gentoo-commits] gentoo-x86 commit in dev-java/ant-core: ChangeLog ant-core-1.7.1-r4.ebuild ant-core-1.7.1-r3.ebuild

[gentoo-commits] gentoo-x86 commit in dev-java/ant-core: ChangeLog ant-core-1.7.1-r4.ebuild ant-core-1.7.1-r3.ebuild

[Petteri Raty (betelgeuse)]

betelgeuse    09/03/17 12:54:49

  Modified:             ChangeLog
  Added:                ant-core-1.7.1-r4.ebuild
  Removed:              ant-core-1.7.1-r3.ebuild
  Log:
  Fix javadoc for sun-jdk-1.4. Fixes bug #217102. Update patch for bug #262511 to work with 1.4 JDKs. Thanks to Martin von Gagern <Martin.vGagern@gmx.net>.
  (Portage version: 2.2_rc25/cvs/Linux i686)

Revision  Changes    Path
1.93                 dev-java/ant-core/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ant-core/ChangeLog?rev=1.93&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ant-core/ChangeLog?rev=1.93&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ant-core/ChangeLog?r1=1.92&r2=1.93

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- ChangeLog	15 Mar 2009 12:18:36 -0000	1.92
+++ ChangeLog	17 Mar 2009 12:54:49 -0000	1.93
@@ -1,11 +1,20 @@
 # ChangeLog for dev-java/ant-core
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.92 2009/03/15 12:18:36 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.93 2009/03/17 12:54:49 betelgeuse 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.7.1-r4 (17 Mar 2009)
+
+  17 Mar 2009; Petteri Räty <betelgeuse@gentoo.org>
+  +files/1.7.1-jdk4-javadoc.patch, files/1.7.1-pkg-info.patch,
+  -ant-core-1.7.1-r3.ebuild, +ant-core-1.7.1-r4.ebuild:
+  Fix javadoc for sun-jdk-1.4. Fixes bug #217102. Update patch for bug
+  #262511 to work with 1.4 JDKs. Thanks to Martin von Gagern
+  <Martin.vGagern@gmx.net>.
+
 *ant-core-1.7.1-r3 (15 Mar 2009)
 
   15 Mar 2009; Petteri Räty <betelgeuse@gentoo.org>



1.1                  dev-java/ant-core/ant-core-1.7.1-r4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ant-core/ant-core-1.7.1-r4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ant-core/ant-core-1.7.1-r4.ebuild?rev=1.1&content-type=text/plain

Index: ant-core-1.7.1-r4.ebuild
===================================================================
# Copyright 1999-2009 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.7.1-r4.ebuild,v 1.1 2009/03/17 12:54:49 betelgeuse Exp $

EAPI="2"

# 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 java-pkg-2 java-ant-2

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
	mirror://gentoo/ant-${PV}-gentoo.tar.bz2"

LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
IUSE=""

DEPEND=">=virtual/jdk-1.4
	!dev-java/ant-tasks
	!dev-java/ant-optional"
RDEPEND="${DEPEND}"

S="${WORKDIR}/${MY_P}"

src_prepare() {
	# remove bundled xerces
	rm -v lib/*.jar || die

	epatch "${FILESDIR}/1.7.1-pkg-info.patch"
	epatch "${FILESDIR}/1.7.1-jdk4-javadoc.patch"

	# 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

	newbin "${FILESDIR}/${PV}-ant-r1" ant || die "failed to install wrapper"
	dodir /usr/share/${PN}/bin
	for each in antRun 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=\"/usr/share/ant\"" > "${T}/20ant"
	doenvd "${T}/20ant" || die "failed to install env.d file"

	dodoc README WHATSNEW KEYS

	if use doc; then
		dohtml welcome.html
		dohtml -r docs/*
		java-pkg_dojavadoc --symlink manual/api build/javadocs
	fi

	use source && java-pkg_dosrc src/main/*
}

pkg_postinst() {
	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"
	elog
	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."
}