From b75ed94dff896f7bce0011aad2ff9774c3a837db Mon Sep 17 00:00:00 2001
From: hasufell <hasufell@hasufell.de>
Date: Sun, 16 Aug 2015 17:46:11 +0200
Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run

---
 .../hooks/ebuild_install_post/games_var.bash  |  1 -
 .../hooks/ebuild_install_pre/games_var.bash   |  0
 .../hooks/ebuild_postinst_post/etckeeper.bash |  8 +++++++
 paludis/hooks/ebuild_postinst_post/gold.bash  |  1 +
 paludis/hooks/ebuild_postinst_post/ns2.bash   |  6 -----
 .../pulseaudio_no_exec.bash                   | 11 +++++++++
 paludis/hooks/ebuild_postinst_post/some.bash  |  7 ------
 .../hooks/ebuild_postrm_post/etckeeper.bash   |  8 +++++++
 paludis/hooks/ebuild_postrm_post/gold.bash    |  1 +
 paludis/hooks/ebuild_postrm_post/some.bash    |  8 -------
 .../hooks/ebuild_preinst_post/etckeeper.bash  |  7 ++++++
 paludis/hooks/ebuild_preinst_post/some.bash   | 24 -------------------
 .../hooks/ebuild_prerm_post/etckeeper.bash    |  7 ++++++
 paludis/hooks/ebuild_prerm_post/some.bash     |  4 ----
 paludis/hooks/ebuild_pretend_pre/gold.bash    |  1 +
 paludis/hooks/ebuild_pretend_pre/some.bash    |  4 ----
 paludis/hooks/ebuild_setup_pre/gold.bash      |  1 +
 paludis/hooks/ebuild_setup_pre/some.bash      |  4 ----
 paludis/hooks/gold.bash                       |  7 ++++++
 paludis/hooks/install_all_post/some.bash      | 10 --------
 .../install_all_post/update_find_db.bash      |  8 +++++++
 .../hooks/sync_all_post/sync_herds_xml.bash   |  2 +-
 paludis/package_unmask.conf                   |  8 +++----
 23 files changed, 65 insertions(+), 73 deletions(-)
 delete mode 100644 paludis/hooks/ebuild_install_post/games_var.bash
 delete mode 100644 paludis/hooks/ebuild_install_pre/games_var.bash
 create mode 100644 paludis/hooks/ebuild_postinst_post/etckeeper.bash
 create mode 120000 paludis/hooks/ebuild_postinst_post/gold.bash
 delete mode 100755 paludis/hooks/ebuild_postinst_post/ns2.bash
 create mode 100755 paludis/hooks/ebuild_postinst_post/pulseaudio_no_exec.bash
 delete mode 100644 paludis/hooks/ebuild_postinst_post/some.bash
 create mode 100644 paludis/hooks/ebuild_postrm_post/etckeeper.bash
 create mode 120000 paludis/hooks/ebuild_postrm_post/gold.bash
 delete mode 100644 paludis/hooks/ebuild_postrm_post/some.bash
 create mode 100644 paludis/hooks/ebuild_preinst_post/etckeeper.bash
 delete mode 100644 paludis/hooks/ebuild_preinst_post/some.bash
 create mode 100644 paludis/hooks/ebuild_prerm_post/etckeeper.bash
 delete mode 100644 paludis/hooks/ebuild_prerm_post/some.bash
 create mode 120000 paludis/hooks/ebuild_pretend_pre/gold.bash
 delete mode 100755 paludis/hooks/ebuild_pretend_pre/some.bash
 create mode 120000 paludis/hooks/ebuild_setup_pre/gold.bash
 delete mode 100755 paludis/hooks/ebuild_setup_pre/some.bash
 create mode 100644 paludis/hooks/gold.bash
 delete mode 100755 paludis/hooks/install_all_post/some.bash
 create mode 100755 paludis/hooks/install_all_post/update_find_db.bash

diff --git a/paludis/hooks/ebuild_install_post/games_var.bash b/paludis/hooks/ebuild_install_post/games_var.bash
deleted file mode 100644
index 8b13789..0000000
--- a/paludis/hooks/ebuild_install_post/games_var.bash
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/paludis/hooks/ebuild_install_pre/games_var.bash b/paludis/hooks/ebuild_install_pre/games_var.bash
deleted file mode 100644
index e69de29..0000000
diff --git a/paludis/hooks/ebuild_postinst_post/etckeeper.bash b/paludis/hooks/ebuild_postinst_post/etckeeper.bash
new file mode 100644
index 0000000..bc69d57
--- /dev/null
+++ b/paludis/hooks/ebuild_postinst_post/etckeeper.bash
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+source "${PALUDIS_EBUILD_DIR}/echo_functions.bash"
+
+einfo "running 'etckeeper post-install'"
+
+etckeeper post-install
+
diff --git a/paludis/hooks/ebuild_postinst_post/gold.bash b/paludis/hooks/ebuild_postinst_post/gold.bash
new file mode 120000
index 0000000..304fe45
--- /dev/null
+++ b/paludis/hooks/ebuild_postinst_post/gold.bash
@@ -0,0 +1 @@
+/etc/paludis/hooks/gold.bash
\ No newline at end of file
diff --git a/paludis/hooks/ebuild_postinst_post/ns2.bash b/paludis/hooks/ebuild_postinst_post/ns2.bash
deleted file mode 100755
index 423ee7c..0000000
--- a/paludis/hooks/ebuild_postinst_post/ns2.bash
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-if [[ "${CATEGORY}/${PN}" == "media-sound/pulseaudio" ]] ; then
-	chmod -x /usr/bin/pulseaudio
-fi
-
diff --git a/paludis/hooks/ebuild_postinst_post/pulseaudio_no_exec.bash b/paludis/hooks/ebuild_postinst_post/pulseaudio_no_exec.bash
new file mode 100755
index 0000000..59f6a07
--- /dev/null
+++ b/paludis/hooks/ebuild_postinst_post/pulseaudio_no_exec.bash
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+source "${PALUDIS_EBUILD_DIR}/echo_functions.bash"
+
+# e.g. use for ns2
+
+if [[ "${CATEGORY}/${PN}" == "media-sound/pulseaudio" ]] ; then
+	einfo "removing executable bit from '/usr/bin/pulseaudio!'" 
+	chmod -x /usr/bin/pulseaudio
+fi
+
diff --git a/paludis/hooks/ebuild_postinst_post/some.bash b/paludis/hooks/ebuild_postinst_post/some.bash
deleted file mode 100644
index 154b098..0000000
--- a/paludis/hooks/ebuild_postinst_post/some.bash
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo -e '\033[1;32metckeeper postinst phase...\033[0m'
-etckeeper post-install
-if [[ $(ld --version) =~ "gold" ]] ; then
-	echo -e "\033[1;31mld gold is in use!!\033[0m"
-fi
diff --git a/paludis/hooks/ebuild_postrm_post/etckeeper.bash b/paludis/hooks/ebuild_postrm_post/etckeeper.bash
new file mode 100644
index 0000000..bc69d57
--- /dev/null
+++ b/paludis/hooks/ebuild_postrm_post/etckeeper.bash
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+source "${PALUDIS_EBUILD_DIR}/echo_functions.bash"
+
+einfo "running 'etckeeper post-install'"
+
+etckeeper post-install
+
diff --git a/paludis/hooks/ebuild_postrm_post/gold.bash b/paludis/hooks/ebuild_postrm_post/gold.bash
new file mode 120000
index 0000000..304fe45
--- /dev/null
+++ b/paludis/hooks/ebuild_postrm_post/gold.bash
@@ -0,0 +1 @@
+/etc/paludis/hooks/gold.bash
\ No newline at end of file
diff --git a/paludis/hooks/ebuild_postrm_post/some.bash b/paludis/hooks/ebuild_postrm_post/some.bash
deleted file mode 100644
index b9170cf..0000000
--- a/paludis/hooks/ebuild_postrm_post/some.bash
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-echo -e '\033[1;32metckeeper postinst phase...\033[0m'
-etckeeper post-install
-if [[ $(ld --version) =~ "gold" ]] ; then 
-        echo -e "\033[1;31mld gold is in use!!\033[0m"
-fi
-
diff --git a/paludis/hooks/ebuild_preinst_post/etckeeper.bash b/paludis/hooks/ebuild_preinst_post/etckeeper.bash
new file mode 100644
index 0000000..eb950f3
--- /dev/null
+++ b/paludis/hooks/ebuild_preinst_post/etckeeper.bash
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+source "${PALUDIS_EBUILD_DIR}/echo_functions.bash"
+
+einfo "running 'etckeeper pre-install'"
+
+etckeeper pre-install
diff --git a/paludis/hooks/ebuild_preinst_post/some.bash b/paludis/hooks/ebuild_preinst_post/some.bash
deleted file mode 100644
index 19b71ee..0000000
--- a/paludis/hooks/ebuild_preinst_post/some.bash
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-echo -e '\033[1;32metckeeper preinst phase...\033[0m'
-etckeeper pre-install
-
-# if [[ "${CATEGORY}/${PN}" =~ "app-emulation/emul-linux-x86" ||
-	# "${CATEGORY}/${PN}" == "x11-drivers/nvidia-drivers" ||
-	# "${CATEGORY}/${PN}" == "sys-libs/libstdc++-v3" ||
-	# "${CATEGORY}/${PN}" == "dev-lang/dmd" ||
-	# "${CATEGORY}/${PN}" == "sys-apps/sandbox" ||
-	# "${CATEGORY}/${PN}" == "app-emulation/wine" ||
-	# "${CATEGORY}/${PN}" == "sys-libs/glibc"
-	# ]]
-# then
-	# :
-# else
-	# einfo
-	# einfo "removing stuff in "${ED%/}"/usr/lib32/"
-	# einfo
-	# if [[ -n ${ED%/} && -e "${ED%/}/usr/lib32" ]] ; then
-		# rm -rf "${ED%/}/usr/lib32"
-	# fi
-# fi
-
diff --git a/paludis/hooks/ebuild_prerm_post/etckeeper.bash b/paludis/hooks/ebuild_prerm_post/etckeeper.bash
new file mode 100644
index 0000000..eb950f3
--- /dev/null
+++ b/paludis/hooks/ebuild_prerm_post/etckeeper.bash
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+source "${PALUDIS_EBUILD_DIR}/echo_functions.bash"
+
+einfo "running 'etckeeper pre-install'"
+
+etckeeper pre-install
diff --git a/paludis/hooks/ebuild_prerm_post/some.bash b/paludis/hooks/ebuild_prerm_post/some.bash
deleted file mode 100644
index e08705f..0000000
--- a/paludis/hooks/ebuild_prerm_post/some.bash
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-echo -e '\033[1;32metckeeper preinst phase...\033[0m'
-etckeeper pre-install
diff --git a/paludis/hooks/ebuild_pretend_pre/gold.bash b/paludis/hooks/ebuild_pretend_pre/gold.bash
new file mode 120000
index 0000000..304fe45
--- /dev/null
+++ b/paludis/hooks/ebuild_pretend_pre/gold.bash
@@ -0,0 +1 @@
+/etc/paludis/hooks/gold.bash
\ No newline at end of file
diff --git a/paludis/hooks/ebuild_pretend_pre/some.bash b/paludis/hooks/ebuild_pretend_pre/some.bash
deleted file mode 100755
index 34cf73d..0000000
--- a/paludis/hooks/ebuild_pretend_pre/some.bash
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-if [[ $(ld --version) =~ "gold" ]] ; then 
-	echo -e "\033[1;31mld gold is in use!!\033[0m"
-fi
diff --git a/paludis/hooks/ebuild_setup_pre/gold.bash b/paludis/hooks/ebuild_setup_pre/gold.bash
new file mode 120000
index 0000000..304fe45
--- /dev/null
+++ b/paludis/hooks/ebuild_setup_pre/gold.bash
@@ -0,0 +1 @@
+/etc/paludis/hooks/gold.bash
\ No newline at end of file
diff --git a/paludis/hooks/ebuild_setup_pre/some.bash b/paludis/hooks/ebuild_setup_pre/some.bash
deleted file mode 100755
index 87d92e6..0000000
--- a/paludis/hooks/ebuild_setup_pre/some.bash
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-if [[ $(ld --version) =~ "gold" ]] ; then
-	echo -e "\033[1;31mld gold is in use!!\033[0m"
-fi
diff --git a/paludis/hooks/gold.bash b/paludis/hooks/gold.bash
new file mode 100644
index 0000000..adad9a3
--- /dev/null
+++ b/paludis/hooks/gold.bash
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+source "${PALUDIS_EBUILD_DIR}/echo_functions.bash"
+
+if [[ $(ld --version) =~ "gold" ]] ; then
+	ewarn \033[1;31mld gold is in use!!\033[0m"
+fi
diff --git a/paludis/hooks/install_all_post/some.bash b/paludis/hooks/install_all_post/some.bash
deleted file mode 100755
index 05fb96e..0000000
--- a/paludis/hooks/install_all_post/some.bash
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-#echo -e "\033[1;33mcompressing logs...\033[0m"
-#find "$(portageq envvar PORT_LOGDIR)" -type f -name "*.log" -exec xz -z -9 '{}' \; && echo -e "\033[1;32mcompressing logs finished!\033[0m" || echo -e "\033[1;31mfailed!\033[0m"
-
-
-# updatedb
-/root/updatedb.sh
-echo -e "\033[1;33mstarting database-update...\033[0m" 
-updatedb && echo -e "\033[1;32mupdating database finished!\033[0m" || echo -e "\033[1;31mfailed!\033[0m"
diff --git a/paludis/hooks/install_all_post/update_find_db.bash b/paludis/hooks/install_all_post/update_find_db.bash
new file mode 100755
index 0000000..30f6c9d
--- /dev/null
+++ b/paludis/hooks/install_all_post/update_find_db.bash
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+source "${PALUDIS_EBUILD_DIR}/echo_functions.bash"
+
+einfo "starting database-update..." 
+
+/root/updatedb.sh
+updatedb && einfo "updating database finished!" || eerror "failed!"
diff --git a/paludis/hooks/sync_all_post/sync_herds_xml.bash b/paludis/hooks/sync_all_post/sync_herds_xml.bash
index d89fef8..fe50a82 100644
--- a/paludis/hooks/sync_all_post/sync_herds_xml.bash
+++ b/paludis/hooks/sync_all_post/sync_herds_xml.bash
@@ -7,4 +7,4 @@ source "/etc/paludis/hooks/set_portdir.bash"
 
 cd "${PORTDIR}"/metadata || die "could not cd into '${PORTDIR}/metadata'!"
 [[ -e "${PORTDIR}"/metadata/herds.xml ]] && { rm "${PORTDIR}"/metadata/herds.xml || die "failed to rm herds.xml!" ;}
-wget https://gitweb.gentoo.org/proj/api.git/plain/files/packages/herds.xml || die "failed to wget herds.xml"
+wget https://gitweb.gentoo.org/data/api.git/plain/files/packages/herds.xml || die "failed to wget herds.xml"
diff --git a/paludis/package_unmask.conf b/paludis/package_unmask.conf
index ce738d9..5796f74 100644
--- a/paludis/package_unmask.conf
+++ b/paludis/package_unmask.conf
@@ -91,8 +91,8 @@ app-office/ganttproject-bin::sunrise
 <media-video/mpv-9999
 
 
-#>=net-voip/linphone-3.8.0
-#>=media-libs/mediastreamer-2.11.0
-#>=net-libs/ortp-0.24.0
-#>=net-libs/belle-sip-1.4.0
+>=net-voip/linphone-3.8.0
+>=media-libs/mediastreamer-2.11.0
+>=net-libs/ortp-0.24.0
+>=net-libs/belle-sip-1.4.0