Automatic-merge: merge updates for 4.2.1 from kde-testing.

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

2 files changed, 41 insertions, 1 deletions

diff --git a/kde-base/libkdepim/ChangeLog b/kde-base/libkdepim/ChangeLog
index 21649133ee2e..992730f04ee2 100644
--- a/kde-base/libkdepim/ChangeLog
+++ b/kde-base/libkdepim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkdepim
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.112 2009/03/09 20:33:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.113 2009/03/15 14:38:48 scarabeus Exp $
+
+*libkdepim-4.2.1-r1 (15 Mar 2009)
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +libkdepim-4.2.1-r1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   09 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> libkdepim-4.2.1.ebuild:
   update deps for new eclass.
diff --git a/kde-base/libkdepim/libkdepim-4.2.1-r1.ebuild b/kde-base/libkdepim/libkdepim-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..811a709a4648
--- /dev/null
+++ b/kde-base/libkdepim/libkdepim-4.2.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-4.2.1-r1.ebuild,v 1.1 2009/03/15 14:38:48 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Common library for KDE PIM apps"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	>=kde-base/kode-${PV}:${SLOT}[kdeprefix=]
+"
+
+KMEXTRACTONLY="
+	kaddressbook/org.kde.KAddressbook.Core.xml
+	korganizer/korgac/org.kde.korganizer.KOrgac.xml
+"
+
+KMSAVELIBS="true"
+
+src_install() {
+	kde4-meta_src_install
+
+	# install additional generated headers that are needed by other packages that
+	# are derived from kdepim. e.g. kmail.
+	pushd "${WORKDIR}/${PN}_build/libkdepim/" 2>/dev/null || die "pushd libkdepim failed"
+	insinto "${PREFIX}/include"
+	doins ui_addresspicker.h ui_categoryselectdialog_base.h || die "Failed to install extra header files."
+	popd 2>/dev/null
+}