Pull in changes from overlay and prefix support

Package-Manager: portage--svn/cvs/Linux i686

4 files changed, 18 insertions, 14 deletions

diff --git a/kde-base/akonadi/ChangeLog b/kde-base/akonadi/ChangeLog
index 79e98c159708..753659130c9e 100644
--- a/kde-base/akonadi/ChangeLog
+++ b/kde-base/akonadi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/akonadi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v 1.45 2009/12/10 18:55:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v 1.46 2009/12/22 22:31:03 abcd Exp $
+
+  22 Dec 2009; Jonathan Callen <abcd@gentoo.org> akonadi-4.3.4.ebuild:
+  Pull in changes from overlay and prefix support
 
   10 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   -akonadi-4.3.1.ebuild:
diff --git a/kde-base/akonadi/Manifest b/kde-base/akonadi/Manifest
index 1cdb7eb9813f..db1d5a2055ac 100644
--- a/kde-base/akonadi/Manifest
+++ b/kde-base/akonadi/Manifest
@@ -1,6 +1,6 @@
 DIST kdepim-runtime-4.3.3.tar.bz2 745417 RMD160 d5ed82e2c66f91ef290e4ae9c0f46044c9fa8e92 SHA1 2c13726ffc64a6975b774af4262914bcc7ad1e66 SHA256 8da345b5bca5fdc561d6cb13e5e31017c31a977f1046eb430f50e747dab0e974
 DIST kdepim-runtime-4.3.4.tar.bz2 745494 RMD160 eb14075e34711fef0cd204f6307476f36abe75af SHA1 bef70088aec4355f5bb8c0375082388eaa3d4b26 SHA256 59cd69c33254ed3b24dbd57e323499c8561d4369e5798061e753847c47592706
 EBUILD akonadi-4.3.3.ebuild 2540 RMD160 b4c8a87769b65f038476934941df19d4e6f2bbcb SHA1 55a111d66d0b15b035313f9db307cbabfdbd96c2 SHA256 374fe3ac83fc2b3f54f6c551a4cf3ee7deeb82ead8ba29c7ea60bf89cf4a5d0a
-EBUILD akonadi-4.3.4.ebuild 2544 RMD160 802cae6d241cae2f57002e97e874c79325158b97 SHA1 7e5d78c90f3e1216cdabc26ca3dc50cdb7f2de95 SHA256 09cc0a006ab33cb78877edf2f056cf18557ed7b98602d82bb876446bd685c58c
-MISC ChangeLog 5442 RMD160 b0c1bc6ff9b18625a80fb9cca61230677a98493b SHA1 7aa99c991486299e4b9b80ee61b94f75bf48340e SHA256 42cc52d933d9bef23466b2d91ef8fe035d3f7e0aa2147ec9fc893f0175cf3b84
+EBUILD akonadi-4.3.4.ebuild 2529 RMD160 fa8fe38fc44cbf3a789ca685197731abbcf62492 SHA1 125fd7c39fb67c9409306a2fdbc1e9e538f3eb8b SHA256 2dff4d95a834d07aacd3e1ad3e041cb4249aa227ed293100b66347fc50a86a74
+MISC ChangeLog 5559 RMD160 c0778d1be9a44040c8c9d74eff35f3ec72521a0d SHA1 3bccd76d2f71fa191f6228c0f5d0931650cb44a5 SHA256 44f9d50ca144b0174ed42860c5909ff43e8e3bf646035c0dd11c48b8c1806167
 MISC metadata.xml 264 RMD160 4d66ebe451b6634cb712a67519338b16a556b983 SHA1 272c64cf9e24ac997a3a9d4ce32249a09f4d62bd SHA256 7c3b87ecba257c3c302e5beccf9e21d858c9651ea7b6b723b79a3364f671b7e5
diff --git a/kde-base/akonadi/akonadi-4.3.4.ebuild b/kde-base/akonadi/akonadi-4.3.4.ebuild
index 8e2f87abf159..e8ce86ad0b52 100644
--- a/kde-base/akonadi/akonadi-4.3.4.ebuild
+++ b/kde-base/akonadi/akonadi-4.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.3.4.ebuild,v 1.1 2009/12/01 09:55:21 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.3.4.ebuild,v 1.2 2009/12/22 22:31:03 abcd Exp $
 
 EAPI="2"
 
@@ -52,19 +52,20 @@ 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}
+	mycmakeargs=(
+		# Set the dbus dirs, otherwise it searches in KDEDIR
+		-DAKONADI_DBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces"
+		-DAKONADI_DBUS_SERVICES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/services"
+
 		-DWITH_LibXslt=ON
+		# replace with $(cmake-utils_use_with exchange OpenChange) when libmapi becomes available with an ebuild
 		-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)"
+		$(cmake-utils_use_with semantic-desktop Soprano)
+	)
 
 	${eclass}_src_configure
 }
@@ -84,5 +85,5 @@ 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}
+	rm -rf "${ED}"/${KDEDIR}/share/apps/nepomuk/ontologies/n{m,c}o.{desktop,trig}
 }
diff --git a/kde-base/ark/Manifest b/kde-base/ark/Manifest
index 18b78f240e09..c1c9d1b79e65 100644
--- a/kde-base/ark/Manifest
+++ b/kde-base/ark/Manifest
@@ -1,6 +1,6 @@
 DIST kdeutils-4.3.3.tar.bz2 2525876 RMD160 d1e8a1a8ee2a7bf1e5104dfb97af9b354aaac2bd SHA1 af3bd5c91020ae4fcd27b799eecf06aa161b48b4 SHA256 1690333709021a8a609a7f2ccfcb2d4677bde8d2e706139426a2f6d143202cc7
 DIST kdeutils-4.3.4.tar.bz2 2526973 RMD160 8a6444010e026341d492c9a43681e2ed32c29863 SHA1 2d5e26055e364af2df7459cdbc3aebdc3a8abdea SHA256 2b9e379360cb46463327c9d73382f60a80aa27bec4f4b6c60b1d58582656aff8
 EBUILD ark-4.3.3.ebuild 815 RMD160 30fed13f120aaea69b7861f838a0dac1cc1b31ad SHA1 0f09b241255fd83c13847c84f08ca87f2222d2bd SHA256 75b68efba2c819a8ca1ae7350678b708bd3fedb2092bb8545230a89a4fbe3f7a
-EBUILD ark-4.3.4.ebuild 819 RMD160 cc8c368a5c242699106412c5c59e4047fa746ee8 SHA1 41c69669772ea84dce548833dde96d7c04cb2642 SHA256 1bda790f81bf26a67d08a9394251c3ad3dc60b7d30408155dac36f39fd089787
-MISC ChangeLog 16145 RMD160 07962ee157a0a0c164b8f9ed97e0129b01c601a1 SHA1 cd0c1ec8eedc6393229bc3fb09d2afad01aae734 SHA256 bca04b71af90aadcf494ec993246bdf7a52770fe8db51bd7cbf6cc52d749b06a
+EBUILD ark-4.3.4.ebuild 804 RMD160 8bb27a030942e6e8c777ba8371e5fa72da32e538 SHA1 ee194a4f7f69177c692e2d8becd95479f5774934 SHA256 423ab333e0b414c272eb5db9f90d4ba84dcba68c1fe0eb9cbc6d31f160e0c5c0
+MISC ChangeLog 16239 RMD160 a4593d3ddb18bfd627e4a932074be756340edcf4 SHA1 0476936cb84f0fb143b4157bcfb583122cb31e7b SHA256 bb4917ee06ad811a4ec0be15f8b904d34eeb084b81c047a81069e29926f3fde2
 MISC metadata.xml 370 RMD160 d6b75813322cedba5751430dee5a2e98e48a8257 SHA1 59e744550e7453f0915631e4543b080b874b0ee8 SHA256 7cae17026ff971dd050dc3218ec4b6e6953b4d86e0d5fdeb5cfd58b5234bc292