diff options
| author |   Gregorio Guidi <greg_g@gentoo.org> | 2005-07-28 14:56:06 +0000 |
|---|---|---|
| committer | Gregorio Guidi <greg_g@gentoo.org> | 2005-07-28 14:56:06 +0000 |
| commit | db60bb17211b2cd2fe0902097fb8df7dafb113c6 (patch) | |
| tree | 67ef0d1a7f1b4769e57cc48bfb748e8024aee2f4 /kde-base | |
| parent | add back 92 and 94 for vapier (diff) | |
| download | gentoo-2-db60bb17211b2cd2fe0902097fb8df7dafb113c6.tar.gz gentoo-2-db60bb17211b2cd2fe0902097fb8df7dafb113c6.tar.bz2 gentoo-2-db60bb17211b2cd2fe0902097fb8df7dafb113c6.zip | |
Update configure patch and make support for Berkeley DB optional.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdesdk/files/kdesdk-3.4-configure.patch | 30 | ||||
| -rw-r--r-- | kde-base/kdesdk/kdesdk-3.4.2.ebuild | 24 |
2 files changed, 42 insertions, 12 deletions
diff --git a/kde-base/kdesdk/files/kdesdk-3.4-configure.patch b/kde-base/kdesdk/files/kdesdk-3.4-configure.patch index 8933c41f59f7..0f33340d4b6d 100644 --- a/kde-base/kdesdk/files/kdesdk-3.4-configure.patch +++ b/kde-base/kdesdk/files/kdesdk-3.4-configure.patch @@ -1,6 +1,32 @@ +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-28 16:28:56.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 -Nur kdesdk-3.4.2.orig/kioslave/svn/configure.in.bot kdesdk-3.4.2/kioslave/svn/configure.in.bot --- kdesdk-3.4.2.orig/kioslave/svn/configure.in.bot 2005-05-23 14:08:56.000000000 +0200 -+++ kdesdk-3.4.2/kioslave/svn/configure.in.bot 2005-07-26 14:17:35.000000000 +0200 ++++ kdesdk-3.4.2/kioslave/svn/configure.in.bot 2005-07-28 16:28:38.000000000 +0200 @@ -1,4 +1,4 @@ -if test -z "$SVN_SUBDIR"; then +if test "x$with_subversion" = xcheck && test -z "$SVN_SUBDIR"; then @@ -14,7 +40,7 @@ diff -Nur kdesdk-3.4.2.orig/kioslave/svn/configure.in.bot kdesdk-3.4.2/kioslave/ - diff -Nur kdesdk-3.4.2.orig/kioslave/svn/configure.in.in kdesdk-3.4.2/kioslave/svn/configure.in.in --- kdesdk-3.4.2.orig/kioslave/svn/configure.in.in 2005-05-23 14:08:56.000000000 +0200 -+++ kdesdk-3.4.2/kioslave/svn/configure.in.in 2005-07-26 14:17:59.000000000 +0200 ++++ kdesdk-3.4.2/kioslave/svn/configure.in.in 2005-07-28 16:28:38.000000000 +0200 @@ -1,3 +1,11 @@ +AC_ARG_WITH(subversion, + [AC_HELP_STRING(--with-subversion, diff --git a/kde-base/kdesdk/kdesdk-3.4.2.ebuild b/kde-base/kdesdk/kdesdk-3.4.2.ebuild index 1cc8ec7b985b..2f385b1b0e0c 100644 --- a/kde-base/kdesdk/kdesdk-3.4.2.ebuild +++ b/kde-base/kdesdk/kdesdk-3.4.2.ebuild @@ -1,20 +1,20 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.4.2.ebuild,v 1.1 2005/07/28 13:04:00 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.4.2.ebuild,v 1.2 2005/07/28 14:56:06 greg_g Exp $ inherit kde-dist eutils DESCRIPTION="KDE SDK: Cervisia, KBabel, KCachegrind, Kompare, Umbrello,..." KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="subversion" +IUSE="berkdb subversion" DEPEND="x86? ( dev-util/callgrind ) media-gfx/graphviz sys-devel/flex subversion? ( dev-util/subversion ) - || ( =sys-libs/db-4.3* - =sys-libs/db-4.2* )" + berkdb? ( || ( =sys-libs/db-4.3* + =sys-libs/db-4.2* ) )" RDEPEND="${DEPEND} dev-util/cvs" @@ -32,12 +32,16 @@ src_unpack() { src_compile() { local myconf="$(use_with subversion)" - if has_version "=sys-libs/db-4.3*"; then - myconf="${myconf} --with-db-name=db-4.3 - --with-db-include-dir=/usr/include/db4.3" - elif has_version "=sys-libs/db-4.2*"; then - myconf="${myconf} --with-db-name=db-4.2 - --with-db-include-dir=/usr/include/db4.2" + if use berkdb; then + 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 + myconf="${myconf} --with-berkeley-db --with-db-name=db-4.2 + --with-db-include-dir=/usr/include/db4.2" + fi + else + myconf="${myconf} --without-berkeley-db" fi kde_src_compile |