From: Mike Gilbert <floppym@gentoo.org>
Date: Thu, 4 Aug 2016 04:21:16 +0000 (-0400)
Subject: Revert "dev-lang/python: disable MPROTECT"
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=7bfef0ed0bc61eaee2088072558d37e11818cfe1;p=gentoo.git

Revert "dev-lang/python: disable MPROTECT"

This reverts commit b8cb87b5af9ab23e60864a4c66988c0f595f5b77.
---

diff --git a/dev-lang/python/python-2.7.12.ebuild b/dev-lang/python/python-2.7.12.ebuild
index 2901f8f0870e..992882b2ebd3 100644
--- a/dev-lang/python/python-2.7.12.ebuild
+++ b/dev-lang/python/python-2.7.12.ebuild
@@ -216,7 +216,12 @@ src_compile() {
 	cd "${BUILD_DIR}" || die
 	emake
 
-	pax-mark m python
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
 }
 
 src_test() {
diff --git a/dev-lang/python/python-3.4.5.ebuild b/dev-lang/python/python-3.4.5.ebuild
index 88f5362878bc..433a3a373da8 100644
--- a/dev-lang/python/python-3.4.5.ebuild
+++ b/dev-lang/python/python-3.4.5.ebuild
@@ -175,7 +175,12 @@ src_compile() {
 
 	emake CPPFLAGS= CFLAGS= LDFLAGS=
 
-	pax-mark m python
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
 }
 
 src_test() {
diff --git a/dev-lang/python/python-3.5.2.ebuild b/dev-lang/python/python-3.5.2.ebuild
index a1f4150b9b91..ea66658420d0 100644
--- a/dev-lang/python/python-3.5.2.ebuild
+++ b/dev-lang/python/python-3.5.2.ebuild
@@ -174,7 +174,12 @@ src_compile() {
 
 	emake CPPFLAGS= CFLAGS= LDFLAGS=
 
-	pax-mark m python
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
 }
 
 src_test() {