Fix deps, remove old

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

4 files changed, 13 insertions, 97 deletions

diff --git a/x11-plugins/pidgin-sipe/ChangeLog b/x11-plugins/pidgin-sipe/ChangeLog
index 85f79c4e499e..e5ec18197d47 100644
--- a/x11-plugins/pidgin-sipe/ChangeLog
+++ b/x11-plugins/pidgin-sipe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/pidgin-sipe
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/ChangeLog,v 1.12 2012/04/24 18:47:29 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/ChangeLog,v 1.13 2012/06/26 19:53:26 thev00d00 Exp $
+
+  26 Jun 2012; Ian Whyman <thev00d00@gentoo.org> -pidgin-sipe-1.12.0.ebuild,
+  -pidgin-sipe-1.13.0.ebuild, pidgin-sipe-1.13.1.ebuild:
+  Fix deps, remove old
 
 *pidgin-sipe-1.13.1 (24 Apr 2012)
 
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.12.0.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.12.0.ebuild
deleted file mode 100644
index 714f0cc3abf1..000000000000
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.12.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.2 2012/01/10 20:03:35 thev00d00 Exp $
-
-EAPI=4
-inherit autotools
-
-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 voice"
-
-DEPEND="net-im/pidgin[gnutls]
-	dev-util/intltool
-	>=dev-libs/gmime-2.4.16
-	dev-libs/libxml2
-	kerberos? ( app-crypt/mit-krb5 )
-	voice? (
-		>=dev-libs/glib-2.28.0
-		>=net-libs/libnice-0.1.0
-		media-libs/gstreamer )
-	!voice? ( >=dev-libs/glib-2.12.0 )"
-
-src_prepare() {
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--enable-purple \
-		--disable-quality-check \
-		--disable-kopete \
-		--disable-telepathy \
-		$(use_with voice vv) \
-		$(use_enable debug) \
-		$(use_with kerberos krb5)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog NEWS TODO README
-}
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.13.0.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.13.0.ebuild
deleted file mode 100644
index bbfbf0a24fa3..000000000000
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.13.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.13.0.ebuild,v 1.1 2012/03/20 20:28:01 thev00d00 Exp $
-
-EAPI=4
-
-inherit autotools
-
-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 voice"
-
-DEPEND="net-im/pidgin[gnutls]
-	dev-util/intltool
-	>=dev-libs/gmime-2.4.16
-	dev-libs/libxml2
-	kerberos? ( app-crypt/mit-krb5 )
-	voice? (
-		>=dev-libs/glib-2.28.0
-		>=net-libs/libnice-0.1.0
-		media-libs/gstreamer )
-	!voice? ( >=dev-libs/glib-2.12.0 )"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-purple \
-		--disable-quality-check \
-		--disable-telepathy \
-		$(use_with voice vv) \
-		$(use_enable debug) \
-		$(use_with kerberos krb5)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog NEWS TODO README
-}
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.13.1.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.13.1.ebuild
index af6763c0cc9c..252e6472f270 100644
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.13.1.ebuild
+++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.13.1.ebuild
@@ -1,6 +1,6 @@
 # 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.13.1.ebuild,v 1.1 2012/04/24 18:47:29 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/pidgin-sipe-1.13.1.ebuild,v 1.2 2012/06/26 19:53:26 thev00d00 Exp $
 
 EAPI=4
 
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug kerberos voice"
 
-DEPEND="net-im/pidgin[gnutls]
-	dev-util/intltool
+RDEPEND="net-im/pidgin[gnutls]
 	>=dev-libs/gmime-2.4.16
 	dev-libs/libxml2
 	kerberos? ( app-crypt/mit-krb5 )
@@ -22,7 +21,12 @@ DEPEND="net-im/pidgin[gnutls]
 		>=dev-libs/glib-2.28.0
 		>=net-libs/libnice-0.1.0
 		media-libs/gstreamer )
-	!voice? ( >=dev-libs/glib-2.12.0 )"
+	!voice? ( >=dev-libs/glib-2.12.0 )
+"
+
+DEPEND="dev-util/intltool
+	${RDEPEND}
+"
 
 src_configure() {
 	econf \