commit: 2c0f90abbf6bda4d37f84130faa491eb001aa2b9
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 1 13:28:10 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Jul 1 13:28:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c0f90ab
app-i18n/multiskkserv: update patch to build with dev-db/tinycdb
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../files/multiskkserv-20100128-cdb.patch | 45 -------------------
app-i18n/multiskkserv/files/multiskkserv-cdb.patch | 52 ++++++++++++++++++++++
app-i18n/multiskkserv/multiskkserv-20100128.ebuild | 9 ++--
3 files changed, 58 insertions(+), 48 deletions(-)
diff --git a/app-i18n/multiskkserv/files/multiskkserv-20100128-cdb.patch
b/app-i18n/multiskkserv/files/multiskkserv-20100128-cdb.patch
deleted file mode 100644
index 938043ca46b..00000000000
--- a/app-i18n/multiskkserv/files/multiskkserv-20100128-cdb.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 648f742..2ac4e92 100644
---- a/configure.in
-+++ b/configure.in
-@@ -108,22 +108,24 @@ if test "$with_cdb" = "no"; then
- else
- if test "$with_cdb" = "yes"; then
- for i in /usr/local /usr; do
-- if test -d "$i/include" -a -f "$i/include/cdb.h"; then
-- CDB_DIR="$i"
-- CDB_INCLUDES="-I$i/include"
-- available_cdb="yes"
-- for j in cdb.a buffer.a unix.a byte.a alloc.a; do
-- if test -f "$i/lib/$j"; then
-- LIBADD_CDB="$LIBADD_CDB $i/lib/$j"
-- else
-- available_cdb="no"
-- break
-- fi
-- done
-- if test "$available_cdb" = "yes"; then
-- break
-- fi
-- fi
-+ for inc in include include/cdb; do
-+ if test -d "$i/$inc" -a -f "$i/$inc/cdb.h"; then
-+ CDB_DIR="$i"
-+ CDB_INCLUDES="-I$i/$inc"
-+ available_cdb="yes"
-+ for j in cdb.a buffer.a unix.a byte.a alloc.a; do
-+ if test -f "$i/lib/$j"; then
-+ LIBADD_CDB="$LIBADD_CDB $i/lib/$j"
-+ else
-+ available_cdb="no"
-+ break
-+ fi
-+ done
-+ if test "$available_cdb" = "yes"; then
-+ break
-+ fi
-+ fi
-+ done
- done
- else
- if test -d "$with_cdb" -a -f "$with_cdb/cdb.h"; then
diff --git a/app-i18n/multiskkserv/files/multiskkserv-cdb.patch
b/app-i18n/multiskkserv/files/multiskkserv-cdb.patch
new file mode 100644
index 00000000000..c6f0da50309
--- /dev/null
+++ b/app-i18n/multiskkserv/files/multiskkserv-cdb.patch
@@ -0,0 +1,52 @@
+--- a/configure.in
++++ b/configure.in
+@@ -126,19 +126,38 @@
+ fi
+ done
+ else
+- if test -d "$with_cdb" -a -f "$with_cdb/cdb.h"; then
+- CDB_DIR="$with_cdb"
+- CDB_INCLUDES="-I$with_cdb"
+- available_cdb="yes"
+- for j in cdb.a buffer.a unix.a byte.a alloc.a; do
+- if test -f "$with_cdb/$j"; then
+- LIBADD_CDB="$LIBADD_CDB $with_cdb/$j"
++ for i in include include/cdb; do
++ if test -f "$with_cdb/$i/cdb.h"; then
++ CDB_DIR="$with_cdb"
++ CDB_INCLUDES="-I$with_cdb/$i"
++ available_cdb="yes"
++ if test -f "$with_cdb/$i/uint32.h"; then
++ for l in lib64 lib32 lib; do
++ for a in cdb.a alloc.a buffer.a byte.a unix.a; do
++ if test -f "$with_cdb/$l/$a"; then
++ LIBADD_CDB="$LIBADD_CDB $with_cdb/$l/$a"
++ else
++ LIBADD_CDB=""
++ available_cdb="no"
++ break
++ fi
++ done
++ if test "$available_cdb" = "yes"; then
++ break
++ fi
++ done
+ else
+- available_cdb="no"
+- break
++ save_LIBS="$LIBS"
++ AC_CHECK_LIB(cdb, cdb_init)
++ LIBS="$save_LIBS"
++ LIBADD_CDB="-lcdb"
++ AC_DEFINE(USE_TINYCDB, 1, [Use tinycdb])
+ fi
+- done
+- fi
++ fi
++ if test "$available_cdb" = "yes"; then
++ break
++ fi
++ done
+ fi
+ if test "$available_cdb" = "yes"; then
+ AC_MSG_RESULT([cdb found, path: $CDB_DIR])
diff --git a/app-i18n/multiskkserv/multiskkserv-20100128.ebuild
b/app-i18n/multiskkserv/multiskkserv-20100128.ebuild
index b6ec66dc57b..7ffc4e22f88 100644
--- a/app-i18n/multiskkserv/multiskkserv-20100128.ebuild
+++ b/app-i18n/multiskkserv/multiskkserv-20100128.ebuild
@@ -14,11 +14,14 @@ SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE="test"
-DEPEND="dev-db/cdb
+DEPEND="|| (
+ dev-db/tinycdb
+ dev-db/cdb
+ )
test? ( app-i18n/nkf )"
RDEPEND="app-i18n/skk-jisyo[cdb]"
-PATCHES=( "${FILESDIR}"/${P}-cdb.patch )
+PATCHES=( "${FILESDIR}"/${PN}-cdb.patch )
src_prepare() {
default
@@ -27,7 +30,7 @@ src_prepare() {
}
src_configure() {
- econf --with-cdb=yes
+ econf --with-cdb="${EPREFIX}"/usr
}
src_install() {
