Synced changes between 2.0.1 and 2.1.0 ebuilds.

Package-Manager: portage-2.1.2_rc1-r3

diff --git a/dev-java/jdbc-jaybird/ChangeLog b/dev-java/jdbc-jaybird/ChangeLog
index a41fe1592eb6f38f99c08b0121ab613e6ffa9feb..11a0717471f6b60cf9212084dc75317e6fff8d4c 100644 (file)
--- 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/Manifest b/dev-java/jdbc-jaybird/Manifest
index c6cc9015d1654388bd93427bd07d881e2e6cc6e4..1f4d92e6463c46bc7b9837529aa9786ff9bafefe 100644 (file)
--- a/dev-java/jdbc-jaybird/Manifest
+++ b/dev-java/jdbc-jaybird/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
@@ -27,14 +24,14 @@ EBUILD jdbc-jaybird-2.0.1.ebuild 2858 RMD160 c10adcbe9046329f1b4042159a9e60d8cfa
 MD5 778f9279adba18cd42765aebdd91a4a1 jdbc-jaybird-2.0.1.ebuild 2858
 RMD160 c10adcbe9046329f1b4042159a9e60d8cfaf051a jdbc-jaybird-2.0.1.ebuild 2858
 SHA256 8841282962d2193529f202dd0fcfe3fe49e02c46ca13efd6bbf0461b4c1aeea4 jdbc-jaybird-2.0.1.ebuild 2858
-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 1870 RMD160 e9036ff1f94784f98610b3dc8c7378f10c3d4f5f SHA1 6e6bea09ba8b7285a2998ad67dca153e9522fdd1 SHA256 ad6f5b4e15419f311bd746d8b58c74dbd0b177039bab203fb1fe8a15c131e22e
-MD5 f967400707ed050da0822419b237af09 ChangeLog 1870
-RMD160 e9036ff1f94784f98610b3dc8c7378f10c3d4f5f ChangeLog 1870
-SHA256 ad6f5b4e15419f311bd746d8b58c74dbd0b177039bab203fb1fe8a15c131e22e ChangeLog 1870
+EBUILD jdbc-jaybird-2.1.0.ebuild 2655 RMD160 e7d2f97547e235e7c3af8a8fa65731413bbc31ee SHA1 93ad53af930ab47aa8e43c170deee76b202f55a2 SHA256 8c757a727d4b391779d32f3a891d5b8bd4170c078418b286c0a3e30fa63343c3
+MD5 0c94c1cc6f6b0f038ca44cb0e4123e4f jdbc-jaybird-2.1.0.ebuild 2655
+RMD160 e7d2f97547e235e7c3af8a8fa65731413bbc31ee jdbc-jaybird-2.1.0.ebuild 2655
+SHA256 8c757a727d4b391779d32f3a891d5b8bd4170c078418b286c0a3e30fa63343c3 jdbc-jaybird-2.1.0.ebuild 2655
+MISC ChangeLog 2009 RMD160 8cce5f1e50ae28fe3ff44ad445785a1416461ab7 SHA1 9faa59330af5f07485dd15c7c1f4c458137d57ce SHA256 2cfbcf35c9aaa8d3aeca891e2fba4b79d19bb7d654636fbbb51a6a1a41a69ecf
+MD5 2c56c945287455e3fedf104e081a4748 ChangeLog 2009
+RMD160 8cce5f1e50ae28fe3ff44ad445785a1416461ab7 ChangeLog 2009
+SHA256 2cfbcf35c9aaa8d3aeca891e2fba4b79d19bb7d654636fbbb51a6a1a41a69ecf ChangeLog 2009
 MISC metadata.xml 428 RMD160 2c8aa4639fd5675819c5a105d24fbc538f9bb471 SHA1 76b3cd6dba37cfabeb1ef69314b1e05b8cd7bd12 SHA256 8c5b2d28256190682037a14b86a7d4a29d2b79671ccde3631c1eb5d656223091
 MD5 37d8cbe784ce232ec1b6bd1e8cf5cde4 metadata.xml 428
 RMD160 2c8aa4639fd5675819c5a105d24fbc538f9bb471 metadata.xml 428
@@ -45,10 +42,3 @@ SHA256 daac132ade2347576fc4870f504610e430c89211b336bfbcf262ee81e7473869 files/di
 MD5 2d275643a2fddc9000f8d416dd908e6b files/digest-jdbc-jaybird-2.1.0 247
 RMD160 de7d5a5a54a1076bf0dc82ccba145e2843dd2c89 files/digest-jdbc-jaybird-2.1.0 247
 SHA256 1bde00cf88acb3441873dada2c0efe24051a02bd5b35a0044ee28e169d516638 files/digest-jdbc-jaybird-2.1.0 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFFTjkpomPajV0RnrERAm7TAJ0e01mb5F2t6UU067gEowOlKUYUnACdGDaX
-I4npbyj411LQiipa/maFIH8=
-=IoYA
------END PGP SIGNATURE-----

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 5ab032af1927bf505369a1f7199f0e11be05b438..170138c2de424b77830ec3378a204dd4743b75be 100644 (file)
--- 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
 }