public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdbc-jaybird/
@ 2015-12-06 12:07 James Le Cuirot
  0 siblings, 0 replies; 2+ messages in thread
From: James Le Cuirot @ 2015-12-06 12:07 UTC (permalink / raw
  To: gentoo-commits

commit:     6cea61c7d5a83e9efd69a824fcc4f30ed0ae5f48
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 11:08:20 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 12:07:00 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cea61c7

dev-java/jdbc-jaybird: Remove old

Package-Manager: portage-2.2.26

 dev-java/jdbc-jaybird/Manifest                     |   3 -
 dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild | 110 ------------------
 dev-java/jdbc-jaybird/jdbc-jaybird-2.1.6.ebuild    | 108 ------------------
 dev-java/jdbc-jaybird/jdbc-jaybird-2.2.7.ebuild    | 125 --------------------
 dev-java/jdbc-jaybird/jdbc-jaybird-2.2.8.ebuild    | 126 ---------------------
 5 files changed, 472 deletions(-)

diff --git a/dev-java/jdbc-jaybird/Manifest b/dev-java/jdbc-jaybird/Manifest
index 6173bf0..f6ee813 100644
--- a/dev-java/jdbc-jaybird/Manifest
+++ b/dev-java/jdbc-jaybird/Manifest
@@ -1,5 +1,2 @@
 DIST Jaybird-2.1.5-src.zip 6047595 SHA256 3b475bca2cc5c3cbf6032c75ff2ea47d2e77abad18df36e149c1eaccfc15a868 SHA512 e6d7eb70cf59d5d9a2dd7817bc11574ba5f014f2aae6cb6c4b141e7d0a172cf091b950e3475ee5d4389f3ca3efae3f34ed1efbc694b74a2a99adc2694c936a7e WHIRLPOOL ca5e3fedce5f13a00ea37f946f9f0141d3132ea3b9209623961b32868946dd0e36621d0280716263031bc02dbcc7f8cd80de29da5e0235127d9c0d9e4deea54e
-DIST Jaybird-2.1.6-src.zip 5849860 SHA256 819d47e37b91d0ea23f8b043d504a00f5b19d207d80556f2bf465abf1e50fa48 SHA512 756ad70e3eb7c80d59afffba132c207310c2e9346c6f08b6a023305db36fd46a351c33259ca7d73eff853e9f7ff2245234297de33c7d9042fe87c3a8df204014 WHIRLPOOL aa1c4bd03373dd7671c5d15db4210e1ccd319b41fd0259033944d1cfa75dac17a22293cf25a4c922dc17f4649ca4315d6136a878e1dad758664db7e6e03019ad
-DIST Jaybird-2.2.7-src.tar.gz 9548804 SHA256 ff88c4b2297b153a9693bc6fd57761f6c0472518f12dcd5892cf72e31721cbad SHA512 53a5fb13f82f57cb1dd1febba81cb43d92dabe4973b4cb0df185188e3a48bbb0a206132297759459708b2e44d155f5936015f547fed834f7cc2287d5aa423f22 WHIRLPOOL 0297f49d2c866ba2dbd250fea5f928d2e04cbab4f22497c4d12449295054ba33d109e21260ab6cf0bdf41b8cfbb539018994432c4e8f418bfe10cb46322edaf7
 DIST Jaybird-2.2.9-src.zip 9833669 SHA256 46b807c85efd3531aef612b5d7a71e570c02e344cf73d67890c1194d3a250828 SHA512 487e64658553f60fa2a1f9b6d7136504119bac2905c6480cac01a94ce2c6e70b82449ee9a1b9b1ee96a12646ef69064d542401fc62564662f14531dea3790e6e WHIRLPOOL f3197921d0eca901662353ab5150ba62b72ac40ccf884f78f229fadac2239bc56964d5ae452d0dcddf82099b66a71c734beaffe6b8a4b3d9bffec98061d7dc0a
-DIST v2.2.8.zip 10235590 SHA256 6345bc37c958f8bb6a69b07281b6a4e1bd643e822f3223b4a171d1fc74253b77 SHA512 05689c86bcde9bb7611052168414c75bffac2a30c984f0c3db602baf6c463c6a9d2f424fddb94bfd00634a399901edbf37700f6cb3ac0d8fa246006f3add1e15 WHIRLPOOL 01e6e38014cf7d43410677dc115747c796811ed1b514998de296b9d6ce585c2b5efb427df220f8c471dfcc21df9aa312fbf2f9889a5649525daf15bd8108e267

diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild
deleted file mode 100644
index fbd292b..0000000
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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"
-
-RDEPEND=">=virtual/jre-1.6
-	dev-java/ant-core
-	dev-java/log4j"
-DEPEND="=virtual/jdk-1.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
-	)"
-
-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"
-
-	# JAVA_ANT_ENCODING doesn't work because it doesn't like entities
-	java-ant_xml-rewrite -f build.xml -c -e javac -a encoding -v ISO-8859-1
-
-	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
-}

diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.6.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.6.ebuild
deleted file mode 100644
index 573b69a..0000000
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.6.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-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"
-
-RDEPEND=">=virtual/jre-1.6
-	dev-java/log4j:0
-	dev-java/glassfish-connector-api:0"
-DEPEND=">=virtual/jdk-1.6
-	${RDEPEND}
-	app-arch/unzip
-	jni? ( dev-java/cpptasks )
-	test? (
-		dev-java/ant-junit
-	)"
-
-S="${WORKDIR}/client-java.sources"
-
-MY_PN="jaybird"
-
-java_prepare() {
-
-	epatch "${FILESDIR}/archive-xml-2.1.0.patch"
-	epatch "${FILESDIR}/compile_xml-2.1.2.patch"
-	epatch "${FILESDIR}/2.1.6-remove-unused-ant-import.patch"
-
-	# JAVA_ANT_ENCODING doesn't work because it doesn't like entities
-	java-ant_xml-rewrite -f build.xml -c -e javac -a encoding -v ISO-8859-1
-
-	cd "${S}/lib/"
-	rm -v *.jar
-	use test && java-pkg_jar-from --build-only junit junit.jar
-
-	cd "${S}/src/lib/"
-	rm -v *.jar *.zip
-	# the build.xml unpacks this and uses stuff
-	touch empty
-	jar cf mini-j2ee.jar empty
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="glassfish-connector-api,log4j"
-EANT_BUILD_TARGET="jars"
-EANT_DOC_TARGET="javadocs"
-
-src_compile() {
-	java-pkg_filter-compiler jikes
-	use jni && ANT_TASKS="cpptasks"
-	java-pkg-2_src_compile $(use test && echo "-Dtests=true") \
-		$(use jni && echo "compile-native")
-}
-
-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
-}

diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.7.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.7.ebuild
deleted file mode 100644
index bffa22c..0000000
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.7.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-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}.tar.gz"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="jni"
-
-RDEPEND=">=virtual/jre-1.6
-	dev-java/junit:4
-	dev-java/antlr:4
-	dev-java/log4j:0
-	dev-java/glassfish-connector-api:0"
-DEPEND=">=virtual/jdk-1.6
-	${RDEPEND}
-	app-arch/unzip
-	jni? ( dev-java/cpptasks )
-	test? ( dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${At}"
-
-MY_PN="jaybird"
-
-java_prepare() {
-	# prevent test/sources/javadoc from being built unless wanted
-	sed -i -e 's|name="jar-test" depends="compile"|name="jar-test" depends="compile" if="tests"|' \
-		"${S}/build/archive.xml" || die
-	sed -i -e 's|name="compile-examples"|name="compile-examples" if="examples"|' \
-		-e 's|,set-jdbc-42-test"|,set-jdbc-42-test" if="tests"|' \
-		"${S}/build/compile.xml" || die
-
-	# JAVA_ANT_ENCODING doesn't work because it doesn't like entities
-	java-ant_xml-rewrite -f build.xml -c -e javac -a encoding -v ISO-8859-1
-
-	cd "${S}/lib/"
-	rm -v *.jar
-
-	cd "${S}/src/lib/"
-	rm -v *.jar *.zip
-
-	java-pkg_jar-from --build-only glassfish-connector-api \
-		glassfish-connector-api.jar connector-api-1.5.jar
-
-	# the build.xml unpacks this and uses stuff
-	touch empty
-	jar cf mini-j2ee.jar empty
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="antlr:4,glassfish-connector-api,log4j"
-EANT_BUILD_TARGET="jars"
-EANT_DOC_TARGET="javadocs"
-
-src_compile() {
-	java-pkg_filter-compiler jikes
-	use jni && ANT_TASKS="cpptasks"
-
-	# This is nonsense, I know, but it works.
-	if use test; then
-		EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-	fi
-
-	java-pkg-2_src_compile $(use test && echo "-Dtests=true") \
-		$(use jni && echo "compile-native")
-}
-
-src_install() {
-	cd "${S}/output/lib/"
-	java-pkg_newjar ${MY_PN}-${PV}.jar ${PN}.jar
-
-	for jar in full; 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/"
-		local so_arch
-		if use amd64; then
-			so_arch="x64"
-		elif use x86; then
-			so_arch="x86"
-		fi
-		java-pkg_doso libjaybird22_${so_arch}.so || die \
-			"java-pkg_doso ${sodest}libjaybird22.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/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
-}

diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.8.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.8.ebuild
deleted file mode 100644
index 1d2513a..0000000
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.8.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source examples test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PN="${PN/jdbc-/}"
-DESCRIPTION="JDBC Type 2 and 4 drivers for Firebird SQL server"
-HOMEPAGE="http://jaybirdwiki.firebirdsql.org/"
-SRC_URI="https://github.com/FirebirdSQL/${MY_PN}/archive/v${PV}.zip"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE="jni"
-
-CDEPEND="dev-java/junit:4
-	dev-java/antlr:4
-	dev-java/log4j:0
-	dev-java/glassfish-connector-api:0"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	app-arch/unzip
-	jni? ( dev-java/cpptasks )
-	test? ( dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-java_prepare() {
-	# prevent test/sources/javadoc from being built unless wanted
-	sed -i -e 's|name="jar-test" depends="compile"|name="jar-test" depends="compile" if="tests"|' \
-		"${S}/build/archive.xml" || die
-	sed -i -e 's|name="compile-examples"|name="compile-examples" if="examples"|' \
-		-e 's|,set-jdbc-42-test"|,set-jdbc-42-test" if="tests"|' \
-		"${S}/build/compile.xml" || die
-
-	# JAVA_ANT_ENCODING doesn't work because it doesn't like entities
-	java-ant_xml-rewrite -f build.xml -c -e javac -a encoding -v ISO-8859-1
-
-	cd "${S}/lib/"
-	rm -v *.jar
-
-	cd "${S}/src/lib/"
-	rm -v *.jar *.zip
-
-	java-pkg_jar-from --build-only glassfish-connector-api \
-		glassfish-connector-api.jar connector-api-1.5.jar
-
-	# the build.xml unpacks this and uses stuff
-	touch empty
-	jar cf mini-j2ee.jar empty
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="antlr:4,glassfish-connector-api,log4j"
-EANT_BUILD_TARGET="jars"
-EANT_DOC_TARGET="javadocs"
-
-src_compile() {
-	java-pkg_filter-compiler jikes
-	use jni && ANT_TASKS="cpptasks"
-
-	# This is nonsense, I know, but it works.
-	if use test; then
-		EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-	fi
-
-	java-pkg-2_src_compile $(use test && echo "-Dtests=true") \
-		$(use jni && echo "compile-native")
-}
-
-src_install() {
-	cd "${S}/output/lib/"
-	java-pkg_newjar ${MY_PN}-${PV}.jar ${PN}.jar
-
-	for jar in full; 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/"
-		local so_arch
-		if use amd64; then
-			so_arch="x64"
-		elif use x86; then
-			so_arch="x86"
-		fi
-		java-pkg_doso libjaybird22_${so_arch}.so || die \
-			"java-pkg_doso ${sodest}libjaybird22.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/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
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdbc-jaybird/
@ 2015-12-06 12:07 James Le Cuirot
  0 siblings, 0 replies; 2+ messages in thread
From: James Le Cuirot @ 2015-12-06 12:07 UTC (permalink / raw
  To: gentoo-commits

commit:     433189db071c5ba279ff8bd1b6d0ab2d79133d48
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 10:58:23 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 12:06:58 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=433189db

dev-java/jdbc-jaybird: Version bump to 2.2.9

 * Depend on the correct version on antlr. v4 worked before because it
   incorrectly bundled v3.5. This will be fixed.
 * Give the SRC_URI a meaningful name.

Package-Manager: portage-2.2.26

 dev-java/jdbc-jaybird/Manifest                  |   1 +
 dev-java/jdbc-jaybird/jdbc-jaybird-2.2.9.ebuild | 126 ++++++++++++++++++++++++
 2 files changed, 127 insertions(+)

diff --git a/dev-java/jdbc-jaybird/Manifest b/dev-java/jdbc-jaybird/Manifest
index ed9c4a7..6173bf0 100644
--- a/dev-java/jdbc-jaybird/Manifest
+++ b/dev-java/jdbc-jaybird/Manifest
@@ -1,4 +1,5 @@
 DIST Jaybird-2.1.5-src.zip 6047595 SHA256 3b475bca2cc5c3cbf6032c75ff2ea47d2e77abad18df36e149c1eaccfc15a868 SHA512 e6d7eb70cf59d5d9a2dd7817bc11574ba5f014f2aae6cb6c4b141e7d0a172cf091b950e3475ee5d4389f3ca3efae3f34ed1efbc694b74a2a99adc2694c936a7e WHIRLPOOL ca5e3fedce5f13a00ea37f946f9f0141d3132ea3b9209623961b32868946dd0e36621d0280716263031bc02dbcc7f8cd80de29da5e0235127d9c0d9e4deea54e
 DIST Jaybird-2.1.6-src.zip 5849860 SHA256 819d47e37b91d0ea23f8b043d504a00f5b19d207d80556f2bf465abf1e50fa48 SHA512 756ad70e3eb7c80d59afffba132c207310c2e9346c6f08b6a023305db36fd46a351c33259ca7d73eff853e9f7ff2245234297de33c7d9042fe87c3a8df204014 WHIRLPOOL aa1c4bd03373dd7671c5d15db4210e1ccd319b41fd0259033944d1cfa75dac17a22293cf25a4c922dc17f4649ca4315d6136a878e1dad758664db7e6e03019ad
 DIST Jaybird-2.2.7-src.tar.gz 9548804 SHA256 ff88c4b2297b153a9693bc6fd57761f6c0472518f12dcd5892cf72e31721cbad SHA512 53a5fb13f82f57cb1dd1febba81cb43d92dabe4973b4cb0df185188e3a48bbb0a206132297759459708b2e44d155f5936015f547fed834f7cc2287d5aa423f22 WHIRLPOOL 0297f49d2c866ba2dbd250fea5f928d2e04cbab4f22497c4d12449295054ba33d109e21260ab6cf0bdf41b8cfbb539018994432c4e8f418bfe10cb46322edaf7
+DIST Jaybird-2.2.9-src.zip 9833669 SHA256 46b807c85efd3531aef612b5d7a71e570c02e344cf73d67890c1194d3a250828 SHA512 487e64658553f60fa2a1f9b6d7136504119bac2905c6480cac01a94ce2c6e70b82449ee9a1b9b1ee96a12646ef69064d542401fc62564662f14531dea3790e6e WHIRLPOOL f3197921d0eca901662353ab5150ba62b72ac40ccf884f78f229fadac2239bc56964d5ae452d0dcddf82099b66a71c734beaffe6b8a4b3d9bffec98061d7dc0a
 DIST v2.2.8.zip 10235590 SHA256 6345bc37c958f8bb6a69b07281b6a4e1bd643e822f3223b4a171d1fc74253b77 SHA512 05689c86bcde9bb7611052168414c75bffac2a30c984f0c3db602baf6c463c6a9d2f424fddb94bfd00634a399901edbf37700f6cb3ac0d8fa246006f3add1e15 WHIRLPOOL 01e6e38014cf7d43410677dc115747c796811ed1b514998de296b9d6ce585c2b5efb427df220f8c471dfcc21df9aa312fbf2f9889a5649525daf15bd8108e267

diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.9.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.9.ebuild
new file mode 100644
index 0000000..6bd20c6
--- /dev/null
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.9.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source examples test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PN="${PN/jdbc-/}"
+DESCRIPTION="JDBC Type 2 and 4 drivers for Firebird SQL server"
+HOMEPAGE="http://jaybirdwiki.firebirdsql.org/"
+SRC_URI="https://github.com/FirebirdSQL/${MY_PN}/archive/v${PV}.zip -> Jaybird-${PV}-src.zip"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc"
+IUSE="jni"
+
+CDEPEND="dev-java/junit:4
+	dev-java/antlr:3.5
+	dev-java/log4j:0
+	dev-java/glassfish-connector-api:0"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip
+	jni? ( dev-java/cpptasks )
+	test? ( dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+java_prepare() {
+	# prevent test/sources/javadoc from being built unless wanted
+	sed -i -e 's|name="jar-test" depends="compile"|name="jar-test" depends="compile" if="tests"|' \
+		"${S}/build/archive.xml" || die
+	sed -i -e 's|name="compile-examples"|name="compile-examples" if="examples"|' \
+		-e 's|,set-jdbc-42-test"|,set-jdbc-42-test" if="tests"|' \
+		"${S}/build/compile.xml" || die
+
+	# JAVA_ANT_ENCODING doesn't work because it doesn't like entities
+	java-ant_xml-rewrite -f build.xml -c -e javac -a encoding -v ISO-8859-1
+
+	cd "${S}/lib/"
+	rm -v *.jar
+
+	cd "${S}/src/lib/"
+	rm -v *.jar *.zip
+
+	java-pkg_jar-from --build-only glassfish-connector-api \
+		glassfish-connector-api.jar connector-api-1.5.jar
+
+	# the build.xml unpacks this and uses stuff
+	touch empty
+	jar cf mini-j2ee.jar empty
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="antlr-3.5,glassfish-connector-api,log4j"
+EANT_BUILD_TARGET="jars"
+EANT_DOC_TARGET="javadocs"
+
+src_compile() {
+	java-pkg_filter-compiler jikes
+	use jni && ANT_TASKS="cpptasks"
+
+	# This is nonsense, I know, but it works.
+	if use test; then
+		EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+	fi
+
+	java-pkg-2_src_compile $(use test && echo "-Dtests=true") \
+		$(use jni && echo "compile-native")
+}
+
+src_install() {
+	cd "${S}/output/lib/"
+	java-pkg_newjar ${MY_PN}-${PV}.jar ${PN}.jar
+
+	for jar in full; 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/"
+		local so_arch
+		if use amd64; then
+			so_arch="x64"
+		elif use x86; then
+			so_arch="x86"
+		fi
+		java-pkg_doso libjaybird22_${so_arch}.so || die \
+			"java-pkg_doso ${sodest}libjaybird22.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/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
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-12-06 12:07 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-06 12:07 [gentoo-commits] repo/gentoo:master commit in: dev-java/jdbc-jaybird/ James Le Cuirot
  -- strict thread matches above, loose matches on Subject: below --
2015-12-06 12:07 James Le Cuirot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox