From 77bea3f77553ef941b0ce957515c090e2017b2eb Mon Sep 17 00:00:00 2001 From: Carsten Lohrke Date: Sat, 14 Apr 2007 16:23:50 +0000 Subject: [PATCH] Fix bug #174540. Package-Manager: portage-2.1.2.3 --- kde-base/kde-meta/ChangeLog | 5 ++++- kde-base/kde-meta/kde-meta-3.5.6.ebuild | 5 +++-- kde-base/kde/ChangeLog | 5 ++++- kde-base/kde/files/digest-kde-3.5.5 | 1 - kde-base/kde/files/digest-kde-3.5.6 | 1 - kde-base/kde/kde-3.5.6.ebuild | 5 +++-- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/kde-base/kde-meta/ChangeLog b/kde-base/kde-meta/ChangeLog index ca0bf5e62905..81c19ecfb47f 100644 --- a/kde-base/kde-meta/ChangeLog +++ b/kde-base/kde-meta/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/kde-meta # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/ChangeLog,v 1.71 2007/02/04 02:07:02 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/ChangeLog,v 1.72 2007/04/14 16:23:50 carlo Exp $ + + 14 Apr 2007; Carsten Lohrke kde-meta-3.5.6.ebuild: + Fix bug #174540. 04 Feb 2007; Diego Pettenò -kde-meta-3.5.2.ebuild: Remove old versions. diff --git a/kde-base/kde-meta/kde-meta-3.5.6.ebuild b/kde-base/kde-meta/kde-meta-3.5.6.ebuild index 73a4be59daed..d071405d601a 100644 --- a/kde-base/kde-meta/kde-meta-3.5.6.ebuild +++ b/kde-base/kde-meta/kde-meta-3.5.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-3.5.6.ebuild,v 1.1 2007/01/16 20:10:43 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-3.5.6.ebuild,v 1.2 2007/04/14 16:23:50 carlo Exp $ MAXKDEVER=$PV inherit kde-functions @@ -27,4 +27,5 @@ $(deprange $PV $MAXKDEVER kde-base/kdeutils-meta) $(deprange $PV $MAXKDEVER kde-base/kdeartwork-meta) $(deprange $PV $MAXKDEVER kde-base/kdewebdev-meta) accessibility? ( $(deprange $PV $MAXKDEVER kde-base/kdeaccessibility-meta) ) -nls? ( $(deprange $PV $MAXKDEVER kde-base/kde-i18n) )" +nls? ( $(deprange $PV $MAXKDEVER kde-base/kde-i18n) ) +!kde-base/kde" diff --git a/kde-base/kde/ChangeLog b/kde-base/kde/ChangeLog index 2775ce6b482d..5863a90be51c 100644 --- a/kde-base/kde/ChangeLog +++ b/kde-base/kde/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/kde # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/ChangeLog,v 1.173 2007/02/04 18:21:46 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/ChangeLog,v 1.174 2007/04/14 16:22:54 carlo Exp $ + + 14 Apr 2007; Carsten Lohrke kde-3.5.6.ebuild: + Fix bug #174540. 04 Feb 2007; Jeroen Roovers kde-3.5.6.ebuild: Marked ~hppa. diff --git a/kde-base/kde/files/digest-kde-3.5.5 b/kde-base/kde/files/digest-kde-3.5.5 index 8b137891791f..e69de29bb2d1 100644 --- a/kde-base/kde/files/digest-kde-3.5.5 +++ b/kde-base/kde/files/digest-kde-3.5.5 @@ -1 +0,0 @@ - diff --git a/kde-base/kde/files/digest-kde-3.5.6 b/kde-base/kde/files/digest-kde-3.5.6 index 8b137891791f..e69de29bb2d1 100644 --- a/kde-base/kde/files/digest-kde-3.5.6 +++ b/kde-base/kde/files/digest-kde-3.5.6 @@ -1 +0,0 @@ - diff --git a/kde-base/kde/kde-3.5.6.ebuild b/kde-base/kde/kde-3.5.6.ebuild index fc722c6ae9af..f585ae515d86 100644 --- a/kde-base/kde/kde-3.5.6.ebuild +++ b/kde-base/kde/kde-3.5.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.5.6.ebuild,v 1.4 2007/02/04 18:21:46 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.5.6.ebuild,v 1.5 2007/04/14 16:22:54 carlo Exp $ DESCRIPTION="KDE - merge this to pull in all non-developer kde-base/* packages" HOMEPAGE="http://www.kde.org/" @@ -25,4 +25,5 @@ RDEPEND="~kde-base/kdelibs-${PV} ~kde-base/kdetoys-${PV} ~kde-base/kdeutils-${PV} ~kde-base/kdewebdev-${PV} - accessibility? ( ~kde-base/kdeaccessibility-${PV} )" + accessibility? ( ~kde-base/kdeaccessibility-${PV} ) + !kde-base/kde-meta" -- 2.26.2