From 91423d64c90c50d854cab4bfb4b264954f67b00e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 18 Oct 2016 18:31:54 +0100 Subject: adjust calamares a bit --- app-admin/calamares/calamares-2.4.2-r2.ebuild | 78 ---------------------- app-admin/calamares/calamares-2.4.2-r3.ebuild | 78 ++++++++++++++++++++++ .../files/calamares-2.4.2-dracut-kogaion.patch | 12 ++++ .../files/calamares-kogaion-dracut-call.patch | 12 ---- 4 files changed, 90 insertions(+), 90 deletions(-) delete mode 100644 app-admin/calamares/calamares-2.4.2-r2.ebuild create mode 100644 app-admin/calamares/calamares-2.4.2-r3.ebuild create mode 100644 app-admin/calamares/files/calamares-2.4.2-dracut-kogaion.patch delete mode 100644 app-admin/calamares/files/calamares-kogaion-dracut-call.patch (limited to 'app-admin/calamares') diff --git a/app-admin/calamares/calamares-2.4.2-r2.ebuild b/app-admin/calamares/calamares-2.4.2-r2.ebuild deleted file mode 100644 index bbe4dc24..00000000 --- a/app-admin/calamares/calamares-2.4.2-r2.ebuild +++ /dev/null @@ -1,78 +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=" - dev-vcs/git - 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-2.2.0" - -RDEPEND=">=app-misc/calamares-runtime-3.1[branding]" - -src_prepare() { - # patch dracut module to be called the way we want it, until the module becomes configurable - epatch ${FILESDIR}/${PN}-kogaion-dracut-call.patch - # calamares dracut luks patch - epatch ${FILESDIR}/${P}-dracut-luks-fde.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-2.4.2-r3.ebuild b/app-admin/calamares/calamares-2.4.2-r3.ebuild new file mode 100644 index 00000000..d4cba4e5 --- /dev/null +++ b/app-admin/calamares/calamares-2.4.2-r3.ebuild @@ -0,0 +1,78 @@ +# 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=" + dev-vcs/git + 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-2.2.0" + +RDEPEND=">=app-misc/calamares-runtime-3.1[branding]" + +src_prepare() { + # patch dracut module to be called the way we want it, until the module becomes configurable + epatch ${FILESDIR}/${P}-dracut-kogaion.patch + # calamares dracut luks patch + epatch ${FILESDIR}/${P}-dracut-luks-fde.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-2.4.2-dracut-kogaion.patch b/app-admin/calamares/files/calamares-2.4.2-dracut-kogaion.patch new file mode 100644 index 00000000..31143732 --- /dev/null +++ b/app-admin/calamares/files/calamares-2.4.2-dracut-kogaion.patch @@ -0,0 +1,12 @@ +diff -Nur a/src/modules/dracut/main.py b/src/modules/dracut/main.py +--- a/src/modules/dracut/main.py 2016-04-12 10:23:47.000000000 +0100 ++++ b/src/modules/dracut/main.py 2016-08-06 13:21:38.055554294 +0100 +@@ -28,7 +28,7 @@ + + :return: + """ +- return target_env_call(['dracut', '-f']) ++ return target_env_call(['dracut', '-H', '-f', '-o', 'systemd', '-o', 'systemd-initrd', '-o', 'systemd-networkd', '-o', 'dracut-systemd', '--kver', '4.4.5-kogaion', '/boot/initramfs-genkernel-x86_64-4.4.5-kogaion']) + + + def run(): diff --git a/app-admin/calamares/files/calamares-kogaion-dracut-call.patch b/app-admin/calamares/files/calamares-kogaion-dracut-call.patch deleted file mode 100644 index 31143732..00000000 --- a/app-admin/calamares/files/calamares-kogaion-dracut-call.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur a/src/modules/dracut/main.py b/src/modules/dracut/main.py ---- a/src/modules/dracut/main.py 2016-04-12 10:23:47.000000000 +0100 -+++ b/src/modules/dracut/main.py 2016-08-06 13:21:38.055554294 +0100 -@@ -28,7 +28,7 @@ - - :return: - """ -- return target_env_call(['dracut', '-f']) -+ return target_env_call(['dracut', '-H', '-f', '-o', 'systemd', '-o', 'systemd-initrd', '-o', 'systemd-networkd', '-o', 'dracut-systemd', '--kver', '4.4.5-kogaion', '/boot/initramfs-genkernel-x86_64-4.4.5-kogaion']) - - - def run(): -- cgit v1.2.3