[kde-base/akonadi] Add missing dep on kdepimlibs

5 files changed, 103 insertions, 3 deletions

diff --git a/kde-base/akonadi/Manifest b/kde-base/akonadi/Manifest
index 18af685b43e..1aabe891982 100644
--- a/kde-base/akonadi/Manifest
+++ b/kde-base/akonadi/Manifest
@@ -1,5 +1,7 @@
+DIST kdepim-runtime-4.3.1.tar.bz2 744306 RMD160 d44d8cf1e5dbcc0b60edb4b4f3fae5e5e7f97c16 SHA1 c39b0fc1d3721fb8c6074ba6a174ad8716c6c604 SHA256 77d5019274051ea5924fb43fd0e660f7437be5d05023c18d876cde63480861ad
 DIST kdepim-runtime-4.3.65.tar.lzma 676846 RMD160 084830498f9206dc01e942b9cb7ae2be1c572ba1 SHA1 6819a80b7423309f509bb5eabe81b2987e5d170f SHA256 274692e1cd9a956187be70fbbc625a761c8ac030d7bf067fe5171e86d2863569
-EBUILD akonadi-4.3.65.ebuild 2670 RMD160 e9e88eca80438b26ab6f86cc2c7d70347ecfce92 SHA1 00a797bb6f19f1cbaffd52aed118cb32f9f03fbb SHA256 e8fcd3e6bf6e0317d18df34604ecb56499794a4c373ed107a2463c70855357c3
-EBUILD akonadi-4.3.9999.ebuild 2628 RMD160 900e2d41ec1c17265f1ce1147e015ac218f9cb80 SHA1 200726633438cd0fe17175e88d0aee1b0749b8ba SHA256 7cb2c3ab95ed081c6b5839b94397d01f5c6bbd4264040f9e96dc324898471aac
-EBUILD akonadi-9999-r1.ebuild 2628 RMD160 900e2d41ec1c17265f1ce1147e015ac218f9cb80 SHA1 200726633438cd0fe17175e88d0aee1b0749b8ba SHA256 7cb2c3ab95ed081c6b5839b94397d01f5c6bbd4264040f9e96dc324898471aac
+EBUILD akonadi-4.3.1.ebuild 2719 RMD160 443508a5db82ca7fd90b66a1685f39b921c040a9 SHA1 ca8585f5d222ca9fc8893d87f4845522ace9bff5 SHA256 c1aa89326e8d6b57a477e03cbdc54c5cd16d1443ab533750fd4075561f5858e8
+EBUILD akonadi-4.3.65.ebuild 2719 RMD160 443508a5db82ca7fd90b66a1685f39b921c040a9 SHA1 ca8585f5d222ca9fc8893d87f4845522ace9bff5 SHA256 c1aa89326e8d6b57a477e03cbdc54c5cd16d1443ab533750fd4075561f5858e8
+EBUILD akonadi-4.3.9999.ebuild 2677 RMD160 54e1c595b13643a87e891b2bfde68caa8ce48cc0 SHA1 7033c4bf028840188458741d849848b4980e8f46 SHA256 77debfaf0ba7651d13f50aa41a5a3887f384dccb7006f482448dd6c378eefb62
+EBUILD akonadi-9999-r1.ebuild 2677 RMD160 54e1c595b13643a87e891b2bfde68caa8ce48cc0 SHA1 7033c4bf028840188458741d849848b4980e8f46 SHA256 77debfaf0ba7651d13f50aa41a5a3887f384dccb7006f482448dd6c378eefb62
 MISC metadata.xml 264 RMD160 4d66ebe451b6634cb712a67519338b16a556b983 SHA1 272c64cf9e24ac997a3a9d4ce32249a09f4d62bd SHA256 7c3b87ecba257c3c302e5beccf9e21d858c9651ea7b6b723b79a3364f671b7e5
diff --git a/kde-base/akonadi/akonadi-4.3.1.ebuild b/kde-base/akonadi/akonadi-4.3.1.ebuild
new file mode 100644
index 00000000000..9e83d967bfb
--- /dev/null
+++ b/kde-base/akonadi/akonadi-4.3.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+if [[ ${PV} = *9999* ]]; then
+	KMNAME="kdepim"
+	eclass="kde4-meta"
+else
+	KMNAME="kdepim-runtime"
+	eclass="kde4-base"
+fi
+inherit ${eclass}
+
+DESCRIPTION="An extensible cross-desktop storage service for PIM data and meta data"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+# add when libmapi becomes available with an ebuild
+#exchange
+IUSE="debug +semantic-desktop"
+
+# add when libmapi becomes available with an ebuild
+#exchange? ( net-libs/libmapi )
+DEPEND="
+	dev-libs/boost
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,semantic-desktop?]
+	>=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]
+	x11-misc/shared-mime-info
+"
+# @since 4.3 - blocks kdemaildir - no longer provided (it's in akonadi now)
+RDEPEND="${DEPEND}
+	!kdeprefix? (
+		!kde-base/kdemaildir[-kdeprefix]
+		!~kde-base/kdepim-kresources-4.2.3[-kdeprefix]
+		!~kde-base/kdepim-kresources-4.2.4[-kdeprefix]
+		!<kde-base/kdepim-kresources-4.2.95:4.3[-kdeprefix]
+	)
+	kdeprefix? (
+		!kde-base/kdemaildir:${SLOT}
+		!<kde-base/kdepim-kresources-4.2.95:${SLOT}[kdeprefix]
+	)
+	>=app-office/akonadi-server-1.2.1
+"
+
+[[ ${KMNAME} = "kdepim-runtime" ]] && S="${WORKDIR}/${KMNAME}-${PV}"
+
+src_prepare() {
+	local pref="${S}"
+	[[ ${KMNAME} != "kdepim-runtime" ]] && pref="${S}/${PN}"
+	if ! use semantic-desktop; then
+		sed -i -e "s/add_subdirectory( nepomuktag )//"\
+			"${pref}"/resources/CMakeLists.txt\
+			|| die "Failed to disable nepomuktag"
+	fi
+
+	${eclass}_src_prepare
+}
+
+src_configure() {
+	# Set the dbus dirs, otherwise it searches in KDEDIR
+	mycmakeargs="${mycmakeargs}
+		-DAKONADI_DBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces
+		-DAKONADI_DBUS_SERVICES_INSTALL_DIR=/usr/share/dbus-1/services"
+	# replace with $(cmake-utils_use_with exchange OpenChange) when libmapi becomes available with an ebuild
+	mycmakeargs="${mycmakeargs}
+		-DWITH_LibXslt=ON
+		-DWITH_OpenChange=OFF
+		-DWITH_GNOKII=OFF
+		-DWITH_GLIB2=OFF
+		-DWITH_OpenSync=OFF
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)"
+
+	${eclass}_src_configure
+}
+
+src_test() {
+	# disable broken tests
+	sed -i -e '/kcalserializertest/ s/^/#DO_NOT_RUN_TEST /' \
+		"${S}"/plugins/tests/CMakeLists.txt || \
+		die "sed to disable kcalserializertest failed."
+	sed -i -e '/kresmigrationtest/ s/^/#DO_NOT_RUN_TEST /' \
+		"${S}"/migration/kres/tests/CMakeLists.txt || \
+		die "sed to disable kresmigrationtest failed."
+
+	${eclass}_src_test
+}
+
+src_install() {
+	${eclass}_src_install
+	# colliding files with nepomuk
+	rm -rf "${D}"/${KDEDIR}/share/apps/nepomuk/ontologies/n{m,c}o.{desktop,trig}
+}
diff --git a/kde-base/akonadi/akonadi-4.3.65.ebuild b/kde-base/akonadi/akonadi-4.3.65.ebuild
index 352ff5d59b2..9e83d967bfb 100644
--- a/kde-base/akonadi/akonadi-4.3.65.ebuild
+++ b/kde-base/akonadi/akonadi-4.3.65.ebuild
@@ -26,6 +26,7 @@ DEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
 	>=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,semantic-desktop?]
+	>=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]
 	x11-misc/shared-mime-info
 "
 # @since 4.3 - blocks kdemaildir - no longer provided (it's in akonadi now)
diff --git a/kde-base/akonadi/akonadi-4.3.9999.ebuild b/kde-base/akonadi/akonadi-4.3.9999.ebuild
index 58952e15aed..b537fe28843 100644
--- a/kde-base/akonadi/akonadi-4.3.9999.ebuild
+++ b/kde-base/akonadi/akonadi-4.3.9999.ebuild
@@ -26,6 +26,7 @@ DEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
 	>=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,semantic-desktop?]
+	>=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]
 	x11-misc/shared-mime-info
 "
 # @since 4.3 - blocks kdemaildir - no longer provided (it's in akonadi now)
diff --git a/kde-base/akonadi/akonadi-9999-r1.ebuild b/kde-base/akonadi/akonadi-9999-r1.ebuild
index 58952e15aed..b537fe28843 100644
--- a/kde-base/akonadi/akonadi-9999-r1.ebuild
+++ b/kde-base/akonadi/akonadi-9999-r1.ebuild
@@ -26,6 +26,7 @@ DEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
 	>=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,semantic-desktop?]
+	>=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]
 	x11-misc/shared-mime-info
 "
 # @since 4.3 - blocks kdemaildir - no longer provided (it's in akonadi now)