Add patch to fix KDE BUG #130630 (unable to connect to ICQ since today), and add a few useflags from bug #125782, thanks to Andrew Kirilenko. Dropped ~ppc64 useflag because of missing netmeeting dependency.

Package-Manager: portage-2.1.1_pre2-r6

5 files changed, 158 insertions, 8 deletions

diff --git a/net-im/kopete/ChangeLog b/net-im/kopete/ChangeLog
index 2cec221a315e..0de471e6d578 100644
--- a/net-im/kopete/ChangeLog
+++ b/net-im/kopete/ChangeLog
@@ -1,6 +1,14 @@
 # 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.66 2006/07/09 04:11:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/ChangeLog,v 1.67 2006/07/11 17:57:18 flameeyes Exp $
+
+*kopete-0.12.0-r2 (11 Jul 2006)
+
+  11 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kopete-0.12-icqfix.patch, +kopete-0.12.0-r2.ebuild:
+  Add patch to fix KDE BUG #130630 (unable to connect to ICQ since today), and
+  add a few useflags from bug #125782, thanks to Andrew Kirilenko. Dropped
+  ~ppc64 useflag because of missing netmeeting dependency.
 
   09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
   kopete-0.12.0-r1.ebuild:
diff --git a/net-im/kopete/Manifest b/net-im/kopete/Manifest
index 9c0fab55a7be..b4bd2e16f8e5 100644
--- a/net-im/kopete/Manifest
+++ b/net-im/kopete/Manifest
@@ -5,6 +5,10 @@ AUX kopete-0.12-away.diff 1076 RMD160 4ec518082447c48d1443ae1b95a97b6e438145c2 S
 MD5 d2573dff2b7cddcdca0830215a8bdc6c files/kopete-0.12-away.diff 1076
 RMD160 4ec518082447c48d1443ae1b95a97b6e438145c2 files/kopete-0.12-away.diff 1076
 SHA256 d966c34131caa0696851c8d5f56a22982127afc0c3c9cf797ef003c259737237 files/kopete-0.12-away.diff 1076
+AUX kopete-0.12-icqfix.patch 706 RMD160 305c9cc77716f1c3eff7fe3ac0e99ade6893034c SHA1 2c1c9a472d4f5ad299a04a359a082e3bb55efc6e SHA256 030b0af9b6ec82bf0303532ea40e32e3983e7edd6296d089874034981e6f3485
+MD5 c6e2c0a68b4ea1ceaf09345fa7fecf75 files/kopete-0.12-icqfix.patch 706
+RMD160 305c9cc77716f1c3eff7fe3ac0e99ade6893034c files/kopete-0.12-icqfix.patch 706
+SHA256 030b0af9b6ec82bf0303532ea40e32e3983e7edd6296d089874034981e6f3485 files/kopete-0.12-icqfix.patch 706
 AUX kopete-0.12-jabber-muc-chat.patch 3328 RMD160 95478b96cbb457c9dbb4ab4f0947facdb3332a04 SHA1 a07667668de03b61199a1a9b1f68e2c239cf742e SHA256 c011a3f27f198ddecf8577dcb8342b7203af4a9daad6c02fb8b99b6ad3e6852c
 MD5 3e2376346d0da278554352f06a777e0b files/kopete-0.12-jabber-muc-chat.patch 3328
 RMD160 95478b96cbb457c9dbb4ab4f0947facdb3332a04 files/kopete-0.12-jabber-muc-chat.patch 3328
@@ -18,10 +22,14 @@ EBUILD kopete-0.12.0-r1.ebuild 2556 RMD160 cef933192b38d0080112706ad9e46b7efea82
 MD5 3ad8b893e28d70015569a0c5a16c3084 kopete-0.12.0-r1.ebuild 2556
 RMD160 cef933192b38d0080112706ad9e46b7efea820fe kopete-0.12.0-r1.ebuild 2556
 SHA256 2530524bf5cdef421a6788d2675af758388c689b1c274949f45c99d5eebf150b kopete-0.12.0-r1.ebuild 2556
-MISC ChangeLog 3268 RMD160 70c5910ec14be8c6dd9a25ffd46817df52388f23 SHA1 c11064084b18bb1f5d3fc95e162ef8521a21f53b SHA256 13af4fada5987823e38eb24b95814ce5f30c0d62f06681e0ea94adf39d921c18
-MD5 ea73fbde59f0fc44b952082ae40e4db6 ChangeLog 3268
-RMD160 70c5910ec14be8c6dd9a25ffd46817df52388f23 ChangeLog 3268
-SHA256 13af4fada5987823e38eb24b95814ce5f30c0d62f06681e0ea94adf39d921c18 ChangeLog 3268
+EBUILD kopete-0.12.0-r2.ebuild 3331 RMD160 d902fa7a3114278f7205585966de6a56776a77ce SHA1 15bd6f4712fb70086da128619a8dfb35edc59a85 SHA256 b4ae632d7ffacab5ead19c0b2f8196c4af96fc03d768c923a0d6aeb980f07e40
+MD5 a146c81fc854301dcf59be22257eca03 kopete-0.12.0-r2.ebuild 3331
+RMD160 d902fa7a3114278f7205585966de6a56776a77ce kopete-0.12.0-r2.ebuild 3331
+SHA256 b4ae632d7ffacab5ead19c0b2f8196c4af96fc03d768c923a0d6aeb980f07e40 kopete-0.12.0-r2.ebuild 3331
+MISC ChangeLog 3629 RMD160 10066c432aa33093c118e192b7936e7c468796a3 SHA1 5db9b7a3f5d0a51fc25496f4bfdf1db5361add66 SHA256 4f7134031b75e024651fa6d365df2b0b52d652ef1dd15f9681de4a96e288c859
+MD5 234adfe719872b48d974b47b9858e7d7 ChangeLog 3629
+RMD160 10066c432aa33093c118e192b7936e7c468796a3 ChangeLog 3629
+SHA256 4f7134031b75e024651fa6d365df2b0b52d652ef1dd15f9681de4a96e288c859 ChangeLog 3629
 MISC metadata.xml 254 RMD160 ddca3e329213be86e7b2d62c52078a77ea308f4a SHA1 899c7665ef94c737788e8a2c53bc8a3d97a1356a SHA256 addaf999f171c0e580a0399105382e9b213e14f3bd85b74671742b41f41c2261
 MD5 64e213d0db015eb97e16b31ec6e748c3 metadata.xml 254
 RMD160 ddca3e329213be86e7b2d62c52078a77ea308f4a metadata.xml 254
@@ -29,10 +37,13 @@ SHA256 addaf999f171c0e580a0399105382e9b213e14f3bd85b74671742b41f41c2261 metadata
 MD5 01832fcb2e5e8d98235b4ff35d29c467 files/digest-kopete-0.12.0-r1 241
 RMD160 570f6293396053404d178f86b01eaecc5c783d44 files/digest-kopete-0.12.0-r1 241
 SHA256 7c82928c5b35764c916e17475c795b9a07d73a2f5db052ad0afac911089abb74 files/digest-kopete-0.12.0-r1 241
+MD5 01832fcb2e5e8d98235b4ff35d29c467 files/digest-kopete-0.12.0-r2 241
+RMD160 570f6293396053404d178f86b01eaecc5c783d44 files/digest-kopete-0.12.0-r2 241
+SHA256 7c82928c5b35764c916e17475c795b9a07d73a2f5db052ad0afac911089abb74 files/digest-kopete-0.12.0-r2 241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEsIIVAiZjviIA2XgRAqYGAJ0YYFwXim2KSVLP0Zn+mrHMjK2nRwCgkS+1
-huKTFDaP6fZFn/ZsQBRQ/BQ=
-=cWOM
+iD8DBQFEs+aUAiZjviIA2XgRAuHzAJ4/ZaTkfNGAGRReXdiaYxB1vq0XZACgx0aA
++2lUemzz9t4bR7dnMTcdFps=
+=khBm
 -----END PGP SIGNATURE-----
diff --git a/net-im/kopete/files/digest-kopete-0.12.0-r2 b/net-im/kopete/files/digest-kopete-0.12.0-r2
new file mode 100644
index 000000000000..488e78a604c5
--- /dev/null
+++ b/net-im/kopete/files/digest-kopete-0.12.0-r2
@@ -0,0 +1,3 @@
+MD5 392c5af64177ae29b3eebc10b91ad782 kopete-0.12.tar.bz2 5303165
+RMD160 f69576edb740dc80b74e69455b3302e7345d71b6 kopete-0.12.tar.bz2 5303165
+SHA256 1fc32f9729dcf29ae5cad344858ec7d4b3bbb0f94f13edbbbe72462e89cdfa58 kopete-0.12.tar.bz2 5303165
diff --git a/net-im/kopete/files/kopete-0.12-icqfix.patch b/net-im/kopete/files/kopete-0.12-icqfix.patch
new file mode 100644
index 000000000000..2ccc30a9e163
--- /dev/null
+++ b/net-im/kopete/files/kopete-0.12-icqfix.patch
@@ -0,0 +1,16 @@
+Index: kopete/protocols/oscar/liboscar/oscartypes.h
+===================================================================
+--- kopete/protocols/oscar/liboscar/oscartypes.h	(revision 560989)
++++ kopete/protocols/oscar/liboscar/oscartypes.h	(revision 560990)
+@@ -237,9 +237,9 @@
+ 	const char ICQ_CLIENTSTRING[] 		= "ICQBasic";
+ 	const WORD ICQ_CLIENTID 		= 0x010A;
+ 	const WORD ICQ_MAJOR 			= 0x0014;
+-	const WORD ICQ_MINOR 			= 0x0022;
++	const WORD ICQ_MINOR 			= 0x0034;
+ 	const WORD ICQ_POINT 			= 0x0000;
+-	const WORD ICQ_BUILD 			= 0x0911;
++	const WORD ICQ_BUILD 			= 0x0A0F;
+ 	const char ICQ_OTHER[] 			= { 0x00, 0x00, 0x04, 0x3d };
+ 	const char ICQ_COUNTRY[] 		= "us";
+ 	const char ICQ_LANG[] 			= "en";
diff --git a/net-im/kopete/kopete-0.12.0-r2.ebuild b/net-im/kopete/kopete-0.12.0-r2.ebuild
new file mode 100644
index 000000000000..51afbe40e171
--- /dev/null
+++ b/net-im/kopete/kopete-0.12.0-r2.ebuild
@@ -0,0 +1,112 @@
+# 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.0-r2.ebuild,v 1.1 2006/07/11 17:57:18 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 ~x86"
+IUSE="jingle sametime ssl xmms xscreensaver slp kernel_linux latex crypt
+	  winpopup sms irc yahoo gadu groupwise netmeeting statistics"
+
+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
+	!net-libs/libjingle
+	latex? ( app-text/tetex )
+	crypt? ( app-crypt/gnupg )
+	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"
+	epatch "${FILESDIR}/${PN}-0.12-away.diff"
+	epatch "${FILESDIR}/${PN}-0.12-jabber-muc-chat.patch"
+	epatch "${FILESDIR}/${PN}-0.12-icqfix.patch"
+
+	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 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)"
+
+	kde_src_compile
+}