diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-05-08 23:38:47 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-05-09 00:09:22 -0700 |
| commit | 20817801dd4ef0117bcc7b33c90650da1e920385 (patch) | |
| tree | c2e30f858b87e9d1504774a8e84791aff149453c /bin | |
| parent | 476f99337da69662660bfe2a0406b9ac5b4678c4 (diff) | |
| download | portage-20817801dd4ef0117bcc7b33c90650da1e920385.tar.gz portage-20817801dd4ef0117bcc7b33c90650da1e920385.tar.bz2 portage-20817801dd4ef0117bcc7b33c90650da1e920385.zip | |
Parse EAPI with pattern from PMS section 7.3.1.
This implements the specification that was approved in Gentoo's council
meeting on May 8, 2012 (see bug #402167). The parse-eapi-ebuild-head
FEATURES setting is now enabled by default, and causes non-conformant
ebuilds to be treated as invalid. This behavior will soon become
enabled unconditionally.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild.sh | 6 | ||||
| -rwxr-xr-x | bin/repoman | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 32dc64f0c..d161bc65d 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -534,7 +534,7 @@ if ! has "$EBUILD_PHASE" clean cleanrm ; then # In order to ensure correct interaction between ebuilds and # eclasses, they need to be unset before this process of # interaction begins. - unset DEPEND RDEPEND PDEPEND INHERITED IUSE REQUIRED_USE \ + unset EAPI DEPEND RDEPEND PDEPEND INHERITED IUSE REQUIRED_USE \ ECLASS E_IUSE E_REQUIRED_USE E_DEPEND E_RDEPEND E_PDEPEND if [[ $PORTAGE_DEBUG != 1 || ${-/x/} != $- ]] ; then @@ -551,7 +551,7 @@ if ! has "$EBUILD_PHASE" clean cleanrm ; then rm "$PORTAGE_BUILDDIR/.ebuild_changed" fi - [[ -n $EAPI ]] || EAPI=0 + [ "${EAPI+set}" = set ] || EAPI=0 if has "$EAPI" 0 1 2 3 3_pre2 ; then export RDEPEND=${RDEPEND-${DEPEND}} @@ -670,7 +670,7 @@ if [[ $EBUILD_PHASE = depend ]] ; then PROPERTIES DEFINED_PHASES UNUSED_05 UNUSED_04 UNUSED_03 UNUSED_02 UNUSED_01" - [ -n "${EAPI}" ] || EAPI=0 + [ "${EAPI+set}" = set ] || EAPI=0 # The extra $(echo) commands remove newlines. if [ -n "${dbkey}" ] ; then diff --git a/bin/repoman b/bin/repoman index cfe4b8e01..3d1a4b0c1 100755 --- a/bin/repoman +++ b/bin/repoman @@ -322,7 +322,7 @@ qahelp={ "LICENSE.virtual":"Virtuals that have a non-empty LICENSE variable", "DESCRIPTION.missing":"Ebuilds that have a missing or empty DESCRIPTION variable", "DESCRIPTION.toolong":"DESCRIPTION is over %d characters" % max_desc_len, - "EAPI.definition":"EAPI definition does not conform to PMS section 8.3.1 (first non-comment, non-blank line)", + "EAPI.definition":"EAPI definition does not conform to PMS section 7.3.1 (first non-comment, non-blank line)", "EAPI.deprecated":"Ebuilds that use features that are deprecated in the current EAPI", "EAPI.incompatible":"Ebuilds that use features that are only available with a different EAPI", "EAPI.unsupported":"Ebuilds that have an unsupported EAPI version (you must upgrade portage)", |