From 36ec1121ea2f7dd91657aa36af958f4b42718211 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 20 Nov 2017 19:02:04 +0000 Subject: app-admin/calamares : revision bump --- app-admin/calamares/calamares-3.1.8-r1.ebuild | 77 --------------------- app-admin/calamares/calamares-3.1.8-r2.ebuild | 79 ++++++++++++++++++++++ .../calamares-3.1.8-dont-run-locale-gen.patch | 42 ++++++++++++ 3 files changed, 121 insertions(+), 77 deletions(-) delete mode 100644 app-admin/calamares/calamares-3.1.8-r1.ebuild create mode 100644 app-admin/calamares/calamares-3.1.8-r2.ebuild create mode 100644 app-admin/calamares/files/calamares-3.1.8-dont-run-locale-gen.patch (limited to 'app-admin') diff --git a/app-admin/calamares/calamares-3.1.8-r1.ebuild b/app-admin/calamares/calamares-3.1.8-r1.ebuild deleted file mode 100644 index fe19f596..00000000 --- a/app-admin/calamares/calamares-3.1.8-r1.ebuild +++ /dev/null @@ -1,77 +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 ) - -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_targets_python3_4] - ) - >=dev-qt/designer-5.6.0:5 - >=dev-qt/linguist-tools-5.6.0:5 - >=dev-qt/qtconcurrent-5.6.0:5 - >=dev-qt/qtcore-5.6.0:5 - >=dev-qt/qtdbus-5.6.0:5 - >=dev-qt/qtdeclarative-5.6.0:5 - >=dev-qt/qtgui-5.6.0:5 - >=dev-qt/qtnetwork-5.6.0:5 - >=dev-qt/qtopengl-5.6.0:5 - >=dev-qt/qtprintsupport-5.6.0:5 - >=dev-qt/qtscript-5.6.0:5 - >=dev-qt/qtsvg-5.6.0:5 - >=dev-qt/qttest-5.6.0:5 - >=dev-qt/qtwebengine-5.6.0:5 - >=dev-qt/qtwebchannel-5.6.0:5 - >=dev-qt/qtwidgets-5.6.0:5 - >=dev-qt/qtxml-5.6.0:5 - >=dev-qt/qtxmlpatterns-5.6.0:5 - >=dev-cpp/yaml-cpp-0.5.1 - >=kde-frameworks/extra-cmake-modules-5.18.0 - >=sys-libs/kpmcore-3.0.2" - -RDEPEND=">=app-misc/calamares-runtime-1.0[branding]" - -src_prepare() { - # build against kpmcore-3.2 - epatch "${FILESDIR}"/${P}-kpmcore-3.2.patch - # support auto-unlocking encrypted /home partition via OpenRC's dmcrypt service - epatch -p1 "${FILESDIR}"/${P}-openrc-dmcrypt-cfg.patch - # replace calamares installer desktop icon - sed -i "s/Icon=calamares/Icon=redcore-logo/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.8-r2.ebuild b/app-admin/calamares/calamares-3.1.8-r2.ebuild new file mode 100644 index 00000000..f23d3ce8 --- /dev/null +++ b/app-admin/calamares/calamares-3.1.8-r2.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 +PYTHON_COMPAT=( python3_4 ) + +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_targets_python3_4] + ) + >=dev-qt/designer-5.6.0:5 + >=dev-qt/linguist-tools-5.6.0:5 + >=dev-qt/qtconcurrent-5.6.0:5 + >=dev-qt/qtcore-5.6.0:5 + >=dev-qt/qtdbus-5.6.0:5 + >=dev-qt/qtdeclarative-5.6.0:5 + >=dev-qt/qtgui-5.6.0:5 + >=dev-qt/qtnetwork-5.6.0:5 + >=dev-qt/qtopengl-5.6.0:5 + >=dev-qt/qtprintsupport-5.6.0:5 + >=dev-qt/qtscript-5.6.0:5 + >=dev-qt/qtsvg-5.6.0:5 + >=dev-qt/qttest-5.6.0:5 + >=dev-qt/qtwebengine-5.6.0:5 + >=dev-qt/qtwebchannel-5.6.0:5 + >=dev-qt/qtwidgets-5.6.0:5 + >=dev-qt/qtxml-5.6.0:5 + >=dev-qt/qtxmlpatterns-5.6.0:5 + >=dev-cpp/yaml-cpp-0.5.1 + >=kde-frameworks/extra-cmake-modules-5.18.0 + >=sys-libs/kpmcore-3.0.2" + +RDEPEND=">=app-misc/calamares-runtime-1.0[branding]" + +src_prepare() { + # build against kpmcore-3.2 + epatch "${FILESDIR}"/${P}-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}"/${P}-dont-run-locale-gen.patch + # support auto-unlocking encrypted /home partition via OpenRC's dmcrypt service + epatch -p1 "${FILESDIR}"/${P}-openrc-dmcrypt-cfg.patch + # replace calamares installer desktop icon + sed -i "s/Icon=calamares/Icon=redcore-logo/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-3.1.8-dont-run-locale-gen.patch b/app-admin/calamares/files/calamares-3.1.8-dont-run-locale-gen.patch new file mode 100644 index 00000000..29ca6a61 --- /dev/null +++ b/app-admin/calamares/files/calamares-3.1.8-dont-run-locale-gen.patch @@ -0,0 +1,42 @@ +diff -Nur a/src/modules/localecfg/main.py b/src/modules/localecfg/main.py +--- a/src/modules/localecfg/main.py 2017-11-14 15:18:58.000000000 +0000 ++++ b/src/modules/localecfg/main.py 2017-11-20 18:56:23.801595116 +0000 +@@ -47,38 +47,6 @@ + + install_path = libcalamares.globalstorage.value("rootMountPoint") + +- # restore backup if available +- if os.path.exists('/etc/locale.gen.bak'): +- shutil.copy2("{!s}/etc/locale.gen.bak".format(install_path), +- "{!s}/etc/locale.gen".format(install_path)) +- +- # run locale-gen if detected +- if os.path.exists('/etc/locale.gen'): +- text = [] +- +- with open("{!s}/etc/locale.gen".format(install_path), "r") as gen: +- text = gen.readlines() +- +- # we want unique values, so locale_values should have 1 or 2 items +- locale_values = set(locale_conf.values()) +- +- with open("{!s}/etc/locale.gen".format(install_path), "w") as gen: +- for line in text: +- # always enable en_US +- if en_us_locale in line and line[0] == "#": +- # uncomment line +- line = line[1:].lstrip() +- +- for locale_value in locale_values: +- if locale_value in line and line[0] == "#": +- # uncomment line +- line = line[1:].lstrip() +- +- gen.write(line) +- +- libcalamares.utils.target_env_call(['locale-gen']) +- print('locale.gen done') +- + # write /etc/locale.conf + locale_conf_path = os.path.join(install_path, "etc/locale.conf") + with open(locale_conf_path, "w") as lcf: -- cgit v1.2.3