Depend on setuptools. Remove old.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

6 files changed, 19 insertions, 81 deletions

diff --git a/dev-python/httplib2/ChangeLog b/dev-python/httplib2/ChangeLog
index 14a28d5b3cc8..41808a0194df 100644
--- a/dev-python/httplib2/ChangeLog
+++ b/dev-python/httplib2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/httplib2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/httplib2/ChangeLog,v 1.43 2014/05/24 09:53:40 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/httplib2/ChangeLog,v 1.44 2014/11/05 00:18:10 floppym Exp $
+
+  05 Nov 2014; Mike Gilbert <floppym@gentoo.org> -httplib2-0.6.0.ebuild,
+  -httplib2-0.7.7.ebuild, httplib2-0.7.6.ebuild, httplib2-0.8.ebuild:
+  Depend on setuptools. Remove old.
 
   24 May 2014; Ian Delaney <idella4@gentoo.org> httplib2-0.8.ebuild:
   add pypy support
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index 92230f7f4e63..1f7382d10e0e 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -1,20 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST httplib2-0.6.0.tar.gz 53800 SHA256 58de068e5af5661c566abb871a75133cc8297e6473ff3f15e98079d57da3978c SHA512 5f90ad3423fcdf087288c9ad299c200d8855416c916b5d6d25fbf3d6f5769ec8df98e3a4b80705df5344a4143fcd20931b852f255c4dae70be0c4cc8210e7bbf WHIRLPOOL 51ca950eabfed081d6d8b05c95e26fc1f1fa9a988920d507f3934023a71adde5b0385f29473dc4fa19e7482faf5305f517a77b3ae63b0195e0cdfb90f82db7b3
 DIST httplib2-0.7.6.tar.gz 141916 SHA256 baa7bf431fa9d3c1016562de717e1ebb322a99df72a2918f6b5b8f65fa65bc2e SHA512 024898922a77780184ba454f80cb2ab05a10ca75cddc1d1b5b86aae83a47ad1daa23dd3aacaea1d50d70de18ae3f776977ccc5cff1ab7d48a959d47ded554eae WHIRLPOOL 93827c86efb78fa6082b220b36dcb61b003f33292c6ecffadf99f477d565bdc25b53f82a1111e1877aea6522fce6b9864d1841d125d1a215ad1e20f1fb62cc74
-DIST httplib2-0.7.7.tar.gz 144020 SHA256 2e2ce18092c32d1ec54f8a447e14e33585e30f240b883bfeeca65f12b3bcfaf6 SHA512 686400092bdc3f5aa1ee809ebb1c3ea52995523eb58926c26401dcdadef3de6bd17241531e1fdc01f649a07b92071bd3d136e50aa9f9c8aa6fa4fdd8cdc31ab4 WHIRLPOOL 4217917e358c982a88e41b60ace246730ffb925cfa21099879bf92013456f5feb46f33d9e6b20398e828369507069f903b3d84038bd95688310f1fb861326925
 DIST httplib2-0.8.tar.gz 148284 SHA256 af689bc3cb10a95721eb0d0cf806202a699e7799dacd3497f63b48b2ba429c3f SHA512 3b95b2f64f7b24a638792562e2d8645f9087ab716a105c8771e002507fde3cca9eb7e5de27140a7aed075e70ebd83fbfbda798714a94153b6233b2b704db1176 WHIRLPOOL 3aa30e5e4cdb08cb6e8544d2fb82eb02492ce04a5752255ae281389fcc382aceecdb060a3cda0a926eba4bbe15563d379851c97cbcabbb17106696f4a90d4987
-EBUILD httplib2-0.6.0.ebuild 815 SHA256 1d364b7b298d4fef6a5c4e49ee9c0e10eb4cac9b6a3b7ebd8b6ce6029c5e6493 SHA512 ec4ab5e3fd5fd382ebd3a7ae5bf5d4a6e310985e41415f1e914abe9cad26308fbf06ea73c8bfe5b57d79c2d037fd0b85dfcd0cc7975209565a405ca0a4e8a9c7 WHIRLPOOL 6c69df8cfb0e9cf9974381711c63143343ed861b19a7ae40de0c90b7c82bc42686d594dbfeb1a6be5c70c4aaa823aa5670e32da7c342ec4512cb71f1d1e951a7
-EBUILD httplib2-0.7.6.ebuild 887 SHA256 239c5f5bc98bd88d7b18f9d2f43e083e2736f59caa64142de60e908ee246d9da SHA512 7f3d8846ae785ff5bfcafdbe44969b1b6e522d67c3d45ff27dd13e3a6df1bc43f69086c36c621e1d77b3ca9dc263d80c3dbeb4959537abaccda419f574c42347 WHIRLPOOL 7b488f3262b33a585f622672dcdce6cb8a9351f834af386cdfc55589f5e259122ec9ba69dd92ce04dd7c5a7cd515116bbb561a3d8aa3ae83273deb6f8075ac12
-EBUILD httplib2-0.7.7.ebuild 806 SHA256 9a1e4e6501309a8af8e4950b8c211719950933284240300d8025a85eb6ed8393 SHA512 13a65bc52fc4f4e03a1c2b3e3280b696ea26af6009cb29bf2acfe1269e617a3331591f0177fd8b9dce9c3e7221aa63a5553eeefb7ad46db5580e776de2373bbf WHIRLPOOL f427cfdcfd8363a581c226cd81eab812d7213e3500241ad02c7ccee56842c5cde7e67e596a41a3385422013e61fa0b1d1af65eb27b739d3306b610b43d3528c6
-EBUILD httplib2-0.8.ebuild 810 SHA256 fdb02167c74c355877c27b56cd2c9bede622b9fca9580770622791d81426da09 SHA512 7a9142f8f094d1cc9ac5f6defbf78d8081e1d3541e7c73efd867d4aca3bd7386d692eb6df4a6aef3a34beeecf5b9c27d3f25b2ca9e4e812f170b9f653bcaa6bd WHIRLPOOL 2ca51b56aa36de3600a2d4864b3de999b2c017d44a104d9dae0e72cc78dbf08946d518d82063063fb3fc38e4434a7bfec677482de7188bc6815a1b6be2ca674e
-MISC ChangeLog 5558 SHA256 01643fbabed25b390e8f7c67fd85b50ae0242343ae2ced46de7f500896939549 SHA512 4e1c6ca9c448ab654e0883886453928eedc4b1c4500453c278386b357e36e29d0f3464181b187bd4145f8cf817b29c4303d8b11fcbe13c0346624ebd75ea6c61 WHIRLPOOL b4ff3d4bcb4a6126458bf25daef6569763d7a4523df5efb08eab7890f215c5cec2eea076045d5a9cafe90a9dab283edaa7a1f6b6f687a69028b1c5f4c6498b2f
+EBUILD httplib2-0.7.6.ebuild 923 SHA256 e6a607553ccae9eb6061873b2f27805539c6ac70cc17072e2c6d59343717c86f SHA512 8278f2ae28ffeca9f0aecd54b02b007052d18426b73836e7902de38d53036ae5bb8e2da77f1f43d6c3d2d9dfa7cc3c52063928a4f93a19eab89d7223e74ff226 WHIRLPOOL e65c128e9c80f1b7fe15e73d87be63d06daf7fe84bc7fff49ab0a117f705937910038df2d72d651c9c2dcab2d1ad1ed9e465c4d13bbcaf076c07e42b05567128
+EBUILD httplib2-0.8.ebuild 860 SHA256 fb9ca8e028431808c4ad33950fb87916b0be3b6d1dcf94305c0e20229313a9bb SHA512 225fb81b6c1756f4e2b768a88dde46c65bd198fcb582ec221195c17987fc5b7adaedd8547b08f23d86f702aadf2fab3ecea2ee03d0cb917ef0ab14fac6161f1e WHIRLPOOL 5b8db7e4a533b2e9f2a0d14b4a73ba7df86d36f132211e7f265c0f7dd82c28f8197dd58be59875ffcb25de3c6309d08224dfda04db6c157cf7c379844cfdcd5e
+MISC ChangeLog 5738 SHA256 6310405f37a82b16c44ed4dc0cbc2be0164443f8c61963c08b575682b81704aa SHA512 29fadc08f942080be82dc792d0fb8b200068eb6ef2b411493623a1049f7a74fb3f8653eeffa14c3c77c18278c30e2d03c47a98b7a8595482c64e34e1c121b2b3 WHIRLPOOL d314aebeed57736a369f89dd50d0d48fb9c80804986b92784879dddd169b69f0e246d98b563a299a8efe7fa710eada82d5377e4867ce7cb64f1c2f5b4a02b82c
 MISC metadata.xml 238 SHA256 5067624ed45f021ddec2e6cda0ac3cddd1fe3fe6e1c40b3ecf73edaff95d8548 SHA512 2579f3be08591bff0d81bb86448d3c1c707478879be5f315b02ccb0651318ac919df55d9683dc353829f6fc71eef3927570b6e05275d8e1de240d62afdf1ccbb WHIRLPOOL c8825c9625f0480ab66550f3f0bcc003bdd0706ad0cf2f7142b4c649df2c94ae47d980376163304aefcc03b920ee59f7a530282429c0e2ee8a5605e8499e7bb7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlOAalYACgkQso7CE7gHKw3i1ACfYLC4NJYLGiIf2Em81zXFjnHj
-JUIAoMQyac23W2qt7jCB0Cn+3O3dpsSN
-=W/Zw
+iF4EAREIAAYFAlRZbMMACgkQC77qH+pIQ6QlFwEAnpqEvQsrWWeBpLs69pZP+z2v
+89o8hFNOuTzZPghtsvYBAKP4w4XNVCLUfl3kyduPSgak6e+4Vgk3KNqL+A1C/LpG
+=RrH/
 -----END PGP SIGNATURE-----
diff --git a/dev-python/httplib2/httplib2-0.6.0.ebuild b/dev-python/httplib2/httplib2-0.6.0.ebuild
deleted file mode 100644
index d5f31d08775a..000000000000
--- a/dev-python/httplib2/httplib2-0.6.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/httplib2/httplib2-0.6.0.ebuild,v 1.10 2010/10/09 10:38:53 ssuominen Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-DESCRIPTION="A comprehensive HTTP client library"
-HOMEPAGE="http://code.google.com/p/httplib2/ http://pypi.python.org/pypi/httplib2"
-SRC_URI="http://httplib2.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	distutils_src_install
-
-	dodoc README
-	newdoc python3/README README-python3
-}
-
-src_test() {
-	testing() {
-		cd "$S/python${PYTHON_ABI:0:1}"
-		"$(PYTHON)" httplib2test.py
-		cd ../..
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/httplib2/httplib2-0.7.6.ebuild b/dev-python/httplib2/httplib2-0.7.6.ebuild
index c25d68d51604..898f2aa43a9d 100644
--- a/dev-python/httplib2/httplib2-0.7.6.ebuild
+++ b/dev-python/httplib2/httplib2-0.7.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/httplib2/httplib2-0.7.6.ebuild,v 1.8 2012/12/30 20:25:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/httplib2/httplib2-0.7.6.ebuild,v 1.9 2014/11/05 00:18:10 floppym Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2 3:3.2"
@@ -20,6 +20,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
+DEPEND="dev-python/setuptools"
+
 src_test() {
 	testing() {
 		pushd "python$(python_get_version --major)" > /dev/null
diff --git a/dev-python/httplib2/httplib2-0.7.7.ebuild b/dev-python/httplib2/httplib2-0.7.7.ebuild
deleted file mode 100644
index 335d8192506f..000000000000
--- a/dev-python/httplib2/httplib2-0.7.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/httplib2/httplib2-0.7.7.ebuild,v 1.2 2013/09/05 18:46:31 mgorny Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="A comprehensive HTTP client library"
-HOMEPAGE="http://code.google.com/p/httplib2/ http://pypi.python.org/pypi/httplib2"
-SRC_URI="http://httplib2.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x64-macos ~x86-linux"
-IUSE=""
-
-# tests connect to random remote sites
-RESTRICT="test"
-
-python_test() {
-	if [[ ${EPYTHON} == python2.* ]] ; then
-		cd python2
-	else
-		cd python3
-	fi
-
-	"${PYTHON}" httplib2test.py || die
-}
diff --git a/dev-python/httplib2/httplib2-0.8.ebuild b/dev-python/httplib2/httplib2-0.8.ebuild
index 278078723f9a..1a7b9dc97917 100644
--- a/dev-python/httplib2/httplib2-0.8.ebuild
+++ b/dev-python/httplib2/httplib2-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/httplib2/httplib2-0.8.ebuild,v 1.4 2014/05/24 09:53:40 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/httplib2/httplib2-0.8.ebuild,v 1.5 2014/11/05 00:18:10 floppym Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -16,6 +16,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x64-macos ~x86-linux"
 IUSE=""
 
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
 # tests connect to random remote sites
 RESTRICT="test"