From 5924eaed34b0a8ca15a2137b110cd51d8ee73607 Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Mon, 2 Sep 2019 00:20:34 +0200
Subject: RusXMMS and CUDA

---
 scripts/bootstrap/fix_deps.sh      | 11 +++++------
 scripts/bootstrap/layman_reinit.sh |  9 ++++++---
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'scripts/bootstrap')

diff --git a/scripts/bootstrap/fix_deps.sh b/scripts/bootstrap/fix_deps.sh
index cf73d1e..e27a8c0 100644
--- a/scripts/bootstrap/fix_deps.sh
+++ b/scripts/bootstrap/fix_deps.sh
@@ -1,10 +1,9 @@
-# Unmerge
-emerge --depclean -a
-
 # Ncurses/GPM circular dependency
 USE="-gpm" emerge -1 ncurses
 
+# Unmerge
+#emerge --depclean -a
+
 # Perl 
-#     emerge -u -1 -O perl  $(eix '-I#' virtual/perl-*)
-#     emerge -u -1 perl $(eix '-I#' virtual/perl-*)
-#     perl-cleaner --all
+#emerge -u -1 -O perl  
+#emerge -C sys-apps/texinfo app-text/po4a $(eix '-I#' virtual/perl-*)  $(eix '-I#' dev-perl/*)
diff --git a/scripts/bootstrap/layman_reinit.sh b/scripts/bootstrap/layman_reinit.sh
index ce88379..6f977c7 100644
--- a/scripts/bootstrap/layman_reinit.sh
+++ b/scripts/bootstrap/layman_reinit.sh
@@ -1,12 +1,14 @@
 #! /bin/bash
 
 (
-    repos=$(xmllint -xpath "//repo/name/text()|//repo/source/text()" /etc/portage/layman.xml  | xargs -n2)
-
+    repos=$(xmllint -xpath "//repo/name/text()|//repo/source/text()" /etc/portage/layman.xml  | xargs -n2)      #"
+    repos_enabled=$(cat /etc/portage/repos.conf/layman.conf | grep -oP "\[\K[^]]*")
+    
     cd /etc/portage
     
     layman -d ALL
-    for repo in $(cat /etc/portage/repos.conf/layman.conf | grep -oP "\[\K[^]]*"); do
+    layman -L &> /dev/null
+    for repo in "$repos_enabled"; do
         repo_src=$(echo "$repos" | grep -P "^$repo" | awk '{ print $2 }')
         if [ -n "$repo_src" ]; then
             layman -a "$repo" -O "$repo_src"
@@ -16,4 +18,5 @@
     done
 
     git checkout -- layman.xml
+    git checkout -- repos.conf/layman.conf 
 )
-- 
cgit v1.2.1