Merge with 0.7.5

1 files changed, 4 insertions, 0 deletions

diff --git a/setup.py b/setup.py
index d56c491a..e6d62b18 100755
--- a/setup.py
+++ b/setup.py
@@ -56,6 +56,10 @@ from setuptools.command.test import test as _test
 scripts = []
 
 console_scripts = ["easy_install = setuptools.command.easy_install:main"]
+
+# Gentoo distributions manage the python-version-specific scripts themselves,
+# so they define an environment variable to suppress the creation of the
+# version-specific scripts.
 if os.environ.get("SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") in (None, "", "0") and \
     os.environ.get("DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") in (None, "", "0"):
     console_scripts.append("easy_install-%s = setuptools.command.easy_install:main" % sys.version[:3])