summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-03-15 14:28:17 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-03-15 14:28:17 +0000
commita6dce293b7d6a979026e61acc78b7b7c245caa59 (patch)
tree66f14f15ee4e0a75631841429c906f8719b5add8
parentAutomatic-merge: merge updates for 4.2.1 from kde-testing. (diff)
downloadgentoo-2-a6dce293b7d6a979026e61acc78b7b7c245caa59.tar.gz
gentoo-2-a6dce293b7d6a979026e61acc78b7b7c245caa59.tar.bz2
gentoo-2-a6dce293b7d6a979026e61acc78b7b7c245caa59.zip
Automatic-merge: merge updates for 4.2.1 from kde-testing.
(Portage version: 2.2_rc25/cvs/Linux x86_64)
-rw-r--r--kde-base/kdialog/ChangeLog5
-rw-r--r--kde-base/kdialog/kdialog-4.2.1.ebuild5
2 files changed, 6 insertions, 4 deletions
diff --git a/kde-base/kdialog/ChangeLog b/kde-base/kdialog/ChangeLog
index 1e5575c6a8ba..1963b290a410 100644
--- a/kde-base/kdialog/ChangeLog
+++ b/kde-base/kdialog/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/kdialog
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/ChangeLog,v 1.98 2009/03/08 22:47:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/ChangeLog,v 1.99 2009/03/15 14:28:17 scarabeus Exp $
+
+ 15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kdialog-4.2.1.ebuild:
+ Automatic-merge: merge updates for 4.2.1 from kde-testing.
08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kdialog-4.2.1.ebuild:
Revert wrongly commited new eclass behavior.
diff --git a/kde-base/kdialog/kdialog-4.2.1.ebuild b/kde-base/kdialog/kdialog-4.2.1.ebuild
index 5f50b342ec31..454dca754a60 100644
--- a/kde-base/kdialog/kdialog-4.2.1.ebuild
+++ b/kde-base/kdialog/kdialog-4.2.1.ebuild
@@ -1,11 +1,10 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/kdialog-4.2.1.ebuild,v 1.3 2009/03/08 22:47:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/kdialog-4.2.1.ebuild,v 1.4 2009/03/15 14:28:17 scarabeus Exp $
EAPI="2"
-KMNAME="kdebase"
-KMMODULE="apps/${PN}"
+KMNAME="kdebase-apps"
inherit kde4-meta
DESCRIPTION="KDialog can be used to show nice dialog boxes from shell scripts"