Add server USE flag - use locally installed database server

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

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index 66ab546f6cf1dd8041a64dc02dd9e2ea247bb2f8..c15482839ceab66856b84d0712fd7c65c129ea72 100644 (file)
--- a/app-office/akonadi-server/ChangeLog
+++ b/app-office/akonadi-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/akonadi-server
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.36 2010/05/15 13:58:28 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.37 2010/05/15 15:59:26 reavertm Exp $
+
+  15 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  akonadi-server-1.3.1.ebuild, metadata.xml:
+  Add server USE flag - use locally installed database server
 
   15 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
   akonadi-server-1.2.1.ebuild, akonadi-server-1.3.1.ebuild:

diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
index 9b84075504abd8589cdff8e5aa509561b7e38209..da90ae1954fd231ae34b4ac23d81c6af5b698bd7 100644 (file)
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -1,6 +1,6 @@
 DIST akonadi-1.2.1.tar.bz2 177290 RMD160 e071e2e8ccad1341ce9c86987c2daed5186e5ed6 SHA1 29916601d724b95d22712673bb0e1b72918cc43e SHA256 ee2bd0802d8202652388dd78959628716968f974b8f254de7055a0d74cba2134
 DIST akonadi-1.3.1.tar.bz2 193500 RMD160 487408ad3ac49983b9151aba358225f203ed19a1 SHA1 b6e97634878fe52785f3dec7d6394a18579d4a50 SHA256 4b9e99c20d0195ef7e477b399fed21e0533b9863f66a0650bfbddf18b73676dd
 EBUILD akonadi-server-1.2.1.ebuild 1922 RMD160 3c24245865c1e24561e0dd9cd781b4d86627ccd3 SHA1 d636c646acf185de595e8f43f38068a5a6dec36b SHA256 b9ab8920d7ef16f3eaff4080b5bf2bee497a15b267e1dc72e41624860f219f69
-EBUILD akonadi-server-1.3.1.ebuild 2062 RMD160 e71b9bb60cdc56fe6fb56ac35833839e2fd7a802 SHA1 44dab6a1372a29e660ce8243c7168b23daa831e8 SHA256 fcb5e57943a0750eea51f80fd274bc8198a1c16c16bd93bfb64a66dfcf830f67
-MISC ChangeLog 4977 RMD160 ec175ca9c50f26820eaaf8c463fe10d065e670fa SHA1 12fdf256520c62810d5d446c028ba8deef4607f9 SHA256 1c40bd7dfe14b46c3533b8dbc1e250ef65fdb4bb24b4d7844aa1aa2026b2d0a5
-MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+EBUILD akonadi-server-1.3.1.ebuild 2147 RMD160 02bea24ec9862992e367f9bddc9179e3fef240e3 SHA1 045693cb3ac4fd1746bdfce1c3b440279f65ed03 SHA256 28ef296780f680e5d0464a80c34ed5d9b7f978bb8a83747659de1d174ffb2a61
+MISC ChangeLog 5139 RMD160 c14ac045dc0bc0b544207e4b09b6d5bcef373597 SHA1 1ada13e56a8e5b2a0fcf102ac3929c9b77b34ac7 SHA256 6ce7802cb8c1c5f8b723af06735b41686fc6a394c7039009130ae77aab1824b3
+MISC metadata.xml 236 RMD160 c5cc6cb9745f9f6e3c7358482117892cbc866eb2 SHA1 d1bd263bd36cfc701e7ae12fb77e24d3f6556a88 SHA256 3bf214b7d5dabbbd8f2d607f6166647d91c5d0b7f166a4d5615da31995da06b6

diff --git a/app-office/akonadi-server/akonadi-server-1.3.1.ebuild b/app-office/akonadi-server/akonadi-server-1.3.1.ebuild
index 4d1f6ea4309440dc6440c7d3d36d54e80caed658..170e0271582c33765f27109df4facec585e04d7d 100644 (file)
--- a/app-office/akonadi-server/akonadi-server-1.3.1.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.3.1.ebuild,v 1.4 2010/05/15 13:58:28 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.3.1.ebuild,v 1.5 2010/05/15 15:59:26 reavertm Exp $
 
 EAPI="2"
 
@@ -13,19 +13,24 @@ SRC_URI="http://download.akonadi-project.org/${P/-server/}.tar.bz2"
 LICENSE="LGPL-2.1"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
-IUSE="+mysql postgres sqlite"
+IUSE="+mysql postgres sqlite +server"
 
-RDEPEND="
+CDEPEND="
        dev-libs/boost
        >=dev-libs/soprano-2.2
        >=x11-libs/qt-gui-4.5.0:4[dbus]
        >=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?,sqlite?]
        x11-misc/shared-mime-info
 "
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
        dev-libs/libxslt
        >=dev-util/automoc-0.9.88
 "
+RDEPEND="${CDEPEND}
+       server? (
+               postgres? ( dev-db/postgresql-server )
+       )
+"
 
 S="${WORKDIR}/${P/-server/}"
 

diff --git a/app-office/akonadi-server/metadata.xml b/app-office/akonadi-server/metadata.xml
index 8d1e86a9cefb2981ec3d76074dc128c9474d4910..f580a202f05f61f9d5bcc5a6402629451a4a4340 100644 (file)
--- a/app-office/akonadi-server/metadata.xml
+++ b/app-office/akonadi-server/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>kde</herd>
+<use>
+       <flag name="server">Use locally installed database server.</flag>
+</use>
 </pkgmetadata>