Fixed duplicate jabber messages, bug #199434, reported by Sebastian Lechte <seb AT stian.lechte.net>. Some other upsteam fixes.

Package-Manager: portage-2.1.3.19

6 files changed, 160 insertions, 11 deletions

diff --git a/net-im/sim/ChangeLog b/net-im/sim/ChangeLog
index 3c43b99b08f8..9030cfb01dd0 100644
--- a/net-im/sim/ChangeLog
+++ b/net-im/sim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/sim
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.79 2007/07/22 06:19:57 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.80 2007/11/17 17:23:45 pva Exp $
+
+*sim-0.9.4.3-r1 (17 Nov 2007)
+
+  17 Nov 2007; <pva@gentoo.org> +files/sim-0.9.4.3-double-message-fix.patch,
+  sim-0.9.4.3.ebuild, +sim-0.9.4.3-r1.ebuild:
+  Fixed duplicate jabber messages, bug #199434, reported by Sebastian Lechte
+  <seb AT stian.lechte.net>. Some other upsteam fixes.
 
   22 Jul 2007; <pva@gentoo.org> sim-0.9.4.3.ebuild:
   Removed virtual/x11 dependency.
diff --git a/net-im/sim/Manifest b/net-im/sim/Manifest
index bd7dd73724b6..a4b8eba694a2 100644
--- a/net-im/sim/Manifest
+++ b/net-im/sim/Manifest
@@ -1,12 +1,21 @@
+AUX sim-0.9.4.3-double-message-fix.patch 882 RMD160 adf7304d31d6cb90b4c64098b5ec993355d050fc SHA1 43d1dc1d32cc8a229b1ff6759f1e5bc6f6bdc627 SHA256 997d40dd9a23b55e02c8dc0a5c9bcf81de93b0dd0c2bea673961e1e31d76cc41
+MD5 0e8a31d6139f1564426eb32c3c562799 files/sim-0.9.4.3-double-message-fix.patch 882
+RMD160 adf7304d31d6cb90b4c64098b5ec993355d050fc files/sim-0.9.4.3-double-message-fix.patch 882
+SHA256 997d40dd9a23b55e02c8dc0a5c9bcf81de93b0dd0c2bea673961e1e31d76cc41 files/sim-0.9.4.3-double-message-fix.patch 882
+DIST sim-0.9.4.3-r1919_1924.patch.bz2 53044 RMD160 9982bc984fb8befe0680cae7115fdad575936458 SHA1 e8e7cc8da756f5e7686e416afe79a42cb76442d9 SHA256 80717eac7096c6a4b72edcf88c90926e0cd1e8760dd101f5a3986e6d3f16e17f
 DIST sim-0.9.4.3.tar.bz2 3251965 RMD160 2a1ced43d1e25e7b4fc95a88b7356c9991252d3c SHA1 6d181b4cb6b8470dd874a409578c02504f157b3e SHA256 305ee38897f11b2e68471d0f771f5487ac08e77f5ca2d47e2c350894ffc1a1b9
-EBUILD sim-0.9.4.3.ebuild 2594 RMD160 60d7836e6484eb69258d6acad611f245ce82bde9 SHA1 295d4c97287b485dd9b4ed02c55febb98cc91361 SHA256 95ddcbcdb5d5d95f804ac674bb9822d362414cbf3f3b6173433ef50c60d07813
-MD5 f28d30040366b79c66da7aea14ff5b8a sim-0.9.4.3.ebuild 2594
-RMD160 60d7836e6484eb69258d6acad611f245ce82bde9 sim-0.9.4.3.ebuild 2594
-SHA256 95ddcbcdb5d5d95f804ac674bb9822d362414cbf3f3b6173433ef50c60d07813 sim-0.9.4.3.ebuild 2594
-MISC ChangeLog 11404 RMD160 acff2858e5275ed49180b916f87c7640b9f3889e SHA1 256a904c2e1a65daa15cf1fafdcb0c8c113256dd SHA256 dad4e6d0b33b000f10676aecab7b6c322fc8b7aac284ca4258ce0a8cf144fb89
-MD5 312d2306b100bc883a9b6abbd611a650 ChangeLog 11404
-RMD160 acff2858e5275ed49180b916f87c7640b9f3889e ChangeLog 11404
-SHA256 dad4e6d0b33b000f10676aecab7b6c322fc8b7aac284ca4258ce0a8cf144fb89 ChangeLog 11404
+EBUILD sim-0.9.4.3-r1.ebuild 2731 RMD160 85c16141a7fdbbfafc372b86d1144303b7efe6e1 SHA1 2384a0d0f2a42ffb32b83d780d6d054a705b7d90 SHA256 60f524885499d110a330f732c5191fa54899f19acdcdf643f015ca35dc53debb
+MD5 ab94c7620685b0643ee2f49b3ba81595 sim-0.9.4.3-r1.ebuild 2731
+RMD160 85c16141a7fdbbfafc372b86d1144303b7efe6e1 sim-0.9.4.3-r1.ebuild 2731
+SHA256 60f524885499d110a330f732c5191fa54899f19acdcdf643f015ca35dc53debb sim-0.9.4.3-r1.ebuild 2731
+EBUILD sim-0.9.4.3.ebuild 2596 RMD160 e8e8af2802fdd5ff6d7c5d20fb0c356a9169d452 SHA1 8ca5a1a041a845a74bc93282986b3a14dfa3f1eb SHA256 fe6007bffc28af33686cfa982af2989b61810cdd16b26a8d030813fd7151cb92
+MD5 d729a5fe8026feba7aaa7fdbffe554f6 sim-0.9.4.3.ebuild 2596
+RMD160 e8e8af2802fdd5ff6d7c5d20fb0c356a9169d452 sim-0.9.4.3.ebuild 2596
+SHA256 fe6007bffc28af33686cfa982af2989b61810cdd16b26a8d030813fd7151cb92 sim-0.9.4.3.ebuild 2596
+MISC ChangeLog 11691 RMD160 cc2e17b4f5b7a5ad5df485d4ebe3d7e2f764c58f SHA1 458174703fe96e7fa9225fd2d9563d9c82401e0c SHA256 c967a374c69a0c00d495b8a34bc3aa579bc6ca2121e90d1dcb0c4f791b812d92
+MD5 edee3961320ec9838e7ae4fbb46cbc71 ChangeLog 11691
+RMD160 cc2e17b4f5b7a5ad5df485d4ebe3d7e2f764c58f ChangeLog 11691
+SHA256 c967a374c69a0c00d495b8a34bc3aa579bc6ca2121e90d1dcb0c4f791b812d92 ChangeLog 11691
 MISC metadata.xml 507 RMD160 7ff8ac8164276338a780a1e8441ca14b7f41a7e4 SHA1 b1b15267602a354ad1124c9eccf281b5b5960d2f SHA256 260177f2cc2f6010a6d29dccb4190b8d7480f5af803fb73bdf0ac151a685b92f
 MD5 3af162e57508c83727e10edddce8117b metadata.xml 507
 RMD160 7ff8ac8164276338a780a1e8441ca14b7f41a7e4 metadata.xml 507
@@ -14,3 +23,6 @@ SHA256 260177f2cc2f6010a6d29dccb4190b8d7480f5af803fb73bdf0ac151a685b92f metadata
 MD5 54eb49f6a317c6239d299de7ffc268cb files/digest-sim-0.9.4.3 241
 RMD160 c7b84f5c6c238d2e5e02f552f461ddf059e0ed7c files/digest-sim-0.9.4.3 241
 SHA256 3335593e5767bc7144383c647707d2b8ea04d511bad7327c17591337f9d2efd9 files/digest-sim-0.9.4.3 241
+MD5 55fd78610e42545c39e01bc7a8a40405 files/digest-sim-0.9.4.3-r1 515
+RMD160 0db1797e69a1753775afc9b1ca81d111ecd5b6d6 files/digest-sim-0.9.4.3-r1 515
+SHA256 8751d520d26dc45f55cce245ca57a368b44f92bfe7be53e4b5c6a37d0368d054 files/digest-sim-0.9.4.3-r1 515
diff --git a/net-im/sim/files/digest-sim-0.9.4.3-r1 b/net-im/sim/files/digest-sim-0.9.4.3-r1
new file mode 100644
index 000000000000..2bb858af2716
--- /dev/null
+++ b/net-im/sim/files/digest-sim-0.9.4.3-r1
@@ -0,0 +1,6 @@
+MD5 f941238d01e81705dfc42c7f3a626479 sim-0.9.4.3-r1919_1924.patch.bz2 53044
+RMD160 9982bc984fb8befe0680cae7115fdad575936458 sim-0.9.4.3-r1919_1924.patch.bz2 53044
+SHA256 80717eac7096c6a4b72edcf88c90926e0cd1e8760dd101f5a3986e6d3f16e17f sim-0.9.4.3-r1919_1924.patch.bz2 53044
+MD5 4bc30577e619e05252d394d51dc20747 sim-0.9.4.3.tar.bz2 3251965
+RMD160 2a1ced43d1e25e7b4fc95a88b7356c9991252d3c sim-0.9.4.3.tar.bz2 3251965
+SHA256 305ee38897f11b2e68471d0f771f5487ac08e77f5ca2d47e2c350894ffc1a1b9 sim-0.9.4.3.tar.bz2 3251965
diff --git a/net-im/sim/files/sim-0.9.4.3-double-message-fix.patch b/net-im/sim/files/sim-0.9.4.3-double-message-fix.patch
new file mode 100644
index 000000000000..1f0cb2bb1ff5
--- /dev/null
+++ b/net-im/sim/files/sim-0.9.4.3-double-message-fix.patch
@@ -0,0 +1,24 @@
+Patch fixes the issue of double message text display when receiving Jabber
+messages from some clients like Pidgin.
+
+Issue was reported as BerliOS.de bug #9681 (http://tinyurl.com/3bnss4)
+
+Patch extracted from http://tinyurl.com/yob7wm
+
+Prepared by Kir Kolyshkin <kir@openvz.org>, thanks to shaplov@
+
+--- sim-0.9.4.3/plugins/jabber/jabber_rosters.cpp.double-msg	2007-01-19 20:00:41.000000000 +0300
++++ sim-0.9.4.3/plugins/jabber/jabber_rosters.cpp	2007-10-10 01:43:44.000000000 +0400
+@@ -1413,9 +1413,10 @@
+     }
+     if (m_bEvent){
+         // Parsing <x xmlns='jabber:x:event'> tag, which contains JEP-0022 event info
+-        if (!strcmp(el, "composing"))
++        if (!strcmp(el, "composing")){
+             m_bCompose = true;
+-        return;
++            return;
++        }
+     }
+     if (!strcmp(el, "url-data")){
+         m_target = JabberClient::get_attr("target", attr);
diff --git a/net-im/sim/sim-0.9.4.3-r1.ebuild b/net-im/sim/sim-0.9.4.3-r1.ebuild
new file mode 100644
index 000000000000..cca148e403dc
--- /dev/null
+++ b/net-im/sim/sim-0.9.4.3-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.4.3-r1.ebuild,v 1.1 2007/11/17 17:23:45 pva Exp $
+
+inherit kde-functions eutils flag-o-matic
+
+DESCRIPTION="Simple Instant Messenger (with KDE support). ICQ/AIM/Jabber/MSN/Yahoo."
+HOMEPAGE="http://sim-im.org/"
+SRC_URI="http://download.berlios.de/sim-im/${P}.tar.bz2
+		mirror://gentoo/${P}-r1919_1924.patch.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug kde spell ssl"
+
+RESTRICT="fetch"
+
+# kdebase-data provides the icon "licq.png"
+RDEPEND="kde? ( kde-base/kdelibs
+				|| ( kde-base/kdebase-data kde-base/kdebase ) )
+		 !kde? ( $(qt_min_version 3)
+				 spell? ( app-text/aspell ) )
+		 ssl? ( dev-libs/openssl )
+		 dev-libs/libxml2
+		 dev-libs/libxslt
+		 sys-libs/zlib
+		 x11-libs/libXScrnSaver"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	app-arch/zip
+	x11-proto/scrnsaverproto"
+
+pkg_nofetch() {
+	einfo "${CATEGORY}/${P} contains icons and sounds with unclear licensing and thus"
+	einfo "you have to download and it put into ${DISTDIR} by yourself."
+	einfo "Download location:"
+	echo
+	einfo "${SRC_URI}"
+	echo
+	einfo "See http://archives.gentoo.org/gentoo-dev/msg_144003.xml for further"
+	einfo "information."
+}
+
+pkg_setup() {
+	if use kde ; then
+		if use spell; then
+			if ! built_with_use kde-base/kdelibs spell ; then
+				ewarn "kde-base/kdelibs were merged without spell in USE."
+				ewarn "Thus spelling will not work in sim. Please, either"
+				ewarn "reemerge kde-base/kdelibs with spell in USE or emerge"
+				ewarn 'sim with USE="-spell" to avoid this message.'
+				ebeep
+			fi
+		else
+			if built_with_use kde-base/kdelibs spell ; then
+				ewarn 'kde-base/kdelibs were merged with spell in USE.'
+				ewarn 'Thus spelling will work in sim. Please, either'
+				ewarn 'reemerge kde-base/kdelibs without spell in USE or emerge'
+				ewarn 'sim with USE="spell" to avoid this message.'
+				ebeep
+			fi
+		fi
+		if ! built_with_use kde-base/kdelibs arts ; then
+			myconf="--without-arts"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-double-message-fix.patch
+	epatch ../${P}-r1919_1924.patch
+	if use kde ; then
+	set-kdedir 3
+	fi
+}
+
+src_compile() {
+	filter-flags -fstack-protector -fstack-protector-all
+
+	# Workaround for bug #119906
+	append-flags -fno-stack-protector
+
+	use kde || use spell || export DO_NOT_COMPILE="$DO_NOT_COMPILE plugins/spell"
+
+	econf ${myconf} `use_enable kde` \
+		  `use_with ssl` \
+		  `use_enable debug` || die "econf failed"
+
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed."
+	dodoc TODO README AUTHORS.sim jisp-resources.txt ChangeLog
+}
diff --git a/net-im/sim/sim-0.9.4.3.ebuild b/net-im/sim/sim-0.9.4.3.ebuild
index 56147d19cbd1..288f4d5c1b41 100644
--- a/net-im/sim/sim-0.9.4.3.ebuild
+++ b/net-im/sim/sim-0.9.4.3.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-im/sim/sim-0.9.4.3.ebuild,v 1.6 2007/07/22 06:19:57 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.4.3.ebuild,v 1.7 2007/11/17 17:23:45 pva Exp $
 
 inherit kde-functions eutils flag-o-matic
 
@@ -69,7 +69,7 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	if use kde ; then
 	set-kdedir 3