commit: d9e2995129f77953318443f8f67b93d78dc83579 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Feb 8 10:34:48 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Feb 9 15:54:17 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e29951
app-admin/calamares: Switch to python-single-r1 This package does not have *any* code to support multiple implementations, and depends on single-r1 package. Use python-single-r1 instead of hacking around python-r1 to make it work by miracle. Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> app-admin/calamares/calamares-3.2.12.ebuild | 11 ++++++----- ...calamares-3.2.17.1.ebuild => calamares-3.2.17.1-r1.ebuild} | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app-admin/calamares/calamares-3.2.12.ebuild b/app-admin/calamares/calamares-3.2.12.ebuild index 9fea01c24f6..8ce51a9bf5d 100644 --- a/app-admin/calamares/calamares-3.2.12.ebuild +++ b/app-admin/calamares/calamares-3.2.12.ebuild @@ -5,7 +5,7 @@ EAPI=7 KDE_TEST="true" PYTHON_COMPAT=( python3_6 ) -inherit kde5 python-r1 +inherit kde5 python-single-r1 DESCRIPTION="Distribution-independent installer framework" HOMEPAGE="https://calamares.io"; @@ -41,13 +41,15 @@ COMMON_DEPEND="${PYTHON_DEPS} $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) dev-cpp/yaml-cpp:= - >=dev-libs/boost-1.55:=[python,${PYTHON_USEDEP}] - dev-libs/libpwquality[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-libs/boost-1.55:=[python,${PYTHON_MULTI_USEDEP}] + dev-libs/libpwquality[${PYTHON_MULTI_USEDEP}] + ') sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-4.0.0:5= - pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] ) + pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_SINGLE_USEDEP}] ) " DEPEND="${COMMON_DEPEND} test? ( $(add_qt_dep qttest) ) @@ -67,7 +69,6 @@ RDEPEND="${COMMON_DEPEND} src_prepare() { cmake-utils_src_prepare - python_setup export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \ PYTHON_INCLUDE_PATH="$(python_get_library_path)"\ PYTHON_CFLAGS="$(python_get_CFLAGS)"\ diff --git a/app-admin/calamares/calamares-3.2.17.1.ebuild b/app-admin/calamares/calamares-3.2.17.1-r1.ebuild similarity index 89% rename from app-admin/calamares/calamares-3.2.17.1.ebuild rename to app-admin/calamares/calamares-3.2.17.1-r1.ebuild index e94dcef7f30..de32e110d2e 100644 --- a/app-admin/calamares/calamares-3.2.17.1.ebuild +++ b/app-admin/calamares/calamares-3.2.17.1-r1.ebuild @@ -5,7 +5,7 @@ EAPI=7 ECM_TEST="true" PYTHON_COMPAT=( python3_6 ) -inherit ecm python-r1 +inherit ecm python-single-r1 DESCRIPTION="Distribution-independent installer framework" HOMEPAGE="https://calamares.io"; @@ -22,8 +22,10 @@ BDEPEND=" " COMMON_DEPEND="${PYTHON_DEPS} dev-cpp/yaml-cpp:= - >=dev-libs/boost-1.55:=[python,${PYTHON_USEDEP}] - dev-libs/libpwquality[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-libs/boost-1.55:=[python,${PYTHON_MULTI_USEDEP}] + dev-libs/libpwquality[${PYTHON_MULTI_USEDEP}] + ') dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 @@ -43,7 +45,7 @@ COMMON_DEPEND="${PYTHON_DEPS} sys-apps/dmidecode sys-auth/polkit-qt >=sys-libs/kpmcore-4.0.0:5= - pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] ) + pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_SINGLE_USEDEP}] ) " DEPEND="${COMMON_DEPEND} test? ( dev-qt/qttest:5 ) @@ -63,7 +65,6 @@ RDEPEND="${COMMON_DEPEND} src_prepare() { ecm_src_prepare - python_setup export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \ PYTHON_INCLUDE_PATH="$(python_get_library_path)"\ PYTHON_CFLAGS="$(python_get_CFLAGS)"\
