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

Package-Manager: portage-2.2.0_alpha182/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

5 files changed, 33 insertions, 52 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/Manifest b/x11-plugins/pidgin-otr/Manifest
index c3d550139520..4bed2aa10fb3 100644
--- a/x11-plugins/pidgin-otr/Manifest
+++ b/x11-plugins/pidgin-otr/Manifest
@@ -1,22 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST pidgin-otr-3.2.0.tar.gz 435146 SHA256 0870858b06d90cb522b93a354435f7645a9e28cff2d4bae929a6455d4cd1e6b2
-DIST pidgin-otr-3.2.1.tar.gz 409238 SHA256 ce17e9769e3853076d80645adafaa866e7d7188f988d28a9793afc32c85cb979
+DIST pidgin-otr-3.2.1.tar.gz 409238 SHA256 ce17e9769e3853076d80645adafaa866e7d7188f988d28a9793afc32c85cb979 SHA512 97ae7362c153fecaf838b5aade2ed57cceb7b6204049e851c07b7d9460c8dcf3a3955efc33821deaf3435103f874a285e9868204bbed64e793f0edaecabe37fa WHIRLPOOL 063f5768c6fd35b50656a7540be110f064ae7c01c1838b74a9481700aade78131497ffe10606f01ba803f07d5c1a73de3b53e943091bec44a09f69b8f3789017
 DIST pidgin-otr-4.0.0.tar.gz 459591 SHA256 d56b3f092dbe9ee6597641c7d2dd294884dc04ba47aaf4ec571cd54977df4691 SHA512 5f74da77d0c72576bb4a510b41bc70f041ab2555554b4d37376073f2edee8e1021c153cf5cc3d32bd276bdee643e9e7d881026628240a8757e5f8974c200f3d7 WHIRLPOOL 80c58c166669b39655471f23a3c186cb29bbb8d0d08f1f6b458132712bc9818fc8da9c07d4580e51398591fe0375df625b8a1e985836994f6fba5122cb1e8426
-EBUILD pidgin-otr-3.2.0.ebuild 677 SHA256 910e89b955f89dbee221808d481f11b7645907283ba0b735f617b446d89133b9 SHA512 0a35ff86ea58a3f75212bfb996847a8408196efa3e20f1d56c22461e358b8236ad9a02e6a4f2e6d5e7660df6a1c62b318079e3e6f30baa019db81bfc3a4e00ec WHIRLPOOL 7b62de520d7a74e19c33423259d97da70d179a22304492bd8249eda31527bc4b139aedd0bdd6ee1870fa427008382cb52db0e49618df5e53d7da468161545d54
-EBUILD pidgin-otr-3.2.1.ebuild 676 SHA256 9f6567bf49cc693fb896b34e4d8a8143423ec39e966cd3b07661a282df66217c SHA512 25c8790d969bdd743d2bc26066d0773aa66b6a640d2aafde65146a6e3f8423edf7a7d1af0fc431e2762fd0c20ff45447ee6a78d70fcc88409a2e5ced9c6ecb5e WHIRLPOOL 9cb03b2d2fa77faec6cb10b55e016daf4d6b807ed8d22e3c86fe3ccc1868ffcc52e217834c3918739eeaf6e564411b9f938f1cbcf6ee487471c2dc124b1d5fa9
-EBUILD pidgin-otr-4.0.0.ebuild 681 SHA256 7ea54460aafd3eb6cfe10f55beef2b26f09380cb7ef6457319fe8500979d3d0f SHA512 886d32637fcb1cc6dd8c660b2a47f37822496b207f1026a4f632dfc006063b06c805a7006b92e72b1f6e935a5f8a4dc33452bb7fec94274cdeaca9d431d4469a WHIRLPOOL 2bf2830cdbe9e3028b4596587c8aba04e8cb3e27c6bb0b487a8d701a5af3c4aa85985e60aa34087e81a41851a9e0c9d745773fe890b4c2280f7ed12281d9512f
-MISC ChangeLog 3788 SHA256 744286b508d0a88779fafbb117f19517189544dcd2c67c938821f399a150e0dc SHA512 7fe459cc3841eee135c20d28c59d391fd03b602cdb00ffb28c9d7d79c1972a1095e2ee65fbe0e6926d66b28f36f4aeb9d060fc52b20e69774737b38a4a7bd965 WHIRLPOOL 8093e044bcd23e30e0f53a4a658ae91e93d47c02a1a1f8ee22c27d7cc905ff9d264ae0674fbe0eb447fa3082d6fb6233827045a5cd0729406c2ae2db635758bb
+EBUILD pidgin-otr-3.2.1.ebuild 627 SHA256 77c74e51f29f52ced34f2399c4386035e8b8d11fc8d4301affa2a8962bad661d SHA512 2176dada05da2190361eed0528e546ccf4f91885ee0385485792e92aa3f5932d7ead88bde1ca10ed72f83855c55ed75c4fd20232c59b60869289f9bd2d59c615 WHIRLPOOL 6d958381f9fc9ddd4e2601b9ded70ee905b003d011130aed096952e6ad8d96be325d0fc381b871604829da0de3f0b083f1335b114793ef82950446419f1139a6
+EBUILD pidgin-otr-4.0.0.ebuild 683 SHA256 137e87e7296a5aa132775f9d83cd7b1971b626b256da5555a1b164a7c260ab56 SHA512 90c764db25af09c6cd20422a6cb5929aecc5419d86e489ce6fff1b740fdc76a87fae2f23b2d66315879413270aadddabfd4411c28dcd9e5453d308952fbbf30a WHIRLPOOL 566d55dfc12c27088d93a7cecbe925354e4251f345809229a3eb081a45a8c9de41df0d999e318662fc67858d9d0623e3db42063f70df535ceb6d06c5c4c5726b
+MISC ChangeLog 4061 SHA256 6324d3c9b76e1c4dd5683464be885edfa6bc02682349d671d8dd6e1ad9fb8ea9 SHA512 9dc44135fef9add3674e8da9599411598962a1f5183de9eba8bc5ec5fd821e1c9d8be0f091de425ebed6e5c186da8be524bbc5e5ef44af14444c961cf0361c38 WHIRLPOOL c8635fb0d7e6eff07756818f90b36fdd089a7effbebcf825c451bc61c313aabd01a4b0dd34aecda002c809a80e775b9b27e1871cddca6490a3cf32166357df2e
 MISC metadata.xml 159 SHA256 bb3130d2515d5b2e4ff19aff2199bb00ac7c350bf78b34bbec55268bf1013908 SHA512 654eb43c983b348e2a62866073938353ad4eb0360194949986636f4522c18c6691cfbca9257f4e156fc76900b7484a06ebe113d4302fdc9f751c9c43e718d981 WHIRLPOOL c31843111ad45e159a17794975907283af2dabac36bbbb6f98bbd2d56f2e84120857ab0d50af1aca5c5e9661a06edb4dfd84d54ef17b8881a9101e4d986c40dc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQgCsaAAoJEMbwO6tnXQ0sv3cIANCxO1dkL0Aqny+ZO2KUyQ3g
-RClRbQdQcn4hRLkZXl2mAL/THXwY1XPurpgbo8iuEOM++JvYiqf06da0ZQWmUiLo
-Wszs1/IgaKVMIxYXlJokswZYDOAh87tHlJDdKMJSUZHbOM1lxBTqShqL8+xHtCR1
-38/caZKdGfDzlXpjBxaA++BUtyajtplE9lJ0cOOLxDSSa6F3jyvyUxWpj0bzP0tK
-K3YPx4wv2rBzXMcVfwu1cV1HNmAG7PwAtfc3U67D2zNCsxZaVNgNxjjbTNaboFez
-Q/5SffN1oNXTo45sCaTU1pf5WR20AVsPazhYQTBYbJAfzX9Vw81W9SG3vTd/u+s=
-=CB5a
+iQIcBAEBCAAGBQJRwxDKAAoJEPiazRVxLXTF9UMP/A5+kYiJ/l3ev7zxp0SdCV7m
+kZlXlm1ed9j18BwBlXbUsF4TmIji9eMpR9rMcFjv/jrg2iiWxfKcrJKZ+0EK3K7D
+zmn2V5Uhe4gMgfeBBmvyImSsVqLHtDGlJu7iWhF5E7Qoabk7vtQpq4KbQWRSUlhW
+lE5GdjU90vWCxsy7CY9KY3K0Pe+oOBlzyVq8J8+/jRBFItpB133viEXnVF5ihaO8
+WlekLtuxWyhef4ErLQUVcKnh9IIbeGOkdUgStFM41qgsgd30AYvL1096378YMZ0x
+Sbk4aLd3nyufRNoPBrrtTGXULCH12MTUH4pGRzNnxYaoi0rNcuQsxLuNZHSCTL2t
+3JE6pBa71Pery7aYXyWWsKKU9Jwd5DbRE3SnO9ILxW8awRQURLzRCGfcf606cP+Y
+NeHQUwEyCZV7pWLy7N1D1rAp7VjBZai7H0J+EI1D1DfXjBom3gh1iTJx7rlnSBGI
+hr3iue+O9enb6ePrwJX9KpffNGskTfALb437LBzBhMnd0oNHPYHbeibEIfT8Fdhy
+XtvbfGcV+zAJiaVwHYTHMXlOBPGeRmbKbuhvr+elOrbAWJ49dL13q4STnrYkHDhS
+5fIlEvgFs7oYodNDhCwA+TgqRNSvxemYZeBsz3sH+fBm6jo1zQTrIgwDghWhC1Hp
+f+bdzkbZZnoIna6cX+7o
+=aF1n
 -----END PGP SIGNATURE-----
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/"