From 876f87739c1dfbb5e13190bf8f9911a54e527a9c Mon Sep 17 00:00:00 2001 From: Jan Brinkmann Date: Sat, 14 May 2005 16:14:02 +0000 Subject: updated commons-beanutils dependency to reflect new slotting. see #71952 Package-Manager: portage-2.0.51.21 --- dev-java/ant-core/ChangeLog | 10 +++- dev-java/ant-core/Manifest | 24 +++----- dev-java/ant-core/ant-core-1.6.2-r2.ebuild | 76 ------------------------ dev-java/ant-core/ant-core-1.6.2-r3.ebuild | 76 ++++++++++++++++++++++++ dev-java/ant-core/ant-core-1.6.3-r1.ebuild | 74 +++++++++++++++++++++++ dev-java/ant-core/ant-core-1.6.3.ebuild | 74 ----------------------- dev-java/ant-core/files/1.6.2-ant | 4 +- dev-java/ant-core/files/1.6.3-ant | 4 +- dev-java/ant-core/files/digest-ant-core-1.6.2-r2 | 1 - dev-java/ant-core/files/digest-ant-core-1.6.2-r3 | 1 + dev-java/ant-core/files/digest-ant-core-1.6.3 | 1 - dev-java/ant-core/files/digest-ant-core-1.6.3-r1 | 1 + 12 files changed, 172 insertions(+), 174 deletions(-) delete mode 100644 dev-java/ant-core/ant-core-1.6.2-r2.ebuild create mode 100644 dev-java/ant-core/ant-core-1.6.2-r3.ebuild create mode 100644 dev-java/ant-core/ant-core-1.6.3-r1.ebuild delete mode 100644 dev-java/ant-core/ant-core-1.6.3.ebuild delete mode 100644 dev-java/ant-core/files/digest-ant-core-1.6.2-r2 create mode 100644 dev-java/ant-core/files/digest-ant-core-1.6.2-r3 delete mode 100644 dev-java/ant-core/files/digest-ant-core-1.6.3 create mode 100644 dev-java/ant-core/files/digest-ant-core-1.6.3-r1 (limited to 'dev-java/ant-core') diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog index 7f6e220944df..c4216f5c9c56 100644 --- a/dev-java/ant-core/ChangeLog +++ b/dev-java/ant-core/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-java/ant-core # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.21 2005/04/28 20:41:25 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.22 2005/05/14 16:09:55 luckyduck Exp $ + +*ant-core-1.6.3-r1 (14 May 2005) +*ant-core-1.6.2-r3 (14 May 2005) + + 14 May 2005; Jan Brinkmann files/1.6.2-ant, + files/1.6.3-ant, -ant-core-1.6.2-r2.ebuild, +ant-core-1.6.2-r3.ebuild, + -ant-core-1.6.3.ebuild, +ant-core-1.6.3-r1.ebuild: + updated commons-beanutils dependency to reflect new slotting. see #71952 *ant-core-1.6.3 (28 Apr 2005) diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest index 87967339a66e..ae7392cda0ba 100644 --- a/dev-java/ant-core/Manifest +++ b/dev-java/ant-core/Manifest @@ -1,24 +1,14 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 3fc14c36e9ebd0c74a87e2560d6219f3 ant-core-1.6.2-r2.ebuild 2019 -MD5 5a75895ba30fb797cfa6b586bcf0594e ant-core-1.6.3.ebuild 1902 +MD5 4637b3d744387c7394719c90225ddc5c ant-core-1.6.3-r1.ebuild 1884 MD5 e9577f39414ff99938fdadbd15ce5359 ant-core-1.5.4-r2.ebuild 3054 -MD5 fa5a700f09a765dca77b608ba681ab29 ChangeLog 16714 +MD5 13a8544496999ba0c7827e826b681949 ant-core-1.6.2-r3.ebuild 2001 +MD5 1ebf45744b67b92f1fd5a631a4e1ee0d ChangeLog 17052 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 MD5 d7186edf4c71dc0531330f90e2c08fe9 files/1.5.4-ant 2283 -MD5 668644917f8fddd4162667137cb53c85 files/1.6.2-ant 5062 -MD5 93c5b0cd15218723394245a54155ee5f files/1.6.3-ant 5057 +MD5 1b0c2d0981f992904c0b18a4b450b1dc files/1.6.2-ant 5066 +MD5 505824b938f7ea2c4394305676bbdb84 files/1.6.3-ant 5061 MD5 4383441650437fec5622070e48e4324c files/build.sh-exit-fix.patch.gz 256 MD5 55ece9ccf573b244b3dff966839528c5 files/rpmbuild.patch.gz 1164 MD5 8d86f265f37d0d73cdd2e8a3fd2ff6eb files/digest-ant-core-1.5.4-r2 70 -MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-core-1.6.2-r2 74 +MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-core-1.6.2-r3 74 +MD5 4abd275148cde1e1c88e8ff4097cbcd8 files/digest-ant-core-1.6.3-r1 74 MD5 8c69a473b88559829069ac80730f2f1b files/1.6.2-scp.patch 877 -MD5 4abd275148cde1e1c88e8ff4097cbcd8 files/digest-ant-core-1.6.3 74 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCcUql/rLF9B432nYRAsd/AKCmZeCpcTxl5CsgQZ0mkXTHYYwLqwCcCgTm -oviTS7JmrJ6mi2RFap8hQCQ= -=/3uH ------END PGP SIGNATURE----- diff --git a/dev-java/ant-core/ant-core-1.6.2-r2.ebuild b/dev-java/ant-core/ant-core-1.6.2-r2.ebuild deleted file mode 100644 index 0db13b1b492f..000000000000 --- a/dev-java/ant-core/ant-core-1.6.2-r2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2005 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.6.2-r2.ebuild,v 1.2 2005/04/03 20:29:22 axxo Exp $ - -inherit java-pkg eutils - -MY_PN=${PN/-core} - -DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files." -HOMEPAGE="http://ant.apache.org/" -SRC_URI="mirror://apache/ant/source/apache-${MY_PN}-${PV}-src.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="x86 amd64 ppc sparc ppc64" -IUSE="doc" - -DEPEND="virtual/libc - >=virtual/jdk-1.4 - >=dev-java/java-config-1.2" -RDEPEND=">=virtual/jdk-1.4 - app-shells/bash - >=dev-java/java-config-1.2" - -S="${WORKDIR}/apache-ant-${PV}" - -src_unpack() { - unpack ${A} - cd ${S} - - # also see #77365 and - # http://sourceforge.net/mailarchive/forum.php?thread_id=6173225&forum_id=12628 - epatch ${FILESDIR}/${PV}-scp.patch - - # Patch build.sh to die with non-zero exit code in case of errors. - # This patch may be useful for all ant versions. - epatch ${FILESDIR}/build.sh-exit-fix.patch.gz -} - -src_compile() { - addwrite "/proc/self/maps" - if [ `arch` == "ppc" ] ; then - # We're compiling _ON_ PPC - export THREADS_FLAG="green" - fi - - - local myc - myc="${myc} -Ddist.dir=${D}/usr/share/${PN}" - myc="${myc} -Djavac.target=1.4" - echo $CLASSPATH - CLASSPATH="." ./build.sh -Ddist.dir=${D}/usr/share/${PN} || die - - use doc && ./build.sh dist_javadocs -} - -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 - - dodir /etc/env.d - echo "ANT_HOME=\"/usr/share/${PN}\"" > ${D}/etc/env.d/20ant - - java-pkg_dojar build/lib/ant.jar - java-pkg_dojar build/lib/ant-launcher.jar - - dodoc LICENSE LICENSE.* README WHATSNEW KEYS - use doc && dohtml welcome.html - use doc && java-pkg_dohtml -r docs/* - use doc && java-pkg_dohtml -r dist/docs/manual/api/* -} diff --git a/dev-java/ant-core/ant-core-1.6.2-r3.ebuild b/dev-java/ant-core/ant-core-1.6.2-r3.ebuild new file mode 100644 index 000000000000..84d717a47078 --- /dev/null +++ b/dev-java/ant-core/ant-core-1.6.2-r3.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2005 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.6.2-r3.ebuild,v 1.1 2005/05/14 16:09:55 luckyduck Exp $ + +inherit java-pkg eutils + +MY_PN=${PN/-core} + +DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files." +HOMEPAGE="http://ant.apache.org/" +SRC_URI="mirror://apache/ant/source/apache-${MY_PN}-${PV}-src.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="x86 amd64 ppc sparc ppc64" +IUSE="doc" + +DEPEND="virtual/libc + >=virtual/jdk-1.4 + >=dev-java/java-config-1.2" +RDEPEND=">=virtual/jdk-1.4 + app-shells/bash + >=dev-java/java-config-1.2" + +S="${WORKDIR}/apache-ant-${PV}" + +src_unpack() { + unpack ${A} + cd ${S} + + # also see #77365 and + # http://sourceforge.net/mailarchive/forum.php?thread_id=6173225&forum_id=12628 + epatch ${FILESDIR}/${PV}-scp.patch + + # Patch build.sh to die with non-zero exit code in case of errors. + # This patch may be useful for all ant versions. + epatch ${FILESDIR}/build.sh-exit-fix.patch.gz +} + +src_compile() { + addwrite "/proc/self/maps" + if [ `arch` == "ppc" ] ; then + # We're compiling _ON_ PPC + export THREADS_FLAG="green" + fi + + + local myc + myc="${myc} -Ddist.dir=${D}/usr/share/${PN}" + myc="${myc} -Djavac.target=1.4" + echo $CLASSPATH + CLASSPATH="." ./build.sh -Ddist.dir=${D}/usr/share/${PN} || die + + use doc && ./build.sh dist_javadocs +} + +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 + + dodir /etc/env.d + echo "ANT_HOME=\"/usr/share/${PN}\"" > ${D}/etc/env.d/20ant + + java-pkg_dojar build/lib/ant.jar + java-pkg_dojar build/lib/ant-launcher.jar + + dodoc README WHATSNEW KEYS + use doc && dohtml welcome.html + use doc && java-pkg_dohtml -r docs/* + use doc && java-pkg_dohtml -r dist/docs/manual/api/* +} diff --git a/dev-java/ant-core/ant-core-1.6.3-r1.ebuild b/dev-java/ant-core/ant-core-1.6.3-r1.ebuild new file mode 100644 index 000000000000..a12d2a55cbdd --- /dev/null +++ b/dev-java/ant-core/ant-core-1.6.3-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2005 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.6.3-r1.ebuild,v 1.1 2005/05/14 16:09:55 luckyduck Exp $ + +inherit java-pkg eutils + +MY_PN=${PN/-core} + +MY_PV=${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/apache-${MY_PN}-${PV}-src.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~ppc64" +IUSE="doc" + +DEPEND="virtual/libc + >=virtual/jdk-1.4 + >=dev-java/java-config-1.2" +RDEPEND=">=virtual/jdk-1.4 + app-shells/bash + >=dev-java/java-config-1.2" + +S="${WORKDIR}/apache-ant-${MY_PV}" + +src_unpack() { + unpack ${A} + cd ${S} + + # Patch build.sh to die with non-zero exit code in case of errors. + # This patch may be useful for all ant versions. + epatch ${FILESDIR}/build.sh-exit-fix.patch.gz +} + +src_compile() { + addwrite "/proc/self/maps" + if [ `arch` == "ppc" ] ; then + # We're compiling _ON_ PPC + export THREADS_FLAG="green" + fi + + + local myc + myc="${myc} -Ddist.dir=${D}/usr/share/${PN}" + myc="${myc} -Djavac.target=1.4" + echo $CLASSPATH + CLASSPATH="." ./build.sh -Ddist.dir=${D}/usr/share/${PN} || die + + use doc && ./build.sh dist_javadocs +} + +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 + + dodir /etc/env.d + echo "ANT_HOME=\"/usr/share/${PN}\"" > ${D}/etc/env.d/20ant + + java-pkg_dojar build/lib/ant.jar + java-pkg_dojar build/lib/ant-launcher.jar + + dodoc README WHATSNEW KEYS + use doc && dohtml welcome.html + use doc && java-pkg_dohtml -r docs/* + use doc && java-pkg_dohtml -r dist/docs/manual/api/* +} diff --git a/dev-java/ant-core/ant-core-1.6.3.ebuild b/dev-java/ant-core/ant-core-1.6.3.ebuild deleted file mode 100644 index 4015fc590bc3..000000000000 --- a/dev-java/ant-core/ant-core-1.6.3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2005 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.6.3.ebuild,v 1.1 2005/04/28 20:41:25 axxo Exp $ - -inherit java-pkg eutils - -MY_PN=${PN/-core} - -MY_PV=${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/apache-${MY_PN}-${PV}-src.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~ppc64" -IUSE="doc" - -DEPEND="virtual/libc - >=virtual/jdk-1.4 - >=dev-java/java-config-1.2" -RDEPEND=">=virtual/jdk-1.4 - app-shells/bash - >=dev-java/java-config-1.2" - -S="${WORKDIR}/apache-ant-${MY_PV}" - -src_unpack() { - unpack ${A} - cd ${S} - - # Patch build.sh to die with non-zero exit code in case of errors. - # This patch may be useful for all ant versions. - epatch ${FILESDIR}/build.sh-exit-fix.patch.gz -} - -src_compile() { - addwrite "/proc/self/maps" - if [ `arch` == "ppc" ] ; then - # We're compiling _ON_ PPC - export THREADS_FLAG="green" - fi - - - local myc - myc="${myc} -Ddist.dir=${D}/usr/share/${PN}" - myc="${myc} -Djavac.target=1.4" - echo $CLASSPATH - CLASSPATH="." ./build.sh -Ddist.dir=${D}/usr/share/${PN} || die - - use doc && ./build.sh dist_javadocs -} - -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 - - dodir /etc/env.d - echo "ANT_HOME=\"/usr/share/${PN}\"" > ${D}/etc/env.d/20ant - - java-pkg_dojar build/lib/ant.jar - java-pkg_dojar build/lib/ant-launcher.jar - - dodoc LICENSE LICENSE.* README WHATSNEW KEYS - use doc && dohtml welcome.html - use doc && java-pkg_dohtml -r docs/* - use doc && java-pkg_dohtml -r dist/docs/manual/api/* -} diff --git a/dev-java/ant-core/files/1.6.2-ant b/dev-java/ant-core/files/1.6.2-ant index d527a359b3b5..62dce8689425 100644 --- a/dev-java/ant-core/files/1.6.2-ant +++ b/dev-java/ant-core/files/1.6.2-ant @@ -15,7 +15,7 @@ # limitations under the License. # Edited for Gentoo Linux -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/files/1.6.2-ant,v 1.6 2005/04/02 23:32:24 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/files/1.6.2-ant,v 1.7 2005/05/14 16:09:55 luckyduck Exp $ # Extract launch and ant arguments, (see details below). ant_exec_args= @@ -105,7 +105,7 @@ else fi # add in the dependency .jar files -LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=ant-core,ant-tasks,log4j,xerces-2,xalan,junit,antlr,bcel,bsh,commons-beanutils,commons-collections,commons-logging,commons-net,jakarta-oro-2.0,jdepend,jsch,jakarta-regexp-1.3,rhino-1.5,jython,jta,jaf,javamail 2> /dev/null`" +LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=ant-core,ant-tasks,log4j,xerces-2,xalan,junit,antlr,bcel,bsh,commons-beanutils-1.6,commons-collections,commons-logging,commons-net,jakarta-oro-2.0,jdepend,jsch,jakarta-regexp-1.3,rhino-1.5,jython,jta,jaf,javamail 2> /dev/null`" if [ -n "$JAVA_HOME" ] ; then if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then diff --git a/dev-java/ant-core/files/1.6.3-ant b/dev-java/ant-core/files/1.6.3-ant index 920c4491ab51..ddab7a81f17d 100644 --- a/dev-java/ant-core/files/1.6.3-ant +++ b/dev-java/ant-core/files/1.6.3-ant @@ -15,7 +15,7 @@ # limitations under the License. # Edited for Gentoo Linux -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/files/1.6.3-ant,v 1.2 2005/04/19 14:07:55 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/files/1.6.3-ant,v 1.3 2005/05/14 16:09:55 luckyduck Exp $ # Extract launch and ant arguments, (see details below). ant_exec_args= @@ -105,7 +105,7 @@ else fi # add in the dependency .jar files -LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=ant-core,ant-tasks,log4j,xerces-2,xalan,junit,antlr,bcel,bsh,commons-beanutils,commons-collections,commons-logging,commons-net,jakarta-oro-2.0,jdepend,jsch,jakarta-regexp-1.3,rhino-1.5,jython,jta,jaf,javamail 2> /dev/null`" +LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=ant-core,ant-tasks,log4j,xerces-2,xalan,junit,antlr,bcel,bsh,commons-beanutils-1.6,commons-collections,commons-logging,commons-net,jakarta-oro-2.0,jdepend,jsch,jakarta-regexp-1.3,rhino-1.5,jython,jta,jaf,javamail 2> /dev/null`" if [ -n "$JAVA_HOME" ] ; then if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then diff --git a/dev-java/ant-core/files/digest-ant-core-1.6.2-r2 b/dev-java/ant-core/files/digest-ant-core-1.6.2-r2 deleted file mode 100644 index 511c4167d672..000000000000 --- a/dev-java/ant-core/files/digest-ant-core-1.6.2-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 83c3adefdbf90bcbc4b804d4c55c0778 apache-ant-1.6.2-src.tar.bz2 6282237 diff --git a/dev-java/ant-core/files/digest-ant-core-1.6.2-r3 b/dev-java/ant-core/files/digest-ant-core-1.6.2-r3 new file mode 100644 index 000000000000..511c4167d672 --- /dev/null +++ b/dev-java/ant-core/files/digest-ant-core-1.6.2-r3 @@ -0,0 +1 @@ +MD5 83c3adefdbf90bcbc4b804d4c55c0778 apache-ant-1.6.2-src.tar.bz2 6282237 diff --git a/dev-java/ant-core/files/digest-ant-core-1.6.3 b/dev-java/ant-core/files/digest-ant-core-1.6.3 deleted file mode 100644 index 3028550c2577..000000000000 --- a/dev-java/ant-core/files/digest-ant-core-1.6.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 fab56a0c0ab7bb2875e67c2a84b0a618 apache-ant-1.6.3-src.tar.bz2 6280919 diff --git a/dev-java/ant-core/files/digest-ant-core-1.6.3-r1 b/dev-java/ant-core/files/digest-ant-core-1.6.3-r1 new file mode 100644 index 000000000000..3028550c2577 --- /dev/null +++ b/dev-java/ant-core/files/digest-ant-core-1.6.3-r1 @@ -0,0 +1 @@ +MD5 fab56a0c0ab7bb2875e67c2a84b0a618 apache-ant-1.6.3-src.tar.bz2 6280919 -- cgit v1.2.3-65-gdbad