summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregorio Guidi <greg_g@gentoo.org>2005-07-29 11:51:31 +0000
committerGregorio Guidi <greg_g@gentoo.org>2005-07-29 11:51:31 +0000
commit140a199c01516682b7ecce223da033974dabffb2 (patch)
treee3d3b433810517ecea6ce955259858110511c940 /kde-base
parentAdd support for Berkeley DB. (diff)
downloadgentoo-2-140a199c01516682b7ecce223da033974dabffb2.tar.gz
gentoo-2-140a199c01516682b7ecce223da033974dabffb2.tar.bz2
gentoo-2-140a199c01516682b7ecce223da033974dabffb2.zip
Add support for Berkeley DB.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kbabel/ChangeLog6
-rw-r--r--kde-base/kbabel/files/configure-fix-kdesdk-db-3.4.patch26
-rw-r--r--kde-base/kbabel/kbabel-3.4.2.ebuild4
3 files changed, 33 insertions, 3 deletions
diff --git a/kde-base/kbabel/ChangeLog b/kde-base/kbabel/ChangeLog
index 9844c00c5a53..005b38327ad4 100644
--- a/kde-base/kbabel/ChangeLog
+++ b/kde-base/kbabel/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kbabel
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbabel/ChangeLog,v 1.12 2005/07/28 21:16:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbabel/ChangeLog,v 1.13 2005/07/29 11:48:24 greg_g Exp $
+
+ 29 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+ +files/configure-fix-kdesdk-db-3.4.patch, kbabel-3.4.2.ebuild:
+ Add support for Berkeley DB.
*kbabel-3.4.2 (28 Jul 2005)
diff --git a/kde-base/kbabel/files/configure-fix-kdesdk-db-3.4.patch b/kde-base/kbabel/files/configure-fix-kdesdk-db-3.4.patch
new file mode 100644
index 000000000000..1b60cff7ab08
--- /dev/null
+++ b/kde-base/kbabel/files/configure-fix-kdesdk-db-3.4.patch
@@ -0,0 +1,26 @@
+diff -Nur kdesdk-3.4.2.orig/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in kdesdk-3.4.2/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in
+--- kdesdk-3.4.2.orig/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in 2005-05-23 14:08:28.000000000 +0200
++++ kdesdk-3.4.2/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in 2005-07-29 13:41:27.000000000 +0200
+@@ -1,3 +1,10 @@
++AC_ARG_WITH(berkeley-db,
++ [AC_HELP_STRING(--with-berkeley-db,
++ [enable the dictionary plugin based on Berkeley DB IV @<:@default=check@:>@])],
++ [], with_berkeley_db=check)
++
++LIB_DBIV=""
++if test "x$with_berkeley_db" != xno; then
+
+ AC_MSG_CHECKING([for Berkeley Database IV])
+
+@@ -122,6 +129,11 @@
+ DBIV_INCLUDES="$ac_db_includes"
+ DBIV_NAME="$ac_db_name"
+
++if test "x$with_berkeley_db" != xcheck && test -z "$LIB_DBIV"; then
++ AC_MSG_ERROR([--with-berkeley-db was given, but test for Berkeley DB IV failed])
++fi
++fi
++
+ AC_SUBST(DBIV_INCLUDES)
+ AC_SUBST(DBIV_LDFLAGS)
+ AC_SUBST(DBIV_NAME)
diff --git a/kde-base/kbabel/kbabel-3.4.2.ebuild b/kde-base/kbabel/kbabel-3.4.2.ebuild
index 58cbe09c779c..1a4289162f7b 100644
--- a/kde-base/kbabel/kbabel-3.4.2.ebuild
+++ b/kde-base/kbabel/kbabel-3.4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbabel/kbabel-3.4.2.ebuild,v 1.2 2005/07/29 11:48:25 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbabel/kbabel-3.4.2.ebuild,v 1.3 2005/07/29 11:51:31 greg_g Exp $
KMNAME=kdesdk
MAXKDEVER=$PV
@@ -24,7 +24,7 @@ src_compile() {
if has_version "=sys-libs/db-4.3*"; then
myconf="${myconf} --with-berkeley-db --with-db-name=db-4.3
--with-db-include-dir=/usr/include/db4.3"
- elif has_version "=sys-libs/db-4.2*"; then
+ elif has_version "=sys-libs/db-4.2*"; then
myconf="${myconf} --with-berkeley-db --with-db-name=db-4.2
--with-db-include-dir=/usr/include/db4.2"
fi