[gentoo-commits] dev/dev-zero:master commit in: dev-python/mwclient/

[Tiziano Müller]

commit:     ac4454cdc9a2096b58a918677101ae9ec9158f3c
Author:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 19 06:12:42 2015 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Sun Apr 19 06:12:42 2015 +0000
URL:        https://gitweb.gentoo.org/dev/dev-zero.git/commit/?id=ac4454cd

upstream merge the requests branch

 dev-python/mwclient/Manifest            | 1 -
 dev-python/mwclient/mwclient-scm.ebuild | 9 ++-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/dev-python/mwclient/Manifest b/dev-python/mwclient/Manifest
deleted file mode 100644
index 5bf0eb3..0000000
--- a/dev-python/mwclient/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-EBUILD mwclient-scm.ebuild 752 SHA256 
1fcacecb36727ab439d795074bf4f5e7d83009195d4b080c3836951a077e7d9d SHA512 
8de4300ae1af6bc2d870f7b82b8e3ff1ec6a6ea8855e8c0be2c6ea70e26e9087b129ca75a7502c9373ea101b79cb0ee283f80d1e5c1674c7abfd23a1a1ad7bae
 WHIRLPOOL 
889580e8cf5beb7f66300ffd354314b217ef3fa2189ea8c0271abb854d10860e9362f16788fed7782b84a288d7b84b349b2287c9330dc05e4d53cb1c4e05ed9e

diff --git a/dev-python/mwclient/mwclient-scm.ebuild 
b/dev-python/mwclient/mwclient-scm.ebuild
index c25d189..527922b 100644
--- a/dev-python/mwclient/mwclient-scm.ebuild
+++ b/dev-python/mwclient/mwclient-scm.ebuild
@@ -17,16 +17,11 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]
+       dev-python/requests[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
        ${RDEPEND}"
 
 DOCS=( README.rst {REFERENCE,RELEASE-NOTES}.md )
 
-python_prepare_all() {
-       sed -i \
-               -e "/use_setuptools/d" \
-               setup.py || die
-}
-
 # Notes: tests require a running mediawiki instance including credentials