diff options
| author |   Joshua Nichols <nichoj@gentoo.org> | 2005-12-28 02:34:50 +0000 |
|---|---|---|
| committer | Joshua Nichols <nichoj@gentoo.org> | 2005-12-28 02:34:50 +0000 |
| commit | 4c3180fa3c58fa840223f3bc602c74b174a82f89 (patch) | |
| tree | 92b0a4dee3b40a33438040bae2a98dcbbe3af5d7 | |
| parent | Workaround for bug #116907 (diff) | |
| download | gentoo-2-4c3180fa3c58fa840223f3bc602c74b174a82f89.tar.gz gentoo-2-4c3180fa3c58fa840223f3bc602c74b174a82f89.tar.bz2 gentoo-2-4c3180fa3c58fa840223f3bc602c74b174a82f89.zip | |
Cleanup.
(Portage version: 2.1_pre1)
| -rw-r--r-- | dev-java/picocontainer/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/picocontainer/Manifest | 16 | ||||
| -rw-r--r-- | dev-java/picocontainer/picocontainer-1.0_beta4.ebuild | 16 |
3 files changed, 17 insertions, 21 deletions
diff --git a/dev-java/picocontainer/ChangeLog b/dev-java/picocontainer/ChangeLog index 37fcfd95f849..a1cb6db20ccd 100644 --- a/dev-java/picocontainer/ChangeLog +++ b/dev-java/picocontainer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/picocontainer # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/ChangeLog,v 1.12 2005/05/06 09:55:23 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/ChangeLog,v 1.13 2005/12/28 02:34:49 nichoj Exp $ + + 28 Dec 2005; Joshua Nichols <nichoj@gentoo.org> + picocontainer-1.0_beta4.ebuild: + Cleanup. 06 May 2005; Sven Wegener <swegener@gentoo.org> picocontainer-1.0_beta4.ebuild: diff --git a/dev-java/picocontainer/Manifest b/dev-java/picocontainer/Manifest index eb2584bcf9e8..125c3d5324e8 100644 --- a/dev-java/picocontainer/Manifest +++ b/dev-java/picocontainer/Manifest @@ -1,15 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 32acb371f57aa733579e9651bc25d992 picocontainer-1.0_beta4.ebuild 1029 MD5 b81ebc854c25f748d7871f840fdc4eb1 ChangeLog 1918 -MD5 bebc5edd0414aba81a45ce457cd9d4f3 metadata.xml 553 -MD5 c2b76bdb1d4fad1a042d5c415bec441b files/digest-picocontainer-1.0_beta4 79 MD5 a8864951b56c2a4abc07e4cb8a4067f2 files/build-1.0_beta4.xml 6500 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFC1/Bs/rLF9B432nYRAkU2AKCgz2wlFuWXzoqXxpI5G1pnW94qCQCfdNVP -6LlXB4iWTJyk+NAgFJuLCUs= -=LNBH ------END PGP SIGNATURE----- +MD5 c2b76bdb1d4fad1a042d5c415bec441b files/digest-picocontainer-1.0_beta4 79 +MD5 bebc5edd0414aba81a45ce457cd9d4f3 metadata.xml 553 +MD5 2f971205543d8162a4bc4273dba6085d picocontainer-1.0_beta4.ebuild 1084 diff --git a/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild b/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild index e66c19cfed14..0043aad9be9a 100644 --- a/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild +++ b/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild @@ -1,12 +1,14 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild,v 1.10 2005/07/15 17:20:19 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild,v 1.11 2005/12/28 02:34:50 nichoj Exp $ inherit java-pkg +MY_PV="${PV/_beta/-beta-}" +MY_P="${PN}-${MY_PV}" DESCRIPTION="PicoContainer is a lightweight container" HOMEPAGE="http://docs.codehaus.org/display/PICO/" -SRC_URI="http://dist.codehaus.org/picocontainer/distributions/${PN}-1.0-beta-4-src.tar.gz" +SRC_URI="http://dist.codehaus.org/${PN}/distributions/${MY_P}-src.tar.gz" LICENSE="PicoContainer" SLOT="1" KEYWORDS="x86 ppc amd64" @@ -15,23 +17,23 @@ RDEPEND=">=virtual/jre-1.4" DEPEND=">=virtual/jdk-1.4 >=dev-java/ant-1.5 >=dev-java/junit-3.8.1" -S=${WORKDIR}/${PN}-1.0-beta-4 +S="${WORKDIR}/${MY_P}" src_unpack() { unpack ${A} cd ${S} # FIXME: patch cp ${FILESDIR}/build-${PV}.xml build.xml + mkdir -p target/lib cd target/lib java-pkg_jar-from junit junit.jar junit-3.8.1.jar } src_compile() { - ant -Dfinal.name=${PN} jar || die - if use doc ; then - ant javadoc || die - fi + local antflags="-Dfinal.name=${PN} jar" + use doc && antflags="${antflags} javadoc" + ant ${antflags} || die } src_install() { |