From b119b455f9b2238bbe49c231725c464e42fc4e8d Mon Sep 17 00:00:00 2001 From: Carsten Lohrke Date: Wed, 14 Jun 2006 22:31:24 +0000 Subject: [PATCH] Really fix bug #136299. Package-Manager: portage-2.1 --- kde-base/kdeaddons/ChangeLog | 5 ++++- kde-base/kdeaddons/kdeaddons-3.5.3.ebuild | 5 +++-- kde-base/noatun-plugins/ChangeLog | 6 +++++- kde-base/noatun-plugins/noatun-plugins-3.5.3.ebuild | 5 +++-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/kde-base/kdeaddons/ChangeLog b/kde-base/kdeaddons/ChangeLog index 71c3de4130ea..56dfa91fe037 100644 --- a/kde-base/kdeaddons/ChangeLog +++ b/kde-base/kdeaddons/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/kdeaddons # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.174 2006/06/13 11:52:54 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.175 2006/06/14 22:31:24 carlo Exp $ + + 14 Jun 2006; Carsten Lohrke kdeaddons-3.5.3.ebuild: + Really fix bug #136299. 13 Jun 2006; Robin H. Johnson kdeaddons-3.5.3.ebuild: Repoman really should have detected this major tree breakage. ALWAYS quote diff --git a/kde-base/kdeaddons/kdeaddons-3.5.3.ebuild b/kde-base/kdeaddons/kdeaddons-3.5.3.ebuild index 7297ab5c74aa..8613c4bff6d6 100644 --- a/kde-base/kdeaddons/kdeaddons-3.5.3.ebuild +++ b/kde-base/kdeaddons/kdeaddons-3.5.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.5.3.ebuild,v 1.3 2006/06/13 11:52:54 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.5.3.ebuild,v 1.4 2006/06/14 22:31:24 carlo Exp $ inherit db-use kde-dist @@ -23,7 +23,8 @@ src_compile() { local myconf="$(use_with sdl) $(use_with xmms)" if use berkdb; then - myconf="${myconf} --with-berkeley-db --with-db-lib=$(db_libname) + dblib="$(db_libname)" + myconf="${myconf} --with-berkeley-db --with-db-lib=${dblib/-/_cxx-} --with-extra-includes=${ROOT}$(db_includedir)" else myconf="${myconf} --without-berkeley-db" diff --git a/kde-base/noatun-plugins/ChangeLog b/kde-base/noatun-plugins/ChangeLog index 9333eac75696..ab91d5b320cd 100644 --- a/kde-base/noatun-plugins/ChangeLog +++ b/kde-base/noatun-plugins/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/noatun-plugins # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun-plugins/ChangeLog,v 1.46 2006/06/12 22:20:32 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun-plugins/ChangeLog,v 1.47 2006/06/14 22:29:12 carlo Exp $ + + 14 Jun 2006; Carsten Lohrke + noatun-plugins-3.5.3.ebuild: + Really fix bug #136299. 12 Jun 2006; Carsten Lohrke noatun-plugins-3.5.3.ebuild: diff --git a/kde-base/noatun-plugins/noatun-plugins-3.5.3.ebuild b/kde-base/noatun-plugins/noatun-plugins-3.5.3.ebuild index e878148b12f6..06120b119666 100644 --- a/kde-base/noatun-plugins/noatun-plugins-3.5.3.ebuild +++ b/kde-base/noatun-plugins/noatun-plugins-3.5.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun-plugins/noatun-plugins-3.5.3.ebuild,v 1.2 2006/06/12 22:20:32 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun-plugins/noatun-plugins-3.5.3.ebuild,v 1.3 2006/06/14 22:29:12 carlo Exp $ KMNAME=kdeaddons MAXKDEVER=$PV KM_DEPRANGE="$PV $MAXKDEVER" @@ -20,7 +20,8 @@ src_compile() { local myconf="$(use_with sdl)" if use berkdb; then - myconf="${myconf} --with-berkeley-db --with-db-lib=$(db_libname) + dblib="$(db_libname)" + myconf="${myconf} --with-berkeley-db --with-db-lib=${dblib/-/_cxx-} --with-extra-includes=${ROOT}$(db_includedir)" else myconf="${myconf} --without-berkeley-db" -- 2.26.2