EAPI="5-progress": Add master_repositories(), repository_path(),

available_eclasses(), eclass_path() and license_path() functions.

5 files changed, 302 insertions, 10 deletions

diff --git a/bin/eapi.sh b/bin/eapi.sh
index a561c1cf8..d21b69df7 100644
--- a/bin/eapi.sh
+++ b/bin/eapi.sh
@@ -64,6 +64,26 @@ ___eapi_has_usex() {
 	[[ ! ${1-${EAPI}} =~ ^(0|1|2|3|4|4-python|4-slot-abi)$ ]]
 }
 
+___eapi_has_master_repositories() {
+	[[ ${1-${EAPI}} =~ ^(5-progress)$ ]]
+}
+
+___eapi_has_repository_path() {
+	[[ ${1-${EAPI}} =~ ^(5-progress)$ ]]
+}
+
+___eapi_has_available_eclasses() {
+	[[ ${1-${EAPI}} =~ ^(5-progress)$ ]]
+}
+
+___eapi_has_eclass_path() {
+	[[ ${1-${EAPI}} =~ ^(5-progress)$ ]]
+}
+
+___eapi_has_license_path() {
+	[[ ${1-${EAPI}} =~ ^(5-progress)$ ]]
+}
+
 # HELPERS BEHAVIOR
 
 ___eapi_best_version_and_has_version_support_--host-root() {
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index de54e22eb..b04244128 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -34,9 +34,7 @@ else
 	# These dummy functions return false in non-strict EAPIs, in order to ensure that
 	# `use multislot` is false for the "depend" phase.
 	funcs="use useq usev"
-	if ___eapi_has_usex; then
-		funcs+=" usex"
-	fi
+	___eapi_has_usex && funcs+=" usex"
 	for x in ${funcs} ; do
 		eval "${x}() {
 			if ___eapi_disallows_helpers_in_global_scope; then
@@ -48,7 +46,13 @@ else
 	done
 	# These functions die because calls to them during the "depend" phase
 	# are considered to be severe QA violations.
-	for x in best_version has_version portageq ; do
+	funcs="best_version has_version portageq"
+	___eapi_has_master_repositories && funcs+=" master_repositories"
+	___eapi_has_repository_path && funcs+=" repository_path"
+	___eapi_has_available_eclasses && funcs+=" available_eclasses"
+	___eapi_has_eclass_path && funcs+=" eclass_path"
+	___eapi_has_license_path && funcs+=" license_path"
+	for x in ${funcs} ; do
 		eval "${x}() { die \"\${FUNCNAME}() calls are not allowed in global scope\"; }"
 	done
 	unset funcs x
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 55fe9f0f6..67d09a462 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -736,3 +736,162 @@ best_version() {
 			;;
 	esac
 }
+
+if ___eapi_has_master_repositories; then
+	master_repositories() {
+		local output repository=$1 retval
+		shift
+		[[ $# -gt 0 ]] && die "${FUNCNAME[0]}: unused argument(s): $*"
+
+		if [[ -n ${PORTAGE_IPC_DAEMON} ]]; then
+			"${PORTAGE_BIN_PATH}/ebuild-ipc" master_repositories "${EROOT}" "${repository}"
+		else
+			output=$(PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
+			"${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" master_repositories "${EROOT}" "${repository}")
+		fi
+		retval=$?
+		[[ -n ${output} ]] && echo "${output}"
+		case "${retval}" in
+			0|1)
+				return ${retval}
+				;;
+			2)
+				die "${FUNCNAME[0]}: invalid repository: ${repository}"
+				;;
+			*)
+				if [[ -n ${PORTAGE_IPC_DAEMON} ]]; then
+					die "${FUNCNAME[0]}: unexpected ebuild-ipc exit code: ${retval}"
+				else
+					die "${FUNCNAME[0]}: unexpected portageq exit code: ${retval}"
+				fi
+				;;
+		esac
+	}
+fi
+
+if ___eapi_has_repository_path; then
+	repository_path() {
+		local output repository=$1 retval
+		shift
+		[[ $# -gt 0 ]] && die "${FUNCNAME[0]}: unused argument(s): $*"
+
+		if [[ -n ${PORTAGE_IPC_DAEMON} ]]; then
+			"${PORTAGE_BIN_PATH}/ebuild-ipc" repository_path "${EROOT}" "${repository}"
+		else
+			output=$(PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
+			"${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" get_repo_path "${EROOT}" "${repository}")
+		fi
+		retval=$?
+		[[ -n ${output} ]] && echo "${output}"
+		case "${retval}" in
+			0|1)
+				return ${retval}
+				;;
+			2)
+				die "${FUNCNAME[0]}: invalid repository: ${repository}"
+				;;
+			*)
+				if [[ -n ${PORTAGE_IPC_DAEMON} ]]; then
+					die "${FUNCNAME[0]}: unexpected ebuild-ipc exit code: ${retval}"
+				else
+					die "${FUNCNAME[0]}: unexpected portageq exit code: ${retval}"
+				fi
+				;;
+		esac
+	}
+fi
+
+if ___eapi_has_available_eclasses; then
+	available_eclasses() {
+		local output repository=${PORTAGE_REPO_NAME} retval
+		[[ $# -gt 0 ]] && die "${FUNCNAME[0]}: unused argument(s): $*"
+
+		if [[ -n ${PORTAGE_IPC_DAEMON} ]]; then
+			"${PORTAGE_BIN_PATH}/ebuild-ipc" available_eclasses "${EROOT}" "${repository}"
+		else
+			output=$(PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
+			"${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" available_eclasses "${EROOT}" "${repository}")
+		fi
+		retval=$?
+		[[ -n ${output} ]] && echo "${output}"
+		case "${retval}" in
+			0|1)
+				return ${retval}
+				;;
+			2)
+				die "${FUNCNAME[0]}: invalid repository: ${repository}"
+				;;
+			*)
+				if [[ -n ${PORTAGE_IPC_DAEMON} ]]; then
+					die "${FUNCNAME[0]}: unexpected ebuild-ipc exit code: ${retval}"
+				else
+					die "${FUNCNAME[0]}: unexpected portageq exit code: ${retval}"
+				fi
+				;;
+		esac
+	}
+fi
+
+if ___eapi_has_eclass_path; then
+	eclass_path() {
+		local eclass=$1 output repository=${PORTAGE_REPO_NAME} retval
+		shift
+		[[ $# -gt 0 ]] && die "${FUNCNAME[0]}: unused argument(s): $*"
+
+		if [[ -n ${PORTAGE_IPC_DAEMON} ]]; then
+			"${PORTAGE_BIN_PATH}/ebuild-ipc" eclass_path "${EROOT}" "${repository}" "${eclass}"
+		else
+			output=$(PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
+			"${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" eclass_path "${EROOT}" "${repository}" "${eclass}")
+		fi
+		retval=$?
+		[[ -n ${output} ]] && echo "${output}"
+		case "${retval}" in
+			0|1)
+				return ${retval}
+				;;
+			2)
+				die "${FUNCNAME[0]}: invalid repository: ${repository}"
+				;;
+			*)
+				if [[ -n ${PORTAGE_IPC_DAEMON} ]]; then
+					die "${FUNCNAME[0]}: unexpected ebuild-ipc exit code: ${retval}"
+				else
+					die "${FUNCNAME[0]}: unexpected portageq exit code: ${retval}"
+				fi
+				;;
+		esac
+	}
+fi
+
+if ___eapi_has_license_path; then
+	license_path() {
+		local license=$1 output repository=${PORTAGE_REPO_NAME} retval
+		shift
+		[[ $# -gt 0 ]] && die "${FUNCNAME[0]}: unused argument(s): $*"
+
+		if [[ -n ${PORTAGE_IPC_DAEMON} ]]; then
+			"${PORTAGE_BIN_PATH}/ebuild-ipc" license_path "${EROOT}" "${repository}" "${license}"
+		else
+			output=$(PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
+			"${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" license_path "${EROOT}" "${repository}" "${license}")
+		fi
+		retval=$?
+		[[ -n ${output} ]] && echo "${output}"
+		case "${retval}" in
+			0|1)
+				return ${retval}
+				;;
+			2)
+				die "${FUNCNAME[0]}: invalid repository: ${repository}"
+				;;
+			*)
+				if [[ -n ${PORTAGE_IPC_DAEMON} ]]; then
+					die "${FUNCNAME[0]}: unexpected ebuild-ipc exit code: ${retval}"
+				else
+					die "${FUNCNAME[0]}: unexpected portageq exit code: ${retval}"
+				fi
+				;;
+		esac
+	}
+fi
diff --git a/bin/portageq b/bin/portageq
index 97b5f3f14..7b5c2cd31 100755
--- a/bin/portageq
+++ b/bin/portageq
@@ -730,21 +730,127 @@ def get_repos(argv):
 
 get_repos.uses_eroot = True
 
+def master_repositories(argv):
+	"""<eroot> <repo_id>+
+	Returns space-separated list of master repositories for specified repository.
+	"""
+	if len(argv) < 2:
+		print("ERROR: insufficient parameters!", file=sys.stderr)
+		return 3
+	for arg in argv[1:]:
+		if portage.dep._repo_name_re.match(arg) is None:
+			print("ERROR: invalid repository: %s" % arg, file=sys.stderr)
+			return 2
+		try:
+			repo = portage.db[argv[0]]["porttree"].dbapi.repositories[arg]
+		except KeyError:
+			print("")
+			return 1
+		else:
+			print(" ".join(x.name for x in repo.masters))
+
+master_repositories.uses_eroot = True
+
 def get_repo_path(argv):
 	"""<eroot> <repo_id>+
 	Returns the path to the repo named argv[1], argv[0] = $EROOT
 	"""
 	if len(argv) < 2:
-		print("ERROR: insufficient parameters!")
-		return 2
+		print("ERROR: insufficient parameters!", file=sys.stderr)
+		return 3
 	for arg in argv[1:]:
+		if portage.dep._repo_name_re.match(arg) is None:
+			print("ERROR: invalid repository: %s" % arg, file=sys.stderr)
+			return 2
 		path = portage.db[argv[0]]["porttree"].dbapi.getRepositoryPath(arg)
 		if path is None:
-			path = ""
+			print("")
+			return 1
 		print(path)
 
 get_repo_path.uses_eroot = True
 
+def available_eclasses(argv):
+	"""<eroot> <repo_id>+
+	Returns space-separated list of available eclasses for specified repository.
+	"""
+	if len(argv) < 2:
+		print("ERROR: insufficient parameters!", file=sys.stderr)
+		return 3
+	for arg in argv[1:]:
+		if portage.dep._repo_name_re.match(arg) is None:
+			print("ERROR: invalid repository: %s" % arg, file=sys.stderr)
+			return 2
+		try:
+			repo = portage.db[argv[0]]["porttree"].dbapi.repositories[arg]
+		except KeyError:
+			print("")
+			return 1
+		else:
+			print(" ".join(sorted(repo.eclass_db.eclasses)))
+
+available_eclasses.uses_eroot = True
+
+def eclass_path(argv):
+	"""<eroot> <repo_id> <eclass>+
+	Returns the path to specified eclass for specified repository.
+	"""
+	if len(argv) < 3:
+		print("ERROR: insufficient parameters!", file=sys.stderr)
+		return 3
+	if portage.dep._repo_name_re.match(argv[1]) is None:
+		print("ERROR: invalid repository: %s" % argv[1], file=sys.stderr)
+		return 2
+	try:
+		repo = portage.db[argv[0]]["porttree"].dbapi.repositories[argv[1]]
+	except KeyError:
+		print("")
+		return 1
+	else:
+		retval = 0
+		for arg in argv[2:]:
+			try:
+				eclass = repo.eclass_db.eclasses[arg]
+			except KeyError:
+				print("")
+				retval = 1
+			else:
+				print(eclass.location)
+		return retval
+
+eclass_path.uses_eroot = True
+
+def license_path(argv):
+	"""<eroot> <repo_id> <license>+
+	Returns the path to specified license for specified repository.
+	"""
+	if len(argv) < 3:
+		print("ERROR: insufficient parameters!", file=sys.stderr)
+		return 3
+	if portage.dep._repo_name_re.match(argv[1]) is None:
+		print("ERROR: invalid repository: %s" % argv[1], file=sys.stderr)
+		return 2
+	try:
+		repo = portage.db[argv[0]]["porttree"].dbapi.repositories[argv[1]]
+	except KeyError:
+		print("")
+		return 1
+	else:
+		retval = 0
+		for arg in argv[2:]:
+			eclass_path = ""
+			paths = reversed([os.path.join(x.location, 'licenses', arg) for x in list(repo.masters) + [repo]])
+			for path in paths:
+				if os.path.exists(path):
+					eclass_path = path
+					break
+			if eclass_path == "":
+				retval = 1
+			print(eclass_path)
+		return retval
+
+license_path.uses_eroot = True
+
 def list_preserved_libs(argv):
 	"""<eroot>
 	Print a list of libraries preserved during a package update in the form
diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh
index 92cc692db..f6dc2c5e7 100644
--- a/bin/save-ebuild-env.sh
+++ b/bin/save-ebuild-env.sh
@@ -76,9 +76,12 @@ __save_ebuild_env() {
 		__unpack_tar __unset_colors \
 		${QA_INTERCEPTORS}
 
-	if ___eapi_has_usex; then
-		unset -f usex
-	fi
+	___eapi_has_usex && unset -f usex
+	___eapi_has_master_repositories && unset -f master_repositories
+	___eapi_has_repository_path && unset -f repository_path
+	___eapi_has_available_eclasses && unset -f available_eclasses
+	___eapi_has_eclass_path && unset -f eclass_path
+	___eapi_has_license_path && unset -f license_path
 
 	unset -f $(compgen -A function ___eapi_)