From 2acacdfa641f60348d6d6fb76831bf9d2bfdb9be Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 31 Dec 2017 15:27:47 +0100 Subject: [PATCH] Revert "Revert "[app-admin/anaconda] bump to 22.9-r3"" This reverts commit 45efcbad1606ceb74712801ab0274f607d10e7a1. --- ...22.9-r2.ebuild => anaconda-22.9-r3.ebuild} | 3 +- ...me-other-packages-to-the-delete-list.patch | 39 +++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) rename app-admin/anaconda/{anaconda-22.9-r2.ebuild => anaconda-22.9-r3.ebuild} (97%) create mode 100644 app-admin/anaconda/files/0019-add-some-other-packages-to-the-delete-list.patch diff --git a/app-admin/anaconda/anaconda-22.9-r2.ebuild b/app-admin/anaconda/anaconda-22.9-r3.ebuild similarity index 97% rename from app-admin/anaconda/anaconda-22.9-r2.ebuild rename to app-admin/anaconda/anaconda-22.9-r3.ebuild index b0d3cfb7a..dfc11c4ae 100644 --- a/app-admin/anaconda/anaconda-22.9-r2.ebuild +++ b/app-admin/anaconda/anaconda-22.9-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2004-2014 Sabayon +# Copyright 2004-2017 Sabayon # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -119,6 +119,7 @@ src_unpack() { src_prepare() { default epatch "${FILESDIR}"/0018-remove-libsepol-libsemanage-policycoreutils.patch + epatch "${FILESDIR}"/0019-add-some-other-packages-to-the-delete-list.patch # Setup CFLAGS, LDFLAGS append-cppflags "-I${D}/usr/include/anaconda-runtime" append-ldflags "-L${D}/usr/$(get_libdir)/anaconda-runtime" diff --git a/app-admin/anaconda/files/0019-add-some-other-packages-to-the-delete-list.patch b/app-admin/anaconda/files/0019-add-some-other-packages-to-the-delete-list.patch new file mode 100644 index 000000000..d4d0c0621 --- /dev/null +++ b/app-admin/anaconda/files/0019-add-some-other-packages-to-the-delete-list.patch @@ -0,0 +1,39 @@ +From d1775a967b1b560198e1f672ee72fb28163b0ebd Mon Sep 17 00:00:00 2001 +From: Francesco Ferro +Date: Fri, 8 Dec 2017 20:48:46 +0100 +Subject: [PATCH] Add some packages to the delete list + +--- + pyanaconda/sabayon/utils.py | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/pyanaconda/sabayon/utils.py b/pyanaconda/sabayon/utils.py +index e764690fb..26246670a 100644 +--- a/pyanaconda/sabayon/utils.py ++++ b/pyanaconda/sabayon/utils.py +@@ -651,10 +651,22 @@ blacklist nouveau + "app-admin/calamares-sabayon-branding", + "app-admin/calamares-sabayon-base-modules", + "app-admin/calamares", ++ "app-admin/setools", ++ "app-emulation/spice-vdagent", ++ "app-i18n/langtable", + "dev-libs/libreport", ++ "dev-libs/libtimezonemap", + "dev-libs/satyr", ++ "dev-python/ipy", ++ "dev-python/pyblock", ++ "dev-python/python-bugzilla", + "dev-python/python-blivet", + "dev-python/python-meh", ++ "dev-python/python-nss", ++ "dev-python/pyparted", ++ "dev-python/sepolgen", ++ "net-misc/fcoe-utils", ++ "net-misc/tightvnc", + "dev-util/glade", + "dev-util/pykickstart", + "sys-apps/policycoreutils", +-- +2.15.1 +