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

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 29 insertions, 56 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/Manifest b/net-irc/konversation/Manifest
index f9b7f97fd435..06bd9991ef06 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -8,17 +8,15 @@ AUX konversation-1.0.1-serverlist-compiz-workaround.patch 1325 RMD160 c2ce401bd3
 AUX konversation-1.1-desktop-entry-fix.diff 608 RMD160 bcaaa36a61a35808072c9086e89e237f23f4244f SHA1 26ee600729d1b2adc54ee0959cb60374da083477 SHA256 0246e081c5a9066ec92b29c45009302c796dc9affbbd0c7530495b1d07491f67
 DIST konversation-1.0.1.tar.bz2 5848563 RMD160 1cf79a87f451aa2718560f00ddf987b68938310a SHA1 7e4b2356e942848fb83584db1bf2a1b6ef63234d SHA256 8be736289c52c21fe5ada7dd153767abd5155424a510ab9781b9d2f585cc00fd
 DIST konversation-1.1.tar.bz2 5468714 RMD160 ce79f6ec97cc8d7b048b15898d02eb87b4ea02ce SHA1 9b2984a0535c9c148f62c9e4d651366e6e875bd9 SHA256 3ef15e7a46c10a11aa369ff80dd33b3e2feb54834dfc036d3609c1ed94476d33
-DIST konversation-1.1rc1.tar.bz2 5117865 RMD160 b8c330a0a7080995991bc0fc4a637c4cd1b83dd2 SHA1 9aba7fb2901a018ccee5cfd0fd8c0ef595a38cdc SHA256 9e3aec2ac383e8ec2448d5b2e322b61cb445cdb396b61c20b02d440b0f42e3fb
-EBUILD konversation-1.0.1-r3.ebuild 1048 RMD160 36f4e2f67a2b360b13a34d60422ff1e6837e3e67 SHA1 f77a8f5b47bf39c0ebcd06dfabdd533b82bba85b SHA256 890d15437b4219a895cd2360ad8eea8c22ad9a51f746f576770296f3b8e60181
 EBUILD konversation-1.0.1-r4.ebuild 1101 RMD160 10763a184bdb6bc60d10cb0a7eac024d7526e7c1 SHA1 3bda2eee46308334dabcd1e8a118b11fcc3ba66d SHA256 d219db37751d715e34f579d16d733fa8e8c884c738969370a33a2c80a12e7f51
+EBUILD konversation-1.1-r1.ebuild 1014 RMD160 55861b8568281f078ec1d83e1440d8291ec3b5f3 SHA1 b2b338f1e25783d20ebe7c2197fb8762d18088d7 SHA256 79b29dade65c69b7fc832c41643f55ec3d7ce90e6ed521a4ca587d1ede4ce90b
 EBUILD konversation-1.1.ebuild 931 RMD160 560ab9ba9083318fc399a8a398c449b5faa919fa SHA1 16dd2f23bb9f64dece05ccb7a6e27030f968284c SHA256 e0a4b6347c1b7a4bcdcfc54bad3c6cbd58cf0ecb49e13b1e82049084487681fa
-EBUILD konversation-1.1_rc1.ebuild 997 RMD160 a8114b683241217e27e793aec27c6b841c77b0be SHA1 9c14c5810b807d6bc275078df74ce2c68a0da666 SHA256 734c80d3b69021a1f90368acd099ae16a011014ea00920d3fc8ccdf4d58a6e21
-MISC ChangeLog 9679 RMD160 2d067a034bd894b6091593d10cac6032e83c3c93 SHA1 be724c7891ddf6be80db219b33b8f0d9c99b465a SHA256 9142f4b95c492c2a471110f3752bb799f029ab7ea9f03471160152db5b53ab3b
+MISC ChangeLog 9948 RMD160 e8ee33ac4fe50b5446f8d85bfeaa8c68dfd44793 SHA1 ed079c90b1a9631816c6bd7505c02b1a4437b535 SHA256 f11ab7d7770ea23094110e868706c8ecb1ee797df039af7e6a17aeb767f91885
 MISC metadata.xml 177 RMD160 8850c5b17b8777a62f670a0ade3bab8144c2b2dc SHA1 500abb13eb9ab623336557bb1246056b39896046 SHA256 0d969af6afa28170dac4b321dd8489b27d322f49f40c39aa3f614953f85292ce
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkjfqCcACgkQt3UOBHx+2m8/ogCfcxmnTZuoVyroPKdsJObpfvXm
-56oAnAj/kqvCn3i9XP5sNcpd1s+raovQ
-=BqaE
+iEYEARECAAYFAkoVOukACgkQjDdoMVfcAHg6kQCeJEwOXg/hR2YMsbxTu0WtWK/s
+70oAoNxgYvuXylDHKZmfCCRdCVYfalER
+=l4rB
 -----END PGP SIGNATURE-----
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
 }