Version bump, uses new Java build system.

Package-Manager: portage-2.1.1

3 files changed, 24 insertions, 58 deletions

diff --git a/dev-java/ognl/Manifest b/dev-java/ognl/Manifest
index 3579d9fe0937..92189a885a39 100644
--- a/dev-java/ognl/Manifest
+++ b/dev-java/ognl/Manifest
@@ -1,12 +1,27 @@
-MD5 a31a9fa2cfaf993a5107fdacedbd6afb ChangeLog 792
-RMD160 74c559b621989b1a770cf5077a276bd5011067df ChangeLog 792
-SHA256 b037ef2f6943a84092f253844db2aee3273a673360ff9cf4300def419e1a14f9 ChangeLog 792
-MD5 44fb88dbb67c5b5e5f8c7f56677bbfd1 files/digest-ognl-2.6.7 238
-RMD160 435ff9cded722a415d8fb1260610cd02add63ca0 files/digest-ognl-2.6.7 238
-SHA256 6fd64493c5937c82d205b1d36c95b4b34fd42588d409ba2dad5deae4c50d33b9 files/digest-ognl-2.6.7 238
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST ognl-2.6.9-dist.zip 2338429 RMD160 c472635a1285ab34d18d52aaad76768b1eb03784 SHA1 81303e6d92da0ff06dc79af48fd163da796e041e SHA256 2fcb108c332b388c0ca282e8dfea9a079ab6af3caa08cfe3ccb307dffd57e290
+DIST osbuild.xml 5939 RMD160 f10a07ff492f389dc5a61ba33e3d6faa235127c9 SHA1 af71027c105a33428beebd8072ce44999e3619da SHA256 b56534bfdceabe54f4c446d7ee3718dc373523aa368d83206723300fa6931726
+EBUILD ognl-2.6.9.ebuild 1242 RMD160 4b055abd09ebc1d00cd5052aadccfa93d4fb7c4e SHA1 1b7860dc091510bd0ed44fefebd44d4911d97b44 SHA256 d0ce8394e92c9d306a5e315aa9c71889e9b57e81f4d9976fd382aebbe594657c
+MD5 85fa0da31f931f4c105c178e08705a20 ognl-2.6.9.ebuild 1242
+RMD160 4b055abd09ebc1d00cd5052aadccfa93d4fb7c4e ognl-2.6.9.ebuild 1242
+SHA256 d0ce8394e92c9d306a5e315aa9c71889e9b57e81f4d9976fd382aebbe594657c ognl-2.6.9.ebuild 1242
+MISC ChangeLog 957 RMD160 d3bb490a52088211eed3db3469f301b6fe2619e1 SHA1 48f72494d6fd2824cc6a09a8418150bf3d69d9f5 SHA256 6d3fd3c5bb2f8d677a227683fd7fc3605b8eddb5cebdc1484fbbebd726882688
+MD5 8282d631c39c0ca98c018dc320b6f58c ChangeLog 957
+RMD160 d3bb490a52088211eed3db3469f301b6fe2619e1 ChangeLog 957
+SHA256 6d3fd3c5bb2f8d677a227683fd7fc3605b8eddb5cebdc1484fbbebd726882688 ChangeLog 957
+MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
-MD5 e372b69860b58586dcd0cd57a4fba343 ognl-2.6.7.ebuild 1096
-RMD160 72826dbace075dd0c23264baf65c017b79cfb6ea ognl-2.6.7.ebuild 1096
-SHA256 f63a2a22af5cb93752a58dc293f93dfd63da611f9c1f7982f29684d0541f595b ognl-2.6.7.ebuild 1096
+MD5 01bf84ae493155a6ad8b8b5c0d37fc51 files/digest-ognl-2.6.9 449
+RMD160 0312a31c1be3fab13bec108c298a2f5b96f77bee files/digest-ognl-2.6.9 449
+SHA256 631a563a7b9edbbee2259b868bd975a737e88f1fdbe94193250a79749dc3974e files/digest-ognl-2.6.9 449
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFBZFhgo/w9rxVVVERAl5DAKCRCUsxv9APwWuhH0+xWaD4H2aa+wCgl3Rd
+p0ieTiq/Z8/DRq4yWEd/O+k=
+=IT5e
+-----END PGP SIGNATURE-----
diff --git a/dev-java/ognl/files/digest-ognl-2.6.7 b/dev-java/ognl/files/digest-ognl-2.6.7
deleted file mode 100644
index bf01329761e7..000000000000
--- a/dev-java/ognl/files/digest-ognl-2.6.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2da68b6919f31f17ca091a26175d587d ognl-2.6.7-dist.zip 332428
-RMD160 b69765f8e8e229628e53da4004140229c2b56c48 ognl-2.6.7-dist.zip 332428
-SHA256 6452bea1bf64c63fbd4813cb356920ad7604e6c9e87542d075b550ee8ebfd839 ognl-2.6.7-dist.zip 332428
diff --git a/dev-java/ognl/ognl-2.6.7.ebuild b/dev-java/ognl/ognl-2.6.7.ebuild
deleted file mode 100644
index 79f07863f7e0..000000000000
--- a/dev-java/ognl/ognl-2.6.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ognl/ognl-2.6.7.ebuild,v 1.5 2006/03/19 22:41:14 betelgeuse Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Object-Graph Navigation Language; it is an expression language for getting and setting properties of Java objects"
-HOMEPAGE="http://www.ognl.org/"
-SRC_URI="http://www.ognl.org/${PV}/${P}-dist.zip"
-
-LICENSE="OpenSymphony-1.1"
-SLOT="2.6"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc source"
-
-RDEPEND=">=virtual/jre-1.4
-	dev-java/javacc
-	=dev-java/javassist-3.1*"
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	dev-java/ant-core
-	dev-java/ant-contrib
-	${RDEPEND}"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/lib
-	java-pkg_jar-from javacc
-	java-pkg_jar-from javassist-3.1
-}
-
-src_compile() {
-	local antflags="jar"
-	use doc && antflags="${antflags} javadoc-doc -Djavadoc.output=doc/api"
-	ant ${antflags} || die "ant failed"
-}
-
-src_install() {
-	java-pkg_newjar ${P}.jar ${PN}.jar
-
-	use doc && java-pkg_dohtml -r doc/api
-	use source && java-pkg_dosrc java/*
-}