From 698e9e2a9f32b738c6579e759b7e68a43d516999 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Fri, 6 Nov 2020 13:52:11 +0100 Subject: [PATCH] profiles: make net-mail/mailbase provided Although `dev-libs/cyrus-sasl` pulls in `net-mail/mailbase`, the mailbase package is not needed at all. Simply mark it as provided, to make it build without mailbase. Also enable python_single_target_python3_6 for tdb, talloc, tevent. Remove unnecessary arm64 keywords. Clean up unnecessary USE flags. --- .../profiles/coreos/arm64/package.accept_keywords | 2 -- .../profiles/coreos/base/package.accept_keywords | 3 --- .../coreos-overlay/profiles/coreos/base/package.provided | 3 +++ .../coreos-overlay/profiles/coreos/base/package.use | 5 ++++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords index b6060b1d83..3e8b46617b 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords @@ -66,8 +66,6 @@ =sys-fs/quota-4.04-r1 ~arm64 =sys-libs/binutils-libs-2.29.1-r1 ~arm64 =sys-libs/libcap-ng-0.7.8 ~arm64 -=sys-libs/tdb-1.3.8 ~arm64 -=sys-libs/tevent-0.9.28 ~arm64 =virtual/krb5-0-r1 ~arm64 =virtual/libudev-232 ~arm64 =virtual/libusb-1-r2 ~arm64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 6d3923b1d2..33f05607b8 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -20,9 +20,6 @@ dev-python/boto # no version marked stable upstream dev-util/checkbashisms -# Older versions of sssd fail to build -=sys-auth/sssd-1.13.1 ~amd64 ~arm64 - # jq 1.5-r2 for heap overflow fix # https://bugs.gentoo.org/show_bug.cgi?id=580606 # jq 1.6-r3 for CVE-2015-8863 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.provided b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.provided index b537b2d65f..66239364b5 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.provided +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.provided @@ -1,2 +1,5 @@ # Skip MTA dependencies. virtual/mta-1 + +# pulled in by dev-libs/cyrus-sasl +net-mail/mailbase-1.1 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use index 4633182c40..3decf29cb5 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use @@ -29,6 +29,9 @@ sys-apps/portage -python_targets_python3_6 dev-util/gdbus-codegen python_single_target_python3_6 dev-util/glib-utils python_single_target_python3_6 net-fs/samba python_single_target_python3_6 +sys-libs/talloc python_single_target_python3_6 +sys-libs/tdb python_single_target_python3_6 +sys-libs/tevent python_single_target_python3_6 sys-apps/gptfdisk -icu @@ -74,7 +77,7 @@ sys-libs/glibc nscd dev-libs/cyrus-sasl kerberos -berkdb -gdbm # don't build manpages for sssd -sys-auth/sssd -manpages -python samba kerberos gssapi ssh sudo +sys-auth/sssd -python samba kerberos gssapi ssh sudo # needed for realmd build sys-auth/polkit introspection