From a0c7d7b7a3340c4d2788cb519027b1074ba56ed1 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Thu, 8 Dec 2016 17:57:12 +0100
Subject: [PATCH] Apply python symlink options properly

---
 astronaut/astronaut               | 2 +-
 satellites/python3-setuptools.sat | 4 +++-
 satellites/python3.sat            | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/astronaut/astronaut b/astronaut/astronaut
index 856306a..1147f60 100755
--- a/astronaut/astronaut
+++ b/astronaut/astronaut
@@ -270,7 +270,7 @@ option() {
 
     if [ "$1" ]; then
         if [ "$enabled" = true ]; then
-            eval "$@"
+            "$@"
         fi
     else
         return $([ "$enabled" = true ])
diff --git a/satellites/python3-setuptools.sat b/satellites/python3-setuptools.sat
index c0098f0..ade189f 100644
--- a/satellites/python3-setuptools.sat
+++ b/satellites/python3-setuptools.sat
@@ -4,6 +4,8 @@ name=setuptools
 version=30.2.0
 update_url="https://github.com/pypa/$name/releases"
 
+define_option 'easy_install-symlink: Install the easy_install symlink (it may conflict with python2)'
+
 dlextract "https://github.com/pypa/$name/archive/v$version.tar.gz" \
           'asdf'
 header_end
@@ -11,7 +13,7 @@ header_end
 cd "$name-$version"
 
 # Don't install the regular easy_install, as it conflicts with python 2
-sed -i -e '/easy_install =/d' setup.py
+option !easy_install sed -i -e '/easy_install =/d' setup.py
 
 compile_python 3
 
diff --git a/satellites/python3.sat b/satellites/python3.sat
index d8a7e81..a3d9138 100644
--- a/satellites/python3.sat
+++ b/satellites/python3.sat
@@ -30,7 +30,7 @@ sed -i -e '/$(BUILDPYTHON):/s/$(LIBRARY)//' \
        -e '/test -d $(LIBRARY)/c\	@if false; then \\' Makefile.pre.in
 
 # Don't install the 2to3 symlink, as that conflicts with python 2
-sed -i -e '/$(LN) -s 2to3/d' Makefile.pre.in
+option !2to3-symlink sed -i -e '/$(LN) -s 2to3/d' Makefile.pre.in
 
 compile_configure -- \
     --enable-shared \