From f22cc4450a588d73825b6408eeea8bf7ad47348a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Jun 2017 13:07:59 +0100 Subject: bump calamares to v3.1.0 --- app-admin/calamares/Manifest | 3 +- app-admin/calamares/calamares-2.4.5-r2.ebuild | 74 ---------------------- app-admin/calamares/calamares-2.4.6.ebuild | 74 ---------------------- app-admin/calamares/calamares-3.1.0.ebuild | 73 +++++++++++++++++++++ .../calamares-config-redcore-1704.ebuild | 24 ------- .../calamares-runtime-1704.ebuild | 59 ----------------- 6 files changed, 74 insertions(+), 233 deletions(-) delete mode 100644 app-admin/calamares/calamares-2.4.5-r2.ebuild delete mode 100644 app-admin/calamares/calamares-2.4.6.ebuild create mode 100644 app-admin/calamares/calamares-3.1.0.ebuild delete mode 100644 app-misc/calamares-config-redcore/calamares-config-redcore-1704.ebuild delete mode 100644 app-misc/calamares-runtime/calamares-runtime-1704.ebuild diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest index b407262f..a09258eb 100644 --- a/app-admin/calamares/Manifest +++ b/app-admin/calamares/Manifest @@ -1,2 +1 @@ -DIST calamares-2.4.5.tar.gz 2142339 SHA256 fe924bf951ea64c92a565195330aff87587b9326c6769f5c8a8e4ee67e20bab5 SHA512 b55ed22f40116e67fe9bea6f1112fa98538f831886b950097465e171390bbef5773f61c374939c7a7a467a721af5e36c9e9845eb419f7cb015e997f82550998c WHIRLPOOL 33e91c774561eb4687eed94dedb7b2708cb0b2c73522d10061c635c9367807c4a01fdc5aee713668f090dfc204c48cd55ba76353af19e2dfff6bfaffccc6f24a -DIST calamares-2.4.6.tar.gz 2143386 SHA256 c091ad0db9b69b7552d7f282317ba4a4453d7e5ca7ee4bf98f605fe43c63597e SHA512 d2ba4675a846095c437231eb1d59f86668f7c65e2f9bda9681cd4de60324b8d8007f4337f8cd93ca71a303812ecdb8c55935805adc8fd25bb98f1e39432be009 WHIRLPOOL b54ac8347604942a00293c23e766142af867ac37dc3e910d93a07fc909eefb70bd9dc7744270320fcda10b25c3db50476f35074122ae60ee2243e46ab14ea206 +DIST calamares-3.1.0.tar.gz 2215820 SHA256 7b4c74fc350624a17eb8b8187ade490711bfdc608d2be07322c8a3fc0a449276 SHA512 17c15aafbc811f42246f8300f64ffe7d44b43ac24f5b6ced15c83715c5fff9644060964de82cc3e7021c710e6eebbc124785d9d7b85613c5f190ec0f8d5d5389 WHIRLPOOL 6c8e46aff3700d26e876dd6f02bf28e55ea59cebe46438e64a8d04e921df9e35d0c1c3077479767b67284805103c16cda7ef5e1a2ec50d9e735093cb9e04b886 diff --git a/app-admin/calamares/calamares-2.4.5-r2.ebuild b/app-admin/calamares/calamares-2.4.5-r2.ebuild deleted file mode 100644 index b6276d73..00000000 --- a/app-admin/calamares/calamares-2.4.5-r2.ebuild +++ /dev/null @@ -1,74 +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() { - # 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-2.4.6.ebuild b/app-admin/calamares/calamares-2.4.6.ebuild deleted file mode 100644 index b6276d73..00000000 --- a/app-admin/calamares/calamares-2.4.6.ebuild +++ /dev/null @@ -1,74 +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() { - # 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.0.ebuild b/app-admin/calamares/calamares-3.1.0.ebuild new file mode 100644 index 00000000..cd5d803e --- /dev/null +++ b/app-admin/calamares/calamares-3.1.0.ebuild @@ -0,0 +1,73 @@ +# 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() { + # 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-misc/calamares-config-redcore/calamares-config-redcore-1704.ebuild b/app-misc/calamares-config-redcore/calamares-config-redcore-1704.ebuild deleted file mode 100644 index 9f6639d2..00000000 --- a/app-misc/calamares-config-redcore/calamares-config-redcore-1704.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -DESCRIPTION="Redcore Linux Calamares modules config" -HOMEPAGE="" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="app-admin/calamares" - -S="${FILESDIR}" - -src_install() { - dodir "/etc/calamares" || die - insinto "/etc/calamares" || die - doins -r "${S}/"* || die -} diff --git a/app-misc/calamares-runtime/calamares-runtime-1704.ebuild b/app-misc/calamares-runtime/calamares-runtime-1704.ebuild deleted file mode 100644 index eb1cfd85..00000000 --- a/app-misc/calamares-runtime/calamares-runtime-1704.ebuild +++ /dev/null @@ -1,59 +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/redcore-artwork-calamares-1.0 ) - >=app-misc/calamares-config-redcore-1.0 - >=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 - >=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 - virtual/udev" -- cgit v1.2.3