Cleaned up dependencies, make tests actually not compile when not needed, remove jdk version autodetection and force -source 1.4 -target 1.4 everywhere, until somebody needs the 1.5 features.

Package-Manager: portage-2.1.2_pre3-r3

7 files changed, 178 insertions, 36 deletions

diff --git a/dev-java/jdbc-jaybird/ChangeLog b/dev-java/jdbc-jaybird/ChangeLog
index af22c54269e3..501fe8a8b28c 100644
--- a/dev-java/jdbc-jaybird/ChangeLog
+++ b/dev-java/jdbc-jaybird/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jdbc-jaybird
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.6 2006/10/19 20:11:13 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.7 2006/10/19 21:39:35 caster Exp $
+
+  19 Oct 2006; Vlastimil Babka <caster@gentoo.org>
+  +files/archive-xml-2.0.1.patch, +files/compile-xml-2.0.1.patch,
+  +files/dist-xml-2.0.1.patch, metadata.xml, jdbc-jaybird-2.0.1.ebuild:
+  Cleaned up dependencies, make tests actually not compile when not needed,
+  remove jdk version autodetection and force -source 1.4 -target 1.4
+  everywhere, until somebody needs the 1.5 features.
 
   19 Oct 2006; William L. Thomson Jr. <wltjr@gentoo.org>
   jdbc-jaybird-2.0.1.ebuild, jdbc-jaybird-2.1.0.ebuild:
diff --git a/dev-java/jdbc-jaybird/Manifest b/dev-java/jdbc-jaybird/Manifest
index f355fb1c3614..de17ea059e64 100644
--- a/dev-java/jdbc-jaybird/Manifest
+++ b/dev-java/jdbc-jaybird/Manifest
@@ -1,29 +1,41 @@
+AUX archive-xml-2.0.1.patch 387 RMD160 7cfbbf7027cb80ed0f75fd6d3fee55735f1cd497 SHA1 b53eec1c235b34d178e8851ab3e37d39e118c382 SHA256 6cfe878c1244d9201c5ed996abb70d0de76e21b27fa4899259a82da91dcc9de5
+MD5 4f432a684ef56a2acdbf3544104fff5c files/archive-xml-2.0.1.patch 387
+RMD160 7cfbbf7027cb80ed0f75fd6d3fee55735f1cd497 files/archive-xml-2.0.1.patch 387
+SHA256 6cfe878c1244d9201c5ed996abb70d0de76e21b27fa4899259a82da91dcc9de5 files/archive-xml-2.0.1.patch 387
 AUX archive-xml-2.1.0.patch 399 RMD160 b84c5992739ce8db698dbe6562e3cae2f8099d3c SHA1 5bdf1fef96ce163cc90a8c6836ac3c9fc9f33f14 SHA256 3e3e1f0d3bce0b6582a1ed7a5d14d55f8d51a6ef6a68a9ac4532d96323c6917a
 MD5 859aed28f3c78d3a70a3d8315e7ce5d0 files/archive-xml-2.1.0.patch 399
 RMD160 b84c5992739ce8db698dbe6562e3cae2f8099d3c files/archive-xml-2.1.0.patch 399
 SHA256 3e3e1f0d3bce0b6582a1ed7a5d14d55f8d51a6ef6a68a9ac4532d96323c6917a files/archive-xml-2.1.0.patch 399
+AUX compile-xml-2.0.1.patch 2905 RMD160 d5b616b649d284d99336232ed153d5c89e79db69 SHA1 1bbc825d884f19ae5e04d57fab9283f8a453cf01 SHA256 6305741ff6808857ceabd53c0c1578b218e954c531e8617e40c265ba5637f14c
+MD5 b88ee9f952c1e3ac2ffb3cc635d0d286 files/compile-xml-2.0.1.patch 2905
+RMD160 d5b616b649d284d99336232ed153d5c89e79db69 files/compile-xml-2.0.1.patch 2905
+SHA256 6305741ff6808857ceabd53c0c1578b218e954c531e8617e40c265ba5637f14c files/compile-xml-2.0.1.patch 2905
 AUX compile-xml-2.1.0.patch 765 RMD160 6c05eda9ae904d06d8adb0cbaaf8c72a1881c736 SHA1 4259d97a0beab831c0fc3dc28038980bdec42b54 SHA256 f06048766fe9d9e3daf3824fd0c78a3e03cafc5de68e8a0c05d576170f499079
 MD5 cec3423ab0f8ebba0ce92a0048dd0985 files/compile-xml-2.1.0.patch 765
 RMD160 6c05eda9ae904d06d8adb0cbaaf8c72a1881c736 files/compile-xml-2.1.0.patch 765
 SHA256 f06048766fe9d9e3daf3824fd0c78a3e03cafc5de68e8a0c05d576170f499079 files/compile-xml-2.1.0.patch 765
+AUX dist-xml-2.0.1.patch 377 RMD160 8b385d472e126a5994a7862a5dbe304cf304932b SHA1 2714eacc7511394f663abcf5cbae29904a4d9f4e SHA256 dad962de758f785af7e0b4731a70ca2f32dc74acd5028572f93b4aa957d4a1dd
+MD5 435c1d2d1810515aa3a1dc739087f0ce files/dist-xml-2.0.1.patch 377
+RMD160 8b385d472e126a5994a7862a5dbe304cf304932b files/dist-xml-2.0.1.patch 377
+SHA256 dad962de758f785af7e0b4731a70ca2f32dc74acd5028572f93b4aa957d4a1dd files/dist-xml-2.0.1.patch 377
 DIST JayBird-2.0.1-src.zip 4899770 RMD160 50e3fb99668ca08116fec3838892e1e6ff4b8e7d SHA1 21adf4a88660c10f7afb2daddec2c4826d068fd7 SHA256 ad3d6ad4199419752281c0e11f445fd109542499d162b5356e98e6eceb25a914
 DIST Jaybird-2.1.0-src.zip 5004088 RMD160 1066f39a393ff14812c907c38aeb094c407114da SHA1 a99c4b0ed90ff1252d6f5b076bfad8087eda6faf SHA256 a96cff648af0ef01b48e3471525d2447a76015e609bbf81a54c372d2963e0214
-EBUILD jdbc-jaybird-2.0.1.ebuild 2537 RMD160 dabd35740563c053dc018c0f42e916c3e1099c7c SHA1 fffc58367a9ec09284660ded93ac4ee3433c11ac SHA256 d0e3b125393b20b1b0f03be94ca0a53f40b57e241a64cf7a7c637339ec585c68
-MD5 e89e930acafb09967a10d7416e406276 jdbc-jaybird-2.0.1.ebuild 2537
-RMD160 dabd35740563c053dc018c0f42e916c3e1099c7c jdbc-jaybird-2.0.1.ebuild 2537
-SHA256 d0e3b125393b20b1b0f03be94ca0a53f40b57e241a64cf7a7c637339ec585c68 jdbc-jaybird-2.0.1.ebuild 2537
+EBUILD jdbc-jaybird-2.0.1.ebuild 2862 RMD160 239a9c54464d16a36202797ffe0e792abc9c57c3 SHA1 53a5b62a038330e65a80ab085144bf5386f61547 SHA256 900f9a5939e9659aade33eaf31649f37a61f7a47c217bbf8cf8252e8377045f8
+MD5 633a52f4ac5030dc353a8fdcd3203b8a jdbc-jaybird-2.0.1.ebuild 2862
+RMD160 239a9c54464d16a36202797ffe0e792abc9c57c3 jdbc-jaybird-2.0.1.ebuild 2862
+SHA256 900f9a5939e9659aade33eaf31649f37a61f7a47c217bbf8cf8252e8377045f8 jdbc-jaybird-2.0.1.ebuild 2862
 EBUILD jdbc-jaybird-2.1.0.ebuild 2766 RMD160 3f2be97c3493dc8128b60f7e0fedbf6d2fc878e3 SHA1 1f3fd5162aa138b451b91df04479fe21678d0ae8 SHA256 46fafe5528a575e952802ae1ff704359828f4ad22f17164f35a260b84874c5b2
 MD5 f55e6fd154ef71373ee1bd338cc04a54 jdbc-jaybird-2.1.0.ebuild 2766
 RMD160 3f2be97c3493dc8128b60f7e0fedbf6d2fc878e3 jdbc-jaybird-2.1.0.ebuild 2766
 SHA256 46fafe5528a575e952802ae1ff704359828f4ad22f17164f35a260b84874c5b2 jdbc-jaybird-2.1.0.ebuild 2766
-MISC ChangeLog 1249 RMD160 d6d473c7ea990c20e131a47b02844ef20005bd89 SHA1 c6fb8f97b3d024b833cabb00cbf0cff43f1c910d SHA256 db3a3ad1f6e1793c45b044a57f3c8a66c16ee9038f6beeb212437e106a1ef320
-MD5 55930808228a8ac73fb5460406739888 ChangeLog 1249
-RMD160 d6d473c7ea990c20e131a47b02844ef20005bd89 ChangeLog 1249
-SHA256 db3a3ad1f6e1793c45b044a57f3c8a66c16ee9038f6beeb212437e106a1ef320 ChangeLog 1249
-MISC metadata.xml 436 RMD160 824e9083e20ae9d6f6ef15f7d93f9cb2e6d60877 SHA1 121db7d23040f789a09b1c433737759fc9d02917 SHA256 018127f870ab1c5e05f4da390c475e1cdcbb4634eaf4b6e361064b4e5d67a92d
-MD5 19790b183474368a06265d9c4ea251ea metadata.xml 436
-RMD160 824e9083e20ae9d6f6ef15f7d93f9cb2e6d60877 metadata.xml 436
-SHA256 018127f870ab1c5e05f4da390c475e1cdcbb4634eaf4b6e361064b4e5d67a92d metadata.xml 436
+MISC ChangeLog 1638 RMD160 d748e3420ff74339c5c67bd58e681f25a91acb93 SHA1 c9cc5da97ec68cd5c020ca8a53009f1cbfd7bc83 SHA256 dab3dfd639faabff0074b97f7476737252ca69c2f96ee106514262f3a68042bd
+MD5 77a5e782de1f115d7122e94f0ed99620 ChangeLog 1638
+RMD160 d748e3420ff74339c5c67bd58e681f25a91acb93 ChangeLog 1638
+SHA256 dab3dfd639faabff0074b97f7476737252ca69c2f96ee106514262f3a68042bd ChangeLog 1638
+MISC metadata.xml 428 RMD160 2c8aa4639fd5675819c5a105d24fbc538f9bb471 SHA1 76b3cd6dba37cfabeb1ef69314b1e05b8cd7bd12 SHA256 8c5b2d28256190682037a14b86a7d4a29d2b79671ccde3631c1eb5d656223091
+MD5 37d8cbe784ce232ec1b6bd1e8cf5cde4 metadata.xml 428
+RMD160 2c8aa4639fd5675819c5a105d24fbc538f9bb471 metadata.xml 428
+SHA256 8c5b2d28256190682037a14b86a7d4a29d2b79671ccde3631c1eb5d656223091 metadata.xml 428
 MD5 6c6a365fa003e27aa057f1b60b09bc71 files/digest-jdbc-jaybird-2.0.1 247
 RMD160 954d1ce9745c47233fc59a5eb7d4241840051671 files/digest-jdbc-jaybird-2.0.1 247
 SHA256 daac132ade2347576fc4870f504610e430c89211b336bfbcf262ee81e7473869 files/digest-jdbc-jaybird-2.0.1 247
diff --git a/dev-java/jdbc-jaybird/files/archive-xml-2.0.1.patch b/dev-java/jdbc-jaybird/files/archive-xml-2.0.1.patch
new file mode 100644
index 000000000000..10a3055ca14a
--- /dev/null
+++ b/dev-java/jdbc-jaybird/files/archive-xml-2.0.1.patch
@@ -0,0 +1,11 @@
+--- build/archive.xml	2005-06-25 18:26:26.000000000 +0200
++++ build/archive.xml	2006-10-19 16:39:56.000000000 +0200
+@@ -57,7 +57,7 @@
+ 

+   </target>

+ 

+-  <target name="jar-test" depends="compile">

++  <target name="jar-test" depends="compile" if="tests">

+ 

+     <mkdir dir="${build.lib}"/>

+     <jar jarfile="${build.lib}/${archive.name.test}" manifest="${build.etc}/default.mf">

diff --git a/dev-java/jdbc-jaybird/files/compile-xml-2.0.1.patch b/dev-java/jdbc-jaybird/files/compile-xml-2.0.1.patch
new file mode 100644
index 000000000000..2edd340e7502
--- /dev/null
+++ b/dev-java/jdbc-jaybird/files/compile-xml-2.0.1.patch
@@ -0,0 +1,92 @@
+--- build/compile.xml	2006-10-19 18:07:58.000000000 +0200
++++ build/compile.xml	2006-10-19 18:17:17.000000000 +0200
+@@ -13,11 +13,12 @@
+     <ant antfile="build_native.xml"/>

+   </target>

+  

+-  <target name="compile-examples">

++  <target name="compile-examples" if="examples">

+   	<mkdir dir="${build.examples}"/>

+     <javac srcdir="${source.examples}"

+            destdir="${build.examples}"

+-           target="${ant.java.version}"

++		   source="1.4"
++		   target="1.4"
+            debug="on"

+            deprecation="on"

+            optimize="on"

+@@ -40,25 +41,25 @@
+     </path>

+   </target>

+ 

+-  <target name="set-wire1.3-src" if="jdk1.3">

++  <target name="set-wire1.3-src" if="never">

+     <path id="source.java.wire">

+       <pathelement path="${source.wire1.3}"/>

+     </path>

+   </target>

+ 

+-  <target name="set-wire1.4-src" unless="jdk1.3">

++  <target name="set-wire1.4-src">

+     <path id="source.java.wire">

+       <pathelement path="${source.wire1.4}"/>

+     </path>

+   </target>

+ 

+-  <target name="set-pool1.4-src" unless="jdk1.5">

++  <target name="set-pool1.4-src">

+     <path id="source.java.pool">

+       <pathelement path="${source.pool1.4}"/>

+     </path>

+   </target>

+ 

+-  <target name="set-pool1.5-src" if="jdk1.5">

++  <target name="set-pool1.5-src" if="never">

+     <path id="source.java.pool">

+       <pathelement path="${source.pool1.5}"/>

+     </path>

+@@ -67,7 +68,8 @@
+   <target name="compile-driver" depends="set-jdbc-20-src,set-jdbc-30-src,set-wire1.3-src,set-wire1.4-src">

+     <mkdir dir="${build.classes}"/>

+     <javac destdir="${build.classes}"

+-           target="${ant.java.version}"

++		   source="1.4"
++		   target="1.4"
+            debug="on"

+            deprecation="on"

+            optimize="on"

+@@ -85,7 +87,8 @@
+     <mkdir dir="${build.pool}"/>

+     <javac srcdir="${source.pool}"

+            destdir="${build.pool}"

+-           target="${ant.java.version}"

++		   source="1.4"
++		   target="1.4"
+            debug="on"

+            deprecation="on"

+            optimize="on"

+@@ -101,7 +104,8 @@
+   	<mkdir dir="${build.compatibility}"/>

+     <javac srcdir="${source.compatibility}"

+            destdir="${build.compatibility}"

+-           target="${ant.java.version}"

++		   source="1.4"
++		   target="1.4"
+            debug="on"

+            deprecation="on"

+            optimize="on"

+@@ -121,11 +125,12 @@
+     </path>

+   </target>

+ 

+-  <target name="compile-tests" depends="compile-pool,set-jdbc-20-test,set-jdbc-30-test">

++  <target name="compile-tests" depends="compile-pool,set-jdbc-20-test,set-jdbc-30-test" if="tests">

+     <mkdir dir="${build.test}"/>

+     <javac srcdir="${source.test}"

+            destdir="${build.test}"

+-           target="${ant.java.version}"

++		   source="1.4"
++		   target="1.4"
+            debug="on"

+            deprecation="on"

+            optimize="on"

diff --git a/dev-java/jdbc-jaybird/files/dist-xml-2.0.1.patch b/dev-java/jdbc-jaybird/files/dist-xml-2.0.1.patch
new file mode 100644
index 000000000000..fd4c3c35afa6
--- /dev/null
+++ b/dev-java/jdbc-jaybird/files/dist-xml-2.0.1.patch
@@ -0,0 +1,10 @@
+--- build/dist.xml	2006-10-19 18:07:20.000000000 +0200
++++ build/dist.xml	2006-10-19 18:10:11.000000000 +0200
+@@ -5,6 +5,7 @@
+     <mkdir dir="${build.docs}"/>

+     <javadoc packagenames="${packages}"

+              sourcepath="${source.java};${source.pool}"

++			 source="1.4"
+              destdir="${build.docs}"

+              author="true"

+              version="true"

diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild
index 420961223317..63dffdd4e2e2 100644
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild,v 1.6 2006/10/19 20:11:13 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild,v 1.7 2006/10/19 21:39:35 caster Exp $
 
-inherit java-pkg-2
+inherit eutils java-pkg-2
 
 At="JayBird-${PV}-src"
 DESCRIPTION="JDBC Type 2 and 4 drivers for Firebird SQL server"
@@ -13,45 +13,55 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples source test"
 
+COMMON_DEPEND="dev-java/log4j"
 RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.5* )
-		dev-java/log4j"
+		${COMMON_DEPEND}"
 DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
 		app-arch/unzip
-		dev-java/ant-core
 		dev-java/cpptasks
-		${RDEPEND}
-		test? ( dev-java/junit )
-		source? ( app-arch/zip )"
+		test? (
+			dev-java/junit
+			dev-java/ant
+		)
+		!test? ( dev-java/ant-core )
+		source? ( app-arch/zip )
+		${COMMON_DEPEND}"
 
 S="${WORKDIR}/client-java"
 
 MY_PN="jaybird"
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
+	cd "${S}"
+
+	# make compiling of tests and examples optional, fix source/target
+	# disable checking for jdk version - default all to 1.4
+	# note that java-ant-2.eclass xml rewriting breaks here
+	epatch "${FILESDIR}/archive-xml-${PV}.patch"
+	epatch "${FILESDIR}/compile-xml-${PV}.patch"
+	epatch "${FILESDIR}/dist-xml-${PV}.patch"
 
-	cd "${S}"/lib/
-	rm *.jar
-	use test && java-pkg_jar-from junit junit.jar
+	cd "${S}/lib/"
+	rm -v *.jar
+	use test && java-pkg_jar-from --build-only junit junit.jar
 
 	cd "${S}/src/lib/"
 	# the build.xml unpacks this and uses stuff
 	mv mini-j2ee.jar ${T} || die "Failed to move mini-j2ee.jar to ${T}"
-	rm *.jar
+	rm -v *.jar *.zip
 	mv ${T}/mini-j2ee.jar . || die "Failed to move mini-j2ee.jar back from ${T}"
 
 	java-pkg_jar-from log4j log4j.jar log4j-core.jar
 }
 
 src_compile() {
-	local antflags="jars compile-native"
-	use doc && antflags="${antflags} javadocs"
-	use test && antflags="${antflags} -Dtests=true"
-	eant ${antflags}
+	eant $(use test && echo "-Dtests=true") jars compile-native \
+		$(use_doc javadocs)
 }
 
 src_install() {
-	cd "${S}"/output/lib/
+	cd "${S}/output/lib/"
 	java-pkg_newjar ${MY_PN}-${PV}.jar ${PN}.jar
 
 	for jar in full pool; do
@@ -61,7 +71,7 @@ src_install() {
 		java-pkg_newjar ${MY_PN}-test-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
 	fi
 
-	cd "${S}"/output/native
+	cd "${S}/output/native"
 	sodest="/usr/lib/"
 	java-pkg_doso libjaybird2.so || die "java-pkg_doso ${sodest}libjaybird2.so failed"
 
@@ -75,8 +85,8 @@ src_install() {
 	use source && java-pkg_dosrc "${S}"/src/*/org
 
 	cd "${S}/output"
-	use doc && java-pkg_dohtml -r docs/
-	dodoc etc/{*.txt,default.mf}
+	use doc && java-pkg_dojavadoc docs
+	dodoc etc/FAQ.txt
 	dohtml etc/*.html
 }
 
@@ -88,5 +98,5 @@ src_test() {
 	ewarn "without Firebird installed and running locally. The tests will"
 	ewarn "complete without Firebird, but network timeouts prolong the"
 	ewarn "testing phase considerably."
-	ant all-tests-pure-java || die "JUnit testing failed."
+	eant all-tests-pure-java
 }
diff --git a/dev-java/jdbc-jaybird/metadata.xml b/dev-java/jdbc-jaybird/metadata.xml
index b02d7d2b4bcc..e0e17cc4950e 100644
--- a/dev-java/jdbc-jaybird/metadata.xml
+++ b/dev-java/jdbc-jaybird/metadata.xml
@@ -5,13 +5,13 @@
 	<herd>java</herd>
 
 	<maintainer>
-        	<email>wltjr@gentoo.org</email>
+		<email>wltjr@gentoo.org</email>
 		<name>William L. Thomson Jr.</name>
 	</maintainer>
 
 	<longdescription>
 	Jaybird is a JCA/JDBC driver suite for the Firebird database server.
-	This package includes both a type 2 and 4 JDBC driver. 
+	This package includes both a type 2 and 4 JDBC driver.
 	</longdescription>
 
 </pkgmetadata>