diff options
-rw-r--r-- | app-admin/calamares/calamares-2.3-r6.ebuild (renamed from app-admin/calamares/calamares-2.3-r5.ebuild) | 3 | ||||
-rw-r--r-- | app-admin/calamares/files/calamares-portage-backend-properly-remove-revdeps.patch | 11 |
2 files changed, 14 insertions, 0 deletions
diff --git a/app-admin/calamares/calamares-2.3-r5.ebuild b/app-admin/calamares/calamares-2.3-r6.ebuild index 935a9551..de4ac25d 100644 --- a/app-admin/calamares/calamares-2.3-r5.ebuild +++ b/app-admin/calamares/calamares-2.3-r6.ebuild @@ -49,7 +49,10 @@ DEPEND=" 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) 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) + |