Fix jingle support, thanks to Llloeki in bug #151006.

(Portage version: 2.1.2_pre2-r9)
 (Signed Manifest commit)

3 files changed, 14 insertions, 133 deletions

diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 7151c6cf339f..b89c4504db4e 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -50,14 +50,14 @@ EBUILD kopete-3.5.4.ebuild 2015 RMD160 af586fec5f8365571446ff30ea89de8c475b2f71
 MD5 b6ba949fc2aa7385b66767ea672557b0 kopete-3.5.4.ebuild 2015
 RMD160 af586fec5f8365571446ff30ea89de8c475b2f71 kopete-3.5.4.ebuild 2015
 SHA256 53788187c67c74f96a418e4483fb2f3615157df61be2e5f41987cc8ce676d696 kopete-3.5.4.ebuild 2015
-EBUILD kopete-3.5.5.ebuild 3769 RMD160 aecae6c47a00c29932e3fb082952cd2950acc87e SHA1 34443ffc2b30c8d232f064e47edd8d5b21da5403 SHA256 8c5e3bce03cd0c514b7478f643b58c9e10b72bd1b8a2ae26b3e40de0daf4099f
-MD5 50e9673ecb3721a0e2b7a4251a6731cb kopete-3.5.5.ebuild 3769
-RMD160 aecae6c47a00c29932e3fb082952cd2950acc87e kopete-3.5.5.ebuild 3769
-SHA256 8c5e3bce03cd0c514b7478f643b58c9e10b72bd1b8a2ae26b3e40de0daf4099f kopete-3.5.5.ebuild 3769
-MISC ChangeLog 11673 RMD160 86df1b79645c59b95d7a43521f8ba349eacb1219 SHA1 d7be3dde187e9f952446a3017bf6e5b92fe4debc SHA256 c038a5b22b6ba3ca6c682c5a4cada636b8508d704de0261c080248886ccbc921
-MD5 d3b3039960b474fb638e2b927f381d47 ChangeLog 11673
-RMD160 86df1b79645c59b95d7a43521f8ba349eacb1219 ChangeLog 11673
-SHA256 c038a5b22b6ba3ca6c682c5a4cada636b8508d704de0261c080248886ccbc921 ChangeLog 11673
+EBUILD kopete-3.5.5-r1.ebuild 4023 RMD160 dcb8030ce1f5a781cdc0a2d191e7bcbcd4ec60e7 SHA1 82bb934cd87a9f0c3349a7f1a46a07ea39eb4f48 SHA256 4d1ef679a6121bc1b27ec490a79c18af8a475994587b614b43e4a52295411a46
+MD5 52d06117827208ae877a19945d238101 kopete-3.5.5-r1.ebuild 4023
+RMD160 dcb8030ce1f5a781cdc0a2d191e7bcbcd4ec60e7 kopete-3.5.5-r1.ebuild 4023
+SHA256 4d1ef679a6121bc1b27ec490a79c18af8a475994587b614b43e4a52295411a46 kopete-3.5.5-r1.ebuild 4023
+MISC ChangeLog 11864 RMD160 df853ffd16fbb90d246d14e07772dc23b19be8d6 SHA1 9223e4f8d05bc00eacee1685af7d9ec412ec3744 SHA256 5df9f604f851186c14aa3ef03142e7bad5971eb201eafbf825dedcf67577af2d
+MD5 4b7fbf1334c5529d52e3907d5a42bda2 ChangeLog 11864
+RMD160 df853ffd16fbb90d246d14e07772dc23b19be8d6 ChangeLog 11864
+SHA256 5df9f604f851186c14aa3ef03142e7bad5971eb201eafbf825dedcf67577af2d ChangeLog 11864
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -71,13 +71,13 @@ SHA256 6b69107cd0da9f5855f2ce1f8ca41066fc27fdeb33b56d00f35902079be1bb64 files/di
 MD5 8b8ff247dca55586562d9fd824d2fabb files/digest-kopete-3.5.4 533
 RMD160 90dab1c82c149274c3c7edd45ac2d49d6413b74a files/digest-kopete-3.5.4 533
 SHA256 beb14f778ba810ba5a07abc26c6526aeb824417ee5c3c6cae984ec52813a735b files/digest-kopete-3.5.4 533
-MD5 45b1745fd4f181a722520c1c0d8109df files/digest-kopete-3.5.5 533
-RMD160 8df6da27490a6e4ead003e4844d161332b84c178 files/digest-kopete-3.5.5 533
-SHA256 59d2b99e43fa26211edb734d620ed0b5b040082147055efd44504be0a40ddd80 files/digest-kopete-3.5.5 533
+MD5 45b1745fd4f181a722520c1c0d8109df files/digest-kopete-3.5.5-r1 533
+RMD160 8df6da27490a6e4ead003e4844d161332b84c178 files/digest-kopete-3.5.5-r1 533
+SHA256 59d2b99e43fa26211edb734d620ed0b5b040082147055efd44504be0a40ddd80 files/digest-kopete-3.5.5-r1 533
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFLgt7AiZjviIA2XgRAmfGAKChL4Xkuxa964hlOqRYazIFCxrW0wCeKRf1
-UiXtNStQDgJruTcT9tOZS6Y=
-=0OXI
+iD8DBQFFLnInAiZjviIA2XgRAgMDAJ9xZ/zrtaGQtpgllvTdCLdWVYogvQCbBPJP
+QpGN5/Onxks8oqDGoU3ljJk=
+=eZFc
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kopete/files/digest-kopete-3.5.5 b/kde-base/kopete/files/digest-kopete-3.5.5
deleted file mode 100644
index e013575200c5..000000000000
--- a/kde-base/kopete/files/digest-kopete-3.5.5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 07d313f91154d3c2f4620b921277fdc8 kdenetwork-3.5-patchset-01.tar.bz2 2986
-RMD160 288113734e7767a7526f4b9311c1985ac8aa91bf kdenetwork-3.5-patchset-01.tar.bz2 2986
-SHA256 0bbde1adaa4e8fff02c1f1fd6ceb66ec9af14dd19ff64567ab0fd03926d7d05b kdenetwork-3.5-patchset-01.tar.bz2 2986
-MD5 a6e642c070cbd50d4a817f6588bf8e46 kdenetwork-3.5.5.tar.bz2 9235564
-RMD160 3e757d10ee5bf24b2ccf131e693fb614b9fdb9f4 kdenetwork-3.5.5.tar.bz2 9235564
-SHA256 c3f36e69bbd23902f2bdd9a1a8cda93b0436338ada422bb8ac6bc3d2bcd8e38f kdenetwork-3.5.5.tar.bz2 9235564
diff --git a/kde-base/kopete/kopete-3.5.5.ebuild b/kde-base/kopete/kopete-3.5.5.ebuild
deleted file mode 100644
index 2283bfa90ea6..000000000000
--- a/kde-base/kopete/kopete-3.5.5.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.5.ebuild,v 1.4 2006/10/12 09:31:19 flameeyes Exp $
-
-KMNAME=kdenetwork
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdenetwork-3.5-patchset-01.tar.bz2"
-
-DESCRIPTION="KDE multi-protocol IM client"
-HOMEPAGE="http://kopete.kde.org/"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="jingle sametime ssl xmms xscreensaver slp kernel_linux latex crypt
-	  winpopup sms irc yahoo gadu groupwise netmeeting statistics autoreplace
-	  connectionstatus contactnotes translator webpresence texteffect highlight
-	  alias autoreplace history nowlistening addbookmarks"
-
-# 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
-	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
-	latex? ( virtual/tetex
-		media-gfx/imagemagick )
-	crypt? ( app-crypt/gnupg )"
-#	gnomemeeting is deprecated and ekiga is not yet ~ppc64
-#	only needed for calling
-#	netmeeting? ( net-im/gnomemeeting )"
-
-DEPEND="${BOTH_DEPEND}
-	kernel_linux? ( virtual/os-headers )
-	|| ( (
-			x11-proto/videoproto
-			kernel_linux? ( x11-libs/libXv )
-			xscreensaver? ( x11-proto/scrnsaverproto )
-		) <virtual/x11-7 )"
-
-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-meta_src_unpack
-
-	epatch "${FILESDIR}/kopete-0.12_alpha1-xscreensaver.patch"
-	# use ekiga instead of gnomemeeting by default
-	epatch "${FILESDIR}/gnomemeeting-ekiga.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 autoreplace || kopete_disable plugin autoreplace
-	use connectionstatus || kopete_disable plugin connectionstatus
-	use contactnotes || kopete_disable plugin contactnotes
-	use translator || kopete_disable plugin translator
-	use webpresence || kopete_disable plugin webpresence
-	use texteffect || kopete_disable plugin texteffect
-	use highlight || kopete_disable plugin highlight
-	use alias || kopete_disable plugin alias
-	use addbookmarks || kopete_disable plugin addbookmarks
-	use history || kopete_disable plugin history
-	use nowlistening || kopete_disable plugin nowlistening
-
-	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 sametime sametime-plugin)
-		$(use_with xmms) --without-external-libgadu"
-
-	kde-meta_src_compile
-}