Add patch from Marco Gulino to get the correct updated MSN profile URL.

Package-Manager: portage-2.1.1_pre4-r1

5 files changed, 178 insertions, 8 deletions

diff --git a/net-im/kopete/ChangeLog b/net-im/kopete/ChangeLog
index 8ca5d13823d4..d131f64f6e36 100644
--- a/net-im/kopete/ChangeLog
+++ b/net-im/kopete/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/kopete
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/ChangeLog,v 1.76 2006/07/31 18:53:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/ChangeLog,v 1.77 2006/08/01 20:09:46 flameeyes Exp $
+
+*kopete-0.12.1-r4 (01 Aug 2006)
+
+  01 Aug 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kopete-0.12-msnprofile.diff, +kopete-0.12.1-r4.ebuild:
+  Add patch from Marco Gulino to get the correct updated MSN profile URL.
 
 *kopete-0.12.1-r3 (31 Jul 2006)
 
diff --git a/net-im/kopete/Manifest b/net-im/kopete/Manifest
index 0b7f04b5cccb..36b718864600 100644
--- a/net-im/kopete/Manifest
+++ b/net-im/kopete/Manifest
@@ -5,6 +5,10 @@ AUX gnomemeeting-ekiga.patch 2073 RMD160 d8e695ed5a8a6f2fd6819b965dccade6d288a93
 MD5 9e1eafd475bca7ccb4c199e2fbdca02a files/gnomemeeting-ekiga.patch 2073
 RMD160 d8e695ed5a8a6f2fd6819b965dccade6d288a938 files/gnomemeeting-ekiga.patch 2073
 SHA256 5f908d8491a286db761d4c7e0bc07da05ad0ec7cc5c94bc69533706bbd8d552c files/gnomemeeting-ekiga.patch 2073
+AUX kopete-0.12-msnprofile.diff 608 RMD160 1d8b1d898bca99bb6f75f14dd5dbdd47f958306d SHA1 909eef2b21521060e62796d19c971d65b1c376b1 SHA256 96f47fc328f65ee603cdbca7a098d923caa31ad527dbe69006d03f4cdf593de1
+MD5 b4ee80f618d6a4a7f21f0e4fd3ee1ec9 files/kopete-0.12-msnprofile.diff 608
+RMD160 1d8b1d898bca99bb6f75f14dd5dbdd47f958306d files/kopete-0.12-msnprofile.diff 608
+SHA256 96f47fc328f65ee603cdbca7a098d923caa31ad527dbe69006d03f4cdf593de1 files/kopete-0.12-msnprofile.diff 608
 AUX kopete-0.12.1-icqfix3.patch 584 RMD160 12b8de0555fe71321139d2d2ffca2e94c70f765f SHA1 3d7b5ec003c9c9ba8abf48f04ba695b63ea92e12 SHA256 b3f942f94403135f30990574a74f36755c8ffb496a6496fa823ae1b028f8ca82
 MD5 01b42c4e8b58d78005e6f3870b5fda16 files/kopete-0.12.1-icqfix3.patch 584
 RMD160 12b8de0555fe71321139d2d2ffca2e94c70f765f files/kopete-0.12.1-icqfix3.patch 584
@@ -22,10 +26,14 @@ EBUILD kopete-0.12.1-r3.ebuild 4308 RMD160 1c7fa8bfaa62a86479c1abac2c43c1c6b3296
 MD5 238f5425de26bdf517132091e3ff5d40 kopete-0.12.1-r3.ebuild 4308
 RMD160 1c7fa8bfaa62a86479c1abac2c43c1c6b32960a5 kopete-0.12.1-r3.ebuild 4308
 SHA256 4f3b1f4a8d1dc3a10c71d3ebffc076a572e7cce7b4d80363d8426cd85b572076 kopete-0.12.1-r3.ebuild 4308
-MISC ChangeLog 5527 RMD160 1cd19a58c32bf0dfe8c1c5ae16bb2d3104f19c2d SHA1 8b36cdd4b11b446ca384dcbba0d7c2479f0d4767 SHA256 cc9c99ab7dd8254c9eef05e5db142d19426637d0bd68853b4c530523e4ae2b65
-MD5 0ec0a4d8b4010d7a0c2e437b66308b7c ChangeLog 5527
-RMD160 1cd19a58c32bf0dfe8c1c5ae16bb2d3104f19c2d ChangeLog 5527
-SHA256 cc9c99ab7dd8254c9eef05e5db142d19426637d0bd68853b4c530523e4ae2b65 ChangeLog 5527
+EBUILD kopete-0.12.1-r4.ebuild 4380 RMD160 74bb4dce9fed24fa60e2d8c513e798e9b342a2bb SHA1 0656affd27949d5c58f386b0562b90496b81aeb9 SHA256 af0934233f907d3fc48311c550985a02db5a0f81571028d58b19094c855cd2e8
+MD5 f2e252d2b6744313fbb640a88844ca6d kopete-0.12.1-r4.ebuild 4380
+RMD160 74bb4dce9fed24fa60e2d8c513e798e9b342a2bb kopete-0.12.1-r4.ebuild 4380
+SHA256 af0934233f907d3fc48311c550985a02db5a0f81571028d58b19094c855cd2e8 kopete-0.12.1-r4.ebuild 4380
+MISC ChangeLog 5752 RMD160 62f531dc0e6018239d9a37d9756849fa86f5578f SHA1 f71f69ee8bfbe05ece8327e81656571f6e57f576 SHA256 b82a481670e51f951b5054e72dbc67187c7c756f12bc39d6129c3d5c81073b98
+MD5 5808a76dcb6b788116e673f5cf6383fd ChangeLog 5752
+RMD160 62f531dc0e6018239d9a37d9756849fa86f5578f ChangeLog 5752
+SHA256 b82a481670e51f951b5054e72dbc67187c7c756f12bc39d6129c3d5c81073b98 ChangeLog 5752
 MISC metadata.xml 254 RMD160 ddca3e329213be86e7b2d62c52078a77ea308f4a SHA1 899c7665ef94c737788e8a2c53bc8a3d97a1356a SHA256 addaf999f171c0e580a0399105382e9b213e14f3bd85b74671742b41f41c2261
 MD5 64e213d0db015eb97e16b31ec6e748c3 metadata.xml 254
 RMD160 ddca3e329213be86e7b2d62c52078a77ea308f4a metadata.xml 254
@@ -33,10 +41,13 @@ SHA256 addaf999f171c0e580a0399105382e9b213e14f3bd85b74671742b41f41c2261 metadata
 MD5 5ec703b9184a1c0d72d57d051eb6a8af files/digest-kopete-0.12.1-r3 247
 RMD160 e36d314e7b529f07f7da9eb4500cae429bc12159 files/digest-kopete-0.12.1-r3 247
 SHA256 7ec59e43384c9b57a703cc0041f69ac6d5ac2381340f20335fc62d674b68e4ad files/digest-kopete-0.12.1-r3 247
+MD5 5ec703b9184a1c0d72d57d051eb6a8af files/digest-kopete-0.12.1-r4 247
+RMD160 e36d314e7b529f07f7da9eb4500cae429bc12159 files/digest-kopete-0.12.1-r4 247
+SHA256 7ec59e43384c9b57a703cc0041f69ac6d5ac2381340f20335fc62d674b68e4ad files/digest-kopete-0.12.1-r4 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEzlGhAiZjviIA2XgRAgG4AJ4+ODOL9lj25kdzlGJcR3PiX5IAfwCgg55X
-7eshplLaqRG51YK5QgjdAJ0=
-=Q1bc
+iD8DBQFEz7URAiZjviIA2XgRApuaAKDcLUESZk6XLe3iRRCQY2NtI+ypdQCePyHV
+E+SqcdKi4bu7QuZMyeVmjIc=
+=p2FG
 -----END PGP SIGNATURE-----
diff --git a/net-im/kopete/files/digest-kopete-0.12.1-r4 b/net-im/kopete/files/digest-kopete-0.12.1-r4
new file mode 100644
index 000000000000..2f6f75f34afa
--- /dev/null
+++ b/net-im/kopete/files/digest-kopete-0.12.1-r4
@@ -0,0 +1,3 @@
+MD5 b646f2f45fc0fbcd56ada5078fb540fb kopete-0.12.1.tar.bz2 5309636
+RMD160 0bb66fb0a8a0d12b0d19845d5a39993520cb368d kopete-0.12.1.tar.bz2 5309636
+SHA256 a18174bf48257361c6a337073e2fa1c7dc0b0eba274d558ac9fd5bc84275927e kopete-0.12.1.tar.bz2 5309636
diff --git a/net-im/kopete/files/kopete-0.12-msnprofile.diff b/net-im/kopete/files/kopete-0.12-msnprofile.diff
new file mode 100644
index 000000000000..6ad62759679d
--- /dev/null
+++ b/net-im/kopete/files/kopete-0.12-msnprofile.diff
@@ -0,0 +1,12 @@
+diff -ru kopete-0.12.1.orig/kopete/protocols/msn/msncontact.cpp kopete-0.12.1/kopete/protocols/msn/msncontact.cpp
+--- kopete-0.12.1.orig/kopete/protocols/msn/msncontact.cpp	2006-07-13 02:55:41.000000000 +0200
++++ kopete-0.12.1/kopete/protocols/msn/msncontact.cpp	2006-08-01 14:24:20.000000000 +0200
+@@ -577,7 +577,7 @@
+ 
+ void MSNContact::slotShowProfile()
+ {
+-	KRun::runURL( KURL( QString::fromLatin1("http://members.msn.com/default.msnw?mem=") + contactId())  , "text/html" );
++	KRun::runURL( KURL( QString::fromLatin1("http://members.msn.com/?pgmarket=it-it&mem=") + contactId())  , "text/html" );
+ }
+ 
+ 
diff --git a/net-im/kopete/kopete-0.12.1-r4.ebuild b/net-im/kopete/kopete-0.12.1-r4.ebuild
new file mode 100644
index 000000000000..1cdae425189c
--- /dev/null
+++ b/net-im/kopete/kopete-0.12.1-r4.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/kopete-0.12.1-r4.ebuild,v 1.1 2006/08/01 20:09:46 flameeyes Exp $
+
+inherit kde eutils
+
+MY_P="${P/_/-}"
+MY_P="${MY_P/.0/}"
+
+DESCRIPTION="KDE multi-protocol IM client"
+HOMEPAGE="http://kopete.kde.org/"
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="jingle sametime ssl xmms xscreensaver slp kernel_linux latex crypt
+	  winpopup sms irc yahoo gadu groupwise netmeeting statistics autoreplace
+	  connectionstatus contactnotes translator webpresence texteffect highlight
+	  alias autoreplace history nowlistening addbookmarks"
+
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+# The kernel_linux? ( ) conditional dependencies are for webcams, not supported
+# on other kernels AFAIK
+BOTH_DEPEND="dev-libs/libxslt
+	dev-libs/libxml2
+	net-dns/libidn
+	>=dev-libs/glib-2
+	app-crypt/qca
+	slp? ( net-libs/openslp )
+	jingle? (
+		>=media-libs/speex-1.1.6
+		dev-libs/expat
+		~net-libs/ortp-0.7.1 )
+	sametime? ( =net-libs/meanwhile-0.4* )
+	xmms? ( media-sound/xmms )
+	|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrender
+		xscreensaver? ( x11-libs/libXScrnSaver )
+		) <virtual/x11-7 )
+	kernel_linux? ( virtual/opengl )
+	sms? ( app-mobilephone/gsmlib )"
+
+RDEPEND="${BOTH_DEPEND}
+	ssl? ( app-crypt/qca-tls )
+	!kde-base/kopete
+	!kde-base/kdenetwork
+	latex? ( virtual/tetex )
+	crypt? ( app-crypt/gnupg )"
+#	gnomemeeting is deprecated and ekiga is not yet ~ppc64
+#	only needed for calling
+#	netmeeting? ( net-im/gnomemeeting )"
+
+DEPEND="${BOTH_DEPEND}
+	kernel_linux? ( virtual/os-headers )
+	|| ( (
+			x11-proto/videoproto
+			x11-proto/xextproto
+			x11-proto/xproto
+			kernel_linux? ( x11-libs/libXv )
+			xscreensaver? ( x11-proto/scrnsaverproto )
+		) <virtual/x11-7 )"
+
+need-kde 3.4
+
+#dev-libs/ilbc-rfc3951: could not see any benifit in it
+#sed -i 's:ilbc_found="no":ilbc_found="yes":' ${S}/kopete/protocols/jabber/jingle/configure.in.in
+
+pkg_setup() {
+	if use kernel_linux && ! built_with_use =x11-libs/qt-3* opengl; then
+		eerror "To support Video4Linux webcams in this package is required to have"
+		eerror "=x11-libs/qt-3* compiled with OpenGL support."
+		eerror "Please reemerge =x11-libs/qt-3* with USE=\"opengl\"."
+		die "Please reemerge =x11-libs/qt-3* with USE=\"opengl\"."
+	fi
+}
+
+kopete_disable() {
+	einfo "Disabling $2 $1"
+	sed -i -e "s/$2//" "${S}/kopete/$1s/Makefile.am"
+}
+
+src_unpack() {
+	kde_src_unpack
+	epatch "${FILESDIR}/${PN}-0.12_alpha1-xscreensaver.patch"
+	# use ekiga instead of gnomemeeting by default
+	epatch "${FILESDIR}/gnomemeeting-ekiga.patch"
+	# Bug #141675
+	epatch "${FILESDIR}/${P}-oscarcontacts.patch"
+	# KDE BUG #130630
+	epatch "${FILESDIR}/${P}-icqfix3.patch"
+	# KDE revision 568520
+	epatch "${FILESDIR}/${PN}-0.12-msnprofile.diff"
+
+	use latex || kopete_disable plugin latex
+	use crypt || kopete_disable plugin cryptography
+	use netmeeting || kopete_disable plugin netmeeting
+	use statistics || kopete_disable plugin statistics
+	use autoreplace || kopete_disable plugin autoreplace
+	use connectionstatus || kopete_disable plugin connectionstatus
+	use contactnotes || kopete_disable plugin contactnotes
+	use translator || kopete_disable plugin translator
+	use webpresence || kopete_disable plugin webpresence
+	use texteffect || kopete_disable plugin texteffect
+	use highlight || kopete_disable plugin highlight
+	use alias || kopete_disable plugin alias
+	use addbookmarks || kopete_disable plugin addbookmarks
+	use history || kopete_disable plugin history
+	use nowlistening || kopete_disable plugin nowlistening
+
+	use winpopup || kopete_disable protocol winpopup
+	use gadu || kopete_disable protocol '\$(GADU)'
+	use irc || kopete_disable protocol irc
+	use groupwise || kopete_disable protocol groupwise
+	use yahoo || kopete_disable protocol yahoo
+
+	rm -f "${S}/configure"
+}
+
+src_compile() {
+	# External libgadu support - doesn't work, kopete requires a specific development snapshot of libgadu.
+	# Maybe we can enable it in the future.
+	# The nowlistening plugin has xmms support.
+	local myconf="$(use_enable jingle)
+		$(use_enable sametime sametime-plugin)
+		$(use_with xmms) --without-external-libgadu
+		$(use_with xscreensaver) $(use_enable sms smsgsm)
+		$(use_enable debug testbed)"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	rm -f "${D}"/usr/bin/{stun,relay}server
+}