bump; add IUSE flag for optional dep, py3.3 support, update deps

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

5 files changed, 43 insertions, 43 deletions

diff --git a/dev-python/geopy/ChangeLog b/dev-python/geopy/ChangeLog
index df7f69ea428f..87908503735e 100644
--- a/dev-python/geopy/ChangeLog
+++ b/dev-python/geopy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/geopy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/geopy/ChangeLog,v 1.7 2014/03/31 21:00:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/geopy/ChangeLog,v 1.8 2014/04/10 15:24:36 idella4 Exp $
+
+*geopy-0.99 (10 Apr 2014)
+
+  10 Apr 2014; Ian Delaney <idella4@gentoo.org> +geopy-0.99.ebuild,
+  -geopy-0.94.2-r1.ebuild, metadata.xml:
+  bump; add IUSE flag for optional dep, py3.3 support, update deps
 
   31 Mar 2014; Michał Górny <mgorny@gentoo.org> geopy-0.95.1.ebuild,
   geopy-0.96.2.ebuild, geopy-0.97.ebuild:
diff --git a/dev-python/geopy/Manifest b/dev-python/geopy/Manifest
index 22238f96df47..f903f446f20d 100644
--- a/dev-python/geopy/Manifest
+++ b/dev-python/geopy/Manifest
@@ -2,32 +2,20 @@
 Hash: SHA256
 
 DIST fells_loop.gpx 29789 SHA256 29dc50a741ce01d15370fea60e128d557bdc688b3ed9652df6484a2194a649ac SHA512 329f6d764a52fc759df64b8f2f71db7c085b905d12019cd67bec2de7f87c4418a9deeb046324b11d713197fa35f0d2d00a7adbba3b13a55df8fb90c636392fda WHIRLPOOL 04969a29592322917760ace209ebc1ed0ecd0a24d07eb8b86e1d8289afd5dc3537a2a7b030fcbd25c953f660ed40b396b060bd0ff9cd545284f529fdd051ef57
-DIST geopy-0.94.2.tar.gz 33213 SHA256 d661fd6b8404888b0ab1c181531d804b4f20925470db0c9cf762564533c04ca3 SHA512 a1825dff32b9fb2a4f4c3fe5cf735ab32b0fdefc7f65ea32fd4964bdfbfda160603fd97b13e0fc3c3fcea37809df62b31eb228bf89eb4fa33735719fa7865a76 WHIRLPOOL 2b3fc57100ba786499393beca6b703b889a93c22644f436ff92ce50ef784a470934b083d7742f398456fe367bfcd6a4f9206b70209f740dd15bc4d76c9207c79
 DIST geopy-0.95.1.tar.gz 32504 SHA256 2db216b60289d9b34d802859b4d51ad41bbc0230e934ef14b625d2f5474c9d33 SHA512 a90bf40a0f543a6699f110c8498ac10803f0f85a0fae3074eccf203279f0a84021a5c40c4ff0b3ed514471f4939b151aa2ccf73eb6fe45f7814e27227e21ed88 WHIRLPOOL cff5ff7ff62a079eb7609c714a4903c76482109e5bc288dc77f6012fa4e6058aa6d4798b1369ce61e9fc4a01a429beb967d6a93bbf12200c46c2d06cbe94a6c7
 DIST geopy-0.96.2.tar.gz 27749 SHA256 2f0d250f41cdf32b5204c4e84957fa49c54e6919790688dd2b575bbf535d7506 SHA512 9eb02ac0c1b1d66dff203c736fb5d5e8f41d92d0c06b08cce6e877c22fc55bccd5b2f760f188122adac0838b8cc24bb296f24c038148b16141cb32db38a17e60 WHIRLPOOL 55ae1b51ca0a7fb49bf5c296d958e5de46236e0d53e927abcf6f06b5cd8c16c014596ef4dd4a6e75af282c332cbfc1eaaae97b0ec6dd1934645a06bf0a84017e
 DIST geopy-0.97.tar.gz 62002 SHA256 17af9b4c8a07a69525537b675d8a1cea89e2c4fad7e3d7379282ecbb5c840240 SHA512 fb586c1828e8971c8d199c3781d0bdab5bbcee12a17c2d80e6a5de38776888e3c61eb768f133a17c40403607996ff0fd33651e5fa8427f6f5dbf88ae6c82f118 WHIRLPOOL 87de4f622302f4e8041a1c7a88770faa36d8fda988d6915d5509c903506a12f25d2703c6ab430b5534113c5d991fb4cdf6abb5c2aae19d5af49577226413ad9f
-EBUILD geopy-0.94.2-r1.ebuild 647 SHA256 391c2fb073edafb9f3dd45a7e6b9cb4766eb221756b95c66064824ee7ef43f6a SHA512 20a9393feb73919aba2ca1a8bacbba138a74c84164892348829442cb3ebadc204109ff4e4b17cba4bbe794e1008c7af320b93e73eb2c5f1db6d520820d8e862b WHIRLPOOL f314b9de7007e7e6849e147059575a9241e9237535211d3bdf73044f794ea9162bedffe47015afa8ad7ffee03515f6788accea42a2498402a9f33c471693367d
+DIST geopy-0.99.tar.gz 65066 SHA256 463327a27871fcfe74e22b0de47b79d61dbb4085471be0efc9135fa14b11334c SHA512 67809c498c1118d75c5d8fa55354df46e6f7a95c4194f25373ac622b517fdac50bc489b3de8635518fa7b5f41807119b498abb60487314f5fc218b228e1afe22 WHIRLPOOL daac6fe50ef8f1ea11a94ac7702313ca2ae0f05c916e8f453bc05c88c0959850130db1e92e3be20ef2457dc2aefaee58bfa041d2300e8566ac7f2d0382c6b2d6
 EBUILD geopy-0.95.1.ebuild 998 SHA256 30ccf5b5f4c1f01c189aa871c0d8f58b9c3517ee39d97d2af8fb10e55bef0e85 SHA512 713c29dd50a2ee11669eb90264ed2640faea0741f78e4a54ecc7a333872e72e41d763c54e4093f453fbee2b476f1c3639862fe2b8eb5453f91984e4e5a76332f WHIRLPOOL 535012c0d793a2e10085592099d0cc0ddad396a24ecb36fad4f1751e0420fe5339d180771cf05ac2fe3cd6ec837abd0bcc48795e799e3cb536b29c6c41768da3
 EBUILD geopy-0.96.2.ebuild 746 SHA256 929c5100c50da8bb950ce6acd1f46448ca21580a2ae8efccf9bce06037cbb481 SHA512 ccd6044dd74b743b11463872f36d38a84f61016c6c5ff4969206256b933d6dc267be9f394da52050bc50de9d1907c8f53a2b0e7aa0171746055055910bea6af1 WHIRLPOOL 3c2d1d62d6c7dcfcef6d909af0f9283dbc7153c02a80b36045f0c6c368709e1a2c587586dadb29924711c77f1557625c257441543fbee48239197f8413babf0c
 EBUILD geopy-0.97.ebuild 744 SHA256 00386b0b6a1a8369d5205d35e76dd8bab7edb4345999836249c7406c1903d3fe SHA512 f6000a2f5b1882fa8860c057c9dd883ae4d5ce4351ddde8794300237527d40f2eccbd02a5dc3049d8cf7b21ad4fa4743eec9fd2274ff213d32e35b92051d8130 WHIRLPOOL 11bc704476146beb86663e628d209c54b13bccf9c04915dcdaa463ccdb76883c6e5483890fb372f6bf9c932c70fe5fd0eb2f309ad2175a87ac4fbfc5dfa8e9a5
-MISC ChangeLog 1173 SHA256 be72b5f9bdc908d6650779fd8625326d6a4b47a57c6104817029f38891745c1e SHA512 85fcfd5366fc4a58714720199ab11bbca62c2084f24f82a9225112ab6f53d30a49dc2a639c017e54ca24719d8890752dd0ca70b482f61713b58641dd7a7e0097 WHIRLPOOL 5055911473682234e8c82580358c403d1dd50b78d79753620794ae8fd977e7bbd938438b687df1e300c27560532992140960cba95a4ff8fc089e7320528d3da0
-MISC metadata.xml 278 SHA256 5911edd9025066d69aa623d054bc55aef8660d236358284612d3e9bdcbf32e35 SHA512 90ca9749481528236723854735531780e1eb2ae6207da62ee408c0688d1d872ec6c6a97c915f76747bcae7697ae82726c9fdbbd2ea0c3c6a98e670927a3e266e WHIRLPOOL 97fb9258e08d914947fbe3eeeb320f5f29bf53846d25368e06adf5d17b0c1d0afcb6b5838d0549f1b6168c50f247bbcf121550d8133640d8621b4b496eb75ab7
+EBUILD geopy-0.99.ebuild 862 SHA256 298c297181dac509022fe127223b62623c27f1525b876875f9938d050934c10b SHA512 82988e3ec8b6a4ce7b8586d28bafc9ef862b384ad267b0dbc95690f62ee1585b895c530309bdfce3735ea5854f0b5464c470a5ab62d48490d69436a258ec9e74 WHIRLPOOL a53ff28672477865690ebcc93d0b6e5a2e736ce9aed3b97238d734bb45e8de0ea84daca3307191ebf4eaa084119c3d0f664f959d44b0682109283ebc6aeeadb8
+MISC ChangeLog 1378 SHA256 d69caa8cfb6c8224dbee60cf6b2a7c64ef7c153a6af497bdfc4174704de33836 SHA512 cd9663172c772912a3a3c65987ee8b3d4cb16eaace9f077e0e3eb09e759e4b5ba346b0a9a872df76056020c32ad64a6f8ecb76a6ea2871a38a18d56e79de4e97 WHIRLPOOL 3c270799cfb5460b7c8c7ab3a91a29a6e5b30a7fe046a1df1101ab8ca61a3ee5e98eb81a64b957f237febde852db39dc04a3efd92db654d60d08fd944cb9ad86
+MISC metadata.xml 354 SHA256 18d9080a85b096946432f32c1bf3ca5ad46eca72630799b2270210a1b16ff1bc SHA512 53366a0d35f310c22cb7dc537e8d885a4bbbbb6b6dc606991815da47063b9e210b0d94b7db4b517639585c6024287552f4d7793b5cb1b33c3dab06b34d01711c WHIRLPOOL 2c7e7fabf79c9f1f0a095acc9282a145a4b3a58f76f644e491348722495302ce9d77dc0913990df4c8fc6b6e321adb4ba267063e1944f7a0239283847d114652
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTOddkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOhOQP/2OCZugvEsa9PxOwiUg2AGJJ
-ozqAzqK/NGqlS6XER5tCyO7z9TBT3uD7sgnG3Alx3fM3LQIS1Nwim7Q67lq3mV18
-0nsqyOZKQBEElSQ8PIur6MJ+hJbNk6kvxtJ1q0IPtCkqWZwYK3mJVjoPHxnpCCV1
-K7DhDFvUl7OPK413rNdIhn4U6UMIEHNGb0Dst8IbrCpU/ctOLWkh3zXI1if5mkhF
-+kazsteISNwCYZN6fcUiGAfpemGqQTRz8g0ZVU/+Pj303u6/zX6SoTTX20p4USND
-eX5/UZrPug4eSglg8mFy9tmyLU3I5p8n8+ArtiRJpfD9x6glz6v/WFupHWbPaRTK
-ax9NDRtWSVfNe+ehbKLj6hKoFIqRvtYh+lZsDSXLf3D2i/ICRWAE3VyuTkO0qMRQ
-GjJ1gL3e+S/p2NUQ912W9cotKT32igwMycm+Q9sJMeoOCmEQnAuOlUciCR6Kirfp
-f5IkRkz5DJ4YVuhVX1liu2VDjWPWC5Oo02qKEpeoDzLLsJ86Hew7dzK/bNTpMFXA
-zViw4z4c9iklGgHWSVfsKyzR2mq/06ul3ToqafZPRiK9FdA0RuYcPlceIXulHVcc
-z4iJckoG1tUHWFeBNHCo5ruTOnf4pRo7DMRCPcfLfNEBEiWcQKi+M/sQ6NiT/VHy
-MiY879A/nPgJGlT1hV9u
-=BXkI
+iEYEAREIAAYFAlNGtf4ACgkQso7CE7gHKw0WoACgqW4AVFrX1MYaDRvbu2D04Fwr
+DUIAnAqNQ4iN8ATd+rPRxIIoDKyscOBT
+=oRWD
 -----END PGP SIGNATURE-----
diff --git a/dev-python/geopy/geopy-0.94.2-r1.ebuild b/dev-python/geopy/geopy-0.94.2-r1.ebuild
deleted file mode 100644
index c4e18e7bc459..000000000000
--- a/dev-python/geopy/geopy-0.94.2-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/geopy/geopy-0.94.2-r1.ebuild,v 1.1 2012/06/29 15:54:33 iksaif Exp $
-
-EAPI="4"
-
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
-
-DESCRIPTION="A Geocoding Toolbox for Python"
-HOMEPAGE="http://www.geopy.org/ http://pypi.python.org/pypi/geopy http://code.google.com/p/geopy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-IUSE=""
-
-RDEPEND="<=dev-python/beautifulsoup-4.0"
-DEPEND="${RDEPEND}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/geopy/geopy-0.99.ebuild b/dev-python/geopy/geopy-0.99.ebuild
new file mode 100644
index 000000000000..9703451049ea
--- /dev/null
+++ b/dev-python/geopy/geopy-0.99.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/geopy/geopy-0.99.ebuild,v 1.1 2014/04/10 15:24:36 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Geocoding Toolbox for Python"
+HOMEPAGE="http://www.geopy.org/ http://pypi.python.org/pypi/geopy http://code.google.com/p/geopy/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+IUSE="test yahoo"
+
+RDEPEND="yahoo? ( >=dev-python/requests-oauthlib-0.4.0[$(python_gen_usedep 'python2*' python3_3)] )"
+DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="yahoo? ( || ( $(python_gen_useflags 'python2*' python3_3) ) )"
+
+python_test() {
+	nosetests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/geopy/metadata.xml b/dev-python/geopy/metadata.xml
index e61d2e72fd2b..1300364135aa 100644
--- a/dev-python/geopy/metadata.xml
+++ b/dev-python/geopy/metadata.xml
@@ -6,4 +6,7 @@
 		<remote-id type="google-code">geopy</remote-id>
 		<remote-id type="pypi">geopy</remote-id>
 	</upstream>
+  <use>
+	<flag name="yahoo">Enables use of YahooPlaceFinder</flag>
+  </use>
 </pkgmetadata>