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
commit2c0bee7dc585aa28adc5e1caa9cf21227ce6a9e6 (patch)
tree19f52a847f8e354a1b69cbeec25be8591cb2f800 /kde-base
parentReadd patch that was mistakenly removed. (diff)
downloadhistorical-2c0bee7dc585aa28adc5e1caa9cf21227ce6a9e6.tar.gz
historical-2c0bee7dc585aa28adc5e1caa9cf21227ce6a9e6.tar.bz2
historical-2c0bee7dc585aa28adc5e1caa9cf21227ce6a9e6.zip
Readd patch that was mistakenly removed.
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdeaddons/Manifest19
-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
4 files changed, 38 insertions, 13 deletions
diff --git a/kde-base/kdeaddons/Manifest b/kde-base/kdeaddons/Manifest
index a7a3f0f6bd71..6d13ab18b6c3 100644
--- a/kde-base/kdeaddons/Manifest
+++ b/kde-base/kdeaddons/Manifest
@@ -1,14 +1,15 @@
-MD5 5ceb2a1a78884aedfba42ef8b1bb08df kdeaddons-3.3.1.ebuild 985
-MD5 210031ed275d867c8ce19c8db4ee0194 kdeaddons-3.3.2.ebuild 995
-MD5 3183218a8f27ad2c638d329e23b39134 kdeaddons-3.4.0.ebuild 1331
-MD5 40ba8c1c7f621fcb1f775831c4c30328 kdeaddons-3.4.0_rc1.ebuild 1335
-MD5 2199ddda80990c67f8c7450571e909c1 ChangeLog 16359
MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
+MD5 6bce112b1dc4fb55723bbad798d912ff kdeaddons-3.4.0_rc1.ebuild 1329
+MD5 2199ddda80990c67f8c7450571e909c1 ChangeLog 16359
+MD5 210031ed275d867c8ce19c8db4ee0194 kdeaddons-3.3.2.ebuild 995
+MD5 5ceb2a1a78884aedfba42ef8b1bb08df kdeaddons-3.3.1.ebuild 985
MD5 b2676065f8c89b6a2b9ffef083fac50f kdeaddons-3.2.3.ebuild 988
-MD5 3bec1549e74c6f661045a83198e45290 files/kdeaddons-3.2.0-kvim.diff 363
+MD5 29333c93d27fa2b371f78615b327de3a kdeaddons-3.4.0.ebuild 1325
+MD5 913bd9f1c52d68ec7faa72960464132e files/kdeaddons-3.2.3-gcc34.patch 1256
+MD5 6ec5a8a3f0f5ae85d431525c926c27fe files/noatun-oblique-db-location-3.4.0.diff 625
MD5 c76665fa9f2c24695bb841ab2596f20f files/digest-kdeaddons-3.4.0_rc1 73
-MD5 e773fdc5e9bf3ab47e4dada5fba0ebbe files/digest-kdeaddons-3.2.3 69
-MD5 73f4e27e90b4b9dc9b6f20bcb8076769 files/digest-kdeaddons-3.3.1 69
+MD5 3bec1549e74c6f661045a83198e45290 files/kdeaddons-3.2.0-kvim.diff 363
MD5 f510fb4a423935c458f3e01d994b5bd2 files/digest-kdeaddons-3.3.2 69
MD5 231586b7509d98416a3043180cebfe60 files/digest-kdeaddons-3.4.0 69
-MD5 913bd9f1c52d68ec7faa72960464132e files/kdeaddons-3.2.3-gcc34.patch 1256
+MD5 73f4e27e90b4b9dc9b6f20bcb8076769 files/digest-kdeaddons-3.3.1 69
+MD5 e773fdc5e9bf3ab47e4dada5fba0ebbe files/digest-kdeaddons-3.2.3 69
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