| 1 |
commit: d9e2995129f77953318443f8f67b93d78dc83579 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 8 10:34:48 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 15:54:17 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e29951 |
| 7 |
|
| 8 |
app-admin/calamares: Switch to python-single-r1 |
| 9 |
|
| 10 |
This package does not have *any* code to support multiple |
| 11 |
implementations, and depends on single-r1 package. Use python-single-r1 |
| 12 |
instead of hacking around python-r1 to make it work by miracle. |
| 13 |
|
| 14 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 15 |
|
| 16 |
app-admin/calamares/calamares-3.2.12.ebuild | 11 ++++++----- |
| 17 |
...calamares-3.2.17.1.ebuild => calamares-3.2.17.1-r1.ebuild} | 11 ++++++----- |
| 18 |
2 files changed, 12 insertions(+), 10 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-admin/calamares/calamares-3.2.12.ebuild b/app-admin/calamares/calamares-3.2.12.ebuild |
| 21 |
index 9fea01c24f6..8ce51a9bf5d 100644 |
| 22 |
--- a/app-admin/calamares/calamares-3.2.12.ebuild |
| 23 |
+++ b/app-admin/calamares/calamares-3.2.12.ebuild |
| 24 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 25 |
|
| 26 |
KDE_TEST="true" |
| 27 |
PYTHON_COMPAT=( python3_6 ) |
| 28 |
-inherit kde5 python-r1 |
| 29 |
+inherit kde5 python-single-r1 |
| 30 |
|
| 31 |
DESCRIPTION="Distribution-independent installer framework" |
| 32 |
HOMEPAGE="https://calamares.io" |
| 33 |
@@ -41,13 +41,15 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 34 |
$(add_qt_dep qtwidgets) |
| 35 |
$(add_qt_dep qtxml) |
| 36 |
dev-cpp/yaml-cpp:= |
| 37 |
- >=dev-libs/boost-1.55:=[python,${PYTHON_USEDEP}] |
| 38 |
- dev-libs/libpwquality[${PYTHON_USEDEP}] |
| 39 |
+ $(python_gen_cond_dep ' |
| 40 |
+ >=dev-libs/boost-1.55:=[python,${PYTHON_MULTI_USEDEP}] |
| 41 |
+ dev-libs/libpwquality[${PYTHON_MULTI_USEDEP}] |
| 42 |
+ ') |
| 43 |
sys-apps/dbus |
| 44 |
sys-apps/dmidecode |
| 45 |
sys-auth/polkit-qt[qt5(+)] |
| 46 |
>=sys-libs/kpmcore-4.0.0:5= |
| 47 |
- pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] ) |
| 48 |
+ pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_SINGLE_USEDEP}] ) |
| 49 |
" |
| 50 |
DEPEND="${COMMON_DEPEND} |
| 51 |
test? ( $(add_qt_dep qttest) ) |
| 52 |
@@ -67,7 +69,6 @@ RDEPEND="${COMMON_DEPEND} |
| 53 |
|
| 54 |
src_prepare() { |
| 55 |
cmake-utils_src_prepare |
| 56 |
- python_setup |
| 57 |
export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \ |
| 58 |
PYTHON_INCLUDE_PATH="$(python_get_library_path)"\ |
| 59 |
PYTHON_CFLAGS="$(python_get_CFLAGS)"\ |
| 60 |
|
| 61 |
diff --git a/app-admin/calamares/calamares-3.2.17.1.ebuild b/app-admin/calamares/calamares-3.2.17.1-r1.ebuild |
| 62 |
similarity index 89% |
| 63 |
rename from app-admin/calamares/calamares-3.2.17.1.ebuild |
| 64 |
rename to app-admin/calamares/calamares-3.2.17.1-r1.ebuild |
| 65 |
index e94dcef7f30..de32e110d2e 100644 |
| 66 |
--- a/app-admin/calamares/calamares-3.2.17.1.ebuild |
| 67 |
+++ b/app-admin/calamares/calamares-3.2.17.1-r1.ebuild |
| 68 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 69 |
|
| 70 |
ECM_TEST="true" |
| 71 |
PYTHON_COMPAT=( python3_6 ) |
| 72 |
-inherit ecm python-r1 |
| 73 |
+inherit ecm python-single-r1 |
| 74 |
|
| 75 |
DESCRIPTION="Distribution-independent installer framework" |
| 76 |
HOMEPAGE="https://calamares.io" |
| 77 |
@@ -22,8 +22,10 @@ BDEPEND=" |
| 78 |
" |
| 79 |
COMMON_DEPEND="${PYTHON_DEPS} |
| 80 |
dev-cpp/yaml-cpp:= |
| 81 |
- >=dev-libs/boost-1.55:=[python,${PYTHON_USEDEP}] |
| 82 |
- dev-libs/libpwquality[${PYTHON_USEDEP}] |
| 83 |
+ $(python_gen_cond_dep ' |
| 84 |
+ >=dev-libs/boost-1.55:=[python,${PYTHON_MULTI_USEDEP}] |
| 85 |
+ dev-libs/libpwquality[${PYTHON_MULTI_USEDEP}] |
| 86 |
+ ') |
| 87 |
dev-qt/qtconcurrent:5 |
| 88 |
dev-qt/qtdbus:5 |
| 89 |
dev-qt/qtdeclarative:5 |
| 90 |
@@ -43,7 +45,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 91 |
sys-apps/dmidecode |
| 92 |
sys-auth/polkit-qt |
| 93 |
>=sys-libs/kpmcore-4.0.0:5= |
| 94 |
- pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] ) |
| 95 |
+ pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_SINGLE_USEDEP}] ) |
| 96 |
" |
| 97 |
DEPEND="${COMMON_DEPEND} |
| 98 |
test? ( dev-qt/qttest:5 ) |
| 99 |
@@ -63,7 +65,6 @@ RDEPEND="${COMMON_DEPEND} |
| 100 |
|
| 101 |
src_prepare() { |
| 102 |
ecm_src_prepare |
| 103 |
- python_setup |
| 104 |
export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \ |
| 105 |
PYTHON_INCLUDE_PATH="$(python_get_library_path)"\ |
| 106 |
PYTHON_CFLAGS="$(python_get_CFLAGS)"\ |
Archives