Remove old.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

5 files changed, 20 insertions, 315 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index 3d009289890f..bbeb9863eabe 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.153 2014/12/09 17:18:39 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.154 2014/12/09 17:27:38 kensington Exp $
+
+  09 Dec 2014; Michael Palimaka <kensington@gentoo.org>
+  -akonadi-server-1.11.0.ebuild, -akonadi-server-1.12.1-r1.ebuild,
+  -files/akonadi-server-1.12.1-db-initialize.patch:
+  Remove old.
 
   09 Dec 2014; Michael Palimaka <kensington@gentoo.org>
   akonadi-server-1.13.0.ebuild:
diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
index 427458c7b97b..4080f30524a6 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -1,30 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX akonadi-server-1.12.1-db-initialize.patch 1734 SHA256 5ad4ce105a6547f62df16729942ffdb3f845a08e3298b0e5e482e4fb41baf8fc SHA512 14be75191ee689f115bedc3e28655a6c70ca49fa1240a5b82aede5d977949bb4a314192715300f06978515192268b03b171359525a3edc6bbb7c3ed0d5d0ffe0 WHIRLPOOL b659d65e66659250ec29b82b7d7d33352d955c2bc97afc07eb4dfe15a5bff30dc743b693b7dc719bdd2b2b4bebe2fb9abab7fdaa6e39b45eb62e71b1ad2059c9
-DIST akonadi-1.12.1.tar.bz2 251899 SHA256 a073228fda8bdbcf836af32d4b4c44dcbe58a3eac6da4e5a286b42ace9d83145 SHA512 128af06874ec32be4205d8bfcae5ac044d1fade6b2c612cdfe801be20f179f2b70e8a6d48ef0427e4b419b6c1efa8eed3b9d741765750f36fb89e909da8040a2 WHIRLPOOL c83fa6395982b5d06d8f877c833e2b1fe0bd4d3906f4a3f8aa86b78b946019bbea6b5d507026e3675001e82925d144afc1ed51ebfec0ec6e40a6db0571464326
 DIST akonadi-1.13.0.tar.bz2 294198 SHA256 8c7f690002ea22c139f3a64394aef2e816e00ca47fd971af7d54a66087356dd2 SHA512 4bf2026c3807b5493c9f63d0c2bff2e6db00fbe97a4e2c2f707aaa3bf4a848b70dd9657d8fa1743690e8eeefd967de4895c1329c6bb817a1d023fe398285222f WHIRLPOOL edc18247dd864af48395f4e3187f6a52cdaf4737959b317e3decb10caf138b97258a661eeb11a2ad11f2365fdd053a7c6fe63097ba71c24a12417ee71de54afb
-DIST akonadi-server-1.11.0.tar.bz2 235101 SHA256 0cb257509d53927241b71d85c42efb0b5776efc37fc8dc732e75f6813b8a264d SHA512 366f0e4a86038af5eb6603653e599076c66e84f59db57f4c56a89ec265be7e335f3f5d14444030a6f398e2361969ad85bc73357359da7ab8c307ec3c5d80ea40 WHIRLPOOL b050f5e1d5220ec512ab6e57cd083b652f03ef1e391fb336a51888aede7b0faf2f2ab58db6f6e67ee3fd7ceea8efcb54d5c3b1a6c224adf3deb41cb10b3c91d2
-EBUILD akonadi-server-1.11.0.ebuild 3117 SHA256 971aeafd1165f5886d81edd1335971de02b8ec9654ef62614411c1d7020b0e70 SHA512 8044d87c6b8ca75d7d4d9d2eb7673056ce16af6df56acf448e490d0fd1fc4e87e2bb914fb2cbbdada61e0db133c9c19bc7a55f870795f97e43ab93db82240723 WHIRLPOOL cb6da1ed1176d1dc070fdb020ab6a29347e9ad35fb97d8c509a8186e27243d614c25d794f8b321edd2c40423f00add7a68e2eb09b471b8b552f62050bf4cf05a
-EBUILD akonadi-server-1.12.1-r1.ebuild 3173 SHA256 c5e616160390c3bc81475ed31e060a3c4c9fe6c9761fcefab25d90e9d281090f SHA512 423860e434797e041a7406f58f56f6571a687e721106b14261ab578c146c4409dbbb76959bffab14dfbbc8c60c7a02d260b2cf09c638a794346784242c286404 WHIRLPOOL 70df76489616ca5e66188bf5ac666ac3b178a1d2f4e6d3aaea9795eb9858998063720668bd4549fdc4296a1af11db16ac4a8903f4a816bfc93d93751ee95617e
 EBUILD akonadi-server-1.13.0.ebuild 3380 SHA256 4593c70a4b2d951563a2c336008f771ed3a84e0b4d7c1582bb9913dfb6a46684 SHA512 00e6f643482da4ee8db35f018cc982843c89bd2ce71f7f6ecf1a46a82bf07352a2935f8fdb75ad76a939467bb5c76b2cd23f2f0869a643c2696fdec2eebafca8 WHIRLPOOL 6c12bf270e31d5482c262fd3c3307d148e24f6fc6f24ec05bfe570d90fd70a22a57a3fd9d4ef474faa426a1eac907384665b3b67633c16e109b84f1652838ad7
-MISC ChangeLog 22557 SHA256 f39ed94ff69dbc8d755908b581f53110cf53218763c45f72e129d4ee5cc5d807 SHA512 7de29fa63fa10d22153562db7e806ceaaa26eb3ec699b29684ef77b99c950ee53fe29703734b7d0fa684edda5d45041016315f72fb9e3a4fff7d985d18fa12bc WHIRLPOOL f138d2aa0d2fea9fad8c2952d3fcf30548522737051c47b64dfcf904b40c48cf646a9f9670656f5684fc109a3e4ff448e024e41ca6b61fd7797f372d2d3778f7
+MISC ChangeLog 22747 SHA256 a215b82d565b09ef68049dc9702dd655d17f44bf92b1756858ae5581c637e230 SHA512 a7d264029cfddf9c5ec1806e67fa75720ad01119d80b7a20e872db0f05e75723863452eda57d40dbd8e536a370dae781d0550258729a52d0360e4a064cddd26e WHIRLPOOL c426c388255683904901c75724f4ab705dc32c2c80668e7ef186b4df3d88abcd46e39443eca3314be1362491d03e186ee5e60264d1e9bf6c54417cd4512a3250
 MISC metadata.xml 275 SHA256 0602f046fd341806f78a5850c099f697359bcac7eb67327fafb3339bb44c3700 SHA512 18330303bd7767d1dfc9398a35fd59fea5337227056dba883f25f5624ab9fbebbe3bbee7a3f678f82033c07660f95da7c73325ac5a41fd7fed8db6950c2cfdbd WHIRLPOOL c7e9aa255e46fd3bacfa0a1a036673311fcf0dfdd03f28b7076c5c0361f635293095d2a9210750ece0755591ca3fd2d35a1e28bffa00b92c618a22403cec367b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJUhy8ARRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+iQJiBAEBCABMBQJUhzEcRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
 MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7N5cD/9NBZ1wjNga1f38cLakCA5kQNINQcRjYHhAne0mWP/tNz6k6j4FskIXjm/f
-M7TUTg3B8QDvx8NNzN90GVZqBgrlVXfthdd42NHrJI8I3xLLmtdub94agPowRagG
-bGarUkV+vh//Xb1IqhdHc/cq6oBA3vb4JAgCg9kuhCAX/o9oFbm07jeClzSSfB+3
-6VhthDHyckSzsl+GfFgBrpl816dgw25FSEMtg/KfgugDODerhN1vaYJ3EZJMAuZe
-w/mr1ux1nhNdyLnZb2LUrGooum5T42pKWYx6i0NJf0n7/FhNp5J0owcExBx0x5Dd
-CWG4lydt+ETCAI8oINXnYi8sDtXD+/rdJy3lx73ZV6u7JLrLFvvOXE9HgPyekTN8
-93YurFm1ndEJbgPuOvn9Po6eydOXGOwYmuIdNNhGU3UmWBx554V3S3224NcvDlD8
-cWXdR/oFW8rfx1JcC8xeXemEWr9jVao9qGAG9qxLeWlaB0qaSF3/f826LgwCTU9D
-R692ycChtCrnPf+2e+eD0oTCepq6Dwj4lo/UYA+8Wr9FgT6eLh1SlG/GTk0u3ZBK
-hn9zX7R8xIDS/gHNvI882Pjrx3LlkdRZwRC2LcXGwyQJ6lVB3b121cOndmtL/hAB
-hAlNe3HLTomNp5LhlaRvI81GXZ/3B4QLI2GAtdU/0yTSPbu98A==
-=RJyO
+7IDpEACbFjeHa9nH9uRSX/4ZcqETVVAqL/7T1ZxI4lzPlPIILiNAd4zOg8OzlUGf
+cQQL61/assDIW5hs3CeD7Q04rqDWaqf5Vvo3jrc9kObF34jDcVgXbTtdusJSqiFI
+3oA/KAWQtApqIt3B7MeSQjwBMRLGH3H8uZIHddoRvuRr0124jY1gFMSWEIUchLwr
+cjCUCnao5Nhs+GrU3HhBIe9Q6fkciZz7Zj0UWaNvfIkkhCzct21kohwTWmiN+5HC
+U2VOG7h4noyncId92ZpCJGQyX68V9H2OYF9Mm6Ex21lmyjU81aTVYQ2B1JDgeleU
+Lg7anhseWpqCNWD2XwYbZ+Eq4aogWmN2gP4ahKtbRsZWuGI6ddeuQu85y5V1zZC3
+e9krgwhQcXIhzcO3esgVpJ+2er6TBDjP0+T4DrXlqU8qYASJGNVFT+XYuyU+ri0E
+54tcBk1f4n4KmrL1cK9W0Fdp7qjnkdBsRNpf/dkvBI8mUhB+ehLv1qbYJXwajUfF
+REV38lTx0miX1H6Al++tlZmd5HLIJPAaltLfb3WMmNWApGePT9kQfFhDJRWDt8gY
+KwHuul43kMxJl8SX9fnADTuBURXaD7Q8QgPPpk25DBBeqD2VBT8tS5C8725hacJh
+MXhtlpbgam4/I0RIBznmSElzvneYAeIhbmKQtFLHwmWwlIZyvA==
+=b1G2
 -----END PGP SIGNATURE-----
diff --git a/app-office/akonadi-server/akonadi-server-1.11.0.ebuild b/app-office/akonadi-server/akonadi-server-1.11.0.ebuild
deleted file mode 100644
index c3e3a6e883ed..000000000000
--- a/app-office/akonadi-server/akonadi-server-1.11.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2014 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.11.0.ebuild,v 1.7 2014/11/03 11:14:37 titanofold Exp $
-
-EAPI=5
-
-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/${PN/-server/}-${PV}.tar.bz2 -> ${P}.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 +qt4 qt5 sqlite test"
-
-REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
-
-CDEPEND="
-	dev-libs/boost:=
-	>=dev-libs/soprano-2.6.51
-	x11-misc/shared-mime-info
-	qt4? (
-		>=dev-qt/qtcore-4.8.5:4
-		>=dev-qt/qtdbus-4.8.5:4
-		>=dev-qt/qtgui-4.8.5:4
-		>=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
-		>=dev-qt/qttest-4.8.5:4
-	)
-	qt5? (
-		>=dev-libs/soprano-2.6.51[-qt4,qt5]
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsql:5[mysql?,postgres?]
-		dev-qt/qttest:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${CDEPEND}
-	dev-libs/libxslt
-	>=dev-util/automoc-0.9.88
-	test? ( sys-apps/dbus )
-"
-RDEPEND="${CDEPEND}
-	postgres? ( virtual/postgresql[server] )
-"
-
-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 MySQL is recommend by upstream
-	if use sqlite || has_version "<${CATEGORY}/${P}[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 "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
-		$(cmake-utils_use test AKONADI_BUILD_TESTS)
-		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
-		$(cmake-utils_use qt5 QT5_BUILD)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	export $(dbus-launch)
-	cmake-utils_src_test
-}
-
-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() {
-	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/akonadi-server-1.12.1-r1.ebuild b/app-office/akonadi-server/akonadi-server-1.12.1-r1.ebuild
deleted file mode 100644
index d6764a2df3f2..000000000000
--- a/app-office/akonadi-server/akonadi-server-1.12.1-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2014 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.12.1-r1.ebuild,v 1.6 2014/11/03 11:14:37 titanofold Exp $
-
-EAPI=5
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-r3
-	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 +qt4 qt5 soprano sqlite test"
-
-REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
-
-CDEPEND="
-	dev-libs/boost:=
-	x11-misc/shared-mime-info
-	qt4? (
-		>=dev-qt/qtcore-4.8.5:4
-		>=dev-qt/qtdbus-4.8.5:4
-		>=dev-qt/qtgui-4.8.5:4
-		>=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
-		>=dev-qt/qttest-4.8.5:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsql:5[mysql?,postgres?]
-		dev-qt/qttest:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		soprano? ( dev-libs/soprano[-qt4,qt5] )
-	)
-	soprano? ( dev-libs/soprano )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${CDEPEND}
-	dev-libs/libxslt
-	>=dev-util/automoc-0.9.88
-	test? ( sys-apps/dbus )
-"
-RDEPEND="${CDEPEND}
-	postgres? ( virtual/postgresql[server] )
-"
-
-PATCHES=( "${FILESDIR}/${P}-db-initialize.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 MySQL is recommend by upstream
-	if use sqlite || has_version "<${CATEGORY}/${P}[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 "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
-		ewarn "Available drivers are:${AVAILABLE}"
-		ewarn
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
-		$(cmake-utils_use test AKONADI_BUILD_TESTS)
-		$(cmake-utils_use_with soprano)
-		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
-		$(cmake-utils_use qt5 QT5_BUILD)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	export $(dbus-launch)
-	cmake-utils_src_test
-}
-
-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() {
-	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.12.1-db-initialize.patch b/app-office/akonadi-server/files/akonadi-server-1.12.1-db-initialize.patch
deleted file mode 100644
index a36706764199..000000000000
--- a/app-office/akonadi-server/files/akonadi-server-1.12.1-db-initialize.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-commit 4ca8b846baaad48ebbd723f6411f9571a3b0f5ad
-Author: Dan Vrátil <dvratil@redhat.com>
-Date:   Tue Apr 22 11:28:07 2014 +0200
-
-    Remove the invalid GID part from PartTable before starting PartTable migration
-    
-    More people than we expected have invalid 'GID' part in their PartTable,
-    which breaks migration to schema 25, because it expects all part types
-    to have a valid name.
-    
-    To work around this fact, we DELETE all parts with name 'GID' from PartTable
-    before starting the actual migration. This will not fix the migration for
-    people with other invalid parts, but I haven't heard of any such. To make
-    this completely bullet-proof, we would need to iterate through all entries,
-    which would be massively slower than current INSERT INTO ... SELECT FROM approach.
-    
-    Distributions, this is a good choice for backporting into 1.12.1 ;-)
-    
-    BUG: 331867
-    FIXED-IN: 1.12.2
-
-diff --git a/server/src/storage/dbupdater.cpp b/server/src/storage/dbupdater.cpp
-index ccaf584..d6368b5 100644
---- a/server/src/storage/dbupdater.cpp
-+++ b/server/src/storage/dbupdater.cpp
-@@ -261,6 +261,15 @@ bool DbUpdater::complexUpdate_25()
-     }
-   }
- 
-+  {
-+    // It appears that more users than expected have the invalid "GID" part in their
-+    // PartTable, which breaks the migration below (see BKO#331867), so we apply this
-+    // wanna-be fix to remove the invalid part before we start the actual migration.
-+    QueryBuilder qb( QLatin1String( "PartTable" ), QueryBuilder::Delete );
-+    qb.addValueCondition( QLatin1String( "PartTable.name" ), Query::Equals, QLatin1String( "GID" ) );
-+    qb.exec();
-+  }
-+
-   akDebug() << "Creating a PartTable_new";
-   {
-     TableDescription description;