Remove old.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux i686

3 files changed, 19 insertions, 100 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index d640ad937786..86ead3e1d12e 100644
--- a/app-office/akonadi-server/ChangeLog
+++ b/app-office/akonadi-server/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/akonadi-server
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.74 2012/03/09 14:26:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.75 2012/03/12 09:53:24 johu Exp $
+
+  12 Mar 2012; Johannes Huber <johu@gentoo.org> -akonadi-server-1.5.2.ebuild:
+  Remove old.
 
   09 Mar 2012; Brent Baude <ranger@gentoo.org> akonadi-server-1.6.2-r1.ebuild:
   Marking akonadi-server-1.6.2-r1 ppc64 for bug 399661
diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
index afa163dacec5..f3a19db8ca96 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -1,10 +1,22 @@
-DIST akonadi-1.5.2.tar.bz2 209050 RMD160 51c4658fef5e9d638b2446d7e62f57d339225a7f SHA1 c5d24a2c553ec26e975ab51f98cf74a8a64af633 SHA256 4a4299ff360998c897a528f557013519cceb29be88ee4f235dd88aad41964e68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST akonadi-1.6.2.tar.bz2 211347 RMD160 d4f923054a794ecbb03fd6a13db4c9e69a57975c SHA1 f02302686f6e50be240d1e73280c00a10c8ccf11 SHA256 29e5cffbc806b30ded70ba486e71a2aaf0e7b9ea1a798881b2e9bf25535b1696
 DIST akonadi-1.7.0.tar.bz2 210281 RMD160 0125b31a02143be7e50f427162bc9e7d0421a94d SHA1 794be377ed42d6ec906a3c9eb36af28493d7ea56 SHA256 bfb9228d83c1dfe1787883682afc4b9ac8b35096888a2b1ba0d3bc604d96b580
 DIST akonadi-1.7.1.tar.bz2 210853 RMD160 39ddd2e37437ea5bbc912f5994684a1413bad06e SHA1 a6057bd1a1740568ed86ee9dfaf325e3c3f77662 SHA256 6e6042257df8f212d63a06423e6d391bbf26259d985613e88759b62c993ee8ac
-EBUILD akonadi-server-1.5.2.ebuild 2584 RMD160 4f6887690b628625bf47de41f23950c92bc1b381 SHA1 c0b02f63b700c88ba6689aaf15c35f21d32f5f4e SHA256 34062df58567a7f3056c25db5d9679a1d8639b26ae9874b5bc60cf0cd475a6a1
 EBUILD akonadi-server-1.6.2-r1.ebuild 2623 RMD160 c290dac7fe39d8c7b4162604fb7a6f1d39a6239e SHA1 9efbf674440b931915b81c69961c4a2736f7db06 SHA256 4d67544a6bff511a0f0e1ad15a8dcc88f4778b4e53af0c2a42880726ac78e684
 EBUILD akonadi-server-1.7.0.ebuild 2628 RMD160 c4aa77daec0f324cb89340ca52b0886524ee460f SHA1 aa45fa138d496bb77d7c06372c9cef9caeb9889e SHA256 205f8387d9cfa6d49342a1b32c9ae20ce9ea998fb70291d66ca23fabb69287a9
 EBUILD akonadi-server-1.7.1.ebuild 2628 RMD160 c9672eb71e3d4de0ee89310f849769c16b597b1b SHA1 16e900f2eb6fd64f086f25e809bacd7709f4540b SHA256 ee0dbd9ab50e22789bc22a0561e0f7a30b7d1e32f393fb6c3d69cea919bdaa4e
-MISC ChangeLog 11357 RMD160 94421a3efbec2e6a844705ec90d1d476c0f1a639 SHA1 39418ccf4edfb1b72aa2af48b98139b52478d7fa SHA256 16db977d3fbece9481ef109cb6b591044ddee5dac5dd5c51552709bd18d76674
+MISC ChangeLog 11448 RMD160 50db7e39c5757ba7fc4373e814fcdb83915de34c SHA1 0af89de025aa4a51efa20d5fbf0b6dc9f9813dcc SHA256 abd5a5eec2bbd9dad9f019f90f02835c731d6f1ad595bf24928d5d1873e2d91f
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJPXcjbAAoJEO+t9ga+3I3aNsoIALDgNwhh9CoiVGKnS2QoP97N
+kGZTs9WcvZeWRSPIxIBi9NagWurx3/SsyK2IKvTvugXqrCEwXjmMTPNQuXDf7Lfn
+Wu/S6ezsKV3AInxw+t1HvAo/HN8hcMSMYc1giT/cCJJNY6jHry6RZRRjbteWpl8d
++CnHPKAaTGz/Lmt7YauPWFbbqzt46+RI7d7lV3crtsHhDjjQXbrI5lKZebLQVctg
+rXtwiyxdK66xtjZW0GFsdtqGZW/twrppgfPA0gu4eam4b1Exx9+MBN6279OnJ/lT
+P77wM6NRrT6j72qYW2LzsloJ61Pp4p30fUyiqcJ8KnNgR3ZUvIBn9PPafeLYtP4=
+=ceGP
+-----END PGP SIGNATURE-----
diff --git a/app-office/akonadi-server/akonadi-server-1.5.2.ebuild b/app-office/akonadi-server/akonadi-server-1.5.2.ebuild
deleted file mode 100644
index a563031a1e02..000000000000
--- a/app-office/akonadi-server/akonadi-server-1.5.2.ebuild
+++ /dev/null
@@ -1,96 +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.2.ebuild,v 1.8 2011/10/17 17:08:57 jer Exp $
-
-EAPI=4
-
-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 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="mysql postgres +sqlite test"
-
-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}
-	postgres? ( dev-db/postgresql-server )
-"
-
-REQUIRED_USE="|| ( sqlite mysql postgres )"
-
-S=${WORKDIR}/${P/-server/}
-
-pkg_setup() {
-	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
-	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_configure() {
-	local mycmakeargs=(
-		"-DAKONADI_USE_STRIGI_SEARCH=OFF"
-		$(cmake-utils_use test AKONADI_BUILD_TESTS)
-		$(cmake-utils_use sqlite INSTALL_QSQLITE_IN_QT_PREFIX)
-	)
-
-	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 || die "doins failed"
-
-	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}"
-}