Remove old.

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

3 files changed, 5 insertions, 144 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index 82f19c02282a..3466382ce5aa 100644
--- a/app-office/akonadi-server/ChangeLog
+++ b/app-office/akonadi-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/akonadi-server
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.114 2013/06/08 10:14:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.115 2013/06/09 10:46:45 johu Exp $
+
+  09 Jun 2013; Johannes Huber <johu@gentoo.org> -akonadi-server-1.9.1-r1.ebuild,
+  -files/akonadi-server-1.9.0-qt5.patch:
+  Remove old.
 
   08 Jun 2013; Agostino Sarubbo <ago@gentoo.org> akonadi-server-1.9.2.ebuild:
   Stable for ppc64, wrt bug #471392
diff --git a/app-office/akonadi-server/akonadi-server-1.9.1-r1.ebuild b/app-office/akonadi-server/akonadi-server-1.9.1-r1.ebuild
deleted file mode 100644
index 673713225b1b..000000000000
--- a/app-office/akonadi-server/akonadi-server-1.9.1-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2013 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.9.1-r1.ebuild,v 1.6 2013/04/02 20:55:51 ago Exp $
-
-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 ~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 +sqlite test"
-
-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
-"
-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}/${PN}-1.9.0-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 has_version "<=${CATEGORY}/${PN}-1.9.0[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 "To ease the transition, this akonadi-server ebuild has enabled both sqlite"
-		ewarn "and mysql backend by default. Future stable versions will by default"
-		ewarn "disable the sqlite backend."
-		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
-		-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/files/akonadi-server-1.9.0-qt5.patch b/app-office/akonadi-server/files/akonadi-server-1.9.0-qt5.patch
deleted file mode 100644
index 132557ad8532..000000000000
--- a/app-office/akonadi-server/files/akonadi-server-1.9.0-qt5.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e0efd25..efcdbe0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,6 +21,7 @@ option(AKONADI_BUILD_QSQLITE "Build the Sqlite backend." TRUE)
- option(AKONADI_USE_STRIGI_SEARCH "Build Akonadi with strigi as search engine." FALSE)
- option(INSTALL_QSQLITE_IN_QT_PREFIX "Install the QSQLite plugin in QT_PLUGIN_DIR" FALSE)
- option(STATIC_LIBRARY "Build Akonadi as a static library." FALSE)
-+OPTION(WITH_QT5 "Build against Qt5." TRUE)
- 
- if(NOT DEFINED DATABASE_BACKEND)
-   set(DATABASE_BACKEND "MYSQL" CACHE STRING "The default database backend to use for Akonadi. Can be either MYSQL, POSTGRES or SQLITE")
-@@ -128,7 +129,10 @@ set_default_db_backend(${DATABASE_BACKEND})
- set(QT_USE_IMPORTED_TARGETS TRUE) # Qt 4 only
- set(QT_MIN_VERSION 4.6.0)         # Qt 4 only
- 
--find_package(Qt5Core QUIET)
-+if (WITH_QT5)
-+  find_package(Qt5Core QUIET)
-+endif()
-+
- if (Qt5Core_FOUND)
-   find_package(Qt5Gui REQUIRED)
-   find_package(Qt5Widgets REQUIRED)