diff options
-rw-r--r-- | dev-java/jdbc-jaybird/Manifest | 1 | ||||
-rw-r--r-- | dev-java/jdbc-jaybird/files/2.1.6-remove-unused-ant-import.patch | 12 | ||||
-rw-r--r-- | dev-java/jdbc-jaybird/files/archive-xml-2.1.0.patch | 11 | ||||
-rw-r--r-- | dev-java/jdbc-jaybird/files/compile_xml-2.1.2.patch | 21 | ||||
-rw-r--r-- | dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild | 97 |
5 files changed, 0 insertions, 142 deletions
diff --git a/dev-java/jdbc-jaybird/Manifest b/dev-java/jdbc-jaybird/Manifest index f6ee813dffb..2502905fe59 100644 --- a/dev-java/jdbc-jaybird/Manifest +++ b/dev-java/jdbc-jaybird/Manifest @@ -1,2 +1 @@ -DIST Jaybird-2.1.5-src.zip 6047595 SHA256 3b475bca2cc5c3cbf6032c75ff2ea47d2e77abad18df36e149c1eaccfc15a868 SHA512 e6d7eb70cf59d5d9a2dd7817bc11574ba5f014f2aae6cb6c4b141e7d0a172cf091b950e3475ee5d4389f3ca3efae3f34ed1efbc694b74a2a99adc2694c936a7e WHIRLPOOL ca5e3fedce5f13a00ea37f946f9f0141d3132ea3b9209623961b32868946dd0e36621d0280716263031bc02dbcc7f8cd80de29da5e0235127d9c0d9e4deea54e DIST Jaybird-2.2.9-src.zip 9833669 SHA256 46b807c85efd3531aef612b5d7a71e570c02e344cf73d67890c1194d3a250828 SHA512 487e64658553f60fa2a1f9b6d7136504119bac2905c6480cac01a94ce2c6e70b82449ee9a1b9b1ee96a12646ef69064d542401fc62564662f14531dea3790e6e WHIRLPOOL f3197921d0eca901662353ab5150ba62b72ac40ccf884f78f229fadac2239bc56964d5ae452d0dcddf82099b66a71c734beaffe6b8a4b3d9bffec98061d7dc0a diff --git a/dev-java/jdbc-jaybird/files/2.1.6-remove-unused-ant-import.patch b/dev-java/jdbc-jaybird/files/2.1.6-remove-unused-ant-import.patch deleted file mode 100644 index 2a32c5a4126..00000000000 --- a/dev-java/jdbc-jaybird/files/2.1.6-remove-unused-ant-import.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/main/org/firebirdsql/jdbc/AbstractDatabaseMetaData.java b/src/main/org/firebirdsql/jdbc/AbstractDatabaseMetaData.java -index 179f58b..fec2ac7 100644 ---- a/src/main/org/firebirdsql/jdbc/AbstractDatabaseMetaData.java -+++ b/src/main/org/firebirdsql/jdbc/AbstractDatabaseMetaData.java -@@ -23,7 +23,6 @@ package org.firebirdsql.jdbc; - import java.sql.*;
- import java.util.*;
-
--import org.apache.tools.ant.taskdefs.Get.DownloadProgress;
- import org.firebirdsql.gds.*;
- import org.firebirdsql.gds.impl.AbstractGDS;
- import org.firebirdsql.gds.impl.AbstractIscDbHandle;
diff --git a/dev-java/jdbc-jaybird/files/archive-xml-2.1.0.patch b/dev-java/jdbc-jaybird/files/archive-xml-2.1.0.patch deleted file mode 100644 index a6d36de8a7d..00000000000 --- a/dev-java/jdbc-jaybird/files/archive-xml-2.1.0.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- client-java/build/archive.xml 2005-06-25 19:26:26.000000000 -0400 -+++ build/archive.xml 2006-05-09 12:41:03.000000000 -0400 -@@ -57,7 +57,7 @@ -
- </target>
-
-- <target name="jar-test" depends="compile">
-+ <target name="jar-test" depends="compile" if="tests">
-
- <mkdir dir="${build.lib}"/>
- <jar jarfile="${build.lib}/${archive.name.test}" manifest="${build.etc}/default.mf">
diff --git a/dev-java/jdbc-jaybird/files/compile_xml-2.1.2.patch b/dev-java/jdbc-jaybird/files/compile_xml-2.1.2.patch deleted file mode 100644 index d66e7bf4004..00000000000 --- a/dev-java/jdbc-jaybird/files/compile_xml-2.1.2.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur client-java_orig/build/compile.xml client-java/build/compile.xml ---- client-java_orig/build/compile.xml 2008-02-07 20:46:24.000000000 -0500 -+++ client-java/build/compile.xml 2008-02-13 14:46:08.000000000 -0500 -@@ -13,7 +13,7 @@ - <ant antfile="build_native.xml"/>
- </target>
-
-- <target name="compile-examples">
-+ <target name="compile-examples" if="examples">
- <mkdir dir="${build.examples}"/>
- <javac srcdir="${source.examples}"
- destdir="${build.examples}"
-@@ -154,7 +154,7 @@ - </path>
- </target>
-
-- <target name="compile-tests" depends="compile-pool,set-jdbc-20-test,set-jdbc-30-test,set-jdbc-30-test">
-+ <target name="compile-tests" depends="compile-pool,set-jdbc-20-test,set-jdbc-30-test,set-jdbc-30-test" if="tests">
- <mkdir dir="${build.test}"/>
- <javac srcdir="${source.test}"
- destdir="${build.test}"
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild deleted file mode 100644 index 49e90180d82..00000000000 --- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2016 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 x86" -IUSE="" - -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 - 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_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 - - 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 -} |