Bump KDE to 4.1.1

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x42618354

3 files changed, 173 insertions, 17 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 3e36b3e98cea..7c8b3132e57f 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.391 2013/08/14 20:24:20 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.392 2013/09/03 19:04:12 creffett Exp $
+
+*kopete-4.11.1 (03 Sep 2013)
+
+  03 Sep 2013; Chris Reffett <creffett@gentoo.org> +kopete-4.11.1.ebuild:
+  Bump KDE to 4.1.1
 
 *kopete-4.11.0 (14 Aug 2013)
 
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 7647d75a45ce..79c227bc9309 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -4,26 +4,18 @@ Hash: SHA256
 AUX kopete-4.10.3-v4l.patch 1400 SHA256 0bd8befa2d488e461531d6e108305fb47e95612e78747913ed86b58923bf14a6 SHA512 c85dd97eb57cce4ab20c747d92013feda9a2f5d5ebf3e85f6e6480aee22eaf085a832b4321a6c803bacff38b7923d498e03d7e67fa73ee6d785b39b18fc23765 WHIRLPOOL c154bd9f91c65eee8188fab5fa1c2d380a6b477a45870cf276bd87769db7f7f9f514eff0b7fd69ff8058cfce93e7cde6e3276c50803876d97df22a53c096787a
 DIST kdenetwork-4.10.5.tar.xz 9030076 SHA256 d308c7f4f14e5ca91d69e661538e051335de389ca1eb9a74c1cd92ad40092ad3 SHA512 0a24c22cc2a0b18828f059e1a1b4eba3639bb1970628bafa07f6462708b37a7feacbd5353bc5114eb7c74f199957620fded38373af26089935ed23f8832f0f45 WHIRLPOOL 63931d477bb03d9eb5b8fd1d6d7787e13d650774680d9daf9027caa464158cedb2e6138dde98cb40364fd74c08d8195dd9b344bae57a2d9872d179da993c1e09
 DIST kopete-4.11.0.tar.xz 6497164 SHA256 38f87876cd508d1d5897c647234395352b957cfdd05ecb5c67aaed63e8058f84 SHA512 ae845820a9375d7aaf8d8855b3d9cdae635b161c8b98f974e971a0819070aa23f19a092af3685897c7b922ee7830f8d47731a8db7131040e5e2451e0aafed333 WHIRLPOOL 777667890acb66dfbf294c8cb968c6ad9f4d7837cd1ae37760bf6d2d0c2f4586fc58aa1185cfccedcea963c27175d8f381116b79e459474c1d39ec9cb793a4ea
+DIST kopete-4.11.1.tar.xz 6571784 SHA256 3313370062bfdd233704f4426b14fb07544197751847f4f6e6a0214b9dd3ccc9 SHA512 deee54633f35170177b4d11c733fa355d2e3f04e303291198cd35cf1e6613d86358e1f05180d6241e4629449e5196d4c40b60996f1b1ab7c046140fbb05d0089 WHIRLPOOL 89f9f45ed2d63a161b61a6b12d9464b2a4c551d250d22a5a0bd3e2edcd6da8f8d0c79c8105591ee537e32440855786385c574351b5ab4fa16795cc58cddaada3
 EBUILD kopete-4.10.5.ebuild 4230 SHA256 18cd230cb88010015a4f1f5e25a2e8300c3b8408f2069e0e4b3c424e6bfe7a10 SHA512 cea99d8e1df3bb0bf788469b185b1c8639a8f8e0f1a930f13d61e33b122de4e155ff3a370a586c22e5a08cedd74c8bb91b361d46b5a36935d55aa7fab6c86057 WHIRLPOOL cad778104056a418108383681f04a5096eac18654d2ce5bf1360e77ad5b91f2a457fd13ac3624697c79d682df67657d53582c763ce7a4e0a455900cafa8beb50
 EBUILD kopete-4.11.0.ebuild 4121 SHA256 064a6cfb5d0805d42cb00e9f4590f751898c2ade376d7b489b1e1880112ec964 SHA512 455f810187c2df648ebc403b422935a7403e7e4eda3ef89a43a59935a55a0a94031a93a1e1e7e9e5fd18f531e1a06527dae4a5295d89cd6fe62281e5c445a449 WHIRLPOOL 1888250ce71996303c55f36c78dbfd5af43ca49429052ab17074e03a606bbc737077b7f69806ab861d8b6569886064f2f424ac2475f412dd3db2ec236dab3e58
-MISC ChangeLog 54404 SHA256 e873b85acb18f5e746e3b636ec145d0e0c36ffb54febf95ae46f8e2807a1aa10 SHA512 ea6ba817ef0c0ec1219964dd4f8b49e3eaf4cb1508aa9401358fdecad29966b572d11f0d208d4e8657cc1b5c74a14f60444cb400d52a7fa488bc859b3d884d48 WHIRLPOOL a74af3c3593c3e9950fb3d8f59ffc0b7ae905d94d11a1fbb4cedbd9346dff1eae216dd82a62cf95f458de56555af33366f1ba3aaa1f8677396939f12154b1c71
+EBUILD kopete-4.11.1.ebuild 4121 SHA256 2f926e9986e2ca1d8f736af5af18873b261bf36c1f23b4542dc3322aefa45141 SHA512 cd83970feeed61942c42b0afa3b402fab622aefd96625dd3f31a18635e15c0ad0a3f36c577ebcc2ed3238de39a1eb01083718bb075d9e4ee4d7bb7d8eefe5170 WHIRLPOOL c84de8ff7c8b1eb05afdb32f057337d2150784fad168f2831196fcbeee22d463772f3b7bc06bb01c35e7addc2b300ed2a2b7a3d1f95f3b951289c903e1d14f07
+MISC ChangeLog 54528 SHA256 0a983cccd754d8511d5634c42352ee6a69d871774ee28b70f3644696d53740e0 SHA512 4c505d13caf961f4ee379ab6972d91f75ef1ba41098f29ee624367f624867e3a69ea325e1288849ca620598bbfe2f1960469cb7964c2358725b5ee819b20d01a WHIRLPOOL 043d3754defc9739b818dd146bb8ca2e6ced0549e39e87ebe73f162d3efef1d5b7a802e5a07bdcd88588cbb78b82e2fb6effeba89ba38217134139f7ed39f60d
 MISC metadata.xml 2449 SHA256 2373b4b12a5db6aed29c91a5a9c114250692ac02691b3ec919dda89ceeb3fa0b SHA512 087fd456daee8ce857b321d32a572838fb5c32137c051ff9f1a8df9cded0dbcbc3517a784347e9231ecc41069d8ef5242efd08def865489bb434e99ddaf0db88 WHIRLPOOL dfe45c7f2a1821f5636ea1dc88e38cd47b9f4b6d4831c60cb68f4ce52eea03435e46fc128bf8af36e5f7de5598408989f9ae419dec62cc096f15f1717a67cb61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSC+h1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcqYYP/3lpmEXYw/YN02T6S3dKwiFf
-aVnMT4nQY03sXky72vtVmi/99/oT/0DIy2+obBnfN6MP1bKLLxOHJYATrwgcqa+e
-ZCteVSYqdoXQwPGQjZ/sZ6BgEBcoM8Ugzrt2sM9nQZ15XNR3CqMbVEBKiIMnDsc4
-ApXMnuSXzxZMUDNjLMtSuq8mipAowXprXw8lDjBfY/h2ZslbDf/tnfmVAGC1eMcw
-LMUYt8EdtqP3YBZ4kjljdd8Ti1lTr2bPJpoFmgmwh+QhcOtza6dhDrRA9onF5/ZQ
-IA2QT2epKQyP54qTm4h7KkvkA+b+rLfcQjTVFCu9DMBXQq+tK2YkMegwhvT5LD/Q
-BCGZ5nldTcVFqYBhVuyaNF8e/d6H1C4kqnRU5TbZuJ6MJtaBYz2Dro9eyN/r/4H1
-0TKc97+pkNiheK8Wc9cLKpJaFVqemxNbUUreCK3MDAa0ADQUsDINuvdyJKTIy/R4
-VRd0vBb9KJF69bhenDw0GOh1Xhu06z7X6HZz4rqABY2QQ0P66ocrWzl5HfJJaCR0
-4dRzRVATOtu7zWFzsUqxlmf/3h9L+CN/LOHFhMXdwjlfTHoSI32OlfzvS4mY1G8T
-QtRbmq8HQpjKWWT3c1zsRZ6bjHta0JIOFbE9AS/YPyWjyvOhgeH56EwLac1NSdJA
-gi7sdB64ZciKxcmhwzhd
-=Jsyc
+iKYEAREIAGYFAlImM2xfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
+Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1SpHQCfRyr1rzLD9cZad5lC3mCsF+2h
+tqQAn121y8jbDrvjf8FxGw3XN7kekZdi
+=yU1n
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kopete/kopete-4.11.1.ebuild b/kde-base/kopete/kopete-4.11.1.ebuild
new file mode 100644
index 000000000000..37ba4993fd75
--- /dev/null
+++ b/kde-base/kopete/kopete-4.11.1.ebuild
@@ -0,0 +1,159 @@
+# 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.11.1.ebuild,v 1.1 2013/09/03 19:04:12 creffett 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 ~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_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-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 || 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
+}