Version bump KDE SC 4.10.4

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

3 files changed, 184 insertions, 16 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 2821c5ca26ab..40d38900d156 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.371 2013/06/04 13:05:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.372 2013/06/04 18:21:33 johu Exp $
+
+*kopete-4.10.4 (04 Jun 2013)
+
+  04 Jun 2013; Johannes Huber <johu@gentoo.org> +kopete-4.10.4.ebuild:
+  Version bump KDE SC 4.10.4
 
   04 Jun 2013; Agostino Sarubbo <ago@gentoo.org> kopete-4.10.3.ebuild:
   Stable for amd64, wrt to bug #471392
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 73dc572c5b47..096d95300648 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -4,24 +4,20 @@ Hash: SHA256
 AUX kopete-4.10.3-v4l.patch 1400 SHA256 0bd8befa2d488e461531d6e108305fb47e95612e78747913ed86b58923bf14a6 SHA512 c85dd97eb57cce4ab20c747d92013feda9a2f5d5ebf3e85f6e6480aee22eaf085a832b4321a6c803bacff38b7923d498e03d7e67fa73ee6d785b39b18fc23765 WHIRLPOOL c154bd9f91c65eee8188fab5fa1c2d380a6b477a45870cf276bd87769db7f7f9f514eff0b7fd69ff8058cfce93e7cde6e3276c50803876d97df22a53c096787a
 DIST kdenetwork-4.10.2.tar.xz 9052096 SHA256 88a6fea9b34ec30b1c289595cca71d184f7fe52bb7e3f14f77391d958ce4524e SHA512 e995bb6ef7bf5435bda18cde5b04e6ed98c1613d8c6a469732235282acfae6200db1f9f8b4c7f260f3fe99407e9015cc3a427f02a12a89f2ae1aee9503bcf56a WHIRLPOOL 8d4871816f05280aa0c9b2b4eb952eb9321e5acb96a7c3036449af7892bd5c3cabe33a592ab771d0b32f5a32530f95756ac2e5248d663525beb3dcc399563067
 DIST kdenetwork-4.10.3.tar.xz 9058180 SHA256 0f5e92d7920bc2d8a30985ca309b131384e3cb2f7b414962f394de36963be5f7 SHA512 4c62dbf3237279ed5dea155349e8fecbdada3ea2a166d524f9517cf18f7657f74361ef07fe554f8351d4e62dee8c951173b8e49f32f9176d18b21cba2a70759b WHIRLPOOL 1b65f31c70bdbff8cec95749f62290d30fe51a6e13470b802e0c43d93337491eb6326d4a87005e5ab213997ecb08e55fa5748b39e0cbc011c56974e25416623e
+DIST kdenetwork-4.10.4.tar.xz 8911092 SHA256 e681cd08ec512303b08fddb847f26b612c10dee51b6746b32be30c4bed71a9ba SHA512 39e0fca390410d12e9d3c99b9258dcb4c7f50856ec36891106e253ddccca719cfae2ded7e955003a31589a4073094c4b3ec7eaa3cad680f4fc5e067207c98151 WHIRLPOOL a0affc43cbc911d018b6d4077b5e55a15115592d655d88657ceab6c5d11078c735c733960b3999e4194d1f81085ed6d37f2ca3e6821371b61c6e3ef3db29433c
 EBUILD kopete-4.10.2.ebuild 4239 SHA256 b815d6dbb64202a4b724ea393a6b0d58b833f655f5048b96ad6e121d6f768eae SHA512 484da888e3a56c56adf2b20528b40c9d1effdde03422d4e7ba34fedd4597e12c4baa20319841d9ef7447acc63d740fff1c004f0fda2ebb545ed843725ff0f2fc WHIRLPOOL 02fb163d99d5c32537b97a5c74ab7364d6c1eb722665946a191c652b957f556125e7d38ddb47e10d2b10826fcf009d27eb9bd58f6e3acf78d89aa5033ef34b53
 EBUILD kopete-4.10.3.ebuild 4284 SHA256 ee53385d346f5338960e0c4d123f4eb9bcf0a4f9bc5c0b0c876678d6e279a4b8 SHA512 99785ad7da1dcb46bbd6b734320ca64bfb222906675be3f56b710b0ca441345b96a48492e4f5c184e0a2946498dda5299a26b6fe93fbb66238a0813842a1f35f WHIRLPOOL c628b5c5ac983f7b61dfd02c9fd7956d98bafbcc35706088207ccbf0f3dffa0ae3a9fb9047badb390553323a1d953944cb762009895cae8cab096183f87a9306
-MISC ChangeLog 52121 SHA256 7cfa8193c46c7c11687112a89188b5d7b819cdc8cfbc7a5f8d438694e70ea88d SHA512 6e05a5a66ac33c3e272b8c94e6944f0bee99a3415801c4881863728ea98dc16a2f63e515d9211b008f4a7fdad48005161b501990a00ffdef7281628414970eb3 WHIRLPOOL 2f984aadc8ea89ad1f67d484a80e22bfba4f18217362064bf78dee7055f625e61f703abf87c360ae3e79758fdfd7d8a82a91aabc622fd89cf739fa54d63042b3
+EBUILD kopete-4.10.4.ebuild 4247 SHA256 94a2e2ab2cbe9f7325ecaca2a17b4812fc3d65def7d99b06c704f5bfea044097 SHA512 44a9a4174695ab01c643f8e5ffe24698080a97c56e549119e6522a011af4ec3c8f90d5483df491ef3ffba95980fd05ab573492f71f6e9597358bc33b8b1feb30 WHIRLPOOL b4746b44a8587823eeb020ccc2bb2d4bde2bafaf2b8a224f204062b31a75b9fede48e22ffdf7b69a85ddd6bebd46777718b837a269be429224950837c4473a08
+MISC ChangeLog 52253 SHA256 214db0342711e588c55889e24739c022dc5bc45adf530b2118037e8e5d3fe288 SHA512 8b0124920face66c7b407df989bacaf3fd13ce63f0385501912f1c5de824aa9761631d7b2b717eaccf23f89917a54be56913326ee596db83c02b2d6363d9914a WHIRLPOOL 5bd015e0142fec3683c13c8a5ceca2add3c0b47f45e0ab6ac70860a9b3154bc429b96d5f9a9ec7402874a94cbb4cf8349104fe5386c66b8d3261349279b75393
 MISC metadata.xml 2449 SHA256 2373b4b12a5db6aed29c91a5a9c114250692ac02691b3ec919dda89ceeb3fa0b SHA512 087fd456daee8ce857b321d32a572838fb5c32137c051ff9f1a8df9cded0dbcbc3517a784347e9231ecc41069d8ef5242efd08def865489bb434e99ddaf0db88 WHIRLPOOL dfe45c7f2a1821f5636ea1dc88e38cd47b9f4b6d4831c60cb68f4ce52eea03435e46fc128bf8af36e5f7de5598408989f9ae419dec62cc096f15f1717a67cb61
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRrebSAAoJELp701BxlEWfHxUP/2EfKoHI/3tzGy/ufzduXSdK
-zJMSOVjC7UoJ3t9sfJQUyqLpX//bDLwRUs2xJ6QMZ3EooaVbUWCDsXSk+aDqxP1m
-wZhQ0yd63O++FhMfCmqXRfNfc0qF0AMSHWcixSsVSle9Yq8/GKJBN1WW5EwEAzqu
-1cHcYrkDTzni4I2Su6rmt4K9XY2px+xfvucQdjE/oPXolHrlIuWEOQloCkAnwPV0
-444yBtzKLezfnHm8jWu9Qxqbmgljo80gyZwJmxRisyjSvJ2r+r1LINbWbsr0WHM8
-TTdN5aCLW/+oTBYQ4H2O1R41C2kfkaMJU16A8k9CqXogJnrh91YKQnwW0Rrd7GGc
-B3RAZHcieDHnKRQAXU1qeB2g93TWm2vALVtXSX+T1DFF50j872kpPWdzq8RzeQ89
-i2P58wPNsb7wJ05GzM8KDJyffL+JE7c5k/FEwANJ62eNqc96D+gLzH5tp62vlNrR
-6Hadog2CZFYEKHmix/Tp9mHyPpyK7tooajQMfW5rv4xDUhdoOMulcLtBxiUcSVD7
-TSuBapl2YjKKjIpCJwQ3dDWOBMnrucHxxpk4MhITL4sHGILyBhhF+2PiUF2Glh1P
-4GxPoeGlnuhXkEXwqIf0XMu3iUowEDwjfOopo9Tsv3IJBsNIw4JOc7qGHT9gb9KN
-GybpCIcBiUM79CO+c7HD
-=8TBl
+iQEcBAEBCAAGBQJRrjCYAAoJEO+t9ga+3I3ak6cH/RiINHnZfdklZ7d/QVo3BAed
+hcEhpvkp43ntRc1d82nkIAnu0/R7A5837t7zVcHM9a8Ruj2fWwtFZpR/e9XUpzBs
+A5QHce1EALYEzgpybk7V5XY8P+9Z+9D6MkwYdy+y/gA7CFmB6WNdtxJE0g0+zaT9
+sD+OU2uR2iYrHbENspa6xDHQ39OGGMgj8nqdbd21ZHx4d63JfWf9Bz/HAJoNfpkr
+2pk9+RG+2xAzz1INXotNaFQD6shE3ORE3cPf85O+Fw9yqOOO5po62lQ6ZMA3Q9gx
+O0sFeWgebSxMjNn3W2dnMSUcwNujgbe7fwDOpboSFDNo2h3dpuuQjBGFlvpNavY=
+=PPS5
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kopete/kopete-4.10.4.ebuild b/kde-base/kopete/kopete-4.10.4.ebuild
new file mode 100644
index 000000000000..ce16b0a5f41c
--- /dev/null
+++ b/kde-base/kopete/kopete-4.10.4.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.10.4.ebuild,v 1.1 2013/06/04 18:21:33 johu Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdenetwork"
+KDE_SCM="svn"
+inherit kde4-meta multilib
+
+DESCRIPTION="KDE multi-protocol IM client"
+KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~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
+#	msn: libmsn == this is wlm plugin, we disable msn one
+#	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 msn oscar skype
+sms testbed winpopup +xmpp yahoo zeroconf"
+
+# disabled protocols
+#   telepathy: net-libs/decibel
+#   irc: NO DEPS
+#	qq: NO DEPS
+
+IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
+
+COMMONDEPEND="
+	dev-libs/libpcre
+	$(add_kdebase_dep kdepimlibs)
+	media-libs/qimageblitz
+	>=dev-qt/qtgui-4.4.0:4[mng]
+	!aqua? ( x11-libs/libXScrnSaver )
+	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
+	groupwise? ( app-crypt/qca:2 )
+	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 <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
+		net-dns/libidn
+	)
+	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 )
+	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"
+
+	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_disable v4l VIDEOSUPPORT)
+	)
+	# enable protocols
+	for x in ${PROTOCOLS}; do
+		case ${x/+/} in
+			msn) x2=Libmsn ;;
+			zeroconf) x2=bonjour ;;
+			xmpp) x2=jabber ;;
+			*) x2='' ;;
+		esac
+		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
+	done
+
+	mycmakeargs+=( -DWITH_qq=OFF )
+
+	# 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 xmpp || use msn; then # || use irc; then
+			if ! has_version app-crypt/qca-ossl ; then
+				elog "In order to use ssl in xmpp and msn you'll need to"
+				elog "install app-crypt/qca-ossl package."
+			fi
+		fi
+	fi
+}