Removed older version that dep'd on slot 3.1 of javassist.

Package-Manager: portage-2.1.2.2

4 files changed, 8 insertions, 76 deletions

diff --git a/dev-java/ognl/ChangeLog b/dev-java/ognl/ChangeLog
index 54575f82af0f..c50a2f3e2aac 100644
--- a/dev-java/ognl/ChangeLog
+++ b/dev-java/ognl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ognl
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ognl/ChangeLog,v 1.7 2007/03/19 02:33:54 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ognl/ChangeLog,v 1.8 2007/03/19 03:37:47 wltjr Exp $
+
+  19 Mar 2007; William L. Thomson Jr. <wltjr@gentoo.org> -ognl-2.6.9.ebuild:
+  Removed older version that dep'd on slot 3.1 of javassist.
 
 *ognl-2.6.9-r1 (19 Mar 2007)
 
diff --git a/dev-java/ognl/Manifest b/dev-java/ognl/Manifest
index 0db4cc391b10..5b4139e703df 100644
--- a/dev-java/ognl/Manifest
+++ b/dev-java/ognl/Manifest
@@ -4,21 +4,14 @@ EBUILD ognl-2.6.9-r1.ebuild 1156 RMD160 9841e43d8a6900239a5574209634a5513074b994
 MD5 bd57efc3980b278ab5b5b92895b2a720 ognl-2.6.9-r1.ebuild 1156
 RMD160 9841e43d8a6900239a5574209634a5513074b994 ognl-2.6.9-r1.ebuild 1156
 SHA256 510dfd03e324ec12563ea02049131adf183d0a4b4054ee0b1e42d336167177a8 ognl-2.6.9-r1.ebuild 1156
-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 1188 RMD160 8b5f163cee590dccc4e51a478a313be5e33bd27d SHA1 3e77285c6acf939f96802abcbb9b9b553385e0f6 SHA256 c7631bab7dea187b3e4c3c03383fb4325b64f33ea662936c185cdfac1bc5c1e2
-MD5 74e01165c46658d767034e01bfd6ca21 ChangeLog 1188
-RMD160 8b5f163cee590dccc4e51a478a313be5e33bd27d ChangeLog 1188
-SHA256 c7631bab7dea187b3e4c3c03383fb4325b64f33ea662936c185cdfac1bc5c1e2 ChangeLog 1188
+MISC ChangeLog 1327 RMD160 28ad26f89d2b6b02dc18e21091d3fa719809693e SHA1 29a04ab50ee815c488f1561ac9a57b1d7470c13f SHA256 15519b86eacdd5cd4a414842960f57d0e25f0577d28a4d2fa02828ee86705017
+MD5 448532d35ff6f3a74b28ed4ef49227a8 ChangeLog 1327
+RMD160 28ad26f89d2b6b02dc18e21091d3fa719809693e ChangeLog 1327
+SHA256 15519b86eacdd5cd4a414842960f57d0e25f0577d28a4d2fa02828ee86705017 ChangeLog 1327
 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 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
 MD5 01bf84ae493155a6ad8b8b5c0d37fc51 files/digest-ognl-2.6.9-r1 449
 RMD160 0312a31c1be3fab13bec108c298a2f5b96f77bee files/digest-ognl-2.6.9-r1 449
 SHA256 631a563a7b9edbbee2259b868bd975a737e88f1fdbe94193250a79749dc3974e files/digest-ognl-2.6.9-r1 449
diff --git a/dev-java/ognl/files/digest-ognl-2.6.9 b/dev-java/ognl/files/digest-ognl-2.6.9
deleted file mode 100644
index e19d8744a402..000000000000
--- a/dev-java/ognl/files/digest-ognl-2.6.9
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 dad8b45518283cfd62520f90715382bb ognl-2.6.9-dist.zip 2338429
-RMD160 c472635a1285ab34d18d52aaad76768b1eb03784 ognl-2.6.9-dist.zip 2338429
-SHA256 2fcb108c332b388c0ca282e8dfea9a079ab6af3caa08cfe3ccb307dffd57e290 ognl-2.6.9-dist.zip 2338429
-MD5 218b3831f414d716952ca761628c77d3 osbuild.xml 5939
-RMD160 f10a07ff492f389dc5a61ba33e3d6faa235127c9 osbuild.xml 5939
-SHA256 b56534bfdceabe54f4c446d7ee3718dc373523aa368d83206723300fa6931726 osbuild.xml 5939
diff --git a/dev-java/ognl/ognl-2.6.9.ebuild b/dev-java/ognl/ognl-2.6.9.ebuild
deleted file mode 100644
index 0818ccf1cc9d..000000000000
--- a/dev-java/ognl/ognl-2.6.9.ebuild
+++ /dev/null
@@ -1,58 +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.9.ebuild,v 1.1 2006/09/11 16:39:50 nelchael Exp $
-
-inherit java-pkg-2 java-ant-2
-
-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
-	https://ognl.dev.java.net/source/browse/*checkout*/ognl/osbuild.xml"
-
-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}
-
-	cp "${DISTDIR}/osbuild.xml" "${S}/"
-
-}
-
-src_compile() {
-
-	cd "${S}/lib/build"
-	rm -f *.jar
-	java-pkg_jar-from javacc
-	java-pkg_jar-from javassist-3.1
-
-	cd "${S}"
-	local antflags="jar"
-	use doc && antflags="${antflags} javadocs"
-	eant ${antflags} || die "ant failed"
-
-}
-
-src_install() {
-
-	java-pkg_newjar build/${P}.jar ${PN}.jar
-
-	use doc && java-pkg_dohtml -r dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-
-}