| 1 |
commit: 0ce03a9d9b9fec66e619b890471089fc61ca029d |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 2 20:48:57 2020 +0000 |
| 4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 2 20:51:00 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ce03a9d |
| 7 |
|
| 8 |
app-emulation/diskimage-builder: use DISTUTILS_USE_SETUPTOOLS |
| 9 |
|
| 10 |
closes: https://bugs.gentoo.org/746077 |
| 11 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 12 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
| 13 |
|
| 14 |
app-emulation/diskimage-builder/diskimage-builder-3.2.1.ebuild | 4 ++-- |
| 15 |
app-emulation/diskimage-builder/diskimage-builder-3.3.1.ebuild | 4 ++-- |
| 16 |
app-emulation/diskimage-builder/diskimage-builder-9999.ebuild | 4 ++-- |
| 17 |
3 files changed, 6 insertions(+), 6 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.2.1.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.2.1.ebuild |
| 20 |
index 3f1829944be..893f0c3ae6b 100644 |
| 21 |
--- a/app-emulation/diskimage-builder/diskimage-builder-3.2.1.ebuild |
| 22 |
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.2.1.ebuild |
| 23 |
@@ -4,6 +4,7 @@ |
| 24 |
EAPI=7 |
| 25 |
|
| 26 |
PYTHON_COMPAT=( python3_{6,7,8} ) |
| 27 |
+DISTUTILS_USE_SETUPTOOLS=rdepend |
| 28 |
inherit distutils-r1 |
| 29 |
|
| 30 |
DESCRIPTION="Golden Disk Image builder." |
| 31 |
@@ -22,8 +23,7 @@ IUSE="" |
| 32 |
|
| 33 |
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] |
| 34 |
!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]" |
| 35 |
-DEPEND="${CDEPEND} |
| 36 |
- dev-python/setuptools[${PYTHON_USEDEP}]" |
| 37 |
+DEPEND="${CDEPEND}" |
| 38 |
RDEPEND="${CDEPEND} |
| 39 |
>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] |
| 40 |
!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}] |
| 41 |
|
| 42 |
diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.3.1.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.3.1.ebuild |
| 43 |
index 720474e33c4..eb082f7274e 100644 |
| 44 |
--- a/app-emulation/diskimage-builder/diskimage-builder-3.3.1.ebuild |
| 45 |
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.3.1.ebuild |
| 46 |
@@ -4,6 +4,7 @@ |
| 47 |
EAPI=7 |
| 48 |
|
| 49 |
PYTHON_COMPAT=( python3_{6,7,8} ) |
| 50 |
+DISTUTILS_USE_SETUPTOOLS=rdepend |
| 51 |
inherit distutils-r1 |
| 52 |
|
| 53 |
DESCRIPTION="Golden Disk Image builder." |
| 54 |
@@ -22,8 +23,7 @@ IUSE="" |
| 55 |
|
| 56 |
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] |
| 57 |
!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]" |
| 58 |
-DEPEND="${CDEPEND} |
| 59 |
- dev-python/setuptools[${PYTHON_USEDEP}]" |
| 60 |
+DEPEND="${CDEPEND}" |
| 61 |
RDEPEND="${CDEPEND} |
| 62 |
>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] |
| 63 |
!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}] |
| 64 |
|
| 65 |
diff --git a/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild b/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild |
| 66 |
index 720474e33c4..eb082f7274e 100644 |
| 67 |
--- a/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild |
| 68 |
+++ b/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild |
| 69 |
@@ -4,6 +4,7 @@ |
| 70 |
EAPI=7 |
| 71 |
|
| 72 |
PYTHON_COMPAT=( python3_{6,7,8} ) |
| 73 |
+DISTUTILS_USE_SETUPTOOLS=rdepend |
| 74 |
inherit distutils-r1 |
| 75 |
|
| 76 |
DESCRIPTION="Golden Disk Image builder." |
| 77 |
@@ -22,8 +23,7 @@ IUSE="" |
| 78 |
|
| 79 |
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] |
| 80 |
!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]" |
| 81 |
-DEPEND="${CDEPEND} |
| 82 |
- dev-python/setuptools[${PYTHON_USEDEP}]" |
| 83 |
+DEPEND="${CDEPEND}" |
| 84 |
RDEPEND="${CDEPEND} |
| 85 |
>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] |
| 86 |
!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}] |
Archives