dodoc, prepalldocs: Don't test for EAPI; use helpers in subdir 4 instead.

diff --git a/bin/ebuild-helpers/4/dodoc b/bin/ebuild-helpers/4/dodoc
index c9068a8b5d07b1cdf5ed7d1eb913f5a8abb69eb5..91e7e044f772bc18ae25444f4268ad4893d7fd04 100755 (executable)
--- 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 (symlink)
index 0000000..1a6b57a
--- /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 99410ea85985560c307a1ec0b0097acfbe74bd01..29b69011260dc7c376857913b8db6b8d0008eb95 100755 (executable)
--- 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 3b16f97260397444866249853adaf9392927264f..fdc735d6fc35ed7630d5d41b344674169575f4cb 100755 (executable)
--- 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