Version bump, bug #351850.

Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64

4 files changed, 152 insertions, 2 deletions

diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index 349e2f9a2523..494c24d579ac 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.110 2012/01/02 09:53:42 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.111 2012/02/18 22:22:00 caster 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.2 (18 Feb 2012)
+
+  18 Feb 2012; Vlastimil Babka <caster@gentoo.org> +ant-core-1.8.2.ebuild:
+  Version bump, bug #351850.
+
   02 Jan 2012; Ralph Sennhauser <sera@gentoo.org> ant-core-1.7.1-r4.ebuild,
   ant-core-1.7.1-r5.ebuild, ant-core-1.8.0-r1.ebuild, ant-core-1.8.0-r2.ebuild,
   ant-core-1.8.1.ebuild:
diff --git a/dev-java/ant-core/ant-core-1.8.2.ebuild b/dev-java/ant-core/ant-core-1.8.2.ebuild
new file mode 100644
index 000000000000..8878181d5335
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.8.2.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.2.ebuild,v 1.1 2012/02/18 22:22:00 caster 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/~caster/distfiles/ant-${PV}-gentoo.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~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 docs/*
+		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
+}
diff --git a/dev-java/ant-junit4/ChangeLog b/dev-java/ant-junit4/ChangeLog
index 2fd6d1008d9a..26c07b5cbaf2 100644
--- a/dev-java/ant-junit4/ChangeLog
+++ b/dev-java/ant-junit4/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant-junit4
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit4/ChangeLog,v 1.15 2012/02/16 17:59:12 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit4/ChangeLog,v 1.16 2012/02/18 22:24:23 caster Exp $
+
+*ant-junit4-1.8.2 (18 Feb 2012)
+
+  18 Feb 2012; Vlastimil Babka <caster@gentoo.org> +ant-junit4-1.8.2.ebuild:
+  Version bump, bug #351850.
 
   16 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> ant-junit4-1.8.1.ebuild:
   x86 stable wrt bug #396871
diff --git a/dev-java/ant-junit4/ant-junit4-1.8.2.ebuild b/dev-java/ant-junit4/ant-junit4-1.8.2.ebuild
new file mode 100644
index 000000000000..86c6506c8eb2
--- /dev/null
+++ b/dev-java/ant-junit4/ant-junit4-1.8.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit4/ant-junit4-1.8.2.ebuild,v 1.1 2012/02/18 22:24:23 caster Exp $
+
+EAPI="4"
+
+ANT_TASK_JDKVER=1.5
+ANT_TASK_JREVER=1.5
+ANT_TASK_DEPNAME="junit-4"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-java/junit:4
+	~dev-java/ant-junit-${PV}"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	eant jar-junit4
+}
+
+src_install() {
+	# no registration as ant-task, would be loaded together with ant-junit
+	java-pkg_dojar build/lib/ant-junit4.jar
+
+	# As we dont't want to depend on and-junit in package.env, because it depends
+	# on junit:0. Instead, we "steal" its jar and record it to our package.env as
+	# if it belongs to this package's classpath
+	java-pkg_getjar --build-only ant-junit ant-junit.jar
+	java-pkg_regjar $(java-pkg_getjar --build-only ant-junit ant-junit.jar)
+}