diff options
author | Petteri Räty <betelgeuse@gentoo.org> | 2005-08-11 18:46:15 +0000 |
---|---|---|
committer | Petteri Räty <betelgeuse@gentoo.org> | 2005-08-11 18:46:15 +0000 |
commit | 7ba24a2908c9472d6dd903476e833d6e58fac607 (patch) | |
tree | ae8daaabe71526bf57960fbec2eb78a6f1bd8d3b /dev-java | |
parent | marked ~amd64. closes bug #102054 (diff) | |
download | historical-7ba24a2908c9472d6dd903476e833d6e58fac607.tar.gz historical-7ba24a2908c9472d6dd903476e833d6e58fac607.tar.bz2 historical-7ba24a2908c9472d6dd903476e833d6e58fac607.zip |
The installed jar is not versioned any more. Removed the old version because it does not compile against the most recent asm.
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/jarjar/ChangeLog | 8 | ||||
-rw-r--r-- | dev-java/jarjar/Manifest | 6 | ||||
-rw-r--r-- | dev-java/jarjar/files/digest-jarjar-0.4_p20050105 | 1 | ||||
-rw-r--r-- | dev-java/jarjar/jarjar-0.4_p20050105.ebuild | 47 | ||||
-rw-r--r-- | dev-java/jarjar/jarjar-0.6.ebuild | 9 |
5 files changed, 13 insertions, 58 deletions
diff --git a/dev-java/jarjar/ChangeLog b/dev-java/jarjar/ChangeLog index 02525d12eb51..26fa656a0b38 100644 --- a/dev-java/jarjar/ChangeLog +++ b/dev-java/jarjar/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/jarjar # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/ChangeLog,v 1.4 2005/08/03 18:08:21 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/ChangeLog,v 1.5 2005/08/11 18:46:15 betelgeuse Exp $ + + 11 Aug 2005; Petteri Räty <betelgeuse@gentoo.org> + -jarjar-0.4_p20050105.ebuild, jarjar-0.6.ebuild: + The installed jar is not versioned any more. + Removed the old version because it does not compile + against the most recent asm. 03 Aug 2005; Petteri Räty <betelgeuse@gentoo.org> jarjar-0.4_p20050105.ebuild, jarjar-0.6.ebuild: diff --git a/dev-java/jarjar/Manifest b/dev-java/jarjar/Manifest index e86f61b905f5..8a5c6a9d0d0c 100644 --- a/dev-java/jarjar/Manifest +++ b/dev-java/jarjar/Manifest @@ -1,7 +1,5 @@ -MD5 7f06876cd4ded40bfec11e8088970646 ChangeLog 969 -MD5 f6b543b9a51516ba90ebc383762866b7 jarjar-0.4_p20050105.ebuild 1090 +MD5 75d6194ffd118e7b2651543d09ec81a4 ChangeLog 1206 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 -MD5 bbf03ada046c5ef596c44ec6eae0c8d9 jarjar-0.6.ebuild 1099 +MD5 41d75ccb089e67eba148b4e1bf091cde jarjar-0.6.ebuild 1099 MD5 898b954c34be9e78c40ef2bdef781b52 files/asm-2.0_alpha-buildfile.patch 1507 -MD5 5cf7fdf1f1aa15a1acee10e1ee4b5cd5 files/digest-jarjar-0.4_p20050105 72 MD5 32e25e8c0b1eebdf6e1ab7f328e558cf files/digest-jarjar-0.6 63 diff --git a/dev-java/jarjar/files/digest-jarjar-0.4_p20050105 b/dev-java/jarjar/files/digest-jarjar-0.4_p20050105 deleted file mode 100644 index 99a92f716ce8..000000000000 --- a/dev-java/jarjar/files/digest-jarjar-0.4_p20050105 +++ /dev/null @@ -1 +0,0 @@ -MD5 81aae1b6fa61758badaa503beaa626df jarjar-0.4_p20050105.tar.bz2 35698 diff --git a/dev-java/jarjar/jarjar-0.4_p20050105.ebuild b/dev-java/jarjar/jarjar-0.4_p20050105.ebuild deleted file mode 100644 index 2862205618d0..000000000000 --- a/dev-java/jarjar/jarjar-0.4_p20050105.ebuild +++ /dev/null @@ -1,47 +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/jarjar/jarjar-0.4_p20050105.ebuild,v 1.5 2005/08/03 18:08:21 betelgeuse Exp $ - -inherit eutils java-pkg - -DESCRIPTION="Tool for repackaging third-party jars." -SRC_URI="mirror://gentoo/${P}.tar.bz2" -HOMEPAGE="http://jarjar.sourceforge.net" -LICENSE="GPL-2" -SLOT="1" -KEYWORDS="x86 amd64" -IUSE="doc jikes" -RDEPEND=">=virtual/jre-1.3 - =dev-java/asm-2* - =dev-java/gnu-regexp-1*" -DEPEND=">=virtual/jdk-1.3 - ${RDEPEND} - jikes? ( >=dev-java/jikes-1.21 ) - >=dev-java/ant-core-1.4" - -src_unpack() { - unpack ${A} - - cd ${S} - epatch ${FILESDIR}/asm-2.0_alpha-buildfile.patch - - cd ${S}/lib - rm -f *.jar - java-pkg_jar-from asm-2 - java-pkg_jar-from gnu-regexp-1 -} - -src_compile() { - local antflags="jar" - use doc && antflags="${antflags} javadoc" - use jikes && antflags="${antflags} -Dbuild.compiler=jikes" - ant ${antflags} || die "failed to build" -} - -src_install() { - java-pkg_dojar dist/${PN}.jar - - if use doc; then - java-pkg_dohtml -r dist/javadoc/* - fi -} diff --git a/dev-java/jarjar/jarjar-0.6.ebuild b/dev-java/jarjar/jarjar-0.6.ebuild index bed7c488cf78..1ba2d809caf8 100644 --- a/dev-java/jarjar/jarjar-0.6.ebuild +++ b/dev-java/jarjar/jarjar-0.6.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/jarjar/jarjar-0.6.ebuild,v 1.2 2005/08/03 18:08:21 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/jarjar-0.6.ebuild,v 1.3 2005/08/11 18:46:15 betelgeuse Exp $ inherit eutils java-pkg @@ -39,9 +39,8 @@ src_compile() { } src_install() { - java-pkg_dojar dist/${P}.jar + java-pkg_newjar dist/${P}.jar ${PN}.jar + + use doc && java-pkg_dohtml -r dist/javadoc/* - if use doc; then - java-pkg_dohtml -r dist/javadoc/* - fi } |