From cbf6a72e1199cf1d12e3c5e060a34b32fc52df18 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 1 Aug 2016 13:34:52 +0100 Subject: link calamares to qtwebengine instead of qtwebkit, so at least qt 5.6 is needed --- app-admin/calamares/calamares-2.3-r1.ebuild | 63 ---------------------- app-admin/calamares/calamares-2.3-r2.ebuild | 63 ++++++++++++++++++++++ .../calamares-runtime/calamares-runtime-3.1.ebuild | 58 -------------------- 3 files changed, 63 insertions(+), 121 deletions(-) delete mode 100644 app-admin/calamares/calamares-2.3-r1.ebuild create mode 100644 app-admin/calamares/calamares-2.3-r2.ebuild delete mode 100644 app-misc/calamares-runtime/calamares-runtime-3.1.ebuild diff --git a/app-admin/calamares/calamares-2.3-r1.ebuild b/app-admin/calamares/calamares-2.3-r1.ebuild deleted file mode 100644 index 62de5efe..00000000 --- a/app-admin/calamares/calamares-2.3-r1.ebuild +++ /dev/null @@ -1,63 +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/v2.3/calamares-2.3.tar.gz" - -DESCRIPTION="Distribution-independent installer framework" -HOMEPAGE="http://calamares.io" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64" -IUSE="+python" - -S="${WORKDIR}/${PN}-${PV}" - -DEPEND=" - dev-vcs/git - python? ( - >=dev-libs/boost-1.55.0-r2[python_targets_python3_4] - ) - >=dev-qt/designer-5.4.0:5 - >=dev-qt/linguist-tools-5.4.0:5 - >=dev-qt/qtconcurrent-5.4.0:5 - >=dev-qt/qtcore-5.4.0:5 - >=dev-qt/qtdbus-5.4.0:5 - >=dev-qt/qtdeclarative-5.4.0:5 - >=dev-qt/qtgui-5.4.0:5 - >=dev-qt/qtnetwork-5.4.0:5 - >=dev-qt/qtopengl-5.4.0:5 - >=dev-qt/qtprintsupport-5.4.0:5 - >=dev-qt/qtscript-5.4.0:5 - >=dev-qt/qtsvg-5.4.0:5 - >=dev-qt/qttest-5.4.0:5 - >=dev-qt/qtwebkit-5.4.0:5 - >=dev-qt/qtwidgets-5.4.0:5 - >=dev-qt/qtxml-5.4.0:5 - >=dev-qt/qtxmlpatterns-5.4.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() { - # replace calamares installer desktop icon - sed -i "s/Icon=calamares/Icon=start-here/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 -} diff --git a/app-admin/calamares/calamares-2.3-r2.ebuild b/app-admin/calamares/calamares-2.3-r2.ebuild new file mode 100644 index 00000000..2b342638 --- /dev/null +++ b/app-admin/calamares/calamares-2.3-r2.ebuild @@ -0,0 +1,63 @@ +# 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/v2.3/calamares-2.3.tar.gz" + +DESCRIPTION="Distribution-independent installer framework" +HOMEPAGE="http://calamares.io" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64" +IUSE="+python" + +S="${WORKDIR}/${PN}-${PV}" + +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/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() { + # replace calamares installer desktop icon + sed -i "s/Icon=calamares/Icon=start-here/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 +} diff --git a/app-misc/calamares-runtime/calamares-runtime-3.1.ebuild b/app-misc/calamares-runtime/calamares-runtime-3.1.ebuild deleted file mode 100644 index 85b67f20..00000000 --- a/app-misc/calamares-runtime/calamares-runtime-3.1.ebuild +++ /dev/null @@ -1,58 +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 ) - -DESCRIPTION="Calamares distribution-independent installer framework runtime meta-package (containing all the runtime dependencies)" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64" -IUSE="+branding +python" - -DEPEND="" -RDEPEND=" - python? ( - >=dev-libs/boost-1.55.0-r2[python_targets_python3_4] - ) - branding? ( >=x11-themes/kogaion-artwork-calamares-2.0 ) - >=app-misc/calamares-config-kogaion-2.0 - >=dev-qt/designer-5.4.0:5 - >=dev-qt/linguist-tools-5.4.0:5 - >=dev-qt/qtconcurrent-5.4.0:5 - >=dev-qt/qtcore-5.4.0:5 - >=dev-qt/qtdbus-5.4.0:5 - >=dev-qt/qtdeclarative-5.4.0:5 - >=dev-qt/qtgui-5.4.0:5 - >=dev-qt/qtnetwork-5.4.0:5 - >=dev-qt/qtopengl-5.4.0:5 - >=dev-qt/qtprintsupport-5.4.0:5 - >=dev-qt/qtscript-5.4.0:5 - >=dev-qt/qtsvg-5.4.0:5 - >=dev-qt/qttest-5.4.0:5 - >=dev-qt/qtwebkit-5.4.0:5 - >=dev-qt/qtwidgets-5.4.0:5 - >=dev-qt/qtxml-5.4.0:5 - >=dev-qt/qtxmlpatterns-5.4.0:5 - >=dev-cpp/yaml-cpp-0.5.1 - >=dev-libs/libatasmart-0.19 - >=kde-frameworks/kconfig-5.18.0 - >=kde-frameworks/ki18n-5.18.0 - >=kde-frameworks/kcoreaddons-5.18.0 - >=kde-frameworks/kparts-5.18.0 - >=kde-frameworks/solid-5.18.0 - >=net-misc/rsync-3.1[xattr] - >=sys-block/parted-3.0 - >=sys-apps/gptfdisk-0.8.10 - >=sys-apps/dmidecode-2.12-r1 - >=sys-fs/squashfs-tools-4.3:0[xattr] - >=sys-power/upower-0.99.0-r1 - >=sys-libs/kpmcore-2.2.0 - sys-boot/os-prober - sys-auth/polkit-qt5 - sys-fs/udisks:2[systemd] - virtual/udev[systemd]" -- cgit v1.2.3