public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2011-02-17 16:55 Tomas Chvatal
  0 siblings, 0 replies; 48+ messages in thread
From: Tomas Chvatal @ 2011-02-17 16:55 UTC (permalink / raw
  To: gentoo-commits

commit:     931201b0de1580449aee27faa986036785bc934e
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 17 16:54:58 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Thu Feb 17 16:54:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=931201b0

app-office/akonadi-server migrate to git2 and eapi4.

---
 .../akonadi-server/akonadi-server-9999.ebuild      |   27 ++++++++-----------
 1 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index b66717e..3535345 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
-inherit cmake-utils git
+inherit cmake-utils git-2
 
 DESCRIPTION="The server part of Akonadi"
 HOMEPAGE="http://pim.kde.org/akonadi"
@@ -33,7 +33,7 @@ RDEPEND="${CDEPEND}
 	)
 "
 
-S="${WORKDIR}/${P/-server/}"
+REQUIRED_USE="^^ ( sqlite mysql postgres )"
 
 pkg_setup() {
 	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
@@ -41,10 +41,12 @@ pkg_setup() {
 	if use sqlite; then
 		driver="QSQLITE3"
 		available+=" ${driver}"
-	elif use mysql; then
+	fi
+	if use mysql; then
 		driver="QMYSQL"
 		available+=" ${driver}"
-	elif use postgres; then
+	fi
+	if use postgres; then
 		driver="QPSQL"
 		available+=" ${driver}"
 	fi
@@ -80,15 +82,8 @@ EOF
 }
 
 pkg_postinst() {
-	if use mysql || use postgres || use sqlite; then
-		elog
-		elog "${driver} has been set as your default akonadi storage backend."
-		elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
-		elog "Available drivers are: QMYSQL, QPSQL, QSQLITE3"
-	else
-		ewarn
-		ewarn "You have decided to build ${PN} with"
-		ewarn "'mysql', 'postgres' and 'sqlite' USE flags disabled."
-		ewarn "${PN} will not be functional."
-	fi
+	echo
+	elog "${driver} has been set as your default akonadi storage backend."
+	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are: QMYSQL, QPSQL, QSQLITE3"
 }



^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2011-04-05 23:27 Tomas Chvatal
  0 siblings, 0 replies; 48+ messages in thread
From: Tomas Chvatal @ 2011-04-05 23:27 UTC (permalink / raw
  To: gentoo-commits

commit:     5ba7ba8fb50debd33fc32f878c55c58ce6853a82
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 23:27:22 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 23:27:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5ba7ba8f

[app-office/akonadi-server] Cleanup the ebuild.

---
 .../akonadi-server/akonadi-server-9999.ebuild      |   35 ++++++++-----------
 1 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index 3535345..1638c23 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -13,7 +13,7 @@ EGIT_REPO_URI="git://anongit.kde.org/akonadi"
 LICENSE="LGPL-2.1"
 KEYWORDS=""
 SLOT="0"
-IUSE="mysql postgres +sqlite +server"
+IUSE="mysql postgres +sqlite"
 
 CDEPEND="
 	dev-libs/boost
@@ -28,27 +28,22 @@ DEPEND="${CDEPEND}
 	>=dev-util/automoc-0.9.88
 "
 RDEPEND="${CDEPEND}
-	server? (
-		postgres? ( dev-db/postgresql-server )
-	)
+	postgres? ( dev-db/postgresql-server )
 "
 
-REQUIRED_USE="^^ ( sqlite mysql postgres )"
+REQUIRED_USE="|| ( sqlite mysql postgres )"
 
 pkg_setup() {
 	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
-	local available
 	if use sqlite; then
-		driver="QSQLITE3"
-		available+=" ${driver}"
-	fi
-	if use mysql; then
-		driver="QMYSQL"
-		available+=" ${driver}"
-	fi
-	if use postgres; then
-		driver="QPSQL"
-		available+=" ${driver}"
+		DRIVER="QSQLITE3"
+		AVAILABLE+=" ${driver}"
+	elif use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${driver}"
+	elif use postgres; then
+		DRIVER="QPSQL"
+		AVAILABLE+=" ${driver}"
 	fi
 
 	# Notify about driver name change
@@ -65,7 +60,7 @@ pkg_setup() {
 		ewarn "If you intend to use it, please enable mysql USE flag and reinstall"
 		ewarn "${CATEGORY}/${PN}."
 		ewarn "Otherwise select different driver in your ~/.config/akonadi/akonadiserverrc."
-		ewarn "Available drivers are:${available}"
+		ewarn "Available drivers are:${AVAILABLE}"
 	fi
 }
 
@@ -73,7 +68,7 @@ src_install() {
 	# Who knows, maybe it accidentally fixes our permission issues
 	cat <<-EOF > "${T}"/akonadiserverrc
 [%General]
-Driver=${driver}
+Driver=${DRIVER}
 EOF
 	insinto /usr/share/config/akonadi
 	doins "${T}"/akonadiserverrc || die "doins failed"
@@ -83,7 +78,7 @@ EOF
 
 pkg_postinst() {
 	echo
-	elog "${driver} has been set as your default akonadi storage backend."
+	elog "${DRIVER} has been set as your default akonadi storage backend."
 	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are: QMYSQL, QPSQL, QSQLITE3"
+	elog "Available drivers are: ${AVAILABLE}"
 }



^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2011-04-05 23:43 Tomas Chvatal
  0 siblings, 0 replies; 48+ messages in thread
From: Tomas Chvatal @ 2011-04-05 23:43 UTC (permalink / raw
  To: gentoo-commits

commit:     c29a36a5ad38a23fa6192e66141a4583c214c015
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 23:43:47 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 23:43:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c29a36a5

[app-office/akonadi-server] Add some configure opitons.

---
 .../akonadi-server/akonadi-server-9999.ebuild      |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index 1638c23..c76d6e8 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -13,7 +13,7 @@ EGIT_REPO_URI="git://anongit.kde.org/akonadi"
 LICENSE="LGPL-2.1"
 KEYWORDS=""
 SLOT="0"
-IUSE="mysql postgres +sqlite"
+IUSE="mysql postgres +sqlite test"
 
 CDEPEND="
 	dev-libs/boost
@@ -64,6 +64,16 @@ pkg_setup() {
 	fi
 }
 
+src_configure() {
+	local mycmakeargs=(
+		"-DAKONADI_USE_STRIGI_SEARCH=OFF"
+		$(cmake-utils_use test AKONADI_BUILD_TESTS)
+		$(cmake-utils_use sqlite INSTALL_QSQLITE_IN_QT_PREFIX)
+	)
+
+	cmake-utils_src_configure
+}
+
 src_install() {
 	# Who knows, maybe it accidentally fixes our permission issues
 	cat <<-EOF > "${T}"/akonadiserverrc



^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2011-05-24  5:57 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 48+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-05-24  5:57 UTC (permalink / raw
  To: gentoo-commits

commit:     7b2eea08911f83e15dc4ce44563166f803c4c2ba
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 05:01:09 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue May 24 05:01:09 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7b2eea08

[app-office/akonadi-server] 1.5.80 version bump. KDE-4.6.80 dep.

(Portage version: 2.2.0_alpha34/git/Linux x86_64, signed Manifest commit with key BB0E6E98)

---
 .../akonadi-server/akonadi-server-1.5.80.ebuild    |   96 ++++++++++++++++++++
 1 files changed, 96 insertions(+), 0 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.5.80.ebuild b/app-office/akonadi-server/akonadi-server-1.5.80.ebuild
new file mode 100644
index 0000000..20a5de1
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.5.80.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2011 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.5.3.ebuild,v 1.1 2011/05/07 10:19:30 scarabeus Exp $
+
+EAPI=4
+
+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="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="mysql postgres +sqlite test"
+
+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?]
+	>=x11-libs/qt-test-4.5.0:4
+	x11-misc/shared-mime-info
+"
+DEPEND="${CDEPEND}
+	dev-libs/libxslt
+	>=dev-util/automoc-0.9.88
+"
+RDEPEND="${CDEPEND}
+	postgres? ( dev-db/postgresql-server )
+"
+
+REQUIRED_USE="|| ( sqlite mysql postgres )"
+
+S=${WORKDIR}/${P/-server/}
+
+pkg_setup() {
+	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
+	if use sqlite; then
+		DRIVER="QSQLITE3"
+		AVAILABLE+=" ${driver}"
+	elif use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${driver}"
+	elif use postgres; then
+		DRIVER="QPSQL"
+		AVAILABLE+=" ${driver}"
+	fi
+
+	# Notify about driver name change
+	if use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
+		ewarn
+		ewarn "SQLite driver name changed from QSQLITE to QSQLITE3."
+		ewarn "Please edit your ~/.config/akonadi/akonadiserverrc."
+	fi
+
+	# Notify about MySQL not being default anymore
+	if ! use mysql && has_version "<=${CATEGORY}/${PN}-1.4.0[mysql]"; then
+		ewarn
+		ewarn "MySQL driver is not enabled by default in Gentoo anymore."
+		ewarn "If you intend to use it, please enable mysql USE flag and reinstall"
+		ewarn "${CATEGORY}/${PN}."
+		ewarn "Otherwise select different driver in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Available drivers are:${AVAILABLE}"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DAKONADI_USE_STRIGI_SEARCH=OFF"
+		$(cmake-utils_use test AKONADI_BUILD_TESTS)
+		$(cmake-utils_use sqlite INSTALL_QSQLITE_IN_QT_PREFIX)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc || die "doins failed"
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	echo
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are: ${AVAILABLE}"
+}



^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2011-06-29  9:06 Alexey Shvetsov
  0 siblings, 0 replies; 48+ messages in thread
From: Alexey Shvetsov @ 2011-06-29  9:06 UTC (permalink / raw
  To: gentoo-commits

commit:     c1ab7b9ec84815530f6d410b8eb1855c1b4df150
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 09:06:16 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 09:06:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c1ab7b9e

[app-office/akonadi-server] Set right soprano version

(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 .../akonadi-server/akonadi-server-1.5.80.ebuild    |    2 +-
 .../akonadi-server/akonadi-server-9999.ebuild      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.5.80.ebuild b/app-office/akonadi-server/akonadi-server-1.5.80.ebuild
index 1a7b4c8..9aa3854 100644
--- a/app-office/akonadi-server/akonadi-server-1.5.80.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.5.80.ebuild
@@ -17,7 +17,7 @@ IUSE="mysql postgres +sqlite test"
 
 CDEPEND="
 	dev-libs/boost
-	>=dev-libs/soprano-2.2
+	>=dev-libs/soprano-2.6.51
 	>=x11-libs/qt-gui-4.5.0:4[dbus]
 	>=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?]
 	>=x11-libs/qt-test-4.5.0:4

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index f907d9a..bffc15b 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -17,7 +17,7 @@ IUSE="mysql postgres +sqlite test"
 
 CDEPEND="
 	dev-libs/boost
-	>=dev-libs/soprano-2.2
+	>=dev-libs/soprano-2.6.51
 	>=x11-libs/qt-gui-4.5.0:4[dbus]
 	>=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?]
 	>=x11-libs/qt-test-4.5.0:4



^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2011-07-11 21:38 Alexey Shvetsov
  0 siblings, 0 replies; 48+ messages in thread
From: Alexey Shvetsov @ 2011-07-11 21:38 UTC (permalink / raw
  To: gentoo-commits

commit:     e93455cc6ee3e01add98ac011cc3ea8de58dd17f
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 11 21:37:38 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Mon Jul 11 21:37:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e93455cc

[app-office/akonadi-server] New server released

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 ...r-1.5.80.ebuild => akonadi-server-1.6.0.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.5.80.ebuild b/app-office/akonadi-server/akonadi-server-1.6.0.ebuild
similarity index 100%
rename from app-office/akonadi-server/akonadi-server-1.5.80.ebuild
rename to app-office/akonadi-server/akonadi-server-1.6.0.ebuild



^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2011-07-18 11:49 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 48+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-07-18 11:49 UTC (permalink / raw
  To: gentoo-commits

commit:     865b50d1400b4f80b597fa135cd3cf7c3b53a40c
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 11:49:40 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 11:49:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=865b50d1

[app-office/akonadi-server-1.6.0] Fix SRC_URI as the tarballs are now on
the kde mirrors. Drop unused server use flag.

(Portage version: 2.2.0_alpha45/git/Linux x86_64, unsigned Manifest commit)

---
 .../akonadi-server/akonadi-server-1.6.0.ebuild     |    2 +-
 app-office/akonadi-server/metadata.xml             |    3 ---
 2 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.6.0.ebuild b/app-office/akonadi-server/akonadi-server-1.6.0.ebuild
index 9aa3854..600dfc1 100644
--- a/app-office/akonadi-server/akonadi-server-1.6.0.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.6.0.ebuild
@@ -8,7 +8,7 @@ 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"
+SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"

diff --git a/app-office/akonadi-server/metadata.xml b/app-office/akonadi-server/metadata.xml
index f580a20..8d1e86a 100644
--- a/app-office/akonadi-server/metadata.xml
+++ b/app-office/akonadi-server/metadata.xml
@@ -2,7 +2,4 @@
 <!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>



^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2011-10-23  2:07 Jonathan Callen
  0 siblings, 0 replies; 48+ messages in thread
From: Jonathan Callen @ 2011-10-23  2:07 UTC (permalink / raw
  To: gentoo-commits

commit:     4ab42bbbb42f4e1075397322e94a058655584a44
Author:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 22 22:04:40 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Sat Oct 22 22:04:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4ab42bbb

[app-office/akonadi-server] Upstream now has a proper method to disable sqlite

---
 .../akonadi-server/akonadi-server-9999.ebuild      |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index bffc15b..92291b8 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -66,9 +66,9 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		"-DAKONADI_USE_STRIGI_SEARCH=OFF"
+		-DAKONADI_USE_STRIGI_SEARCH=OFF
 		$(cmake-utils_use test AKONADI_BUILD_TESTS)
-		$(cmake-utils_use sqlite INSTALL_QSQLITE_IN_QT_PREFIX)
+		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
 	)
 
 	cmake-utils_src_configure



^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2011-12-21  0:00 Johannes Huber
  0 siblings, 0 replies; 48+ messages in thread
From: Johannes Huber @ 2011-12-21  0:00 UTC (permalink / raw
  To: gentoo-commits

commit:     a670f9dda42f718daad1538d6b5975d8dc59edf7
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 21 00:02:10 2011 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 00:02:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a670f9dd

[app-office/akonadi-server] Fix driver array fill, bug 395165

(Portage version: 2.2.0_alpha81/git/Linux i686, unsigned Manifest commit)

---
 .../akonadi-server/akonadi-server-9999.ebuild      |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index 92291b8..1be8867 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -35,15 +35,20 @@ REQUIRED_USE="|| ( sqlite mysql postgres )"
 
 pkg_setup() {
 	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
+	# reverse driver check to keep the order
+	if use postgres; then
+		DRIVER="QPSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
 	if use sqlite; then
 		DRIVER="QSQLITE3"
-		AVAILABLE+=" ${driver}"
-	elif use mysql; then
-		DRIVER="QMYSQL"
-		AVAILABLE+=" ${driver}"
-	elif use postgres; then
-		DRIVER="QPSQL"
-		AVAILABLE+=" ${driver}"
+		AVAILABLE+=" ${DRIVER}"
 	fi
 
 	# Notify about driver name change



^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2012-01-18 12:25 Johannes Huber
  0 siblings, 0 replies; 48+ messages in thread
From: Johannes Huber @ 2012-01-18 12:25 UTC (permalink / raw
  To: gentoo-commits

commit:     e8753dd439f8ecfc7140a01d94765d9d60efab89
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 18 12:24:12 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 12:24:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e8753dd4

[app-office/akonadi-server] Version bump 1.6.90 (aka 1.7 rc1)

(Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commit)

---
 .../akonadi-server/akonadi-server-1.6.90.ebuild    |  101 ++++++++++++++++++++
 1 files changed, 101 insertions(+), 0 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.6.90.ebuild b/app-office/akonadi-server/akonadi-server-1.6.90.ebuild
new file mode 100644
index 0000000..e66a08a
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.6.90.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="http://pim.kde.org/akonadi"
+SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="mysql postgres +sqlite test"
+
+CDEPEND="
+	dev-libs/boost
+	>=dev-libs/soprano-2.6.51
+	>=x11-libs/qt-gui-4.5.0:4[dbus]
+	>=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?]
+	>=x11-libs/qt-test-4.5.0:4
+	x11-misc/shared-mime-info
+"
+DEPEND="${CDEPEND}
+	dev-libs/libxslt
+	>=dev-util/automoc-0.9.88
+"
+RDEPEND="${CDEPEND}
+	postgres? ( dev-db/postgresql-server )
+"
+
+REQUIRED_USE="|| ( sqlite mysql postgres )"
+
+S=${WORKDIR}/${P/-server/}
+
+pkg_setup() {
+	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
+	# reverse driver check to keep the order
+	if use postgres; then
+		DRIVER="QPSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use sqlite; then
+		DRIVER="QSQLITE3"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	# Notify about driver name change
+	if use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
+		ewarn
+		ewarn "SQLite driver name changed from QSQLITE to QSQLITE3."
+		ewarn "Please edit your ~/.config/akonadi/akonadiserverrc."
+	fi
+
+	# Notify about MySQL not being default anymore
+	if ! use mysql && has_version "<=${CATEGORY}/${PN}-1.4.0[mysql]"; then
+		ewarn
+		ewarn "MySQL driver is not enabled by default in Gentoo anymore."
+		ewarn "If you intend to use it, please enable mysql USE flag and reinstall"
+		ewarn "${CATEGORY}/${PN}."
+		ewarn "Otherwise select different driver in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Available drivers are:${AVAILABLE}"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAKONADI_USE_STRIGI_SEARCH=OFF
+		$(cmake-utils_use test AKONADI_BUILD_TESTS)
+		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	echo
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are: ${AVAILABLE}"
+}



^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2012-01-24 22:57 Andreas Hüttel
  0 siblings, 0 replies; 48+ messages in thread
From: Andreas Hüttel @ 2012-01-24 22:57 UTC (permalink / raw
  To: gentoo-commits

commit:     63bd5cee48d8df35238486261d266867d087c919
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Tue Jan 24 22:59:04 2012 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 22:59:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=63bd5cee

[app-office/akonadi-server] Bump

(Portage version: 2.1.10.44/git/Linux x86_64, unsigned Manifest commit)

---
 .../akonadi-server/akonadi-server-1.7.0.ebuild     |  101 ++++++++++++++++++++
 1 files changed, 101 insertions(+), 0 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.7.0.ebuild b/app-office/akonadi-server/akonadi-server-1.7.0.ebuild
new file mode 100644
index 0000000..e66a08a
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.7.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="http://pim.kde.org/akonadi"
+SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="mysql postgres +sqlite test"
+
+CDEPEND="
+	dev-libs/boost
+	>=dev-libs/soprano-2.6.51
+	>=x11-libs/qt-gui-4.5.0:4[dbus]
+	>=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?]
+	>=x11-libs/qt-test-4.5.0:4
+	x11-misc/shared-mime-info
+"
+DEPEND="${CDEPEND}
+	dev-libs/libxslt
+	>=dev-util/automoc-0.9.88
+"
+RDEPEND="${CDEPEND}
+	postgres? ( dev-db/postgresql-server )
+"
+
+REQUIRED_USE="|| ( sqlite mysql postgres )"
+
+S=${WORKDIR}/${P/-server/}
+
+pkg_setup() {
+	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
+	# reverse driver check to keep the order
+	if use postgres; then
+		DRIVER="QPSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use sqlite; then
+		DRIVER="QSQLITE3"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	# Notify about driver name change
+	if use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
+		ewarn
+		ewarn "SQLite driver name changed from QSQLITE to QSQLITE3."
+		ewarn "Please edit your ~/.config/akonadi/akonadiserverrc."
+	fi
+
+	# Notify about MySQL not being default anymore
+	if ! use mysql && has_version "<=${CATEGORY}/${PN}-1.4.0[mysql]"; then
+		ewarn
+		ewarn "MySQL driver is not enabled by default in Gentoo anymore."
+		ewarn "If you intend to use it, please enable mysql USE flag and reinstall"
+		ewarn "${CATEGORY}/${PN}."
+		ewarn "Otherwise select different driver in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Available drivers are:${AVAILABLE}"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAKONADI_USE_STRIGI_SEARCH=OFF
+		$(cmake-utils_use test AKONADI_BUILD_TESTS)
+		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	echo
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are: ${AVAILABLE}"
+}



^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2012-01-25 19:15 Johannes Huber
  0 siblings, 0 replies; 48+ messages in thread
From: Johannes Huber @ 2012-01-25 19:15 UTC (permalink / raw
  To: gentoo-commits

commit:     3134371318158d19ac542597e882416b2fe77217
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 25 19:18:54 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jan 25 19:18:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=31343713

[app-office/akonadi-server] Moved to tree.

(Portage version: 2.2.0_alpha84/git/Linux i686, unsigned Manifest commit)

---
 .../akonadi-server/akonadi-server-1.6.90.ebuild    |  101 --------------------
 .../akonadi-server/akonadi-server-1.7.0.ebuild     |  101 --------------------
 2 files changed, 0 insertions(+), 202 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.6.90.ebuild b/app-office/akonadi-server/akonadi-server-1.6.90.ebuild
deleted file mode 100644
index e66a08a..0000000
--- a/app-office/akonadi-server/akonadi-server-1.6.90.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit cmake-utils
-
-DESCRIPTION="The server part of Akonadi"
-HOMEPAGE="http://pim.kde.org/akonadi"
-SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="mysql postgres +sqlite test"
-
-CDEPEND="
-	dev-libs/boost
-	>=dev-libs/soprano-2.6.51
-	>=x11-libs/qt-gui-4.5.0:4[dbus]
-	>=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?]
-	>=x11-libs/qt-test-4.5.0:4
-	x11-misc/shared-mime-info
-"
-DEPEND="${CDEPEND}
-	dev-libs/libxslt
-	>=dev-util/automoc-0.9.88
-"
-RDEPEND="${CDEPEND}
-	postgres? ( dev-db/postgresql-server )
-"
-
-REQUIRED_USE="|| ( sqlite mysql postgres )"
-
-S=${WORKDIR}/${P/-server/}
-
-pkg_setup() {
-	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
-	# reverse driver check to keep the order
-	if use postgres; then
-		DRIVER="QPSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use mysql; then
-		DRIVER="QMYSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use sqlite; then
-		DRIVER="QSQLITE3"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	# Notify about driver name change
-	if use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
-		ewarn
-		ewarn "SQLite driver name changed from QSQLITE to QSQLITE3."
-		ewarn "Please edit your ~/.config/akonadi/akonadiserverrc."
-	fi
-
-	# Notify about MySQL not being default anymore
-	if ! use mysql && has_version "<=${CATEGORY}/${PN}-1.4.0[mysql]"; then
-		ewarn
-		ewarn "MySQL driver is not enabled by default in Gentoo anymore."
-		ewarn "If you intend to use it, please enable mysql USE flag and reinstall"
-		ewarn "${CATEGORY}/${PN}."
-		ewarn "Otherwise select different driver in your ~/.config/akonadi/akonadiserverrc."
-		ewarn "Available drivers are:${AVAILABLE}"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAKONADI_USE_STRIGI_SEARCH=OFF
-		$(cmake-utils_use test AKONADI_BUILD_TESTS)
-		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	# Who knows, maybe it accidentally fixes our permission issues
-	cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-	insinto /usr/share/config/akonadi
-	doins "${T}"/akonadiserverrc
-
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	echo
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are: ${AVAILABLE}"
-}

diff --git a/app-office/akonadi-server/akonadi-server-1.7.0.ebuild b/app-office/akonadi-server/akonadi-server-1.7.0.ebuild
deleted file mode 100644
index e66a08a..0000000
--- a/app-office/akonadi-server/akonadi-server-1.7.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit cmake-utils
-
-DESCRIPTION="The server part of Akonadi"
-HOMEPAGE="http://pim.kde.org/akonadi"
-SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="mysql postgres +sqlite test"
-
-CDEPEND="
-	dev-libs/boost
-	>=dev-libs/soprano-2.6.51
-	>=x11-libs/qt-gui-4.5.0:4[dbus]
-	>=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?]
-	>=x11-libs/qt-test-4.5.0:4
-	x11-misc/shared-mime-info
-"
-DEPEND="${CDEPEND}
-	dev-libs/libxslt
-	>=dev-util/automoc-0.9.88
-"
-RDEPEND="${CDEPEND}
-	postgres? ( dev-db/postgresql-server )
-"
-
-REQUIRED_USE="|| ( sqlite mysql postgres )"
-
-S=${WORKDIR}/${P/-server/}
-
-pkg_setup() {
-	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
-	# reverse driver check to keep the order
-	if use postgres; then
-		DRIVER="QPSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use mysql; then
-		DRIVER="QMYSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use sqlite; then
-		DRIVER="QSQLITE3"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	# Notify about driver name change
-	if use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
-		ewarn
-		ewarn "SQLite driver name changed from QSQLITE to QSQLITE3."
-		ewarn "Please edit your ~/.config/akonadi/akonadiserverrc."
-	fi
-
-	# Notify about MySQL not being default anymore
-	if ! use mysql && has_version "<=${CATEGORY}/${PN}-1.4.0[mysql]"; then
-		ewarn
-		ewarn "MySQL driver is not enabled by default in Gentoo anymore."
-		ewarn "If you intend to use it, please enable mysql USE flag and reinstall"
-		ewarn "${CATEGORY}/${PN}."
-		ewarn "Otherwise select different driver in your ~/.config/akonadi/akonadiserverrc."
-		ewarn "Available drivers are:${AVAILABLE}"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAKONADI_USE_STRIGI_SEARCH=OFF
-		$(cmake-utils_use test AKONADI_BUILD_TESTS)
-		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	# Who knows, maybe it accidentally fixes our permission issues
-	cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-	insinto /usr/share/config/akonadi
-	doins "${T}"/akonadiserverrc
-
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	echo
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are: ${AVAILABLE}"
-}



^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2012-06-28 13:14 Andreas Hüttel
  0 siblings, 0 replies; 48+ messages in thread
From: Andreas Hüttel @ 2012-06-28 13:14 UTC (permalink / raw
  To: gentoo-commits

commit:     392b33bf7f35d9e5f419c2343a49e961832d44fd
Author:     Andreas K. Huettel <mail <AT> akhuettel <DOT> de>
AuthorDate: Thu Jun 28 13:13:11 2012 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Jun 28 13:13:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=392b33bf

[app-office/akonadi-server] Bump

(Portage version: 2.2.0_alpha114/git/Linux x86_64, unsigned Manifest commit)

---
 .../akonadi-server/akonadi-server-1.7.90.ebuild    |  104 ++++++++++++++++++++
 1 files changed, 104 insertions(+), 0 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.7.90.ebuild b/app-office/akonadi-server/akonadi-server-1.7.90.ebuild
new file mode 100644
index 0000000..23b1598
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.7.90.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2012 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.7.2.ebuild,v 1.5 2012/06/07 21:22:12 ranger Exp $
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="http://pim.kde.org/akonadi"
+SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="mysql postgres +sqlite test"
+
+CDEPEND="
+	dev-libs/boost
+	>=dev-libs/soprano-2.6.51
+	>=x11-libs/qt-gui-4.5.0:4[dbus]
+	>=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?]
+	>=x11-libs/qt-test-4.5.0:4
+	x11-misc/shared-mime-info
+"
+DEPEND="${CDEPEND}
+	dev-libs/libxslt
+	>=dev-util/automoc-0.9.88
+"
+RDEPEND="${CDEPEND}
+	postgres? ( dev-db/postgresql-server )
+"
+
+REQUIRED_USE="|| ( sqlite mysql postgres )"
+
+S=${WORKDIR}/${P/-server/}
+
+RESTRICT=test
+# bug 401139
+
+pkg_setup() {
+	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
+	# reverse driver check to keep the order
+	if use postgres; then
+		DRIVER="QPSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use sqlite; then
+		DRIVER="QSQLITE3"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	# Notify about driver name change
+	if use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
+		ewarn
+		ewarn "SQLite driver name changed from QSQLITE to QSQLITE3."
+		ewarn "Please edit your ~/.config/akonadi/akonadiserverrc."
+	fi
+
+	# Notify about MySQL not being default anymore
+	if ! use mysql && has_version "<=${CATEGORY}/${PN}-1.4.0[mysql]"; then
+		ewarn
+		ewarn "MySQL driver is not enabled by default in Gentoo anymore."
+		ewarn "If you intend to use it, please enable mysql USE flag and reinstall"
+		ewarn "${CATEGORY}/${PN}."
+		ewarn "Otherwise select different driver in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Available drivers are:${AVAILABLE}"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAKONADI_USE_STRIGI_SEARCH=OFF
+		$(cmake-utils_use test AKONADI_BUILD_TESTS)
+		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	echo
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are: ${AVAILABLE}"
+}



^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2012-07-25 21:15 Johannes Huber
  0 siblings, 0 replies; 48+ messages in thread
From: Johannes Huber @ 2012-07-25 21:15 UTC (permalink / raw
  To: gentoo-commits

commit:     05e382fdec3d5fe132c9080968e01b4a35f90f37
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 25 21:01:40 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jul 25 21:01:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=05e382fd

[app-office/akonadi-server] Removed old, newer version in tree.

(Portage version: 2.2.0_alpha120/git/Linux x86_64, unsigned Manifest commit)

---
 .../akonadi-server/akonadi-server-1.7.90.ebuild    |  104 --------------------
 1 files changed, 0 insertions(+), 104 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.7.90.ebuild b/app-office/akonadi-server/akonadi-server-1.7.90.ebuild
deleted file mode 100644
index 23b1598..0000000
--- a/app-office/akonadi-server/akonadi-server-1.7.90.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2012 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.7.2.ebuild,v 1.5 2012/06/07 21:22:12 ranger Exp $
-
-EAPI=4
-
-inherit cmake-utils
-
-DESCRIPTION="The server part of Akonadi"
-HOMEPAGE="http://pim.kde.org/akonadi"
-SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="mysql postgres +sqlite test"
-
-CDEPEND="
-	dev-libs/boost
-	>=dev-libs/soprano-2.6.51
-	>=x11-libs/qt-gui-4.5.0:4[dbus]
-	>=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?]
-	>=x11-libs/qt-test-4.5.0:4
-	x11-misc/shared-mime-info
-"
-DEPEND="${CDEPEND}
-	dev-libs/libxslt
-	>=dev-util/automoc-0.9.88
-"
-RDEPEND="${CDEPEND}
-	postgres? ( dev-db/postgresql-server )
-"
-
-REQUIRED_USE="|| ( sqlite mysql postgres )"
-
-S=${WORKDIR}/${P/-server/}
-
-RESTRICT=test
-# bug 401139
-
-pkg_setup() {
-	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
-	# reverse driver check to keep the order
-	if use postgres; then
-		DRIVER="QPSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use mysql; then
-		DRIVER="QMYSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use sqlite; then
-		DRIVER="QSQLITE3"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	# Notify about driver name change
-	if use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
-		ewarn
-		ewarn "SQLite driver name changed from QSQLITE to QSQLITE3."
-		ewarn "Please edit your ~/.config/akonadi/akonadiserverrc."
-	fi
-
-	# Notify about MySQL not being default anymore
-	if ! use mysql && has_version "<=${CATEGORY}/${PN}-1.4.0[mysql]"; then
-		ewarn
-		ewarn "MySQL driver is not enabled by default in Gentoo anymore."
-		ewarn "If you intend to use it, please enable mysql USE flag and reinstall"
-		ewarn "${CATEGORY}/${PN}."
-		ewarn "Otherwise select different driver in your ~/.config/akonadi/akonadiserverrc."
-		ewarn "Available drivers are:${AVAILABLE}"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAKONADI_USE_STRIGI_SEARCH=OFF
-		$(cmake-utils_use test AKONADI_BUILD_TESTS)
-		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	# Who knows, maybe it accidentally fixes our permission issues
-	cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-	insinto /usr/share/config/akonadi
-	doins "${T}"/akonadiserverrc
-
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	echo
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are: ${AVAILABLE}"
-}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2012-11-16 19:05 Alexey Shvetsov
  0 siblings, 0 replies; 48+ messages in thread
From: Alexey Shvetsov @ 2012-11-16 19:05 UTC (permalink / raw
  To: gentoo-commits

commit:     d01926b268d78ec7b484eedda7ac9496d25c5755
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 16 19:04:29 2012 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Fri Nov 16 19:04:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d01926b2

[app-office/akonadi-server] Add new akonadi

Package-Manager: portage-2.2.0_alpha142

---
 .../akonadi-server/akonadi-server-1.8.80.ebuild    |   99 ++++++++++++++++++++
 1 files changed, 99 insertions(+), 0 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.8.80.ebuild b/app-office/akonadi-server/akonadi-server-1.8.80.ebuild
new file mode 100644
index 0000000..92decbe
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.8.80.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit cmake-utils git-2
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="http://pim.kde.org/akonadi"
+EGIT_REPO_URI="git://anongit.kde.org/akonadi"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="mysql postgres +sqlite test"
+
+CDEPEND="
+	dev-libs/boost
+	>=dev-libs/soprano-2.6.51
+	>=x11-libs/qt-gui-4.5.0:4[dbus]
+	>=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?]
+	>=x11-libs/qt-test-4.5.0:4
+	x11-misc/shared-mime-info
+"
+DEPEND="${CDEPEND}
+	dev-libs/libxslt
+	>=dev-util/automoc-0.9.88
+"
+RDEPEND="${CDEPEND}
+	postgres? ( dev-db/postgresql-server )
+"
+
+REQUIRED_USE="|| ( sqlite mysql postgres )"
+
+pkg_setup() {
+	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
+	# reverse driver check to keep the order
+	if use postgres; then
+		DRIVER="QPSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use sqlite; then
+		DRIVER="QSQLITE3"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	# Notify about driver name change
+	if use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
+		ewarn
+		ewarn "SQLite driver name changed from QSQLITE to QSQLITE3."
+		ewarn "Please edit your ~/.config/akonadi/akonadiserverrc."
+	fi
+
+	# Notify about MySQL not being default anymore
+	if ! use mysql && has_version "<=${CATEGORY}/${PN}-1.4.0[mysql]"; then
+		ewarn
+		ewarn "MySQL driver is not enabled by default in Gentoo anymore."
+		ewarn "If you intend to use it, please enable mysql USE flag and reinstall"
+		ewarn "${CATEGORY}/${PN}."
+		ewarn "Otherwise select different driver in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Available drivers are:${AVAILABLE}"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAKONADI_USE_STRIGI_SEARCH=OFF
+		$(cmake-utils_use test AKONADI_BUILD_TESTS)
+		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	echo
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are: ${AVAILABLE}"
+}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2012-11-25 16:35 Andreas Hüttel
  0 siblings, 0 replies; 48+ messages in thread
From: Andreas Hüttel @ 2012-11-25 16:35 UTC (permalink / raw
  To: gentoo-commits

commit:     fe06dd5dfb75f82d710168166853aeebf698fa0b
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 25 16:36:22 2012 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 25 16:36:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=fe06dd5d

[app-office/akonadi-server] tests fail

Package-Manager: portage-2.2.0_alpha142

---
 .../akonadi-server/akonadi-server-1.8.80.ebuild    |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.8.80.ebuild b/app-office/akonadi-server/akonadi-server-1.8.80.ebuild
index 92decbe..f95621c 100644
--- a/app-office/akonadi-server/akonadi-server-1.8.80.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.8.80.ebuild
@@ -33,6 +33,8 @@ RDEPEND="${CDEPEND}
 
 REQUIRED_USE="|| ( sqlite mysql postgres )"
 
+RESTRICT=test
+
 pkg_setup() {
 	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
 	# reverse driver check to keep the order


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2013-01-04  7:45 Alexey Shvetsov
  0 siblings, 0 replies; 48+ messages in thread
From: Alexey Shvetsov @ 2013-01-04  7:45 UTC (permalink / raw
  To: gentoo-commits

commit:     ae6951bab35626d6b403650a3bffb98aa9de55cd
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  4 07:22:03 2013 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Fri Jan  4 07:22:03 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ae6951ba

[app-office/akonadi-server] Add new

Package-Manager: portage-2.2.0_alpha149

---
 ...r-1.8.80.ebuild => akonadi-server-1.9.0.ebuild} |   14 +++++++++++---
 .../akonadi-server/akonadi-server-9999.ebuild      |   16 +++++++++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.8.80.ebuild b/app-office/akonadi-server/akonadi-server-1.9.0.ebuild
similarity index 88%
rename from app-office/akonadi-server/akonadi-server-1.8.80.ebuild
rename to app-office/akonadi-server/akonadi-server-1.9.0.ebuild
index b59b67b..9623384 100644
--- a/app-office/akonadi-server/akonadi-server-1.8.80.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.9.0.ebuild
@@ -4,14 +4,22 @@
 
 EAPI=4
 
-inherit cmake-utils git-2
+if [[ $PV = *9999* ]]; then
+	scm_eclass=git-2
+	EGIT_REPO_URI="git://anongit.kde.org/akonadi"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+inherit cmake-utils ${scm_eclass}
 
 DESCRIPTION="The server part of Akonadi"
 HOMEPAGE="http://pim.kde.org/akonadi"
-EGIT_REPO_URI="git://anongit.kde.org/akonadi"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="mysql postgres +sqlite test"
 

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index 7990e8d..9623384 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -4,14 +4,22 @@
 
 EAPI=4
 
-inherit cmake-utils git-2
+if [[ $PV = *9999* ]]; then
+	scm_eclass=git-2
+	EGIT_REPO_URI="git://anongit.kde.org/akonadi"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+inherit cmake-utils ${scm_eclass}
 
 DESCRIPTION="The server part of Akonadi"
 HOMEPAGE="http://pim.kde.org/akonadi"
-EGIT_REPO_URI="git://anongit.kde.org/akonadi"
 
 LICENSE="LGPL-2.1"
-KEYWORDS=""
 SLOT="0"
 IUSE="mysql postgres +sqlite test"
 
@@ -33,6 +41,8 @@ RDEPEND="${CDEPEND}
 
 REQUIRED_USE="|| ( sqlite mysql postgres )"
 
+RESTRICT=test
+
 pkg_setup() {
 	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
 	# reverse driver check to keep the order


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2013-01-04  7:50 Alexey Shvetsov
  0 siblings, 0 replies; 48+ messages in thread
From: Alexey Shvetsov @ 2013-01-04  7:50 UTC (permalink / raw
  To: gentoo-commits

commit:     1ce90f04bea0ac0bbae58b30adf875b6f836f6ea
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  4 07:50:10 2013 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Fri Jan  4 07:50:10 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1ce90f04

[app-office/akonadi-server] Fix ${S}

Package-Manager: portage-2.2.0_alpha149

---
 .../akonadi-server/akonadi-server-1.9.0.ebuild     |    1 +
 .../akonadi-server/akonadi-server-9999.ebuild      |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.9.0.ebuild b/app-office/akonadi-server/akonadi-server-1.9.0.ebuild
index 9623384..1cfcc99 100644
--- a/app-office/akonadi-server/akonadi-server-1.9.0.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.9.0.ebuild
@@ -12,6 +12,7 @@ if [[ $PV = *9999* ]]; then
 else
 	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${P/-server/}"
 fi
 
 inherit cmake-utils ${scm_eclass}

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index 9623384..1cfcc99 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -12,6 +12,7 @@ if [[ $PV = *9999* ]]; then
 else
 	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${P/-server/}"
 fi
 
 inherit cmake-utils ${scm_eclass}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2013-02-06 15:59 Chris Reffett
  0 siblings, 0 replies; 48+ messages in thread
From: Chris Reffett @ 2013-02-06 15:59 UTC (permalink / raw
  To: gentoo-commits

commit:     ee3a203ee89730c3dd6d60ca2d562fff9c7969f2
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  6 15:58:03 2013 +0000
Commit:     Chris Reffett <geekboy72 <AT> gmail <DOT> com>
CommitDate: Wed Feb  6 15:58:29 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ee3a203e

[app-office/akonadi-server] Change default backend to mysql wrt bug 441596

Package-Manager: portage-2.2.0_alpha161

---
 .../akonadi-server/akonadi-server-1.9.0.ebuild     |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.9.0.ebuild b/app-office/akonadi-server/akonadi-server-1.9.0.ebuild
index aa7fea1..fca4cc0 100644
--- a/app-office/akonadi-server/akonadi-server-1.9.0.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.9.0.ebuild
@@ -47,20 +47,20 @@ RESTRICT=test
 PATCHES=( "${FILESDIR}/${P}-qt5.patch" )
 
 pkg_setup() {
-	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
+	# Set default storage backend in order: MySQL, SQLite PostgreSQL
 	# reverse driver check to keep the order
 	if use postgres; then
 		DRIVER="QPSQL"
 		AVAILABLE+=" ${DRIVER}"
 	fi
 
-	if use mysql; then
-		DRIVER="QMYSQL"
+	if use sqlite; then
+		DRIVER="QSQLITE3"
 		AVAILABLE+=" ${DRIVER}"
 	fi
 
-	if use sqlite; then
-		DRIVER="QSQLITE3"
+	if use mysql; then
+		DRIVER="QMYSQL"
 		AVAILABLE+=" ${DRIVER}"
 	fi
 
@@ -72,12 +72,12 @@ pkg_setup() {
 	fi
 
 	# Notify about MySQL not being default anymore
-	if ! use mysql && has_version "<=${CATEGORY}/${PN}-1.4.0[mysql]"; then
+	if ! use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
 		ewarn
-		ewarn "MySQL driver is not enabled by default in Gentoo anymore."
-		ewarn "If you intend to use it, please enable mysql USE flag and reinstall"
+		ewarn "The default storage drive has changed from SQLite to MySQL."
+		ewarn "If you want to stay with SQLite, enable the sqlite USE flag and reinstall"
 		ewarn "${CATEGORY}/${PN}."
-		ewarn "Otherwise select different driver in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Otherwise, select a different driver in your ~/.config/akonadi/akonadiserverrc."
 		ewarn "Available drivers are:${AVAILABLE}"
 	fi
 }


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2013-02-06 16:03 Chris Reffett
  0 siblings, 0 replies; 48+ messages in thread
From: Chris Reffett @ 2013-02-06 16:03 UTC (permalink / raw
  To: gentoo-commits

commit:     e2f235a82632ba3d5c57620c092da8c9ae9d819e
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  6 16:02:46 2013 +0000
Commit:     Chris Reffett <geekboy72 <AT> gmail <DOT> com>
CommitDate: Wed Feb  6 16:02:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e2f235a8

[app-office/akonadi-server] Also change default USE flags.

Package-Manager: portage-2.2.0_alpha161

---
 .../akonadi-server/akonadi-server-1.9.0.ebuild     |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.9.0.ebuild b/app-office/akonadi-server/akonadi-server-1.9.0.ebuild
index fca4cc0..91ea8c9 100644
--- a/app-office/akonadi-server/akonadi-server-1.9.0.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.9.0.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="http://pim.kde.org/akonadi"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="mysql postgres +sqlite test"
+IUSE="+mysql postgres sqlite test"
 
 CDEPEND="
 	dev-libs/boost


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2013-02-06 20:17 Andreas Hüttel
  0 siblings, 0 replies; 48+ messages in thread
From: Andreas Hüttel @ 2013-02-06 20:17 UTC (permalink / raw
  To: gentoo-commits

commit:     7490f737563f44fbb1d5593640fd6be2ae186d44
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Wed Feb  6 20:17:33 2013 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Feb  6 20:17:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7490f737

[app-office/akonadi-server] Update from tree

Package-Manager: portage-2.2.0_alpha161

---
 .../akonadi-server/akonadi-server-1.9.0.ebuild     |  113 --------------------
 .../akonadi-server/akonadi-server-9999.ebuild      |   20 ++--
 2 files changed, 10 insertions(+), 123 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.9.0.ebuild b/app-office/akonadi-server/akonadi-server-1.9.0.ebuild
deleted file mode 100644
index 91ea8c9..0000000
--- a/app-office/akonadi-server/akonadi-server-1.9.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-2
-	EGIT_REPO_URI="git://anongit.kde.org/akonadi"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${P/-server/}"
-fi
-
-inherit cmake-utils ${scm_eclass}
-
-DESCRIPTION="The server part of Akonadi"
-HOMEPAGE="http://pim.kde.org/akonadi"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+mysql postgres sqlite test"
-
-CDEPEND="
-	dev-libs/boost
-	>=dev-libs/soprano-2.6.51
-	>=x11-libs/qt-gui-4.5.0:4[dbus]
-	>=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?]
-	>=x11-libs/qt-test-4.5.0:4
-	x11-misc/shared-mime-info
-"
-DEPEND="${CDEPEND}
-	dev-libs/libxslt
-	>=dev-util/automoc-0.9.88
-"
-RDEPEND="${CDEPEND}
-	postgres? ( dev-db/postgresql-server )
-"
-
-REQUIRED_USE="|| ( sqlite mysql postgres )"
-
-RESTRICT=test
-
-PATCHES=( "${FILESDIR}/${P}-qt5.patch" )
-
-pkg_setup() {
-	# Set default storage backend in order: MySQL, SQLite PostgreSQL
-	# reverse driver check to keep the order
-	if use postgres; then
-		DRIVER="QPSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use sqlite; then
-		DRIVER="QSQLITE3"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use mysql; then
-		DRIVER="QMYSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	# Notify about driver name change
-	if use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
-		ewarn
-		ewarn "SQLite driver name changed from QSQLITE to QSQLITE3."
-		ewarn "Please edit your ~/.config/akonadi/akonadiserverrc."
-	fi
-
-	# Notify about MySQL not being default anymore
-	if ! use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
-		ewarn
-		ewarn "The default storage drive has changed from SQLite to MySQL."
-		ewarn "If you want to stay with SQLite, enable the sqlite USE flag and reinstall"
-		ewarn "${CATEGORY}/${PN}."
-		ewarn "Otherwise, select a different driver in your ~/.config/akonadi/akonadiserverrc."
-		ewarn "Available drivers are:${AVAILABLE}"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAKONADI_USE_STRIGI_SEARCH=OFF
-		-DWITH_QT5=OFF
-		$(cmake-utils_use test AKONADI_BUILD_TESTS)
-		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	# Who knows, maybe it accidentally fixes our permission issues
-	cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-	insinto /usr/share/config/akonadi
-	doins "${T}"/akonadiserverrc
-
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	echo
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are: ${AVAILABLE}"
-}

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index 1cfcc99..6686b89 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="http://pim.kde.org/akonadi"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="mysql postgres +sqlite test"
+IUSE="+mysql postgres sqlite test"
 
 CDEPEND="
 	dev-libs/boost
@@ -45,20 +45,20 @@ REQUIRED_USE="|| ( sqlite mysql postgres )"
 RESTRICT=test
 
 pkg_setup() {
-	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
+	# Set default storage backend in order: MySQL, SQLite PostgreSQL
 	# reverse driver check to keep the order
 	if use postgres; then
 		DRIVER="QPSQL"
 		AVAILABLE+=" ${DRIVER}"
 	fi
 
-	if use mysql; then
-		DRIVER="QMYSQL"
+	if use sqlite; then
+		DRIVER="QSQLITE3"
 		AVAILABLE+=" ${DRIVER}"
 	fi
 
-	if use sqlite; then
-		DRIVER="QSQLITE3"
+	if use mysql; then
+		DRIVER="QMYSQL"
 		AVAILABLE+=" ${DRIVER}"
 	fi
 
@@ -70,12 +70,12 @@ pkg_setup() {
 	fi
 
 	# Notify about MySQL not being default anymore
-	if ! use mysql && has_version "<=${CATEGORY}/${PN}-1.4.0[mysql]"; then
+	if ! use sqlite && has_version "<=${CATEGORY}/${PN}-1.9.0[sqlite]"; then
 		ewarn
-		ewarn "MySQL driver is not enabled by default in Gentoo anymore."
-		ewarn "If you intend to use it, please enable mysql USE flag and reinstall"
+		ewarn "The default storage drive has changed from SQLite to MySQL."
+		ewarn "If you want to stay with SQLite, enable the sqlite USE flag and reinstall"
 		ewarn "${CATEGORY}/${PN}."
-		ewarn "Otherwise select different driver in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Otherwise, select a different driver in your ~/.config/akonadi/akonadiserverrc."
 		ewarn "Available drivers are:${AVAILABLE}"
 	fi
 }


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2013-03-03 16:14 Michael Palimaka
  0 siblings, 0 replies; 48+ messages in thread
From: Michael Palimaka @ 2013-03-03 16:14 UTC (permalink / raw
  To: gentoo-commits

commit:     e1d69acc605ad1d06486ebd8c4628981d9d1f953
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  3 16:12:54 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 16:12:54 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e1d69acc

[app-office/akonadi-server] Migrate to EAPI 5. Add subslot dependency for boost.

Package-Manager: portage-2.1.11.53

---
 .../akonadi-server/akonadi-server-9999.ebuild      |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index 12d0372..1ad2369 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 if [[ $PV = *9999* ]]; then
 	scm_eclass=git-2
@@ -25,7 +25,7 @@ SLOT="0"
 IUSE="+mysql postgres sqlite test"
 
 CDEPEND="
-	dev-libs/boost
+	dev-libs/boost:=
 	>=dev-libs/soprano-2.6.51
 	>=dev-qt/qtgui-4.5.0:4[dbus]
 	>=dev-qt/qtsql-4.5.0:4[mysql?,postgres?]


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2013-03-11 16:21 Michael Palimaka
  0 siblings, 0 replies; 48+ messages in thread
From: Michael Palimaka @ 2013-03-11 16:21 UTC (permalink / raw
  To: gentoo-commits

commit:     35e8e60c7e469359540fb3c4a209844b66fd5d81
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 16:20:28 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 16:20:28 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=35e8e60c

[app-office/akonadi-server] Add framework for Qt5 support.

Note that this depends on soprano[qt5] which is still a work-in-progress upstream.

Package-Manager: portage-2.1.11.55

---
 .../akonadi-server/akonadi-server-9999.ebuild      |   34 ++++++++++++++-----
 app-office/akonadi-server/metadata.xml             |    5 ++-
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index 1ad2369..311aba1 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -22,15 +22,33 @@ HOMEPAGE="http://pim.kde.org/akonadi"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="+mysql postgres sqlite test"
+IUSE="+mysql postgres +qt4 qt5 sqlite test"
+
+REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
 
 CDEPEND="
 	dev-libs/boost:=
 	>=dev-libs/soprano-2.6.51
-	>=dev-qt/qtgui-4.5.0:4[dbus]
-	>=dev-qt/qtsql-4.5.0:4[mysql?,postgres?]
-	>=dev-qt/qttest-4.5.0:4
 	x11-misc/shared-mime-info
+	qt4? (
+		>=dev-qt/qtcore-4.5.0:4
+		>=dev-qt/qtdbus-4.5.0:4
+		>=dev-qt/qtgui-4.5.0:4[dbus]
+		>=dev-qt/qtsql-4.5.0:4[mysql?,postgres?]
+		>=dev-qt/qttest-4.5.0:4
+	)
+	qt5? (
+		>=dev-libs/soprano-2.6.51[-qt4,qt5]
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsql:5[mysql?,postgres?]
+		dev-qt/qttest:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	sqlite? ( dev-db/sqlite:3 )
 "
 DEPEND="${CDEPEND}
 	dev-libs/libxslt
@@ -40,9 +58,7 @@ RDEPEND="${CDEPEND}
 	postgres? ( dev-db/postgresql-server )
 "
 
-REQUIRED_USE="|| ( sqlite mysql postgres )"
-
-RESTRICT=test
+RESTRICT="test"
 
 pkg_setup() {
 	# Set default storage backend in order: MySQL, SQLite PostgreSQL
@@ -69,7 +85,7 @@ pkg_setup() {
 		ewarn "Please edit your ~/.config/akonadi/akonadiserverrc."
 	fi
 
-	# Notify about MySQL not being default anymore
+	# Notify about SQLite not being default anymore
 	if ! use sqlite && has_version "<=${CATEGORY}/${PN}-1.9.0[sqlite]"; then
 		ewarn
 		ewarn "The default storage drive has changed from SQLite to MySQL."
@@ -85,6 +101,7 @@ src_configure() {
 		-DAKONADI_USE_STRIGI_SEARCH=OFF
 		$(cmake-utils_use test AKONADI_BUILD_TESTS)
 		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
+		$(cmake-utils_use_find_package qt5 Qt5Core)
 	)
 
 	cmake-utils_src_configure
@@ -103,7 +120,6 @@ EOF
 }
 
 pkg_postinst() {
-	echo
 	elog "${DRIVER} has been set as your default akonadi storage backend."
 	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
 	elog "Available drivers are: ${AVAILABLE}"

diff --git a/app-office/akonadi-server/metadata.xml b/app-office/akonadi-server/metadata.xml
index 8d1e86a..f5a3d63 100644
--- a/app-office/akonadi-server/metadata.xml
+++ b/app-office/akonadi-server/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+	<herd>kde</herd>
+	<use>
+		<flag name="qt5">Adds support for the Qt GUI/Application Toolkit version 5.x</flag>
+	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2013-03-20 13:25 Michael Palimaka
  0 siblings, 0 replies; 48+ messages in thread
From: Michael Palimaka @ 2013-03-20 13:25 UTC (permalink / raw
  To: gentoo-commits

commit:     62afb608a0793ef12f6df94d55d2f47f6af9f73c
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 13:24:24 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 13:24:24 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=62afb608

[app-office/akonadi-server] Install QSQLITE3 plugin into same directory as other QtSQL plugins.

Package-Manager: portage-2.1.11.57

---
 .../akonadi-server/akonadi-server-9999.ebuild      |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index 311aba1..737c938 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -99,6 +99,7 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs=(
 		-DAKONADI_USE_STRIGI_SEARCH=OFF
+		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
 		$(cmake-utils_use test AKONADI_BUILD_TESTS)
 		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
 		$(cmake-utils_use_find_package qt5 Qt5Core)


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2013-05-08 18:39 Johannes Huber
  0 siblings, 0 replies; 48+ messages in thread
From: Johannes Huber @ 2013-05-08 18:39 UTC (permalink / raw
  To: gentoo-commits

commit:     5eadadd5adc4da14c17d99953fd49ce80b67610c
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed May  8 18:38:55 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed May  8 18:38:55 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5eadadd5

[app-office/akonadi-server] Sync with tree.

Package-Manager: portage-2.2.0_alpha174

---
 .../akonadi-server/akonadi-server-9999.ebuild      |   23 +++++++------------
 1 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index 4840149..d7b6ca1 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -11,7 +11,7 @@ if [[ $PV = *9999* ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${P/-server/}"
 fi
 
@@ -78,21 +78,16 @@ pkg_setup() {
 		AVAILABLE+=" ${DRIVER}"
 	fi
 
-	# Notify about driver name change
-	if use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
+	# Notify about MySQL is recommend by upstream
+	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
 		ewarn
-		ewarn "SQLite driver name changed from QSQLITE to QSQLITE3."
-		ewarn "Please edit your ~/.config/akonadi/akonadiserverrc."
-	fi
-
-	# Notify about SQLite not being default anymore
-	if ! use sqlite && has_version "<=${CATEGORY}/${PN}-1.9.0[sqlite]"; then
-		ewarn
-		ewarn "The default storage drive has changed from SQLite to MySQL."
-		ewarn "If you want to stay with SQLite, enable the sqlite USE flag and reinstall"
-		ewarn "${CATEGORY}/${PN}."
-		ewarn "Otherwise, select a different driver in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
+		ewarn "user configuration. This is the backend recommended by KDE upstream."
+		ewarn "In particular, kde-base/kmail-4.10 does not work properly with the sqlite"
+		ewarn "backend anymore."
+		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
 		ewarn "Available drivers are:${AVAILABLE}"
+		ewarn
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2013-06-01 15:58 Michael Palimaka
  0 siblings, 0 replies; 48+ messages in thread
From: Michael Palimaka @ 2013-06-01 15:58 UTC (permalink / raw
  To: gentoo-commits

commit:     e4432b37e0e5811a5b721278c33d267ac9cad3be
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  1 15:53:41 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jun  1 15:53:41 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e4432b37

[app-office/akonadi-server] Remove local qt5 USE flag since it is now global.

Package-Manager: portage-2.1.12.2

---
 app-office/akonadi-server/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app-office/akonadi-server/metadata.xml b/app-office/akonadi-server/metadata.xml
index f5a3d63..a23f444 100644
--- a/app-office/akonadi-server/metadata.xml
+++ b/app-office/akonadi-server/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
-	<use>
-		<flag name="qt5">Adds support for the Qt GUI/Application Toolkit version 5.x</flag>
-	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2013-06-03 15:32 Michael Palimaka
  0 siblings, 0 replies; 48+ messages in thread
From: Michael Palimaka @ 2013-06-03 15:32 UTC (permalink / raw
  To: gentoo-commits

commit:     ce790e700a35fb985b2e661ab91f1406249df097
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  3 15:30:14 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 15:30:14 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ce790e70

[app-office/akonadi-server] Launch dbus for tests and unrestrict them.

Package-Manager: portage-2.1.12.2

---
 app-office/akonadi-server/akonadi-server-9999.ebuild | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index d7b6ca1..a5e54e8 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -53,13 +53,12 @@ CDEPEND="
 DEPEND="${CDEPEND}
 	dev-libs/libxslt
 	>=dev-util/automoc-0.9.88
+	test? ( sys-apps/dbus )
 "
 RDEPEND="${CDEPEND}
 	postgres? ( dev-db/postgresql-server )
 "
 
-RESTRICT="test"
-
 pkg_setup() {
 	# Set default storage backend in order: MySQL, SQLite PostgreSQL
 	# reverse driver check to keep the order
@@ -103,6 +102,11 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_test() {
+	export $(dbus-launch)
+	cmake-utils_src_test
+}
+
 src_install() {
 	# Who knows, maybe it accidentally fixes our permission issues
 	cat <<-EOF > "${T}"/akonadiserverrc


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2013-06-12 21:18 Johannes Huber
  0 siblings, 0 replies; 48+ messages in thread
From: Johannes Huber @ 2013-06-12 21:18 UTC (permalink / raw
  To: gentoo-commits

commit:     9e7de09263cdaad8c56e8ff616e053e523ddf567
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 21:18:02 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 21:18:02 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9e7de092

[app-office/akonadi-server] Version bump.

Package-Manager: portage-2.2.0_alpha179

---
 .../akonadi-server/akonadi-server-1.9.80.ebuild    | 126 +++++++++++++++++++++
 1 file changed, 126 insertions(+)

diff --git a/app-office/akonadi-server/akonadi-server-1.9.80.ebuild b/app-office/akonadi-server/akonadi-server-1.9.80.ebuild
new file mode 100644
index 0000000..a5e54e8
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.9.80.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+if [[ $PV = *9999* ]]; then
+	scm_eclass=git-2
+	EGIT_REPO_URI="git://anongit.kde.org/akonadi"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${P/-server/}"
+fi
+
+inherit cmake-utils ${scm_eclass}
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="http://pim.kde.org/akonadi"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+mysql postgres +qt4 qt5 sqlite test"
+
+REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
+
+CDEPEND="
+	dev-libs/boost:=
+	>=dev-libs/soprano-2.6.51
+	x11-misc/shared-mime-info
+	qt4? (
+		>=dev-qt/qtcore-4.5.0:4
+		>=dev-qt/qtdbus-4.5.0:4
+		>=dev-qt/qtgui-4.5.0:4[dbus]
+		>=dev-qt/qtsql-4.5.0:4[mysql?,postgres?]
+		>=dev-qt/qttest-4.5.0:4
+	)
+	qt5? (
+		>=dev-libs/soprano-2.6.51[-qt4,qt5]
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsql:5[mysql?,postgres?]
+		dev-qt/qttest:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${CDEPEND}
+	dev-libs/libxslt
+	>=dev-util/automoc-0.9.88
+	test? ( sys-apps/dbus )
+"
+RDEPEND="${CDEPEND}
+	postgres? ( dev-db/postgresql-server )
+"
+
+pkg_setup() {
+	# Set default storage backend in order: MySQL, SQLite PostgreSQL
+	# reverse driver check to keep the order
+	if use postgres; then
+		DRIVER="QPSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use sqlite; then
+		DRIVER="QSQLITE3"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	# Notify about MySQL is recommend by upstream
+	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
+		ewarn
+		ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
+		ewarn "user configuration. This is the backend recommended by KDE upstream."
+		ewarn "In particular, kde-base/kmail-4.10 does not work properly with the sqlite"
+		ewarn "backend anymore."
+		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Available drivers are:${AVAILABLE}"
+		ewarn
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAKONADI_USE_STRIGI_SEARCH=OFF
+		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
+		$(cmake-utils_use test AKONADI_BUILD_TESTS)
+		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
+		$(cmake-utils_use qt5 QT5_BUILD)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	export $(dbus-launch)
+	cmake-utils_src_test
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are: ${AVAILABLE}"
+}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2013-07-10 19:59 Johannes Huber
  0 siblings, 0 replies; 48+ messages in thread
From: Johannes Huber @ 2013-07-10 19:59 UTC (permalink / raw
  To: gentoo-commits

commit:     c7096730a189743e61cc232cbbbee7a7123dcc71
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 10 20:00:02 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jul 10 20:00:02 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c7096730

[app-office/akonadi-server] Removed, newer version in tree.

Package-Manager: portage-2.2.0_alpha188

---
 .../akonadi-server/akonadi-server-1.9.80.ebuild    | 126 ---------------------
 1 file changed, 126 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.9.80.ebuild b/app-office/akonadi-server/akonadi-server-1.9.80.ebuild
deleted file mode 100644
index bcdc653..0000000
--- a/app-office/akonadi-server/akonadi-server-1.9.80.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-2
-	EGIT_REPO_URI="git://anongit.kde.org/akonadi"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${P/-server/}"
-fi
-
-inherit cmake-utils ${scm_eclass}
-
-DESCRIPTION="The server part of Akonadi"
-HOMEPAGE="http://pim.kde.org/akonadi"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+mysql postgres +qt4 qt5 sqlite test"
-
-REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
-
-CDEPEND="
-	dev-libs/boost:=
-	>=dev-libs/soprano-2.6.51
-	x11-misc/shared-mime-info
-	qt4? (
-		>=dev-qt/qtcore-4.5.0:4
-		>=dev-qt/qtdbus-4.5.0:4
-		>=dev-qt/qtgui-4.5.0:4[dbus(+)]
-		>=dev-qt/qtsql-4.5.0:4[mysql?,postgres?]
-		>=dev-qt/qttest-4.5.0:4
-	)
-	qt5? (
-		>=dev-libs/soprano-2.6.51[-qt4,qt5]
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsql:5[mysql?,postgres?]
-		dev-qt/qttest:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${CDEPEND}
-	dev-libs/libxslt
-	>=dev-util/automoc-0.9.88
-	test? ( sys-apps/dbus )
-"
-RDEPEND="${CDEPEND}
-	postgres? ( dev-db/postgresql-server )
-"
-
-pkg_setup() {
-	# Set default storage backend in order: MySQL, SQLite PostgreSQL
-	# reverse driver check to keep the order
-	if use postgres; then
-		DRIVER="QPSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use sqlite; then
-		DRIVER="QSQLITE3"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use mysql; then
-		DRIVER="QMYSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	# Notify about MySQL is recommend by upstream
-	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-		ewarn
-		ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
-		ewarn "user configuration. This is the backend recommended by KDE upstream."
-		ewarn "In particular, kde-base/kmail-4.10 does not work properly with the sqlite"
-		ewarn "backend anymore."
-		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
-		ewarn "Available drivers are:${AVAILABLE}"
-		ewarn
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAKONADI_USE_STRIGI_SEARCH=OFF
-		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
-		$(cmake-utils_use test AKONADI_BUILD_TESTS)
-		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
-		$(cmake-utils_use qt5 QT5_BUILD)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	export $(dbus-launch)
-	cmake-utils_src_test
-}
-
-src_install() {
-	# Who knows, maybe it accidentally fixes our permission issues
-	cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-	insinto /usr/share/config/akonadi
-	doins "${T}"/akonadiserverrc
-
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are: ${AVAILABLE}"
-}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2013-09-08 13:50 Michael Palimaka
  0 siblings, 0 replies; 48+ messages in thread
From: Michael Palimaka @ 2013-09-08 13:50 UTC (permalink / raw
  To: gentoo-commits

commit:     e3c9bbaeb78a3af32bd7658c6dfb1dee61c1cfc1
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  8 13:47:20 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Sep  8 13:47:20 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e3c9bbae

[app-office/akonadi-server] Remove useless USE dependency, wrt bug #484166.

Package-Manager: portage-2.2.1

---
 app-office/akonadi-server/akonadi-server-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index bcdc653..e94b0f8 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -33,7 +33,7 @@ CDEPEND="
 	qt4? (
 		>=dev-qt/qtcore-4.5.0:4
 		>=dev-qt/qtdbus-4.5.0:4
-		>=dev-qt/qtgui-4.5.0:4[dbus(+)]
+		>=dev-qt/qtgui-4.5.0:4
 		>=dev-qt/qtsql-4.5.0:4[mysql?,postgres?]
 		>=dev-qt/qttest-4.5.0:4
 	)


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2013-10-13 17:03 Johannes Huber
  0 siblings, 0 replies; 48+ messages in thread
From: Johannes Huber @ 2013-10-13 17:03 UTC (permalink / raw
  To: gentoo-commits

commit:     7f82310cbb85213a4716bf6f2de05a41e96d517c
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 18:50:17 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 18:50:17 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7f82310c

[app-office/akonadi-server] Move to git-r3 eclass.

Package-Manager: portage-2.2.7

---
 app-office/akonadi-server/akonadi-server-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index e94b0f8..97b72e6 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -5,8 +5,8 @@
 EAPI=5
 
 if [[ $PV = *9999* ]]; then
-	scm_eclass=git-2
-	EGIT_REPO_URI="git://anongit.kde.org/akonadi"
+	scm_eclass=git-r3
+	EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
 	SRC_URI=""
 	KEYWORDS=""
 else


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2013-10-14 22:00 Andreas Hüttel
  0 siblings, 0 replies; 48+ messages in thread
From: Andreas Hüttel @ 2013-10-14 22:00 UTC (permalink / raw
  To: gentoo-commits

commit:     7359bf207dd3e43057104f6cd8665eeb967f264f
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 14 21:52:24 2013 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Oct 14 22:00:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7359bf20

[app-office/akonadi-server] Needs qt-4.8.5 or the postgres backend breaks horribly

Package-Manager: portage-2.2.7

---
 app-office/akonadi-server/akonadi-server-9999.ebuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index 97b72e6..ab4ad89 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -31,11 +31,11 @@ CDEPEND="
 	>=dev-libs/soprano-2.6.51
 	x11-misc/shared-mime-info
 	qt4? (
-		>=dev-qt/qtcore-4.5.0:4
-		>=dev-qt/qtdbus-4.5.0:4
-		>=dev-qt/qtgui-4.5.0:4
-		>=dev-qt/qtsql-4.5.0:4[mysql?,postgres?]
-		>=dev-qt/qttest-4.5.0:4
+		>=dev-qt/qtcore-4.8.5:4
+		>=dev-qt/qtdbus-4.8.5:4
+		>=dev-qt/qtgui-4.8.5:4
+		>=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
+		>=dev-qt/qttest-4.8.5:4
 	)
 	qt5? (
 		>=dev-libs/soprano-2.6.51[-qt4,qt5]


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2013-11-24  0:22 Johannes Huber
  0 siblings, 0 replies; 48+ messages in thread
From: Johannes Huber @ 2013-11-24  0:22 UTC (permalink / raw
  To: gentoo-commits

commit:     ce23bcb36b5e97b289289c108309495d6b86fd41
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 23:22:34 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 23:22:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ce23bcb3

[app-office/akonadi-server] Strigi support removed by upstream

Upstream commit 407a92fde2407b4ef7564a9eee3b6093e6ab6bb6/diff

Package-Manager: portage-2.2.7

---
 app-office/akonadi-server/akonadi-server-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index ab4ad89..90b3191 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -92,7 +92,6 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DAKONADI_USE_STRIGI_SEARCH=OFF
 		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
 		$(cmake-utils_use test AKONADI_BUILD_TESTS)
 		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2013-12-09  4:10 Chris Reffett
  0 siblings, 0 replies; 48+ messages in thread
From: Chris Reffett @ 2013-12-09  4:10 UTC (permalink / raw
  To: gentoo-commits

commit:     bac6fb7a5a44abe9fa6fd68a355bdbe22c727886
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  9 03:17:46 2013 +0000
Commit:     Chris Reffett <creffett <AT> gentoo <DOT> org>
CommitDate: Mon Dec  9 03:59:21 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bac6fb7a

[app-office/akonadi-server] Bump to 1.11.0

Package-Manager: portage-2.2.7

---
 .../akonadi-server/akonadi-server-1.11.0.ebuild    | 126 +++++++++++++++++++++
 1 file changed, 126 insertions(+)

diff --git a/app-office/akonadi-server/akonadi-server-1.11.0.ebuild b/app-office/akonadi-server/akonadi-server-1.11.0.ebuild
new file mode 100644
index 0000000..3d2cf0a
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.11.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+if [[ $PV = *9999* ]]; then
+	scm_eclass=git-2
+	EGIT_REPO_URI="git://anongit.kde.org/akonadi"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${PN/-server/}-${PV}.tar.bz2 -> ${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${P/-server/}"
+fi
+
+inherit cmake-utils ${scm_eclass}
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="http://pim.kde.org/akonadi"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+mysql postgres +qt4 qt5 sqlite test"
+
+REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
+
+CDEPEND="
+	dev-libs/boost:=
+	>=dev-libs/soprano-2.6.51
+	x11-misc/shared-mime-info
+	qt4? (
+		>=dev-qt/qtcore-4.8.5:4
+		>=dev-qt/qtdbus-4.8.5:4
+		>=dev-qt/qtgui-4.8.5:4
+		>=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
+		>=dev-qt/qttest-4.8.5:4
+	)
+	qt5? (
+		>=dev-libs/soprano-2.6.51[-qt4,qt5]
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsql:5[mysql?,postgres?]
+		dev-qt/qttest:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${CDEPEND}
+	dev-libs/libxslt
+	>=dev-util/automoc-0.9.88
+	test? ( sys-apps/dbus )
+"
+RDEPEND="${CDEPEND}
+	postgres? ( dev-db/postgresql-server )
+"
+
+pkg_setup() {
+	# Set default storage backend in order: MySQL, SQLite PostgreSQL
+	# reverse driver check to keep the order
+	if use postgres; then
+		DRIVER="QPSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use sqlite; then
+		DRIVER="QSQLITE3"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	# Notify about MySQL is recommend by upstream
+	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
+		ewarn
+		ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
+		ewarn "user configuration. This is the backend recommended by KDE upstream."
+		ewarn "In particular, kde-base/kmail-4.10 does not work properly with the sqlite"
+		ewarn "backend anymore."
+		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Available drivers are:${AVAILABLE}"
+		ewarn
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAKONADI_USE_STRIGI_SEARCH=OFF
+		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
+		$(cmake-utils_use test AKONADI_BUILD_TESTS)
+		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
+		$(cmake-utils_use qt5 QT5_BUILD)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	export $(dbus-launch)
+	cmake-utils_src_test
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are: ${AVAILABLE}"
+}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2013-12-18 18:02 Johannes Huber
  0 siblings, 0 replies; 48+ messages in thread
From: Johannes Huber @ 2013-12-18 18:02 UTC (permalink / raw
  To: gentoo-commits

commit:     74b9380405d1ad4f264aa965d8fc34cd5f87bc5a
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 18 18:01:45 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Dec 18 18:01:45 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=74b93804

[app-office/akonadi-server] Moved to tree

Package-Manager: portage-2.2.7

---
 .../akonadi-server/akonadi-server-1.11.0.ebuild    | 126 ---------------------
 1 file changed, 126 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.11.0.ebuild b/app-office/akonadi-server/akonadi-server-1.11.0.ebuild
deleted file mode 100644
index 3d2cf0a..0000000
--- a/app-office/akonadi-server/akonadi-server-1.11.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-2
-	EGIT_REPO_URI="git://anongit.kde.org/akonadi"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${PN/-server/}-${PV}.tar.bz2 -> ${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${P/-server/}"
-fi
-
-inherit cmake-utils ${scm_eclass}
-
-DESCRIPTION="The server part of Akonadi"
-HOMEPAGE="http://pim.kde.org/akonadi"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+mysql postgres +qt4 qt5 sqlite test"
-
-REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
-
-CDEPEND="
-	dev-libs/boost:=
-	>=dev-libs/soprano-2.6.51
-	x11-misc/shared-mime-info
-	qt4? (
-		>=dev-qt/qtcore-4.8.5:4
-		>=dev-qt/qtdbus-4.8.5:4
-		>=dev-qt/qtgui-4.8.5:4
-		>=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
-		>=dev-qt/qttest-4.8.5:4
-	)
-	qt5? (
-		>=dev-libs/soprano-2.6.51[-qt4,qt5]
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsql:5[mysql?,postgres?]
-		dev-qt/qttest:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${CDEPEND}
-	dev-libs/libxslt
-	>=dev-util/automoc-0.9.88
-	test? ( sys-apps/dbus )
-"
-RDEPEND="${CDEPEND}
-	postgres? ( dev-db/postgresql-server )
-"
-
-pkg_setup() {
-	# Set default storage backend in order: MySQL, SQLite PostgreSQL
-	# reverse driver check to keep the order
-	if use postgres; then
-		DRIVER="QPSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use sqlite; then
-		DRIVER="QSQLITE3"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use mysql; then
-		DRIVER="QMYSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	# Notify about MySQL is recommend by upstream
-	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-		ewarn
-		ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
-		ewarn "user configuration. This is the backend recommended by KDE upstream."
-		ewarn "In particular, kde-base/kmail-4.10 does not work properly with the sqlite"
-		ewarn "backend anymore."
-		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
-		ewarn "Available drivers are:${AVAILABLE}"
-		ewarn
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAKONADI_USE_STRIGI_SEARCH=OFF
-		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
-		$(cmake-utils_use test AKONADI_BUILD_TESTS)
-		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
-		$(cmake-utils_use qt5 QT5_BUILD)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	export $(dbus-launch)
-	cmake-utils_src_test
-}
-
-src_install() {
-	# Who knows, maybe it accidentally fixes our permission issues
-	cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-	insinto /usr/share/config/akonadi
-	doins "${T}"/akonadiserverrc
-
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are: ${AVAILABLE}"
-}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2014-03-08 15:09 Johannes Huber
  0 siblings, 0 replies; 48+ messages in thread
From: Johannes Huber @ 2014-03-08 15:09 UTC (permalink / raw
  To: gentoo-commits

commit:     691c90454b15a7a95c2674fa8e85de80281288d0
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  8 15:08:36 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Mar  8 15:09:13 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=691c9045

[app-office/akonadi-server] Version bump

Package-Manager: portage-2.2.8-r1

---
 .../akonadi-server/akonadi-server-1.11.80.ebuild   | 125 +++++++++++++++++++++
 1 file changed, 125 insertions(+)

diff --git a/app-office/akonadi-server/akonadi-server-1.11.80.ebuild b/app-office/akonadi-server/akonadi-server-1.11.80.ebuild
new file mode 100644
index 0000000..d48db9d
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.11.80.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+if [[ $PV = *9999* ]]; then
+	scm_eclass=git-r3
+	EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${P/-server/}"
+fi
+
+inherit cmake-utils ${scm_eclass}
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="http://pim.kde.org/akonadi"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+mysql postgres +qt4 qt5 sqlite test"
+
+REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
+
+CDEPEND="
+	dev-libs/boost:=
+	>=dev-libs/soprano-2.6.51
+	x11-misc/shared-mime-info
+	qt4? (
+		>=dev-qt/qtcore-4.8.5:4
+		>=dev-qt/qtdbus-4.8.5:4
+		>=dev-qt/qtgui-4.8.5:4
+		>=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
+		>=dev-qt/qttest-4.8.5:4
+	)
+	qt5? (
+		>=dev-libs/soprano-2.6.51[-qt4,qt5]
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsql:5[mysql?,postgres?]
+		dev-qt/qttest:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${CDEPEND}
+	dev-libs/libxslt
+	>=dev-util/automoc-0.9.88
+	test? ( sys-apps/dbus )
+"
+RDEPEND="${CDEPEND}
+	postgres? ( dev-db/postgresql-server )
+"
+
+pkg_setup() {
+	# Set default storage backend in order: MySQL, SQLite PostgreSQL
+	# reverse driver check to keep the order
+	if use postgres; then
+		DRIVER="QPSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use sqlite; then
+		DRIVER="QSQLITE3"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	# Notify about MySQL is recommend by upstream
+	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
+		ewarn
+		ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
+		ewarn "user configuration. This is the backend recommended by KDE upstream."
+		ewarn "In particular, kde-base/kmail-4.10 does not work properly with the sqlite"
+		ewarn "backend anymore."
+		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Available drivers are:${AVAILABLE}"
+		ewarn
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
+		$(cmake-utils_use test AKONADI_BUILD_TESTS)
+		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
+		$(cmake-utils_use qt5 QT5_BUILD)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	export $(dbus-launch)
+	cmake-utils_src_test
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are: ${AVAILABLE}"
+}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2014-03-19 21:53 Johannes Huber
  0 siblings, 0 replies; 48+ messages in thread
From: Johannes Huber @ 2014-03-19 21:53 UTC (permalink / raw
  To: gentoo-commits

commit:     55e199778d80e3e5b45018cf38b1b47a4c4bd609
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 19 21:53:32 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Mar 19 21:53:32 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=55e19977

[app-office/akonadi-server] Version bump

Package-Manager: portage-2.2.8-r1

---
 .../{akonadi-server-1.11.80.ebuild => akonadi-server-1.11.90.ebuild}      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.11.80.ebuild b/app-office/akonadi-server/akonadi-server-1.11.90.ebuild
similarity index 100%
rename from app-office/akonadi-server/akonadi-server-1.11.80.ebuild
rename to app-office/akonadi-server/akonadi-server-1.11.90.ebuild


^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2014-03-29 19:50 Johannes Huber
  0 siblings, 0 replies; 48+ messages in thread
From: Johannes Huber @ 2014-03-29 19:50 UTC (permalink / raw
  To: gentoo-commits

commit:     1810084b17f15568c666f6e22ffdaa2d7258c868
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 29 19:49:55 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Mar 29 19:49:55 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1810084b

[app-office/akonadi-server] Remove, newer version in tree

Package-Manager: portage-2.2.10

---
 .../akonadi-server/akonadi-server-1.11.90.ebuild   | 125 ---------------------
 1 file changed, 125 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.11.90.ebuild b/app-office/akonadi-server/akonadi-server-1.11.90.ebuild
deleted file mode 100644
index d48db9d..0000000
--- a/app-office/akonadi-server/akonadi-server-1.11.90.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-r3
-	EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${P/-server/}"
-fi
-
-inherit cmake-utils ${scm_eclass}
-
-DESCRIPTION="The server part of Akonadi"
-HOMEPAGE="http://pim.kde.org/akonadi"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+mysql postgres +qt4 qt5 sqlite test"
-
-REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
-
-CDEPEND="
-	dev-libs/boost:=
-	>=dev-libs/soprano-2.6.51
-	x11-misc/shared-mime-info
-	qt4? (
-		>=dev-qt/qtcore-4.8.5:4
-		>=dev-qt/qtdbus-4.8.5:4
-		>=dev-qt/qtgui-4.8.5:4
-		>=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
-		>=dev-qt/qttest-4.8.5:4
-	)
-	qt5? (
-		>=dev-libs/soprano-2.6.51[-qt4,qt5]
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsql:5[mysql?,postgres?]
-		dev-qt/qttest:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${CDEPEND}
-	dev-libs/libxslt
-	>=dev-util/automoc-0.9.88
-	test? ( sys-apps/dbus )
-"
-RDEPEND="${CDEPEND}
-	postgres? ( dev-db/postgresql-server )
-"
-
-pkg_setup() {
-	# Set default storage backend in order: MySQL, SQLite PostgreSQL
-	# reverse driver check to keep the order
-	if use postgres; then
-		DRIVER="QPSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use sqlite; then
-		DRIVER="QSQLITE3"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use mysql; then
-		DRIVER="QMYSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	# Notify about MySQL is recommend by upstream
-	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-		ewarn
-		ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
-		ewarn "user configuration. This is the backend recommended by KDE upstream."
-		ewarn "In particular, kde-base/kmail-4.10 does not work properly with the sqlite"
-		ewarn "backend anymore."
-		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
-		ewarn "Available drivers are:${AVAILABLE}"
-		ewarn
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
-		$(cmake-utils_use test AKONADI_BUILD_TESTS)
-		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
-		$(cmake-utils_use qt5 QT5_BUILD)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	export $(dbus-launch)
-	cmake-utils_src_test
-}
-
-src_install() {
-	# Who knows, maybe it accidentally fixes our permission issues
-	cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-	insinto /usr/share/config/akonadi
-	doins "${T}"/akonadiserverrc
-
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are: ${AVAILABLE}"
-}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2014-04-21 12:32 Johannes Huber
  0 siblings, 0 replies; 48+ messages in thread
From: Johannes Huber @ 2014-04-21 12:32 UTC (permalink / raw
  To: gentoo-commits

commit:     e6519e7bea4b31f942135e718c884caedea657b6
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 21 12:32:07 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Apr 21 12:32:07 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e6519e7b

[app-office/akonadi-server] Add USE flag soprano, bug #508040

Package-Manager: portage-2.2.10

---
 app-office/akonadi-server/akonadi-server-9999.ebuild | 11 +++++++----
 app-office/akonadi-server/metadata.xml               |  3 +++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index d48db9d..361da4e 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -22,14 +22,12 @@ HOMEPAGE="http://pim.kde.org/akonadi"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="+mysql postgres +qt4 qt5 sqlite test"
+IUSE="+mysql postgres +qt4 qt5 soprano sqlite test"
 
 REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
 
 CDEPEND="
 	dev-libs/boost:=
-	>=dev-libs/soprano-2.6.51
-	x11-misc/shared-mime-info
 	qt4? (
 		>=dev-qt/qtcore-4.8.5:4
 		>=dev-qt/qtdbus-4.8.5:4
@@ -38,7 +36,6 @@ CDEPEND="
 		>=dev-qt/qttest-4.8.5:4
 	)
 	qt5? (
-		>=dev-libs/soprano-2.6.51[-qt4,qt5]
 		dev-qt/qtcore:5
 		dev-qt/qtdbus:5
 		dev-qt/qtgui:5
@@ -47,6 +44,11 @@ CDEPEND="
 		dev-qt/qttest:5
 		dev-qt/qtwidgets:5
 		dev-qt/qtxml:5
+		soprano? ( dev-libs/soprano[-qt4,qt5] )
+	)
+	soprano? (
+		dev-libs/soprano
+		x11-misc/shared-mime-info
 	)
 	sqlite? ( dev-db/sqlite:3 )
 "
@@ -94,6 +96,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
 		$(cmake-utils_use test AKONADI_BUILD_TESTS)
+		$(cmake-utils_use_with soprano)
 		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
 		$(cmake-utils_use qt5 QT5_BUILD)
 	)

diff --git a/app-office/akonadi-server/metadata.xml b/app-office/akonadi-server/metadata.xml
index a23f444..3142906 100644
--- 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="soprano">Enable deprecated <pkg>dev-libs/soprano</pkg>, needed for nepomuk search</flag>
+	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2014-04-21 13:23 Johannes Huber
  0 siblings, 0 replies; 48+ messages in thread
From: Johannes Huber @ 2014-04-21 13:23 UTC (permalink / raw
  To: gentoo-commits

commit:     3a59803948112c58300adc430ec5f702fea3237d
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 21 13:22:50 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Apr 21 13:22:50 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3a598039

[app-office/akonadi-server] Fix deps

Package-Manager: portage-2.2.10

---
 app-office/akonadi-server/akonadi-server-9999.ebuild | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index 361da4e..2c5ea5c 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -28,6 +28,7 @@ REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
 
 CDEPEND="
 	dev-libs/boost:=
+	x11-misc/shared-mime-info
 	qt4? (
 		>=dev-qt/qtcore-4.8.5:4
 		>=dev-qt/qtdbus-4.8.5:4
@@ -46,10 +47,7 @@ CDEPEND="
 		dev-qt/qtxml:5
 		soprano? ( dev-libs/soprano[-qt4,qt5] )
 	)
-	soprano? (
-		dev-libs/soprano
-		x11-misc/shared-mime-info
-	)
+	soprano? ( dev-libs/soprano )
 	sqlite? ( dev-db/sqlite:3 )
 "
 DEPEND="${CDEPEND}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2014-07-18 13:58 Manuel Rüger
  0 siblings, 0 replies; 48+ messages in thread
From: Manuel Rüger @ 2014-07-18 13:58 UTC (permalink / raw
  To: gentoo-commits

commit:     4bb92ba2797f9a1728eda9f64d8cd41cdb530b97
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 18 13:57:53 2014 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Fri Jul 18 13:57:53 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4bb92ba2

[app-office/akonadi-server] Add 1.13 prerelease

Package-Manager: portage-2.2.10

---
 .../akonadi-server/akonadi-server-1.12.91.ebuild   | 126 +++++++++++++++++++++
 1 file changed, 126 insertions(+)

diff --git a/app-office/akonadi-server/akonadi-server-1.12.91.ebuild b/app-office/akonadi-server/akonadi-server-1.12.91.ebuild
new file mode 100644
index 0000000..58a4b10
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.12.91.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2014 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.12.1-r1.ebuild,v 1.1 2014/04/22 15:44:02 johu Exp $
+
+EAPI=5
+
+if [[ $PV = *9999* ]]; then
+	scm_eclass=git-r3
+	EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${P/-server/}"
+fi
+
+inherit cmake-utils ${scm_eclass}
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="http://pim.kde.org/akonadi"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+mysql postgres +qt4 qt5 soprano sqlite test"
+
+REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
+
+CDEPEND="
+	dev-libs/boost:=
+	x11-misc/shared-mime-info
+	qt4? (
+		>=dev-qt/qtcore-4.8.5:4
+		>=dev-qt/qtdbus-4.8.5:4
+		>=dev-qt/qtgui-4.8.5:4
+		>=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
+		>=dev-qt/qttest-4.8.5:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsql:5[mysql?,postgres?]
+		dev-qt/qttest:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		soprano? ( dev-libs/soprano[-qt4,qt5] )
+	)
+	soprano? ( dev-libs/soprano )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${CDEPEND}
+	dev-libs/libxslt
+	>=dev-util/automoc-0.9.88
+	test? ( sys-apps/dbus )
+"
+RDEPEND="${CDEPEND}
+	postgres? ( dev-db/postgresql-server )
+"
+
+pkg_setup() {
+	# Set default storage backend in order: MySQL, SQLite PostgreSQL
+	# reverse driver check to keep the order
+	if use postgres; then
+		DRIVER="QPSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use sqlite; then
+		DRIVER="QSQLITE3"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	# Notify about MySQL is recommend by upstream
+	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
+		ewarn
+		ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
+		ewarn "user configuration. This is the backend recommended by KDE upstream."
+		ewarn "In particular, kde-base/kmail-4.10 does not work properly with the sqlite"
+		ewarn "backend anymore."
+		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Available drivers are:${AVAILABLE}"
+		ewarn
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
+		$(cmake-utils_use test AKONADI_BUILD_TESTS)
+		$(cmake-utils_use_with soprano)
+		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
+		$(cmake-utils_use qt5 QT5_BUILD)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	export $(dbus-launch)
+	cmake-utils_src_test
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are: ${AVAILABLE}"
+}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2014-07-18 15:01 Johannes Huber
  0 siblings, 0 replies; 48+ messages in thread
From: Johannes Huber @ 2014-07-18 15:01 UTC (permalink / raw
  To: gentoo-commits

commit:     83b9ed0d48b9a5556a0e78df6da994dec19e6f8c
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 18 14:51:54 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jul 18 14:51:54 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=83b9ed0d

[app-office/akonadi-server] Cleanup header

Package-Manager: portage-2.2.10

---
 app-office/akonadi-server/akonadi-server-1.12.91.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.12.91.ebuild b/app-office/akonadi-server/akonadi-server-1.12.91.ebuild
index 58a4b10..2c5ea5c 100644
--- a/app-office/akonadi-server/akonadi-server-1.12.91.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.12.91.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.12.1-r1.ebuild,v 1.1 2014/04/22 15:44:02 johu Exp $
+# $Header: $
 
 EAPI=5
 


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2014-07-20 14:22 Andreas Hüttel
  0 siblings, 0 replies; 48+ messages in thread
From: Andreas Hüttel @ 2014-07-20 14:22 UTC (permalink / raw
  To: gentoo-commits

commit:     596e7178387aefbc8bfb1f7f92611226cee6b3b7
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 20 14:15:32 2014 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jul 20 14:15:32 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=596e7178

[app-office/akonadi-server] tests fail

Package-Manager: portage-2.2.10

---
 app-office/akonadi-server/akonadi-server-1.12.91.ebuild | 2 ++
 app-office/akonadi-server/akonadi-server-9999.ebuild    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app-office/akonadi-server/akonadi-server-1.12.91.ebuild b/app-office/akonadi-server/akonadi-server-1.12.91.ebuild
index 2c5ea5c..93bc60a 100644
--- a/app-office/akonadi-server/akonadi-server-1.12.91.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.12.91.ebuild
@@ -59,6 +59,8 @@ RDEPEND="${CDEPEND}
 	postgres? ( dev-db/postgresql-server )
 "
 
+RESTRICT="test"
+
 pkg_setup() {
 	# Set default storage backend in order: MySQL, SQLite PostgreSQL
 	# reverse driver check to keep the order

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index 2c5ea5c..93bc60a 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -59,6 +59,8 @@ RDEPEND="${CDEPEND}
 	postgres? ( dev-db/postgresql-server )
 "
 
+RESTRICT="test"
+
 pkg_setup() {
 	# Set default storage backend in order: MySQL, SQLite PostgreSQL
 	# reverse driver check to keep the order


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2014-08-10 11:43 Johannes Huber
  0 siblings, 0 replies; 48+ messages in thread
From: Johannes Huber @ 2014-08-10 11:43 UTC (permalink / raw
  To: gentoo-commits

commit:     11d3304ddb837c46430e5f6a73c77d8fa0192813
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 10 11:42:50 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Aug 10 11:42:50 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=11d3304d

[app-office/akonadi-server] Remove, newer version in tree

Package-Manager: portage-2.2.11-r1

---
 .../akonadi-server/akonadi-server-1.12.91.ebuild   | 128 ---------------------
 1 file changed, 128 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.12.91.ebuild b/app-office/akonadi-server/akonadi-server-1.12.91.ebuild
deleted file mode 100644
index 93bc60a..0000000
--- a/app-office/akonadi-server/akonadi-server-1.12.91.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-r3
-	EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${P/-server/}"
-fi
-
-inherit cmake-utils ${scm_eclass}
-
-DESCRIPTION="The server part of Akonadi"
-HOMEPAGE="http://pim.kde.org/akonadi"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+mysql postgres +qt4 qt5 soprano sqlite test"
-
-REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
-
-CDEPEND="
-	dev-libs/boost:=
-	x11-misc/shared-mime-info
-	qt4? (
-		>=dev-qt/qtcore-4.8.5:4
-		>=dev-qt/qtdbus-4.8.5:4
-		>=dev-qt/qtgui-4.8.5:4
-		>=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
-		>=dev-qt/qttest-4.8.5:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsql:5[mysql?,postgres?]
-		dev-qt/qttest:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		soprano? ( dev-libs/soprano[-qt4,qt5] )
-	)
-	soprano? ( dev-libs/soprano )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${CDEPEND}
-	dev-libs/libxslt
-	>=dev-util/automoc-0.9.88
-	test? ( sys-apps/dbus )
-"
-RDEPEND="${CDEPEND}
-	postgres? ( dev-db/postgresql-server )
-"
-
-RESTRICT="test"
-
-pkg_setup() {
-	# Set default storage backend in order: MySQL, SQLite PostgreSQL
-	# reverse driver check to keep the order
-	if use postgres; then
-		DRIVER="QPSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use sqlite; then
-		DRIVER="QSQLITE3"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use mysql; then
-		DRIVER="QMYSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	# Notify about MySQL is recommend by upstream
-	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-		ewarn
-		ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
-		ewarn "user configuration. This is the backend recommended by KDE upstream."
-		ewarn "In particular, kde-base/kmail-4.10 does not work properly with the sqlite"
-		ewarn "backend anymore."
-		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
-		ewarn "Available drivers are:${AVAILABLE}"
-		ewarn
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
-		$(cmake-utils_use test AKONADI_BUILD_TESTS)
-		$(cmake-utils_use_with soprano)
-		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
-		$(cmake-utils_use qt5 QT5_BUILD)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	export $(dbus-launch)
-	cmake-utils_src_test
-}
-
-src_install() {
-	# Who knows, maybe it accidentally fixes our permission issues
-	cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-	insinto /usr/share/config/akonadi
-	doins "${T}"/akonadiserverrc
-
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are: ${AVAILABLE}"
-}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2014-09-11 21:52 Johannes Huber
  0 siblings, 0 replies; 48+ messages in thread
From: Johannes Huber @ 2014-09-11 21:52 UTC (permalink / raw
  To: gentoo-commits

commit:     030c9a707d29f8ab381730d914642de664f36914
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 11 21:48:29 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Sep 11 21:48:29 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=030c9a70

[app-office/akonadi-server] Adapt upstream changes

Package-Manager: portage-2.2.12

---
 .../akonadi-server/akonadi-server-9999.ebuild      | 56 +++++++---------------
 app-office/akonadi-server/metadata.xml             |  3 --
 2 files changed, 18 insertions(+), 41 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index 93bc60a..d5e29ad 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -5,8 +5,7 @@
 EAPI=5
 
 if [[ $PV = *9999* ]]; then
-	scm_eclass=git-r3
-	EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
+	EGIT_REPONAME="${PN/-server/}"
 	SRC_URI=""
 	KEYWORDS=""
 else
@@ -15,52 +14,40 @@ else
 	S="${WORKDIR}/${P/-server/}"
 fi
 
-inherit cmake-utils ${scm_eclass}
+KDE_TESTS=true
+VIRTUALDBUS_TEST=true
+inherit kde5
 
 DESCRIPTION="The server part of Akonadi"
 HOMEPAGE="http://pim.kde.org/akonadi"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="+mysql postgres +qt4 qt5 soprano sqlite test"
+IUSE="+mysql postgres sqlite test"
 
-REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
+REQUIRED_USE="|| ( sqlite mysql postgres )"
+
+# TODO: new optional dep see ENABLE_ASAN
 
 CDEPEND="
-	dev-libs/boost:=
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[mysql?,postgres?]
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 	x11-misc/shared-mime-info
-	qt4? (
-		>=dev-qt/qtcore-4.8.5:4
-		>=dev-qt/qtdbus-4.8.5:4
-		>=dev-qt/qtgui-4.8.5:4
-		>=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
-		>=dev-qt/qttest-4.8.5:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsql:5[mysql?,postgres?]
-		dev-qt/qttest:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		soprano? ( dev-libs/soprano[-qt4,qt5] )
-	)
-	soprano? ( dev-libs/soprano )
 	sqlite? ( dev-db/sqlite:3 )
 "
 DEPEND="${CDEPEND}
 	dev-libs/libxslt
-	>=dev-util/automoc-0.9.88
 	test? ( sys-apps/dbus )
 "
 RDEPEND="${CDEPEND}
 	postgres? ( dev-db/postgresql-server )
 "
 
-RESTRICT="test"
-
 pkg_setup() {
 	# Set default storage backend in order: MySQL, SQLite PostgreSQL
 	# reverse driver check to keep the order
@@ -94,19 +81,12 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DKDE_INSTALL_USE_QT_SYS_PATHS=OFF
 		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
-		$(cmake-utils_use test AKONADI_BUILD_TESTS)
-		$(cmake-utils_use_with soprano)
 		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
-		$(cmake-utils_use qt5 QT5_BUILD)
 	)
 
-	cmake-utils_src_configure
-}
-
-src_test() {
-	export $(dbus-launch)
-	cmake-utils_src_test
+	kde5_src_configure
 }
 
 src_install() {
@@ -118,7 +98,7 @@ EOF
 	insinto /usr/share/config/akonadi
 	doins "${T}"/akonadiserverrc
 
-	cmake-utils_src_install
+	kde5_src_install
 }
 
 pkg_postinst() {

diff --git a/app-office/akonadi-server/metadata.xml b/app-office/akonadi-server/metadata.xml
index 3142906..a23f444 100644
--- a/app-office/akonadi-server/metadata.xml
+++ b/app-office/akonadi-server/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
-	<use>
-		<flag name="soprano">Enable deprecated <pkg>dev-libs/soprano</pkg>, needed for nepomuk search</flag>
-	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2014-09-12 19:03 Johannes Huber
  0 siblings, 0 replies; 48+ messages in thread
From: Johannes Huber @ 2014-09-12 19:03 UTC (permalink / raw
  To: gentoo-commits

commit:     26104d316fd8867deccb1692b3e71fd8afb141f9
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 12 19:03:41 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Sep 12 19:03:41 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=26104d31

[app-office/akonadi-server] Enable ASAN by default in configure phase

We check on gcc4.8 in eclass so feature is available.

Package-Manager: portage-2.2.12

---
 app-office/akonadi-server/akonadi-server-9999.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index d5e29ad..6c84bc6 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -27,8 +27,6 @@ IUSE="+mysql postgres sqlite test"
 
 REQUIRED_USE="|| ( sqlite mysql postgres )"
 
-# TODO: new optional dep see ENABLE_ASAN
-
 CDEPEND="
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
@@ -81,7 +79,7 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DKDE_INSTALL_USE_QT_SYS_PATHS=OFF
+		-DENABLE_ASAN=ON
 		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
 		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
 	)


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2014-12-30 16:39 Elias Probst
  0 siblings, 0 replies; 48+ messages in thread
From: Elias Probst @ 2014-12-30 16:39 UTC (permalink / raw
  To: gentoo-commits

commit:     e0492cde9f682bc51fdfef5eaf2863a9917add83
Author:     Elias Probst <mail <AT> eliasprobst <DOT> eu>
AuthorDate: Tue Dec 30 14:50:41 2014 +0000
Commit:     Elias Probst <mail <AT> eliasprobst <DOT> eu>
CommitDate: Tue Dec 30 14:50:41 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e0492cde

[app-office/akonadi-server] Follow postgresql ebuild merge

Package-Manager: portage-2.2.15

---
 app-office/akonadi-server/akonadi-server-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index 6c84bc6..ca1e5f8 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -43,7 +43,7 @@ DEPEND="${CDEPEND}
 	test? ( sys-apps/dbus )
 "
 RDEPEND="${CDEPEND}
-	postgres? ( dev-db/postgresql-server )
+	postgres? ( dev-db/postgresql )
 "
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
@ 2015-07-22 12:36 Michael Palimaka
  0 siblings, 0 replies; 48+ messages in thread
From: Michael Palimaka @ 2015-07-22 12:36 UTC (permalink / raw
  To: gentoo-commits

commit:     c1a0a33d539f84eb62d66941c6636414fb1b2ed2
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Jul 22 12:22:45 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 22 12:36:16 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c1a0a33d

[app-office/akonadi-server] Don't enable ASAN, breaks runtime

Package-Manager: portage-2.2.20

 app-office/akonadi-server/akonadi-server-9999.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index 8729b2c..f9b6592 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -79,9 +79,8 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DENABLE_ASAN=ON
-		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
-		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
+		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
 	)
 
 	kde5_src_configure


^ permalink raw reply related	[flat|nested] 48+ messages in thread

end of thread, other threads:[~2015-07-22 12:36 UTC | newest]

Thread overview: 48+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-25 21:15 [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/ Johannes Huber
  -- strict thread matches above, loose matches on Subject: below --
2015-07-22 12:36 Michael Palimaka
2014-12-30 16:39 Elias Probst
2014-09-12 19:03 Johannes Huber
2014-09-11 21:52 Johannes Huber
2014-08-10 11:43 Johannes Huber
2014-07-20 14:22 Andreas Hüttel
2014-07-18 15:01 Johannes Huber
2014-07-18 13:58 Manuel Rüger
2014-04-21 13:23 Johannes Huber
2014-04-21 12:32 Johannes Huber
2014-03-29 19:50 Johannes Huber
2014-03-19 21:53 Johannes Huber
2014-03-08 15:09 Johannes Huber
2013-12-18 18:02 Johannes Huber
2013-12-09  4:10 Chris Reffett
2013-11-24  0:22 Johannes Huber
2013-10-14 22:00 Andreas Hüttel
2013-10-13 17:03 Johannes Huber
2013-09-08 13:50 Michael Palimaka
2013-07-10 19:59 Johannes Huber
2013-06-12 21:18 Johannes Huber
2013-06-03 15:32 Michael Palimaka
2013-06-01 15:58 Michael Palimaka
2013-05-08 18:39 Johannes Huber
2013-03-20 13:25 Michael Palimaka
2013-03-11 16:21 Michael Palimaka
2013-03-03 16:14 Michael Palimaka
2013-02-06 20:17 Andreas Hüttel
2013-02-06 16:03 Chris Reffett
2013-02-06 15:59 Chris Reffett
2013-01-04  7:50 Alexey Shvetsov
2013-01-04  7:45 Alexey Shvetsov
2012-11-25 16:35 Andreas Hüttel
2012-11-16 19:05 Alexey Shvetsov
2012-06-28 13:14 Andreas Hüttel
2012-01-25 19:15 Johannes Huber
2012-01-24 22:57 Andreas Hüttel
2012-01-18 12:25 Johannes Huber
2011-12-21  0:00 Johannes Huber
2011-10-23  2:07 Jonathan Callen
2011-07-18 11:49 Jorge Manuel B. S. Vicetto
2011-07-11 21:38 Alexey Shvetsov
2011-06-29  9:06 Alexey Shvetsov
2011-05-24  5:57 Jorge Manuel B. S. Vicetto
2011-04-05 23:43 Tomas Chvatal
2011-04-05 23:27 Tomas Chvatal
2011-02-17 16:55 Tomas Chvatal

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox