Version bump. Remove old.

Package-Manager: portage-2.2_rc44/cvs/Linux i686

4 files changed, 18 insertions, 29 deletions

diff --git a/net-irc/konversation/ChangeLog b/net-irc/konversation/ChangeLog
index 2b6c194f5d07..014f75442a60 100644
--- a/net-irc/konversation/ChangeLog
+++ b/net-irc/konversation/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/konversation
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.86 2009/10/07 21:40:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.87 2009/10/09 12:11:34 scarabeus Exp $
+
+*konversation-1.2 (09 Oct 2009)
+
+  09 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/1.2_rc1-debug.patch, -konversation-1.2_rc1-r1.ebuild,
+  +konversation-1.2.ebuild:
+  Remove old. Version bump to 1.2 Final.
 
 *konversation-1.2_rc1-r1 (07 Oct 2009)
 
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index ad845aced1f1..52ddce11d726 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,17 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 1.2_rc1-debug.patch 582 RMD160 8718aacea6e4a76c6281d79200bf8f2c8bfad693 SHA1 44d10a2bcc54a477a3f1f962f25e77eaa17fce59 SHA256 934eb9ca9ce7ccc3a146360b000c96ff4be899cb9e2d0672b5035cc01f80b1a1
 DIST konversation-1.1.tar.bz2 5468714 RMD160 ce79f6ec97cc8d7b048b15898d02eb87b4ea02ce SHA1 9b2984a0535c9c148f62c9e4d651366e6e875bd9 SHA256 3ef15e7a46c10a11aa369ff80dd33b3e2feb54834dfc036d3609c1ed94476d33
-DIST konversation-1.2-rc1.tar.bz2 2851528 RMD160 2baeae0e0dcd810d5a6b9328ad9e2f9c95e5ad02 SHA1 3c0a251e78b7b824623e106f4e1050c2f82ca213 SHA256 021b8f72f8efe1e71ada6909b916dcdad0c81b8a5e6247a5b49e8b2e465b62f3
+DIST konversation-1.2.tar.bz2 2869819 RMD160 23ec1abb185b2d1a69b003996f35cd33febaf384 SHA1 64376d427b628ccde56598cfc9be3d8f31d757fc SHA256 652425a4a1a7a9a5b563912ffcfca3447210d8c3fa7b8894289069548f87f49a
 EBUILD konversation-1.1-r1.ebuild 1006 RMD160 1f563f004ed1a8018d490c67b9848154991cfb0d SHA1 b5e9a87f7642062a5349d41b79131faf1cd24bed SHA256 2f6d128fcbb3a4d6c123ffbc91dea05aa5a070eb7b3380130a66cf0f19d60497
-EBUILD konversation-1.2_rc1-r1.ebuild 939 RMD160 3619d8806f90a5f0fe80687304d7d2deda0c9261 SHA1 592fd3a2a3f84d3a0fbe43c6998daac832fce2bc SHA256 539815119fb5c5db9418e36d543e3a09cfc4f9f962d18cefeca6a64408005c5f
-MISC ChangeLog 12659 RMD160 d254bba4fb5ac057dc1e0d46d8ab0d89fcf9069d SHA1 df3d79bd56483aadf61f3b2b6ee2f4ce630e6294 SHA256 874b3eacc8dc125ee1c50b9ed024d6c6d6b966dd8d7d82d6cbbbdd12e53835cd
+EBUILD konversation-1.2.ebuild 887 RMD160 19a4de99b5948045d8f193907aeb84e80fd7d59f SHA1 b5ba2173dac6806bf43cffba3e2379d8e6ce44cd SHA256 3a7dc1c00f9c522af5931305258ef036a759196a760229bde17621a799d2f10d
+MISC ChangeLog 12880 RMD160 4776e29ade592a215f75a00814dae5ea943707ba SHA1 3030a04f0fd646a4f652bc5b9bd8e428a15432ce SHA256 b0e49f099c9c520e3417057c252954886a8c0f1ab8d0dd77ac6e3a05304a8774
 MISC metadata.xml 177 RMD160 8850c5b17b8777a62f670a0ade3bab8144c2b2dc SHA1 500abb13eb9ab623336557bb1246056b39896046 SHA256 0d969af6afa28170dac4b321dd8489b27d322f49f40c39aa3f614953f85292ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkrNCtMACgkQHB6c3gNBRYd0xgCghWTM0B9wuHMUnnvT59Oqvgxk
-4skAoLAoXusH/amrf1DWG6egpDWIyMaG
-=CYdm
+iEYEARECAAYFAkrPKIAACgkQHB6c3gNBRYc3GACbBEWZJOlFYrmU/350C0avdNOh
+5TAAoMlTRjmrkaTjvmSz/4N1cKCane6t
+=jyR8
 -----END PGP SIGNATURE-----
diff --git a/net-irc/konversation/files/1.2_rc1-debug.patch b/net-irc/konversation/files/1.2_rc1-debug.patch
deleted file mode 100644
index 1b5b4bff4c59..000000000000
--- a/net-irc/konversation/files/1.2_rc1-debug.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: trunk/extragear/network/konversation/src/viewer/ircview.cpp
-===================================================================
---- trunk/extragear/network/konversation/src/viewer/ircview.cpp	(revision 1032161)
-+++ trunk/extragear/network/konversation/src/viewer/ircview.cpp	(revision 1032162)
-@@ -856,8 +856,6 @@
- 
-     KTextBrowser::append(line);
- 
--    Q_ASSERT(document()->rootFrame()->childFrames().count() == 0); // no child frames, see SelectionPin
--
-     QTextCursor formatCursor(document()->lastBlock());
-     QTextBlockFormat format = formatCursor.blockFormat();
- 
diff --git a/net-irc/konversation/konversation-1.2_rc1-r1.ebuild b/net-irc/konversation/konversation-1.2.ebuild
index 4c0c91c5fc35..fd8a029b944e 100644
--- a/net-irc/konversation/konversation-1.2_rc1-r1.ebuild
+++ b/net-irc/konversation/konversation-1.2.ebuild
@@ -1,11 +1,11 @@
 # 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.2_rc1-r1.ebuild,v 1.1 2009/10/07 21:40:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.2.ebuild,v 1.1 2009/10/09 12:11:34 scarabeus Exp $
 
 EAPI="2"
 
-KDE_LINGUAS="ar bg ca  cs da de el en_GB es et fr gl hu it ja nds nl pa pt pt_BR ru sv
-tr uk zh_CN zh_TW"
+KDE_LINGUAS="ar bg ca  cs da de el en_GB es et fr gl he hu it ja nds nl pa pt
+pt_BR ru sv tr uk zh_CN zh_TW"
 inherit kde4-base versionator
 
 MY_PV=$(replace_version_separator 2 '-')
@@ -13,7 +13,7 @@ MY_P="${PN}"-"${MY_PV}"
 
 DESCRIPTION="A user friendly IRC Client for KDE4"
 HOMEPAGE="http://konversation.kde.org"
-SRC_URI="mirror://kde/unstable/${PN}/${MY_PV}/src/${MY_P}.tar.bz2"
+SRC_URI="mirror://kde/stable/${PN}/${MY_PV}/src/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
@@ -28,10 +28,6 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-	"${FILESDIR}"/${PV}-debug.patch
-)
-
 src_configure() {
 	mycmakeargs="$(cmake-utils_use_with crypt QCA2)"
 	kde4-base_src_configure