public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-dev] Fix spurious dep to eselect-python
@ 2012-03-20  4:29 Luca Barbato
  2012-03-20 16:41 ` Arfrever Frehtes Taifersar Arahesis
  0 siblings, 1 reply; 11+ messages in thread
From: Luca Barbato @ 2012-03-20  4:29 UTC (permalink / raw
  To: gentoo-dev; +Cc: Gentoo Python Project

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

Hi, I tried to avoid depending on eselect-python if the useflag is disabled.

Please test and review.

lu

-- 

Luca Barbato
Gentoo/linux
http://dev.gentoo.org/~lu_zero


[-- Attachment #2: python.eclass.diff --]
[-- Type: text/x-patch, Size: 2019 bytes --]

--- /usr/portage/eclass/python.eclass	2012-03-06 20:31:12.000000000 -0800
+++ /var/tmp/python.eclass	2012-03-19 21:24:24.937967537 -0700
@@ -33,6 +33,8 @@
 _PYPY_GLOBALLY_SUPPORTED_ABIS=(2.7-pypy-1.7 2.7-pypy-1.8)
 _PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} ${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]} ${_PYPY_GLOBALLY_SUPPORTED_ABIS[@]})
 
+ESELECT_DEP=">=app-admin/eselect-python-20091230"
+
 # ================================================================================================
 # ===================================== HANDLING OF METADATA =====================================
 # ================================================================================================
@@ -232,26 +234,27 @@
 		fi
 
 		unset -f _append_accepted_versions_range
-
+		DEPEND="${USE_flag}${USE_flag:+? ( }${ESELECT_DEP}${USE_flag:+ )}"
+		RDEPEND="${DEPEND}"
 		if [[ "${#_PYTHON_ATOMS[@]}" -gt 1 ]]; then
-			DEPEND+="${DEPEND:+ }${USE_flag}${USE_flag:+? ( }|| ( ${_PYTHON_ATOMS[@]} )${USE_flag:+ )}"
-			RDEPEND+="${RDEPEND:+ }${USE_flag}${USE_flag:+? ( }|| ( ${_PYTHON_ATOMS[@]} )${USE_flag:+ )}"
+			DEPEND+=" ${USE_flag}${USE_flag:+? ( }|| ( ${_PYTHON_ATOMS[@]} )${USE_flag:+ )}"
+			RDEPEND+=" ${USE_flag}${USE_flag:+? ( }|| ( ${_PYTHON_ATOMS[@]} )${USE_flag:+ )}"
 		else
-			DEPEND+="${DEPEND:+ }${USE_flag}${USE_flag:+? ( }${_PYTHON_ATOMS[@]}${USE_flag:+ )}"
-			RDEPEND+="${RDEPEND:+ }${USE_flag}${USE_flag:+? ( }${_PYTHON_ATOMS[@]}${USE_flag:+ )}"
+			DEPEND+=" ${USE_flag}${USE_flag:+? ( }${_PYTHON_ATOMS[@]}${USE_flag:+ )}"
+			RDEPEND+=" ${USE_flag}${USE_flag:+? ( }${_PYTHON_ATOMS[@]}${USE_flag:+ )}"
 		fi
 	else
 		die "Invalid syntax of PYTHON_DEPEND"
 	fi
 }
 
-DEPEND=">=app-admin/eselect-python-20091230"
-RDEPEND="${DEPEND}"
 
 if [[ -n "${PYTHON_DEPEND}" ]]; then
 	_python_parse_PYTHON_DEPEND
 else
 	_PYTHON_ATOMS=("dev-lang/python")
+	DEPEND="${ESELECT_DEP}"
+	RDEPEND="${DEPEND}"
 fi
 unset -f _python_parse_PYTHON_DEPEND
 

^ permalink raw reply	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2012-03-20 21:33 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-20  4:29 [gentoo-dev] Fix spurious dep to eselect-python Luca Barbato
2012-03-20 16:41 ` Arfrever Frehtes Taifersar Arahesis
2012-03-20 16:51   ` Mike Gilbert
2012-03-20 16:53   ` Michał Górny
2012-03-20 19:35     ` Arfrever Frehtes Taifersar Arahesis
2012-03-20 20:57       ` Alexis Ballier
2012-03-20 21:05         ` Alexis Ballier
2012-03-20 21:09           ` Arfrever Frehtes Taifersar Arahesis
2012-03-20 21:09           ` Mike Gilbert
2012-03-20 21:20             ` Alexis Ballier
2012-03-20 21:33               ` Mike Gilbert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox