Remove old.

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

4 files changed, 14 insertions, 162 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/Manifest b/app-office/akonadi-server/Manifest
index 5d746ce682ff..8ff09b873d28 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -1,27 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX akonadi-server-1.9.0-qt5.patch 996 SHA256 e4a2ec9a7edc833cd79e3bcdbcb4c7e477191cf71e02a33bd5a2f17bbddc5491 SHA512 50ce0f324f49b68f0b0c583d2af4541be21e08cec76a5bf0b8fffab58b2091f59dfadb1dbe35d798d57afa02b0f64040591189bd38497b4377d80191e81b4d0e WHIRLPOOL fa1178fa0bfb6ccd86e7ed0c9b44189e2cd0a5a6523701ebdcbc8c1bda9b4f4aaa00e0424e8f4f7bbdd99f2d1592405f1c3e1649ee158c8ebca0a51497d0106a
-DIST akonadi-1.9.1.tar.bz2 220354 SHA256 53ae49a2039cc0454795f14f6c7c08780f39990652c45843f4266654c99a20f0 SHA512 dacb8015a1a9a1988f45f1ad91503d7aebf8afc9c1c5e1182b8fd6fcf0aa8e6317e7d302a0f7de5f5569dbb36006c5d37cb6d581b543685cde023dc71e7d54ef WHIRLPOOL 7a0f8202c00c07834f2c627462f8f45ac8b85230d2ade381888c6b77316cea8b743b9b634924ff09d6e1a6965177f81753c0315169f250e060ea00ce6e4e2b1e
 DIST akonadi-1.9.2.tar.bz2 220599 SHA256 e712f3ee59731d613935df78df1cd65f80680d86d1f6642ff118061cd461bfd9 SHA512 9c281315cbb4801490acb0c6afa8bde6e42a73cfd0ba4ab0cb2b0b50a63ae55d350efcf8535b7f3251d93da0ba63c51e7920c250496fedcb3d90e1d8644c1b7f WHIRLPOOL 3415b70bc03ba451ae4e8216de0eeeb0f0c7f53c4f6433cc21f4725167f24493bee3f6dfe188f7d3633b4f5e4471d3a02ffc5407b90def86c439db6e711a1cce
-EBUILD akonadi-server-1.9.1-r1.ebuild 3167 SHA256 6fe95c4ee6b11d02f88d700d637f2bd8a0a0ad3d452706cc9f9b8096825eccd4 SHA512 4f4c7629ccf8e66aeee65b75b7382c97c995561ea0a6120e12c81d43f3a2d54855b64347cb9f8fe904c3b36e983ec7a0ff852b76d795b7de82f4b738a22023fc WHIRLPOOL ac32f3f7793a8510bedbfa9432439f669f77b340a2cfcd84247201af52a1aa789c1f9c0af242bac838af00679b225188e464b8dc964196100b017eb035e076e6
 EBUILD akonadi-server-1.9.2.ebuild 2670 SHA256 bec45dee70df12ea51fd68f2c02e6a3f42f26bb57b89bd5d1f5eadf61cf0aee5 SHA512 8597b68ceb9ce672dcecd71f75765cd51ee42ca1392f0db5632f83b4e117c89ea6eb58344e269acda7e70ca1d99d84eb9d9e612eb1a4f1c764736cfd8bd2685a WHIRLPOOL 8bd952a9178b6bb31e84e3b2dc19a39776a59c2f4d5f9d26d6c21251a32ee3f2b7da38781a9efe99b9514b34b3acb34b633ba5db9ba7d93ae7efd175fe8561d4
-MISC ChangeLog 16572 SHA256 3ebf213bb3879533adda6239ca156c045bea466bd76f7c70d0ec5a6d1ce37e28 SHA512 bbce59b28cc844beb61e8fc6dcb7fa6f56c0f07979ac0e8a5df6c933c0f4212cbd875b7771783852f83796816183bac1e387146040d55af24bc6ad49f799da95 WHIRLPOOL 8f09d95b7c6453617b549926be3e1d1b33a3b80354f940391492e35a9667530b44fe649272c9d75a6957720555e0196db0c462e47e56e1848c065d2375aa2610
+MISC ChangeLog 16710 SHA256 87310bc33532d915972709d8e36308bc0f5e9b21f63948bff612870c66b7f678 SHA512 01d7d1fa5ffa850336a4510ab4512682216b9336fb7bcf28c85eb1d50343f6c19e60ab0ebe2f64cccb614873a4196ddf807f64e208727769df8f7cd789e36756 WHIRLPOOL 8c9d3ad4b14a039010c9a7d58283f53094fe824064767389c64dec538bb327a426ad8361e48f88fb1e2e2d3badb70604d54aa2fb9009c6e9d90b81dddd677592
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRswP/AAoJELp701BxlEWfXAoP/0leZSfdriAsdXn0Yqgxx9Mi
-X/B36I4Ixlb4VARwcUKMTYotdJPZiD+5XPBQ1yn7exRaHqQota54iLvKceoTc/qF
-4tRhU/yQ+TVvG1dTLpMtIQwhrm1rfYDsb74z4ZFfAh8xSws2kz31euABmCwHemFN
-5uwPFSGbLd+bQq9+yWzHSnGzBUw7WVxRE/6y1UmfO4OvIr01Z6SnCSU8RqCADeDV
-FQFNGkUlG83uAyq3TUAPJd4JpA97rbsyXKGCVhhrR2KjJGoqDdMOeIKV/hZUOpow
-bm3oguNUczof08syqz1ikFzeL092aMis85MIA6qWG3jQampR/G/5y9dWg4DQff72
-aNTDyJTh9kTliJnQu4uaYtMUgKHoUt1yUnTXPBzmEMGniavZNE3hwypgWTZwpgpC
-U9BrspG7xW5eBg9DMXbvxa8beJIKVauvP0nznJab0zNrcVpqLueggJ9gsQHJchLr
-ZXentTBa+nrj/jCcGEAn4n3Z/7GjPe/02MqvwCk+JoHQ+63wm5+vsyLaNOld1lLy
-6NDzMtzlOKLu4UO0QL55ExD/VPCBy/CtZAP+MA+MnJT6tL6Bugas/Si/zOAI03iN
-ORGGa5Gmq7L10Q7pnWc5G3P+eTfV1Ai6S5YffWTyJI1wQky+bzKfIPCqzgWNZpcB
-eeTpoVr31dV1vMaaVj/b
-=5iH0
+iQEcBAEBCAAGBQJRtF0gAAoJEO+t9ga+3I3aad0H/2oYq4hkXSp6I86cuD5Od+yr
+8DniS6rTtIDwjCbp/8sSy9DnkjS+X/of6rHZmK/7KB7dXGQkzwy1JauXU+FNKR+0
+M3Zs2Rph8bBlJVoFvQSvuv+1klQ7HdjDKJEXWNcOI3B2xM/OR03008XEbAn4We2H
+M8/1Jf4FCuhNixjaFg1JcuSdbIpNTD5bRZ97uVwCf5D3u85ak2/guU9T8LccfXgl
+HlvyR11tpvw7lpddWybjN8sMRO3mg8KV5O6fkvWD98b/M+7pv9VC+qAs0cvHCO2X
+aE/XlUvGG4qig462c/3ZOpaeNkTMoeNfQTST9ERjKA5Qj8hMX+Xxoy2VCcBEy3M=
+=5/mV
 -----END PGP SIGNATURE-----
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)