Remove old and revision bump, EAPI 2 and slotted to 3.5, also fixes bug 246728

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 23 insertions, 48 deletions

diff --git a/net-irc/konversation/ChangeLog b/net-irc/konversation/ChangeLog
index 55bf7d8ddf1d..2effad6a77e3 100644
--- a/net-irc/konversation/ChangeLog
+++ b/net-irc/konversation/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-irc/konversation
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.70 2008/09/28 15:51:55 keytoaster Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.71 2009/05/21 11:28:33 tampakrap Exp $
+
+*konversation-1.1-r1 (21 May 2009)
+
+  21 May 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  -konversation-1.0.1-r3.ebuild, -konversation-1.1_rc1.ebuild,
+  +konversation-1.1-r1.ebuild:
+  Remove old and revision bump, EAPI-2 and slotted to 3.5, also fixes bug
+  246728
 
   28 Sep 2008; Tobias Heinlein <keytoaster@gentoo.org>
   files/konversation-1.0.1-konsolepanel.patch:
diff --git a/net-irc/konversation/konversation-1.0.1-r3.ebuild b/net-irc/konversation/konversation-1.0.1-r3.ebuild
deleted file mode 100644
index d83c86d0c773..000000000000
--- a/net-irc/konversation/konversation-1.0.1-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.0.1-r3.ebuild,v 1.7 2008/06/20 21:19:22 swegener Exp $
-
-LANGS="bg ca da de el en_GB es et fi fr hu it ja ka ko nl pt ru sr sr@Latn sv tr zh_TW
-	ar cs gl he lt pa pt_BR ta"
-LANGS_DOC="da es et it nl pt ru sv"
-
-USE_KEG_PACKAGING=1
-
-inherit kde
-
-DESCRIPTION="A user friendly IRC Client for KDE3.x"
-HOMEPAGE="http://konversation.kde.org/"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-need-kde 3
-
-PATCHES="${FILESDIR}/${P}-crash.patch
-		${FILESDIR}/${P}-konsolepanel.patch
-		${FILESDIR}/${P}-media-script-vulnerability.patch"
-
-pkg_postinst() {
-	kde_pkg_postinst
-
-	if ! has_version kde-base/konsole && ! has_version kde-base/kdebase; then
-		echo
-		elog "If you want to be able to use Konsole from inside ${PN}, please emerge either"
-		elog "kde-base/konsole or kde-base/kdebase."
-		echo
-	fi
-}
diff --git a/net-irc/konversation/konversation-1.1_rc1.ebuild b/net-irc/konversation/konversation-1.1-r1.ebuild
index 65acd8f6a607..84a3ad5029bc 100644
--- a/net-irc/konversation/konversation-1.1_rc1.ebuild
+++ b/net-irc/konversation/konversation-1.1-r1.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.1_rc1.ebuild,v 1.1 2008/07/15 17:21:44 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.1-r1.ebuild,v 1.1 2009/05/21 11:28:33 tampakrap Exp $
+
+EAPI="2"
 
 ARTS_REQUIRED="never"
+
 USE_KEG_PACKAGING=1
 
 inherit kde
@@ -14,25 +17,26 @@ DESCRIPTION="A user friendly IRC Client for KDE3.x"
 HOMEPAGE="http://konversation.kde.org/"
 SRC_URI="mirror://berlios/konversation/${MY_P}.tar.bz2"
 
-SLOT="0"
+SLOT="3.5"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-need-kde 3.5
+DEPEND="!<net-irc/konversation-1.1-r1"
+RDEPEND="${DEPEND}"
 
-LANGS="bg ca da de el es et fr gl he hu it ka ko pt sv"
-LANGS_DOC="da es et it pt sv"
+need-kde 3.5
 
-PATCHES="${FILESDIR}/konversation-1.1-desktop-entry-fix.diff"
+LANGS="ar bg ca da de el es et fi fr gl he hu it ja ka ko pa pt ru sr sv tr zh_CN zn_TW"
+LANGS_DOC="da es et it pt ru sv"
 
 pkg_postinst() {
 	kde_pkg_postinst
 
 	if ! has_version kde-base/konsole && ! has_version kde-base/kdebase; then
 		echo
-		elog "If you want to be able to use Konsole from inside ${PN}, please emerge either"
-		elog "kde-base/konsole:3.5 or kde-base/kdebase:3.5."
+		elog "If you want to be able to use Konsole from inside ${PN}, please emerge"
+		elog "kde-base/konsole:3.5"
 		echo
 	fi
 }