Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/files/
Date: Sat, 02 Sep 2017 14:27:26
Message-Id: 1504362434.bacd55e3fd6e6760287a20d89d73e3ecbc0bb857.kensington@gentoo
1 commit: bacd55e3fd6e6760287a20d89d73e3ecbc0bb857
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Tue Aug 29 08:59:09 2017 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 2 14:27:14 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bacd55e3
7
8 dev-libs/apr-util: remove unused patch
9
10 .../apr-util/files/apr-util-1.5.3-berkdb6.patch | 69 ----------------------
11 1 file changed, 69 deletions(-)
12
13 diff --git a/dev-libs/apr-util/files/apr-util-1.5.3-berkdb6.patch b/dev-libs/apr-util/files/apr-util-1.5.3-berkdb6.patch
14 deleted file mode 100644
15 index a3f4a3c9b19..00000000000
16 --- a/dev-libs/apr-util/files/apr-util-1.5.3-berkdb6.patch
17 +++ /dev/null
18 @@ -1,69 +0,0 @@
19 -http://svn.apache.org/viewvc/apr/apr/trunk/build/dbm.m4?r1=1495889&r2=1544846&diff_format=h
20 -
21 ---- apr/apr/trunk/build/dbm.m4 2013/06/23 20:27:54 1495889
22 -+++ apr/apr/trunk/build/dbm.m4 2013/11/23 17:57:39 1544846
23 -@@ -112,7 +112,7 @@
24 - changequote([,])
25 - unset $cache_id
26 - AC_CHECK_HEADER([$bdb_header], [
27 -- if test "$1" = "3" -o "$1" = "4" -o "$1" = "5"; then
28 -+ if test "$1" = "3" -o "$1" = "4" -o "$1" = "5" -o "$1" = "6"; then
29 - # We generate a separate cache variable for each prefix and libname
30 - # we search under. That way, we avoid caching information that
31 - # changes if the user runs `configure' with a different set of
32 -@@ -455,13 +455,13 @@
33 - ])
34 -
35 - dnl
36 --dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.X to 1.
37 -+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 6.X to 1.
38 - dnl
39 - AC_DEFUN([APU_CHECK_DB_ALL], [
40 - all_places=$1
41 -
42 -- # Start version search at version 5.9
43 -- db_version=59
44 -+ # Start version search at version 6.9
45 -+ db_version=69
46 - while [[ $db_version -ge 40 ]]
47 - do
48 - db_major=`echo $db_version | sed -e 's/.$//'`
49 -@@ -511,19 +511,34 @@
50 - apu_db_version=0
51 -
52 - # Maximum supported version announced in help string.
53 -- # Although we search for all versions up to 5.9,
54 -+ # Although we search for all versions up to 6.9,
55 - # we should only include existing versions in our
56 - # help string.
57 -- db_max_version=53
58 -- db_min_version=41
59 - dbm_list="sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4"
60 -+ db_max_version=48
61 -+ db_min_version=41
62 -+ db_version="$db_min_version"
63 -+ while [[ $db_version -le $db_max_version ]]
64 -+ do
65 -+ dbm_list="$dbm_list, db$db_version"
66 -+ db_version=`expr $db_version + 1`
67 -+ done
68 -+ db_max_version=53
69 -+ db_min_version=50
70 -+ db_version="$db_min_version"
71 -+ while [[ $db_version -le $db_max_version ]]
72 -+ do
73 -+ dbm_list="$dbm_list, db$db_version"
74 -+ db_version=`expr $db_version + 1`
75 -+ done
76 -+ db_max_version=60
77 -+ db_min_version=60
78 - db_version="$db_min_version"
79 - while [[ $db_version -le $db_max_version ]]
80 - do
81 - dbm_list="$dbm_list, db$db_version"
82 - db_version=`expr $db_version + 1`
83 - done
84 -- dbm_list="$dbm_list, db60"
85 -
86 - AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use.
87 - DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db4X,db5X,db6X} for some X=0,...,9])],