From b948cc5f85cc8a983ab14452c64fd21127f05e75 Mon Sep 17 00:00:00 2001
From: Louis Sautier <sbraz@gentoo.org>
Date: Tue, 2 Jul 2019 14:59:15 +0200
Subject: [PATCH] dev-python/jaraco-*: depend on old pkg_resources-style
 namespace pkg

In anticipation of a switch to a pkgutil-style namespace package.

Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Louis Sautier <sbraz@gentoo.org>
---
 .../{jaraco-classes-1.5.ebuild => jaraco-classes-1.5-r1.ebuild} | 2 +-
 ...lections-1.5.3.ebuild => jaraco-collections-1.5.3-r1.ebuild} | 2 +-
 ...lections-1.6.0.ebuild => jaraco-collections-1.6.0-r1.ebuild} | 2 +-
 ...co-functools-1.19.ebuild => jaraco-functools-1.19-r1.ebuild} | 2 +-
 ...co-functools-1.20.ebuild => jaraco-functools-1.20-r1.ebuild} | 2 +-
 ...raco-itertools-2.3.ebuild => jaraco-itertools-2.3-r1.ebuild} | 2 +-
 ...-itertools-3.0.0.ebuild => jaraco-itertools-2.5.2-r1.ebuild} | 2 +-
 ...-itertools-2.5.2.ebuild => jaraco-itertools-3.0.0-r1.ebuild} | 2 +-
 ...raco-logging-1.5.2.ebuild => jaraco-logging-1.5.2-r1.ebuild} | 2 +-
 ...raco-packaging-5.1.ebuild => jaraco-packaging-5.1-r1.ebuild} | 2 +-
 ...-packaging-5.1.1.ebuild => jaraco-packaging-5.1.1-r1.ebuild} | 2 +-
 ...raco-packaging-5.2.ebuild => jaraco-packaging-5.2-r1.ebuild} | 2 +-
 .../{jaraco-stream-1.2.ebuild => jaraco-stream-1.2-r1.ebuild}   | 2 +-
 .../{jaraco-text-1.10.1.ebuild => jaraco-text-1.10.1-r1.ebuild} | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)
 rename dev-python/jaraco-classes/{jaraco-classes-1.5.ebuild => jaraco-classes-1.5-r1.ebuild} (96%)
 rename dev-python/jaraco-collections/{jaraco-collections-1.5.3.ebuild => jaraco-collections-1.5.3-r1.ebuild} (96%)
 rename dev-python/jaraco-collections/{jaraco-collections-1.6.0.ebuild => jaraco-collections-1.6.0-r1.ebuild} (96%)
 rename dev-python/jaraco-functools/{jaraco-functools-1.19.ebuild => jaraco-functools-1.19-r1.ebuild} (96%)
 rename dev-python/jaraco-functools/{jaraco-functools-1.20.ebuild => jaraco-functools-1.20-r1.ebuild} (96%)
 rename dev-python/jaraco-itertools/{jaraco-itertools-2.3.ebuild => jaraco-itertools-2.3-r1.ebuild} (96%)
 rename dev-python/jaraco-itertools/{jaraco-itertools-3.0.0.ebuild => jaraco-itertools-2.5.2-r1.ebuild} (96%)
 rename dev-python/jaraco-itertools/{jaraco-itertools-2.5.2.ebuild => jaraco-itertools-3.0.0-r1.ebuild} (96%)
 rename dev-python/jaraco-logging/{jaraco-logging-1.5.2.ebuild => jaraco-logging-1.5.2-r1.ebuild} (96%)
 rename dev-python/jaraco-packaging/{jaraco-packaging-5.1.ebuild => jaraco-packaging-5.1-r1.ebuild} (96%)
 rename dev-python/jaraco-packaging/{jaraco-packaging-5.1.1.ebuild => jaraco-packaging-5.1.1-r1.ebuild} (96%)
 rename dev-python/jaraco-packaging/{jaraco-packaging-5.2.ebuild => jaraco-packaging-5.2-r1.ebuild} (96%)
 rename dev-python/jaraco-stream/{jaraco-stream-1.2.ebuild => jaraco-stream-1.2-r1.ebuild} (96%)
 rename dev-python/jaraco-text/{jaraco-text-1.10.1.ebuild => jaraco-text-1.10.1-r1.ebuild} (96%)

diff --git a/dev-python/jaraco-classes/jaraco-classes-1.5.ebuild b/dev-python/jaraco-classes/jaraco-classes-1.5-r1.ebuild
similarity index 96%
rename from dev-python/jaraco-classes/jaraco-classes-1.5.ebuild
rename to dev-python/jaraco-classes/jaraco-classes-1.5-r1.ebuild
index 8eee44f2f2c4..53def5d54190 100644
--- a/dev-python/jaraco-classes/jaraco-classes-1.5.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-1.5-r1.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="
diff --git a/dev-python/jaraco-collections/jaraco-collections-1.5.3.ebuild b/dev-python/jaraco-collections/jaraco-collections-1.5.3-r1.ebuild
similarity index 96%
rename from dev-python/jaraco-collections/jaraco-collections-1.5.3.ebuild
rename to dev-python/jaraco-collections/jaraco-collections-1.5.3-r1.ebuild
index c1d401f3dfde..d634de30137b 100644
--- a/dev-python/jaraco-collections/jaraco-collections-1.5.3.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-1.5.3-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="doc test"
 
 PDEPEND="dev-python/jaraco-text[${PYTHON_USEDEP}]"
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/jaraco-classes[${PYTHON_USEDEP}]
 	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/jaraco-collections/jaraco-collections-1.6.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-1.6.0-r1.ebuild
similarity index 96%
rename from dev-python/jaraco-collections/jaraco-collections-1.6.0.ebuild
rename to dev-python/jaraco-collections/jaraco-collections-1.6.0-r1.ebuild
index 5bfd4a68210a..b9c0016ba406 100644
--- a/dev-python/jaraco-collections/jaraco-collections-1.6.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-1.6.0-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="doc test"
 
 PDEPEND="dev-python/jaraco-text[${PYTHON_USEDEP}]"
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/jaraco-classes[${PYTHON_USEDEP}]
 	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/jaraco-functools/jaraco-functools-1.19.ebuild b/dev-python/jaraco-functools/jaraco-functools-1.19-r1.ebuild
similarity index 96%
rename from dev-python/jaraco-functools/jaraco-functools-1.19.ebuild
rename to dev-python/jaraco-functools/jaraco-functools-1.19-r1.ebuild
index ae4fb433a042..ebe3f058128f 100644
--- a/dev-python/jaraco-functools/jaraco-functools-1.19.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-1.19-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/more-itertools[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)
 "
diff --git a/dev-python/jaraco-functools/jaraco-functools-1.20.ebuild b/dev-python/jaraco-functools/jaraco-functools-1.20-r1.ebuild
similarity index 96%
rename from dev-python/jaraco-functools/jaraco-functools-1.20.ebuild
rename to dev-python/jaraco-functools/jaraco-functools-1.20-r1.ebuild
index 8f111d3f60ec..5dd7780fa576 100644
--- a/dev-python/jaraco-functools/jaraco-functools-1.20.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-1.20-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/more-itertools[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)
 "
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-2.3.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-2.3-r1.ebuild
similarity index 96%
rename from dev-python/jaraco-itertools/jaraco-itertools-2.3.ebuild
rename to dev-python/jaraco-itertools/jaraco-itertools-2.3-r1.ebuild
index a536517d0e14..c4c48eba45f8 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-2.3.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-2.3-r1.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/inflect[${PYTHON_USEDEP}]
 	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-3.0.0.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-2.5.2-r1.ebuild
similarity index 96%
rename from dev-python/jaraco-itertools/jaraco-itertools-3.0.0.ebuild
rename to dev-python/jaraco-itertools/jaraco-itertools-2.5.2-r1.ebuild
index e8ac043da8b8..0d19fccfefd0 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-3.0.0.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-2.5.2-r1.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/inflect[${PYTHON_USEDEP}]
 	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-2.5.2.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-3.0.0-r1.ebuild
similarity index 96%
rename from dev-python/jaraco-itertools/jaraco-itertools-2.5.2.ebuild
rename to dev-python/jaraco-itertools/jaraco-itertools-3.0.0-r1.ebuild
index e8ac043da8b8..0d19fccfefd0 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-2.5.2.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-3.0.0-r1.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/inflect[${PYTHON_USEDEP}]
 	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-logging/jaraco-logging-1.5.2.ebuild b/dev-python/jaraco-logging/jaraco-logging-1.5.2-r1.ebuild
similarity index 96%
rename from dev-python/jaraco-logging/jaraco-logging-1.5.2.ebuild
rename to dev-python/jaraco-logging/jaraco-logging-1.5.2-r1.ebuild
index 34cdfb17674e..b2ba8ab3c09a 100644
--- a/dev-python/jaraco-logging/jaraco-logging-1.5.2.ebuild
+++ b/dev-python/jaraco-logging/jaraco-logging-1.5.2-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/tempora[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-5.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-5.1-r1.ebuild
similarity index 96%
rename from dev-python/jaraco-packaging/jaraco-packaging-5.1.ebuild
rename to dev-python/jaraco-packaging/jaraco-packaging-5.1-r1.ebuild
index 0df91a50e77a..18bde9c8b29d 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-5.1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-5.1-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="doc test"
 
 RDEPEND="
 	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 "
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-5.1.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-5.1.1-r1.ebuild
similarity index 96%
rename from dev-python/jaraco-packaging/jaraco-packaging-5.1.1.ebuild
rename to dev-python/jaraco-packaging/jaraco-packaging-5.1.1-r1.ebuild
index ac2c79492cd4..e1a1a2212cd3 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-5.1.1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-5.1.1-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="doc test"
 
 RDEPEND="
 	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-5.2.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-5.2-r1.ebuild
similarity index 96%
rename from dev-python/jaraco-packaging/jaraco-packaging-5.2.ebuild
rename to dev-python/jaraco-packaging/jaraco-packaging-5.2-r1.ebuild
index 40b2b4cd34fc..0b92ee431110 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-5.2.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-5.2-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="doc test"
 
 RDEPEND="
 	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-stream/jaraco-stream-1.2.ebuild b/dev-python/jaraco-stream/jaraco-stream-1.2-r1.ebuild
similarity index 96%
rename from dev-python/jaraco-stream/jaraco-stream-1.2.ebuild
rename to dev-python/jaraco-stream/jaraco-stream-1.2-r1.ebuild
index e3f8538a0b9c..6e61e406dd65 100644
--- a/dev-python/jaraco-stream/jaraco-stream-1.2.ebuild
+++ b/dev-python/jaraco-stream/jaraco-stream-1.2-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-text/jaraco-text-1.10.1.ebuild b/dev-python/jaraco-text/jaraco-text-1.10.1-r1.ebuild
similarity index 96%
rename from dev-python/jaraco-text/jaraco-text-1.10.1.ebuild
rename to dev-python/jaraco-text/jaraco-text-1.10.1-r1.ebuild
index 03f71fdc3edd..2f1f531343ed 100644
--- a/dev-python/jaraco-text/jaraco-text-1.10.1.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-1.10.1-r1.ebuild
@@ -20,7 +20,7 @@ IUSE="doc test"
 PDEPEND="dev-python/jaraco-collections[${PYTHON_USEDEP}]"
 RDEPEND="
 	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-- 
2.26.2