Added an upstream patch (thanks, Eike, for providing it only *minutes* after the report) to avoid a crash if konsole is not installed. Fixes bug 189057.

Package-Manager: portage-2.1.3.5

5 files changed, 130 insertions, 9 deletions

diff --git a/net-irc/konversation/ChangeLog b/net-irc/konversation/ChangeLog
index 2e0f5c049421..d5cc7eeba0b7 100644
--- a/net-irc/konversation/ChangeLog
+++ b/net-irc/konversation/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-irc/konversation
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.54 2007/06/27 12:17:46 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.55 2007/08/16 16:20:19 philantrop Exp $
+
+*konversation-1.0.1-r2 (16 Aug 2007)
+
+  16 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/konversation-1.0.1-konsolepanel.patch,
+  +konversation-1.0.1-r2.ebuild:
+  Added an upstream patch (thanks, Eike, for providing it only *minutes* after
+  the report) to avoid a crash if konsole is not installed. Fixes bug 189057.
 
   27 Jun 2007; Lars Weiler <pylon@gentoo.org> konversation-1.0.1-r1.ebuild:
   Stable on ppc; bug #182589.
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index 04e8eb8a9f19..6e990a06bd98 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -5,19 +5,27 @@ AUX konversation-1.0.1-crash.patch 827 RMD160 6c80c566c74ccf72bf8f92d51ddc1b1a25
 MD5 774e304ea1bc6c175e4911b794b5fd75 files/konversation-1.0.1-crash.patch 827
 RMD160 6c80c566c74ccf72bf8f92d51ddc1b1a25ed3de8 files/konversation-1.0.1-crash.patch 827
 SHA256 0e9db29683914ae972ba10dc60a25f35f2e2a907ca29aae14282f4a160c5b351 files/konversation-1.0.1-crash.patch 827
+AUX konversation-1.0.1-konsolepanel.patch 1586 RMD160 50be8366aa4276ad176206b5e559e37771094f35 SHA1 8036d5bf87ad370a0e6f9af42e7dda494c9337dd SHA256 20ce86652f7e2e4eb24e0a855e7c52dc12729a9139cf9f7ef29dffe35e49f56e
+MD5 282b693a31f6e76504c4dbc2ffb36708 files/konversation-1.0.1-konsolepanel.patch 1586
+RMD160 50be8366aa4276ad176206b5e559e37771094f35 files/konversation-1.0.1-konsolepanel.patch 1586
+SHA256 20ce86652f7e2e4eb24e0a855e7c52dc12729a9139cf9f7ef29dffe35e49f56e files/konversation-1.0.1-konsolepanel.patch 1586
 DIST konversation-1.0.1.tar.bz2 5848563 RMD160 1cf79a87f451aa2718560f00ddf987b68938310a SHA1 7e4b2356e942848fb83584db1bf2a1b6ef63234d SHA256 8be736289c52c21fe5ada7dd153767abd5155424a510ab9781b9d2f585cc00fd
 EBUILD konversation-1.0.1-r1.ebuild 699 RMD160 0c2ae48c2e1c762fb0eb8abc6b5b2c0f01b4b101 SHA1 c71ac2bc61ff07206c0dacc1d59e16353c892039 SHA256 20a4b22f973b576224f313cdef9834daba0c2ace8c4b71e004d46005cecc65cb
 MD5 5dbd7a25f72ed7ff92399ecea47e5aed konversation-1.0.1-r1.ebuild 699
 RMD160 0c2ae48c2e1c762fb0eb8abc6b5b2c0f01b4b101 konversation-1.0.1-r1.ebuild 699
 SHA256 20a4b22f973b576224f313cdef9834daba0c2ace8c4b71e004d46005cecc65cb konversation-1.0.1-r1.ebuild 699
+EBUILD konversation-1.0.1-r2.ebuild 1013 RMD160 a3ef6f2fe19429bcf0782c906daa429af4932231 SHA1 2e6a8e7bc107f9a5fc297109c31d5e8881cd2215 SHA256 a6db86ae0d4bb420210b9e0d4d7cd03b082d9601253eb5cbefa43e8c4aca3b51
+MD5 820a1e6eaae3ff937bfcce4a2e2774c2 konversation-1.0.1-r2.ebuild 1013
+RMD160 a3ef6f2fe19429bcf0782c906daa429af4932231 konversation-1.0.1-r2.ebuild 1013
+SHA256 a6db86ae0d4bb420210b9e0d4d7cd03b082d9601253eb5cbefa43e8c4aca3b51 konversation-1.0.1-r2.ebuild 1013
 EBUILD konversation-1.0.1.ebuild 657 RMD160 ab1ecf9bc9909dc27caab08fa9769b869c5855e5 SHA1 58d27e21dea113d894a43a934072840085514f72 SHA256 bd9d1bfc7640346582158a7f2f9475b8bf2a49964948ca3980e174841d6afac1
 MD5 ffaeb45abfc346c3329ead8b0941b7e0 konversation-1.0.1.ebuild 657
 RMD160 ab1ecf9bc9909dc27caab08fa9769b869c5855e5 konversation-1.0.1.ebuild 657
 SHA256 bd9d1bfc7640346582158a7f2f9475b8bf2a49964948ca3980e174841d6afac1 konversation-1.0.1.ebuild 657
-MISC ChangeLog 6914 RMD160 981837765f298af14fd18fc3b3bed94813f95e37 SHA1 867cc9fd21ac88ef17ff05520125b0bdbab11a6c SHA256 56f654fd8db01e611b4030234de1b967ef712e0edf32e763967ae878127599a4
-MD5 72e777a128b26fd297d96a363ac3bf26 ChangeLog 6914
-RMD160 981837765f298af14fd18fc3b3bed94813f95e37 ChangeLog 6914
-SHA256 56f654fd8db01e611b4030234de1b967ef712e0edf32e763967ae878127599a4 ChangeLog 6914
+MISC ChangeLog 7251 RMD160 20dd9c7facf304ac0240f4163e3682247552a7b2 SHA1 97235540061bdf386665e47693d63aa6f97594ef SHA256 a4a651ef1bfa2b8c80c1c990177138adce3d7a75e679148cfaa44376fa7c0a21
+MD5 696dc84da567c93206d5ac36016844ac ChangeLog 7251
+RMD160 20dd9c7facf304ac0240f4163e3682247552a7b2 ChangeLog 7251
+SHA256 a4a651ef1bfa2b8c80c1c990177138adce3d7a75e679148cfaa44376fa7c0a21 ChangeLog 7251
 MISC metadata.xml 177 RMD160 8850c5b17b8777a62f670a0ade3bab8144c2b2dc SHA1 500abb13eb9ab623336557bb1246056b39896046 SHA256 0d969af6afa28170dac4b321dd8489b27d322f49f40c39aa3f614953f85292ce
 MD5 71e1e6f08f072eec25aeb364865de8ef metadata.xml 177
 RMD160 8850c5b17b8777a62f670a0ade3bab8144c2b2dc metadata.xml 177
@@ -28,10 +36,13 @@ SHA256 e905fba1709b730342f4e0cb8b2791f8434aadd38cc90c2804123bfc7e864680 files/di
 MD5 7c7e86e03d533fc23d42a755deae605b files/digest-konversation-1.0.1-r1 262
 RMD160 ee7c62af8dabf95b5523d4e37bc502c9743c09f0 files/digest-konversation-1.0.1-r1 262
 SHA256 e905fba1709b730342f4e0cb8b2791f8434aadd38cc90c2804123bfc7e864680 files/digest-konversation-1.0.1-r1 262
+MD5 7c7e86e03d533fc23d42a755deae605b files/digest-konversation-1.0.1-r2 262
+RMD160 ee7c62af8dabf95b5523d4e37bc502c9743c09f0 files/digest-konversation-1.0.1-r2 262
+SHA256 e905fba1709b730342f4e0cb8b2791f8434aadd38cc90c2804123bfc7e864680 files/digest-konversation-1.0.1-r2 262
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGglVs6IPkARlRZfQRAovxAJ9hKGue5M8Rv6f8Scs936FRzykChwCfc/ZQ
-27kSnRQRdFDpdawRN3W4tu0=
-=2nHC
+iD8DBQFGxHlLCkvF58q80IkRAthRAKCKmNSVSQMKjGReblN3lD/HUBcneACgpXuf
+GI0NvZkaJOv/iFcLYtAoXGQ=
+=YY3e
 -----END PGP SIGNATURE-----
diff --git a/net-irc/konversation/files/digest-konversation-1.0.1-r2 b/net-irc/konversation/files/digest-konversation-1.0.1-r2
new file mode 100644
index 000000000000..f5304937b259
--- /dev/null
+++ b/net-irc/konversation/files/digest-konversation-1.0.1-r2
@@ -0,0 +1,3 @@
+MD5 60c2c5f94d4a916055db09728304b19f konversation-1.0.1.tar.bz2 5848563
+RMD160 1cf79a87f451aa2718560f00ddf987b68938310a konversation-1.0.1.tar.bz2 5848563
+SHA256 8be736289c52c21fe5ada7dd153767abd5155424a510ab9781b9d2f585cc00fd konversation-1.0.1.tar.bz2 5848563
diff --git a/net-irc/konversation/files/konversation-1.0.1-konsolepanel.patch b/net-irc/konversation/files/konversation-1.0.1-konsolepanel.patch
new file mode 100644
index 000000000000..42f08c19ca5e
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.0.1-konsolepanel.patch
@@ -0,0 +1,63 @@
+--- /var/tmp/portage/net-irc/konversation-1.0.1-r2/work/konversation-1.0.1/konversation/src/konsolepanel.h	2006-10-06 18:43:29.000000000 +0200
++++ konversation/src/konsolepanel.h	2007-08-16 16:25:09.000000000 +0200
+@@ -13,8 +13,10 @@
+ #define KONSOLE_PANEL_H
+ 
+ #include "chatwindow.h"
++
+ #include <kparts/part.h>
+ 
++
+ class KonsolePanel : public ChatWindow
+ {
+     Q_OBJECT
+@@ -25,6 +27,8 @@
+ 
+         virtual void setName(const QString& newName) { ChatWindow::setName(newName); }
+ 
++        QWidget* getWidget();
++
+     signals:
+         void closeView(ChatWindow* view);
+ 
+--- /var/tmp/portage/net-irc/konversation-1.0.1-r2/work/konversation-1.0.1/konversation/src/konsolepanel.cpp	2006-10-06 18:43:29.000000000 +0200
++++ konversation/src/konsolepanel.cpp	2007-08-16 16:25:09.000000000 +0200
+@@ -9,15 +9,16 @@
+   Copyright (C) 2003 Mickael Marchand <marchand@kde.org>
+ */
+ 
++#include "konsolepanel.h"
++#include "common.h"
++#include "viewcontainer.h"
++
+ #include <kdebug.h>
+ #include <klibloader.h>
+ #include <klocale.h>
+ 
+-#include "konsolepanel.h"
+-#include "common.h"
+-#include "viewcontainer.h"
+ 
+-KonsolePanel::KonsolePanel(QWidget *p) : ChatWindow( p )
++KonsolePanel::KonsolePanel(QWidget *p) : ChatWindow( p ), k_part (0)
+ {
+     setName(i18n("Konsole"));
+     setType(ChatWindow::Konsole);
+@@ -46,8 +47,17 @@
+     }
+ }
+ 
++QWidget* KonsolePanel::getWidget()
++{
++    if (k_part)
++        return k_part->widget();
++    else
++        return 0;
++}
++
+ void KonsolePanel::childAdjustFocus()
+ {
++    if (k_part) k_part->widget()->setFocus();
+ }
+ 
+ void KonsolePanel::partDestroyed()
diff --git a/net-irc/konversation/konversation-1.0.1-r2.ebuild b/net-irc/konversation/konversation-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..da4a70176140
--- /dev/null
+++ b/net-irc/konversation/konversation-1.0.1-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2007 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-r2.ebuild,v 1.1 2007/08/16 16:20:19 philantrop 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="http://download.berlios.de/${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"
+
+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
+}