Added an upstream patch that fixes a problem where there's a broken and unclosable server list window hanging around when Konversation is used in compiz/beryl. Thanks, Eike, for providing it! Removed obsolete versions.

(Portage version: 2.1.3.15)

8 files changed, 46 insertions, 55 deletions

diff --git a/net-irc/konversation/ChangeLog b/net-irc/konversation/ChangeLog
index 27cbccf25ed7..bfb34f79b532 100644
--- a/net-irc/konversation/ChangeLog
+++ b/net-irc/konversation/ChangeLog
@@ -1,6 +1,16 @@
 # 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.61 2007/09/14 15:42:12 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.62 2007/10/20 19:34:15 philantrop Exp $
+
+*konversation-1.0.1-r4 (20 Oct 2007)
+
+  20 Oct 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/konversation-1.0.1-serverlist-compiz-workaround.patch,
+  -konversation-1.0.1.ebuild, -konversation-1.0.1-r1.ebuild,
+  -konversation-1.0.1-r2.ebuild, +konversation-1.0.1-r4.ebuild:
+  Added an upstream patch that fixes a problem where there's a broken and
+  unclosable server list window hanging around when Konversation is used in
+  compiz/beryl. Thanks, Eike, for providing it! Removed obsolete versions.
 
   14 Sep 2007; Markus Ullmann <jokey@gentoo.org>
   konversation-1.0.1-r3.ebuild:
diff --git a/net-irc/konversation/files/digest-konversation-1.0.1-r1 b/net-irc/konversation/files/digest-konversation-1.0.1-r1
deleted file mode 100644
index f5304937b259..000000000000
--- a/net-irc/konversation/files/digest-konversation-1.0.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-konversation-1.0.1-r2 b/net-irc/konversation/files/digest-konversation-1.0.1-r2
deleted file mode 100644
index f5304937b259..000000000000
--- a/net-irc/konversation/files/digest-konversation-1.0.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-konversation-1.0.1 b/net-irc/konversation/files/digest-konversation-1.0.1-r4
index f5304937b259..f5304937b259 100644
--- a/net-irc/konversation/files/digest-konversation-1.0.1
+++ b/net-irc/konversation/files/digest-konversation-1.0.1-r4
diff --git a/net-irc/konversation/files/konversation-1.0.1-serverlist-compiz-workaround.patch b/net-irc/konversation/files/konversation-1.0.1-serverlist-compiz-workaround.patch
new file mode 100644
index 000000000000..4f58d5ab0f76
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.0.1-serverlist-compiz-workaround.patch
@@ -0,0 +1,31 @@
+--- konversation-1.0.1/konversation/src/konversationapplication.cpp	2006-10-06 18:43:29.000000000 +0200
++++ konversation-new/konversation/src/konversationapplication.cpp	2007-10-12 18:38:23.000000000 +0200
+@@ -126,7 +126,7 @@
+         emit appearanceChanged();
+         mainWindow->show();
+ 
+-        if (Preferences::showServerList()) mainWindow->openServerList();
++        bool openServerList = Preferences::showServerList();
+ 
+         // handle autoconnect on startup
+         Konversation::ServerGroupList serverGroups = Preferences::serverGroupList();
+@@ -135,12 +135,18 @@
+         {
+             for (Konversation::ServerGroupList::iterator it = serverGroups.begin(); it != serverGroups.end(); ++it)
+             {
+-                if ((*it)->autoConnectEnabled()) connectToServer((*it)->id());
++                if ((*it)->autoConnectEnabled())
++                {
++                    openServerList = false;
++                    connectToServer((*it)->id());
++                }
+             }
+         }
+         else
+             quickConnectToServer(m_hostName, m_port, m_channel, m_nick, m_password, m_useSSL);
+ 
++        if (openServerList) mainWindow->openServerList();
++
+         // prepare dcop interface
+         dcopObject = new KonvDCOP;
+         kapp->dcopClient()->setDefaultObject(dcopObject->objId());
diff --git a/net-irc/konversation/konversation-1.0.1-r1.ebuild b/net-irc/konversation/konversation-1.0.1-r1.ebuild
deleted file mode 100644
index 068efce8887f..000000000000
--- a/net-irc/konversation/konversation-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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-r1.ebuild,v 1.6 2007/06/27 12:17:46 pylon 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"
diff --git a/net-irc/konversation/konversation-1.0.1-r2.ebuild b/net-irc/konversation/konversation-1.0.1-r4.ebuild
index da4a70176140..eeba0700a920 100644
--- a/net-irc/konversation/konversation-1.0.1-r2.ebuild
+++ b/net-irc/konversation/konversation-1.0.1-r4.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.0.1-r4.ebuild,v 1.1 2007/10/20 19:34:15 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"
@@ -22,7 +22,9 @@ IUSE=""
 need-kde 3
 
 PATCHES="${FILESDIR}/${P}-crash.patch
-		${FILESDIR}/${P}-konsolepanel.patch"
+		${FILESDIR}/${P}-konsolepanel.patch
+		${FILESDIR}/${P}-media-script-vulnerability.patch
+		${FILESDIR}/${P}-serverlist-compiz-workaround.patch"
 
 pkg_postinst() {
 	kde_pkg_postinst
diff --git a/net-irc/konversation/konversation-1.0.1.ebuild b/net-irc/konversation/konversation-1.0.1.ebuild
deleted file mode 100644
index 22ea98774938..000000000000
--- a/net-irc/konversation/konversation-1.0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.5 2006/11/20 21:51:06 cryos 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