summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-04-07 13:09:32 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-04-07 13:09:32 +0000
commit9784387cd0c4f63b79344cc645ea9461c6dad075 (patch)
tree30317464fc8c75e480f27193a8f8e26c921d8649 /app-office/akonadi-server
parentFix for Darwin, thanks Sven Schwyn bug #353516, marked ~x86-solaris (diff)
downloadgentoo-2-9784387cd0c4f63b79344cc645ea9461c6dad075.tar.gz
gentoo-2-9784387cd0c4f63b79344cc645ea9461c6dad075.tar.bz2
gentoo-2-9784387cd0c4f63b79344cc645ea9461c6dad075.zip
Drop old.
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Diffstat (limited to 'app-office/akonadi-server')
-rw-r--r--app-office/akonadi-server/ChangeLog7
-rw-r--r--app-office/akonadi-server/akonadi-server-1.4.1.ebuild98
-rw-r--r--app-office/akonadi-server/akonadi-server-1.5.0.ebuild94
-rw-r--r--app-office/akonadi-server/files/akonadi-server-1.4.0-remove-sqlite-version-assert.patch11
4 files changed, 6 insertions, 204 deletions
diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index 0858b0fb85bb..abbc6a62c9ae 100644
--- a/app-office/akonadi-server/ChangeLog
+++ b/app-office/akonadi-server/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-office/akonadi-server
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.50 2011/04/05 23:51:18 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.51 2011/04/07 13:09:32 scarabeus Exp $
+
+ 07 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ -files/akonadi-server-1.4.0-remove-sqlite-version-assert.patch,
+ -akonadi-server-1.4.1.ebuild, -akonadi-server-1.5.0.ebuild:
+ Drop old.
*akonadi-server-1.5.2 (05 Apr 2011)
diff --git a/app-office/akonadi-server/akonadi-server-1.4.1.ebuild b/app-office/akonadi-server/akonadi-server-1.4.1.ebuild
deleted file mode 100644
index 85840b7e32d3..000000000000
--- a/app-office/akonadi-server/akonadi-server-1.4.1.ebuild
+++ /dev/null
@@ -1,98 +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.1.ebuild,v 1.1 2010/10/22 17:07:36 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?]
- >=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}/${PN}-1.4.0-remove-sqlite-version-assert.patch"
-)
-
-pkg_setup() {
- # Set default storage backend in order: SQLite, MySQL, PostgreSQL
- local available
- 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_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() {
- 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
-}
diff --git a/app-office/akonadi-server/akonadi-server-1.5.0.ebuild b/app-office/akonadi-server/akonadi-server-1.5.0.ebuild
deleted file mode 100644
index 5f85dcfc8570..000000000000
--- a/app-office/akonadi-server/akonadi-server-1.5.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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.0.ebuild,v 1.1 2011/01/26 19:44:22 alexxy Exp $
-
-EAPI="3"
-
-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?]
- >=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/}"
-
-pkg_setup() {
- # Set default storage backend in order: SQLite, MySQL, PostgreSQL
- local available
- 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_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() {
- 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
-}
diff --git a/app-office/akonadi-server/files/akonadi-server-1.4.0-remove-sqlite-version-assert.patch b/app-office/akonadi-server/files/akonadi-server-1.4.0-remove-sqlite-version-assert.patch
deleted file mode 100644
index 2a14a7eb0f57..000000000000
--- a/app-office/akonadi-server/files/akonadi-server-1.4.0-remove-sqlite-version-assert.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru ../akonadi-1.4.0/qsqlite/src/qsql_sqlite.cpp ./qsqlite/src/qsql_sqlite.cpp
---- ../akonadi-1.4.0/qsqlite/src/qsql_sqlite.cpp 2010-07-31 18:12:24.000000000 +0200
-+++ ./qsqlite/src/qsql_sqlite.cpp 2010-09-08 15:23:16.152896580 +0200
-@@ -323,7 +323,6 @@
-
- setSelect(false);
-
-- Q_ASSERT(SQLITE_VERSION_NUMBER == 3006023);
- #if (SQLITE_VERSION_NUMBER >= 3003011)
- // int res = sqlite3_prepare16_v2(d->access, query.constData(), (query.size() + 1) * sizeof(QChar),
- // &d->stmt, 0);