Relaxed dep on javassist to reflect it's new slot. Package potentially will be packag...

Package-Manager: portage-2.1.2.2

diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest
index d37e34bf03eb574dc1365d15e1e07db51523b304..c486f436462cd0d9eac501b5f4c4377cda6da115 100644 (file)
--- a/dev-java/javassist/Manifest
+++ b/dev-java/javassist/Manifest
@@ -3,7 +3,6 @@ MD5 9a19379729e3014becdc23b352edfad2 files/javassist-3.1_rc2-classpath.patch 481
 RMD160 42f66a9ff4bc998e1294890c216afbe24bd695c1 files/javassist-3.1_rc2-classpath.patch 481
 SHA256 047c9afb852501a1fb392dea914690e00b941931a577356233404340e2a7a62b files/javassist-3.1_rc2-classpath.patch 481
 DIST javassist-2.6.zip 1143271 RMD160 3a347906edd778f9aec39a82021a0d6bb9c168fd SHA1 8a66498a5c39d85fe4e6fb13209695a79df8688a SHA256 c77a56714df64996c704c76718d07ea97f582c6eba20711bfd9ecbd468bd02e8
-DIST javassist-3.1RC2.zip 1577619 RMD160 e916f431036c7ddd0b3dad8754dd273d3990d3c2 SHA1 e19bbe648901cf4b31756efe58cd47049b81ff12 SHA256 665e905e7199161fa947373fefa38929a48f9e6d1ee7989054d007de534d83f4
 DIST javassist-3.4.zip 1714086 RMD160 dfab91b6ca74c60a3685480ad596754dd5177ac2 SHA1 93ce5becb770699f9c6d107d0f810cb2f849ce7d SHA256 0f7dc85472d72acf4c74a47ce0d62462218709c6a2f272dc9785e17a524ccaff
 EBUILD javassist-2.6-r1.ebuild 881 RMD160 6b132f8a7fb8902dc3f23fc05134279c997bbcce SHA1 a8dbb5707d3356a27ab5b623f50853c7116d29ae SHA256 c62c8b199583037d3208d8cc1ef3a499d0bc89a1cc5f8d0206962d9bf65831b9
 MD5 d4d1927a0ec282e650ba5fc52ed7e5d4 javassist-2.6-r1.ebuild 881
@@ -13,18 +12,14 @@ EBUILD javassist-2.6.ebuild 1042 RMD160 7dfee5380fd5bf5b2d65abe42dea0301b8a73f80
 MD5 85462849aa82e52b83aa4785f82ac4b5 javassist-2.6.ebuild 1042
 RMD160 7dfee5380fd5bf5b2d65abe42dea0301b8a73f80 javassist-2.6.ebuild 1042
 SHA256 82a7504d522ff91c5b2169d9cbf421297056240ff7684550d0f02b6de7e98873 javassist-2.6.ebuild 1042
-EBUILD javassist-3.1_rc2-r1.ebuild 1096 RMD160 dec539506c73dacb67f7ec9bf4fa34d754ba149e SHA1 72e5a83e7e8b2989d1734d33f4961149cc7e0df3 SHA256 3747f04d2c371010c3bbfdd5cb057e16348a7b2b3fa69f2e135d6601d50a96f3
-MD5 72f9c82ca5b746c698c69977e991d1ed javassist-3.1_rc2-r1.ebuild 1096
-RMD160 dec539506c73dacb67f7ec9bf4fa34d754ba149e javassist-3.1_rc2-r1.ebuild 1096
-SHA256 3747f04d2c371010c3bbfdd5cb057e16348a7b2b3fa69f2e135d6601d50a96f3 javassist-3.1_rc2-r1.ebuild 1096
-EBUILD javassist-3.4.ebuild 1036 RMD160 18245ca0fcf989dbef03f0e9b099e71980d3b620 SHA1 b02ca0613d8135be02d26d372fc61eefb06e41d7 SHA256 2dad82fbadb9bcb916474a426ac51ec9566dcb3e2d15457c98b42e0bb15821d6
-MD5 c5278f233a28a198b46fc155b879a49a javassist-3.4.ebuild 1036
-RMD160 18245ca0fcf989dbef03f0e9b099e71980d3b620 javassist-3.4.ebuild 1036
-SHA256 2dad82fbadb9bcb916474a426ac51ec9566dcb3e2d15457c98b42e0bb15821d6 javassist-3.4.ebuild 1036
-MISC ChangeLog 1942 RMD160 e0658ebecacbb5f02af6e35fca07db7fefb5f91d SHA1 7444373a5fb412260166fa700c0b6fd796e71411 SHA256 3f3aa1af6bb5adfd10beaee97b6397c9094e819ad5d592e9a8727fca97e5de71
-MD5 ca8c67cc2cef4962f8d3106ca22e88c3 ChangeLog 1942
-RMD160 e0658ebecacbb5f02af6e35fca07db7fefb5f91d ChangeLog 1942
-SHA256 3f3aa1af6bb5adfd10beaee97b6397c9094e819ad5d592e9a8727fca97e5de71 ChangeLog 1942
+EBUILD javassist-3.4.ebuild 1030 RMD160 208bff4b30a9c1d2a2c8859c77fdcc3eb08c64e9 SHA1 5b4097ebafbc53efc52ae9c254a692ec350f375d SHA256 dd4aa611fc379ab1bf9d2abec4f57630984ae05fd83612b983b7232bc8bcef88
+MD5 8a30e3c70be565e708c7243227236a6d javassist-3.4.ebuild 1030
+RMD160 208bff4b30a9c1d2a2c8859c77fdcc3eb08c64e9 javassist-3.4.ebuild 1030
+SHA256 dd4aa611fc379ab1bf9d2abec4f57630984ae05fd83612b983b7232bc8bcef88 javassist-3.4.ebuild 1030
+MISC ChangeLog 2110 RMD160 cd1d7bb3d445f55d78fc81bace4c6916d23ea425 SHA1 62c9e748e20332a3c238ef47dff5eee548386bbb SHA256 ee287e659f449b9ae6c3288f667115223f2e41801319ae223c88a84f24a59566
+MD5 c1322c06f8900b3c4239ff3fd3225d6e ChangeLog 2110
+RMD160 cd1d7bb3d445f55d78fc81bace4c6916d23ea425 ChangeLog 2110
+SHA256 ee287e659f449b9ae6c3288f667115223f2e41801319ae223c88a84f24a59566 ChangeLog 2110
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -35,9 +30,6 @@ SHA256 cbcd55abedc51b6720c79e5def16f09a4c64add7935988e8eec68f414b08fe51 files/di
 MD5 d53c6f92adda7930d4d6f743349d54b6 files/digest-javassist-2.6-r1 235
 RMD160 e273e35d200d36de8a508e8a68d00d528e34592a files/digest-javassist-2.6-r1 235
 SHA256 cbcd55abedc51b6720c79e5def16f09a4c64add7935988e8eec68f414b08fe51 files/digest-javassist-2.6-r1 235
-MD5 23b5b08159f713a0f4587962b0c48d08 files/digest-javassist-3.1_rc2-r1 244
-RMD160 24695f5ded2742cf12609bb1bf282b5302b1e7c9 files/digest-javassist-3.1_rc2-r1 244
-SHA256 356080fe31f6d9cde691f11a77e24cadff22b2bd213688fb8283ea9c446ff66d files/digest-javassist-3.1_rc2-r1 244
 MD5 79a46e3a2caa7093380de74c51f93c9d files/digest-javassist-3.4 235
 RMD160 540c191c9a89f164d0b0ca7a75a0a6c0cc223733 files/digest-javassist-3.4 235
 SHA256 ae1c2f802bc989f2c5df0f3eacfc302922aad48b6569becde9d503f264028a5a files/digest-javassist-3.4 235

diff --git a/dev-java/ognl/ChangeLog b/dev-java/ognl/ChangeLog
index 197fd741c9d923d9407ce7da82fa4ab52e994a2f..54575f82af0f3dcec0a0a67abb318941e7863e2a 100644 (file)
--- a/dev-java/ognl/ChangeLog
+++ b/dev-java/ognl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/ognl
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ognl/ChangeLog,v 1.6 2006/09/11 16:39:50 nelchael Exp $
+# 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 $
+
+*ognl-2.6.9-r1 (19 Mar 2007)
+
+  19 Mar 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  +ognl-2.6.9-r1.ebuild:
+  Relaxed dep on javassist to reflect it's new slot. Package potentially will
+  be package.masked and removed from tree.
 
 *ognl-2.6.9 (11 Sep 2006)
 

diff --git a/dev-java/ognl/files/digest-ognl-2.6.9-r1 b/dev-java/ognl/files/digest-ognl-2.6.9-r1
new file mode 100644 (file)
index 0000000..e19d874
--- /dev/null
+++ b/dev-java/ognl/files/digest-ognl-2.6.9-r1
@@ -0,0 +1,6 @@
+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-r1.ebuild b/dev-java/ognl/ognl-2.6.9-r1.ebuild
new file mode 100644 (file)
index 0000000..187d7c6
--- /dev/null
+++ b/dev-java/ognl/ognl-2.6.9-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2007 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-r1.ebuild,v 1.1 2007/03/19 02:33:54 wltjr Exp $
+
+JAVA_PKG_IUSE="doc source"
+
+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"
+
+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}/" || die
+       cd "${S}/lib/build" || die
+       rm -f *.jar || die
+       java-pkg_jar-from javacc
+       java-pkg_jar-from javassist-3
+}
+
+EANT_DOC_TARGET="javadocs"
+
+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/*
+}