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.

Package-Manager: portage-2.1.3.15

9 files changed, 64 insertions, 83 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/Manifest b/net-irc/konversation/Manifest
index 6e139b40a638..4b3e7b3b0c16 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -13,47 +13,37 @@ AUX konversation-1.0.1-media-script-vulnerability.patch 1963 RMD160 f7cc1a2dfe90
 MD5 4e7f4e0417fad74657ae3cf80648cf8a files/konversation-1.0.1-media-script-vulnerability.patch 1963
 RMD160 f7cc1a2dfe90ec33fab1c25b9a4895b4f87bcff3 files/konversation-1.0.1-media-script-vulnerability.patch 1963
 SHA256 40b6250533293cb37fd86aed31ac814c875d025f4798a01fc51af9de7e0fed48 files/konversation-1.0.1-media-script-vulnerability.patch 1963
+AUX konversation-1.0.1-serverlist-compiz-workaround.patch 1325 RMD160 c2ce401bd333f9c66c48b45c0120ce80275bf52d SHA1 dcd5e1a20fc49984375167c27279332715d2ce21 SHA256 2d382fd6a683c3b0f55d796225684f411ff177d849f29f77c6df2e65c98ac8c8
+MD5 41c059b2a4ce576d8ec90a63884c3d00 files/konversation-1.0.1-serverlist-compiz-workaround.patch 1325
+RMD160 c2ce401bd333f9c66c48b45c0120ce80275bf52d files/konversation-1.0.1-serverlist-compiz-workaround.patch 1325
+SHA256 2d382fd6a683c3b0f55d796225684f411ff177d849f29f77c6df2e65c98ac8c8 files/konversation-1.0.1-serverlist-compiz-workaround.patch 1325
 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-r3.ebuild 1055 RMD160 8b20b7a7d4cba5824d61fcd6e79d962afba9c1c8 SHA1 d1da034d22cf84fdc129b21bb1af28fe6b841f0f SHA256 041894a743b0870bf13e435c97426f3757993828ad3759053297aa8440892c5e
 MD5 4076864cfde08fe76e6bc078365b17e1 konversation-1.0.1-r3.ebuild 1055
 RMD160 8b20b7a7d4cba5824d61fcd6e79d962afba9c1c8 konversation-1.0.1-r3.ebuild 1055
 SHA256 041894a743b0870bf13e435c97426f3757993828ad3759053297aa8440892c5e konversation-1.0.1-r3.ebuild 1055
-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 8047 RMD160 c695c1aa30756a0c28d2e6ff4ff5f8358e06abd5 SHA1 3d2f0a971bca599ba07b93e8d35eb80ec5a9cf9c SHA256 c4b21473897995f5af772e40b2d1de5f35658638942ce0f51a98eaf520df2e24
-MD5 455f78486f014900b1b1373da6f435f3 ChangeLog 8047
-RMD160 c695c1aa30756a0c28d2e6ff4ff5f8358e06abd5 ChangeLog 8047
-SHA256 c4b21473897995f5af772e40b2d1de5f35658638942ce0f51a98eaf520df2e24 ChangeLog 8047
+EBUILD konversation-1.0.1-r4.ebuild 1119 RMD160 388042cfef4c429714da2a39afa1975ae1a0ebc9 SHA1 fd287b9dc39dfc2b4f4e7ce7dd0c7bb3b9b96451 SHA256 d7aecceb35aa23e2c5bb5649616ab3bb670624b5c502028a8b40c8072347ba54
+MD5 b73a15f5a69a3dcd764a7389a8fcc8e7 konversation-1.0.1-r4.ebuild 1119
+RMD160 388042cfef4c429714da2a39afa1975ae1a0ebc9 konversation-1.0.1-r4.ebuild 1119
+SHA256 d7aecceb35aa23e2c5bb5649616ab3bb670624b5c502028a8b40c8072347ba54 konversation-1.0.1-r4.ebuild 1119
+MISC ChangeLog 8560 RMD160 461a900e61cd0ab2a5e34d580c7b703f965f12f9 SHA1 5a6a2d65beb88b02d3f720c69e65a578c480990b SHA256 fa81149e5656949207dd9607e89c4126fde32e21ad22ebff2e521498755b1622
+MD5 2455da8369a434ebd7a5b36d2ae9ca9f ChangeLog 8560
+RMD160 461a900e61cd0ab2a5e34d580c7b703f965f12f9 ChangeLog 8560
+SHA256 fa81149e5656949207dd9607e89c4126fde32e21ad22ebff2e521498755b1622 ChangeLog 8560
 MISC metadata.xml 177 RMD160 8850c5b17b8777a62f670a0ade3bab8144c2b2dc SHA1 500abb13eb9ab623336557bb1246056b39896046 SHA256 0d969af6afa28170dac4b321dd8489b27d322f49f40c39aa3f614953f85292ce
 MD5 71e1e6f08f072eec25aeb364865de8ef metadata.xml 177
 RMD160 8850c5b17b8777a62f670a0ade3bab8144c2b2dc metadata.xml 177
 SHA256 0d969af6afa28170dac4b321dd8489b27d322f49f40c39aa3f614953f85292ce metadata.xml 177
-MD5 7c7e86e03d533fc23d42a755deae605b files/digest-konversation-1.0.1 262
-RMD160 ee7c62af8dabf95b5523d4e37bc502c9743c09f0 files/digest-konversation-1.0.1 262
-SHA256 e905fba1709b730342f4e0cb8b2791f8434aadd38cc90c2804123bfc7e864680 files/digest-konversation-1.0.1 262
-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
 MD5 7c7e86e03d533fc23d42a755deae605b files/digest-konversation-1.0.1-r3 262
 RMD160 ee7c62af8dabf95b5523d4e37bc502c9743c09f0 files/digest-konversation-1.0.1-r3 262
 SHA256 e905fba1709b730342f4e0cb8b2791f8434aadd38cc90c2804123bfc7e864680 files/digest-konversation-1.0.1-r3 262
+MD5 7c7e86e03d533fc23d42a755deae605b files/digest-konversation-1.0.1-r4 262
+RMD160 ee7c62af8dabf95b5523d4e37bc502c9743c09f0 files/digest-konversation-1.0.1-r4 262
+SHA256 e905fba1709b730342f4e0cb8b2791f8434aadd38cc90c2804123bfc7e864680 files/digest-konversation-1.0.1-r4 262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG6qvnz974XjDVpbkRArAeAJ9pp5zuk5vgpdbfuND/two1qph8VwCgsxdS
-5a4Lt04FQIvOPwEVZTt/A40=
-=Tqvy
+iD8DBQFHGlhMCkvF58q80IkRAiUGAKCD2dsEbEc1joBuUgjPCdoTZ8w8AACeMKql
+p9Ty51nmtFP8Tt0JiV0C2D4=
+=6Ls0
 -----END PGP SIGNATURE-----
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