Stabilise latest amd64 and x86. Drop older.

(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

4 files changed, 14 insertions, 76 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/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
-}