Fix Javadoc links in the manual using the new --symlink feature to dojavadoc. Fixes bug #185694.

Package-Manager: portage-2.1.4_rc3

4 files changed, 130 insertions, 5 deletions

diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index 34b65e7d89b8..bd886858dda7 100644
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,11 +1,18 @@
 # ChangeLog for dev-java/ant-core
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.74 2007/05/12 17:43:18 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.75 2007/11/28 02:07:17 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.0-r1 (28 Nov 2007)
+
+  28 Nov 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +ant-core-1.7.0-r1.ebuild:
+  Fix Javadoc links in the manual using the new --symlink feature to
+  dojavadoc. Fixes bug #185694.
+
   12 May 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   ant-core-1.7.0.ebuild:
   Stable on amd64, bug #176856
@@ -301,6 +308,7 @@
   src_compile. Don't use global classpath when compiling
 
 *ant-core-1.6.2 (10 Sep 2004)
+*ant-core-1.5.4 (10 Sep 2004)
 
   10 Sep 2004; Thomas Matthijs <axxo@gentoo.org> +metadata.xml,
   +files/1.5.4-ant, +files/1.6.2-ant, +files/build.sh-exit-fix.patch.gz,
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 57483a4ea500..5e4732158433 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.6.5-ant 5207 RMD160 95b043c0f0cab82b8a3b18625214b42945b7c69c SHA1 ad745a52964270c1713a0ae9cc1a5c5f91e61e05 SHA256 47f223399a08e199e219a4da2e42c43d37138f5ef1024b6f238ab6c8de007be5
 MD5 123ab261c3aebaf247db2551a0a890b0 files/1.6.5-ant 5207
 RMD160 95b043c0f0cab82b8a3b18625214b42945b7c69c files/1.6.5-ant 5207
@@ -17,14 +20,18 @@ EBUILD ant-core-1.6.5-r14.ebuild 1918 RMD160 d4baa54a15d40ed6e1637647a9b47634604
 MD5 e215468b2b9040222c18bb54f932f85c ant-core-1.6.5-r14.ebuild 1918
 RMD160 d4baa54a15d40ed6e1637647a9b4763460483eef ant-core-1.6.5-r14.ebuild 1918
 SHA256 d6b721213737928c36e8bd8b426ccd214e81596f8a3a9202268cd391f43ea68b ant-core-1.6.5-r14.ebuild 1918
+EBUILD ant-core-1.7.0-r1.ebuild 2585 RMD160 b52dd2aaca5bd12533ad6fd66bd773a2d648801e SHA1 cb6db49b60ca2297c6ef45ce4bf2eba13bf3dfef SHA256 4a989c1f8a04a72be3b557930d352e6f42e054b4bf14ac0a5f9dd481e222214f
+MD5 fba75f2a840532c638ee9d4a9106bc77 ant-core-1.7.0-r1.ebuild 2585
+RMD160 b52dd2aaca5bd12533ad6fd66bd773a2d648801e ant-core-1.7.0-r1.ebuild 2585
+SHA256 4a989c1f8a04a72be3b557930d352e6f42e054b4bf14ac0a5f9dd481e222214f ant-core-1.7.0-r1.ebuild 2585
 EBUILD ant-core-1.7.0.ebuild 2552 RMD160 418c8d927107524c849e1d0ff12861448ef77309 SHA1 2f8509ec164c3d70d9bd5482dbdc2c7038ea9f24 SHA256 607185bb6d56d749d32b38dc740db00f498bafe04656127a582d329304995e4a
 MD5 cd06d44e74017f39f14ea0e7d1ec7c56 ant-core-1.7.0.ebuild 2552
 RMD160 418c8d927107524c849e1d0ff12861448ef77309 ant-core-1.7.0.ebuild 2552
 SHA256 607185bb6d56d749d32b38dc740db00f498bafe04656127a582d329304995e4a ant-core-1.7.0.ebuild 2552
-MISC ChangeLog 24400 RMD160 b4c6bc0858df842a70783c06a64f4c7d3644a2dc SHA1 fd8f8072141b71289c0a9a6f9b6cebb302d43199 SHA256 3a1cac727f10c3c0bbc30c097ac21758a394777f298c1624b9f7f7833a819bdc
-MD5 ac4375d2808573dbbb8d2cc5ea357835 ChangeLog 24400
-RMD160 b4c6bc0858df842a70783c06a64f4c7d3644a2dc ChangeLog 24400
-SHA256 3a1cac727f10c3c0bbc30c097ac21758a394777f298c1624b9f7f7833a819bdc ChangeLog 24400
+MISC ChangeLog 24653 RMD160 9ba1a460b727acc710074aa3c2333fc2f2abf7dd SHA1 c7d1167136fcc38e87754a7eb387dfe31dd08dc8 SHA256 1d2b9257f52caa0d73bad9e2f2f8f1aa5404311d6181531aaeed4a2ec7eeaabc
+MD5 0826cd30495f26af23b0b3b9f16ed99f ChangeLog 24653
+RMD160 9ba1a460b727acc710074aa3c2333fc2f2abf7dd ChangeLog 24653
+SHA256 1d2b9257f52caa0d73bad9e2f2f8f1aa5404311d6181531aaeed4a2ec7eeaabc ChangeLog 24653
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -35,3 +42,13 @@ SHA256 6d25121ad88d0c2a4d0822cff5bb2d50c9f6886369b452882476811f65c1b8f5 files/di
 MD5 a7b309b2642e68941a45f02dd5a5c96d files/digest-ant-core-1.7.0 518
 RMD160 d03eca1d95f01c905fe3b77f5a2c39ac67d13c22 files/digest-ant-core-1.7.0 518
 SHA256 99ca534318f44bd6e836a90ba168e57156af32905f50619d14887361de2823b9 files/digest-ant-core-1.7.0 518
+MD5 a7b309b2642e68941a45f02dd5a5c96d files/digest-ant-core-1.7.0-r1 518
+RMD160 d03eca1d95f01c905fe3b77f5a2c39ac67d13c22 files/digest-ant-core-1.7.0-r1 518
+SHA256 99ca534318f44bd6e836a90ba168e57156af32905f50619d14887361de2823b9 files/digest-ant-core-1.7.0-r1 518
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHTM0LcxLzpIGCsLQRAl8GAJ0cWY/jr1NXb+bMWfGE+NEQ5Hb+1wCeJbx6
+6lR+nyWgxHauxvaOSy972Nk=
+=dwXQ
+-----END PGP SIGNATURE-----
diff --git a/dev-java/ant-core/ant-core-1.7.0-r1.ebuild b/dev-java/ant-core/ant-core-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..d6ce83a983e6
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.7.0-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2007 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.0-r1.ebuild,v 1.1 2007/11/28 02:07:17 betelgeuse Exp $
+
+# 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
+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="doc source"
+
+# 1.7.0 instead of $PV in blocks is intentional, >1.7.0 upgrades should
+# be block free (but these fixed blocks should stay there for users upgrading
+# from <1.7.0 of course)
+RDEPEND=">=virtual/jdk-1.4
+	!<dev-java/ant-tasks-1.7.0
+	!<dev-java/ant-1.7.0
+	!dev-java/ant-optional"
+DEPEND="${RDEPEND}
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# remove bundled xerces
+	rm -v lib/*.jar
+
+	# use our split-ant build.xml
+	mv -f ${WORKDIR}/build.xml .
+}
+
+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
+
+	./build.sh ${bsyscp} jars-core $(use_doc javadocs) \
+		|| die "build failed"
+}
+
+src_install() {
+	newbin ${FILESDIR}/${PV}-ant 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
+
+	echo "ANT_HOME=\"/usr/share/${PN}\"" > ${T}/20ant
+	doenvd ${T}/20ant || die "failed to install env.d file"
+
+	java-pkg_dojar build/lib/ant.jar
+	java-pkg_dojar build/lib/ant-bootstrap.jar
+	java-pkg_dojar build/lib/ant-launcher.jar
+
+	use source && java-pkg_dosrc src/main/*
+
+	dodoc README WHATSNEW KEYS
+
+	if use doc; then
+		dohtml welcome.html
+		dohtml -r docs/*
+		java-pkg_dojavadoc --symlink manual/api build/javadocs
+	fi
+}
+
+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"
+}
diff --git a/dev-java/ant-core/files/digest-ant-core-1.7.0-r1 b/dev-java/ant-core/files/digest-ant-core-1.7.0-r1
new file mode 100644
index 000000000000..035927394fcb
--- /dev/null
+++ b/dev-java/ant-core/files/digest-ant-core-1.7.0-r1
@@ -0,0 +1,6 @@
+MD5 9e834373c21fe197ac66f4da51dd47a5 ant-1.7.0-gentoo.tar.bz2 11720
+RMD160 51d24f2c0c98195ed6ef1852045201a567a5d9ea ant-1.7.0-gentoo.tar.bz2 11720
+SHA256 7b1e0c63bec193c010c3fcca7a3524e2e35cc4ca56b86e4571737ac1e169e35c ant-1.7.0-gentoo.tar.bz2 11720
+MD5 22b378e27ab300e4d73bf09d91c7e2a6 apache-ant-1.7.0-src.tar.bz2 6831017
+RMD160 e18ecde1996401f03529d80d2b6f3be2c55e64ab apache-ant-1.7.0-src.tar.bz2 6831017
+SHA256 a6698e8420f6d1cefd9e02c5a6b610b84495a3f9bfe1fc9e1b4fe8a8769e3779 apache-ant-1.7.0-src.tar.bz2 6831017