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

[William Thomson (wltjr)]

wltjr       08/06/30 21:28:00

  Modified:             ChangeLog
  Added:                jdbc-jaybird-2.1.5.ebuild
  Log:
  Bumped to lastest version, added hack to get ant.jar on cp vs patch.
  (Portage version: 2.2_rc1/cvs/Linux 2.6.24-gentoo-r4 x86_64)

Revision  Changes    Path
1.25                 dev-java/jdbc-jaybird/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ChangeLog	13 Feb 2008 20:11:50 -0000	1.24
+++ ChangeLog	30 Jun 2008 21:28:00 -0000	1.25
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jdbc-jaybird
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.24 2008/02/13 20:11:50 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.25 2008/06/30 21:28:00 wltjr Exp $
+
+*jdbc-jaybird-2.1.5 (30 Jun 2008)
+
+  30 Jun 2008; William L. Thomson Jr. <wltjr@g.o>
+  +jdbc-jaybird-2.1.5.ebuild:
+  Bumped to lastest version, added hack to get ant.jar on cp vs patch.
 
 *jdbc-jaybird-2.1.2 (13 Feb 2008)
 



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

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

Index: jdbc-jaybird-2.1.5.ebuild
===================================================================
# Copyright 1999-2008 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.ebuild,v 1.1 2008/06/30 21:28:00 wltjr 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 java5 java6"

RDEPEND="java6? ( =virtual/jre-1.6* )
	java5? ( =virtual/jre-1.5* )
	!java6? ( !java5? ( =virtual/jre-1.4* ) )
	dev-java/ant-core
	dev-java/log4j"
DEPEND="java6? ( =virtual/jdk-1.6* )
	java5? ( =virtual/jdk-1.5* )
	!java6? ( !java5? ( =virtual/jdk-1.4* ) )
	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
	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
}



-- 
gentoo-commits@l.g.o mailing list