From c5a1154411e4a9e6624c6988491dc546cfea0a40 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 17 Oct 2016 18:46:26 +0100 Subject: drop calamares 2.3, focus on 2.4.2 --- app-admin/calamares/Manifest | 1 - app-admin/calamares/calamares-2.3-r6.ebuild | 78 ---------------------- ...s-portage-backend-properly-remove-revdeps.patch | 11 --- 3 files changed, 90 deletions(-) delete mode 100644 app-admin/calamares/calamares-2.3-r6.ebuild delete mode 100644 app-admin/calamares/files/calamares-portage-backend-properly-remove-revdeps.patch (limited to 'app-admin') diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest index 40976769..66caa3b6 100644 --- a/app-admin/calamares/Manifest +++ b/app-admin/calamares/Manifest @@ -1,2 +1 @@ -DIST calamares-2.3.tar.gz 2029483 SHA256 c499a8a8ea1573c6f0323398fb092f8978958202e11c9d339202c35c73276f9f SHA512 be0b1e328ebd6bddab3a163bf38649fd4f64cfe74213946f00b0d05c76fba870662386328c0ccb7656dc63975a1b28058be7eda56b2cee792fba78443ab6d36e WHIRLPOOL aa1602aa06a4320f5a263c24e17c322bbdfcd83b7f11012e4b2cec895d6a18cdbf627d82f614ace60c62572374a9fb247216619fa0a4de207e3f8267bf51cd9e DIST calamares-2.4.2.tar.gz 2137039 SHA256 4620fd4e9c2d9868e6c20a5c600f123e91080f7ef3a7c6ea55314aa57841b96a SHA512 152857f256f15ff72c44087baf8d4d9d452c5692e131334dd429f40c0e212eac01178352fd17f4020a128f880d3a91dbd634500384d53752d4313a08de816112 WHIRLPOOL 1aa6919a461d5b02a43a4cdbd580a9e7fc9bdc3b048f467f082c4d053c83e5bae5f5777439870828d12153789aac2e4f3b4b6868732dd7c70b0baec3ad4d65c3 diff --git a/app-admin/calamares/calamares-2.3-r6.ebuild b/app-admin/calamares/calamares-2.3-r6.ebuild deleted file mode 100644 index de4ac25d..00000000 --- a/app-admin/calamares/calamares-2.3-r6.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/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/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 - # patch portage backend to properly remove reverse dependencies (submitted by Kogaion, merged upstream in commit 9dfaca175dfdc8bc5d64a258af26a142c184b29e) - epatch ${FILESDIR}/${PN}-portage-backend-properly-remove-revdeps.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-portage-backend-properly-remove-revdeps.patch b/app-admin/calamares/files/calamares-portage-backend-properly-remove-revdeps.patch deleted file mode 100644 index e947e9c5..00000000 --- a/app-admin/calamares/files/calamares-portage-backend-properly-remove-revdeps.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur a/src/modules/packages/main.py b/src/modules/packages/main.py ---- a/src/modules/packages/main.py 2016-04-12 10:23:47.000000000 +0100 -+++ b/src/modules/packages/main.py 2016-08-12 16:17:12.660215490 +0100 -@@ -87,6 +87,7 @@ - check_target_env_call(["pacman", "-Rs", "--noconfirm"] + pkgs) - elif self.backend == "portage": - check_target_env_call(["emerge", "-C"] + pkgs) -+ check_target_env_call(["emerge", "--depclean", "-q"]) - elif self.backend == "entropy": - check_target_env_call(["equo", "rm"] + pkgs) - -- cgit v1.2.3