diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/distutils-r1.eclass | 2 | ||||
| -rw-r--r-- | eclass/elisp.eclass | 4 | ||||
| -rw-r--r-- | eclass/multibuild.eclass | 2 | ||||
| -rw-r--r-- | eclass/readme.gentoo-r1.eclass | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index be94c46cb3e0..7965e9106a49 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -419,7 +419,7 @@ _distutils-r1_create_setup_cfg() { _distutils-r1_copy_egg_info() { mkdir -p "${BUILD_DIR}" || die # stupid freebsd can't do 'cp -t ${BUILD_DIR} {} +' - find -name '*.egg-info' -type d -exec cp -pr {} "${BUILD_DIR}"/ ';' || die + find -name '*.egg-info' -type d -exec cp -R -p {} "${BUILD_DIR}"/ ';' || die } # @FUNCTION: distutils-r1_python_compile diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass index 6f1a6afdb140..11788802b039 100644 --- a/eclass/elisp.eclass +++ b/eclass/elisp.eclass @@ -67,7 +67,7 @@ inherit elisp-common eutils -case "${EAPI:-0}" in +case ${EAPI:-0} in 0|1) EXPORT_FUNCTIONS src_{unpack,compile,install} \ pkg_{setup,postinst,postrm} ;; *) EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \ @@ -105,7 +105,7 @@ elisp_src_unpack() { [[ -d ${S} ]] || S=${WORKDIR} fi - case "${EAPI:-0}" in + case ${EAPI:-0} in 0|1) [[ -d ${S} ]] && cd "${S}" elisp_src_prepare ;; esac diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass index d21008cf2666..3d05f46d2a03 100644 --- a/eclass/multibuild.eclass +++ b/eclass/multibuild.eclass @@ -195,7 +195,7 @@ multibuild_copy_sources() { _multibuild_create_source_copy() { einfo "${MULTIBUILD_VARIANT}: copying to ${BUILD_DIR}" - cp -pr "${cp_args[@]}" \ + cp -p -R "${cp_args[@]}" \ "${_MULTIBUILD_INITIAL_BUILD_DIR}" "${BUILD_DIR}" || die } diff --git a/eclass/readme.gentoo-r1.eclass b/eclass/readme.gentoo-r1.eclass index d98a445d4ea9..c07665072c2b 100644 --- a/eclass/readme.gentoo-r1.eclass +++ b/eclass/readme.gentoo-r1.eclass @@ -24,10 +24,10 @@ _README_GENTOO_ECLASS=1 inherit eutils case "${EAPI:-0}" in - 0|1|2|3|4|5) + 0|1|2|3) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;; - 6) + 4|5|6) ;; *) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" |