6 files changed, 10 insertions, 100 deletions
diff --git a/x11-plugins/pidgin-sipe/ChangeLog b/x11-plugins/pidgin-sipe/ChangeLog
index cb749b6e4ab6..541648f9ffa6 100644
--- a/x11-plugins/pidgin-sipe/ChangeLog
+++ b/x11-plugins/pidgin-sipe/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/pidgin-sipe
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/ChangeLog,v 1.9 2011/12/15 18:01:35 thev00d00 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/ChangeLog,v 1.10 2012/01/10 20:03:35 thev00d00 Exp $
+
+  10 Jan 2012; Ian Whyman <thev00d00@gentoo.org> -pidgin-sipe-1.3.3.ebuild,
+  -pidgin-sipe-1.7.0.ebuild, -pidgin-sipe-1.7.1.ebuild,
+  -pidgin-sipe-1.10.0.ebuild, pidgin-sipe-1.12.0.ebuild:
+  Remove old, added gnutls USE dep to pidgin, fixes bug #397499
 
 *pidgin-sipe-1.12.0 (15 Dec 2011)
 
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.10.0.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.10.0.ebuild
deleted file mode 100644
index cc5467e0ffef..000000000000
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.10.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/pidgin-sipe-1.10.0.ebuild,v 1.3 2010/05/24 12:12:35 pva Exp $
-
-EAPI="2"
-
-DESCRIPTION="Pidgin Plug-in SIPE (Sip Exchange Protocol)"
-HOMEPAGE="http://sipe.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug kerberos"
-
-#TODO: dev-libs/gmime - which is automagic dep, but
-# >=dev-libs/gmime-2.4.16 is required and is not released atm
-RDEPEND="net-im/pidgin
-	>=dev-libs/glib-2.12.0
-	dev-libs/libxml2 kerberos? ( app-crypt/mit-krb5 )" DEPEND="${RDEPEND}
-	dev-util/intltool"
-
-src_configure() {
-	econf \
-		--enable-purple \
-		--disable-telepathy \
-		--disable-quality-check \
-		$(use_enable debug) \
-		$(use_with kerberos krb5)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS TODO README || die "dodoc failed"
-}
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.12.0.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.12.0.ebuild
index 88d175769457..714f0cc3abf1 100644
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.12.0.ebuild
+++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.12.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/pidgin-sipe-1.12.0.ebuild,v 1.1 2011/12/15 18:01:35 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/pidgin-sipe-1.12.0.ebuild,v 1.2 2012/01/10 20:03:35 thev00d00 Exp $
 
 EAPI=4
 inherit autotools
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug kerberos voice"
 
-DEPEND="net-im/pidgin
+DEPEND="net-im/pidgin[gnutls]
 	dev-util/intltool
 	>=dev-libs/gmime-2.4.16
 	dev-libs/libxml2
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.3.3.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.3.3.ebuild
deleted file mode 100644
index a388b92fbd9f..000000000000
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.3.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/pidgin-sipe-1.3.3.ebuild,v 1.1 2009/02/13 15:56:43 drizzt Exp $
-
-DESCRIPTION="Pidgin Plug-in SIPE (Sip Exchange Protocol)"
-HOMEPAGE="http://sipe.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="net-im/pidgin"
-RDEPEND=$DEPEND
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc ChangeLog NEWS TODO
-}
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.7.0.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.7.0.ebuild
deleted file mode 100644
index 56ae1e76017a..000000000000
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.7.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/pidgin-sipe-1.7.0.ebuild,v 1.1 2009/11/02 18:28:56 ayoy Exp $
-
-DESCRIPTION="Pidgin Plug-in SIPE (Sip Exchange Protocol)"
-HOMEPAGE="http://sipe.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="net-im/pidgin"
-RDEPEND="$DEPEND"
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc ChangeLog NEWS TODO || die "dodoc failed"
-}
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.7.1.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.7.1.ebuild
deleted file mode 100644
index 8338de6fbe59..000000000000
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.7.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/pidgin-sipe-1.7.1.ebuild,v 1.1 2009/11/30 14:09:09 lack Exp $
-
-DESCRIPTION="Pidgin Plug-in SIPE (Sip Exchange Protocol)"
-HOMEPAGE="http://sipe.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="net-im/pidgin"
-RDEPEND="$DEPEND"
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc ChangeLog NEWS TODO || die "dodoc failed"
-}