Bumped kopete-4.4.4-r2 and kopete-4.4.5 to add fix for building wlm protocol support. Thanks to Alin Nastac <mrness@gentoo.org> - fixes bug 328229.

Added patch to allow kopete-4.4.5 to build against openssl-1 based on Samuli Suominen's patch for libmsn-4.1.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 353 insertions, 12 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 9aca4bc419c3..558ce03dc883 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.259 2010/06/30 15:36:58 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.260 2010/07/15 02:46:53 jmbsvicetto Exp $
+
+*kopete-4.4.5-r1 (15 Jul 2010)
+*kopete-4.4.4-r3 (15 Jul 2010)
+
+  15 Jul 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +kopete-4.4.4-r3.ebuild, +kopete-4.4.5-r1.ebuild,
+  +files/kopete-4.4.5-openssl-1.patch:
+  Bumped kopete-4.4.4-r2 and kopete-4.4.5 to add fix for building wlm
+  protocol support. Thanks to Alin Năstac <mrness@gentoo.org> - fixes bug
+  328229.
+  Added patch to allow kopete-4.4.5 to build against openssl-1 based on
+  Samuli Suominen's patch for libmsn-4.1.
 
 *kopete-4.4.5 (30 Jun 2010)
 
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 1036978afd28..2601ca80a00a 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kopete-4.4.2-yahoo-stealth-fix.patch 12072 RMD160 2456ff3bca2e2da73b4039c09e1fe5f7e5afcde9 SHA1 ffcd273bed6a178bada24cfc55d522a717ffa0cf SHA256 fd7bf9aa9ff04e237dc7a73255fbe111e4412b00f36e3fab9dd8bd40585335f2
+AUX kopete-4.4.5-openssl-1.patch 897 RMD160 642c8b094d4d293f4fbcd450e952f7f798f4a079 SHA1 d34e0cfd776b032602e3aebfa683c85a8f9d6245 SHA256 c348a07e605e9cbab069779c4bfcd82772515ea4a563854ed5ca6933cd43dacd
 DIST kdenetwork-4.3.5.tar.bz2 7384719 RMD160 fc631b631957ba49084c2b006d8cef35f2ea3435 SHA1 b94ad996624e170c3a3c3d3a82dd54ca7f2d7910 SHA256 32b1f3d8522bbf98ea141838e8ac9d63fe9a913a59a331ff61f0364b6f3f7ccf
 DIST kdenetwork-4.4.4.tar.bz2 8321292 RMD160 ad4a8ef9ba6baf1e3c161f3df9cae314e3381f00 SHA1 1706b009d723897cbc9ad9b0c1743873e8e79362 SHA256 fafadfab55affcb837557f09aa504a17350eeb06ad7a17275371549e4a7e588d
 DIST kdenetwork-4.4.5.tar.bz2 8324754 RMD160 5cf43ba3e1b772a0fe1306f9553d5ad9cfa40a8b SHA1 5f321ce932d6b1fadf1935e527bd1848c317be7a SHA256 ca9ff22ce3fb44f4025fe864a4be8524efb252e817bd24e93e9c0dc6ea2ceee6
 EBUILD kopete-4.3.5.ebuild 3420 RMD160 378d70e5761f426b291b8418b9057ed63647708f SHA1 e3caa45f1f1b9fc1c8757aeb923b1940cc5cd4b7 SHA256 30e871e088466359d5fbf202805ca942db8aa2ce9037874770e10c728686ebb0
 EBUILD kopete-4.4.4-r2.ebuild 4213 RMD160 33046a53de3427d3b49e4269e9f7b7bc8c62534d SHA1 4bc011c7dd7fbabc1d988ded33907ccc2ae4a89f SHA256 d201906b4751397730b9c915536ba62a3f0ef6b1811382218efe8c5a72ece45e
+EBUILD kopete-4.4.4-r3.ebuild 4218 RMD160 c1343d5140e4a9e825020438312549c3336a4c9d SHA1 2f6045733cc122c9e507635264e56af71d0ae810 SHA256 c4d401562449bac8cda5f780d7109e66fca817c2db26d604c96296d8cfbc1592
+EBUILD kopete-4.4.5-r1.ebuild 4266 RMD160 23074386b7fa8a8f20aa67923517fbb96eaa8f25 SHA1 475f8bfa9d956ebdb459063b8519b392ad5f9e5e SHA256 b54458dee707cb6ae4eeb139f0441c2ee76b3d0d2b22d436f929947ec11904ac
 EBUILD kopete-4.4.5.ebuild 4213 RMD160 e5edec6f925f034fcda51c46735bec928a5a5c02 SHA1 c7fa66859fc10b5acc518f7afd79b3110664e69a SHA256 2d8ecb2c8447103cee7bb1318b5d997e34b77bddcf042d98273c70e574008be2
-MISC ChangeLog 37963 RMD160 d6079aef012b02ce1c51e8feb50483c8a43795aa SHA1 ea057c3cd1e9df5dbd10ced3bce2376cfcd424a0 SHA256 bd9dc8d1f01cf40cf1049033b6f7b2f292b1e871b448d1307751812f3c6620c2
+MISC ChangeLog 38459 RMD160 28cfc52afcb482dc448b6929b19dc6a7b3519293 SHA1 715c255b04830ef85e2971f8c8404b4babffc143 SHA256 929fda3fa69ba308cd420a828c6def7281d416d02d9a2023e4fc50b920bbab09
 MISC metadata.xml 2684 RMD160 186a6c47ff4a52d5ed5b19417758f4707a502301 SHA1 22fb5bcb995b84b1a4013de11eb03eba826fc308 SHA256 341f5a52c56524d1cec99eda9dd62a1ff939fdc952e2d27ce1870130b79282e3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwrZVkACgkQ5BmOA85PVLjr2wCcCizC9nmqHm3JgAkHjhSG9Bh7
-M1AAnjdhz/VA1Ftlxf0BfmuQ2ki/YXpH
-=Sh75
------END PGP SIGNATURE-----
diff --git a/kde-base/kopete/files/kopete-4.4.5-openssl-1.patch b/kde-base/kopete/files/kopete-4.4.5-openssl-1.patch
new file mode 100644
index 000000000000..a4d99c91bd26
--- /dev/null
+++ b/kde-base/kopete/files/kopete-4.4.5-openssl-1.patch
@@ -0,0 +1,18 @@
+diff -urN kopete-4.4.5/kopete/protocols/jabber/googletalk/libjingle/talk/base/openssladapter.cc kopete-4.4.5-new/kopete/protocols/jabber/googletalk/libjingle/talk/base/openssladapter.cc
+--- kopete-4.4.5/kopete/protocols/jabber/googletalk/libjingle/talk/base/openssladapter.cc	2009-11-30 23:34:11.000000000 -0100
++++ kopete-4.4.5-new/kopete/protocols/jabber/googletalk/libjingle/talk/base/openssladapter.cc	2010-07-15 02:12:06.000000000 +0000
+@@ -648,7 +648,13 @@
+     int extension_nid = OBJ_obj2nid(X509_EXTENSION_get_object(extension));
+ 
+     if (extension_nid == NID_subject_alt_name) {
+-      X509V3_EXT_METHOD* meth = X509V3_EXT_get(extension);
++
++      #if OPENSSL_VERSION_NUMBER >= 0x10000000L
++        const X509V3_EXT_METHOD* meth = X509V3_EXT_get(extension);
++      #else
++        X509V3_EXT_METHOD* meth = X509V3_EXT_get(extension);
++      #endif
++
+       if (!meth)
+         break;
+ 
diff --git a/kde-base/kopete/kopete-4.4.4-r3.ebuild b/kde-base/kopete/kopete-4.4.4-r3.ebuild
new file mode 100644
index 000000000000..55e2104d11c5
--- /dev/null
+++ b/kde-base/kopete/kopete-4.4.4-r3.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.4.4-r3.ebuild,v 1.1 2010/07/15 02:46:53 jmbsvicetto Exp $
+
+EAPI="3"
+
+KMNAME="kdenetwork"
+inherit kde4-meta
+
+DESCRIPTION="KDE multi-protocol IM client"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +handbook ssl v4l2"
+
+# tests hang, last checked for 4.2.96
+RESTRICT=test
+
+# Available plugins
+#
+#	addbookmarks: NO DEPS
+#	alias: NO DEPS (disabled upstream)
+#	autoreplace: NO DEPS
+#	contactnotes: NO DEPS
+#	highlight: NO DEPS
+#	history: NO DEPS
+#	latex: virtual/latex as RDEPEND
+#	nowlistening: NO DEPS
+#	otr: libotr
+#	pipes: NO DEPS
+#	privacy: NO DEPS
+#	statistics: dev-db/sqlite:3
+#	texteffect: NO DEPS
+#	translator: NO DEPS
+#	urlpicpreview: NO DEPS
+#	webpresence: libxml2 libxslt
+# NOTE: By default we enable all plugins that don't have any dependencies
+PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
++nowlistening otr +pipes +privacy +statistics +texteffect +translator
++urlpicpreview webpresence"
+
+# Available protocols
+#
+#	gadu: net-libs/libgadu @since 4.3
+#	groupwise: app-crypt/qca:2
+#	irc: NO DEPS, probably will fail so inform user about it
+#	jabber: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
+#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
+#	meanwhile: net-libs/meanwhile
+#	msn: libmsn == this is wlm plugin, we disable msn one
+#	oscar: NO DEPS
+#	qq: NO DEPS
+#   telepathy: net-libs/decibel
+#   testbed: NO DEPS
+#	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
+#	yahoo: NO DEPS
+#	zeroconf (bonjour): NO DEPS
+PROTOCOLS="gadu groupwise +jabber jingle meanwhile msn oscar qq skype
+sms testbed winpopup yahoo zeroconf"
+
+# disabled protocols
+#   telepathy: net-libs/decibel
+#   irc: NO DEPS
+
+IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
+
+COMMONDEPEND="
+	dev-libs/libpcre
+	$(add_kdebase_dep kdepimlibs)
+	media-libs/qimageblitz
+	>=x11-libs/qt-gui-4.4.0:4[mng]
+	!aqua? ( x11-libs/libXScrnSaver )
+	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
+	groupwise? ( app-crypt/qca:2 )
+	jabber? (
+		app-crypt/qca:2
+		net-dns/libidn
+	)
+	jingle? (
+		>=media-libs/mediastreamer-2.3.0
+		media-libs/speex
+		net-libs/ortp
+	)
+	meanwhile? ( net-libs/meanwhile )
+	msn? ( >=net-libs/libmsn-4.1 )
+	otr? ( >=net-libs/libotr-3.2.0 )
+	statistics? ( dev-db/sqlite:3 )
+	webpresence? ( dev-libs/libxml2 dev-libs/libxslt )
+	v4l2? ( media-libs/libv4l )
+"
+RDEPEND="${COMMONDEPEND}
+	latex? (
+		media-gfx/imagemagick
+		virtual/latex-base
+	)
+	sms? ( app-mobilephone/smssend )
+	ssl? ( app-crypt/qca-ossl )
+	winpopup? ( net-fs/samba )
+"
+#	telepathy? ( net-libs/decibel )"
+DEPEND="${COMMONDEPEND}
+	!aqua? ( x11-proto/scrnsaverproto )
+"
+
+src_prepare() {
+	sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \
+		-i kopete/protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"
+	sed -e '/set (LIBV4L2_REQUIRED TRUE)/s/TRUE/FALSE/' \
+		-i kopete/CMakeLists.txt || die 'failed to make v4l2 optional'
+
+	kde4-meta_src_prepare
+}
+
+src_configure() {
+	local x x2
+	# Handle common stuff
+	mycmakeargs=(
+		$(cmake-utils_use_with jingle GOOGLETALK)
+		$(cmake-utils_use_with jingle LiboRTP)
+		$(cmake-utils_use_with jingle Mediastreamer)
+		$(cmake-utils_use_with jingle Speex)
+		$(cmake-utils_use_with v4l2 LibV4L2)
+	)
+	# enable protocols
+	for x in ${PROTOCOLS}; do
+		case ${x/+/} in
+			msn) x2=wlm ;;
+			zeroconf) x2=bonjour ;;
+			*) x2='' ;;
+		esac
+		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
+	done
+
+	# enable plugins
+	for x in ${PLUGINS}; do
+		mycmakeargs+=($(cmake-utils_use_with ${x/+/}))
+	done
+
+	kde4-meta_src_configure
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	#if use telepathy; then
+	#	elog "To use kopete telepathy plugins, you need to start gabble first:"
+	#	elog "GABBLE_PERSIST=1 telepathy-gabble &"
+	#	elog "export TELEPATHY_DATA_PATH='${EPREFIX}/usr/share/telepathy/managers/'"
+	#fi
+
+	if ! use ssl; then
+		if use jabber || use msn; then # || use irc; then
+			echo
+			#elog "In order to use ssl in jabber, msn and irc you'll need to"
+			elog "In order to use ssl in jabber and msn you'll need to"
+			elog "install app-crypt/qca-ossl package."
+			echo
+		fi
+	fi
+}
diff --git a/kde-base/kopete/kopete-4.4.5-r1.ebuild b/kde-base/kopete/kopete-4.4.5-r1.ebuild
new file mode 100644
index 000000000000..7cf7ff27879a
--- /dev/null
+++ b/kde-base/kopete/kopete-4.4.5-r1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.4.5-r1.ebuild,v 1.1 2010/07/15 02:46:53 jmbsvicetto Exp $
+
+EAPI="3"
+
+KMNAME="kdenetwork"
+inherit kde4-meta
+
+DESCRIPTION="KDE multi-protocol IM client"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +handbook ssl v4l2"
+
+# tests hang, last checked for 4.2.96
+RESTRICT=test
+
+# Available plugins
+#
+#	addbookmarks: NO DEPS
+#	alias: NO DEPS (disabled upstream)
+#	autoreplace: NO DEPS
+#	contactnotes: NO DEPS
+#	highlight: NO DEPS
+#	history: NO DEPS
+#	latex: virtual/latex as RDEPEND
+#	nowlistening: NO DEPS
+#	otr: libotr
+#	pipes: NO DEPS
+#	privacy: NO DEPS
+#	statistics: dev-db/sqlite:3
+#	texteffect: NO DEPS
+#	translator: NO DEPS
+#	urlpicpreview: NO DEPS
+#	webpresence: libxml2 libxslt
+# NOTE: By default we enable all plugins that don't have any dependencies
+PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
++nowlistening otr +pipes +privacy +statistics +texteffect +translator
++urlpicpreview webpresence"
+
+# Available protocols
+#
+#	gadu: net-libs/libgadu @since 4.3
+#	groupwise: app-crypt/qca:2
+#	irc: NO DEPS, probably will fail so inform user about it
+#	jabber: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
+#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
+#	meanwhile: net-libs/meanwhile
+#	msn: libmsn == this is wlm plugin, we disable msn one
+#	oscar: NO DEPS
+#	qq: NO DEPS
+#   telepathy: net-libs/decibel
+#   testbed: NO DEPS
+#	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
+#	yahoo: NO DEPS
+#	zeroconf (bonjour): NO DEPS
+PROTOCOLS="gadu groupwise +jabber jingle meanwhile msn oscar qq skype
+sms testbed winpopup yahoo zeroconf"
+
+# disabled protocols
+#   telepathy: net-libs/decibel
+#   irc: NO DEPS
+
+IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
+
+COMMONDEPEND="
+	dev-libs/libpcre
+	$(add_kdebase_dep kdepimlibs)
+	media-libs/qimageblitz
+	>=x11-libs/qt-gui-4.4.0:4[mng]
+	!aqua? ( x11-libs/libXScrnSaver )
+	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
+	groupwise? ( app-crypt/qca:2 )
+	jabber? (
+		app-crypt/qca:2
+		net-dns/libidn
+	)
+	jingle? (
+		>=media-libs/mediastreamer-2.3.0
+		media-libs/speex
+		net-libs/ortp
+	)
+	meanwhile? ( net-libs/meanwhile )
+	msn? ( >=net-libs/libmsn-4.1 )
+	otr? ( >=net-libs/libotr-3.2.0 )
+	statistics? ( dev-db/sqlite:3 )
+	webpresence? ( dev-libs/libxml2 dev-libs/libxslt )
+	v4l2? ( media-libs/libv4l )
+"
+RDEPEND="${COMMONDEPEND}
+	latex? (
+		media-gfx/imagemagick
+		virtual/latex-base
+	)
+	sms? ( app-mobilephone/smssend )
+	ssl? ( app-crypt/qca-ossl )
+	winpopup? ( net-fs/samba )
+"
+#	telepathy? ( net-libs/decibel )"
+DEPEND="${COMMONDEPEND}
+	!aqua? ( x11-proto/scrnsaverproto )
+"
+
+PATCHES=( "${FILESDIR}/${P}-openssl-1.patch" )
+
+src_prepare() {
+	sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \
+		-i kopete/protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"
+	sed -e '/set (LIBV4L2_REQUIRED TRUE)/s/TRUE/FALSE/' \
+		-i kopete/CMakeLists.txt || die 'failed to make v4l2 optional'
+
+	kde4-meta_src_prepare
+}
+
+src_configure() {
+	local x x2
+	# Handle common stuff
+	mycmakeargs=(
+		$(cmake-utils_use_with jingle GOOGLETALK)
+		$(cmake-utils_use_with jingle LiboRTP)
+		$(cmake-utils_use_with jingle Mediastreamer)
+		$(cmake-utils_use_with jingle Speex)
+		$(cmake-utils_use_with v4l2 LibV4L2)
+	)
+	# enable protocols
+	for x in ${PROTOCOLS}; do
+		case ${x/+/} in
+			msn) x2=wlm ;;
+			zeroconf) x2=bonjour ;;
+			*) x2='' ;;
+		esac
+		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
+	done
+
+	# enable plugins
+	for x in ${PLUGINS}; do
+		mycmakeargs+=($(cmake-utils_use_with ${x/+/}))
+	done
+
+	kde4-meta_src_configure
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	#if use telepathy; then
+	#	elog "To use kopete telepathy plugins, you need to start gabble first:"
+	#	elog "GABBLE_PERSIST=1 telepathy-gabble &"
+	#	elog "export TELEPATHY_DATA_PATH='${EPREFIX}/usr/share/telepathy/managers/'"
+	#fi
+
+	if ! use ssl; then
+		if use jabber || use msn; then # || use irc; then
+			echo
+			#elog "In order to use ssl in jabber, msn and irc you'll need to"
+			elog "In order to use ssl in jabber and msn you'll need to"
+			elog "install app-crypt/qca-ossl package."
+			echo
+		fi
+	fi
+}