Synced changes between 2.0.1 and 2.1.0 ebuilds.

(Portage version: 2.1.2_rc1-r3)

2 files changed, 26 insertions, 21 deletions

diff --git a/dev-java/jdbc-jaybird/ChangeLog b/dev-java/jdbc-jaybird/ChangeLog
index a41fe1592eb6..11a0717471f6 100644
--- a/dev-java/jdbc-jaybird/ChangeLog
+++ b/dev-java/jdbc-jaybird/ChangeLog
@@ -1,6 +1,10 @@
 # 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.9 2006/11/05 19:23:31 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.10 2006/11/06 23:48:41 wltjr Exp $
+
+  06 Nov 2006; William L. Thomson Jr. <wltjr@gentoo.org>
+  jdbc-jaybird-2.1.0.ebuild:
+  Synced changes between 2.0.1 and 2.1.0 ebuilds.
 
   05 Nov 2006; Daniel Gryniewicz <dang@gentoo.org>
   jdbc-jaybird-2.0.1.ebuild:
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild
index 5ab032af1927..170138c2de42 100644
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # 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.1.0.ebuild,v 1.5 2006/10/19 20:11:13 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild,v 1.6 2006/11/06 23:48:41 wltjr Exp $
 
 inherit eutils java-pkg-2
 
@@ -13,15 +13,19 @@ 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"
 
@@ -30,34 +34,31 @@ MY_PN="jaybird"
 src_unpack() {
 	unpack "${A}"
 	cd "${S}"
-	echo "${S}"
+
 	epatch "${FILESDIR}/archive-xml-${PV}.patch"
 	epatch "${FILESDIR}/compile-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 examples && antflags="${antflags} -Dexamples=true"
-	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/
-	java-pkg_newjar ${MY_PN}-${PV}.jar ${PN}.jar || die "java-pkg_newjar ${MY_PN}.jar failed"
+	cd "${S}/output/lib/"
+	java-pkg_newjar ${MY_PN}-${PV}.jar ${PN}.jar
 
 	for jar in full pool; do
 		java-pkg_newjar ${MY_PN}-${jar}-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
@@ -66,7 +67,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 libjaybird21.so || die "java-pkg_doso ${sodest}libjaybird21.so failed"
 
@@ -93,5 +94,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
 }