Drop the postgres use flag because the jdbc driver is only used at runtime and it's only one of many possible drivers.

Package-Manager: portage-2.1.2.9

4 files changed, 92 insertions, 8 deletions

diff --git a/dev-java/castor/ChangeLog b/dev-java/castor/ChangeLog
index 5901df5c9819..25b8ad658a37 100644
--- a/dev-java/castor/ChangeLog
+++ b/dev-java/castor/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/castor
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/ChangeLog,v 1.34 2007/06/09 14:30:09 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/ChangeLog,v 1.35 2007/06/09 15:24:57 betelgeuse Exp $
+
+*castor-0.9.9.1-r2 (09 Jun 2007)
+
+  09 Jun 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +castor-0.9.9.1-r2.ebuild:
+  Drop the postgres use flag because the jdbc driver is only used at runtime
+  and it's only one of many possible drivers.
 
 *castor-1.1.1 (09 Jun 2007)
 
diff --git a/dev-java/castor/Manifest b/dev-java/castor/Manifest
index 3b3a11695d23..a8f42ca65ce3 100644
--- a/dev-java/castor/Manifest
+++ b/dev-java/castor/Manifest
@@ -16,6 +16,10 @@ EBUILD castor-0.9.9.1-r1.ebuild 1825 RMD160 ecd1ba62a7845a69f96977fefb26c552176d
 MD5 670762e429c63933bd18512363faf0a2 castor-0.9.9.1-r1.ebuild 1825
 RMD160 ecd1ba62a7845a69f96977fefb26c552176d24a4 castor-0.9.9.1-r1.ebuild 1825
 SHA256 b27c3d666b4fea34a1943c5758c8945afd7f17cd7cb0ceaf437ad6de4ab38909 castor-0.9.9.1-r1.ebuild 1825
+EBUILD castor-0.9.9.1-r2.ebuild 1723 RMD160 59ed793cdd95cfb987b875e2c50464f1f5884166 SHA1 7567b106275cd0b0db0912f4ae9a0a9c0c11e501 SHA256 382759c07dbc6607762012f2e6d6bc061129de58f55f57519d0b2fe7cdbc59e9
+MD5 92b562c0f7711af985cc42f1e2a58680 castor-0.9.9.1-r2.ebuild 1723
+RMD160 59ed793cdd95cfb987b875e2c50464f1f5884166 castor-0.9.9.1-r2.ebuild 1723
+SHA256 382759c07dbc6607762012f2e6d6bc061129de58f55f57519d0b2fe7cdbc59e9 castor-0.9.9.1-r2.ebuild 1723
 EBUILD castor-1.0.5.ebuild 2173 RMD160 69b689da2d78b91d962372849d4f8f10a116ab76 SHA1 a29b16623a42482a471301e7e92fff84fa35d7fe SHA256 3c18ad9b8e9233462f15aa7d37b9dcec822db54d6b2f1d908ee2f95d54a6c84d
 MD5 012c7e401e046b1bd40524ead48a4038 castor-1.0.5.ebuild 2173
 RMD160 69b689da2d78b91d962372849d4f8f10a116ab76 castor-1.0.5.ebuild 2173
@@ -24,10 +28,10 @@ EBUILD castor-1.1.1.ebuild 2446 RMD160 47447edc639efc568b523faa2c386a7a83629667
 MD5 4f6480940f9dd5c38585d83027c24f91 castor-1.1.1.ebuild 2446
 RMD160 47447edc639efc568b523faa2c386a7a83629667 castor-1.1.1.ebuild 2446
 SHA256 93ca7ea8e333e6ca93b611f3286633336860eb069341abcb9906c8ec72a5fd12 castor-1.1.1.ebuild 2446
-MISC ChangeLog 4469 RMD160 0afb14f17c3789aa8966bdfc786ed607939ccc35 SHA1 4909fc0873dbc4b524c9267dc5a497cec4a52d6a SHA256 7cb4bcf56f17e8b4e3850aed9cbd37e3a6e7f0847e749a64d8c93396ee282953
-MD5 241c1ec506adc90458e1861d381380f3 ChangeLog 4469
-RMD160 0afb14f17c3789aa8966bdfc786ed607939ccc35 ChangeLog 4469
-SHA256 7cb4bcf56f17e8b4e3850aed9cbd37e3a6e7f0847e749a64d8c93396ee282953 ChangeLog 4469
+MISC ChangeLog 4709 RMD160 cc4237ece4570a7e0de3f94e4f1401352978e64e SHA1 f01718b27558bde6f9fa6d31f5f593b3e7343f69 SHA256 e811cacb926408f00f2b32e40d6c7024e09a67d621a5954f7099fc0be9ecf7f8
+MD5 bde5191f6385ff48c97d9e5c10cf6c12 ChangeLog 4709
+RMD160 cc4237ece4570a7e0de3f94e4f1401352978e64e ChangeLog 4709
+SHA256 e811cacb926408f00f2b32e40d6c7024e09a67d621a5954f7099fc0be9ecf7f8 ChangeLog 4709
 MISC metadata.xml 548 RMD160 fb4d494db7afbed22d95c58c03fefe9841b6a5f6 SHA1 06ec09b73d1cc9dd371d40c457009fef05e51f6b SHA256 7ea9ff276b4c62bee306d6c5516de76bf19ee62642072dc3817c62ac5c858d33
 MD5 0020d457065666c2b9679d99cc335c51 metadata.xml 548
 RMD160 fb4d494db7afbed22d95c58c03fefe9841b6a5f6 metadata.xml 548
@@ -35,6 +39,9 @@ SHA256 7ea9ff276b4c62bee306d6c5516de76bf19ee62642072dc3817c62ac5c858d33 metadata
 MD5 b2ca7926d0f0016b2aeb096aa097e866 files/digest-castor-0.9.9.1-r1 250
 RMD160 85d65d9edcdae82f7c55fb3a79598dc5a6bda753 files/digest-castor-0.9.9.1-r1 250
 SHA256 888c6364180de0495e2654c7734bb3d13822f99e4cf957cdc160bc7fb1308dad files/digest-castor-0.9.9.1-r1 250
+MD5 b2ca7926d0f0016b2aeb096aa097e866 files/digest-castor-0.9.9.1-r2 250
+RMD160 85d65d9edcdae82f7c55fb3a79598dc5a6bda753 files/digest-castor-0.9.9.1-r2 250
+SHA256 888c6364180de0495e2654c7734bb3d13822f99e4cf957cdc160bc7fb1308dad files/digest-castor-0.9.9.1-r2 250
 MD5 d03659f80a42a110c325f582d250eb91 files/digest-castor-1.0.5 244
 RMD160 805aa08f1e5c62aad848c9971b78a04619a07fe7 files/digest-castor-1.0.5 244
 SHA256 952e23869e5423fee507bcffbb6025aefd725d250dd4731fe47b763bb7558368 files/digest-castor-1.0.5 244
@@ -44,7 +51,7 @@ SHA256 1e0dff4e9579946abfab19ec70437ca46fd9e35cc329b70e16c5dce6e7e29a27 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGar2OcxLzpIGCsLQRAtmWAJ9Nxy96XwBFmrh/cuBJlspxwDaUUQCfVzXO
-vSJOO4UuDst0jMIuwxDqWRU=
-=jqvM
+iD8DBQFGasZNcxLzpIGCsLQRAuLUAKCawVUjU0OEpMQpRUX6ObI7/HoxTwCgiqFW
+XsU2X5WwUNNhKgDmGLzSAl8=
+=+0Nv
 -----END PGP SIGNATURE-----
diff --git a/dev-java/castor/castor-0.9.9.1-r2.ebuild b/dev-java/castor/castor-0.9.9.1-r2.ebuild
new file mode 100644
index 000000000000..315c01d27ba0
--- /dev/null
+++ b/dev-java/castor/castor-0.9.9.1-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/castor-0.9.9.1-r2.ebuild,v 1.1 2007/06/09 15:24:57 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Data binding framework for Java"
+SRC_URI="http://dist.codehaus.org/${PN}/${PV}/${P}-src.tgz"
+HOMEPAGE="http://www.castor.org"
+LICENSE="Exolab"
+KEYWORDS="~amd64 ~x86"
+SLOT="0.9"
+IUSE="doc examples source"
+
+COMMON_DEP="
+	>=dev-java/adaptx-0.9.5.3
+	>=dev-java/commons-logging-1.0.4
+	=dev-java/jakarta-oro-2.0*
+	=dev-java/jakarta-regexp-1.3*
+	>=dev-java/ldapsdk-4.1.7
+	=dev-java/servletapi-2.3*
+	=dev-java/xerces-1.3*
+	=dev-java/cglib-2.0*"
+RDEPEND=">=virtual/jre-1.4
+	dev-java/ant-core
+	${COMMON_DEP}"
+# Does not like Java 1.6's JDBC API
+DEPEND="|| (
+		=virtual/jdk-1.5*
+		=virtual/jdk-1.4*
+	)
+	${COMMON_DEP}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	# TODO this should be filed upstream
+	epatch "${FILESDIR}/0.9.5.3-jikes.patch"
+
+	cd "${S}/lib"
+	rm -f *.jar
+	java-pkg_jar-from ant-core ant.jar
+	java-pkg_jar-from adaptx-0.9
+	java-pkg_jar-from commons-logging
+	java-pkg_jar-from cglib-2
+	java-pkg_jar-from jakarta-oro-2.0 jakarta-oro.jar oro.jar
+	java-pkg_jar-from jakarta-regexp-1.3 jakarta-regexp.jar regexp.jar
+	java-pkg_jar-from servletapi-2.3
+	java-pkg_jar-from xerces-1.3
+	java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar
+}
+
+src_compile() {
+	cd "${S}/src"
+	eant jar $(use_doc)
+}
+
+src_install() {
+	java-pkg_newjar dist/${P}.jar
+	java-pkg_newjar dist/${P}-xml.jar ${PN}-xml.jar
+
+	use doc && java-pkg_dojavadoc build/doc/javadoc
+	use examples && java-pkg_doexamples src/examples
+	use source && java-pkg_dosrc src/main/org
+}
diff --git a/dev-java/castor/files/digest-castor-0.9.9.1-r2 b/dev-java/castor/files/digest-castor-0.9.9.1-r2
new file mode 100644
index 000000000000..ef46289f4e37
--- /dev/null
+++ b/dev-java/castor/files/digest-castor-0.9.9.1-r2
@@ -0,0 +1,3 @@
+MD5 09e276d0819e522ef171e7385517b004 castor-0.9.9.1-src.tgz 6794995
+RMD160 b308fa49edb708963f6abbde2719b7995ba168ed castor-0.9.9.1-src.tgz 6794995
+SHA256 df569ab985714477956e68ed497ac1fa9fde5f95a8bc0264ee2d31125a970f81 castor-0.9.9.1-src.tgz 6794995