[gentoo-commits] gentoo-x86 commit in dev-java/ant-core: ChangeLog ant-core-1.7.0-r1.ebuild

[gentoo-commits] gentoo-x86 commit in dev-java/ant-core: ChangeLog ant-core-1.7.0-r1.ebuild

[Petteri Raty (betelgeuse)]

betelgeuse    07/11/28 02:07:17

  Modified:             ChangeLog
  Added:                ant-core-1.7.0-r1.ebuild
  Log:
  Fix Javadoc links in the manual using the new --symlink feature to dojavadoc. Fixes bug #185694.
  (Portage version: 2.1.4_rc3)

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

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- ChangeLog	12 May 2007 17:43:18 -0000	1.74
+++ ChangeLog	28 Nov 2007 02:07:17 -0000	1.75
@@ -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,



1.1                  dev-java/ant-core/ant-core-1.7.0-r1.ebuild

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

Index: ant-core-1.7.0-r1.ebuild
===================================================================
# 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"
}



-- 
gentoo-commits@gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in dev-java/ant-core: ChangeLog ant-core-1.7.0-r1.ebuild

[Petteri Raty (betelgeuse)]

betelgeuse    07/11/28 02:09:03

  Modified:             ChangeLog ant-core-1.7.0-r1.ebuild
  Log:
  Quote variables.
  (Portage version: 2.1.4_rc3)

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

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- ChangeLog	28 Nov 2007 02:07:17 -0000	1.75
+++ ChangeLog	28 Nov 2007 02:09:02 -0000	1.76
@@ -1,11 +1,15 @@
 # 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.75 2007/11/28 02:07:17 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.76 2007/11/28 02:09:02 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.
 
+  28 Nov 2007; Petteri Räty <betelgeuse@gentoo.org>
+  ant-core-1.7.0-r1.ebuild:
+  Quote variables.
+
 *ant-core-1.7.0-r1 (28 Nov 2007)
 
   28 Nov 2007; Petteri Räty <betelgeuse@gentoo.org>



1.2                  dev-java/ant-core/ant-core-1.7.0-r1.ebuild

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

Index: ant-core-1.7.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.7.0-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ant-core-1.7.0-r1.ebuild	28 Nov 2007 02:07:17 -0000	1.1
+++ ant-core-1.7.0-r1.ebuild	28 Nov 2007 02:09:02 -0000	1.2
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.7.0-r1.ebuild,v 1.2 2007/11/28 02:09:02 betelgeuse Exp $
 
 # don't depend on itself
 JAVA_ANT_DISABLE_ANT_CORE_DEP=true
@@ -40,7 +40,7 @@
 	rm -v lib/*.jar
 
 	# use our split-ant build.xml
-	mv -f ${WORKDIR}/build.xml .
+	mv -f "${WORKDIR}/build.xml" .
 }
 
 src_compile() {
@@ -61,16 +61,16 @@
 }
 
 src_install() {
-	newbin ${FILESDIR}/${PV}-ant ant || die "failed to install wrapper"
+	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}
+		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"
+	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



-- 
gentoo-commits@gentoo.org mailing list