From 5a576e626fb9459377ad3628f780b47ab2888158 Mon Sep 17 00:00:00 2001
From: "Andreas K. Hüttel" <dilfridge@gentoo.org>
Date: Thu, 2 May 2019 23:44:56 +0200
Subject: profiles: Rework so we only use python-3.7 (no patches needed there)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
---
 profiles/arch/riscv/package.accept_keywords | 1 -
 profiles/arch/riscv/package.mask            | 2 --
 profiles/arch/riscv/rv64gc/make.defaults    | 4 ++++
 profiles/arch/riscv/rv64gc/package.mask     | 2 ++
 profiles/arch/riscv/rv64gc/use.mask         | 8 ++++++++
 profiles/arch/riscv/use.mask                | 3 ---
 6 files changed, 14 insertions(+), 6 deletions(-)
 delete mode 100644 profiles/arch/riscv/package.mask
 create mode 100644 profiles/arch/riscv/rv64gc/package.mask

diff --git a/profiles/arch/riscv/package.accept_keywords b/profiles/arch/riscv/package.accept_keywords
index 41b16e7..dc5941f 100644
--- a/profiles/arch/riscv/package.accept_keywords
+++ b/profiles/arch/riscv/package.accept_keywords
@@ -1,5 +1,4 @@
 # we need specific versions / patches for riscv
-dev-lang/python -amd64 -~amd64
 sys-devel/gcc -amd64 -~amd64
 sys-libs/glibc -amd64 -~amd64
 
diff --git a/profiles/arch/riscv/package.mask b/profiles/arch/riscv/package.mask
deleted file mode 100644
index 887eef2..0000000
--- a/profiles/arch/riscv/package.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# Doesnt work properly with the two-level libdirs
-dev-lang/python:2.7
diff --git a/profiles/arch/riscv/rv64gc/make.defaults b/profiles/arch/riscv/rv64gc/make.defaults
index 43de775..0d78820 100644
--- a/profiles/arch/riscv/rv64gc/make.defaults
+++ b/profiles/arch/riscv/rv64gc/make.defaults
@@ -36,3 +36,7 @@ USE_EXPAND_HIDDEN="-ABI_RISCV"
 
 # Implicitly enable lp64d in ebuilds without multilib support
 IUSE_IMPLICIT="abi_riscv_lp64d"
+
+# Enable Python 3.7 (and potentially later versions) only
+PYTHON_TARGETS="python3_7"
+PYTHON_SINGLE_TARGET="python3_7"
diff --git a/profiles/arch/riscv/rv64gc/package.mask b/profiles/arch/riscv/rv64gc/package.mask
new file mode 100644
index 0000000..e351251
--- /dev/null
+++ b/profiles/arch/riscv/rv64gc/package.mask
@@ -0,0 +1,2 @@
+# Doesnt work properly with the two-level libdirs
+<dev-lang/python-3.7
diff --git a/profiles/arch/riscv/rv64gc/use.mask b/profiles/arch/riscv/rv64gc/use.mask
index cf1e9a0..f7180f2 100644
--- a/profiles/arch/riscv/rv64gc/use.mask
+++ b/profiles/arch/riscv/rv64gc/use.mask
@@ -1,3 +1,11 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
 # Unmask the multilib flags for this arch.
 -abi_riscv_lp64d
 -abi_riscv_lp64
+
+# Our Python has a lot of trouble with the two-level libdir.
+python_targets_python2_7
+python_targets_python3_5
+python_targets_python3_6
diff --git a/profiles/arch/riscv/use.mask b/profiles/arch/riscv/use.mask
index d974bbe..7e3b454 100644
--- a/profiles/arch/riscv/use.mask
+++ b/profiles/arch/riscv/use.mask
@@ -6,6 +6,3 @@
 
 # The required library has not been ported to riscv yet.
 seccomp
-
-# Python 2 has a lot of trouble with the two-level libdir.
-python_targets_python2_7
-- 
cgit v1.2.3-65-gdbad