Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/, dev-db/libzdb/files/, dev-db/ctdb/files/, ...
Date: Sat, 30 Jul 2016 06:46:59
Message-Id: 1469861201.3e85c8c4859384b2e7860512dee265c8d18ec370.monsieurp@gentoo
1 commit: 3e85c8c4859384b2e7860512dee265c8d18ec370
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Tue Jul 19 17:29:57 2016 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 30 06:46:41 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e85c8c4
7
8 dev-db/*: remove unused patches.
9
10 Squash all commit messages into a single one.
11
12 Closes: https://github.com/gentoo/gentoo/pull/1936
13 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
14
15 dev-db/ctdb/files/autoconf-2.62-fix.patch | 15 --
16 dev-db/ctdb/files/ctdb-1.0.114_p1-functions.patch | 77 -------
17 dev-db/ctdb/files/ctdb-41.httpd_gentoo.patch | 13 --
18 dev-db/ctdb/files/ctdb-50.samba_gentoo.patch | 14 --
19 dev-db/ctdb/files/ctdb-functions.patch | 76 -------
20 dev-db/ctdb/files/ctdb.initd | 81 -------
21 .../files/firebird-2.5.1.26351.0-deps-flags.patch | 59 -----
22 dev-db/henplus/files/henplus-0.9.7-build.xml.patch | 34 ---
23 dev-db/henplus/files/henplus.patch | 42 ----
24 dev-db/libzdb/files/sqlite_configure.patch | 18 --
25 dev-db/mongodb/files/mms-agent.confd | 9 -
26 dev-db/mongodb/files/mms-agent.initd | 41 ----
27 dev-db/mongodb/files/mms-agent.initd-r1 | 31 ---
28 dev-db/mongodb/files/mms-agent.initd-r2 | 25 ---
29 dev-db/mongodb/files/mongodb-2.0-fix-scons.patch | 36 ---
30 .../mongodb/files/mongodb-2.0-r1-boost-1.50.patch | 245 ---------------------
31 dev-db/mongodb/files/mongodb-2.4.5-fix-scons.patch | 28 ---
32 dev-db/mongodb/files/mongodb-2.6.1-fix-scons.patch | 35 ---
33 dev-db/mongodb/files/mongos.confd | 16 --
34 dev-db/mongodb/files/mongos.initd-r1 | 50 -----
35 .../mysql-connector-c++-1.1.0-disable-tests.patch | 14 --
36 .../mysql-connector-c++-1.1.0-fix-cmake.patch | 85 -------
37 .../mysql-connector-c++-1.1.5-fix-cmake.patch | 106 ---------
38 .../mysql-workbench-6.1.7-mysql_options4.patch | 29 ---
39 .../files/mysql-workbench-6.1.7-wbcopytables.patch | 10 -
40 .../files/mysql-workbench-6.2.3-ctemplate.patch | 35 ---
41 .../files/mysql-workbench-6.2.3-glib.patch | 42 ----
42 .../files/mysql-workbench-6.2.3-paramiko.patch | 51 -----
43 dev-db/postgis/files/postgis-2.0-ldflags.patch | 26 ---
44 .../postgis/files/postgis-2.0-pkgconfig-json.patch | 99 ---------
45 ...tgresql-9.4-alpha-fix-read-memory-barrier.patch | 13 --
46 dev-db/redis/files/redis-2.4.17-shared.patch | 22 --
47 dev-db/redis/files/redis-2.4.3-shared.patch | 22 --
48 dev-db/redis/files/redis-2.4.4-tcmalloc.patch | 21 --
49 dev-db/redis/files/redis-2.6.7-config.patch | 69 ------
50 dev-db/redis/files/redis-2.6.7-shared.patch | 36 ---
51 dev-db/redis/files/redis-2.6.9-tclsh86.patch | 57 -----
52 dev-db/redis/files/redis-2.8.3-config.patch | 59 -----
53 dev-db/redis/files/redis.initd-2 | 23 --
54 dev-db/redis/files/redis.initd-3 | 32 ---
55 dev-db/slony1/files/slony1-2.1.1-ldflags.patch | 29 ---
56 .../files/sqlitebrowser-3.5.1-unbundle.patch | 70 ------
57 ...itebrowser-3.6.0-unbundle-keep-qscintilla.patch | 62 ------
58 dev-db/tokyocabinet/files/1.4.45.patch | 12 -
59 dev-db/tokyocabinet/files/1.4.46.patch | 12 -
60 dev-db/tokyocabinet/files/remove_docinst.patch | 13 --
61 .../files/unixODBC-2.3.0-sqldriverconnect.patch | 27 ---
62 dev-db/wxsqlite3/files/wxsqlite3-3.0.6.1.pc.in | 14 --
63 48 files changed, 2035 deletions(-)
64
65 diff --git a/dev-db/ctdb/files/autoconf-2.62-fix.patch b/dev-db/ctdb/files/autoconf-2.62-fix.patch
66 deleted file mode 100644
67 index 2f5bc2b..0000000
68 --- a/dev-db/ctdb/files/autoconf-2.62-fix.patch
69 +++ /dev/null
70 @@ -1,15 +0,0 @@
71 ---- lib/replace/autoconf-2.60.m4.orig 2008-04-19 00:26:33.000000000 -0400
72 -+++ lib/replace/autoconf-2.60.m4 2008-04-19 00:22:25.000000000 -0400
73 -@@ -179,6 +179,7 @@
74 - # ------------------------
75 - # Enable extensions on systems that normally disable them,
76 - # typically due to standards-conformance issues.
77 -+m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[
78 - AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
79 - [
80 - AC_BEFORE([$0], [AC_COMPILE_IFELSE])
81 -@@ -208,3 +209,4 @@
82 - AC_DEFINE([__EXTENSIONS__])
83 - AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
84 - ])
85 -+])
86
87 diff --git a/dev-db/ctdb/files/ctdb-1.0.114_p1-functions.patch b/dev-db/ctdb/files/ctdb-1.0.114_p1-functions.patch
88 deleted file mode 100644
89 index c70350c..0000000
90 --- a/dev-db/ctdb/files/ctdb-1.0.114_p1-functions.patch
91 +++ /dev/null
92 @@ -1,77 +0,0 @@
93 -diff -Naur ctdb-1.0.114.orig/config/functions ctdb-1.0.114/config/functions
94 ---- ctdb-1.0.114.orig/config/functions 2010-04-04 18:01:18.278707515 +0200
95 -+++ ctdb-1.0.114/config/functions 2010-04-04 18:08:05.792447032 +0200
96 -@@ -22,6 +22,8 @@
97 - . /etc/default/$1
98 - elif [ -f $CTDB_BASE/sysconfig/$1 ]; then
99 - . $CTDB_BASE/sysconfig/$1
100 -+ elif [ -f /etc/config.d/$1 ]; then
101 -+ . /etc/config.d/$name
102 - fi
103 - }
104 -
105 -@@ -33,6 +35,8 @@
106 -
107 - if [ -x /sbin/startproc ]; then
108 - CTDB_INIT_STYLE="suse"
109 -+ elif [ -x /bin/rc-status ] ; then
110 -+ CTDB_INIT_STYLE="gentoo"
111 - elif [ -x /sbin/start-stop-daemon ]; then
112 - CTDB_INIT_STYLE="debian"
113 - else
114 -@@ -356,6 +360,9 @@
115 - [ -x /etc/init.d/nfslock ] && {
116 - PLATFORM="rhel"
117 - }
118 -+ [ -x etc/init.d/nfs ] && {
119 -+ PLATFORM="gentoo"
120 -+ }
121 -
122 - case $PLATFORM in
123 - sles)
124 -@@ -380,6 +387,16 @@
125 - ;;
126 - esac
127 - ;;
128 -+ gentoo)
129 -+ case $1 in
130 -+ start)
131 -+ service nfs start
132 -+ ;;
133 -+ stop)
134 -+ service nfs stop > /dev/null 2>&1
135 -+ ;;
136 -+ esac
137 -+ ;;
138 - *)
139 - echo "Unknown platform. NFS is not supported with ctdb"
140 - exit 1
141 -@@ -398,6 +415,9 @@
142 - [ -x /etc/init.d/nfslock ] && {
143 - PLATFORM="rhel"
144 - }
145 -+ [ -x etc/init.d/nfs ] && {
146 -+ PLATFORM="gentoo"
147 -+ }
148 -
149 - case $PLATFORM in
150 - sles)
151 -@@ -422,6 +442,18 @@
152 - ;;
153 - esac
154 - ;;
155 -+ gentoo)
156 -+ # for gentoo there is no service for lockmanager
157 -+ # so we instead just shutdown/restart nfs
158 -+ case $1 in
159 -+ start)
160 -+ service nfs start
161 -+ ;;
162 -+ stop)
163 -+ service nfs stop > /dev/null 2>&1
164 -+ ;;
165 -+ esac
166 -+ ;;
167 - *)
168 - echo "Unknown platform. NFS locking is not supported with ctdb"
169 - exit 1
170
171 diff --git a/dev-db/ctdb/files/ctdb-41.httpd_gentoo.patch b/dev-db/ctdb/files/ctdb-41.httpd_gentoo.patch
172 deleted file mode 100644
173 index 6865d89..0000000
174 --- a/dev-db/ctdb/files/ctdb-41.httpd_gentoo.patch
175 +++ /dev/null
176 @@ -1,13 +0,0 @@
177 ---- ./config/events.d/41.httpd 2009-05-29 14:19:30.741662868 +0100
178 -+++ ./config/events.d/41.httpd 2009-07-28 18:31:48.016042964 +0100
179 -@@ -19,6 +19,10 @@
180 - CTDB_SERVICE_HTTP="apache2"
181 - CTDB_CONFIG_HTTP="apache2"
182 - ;;
183 -+ gentoo)
184 -+ CTDB_SERVICE_HTTP="apache2"
185 -+ CTDB_CONFIG_HTTP="apache2"
186 -+ ;;
187 - *)
188 - # should not happen.
189 - # for now use red hat style as default
190
191 diff --git a/dev-db/ctdb/files/ctdb-50.samba_gentoo.patch b/dev-db/ctdb/files/ctdb-50.samba_gentoo.patch
192 deleted file mode 100644
193 index fdd68ff..0000000
194 --- a/dev-db/ctdb/files/ctdb-50.samba_gentoo.patch
195 +++ /dev/null
196 @@ -1,14 +0,0 @@
197 ---- ./config/events.d/50.samba 2009-05-29 14:19:30.741662868 +0100
198 -+++ ./config/events.d/50.samba 2009-07-28 18:27:21.896042994 +0100
199 -@@ -25,6 +25,11 @@
200 - CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-""}
201 - CTDB_SERVICE_WINBIND=${CTDB_SERVICE_WINBIND:-winbind}
202 - ;;
203 -+ gentoo)
204 -+ CTDB_SERVICE_SMB=${CTDB_SERVICE_SMB:-samba}
205 -+ CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-""}
206 -+ CTDB_SERVICE_WINBIND=${CTDB_SERVICE_WINBIND:-""}
207 -+ ;;
208 - *)
209 - # should not happen, but for now use redhat style as default:
210 - CTDB_SERVICE_SMB=${CTDB_SERVICE_SMB:-smb}
211
212 diff --git a/dev-db/ctdb/files/ctdb-functions.patch b/dev-db/ctdb/files/ctdb-functions.patch
213 deleted file mode 100644
214 index 61eda72..0000000
215 --- a/dev-db/ctdb/files/ctdb-functions.patch
216 +++ /dev/null
217 @@ -1,76 +0,0 @@
218 ---- ./config/functions 2009-05-29 14:19:30.741662868 +0100
219 -+++ ./config/functions 2009-07-29 14:15:19.436043164 +0100
220 -@@ -10,6 +10,8 @@
221 - . /etc/default/$name
222 - elif [ -f $CTDB_BASE/sysconfig/$name ]; then
223 - . $CTDB_BASE/sysconfig/$name
224 -+ elif [ -f /etc/config.d/$name ]; then
225 -+ . /etc/config.d/$name
226 - fi
227 - }
228 -
229 -@@ -21,6 +23,8 @@
230 -
231 - if [ -x /sbin/startproc ]; then
232 - CTDB_INIT_STYLE="suse"
233 -+ elif [ -x /bin/rc-status ]; then
234 -+ CTDB_INIT_STYLE="gentoo"
235 - elif [ -x /sbin/start-stop-daemon ]; then
236 - CTDB_INIT_STYLE="ubuntu"
237 - else
238 -@@ -400,6 +404,9 @@
239 - [ -x /etc/init.d/nfslock ] && {
240 - PLATFORM="rhel"
241 - }
242 -+ [ -x etc/init.d/nfs ] && {
243 -+ PLATFORM="gentoo"
244 -+ }
245 -
246 - case $PLATFORM in
247 - sles)
248 -@@ -424,6 +431,16 @@
249 - ;;
250 - esac
251 - ;;
252 -+ gentoo)
253 -+ case $1 in
254 -+ start)
255 -+ service nfs start
256 -+ ;;
257 -+ stop)
258 -+ service nfs stop > /dev/null 2>&1
259 -+ ;;
260 -+ esac
261 -+ ;;
262 - *)
263 - echo "Unknown platform. NFS is not supported with ctdb"
264 - exit 1
265 -@@ -442,6 +459,9 @@
266 - [ -x /etc/init.d/nfslock ] && {
267 - PLATFORM="rhel"
268 - }
269 -+ [ -x etc/init.d/nfs ] && {
270 -+ PLATFORM="gentoo"
271 -+ }
272 -
273 - case $PLATFORM in
274 - sles)
275 -@@ -466,6 +486,18 @@
276 - ;;
277 - esac
278 - ;;
279 -+ gentoo)
280 -+ # for gentoo there is no service for lockmanager
281 -+ # so we instead just shutdown/restart nfs
282 -+ case $1 in
283 -+ start)
284 -+ service nfs start
285 -+ ;;
286 -+ stop)
287 -+ service nfs stop > /dev/null 2>&1
288 -+ ;;
289 -+ esac
290 -+ ;;
291 - *)
292 - echo "Unknown platform. NFS locking is not supported with ctdb"
293 - exit 1
294
295 diff --git a/dev-db/ctdb/files/ctdb.initd b/dev-db/ctdb/files/ctdb.initd
296 deleted file mode 100644
297 index d8b8223..0000000
298 --- a/dev-db/ctdb/files/ctdb.initd
299 +++ /dev/null
300 @@ -1,81 +0,0 @@
301 -#!/sbin/openrc-run
302 -
303 -depend() {
304 - need localmount
305 - need net
306 - before samba
307 - after bootmisc
308 -}
309 -
310 -start() {
311 - ebegin "Starting ctdb"
312 -
313 - [ -z "$CTDB_RECOVERY_LOCK" ] && {
314 - eerror "You must configure the location of the CTDB_RECOVERY_LOCK in /etc/conf.d/ctdb"
315 - return 1
316 - }
317 -
318 - [ -z "$CTDB_PUBLIC_ADDRESSES" ] && {
319 - eerror "You must configure the location of the CTDB_PUBLIC_ADDRESSES in /etc/conf.d/ctdb"
320 - return 1
321 - }
322 -
323 - [ -z "$CTDB_PUBLIC_INTERFACE" ] && {
324 - eerror "You must configure the location of the CTDB_PUBLIC_INTERFACE in /etc/conf.d/ctdb"
325 - return 1
326 - }
327 -
328 - CTDB_OPTIONS="$CTDB_OPTIONS --reclock=$CTDB_RECOVERY_LOCK"
329 -
330 - # build up CTDB_OPTIONS variable from optional parameters
331 - [ -z "$CTDB_LOGFILE" ] || CTDB_OPTIONS="$CTDB_OPTIONS --logfile=$CTDB_LOGFILE"
332 - [ -z "$CTDB_NODES" ] || CTDB_OPTIONS="$CTDB_OPTIONS --nlist=$CTDB_NODES"
333 - [ -z "$CTDB_SOCKET" ] || CTDB_OPTIONS="$CTDB_OPTIONS --socket=$CTDB_SOCKET"
334 - [ -z "$CTDB_PUBLIC_ADDRESSES" ] || CTDB_OPTIONS="$CTDB_OPTIONS --public-addresses=$CTDB_PUBLIC_ADDRESSES"
335 - [ -z "$CTDB_PUBLIC_INTERFACE" ] || CTDB_OPTIONS="$CTDB_OPTIONS --public-interface=$CTDB_PUBLIC_INTERFACE"
336 - [ -z "$CTDB_SINGLE_PUBLIC_IP" ] || CTDB_OPTIONS="$CTDB_OPTIONS --single-public-ip=$CTDB_SINGLE_PUBLIC_IP"
337 - [ -z "$CTDB_DBDIR" ] || CTDB_OPTIONS="$CTDB_OPTIONS --dbdir=$CTDB_DBDIR"
338 - [ -z "$CTDB_DBDIR_PERSISTENT" ] || CTDB_OPTIONS="$CTDB_OPTIONS --dbdir-persistent=$CTDB_DBDIR_PERSISTENT"
339 - [ -z "$CTDB_EVENT_SCRIPT_DIR" ] || CTDB_OPTIONS="$CTDB_OPTIONS --event-script-dir $CTDB_EVENT_SCRIPT_DIR"
340 - [ -z "$CTDB_TRANSPORT" ] || CTDB_OPTIONS="$CTDB_OPTIONS --transport $CTDB_TRANSPORT"
341 - [ -z "$CTDB_DEBUGLEVEL" ] || CTDB_OPTIONS="$CTDB_OPTIONS -d $CTDB_DEBUGLEVEL"
342 - [ -z "$CTDB_START_AS_DISABLED" ] || [ "$CTDB_START_AS_DISABLED" != "yes" ] || {
343 - CTDB_OPTIONS="$CTDB_OPTIONS --start-as-disabled"
344 - }
345 - [ -z "$CTDB_CAPABILITY_RECMASTER" ] || [ "$CTDB_CAPABILITY_RECMASTER" != "no" ] || {
346 - CTDB_OPTIONS="$CTDB_OPTIONS --no-recmaster"
347 - }
348 - [ -z "$CTDB_CAPABILITY_LMASTER" ] || [ "$CTDB_CAPABILITY_LMASTER" != "no" ] || {
349 - CTDB_OPTIONS="$CTDB_OPTIONS --no-lmaster"
350 - }
351 - [ -z "$CTDB_LVS_PUBLIC_IP" ] || {
352 - CTDB_OPTIONS="$CTDB_OPTIONS --lvs"
353 - }
354 - [ -z "$CTDB_SCRIPT_LOG_LEVEL" ] || {
355 - CTDB_OPTIONS="$CTDB_OPTIONS --script-log-level=$CTDB_SCRIPT_LOG_LEVEL"
356 - }
357 -
358 - # check all persistent databases that they look ok
359 - PERSISTENT_DB_DIR="/var/ctdb/persistent"
360 - [ -z "$CTDB_DBDIR" ] || {
361 - PERSISTENT_DB_DIR="$CTDB_DBDIR/persistent"
362 - }
363 - mkdir -p $PERSISTENT_DB_DIR 2>/dev/null
364 - for PDBASE in `ls $PERSISTENT_DB_DIR/*.tdb.[0-9] 2>/dev/null`; do
365 - /usr/bin/tdbdump $PDBASE >/dev/null 2>/dev/null || {
366 - eerror "Persistent database $PDBASE is corrupted! CTDB will not start."
367 - return 1
368 - }
369 - done
370 -
371 - start-stop-daemon --start --background --exec /usr/sbin/ctdbd \
372 - --pidfile /var/run/ctdbd.pid -- $CTDB_OPTIONS
373 - eend $?
374 -
375 -}
376 -
377 -stop() {
378 - start-stop-daemon --stop --exec /usr/sbin/ctdbd \
379 - --pidfile /var/run/ctdbd.pid
380 -}
381 -
382
383 diff --git a/dev-db/firebird/files/firebird-2.5.1.26351.0-deps-flags.patch b/dev-db/firebird/files/firebird-2.5.1.26351.0-deps-flags.patch
384 deleted file mode 100644
385 index 8be521c..0000000
386 --- a/dev-db/firebird/files/firebird-2.5.1.26351.0-deps-flags.patch
387 +++ /dev/null
388 @@ -1,59 +0,0 @@
389 -diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird
390 ---- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird 2010-11-09 12:42:45.000000000 -0500
391 -+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird 2011-03-28 15:10:09.814370706 -0400
392 -@@ -158,7 +158,7 @@
393 - # some complications particularly for super in needing to start the server
394 - # that you are currently building. MOD 28-July-2002
395 -
396 --firebird_basic: btyacc_binary external_libraries firebird_boot basic_targets
397 -+firebird_basic: firebird_boot basic_targets
398 -
399 - firebird_boot: updateBuildNum boot_phase1 boot_phase2
400 -
401 -diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults
402 ---- Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults 2010-11-09 12:42:45.000000000 -0500
403 -+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults 2011-03-28 15:21:26.904370708 -0400
404 -@@ -138,7 +138,7 @@
405 - AR= ar @AR_OPTIONS@ crsu
406 - LN= @LN_S@
407 - RANLIB= @RANLIB@
408 --BTYACC=$(ROOT)/extern/btyacc/btyacc
409 -+BTYACC=/usr/bin/btyacc
410 -
411 - CC = @CC@
412 - CXX = @CXX@
413 -diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux
414 ---- Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux 2010-11-09 12:42:45.000000000 -0500
415 -+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux 2011-03-25 21:38:29.031037374 -0400
416 -@@ -18,11 +18,10 @@
417 - #
418 - # 2 Oct 2002, Nickolay Samofatov - Major cleanup
419 -
420 --COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
421 --OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer
422 -+COMMON_FLAGS=-DLINUX -MMD -fPIC -fmessage-length=0
423 - WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
424 -
425 --PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
426 -+PROD_FLAGS=$(COMMON_FLAGS)
427 - #DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
428 - DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)
429 -
430 -diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux_amd64 Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux_amd64
431 ---- Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux_amd64 2010-11-09 12:42:45.000000000 -0500
432 -+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux_amd64 2011-03-25 21:39:15.134370707 -0400
433 -@@ -18,12 +18,11 @@
434 - #
435 - # 2 Oct 2002, Nickolay Samofatov - Major cleanup
436 -
437 --COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0
438 --OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer
439 -+COMMON_FLAGS=-DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -MMD -fPIC -fmessage-length=0
440 - WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
441 - CXXFLAGS:= $(CXXFLAGS) -fno-rtti
442 -
443 --PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
444 -+PROD_FLAGS=$(COMMON_FLAGS)
445 - #DEV_FLAGS=-DUSE_VALGRIND $(COMMON_FLAGS) $(WARN_FLAGS)
446 - DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS)
447 -
448
449 diff --git a/dev-db/henplus/files/henplus-0.9.7-build.xml.patch b/dev-db/henplus/files/henplus-0.9.7-build.xml.patch
450 deleted file mode 100644
451 index 2e4a43a..0000000
452 --- a/dev-db/henplus/files/henplus-0.9.7-build.xml.patch
453 +++ /dev/null
454 @@ -1,34 +0,0 @@
455 ---- build.xml.orig 2006-10-17 22:25:57.000000000 +0200
456 -+++ build.xml 2006-10-17 22:27:34.000000000 +0200
457 -@@ -21,26 +21,26 @@
458 - <property name="libreadline-java" value="libreadline-java-0.8.0.jar"/>
459 -
460 - <path id="compile.classpath">
461 -- <fileset dir="${lib}">
462 -- <include name="${libreadline-java}"/>
463 -- <include name="${commons-cli}"/>
464 -- </fileset>
465 -+ <fileset dir="${lib}" includes="**/*.jar"/>
466 - </path>
467 -
468 - <path id="run.classpath">
469 - <path refid="compile.classpath" />
470 - <pathelement path="${classes}" />
471 - </path>
472 --
473 -+
474 -+ <!--
475 - <taskdef name="ant-server" classname="net.sweetohm.ant.server.ServerTask">
476 - <classpath>
477 - <pathelement location="${lib}/build/sat-0.7.jar" />
478 - </classpath>
479 - </taskdef>
480 -+
481 -
482 - <target name="server">
483 - <ant-server/>
484 - </target>
485 -+ -->
486 -
487 - <target name="prepare">
488 - <tstamp>
489
490 diff --git a/dev-db/henplus/files/henplus.patch b/dev-db/henplus/files/henplus.patch
491 deleted file mode 100644
492 index abc92d3..0000000
493 --- a/dev-db/henplus/files/henplus.patch
494 +++ /dev/null
495 @@ -1,42 +0,0 @@
496 ---- a/bin/henplus 2004-02-02 14:53:28.000000000 +0100
497 -+++ b/bin/henplus 2004-07-23 11:21:11.518166136 +0200
498 -@@ -2,6 +2,7 @@
499 - # $Id$
500 - ##
501 -
502 -+echo $(dirname $0)
503 - # additional flags you might want to pass to the java interpreter
504 - # like -Dfile.encoding=ISO-8859-1
505 - JAVA_FLAGS=
506 -@@ -13,20 +14,8 @@
507 - JAVA=$JAVA_HOME/bin/java
508 - fi
509 -
510 --##------------------
511 --THISDIR=`dirname $0`
512 --HENPLUSDIR=$THISDIR/../share/henplus
513 --
514 --# not yet installed ? Then look in the build directory
515 --if [ ! -d "$HENPLUSDIR" ] ; then
516 -- HENPLUSDIR=$THISDIR/../build
517 --fi
518 --
519 --# location of the readline lib.
520 --# Modify this, if you installation stores this at a different
521 --# position.
522 --LD_LIBRARY_PATH=$THISDIR/../lib:/usr/lib/jni:$LD_LIBRARY_PATH
523 --CLASSPATH=$CLASSPATH:$THISDIR/../share/java/libreadline-java.jar
524 -+HENPLUSDIR=$(dirname $(java-config -p henplus))
525 -+CLASSPATH=$CLASSPATH:$(java-config -p libreadline-java)
526 -
527 - # you may just throw your own jar files in this dir.
528 - # (like additional JDBC-drivers, that are not in default
529 -@@ -65,7 +54,4 @@
530 - CLASSPATH=$CLASSPATH:$f
531 - fi
532 - done
533 --
534 --export CLASSPATH LD_LIBRARY_PATH
535 --
536 --exec $JAVA $JAVA_FLAGS henplus.HenPlus "$@"
537 -+LD_LIBRARY_PATH="$(java-config -i libreadline-java):$LD_LIBRARY_PATH" exec $JAVA -cp $CLASSPATH $JAVA_FLAGS henplus.HenPlus "$@"
538
539 diff --git a/dev-db/libzdb/files/sqlite_configure.patch b/dev-db/libzdb/files/sqlite_configure.patch
540 deleted file mode 100644
541 index 5ea7914..0000000
542 --- a/dev-db/libzdb/files/sqlite_configure.patch
543 +++ /dev/null
544 @@ -1,18 +0,0 @@
545 ---- configure.ac_orig 2012-07-14 07:14:19.000000000 +1000
546 -+++ configure.ac 2012-07-23 14:17:38.702411605 +1000
547 -@@ -298,12 +298,11 @@
548 - CPPFLAGS="-I$with_sqlite/include $CPPFLAGS"
549 - AC_CHECK_HEADERS([sqlite3.h], [
550 - sqlite="yes"
551 -- if test -r "$with_sqlite/lib/libsqlite3.a"; then
552 -+ AC_CHECK_LIB(sqlite3, main,[
553 -+
554 - DBCPPFLAGS="$DBCPPFLAGS -I$with_sqlite/include"
555 - DBLDFLAGS="$DBLDFLAGS -L$with_sqlite/lib/ -lsqlite3"
556 -- else
557 -- sqlite="no"
558 -- fi
559 -+ ],[sqlite="no"])
560 - ], [sqlite="no"])
561 - LDFLAGS=$svd_LDFLAGS
562 - CPPFLAGS=$svd_CPPFLAGS
563
564 diff --git a/dev-db/mongodb/files/mms-agent.confd b/dev-db/mongodb/files/mms-agent.confd
565 deleted file mode 100644
566 index d19b21e..0000000
567 --- a/dev-db/mongodb/files/mms-agent.confd
568 +++ /dev/null
569 @@ -1,9 +0,0 @@
570 -# Your API key - See: http://mms.10gen.com/settings
571 -API_KEY=""
572 -SECRET_KEY=""
573 -
574 -# Seconds between Mongo status checks
575 -#COLLECTION_INTERVAL=56
576 -
577 -# Seconds between cloud configuration checks
578 -#CONF_INTERVAL=120
579 \ No newline at end of file
580
581 diff --git a/dev-db/mongodb/files/mms-agent.initd b/dev-db/mongodb/files/mms-agent.initd
582 deleted file mode 100644
583 index a937fbf..0000000
584 --- a/dev-db/mongodb/files/mms-agent.initd
585 +++ /dev/null
586 @@ -1,41 +0,0 @@
587 -#!/sbin/openrc-run
588 -# Copyright 1999-2013 Gentoo Foundation
589 -# Distributed under the terms of the GNU General Public License v2
590 -# $Id$
591 -
592 -ROOTDIR=/opt/mms-agent
593 -PIDFILE=/var/run/mm-agent.pid
594 -EXEC="/usr/bin/env python agent.py"
595 -LOGFILE=/var/log/mongodb/mms-agent.log
596 -
597 -depend() {
598 - need net
599 - use syslog
600 -}
601 -
602 -start() {
603 - ebegin "Starting ${SVCNAME}"
604 -
605 - checkpath -d -m 0755 -o root:root /var/run/
606 -
607 - # Setup API/SECRETY KEYS
608 - sed -i -e "s/^mms_key.*/mms_key = '${API_KEY}'/g" \
609 - -e "s/^secret_key.*/secret_key = '${SECRET_KEY}'/g" ${ROOTDIR}/settings.py &>/dev/null
610 -
611 - # Tune the agent
612 - [ -z "${COLLECTION_INTERVAL}" ] || sed -i \
613 - -e "s/^collection_interval.*/collection_interval = ${COLLECTION_INTERVAL}/g" ${ROOTDIR}/settings.py &>/dev/null
614 - [ -z "${CONF_INTERVAL}" ] || sed -i \
615 - -e "s/^conf_interval.*/conf_interval = ${CONF_INTERVAL}/g" ${ROOTDIR}/settings.py &>/dev/null
616 -
617 - start-stop-daemon --start --chdir ${ROOTDIR} --exec ${EXEC} \
618 - --pidfile "${PIDFILE}" --make-pidfile --background \
619 - --user mongodb:mongodb --stdout ${LOGFILE} --stderr ${LOGFILE}
620 - eend $?
621 -}
622 -
623 -stop() {
624 - ebegin "Requesting ${SVCNAME} to stop"
625 - start-stop-daemon --stop --pidfile "${PIDFILE}"
626 - eend $?
627 -}
628
629 diff --git a/dev-db/mongodb/files/mms-agent.initd-r1 b/dev-db/mongodb/files/mms-agent.initd-r1
630 deleted file mode 100644
631 index 91002b5..0000000
632 --- a/dev-db/mongodb/files/mms-agent.initd-r1
633 +++ /dev/null
634 @@ -1,31 +0,0 @@
635 -#!/sbin/openrc-run
636 -# Copyright 1999-2014 Gentoo Foundation
637 -# Distributed under the terms of the GNU General Public License v2
638 -# $Id$
639 -
640 -ROOTDIR=/opt/mms-agent
641 -PIDFILE=/var/run/mm-agent.pid
642 -EXEC="/usr/bin/env python agent.py"
643 -LOGFILE=/var/log/mongodb/mms-agent.log
644 -
645 -depend() {
646 - need net
647 - use syslog
648 -}
649 -
650 -start() {
651 - ebegin "Starting ${SVCNAME}"
652 -
653 - checkpath -d -m 0755 -o root:root /var/run/
654 -
655 - start-stop-daemon --start --chdir ${ROOTDIR} --exec ${EXEC} \
656 - --pidfile "${PIDFILE}" --make-pidfile --background \
657 - --user mongodb:mongodb --stdout ${LOGFILE} --stderr ${LOGFILE}
658 - eend $?
659 -}
660 -
661 -stop() {
662 - ebegin "Requesting ${SVCNAME} to stop"
663 - start-stop-daemon --stop --pidfile "${PIDFILE}"
664 - eend $?
665 -}
666
667 diff --git a/dev-db/mongodb/files/mms-agent.initd-r2 b/dev-db/mongodb/files/mms-agent.initd-r2
668 deleted file mode 100644
669 index 592dd9c..0000000
670 --- a/dev-db/mongodb/files/mms-agent.initd-r2
671 +++ /dev/null
672 @@ -1,25 +0,0 @@
673 -#!/sbin/openrc-run
674 -# Copyright 1999-2014 Gentoo Foundation
675 -# Distributed under the terms of the GNU General Public License v2
676 -# $Id$
677 -
678 -logfile=/var/log/mongodb/mms-agent.log
679 -run_dir=${run_dir:-/run/mongodb}
680 -
681 -command="/usr/bin/python2 agent.py &>${logfile}"
682 -command_background="true"
683 -
684 -pidfile=${run_dir}/${SVCNAME}.pid
685 -user=${user:-mongodb}
686 -group=${group:-mongodb}
687 -start_stop_daemon_args="--user ${user} --group ${group}"
688 -
689 -depend() {
690 - need net
691 - use syslog
692 -}
693 -
694 -start_pre() {
695 - checkpath -d -m 0750 -o "${user}":"${group}" "${run_dir}"
696 - cd /opt/mms-agent
697 -}
698
699 diff --git a/dev-db/mongodb/files/mongodb-2.0-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.0-fix-scons.patch
700 deleted file mode 100644
701 index a52e3a3..0000000
702 --- a/dev-db/mongodb/files/mongodb-2.0-fix-scons.patch
703 +++ /dev/null
704 @@ -1,36 +0,0 @@
705 ---- a/SConstruct 2011-11-16 22:11:39.000000000 +0100
706 -+++ b/SConstruct 2011-11-17 16:30:16.144117550 +0100
707 -@@ -688,7 +688,7 @@
708 - env["CXX"] = "distcc " + env["CXX"]
709 -
710 - # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
711 -- env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
712 -+ env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
713 - # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
714 - if linux:
715 - env.Append( CPPFLAGS=" -Werror " )
716 -@@ -696,7 +696,9 @@
717 - env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is faster than gcc's
718 -
719 - env.Append( CPPDEFINES="_FILE_OFFSET_BITS=64" )
720 -+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
721 - env.Append( CXXFLAGS=" -Wnon-virtual-dtor " )
722 -+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
723 - env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
724 - env.Append( LIBS=[] )
725 -
726 -@@ -706,12 +708,13 @@
727 -
728 - if linux and has_option( "sharedclient" ):
729 - env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " )
730 -+ env.Append( SHLINKFLAGS=" -Wl,-soname=libmongoclient.so " )
731 -
732 - if debugBuild:
733 - env.Append( CPPFLAGS=" -O0 -fstack-protector " );
734 - env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind
735 - else:
736 -- env.Append( CPPFLAGS=" -O3 " )
737 -+ env.Append( CXXFLAGS=" -O3 " )
738 - #env.Append( CPPFLAGS=" -fprofile-generate" )
739 - #env.Append( LINKFLAGS=" -fprofile-generate" )
740 - # then:
741
742 diff --git a/dev-db/mongodb/files/mongodb-2.0-r1-boost-1.50.patch b/dev-db/mongodb/files/mongodb-2.0-r1-boost-1.50.patch
743 deleted file mode 100644
744 index 4ccb898..0000000
745 --- a/dev-db/mongodb/files/mongodb-2.0-r1-boost-1.50.patch
746 +++ /dev/null
747 @@ -1,245 +0,0 @@
748 -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/db.cpp mongodb-src-r2.0.6-patched/db/db.cpp
749 ---- mongodb-src-r2.0.6/db/db.cpp 2012-06-04 15:42:54.000000000 +0200
750 -+++ mongodb-src-r2.0.6-patched/db/db.cpp 2012-07-10 22:27:16.496886220 +0200
751 -@@ -326,7 +326,7 @@
752 - boost::filesystem::path path( dbpath );
753 - for ( boost::filesystem::directory_iterator i( path );
754 - i != boost::filesystem::directory_iterator(); ++i ) {
755 -- string fileName = boost::filesystem::path(*i).leaf();
756 -+ string fileName = boost::filesystem::path(*i).leaf().string();
757 - if ( boost::filesystem::is_directory( *i ) &&
758 - fileName.length() && fileName[ 0 ] == '$' )
759 - boost::filesystem::remove_all( *i );
760 -@@ -655,11 +655,6 @@
761 - dbExecCommand = argv[0];
762 -
763 - srand(curTimeMicros());
764 --#if( BOOST_VERSION >= 104500 )
765 -- boost::filesystem::path::default_name_check( boost::filesystem2::no_check );
766 --#else
767 -- boost::filesystem::path::default_name_check( boost::filesystem::no_check );
768 --#endif
769 -
770 - {
771 - unsigned x = 0x12345678;
772 -@@ -976,7 +971,7 @@
773 - if (params.count("shutdown")){
774 - bool failed = false;
775 -
776 -- string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string();
777 -+ string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string();
778 - if ( !boost::filesystem::exists( name ) || boost::filesystem::file_size( name ) == 0 )
779 - failed = true;
780 -
781 -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur.cpp mongodb-src-r2.0.6-patched/db/dur.cpp
782 ---- mongodb-src-r2.0.6/db/dur.cpp 2012-06-04 15:42:54.000000000 +0200
783 -+++ mongodb-src-r2.0.6-patched/db/dur.cpp 2012-07-10 21:56:28.866778732 +0200
784 -@@ -692,7 +692,7 @@
785 -
786 - bool samePartition = true;
787 - try {
788 -- const string dbpathDir = boost::filesystem::path(dbpath).native_directory_string();
789 -+ const string dbpathDir = boost::filesystem::path(dbpath).string();
790 - samePartition = onSamePartition(getJournalDir().string(), dbpathDir);
791 - }
792 - catch(...) {
793 -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur_journal.cpp mongodb-src-r2.0.6-patched/db/dur_journal.cpp
794 ---- mongodb-src-r2.0.6/db/dur_journal.cpp 2012-06-04 15:42:54.000000000 +0200
795 -+++ mongodb-src-r2.0.6-patched/db/dur_journal.cpp 2012-07-10 22:04:18.583472723 +0200
796 -@@ -169,7 +169,7 @@
797 - for ( boost::filesystem::directory_iterator i( getJournalDir() );
798 - i != boost::filesystem::directory_iterator();
799 - ++i ) {
800 -- string fileName = boost::filesystem::path(*i).leaf();
801 -+ string fileName = boost::filesystem::path(*i).leaf().string();
802 - if( str::startsWith(fileName, "j._") )
803 - return true;
804 - }
805 -@@ -185,7 +185,7 @@
806 - for ( boost::filesystem::directory_iterator i( getJournalDir() );
807 - i != boost::filesystem::directory_iterator();
808 - ++i ) {
809 -- string fileName = boost::filesystem::path(*i).leaf();
810 -+ string fileName = boost::filesystem::path(*i).leaf().string();
811 - if( str::startsWith(fileName, "j._") ) {
812 - try {
813 - removeOldJournalFile(*i);
814 -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur_recover.cpp mongodb-src-r2.0.6-patched/db/dur_recover.cpp
815 ---- mongodb-src-r2.0.6/db/dur_recover.cpp 2012-06-04 15:42:54.000000000 +0200
816 -+++ mongodb-src-r2.0.6-patched/db/dur_recover.cpp 2012-07-10 22:02:18.226799055 +0200
817 -@@ -71,7 +71,7 @@
818 - i != filesystem::directory_iterator();
819 - ++i ) {
820 - filesystem::path filepath = *i;
821 -- string fileName = filesystem::path(*i).leaf();
822 -+ string fileName = filesystem::path(*i).leaf().string();
823 - if( str::startsWith(fileName, "j._") ) {
824 - unsigned u = str::toUnsigned( str::after(fileName, '_') );
825 - if( m.count(u) ) {
826 -@@ -84,7 +84,7 @@
827 - if( i != m.begin() && m.count(i->first - 1) == 0 ) {
828 - uasserted(13532,
829 - str::stream() << "unexpected file in journal directory " << dir.string()
830 -- << " : " << filesystem::path(i->second).leaf() << " : can't find its preceeding file");
831 -+ << " : " << filesystem::path(i->second).leaf().string() << " : can't find its preceeding file");
832 - }
833 - files.push_back(i->second);
834 - }
835 -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/instance.cpp mongodb-src-r2.0.6-patched/db/instance.cpp
836 ---- mongodb-src-r2.0.6/db/instance.cpp 2012-06-04 15:42:54.000000000 +0200
837 -+++ mongodb-src-r2.0.6-patched/db/instance.cpp 2012-07-10 22:08:55.213488817 +0200
838 -@@ -645,13 +645,13 @@
839 - i != boost::filesystem::directory_iterator(); ++i ) {
840 - if ( directoryperdb ) {
841 - boost::filesystem::path p = *i;
842 -- string dbName = p.leaf();
843 -+ string dbName = p.leaf().string();
844 - p /= ( dbName + ".ns" );
845 - if ( MMF::exists( p ) )
846 - names.push_back( dbName );
847 - }
848 - else {
849 -- string fileName = boost::filesystem::path(*i).leaf();
850 -+ string fileName = boost::filesystem::path(*i).leaf().string();
851 - if ( fileName.length() > 3 && fileName.substr( fileName.length() - 3, 3 ) == ".ns" )
852 - names.push_back( fileName.substr( 0, fileName.length() - 3 ) );
853 - }
854 -@@ -893,7 +893,7 @@
855 - }
856 -
857 - void acquirePathLock(bool doingRepair) {
858 -- string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string();
859 -+ string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string();
860 -
861 - bool oldFile = false;
862 -
863 -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/pdfile.cpp mongodb-src-r2.0.6-patched/db/pdfile.cpp
864 ---- mongodb-src-r2.0.6/db/pdfile.cpp 2012-06-04 15:42:54.000000000 +0200
865 -+++ mongodb-src-r2.0.6-patched/db/pdfile.cpp 2012-07-10 22:11:44.103498643 +0200
866 -@@ -1987,7 +1987,7 @@
867 - virtual bool apply( const Path &p ) {
868 - if ( !boost::filesystem::exists( p ) )
869 - return false;
870 -- boostRenameWrapper( p, newPath_ / ( p.leaf() + ".bak" ) );
871 -+ boostRenameWrapper( p, newPath_ / ( p.leaf().string() + ".bak" ) );
872 - return true;
873 - }
874 - virtual const char * op() const {
875 -@@ -2093,7 +2093,7 @@
876 - uniqueReservedPath( ( preserveClonedFilesOnFailure || backupOriginalFiles ) ?
877 - "backup" : "$tmp" );
878 - BOOST_CHECK_EXCEPTION( boost::filesystem::create_directory( reservedPath ) );
879 -- string reservedPathString = reservedPath.native_directory_string();
880 -+ string reservedPathString = reservedPath.string();
881 -
882 - bool res;
883 - {
884 -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/dbtests/framework.cpp mongodb-src-r2.0.6-patched/dbtests/framework.cpp
885 ---- mongodb-src-r2.0.6/dbtests/framework.cpp 2012-06-04 15:42:54.000000000 +0200
886 -+++ mongodb-src-r2.0.6-patched/dbtests/framework.cpp 2012-07-10 22:29:20.610226773 +0200
887 -@@ -281,7 +281,7 @@
888 - boost::filesystem::create_directory(p);
889 - }
890 -
891 -- string dbpathString = p.native_directory_string();
892 -+ string dbpathString = p.string();
893 - dbpath = dbpathString.c_str();
894 -
895 - cmdLine.prealloc = false;
896 -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/pch.h mongodb-src-r2.0.6-patched/pch.h
897 ---- mongodb-src-r2.0.6/pch.h 2012-06-04 15:42:54.000000000 +0200
898 -+++ mongodb-src-r2.0.6-patched/pch.h 2012-07-10 21:35:57.133373738 +0200
899 -@@ -79,7 +79,7 @@
900 - //#include <boost/any.hpp>
901 - #include "boost/thread/once.hpp"
902 - //#include <boost/archive/iterators/transform_width.hpp>
903 --#define BOOST_FILESYSTEM_VERSION 2
904 -+#define BOOST_FILESYSTEM_VERSION 3
905 - #include <boost/filesystem/convenience.hpp>
906 - #include <boost/filesystem/exception.hpp>
907 - #include <boost/filesystem/operations.hpp>
908 -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/shell/shell_utils.cpp mongodb-src-r2.0.6-patched/shell/shell_utils.cpp
909 ---- mongodb-src-r2.0.6/shell/shell_utils.cpp 2012-06-04 15:42:54.000000000 +0200
910 -+++ mongodb-src-r2.0.6-patched/shell/shell_utils.cpp 2012-07-10 22:38:58.443593723 +0200
911 -@@ -388,7 +388,7 @@
912 - #endif
913 - }
914 -
915 -- argv_.push_back( programPath.native_file_string() );
916 -+ argv_.push_back( programPath.string() );
917 -
918 - port_ = -1;
919 -
920 -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/tools/restore.cpp mongodb-src-r2.0.6-patched/tools/restore.cpp
921 ---- mongodb-src-r2.0.6/tools/restore.cpp 2012-06-04 15:42:54.000000000 +0200
922 -+++ mongodb-src-r2.0.6-patched/tools/restore.cpp 2012-07-10 22:45:00.046948094 +0200
923 -@@ -131,7 +131,7 @@
924 - log(2) << "drillDown: " << root.string() << endl;
925 -
926 - // skip hidden files and directories
927 -- if (root.leaf()[0] == '.' && root.leaf() != ".")
928 -+ if (root.leaf().string()[0] == '.' && root.leaf().string() != ".")
929 - return;
930 -
931 - if ( is_directory( root ) ) {
932 -@@ -210,7 +210,7 @@
933 - ns += "." + _coll;
934 - }
935 - else {
936 -- string l = root.leaf();
937 -+ string l = root.leaf().string();
938 - l = l.substr( 0 , l.find_last_of( "." ) );
939 - ns += "." + l;
940 - }
941 -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/tools/tool.cpp mongodb-src-r2.0.6-patched/tools/tool.cpp
942 ---- mongodb-src-r2.0.6/tools/tool.cpp 2012-06-04 15:42:54.000000000 +0200
943 -+++ mongodb-src-r2.0.6-patched/tools/tool.cpp 2012-07-10 22:23:53.356874403 +0200
944 -@@ -113,12 +113,6 @@
945 - // we want durability to be disabled.
946 - cmdLine.dur = false;
947 -
948 --#if( BOOST_VERSION >= 104500 )
949 -- boost::filesystem::path::default_name_check( boost::filesystem2::no_check );
950 --#else
951 -- boost::filesystem::path::default_name_check( boost::filesystem::no_check );
952 --#endif
953 --
954 - _name = argv[0];
955 -
956 - /* using the same style as db.cpp */
957 -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/background.cpp mongodb-src-r2.0.6-patched/util/background.cpp
958 ---- mongodb-src-r2.0.6/util/background.cpp 2012-06-04 15:42:54.000000000 +0200
959 -+++ mongodb-src-r2.0.6-patched/util/background.cpp 2012-07-10 21:47:40.420081320 +0200
960 -@@ -89,7 +89,7 @@
961 - if ( msTimeOut ) {
962 - // add msTimeOut millisecond to current time
963 - boost::xtime xt;
964 -- boost::xtime_get( &xt, boost::TIME_UTC );
965 -+ boost::xtime_get( &xt, boost::TIME_UTC_ );
966 -
967 - unsigned long long ns = msTimeOut * 1000000ULL; // milli to nano
968 - if ( xt.nsec + ns < 1000000000 ) {
969 -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/concurrency/mutex.h mongodb-src-r2.0.6-patched/util/concurrency/mutex.h
970 ---- mongodb-src-r2.0.6/util/concurrency/mutex.h 2012-06-04 15:42:54.000000000 +0200
971 -+++ mongodb-src-r2.0.6-patched/util/concurrency/mutex.h 2012-07-10 21:45:51.333408307 +0200
972 -@@ -29,7 +29,7 @@
973 -
974 - inline boost::xtime incxtimemillis( long long s ) {
975 - boost::xtime xt;
976 -- boost::xtime_get(&xt, boost::TIME_UTC);
977 -+ boost::xtime_get(&xt, boost::TIME_UTC_);
978 - xt.sec += (int)( s / 1000 );
979 - xt.nsec += (int)(( s % 1000 ) * 1000000);
980 - if ( xt.nsec >= 1000000000 ) {
981 -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/queue.h mongodb-src-r2.0.6-patched/util/queue.h
982 ---- mongodb-src-r2.0.6/util/queue.h 2012-06-04 15:42:54.000000000 +0200
983 -+++ mongodb-src-r2.0.6-patched/util/queue.h 2012-07-10 22:14:00.243506560 +0200
984 -@@ -82,7 +82,7 @@
985 - Timer timer;
986 -
987 - boost::xtime xt;
988 -- boost::xtime_get(&xt, boost::TIME_UTC);
989 -+ boost::xtime_get(&xt, boost::TIME_UTC_);
990 - xt.sec += maxSecondsToWait;
991 -
992 - scoped_lock l( _lock );
993
994 diff --git a/dev-db/mongodb/files/mongodb-2.4.5-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.4.5-fix-scons.patch
995 deleted file mode 100644
996 index 4f4c134..0000000
997 --- a/dev-db/mongodb/files/mongodb-2.4.5-fix-scons.patch
998 +++ /dev/null
999 @@ -1,28 +0,0 @@
1000 ---- a/SConstruct 2013-06-26 10:31:56.209089504 +0200
1001 -+++ b/SConstruct 2013-06-26 10:33:59.177045991 +0200
1002 -@@ -702,7 +702,6 @@
1003 - # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
1004 - env.Append( CCFLAGS=["-fPIC",
1005 - "-fno-strict-aliasing",
1006 -- "-ggdb",
1007 - "-pthread",
1008 - "-Wall",
1009 - "-Wsign-compare",
1010 -@@ -710,14 +709,14 @@
1011 - "-Winvalid-pch"] )
1012 - # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
1013 - if linux:
1014 -- env.Append( CCFLAGS=["-Werror", "-pipe"] )
1015 - if not has_option('clang'):
1016 - env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's
1017 -
1018 - env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
1019 -- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
1020 -+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
1021 -+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
1022 - env.Append( LINKFLAGS=["-fPIC", "-pthread", "-rdynamic"] )
1023 -- env.Append( LIBS=[] )
1024 -+ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy'] )
1025 -
1026 - #make scons colorgcc friendly
1027 - for key in ('HOME', 'TERM'):
1028
1029 diff --git a/dev-db/mongodb/files/mongodb-2.6.1-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.6.1-fix-scons.patch
1030 deleted file mode 100644
1031 index 031d843..0000000
1032 --- a/dev-db/mongodb/files/mongodb-2.6.1-fix-scons.patch
1033 +++ /dev/null
1034 @@ -1,35 +0,0 @@
1035 -diff --git SConstruct SConstruct
1036 -index 3886d1b..81c59a9 100644
1037 ---- SConstruct
1038 -+++ SConstruct
1039 -@@ -811,19 +811,17 @@ if nix:
1040 - # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
1041 - env.Append( CCFLAGS=["-fPIC",
1042 - "-fno-strict-aliasing",
1043 -- "-ggdb",
1044 - "-pthread",
1045 - "-Wall",
1046 - "-Wsign-compare",
1047 - "-Wno-unknown-pragmas",
1048 - "-Winvalid-pch"] )
1049 - # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
1050 -- if linux or darwin:
1051 -- env.Append( CCFLAGS=["-Werror", "-pipe"] )
1052 -
1053 - env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
1054 -- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
1055 - env.Append( LINKFLAGS=["-fPIC", "-pthread"] )
1056 -+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
1057 -+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
1058 -
1059 - # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
1060 - # startup.
1061 -@@ -840,7 +838,7 @@ if nix:
1062 - if not darwin:
1063 - env.Append( LINKFLAGS=["-rdynamic"] )
1064 -
1065 -- env.Append( LIBS=[] )
1066 -+ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] )
1067 -
1068 - #make scons colorgcc friendly
1069 - for key in ('HOME', 'TERM'):
1070
1071 diff --git a/dev-db/mongodb/files/mongos.confd b/dev-db/mongodb/files/mongos.confd
1072 deleted file mode 100644
1073 index 644cd0a..0000000
1074 --- a/dev-db/mongodb/files/mongos.confd
1075 +++ /dev/null
1076 @@ -1,16 +0,0 @@
1077 -# Mongos essentials
1078 -MONGOS_EXEC="/usr/bin/mongos"
1079 -MONGOS_RUN="/var/run/mongodb"
1080 -MONGOS_USER="mongodb"
1081 -
1082 -# Listen to specified IP, comment this to listen to all
1083 -MONGOS_IP="127.0.0.1"
1084 -
1085 -# Listen to specified port
1086 -MONGOS_PORT="27018"
1087 -
1088 -# 1 to 3 comma separated config servers (mandatory)
1089 -MONGOS_CONFIGDB=""
1090 -
1091 -# Set extra options here
1092 -MONGOS_OPTIONS=""
1093
1094 diff --git a/dev-db/mongodb/files/mongos.initd-r1 b/dev-db/mongodb/files/mongos.initd-r1
1095 deleted file mode 100644
1096 index 1df48d6..0000000
1097 --- a/dev-db/mongodb/files/mongos.initd-r1
1098 +++ /dev/null
1099 @@ -1,50 +0,0 @@
1100 -#!/sbin/openrc-run
1101 -# Copyright 1999-2013 Gentoo Foundation
1102 -# Distributed under the terms of the GNU General Public License v2
1103 -# $Id$
1104 -
1105 -depend() {
1106 - use net
1107 -}
1108 -
1109 -checkconfig() {
1110 - if [ -z "${MONGOS_CONFIGDB}" ]; then
1111 - eerror "MONGOS_CONFIGDB is not defined, check your configuration file !"
1112 - return 1
1113 - fi
1114 - return 0
1115 -}
1116 -
1117 -start() {
1118 - checkconfig || return 1
1119 -
1120 - checkpath -d -m 0750 -o "${MONGOS_USER}":mongodb "${MONGOS_RUN}"
1121 -
1122 - # Listen to MONGOS_IP if configured
1123 - [ -z "${MONGOS_IP}" ] || MONGOS_OPTIONS="--bind_ip ${MONGOS_IP} ${MONGOS_OPTIONS}"
1124 -
1125 - # Baselayout-1 user should use --chuid instead of --user
1126 - local USEROPT="--user"
1127 - if [ ! -f /etc/init.d/sysfs ]; then
1128 - USEROPT="--chuid"
1129 - fi
1130 -
1131 - ebegin "Starting ${SVCNAME}"
1132 - start-stop-daemon --background --start --make-pidfile \
1133 - --pidfile ${MONGOS_RUN:-/var/run/mongodb}/${SVCNAME}.pid \
1134 - ${USEROPT} ${MONGOS_USER:-mongodb} \
1135 - --exec ${MONGOS_EXEC:-/usr/bin/mongos} \
1136 - -- \
1137 - --port ${MONGOS_PORT:-27018} \
1138 - --unixSocketPrefix ${MONGOS_RUN:-/var/run/mongodb} \
1139 - --logappend --logpath /var/log/mongodb/${SVCNAME}.log \
1140 - --configdb ${MONGOS_CONFIGDB} \
1141 - ${MONGOS_OPTIONS}
1142 - eend $?
1143 -}
1144 -
1145 -stop() {
1146 - ebegin "Stopping ${SVCNAME}"
1147 - start-stop-daemon --stop --pidfile ${MONGOS_RUN:-/var/run/mongodb}/${SVCNAME}.pid
1148 - eend $?
1149 -}
1150
1151 diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-disable-tests.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-disable-tests.patch
1152 deleted file mode 100644
1153 index e6345c0..0000000
1154 --- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-disable-tests.patch
1155 +++ /dev/null
1156 @@ -1,14 +0,0 @@
1157 -diff -urNad mysql-connector-c++-1.0.6~r754~/CMakeLists.txt mysql-connector-c++-1.0.6~r754/CMakeLists.txt
1158 ---- mysql-connector-c++-1.0.6~r754~/CMakeLists.txt 2009-08-20 22:25:35.000000000 +0200
1159 -+++ mysql-connector-c++-1.0.6~r754/CMakeLists.txt 2009-08-20 22:25:57.000000000 +0200
1160 -@@ -241,10 +241,6 @@
1161 - ADD_SUBDIRECTORY(cppconn)
1162 - ADD_SUBDIRECTORY(driver)
1163 - ADD_SUBDIRECTORY(examples)
1164 --ADD_SUBDIRECTORY(test)
1165 --ADD_SUBDIRECTORY(test/framework)
1166 --ADD_SUBDIRECTORY(test/CJUnitTestsPort)
1167 --ADD_SUBDIRECTORY(test/unit)
1168 -
1169 - IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
1170 - # see also README
1171
1172 diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-fix-cmake.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-fix-cmake.patch
1173 deleted file mode 100644
1174 index d32fa07..0000000
1175 --- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-fix-cmake.patch
1176 +++ /dev/null
1177 @@ -1,85 +0,0 @@
1178 -diff -urN mysql-connector-c++-1.1.0.old/CMakeLists.txt mysql-connector-c++-1.1.0/CMakeLists.txt
1179 ---- mysql-connector-c++-1.1.0.old/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200
1180 -+++ mysql-connector-c++-1.1.0/CMakeLists.txt 2011-07-30 13:16:18.000000000 +0200
1181 -@@ -232,7 +232,7 @@
1182 - "install_manifest.txt")
1183 - SET(PRJ_COMMON_IGNORE_FILES ${COMMON_IGNORE_FILES} "ANNOUNCEMENT_102_ALPHA" "ANNOUNCEMENT_103_ALPHA" "ANNOUNCEMENT_104_BETA" "ANNOUNCEMENT_105_GA" "ANNOUNCEMENT_110_GA" "ANNOUNCEMENT_DRAFT" )
1184 -
1185 --SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "./cppconn/config.h$" "./driver/nativeapi/binding_config.h$")
1186 -+SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h$" "${CMAKE_CURRENT_SOURCE_DIR}/driver/nativeapi/binding_config.h$")
1187 - SET(CPACK_PACKAGE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "something_there" )
1188 - SET(CPACK_SOURCE_GENERATOR "TGZ")
1189 -
1190 -diff -urN mysql-connector-c++-1.1.0.old/cppconn/CMakeLists.txt mysql-connector-c++-1.1.0/cppconn/CMakeLists.txt
1191 ---- mysql-connector-c++-1.1.0.old/cppconn/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200
1192 -+++ mysql-connector-c++-1.1.0/cppconn/CMakeLists.txt 2011-07-30 14:10:34.000000000 +0200
1193 -@@ -55,7 +55,7 @@
1194 -
1195 - SET(MYSQLCPPCONN_INSTALL_HEADERS
1196 - build_config.h
1197 -- config.h
1198 -+ ${CMAKE_CURRENT_BINARY_DIR}/config.h
1199 - connection.h
1200 - datatype.h
1201 - driver.h
1202 -diff -urN mysql-connector-c++-1.1.0.old/driver/CMakeLists.txt mysql-connector-c++-1.1.0/driver/CMakeLists.txt
1203 ---- mysql-connector-c++-1.1.0.old/driver/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200
1204 -+++ mysql-connector-c++-1.1.0/driver/CMakeLists.txt 2011-07-30 13:20:36.000000000 +0200
1205 -@@ -26,6 +26,9 @@
1206 -
1207 - INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR})
1208 - INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn)
1209 -+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR})
1210 -+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/cppconn)
1211 -+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/driver/nativeapi)
1212 - INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BOOST_INCLUDE_DIRS})
1213 - MESSAGE(STATUS "BOOST_INCLUDE_DIRS=${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}")
1214 -
1215 -@@ -149,20 +152,22 @@
1216 - nativeapi/native_statement_wrapper.h
1217 - nativeapi/mysql_native_resultset_wrapper.h
1218 - nativeapi/native_resultset_wrapper.h
1219 -- ../cppconn/warning.h
1220 -- ../cppconn/statement.h
1221 -- ../cppconn/sqlstring.h
1222 -- ../cppconn/resultset_metadata.h
1223 -- ../cppconn/resultset.h
1224 -- ../cppconn/prepared_statement.h
1225 -- ../cppconn/parameter_metadata.h
1226 -- ../cppconn/metadata.h
1227 -- ../cppconn/exception.h
1228 -- ../cppconn/driver.h
1229 -- ../cppconn/datatype.h
1230 -- ../cppconn/connection.h
1231 -- ../cppconn/config.h
1232 -- ../cppconn/build_config.h
1233 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/warning.h
1234 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/statement.h
1235 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/sqlstring.h
1236 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset_metadata.h
1237 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset.h
1238 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/prepared_statement.h
1239 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/parameter_metadata.h
1240 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/metadata.h
1241 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/exception.h
1242 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/driver.h
1243 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/datatype.h
1244 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/connection.h
1245 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h
1246 -+ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/config.h
1247 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/build_config.h
1248 -+ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/build_config.h
1249 -
1250 - )
1251 -
1252 -@@ -271,8 +276,8 @@
1253 - )
1254 - ELSE(WIN32)
1255 - INSTALL(TARGETS mysqlcppconn mysqlcppconn-static
1256 -- LIBRARY DESTINATION lib
1257 -- ARCHIVE DESTINATION lib
1258 -+ LIBRARY DESTINATION lib${LIB_SUFFIX}
1259 -+ ARCHIVE DESTINATION lib${LIB_SUFFIX}
1260 - )
1261 - ENDIF(WIN32)
1262 -
1263
1264 diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.5-fix-cmake.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.5-fix-cmake.patch
1265 deleted file mode 100644
1266 index 3347909..0000000
1267 --- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.5-fix-cmake.patch
1268 +++ /dev/null
1269 @@ -1,106 +0,0 @@
1270 ---- a/CMakeLists.txt 2014-05-04 21:27:59.000000000 -0400
1271 -+++ b/CMakeLists.txt 2014-05-04 21:47:31.460572470 -0400
1272 -@@ -269,14 +269,14 @@
1273 - ${CPACK_RESOURCE_FILE_LICENSE}
1274 - "${CMAKE_SOURCE_DIR}/Licenses_for_Third-Party_Components.txt"
1275 - "${CMAKE_SOURCE_DIR}/ANNOUNCEMENT"
1276 -- DESTINATION "." OPTIONAL)
1277 -+ DESTINATION "${INSTALL_DOCS}" OPTIONAL)
1278 -
1279 - SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/"
1280 - "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile"
1281 - "install_manifest.txt")
1282 - SET(PRJ_COMMON_IGNORE_FILES ${COMMON_IGNORE_FILES} "ANNOUNCEMENT_102_ALPHA" "ANNOUNCEMENT_103_ALPHA" "ANNOUNCEMENT_104_BETA" "ANNOUNCEMENT_105_GA" "ANNOUNCEMENT_110_GA" "ANNOUNCEMENT_111_GA" "ANNOUNCEMENT_DRAFT" )
1283 -
1284 --SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "./cppconn/config.h$" "./driver/nativeapi/binding_config.h$" "./driver/version_info.h$")
1285 -+SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h$" "${CMAKE_CURRENT_SOURCE_DIR}/driver/nativeapi/binding_config.h$" "${CMAKE_CURRENT_SOURCE_DIR}/driver/version_info.h$")
1286 - SET(CPACK_PACKAGE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "something_there" )
1287 - SET(CPACK_SOURCE_GENERATOR "TGZ")
1288 -
1289 -@@ -303,10 +303,6 @@
1290 - ADD_SUBDIRECTORY(cppconn)
1291 - ADD_SUBDIRECTORY(driver)
1292 - ADD_SUBDIRECTORY(examples)
1293 --ADD_SUBDIRECTORY(test)
1294 --ADD_SUBDIRECTORY(test/framework)
1295 --ADD_SUBDIRECTORY(test/CJUnitTestsPort)
1296 --ADD_SUBDIRECTORY(test/unit)
1297 -
1298 - IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
1299 - # see also README
1300 -diff -urN a/cppconn/CMakeLists.txt b/cppconn/CMakeLists.txt
1301 ---- a/cppconn/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200
1302 -+++ b/cppconn/CMakeLists.txt 2011-07-30 14:10:34.000000000 +0200
1303 -@@ -55,7 +55,7 @@
1304 -
1305 - SET(MYSQLCPPCONN_INSTALL_HEADERS
1306 - build_config.h
1307 -- config.h
1308 -+ ${CMAKE_CURRENT_BINARY_DIR}/config.h
1309 - connection.h
1310 - datatype.h
1311 - driver.h
1312 -diff -urN mysql-connector-c++-1.1.0.old/driver/CMakeLists.txt mysql-connector-c++-1.1.0/driver/CMakeLists.txt
1313 ---- a/driver/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200
1314 -+++ b/driver/CMakeLists.txt 2011-07-30 13:20:36.000000000 +0200
1315 -@@ -26,6 +26,9 @@
1316 -
1317 - INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR})
1318 - INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn)
1319 -+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR})
1320 -+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/cppconn)
1321 -+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/driver/nativeapi)
1322 - INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BOOST_INCLUDE_DIRS})
1323 - MESSAGE(STATUS "BOOST_INCLUDE_DIRS=${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}")
1324 -
1325 -@@ -149,21 +152,23 @@
1326 - nativeapi/native_statement_wrapper.h
1327 - nativeapi/mysql_native_resultset_wrapper.h
1328 - nativeapi/native_resultset_wrapper.h
1329 -- ../cppconn/warning.h
1330 -- ../cppconn/statement.h
1331 -- ../cppconn/sqlstring.h
1332 -- ../cppconn/resultset_metadata.h
1333 -- ../cppconn/resultset.h
1334 -- ../cppconn/prepared_statement.h
1335 -- ../cppconn/parameter_metadata.h
1336 -- ../cppconn/metadata.h
1337 -- ../cppconn/exception.h
1338 -- ../cppconn/driver.h
1339 -- ../cppconn/datatype.h
1340 -- ../cppconn/variant.h
1341 -- ../cppconn/connection.h
1342 -- ../cppconn/config.h
1343 -- ../cppconn/build_config.h
1344 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/warning.h
1345 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/statement.h
1346 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/sqlstring.h
1347 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset_metadata.h
1348 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset.h
1349 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/prepared_statement.h
1350 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/parameter_metadata.h
1351 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/metadata.h
1352 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/exception.h
1353 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/driver.h
1354 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/datatype.h
1355 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/variant.h
1356 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/connection.h
1357 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h
1358 -+ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/config.h
1359 -+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/build_config.h
1360 -+ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/build_config.h
1361 -
1362 - )
1363 -
1364 -diff -aruN a/FindMySQL.cmake b/FindMySQL.cmake
1365 ---- a/FindMySQL.cmake 2014-11-19 08:37:11.000000000 -0500
1366 -+++ b/FindMySQL.cmake 2015-02-21 21:58:20.264446822 -0500
1367 -@@ -462,7 +462,7 @@
1368 - endif()
1369 -
1370 - if(NOT MYSQL_CXXFLAGS)
1371 -- if(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
1372 -+ if(MYSQL_CXX_LINKAGE)
1373 - _mysql_conf(MYSQL_CXXFLAGS "--cxxflags")
1374 - set(MYSQL_CXX_LINKAGE 1)
1375 - else()
1376
1377 diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.1.7-mysql_options4.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.1.7-mysql_options4.patch
1378 deleted file mode 100644
1379 index e0dbc2b..0000000
1380 --- a/dev-db/mysql-workbench/files/mysql-workbench-6.1.7-mysql_options4.patch
1381 +++ /dev/null
1382 @@ -1,29 +0,0 @@
1383 -Patch taken from opensuse:
1384 -https://www.mail-archive.com/opensuse-commit@××××××××.org/msg60296.html
1385 -
1386 -Modified to be conditional on MARIADB_BASE_VERSION
1387 -
1388 -++++++ mysql-workbench-mysql_options4.patch ++++++
1389 -diff --git a/plugins/migration/copytable/copytable.cpp
1390 -b/plugins/migration/copytable/copytable.cpp
1391 -index b273287..77c227b 100644
1392 ---- a/plugins/migration/copytable/copytable.cpp
1393 -+++ b/plugins/migration/copytable/copytable.cpp
1394 -@@ -1633,12 +1633,17 @@ MySQLCopyDataTarget::MySQLCopyDataTarget(const
1395 - std::string &hostname, int port,
1396 - _truncate = false;
1397 -
1398 - mysql_init(&_mysql);
1399 -+ /* This is optional has compiled in for MySQL >= 5.6.6
1400 -+ * Looks like MariaDB does not support this as supposed,
1401 -+ * so disable completly. */
1402 -+#ifndef MARIADB_BASE_VERSION
1403 - #if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH)
1404 - #if MYSQL_CHECK_VERSION(5,6,6)
1405 - mysql_options4(&_mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", app_name.c_str());
1406 - #endif
1407 - #endif
1408 -+#endif
1409 -
1410 - // _bulk_insert_record is used to prepare a single record string, the connection
1411 - // is needed to escape binary data properly
1412
1413 diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.1.7-wbcopytables.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.1.7-wbcopytables.patch
1414 deleted file mode 100644
1415 index 7f4013a..0000000
1416 --- a/dev-db/mysql-workbench/files/mysql-workbench-6.1.7-wbcopytables.patch
1417 +++ /dev/null
1418 @@ -1,10 +0,0 @@
1419 ---- plugins/migration/CMakeLists.txt.~1~ 2014-07-12 08:45:56.808929549 +0200
1420 -+++ plugins/migration/CMakeLists.txt 2014-07-12 08:49:26.659049880 +0200
1421 -@@ -7,6 +7,7 @@
1422 -
1423 - add_definitions(${ODBC_DEFINITIONS})
1424 -
1425 -+SET(CMAKE_INSTALL_RPATH "${WB_INSTALL_LIB_DIR}")
1426 - add_executable(wbcopytables
1427 - copytable/copytable.cpp
1428 - copytable/python_copy_data_source.cpp
1429
1430 diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-ctemplate.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-ctemplate.patch
1431 deleted file mode 100644
1432 index fbcd5bc..0000000
1433 --- a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-ctemplate.patch
1434 +++ /dev/null
1435 @@ -1,35 +0,0 @@
1436 -Fix compilation with ctemplate 2.3 by avoiding long-deprecated method.
1437 -
1438 -Patch by Marcel Pennewiß in https://bugs.gentoo.org/show_bug.cgi?id=533086
1439 -
1440 -Unresolved upstream bug http://bugs.mysql.com/bug.php?id=72585
1441 -
1442 ---- mysql-workbench-community-6.0.9-src/backend/wbpublic/sqlide/recordset_text_storage.cpp
1443 -+++ mysql-workbench-community-6.0.9-src/backend/wbpublic/sqlide/recordset_text_storage.cpp
1444 -@@ -204,7 +204,7 @@
1445 - if (!pre_tpl)
1446 - g_warning("Failed to open template file: `%s`", pre_tpl_path.c_str());
1447 - else
1448 -- pre_tpl->ReloadIfChanged();
1449 -+ pre_tpl->ReloadAllIfChanged();
1450 - }
1451 - if (g_file_test((name+".post.tpl").c_str(), G_FILE_TEST_EXISTS))
1452 - {
1453 -@@ -213,7 +213,7 @@
1454 - if (!post_tpl)
1455 - g_warning("Failed to open template file: `%s`", post_tpl_path.c_str());
1456 - else
1457 -- post_tpl->ReloadIfChanged();
1458 -+ post_tpl->ReloadAllIfChanged();
1459 - }
1460 - }
1461 -
1462 -@@ -222,7 +222,7 @@
1463 - throw std::runtime_error(strfmt("Failed to open output file: `%s`", _file_path.c_str()));
1464 - }
1465 -
1466 -- tpl->ReloadIfChanged();
1467 -+ tpl->ReloadAllIfChanged();
1468 -
1469 - std::auto_ptr<TemplateDictionary> dict(new TemplateDictionary("/"));
1470 - BOOST_FOREACH (const Parameters::value_type &param, _parameters)
1471
1472 diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-glib.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-glib.patch
1473 deleted file mode 100644
1474 index 96da853..0000000
1475 --- a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-glib.patch
1476 +++ /dev/null
1477 @@ -1,42 +0,0 @@
1478 -Patch to make the query results window work with glib 2.42.
1479 -https://bugs.gentoo.org/show_bug.cgi?id=536024
1480 -http://bugs.mysql.com/bug.php?id=74147
1481 -
1482 -
1483 -=== modified file frontend/linux/linux_utilities/listmodel_wrapper.cpp
1484 ---- frontend/linux/linux_utilities/listmodel_wrapper.cpp 2014-03-17 16:42:25 +0000
1485 -+++ frontend/linux/linux_utilities/listmodel_wrapper.cpp 2014-10-16 10:33:12 +0000
1486 -@@ -528,7 +528,6 @@
1487 - ListModelWrapper::ListModelWrapper(bec::ListModel* tm, Gtk::TreeView *treeview, const std::string& name)
1488 - : Glib::ObjectBase(typeid(ListModelWrapper))
1489 - , Glib::Object()
1490 -- , Gtk::TreeModel()
1491 - , _treeview(treeview)
1492 - , _iconview(0)
1493 - , _context_menu(0)
1494 -
1495 -=== modified file frontend/linux/linux_utilities/listmodel_wrapper.h
1496 ---- frontend/linux/linux_utilities/listmodel_wrapper.h 2013-12-05 13:10:03 +0000
1497 -+++ frontend/linux/linux_utilities/listmodel_wrapper.h 2014-10-16 10:33:12 +0000
1498 -@@ -232,9 +232,16 @@
1499 -
1500 - //==============================================================================
1501 -
1502 --class ListModelWrapper : public Glib::Object, public Gtk::TreeModel,
1503 -- public Gtk::TreeDragDest, public Gtk::TreeDragSource,
1504 -- public base::trackable
1505 -+#if GLIB_CHECK_VERSION(2, 42, 0)
1506 -+class ListModelWrapper : public Gtk::TreeModel, public Glib::Object,
1507 -+ public Gtk::TreeDragDest, public Gtk::TreeDragSource,
1508 -+ public base::trackable
1509 -+#else
1510 -+class ListModelWrapper : public Glib::Object, public Gtk::TreeModel,
1511 -+ public Gtk::TreeDragDest, public Gtk::TreeDragSource,
1512 -+ public base::trackable
1513 -+
1514 -+#endif
1515 - {
1516 - friend class ColumnsModel;
1517 - protected:
1518 -
1519 -
1520
1521 diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-paramiko.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-paramiko.patch
1522 deleted file mode 100644
1523 index ad131b7..0000000
1524 --- a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-paramiko.patch
1525 +++ /dev/null
1526 @@ -1,51 +0,0 @@
1527 -Last-Update: 2014-10-07
1528 -Forwarded: not-needed
1529 -From: Alfredo Kojima
1530 -Bug-Upstream: http://bugs.mysql.com/bug.php?id=74223
1531 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=763971
1532 -Description: fix connectivity through SSH tunnel.
1533 -
1534 -=== modified file 'plugins/wb.admin/backend/wb_admin_ssh.py'
1535 ---- a/plugins/wb.admin/backend/wb_admin_ssh.py
1536 -+++ b/plugins/wb.admin/backend/wb_admin_ssh.py
1537 -@@ -84,10 +84,14 @@
1538 - m = Message()
1539 - m.add_byte(chr(MSG_CHANNEL_OPEN))
1540 - m.add_string(kind)
1541 - m.add_int(chanid)
1542 -- m.add_int(self.window_size)
1543 -- m.add_int(self.max_packet_size)
1544 -+ if server_version_str2tuple(paramiko.__version__) < (1, 15, 0):
1545 -+ m.add_int(self.window_size)
1546 -+ m.add_int(self.max_packet_size)
1547 -+ else:
1548 -+ m.add_int(self.default_window_size)
1549 -+ m.add_int(self.default_max_packet_size)
1550 - if (kind == 'forwarded-tcpip') or (kind == 'direct-tcpip'):
1551 - m.add_string(dest_addr[0])
1552 - m.add_int(dest_addr[1])
1553 - m.add_string(src_addr[0])
1554 -@@ -99,9 +103,12 @@
1555 - self._channels.put(chanid, chan)
1556 - self.channel_events[chanid] = event = threading.Event()
1557 - self.channels_seen[chanid] = True
1558 - chan._set_transport(self)
1559 -- chan._set_window(self.window_size, self.max_packet_size)
1560 -+ if server_version_str2tuple(paramiko.__version__) < (1, 15, 0):
1561 -+ chan._set_window(self.window_size, self.max_packet_size)
1562 -+ else:
1563 -+ chan._set_window(self.default_window_size, self.default_max_packet_size)
1564 - finally:
1565 - self.lock.release()
1566 - self._send_user_message(m)
1567 - ts = time.time() + OPEN_CHANNEL_TIMEOUT if (timeout is None) else timeout
1568 -@@ -669,8 +676,9 @@
1569 -
1570 - read_timeout = 10
1571 -
1572 - if self.client is not None:
1573 -+ chan = None
1574 - transport = self.client.get_transport()
1575 - try:
1576 - spawn_process = False
1577 - if 'nohup' in cmd:
1578
1579 diff --git a/dev-db/postgis/files/postgis-2.0-ldflags.patch b/dev-db/postgis/files/postgis-2.0-ldflags.patch
1580 deleted file mode 100644
1581 index f48617c..0000000
1582 --- a/dev-db/postgis/files/postgis-2.0-ldflags.patch
1583 +++ /dev/null
1584 @@ -1,26 +0,0 @@
1585 -diff -Naurw postgis-2.0.2.orig/loader/Makefile.in postgis-2.0.2/loader/Makefile.in
1586 ---- postgis-2.0.2.orig/loader/Makefile.in 2012-03-21 21:36:59.000000000 +0000
1587 -+++ postgis-2.0.2/loader/Makefile.in 2013-01-29 21:44:12.566318760 +0000
1588 -@@ -97,11 +97,11 @@
1589 -
1590 - $(PGSQL2SHP-CLI): $(SHPLIB_OBJS) pgsql2shp-core.o pgsql2shp-cli.o $(LIBLWGEOM)
1591 - $(LIBTOOL) --mode=link \
1592 -- $(CC) $(CFLAGS) $^ $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) -o $@
1593 -+ $(CC) $(CFLAGS) $^ $(LDFLAGS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) -o $@
1594 -
1595 - $(SHP2PGSQL-CLI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-cli.o $(LIBLWGEOM)
1596 - $(LIBTOOL) --mode=link \
1597 -- $(CC) $(CFLAGS) $^ -o $@ $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS)
1598 -+ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS)
1599 -
1600 - shp2pgsql-gui.o: shp2pgsql-gui.c shp2pgsql-core.h shpcommon.h
1601 - $(CC) $(CFLAGS) $(GTK_CFLAGS) $(PGSQL_FE_CPPFLAGS) -o $@ -c shp2pgsql-gui.c
1602 -@@ -109,7 +109,7 @@
1603 - $(SHP2PGSQL-GUI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-gui.o pgsql2shp-core.o $(LIBLWGEOM) $(GTK_WIN32_RES)
1604 - $(LIBTOOL) --mode=link \
1605 - $(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ \
1606 -- $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS)
1607 -+ $(LDFLAGS) $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS)
1608 -
1609 - installdir:
1610 - @mkdir -p $(DESTDIR)$(bindir)
1611
1612 diff --git a/dev-db/postgis/files/postgis-2.0-pkgconfig-json.patch b/dev-db/postgis/files/postgis-2.0-pkgconfig-json.patch
1613 deleted file mode 100644
1614 index 45c5b07..0000000
1615 --- a/dev-db/postgis/files/postgis-2.0-pkgconfig-json.patch
1616 +++ /dev/null
1617 @@ -1,99 +0,0 @@
1618 -diff -Naruw postgis-2.0.2.orig/configure.ac postgis-2.0.2/configure.ac
1619 ---- postgis-2.0.2.orig/configure.ac 2012-05-17 12:10:04.000000000 +0000
1620 -+++ postgis-2.0.2/configure.ac 2013-02-11 11:57:06.733323130 +0000
1621 -@@ -701,57 +701,14 @@
1622 - dnl Detect if json-c installed
1623 - dnl ===========================================================================
1624 -
1625 --HAVE_JSON=no
1626 --AC_SUBST([HAVE_JSON])
1627 --
1628 --AC_ARG_WITH([jsondir],
1629 -- [AS_HELP_STRING([--with-jsondir=PATH], [specify the json-c installation directory])],
1630 -- [JSONDIR="$withval"], [JSONDIR=])
1631 --
1632 --if test ! "x$JSONDIR" = "x"; then
1633 -- dnl Make sure that the directory exists
1634 -- if test "x$JSONDIR" = "xyes"; then
1635 -- AC_MSG_ERROR([you must specify a parameter to --with-jsondir, e.g. --with-jsondir=/path/to])
1636 -- else
1637 -- dnl We need (libjson.so OR libjson.a OR libjson.dll) AND json/json.h
1638 -- if test ! -e "${JSONDIR}/include/json/json.h" -o \
1639 -- ! \( -e "${JSONDIR}/lib/libjson.so" -o \
1640 -- -e "${JSONDIR}/lib/libjson.dll" -o \
1641 -- -e "${JSONDIR}/lib/libjson.dylib" -o \
1642 -- -e "${JSONDIR}/bin/libjson.dll" -o \
1643 -- -e "${JSONDIR}/lib/libjson.a" \)
1644 -- then
1645 -- AC_MSG_ERROR([Cannot find json dev files in "$JSONDIR"])
1646 -- fi
1647 -- AC_MSG_RESULT([Using user-specified json-c directory: $JSONDIR])
1648 --
1649 -- dnl Add the include directory to JSON_CPPFLAGS
1650 -- JSON_CPPFLAGS="-I$JSONDIR/include"
1651 -- JSON_LDFLAGS="-L$JSONDIR/lib -ljson"
1652 -- fi
1653 --fi
1654 --
1655 --dnl Check that we can find the json/json.h header file
1656 --CPPFLAGS_SAVE="$CPPFLAGS"
1657 --CPPFLAGS="$JSON_CPPFLAGS"
1658 --AC_CHECK_HEADER([json/json.h], [HAVE_JSON=yes], [])
1659 --CPPFLAGS="$CPPFLAGS_SAVE"
1660 --
1661 --dnl Ensure we can link against libjson
1662 --LIBS_SAVE="$LIBS"
1663 --LIBS="$JSON_LDFLAGS"
1664 --AC_CHECK_LIB([json], [json_object_get], [HAVE_JSON=yes], [], [])
1665 --LIBS="$LIBS_SAVE"
1666 --
1667 --if test "$HAVE_JSON" = "yes"; then
1668 -+PKG_CHECK_MODULES([JSON], [json],
1669 -+ [
1670 -+ HAVE_JSON=yes
1671 - AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present])
1672 -- if test "x$JSON_LDFLAGS" = "x"; then
1673 -- JSON_LDFLAGS="-ljson"
1674 -- fi
1675 --fi
1676 -+ ],
1677 -+ [HAVE_JSON=no])
1678 -
1679 --AC_SUBST([JSON_CPPFLAGS])
1680 --AC_SUBST([JSON_LDFLAGS])
1681 -+AC_SUBST([HAVE_JSON])
1682 -
1683 - dnl ===========================================================================
1684 - dnl Detect GTK+2.0 for GUI
1685 -@@ -842,10 +799,10 @@
1686 - AC_DEFINE_UNQUOTED([POSTGIS_USE_STATS], [1], [Enable use of ANALYZE statistics])
1687 -
1688 -
1689 --CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $JSON_CPPFLAGS $XML2_CPPFLAGS"
1690 -+CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $JSON_CFLAGS $XML2_CPPFLAGS"
1691 - dnl AC_MSG_RESULT([CPPFLAGS: $CPPFLAGS])
1692 -
1693 --SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LDFLAGS $XML2_LDFLAGS"
1694 -+SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LIBS $XML2_LDFLAGS"
1695 - AC_SUBST([SHLIB_LINK])
1696 - dnl AC_MSG_RESULT([SHLIB_LINK: $SHLIB_LINK])
1697 -
1698 -diff -Naruw postgis-2.0.2.orig/postgis/lwgeom_in_geojson.c postgis-2.0.2/postgis/lwgeom_in_geojson.c
1699 ---- postgis-2.0.2.orig/postgis/lwgeom_in_geojson.c 2012-12-03 16:18:33.000000000 +0000
1700 -+++ postgis-2.0.2/postgis/lwgeom_in_geojson.c 2013-02-11 12:09:29.017167709 +0000
1701 -@@ -28,8 +28,8 @@
1702 - #ifdef HAVE_LIBJSON
1703 -
1704 - #include "lwgeom_export.h"
1705 --#include <json/json.h>
1706 --#include <json/json_object_private.h>
1707 -+#include <json.h>
1708 -+#include <json_object_private.h>
1709 -
1710 - /* Prototype */
1711 - LWGEOM* parse_geojson(json_object *geojson, bool *hasz, int *root_srid);
1712 -@@ -556,4 +556,3 @@
1713 - PG_RETURN_POINTER(geom);
1714 - #endif
1715 - }
1716 --
1717
1718 diff --git a/dev-db/postgresql/files/postgresql-9.4-alpha-fix-read-memory-barrier.patch b/dev-db/postgresql/files/postgresql-9.4-alpha-fix-read-memory-barrier.patch
1719 deleted file mode 100644
1720 index 0ab7242..0000000
1721 --- a/dev-db/postgresql/files/postgresql-9.4-alpha-fix-read-memory-barrier.patch
1722 +++ /dev/null
1723 @@ -1,13 +0,0 @@
1724 -Index: postgresql-9.4-9.4~beta2/src/include/storage/barrier.h
1725 -===================================================================
1726 ---- postgresql-9.4-9.4~beta2.orig/src/include/storage/barrier.h
1727 -+++ postgresql-9.4-9.4~beta2/src/include/storage/barrier.h
1728 -@@ -117,7 +117,7 @@ extern slock_t dummy_spinlock;
1729 - * read barrier to cover that case. We might need to add that later.
1730 - */
1731 - #define pg_memory_barrier() __asm__ __volatile__ ("mb" : : : "memory")
1732 --#define pg_read_barrier() __asm__ __volatile__ ("rmb" : : : "memory")
1733 -+#define pg_read_barrier() __asm__ __volatile__ ("mb" : : : "memory")
1734 - #define pg_write_barrier() __asm__ __volatile__ ("wmb" : : : "memory")
1735 - #elif defined(__hppa) || defined(__hppa__) /* HP PA-RISC */
1736 -
1737
1738 diff --git a/dev-db/redis/files/redis-2.4.17-shared.patch b/dev-db/redis/files/redis-2.4.17-shared.patch
1739 deleted file mode 100644
1740 index 9c60714..0000000
1741 --- a/dev-db/redis/files/redis-2.4.17-shared.patch
1742 +++ /dev/null
1743 @@ -1,22 +0,0 @@
1744 -See https://github.com/antirez/redis/pull/137
1745 -
1746 ---- src/Makefile 2011-10-17 10:46:00.000000000 +0200
1747 -+++ src/Makefile.2 2011-10-17 13:47:53.000000000 +0200
1748 -@@ -49,7 +49,16 @@
1749 - ifeq ($(USE_JEMALLOC),yes)
1750 - ALLOC_DEP=../deps/jemalloc/lib/libjemalloc.a
1751 - ALLOC_LINK=$(ALLOC_DEP) -ldl
1752 -- ALLOC_FLAGS=-DUSE_JEMALLOC -I../deps/jemalloc/include
1753 -+ ALLOC_FLAGS=-DUSE_JEMALLOC
1754 -+ ifdef JEMALLOC_SHARED
1755 -+ ALLOC_DEP=
1756 -+ ALLOC_LINK=-ljemalloc
1757 -+ ALLOC_FLAGS=-DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -I/usr/include
1758 -+ else
1759 -+ ALLOC_DEP=../deps/jemalloc/lib/libjemalloc.a
1760 -+ ALLOC_LINK=$(ALLOC_DEP) -ldl
1761 -+ ALLOC_FLAGS=-DUSE_JEMALLOC -I../deps/jemalloc/include
1762 -+ endif
1763 - endif
1764 -
1765 - CCOPT= $(CFLAGS) $(ARCH) $(PROF)
1766 \ No newline at end of file
1767
1768 diff --git a/dev-db/redis/files/redis-2.4.3-shared.patch b/dev-db/redis/files/redis-2.4.3-shared.patch
1769 deleted file mode 100644
1770 index 20cdebe..0000000
1771 --- a/dev-db/redis/files/redis-2.4.3-shared.patch
1772 +++ /dev/null
1773 @@ -1,22 +0,0 @@
1774 -See https://github.com/antirez/redis/pull/137
1775 -
1776 ---- src/Makefile 2011-10-17 10:46:00.000000000 +0200
1777 -+++ src/Makefile.2 2011-10-17 13:47:53.000000000 +0200
1778 -@@ -49,7 +49,16 @@
1779 - ifeq ($(USE_JEMALLOC),yes)
1780 - ALLOC_DEP=../deps/jemalloc/lib/libjemalloc.a
1781 - ALLOC_LINK=$(ALLOC_DEP) -ldl
1782 -- ALLOC_FLAGS=-DUSE_JEMALLOC -I../deps/jemalloc/include
1783 -+ ALLOC_FLAGS=-DUSE_JEMALLOC
1784 -+ ifdef JEMALLOC_SHARED
1785 -+ ALLOC_DEP=
1786 -+ ALLOC_LINK=-ljemalloc
1787 -+ ALLOC_FLAGS=-DUSE_JEMALLOC -I/usr/include
1788 -+ else
1789 -+ ALLOC_DEP=../deps/jemalloc/lib/libjemalloc.a
1790 -+ ALLOC_LINK=$(ALLOC_DEP) -ldl
1791 -+ ALLOC_FLAGS=-DUSE_JEMALLOC -I../deps/jemalloc/include
1792 -+ endif
1793 - endif
1794 -
1795 - CCOPT= $(CFLAGS) $(ARCH) $(PROF)
1796
1797 diff --git a/dev-db/redis/files/redis-2.4.4-tcmalloc.patch b/dev-db/redis/files/redis-2.4.4-tcmalloc.patch
1798 deleted file mode 100644
1799 index 964ce71..0000000
1800 --- a/dev-db/redis/files/redis-2.4.4-tcmalloc.patch
1801 +++ /dev/null
1802 @@ -1,21 +0,0 @@
1803 -https://github.com/antirez/redis/pull/218
1804 -
1805 -diff --git a/src/Makefile b/src/Makefile
1806 -index 72edcad..3e43990 100644
1807 ---- a/src/Makefile
1808 -+++ b/src/Makefile
1809 -@@ -35,12 +35,14 @@ else
1810 - endif
1811 -
1812 - ifeq ($(USE_TCMALLOC),yes)
1813 -+ USE_JEMALLOC=no
1814 - ALLOC_DEP=
1815 - ALLOC_LINK=-ltcmalloc
1816 - ALLOC_FLAGS=-DUSE_TCMALLOC
1817 - endif
1818 -
1819 - ifeq ($(USE_TCMALLOC_MINIMAL),yes)
1820 -+ USE_JEMALLOC=no
1821 - ALLOC_DEP=
1822 - ALLOC_LINK=-ltcmalloc_minimal
1823 - ALLOC_FLAGS=-DUSE_TCMALLOC
1824 \ No newline at end of file
1825
1826 diff --git a/dev-db/redis/files/redis-2.6.7-config.patch b/dev-db/redis/files/redis-2.6.7-config.patch
1827 deleted file mode 100644
1828 index 0aea1c7..0000000
1829 --- a/dev-db/redis/files/redis-2.6.7-config.patch
1830 +++ /dev/null
1831 @@ -1,69 +0,0 @@
1832 -commit 7f05e59a052941fd070be1825d0623a054c66e2d
1833 -Author: jbergstroem <bugs@××××××××××.nu>
1834 -Date: Tue Oct 30 13:11:23 2012 +1100
1835 -
1836 - Adapt config based on Gentoo defaults
1837 -
1838 -diff --git a/redis.conf b/redis.conf
1839 -index 751a3eb..1a36b12 100644
1840 ---- a/redis.conf
1841 -+++ b/redis.conf
1842 -@@ -14,11 +14,11 @@
1843 -
1844 - # By default Redis does not run as a daemon. Use 'yes' if you need it.
1845 - # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
1846 --daemonize no
1847 -+daemonize yes
1848 -
1849 - # When running daemonized, Redis writes a pid file in /var/run/redis.pid by
1850 - # default. You can specify a custom pid file location here.
1851 --pidfile /var/run/redis.pid
1852 -+pidfile /var/run/redis/redis.pid
1853 -
1854 - # Accept connections on the specified port, default is 6379.
1855 - # If port 0 is specified Redis will not listen on a TCP socket.
1856 -@@ -27,7 +27,7 @@ port 6379
1857 - # If you want you can bind a single interface, if the bind option is not
1858 - # specified all the interfaces will listen for incoming connections.
1859 - #
1860 --# bind 127.0.0.1
1861 -+bind 127.0.0.1
1862 -
1863 - # Specify the path for the unix socket that will be used to listen for
1864 - # incoming connections. There is no default, so Redis will not listen
1865 -@@ -50,7 +50,7 @@ loglevel notice
1866 - # Specify the log file name. Also 'stdout' can be used to force
1867 - # Redis to log on the standard output. Note that if you use standard
1868 - # output for logging but daemonize, logs will be sent to /dev/null
1869 --logfile stdout
1870 -+logfile /var/log/redis/redis.log
1871 -
1872 - # To enable logging to the system logger, just set 'syslog-enabled' to yes,
1873 - # and optionally update the other syslog parameters to suit your needs.
1874 -@@ -124,7 +124,7 @@ rdbcompression yes
1875 - rdbchecksum yes
1876 -
1877 - # The filename where to dump the DB
1878 --dbfilename dump.rdb
1879 -+dbfilename /var/lib/redis/dump.rdb
1880 -
1881 - # The working directory.
1882 - #
1883 -@@ -134,7 +134,7 @@ dbfilename dump.rdb
1884 - # Also the Append Only File will be created inside this directory.
1885 - #
1886 - # Note that you must specify a directory here, not a file name.
1887 --dir ./
1888 -+dir /var/lib/redis/
1889 -
1890 - ################################# REPLICATION #################################
1891 -
1892 -@@ -278,7 +278,7 @@ slave-priority 100
1893 - # limit for maxmemory so that there is some free RAM on the system for slave
1894 - # output buffers (but this is not needed if the policy is 'noeviction').
1895 - #
1896 --# maxmemory <bytes>
1897 -+maxmemory 67108864
1898 -
1899 - # MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
1900 - # is reached? You can select among five behavior:
1901 \ No newline at end of file
1902
1903 diff --git a/dev-db/redis/files/redis-2.6.7-shared.patch b/dev-db/redis/files/redis-2.6.7-shared.patch
1904 deleted file mode 100644
1905 index 992af6c..0000000
1906 --- a/dev-db/redis/files/redis-2.6.7-shared.patch
1907 +++ /dev/null
1908 @@ -1,36 +0,0 @@
1909 -commit 6931bf1d81de597b3abc2a36adf081a24c114567
1910 -Author: jbergstroem <bugs@××××××××××.nu>
1911 -Date: Tue Oct 23 12:26:04 2012 +1100
1912 -
1913 - Build against shared jemalloc
1914 -
1915 -diff --git a/src/Makefile b/src/Makefile
1916 -index 358b4cb..41390f4 100644
1917 ---- a/src/Makefile
1918 -+++ b/src/Makefile
1919 -@@ -22,12 +22,7 @@ STD= -std=c99 -pedantic
1920 - WARN= -Wall
1921 - OPT= $(OPTIMIZATION)
1922 -
1923 --# Default allocator
1924 --ifeq ($(uname_S),Linux)
1925 -- MALLOC=jemalloc
1926 --else
1927 -- MALLOC=libc
1928 --endif
1929 -+MALLOC?=jemalloc
1930 -
1931 - # Backwards compatibility for selecting an allocator
1932 - ifeq ($(USE_TCMALLOC),yes)
1933 -@@ -71,9 +66,8 @@ ifeq ($(MALLOC),tcmalloc_minimal)
1934 - endif
1935 -
1936 - ifeq ($(MALLOC),jemalloc)
1937 -- DEPENDENCY_TARGETS+= jemalloc
1938 -- FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
1939 -- FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl
1940 -+ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE
1941 -+ FINAL_LIBS+= -ljemalloc -ldl
1942 - endif
1943 -
1944 - REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
1945 \ No newline at end of file
1946
1947 diff --git a/dev-db/redis/files/redis-2.6.9-tclsh86.patch b/dev-db/redis/files/redis-2.6.9-tclsh86.patch
1948 deleted file mode 100644
1949 index 00d81df..0000000
1950 --- a/dev-db/redis/files/redis-2.6.9-tclsh86.patch
1951 +++ /dev/null
1952 @@ -1,57 +0,0 @@
1953 -diff --git a/runtest b/runtest
1954 -index 0eb384c..fadc283 100755
1955 ---- a/runtest
1956 -+++ b/runtest
1957 -@@ -1,5 +1,5 @@
1958 - #!/bin/sh
1959 --TCL=tclsh8.5
1960 -+TCL=tclsh
1961 - which $TCL
1962 - if [ "$?" != "0" ]
1963 - then
1964 -diff --git a/tests/integration/replication-4.tcl b/tests/integration/replication-4.tcl
1965 -index 69fcab3..58a70fa 100644
1966 ---- a/tests/integration/replication-4.tcl
1967 -+++ b/tests/integration/replication-4.tcl
1968 -@@ -1,5 +1,5 @@
1969 - proc start_bg_complex_data {host port db ops} {
1970 -- exec tclsh8.5 tests/helpers/bg_complex_data.tcl $host $port $db $ops &
1971 -+ exec tclsh tests/helpers/bg_complex_data.tcl $host $port $db $ops &
1972 - }
1973 -
1974 - proc stop_bg_complex_data {handle} {
1975 -diff --git a/tests/integration/replication.tcl b/tests/integration/replication.tcl
1976 -index da94b08..30baf6a 100644
1977 ---- a/tests/integration/replication.tcl
1978 -+++ b/tests/integration/replication.tcl
1979 -@@ -78,7 +78,7 @@ start_server {tags {"repl"}} {
1980 - }
1981 -
1982 - proc start_write_load {host port seconds} {
1983 -- exec tclsh8.5 tests/helpers/gen_write_load.tcl $host $port $seconds &
1984 -+ exec tclsh tests/helpers/gen_write_load.tcl $host $port $seconds &
1985 - }
1986 -
1987 - proc stop_write_load {handle} {
1988 -diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl
1989 -index b2e58b4..253e955 100644
1990 ---- a/tests/test_helper.tcl
1991 -+++ b/tests/test_helper.tcl
1992 -@@ -2,6 +2,8 @@
1993 - # This softare is released under the BSD License. See the COPYING file for
1994 - # more information.
1995 -
1996 -+package require Tcl 8.5
1997 -+
1998 - set tcl_precision 17
1999 - source tests/support/redis.tcl
2000 - source tests/support/server.tcl
2001 -@@ -189,7 +191,7 @@ proc test_server_main {} {
2002 - set start_port [expr {$::port+100}]
2003 - for {set j 0} {$j < $::numclients} {incr j} {
2004 - set start_port [find_available_port $start_port]
2005 -- set p [exec tclsh8.5 [info script] {*}$::argv \
2006 -+ set p [exec tclsh [info script] {*}$::argv \
2007 - --client $port --port $start_port &]
2008 - lappend ::clients_pids $p
2009 - incr start_port 10
2010 \ No newline at end of file
2011
2012 diff --git a/dev-db/redis/files/redis-2.8.3-config.patch b/dev-db/redis/files/redis-2.8.3-config.patch
2013 deleted file mode 100644
2014 index 3f5d95b..0000000
2015 --- a/dev-db/redis/files/redis-2.8.3-config.patch
2016 +++ /dev/null
2017 @@ -1,59 +0,0 @@
2018 -commit 66f26c12faaeb8ed85a715d2dfd6a41c978a4bd1
2019 -Author: Johan Bergström <bugs@××××××××××.nu>
2020 -Date: Mon Nov 25 09:23:10 2013 +1100
2021 -
2022 - Modify config to gentoo defaults
2023 -
2024 -diff --git redis.conf redis.conf
2025 -index 2e3239c..6c7ef4a 100644
2026 ---- redis.conf
2027 -+++ redis.conf
2028 -@@ -14,11 +14,11 @@
2029 -
2030 - # By default Redis does not run as a daemon. Use 'yes' if you need it.
2031 - # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
2032 --daemonize no
2033 -+daemonize yes
2034 -
2035 - # When running daemonized, Redis writes a pid file in /var/run/redis.pid by
2036 - # default. You can specify a custom pid file location here.
2037 --pidfile /var/run/redis.pid
2038 -+pidfile /run/redis/redis.pid
2039 -
2040 - # Accept connections on the specified port, default is 6379.
2041 - # If port 0 is specified Redis will not listen on a TCP socket.
2042 -@@ -32,7 +32,7 @@ port 6379
2043 - # Examples:
2044 - #
2045 - # bind 192.168.1.100 10.0.0.1
2046 --# bind 127.0.0.1
2047 -+bind 127.0.0.1
2048 -
2049 - # Specify the path for the unix socket that will be used to listen for
2050 - # incoming connections. There is no default, so Redis will not listen
2051 -@@ -71,7 +71,7 @@ loglevel notice
2052 - # Specify the log file name. Also the emptry string can be used to force
2053 - # Redis to log on the standard output. Note that if you use standard
2054 - # output for logging but daemonize, logs will be sent to /dev/null
2055 --logfile ""
2056 -+logfile /var/log/redis/redis.log
2057 -
2058 - # To enable logging to the system logger, just set 'syslog-enabled' to yes,
2059 - # and optionally update the other syslog parameters to suit your needs.
2060 -@@ -155,7 +155,7 @@ dbfilename dump.rdb
2061 - # The Append Only File will also be created inside this directory.
2062 - #
2063 - # Note that you must specify a directory here, not a file name.
2064 --dir ./
2065 -+dir /var/lib/redis/
2066 -
2067 - ################################# REPLICATION #################################
2068 -
2069 -@@ -365,6 +365,7 @@ slave-priority 100
2070 - # output buffers (but this is not needed if the policy is 'noeviction').
2071 - #
2072 - # maxmemory <bytes>
2073 -+maxmemory 67108864
2074 -
2075 - # MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
2076 - # is reached. You can select among five behaviors:
2077
2078 diff --git a/dev-db/redis/files/redis.initd-2 b/dev-db/redis/files/redis.initd-2
2079 deleted file mode 100644
2080 index 48ebe56..0000000
2081 --- a/dev-db/redis/files/redis.initd-2
2082 +++ /dev/null
2083 @@ -1,23 +0,0 @@
2084 -#!/sbin/openrc-run
2085 -# $Id$
2086 -
2087 -REDIS_DIR=${REDIS_DIR:-/var/lib/redis}
2088 -REDIS_CONF=${REDIS_CONF:-/etc/redis.conf}
2089 -REDIS_OPTS=${REDIS_OPTS:-"${REDIS_CONF}"}
2090 -REDIS_USER=${REDIS_USER:-redis}
2091 -REDIS_GROUP=${REDIS_GROUP:-redis}
2092 -
2093 -command=/usr/sbin/redis-server
2094 -start_stop_daemon_args="--chdir \"${REDIS_DIR}\"
2095 - --user ${REDIS_USER} --group ${REDIS_GROUP}"
2096 -command_args="${REDIS_OPTS}"
2097 -pidfile=${REDIS_PID:-/var/run/redis/redis.pid}
2098 -
2099 -depend() {
2100 - use net localmount logger
2101 - after keepalived
2102 -}
2103 -
2104 -start_pre() {
2105 - checkpath -d -m 0775 -o ${REDIS_USER}:${REDIS_GROUP} $(dirname ${REDIS_PID})
2106 -}
2107
2108 diff --git a/dev-db/redis/files/redis.initd-3 b/dev-db/redis/files/redis.initd-3
2109 deleted file mode 100644
2110 index a8564e4..0000000
2111 --- a/dev-db/redis/files/redis.initd-3
2112 +++ /dev/null
2113 @@ -1,32 +0,0 @@
2114 -#!/sbin/openrc-run
2115 -# $Id$
2116 -
2117 -REDIS_DIR=${REDIS_DIR:-/var/lib/redis}
2118 -REDIS_CONF=${REDIS_CONF:-/etc/redis.conf}
2119 -REDIS_OPTS=${REDIS_OPTS:-"${REDIS_CONF}"}
2120 -REDIS_USER=${REDIS_USER:-redis}
2121 -REDIS_GROUP=${REDIS_GROUP:-redis}
2122 -
2123 -command=/usr/sbin/redis-server
2124 -start_stop_daemon_args="--chdir \"${REDIS_DIR}\"
2125 - --user ${REDIS_USER} --group ${REDIS_GROUP}"
2126 -command_args="${REDIS_OPTS}"
2127 -pidfile=${REDIS_PID:-/run/redis/redis.pid}
2128 -
2129 -depend() {
2130 - use net localmount logger
2131 - after keepalived
2132 -}
2133 -
2134 -start_pre() {
2135 - checkpath -d -m 0775 -o ${REDIS_USER}:${REDIS_GROUP} $(dirname ${REDIS_PID})
2136 -}
2137 -
2138 -stop() {
2139 - ebegin "Stopping ${SVCNAME}"
2140 - start-stop-daemon --stop \
2141 - --exec ${retries} \
2142 - --retry 30 \
2143 - --pidfile ${pidfile}
2144 - eend
2145 -}
2146
2147 diff --git a/dev-db/slony1/files/slony1-2.1.1-ldflags.patch b/dev-db/slony1/files/slony1-2.1.1-ldflags.patch
2148 deleted file mode 100644
2149 index 35452ad..0000000
2150 --- a/dev-db/slony1/files/slony1-2.1.1-ldflags.patch
2151 +++ /dev/null
2152 @@ -1,29 +0,0 @@
2153 -diff -Naur a/Makefile.global.in b/Makefile.global.in
2154 ---- a/Makefile.global.in 2012-01-25 14:13:40.000000000 -0500
2155 -+++ b/Makefile.global.in 2012-02-22 06:14:05.240047000 -0500
2156 -@@ -80,7 +80,7 @@
2157 - subdir=$(slony_subdir)
2158 -
2159 - override CPPFLAGS := -I${pgincludeserverdir} -I${pgincludedir} $(CPPFLAGS)
2160 --LDFLAGS = -L${pglibdir} -L${pgpkglibdir} -lpq @NLSLIB@
2161 -+override LDFLAGS += -L${pglibdir} -L${pgpkglibdir} -lpq @NLSLIB@
2162 -
2163 - ifeq ($(GCC), yes)
2164 - CFLAGS += -Wall -Wmissing-prototypes -Wmissing-declarations
2165 -diff -Naur a/makefiles/Makefile.linux b/makefiles/Makefile.linux
2166 ---- a/makefiles/Makefile.linux 2012-01-25 14:13:40.000000000 -0500
2167 -+++ b/makefiles/Makefile.linux 2012-02-22 06:15:45.652523000 -0500
2168 -@@ -12,9 +12,9 @@
2169 - endif
2170 -
2171 - %.so: %.o
2172 -- $(CC) -shared -o $@ $<
2173 -+ $(CC) $(LDFLAGS) -shared -o $@ $<
2174 -
2175 - %.o: %.c
2176 -- $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
2177 -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -c -o $@ $<
2178 -
2179 --sqlmansect = 7
2180 -\ No newline at end of file
2181 -+sqlmansect = 7
2182
2183 diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.5.1-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.5.1-unbundle.patch
2184 deleted file mode 100644
2185 index 203ddfb..0000000
2186 --- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.5.1-unbundle.patch
2187 +++ /dev/null
2188 @@ -1,70 +0,0 @@
2189 - CMakeLists.txt | 12 ++----------
2190 - tests/CMakeLists.txt | 5 +----
2191 - 2 files changed, 3 insertions(+), 14 deletions(-)
2192 -
2193 -diff --git a/CMakeLists.txt b/CMakeLists.txt
2194 -index 4a76947..a58510b 100644
2195 ---- a/CMakeLists.txt
2196 -+++ b/CMakeLists.txt
2197 -@@ -7,13 +7,9 @@ if(NOT CMAKE_BUILD_TYPE)
2198 - set(CMAKE_BUILD_TYPE "Release")
2199 - endif()
2200 -
2201 --set(ANTLR_DIR libs/antlr-2.7.7)
2202 - set(QHEXEDIT_DIR libs/qhexedit)
2203 --set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
2204 -
2205 --add_subdirectory(${ANTLR_DIR})
2206 - add_subdirectory(${QHEXEDIT_DIR})
2207 --add_subdirectory(${QCUSTOMPLOT_DIR})
2208 -
2209 - if(USE_QT5)
2210 - find_package(Qt5Widgets REQUIRED)
2211 -@@ -191,9 +187,7 @@ endif(EXTRAPATH)
2212 -
2213 - include_directories(
2214 - "${CMAKE_CURRENT_BINARY_DIR}"
2215 -- ${ANTLR_DIR}
2216 - ${QHEXEDIT_DIR}
2217 -- ${QCUSTOMPLOT_DIR}
2218 - ${ADDITIONAL_INCLUDE_PATHS}
2219 - src)
2220 -
2221 -@@ -210,12 +204,10 @@ if(USE_QT5)
2222 - qt5_use_modules(${PROJECT_NAME} Gui Widgets Network Test PrintSupport)
2223 - set(QT_LIBRARIES "")
2224 - endif()
2225 --add_dependencies(${PROJECT_NAME} antlr qhexedit qcustomplot)
2226 -+add_dependencies(${PROJECT_NAME} qhexedit)
2227 -
2228 - link_directories(
2229 -- "${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR}"
2230 -- "${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}"
2231 -- "${CMAKE_CURRENT_BINARY_DIR}/${QCUSTOMPLOT_DIR}")
2232 -+ "${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}")
2233 -
2234 - target_link_libraries(${PROJECT_NAME}
2235 - antlr
2236 -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
2237 -index 75009dc..6fd7f48 100644
2238 ---- a/tests/CMakeLists.txt
2239 -+++ b/tests/CMakeLists.txt
2240 -@@ -7,9 +7,6 @@ if(NOT CMAKE_BUILD_TYPE)
2241 - set(CMAKE_BUILD_TYPE "Release")
2242 - endif()
2243 -
2244 --set(ANTLR_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../libs/antlr-2.7.7")
2245 --add_subdirectory("${ANTLR_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/antlr")
2246 --
2247 - if(USE_QT5)
2248 - find_package(Qt5Widgets REQUIRED)
2249 - set(CMAKE_AUTOMOC ON)
2250 -@@ -56,7 +53,7 @@ if(NOT USE_QT5)
2251 - QT4_WRAP_CPP(SQLB_MOC ${SQLB_MOC_HDR})
2252 - endif()
2253 -
2254 --include_directories("${ANTLR_DIR}" ../src)
2255 -+include_directories(../src)
2256 -
2257 - add_executable(${PROJECT_NAME} ${SQLB_MOC} ${SQLB_HDR} ${SQLB_SRC})
2258 -
2259
2260 diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch
2261 deleted file mode 100644
2262 index 6d47c25..0000000
2263 --- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch
2264 +++ /dev/null
2265 @@ -1,62 +0,0 @@
2266 ---- sqlitebrowser-3.6.0/CMakeLists.txt
2267 -+++ sqlitebrowser-3.6.0/CMakeLists.txt
2268 -@@ -21,14 +21,10 @@
2269 - set(CMAKE_PREFIX_PATH "${QT5_PATH};${SQLITE3_PATH}")
2270 - endif()
2271 -
2272 --set(ANTLR_DIR libs/antlr-2.7.7)
2273 - set(QHEXEDIT_DIR libs/qhexedit)
2274 --set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
2275 - set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
2276 -
2277 --add_subdirectory(${ANTLR_DIR})
2278 - add_subdirectory(${QHEXEDIT_DIR})
2279 --add_subdirectory(${QCUSTOMPLOT_DIR})
2280 - add_subdirectory(${QSCINTILLA_DIR})
2281 -
2282 - if(USE_QT5)
2283 -@@ -207,9 +201,7 @@
2284 -
2285 - include_directories(
2286 - "${CMAKE_CURRENT_BINARY_DIR}"
2287 -- ${ANTLR_DIR}
2288 - ${QHEXEDIT_DIR}
2289 -- ${QCUSTOMPLOT_DIR}
2290 - ${QSCINTILLA_DIR}
2291 - ${ADDITIONAL_INCLUDE_PATHS}
2292 - src)
2293 -@@ -227,12 +218,9 @@
2294 - qt5_use_modules(${PROJECT_NAME} Gui Widgets Network Test PrintSupport)
2295 - set(QT_LIBRARIES "")
2296 - endif()
2297 --add_dependencies(${PROJECT_NAME} antlr qhexedit qcustomplot qscintilla2)
2298 -+add_dependencies(${PROJECT_NAME} qhexedit qscintilla2)
2299 -
2300 - link_directories(
2301 -- "${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR}"
2302 -- "${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}"
2303 -- "${CMAKE_CURRENT_BINARY_DIR}/${QCUSTOMPLOT_DIR}"
2304 - "${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}")
2305 -
2306 - target_link_libraries(${PROJECT_NAME}
2307 ---- sqlitebrowser-3.6.0/tests/CMakeLists.txt
2308 -+++ sqlitebrowser-3.6.0/tests/CMakeLists.txt
2309 -@@ -7,9 +7,6 @@
2310 - set(CMAKE_BUILD_TYPE "Release")
2311 - endif()
2312 -
2313 --set(ANTLR_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../libs/antlr-2.7.7")
2314 --add_subdirectory("${ANTLR_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/antlr")
2315 --
2316 - if(USE_QT5)
2317 - find_package(Qt5Widgets REQUIRED)
2318 - set(CMAKE_AUTOMOC ON)
2319 -@@ -65,7 +62,7 @@
2320 - QT4_WRAP_UI(SQLB_FORM_HDR ${SQLB_FORMS})
2321 - endif()
2322 -
2323 --include_directories("${CMAKE_CURRENT_BINARY_DIR}" "${ANTLR_DIR}" ../src)
2324 -+include_directories("${CMAKE_CURRENT_BINARY_DIR}" ../src)
2325 -
2326 - add_executable(${PROJECT_NAME} ${SQLB_MOC} ${SQLB_HDR} ${SQLB_SRC} ${SQLB_FORM_HDR})
2327 -
2328
2329 diff --git a/dev-db/tokyocabinet/files/1.4.45.patch b/dev-db/tokyocabinet/files/1.4.45.patch
2330 deleted file mode 100644
2331 index 64d7b4a..0000000
2332 --- a/dev-db/tokyocabinet/files/1.4.45.patch
2333 +++ /dev/null
2334 @@ -1,12 +0,0 @@
2335 -diff --git a/Makefile.in b/Makefile.in
2336 -index 973bf81..e44f0a8 100644
2337 ---- a/Makefile.in
2338 -+++ b/Makefile.in
2339 -@@ -125,7 +125,6 @@ install :
2340 - cd man && cp -Rf $(MAN3FILES) $(DESTDIR)$(MAN3DIR)
2341 - mkdir -p $(DESTDIR)$(PCDIR)
2342 - cp -Rf $(PCFILES) $(DESTDIR)$(PCDIR)
2343 -- [ "$$UID" = 0 ] && ldconfig || true
2344 - @printf '\n'
2345 - @printf '#================================================================\n'
2346 - @printf '# Thanks for using Tokyo Cabinet.\n'
2347 \ No newline at end of file
2348
2349 diff --git a/dev-db/tokyocabinet/files/1.4.46.patch b/dev-db/tokyocabinet/files/1.4.46.patch
2350 deleted file mode 100644
2351 index 4814e95..0000000
2352 --- a/dev-db/tokyocabinet/files/1.4.46.patch
2353 +++ /dev/null
2354 @@ -1,12 +0,0 @@
2355 -diff --git a/Makefile.in b/Makefile.in
2356 -index 8846c38..01caa50 100644
2357 ---- a/Makefile.in
2358 -+++ b/Makefile.in
2359 -@@ -125,7 +125,6 @@ install :
2360 - cd man && cp -Rf $(MAN3FILES) $(DESTDIR)$(MAN3DIR)
2361 - mkdir -p $(DESTDIR)$(PCDIR)
2362 - cp -Rf $(PCFILES) $(DESTDIR)$(PCDIR)
2363 -- -[ "$$UID" = 0 ] && PATH=/sbin:/usr/sbin:$(PATH) ldconfig 2>/dev/null || true
2364 - @printf '\n'
2365 - @printf '#================================================================\n'
2366 - @printf '# Thanks for using Tokyo Cabinet.\n'
2367
2368 diff --git a/dev-db/tokyocabinet/files/remove_docinst.patch b/dev-db/tokyocabinet/files/remove_docinst.patch
2369 deleted file mode 100644
2370 index d513f54..0000000
2371 --- a/dev-db/tokyocabinet/files/remove_docinst.patch
2372 +++ /dev/null
2373 @@ -1,13 +0,0 @@
2374 -diff --git a/Makefile.in b/Makefile.in
2375 -index 8846c38..29ac11e 100644
2376 ---- a/Makefile.in
2377 -+++ b/Makefile.in
2378 -@@ -117,8 +117,6 @@ install :
2379 - cp -Rf $(COMMANDFILES) $(DESTDIR)$(BINDIR)
2380 - mkdir -p $(DESTDIR)$(LIBEXECDIR)
2381 - cp -Rf $(CGIFILES) $(DESTDIR)$(LIBEXECDIR)
2382 -- mkdir -p $(DESTDIR)$(DATADIR)
2383 -- cp -Rf $(DOCUMENTFILES) $(DESTDIR)$(DATADIR)
2384 - mkdir -p $(DESTDIR)$(MAN1DIR)
2385 - cd man && cp -Rf $(MAN1FILES) $(DESTDIR)$(MAN1DIR)
2386 - mkdir -p $(DESTDIR)$(MAN3DIR)
2387
2388 diff --git a/dev-db/unixODBC/files/unixODBC-2.3.0-sqldriverconnect.patch b/dev-db/unixODBC/files/unixODBC-2.3.0-sqldriverconnect.patch
2389 deleted file mode 100644
2390 index abcce61..0000000
2391 --- a/dev-db/unixODBC/files/unixODBC-2.3.0-sqldriverconnect.patch
2392 +++ /dev/null
2393 @@ -1,27 +0,0 @@
2394 -http://bugs.gentoo.org/show_bug.cgi?id=358611
2395 ---- unixODBC-2.3.0.orig/DriverManager/SQLDriverConnect.c 2011-04-02 21:56:19.889301819 +0400
2396 -+++ unixODBC-2.3.0/DriverManager/SQLDriverConnect.c 2011-04-02 21:58:37.129102095 +0400
2397 -@@ -639,7 +639,7 @@
2398 - {
2399 - DMHDBC connection = (DMHDBC)hdbc;
2400 - struct con_struct con_struct;
2401 -- char *driver, *dsn = NULL, *filedsn, *tsavefile, savefile[ 128 ];
2402 -+ char *driver, *dsn = NULL, *filedsn, *tsavefile, savefile[ INI_MAX_PROPERTY_VALUE + 1 ];
2403 - char lib_name[ INI_MAX_PROPERTY_VALUE + 1 ];
2404 - char driver_name[ INI_MAX_PROPERTY_VALUE + 1 ];
2405 - SQLRETURN ret_from_connect;
2406 -@@ -944,7 +944,13 @@
2407 - tsavefile = __get_attribute_value( &con_struct, "SAVEFILE" );
2408 - if ( tsavefile )
2409 - {
2410 -- strcpy( savefile, tsavefile );
2411 -+ if ( strlen( tsavefile ) > INI_MAX_PROPERTY_VALUE ) {
2412 -+ memcpy( savefile, tsavefile, INI_MAX_PROPERTY_VALUE );
2413 -+ savefile[ INI_MAX_PROPERTY_VALUE ] = '\0';
2414 -+ }
2415 -+ else {
2416 -+ strcpy( savefile, tsavefile );
2417 -+ }
2418 - }
2419 - else
2420 - {
2421
2422 diff --git a/dev-db/wxsqlite3/files/wxsqlite3-3.0.6.1.pc.in b/dev-db/wxsqlite3/files/wxsqlite3-3.0.6.1.pc.in
2423 deleted file mode 100644
2424 index fe30b1f..0000000
2425 --- a/dev-db/wxsqlite3/files/wxsqlite3-3.0.6.1.pc.in
2426 +++ /dev/null
2427 @@ -1,14 +0,0 @@
2428 -# Package Information for pkg-config
2429 -
2430 -prefix=/usr
2431 -wxver=@WXVERSION@
2432 -includedir=${prefix}/include/wx-${wxver}/
2433 -libdir=${prefix}/@LIBDIR@
2434 -
2435 -Name: wxsqlite3-@WXVERSION@
2436 -Description: SQLite3 C++ wrapper for use in programs based on the wxWidgets
2437 -Version: @VERSION@
2438 -#Requires: sqlite3
2439 -Libs: -L${libdir} -lwxcode_gtk2u@WXDEBUG@_wxsqlite3-@WXVERSION@
2440 -Libs.private: -lpthread
2441 -Cflags: -I${includedir}