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 ---------------------
 sets/dekstop-apps                  | 30 ------------------------------
 sets/desktop-apps                  | 29 +++++++++++++++++++++++++++++
 sets/legacy                        |  4 ++++
 sets/sys                           |  1 -
 sets/sys-boot                      |  1 -
 8 files changed, 62 insertions(+), 53 deletions(-)
 create mode 100644 scripts/bootstrap/fix_deps.sh
 create mode 100644 scripts/bootstrap/layman_reinit.sh
 delete mode 100644 scripts/layman_reinit.sh
 delete mode 100644 sets/dekstop-apps
 create mode 100644 sets/desktop-apps
 create mode 100644 sets/legacy

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
-)
diff --git a/sets/dekstop-apps b/sets/dekstop-apps
deleted file mode 100644
index d027f77..0000000
--- a/sets/dekstop-apps
+++ /dev/null
@@ -1,30 +0,0 @@
-# Browsers
-www-client/firefox						# Consider switching to bin
-www-client/firefox-bin
-www-plugins/google-talkplugin
-www-plugins/adobe-flash
-dev-java/icedtea-web
-dev-java/oracle-jdk-bin
-
-www-client/google-chrome
-
-# Mail
-mail-client/thunderbird
-x11-plugins/enigmail
-
-# Office
-app-office/libreoffice-bin
-app-officeext/languagetool
-
-# File Viewers
-kde-apps/okular
-app-text/calibre
-app-text/fbreader
-app-text/djview
-app-text/xchm
-
-# Misc
-sys-apps/baobab							# Disk usage analyzer
-app-cdr/brasero							# CD writting
-
-
diff --git a/sets/desktop-apps b/sets/desktop-apps
new file mode 100644
index 0000000..058c5d6
--- /dev/null
+++ b/sets/desktop-apps
@@ -0,0 +1,29 @@
+# Browsers
+www-client/firefox						# Consider switching to bin
+www-client/firefox-bin
+www-plugins/google-talkplugin
+www-plugins/adobe-flash
+dev-java/icedtea-web
+
+www-client/google-chrome
+
+# Mail
+mail-client/thunderbird
+x11-plugins/enigmail
+
+# Office
+app-office/libreoffice-bin
+app-officeext/languagetool
+
+# File Viewers
+kde-apps/okular
+app-text/calibre
+app-text/fbreader
+app-text/djview
+app-text/xchm
+
+# Misc
+sys-apps/baobab							# Disk usage analyzer
+app-cdr/brasero							# CD writting
+
+
diff --git a/sets/legacy b/sets/legacy
new file mode 100644
index 0000000..fcb0830
--- /dev/null
+++ b/sets/legacy
@@ -0,0 +1,4 @@
+# This packages are not available in portage any more
+sys-boot/grub:0
+sys-kernel/gentoo-sources:4.7.2
+dev-java/oracle-jdk-bin
diff --git a/sets/sys b/sets/sys
index 8024664..c1585f2 100644
--- a/sets/sys
+++ b/sets/sys
@@ -27,7 +27,6 @@ sys-apps/setserial
 sys-apps/sysvinit
 sys-apps/unscd
 sys-boot/grub
-sys-boot/grub:0
 sys-boot/mbr
 sys-fs/mdadm
 sys-power/acpid
diff --git a/sets/sys-boot b/sets/sys-boot
index 0816080..135e3e7 100644
--- a/sets/sys-boot
+++ b/sets/sys-boot
@@ -1,6 +1,5 @@
 sys-kernel/genkernel
 sys-boot/syslinux
-sys-kernel/gentoo-sources:4.7.2
 
 # This is temporarily (we will likely go for 5.4 or later LTS release)
 sys-kernel/gentoo-sources:4.19.66
-- 
cgit v1.2.1