Fix deps, remove old

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

5 files changed, 15 insertions, 103 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/Manifest b/x11-plugins/pidgin-sipe/Manifest
index 1415b5caa751..680b86ab7f8c 100644
--- a/x11-plugins/pidgin-sipe/Manifest
+++ b/x11-plugins/pidgin-sipe/Manifest
@@ -1,8 +1,4 @@
-DIST pidgin-sipe-1.12.0.tar.gz 814198 RMD160 3ecb1218201dfd8d55b017ca3dffcfb089ba4eff SHA1 e8a5c03a43b5b0499ba9275d7af22f1ba38f93af SHA256 260b83d8312894b0545cb5f82066ba4da2f52eaf847f174c52526c608635718a
-DIST pidgin-sipe-1.13.0.tar.gz 911280 RMD160 2e5633a962117c2191c7da0e0097b1379c1dc769 SHA1 115207c66486a63cc52184828f01a5ae0df73a4c SHA256 b23bcdd90c17ef1a80288c70c2e499b89b4647cc638301ab9e5839847b55eaec
 DIST pidgin-sipe-1.13.1.tar.gz 924317 RMD160 15bbafc4346dbb5179af5ddcc60c691530596453 SHA1 e030fd3842350f2f29ac62b8a74c40018f67fc05 SHA256 111f4c5703353816b884acc4536f0f2afa3c1ec3c92cfb9d7786587ce03c9bcb
-EBUILD pidgin-sipe-1.12.0.ebuild 1058 RMD160 4ee0981469d64142de24aad2be68762e0a862505 SHA1 304bd5cb35592d1522e95394975f8232dce25f10 SHA256 57a170619c9bc12334c6fe1f6e80eaedfa46391fe015f8ee14e275134f21c499
-EBUILD pidgin-sipe-1.13.0.ebuild 1038 RMD160 cd864131e3cce4dc9bb0aef2db7880be2574c3a5 SHA1 cb73789a7a8df9611335e6e63be96d9ad6409d49 SHA256 eb3c2ba3f8e22e884eba4d7fdcac7e95abacd46026ecdd8c737418cd62973f16
-EBUILD pidgin-sipe-1.13.1.ebuild 987 RMD160 00302220e7b1174371251d993c210b0d4b339f37 SHA1 d1d80444b0f305fa9803f6bfa6c1446dc25e27b3 SHA256 edad7bf69bde8b2c4b79faa103a0438613ec331b2648a5c02b2267fe2c271133
-MISC ChangeLog 2056 RMD160 9dead53aef927d98cf0d5845a042665d0f233676 SHA1 82d30e43ca09cd767f92cd1679d023e6b91169f3 SHA256 a23ac0093f3bba96a48b38f84cc6cf9739a0c6550416f21707136d0861689d8a
+EBUILD pidgin-sipe-1.13.1.ebuild 1011 RMD160 1ef4c9f48332c7b8939bff51ae9f5e3f7acfb051 SHA1 c2d355d7ffc511d4c4befe02ac512872bb10509f SHA256 4942130f78bdc2fdaa19a567302394825bf23e0fb92f1d007b7ae051556873ac
+MISC ChangeLog 2214 RMD160 210a2ba2cc4183fe002ce90c693a555404ae7839 SHA1 106ee93fb2fbdb5e93a25bbd43c9ed56a5702e61 SHA256 a4bfc3608550d058116f9883acc15e94f3f865d63c0f1dffa28803fcc5f7ffcc
 MISC metadata.xml 471 RMD160 a943e71a466db7d6d665f0ebf95d617ad694fd2c SHA1 5d07bf8d00c671dac5c7695f4c094889fc7033a4 SHA256 c3561038d528a1d45f55462b4ab447be9fadbad5beacb4d0e1ee58654dfb254e
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 \