summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-office/akonadi-server/ChangeLog9
-rw-r--r--app-office/akonadi-server/Manifest7
-rw-r--r--app-office/akonadi-server/akonadi-server-1.4.0.ebuild81
-rw-r--r--app-office/akonadi-server/akonadi-server-1.4.1.ebuild (renamed from app-office/akonadi-server/akonadi-server-1.4.0-r2.ebuild)4
4 files changed, 13 insertions, 88 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/Manifest b/app-office/akonadi-server/Manifest
index 46d28af7532e..96c33777ef9d 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -1,8 +1,7 @@
AUX akonadi-server-1.4.0-remove-sqlite-version-assert.patch 531 RMD160 90bc0d4534fcf731610ca798089fe0827f934de2 SHA1 afa10f2e7635b7a0b3ed64d5bde59001d7e93cdf SHA256 c2c34dc8cc0da230121ce1832feca544c5dcaf5e42dc3ce819df1bb736ca79dd
DIST akonadi-1.3.1.tar.bz2 193500 RMD160 487408ad3ac49983b9151aba358225f203ed19a1 SHA1 b6e97634878fe52785f3dec7d6394a18579d4a50 SHA256 4b9e99c20d0195ef7e477b399fed21e0533b9863f66a0650bfbddf18b73676dd
-DIST akonadi-1.4.0.tar.bz2 229349 RMD160 a69885807127684aa40e6203bd76cc09275dc427 SHA1 a83943aa46537fee4e07953fedf29f5c13487937 SHA256 85da6b75ce069874520e078cc5f75f2f4ebd91ae184bcb78eb203f8f7d812ea5
+DIST akonadi-1.4.1.tar.bz2 229469 RMD160 566d1265cfe8ac898e148f8dda78130edfcf1171 SHA1 da54ff7095a1adc7f67fd84aab0a427379fe8c03 SHA256 b90c22da8d78083ac78bb042a1ef32981bb697873dcdb1ba7ec4c06a4552cc36
EBUILD akonadi-server-1.3.1.ebuild 2150 RMD160 dc2be0043c0c6ed61cc0f336ca48176a5e6d4bf9 SHA1 64cb63a490ab8309d5101fdc3771a44ff29c4c27 SHA256 6b02302e1b7ab386950a600d5454bf12f79ce7f8e52c778e638a7040a296878f
-EBUILD akonadi-server-1.4.0-r2.ebuild 2685 RMD160 d00b3650485f2c284a72a51d91ebda9402a5263c SHA1 0c3ce244bfa14456dc9ff98993a10fe9353ed83b SHA256 180ad67a75ca2727760f6a7cd4ffd7cb70fb0004431dc4527e5f8cb4393df8bc
-EBUILD akonadi-server-1.4.0.ebuild 2223 RMD160 8b9499f35cce43746e9525046cde42c240a41e6b SHA1 801afce02577277c8dc476bd20264e2ebde25dc6 SHA256 5f8f239f5991714f9068311db5fd0dc72130ad330354755296740109f57c1e9e
-MISC ChangeLog 6967 RMD160 e06bb23219b6e4c85a5506d7b3b12819a094b834 SHA1 864475e688024b0bb0add9c9acc002160fd1a0fa SHA256 53d6ba24bcd95abf8a2edf2c3b6b8648eff495a67c6882b1e31668bac94196eb
+EBUILD akonadi-server-1.4.1.ebuild 2689 RMD160 90003f3311be1d73c32dce3686722a36caf718e1 SHA1 bcd9d4bc3b183ec6deaae74905e70e455ab93e5f SHA256 d0f8f309551addab62b55d4ee2a99936296bb48b0db81c6bec255366b7303768
+MISC ChangeLog 7183 RMD160 7c8137f4835fd604442e0503491555140e9b33d1 SHA1 47bff2f6b13cd11e76d4d4e913b170dc16222bc6 SHA256 7bb415c69dfcc9ed31a51ba168a417c2d6f9b5ef1ccd805bd82c7c5ca3098242
MISC metadata.xml 236 RMD160 c5cc6cb9745f9f6e3c7358482117892cbc866eb2 SHA1 d1bd263bd36cfc701e7ae12fb77e24d3f6556a88 SHA256 3bf214b7d5dabbbd8f2d607f6166647d91c5d0b7f166a4d5615da31995da06b6
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() {