Stabilise latest amd64 and x86. Drop older.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

5 files changed, 16 insertions, 82 deletions

diff --git a/net-irc/konversation/ChangeLog b/net-irc/konversation/ChangeLog
index 5f3f59efe511..404dd31c1b6f 100644
--- a/net-irc/konversation/ChangeLog
+++ b/net-irc/konversation/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/konversation
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.102 2010/08/09 12:58:20 scarabeus Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.103 2011/01/28 15:50:12 scarabeus Exp $
+
+  28 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -konversation-1.2.3.ebuild, -konversation-1.3.ebuild,
+  konversation-1.3.1.ebuild:
+  Stabilise latest amd64 and x86. Drop older.
 
   09 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   konversation-1.3.ebuild, konversation-1.3.1.ebuild:
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index 6a251aa6ddb4..6631b7a2fcea 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,8 +1,4 @@
-DIST konversation-1.2.3.tar.bz2 2997272 RMD160 87d03ec13d90f74d991ff139f9f2e7125c5dd0ef SHA1 792fa864fe3e0de0c0cb994ce97f68345f57d09f SHA256 afca39a2f6a1e5324a1e05390efc694f2aecfe4836f9131110ebac479991001a
 DIST konversation-1.3.1.tar.bz2 3275849 RMD160 ad02eea73eff28de2b25f4ba384b785dd75249c6 SHA1 dd3e1436b769cf11218859b851a0c9b9623dbb12 SHA256 d4419797dfcd76d02ebfc3849770ebfd7407670dd0960a1b099e696ae2662f72
-DIST konversation-1.3.tar.bz2 3265147 RMD160 70c5b01d83fd7809049d3b809591e216068a35bd SHA1 f72e00f1abf7895b390a8916ad7fc7c725505830 SHA256 3661ecf3104d43ffbc0bb344b5e8fa2683732166f9f8e6fd89477d4c6439fa15
-EBUILD konversation-1.2.3.ebuild 902 RMD160 7b5f00227db0dd9d685268257e81b7c7a9873e4d SHA1 d64dfd2bc9de92e5c24d4c7b60153702d8f96e14 SHA256 da0d1ec4df3b41e67a963d0f3bdcf11ea79ca2a81713e075423b3d25c71d834b
-EBUILD konversation-1.3.1.ebuild 975 RMD160 3fd33eb55180c53da958ac8b7136c27cabd86a93 SHA1 aad431a84620315aab851dd1aa7a0452e4b6b652 SHA256 81c40b07bf3a87626a39f89dd65e80da931fb9d98c4ad69c5c80a98c26a161ef
-EBUILD konversation-1.3.ebuild 974 RMD160 74335c59bed968aa9ffd5827fe82bda086c4abd3 SHA1 d759a48f7772f622d49e5976aa0441d2158b9ec2 SHA256 a8dc08924c00b9cb9d081e88a5516909f114c3582fd806f0156ff949c2bab3ee
-MISC ChangeLog 14976 RMD160 83faf2f3e9b93f565928b882b787a883588df21f SHA1 db3ae9228f4348b05f6104dcf969e5d9ead095c1 SHA256 868a991e640fec32a4a7c94693280e0a667d9b7ed734ac4830f444a3dbd0d5e9
+EBUILD konversation-1.3.1.ebuild 980 RMD160 523b0ebaf37dd045eb2216486728a45b1abc12e5 SHA1 b19721ccca1083a2e22ce72ad0a8569432f8aaab SHA256 9e6979666e1d15f6c13ae847b372908fadb13d9c7654fdd4a9c064c000b02c4b
+MISC ChangeLog 15163 RMD160 66939045bb6df07fdc4127c58ed53da165f51f85 SHA1 ab30e52b010f59003a63405984d9044915c5d7c6 SHA256 fa03a124ec1475964a2b61c11183114d416bfb608469fbec393118dc10868ec0
 MISC metadata.xml 177 RMD160 8850c5b17b8777a62f670a0ade3bab8144c2b2dc SHA1 500abb13eb9ab623336557bb1246056b39896046 SHA256 0d969af6afa28170dac4b321dd8489b27d322f49f40c39aa3f614953f85292ce
diff --git a/net-irc/konversation/konversation-1.2.3.ebuild b/net-irc/konversation/konversation-1.2.3.ebuild
deleted file mode 100644
index aa7805fbbc26..000000000000
--- a/net-irc/konversation/konversation-1.2.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.2.3.ebuild,v 1.4 2010/06/15 09:27:00 phajdan.jr Exp $
-
-EAPI=2
-KDE_LINGUAS="bg ca cs da de el en_GB es et fi fr gl he hu it ja nb nds nl pl pt
-pt_BR ru sk sv tr uk zh_CN zh_TW"
-KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
-inherit kde4-base
-
-DESCRIPTION="A user friendly IRC Client for KDE4"
-HOMEPAGE="http://konversation.kde.org"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="+crypt debug +handbook"
-
-DEPEND="x11-libs/libXScrnSaver
-	>=kde-base/kdepimlibs-${KDE_MINIMAL}
-	crypt? ( app-crypt/qca:2 )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_configure() {
-	mycmakeargs+=(
-		$(cmake-utils_use_with crypt QCA2)
-		)
-
-	kde4-base_src_configure
-}
diff --git a/net-irc/konversation/konversation-1.3.1.ebuild b/net-irc/konversation/konversation-1.3.1.ebuild
index fd877978ff10..8cf83915cb98 100644
--- a/net-irc/konversation/konversation-1.3.1.ebuild
+++ b/net-irc/konversation/konversation-1.3.1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.3.1.ebuild,v 1.3 2010/08/09 12:58:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.3.1.ebuild,v 1.4 2011/01/28 15:50:12 scarabeus Exp $
 
-EAPI=2
+EAPI=3
 KDE_LINGUAS="bg ca cs da de el en_GB es et fi fr gl hu it ja nb nds nl pa pl pt
 pt_BR ru sk sr sv tr uk zh_CN zh_TW"
 KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
+KDE_HANDBOOK="optional"
 inherit kde4-base
 
 MY_PV="${PV/_/-}"
@@ -16,11 +17,11 @@ SRC_URI="mirror://kde/stable/${PN}/${MY_PV}/src/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2 FDL-1.2"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="+crypt debug +handbook"
+KEYWORDS="amd64 x86"
+IUSE="+crypt debug"
 
 DEPEND="x11-libs/libXScrnSaver
-	>=kde-base/kdepimlibs-${KDE_MINIMAL}
+	$(add_kdebase_dep kdepimlibs)
 	crypt? ( app-crypt/qca:2 )"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
diff --git a/net-irc/konversation/konversation-1.3.ebuild b/net-irc/konversation/konversation-1.3.ebuild
deleted file mode 100644
index 2d52fdb24dce..000000000000
--- a/net-irc/konversation/konversation-1.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.3.ebuild,v 1.3 2010/08/09 12:58:20 scarabeus Exp $
-
-EAPI=2
-KDE_LINGUAS="bg ca cs da de el en_GB es et fi fr gl hu it ja nb nds nl pa pl pt
-pt_BR ru sk sr sv tr uk zh_CN zh_TW"
-KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
-inherit kde4-base
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="A user friendly IRC Client for KDE4"
-HOMEPAGE="http://konversation.kde.org"
-SRC_URI="mirror://kde/stable/${PN}/${MY_PV}/src/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="+crypt debug +handbook"
-
-DEPEND="x11-libs/libXScrnSaver
-	>=kde-base/kdepimlibs-${KDE_MINIMAL}
-	crypt? ( app-crypt/qca:2 )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	mycmakeargs+=(
-		$(cmake-utils_use_with crypt QCA2)
-		)
-
-	kde4-base_src_configure
-}