diff options
author | Thomas Matthijs <axxo@gentoo.org> | 2005-07-09 16:01:24 +0000 |
---|---|---|
committer | Thomas Matthijs <axxo@gentoo.org> | 2005-07-09 16:01:24 +0000 |
commit | b4894c931ac9673e364c59d1965194060983f712 (patch) | |
tree | 30de1f89744aedd133407d8f1f0eb27504022962 | |
parent | QA: Set S once; Use default src_compile (diff) | |
download | historical-b4894c931ac9673e364c59d1965194060983f712.tar.gz historical-b4894c931ac9673e364c59d1965194060983f712.tar.bz2 historical-b4894c931ac9673e364c59d1965194060983f712.zip |
fix deps, some cleanups
Package-Manager: portage-2.0.51.22-r1
-rw-r--r-- | dev-java/bsh/ChangeLog | 6 | ||||
-rw-r--r-- | dev-java/bsh/Manifest | 16 | ||||
-rw-r--r-- | dev-java/bsh/bsh-2.0_beta2.ebuild | 77 | ||||
-rw-r--r-- | dev-java/bsh/bsh-2.0_beta4.ebuild | 25 | ||||
-rw-r--r-- | dev-java/bsh/files/digest-bsh-2.0_beta2 | 2 | ||||
-rw-r--r-- | dev-java/commons-beanutils/ChangeLog | 6 | ||||
-rw-r--r-- | dev-java/commons-beanutils/Manifest | 16 | ||||
-rw-r--r-- | dev-java/commons-beanutils/commons-beanutils-1.6.1-r2.ebuild | 16 | ||||
-rw-r--r-- | dev-java/commons-beanutils/commons-beanutils-1.7.0-r1.ebuild | 20 | ||||
-rw-r--r-- | dev-java/commons-logging/ChangeLog | 6 | ||||
-rw-r--r-- | dev-java/commons-logging/Manifest | 16 | ||||
-rw-r--r-- | dev-java/commons-logging/commons-logging-1.0.4-r1.ebuild | 23 | ||||
-rw-r--r-- | dev-java/commons-logging/commons-logging-1.0.4.ebuild | 49 | ||||
-rw-r--r-- | dev-java/commons-logging/files/digest-commons-logging-1.0.4 | 1 | ||||
-rw-r--r-- | dev-java/commons-net/ChangeLog | 6 | ||||
-rw-r--r-- | dev-java/commons-net/Manifest | 16 | ||||
-rw-r--r-- | dev-java/commons-net/commons-net-1.2.2-r1.ebuild | 15 | ||||
-rw-r--r-- | dev-java/commons-net/commons-net-1.3.0-r1.ebuild | 18 |
18 files changed, 86 insertions, 248 deletions
diff --git a/dev-java/bsh/ChangeLog b/dev-java/bsh/ChangeLog index a8e7baa9b9df..0e6ddd52e577 100644 --- a/dev-java/bsh/ChangeLog +++ b/dev-java/bsh/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/bsh # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/ChangeLog,v 1.26 2005/06/23 09:04:31 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/ChangeLog,v 1.27 2005/07/09 16:00:08 axxo Exp $ + + 09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> -bsh-2.0_beta2.ebuild, + bsh-2.0_beta4.ebuild: + fix deps, some cleanups 23 Jun 2005; Thomas Matthijs <axxo@gentoo.org> +files/bsh2.0b4-build.patch, bsh-2.0_beta4.ebuild: diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest index b26deb2f1caf..f69481c96851 100644 --- a/dev-java/bsh/Manifest +++ b/dev-java/bsh/Manifest @@ -1,26 +1,14 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 3e9db06b96be80b9500257a94feb42f8 bsh-2.0_beta1-r1.ebuild 1175 MD5 8bd71a260abed0bb42193acb1ec2c8df bsh-1.3.0.ebuild 870 -MD5 ac6889173fe71cf9e03c2b6d6473f952 bsh-2.0_beta2.ebuild 2051 -MD5 e450b33e32256c4be5e4f6e13dd0b5f8 ChangeLog 3434 +MD5 21f307c27eb0a29f63e88dcb17582b85 ChangeLog 3557 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 -MD5 023e06c781de5912b9743f4ee112219e bsh-2.0_beta4.ebuild 2079 +MD5 9b7ca719d1ea3099467543e573a256ec bsh-2.0_beta4.ebuild 2090 MD5 5ec33004601026e3f5206a441853b1ed files/digest-bsh-1.3.0 58 MD5 e98c8ab811f673d6089a092d3b8a3d97 files/bsh.Console 856 MD5 c0ad0331cfc0855056051a83d34fc35f files/bsh.Interpreter 871 MD5 af516cc82d6597c5f6f49ad83916647e files/bsh2-build.patch 1704 -MD5 b2666166806a0cf58b311a9a77511fdb files/digest-bsh-2.0_beta2 125 MD5 ce8a7b633b68257eda454f9739f56801 files/digest-bsh-2.0_beta4 125 MD5 b2c7f4d348c2075960cec1811975f5c9 files/bsh2.0b4-build.patch 1697 MD5 356a59a8ed4e03783dc4ec5a143ef75f files/bsh2-readline.patch 5428 MD5 0321e1ba45e1f4f328eae0eecf037105 files/digest-bsh-2.0_beta1-r1 120 MD5 32448cba89ef5394ffab7a7cdb399ded files/beanshell.desktop 266 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCzlt1/rLF9B432nYRAjuXAJ9u3Wn8C0XDNc5KnMDOm9o+LwbncwCeJcNc -kQZwMGl0SIBBff/bktqNKas= -=xsZy ------END PGP SIGNATURE----- diff --git a/dev-java/bsh/bsh-2.0_beta2.ebuild b/dev-java/bsh/bsh-2.0_beta2.ebuild deleted file mode 100644 index 9251073b59fa..000000000000 --- a/dev-java/bsh/bsh-2.0_beta2.ebuild +++ /dev/null @@ -1,77 +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/bsh/bsh-2.0_beta2.ebuild,v 1.3 2005/07/08 10:54:24 axxo Exp $ - -inherit java-pkg eutils - -MY_DIST=${P/_beta/b}-src.jar - -DESCRIPTION="BeanShell: A small embeddable Java source interpreter" -HOMEPAGE="http://www.beanshell.org" -SRC_URI="http://www.beanshell.org/${MY_DIST} - mirror://gentoo/beanshell-icon.png" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~x86 ~amd64 ~ppc" -IUSE="doc gnome jikes junit kde readline" - -DEPEND="${RDEPEND} - >=dev-java/ant-core-1.6" -RDEPEND=">=virtual/jdk-1.4 - =dev-java/bsf-2.3* - =dev-java/servletapi-2.4* - readline? ( dev-java/libreadline-java )" - -S=${WORKDIR}/BeanShell - -src_unpack() { - # Extract the sources - cd ${WORKDIR} - jar xf ${DISTDIR}/${MY_DIST} - - # Apply the build patch - cd ${S} - epatch ${FILESDIR}/bsh2-build.patch - - # Copy the needed files - cp ${FILESDIR}/bsh.Console ${FILESDIR}/bsh.Interpreter ${S} - - # Patch with readline if required - if use readline ; then - # Apply the patch - epatch ${FILESDIR}/bsh2-readline.patch - - # Update the classpath - local ADD_CLASSPATH="`java-config -p libreadline-java`" - sed -e "s:__ADD_CLASSPATH__:${ADD_CLASSPATH}:" \ - -i ${S}/bsh.Console \ - -i ${S}/bsh.Interpreter - fi -} - -src_compile() { - local classpath="bsf-2.3,servletapi-2.4" - use readline && classpath="${classpath},libreadline-java" - classpath=`java-config -p ${classpath}` - - local antflags="jarall" - use doc && antflags="${antflags} javadoc" - use jikes && antflags="${antflags} -Dbuild.compiler=jikes" - ant -lib ${classpath} ${antflags} || die "Compile Failed!" -} - -src_install() { - mv ${S}/dist/${P/_beta/b}.jar ${S}/dist/${PN}.jar - java-pkg_dojar ${S}/dist/${PN}.jar - - newbin ${S}/bsh.Console bsh-console - newbin ${S}/bsh.Interpreter bsh-interpreter - - use doc && java-pkg_dohtml -r ${S}/javadoc/* - - insinto /usr/share/icons/hicolor/scalable/apps - doins ${DISTDIR}/beanshell-icon.png beanshell.png - - make_desktop_entry bsh-console "BeanShell Prompt" beanshell -} diff --git a/dev-java/bsh/bsh-2.0_beta4.ebuild b/dev-java/bsh/bsh-2.0_beta4.ebuild index 42acab9ff7af..95dd5fd362ef 100644 --- a/dev-java/bsh/bsh-2.0_beta4.ebuild +++ b/dev-java/bsh/bsh-2.0_beta4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/bsh-2.0_beta4.ebuild,v 1.3 2005/07/08 10:54:24 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/bsh-2.0_beta4.ebuild,v 1.4 2005/07/09 16:00:08 axxo Exp $ inherit java-pkg eutils @@ -9,27 +9,27 @@ MY_DIST=${PN}-${MY_PV}-src.jar DESCRIPTION="BeanShell: A small embeddable Java source interpreter" HOMEPAGE="http://www.beanshell.org" -SRC_URI="http://www.beanshell.org/${MY_DIST} - mirror://gentoo/beanshell-icon.png" +SRC_URI="http://www.beanshell.org/${MY_DIST} mirror://gentoo/beanshell-icon.png" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~x86 ~amd64 ~ppc" -IUSE="doc jikes junit readline" +IUSE="doc jikes readline source" -DEPEND="${RDEPEND} - >=dev-java/ant-core-1.6" RDEPEND=">=virtual/jdk-1.4 =dev-java/bsf-2.3* =dev-java/servletapi-2.4* readline? ( dev-java/libreadline-java )" +DEPEND="${RDEPEND} + source? ( app-arch/zip ) + >=dev-java/ant-core-1.6" S=${WORKDIR}/BeanShell-${MY_PV} src_unpack() { # Extract the sources cd ${WORKDIR} - jar xf ${DISTDIR}/${MY_DIST} + jar xf ${DISTDIR}/${MY_DIST} || die "failed to unpack" # Apply the build patch cd ${S} @@ -42,19 +42,16 @@ src_unpack() { if use readline ; then # Apply the patch epatch ${FILESDIR}/bsh2-readline.patch - - # Update the classpath - local ADD_CLASSPATH="`java-config -p libreadline-java`" - sed -e "s:__ADD_CLASSPATH__:${ADD_CLASSPATH}:" \ - -i ${S}/bsh.Console \ - -i ${S}/bsh.Interpreter fi + local classpath="bsf-2.3,servletapi-2.4" + use readline && classpath="${classpath},libreadline-java" + classpath="$(java-pkg_getjars ${classpath})" } src_compile() { local classpath="bsf-2.3,servletapi-2.4" use readline && classpath="${classpath},libreadline-java" - classpath=`java-config -p ${classpath}` + classpath="$(java-pkg_getjars ${classpath})" local antflags="jarall" use doc && antflags="${antflags} javadoc" diff --git a/dev-java/bsh/files/digest-bsh-2.0_beta2 b/dev-java/bsh/files/digest-bsh-2.0_beta2 deleted file mode 100644 index eb60e56cfbba..000000000000 --- a/dev-java/bsh/files/digest-bsh-2.0_beta2 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 f9c938446e5d97b74fd37f3bdbebf84a bsh-2.0b2-src.jar 1044734 -MD5 ebba3ce4fcf75c2835a3691cd588a446 beanshell-icon.png 29784 diff --git a/dev-java/commons-beanutils/ChangeLog b/dev-java/commons-beanutils/ChangeLog index d6111261d2b9..c2e6ffb70503 100644 --- a/dev-java/commons-beanutils/ChangeLog +++ b/dev-java/commons-beanutils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/commons-beanutils # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/ChangeLog,v 1.23 2005/05/14 16:07:59 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/ChangeLog,v 1.24 2005/07/09 16:00:26 axxo Exp $ + + 09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> + commons-beanutils-1.6.1-r2.ebuild, commons-beanutils-1.7.0-r1.ebuild: + fix deps, some cleanups *commons-beanutils-1.7.0-r1 (14 May 2005) *commons-beanutils-1.6.1-r2 (14 May 2005) diff --git a/dev-java/commons-beanutils/Manifest b/dev-java/commons-beanutils/Manifest index a3bb8a24883d..851a64b3efdc 100644 --- a/dev-java/commons-beanutils/Manifest +++ b/dev-java/commons-beanutils/Manifest @@ -1,16 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 24371946a712a7f5e4c08e943ee22b88 commons-beanutils-1.7.0-r1.ebuild 1437 -MD5 3bf7a2d13a0907fa79c6c73d8bcb1435 commons-beanutils-1.6.1-r2.ebuild 1430 -MD5 ca01e6b71265b734c7ccd02531d2fd17 ChangeLog 3585 +MD5 1ff476c6a429898ef98253808937853c commons-beanutils-1.7.0-r1.ebuild 1441 +MD5 bf9e370d301357d5ac32e8a02c783dac commons-beanutils-1.6.1-r2.ebuild 1444 +MD5 ffca55f6a3bee779e028697383b04522 ChangeLog 3733 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 MD5 a65fcfbd83466bf025820b316482b38a files/digest-commons-beanutils-1.6.1-r2 79 MD5 776456ec1cdc342af0507027a94da5d3 files/digest-commons-beanutils-1.7.0-r1 79 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) - -iD8DBQFChiJy06ebR+OMO78RAt1AAJ4ytrhROfTY6TUCUq9PBOIrmX7BOQCfbjBf -aq37iNQMB6LlE7d+hI6gIDE= -=8d+X ------END PGP SIGNATURE----- diff --git a/dev-java/commons-beanutils/commons-beanutils-1.6.1-r2.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.6.1-r2.ebuild index 62d8ccfa3587..82668fd1a44a 100644 --- a/dev-java/commons-beanutils/commons-beanutils-1.6.1-r2.ebuild +++ b/dev-java/commons-beanutils/commons-beanutils-1.6.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.6.1-r2.ebuild,v 1.1 2005/05/14 16:07:59 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.6.1-r2.ebuild,v 1.2 2005/07/09 16:00:26 axxo Exp $ inherit java-pkg @@ -13,13 +13,14 @@ SLOT="1.6" KEYWORDS="x86 ppc sparc amd64 ppc64" IUSE="doc jikes source" -DEPEND=">=virtual/jdk-1.3 - dev-java/ant-core - jikes? ( dev-java/jikes ) - source? ( app-arch/zip )" RDEPEND=">=virtual/jre-1.3 >=dev-java/commons-collections-2.1 >=dev-java/commons-logging-1.0.2" +DEPEND=">=virtual/jdk-1.3 + dev-java/ant-core + jikes? ( dev-java/jikes ) + source? ( app-arch/zip ) + ${RDEPEND}" S=${WORKDIR}/${P}-src @@ -27,9 +28,8 @@ src_unpack() { unpack ${A} cd ${S} - echo "commons-collections.jar=$(java-config -p commons-collections)" \ - > build.properties - echo "commons-logging.jar=$(java-config -p commons-logging)" | sed s/\=.*:/\=/ >> build.properties + echo "commons-collections.jar=$(java-pkg_getjars commons-collections)" > build.properties + echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties } src_compile() { diff --git a/dev-java/commons-beanutils/commons-beanutils-1.7.0-r1.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.7.0-r1.ebuild index e18970abec12..707fe377bc54 100644 --- a/dev-java/commons-beanutils/commons-beanutils-1.7.0-r1.ebuild +++ b/dev-java/commons-beanutils/commons-beanutils-1.7.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.7.0-r1.ebuild,v 1.1 2005/05/14 16:07:59 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.7.0-r1.ebuild,v 1.2 2005/07/09 16:00:26 axxo Exp $ inherit java-pkg @@ -13,23 +13,23 @@ SLOT="1.7" KEYWORDS="x86 ppc sparc amd64 ppc64" IUSE="doc jikes source" -DEPEND=">=virtual/jdk-1.3 - dev-java/ant-core - jikes? ( dev-java/jikes ) - source? ( app-arch/zip )" RDEPEND=">=virtual/jre-1.3 >=dev-java/commons-collections-2.1 >=dev-java/commons-logging-1.0.2" -S=${WORKDIR}/${PN}-${PV}-src +DEPEND=">=virtual/jdk-1.3 + dev-java/ant-core + jikes? ( dev-java/jikes ) + source? ( app-arch/zip ) + ${RDEPEND}" + +S=${WORKDIR}/${P}-src src_unpack() { unpack ${A} cd ${S} - echo "commons-collections.jar=$(java-config -p commons-collections)" \ - > build.properties - echo "commons-logging.jar=$(java-config -p commons-logging)" \ - | sed s/\=.*:/\=/ >> build.properties + echo "commons-collections.jar=$(java-pkg_getjars commons-collections)" > build.properties + echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties } src_compile() { diff --git a/dev-java/commons-logging/ChangeLog b/dev-java/commons-logging/ChangeLog index 538655c5185f..6ae0e40e75b1 100644 --- a/dev-java/commons-logging/ChangeLog +++ b/dev-java/commons-logging/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/commons-logging # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.33 2005/06/08 15:34:59 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.34 2005/07/09 16:01:07 axxo Exp $ + + 09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> + -commons-logging-1.0.4.ebuild, commons-logging-1.0.4-r1.ebuild: + fix deps, some cleanups 08 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> commons-logging-1.0.4-r1.ebuild: diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest index 85cc7419582f..76de8084d0d8 100644 --- a/dev-java/commons-logging/Manifest +++ b/dev-java/commons-logging/Manifest @@ -1,16 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +MD5 6e08e06ce6bd628d1dba7fc96e7ac87c commons-logging-1.0.4-r1.ebuild 1567 +MD5 0bc50585bdb116a8c3425135b39e359c ChangeLog 4686 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 -MD5 ad5ec96d01324f469e03d297e10caaab commons-logging-1.0.4-r1.ebuild 1564 -MD5 0626fe661ad5c0ea60a9c17e620685d8 commons-logging-1.0.4.ebuild 1533 -MD5 7a0dbab9aeb6be05746564940b1bf375 ChangeLog 4544 MD5 1e62b8a1770a8f7d817420e0c0d5f651 files/digest-commons-logging-1.0.4-r1 77 -MD5 1e62b8a1770a8f7d817420e0c0d5f651 files/digest-commons-logging-1.0.4 77 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux) - -iD8DBQFCpxAwKRy60XGEcJIRAkGuAJoCGs2kpvJE5oE18aHkGBKCXVp2VwCdHW0v -yXavsNZ5fKldXX7WrKeQQGM= -=u4em ------END PGP SIGNATURE----- diff --git a/dev-java/commons-logging/commons-logging-1.0.4-r1.ebuild b/dev-java/commons-logging/commons-logging-1.0.4-r1.ebuild index d4e46b0794ab..c96bb8fd893e 100644 --- a/dev-java/commons-logging/commons-logging-1.0.4-r1.ebuild +++ b/dev-java/commons-logging/commons-logging-1.0.4-r1.ebuild @@ -1,26 +1,27 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.0.4-r1.ebuild,v 1.7 2005/06/08 15:34:59 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.0.4-r1.ebuild,v 1.8 2005/07/09 16:01:07 axxo Exp $ inherit java-pkg DESCRIPTION="The Jakarta-Commons Logging package is an ultra-thin bridge between different logging libraries." HOMEPAGE="http://jakarta.apache.org/commons/logging/" -SRC_URI="mirror://apache/jakarta/commons/logging/source/${PN}-${PV}-src.tar.gz" +SRC_URI="mirror://apache/jakarta/commons/logging/source/${P}-src.tar.gz" LICENSE="Apache-1.1" SLOT="0" KEYWORDS="x86 amd64 ppc64 sparc ppc" IUSE="avalon doc jikes source" -DEPEND=">=virtual/jdk-1.3 - dev-java/ant-core +RDEPEND=">=virtual/jre-1.3 =dev-java/avalon-logkit-1.2* dev-java/log4j - avalon? ( =dev-java/avalon-framework-4.2* ) + avalon? ( =dev-java/avalon-framework-4.2* )" +DEPEND=">=virtual/jdk-1.3 + dev-java/ant-core jikes? ( >=dev-java/jikes-1.21 ) - source? ( app-arch/zip )" -RDEPEND=">=virtual/jre-1.3" + source? ( app-arch/zip ) + ${RDEPEND}" S="${WORKDIR}/${P}-src/" @@ -28,11 +29,9 @@ src_unpack() { unpack ${A} cd ${S} - echo "log4j.jar=$(java-config -p log4j)" > build.properties - echo "logkit.jar=$(java-config -p avalon-logkit-1.2)" >> build.properties - use avalon && \ - echo "avalon-framework.jar=$(java-config -p avalon-framework-4.2)" \ - >> build.properties + echo "log4j.jar=$(java-pkg_getjars log4j)" > build.properties + echo "logkit.jar=$(java-pkg_getjars avalon-logkit-1.2)" >> build.properties + use avalon && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties } src_compile() { diff --git a/dev-java/commons-logging/commons-logging-1.0.4.ebuild b/dev-java/commons-logging/commons-logging-1.0.4.ebuild deleted file mode 100644 index d0e99e99422c..000000000000 --- a/dev-java/commons-logging/commons-logging-1.0.4.ebuild +++ /dev/null @@ -1,49 +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/commons-logging/commons-logging-1.0.4.ebuild,v 1.13 2005/01/26 21:07:48 corsair Exp $ - -inherit java-pkg - -DESCRIPTION="The Jakarta-Commons Logging package is an ultra-thin bridge between different logging libraries." -HOMEPAGE="http://jakarta.apache.org/commons/logging/" -SRC_URI="mirror://apache/jakarta/commons/logging/source/${PN}-${PV}-src.tar.gz" -DEPEND=">=dev-java/log4j-1.2.5 - dev-java/avalon-logkit-bin - >=dev-java/ant-core-1.4 - jikes? ( >=dev-java/jikes-1.21 ) - junit? ( >=dev-java/junit-3.7 >=virtual/jdk-1.4 ) - !junit? ( >=virtual/jdk-1.3 )" -RDEPEND=">=virtual/jdk-1.3" -LICENSE="Apache-1.1" -SLOT="0" -KEYWORDS="x86 ppc sparc amd64 ppc64" -IUSE="doc jikes junit" - -S="${WORKDIR}/${P}-src/" - -src_unpack() { - unpack ${A} - cd ${S} - echo "log4j.jar=$(java-config -p log4j)" > build.properties - echo "logkit.jar=$(java-config -p avalon-logkit-bin)" >> build.properties - - if use junit; then - echo "junit.jar=$(java-config -p junit)" >> build.properties - fi -} - -src_compile() { - local antflags="compile" - use jikes && antflags="${antflags} -Dbuild.compiler=jikes" - use doc && antflags="${antflags} javadoc" - use junit && antflags="${antflags} test" - ant ${antflags} || die "compile problem" -} - -src_install() { - java-pkg_dojar target/${PN}-api.jar target/${PN}.jar - - dodoc RELEASE-NOTES.txt - dohtml PROPOSAL.html STATUS.html usersguide.html - use doc && java-pkg_dohtml -r dist/docs/ -} diff --git a/dev-java/commons-logging/files/digest-commons-logging-1.0.4 b/dev-java/commons-logging/files/digest-commons-logging-1.0.4 deleted file mode 100644 index f624da15c5f7..000000000000 --- a/dev-java/commons-logging/files/digest-commons-logging-1.0.4 +++ /dev/null @@ -1 +0,0 @@ -MD5 db5dc75c89e794f794be92d10df6be1b commons-logging-1.0.4-src.tar.gz 101017 diff --git a/dev-java/commons-net/ChangeLog b/dev-java/commons-net/ChangeLog index d378703ce9cc..cb6b4dcf621a 100644 --- a/dev-java/commons-net/ChangeLog +++ b/dev-java/commons-net/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/commons-net # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/ChangeLog,v 1.28 2005/05/06 09:52:34 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/ChangeLog,v 1.29 2005/07/09 16:01:24 axxo Exp $ + + 09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> + commons-net-1.2.2-r1.ebuild, commons-net-1.3.0-r1.ebuild: + fix deps, some cleanups 06 May 2005; Sven Wegener <swegener@gentoo.org> commons-net-1.3.0-r1.ebuild: diff --git a/dev-java/commons-net/Manifest b/dev-java/commons-net/Manifest index 9eaa0945087d..9bf582ede308 100644 --- a/dev-java/commons-net/Manifest +++ b/dev-java/commons-net/Manifest @@ -1,18 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 3e76e3c08ab2735777555fe0a40c87a4 commons-net-1.2.2-r1.ebuild 1363 -MD5 6e652cdbc7d6abeb7c684830f723231a ChangeLog 3723 +MD5 aab9323d2afb58f4f909f8a9735873eb commons-net-1.2.2-r1.ebuild 1342 +MD5 15609656fa114f3c0f0fae52f31034ea ChangeLog 3859 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 -MD5 bd413571a7ab16bf84d3f43d8a9f8eb6 commons-net-1.3.0-r1.ebuild 1813 +MD5 7d5a139436f5a189d873c417ba48903e commons-net-1.3.0-r1.ebuild 1776 MD5 e2628a3419f04cdb65cb4a3caad1c9df files/gentoo.diff 4678 MD5 cd5dd0f16006dfa0491e9fb71981d402 files/gentoo-1.2.diff 3152 MD5 fb9978c1444923f864212fcb8914da67 files/digest-commons-net-1.2.2-r1 73 MD5 36815c4f205c7a6b95614626967da49b files/digest-commons-net-1.3.0-r1 73 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCez5yI1lqEGTUzyQRAglOAKDMas0qrRwHrQuCOELqxQVeE3IsIACfToD+ -joNU1IVQ6VpoOaGHMyEz1/Y= -=zxAD ------END PGP SIGNATURE----- diff --git a/dev-java/commons-net/commons-net-1.2.2-r1.ebuild b/dev-java/commons-net/commons-net-1.2.2-r1.ebuild index 419d2b4d52fb..bf7a7b2a64b7 100644 --- a/dev-java/commons-net/commons-net-1.2.2-r1.ebuild +++ b/dev-java/commons-net/commons-net-1.2.2-r1.ebuild @@ -1,18 +1,20 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/commons-net-1.2.2-r1.ebuild,v 1.2 2005/04/02 21:49:52 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/commons-net-1.2.2-r1.ebuild,v 1.3 2005/07/09 16:01:24 axxo Exp $ inherit eutils java-pkg DESCRIPTION="The purpose of the library is to provide fundamental protocol access, not higher-level abstractions." HOMEPAGE="http://jakarta.apache.org/commons/net/" SRC_URI="mirror://apache/jakarta/commons/net/source/${P}-src.tar.gz" +RDEPEND=">=virtual/jre-1.3 + =dev-java/jakarta-oro-2.0*" DEPEND=">=virtual/jdk-1.3 >=dev-java/ant-core-1.5.4 - =dev-java/jakarta-oro-2.0* jikes? ( dev-java/jikes ) - source? ( app-arch/zip )" -RDEPEND=">=virtual/jre-1.3" + source? ( app-arch/zip ) + ${RDEPEND}" + LICENSE="Apache-2.0" SLOT="0" KEYWORDS="x86 sparc ppc amd64" @@ -27,15 +29,14 @@ src_unpack() { } src_compile() { - local antflags="-Doro.jar=$(java-config -p jakarta-oro-2.0) jar" + local antflags="-Doro.jar=$(java-pkg_getjars jakarta-oro-2.0) jar" use doc && antflags="${antflags} javadoc" use jikes && antflags="${antflags} -Dbuild.compiler=jikes" ant ${antflags} || die "died on ant" } src_install() { - mv ${S}/target/${P}-dev.jar ${S}/target/${PN}.jar - java-pkg_dojar target/${PN}.jar + java-pkg_newjar target/${P}-dev.jar ${PN}.jar use doc && java-pkg_dohtml -r dist/docs/ use source && java-pkg_dosrc src/java/org diff --git a/dev-java/commons-net/commons-net-1.3.0-r1.ebuild b/dev-java/commons-net/commons-net-1.3.0-r1.ebuild index 21cdd56c8bfe..1942e69a95ff 100644 --- a/dev-java/commons-net/commons-net-1.3.0-r1.ebuild +++ b/dev-java/commons-net/commons-net-1.3.0-r1.ebuild @@ -1,19 +1,20 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/commons-net-1.3.0-r1.ebuild,v 1.3 2005/05/06 09:52:34 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/commons-net-1.3.0-r1.ebuild,v 1.4 2005/07/09 16:01:24 axxo Exp $ inherit eutils java-pkg DESCRIPTION="The purpose of the library is to provide fundamental protocol access, not higher-level abstractions." HOMEPAGE="http://jakarta.apache.org/commons/net/" SRC_URI="mirror://apache/jakarta/commons/net/source/${P}-src.tar.gz" +RDEPEND=">=virtual/jre-1.3 + >=dev-java/jakarta-oro-2.0" DEPEND=">=virtual/jdk-1.3 >=dev-java/ant-core-1.5.4 - >=dev-java/jakarta-oro-2.0 junit? ( dev-java/junit ) jikes? ( dev-java/jikes ) - source? ( app-arch/zip )" -RDEPEND=">=virtual/jre-1.3" + source? ( app-arch/zip ) + ${RDEPEND}" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~x86 ~sparc ~ppc ~amd64 ppc64" @@ -31,12 +32,10 @@ src_unpack() { cd ${S} if ! use junit ; then - sed -i 's/depends="compile,test"/depends="compile"/' \ - build.xml || die "Failed to disable junit" + sed -i 's/depends="compile,test"/depends="compile"/' build.xml || die "Failed to disable junit" else if ! has_version dev-java/ant-tasks; then - sed -i 's/depends="compile,test"/depends="compile"/' \ - build.xml || die "Failed to disable junit" + sed -i 's/depends="compile,test"/depends="compile"/' build.xml || die "Failed to disable junit" fi fi } @@ -49,8 +48,7 @@ src_compile() { } src_install() { - mv ${S}/target/${P}-dev.jar ${S}/target/${PN}.jar - java-pkg_dojar target/${PN}.jar + java-pkg_newjar target/${P}-dev.jar ${PN}.jar use doc && java-pkg_dohtml -r dist/docs/ if use examples; then |