[gentoo-python] [PATCH 2/3] Disallow using python-r1 & python-single-r1 together.

[Michał Górny]

---
 gx86/eclass/python-r1.eclass        |  4 ++++
 gx86/eclass/python-single-r1.eclass | 15 +++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/gx86/eclass/python-r1.eclass b/gx86/eclass/python-r1.eclass
index 9a02df3..c8cfef3 100644
--- a/gx86/eclass/python-r1.eclass
+++ b/gx86/eclass/python-r1.eclass
@@ -42,6 +42,10 @@ esac
 
 if [[ ! ${_PYTHON_R1} ]]; then
 
+if [[ ${_PYTHON_SINGLE_R1} ]]; then
+	die 'python-r1.eclass can not be used with python-single-r1.eclass.'
+fi
+
 inherit python-utils-r1
 
 # @ECLASS-VARIABLE: PYTHON_COMPAT
diff --git a/gx86/eclass/python-single-r1.eclass b/gx86/eclass/python-single-r1.eclass
index 3aa350b..f645513 100644
--- a/gx86/eclass/python-single-r1.eclass
+++ b/gx86/eclass/python-single-r1.eclass
@@ -23,10 +23,10 @@
 # (using python-r1 eclass) can not depend on packages not supporting
 # them (using this eclass).
 #
-# Please note that python-r1 will always inherit python-utils-r1 as
-# well. Thus, all the functions defined there can be used
-# in the packages using python-r1, and there is no need ever to inherit
-# both.
+# Please note that python-single-r1 will always inherit python-utils-r1
+# as well. Thus, all the functions defined there can be used
+# in the packages using python-single-r1, and there is no need ever
+# to inherit both.
 #
 # For more information, please see the python-r1 Developer's Guide:
 # http://www.gentoo.org/proj/en/Python/python-r1/dev-guide.xml
@@ -45,6 +45,10 @@ esac
 
 if [[ ! ${_PYTHON_SINGLE_R1} ]]; then
 
+if [[ ${_PYTHON_R1} ]]; then
+	die 'python-single-r1.eclass can not be used with python-r1.eclass.'
+fi
+
 inherit python-utils-r1
 
 fi
@@ -182,3 +186,6 @@ python-single-r1_pkg_setup() {
 		fi
 	done
 }
+
+_PYTHON_SINGLE_R1=1
+fi
-- 
1.8.0