Added the same patch noatun-oblique and noatun-plugins use. This fixes the berkeley db test, which enables the oblique plugin.

Note that the berkdb USE flag actually works here wrt what is built.
Package-Manager: portage-2.0.51-r15

4 files changed, 64 insertions, 20 deletions

diff --git a/kde-base/kdeaddons/ChangeLog b/kde-base/kdeaddons/ChangeLog
index 85ee982d8fce..c7a3112d9905 100644
--- a/kde-base/kdeaddons/ChangeLog
+++ b/kde-base/kdeaddons/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeaddons
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.118 2005/02/09 16:15:27 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.119 2005/02/11 19:04:30 danarmak Exp $
+
+  11 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +files/noatun-oblique-db-location-3.4.0_beta2.diff,
+  kdeaddons-3.4.0_beta2.ebuild:
+  Added the same patch noatun-oblique and noatun-plugins use. This fixes the
+  berkeley db test, which enables the oblique plugin. Note that the berkdb USE
+  flag actually works here wrt what is built.
 
 *kdeaddons-3.4.0_beta2 (09 Feb 2005)
 
diff --git a/kde-base/kdeaddons/Manifest b/kde-base/kdeaddons/Manifest
index 635c3d26d8ea..08cd5dc0d6a7 100644
--- a/kde-base/kdeaddons/Manifest
+++ b/kde-base/kdeaddons/Manifest
@@ -1,14 +1,15 @@
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 1815b1059780e3286ae4459fe7e41cea ChangeLog 15459
-MD5 068832a2e98392611d74f251ec331dfb kdeaddons-3.3.2.ebuild 987
 MD5 5ceb2a1a78884aedfba42ef8b1bb08df kdeaddons-3.3.1.ebuild 985
-MD5 cb7ac6bc0914baf29df3301bcde32bc9 kdeaddons-3.4.0_beta2.ebuild 980
-MD5 b2676065f8c89b6a2b9ffef083fac50f kdeaddons-3.2.3.ebuild 988
+MD5 39eb6dbc07e6ba193135602fda87e7cb kdeaddons-3.4.0_beta2.ebuild 1339
+MD5 068832a2e98392611d74f251ec331dfb kdeaddons-3.3.2.ebuild 987
 MD5 a08fe0392380bb6643f661d9d3381e7a kdeaddons-3.4.0_beta1.ebuild 980
-MD5 913bd9f1c52d68ec7faa72960464132e files/kdeaddons-3.2.3-gcc34.patch 1256
-MD5 3bec1549e74c6f661045a83198e45290 files/kdeaddons-3.2.0-kvim.diff 363
-MD5 f510fb4a423935c458f3e01d994b5bd2 files/digest-kdeaddons-3.3.2 69
-MD5 2ae636e43e5d68ce4781c47f203b9e87 files/digest-kdeaddons-3.4.0_beta2 70
+MD5 a51067468748bd7618fb51e9f9503ae4 ChangeLog 15797
+MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
+MD5 b2676065f8c89b6a2b9ffef083fac50f kdeaddons-3.2.3.ebuild 988
 MD5 c2733d1929bd4002e8af7f422dce2e74 files/digest-kdeaddons-3.4.0_beta1 70
-MD5 73f4e27e90b4b9dc9b6f20bcb8076769 files/digest-kdeaddons-3.3.1 69
+MD5 2ae636e43e5d68ce4781c47f203b9e87 files/digest-kdeaddons-3.4.0_beta2 70
+MD5 3bec1549e74c6f661045a83198e45290 files/kdeaddons-3.2.0-kvim.diff 363
+MD5 6ec5a8a3f0f5ae85d431525c926c27fe files/noatun-oblique-db-location-3.4.0_beta2.diff 625
 MD5 e773fdc5e9bf3ab47e4dada5fba0ebbe files/digest-kdeaddons-3.2.3 69
+MD5 73f4e27e90b4b9dc9b6f20bcb8076769 files/digest-kdeaddons-3.3.1 69
+MD5 f510fb4a423935c458f3e01d994b5bd2 files/digest-kdeaddons-3.3.2 69
+MD5 913bd9f1c52d68ec7faa72960464132e files/kdeaddons-3.2.3-gcc34.patch 1256
diff --git a/kde-base/kdeaddons/files/noatun-oblique-db-location-3.4.0_beta2.diff b/kde-base/kdeaddons/files/noatun-oblique-db-location-3.4.0_beta2.diff
new file mode 100644
index 000000000000..bf3f954f57af
--- /dev/null
+++ b/kde-base/kdeaddons/files/noatun-oblique-db-location-3.4.0_beta2.diff
@@ -0,0 +1,24 @@
+--- noatun-plugins/oblique/configure.in.in.orig	2004-10-09 11:41:38.000000000 +0200
++++ noatun-plugins/oblique/configure.in.in	2005-02-11 20:29:38.760533256 +0200
+@@ -1,19 +1,4 @@
+-
+-AC_MSG_CHECKING(for Berkeley DB++)
+-berkeley_db=no
+-AC_LANG_PUSH(C++)
+-AC_TRY_COMPILE([
+-		#include <db_cxx.h>
+-	],[
+-	],[
+-		berkeley_db=yes
+-	])
+-AC_MSG_RESULT($berkeley_db)
+-AC_DEFINE(BERKELEY_DB,1,[Define if you have Berkeley DB++ installed])
+-BERKELEY_DB_LIBS="-ldb_cxx"
++berkeley_db=yes
++BERKELEY_DB_LIBS="-ldb_cxx-4.2"
+ AC_SUBST(BERKELEY_DB_LIBS)
+-AC_LANG_POP(C++)
+-
+ AM_CONDITIONAL(include_BERKELEY_DB, test "$berkeley_db" = yes)
+-
+-
diff --git a/kde-base/kdeaddons/kdeaddons-3.4.0_beta2.ebuild b/kde-base/kdeaddons/kdeaddons-3.4.0_beta2.ebuild
index 5c80c608b1d8..f91492cfc651 100644
--- a/kde-base/kdeaddons/kdeaddons-3.4.0_beta2.ebuild
+++ b/kde-base/kdeaddons/kdeaddons-3.4.0_beta2.ebuild
@@ -1,28 +1,40 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.4.0_beta2.ebuild,v 1.1 2005/02/09 16:15:27 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.4.0_beta2.ebuild,v 1.2 2005/02/11 19:04:30 danarmak Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc"
 
 KEYWORDS="~x86 ~amd64"
-IUSE="arts sdl xmms"
+IUSE="arts sdl xmms berkdb"
 
 DEPEND="~kde-base/kdepim-${PV}
 	~kde-base/kdemultimedia-${PV}
 	~kde-base/kdegames-${PV}
 	arts? ( ~kde-base/arts-${PV} )
 	sdl? ( >=media-libs/libsdl-1.2 )
-	xmms? ( media-sound/xmms )"
-
+	xmms? ( media-sound/xmms )
+	berkdb? ( =sys-lib/db-4.2* )"
+
+# Make vimpart use /usr/bin/kvim -- fixes bug 33257.
+# This should continue to apply to upcoming versions since it's
+# Gentoo-specific and won't go upstream.
+PATCHES="${FILESDIR}/${PN}-3.2.0-kvim.diff"
+
+# This patch makes the configure test in noatun-oblique find db_cxx.h,
+# but it also makes db support non-optional. should be fixed, ideally
+if useq berkdb; then
+	PATCHES="$FILESDIR/noatun-oblique-db-location-$PV.diff"
+	myconf="--with-extra-includes=/usr/include/db4.2"
+fi
+	
 src_unpack() {
 	kde_src_unpack
-
-	# Make vimpart use /usr/bin/kvim -- fixes bug 33257.
-	# This should continue to apply to upcoming versions since it's
-	# Gentoo-specific and won't go upstream.
-	epatch ${FILESDIR}/${PN}-3.2.0-kvim.diff
+	
+	if useq berkdb; then
+		rm $S/configure
+	fi
 }
 
 src_compile() {