| 1 |
commit: 2c0f90abbf6bda4d37f84130faa491eb001aa2b9 |
| 2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 1 13:28:10 2017 +0000 |
| 4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 1 13:28:10 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c0f90ab |
| 7 |
|
| 8 |
app-i18n/multiskkserv: update patch to build with dev-db/tinycdb |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 11 |
|
| 12 |
.../files/multiskkserv-20100128-cdb.patch | 45 ------------------- |
| 13 |
app-i18n/multiskkserv/files/multiskkserv-cdb.patch | 52 ++++++++++++++++++++++ |
| 14 |
app-i18n/multiskkserv/multiskkserv-20100128.ebuild | 9 ++-- |
| 15 |
3 files changed, 58 insertions(+), 48 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-i18n/multiskkserv/files/multiskkserv-20100128-cdb.patch b/app-i18n/multiskkserv/files/multiskkserv-20100128-cdb.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index 938043ca46b..00000000000 |
| 20 |
--- a/app-i18n/multiskkserv/files/multiskkserv-20100128-cdb.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,45 +0,0 @@ |
| 23 |
-diff --git a/configure.in b/configure.in |
| 24 |
-index 648f742..2ac4e92 100644 |
| 25 |
---- a/configure.in |
| 26 |
-+++ b/configure.in |
| 27 |
-@@ -108,22 +108,24 @@ if test "$with_cdb" = "no"; then |
| 28 |
- else |
| 29 |
- if test "$with_cdb" = "yes"; then |
| 30 |
- for i in /usr/local /usr; do |
| 31 |
-- if test -d "$i/include" -a -f "$i/include/cdb.h"; then |
| 32 |
-- CDB_DIR="$i" |
| 33 |
-- CDB_INCLUDES="-I$i/include" |
| 34 |
-- available_cdb="yes" |
| 35 |
-- for j in cdb.a buffer.a unix.a byte.a alloc.a; do |
| 36 |
-- if test -f "$i/lib/$j"; then |
| 37 |
-- LIBADD_CDB="$LIBADD_CDB $i/lib/$j" |
| 38 |
-- else |
| 39 |
-- available_cdb="no" |
| 40 |
-- break |
| 41 |
-- fi |
| 42 |
-- done |
| 43 |
-- if test "$available_cdb" = "yes"; then |
| 44 |
-- break |
| 45 |
-- fi |
| 46 |
-- fi |
| 47 |
-+ for inc in include include/cdb; do |
| 48 |
-+ if test -d "$i/$inc" -a -f "$i/$inc/cdb.h"; then |
| 49 |
-+ CDB_DIR="$i" |
| 50 |
-+ CDB_INCLUDES="-I$i/$inc" |
| 51 |
-+ available_cdb="yes" |
| 52 |
-+ for j in cdb.a buffer.a unix.a byte.a alloc.a; do |
| 53 |
-+ if test -f "$i/lib/$j"; then |
| 54 |
-+ LIBADD_CDB="$LIBADD_CDB $i/lib/$j" |
| 55 |
-+ else |
| 56 |
-+ available_cdb="no" |
| 57 |
-+ break |
| 58 |
-+ fi |
| 59 |
-+ done |
| 60 |
-+ if test "$available_cdb" = "yes"; then |
| 61 |
-+ break |
| 62 |
-+ fi |
| 63 |
-+ fi |
| 64 |
-+ done |
| 65 |
- done |
| 66 |
- else |
| 67 |
- if test -d "$with_cdb" -a -f "$with_cdb/cdb.h"; then |
| 68 |
|
| 69 |
diff --git a/app-i18n/multiskkserv/files/multiskkserv-cdb.patch b/app-i18n/multiskkserv/files/multiskkserv-cdb.patch |
| 70 |
new file mode 100644 |
| 71 |
index 00000000000..c6f0da50309 |
| 72 |
--- /dev/null |
| 73 |
+++ b/app-i18n/multiskkserv/files/multiskkserv-cdb.patch |
| 74 |
@@ -0,0 +1,52 @@ |
| 75 |
+--- a/configure.in |
| 76 |
++++ b/configure.in |
| 77 |
+@@ -126,19 +126,38 @@ |
| 78 |
+ fi |
| 79 |
+ done |
| 80 |
+ else |
| 81 |
+- if test -d "$with_cdb" -a -f "$with_cdb/cdb.h"; then |
| 82 |
+- CDB_DIR="$with_cdb" |
| 83 |
+- CDB_INCLUDES="-I$with_cdb" |
| 84 |
+- available_cdb="yes" |
| 85 |
+- for j in cdb.a buffer.a unix.a byte.a alloc.a; do |
| 86 |
+- if test -f "$with_cdb/$j"; then |
| 87 |
+- LIBADD_CDB="$LIBADD_CDB $with_cdb/$j" |
| 88 |
++ for i in include include/cdb; do |
| 89 |
++ if test -f "$with_cdb/$i/cdb.h"; then |
| 90 |
++ CDB_DIR="$with_cdb" |
| 91 |
++ CDB_INCLUDES="-I$with_cdb/$i" |
| 92 |
++ available_cdb="yes" |
| 93 |
++ if test -f "$with_cdb/$i/uint32.h"; then |
| 94 |
++ for l in lib64 lib32 lib; do |
| 95 |
++ for a in cdb.a alloc.a buffer.a byte.a unix.a; do |
| 96 |
++ if test -f "$with_cdb/$l/$a"; then |
| 97 |
++ LIBADD_CDB="$LIBADD_CDB $with_cdb/$l/$a" |
| 98 |
++ else |
| 99 |
++ LIBADD_CDB="" |
| 100 |
++ available_cdb="no" |
| 101 |
++ break |
| 102 |
++ fi |
| 103 |
++ done |
| 104 |
++ if test "$available_cdb" = "yes"; then |
| 105 |
++ break |
| 106 |
++ fi |
| 107 |
++ done |
| 108 |
+ else |
| 109 |
+- available_cdb="no" |
| 110 |
+- break |
| 111 |
++ save_LIBS="$LIBS" |
| 112 |
++ AC_CHECK_LIB(cdb, cdb_init) |
| 113 |
++ LIBS="$save_LIBS" |
| 114 |
++ LIBADD_CDB="-lcdb" |
| 115 |
++ AC_DEFINE(USE_TINYCDB, 1, [Use tinycdb]) |
| 116 |
+ fi |
| 117 |
+- done |
| 118 |
+- fi |
| 119 |
++ fi |
| 120 |
++ if test "$available_cdb" = "yes"; then |
| 121 |
++ break |
| 122 |
++ fi |
| 123 |
++ done |
| 124 |
+ fi |
| 125 |
+ if test "$available_cdb" = "yes"; then |
| 126 |
+ AC_MSG_RESULT([cdb found, path: $CDB_DIR]) |
| 127 |
|
| 128 |
diff --git a/app-i18n/multiskkserv/multiskkserv-20100128.ebuild b/app-i18n/multiskkserv/multiskkserv-20100128.ebuild |
| 129 |
index b6ec66dc57b..7ffc4e22f88 100644 |
| 130 |
--- a/app-i18n/multiskkserv/multiskkserv-20100128.ebuild |
| 131 |
+++ b/app-i18n/multiskkserv/multiskkserv-20100128.ebuild |
| 132 |
@@ -14,11 +14,14 @@ SLOT="0" |
| 133 |
KEYWORDS="amd64 ppc x86" |
| 134 |
IUSE="test" |
| 135 |
|
| 136 |
-DEPEND="dev-db/cdb |
| 137 |
+DEPEND="|| ( |
| 138 |
+ dev-db/tinycdb |
| 139 |
+ dev-db/cdb |
| 140 |
+ ) |
| 141 |
test? ( app-i18n/nkf )" |
| 142 |
RDEPEND="app-i18n/skk-jisyo[cdb]" |
| 143 |
|
| 144 |
-PATCHES=( "${FILESDIR}"/${P}-cdb.patch ) |
| 145 |
+PATCHES=( "${FILESDIR}"/${PN}-cdb.patch ) |
| 146 |
|
| 147 |
src_prepare() { |
| 148 |
default |
| 149 |
@@ -27,7 +30,7 @@ src_prepare() { |
| 150 |
} |
| 151 |
|
| 152 |
src_configure() { |
| 153 |
- econf --with-cdb=yes |
| 154 |
+ econf --with-cdb="${EPREFIX}"/usr |
| 155 |
} |
| 156 |
|
| 157 |
src_install() { |
Archives