[gentoo-commits] proj/kde:master commit in: profiles/package.mask.d/, app-office/akonadi-server/, profiles/

[gentoo-commits] proj/kde:master commit in: profiles/package.mask.d/, app-office/akonadi-server/, profiles/

[Johannes Huber]

commit:     aea58c2a62fc7fff81729da9c5fc849f92da6b1b
Author:     Johannes Huber <johu <AT> gmx <DOT> de>
AuthorDate: Wed Oct  5 22:23:13 2011 +0000
Commit:     Johannes Huber <johu <AT> gmx <DOT> de>
CommitDate: Wed Oct  5 22:23:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=aea58c2a

[app-office/akonadi-server] Bump 1.6.2, remove old.

(Portage version: 2.2.0_alpha60_p70/git/Linux i686, signed Manifest commit with key DF018462)

---
 ...er-1.6.1.ebuild => akonadi-server-1.6.2.ebuild} |    0
 profiles/package.mask                              |    2 +-
 profiles/package.mask.d/akonadi-server             |    2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/profiles/package.mask b/profiles/package.mask
index 935c7d6..4607ebb 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -2,7 +2,7 @@
 # Edit profiles/package.mask.d/ files instead.
 
 # Available on mirrors, but not announced officially
-~app-office/akonadi-server-1.6.1
+~app-office/akonadi-server-1.6.2
 
 # Dennis Schridde <devurandom@gmx.net> (06 Feb 2011)
 # Beta versions of the Ayatana ebuilds

diff --git a/profiles/package.mask.d/akonadi-server b/profiles/package.mask.d/akonadi-server
index 5980e7b..d621566 100644
--- a/profiles/package.mask.d/akonadi-server
+++ b/profiles/package.mask.d/akonadi-server
@@ -1,2 +1,2 @@
 # Available on mirrors, but not announced officially
-~app-office/akonadi-server-1.6.1
+~app-office/akonadi-server-1.6.2

[gentoo-commits] proj/kde:master commit in: profiles/package.mask.d/, app-office/akonadi-server/, profiles/

[Johannes Huber]

commit:     373bc2f6a9d22d21074acd40eb33036322ba42e7
Author:     Johannes Huber <johu <AT> gmx <DOT> de>
AuthorDate: Thu Oct  6 17:02:17 2011 +0000
Commit:     Johannes Huber <johu <AT> gmx <DOT> de>
CommitDate: Thu Oct  6 17:04:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=373bc2f6

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

(Portage version: 2.2.0_alpha60_p70/git/Linux i686, signed Manifest commit with key DF018462)

---
 .../akonadi-server/akonadi-server-1.6.2.ebuild     |   96 --------------------
 profiles/package.mask                              |    3 -
 profiles/package.mask.d/akonadi-server             |    2 -
 3 files changed, 0 insertions(+), 101 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.6.2.ebuild b/app-office/akonadi-server/akonadi-server-1.6.2.ebuild
deleted file mode 100644
index cc43b6f..0000000
--- a/app-office/akonadi-server/akonadi-server-1.6.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2011 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 ~arm ~hppa ~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/}
-
-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
-
-	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/profiles/package.mask b/profiles/package.mask
index 4607ebb..7ef4d97 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,9 +1,6 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Edit profiles/package.mask.d/ files instead.
 
-# Available on mirrors, but not announced officially
-~app-office/akonadi-server-1.6.2
-
 # Dennis Schridde <devurandom@gmx.net> (06 Feb 2011)
 # Beta versions of the Ayatana ebuilds
 ~dev-libs/libdbusmenu-0.3.94

diff --git a/profiles/package.mask.d/akonadi-server b/profiles/package.mask.d/akonadi-server
deleted file mode 100644
index d621566..0000000
--- a/profiles/package.mask.d/akonadi-server
+++ /dev/null
@@ -1,2 +0,0 @@
-# Available on mirrors, but not announced officially
-~app-office/akonadi-server-1.6.2