diff options
| author | Ulrich Mueller <ulm@gentoo.org> | 2010-09-05 13:50:09 +0200 |
|---|---|---|
| committer | Ulrich Mueller <ulm@gentoo.org> | 2010-09-05 13:52:54 +0200 |
| commit | 4a27551650f41325074ec03a7a4cad756e24dc47 (patch) | |
| tree | 158e1dd198a75353567851239970b279020d2d7f /bin/ebuild-helpers | |
| parent | fdcba63b8c2a4e35718acee18ee8ce362b737868 (diff) | |
| download | portage-4a27551650f41325074ec03a7a4cad756e24dc47.tar.gz portage-4a27551650f41325074ec03a7a4cad756e24dc47.tar.bz2 portage-4a27551650f41325074ec03a7a4cad756e24dc47.zip | |
dodoc, prepalldocs: Don't test for EAPI; use helpers in subdir 4 instead.
Diffstat (limited to 'bin/ebuild-helpers')
| -rwxr-xr-x | bin/ebuild-helpers/4/dodoc | 2 | ||||
| l--------- | bin/ebuild-helpers/4/prepalldocs | 1 | ||||
| -rwxr-xr-x | bin/ebuild-helpers/dodoc | 2 | ||||
| -rwxr-xr-x | bin/ebuild-helpers/prepalldocs | 5 |
4 files changed, 2 insertions, 8 deletions
diff --git a/bin/ebuild-helpers/4/dodoc b/bin/ebuild-helpers/4/dodoc index c9068a8b5..91e7e044f 100755 --- a/bin/ebuild-helpers/4/dodoc +++ b/bin/ebuild-helpers/4/dodoc @@ -37,8 +37,6 @@ for x in "$@" ; do elif [ -s "${x}" ] ; then install -m0644 "${x}" "${dir}" - ecompress --queue "${dir}/${x##*/}" - elif [ ! -e "${x}" ] ; then echo "!!! ${0##*/}: $x does not exist" 1>&2 ((ret|=1)) diff --git a/bin/ebuild-helpers/4/prepalldocs b/bin/ebuild-helpers/4/prepalldocs new file mode 120000 index 000000000..1a6b57a39 --- /dev/null +++ b/bin/ebuild-helpers/4/prepalldocs @@ -0,0 +1 @@ +../../banned-helper
\ No newline at end of file diff --git a/bin/ebuild-helpers/dodoc b/bin/ebuild-helpers/dodoc index 99410ea85..29b690112 100755 --- a/bin/ebuild-helpers/dodoc +++ b/bin/ebuild-helpers/dodoc @@ -18,7 +18,7 @@ ret=0 for x in "$@" ; do if [ -s "${x}" ] ; then install -m0644 "${x}" "${dir}" - hasq "${EAPI}" 0 1 2 3 && ecompress --queue "${dir}/${x##*/}" + ecompress --queue "${dir}/${x##*/}" elif [ ! -e "${x}" ] ; then echo "!!! ${0##*/}: $x does not exist" 1>&2 ((ret|=1)) diff --git a/bin/ebuild-helpers/prepalldocs b/bin/ebuild-helpers/prepalldocs index 3b16f9726..fdc735d6f 100755 --- a/bin/ebuild-helpers/prepalldocs +++ b/bin/ebuild-helpers/prepalldocs @@ -4,11 +4,6 @@ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh -if ! hasq "${EAPI}" 0 1 2 3; then - eqawarn "QA Notice: Deprecated call to 'prepalldocs'" - exit 0 -fi - if [[ -n $1 ]] ; then vecho "${0##*/}: invalid usage; takes no arguments" 1>&2 fi |