Add missing dependencies that prevented libjingle-call from being built wrt bug #536326.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

3 files changed, 192 insertions, 16 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 6761b295aecb..ba3a99f9830c 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.450 2015/01/28 23:45:22 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.451 2015/02/06 17:04:54 kensington Exp $
+
+*kopete-4.14.3-r1 (06 Feb 2015)
+
+  06 Feb 2015; Michael Palimaka <kensington@gentoo.org>
+  +kopete-4.14.3-r1.ebuild:
+  Add missing dependencies that prevented libjingle-call from being built wrt
+  bug #536326.
 
   28 Jan 2015; Johannes Huber <johu@gentoo.org> kopete-4.12.5.ebuild,
   kopete-4.14.3.ebuild:
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 15f03d06a58f..50280641fcda 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -4,23 +4,25 @@ Hash: SHA256
 DIST kopete-4.12.5.tar.xz 6309392 SHA256 bfb4f8147b04c521bfee9018157cd6ce8e4dd559cb7e755ec5920503e414440d SHA512 50663de13d27ea9a225cb66629983107812f1626d9a73b7aa215153e3b5883f6edc1216e60683179f412e620959635c4f888e890ca53303c63d148729621ccc1 WHIRLPOOL 81cb187d3002d87f3bbe82e8445413c2084f50cdbfff7209a440b5de3f2ee777852d6cc0bf2161e887c9d7f3b43104452d4ff589a9cbd4fcb0c7fce66d964556
 DIST kopete-4.14.3.tar.xz 6317288 SHA256 ba23c6dea57233e0861865a1d76c356b0d3f7037f95e2166d0daef14e6c13845 SHA512 33a433da426e7a4a519f033bb14635f31c92954f8e6c46b41759f4e1e41197aed9d07894b163a1e484648ac0e9f92914afe20dfbaa8ddff56b8751d426afd9fc WHIRLPOOL 62d8df47f3214b8cf05fc9ffab3662cc10a1402fd2d33339adb91cd91651c2652dc1dd637130f9e77bf77825b23e19c813f5c43614160cd4dcec945c19e3542e
 EBUILD kopete-4.12.5.ebuild 4181 SHA256 ebc037e96b63d4ef3d4be5c621b53a2a670ed9a743c3e111c622b9831cbd28ce SHA512 445b5c7c3699394003e101a550b125fb191c8dbac691bd6a6dc50fabd1165a29a88ac5a082733218ac82ccd0ad329fef12805b6ebaa42daafe7c316c7dbb91cf WHIRLPOOL 35efd9545f54545e3aee919ea156cf0608149e8243f2371f41fc1334564ad41552ae643fa8498d002a43a6e8133c6805e8db8fd274a7682ab79640161f9cc3c2
+EBUILD kopete-4.14.3-r1.ebuild 4247 SHA256 12df3f3d0abb5e124e2061779c8ff84fc65317e2a7dae2f313e88c3ccc8777e0 SHA512 052d029bdbbd44c1d60c9d4fb0161189626c9c562aceebfb3759f9c2e5c84ab089d53fc5d886a383edfd056932c198e4aafca7e4c217c9bed0f3991673889628 WHIRLPOOL 9c17374bccba430e0b563dd482f10f11643a57ab74e34976af0230a37f16f110be20b1f76b36713f1c93320ae9aeb5aff14f7175b8a0cd93a51ca23d896d2a3a
 EBUILD kopete-4.14.3.ebuild 4102 SHA256 1f1bb3910dade986bd92a6caa83292af031aa63dfe43a5612ce37c84df5f5ca7 SHA512 4258eeb0016839902599f7ecc85e0d608a2518067087c18bbfbeabf9e70302093db8157f9360999560a4ff3f384cc5eb13777c9618d634fa3f561f4d7de9dc99 WHIRLPOOL 2eda4470a986acdde711039f2c402f936558e102c5f10a1cd6537df697bb7dcd917279a99ae5a4ec9b84be5208da18cadf134de0bc99f1d601eab8607e013cbf
-MISC ChangeLog 61395 SHA256 2b353c66fc6c2efb6ab06d9608d7f9d26211ce0deff00a5d9cb38bde6f136d70 SHA512 d13f2f93c4ffbf9310b19de0434e29e11f74c3793139dbd997cceccf411d905772187ee045dcbfccd6ed73b1e3f3d4367033254c6f51345cce13a29d4a2f5c94 WHIRLPOOL a59a1e40b87dfc6122e70198e8c5793495d883ab4f26349e3c1fe25c585a1683872534d292f7063941fd5bd2d03e4177b5c04145498bd204f595c62cfa66307a
+MISC ChangeLog 61612 SHA256 48d95aaffbdeadcbc5c4eb706311fd3a8a2511ac00d457730664694bc647e907 SHA512 b0e4039cad6214fcbbd775eb26fd8a26a21d65f7620412c59631a03cbbb97ca8bf8b069cce37c3aafdb29d017cb22201ccd23653baaed26419079fe7e8a75ea7 WHIRLPOOL 06d02c493fcb39524991d2d5c03439ab145d8f3f2073430128acba93534b0755668cac7436c2d2703c5e69413596040c3a228599b406ceed1aa8ce832cb4b972
 MISC metadata.xml 2449 SHA256 2373b4b12a5db6aed29c91a5a9c114250692ac02691b3ec919dda89ceeb3fa0b SHA512 087fd456daee8ce857b321d32a572838fb5c32137c051ff9f1a8df9cded0dbcbc3517a784347e9231ecc41069d8ef5242efd08def865489bb434e99ddaf0db88 WHIRLPOOL dfe45c7f2a1821f5636ea1dc88e38cd47b9f4b6d4831c60cb68f4ce52eea03435e46fc128bf8af36e5f7de5598408989f9ae419dec62cc096f15f1717a67cb61
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUyXSTAAoJEGVpnaTzz9K9GcwP/3W/ZHbtV5/ZaoEJBucgw57F
-Tdl1NjWdl+qgt16vCi9jlTOTopPXgnQlcRvAJ2WsiZg8LGbO4jVKhDk9P3CFt1k3
-hPfcauJoOjebW1FeygJGMa9K+/Fx/+mPG4P1uOpBenmzAeZl79lh38l2g1LPDc/p
-fcySwGFu+TljKfO6910EIajl8XHwIvYQQwcC1l70g/hWgFiFu+oNvWCYwt8OPWCt
-qsPjbcrBD8uOG5YkmiKxOFA7dmkJBtA+uGHcH0WZR99CsxQsYseCKDxvb6gnbo/f
-o/cB6Gc3MEu8QnQ8gCjLDpLLplaND09SxJDyBux1yr886+0cL9u047EziDeH8cnQ
-2jMv+B/2ZVks8dlA/MkpqPb1/q0mSU89yvkivIjz1Gr2YvBZ6LRfwskd/KGV7gu2
-XcG0zUmX8xpTPi9r2GhSfpC0rYteDRA6rR+/6zcqERRH9TxBz5jKGX1PCWtxc1vN
-BHHdOjyMDsBDsI7+LtfwQw3H731WkdZzcVKoxtgvyei7zvYoUwGj1xqd2yVyfz5S
-k73aakoeFgUTMLSUaoCygZxmLvdkGzwlcnjdtiO1NcALpwQ78TUoW11oirbodizA
-DOsv34b9gJgvj0rX7OWspWzyz0C0ufY0fhwM9lg10KJ4nnB9SF2agm7n7W+7ecPA
-ALyB1al8hrSAWyq3QwYb
-=rOe4
+iQJiBAEBCABMBQJU1PQ8RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7F+/D/44IrkNh3DpWjaJLZ8Dp6ci4s5wDE3A5Q4ndAiBmyLDCXh+IWJH+1Pxfzaa
+YVIzUmGTsYctgg9ndWthr7XEF3Hx19Ito2EUs7LwmEbvNC2lcUl6EhnH6MhysK9L
+hawK0vmGVx6msKLSpBRXk7h25qGLOSguw+ZmeLuT5jYdQ5alEhV7m6Nc1YWHyV0u
+lThlmtv6LVJg4dVbR6YGX5lhmiZ0MsMnSJ7TRKh5uiRkEoib6GHEGjLgIf3U7H7c
+wVmICaIPOiaCitgItioBkanHAiI6zgigBVTJ1ibuCff2qXHqWnwQBNwK3OghXOCs
+/6AwJt7ZB6vuXORpWOsJYSzs1vsjAcdd+wENZeAst+Gwtns7TQanchRh7cs47g2w
+rVfOBMhPaV+sd+PDD3+wT9q6c1QCS8C/ervvgaJEf37zfmdKJ92qicIqfTQKuQ8A
+86AHi54OTfuRWhLBQl5sqwnUHo9mPtZ8w5aBx8AGM5vDETwUYAXViBtFVkIjGkij
+Y/Zl16yRrPIooqjIU6kTV3g/oVsDyth1gYspd+gPsQxtwNN/ePNabKKkN1HSe+6z
+2sRnvb/2/rpygkeww/F6M38A8LqTOuPX65k6QUwVQbJ0jYg15y/SymGtQjKndQ5w
+p5Dl5uXCCozgwCiWbiM+VZShGYTAteOTGC3I1lpzZZbA7OeYDw==
+=hlAM
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kopete/kopete-4.14.3-r1.ebuild b/kde-base/kopete/kopete-4.14.3-r1.ebuild
new file mode 100644
index 000000000000..9c0377cdbbb7
--- /dev/null
+++ b/kde-base/kopete/kopete-4.14.3-r1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.14.3-r1.ebuild,v 1.1 2015/02/06 17:04:54 kensington Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE multi-protocol IM client"
+HOMEPAGE="http://kopete.kde.org http://www.kde.org/applications/internet/kopete"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug ssl v4l"
+
+# 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
+#	xmpp: 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
+#	oscar: NO DEPS
+#   telepathy: net-libs/decibel
+#   testbed: NO DEPS
+#	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
+#	yahoo: media-libs/jasper
+#	zeroconf (bonjour): NO DEPS
+PROTOCOLS="gadu groupwise jingle meanwhile oscar skype
+sms testbed winpopup +xmpp yahoo zeroconf"
+
+# disabled protocols
+#   telepathy: net-libs/decibel
+#   irc: NO DEPS
+#   msn: net-libs/libmsn
+#	qq: NO DEPS
+
+IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
+
+COMMONDEPEND="
+	$(add_kdebase_dep kdelibs 'zeroconf?')
+	$(add_kdebase_dep kdepimlibs)
+	dev-libs/libpcre
+	>=dev-qt/qtgui-4.4.0:4[mng]
+	media-libs/phonon[qt4]
+	media-libs/qimageblitz	
+	!aqua? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+	)
+	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
+	groupwise? ( app-crypt/qca:2[qt4(+)] )
+	jingle? (
+		dev-libs/expat
+		dev-libs/openssl
+		>=media-libs/mediastreamer-2.3.0
+		media-libs/speex
+		net-libs/libsrtp
+		net-libs/ortp:=
+	)
+	meanwhile? ( net-libs/meanwhile )
+	otr? ( >=net-libs/libotr-4.0.0 )
+	statistics? ( dev-db/sqlite:3 )
+	v4l? ( media-libs/libv4l )
+	webpresence? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+	)
+	xmpp? (
+		app-crypt/qca:2[qt4(+)]
+		net-dns/libidn
+		sys-libs/zlib
+	)
+	yahoo? ( media-libs/jasper )
+"
+RDEPEND="${COMMONDEPEND}
+	latex? (
+		|| (
+			media-gfx/imagemagick
+			media-gfx/graphicsmagick[imagemagick]
+		)
+		virtual/latex-base
+	)
+	sms? ( app-mobilephone/smssend )
+	ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
+	winpopup? ( net-fs/samba )
+"
+#	telepathy? ( net-libs/decibel )"
+DEPEND="${COMMONDEPEND}
+	jingle? ( dev-libs/jsoncpp )
+	!aqua? ( x11-proto/scrnsaverproto )
+"
+
+src_configure() {
+	local x x2
+	# Handle common stuff
+	local 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_disable v4l VIDEOSUPPORT)
+	)
+	# enable protocols
+	for x in ${PROTOCOLS}; do
+		case ${x/+/} in
+			zeroconf) x2=bonjour ;;
+			xmpp) x2=jabber ;;
+			*) x2='' ;;
+		esac
+		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
+	done
+
+	mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF )
+
+	# enable plugins
+	for x in ${PLUGINS}; do
+		mycmakeargs+=($(cmake-utils_use_with ${x/+/}))
+	done
+
+	kde4-base_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_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 xmpp ; then # || use irc; then
+			if ! has_version app-crypt/qca-ossl ; then
+				elog "In order to use ssl in xmpp you'll need to"
+				elog "install app-crypt/qca-ossl package."
+			fi
+		fi
+	fi
+}