From d6b4ec09e37c42b7f8ec5ab00548cfa4ae85ed98 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 26 Jan 2019 22:58:47 +0000 Subject: app-admin/calamares : revision bump, we don't rely on plymouthcfg for splash --- app-admin/calamares/calamares-3.1.12-r2.ebuild | 79 --------------------- app-admin/calamares/calamares-3.1.12-r3.ebuild | 81 ++++++++++++++++++++++ .../files/calamares-dont-rely-on-plymouthcfg.patch | 28 ++++++++ 3 files changed, 109 insertions(+), 79 deletions(-) delete mode 100644 app-admin/calamares/calamares-3.1.12-r2.ebuild create mode 100644 app-admin/calamares/calamares-3.1.12-r3.ebuild create mode 100644 app-admin/calamares/files/calamares-dont-rely-on-plymouthcfg.patch diff --git a/app-admin/calamares/calamares-3.1.12-r2.ebuild b/app-admin/calamares/calamares-3.1.12-r2.ebuild deleted file mode 100644 index 042edc7f..00000000 --- a/app-admin/calamares/calamares-3.1.12-r2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -PYTHON_COMPAT=( python3_{4,5,6} ) - -inherit eutils cmake-utils python-r1 - -SRC_URI="https://github.com/calamares/calamares/releases/download/v${PV}/${P}.tar.gz" - -DESCRIPTION="Distribution-independent installer framework" -HOMEPAGE="http://calamares.io" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64" -IUSE="+python" - -S="${WORKDIR}/${P}" - -DEPEND=" - python? ( - >=dev-libs/boost-1.55.0-r2[${PYTHON_USEDEP}] - ) - >=dev-qt/designer-5.9.0:5 - >=dev-qt/linguist-tools-5.9.0:5 - >=dev-qt/qtconcurrent-5.9.0:5 - >=dev-qt/qtcore-5.9.0:5 - >=dev-qt/qtdbus-5.9.0:5 - >=dev-qt/qtdeclarative-5.9.0:5 - >=dev-qt/qtgui-5.9.0:5 - >=dev-qt/qtnetwork-5.9.0:5 - >=dev-qt/qtopengl-5.9.0:5 - >=dev-qt/qtprintsupport-5.9.0:5 - >=dev-qt/qtscript-5.9.0:5 - >=dev-qt/qtsvg-5.9.0:5 - >=dev-qt/qttest-5.9.0:5 - >=dev-qt/qtwebengine-5.9.0:5 - >=dev-qt/qtwebchannel-5.9.0:5 - >=dev-qt/qtwidgets-5.9.0:5 - >=dev-qt/qtxml-5.9.0:5 - >=dev-qt/qtxmlpatterns-5.9.0:5 - >=dev-cpp/yaml-cpp-0.5.1 - >=kde-frameworks/extra-cmake-modules-5.18.0 - >=sys-libs/kpmcore-3.2.0" - -RDEPEND="app-misc/calamares-runtime[branding]" - -src_prepare() { - # build against kpmcore-3.2 - epatch "${FILESDIR}"/${PN}-kpmcore-3.2.patch - # don't run locale-gen during system installation, we run it ourselves during stage4 bootstrap...this patch should speed up installation significantly - epatch "${FILESDIR}"/${PN}-dont-run-locale-gen.patch - # support auto-unlocking encrypted partitions via OpenRC's dmcrypt service - epatch -p1 "${FILESDIR}"/${PN}-openrc-dmcrypt-cfg-r1.patch - # replace calamares installer desktop icon - sed -i "s/Icon=calamares/Icon=start-here/g" "${S}/calamares.desktop" - # fix installer doesn't start from desktop launcher (IMPROVE THIS UGLY THINGY) - sed -i "s/pkexec //g" "${S}/calamares.desktop" - sed -i "s/calamares/calamares-pkexec/g" "${S}/calamares.desktop" - # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt version may be used. - # Setting QT_SELECT environment variable will enforce correct binaries (fix taken from vlc ebuild) - export QT_SELECT=qt5 -} - -src_configure() { - local mycmakeargs=( - -DWITH_PARTITIONMANAGER=1 - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - insinto /usr/bin - insopts -m 755 - doins ${FILESDIR}/calamares-pkexec -} diff --git a/app-admin/calamares/calamares-3.1.12-r3.ebuild b/app-admin/calamares/calamares-3.1.12-r3.ebuild new file mode 100644 index 00000000..025076b6 --- /dev/null +++ b/app-admin/calamares/calamares-3.1.12-r3.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 +PYTHON_COMPAT=( python3_{4,5,6} ) + +inherit eutils cmake-utils python-r1 + +SRC_URI="https://github.com/calamares/calamares/releases/download/v${PV}/${P}.tar.gz" + +DESCRIPTION="Distribution-independent installer framework" +HOMEPAGE="http://calamares.io" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64" +IUSE="+python" + +S="${WORKDIR}/${P}" + +DEPEND=" + python? ( + >=dev-libs/boost-1.55.0-r2[${PYTHON_USEDEP}] + ) + >=dev-qt/designer-5.9.0:5 + >=dev-qt/linguist-tools-5.9.0:5 + >=dev-qt/qtconcurrent-5.9.0:5 + >=dev-qt/qtcore-5.9.0:5 + >=dev-qt/qtdbus-5.9.0:5 + >=dev-qt/qtdeclarative-5.9.0:5 + >=dev-qt/qtgui-5.9.0:5 + >=dev-qt/qtnetwork-5.9.0:5 + >=dev-qt/qtopengl-5.9.0:5 + >=dev-qt/qtprintsupport-5.9.0:5 + >=dev-qt/qtscript-5.9.0:5 + >=dev-qt/qtsvg-5.9.0:5 + >=dev-qt/qttest-5.9.0:5 + >=dev-qt/qtwebengine-5.9.0:5 + >=dev-qt/qtwebchannel-5.9.0:5 + >=dev-qt/qtwidgets-5.9.0:5 + >=dev-qt/qtxml-5.9.0:5 + >=dev-qt/qtxmlpatterns-5.9.0:5 + >=dev-cpp/yaml-cpp-0.5.1 + >=kde-frameworks/extra-cmake-modules-5.18.0 + >=sys-libs/kpmcore-3.2.0" + +RDEPEND="app-misc/calamares-runtime[branding]" + +src_prepare() { + # build against kpmcore-3.2 + epatch "${FILESDIR}"/${PN}-kpmcore-3.2.patch + # don't run locale-gen during system installation, we run it ourselves during stage4 bootstrap...this patch should speed up installation significantly + epatch "${FILESDIR}"/${PN}-dont-run-locale-gen.patch + # support auto-unlocking encrypted partitions via OpenRC's dmcrypt service + epatch -p1 "${FILESDIR}"/${PN}-openrc-dmcrypt-cfg-r1.patch + # fix grubcfg breakage introduced by Manjaro, we don't rely on plymouthcfg to have splash + epatch -p1 "${FILESDIR}"/${PN}-dont-rely-on-plymouthcfg.patch + # replace calamares installer desktop icon + sed -i "s/Icon=calamares/Icon=start-here/g" "${S}/calamares.desktop" + # fix installer doesn't start from desktop launcher (IMPROVE THIS UGLY THINGY) + sed -i "s/pkexec //g" "${S}/calamares.desktop" + sed -i "s/calamares/calamares-pkexec/g" "${S}/calamares.desktop" + # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt version may be used. + # Setting QT_SELECT environment variable will enforce correct binaries (fix taken from vlc ebuild) + export QT_SELECT=qt5 +} + +src_configure() { + local mycmakeargs=( + -DWITH_PARTITIONMANAGER=1 + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + insinto /usr/bin + insopts -m 755 + doins ${FILESDIR}/calamares-pkexec +} diff --git a/app-admin/calamares/files/calamares-dont-rely-on-plymouthcfg.patch b/app-admin/calamares/files/calamares-dont-rely-on-plymouthcfg.patch new file mode 100644 index 00000000..04f41a30 --- /dev/null +++ b/app-admin/calamares/files/calamares-dont-rely-on-plymouthcfg.patch @@ -0,0 +1,28 @@ +diff -Nur a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py +--- a/src/modules/grubcfg/main.py 2018-01-02 14:37:36.000000000 +0000 ++++ b/src/modules/grubcfg/main.py 2019-01-26 22:47:25.005850844 +0000 +@@ -44,16 +44,20 @@ + dracut_bin = libcalamares.utils.target_env_call( + ["sh", "-c", "which dracut"] + ) +- have_dracut = dracut_bin == 0 # Shell exit value 0 means success ++ plymouth_bin = libcalamares.utils.target_env_call( ++ ["sh", "-c", "which plymouth"] ++ ) ++ # Shell exit value 0 means success ++ have_dracut = dracut_bin == 0 ++ have_plymouth = plymouth_bin == 0 + + use_splash = "" + swap_uuid = "" + swap_outer_uuid = "" + swap_outer_mappername = None + +- if libcalamares.globalstorage.contains("hasPlymouth"): +- if libcalamares.globalstorage.value("hasPlymouth"): +- use_splash = "splash" ++ if have_plymouth: ++ use_splash = "splash" + + cryptdevice_params = [] + -- cgit v1.2.3