diff options
| -rw-r--r-- | scripts/bootstrap/fix_deps.sh | 10 | ||||
| -rw-r--r-- | scripts/bootstrap/layman_reinit.sh (renamed from scripts/layman_reinit.sh) | 2 | ||||
| -rw-r--r-- | sets/desktop-apps (renamed from sets/dekstop-apps) | 1 | ||||
| -rw-r--r-- | sets/legacy | 4 | ||||
| -rw-r--r-- | sets/sys | 1 | ||||
| -rw-r--r-- | sets/sys-boot | 1 |
6 files changed, 14 insertions, 5 deletions
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/layman_reinit.sh b/scripts/bootstrap/layman_reinit.sh index 6729149..ce88379 100644 --- a/scripts/layman_reinit.sh +++ b/scripts/bootstrap/layman_reinit.sh @@ -6,8 +6,6 @@ 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 diff --git a/sets/dekstop-apps b/sets/desktop-apps index d027f77..058c5d6 100644 --- a/sets/dekstop-apps +++ b/sets/desktop-apps @@ -4,7 +4,6 @@ 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 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 @@ -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 |