Merge branch 'kill-util-functions' of git://github.com/redneb/portage-gentoo-git-config

etc/portage/repo.postsync.d/sync_gentoo_cache

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 source /etc/init.d/functions.sh
-source /etc/portage/util-functions.sh
 
 repository_name="${1}"
 repository_path="${3}"

etc/portage/repo.postsync.d/sync_gentoo_dtd

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 source /etc/init.d/functions.sh
-source /etc/portage/util-functions.sh
 
 repository_name="${1}"
 repository_path="${3}"

etc/portage/repo.postsync.d/sync_gentoo_glsa

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 source /etc/init.d/functions.sh
-source /etc/portage/util-functions.sh
 
 repository_name="${1}"
 repository_path="${3}"

etc/portage/repo.postsync.d/sync_gentoo_herds_xml

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 source /etc/init.d/functions.sh
-source /etc/portage/util-functions.sh
 
 repository_name="${1}"
 repository_path="${3}"

etc/portage/repo.postsync.d/sync_gentoo_news

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 source /etc/init.d/functions.sh
-source /etc/portage/util-functions.sh
 
 repository_name="${1}"
 repository_path="${3}"
@@ -14,5 +13,5 @@ if [[ ${repository_name} == "gentoo" ]]; then
 	else
 		git clone -q https://anongit.gentoo.org/git/data/gentoo-news.git "${NEWSDIR}"
 	fi
-	eend $? "Try to remove ${PORTDIR}/metadata/news"
+	eend $? "Try to remove ${NEWSDIR}"
 fi

etc/portage/util-functions.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-source /etc/init.d/functions.sh
-
-eend_die() {
-	eend "$@"
-	[[ $1 -ne 0 ]] && exit $1
-}
-
-die() {
-	eerror "$*"
-	exit 1
-}