Remove the empty default pkg_setup, src_install, pkg_preinst,

pkg_postinst, pkg_prerm, pkg_postrm, and pkg_config functions
since they do nothing more than clutter the environment.

svn path=/main/trunk/; revision=8655

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index b4c6dcc53207f2aba5eb20de4f3d454b6b89fd76..d7cfe3b9bcdf92017942cbf191a944d69ccc46d1 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -535,10 +535,6 @@ einstall() {
        fi
 }
 
-pkg_setup() {
-       return
-}
-
 pkg_nofetch() {
        [ -z "${SRC_URI}" ] && return
 
@@ -582,30 +578,6 @@ src_test() {
        fi
 }
 
-src_install() {
-       return
-}
-
-pkg_preinst() {
-       return
-}
-
-pkg_postinst() {
-       return
-}
-
-pkg_prerm() {
-       return
-}
-
-pkg_postrm() {
-       return
-}
-
-pkg_config() {
-       eerror "This ebuild does not have a config function."
-}
-
 # Used to generate the /lib/cpp and /usr/bin/cc wrappers
 gen_wrapper() {
        cat > "$1" <<-EOF
@@ -1735,7 +1707,7 @@ if [ -n "${EBUILD_SH_ARGS}" ] ; then
                exit 1
                ;;
        prerm|postrm|postinst|config|info)
-               if [ "${EBUILD_SH_ARGS}" == "info" ] && \
+               if hasq ${EBUILD_SH_ARGS} config info && \
                        [ "$(type -t pkg_${EBUILD_SH_ARGS})" != "function" ]; then
                        ewarn  "pkg_${EBUILD_SH_ARGS}() is not defined: '${EBUILD##*/}'"
                        exit 0