summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-java/jdbc-jaybird/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-java/jdbc-jaybird/files')
-rw-r--r--dev-java/jdbc-jaybird/files/2.1.6-remove-unused-ant-import.patch12
-rw-r--r--dev-java/jdbc-jaybird/files/archive-xml-2.1.0.patch11
-rw-r--r--dev-java/jdbc-jaybird/files/compile_xml-2.1.2.patch21
3 files changed, 44 insertions, 0 deletions
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
new file mode 100644
index 000000000000..2a32c5a4126f
--- /dev/null
+++ b/dev-java/jdbc-jaybird/files/2.1.6-remove-unused-ant-import.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 000000000000..a6d36de8a7db
--- /dev/null
+++ b/dev-java/jdbc-jaybird/files/archive-xml-2.1.0.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..d66e7bf40049
--- /dev/null
+++ b/dev-java/jdbc-jaybird/files/compile_xml-2.1.2.patch
@@ -0,0 +1,21 @@
+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}"