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@gentoo.org>

diff --git a/app-admin/calamares/calamares-3.2.12.ebuild b/app-admin/calamares/calamares-3.2.12.ebuild
index 9fea01c24f628f2460af24108a68ceac5472a5af..8ce51a9bf5daba7a984633bb078a46c785373d39 100644 (file)
--- 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 e94dcef7f3083606506a2e59e7f67ee885d4848c..de32e110d2e0386350fa98701a7c81f1c86aff9f 100644 (file)
--- 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)"\