1 |
commit: 9d889c5adda8e810553c918319abb11652d0dd25 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 19 21:46:07 2016 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 19 21:46:55 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d889c5a |
7 |
|
8 |
dev-java/jdbc-jaybird: Remove old version that requires Java 6 |
9 |
|
10 |
This drops the only stable version but there are no revdeps and the |
11 |
only likely user of this (wltjr) says he doesn't mind. |
12 |
|
13 |
Package-Manager: portage-2.2.27 |
14 |
|
15 |
dev-java/jdbc-jaybird/Manifest | 1 - |
16 |
.../files/2.1.6-remove-unused-ant-import.patch | 12 --- |
17 |
.../jdbc-jaybird/files/archive-xml-2.1.0.patch | 11 --- |
18 |
.../jdbc-jaybird/files/compile_xml-2.1.2.patch | 21 ----- |
19 |
dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild | 97 ---------------------- |
20 |
5 files changed, 142 deletions(-) |
21 |
|
22 |
diff --git a/dev-java/jdbc-jaybird/Manifest b/dev-java/jdbc-jaybird/Manifest |
23 |
index f6ee813..2502905 100644 |
24 |
--- a/dev-java/jdbc-jaybird/Manifest |
25 |
+++ b/dev-java/jdbc-jaybird/Manifest |
26 |
@@ -1,2 +1 @@ |
27 |
-DIST Jaybird-2.1.5-src.zip 6047595 SHA256 3b475bca2cc5c3cbf6032c75ff2ea47d2e77abad18df36e149c1eaccfc15a868 SHA512 e6d7eb70cf59d5d9a2dd7817bc11574ba5f014f2aae6cb6c4b141e7d0a172cf091b950e3475ee5d4389f3ca3efae3f34ed1efbc694b74a2a99adc2694c936a7e WHIRLPOOL ca5e3fedce5f13a00ea37f946f9f0141d3132ea3b9209623961b32868946dd0e36621d0280716263031bc02dbcc7f8cd80de29da5e0235127d9c0d9e4deea54e |
28 |
DIST Jaybird-2.2.9-src.zip 9833669 SHA256 46b807c85efd3531aef612b5d7a71e570c02e344cf73d67890c1194d3a250828 SHA512 487e64658553f60fa2a1f9b6d7136504119bac2905c6480cac01a94ce2c6e70b82449ee9a1b9b1ee96a12646ef69064d542401fc62564662f14531dea3790e6e WHIRLPOOL f3197921d0eca901662353ab5150ba62b72ac40ccf884f78f229fadac2239bc56964d5ae452d0dcddf82099b66a71c734beaffe6b8a4b3d9bffec98061d7dc0a |
29 |
|
30 |
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 |
31 |
deleted file mode 100644 |
32 |
index 2a32c5a..0000000 |
33 |
--- a/dev-java/jdbc-jaybird/files/2.1.6-remove-unused-ant-import.patch |
34 |
+++ /dev/null |
35 |
@@ -1,12 +0,0 @@ |
36 |
-diff --git a/src/main/org/firebirdsql/jdbc/AbstractDatabaseMetaData.java b/src/main/org/firebirdsql/jdbc/AbstractDatabaseMetaData.java |
37 |
-index 179f58b..fec2ac7 100644 |
38 |
---- a/src/main/org/firebirdsql/jdbc/AbstractDatabaseMetaData.java |
39 |
-+++ b/src/main/org/firebirdsql/jdbc/AbstractDatabaseMetaData.java |
40 |
-@@ -23,7 +23,6 @@ package org.firebirdsql.jdbc; |
41 |
- import java.sql.*; |
42 |
- import java.util.*; |
43 |
- |
44 |
--import org.apache.tools.ant.taskdefs.Get.DownloadProgress; |
45 |
- import org.firebirdsql.gds.*; |
46 |
- import org.firebirdsql.gds.impl.AbstractGDS; |
47 |
- import org.firebirdsql.gds.impl.AbstractIscDbHandle; |
48 |
|
49 |
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 |
50 |
deleted file mode 100644 |
51 |
index a6d36de..0000000 |
52 |
--- a/dev-java/jdbc-jaybird/files/archive-xml-2.1.0.patch |
53 |
+++ /dev/null |
54 |
@@ -1,11 +0,0 @@ |
55 |
---- client-java/build/archive.xml 2005-06-25 19:26:26.000000000 -0400 |
56 |
-+++ build/archive.xml 2006-05-09 12:41:03.000000000 -0400 |
57 |
-@@ -57,7 +57,7 @@ |
58 |
- |
59 |
- </target> |
60 |
- |
61 |
-- <target name="jar-test" depends="compile"> |
62 |
-+ <target name="jar-test" depends="compile" if="tests"> |
63 |
- |
64 |
- <mkdir dir="${build.lib}"/> |
65 |
- <jar jarfile="${build.lib}/${archive.name.test}" manifest="${build.etc}/default.mf"> |
66 |
|
67 |
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 |
68 |
deleted file mode 100644 |
69 |
index d66e7bf..0000000 |
70 |
--- a/dev-java/jdbc-jaybird/files/compile_xml-2.1.2.patch |
71 |
+++ /dev/null |
72 |
@@ -1,21 +0,0 @@ |
73 |
-diff -Naur client-java_orig/build/compile.xml client-java/build/compile.xml |
74 |
---- client-java_orig/build/compile.xml 2008-02-07 20:46:24.000000000 -0500 |
75 |
-+++ client-java/build/compile.xml 2008-02-13 14:46:08.000000000 -0500 |
76 |
-@@ -13,7 +13,7 @@ |
77 |
- <ant antfile="build_native.xml"/> |
78 |
- </target> |
79 |
- |
80 |
-- <target name="compile-examples"> |
81 |
-+ <target name="compile-examples" if="examples"> |
82 |
- <mkdir dir="${build.examples}"/> |
83 |
- <javac srcdir="${source.examples}" |
84 |
- destdir="${build.examples}" |
85 |
-@@ -154,7 +154,7 @@ |
86 |
- </path> |
87 |
- </target> |
88 |
- |
89 |
-- <target name="compile-tests" depends="compile-pool,set-jdbc-20-test,set-jdbc-30-test,set-jdbc-30-test"> |
90 |
-+ <target name="compile-tests" depends="compile-pool,set-jdbc-20-test,set-jdbc-30-test,set-jdbc-30-test" if="tests"> |
91 |
- <mkdir dir="${build.test}"/> |
92 |
- <javac srcdir="${source.test}" |
93 |
- destdir="${build.test}" |
94 |
|
95 |
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 |
96 |
deleted file mode 100644 |
97 |
index 49e9018..0000000 |
98 |
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild |
99 |
+++ /dev/null |
100 |
@@ -1,97 +0,0 @@ |
101 |
-# Copyright 1999-2016 Gentoo Foundation |
102 |
-# Distributed under the terms of the GNU General Public License v2 |
103 |
-# $Id$ |
104 |
- |
105 |
-JAVA_PKG_IUSE="doc source examples test" |
106 |
- |
107 |
-inherit eutils java-pkg-2 java-ant-2 |
108 |
- |
109 |
-At="Jaybird-${PV/_/}-src" |
110 |
-DESCRIPTION="JDBC Type 2 and 4 drivers for Firebird SQL server" |
111 |
-HOMEPAGE="http://jaybirdwiki.firebirdsql.org/" |
112 |
-SRC_URI="mirror://sourceforge/firebird/${At}.zip" |
113 |
-LICENSE="LGPL-2" |
114 |
-SLOT="0" |
115 |
-KEYWORDS="amd64 x86" |
116 |
-IUSE="" |
117 |
- |
118 |
-RDEPEND=">=virtual/jre-1.6 |
119 |
- dev-java/ant-core |
120 |
- dev-java/log4j" |
121 |
-DEPEND="=virtual/jdk-1.6* |
122 |
- app-arch/unzip |
123 |
- dev-java/ant-core |
124 |
- dev-java/log4j |
125 |
- test? ( |
126 |
- =dev-java/junit-3.8* |
127 |
- dev-java/ant-junit |
128 |
- )" |
129 |
- |
130 |
-S="${WORKDIR}/client-java" |
131 |
- |
132 |
-MY_PN="jaybird" |
133 |
- |
134 |
-src_unpack() { |
135 |
- unpack ${A} |
136 |
- cd "${S}" |
137 |
- |
138 |
- epatch "${FILESDIR}/archive-xml-2.1.0.patch" |
139 |
- epatch "${FILESDIR}/compile_xml-2.1.2.patch" |
140 |
- |
141 |
- cd "${S}/lib/" |
142 |
- rm -v *.jar |
143 |
- use test && java-pkg_jar-from --build-only junit junit.jar |
144 |
- |
145 |
- cd "${S}/src/lib/" |
146 |
- # the build.xml unpacks this and uses stuff |
147 |
- mv mini-j2ee.jar "${T}" || die "Failed to move mini-j2ee.jar to ${T}" |
148 |
- rm -v *.jar *.zip |
149 |
- mv "${T}"/mini-j2ee.jar . || die "Failed to move mini-j2ee.jar back from ${T}" |
150 |
- |
151 |
- # Hack to add ant.jar to classpath without patch |
152 |
- java-pkg_jar-from ant-core ant.jar jaas.jar |
153 |
- java-pkg_jar-from log4j log4j.jar log4j-core.jar |
154 |
-} |
155 |
- |
156 |
-src_compile() { |
157 |
- java-pkg_filter-compiler jikes |
158 |
- eant $(use test && echo "-Dtests=true") jars \ |
159 |
- $(use_doc javadocs) |
160 |
-} |
161 |
- |
162 |
-src_install() { |
163 |
- cd "${S}/output/lib/" |
164 |
- java-pkg_newjar ${MY_PN}-${PV}.jar ${PN}.jar |
165 |
- |
166 |
- for jar in full pool; do |
167 |
- java-pkg_newjar ${MY_PN}-${jar}-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed" |
168 |
- done |
169 |
- if use test; then |
170 |
- java-pkg_newjar ${MY_PN}-test-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed" |
171 |
- fi |
172 |
- |
173 |
- cd "${S}" |
174 |
- |
175 |
- if use examples; then |
176 |
- insinto /usr/share/doc/${PF}/ |
177 |
- doins -r examples || die "installing examples failed" |
178 |
- fi |
179 |
- |
180 |
- use source && java-pkg_dosrc "${S}"/src/*/org |
181 |
- |
182 |
- cd "${S}/output" |
183 |
- use doc && java-pkg_dohtml -r docs/ |
184 |
- dodoc etc/{*.txt,default.mf} |
185 |
- dohtml etc/*.html |
186 |
-} |
187 |
- |
188 |
-src_test() { |
189 |
- # |
190 |
- # Warning about timeouts without Firebird installed and running Locally |
191 |
- # |
192 |
- ewarn "You will experience long timeouts when running junit tests" |
193 |
- ewarn "without Firebird installed and running locally. The tests will" |
194 |
- ewarn "complete without Firebird, but network timeouts prolong the" |
195 |
- ewarn "testing phase considerably." |
196 |
- ANT_TASKS="ant-junit" eant all-tests-pure-java |
197 |
-} |