From 11dfe78973b6705b1ac974174b67ab17a56a2ff4 Mon Sep 17 00:00:00 2001
From: Bertrand Jacquin <beber@meleeweb.net>
Date: Thu, 19 Sep 2013 14:08:17 +0200
Subject: dev-python/irc: remove DEPEND on pytest-runner

Package-Manager: portage-2.2.6
---
 dev-python/irc/ChangeLog                               |  5 +++++
 dev-python/irc/Manifest                                |  6 +++---
 dev-python/irc/files/8.5.1-cleanup-requires.diff       | 13 +++++++++++++
 dev-python/irc/files/8.5.1-remove-hg-dependencies.diff | 18 ------------------
 dev-python/irc/irc-8.5.1.ebuild                        |  5 +++--
 5 files changed, 24 insertions(+), 23 deletions(-)
 create mode 100644 dev-python/irc/files/8.5.1-cleanup-requires.diff
 delete mode 100644 dev-python/irc/files/8.5.1-remove-hg-dependencies.diff

(limited to 'dev-python')

diff --git a/dev-python/irc/ChangeLog b/dev-python/irc/ChangeLog
index 615c436e..b91ae210 100644
--- a/dev-python/irc/ChangeLog
+++ b/dev-python/irc/ChangeLog
@@ -1,3 +1,8 @@
+  19 Sep 2013; Bertrand Jacquin <beber@meleeweb.net>
+  +files/8.5.1-cleanup-requires.diff, -files/8.5.1-remove-hg-dependencies.diff,
+  irc-8.5.1.ebuild:
+  dev-python/irc: remove DEPEND on pytest-runner
+
 *irc-8.5.1 (19 Sep 2013)
 
   19 Sep 2013; Bertrand Jacquin <beber@meleeweb.net>
diff --git a/dev-python/irc/Manifest b/dev-python/irc/Manifest
index edb905ae..253f299e 100644
--- a/dev-python/irc/Manifest
+++ b/dev-python/irc/Manifest
@@ -1,5 +1,5 @@
-AUX 8.5.1-remove-hg-dependencies.diff 583 SHA256 202ee36d788c70dc7a53a5f3907e35c91f54636d293b0a1e68d378318f9993b2 WHIRLPOOL d7c26859a8b25c6ffdc1f6dc49a09b03050023a6046c0c277cff0d48df09d771e0891cf7bd097bc8c6bfc01d6e82a45e63dc4d53662c3377e50c3a4d13296b29
+AUX 8.5.1-cleanup-requires.diff 339 SHA256 c71c48db2c2a0679a5b10cc88419d9d4ab4fe66098dad055d61c5d98531e3a80 WHIRLPOOL e5de4a0dd8ca1e7f728ce2ea6720bd76cbededbc1266f8ead59f59eead765399328fa376b8e6679dec563559db56410d0a3555b52d68ad433665a18211bab036
 DIST irc-8.5.1.zip 112916 SHA256 ff29edb5c51bbf6583f60f677e846b3eb651374c2f6b39800e4b4947c989b8db WHIRLPOOL e24d1a8155dd79e840aceb085f0a6d6fd0c0cafb356c64604c01555d4a6189e8e8dbc4824f74d58c45731615d24fe1606987b70dacf40375354134d200373d13
-EBUILD irc-8.5.1.ebuild 1170 SHA256 c4d73c04e56173441e1a4ed88d5f6c6565cef7f0afdb9103001c69f2c598de30 WHIRLPOOL 1a39fd06bb546b67e0448a3b0cffb4df7efeab1cdaedd538dd7b5bf28673e5652311f392f22a25a1b2d606083a108d1bcb1c299257584ac9f204aa3de1c48b7a
-MISC ChangeLog 231 SHA256 0dd285ce002163aad5a68603d8737008f3fd20fde3641a2ad48f2e61ac236504 WHIRLPOOL 83725da9caf65851c125e381ea4248ab9b88c3e8acd6d9913fdb00638f11059e9ee3b28d6882f23dc409b11fa600f2502770428a74c431ba908a6c4debd465d4
+EBUILD irc-8.5.1.ebuild 1191 SHA256 4281cb13ffc7df3704bc68ed81cedcee55d29d6183e4da0e75bc8598f0150cc6 WHIRLPOOL eafe49179f3e183b01fbdffe6b9f15f2ef63d964c14f6d63fe297c705df46c55e8ca0cd200875c9d1e5b45a9e7586051e885a945c1ea9ab189f4ab09390d8a35
+MISC ChangeLog 434 SHA256 75860d54c0ef047ca52f322367d147e04f52c0870b88dc43089857689d1cc188 WHIRLPOOL 30a4be0282a620e5335547f2f75f22a771365f3acb2e016b8fa43c35bba1759788320e55a33e9c27f45491ad94b83eb6ff7c580811642a2bc6cad3c4774c1c62
 MISC metadata.xml 451 SHA256 f70c308344515f83623dba873f7cb705345bee7975fb4d2d4e2f91fcb54ff78b WHIRLPOOL d0eae6b6587c195d8140dfb271babab330c125ce12c10108a89dd247d6c9241852b8eaee285ead3ece28b982ae6f9e2b349476311255bacf085fafa369608a09
diff --git a/dev-python/irc/files/8.5.1-cleanup-requires.diff b/dev-python/irc/files/8.5.1-cleanup-requires.diff
new file mode 100644
index 00000000..29740806
--- /dev/null
+++ b/dev-python/irc/files/8.5.1-cleanup-requires.diff
@@ -0,0 +1,13 @@
+--- setup.py	2013-09-19 12:48:38.946374470 +0200
++++ setup.py	2013-09-19 13:59:33.837894164 +0200
+@@ -34,10 +33,6 @@
+     install_requires=[
+         'six',
+     ] + importlib_req + argparse_req,
+-    setup_requires=[
+-        'hgtools',
+-        'pytest-runner',
+-    ],
+     tests_require=[
+         'pytest',
+         'mock',
diff --git a/dev-python/irc/files/8.5.1-remove-hg-dependencies.diff b/dev-python/irc/files/8.5.1-remove-hg-dependencies.diff
deleted file mode 100644
index 75348799..00000000
--- a/dev-python/irc/files/8.5.1-remove-hg-dependencies.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- setup.py.ori	2013-09-19 12:48:38.946374470 +0200
-+++ setup.py	2013-09-19 12:48:57.766779291 +0200
-@@ -16,7 +16,6 @@
-     name="irc",
-     description="IRC (Internet Relay Chat) protocol client library for Python",
-     long_description=read_long_description(),
--    use_hg_version=True,
-     packages=setuptools.find_packages(),
-     author="Joel Rosdahl",
-     author_email="joel@rosdahl.net",
-@@ -35,7 +34,6 @@
-         'six',
-     ] + importlib_req + argparse_req,
-     setup_requires=[
--        'hgtools',
-         'pytest-runner',
-     ],
-     tests_require=[
diff --git a/dev-python/irc/irc-8.5.1.ebuild b/dev-python/irc/irc-8.5.1.ebuild
index bf9c5c9a..b08affc7 100644
--- a/dev-python/irc/irc-8.5.1.ebuild
+++ b/dev-python/irc/irc-8.5.1.ebuild
@@ -17,7 +17,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="examples test"
 
 DEPEND="app-arch/unzip
-	dev-python/pytest-runner[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}] )"
 
@@ -25,8 +24,10 @@ RDEPEND="!>=dev-python/python-irclib-3.2.2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 
 python_prepare_all() {
+	epatch "${FILESDIR}/${PV}-cleanup-requires.diff"
+
 	# Don't rely on hgtools for version
-	epatch "${FILESDIR}/${PV}-remove-hg-dependencies.diff"
+	sed -e "s/use_hg_version=True/version=\"${PV}\"/" -i setup.py || die
 	sed -e "/^tag_/d" -i setup.cfg || die
 
 	distutils-r1_python_prepare_all
-- 
cgit v1.2.3