Fixed dependency on libotr (bug #439550). Removed old

(Portage version: 2.2.0_alpha182/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

4 files changed, 15 insertions, 38 deletions

diff --git a/x11-plugins/pidgin-otr/ChangeLog b/x11-plugins/pidgin-otr/ChangeLog
index d6e09b69be60..8501b341d1af 100644
--- a/x11-plugins/pidgin-otr/ChangeLog
+++ b/x11-plugins/pidgin-otr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/pidgin-otr
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-otr/ChangeLog,v 1.28 2012/10/18 16:16:42 kensington Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-otr/ChangeLog,v 1.29 2013/06/20 14:25:13 polynomial-c Exp $
+
+  20 Jun 2013; Lars Wendler <polynomial-c@gentoo.org> -pidgin-otr-3.2.0.ebuild,
+  pidgin-otr-3.2.1.ebuild, pidgin-otr-4.0.0.ebuild:
+  Fixed dependency on libotr (bug #439550 by Gary E. Miller). Removed old
+  (vulnerable?) version. Converted remaining ebuilds to EAPI-5.
 
 *pidgin-otr-4.0.0 (18 Oct 2012)
 
diff --git a/x11-plugins/pidgin-otr/pidgin-otr-3.2.0.ebuild b/x11-plugins/pidgin-otr/pidgin-otr-3.2.0.ebuild
deleted file mode 100644
index 4ed921cdb24a..000000000000
--- a/x11-plugins/pidgin-otr/pidgin-otr-3.2.0.ebuild
+++ /dev/null
@@ -1,25 +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-otr/pidgin-otr-3.2.0.ebuild,v 1.10 2012/06/09 19:10:23 armin76 Exp $
-
-EAPI=2
-
-DESCRIPTION="(OTR) Messaging allows you to have private conversations over instant messaging"
-HOMEPAGE="http://www.cypherpunks.ca/otr/"
-SRC_URI="http://www.cypherpunks.ca/otr/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND=">=net-libs/libotr-3.2.0
-	x11-libs/gtk+:2
-	net-im/pidgin[gtk]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog README
-}
diff --git a/x11-plugins/pidgin-otr/pidgin-otr-3.2.1.ebuild b/x11-plugins/pidgin-otr/pidgin-otr-3.2.1.ebuild
index ffbb34cd3f82..54d15935d1d0 100644
--- a/x11-plugins/pidgin-otr/pidgin-otr-3.2.1.ebuild
+++ b/x11-plugins/pidgin-otr/pidgin-otr-3.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-otr/pidgin-otr-3.2.1.ebuild,v 1.5 2012/06/09 19:10:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-otr/pidgin-otr-3.2.1.ebuild,v 1.6 2013/06/20 14:25:13 polynomial-c Exp $
 
-EAPI=2
+EAPI=5
 
 DESCRIPTION="(OTR) Messaging allows you to have private conversations over instant messaging"
 HOMEPAGE="http://www.cypherpunks.ca/otr/"
@@ -13,13 +13,10 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RDEPEND=">=net-libs/libotr-3.2.0
+RDEPEND="<net-libs/libotr-4.0.0
 	x11-libs/gtk+:2
 	net-im/pidgin[gtk]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog README
-}
+DOCS=( ChangeLog README )
diff --git a/x11-plugins/pidgin-otr/pidgin-otr-4.0.0.ebuild b/x11-plugins/pidgin-otr/pidgin-otr-4.0.0.ebuild
index 3c0994868fdc..b8c01a55612a 100644
--- a/x11-plugins/pidgin-otr/pidgin-otr-4.0.0.ebuild
+++ b/x11-plugins/pidgin-otr/pidgin-otr-4.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-otr/pidgin-otr-4.0.0.ebuild,v 1.1 2012/10/18 16:16:42 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-otr/pidgin-otr-4.0.0.ebuild,v 1.2 2013/06/20 14:25:13 polynomial-c Exp $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="(OTR) Messaging allows you to have private conversations over instant messaging"
 HOMEPAGE="http://www.cypherpunks.ca/otr/"