Remove old.

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

4 files changed, 14 insertions, 216 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index 965dd379fcc1..d1ff6cde553b 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.81 2012/03/28 05:40:24 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.82 2012/03/28 06:34:12 johu Exp $
+
+  28 Mar 2012; Johannes Huber <johu@gentoo.org> -akonadi-server-1.6.2-r1.ebuild,
+  -akonadi-server-1.7.0.ebuild:
+  Remove old.
 
   28 Mar 2012; Markus Meier <maekke@gentoo.org> akonadi-server-1.7.1.ebuild:
   add ~arm, bug #408485
diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
index 9a1eaf316815..9e03fea7ad1d 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+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.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 2638 RMD160 9edd77d84f91c6e7bf56316b72c72c5aa9f8c6d0 SHA1 bece6bdeb167a9cecc49c1e714f576586800e9c9 SHA256 1c70a6d5cbf237862014511e1e81376740a82452af422f8b97a6174a479464ee
-MISC ChangeLog 12194 RMD160 3b7367e3ba4772f1016f88fdc82935f61bbebaf0 SHA1 e4fd289052527305457dd7062918f5a0769fce98 SHA256 446ec468018c9e46072721fd542c160070feaa6b3169e47201cb5b24a0a783d4
+MISC ChangeLog 12320 RMD160 03aee24900222ad20d07762d164853685c74aa30 SHA1 e268397a9f1e6040bbad95ee8850431036ec445f SHA256 f27d5a04fdfd4ddcf6eb20c84f3852884d358df2a4bd00c2215383250cec48d4
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9ypPEACgkQkKaRLQcq0GJ8sgCfUqqWOZSQzTtxh7rulQeLJhvh
-pa4AnRFwpq7wnMFP61lq5CeH3NQKDctr
-=wJ+I
+iQEcBAEBCgAGBQJPcrD2AAoJEO+t9ga+3I3aFfUH/2D59KKKRLXTWzU6npVwd33q
+9EJnoFk5d8xte8lBju/5IgVydsnLpByZQdDPtx86jd8T7nQhmLzKsoaDnlZx0l/O
+D+7P98w2l5mFKbf9fYGjXYi32WWTyQy+z6qBT4KU1lGAGo5Qi7U3DUbjBM1r66po
+r0Eo2DOcuviXJLLzRCofq7rVqyjQyfJzkajI5iWGFYSoeJGu3UyOH+gL+nVOF7PL
+Sdg+bGdpy2pa6qT5jj4WyfpNqo61+iLlMsHqWNq7EzA1O4hkp4bhSK0YyFANtojo
+/BCG5FbFfoAlcZeNMFNO/serHW59YMWKYpxhAecozFES4JHY+EVhlvB2B5bIhL8=
+=tNj/
 -----END PGP SIGNATURE-----
diff --git a/app-office/akonadi-server/akonadi-server-1.6.2-r1.ebuild b/app-office/akonadi-server/akonadi-server-1.6.2-r1.ebuild
deleted file mode 100644
index 6b5b530bab25..000000000000
--- a/app-office/akonadi-server/akonadi-server-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2012 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.6.2-r1.ebuild,v 1.5 2012/03/09 14:26:12 ranger Exp $
-
-EAPI=4
-
-inherit cmake-utils
-
-DESCRIPTION="The server part of Akonadi"
-HOMEPAGE="http://pim.kde.org/akonadi"
-SRC_URI="mirror://kde/stable/${PN/-server/}/src/${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.6.51
-	>=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
-	# reverse driver check to keep the order
-
-	if use postgres; then
-		DRIVER="QPSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use mysql; then
-		DRIVER="QMYSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use sqlite; then
-		DRIVER="QSQLITE3"
-		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
-
-	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/akonadi-server-1.7.0.ebuild b/app-office/akonadi-server/akonadi-server-1.7.0.ebuild
deleted file mode 100644
index f07e4c8a67a7..000000000000
--- a/app-office/akonadi-server/akonadi-server-1.7.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2012 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.7.0.ebuild,v 1.2 2012/03/08 02:14:43 dilfridge Exp $
-
-EAPI=4
-
-inherit cmake-utils
-
-DESCRIPTION="The server part of Akonadi"
-HOMEPAGE="http://pim.kde.org/akonadi"
-SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="mysql postgres +sqlite test"
-
-CDEPEND="
-	dev-libs/boost
-	>=dev-libs/soprano-2.6.51
-	>=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 )"
-
-RESTRICT=test
-# bug 401139
-
-S=${WORKDIR}/${P/-server/}
-
-pkg_setup() {
-	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
-	# reverse driver check to keep the order
-	if use postgres; then
-		DRIVER="QPSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use mysql; then
-		DRIVER="QMYSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use sqlite; then
-		DRIVER="QSQLITE3"
-		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 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}"
-}