3 files changed, 10 insertions, 84 deletions
diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index d0488f204069..24b7773a1b69 100644
--- a/app-office/akonadi-server/ChangeLog
+++ b/app-office/akonadi-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/akonadi-server
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.47 2010/09/08 13:43:40 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.48 2010/10/22 17:07:36 reavertm Exp $
+
+*akonadi-server-1.4.1 (22 Oct 2010)
+
+  22 Oct 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  -akonadi-server-1.4.0.ebuild, -akonadi-server-1.4.0-r2.ebuild,
+  +akonadi-server-1.4.1.ebuild:
+  Version bump, remove old
 
 *akonadi-server-1.4.0-r2 (08 Sep 2010)
 
diff --git a/app-office/akonadi-server/akonadi-server-1.4.0.ebuild b/app-office/akonadi-server/akonadi-server-1.4.0.ebuild
deleted file mode 100644
index 376ad3daea09..000000000000
--- a/app-office/akonadi-server/akonadi-server-1.4.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.4.0.ebuild,v 1.2 2010/09/08 13:43:40 reavertm Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="The server part of Akonadi"
-HOMEPAGE="http://pim.kde.org/akonadi"
-SRC_URI="http://download.akonadi-project.org/${P/-server/}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="+mysql postgres sqlite +server"
-
-CDEPEND="
-	dev-libs/boost
-	>=dev-libs/soprano-2.2
-	>=x11-libs/qt-gui-4.5.0:4[dbus]
-	>=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?,sqlite?]
-	>=x11-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}
-	server? (
-		postgres? ( dev-db/postgresql-server )
-	)
-"
-
-S="${WORKDIR}/${P/-server/}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-remove-sqlite-version-assert.patch"
-)
-
-src_install() {
-	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
-	if use mysql; then
-		driver="QMYSQL"
-	elif use postgres; then
-		driver="QPSQL"
-	elif use sqlite; then
-		driver="QSQLITE"
-	fi
-	# 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() {
-	if use mysql || use postgres || use sqlite; then
-		local func=elog
-		( use postgres || use sqlite ) && func=ewarn
-		echo
-		${func} "${driver} has been set as your default akonadi storage backend."
-		${func} "You can override it in your ~/.config/akonadi/akonadiserverrc."
-		${func} "Available drivers are:"
-		${func} "QMYSQL, QPSQL (testing), QSQLITE (experimental)"
-		${func} "Be advised that QMYSQL is the one fully tested and officially supported."
-		use sqlite && ewarn "If you experience random data losses using QSQLITE driver, you have been warned."
-		echo
-	else
-		echo
-		ewarn "You have decided to build akonadi-server with"
-		ewarn "'mysql', 'postgres' and 'sqlite' USE flags disabled."
-		ewarn "akonadi-server will not be functional."
-		echo
-	fi
-}
diff --git a/app-office/akonadi-server/akonadi-server-1.4.0-r2.ebuild b/app-office/akonadi-server/akonadi-server-1.4.1.ebuild
index f02ffa082983..85840b7e32d3 100644
--- a/app-office/akonadi-server/akonadi-server-1.4.0-r2.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.4.0-r2.ebuild,v 1.1 2010/09/08 13:43:40 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.4.1.ebuild,v 1.1 2010/10/22 17:07:36 reavertm Exp $
 
 EAPI="2"
 
@@ -36,7 +36,7 @@ RDEPEND="${CDEPEND}
 S="${WORKDIR}/${P/-server/}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-remove-sqlite-version-assert.patch"
+	"${FILESDIR}/${PN}-1.4.0-remove-sqlite-version-assert.patch"
 )
 
 pkg_setup() {