From 6fd9d116390786f59a05c20e0ca2980bd90f9ea6 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@rogentos.ro>
Date: Thu, 24 Nov 2016 18:57:42 +0000
Subject: we no longer need to patch calamares dracut module, hurray
---
app-admin/calamares/calamares-2.4.3-r3.ebuild | 76 ----------------------
app-admin/calamares/calamares-2.4.3-r4.ebuild | 74 +++++++++++++++++++++
.../files/calamares-2.4.3-dracut-redcore.patch | 12 ----
3 files changed, 74 insertions(+), 88 deletions(-)
delete mode 100644 app-admin/calamares/calamares-2.4.3-r3.ebuild
create mode 100644 app-admin/calamares/calamares-2.4.3-r4.ebuild
delete mode 100644 app-admin/calamares/files/calamares-2.4.3-dracut-redcore.patch
diff --git a/app-admin/calamares/calamares-2.4.3-r3.ebuild b/app-admin/calamares/calamares-2.4.3-r3.ebuild
deleted file mode 100644
index eb7ca13d..00000000
--- a/app-admin/calamares/calamares-2.4.3-r3.ebuild
+++ /dev/null
@@ -1,76 +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-1.0[branding]"
-
-src_prepare() {
- # patch dracut module to be called the way we want it, until the module becomes configurable
- epatch ${FILESDIR}/${P}-dracut-redcore.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.3-r4.ebuild b/app-admin/calamares/calamares-2.4.3-r4.ebuild
new file mode 100644
index 00000000..21944989
--- /dev/null
+++ b/app-admin/calamares/calamares-2.4.3-r4.ebuild
@@ -0,0 +1,74 @@
+# 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-1.0[branding]"
+
+src_prepare() {
+ # 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.3-dracut-redcore.patch b/app-admin/calamares/files/calamares-2.4.3-dracut-redcore.patch
deleted file mode 100644
index 376b1a46..00000000
--- a/app-admin/calamares/files/calamares-2.4.3-dracut-redcore.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.8.5-redcore', '/boot/initramfs-genkernel-x86_64-4.8.5-redcore'])
-
-
- def run():
--
cgit v1.2.3