Gentoo Archives: gentoo-commits

From: "Jorge Manuel B. S. Vicetto" <jmbsvicetto@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/jmbsvicetto:master commit in: dev-db/libdbi-drivers/, dev-db/libdbi/, dev-db/libdbi/files/, ...
Date: Sun, 08 May 2016 18:10:50
Message-Id: 1462731014.773b703789638fcf398dfb76ff965c509b16bba5.jmbsvicetto@gentoo
1 commit: 773b703789638fcf398dfb76ff965c509b16bba5
2 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 8 18:09:43 2016 +0000
4 Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
5 CommitDate: Sun May 8 18:10:14 2016 +0000
6 URL: https://gitweb.gentoo.org/dev/jmbsvicetto.git/commit/?id=773b7037
7
8 Drop libdbi* packages.
9
10 Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
11
12 dev-db/libdbi-drivers/Manifest | 1 -
13 .../files/libdbi-drivers-0.8.3-doc-build-fix.patch | 15 ----
14 .../files/libdbi-drivers-0.8.3-firebird-fix.patch | 25 -------
15 .../files/libdbi-drivers-0.8.3-fix-ac-macro.patch | 12 ---
16 .../libdbi-drivers-0.8.3-oracle-build-fix.patch | 12 ---
17 .../libdbi-drivers/libdbi-drivers-0.8.3-r2.ebuild | 87 ----------------------
18 dev-db/libdbi-drivers/metadata.xml | 8 --
19 dev-db/libdbi/Manifest | 1 -
20 dev-db/libdbi/files/dbi.pc.in | 10 ---
21 dev-db/libdbi/files/libdbi-0.8.1-pkg-config.patch | 8 --
22 .../libdbi/files/libdbi-0.8.4-doc-build-fix.patch | 22 ------
23 .../libdbi/files/libdbi-0.8.4-fix-ac-macro.patch | 12 ---
24 dev-db/libdbi/libdbi-0.8.4.ebuild | 59 ---------------
25 dev-db/libdbi/metadata.xml | 8 --
26 14 files changed, 280 deletions(-)
27
28 diff --git a/dev-db/libdbi-drivers/Manifest b/dev-db/libdbi-drivers/Manifest
29 deleted file mode 100644
30 index 7265a69..0000000
31 --- a/dev-db/libdbi-drivers/Manifest
32 +++ /dev/null
33 @@ -1 +0,0 @@
34 -DIST libdbi-drivers-0.8.3-1.tar.gz 1534420 SHA256 4ab9944398ce769c0deeb64d2f73555c67bc25ccd2ade1ccf552226c7b2acf72 SHA512 c2cb76234b9137cc4a05af42a69ea7d5b08586287378406cbd4d114598598057f29cccb368bfbe0f86e19846ceab88ed636cccff6555ef9f7eebbb98bbcd3824 WHIRLPOOL fc8df681ccdf6995727b0bf7aa315090dc4af2849c02e6b78913f6d5ecdc51c5e60b7eba3f515050a4ae93e74dfa7f1dcc1f7aca7fe3c12e3f02ecfd04184700
35
36 diff --git a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-doc-build-fix.patch b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-doc-build-fix.patch
37 deleted file mode 100644
38 index f3caedb..0000000
39 --- a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-doc-build-fix.patch
40 +++ /dev/null
41 @@ -1,15 +0,0 @@
42 -diff -Nuar libdbi-drivers-0.8.3-1.orig/configure.in libdbi-drivers-0.8.3-1/configure.in
43 ---- libdbi-drivers-0.8.3-1.orig/configure.in 2008-10-09 17:09:09.303141877 -0700
44 -+++ libdbi-drivers-0.8.3-1/configure.in 2008-10-09 17:10:48.100635797 -0700
45 -@@ -149,7 +149,8 @@
46 --ac_docs="YES"
47 -+ac_docs="no"
48 - AC_ARG_ENABLE(docs,
49 - [ --disable-docs do not build and install the documentation.],
50 -- [ ac_docs="NO" ])
51 -+ [ ac_docs="$enableval" ],
52 -+ [ ac_docs="no" ])
53 -
54 --if test "$ac_docs" = "YES"; then
55 -+if test "$ac_docs" = "yes"; then
56 - dnl AC_PATH_PROGS(myjade, openjade jade)
57
58 diff --git a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-firebird-fix.patch b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-firebird-fix.patch
59 deleted file mode 100644
60 index 6a50474..0000000
61 --- a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-firebird-fix.patch
62 +++ /dev/null
63 @@ -1,25 +0,0 @@
64 -diff -Nuar libdbi-drivers-0.8.3-1.orig/acinclude.m4 libdbi-drivers-0.8.3-1/acinclude.m4
65 ---- libdbi-drivers-0.8.3-1.orig/acinclude.m4 2007-12-30 11:05:40.000000000 +0000
66 -+++ libdbi-drivers-0.8.3-1/acinclude.m4 2009-10-26 06:50:49.823477194 +0000
67 -@@ -450,8 +450,8 @@
68 - firebird_incdirs="/opt/firebird/include /usr/include /usr/local/include /usr/include/firebird /usr/local/include/firebird /usr/local/firebird/include /opt/firebird/include"
69 - AC_FIND_FILE(ibase.h, $firebird_incdirs, ac_firebird_incdir)
70 - firebird_libdirs="/opt/firebird/lib /usr/lib /usr/local/lib /usr/lib/firebird /usr/local/lib/firebird /usr/local/firebird/lib /opt/firebird/lib"
71 --dnl AC_FIND_FILE(libfbclient.so, $firebird_libdirs, ac_firebird_libdir)
72 -- AC_FIND_FILE(libfbembed.so, $firebird_libdirs, ac_firebird_libdir)
73 -+ AC_FIND_FILE(libfbclient.so, $firebird_libdirs, ac_firebird_libdir)
74 -+dnl AC_FIND_FILE(libfbembed.so, $firebird_libdirs, ac_firebird_libdir)
75 - if test "$ac_firebird_incdir" = "no"; then
76 - AC_MSG_RESULT(no)
77 - AC_MSG_ERROR([Invalid Firebird/Interbase directory - include files not found.])
78 -@@ -479,8 +479,8 @@
79 - [SCHAR_MSG="no"])
80 - AC_MSG_RESULT([$SCHAR_MSG])
81 -
82 --dnl FIREBIRD_LIBS="-lfbclient"
83 -- FIREBIRD_LIBS="-lfbembed"
84 -+ FIREBIRD_LIBS="-lfbclient"
85 -+dnl FIREBIRD_LIBS="-lfbembed"
86 - FIREBIRD_INCLUDE="-I$ac_firebird_incdir"
87 - FIREBIRD_LDFLAGS="-L$ac_firebird_libdir"
88 -
89
90 diff --git a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-fix-ac-macro.patch b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-fix-ac-macro.patch
91 deleted file mode 100644
92 index d650956..0000000
93 --- a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-fix-ac-macro.patch
94 +++ /dev/null
95 @@ -1,12 +0,0 @@
96 -diff -ur libdbi-drivers-0.8.3-1-old/configure.in libdbi-drivers-0.8.3-1/configure.in
97 ---- libdbi-drivers-0.8.3-1-old/configure.in 2013-05-14 02:28:23.315926087 +0000
98 -+++ libdbi-drivers-0.8.3-1/configure.in 2013-05-14 02:29:05.655762313 +0000
99 -@@ -3,7 +3,7 @@
100 - AM_MAINTAINER_MODE
101 -
102 - AM_INIT_AUTOMAKE(libdbi-drivers, 0.8.3-1)
103 --AM_CONFIG_HEADER(config.h)
104 -+AC_CONFIG_HEADERS(config.h)
105 - AC_LIBTOOL_WIN32_DLL
106 -
107 - dnl library versioning currently unnecessary...
108
109 diff --git a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-oracle-build-fix.patch b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-oracle-build-fix.patch
110 deleted file mode 100644
111 index ad73595..0000000
112 --- a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-oracle-build-fix.patch
113 +++ /dev/null
114 @@ -1,12 +0,0 @@
115 -diff -urN libdbi-drivers-0.8.3-1.orig/drivers/oracle/dbd_oracle.c libdbi-drivers-0.8.3-1/drivers/oracle/dbd_oracle.c
116 ---- libdbi-drivers-0.8.3-1.orig/drivers/oracle/dbd_oracle.c 2009-01-26 16:31:42.000000000 +0300
117 -+++ libdbi-drivers-0.8.3-1/drivers/oracle/dbd_oracle.c 2009-01-26 16:32:38.000000000 +0300
118 -@@ -841,7 +841,7 @@
119 - {
120 - struct tm tmt;
121 - /* char stime[101], *cp = NULL; */
122 --/* time_t loct = 0L; */
123 -+ time_t loct = 0L;
124 -
125 - /* memset(stime, 0, sizeof(stime)); */
126 -
127
128 diff --git a/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r2.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r2.ebuild
129 deleted file mode 100644
130 index b1e7388..0000000
131 --- a/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r2.ebuild
132 +++ /dev/null
133 @@ -1,87 +0,0 @@
134 -# Copyright 1999-2012 Gentoo Foundation
135 -# Distributed under the terms of the GNU General Public License v2
136 -# $Id$
137 -
138 -EAPI=4
139 -
140 -inherit eutils autotools
141 -
142 -MY_P="${P}-1"
143 -
144 -DESCRIPTION="The libdbi-drivers project maintains drivers for libdbi."
145 -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
146 -HOMEPAGE="http://libdbi-drivers.sourceforge.net/"
147 -LICENSE="LGPL-2.1"
148 -
149 -IUSE="bindist doc firebird mysql oci8 postgres +sqlite static-libs"
150 -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
151 -SLOT=0
152 -
153 -RDEPEND="
154 - >=dev-db/libdbi-0.8.3
155 - firebird? ( dev-db/firebird )
156 - mysql? ( virtual/mysql )
157 - postgres? ( dev-db/postgresql-base )
158 - sqlite? ( dev-db/sqlite:3 )
159 -"
160 -DEPEND="${RDEPEND}
161 - doc? ( app-text/openjade )
162 -"
163 -
164 -S="${WORKDIR}/${MY_P}"
165 -
166 -REQUIRED_USE="
167 - firebird? ( !bindist )
168 - || ( mysql postgres sqlite firebird oci8 )
169 -"
170 -
171 -DOCS="AUTHORS ChangeLog NEWS README README.osx TODO"
172 -
173 -pkg_setup() {
174 - use oci8 && [[ -z "${ORACLE_HOME}" ]] && die "\$ORACLE_HOME is not set!"
175 -}
176 -
177 -src_prepare() {
178 - epatch \
179 - "${FILESDIR}"/${P}-fix-ac-macro.patch \
180 - "${FILESDIR}"/${PN}-0.8.3-doc-build-fix.patch \
181 - "${FILESDIR}"/${PN}-0.8.3-oracle-build-fix.patch \
182 - "${FILESDIR}"/${PN}-0.8.3-firebird-fix.patch
183 - eautoreconf
184 -}
185 -
186 -src_configure() {
187 - local myconf=""
188 - # WARNING: the configure script does NOT work correctly
189 - # --without-$driver does NOT work
190 - # so do NOT use `use_with...`
191 - use mysql && myconf+=" --with-mysql"
192 - use postgres && myconf+=" --with-pgsql"
193 - use sqlite && myconf+=" --with-sqlite3"
194 - use firebird && myconf+=" --with-firebird"
195 - if use oci8; then
196 - [[ -z "${ORACLE_HOME}" ]] && die "\$ORACLE_HOME is not set!"
197 - myconf+=" --with-oracle-dir=${ORACLE_HOME} --with-oracle"
198 - fi
199 -
200 - econf \
201 - $(use_enable doc docs) \
202 - $(use_enable static-libs static) \
203 - ${myconf}
204 -}
205 -
206 -src_test() {
207 - if [[ -z "${WANT_INTERACTIVE_TESTS}" ]]; then
208 - ewarn "Tests disabled due to interactivity."
209 - ewarn "Run with WANT_INTERACTIVE_TESTS=1 if you want them."
210 - return 0
211 - fi
212 - einfo "Running interactive tests"
213 - emake check
214 -}
215 -
216 -src_install() {
217 - default
218 -
219 - prune_libtool_files --all
220 -}
221
222 diff --git a/dev-db/libdbi-drivers/metadata.xml b/dev-db/libdbi-drivers/metadata.xml
223 deleted file mode 100644
224 index 3653fc6..0000000
225 --- a/dev-db/libdbi-drivers/metadata.xml
226 +++ /dev/null
227 @@ -1,8 +0,0 @@
228 -<?xml version="1.0" encoding="UTF-8"?>
229 -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
230 -<pkgmetadata>
231 -<maintainer type="person">
232 - <email>jmbsvicetto@g.o</email>
233 - <name>Jorge Manuel B. S. Vicetto</name>
234 -</maintainer>
235 -</pkgmetadata>
236
237 diff --git a/dev-db/libdbi/Manifest b/dev-db/libdbi/Manifest
238 deleted file mode 100644
239 index 40ddc15..0000000
240 --- a/dev-db/libdbi/Manifest
241 +++ /dev/null
242 @@ -1 +0,0 @@
243 -DIST libdbi-0.8.4.tar.gz 1045247 SHA256 ef38db616f0752ccb09b8ba2eac471722369b8ded50b153c25e238cac2c8de99 SHA512 7e28945a96483785840511df23fd8177383a1f9ee3929df863a3e458550b6eb943f8f86f49ede167125ce64daf718b14c40ac09b99e2e8eea474eecf7ee6a530 WHIRLPOOL 6f5770d2a10e02e0e16c6354548d053811ca0205f2942c2e261cd189097423d49a0f2f86afb8308fe7b3cbfde34afc9cb0e16c2fd1471c733c44802235879064
244
245 diff --git a/dev-db/libdbi/files/dbi.pc.in b/dev-db/libdbi/files/dbi.pc.in
246 deleted file mode 100644
247 index a014454..0000000
248 --- a/dev-db/libdbi/files/dbi.pc.in
249 +++ /dev/null
250 @@ -1,10 +0,0 @@
251 -prefix=@prefix@
252 -exec_prefix=@exec_prefix@
253 -libdir=@libdir@
254 -includedir=@includedir@/dbi
255 -
256 -Name: libdbi
257 -Description: database-independent abstraction layer in C
258 -Version: @VERSION@
259 -Libs: -L${libdir} -ldbi
260 -Cflags: -I${includedir} -I${includedir}/dbi
261
262 diff --git a/dev-db/libdbi/files/libdbi-0.8.1-pkg-config.patch b/dev-db/libdbi/files/libdbi-0.8.1-pkg-config.patch
263 deleted file mode 100644
264 index a770ef3..0000000
265 --- a/dev-db/libdbi/files/libdbi-0.8.1-pkg-config.patch
266 +++ /dev/null
267 @@ -1,8 +0,0 @@
268 ---- configure.in.orig 2008-09-23 15:16:20.000000000 -0400
269 -+++ configure.in 2008-09-23 15:16:39.000000000 -0400
270 -@@ -149,4 +149,5 @@
271 - doc/Makefile
272 - include/Makefile
273 - include/dbi/Makefile
274 -+ dbi.pc
275 - ])
276
277 diff --git a/dev-db/libdbi/files/libdbi-0.8.4-doc-build-fix.patch b/dev-db/libdbi/files/libdbi-0.8.4-doc-build-fix.patch
278 deleted file mode 100644
279 index 2891a78..0000000
280 --- a/dev-db/libdbi/files/libdbi-0.8.4-doc-build-fix.patch
281 +++ /dev/null
282 @@ -1,22 +0,0 @@
283 -diff -Nuar libdbi-0.8.4.orig/configure.in libdbi-0.8.4/configure.in
284 ---- libdbi-0.8.4.orig/configure.in 2012-02-21 08:36:15.560231962 +0000
285 -+++ libdbi-0.8.4/configure.in 2012-02-21 08:39:07.910615238 +0000
286 -@@ -147,14 +147,13 @@
287 - dnl See whether to build the docs
288 - dnl ==============================
289 -
290 --ac_docs="YES"
291 -+ac_docs="yes"
292 - AC_ARG_ENABLE(docs,
293 - [ --disable-docs do not build and install the documentation.],
294 -- [ if test "$enable_docs" = "no"; then
295 -- ac_docs="NO"
296 -- fi ])
297 -+ [ ac_docs="$enableval" ],
298 -+ [ ac_docs="no" ])
299 -
300 --if test "$ac_docs" = "YES"; then
301 -+if test "$ac_docs" = "yes"; then
302 - dnl AC_PATH_PROGS(myjade, openjade jade)
303 - dnl if test "x$myjade" != "x"; then
304 - docs_subdirs="doc"
305
306 diff --git a/dev-db/libdbi/files/libdbi-0.8.4-fix-ac-macro.patch b/dev-db/libdbi/files/libdbi-0.8.4-fix-ac-macro.patch
307 deleted file mode 100644
308 index 4dc2868..0000000
309 --- a/dev-db/libdbi/files/libdbi-0.8.4-fix-ac-macro.patch
310 +++ /dev/null
311 @@ -1,12 +0,0 @@
312 -diff -ur libdbi-0.8.4-old/configure.in libdbi-0.8.4/configure.in
313 ---- libdbi-0.8.4-old/configure.in 2013-05-14 01:45:25.595869576 +0000
314 -+++ libdbi-0.8.4/configure.in 2013-05-14 01:47:09.775467777 +0000
315 -@@ -3,7 +3,7 @@
316 - AM_MAINTAINER_MODE
317 -
318 - AM_INIT_AUTOMAKE(libdbi, 0.8.4)
319 --AM_CONFIG_HEADER(config.h)
320 -+AC_CONFIG_HEADERS(config.h)
321 - AC_CONFIG_MACRO_DIR([m4])
322 -
323 - dnl Library versioning
324
325 diff --git a/dev-db/libdbi/libdbi-0.8.4.ebuild b/dev-db/libdbi/libdbi-0.8.4.ebuild
326 deleted file mode 100644
327 index db5b36a..0000000
328 --- a/dev-db/libdbi/libdbi-0.8.4.ebuild
329 +++ /dev/null
330 @@ -1,59 +0,0 @@
331 -# Copyright 1999-2012 Gentoo Foundation
332 -# Distributed under the terms of the GNU General Public License v2
333 -# $Id$
334 -
335 -EAPI=4
336 -
337 -inherit eutils autotools multilib
338 -
339 -DESCRIPTION="libdbi is a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl."
340 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
341 -HOMEPAGE="http://libdbi.sourceforge.net/"
342 -LICENSE="LGPL-2.1"
343 -
344 -IUSE="doc static-libs"
345 -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
346 -SLOT=0
347 -
348 -DOCS="AUTHORS ChangeLog README README.osx TODO"
349 -
350 -RDEPEND=""
351 -DEPEND="${RDEPEND}
352 - >=sys-apps/sed-4
353 - virtual/pkgconfig
354 - doc? ( app-text/openjade )
355 -"
356 -PDEPEND=">=dev-db/libdbi-drivers-0.8.3" # On purpose, libdbi-drivers 0.8.4 does not exist
357 -
358 -src_unpack() {
359 - unpack ${A}
360 - chown -R portage:portage "${S}"
361 -}
362 -
363 -src_prepare() {
364 - epatch "${FILESDIR}/${P}-fix-ac-macro.patch"
365 - epatch "${FILESDIR}"/libdbi-0.8.1-pkg-config.patch
366 - cp -f "${FILESDIR}"/dbi.pc.in "${S}"/dbi.pc.in
367 - epatch "${FILESDIR}"/libdbi-0.8.4-doc-build-fix.patch
368 -
369 - # configure.in has been changed
370 - eautoreconf
371 - # should append CFLAGS, not replace them
372 - sed -i.orig -e 's/^CFLAGS = /CFLAGS += /g' src/Makefile.in
373 -}
374 -
375 -src_configure() {
376 - econf \
377 - $(use_enable doc docs) \
378 - $(use_enable static-libs static)
379 -}
380 -
381 -src_install () {
382 - default
383 -
384 - prune_libtool_files --all
385 -
386 - # syslog-ng requires dbi.pc
387 - insinto /usr/$(get_libdir)/pkgconfig/
388 - doins dbi.pc
389 -}
390
391 diff --git a/dev-db/libdbi/metadata.xml b/dev-db/libdbi/metadata.xml
392 deleted file mode 100644
393 index 3653fc6..0000000
394 --- a/dev-db/libdbi/metadata.xml
395 +++ /dev/null
396 @@ -1,8 +0,0 @@
397 -<?xml version="1.0" encoding="UTF-8"?>
398 -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
399 -<pkgmetadata>
400 -<maintainer type="person">
401 - <email>jmbsvicetto@g.o</email>
402 - <name>Jorge Manuel B. S. Vicetto</name>
403 -</maintainer>
404 -</pkgmetadata>