summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregorio Guidi <greg_g@gentoo.org>2005-03-17 11:58:52 +0000
committerGregorio Guidi <greg_g@gentoo.org>2005-03-17 11:58:52 +0000
commit279f096bc44ce5050985b6743ff5882e3b991be5 (patch)
tree065306393175da2efada6ae6e94d43854facc2c1 /kde-base/kdeaddons
parentReadd patch that was mistakenly removed. (diff)
downloadgentoo-2-279f096bc44ce5050985b6743ff5882e3b991be5.tar.gz
gentoo-2-279f096bc44ce5050985b6743ff5882e3b991be5.tar.bz2
gentoo-2-279f096bc44ce5050985b6743ff5882e3b991be5.zip
Readd patch that was mistakenly removed.
(Portage version: 2.0.51.19)
Diffstat (limited to 'kde-base/kdeaddons')
-rw-r--r--kde-base/kdeaddons/files/noatun-oblique-db-location-3.4.0.diff24
-rw-r--r--kde-base/kdeaddons/kdeaddons-3.4.0.ebuild4
-rw-r--r--kde-base/kdeaddons/kdeaddons-3.4.0_rc1.ebuild4
3 files changed, 28 insertions, 4 deletions
diff --git a/kde-base/kdeaddons/files/noatun-oblique-db-location-3.4.0.diff b/kde-base/kdeaddons/files/noatun-oblique-db-location-3.4.0.diff
new file mode 100644
index 000000000000..bf3f954f57af
--- /dev/null
+++ b/kde-base/kdeaddons/files/noatun-oblique-db-location-3.4.0.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.ebuild b/kde-base/kdeaddons/kdeaddons-3.4.0.ebuild
index 02c4fd510f07..5581d64df3d0 100644
--- a/kde-base/kdeaddons/kdeaddons-3.4.0.ebuild
+++ b/kde-base/kdeaddons/kdeaddons-3.4.0.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/kdeaddons/kdeaddons-3.4.0.ebuild,v 1.1 2005/03/14 21:49:31 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.4.0.ebuild,v 1.2 2005/03/17 11:58:52 greg_g Exp $
inherit kde-dist eutils
@@ -28,7 +28,7 @@ src_unpack() {
# 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
- epatch "${FILESDIR}/noatun-oblique-db-location-3.4.0_beta2.diff"
+ epatch "${FILESDIR}/noatun-oblique-db-location-3.4.0.diff"
myconf="--with-extra-includes=/usr/include/db4.2"
rm ${S}/configure
diff --git a/kde-base/kdeaddons/kdeaddons-3.4.0_rc1.ebuild b/kde-base/kdeaddons/kdeaddons-3.4.0_rc1.ebuild
index 0fbb87e6436f..cb0f26f3f707 100644
--- a/kde-base/kdeaddons/kdeaddons-3.4.0_rc1.ebuild
+++ b/kde-base/kdeaddons/kdeaddons-3.4.0_rc1.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/kdeaddons/kdeaddons-3.4.0_rc1.ebuild,v 1.1 2005/02/27 22:52:01 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.4.0_rc1.ebuild,v 1.2 2005/03/17 11:58:52 greg_g Exp $
inherit kde-dist eutils
@@ -28,7 +28,7 @@ src_unpack() {
# 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
- epatch "${FILESDIR}/noatun-oblique-db-location-3.4.0_beta2.diff"
+ epatch "${FILESDIR}/noatun-oblique-db-location-3.4.0.diff"
myconf="--with-extra-includes=/usr/include/db4.2"
rm ${S}/configure