Remove old.

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

4 files changed, 14 insertions, 210 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index 8329b95e1cad..564f2f99035c 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.68 2012/01/16 20:56:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.69 2012/01/22 01:07:08 johu Exp $
+
+  22 Jan 2012; Johannes Huber <johu@gentoo.org> -akonadi-server-1.5.2-r1.ebuild,
+  -akonadi-server-1.6.2.ebuild:
+  Remove old.
 
   16 Jan 2012; Agostino Sarubbo <ago@gentoo.org>
   akonadi-server-1.6.2-r1.ebuild:
diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
index deb68366114e..5f417b1eef9c 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -3,20 +3,18 @@ Hash: SHA512
 
 DIST akonadi-1.5.2.tar.bz2 209050 RMD160 51c4658fef5e9d638b2446d7e62f57d339225a7f SHA1 c5d24a2c553ec26e975ab51f98cf74a8a64af633 SHA256 4a4299ff360998c897a528f557013519cceb29be88ee4f235dd88aad41964e68
 DIST akonadi-1.6.2.tar.bz2 211347 RMD160 d4f923054a794ecbb03fd6a13db4c9e69a57975c SHA1 f02302686f6e50be240d1e73280c00a10c8ccf11 SHA256 29e5cffbc806b30ded70ba486e71a2aaf0e7b9ea1a798881b2e9bf25535b1696
-EBUILD akonadi-server-1.5.2-r1.ebuild 2622 RMD160 0510d289a63d2a00cfcf9c95bfac3ddea3cfa9e3 SHA1 9c5e3af43ffec1d7e5b4e1a05216af5845c1b093 SHA256 ad04e58ffe3a43074f1243371c0955bb0f8d53a4e665936679d846d28d604e11
 EBUILD akonadi-server-1.5.2.ebuild 2584 RMD160 4f6887690b628625bf47de41f23950c92bc1b381 SHA1 c0b02f63b700c88ba6689aaf15c35f21d32f5f4e SHA256 34062df58567a7f3056c25db5d9679a1d8639b26ae9874b5bc60cf0cd475a6a1
 EBUILD akonadi-server-1.6.2-r1.ebuild 2621 RMD160 c2993992ef09fb392baf53408f39ccfc9e1cc6cc SHA1 cf2ad6cf43525794f1282c281a7ea8831f18a7a5 SHA256 2048d1c0ddb9c386aaba1e1567c8df46d325290698497d28030113c372645592
-EBUILD akonadi-server-1.6.2.ebuild 2575 RMD160 31aa58d7f177a37c28b83cea3a98dc38ee83dd40 SHA1 5c336de05f0d0a84c5c9a60cc69a26f5e4dce739 SHA256 239a79126a4acc93f5a63605234a9ea14359d7a12de727dbdeef8b8d704af8e1
-MISC ChangeLog 10564 RMD160 7ae5b0b4381f741a84c1bce7e5a719e4334cb14f SHA1 4e8c07b0c9a14f43406266ca7560f080e3d6ab45 SHA256 a7c5361eab947508369c9b970e6bd6e391e013aee6c5fb1050e70f404198464a
+MISC ChangeLog 10693 RMD160 9e57455278821bf4a9ac5c896c8f560fe56d20da SHA1 8cb4907fa157370d0628c0861400af61e66b5621 SHA256 5f805396d9ba608c7b15de20657c5643b64791464db05baa893abf20f372c5c3
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPFI7nAAoJEOTDgjZ80txdiS4H/AzYNY65jcrsrKimpsh7SKgL
-E1hHzveZjT4pT3/cNz4EEaohjOtgy+7HF2/UHPquxL470wPzGJJvVrMflXMateL8
-g83BI+zGZp1vhLZ5uZ4swvshV8utSsnSyfoi5ADu39X4k+kA3mQtogjLSp0xpdy8
-9PcctDVMuzxjTprKx10h975Lcl37+JonOnhFafJyVpsHm7pMSGj+gzUsEoCSKVq9
-W7Iywarw1G2XM1D7iKauGd6xZz8Vwj1ublqvF7NVfwKCCwOhifxIaeO/69ZWnKNf
-Od5hDQLrbZ9u73P/SCqz6WwTIFUlwPqWg3z5Vhiw0NsCiPhUx2A2iycRUqkC+rg=
-=5mAT
+iQEcBAEBCgAGBQJPG2IYAAoJEO+t9ga+3I3alTQIANSCHzHOTY5hfPA1AGN4E3yt
+GdG9cBPwmD/BO6nC9gaLdDhC73HE4NghXGSRSL7116KeUr3ig0LV5/a0nsrCw7/Z
+JQgAskDYFJEJI3pOEV/d00NAFVSDvQ7KKR4TxGpBINoOUsVwxg2KcxWUzg1u9c8D
+vNP7gso4WOCWQ9Kn7wvAlmJVvLPfDY5NUVBH2Ed4DflIChlIeVMfzpkpcR9479hP
+7UBJ1xEWYzLLQLbedOIEhMLMZCxPkSi1haLPCKw5gfzoM0F065cAyI+TbBGBMmim
+rcu4BF9/7JoLgfsI4oipGmUTc+FS2iaPwa4f2OGGvufC2N1D2ktASSf3YNC1MLo=
+=BgIL
 -----END PGP SIGNATURE-----
diff --git a/app-office/akonadi-server/akonadi-server-1.5.2-r1.ebuild b/app-office/akonadi-server/akonadi-server-1.5.2-r1.ebuild
deleted file mode 100644
index 8ce25e093020..000000000000
--- a/app-office/akonadi-server/akonadi-server-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,102 +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-r1.ebuild,v 1.1 2011/12/20 23:43:57 johu 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.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
-	# 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.6.2.ebuild b/app-office/akonadi-server/akonadi-server-1.6.2.ebuild
deleted file mode 100644
index c876fd1eb19a..000000000000
--- a/app-office/akonadi-server/akonadi-server-1.6.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.6.2.ebuild,v 1.4 2011/12/07 22:06:37 hwoarang 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
-	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
-
-	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}"
-}