[gentoo-commits] gentoo-x86 commit in dev-java/jdbc-jaybird: jdbc-jaybird-2.1.5-r1.ebuild ChangeLog jdbc-jaybird-2.1.5-r2.ebuild

[Vlastimil Babka (caster)]

caster      09/11/01 20:35:23

  Modified:             jdbc-jaybird-2.1.5-r1.ebuild ChangeLog
  Added:                jdbc-jaybird-2.1.5-r2.ebuild
  Log:
  Revbump to remove the jni support from stable candidate.
  (Portage version: 2.2_rc46/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild?r1=1.1&r2=1.2

Index: jdbc-jaybird-2.1.5-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jdbc-jaybird-2.1.5-r1.ebuild	3 Oct 2009 21:00:21 -0000	1.1
+++ jdbc-jaybird-2.1.5-r1.ebuild	1 Nov 2009 20:35:22 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.5-r1.ebuild,v 1.1 2009/10/03 21:00:21 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild,v 1.2 2009/11/01 20:35:22 caster Exp $
 
 JAVA_PKG_IUSE="doc source examples test"
 
@@ -13,7 +13,7 @@
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="jni java6"
+IUSE="java6"
 
 RDEPEND="java6? ( >=virtual/jre-1.6 )
 	!java6? ( >=virtual/jre-1.5 )
@@ -24,7 +24,6 @@
 	app-arch/unzip
 	dev-java/ant-core
 	dev-java/log4j
-	jni? ( dev-java/cpptasks )
 	test? (
 		=dev-java/junit-3.8*
 		dev-java/ant-junit
@@ -59,7 +58,6 @@
 src_compile() {
 	java-pkg_filter-compiler jikes
 	eant $(use test && echo "-Dtests=true") jars \
-		$(use jni && echo "compile-native") \
 		$(use_doc javadocs)
 }
 
@@ -74,13 +72,6 @@
 		java-pkg_newjar ${MY_PN}-test-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
 	fi
 
-	if use jni; then
-		cd "${S}/output/native"
-		sodest="/usr/lib/"
-		java-pkg_doso libjaybird21.so || die \
-			"java-pkg_doso ${sodest}libjaybird21.so failed"
-	fi
-
 	cd "${S}"
 
 	if use examples; then



1.28                 dev-java/jdbc-jaybird/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog?r1=1.27&r2=1.28

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ChangeLog	3 Oct 2009 21:00:21 -0000	1.27
+++ ChangeLog	1 Nov 2009 20:35:22 -0000	1.28
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jdbc-jaybird
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.27 2009/10/03 21:00:21 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.28 2009/11/01 20:35:22 caster Exp $
+
+*jdbc-jaybird-2.1.5-r2 (01 Nov 2009)
+
+  01 Nov 2009; Vlastimil Babka <caster@g.o>
+  jdbc-jaybird-2.1.5-r1.ebuild, +jdbc-jaybird-2.1.5-r2.ebuild:
+  Revbump to remove the jni support from stable candidate.
 
 *jdbc-jaybird-2.1.5-r1 (03 Oct 2009)
 



1.1                  dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild?rev=1.1&content-type=text/plain

Index: jdbc-jaybird-2.1.5-r2.ebuild
===================================================================
# Copyright 1999-2009 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.5-r2.ebuild,v 1.1 2009/11/01 20:35:22 caster Exp $

JAVA_PKG_IUSE="doc source examples test"

inherit eutils java-pkg-2 java-ant-2

At="Jaybird-${PV/_/}-src"
DESCRIPTION="JDBC Type 2 and 4 drivers for Firebird SQL server"
HOMEPAGE="http://jaybirdwiki.firebirdsql.org/"
SRC_URI="mirror://sourceforge/firebird/${At}.zip"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="jni java6"

RDEPEND="java6? ( >=virtual/jre-1.6 )
	!java6? ( >=virtual/jre-1.5 )
	dev-java/ant-core
	dev-java/log4j"
DEPEND="java6? ( =virtual/jdk-1.6* )
	!java6? ( =virtual/jdk-1.5* )
	app-arch/unzip
	dev-java/ant-core
	dev-java/log4j
	jni? ( dev-java/cpptasks )
	test? (
		=dev-java/junit-3.8*
		dev-java/ant-junit
	)"

S="${WORKDIR}/client-java"

MY_PN="jaybird"

src_unpack() {
	unpack ${A}
	cd "${S}"

	epatch "${FILESDIR}/archive-xml-2.1.0.patch"
	epatch "${FILESDIR}/compile_xml-2.1.2.patch"

	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 -v *.jar *.zip
	mv "${T}"/mini-j2ee.jar . || die "Failed to move mini-j2ee.jar back from ${T}"

	# Hack to add ant.jar to classpath without patch
	java-pkg_jar-from ant-core ant.jar jaas.jar
	java-pkg_jar-from log4j log4j.jar log4j-core.jar
}

src_compile() {
	java-pkg_filter-compiler jikes
	use jni && ANT_TASKS="cpptasks"
	eant $(use test && echo "-Dtests=true") jars \
		$(use jni && echo "compile-native") \
		$(use_doc javadocs)
}

src_install() {
	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"
	done
	if use test; then
		java-pkg_newjar ${MY_PN}-test-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
	fi

	if use jni; then
		cd "${S}/output/native"
		sodest="/usr/lib/"
		java-pkg_doso libjaybird21.so || die \
			"java-pkg_doso ${sodest}libjaybird21.so failed"
	fi

	cd "${S}"

	if use examples; then
		insinto /usr/share/doc/${PF}/
		doins -r examples || die "installing examples failed"
	fi

	use source && java-pkg_dosrc "${S}"/src/*/org

	cd "${S}/output"
	use doc && java-pkg_dohtml -r docs/
	dodoc etc/{*.txt,default.mf}
	dohtml etc/*.html
}

src_test() {
	#
	# Warning about timeouts without Firebird installed and running Locally
	#
	ewarn "You will experience long timeouts when running junit tests"
	ewarn "without Firebird installed and running locally. The tests will"
	ewarn "complete without Firebird, but network timeouts prolong the"
	ewarn "testing phase considerably."
	ANT_TASKS="ant-junit" eant all-tests-pure-java
}