Remove home-made functions; they are not in the trunk, and the added

value is another difference between mainline and prefix.

svn path=/main/branches/prefix/; revision=6390

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 0fd83b4c9ae4e644bd12d9b5fea798fa641f81f6..cc19d62c40c9a26c09a87e672ea32caf34acee6c 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -211,158 +211,6 @@ best_version() {
        "@PORTAGE_BASE@"/bin/portageq 'best_version' "${ROOT}" "$1"
 }
 
-with_bindir() {
-       local mybindir
-       if [ -z "${1}" ]; then
-               if [ ! -z "${EPREFIX}" ]; then
-                       mybindir="${EPREFIX}/bin"
-               else
-                       mybindir="/bin"
-               fi
-       else
-               if [ ! -z "${EPREFIX}" ]; then
-                       mybindir="${EPREFIX}${1}"
-               else
-                       mybindir="${1}"
-               fi
-       fi
-       echo "--bindir=${mybindir}"
-       return 0
-}
-
-with_datadir() {
-       local mydatadir
-       if [ -z "${1}" ]; then
-               if [ ! -z "${EPREFIX}" ]; then
-                       mydatadir="${EPREFIX}/usr/share"
-               else
-                       mydatadir=/usr/share
-               fi
-       else
-               if [ ! -z "${EPREFIX}" ]; then
-                       mydatadir="${EPREFIX}${1}"
-               else
-                       mydatadir="${1}"
-               fi
-       fi
-       echo "--datadir=${mydatadir}"
-       return 0
-}
-
-with_infodir() {
-       local myinfodir
-       if [ -z "${1}" ]; then
-               if [ ! -z "${EPREFIX}" ]; then
-                       myinfodir="${EPREFIX}/usr/share/info"
-               else
-                       myinfodir=/usr/share/info
-               fi
-       else
-               if [ ! -z "${EPREFIX}" ]; then
-                       myinfodir="${EPREFIX}${1}"
-               else
-                       myinfodir="${1}"
-               fi
-       fi
-       echo "--infodir=${myinfodir}"
-       return 0
-}
-
-with_mandir() {
-       local mymandir
-       if [ -z "${1}" ]; then
-               if [ ! -z "${EPREFIX}" ]; then
-                       mymandir="${EPREFIX}/usr/share/man"
-               else
-                       mymandir=/usr/share/man
-               fi
-       else
-               if [ ! -z "${EPREFIX}" ]; then
-                       mymandir="${EPREFIX}${1}"
-               else
-                       mymandir="${1}"
-               fi
-       fi
-       echo "--mandir=${mymandir}"
-       return 0
-}
-
-with_prefix() {
-       local myprefix
-       if [ -z "${1}" ]; then
-               if [ ! -z "${EPREFIX}" ]; then
-                       myprefix="${EPREFIX}/usr"
-               else
-                       myprefix=/usr
-               fi
-       else
-               if [ ! -z "${EPREFIX}" ]; then
-                       myprefix="${EPREFIX}${1}"
-               else
-                       myprefix="${1}"
-               fi
-       fi
-       echo "--prefix=${myprefix}"
-       return 0
-}
-
-with_sysconfdir() {
-       local myconfdir
-       if [ -z "${1}" ]; then
-               if [ ! -z "${EPREFIX}" ]; then
-                       myconfdir="${EPREFIX}/etc"
-               else
-                       myconfdir=/etc
-               fi
-       else
-               if [ ! -z "${EPREFIX}" ]; then
-                       myconfdir="${EPREFIX}${1}"
-               else
-                       myconfdir="${1}"
-               fi
-       fi
-       echo "--sysconfdir=${myconfdir}"
-       return 0
-}
-
-with_localstatedir() {
-       local mylocalstatedir
-       if [ -z "${1}" ]; then
-               if [ ! -z "${EPREFIX}" ]; then
-                       mylocalstatedir="${EPREFIX}/var/lib"
-               else
-                       mylocalstatedir="/var/lib"
-               fi
-       else
-               if [ ! -z "${EPREFIX}" ]; then
-                       mylocalstatedir="${EPREFIX}${1}"
-               else
-                       mylocalstatedir="${1}"
-               fi
-       fi
-       echo "--localstatedir=${mylocalstatedir}"
-       return 0
-}
-
-with_tmpdir() {
-       local mytmpdir
-       if [ -z "${1}" ]; then
-               if [ ! -z "${EPREFIX}" ]; then
-                       mytmpdir="${EPREFIX}/tmp"
-               else
-                       mytmpdir="/tmp"
-               fi
-       else
-               if [ ! -z "${EPREFIX}" ]; then
-                       mytmpdir="${EPREFIX}${1}"
-               else
-                       mytmpdir="${1}"
-               fi
-       fi
-       echo "--with-tmpdir=${mytmpdir}"
-       return 0
-}
-       
 use_with() {
        if [ -z "$1" ]; then
                echo "!!! use_with() called without a parameter." >&2