From b05187a9be4b19660d3073f7018f970b29f3d0c6 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@rogentos.ro>
Date: Tue, 30 Jun 2015 21:16:00 +0100
Subject: vasile does it when starting env, so no longer needed

---
 git-hooks/post-merge | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100755 git-hooks/post-merge

(limited to 'git-hooks/post-merge')

diff --git a/git-hooks/post-merge b/git-hooks/post-merge
deleted file mode 100755
index 6f47f56..0000000
--- a/git-hooks/post-merge
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-# although it doesn't seem to be documented,
-# current directory appears to be git "main" dir
-
-echo "post-merge hook is executing"
-
-arch="$(uname -m)"
-src_make_conf=""
-case $arch in
-	i686)
-	src_make_conf="./conf/intel/portage/make.conf.x86"
-	;;
-	x86_64)
-	src_make_conf="./conf/intel/portage/make.conf.amd64"
-	;;
-esac
-
-if [ -n "$src_make_conf" ]; then
-	echo "post-merge hook: copying make.conf (from $src_make_conf):"
-	cp --no-target-directory -v "$src_make_conf" /etc/make.conf
-fi
-
-# Copy noarch config files
-for conf_file in ./conf/noarch/entropy/packages/* ; do
-	dest_path=/etc/entropy/packages/$(basename "${conf_file}")
-	echo "Writing ${dest_path}"
-	cp --no-target-directory -p -v "${conf_file}" "${dest_path}"
-done
-- 
cgit v1.2.3