From 66d36fe3a62cae443360e5d62e2935c25aa2f557 Mon Sep 17 00:00:00 2001
From: hasufell <hasufell@hasufell.de>
Date: Fri, 21 Aug 2015 23:27:57 +0200
Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run

---
 paludis/hooks/sync_all_post/05-sync_news.bash | 13 ++-----------
 paludis/hooks/util_functions.bash             |  1 -
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/paludis/hooks/sync_all_post/05-sync_news.bash b/paludis/hooks/sync_all_post/05-sync_news.bash
index b8421a6..01f38f8 100644
--- a/paludis/hooks/sync_all_post/05-sync_news.bash
+++ b/paludis/hooks/sync_all_post/05-sync_news.bash
@@ -9,16 +9,7 @@ ebegin "Updating news items"
 if [[ -e ${NEWSDIR} ]]; then
 	git -C "${NEWSDIR}" pull -q --ff
 else
-	git clone -q https://anongit.gentoo.org/git/proj/gentoo-news.git "${NEWSDIR}"
+	git clone -q https://anongit.gentoo.org/git/data/gentoo-news.git "${NEWSDIR}"
 fi
-eend_die $?
-
-ebegin "Cleaning news git repo"
-git -C "${NEWSDIR}" clean -fdxq
-eend_die $?
-
-ebegin "Copying news to base directory"
-cp -a "${NEWSDIR}"/*/* "${NEWSDIR}"
-rm -r "${NEWSDIR}"/2013-06-01-mysql-pbxt-dropped
-eend $?
 
+eend $? "Try to remove ${PORTDIR}/metadata/news"
diff --git a/paludis/hooks/util_functions.bash b/paludis/hooks/util_functions.bash
index 8a2e188..6a430a9 100644
--- a/paludis/hooks/util_functions.bash
+++ b/paludis/hooks/util_functions.bash
@@ -6,4 +6,3 @@ eend_die() {
 	eend "$@"
 	[[ $1 -ne 0 ]] && exit $1
 }
-