Bump KDE 4.2.1

(Portage version: 2.2_rc23/cvs/Linux x86_64)

2 files changed, 50 insertions, 1 deletions

diff --git a/kde-base/kdebase-data/ChangeLog b/kde-base/kdebase-data/ChangeLog
index 33be0855af9a..5d0e2d4787c6 100644
--- a/kde-base/kdebase-data/ChangeLog
+++ b/kde-base/kdebase-data/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase-data
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/ChangeLog,v 1.105 2009/02/19 23:06:27 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/ChangeLog,v 1.106 2009/03/04 20:51:26 alexxy Exp $
+
+*kdebase-data-4.2.1 (04 Mar 2009)
+
+  04 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org>
+  +kdebase-data-4.2.1.ebuild:
+  Bump KDE 4.2.1
 
   19 Feb 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -kdebase-data-4.1.4.ebuild:
diff --git a/kde-base/kdebase-data/kdebase-data-4.2.1.ebuild b/kde-base/kdebase-data/kdebase-data-4.2.1.ebuild
new file mode 100644
index 000000000000..7b86c2affdd0
--- /dev/null
+++ b/kde-base/kdebase-data/kdebase-data-4.2.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-4.2.1.ebuild,v 1.1 2009/03/04 20:51:26 alexxy Exp $
+
+EAPI="2"
+
+KMNAME="kdebase-runtime"
+KMNOMODULE="true"
+inherit kde4-meta
+
+DESCRIPTION="Icons, localization data and various .desktop files from kdebase."
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+# Some files were moved from dolphin to kdebase-data between the 4.1.85 and the 4.1.87
+# releases. Thus we need to block older versions of dolphin, including the :4.1 versions.
+RDEPEND="
+	!<kde-base/dolphin-4.1.87:4.2[kdeprefix=]
+	!=media-gfx/digikam-0.10.0_rc2[kdeprefix=]
+	!kdeprefix? ( !<kde-base/dolphin-4.1.87[-kdeprefix] )
+	x11-themes/hicolor-icon-theme
+"
+
+KMEXTRA="
+	l10n/
+	pics/
+"
+# Note that the eclass doesn't do this for us, because of KMNOMODULE="true".
+KMEXTRACTONLY="
+	config-runtime.h.cmake
+	kde4
+"
+
+src_configure() {
+	# remove instalation of colliding file for hicolor-icon-theme
+	if ! use kdeprefix; then
+		sed -i \
+			-e "s:add_subdirectory( hicolor ):#donotwant:g" \
+			pics/CMakeLists.txt
+	fi
+
+	kde4-meta_src_configure
+}