From 75199f2bcba5cc210273549640d236c46b565145 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 12 Aug 2016 16:26:45 +0100 Subject: improve calamares portage backend to properly remove reverse deps, submitted by Kogaion, merged upstream in 9dfaca175dfdc8bc5d64a258af26a142c184b29e --- app-admin/calamares/calamares-2.3-r5.ebuild | 75 --------------------- app-admin/calamares/calamares-2.3-r6.ebuild | 78 ++++++++++++++++++++++ ...s-portage-backend-properly-remove-revdeps.patch | 11 +++ 3 files changed, 89 insertions(+), 75 deletions(-) delete mode 100644 app-admin/calamares/calamares-2.3-r5.ebuild create mode 100644 app-admin/calamares/calamares-2.3-r6.ebuild create mode 100644 app-admin/calamares/files/calamares-portage-backend-properly-remove-revdeps.patch (limited to 'app-admin/calamares') diff --git a/app-admin/calamares/calamares-2.3-r5.ebuild b/app-admin/calamares/calamares-2.3-r5.ebuild deleted file mode 100644 index 935a9551..00000000 --- a/app-admin/calamares/calamares-2.3-r5.ebuild +++ /dev/null @@ -1,75 +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() { - epatch ${FILESDIR}/${PN}-kogaion-dracut-call.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.3-r6.ebuild b/app-admin/calamares/calamares-2.3-r6.ebuild new file mode 100644 index 00000000..de4ac25d --- /dev/null +++ b/app-admin/calamares/calamares-2.3-r6.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/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 new file mode 100644 index 00000000..e947e9c5 --- /dev/null +++ b/app-admin/calamares/files/calamares-portage-backend-properly-remove-revdeps.patch @@ -0,0 +1,11 @@ +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