1 |
commit: 2f1b7fab01208fea762ce9b179d2f55095c1381b |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 16 07:40:15 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 16 08:24:20 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f1b7fab |
7 |
|
8 |
dev-db/firebird: Drop 3.0.2.32703.0-r2 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/686150 |
11 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
dev-db/firebird/Manifest | 1 - |
15 |
.../files/firebird-3.0.2.32703.0-gcc6.patch | 19 -- |
16 |
dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild | 235 --------------------- |
17 |
3 files changed, 255 deletions(-) |
18 |
|
19 |
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest |
20 |
index ad827f3ecc0..51396b4f1a1 100644 |
21 |
--- a/dev-db/firebird/Manifest |
22 |
+++ b/dev-db/firebird/Manifest |
23 |
@@ -1,3 +1,2 @@ |
24 |
-DIST Firebird-3.0.2.32703-0.tar.bz2 9536416 BLAKE2B 58afbdb430adb5f9aafe33d5459fb4fe8607e9440b6b114291777e43d447a7a5b5696c9f5903a10b63217a15836ce6386569e636369e37bf83195ec0b96e4fc6 SHA512 5950d1689c77fbcda22f1bd8015321d887dec3c7ef39665428a8bda9122838e767b168442ce7d8fb3b9b80cbd1206725b0f54bd215c5c9eb1d322b546cb042e6 |
25 |
DIST Firebird-3.0.4.33054-0.tar.bz2 9778106 BLAKE2B 4b9116cbc351e0c2e10d15e6ea8e9754a383da77d8e016337604143eb2677ff2519da34b1a5c2e9b7b071fa9774eddbb535e9f926058ee626573b0411f6c042d SHA512 a346ebd53aeccf0b33eac5d35c3c3356624c1fbd0ad897173b3f68d940143062b28460a2822df807e8e8a1ea8792ebf98ed33e5b3ae273d86e6e36295a7fc8ad |
26 |
DIST ib_b60_doc.zip 10530848 BLAKE2B b4008b3e8b0416014d024cbbc9ac2e648ad671c71b91b7aeb0eedf0f8479aef80e22aff7105c5e7417e88bcf57f2cdacbc2d5f51a2ef7fb870f9d361c5f0ed6d SHA512 59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a |
27 |
|
28 |
diff --git a/dev-db/firebird/files/firebird-3.0.2.32703.0-gcc6.patch b/dev-db/firebird/files/firebird-3.0.2.32703.0-gcc6.patch |
29 |
deleted file mode 100644 |
30 |
index e1361415c03..00000000000 |
31 |
--- a/dev-db/firebird/files/firebird-3.0.2.32703.0-gcc6.patch |
32 |
+++ /dev/null |
33 |
@@ -1,19 +0,0 @@ |
34 |
-commit 3618aa2171674babf79ef935aa049c40a3db1321 |
35 |
-Author: asfernandes <asfernandes@×××××××××××××××××.net> |
36 |
-Date: Sat Mar 5 03:39:36 2016 +0000 |
37 |
- |
38 |
- Make the generated code compatible with gcc 6 in C++-14 mode. |
39 |
- |
40 |
-diff --git a/src/gpre/c_cxx.cpp b/src/gpre/c_cxx.cpp |
41 |
-index 2af96c6..2dcffd6 100644 |
42 |
---- a/src/gpre/c_cxx.cpp |
43 |
-+++ b/src/gpre/c_cxx.cpp |
44 |
-@@ -2820,7 +2820,7 @@ static void gen_request(const gpre_req* request) |
45 |
- printa(0, "static %sshort\n isc_%dl = %d;", |
46 |
- (request->req_flags & REQ_extend_dpb) ? "" : CONST_STR, |
47 |
- request->req_ident, request->req_length); |
48 |
-- printa(0, "static %schar\n isc_%d [] = {", CONST_STR, request->req_ident); |
49 |
-+ printa(0, "static %sunsigned char\n isc_%d [] = {", CONST_STR, request->req_ident); |
50 |
- |
51 |
- const TEXT* string_type = "blr"; |
52 |
- if (gpreGlob.sw_raw) |
53 |
|
54 |
diff --git a/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild b/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild |
55 |
deleted file mode 100644 |
56 |
index 8ab5dd6952c..00000000000 |
57 |
--- a/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild |
58 |
+++ /dev/null |
59 |
@@ -1,235 +0,0 @@ |
60 |
-# Copyright 1999-2018 Gentoo Foundation |
61 |
-# Distributed under the terms of the GNU General Public License v2 |
62 |
- |
63 |
-EAPI=6 |
64 |
- |
65 |
-inherit autotools flag-o-matic user versionator |
66 |
- |
67 |
-MY_P=${PN/f/F}-$(replace_version_separator 4 -) |
68 |
- |
69 |
-DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 features" |
70 |
-HOMEPAGE="https://www.firebirdsql.org/" |
71 |
-SRC_URI=" |
72 |
- mirror://sourceforge/firebird/${MY_P}.tar.bz2 |
73 |
- doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )" |
74 |
- |
75 |
-LICENSE="IDPL Interbase-1.0" |
76 |
-SLOT="0" |
77 |
-KEYWORDS="~amd64 ~x86" |
78 |
- |
79 |
-IUSE="doc examples +server xinetd" |
80 |
- |
81 |
-# FIXME: cloop? |
82 |
-CDEPEND=" |
83 |
- dev-libs/libtommath |
84 |
- dev-libs/icu:= |
85 |
- dev-libs/libedit |
86 |
-" |
87 |
-DEPEND="${CDEPEND} |
88 |
- >=dev-util/btyacc-3.0-r2 |
89 |
- doc? ( app-arch/unzip ) |
90 |
-" |
91 |
-RDEPEND="${CDEPEND} |
92 |
- xinetd? ( virtual/inetd ) |
93 |
- !sys-cluster/ganglia |
94 |
-" |
95 |
- |
96 |
-S="${WORKDIR}/${MY_P}" |
97 |
- |
98 |
-PATCHES=( |
99 |
- "${FILESDIR}/${P}"-unbundle.patch |
100 |
- "${FILESDIR}/${P}"-gcc6.patch |
101 |
- "${FILESDIR}/${P}"-cloop-compiler.patch |
102 |
-) |
103 |
- |
104 |
-pkg_pretend() { |
105 |
- if [[ -e /var/run/${PN}/${PN}.pid ]] ; then |
106 |
- ewarn |
107 |
- ewarn "The presence of server connections may prevent isql or gsec" |
108 |
- ewarn "from establishing an embedded connection. Accordingly," |
109 |
- ewarn "creating employee.fdb or security3.fdb could fail." |
110 |
- ewarn "It is more secure to stop the firebird daemon before running emerge." |
111 |
- ewarn |
112 |
- fi |
113 |
-} |
114 |
- |
115 |
-pkg_setup() { |
116 |
- enewgroup firebird 450 |
117 |
- enewuser firebird 450 /bin/sh /usr/$(get_libdir)/firebird firebird |
118 |
-} |
119 |
- |
120 |
-check_sed() { |
121 |
- MSG="sed of $3, required $2 line(s) modified $1" |
122 |
- einfo "${MSG}" |
123 |
- [[ $1 -ge $2 ]] || die "${MSG}" |
124 |
-} |
125 |
- |
126 |
-src_unpack() { |
127 |
- unpack "${MY_P}.tar.bz2" |
128 |
- if use doc; then |
129 |
- # Unpack docs |
130 |
- mkdir "manuals" || die |
131 |
- cd "manuals" || die |
132 |
- unpack ib_b60_doc.zip |
133 |
- fi |
134 |
-} |
135 |
- |
136 |
-src_prepare() { |
137 |
- default |
138 |
- |
139 |
- # Rename references to isql to fbsql |
140 |
- # sed vs patch for portability and addtional location changes |
141 |
- check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \ |
142 |
- src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line |
143 |
- check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \ |
144 |
- src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 lines |
145 |
- check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \ |
146 |
- -e 's:isql :fbsql :w /dev/stdout' \ |
147 |
- -e 's:ISQL :FBSQL :w /dev/stdout' \ |
148 |
- src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines |
149 |
- |
150 |
- find . -name \*.sh -exec chmod +x {} + || die |
151 |
- rm -r extern/{btyacc,editline,icu} || die |
152 |
- |
153 |
- eautoreconf |
154 |
-} |
155 |
- |
156 |
-src_configure() { |
157 |
- filter-flags -fprefetch-loop-arrays |
158 |
- filter-mfpmath sse |
159 |
- |
160 |
- # otherwise this doesnt build with gcc-6 |
161 |
- # http://tracker.firebirdsql.org/browse/CORE-5099 |
162 |
- append-cflags -fno-sized-deallocation -fno-delete-null-pointer-checks |
163 |
- append-cxxflags -fno-sized-deallocation -fno-delete-null-pointer-checks -std=c++11 |
164 |
- |
165 |
- econf \ |
166 |
- --prefix=/usr/$(get_libdir)/firebird \ |
167 |
- --with-editline \ |
168 |
- --with-system-editline \ |
169 |
- --with-fbbin=/usr/bin \ |
170 |
- --with-fbsbin=/usr/sbin \ |
171 |
- --with-fbconf=/etc/${PN} \ |
172 |
- --with-fblib=/usr/$(get_libdir) \ |
173 |
- --with-fbinclude=/usr/include \ |
174 |
- --with-fbdoc=/usr/share/doc/${PF} \ |
175 |
- --with-fbudf=/usr/$(get_libdir)/${PN}/UDF \ |
176 |
- --with-fbsample=/usr/share/doc/${PF}/examples \ |
177 |
- --with-fbsample-db=/usr/share/doc/${PF}/examples/db \ |
178 |
- --with-fbhelp=/usr/$(get_libdir)/${PN}/help \ |
179 |
- --with-fbintl=/usr/$(get_libdir)/${PN}/intl \ |
180 |
- --with-fbmisc=/usr/share/${PN} \ |
181 |
- --with-fbsecure-db=/etc/${PN} \ |
182 |
- --with-fbmsg=/usr/$(get_libdir)/${PN} \ |
183 |
- --with-fblog=/var/log/${PN}/ \ |
184 |
- --with-fbglock=/var/run/${PN} \ |
185 |
- --with-fbplugins=/usr/$(get_libdir)/${PN}/plugins \ |
186 |
- --with-gnu-ld \ |
187 |
- ${myconf} |
188 |
-} |
189 |
- |
190 |
-# from linux underground, merging into this here |
191 |
-src_install() { |
192 |
- if use doc; then |
193 |
- dodoc -r doc |
194 |
- find "${WORKDIR}"/manuals -type f -iname "*.pdf" -exec dodoc '{}' + || die |
195 |
- fi |
196 |
- |
197 |
- cd "${S}/gen/Release/${PN}" || die |
198 |
- |
199 |
- doheader include/* |
200 |
- dolib.so lib/*.so* |
201 |
- |
202 |
- # links for backwards compatibility |
203 |
- insinto /usr/$(get_libdir) |
204 |
- dosym libfbclient.so /usr/$(get_libdir)/libgds.so |
205 |
- dosym libfbclient.so /usr/$(get_libdir)/libgds.so.0 |
206 |
- dosym libfbclient.so /usr/$(get_libdir)/libfbclient.so.1 |
207 |
- |
208 |
- insinto /usr/share/${PN}/msg |
209 |
- doins *.msg |
210 |
- |
211 |
- use server || return |
212 |
- |
213 |
- einfo "Renaming isql -> fbsql" |
214 |
- mv bin/isql bin/fbsql || die "failed to rename isql -> fbsql" |
215 |
- |
216 |
- dobin bin/{fb_config,fbsql,fbsvcmgr,fbtracemgr,gbak,gfix,gpre,gsec,gsplit,gstat,nbackup,qli} |
217 |
- dosbin bin/{firebird,fbguard,fb_lock_print} |
218 |
- |
219 |
- insinto /usr/share/${PN}/help |
220 |
- # why??? |
221 |
- insopts -m0660 -o firebird -g firebird |
222 |
- doins help/help.fdb |
223 |
- |
224 |
- exeinto /usr/$(get_libdir)/${PN}/intl |
225 |
- doexe intl/libfbintl.so |
226 |
- dosym libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl.so |
227 |
- |
228 |
- insinto /usr/$(get_libdir)/${PN}/intl |
229 |
- insopts -m0644 -o root -g root |
230 |
- doins intl/fbintl.conf |
231 |
- |
232 |
- # plugins |
233 |
- exeinto /usr/$(get_libdir)/${PN}/plugins |
234 |
- doexe plugins/*.so |
235 |
- exeinto /usr/$(get_libdir)/${PN}/plugins/udr |
236 |
- doexe plugins/udr/*.so |
237 |
- |
238 |
- exeinto /usr/$(get_libdir)/${PN}/UDF |
239 |
- doexe UDF/*.so |
240 |
- |
241 |
- # logging (do we really need the perms?) |
242 |
- diropts -m 755 -o firebird -g firebird |
243 |
- dodir /var/log/${PN} |
244 |
- keepdir /var/log/${PN} |
245 |
- |
246 |
- # logrotate |
247 |
- insinto /etc/logrotate.d |
248 |
- newins "${FILESDIR}/${PN}.logrotate" ${PN} |
249 |
- |
250 |
- # configuration files |
251 |
- insinto /etc/${PN}/plugins |
252 |
- doins plugins/udr_engine.conf |
253 |
- insinto /etc/${PN} |
254 |
- doins {databases,fbtrace,firebird,plugins}.conf |
255 |
- |
256 |
- # install secutity3.fdb |
257 |
- insopts -m0660 -o firebird -g firebird |
258 |
- doins security3.fdb |
259 |
- |
260 |
- if use xinetd; then |
261 |
- insinto /etc/xinetd.d |
262 |
- newins "${FILESDIR}/${PN}.xinetd.3.0" ${PN} |
263 |
- else |
264 |
- newinitd "${FILESDIR}/${PN}.init.d.3.0" ${PN} |
265 |
- fi |
266 |
- |
267 |
- if use examples; then |
268 |
- cd examples |
269 |
- insinto /usr/share/${PN}/examples |
270 |
- insopts -m0644 -o root -g root |
271 |
- doins -r api |
272 |
- doins -r dbcrypt |
273 |
- doins -r include |
274 |
- doins -r interfaces |
275 |
- doins -r package |
276 |
- doins -r stat |
277 |
- doins -r udf |
278 |
- doins -r udr |
279 |
- doins CMakeLists.txt |
280 |
- doins functions.c |
281 |
- doins README |
282 |
- insinto /usr/share/${PN}/examples/empbuild |
283 |
- insopts -m0660 -o firebird -g firebird |
284 |
- doins empbuild/employee.fdb |
285 |
- fi |
286 |
- |
287 |
- einfo |
288 |
- elog "Starting with version 3, server mode is set in firebird.conf" |
289 |
- elog "The default setting is superserver." |
290 |
- einfo |
291 |
- elog "If you're using UDFs, please remember to move them to /usr/$(get_libdir)/firebird/UDF" |
292 |
- einfo |
293 |
- ewarn "${CATEGORY}/${PF} is still a tad experimental. Please test and file bugs!" |
294 |
-} |