Restored akonadi-server-1.1.2 to fix the breakage for alpha and ia64 and droppped keywords for alpha and ia64 for akonadi-server-1.2.{0,1} given the missing keywords for dev-libs/soprano dep.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

5 files changed, 65 insertions, 8 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index 7bbc214b34a2..8ea4383c3355 100644
--- a/app-office/akonadi-server/ChangeLog
+++ b/app-office/akonadi-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/akonadi-server
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.19 2009/09/01 17:29:10 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.20 2009/09/06 01:58:44 jmbsvicetto Exp $
+
+  06 Sep 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +akonadi-server-1.1.2.ebuild, akonadi-server-1.2.0.ebuild,
+  akonadi-server-1.2.1.ebuild:
+  Restored akonadi-server-1.1.2 to fix the breakage for alpha and ia64 and
+  droppped keywords for alpha and ia64 for akonadi-server-1.2.{0,1} given
+  the missing keywords for dev-libs/soprano dep.
 
 *akonadi-server-1.2.1 (01 Sep 2009)
 
diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
index d85e5e105ba9..04cdb7b6d369 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -1,6 +1,8 @@
+DIST akonadi-1.1.2.tar.bz2 135407 RMD160 81457f1c4c68c9ad6c8e5a48e3aa4b483f68bb0c SHA1 baff27f138ab26d1375d28de838ccca0fe7c4513 SHA256 5ab3c18150e9f7f571e0bce3494c54b22285ea0d6a2f7ac458aba3aed9aaa5ce
 DIST akonadi-1.2.0.tar.bz2 176786 RMD160 0a2dfaa1965a91ffe1a5c0f1eed25bccbefcbe5f SHA1 140a7d7ff03e1976f063828c59c13a300abae76a SHA256 cf58c861647a58f3cbe7a97a33b5be7d8c697b412e7d0d00285f5d3ddd2d7d9a
 DIST akonadi-1.2.1.tar.bz2 177290 RMD160 e071e2e8ccad1341ce9c86987c2daed5186e5ed6 SHA1 29916601d724b95d22712673bb0e1b72918cc43e SHA256 ee2bd0802d8202652388dd78959628716968f974b8f254de7055a0d74cba2134
-EBUILD akonadi-server-1.2.0.ebuild 1725 RMD160 43f1e26af5dc4838072d2876cfcc0353842a97c7 SHA1 83e4ec15defb88ceca52a19725568eab989349b7 SHA256 16a577f2ceb3a82adb5184f67bbc2c8a13b1ba0949be6847efb3b238b0f3088f
-EBUILD akonadi-server-1.2.1.ebuild 1896 RMD160 c38fdc0fda9f398107bad7dab867e6068a9dca08 SHA1 039222d25c1739f1a2a0047a0359f7febd494839 SHA256 58b6a543f0d4a9deacf4dc16271dc2867ebf22d9b8e04e1e3abf939d9599569c
-MISC ChangeLog 2580 RMD160 d1cc996965a9803aeeefb46e9dc9b5f67ffb5027 SHA1 0b9e7b4828cf5fc9a76394df2260b5e49a63bea1 SHA256 3028207cb5857b86625b881799d0d3e0e51d84bdf1c7cd6089ded83989c1d7a1
+EBUILD akonadi-server-1.1.2.ebuild 1213 RMD160 1d56eda2283eeeaf0cb9ff210a88807200b2bb48 SHA1 784b14ebed397d3cd47474e16840afa57ac22924 SHA256 de529dc49c798a6ef34888bb7b9d86737a20b900334e155bf7254249597563e9
+EBUILD akonadi-server-1.2.0.ebuild 1714 RMD160 9fa877ed4def2a1f8d2a400f072c806c05b1b1aa SHA1 cd6d7466641deaa2ce3e0285836d18723999a18e SHA256 c9799c92f63df2b5e8f4dd46a8910f798dcd95ab8e0f36ebfe77c7a925f3e80e
+EBUILD akonadi-server-1.2.1.ebuild 1885 RMD160 97adf913cbc357ef9bd3e3908de7d77082a3fed4 SHA1 1c5e947a00502c1545f1504dc719abc8057648bf SHA256 60337c98674f11af0acd3dcaeaa20e99de3ba2b98ac05dd3619af8fcd8f776d6
+MISC ChangeLog 2940 RMD160 91d313cb96dc8238bdd64cd845272eecd3ea27eb SHA1 47a763acabcc1f6a35c2a56255810b7c8a4ce65f SHA256 6e6c0d9cd75206962f74f42186add6b77108ca48c95911ccfc6f346ac61e253c
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/app-office/akonadi-server/akonadi-server-1.1.2.ebuild b/app-office/akonadi-server/akonadi-server-1.1.2.ebuild
new file mode 100644
index 000000000000..4e626273933e
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.1.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.1.2.ebuild,v 1.4 2009/09/06 01:58:44 jmbsvicetto Exp $
+
+EAPI="2"
+
+inherit cmake-utils
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="http://pim.kde.org/akonadi"
+SRC_URI="http://download.akonadi-project.org/${P/-server/}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE="+mysql"
+
+RDEPEND="
+	dev-libs/boost
+	>=x11-libs/qt-core-4.5.0:4
+	>=x11-libs/qt-dbus-4.5.0:4
+	>=x11-libs/qt-sql-4.5.0:4[mysql?]
+	x11-misc/shared-mime-info
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	>=kde-base/automoc-0.9.88
+"
+
+S="${WORKDIR}/${P/-server/}"
+
+src_prepare() {
+	# Don't check for mysql, avoid an automagic dep.
+	if ! use mysql; then
+		sed -e '/mysqld/s/find_program/#DONOTWANT &/' \
+			-i "${S}"/server/CMakeLists.txt || die 'Sed failed.'
+	fi
+}
+
+pkg_postinst() {
+	if ! use mysql; then
+		echo
+		ewarn "You have decided to build akonadi-server with mysql USE"
+		ewarn "flag disabled. Note, that this is the only supported"
+		ewarn "database backend, hence akonadi-server will not work."
+		echo
+	fi
+}
diff --git a/app-office/akonadi-server/akonadi-server-1.2.0.ebuild b/app-office/akonadi-server/akonadi-server-1.2.0.ebuild
index aa2cef70ecfa..f0b48d0d8c2a 100644
--- a/app-office/akonadi-server/akonadi-server-1.2.0.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.2.0.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/app-office/akonadi-server/akonadi-server-1.2.0.ebuild,v 1.3 2009/08/20 09:33:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.2.0.ebuild,v 1.4 2009/09/06 01:58:44 jmbsvicetto Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://pim.kde.org/akonadi"
 SRC_URI="http://download.akonadi-project.org/${P/-server/}.tar.bz2"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 SLOT="0"
 IUSE="+mysql sqlite"
 
diff --git a/app-office/akonadi-server/akonadi-server-1.2.1.ebuild b/app-office/akonadi-server/akonadi-server-1.2.1.ebuild
index 52d58bce7b23..b8d6678da20f 100644
--- a/app-office/akonadi-server/akonadi-server-1.2.1.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.2.1.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/app-office/akonadi-server/akonadi-server-1.2.1.ebuild,v 1.1 2009/09/01 17:29:10 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.2.1.ebuild,v 1.2 2009/09/06 01:58:44 jmbsvicetto Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://pim.kde.org/akonadi"
 SRC_URI="http://download.akonadi-project.org/${P/-server/}.tar.bz2"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 SLOT="0"
 IUSE="+mysql sqlite"