From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 25 Nov 2007 08:50:49 +0000 (-0000)
Subject: Remove the empty default pkg_setup, src_install, pkg_preinst,
X-Git-Tag: v2.2_pre1~323
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5ba6500fc522e165256d59829df120f65510c2c6;p=portage.git

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 b4c6dcc53..d7cfe3b9b 100755
--- 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