x11-plugins/pidgin-sipe: add pidgin gnutls use dep, remove old

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

diff --git a/x11-plugins/pidgin-sipe/ChangeLog b/x11-plugins/pidgin-sipe/ChangeLog
index cb749b6e4ab6e0922387923964b9c465dfd8fa6c..541648f9ffa635c3fa8a6b09d2e72504057022e2 100644 (file)
--- 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/Manifest b/x11-plugins/pidgin-sipe/Manifest
index 2ed774f745240e8218bb424b6726c6e75da14b3f..e2be6c1fc3163ca6a224b438362950651fa1bc86 100644 (file)
--- a/x11-plugins/pidgin-sipe/Manifest
+++ b/x11-plugins/pidgin-sipe/Manifest
@@ -1,12 +1,4 @@
-DIST pidgin-sipe-1.10.0.tar.gz 634493 RMD160 20c7da2611246ccd54d7fdd56757c7f785b02179 SHA1 7481c56bb1ddefde0aa3e10de1195afbf9acefdc SHA256 d7a65789bf269c7fb443c7a77c8cd7a585ae99d7a0d3a1ffe6b5851e3b2ea885
 DIST pidgin-sipe-1.12.0.tar.gz 814198 RMD160 3ecb1218201dfd8d55b017ca3dffcfb089ba4eff SHA1 e8a5c03a43b5b0499ba9275d7af22f1ba38f93af SHA256 260b83d8312894b0545cb5f82066ba4da2f52eaf847f174c52526c608635718a
-DIST pidgin-sipe-1.3.3.tar.gz 411897 RMD160 43e410b7990af6580236e8e1032f67e9dcc12c96 SHA1 e207df2a24e653e4bfb24e0ad18991b1fdabf895 SHA256 cd310a6e6965cad92fb0717d4245dbf7190f22ba1d107caf76e1b7ec0868b2ae
-DIST pidgin-sipe-1.7.0.tar.gz 455592 RMD160 bfad4e6967318cf3bd87964f3e38ce45ef44a598 SHA1 88b1d43fcc3b6bc42005d32cb62991d265025ce5 SHA256 e07569c4e0a03a6569ccf541e5145c3c77ee26ff27f33592acc78375df7f6678
-DIST pidgin-sipe-1.7.1.tar.gz 460304 RMD160 e2577d29677610ae078c07871eae35024e6b5cab SHA1 96c9e2f4abfc398294093ff290c8efd11f2dc989 SHA256 f0cfad2a12f4a838ee83efeaf78558599db9256164672228048fea0015b98869
-EBUILD pidgin-sipe-1.10.0.ebuild 1005 RMD160 eaf959a7686850f5be1988fee0585482e794a353 SHA1 aa5924d8e50fffcda8e80e1cac31115e6bd0615b SHA256 f5f9b11ee2f73213ea3e80a2bdd2d6907d60bc8452f427932e1bb293fca92e7f
-EBUILD pidgin-sipe-1.12.0.ebuild 1050 RMD160 a8d5f0ed1bfbfe22e388021a9c8ab8119fe0fa78 SHA1 adf4bb42d28cf51be2bcc01dd423cfcfcc6b3f7b SHA256 f059fff8e9f6984da16f5e9509bddf7b76de5aebdbd20b9b7b162340ef597d6e
-EBUILD pidgin-sipe-1.3.3.ebuild 574 RMD160 bbbf5cfc44949b7b09ab4b0c114746b4539983dc SHA1 3365df5d234bd72ab4f3a362f0f54d156ac41e90 SHA256 bc29588e54521f6252c8bcb089ed85864e99112d405e7ed540babb6e3959cc04
-EBUILD pidgin-sipe-1.7.0.ebuild 601 RMD160 cd176ca53f146aa3040233d571cc2dc39b954dc9 SHA1 69a2626ce17a2f5a5ef69ff40174889d19b65d07 SHA256 db0449583bb30ff9239cafc5bab76c70c96e8b01373f8c4de5a95c53c2645b7e
-EBUILD pidgin-sipe-1.7.1.ebuild 601 RMD160 902d275c85f65e9240b6f7b11392c3accc1d335d SHA1 ceacb9a48f506abe951087128b0c2d191d8db29c SHA256 203bb0ccdf80b4fcbfec6a3e37eae94ab2e36ec0d145a2a647dd360ef4a4d6f0
-MISC ChangeLog 1541 RMD160 c5deb7a197939709d4426897fd045ce52db54954 SHA1 c04ddce8aa2c50cc0fb05ab84a0cd8b6c1067825 SHA256 34fd0ac6f3a7d6f581fefa6d00a5a36ca306e3e8312da19dfe8ba2beaed3075f
+EBUILD pidgin-sipe-1.12.0.ebuild 1058 RMD160 4ee0981469d64142de24aad2be68762e0a862505 SHA1 304bd5cb35592d1522e95394975f8232dce25f10 SHA256 57a170619c9bc12334c6fe1f6e80eaedfa46391fe015f8ee14e275134f21c499
+MISC ChangeLog 1796 RMD160 58e904a8f761eb4a974d4a249a14b6d70d19eeab SHA1 158c1756afb3f63d6335c89215017d638cec01de SHA256 c4a383e84d11e51c0d50d16cfccf088a02a8565de044c964c7af8f8bc089176c
 MISC metadata.xml 471 RMD160 a943e71a466db7d6d665f0ebf95d617ad694fd2c SHA1 5d07bf8d00c671dac5c7695f4c094889fc7033a4 SHA256 c3561038d528a1d45f55462b4ab447be9fadbad5beacb4d0e1ee58654dfb254e

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 (file)
index cc5467e..0000000
--- 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 88d175769457b3d4a5f141eb90f8164d82888bc9..714f0cc3abf1367159367df1dd49f7dfedd3f126 100644 (file)
--- 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 (file)
index a388b92..0000000
--- 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 (file)
index 56ae1e7..0000000
--- 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 (file)
index 8338de6..0000000
--- 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"
-}