From 359b7fb5959b2a8874772c46477fe034d3030102 Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Sun, 1 Sep 2019 02:50:10 +0200
Subject: Some reshuffle to easier migrate between local and remote systems

---
 scripts/bootstrap/fix_deps.sh      | 10 ++++++++++
 scripts/bootstrap/layman_reinit.sh | 19 +++++++++++++++++++
 scripts/layman_reinit.sh           | 21 ---------------------
 3 files changed, 29 insertions(+), 21 deletions(-)
 create mode 100644 scripts/bootstrap/fix_deps.sh
 create mode 100644 scripts/bootstrap/layman_reinit.sh
 delete mode 100644 scripts/layman_reinit.sh

(limited to 'scripts')

diff --git a/scripts/bootstrap/fix_deps.sh b/scripts/bootstrap/fix_deps.sh
new file mode 100644
index 0000000..cf73d1e
--- /dev/null
+++ b/scripts/bootstrap/fix_deps.sh
@@ -0,0 +1,10 @@
+# Unmerge
+emerge --depclean -a
+
+# Ncurses/GPM circular dependency
+USE="-gpm" emerge -1 ncurses
+
+# Perl 
+#     emerge -u -1 -O perl  $(eix '-I#' virtual/perl-*)
+#     emerge -u -1 perl $(eix '-I#' virtual/perl-*)
+#     perl-cleaner --all
diff --git a/scripts/bootstrap/layman_reinit.sh b/scripts/bootstrap/layman_reinit.sh
new file mode 100644
index 0000000..ce88379
--- /dev/null
+++ b/scripts/bootstrap/layman_reinit.sh
@@ -0,0 +1,19 @@
+#! /bin/bash
+
+(
+    repos=$(xmllint -xpath "//repo/name/text()|//repo/source/text()" /etc/portage/layman.xml  | xargs -n2)
+
+    cd /etc/portage
+    
+    layman -d ALL
+    for repo in $(cat /etc/portage/repos.conf/layman.conf | grep -oP "\[\K[^]]*"); do
+        repo_src=$(echo "$repos" | grep -P "^$repo" | awk '{ print $2 }')
+        if [ -n "$repo_src" ]; then
+            layman -a "$repo" -O "$repo_src"
+        else
+            layman -a "$repo"
+        fi
+    done
+
+    git checkout -- layman.xml
+)
diff --git a/scripts/layman_reinit.sh b/scripts/layman_reinit.sh
deleted file mode 100644
index 6729149..0000000
--- a/scripts/layman_reinit.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/bash
-
-(
-    repos=$(xmllint -xpath "//repo/name/text()|//repo/source/text()" /etc/portage/layman.xml  | xargs -n2)
-
-    cd /etc/portage
-    
-    layman -d ALL
-    git checkout -- layman.xml
-
-    for repo in $(cat /etc/portage/repos.conf/layman.conf | grep -oP "\[\K[^]]*"); do
-        repo_src=$(echo "$repos" | grep -P "^$repo" | awk '{ print $2 }')
-        if [ -n "$repo_src" ]; then
-            layman -a "$repo" -O "$repo_src"
-        else
-            layman -a "$repo"
-        fi
-    done
-
-    git checkout -- layman.xml
-)
-- 
cgit v1.2.3