RusXMMS and CUDA

21 files changed, 48 insertions, 23 deletions

diff --git a/make.conf b/make.conf
index a96ab17..f6ad83f 100644
--- a/make.conf
+++ b/make.conf
@@ -18,6 +18,7 @@ DISTCC_HOSTS="localhost ipepdvcompute4/16"
 FEATURES="distcc splitdebug -test"
 #ccache is reported to cause problems.
 #FEATURES="ccache buildpkg getbinpkg nostrip"
+#FEATURES="-collision-protect"
 
 USE="-systemd -consolekit elogind -doc multislot eselect ccache pch dbus timezone syslog unicode nls icu rcc"
 USE_GENERAL="utils tools script scripts scripting extensions extras applet plugins importers imaging rendering stream video audio sound encode printsupport extra archive"
diff --git a/make.profile b/make.profile
index a2e5afe..163f869 120000
--- a/make.profile
+++ b/make.profile
@@ -1 +1 @@
-/usr/portage/profiles/default/linux/amd64/17.1/developer
\ No newline at end of file
+../../usr/portage/profiles/default/linux/amd64/17.1/developer
\ No newline at end of file
diff --git a/package.env/package.env b/package.env/package.env
index 1abdf61..41e3957 100644
--- a/package.env/package.env
+++ b/package.env/package.env
@@ -1,3 +1,4 @@
+dev-util/nvidia-cuda-sdk        nosplitdebug.conf                               # otherwise conflicts with cuda-toolkit
 www-client/firefox	        nosplitdebug.conf
 sys-auth/pam_x509	        fpic.conf
 gnome-base/libglade             python27.conf
diff --git a/package.keywords/latest.keywords b/package.keywords/latest.keywords
index 6cb19d8..821aa37 100644
--- a/package.keywords/latest.keywords
+++ b/package.keywords/latest.keywords
@@ -1,6 +1,10 @@
 # Latest version required (Development, security, etc.)
 # This may break system. So, it is better to include current version (or at least pattern) of unstable series
 
+#NVIDIA
+dev-util/nvidia-cuda-toolkit ~amd64
+dev-util/nvidia-cuda-sdk ~amd64
+
 #Office
 #www-client/firefox ~amd64
 #www-client/firefox-bin ~amd64
diff --git a/package.keywords/legacy.keywords b/package.keywords/legacy.keywords
new file mode 100644
index 0000000..66cd848
--- /dev/null
+++ b/package.keywords/legacy.keywords
@@ -0,0 +1,2 @@
+=sys-devel/kgcc64-8.3.0 **
+
diff --git a/package.keywords/update-ftrs.keywords b/package.keywords/update-ftrs.keywords
index 5eafab7..6aa6d16 100644
--- a/package.keywords/update-ftrs.keywords
+++ b/package.keywords/update-ftrs.keywords
@@ -8,4 +8,5 @@
 #=app-backup/duplicity-0.7* ~amd64
 =app-backup/borgbackup-1.1.10* ~amd64
 
-
+=net-firewall/nftables-0.9* ~amd64                                      # iptables-nft
+=net-firewall/iptables-1.8* ~amd64                                      # iptables-nft
diff --git a/package.keywords/xdeps-firefox.keywords b/package.keywords/xdeps-firefox.keywords
index 3da31c1..a19a105 100644
--- a/package.keywords/xdeps-firefox.keywords
+++ b/package.keywords/xdeps-firefox.keywords
@@ -1,6 +1,7 @@
 =dev-libs/nss-3.17* ~amd64			# firefox
 =dev-libs/nspr-4.22 ~amd64                      # firefox
 =dev-libs/nss-3.45 ~amd64                       # firefox
+=dev-libs/nss-3.46 ~amd64                       # firefox
 =media-libs/libvpx-1.7* ~amd64                  # firefox
 #=media-libs/libvpx-1.8* ~amd64                  # firefox
 =dev-util/cbindgen-0.9* ~amd64                  # firefox
diff --git a/package.keywords/xdeps.keywords b/package.keywords/xdeps.keywords
index fd40910..0eb217f 100644
--- a/package.keywords/xdeps.keywords
+++ b/package.keywords/xdeps.keywords
@@ -1,4 +1,2 @@
-
-
-
-
+=net-libs/libnftnl-1.1.4 ~amd64                         # nftables 
+=net-misc/ethertypes-0 ~amd64                           # iptables
diff --git a/package.mask/ban.mask b/package.mask/ban.mask
index 2b8f495..c0f881d 100644
--- a/package.mask/ban.mask
+++ b/package.mask/ban.mask
@@ -2,10 +2,10 @@
 net-dns/avahi
 
 #Drivers
-<x11-drivers/nvidia-drivers-430.40
->x11-drivers/nvidia-drivers-430.40-r99
-<dev-util/nvidia-cuda-toolkit-9
->dev-util/nvidia-cuda-toolkit-9-r99
+#<x11-drivers/nvidia-drivers-430.40
+#>x11-drivers/nvidia-drivers-430.40-r99
+#<dev-util/nvidia-cuda-toolkit-9
+#>dev-util/nvidia-cuda-toolkit-9-r99
 
 #Intrusive ask pass, etc.
 <net-misc/x11-ssh-askpass-999
diff --git a/package.mask/darksoft.mask b/package.mask/darksoft.mask
index a86e94e..796bb79 100644
--- a/package.mask/darksoft.mask
+++ b/package.mask/darksoft.mask
@@ -1,8 +1,8 @@
 # RusXMMS
 >media-libs/id3lib-3.8.3-r8
 >media-libs/libid3tag-0.15.1b-r4
->media-libs/taglib-1.9.1-r3
->app-arch/unzip-6.0-r3
+>media-libs/taglib-1.11.1_p20181028-r1
+#>app-arch/unzip-6.0-r3
 #>app-arch/p7zip-9.20.1-r5
 #>net-ftp/gftp-2.0.18-r5
 #>media-libs/mac-3.99-r2
@@ -20,3 +20,4 @@
 
 # Key bindings
 >x11-terms/xterm-278-r2                         # Problems with non-unicode characters in later versions
+>x11-libs/vte-0.56.1:2.91                       # Last patch
diff --git a/package.unmask/package.unmask b/package.unmask/package.unmask
index de33b25..fb87bfe 100644
--- a/package.unmask/package.unmask
+++ b/package.unmask/package.unmask
@@ -1,7 +1,7 @@
 =sys-fs/fuse-3.6*                               # exfat-testing? I don't remember why I have unmasked it
 
 # Old gcc-collection
-=sys-devel/gcc-4.9*
+#=sys-devel/gcc-4.9*
 
 # Java (banned because of licence)
 =dev-java/oracle-jdk-bin-1.8.0.221
diff --git a/package.use/config.use b/package.use/config.use
index cb5e9d2..43e61a2 100644
--- a/package.use/config.use
+++ b/package.use/config.use
@@ -51,3 +51,8 @@ net-misc/dropbox                -X
 app-text/texlive		science extra publishers
 app-office/libreoffice		odk templates webdav java nlpsolver -gtk3
 app-office/libreoffice-bin	java
+dev-util/nvidia-cuda-sdk        mpi opencl doc examples debug
+dev-util/nvidia-cuda-toolkit    eclipse profiler debugger doc
+net-firewall/nftables           xtables
+net-firewall/iptables           nftables conntrack netlink pcap
+
diff --git a/package.use/enforced_flags.use b/package.use/enforced_flags.use
index f040e62..3033554 100644
--- a/package.use/enforced_flags.use
+++ b/package.use/enforced_flags.use
@@ -28,3 +28,4 @@ sci-libs/netcdf				mpi			# paraview
 sci-libs/cgnslib			mpi			# paraview
 virtual/mpi				romio			# paraview
 sys-cluster/openmpi			romio			# paraview
+x11-drivers/nvidia-drivers              uvm                     # cuda
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 
 )
diff --git a/sets/desktop b/sets/desktop
index d9c2d72..ea4d527 100644
--- a/sets/desktop
+++ b/sets/desktop
@@ -27,5 +27,5 @@ app-text/xournal
 app-crypt/seahorse
 net-wireless/blueberry
 gnome-extra/gnome-calculator
-net-misc/d4x
+#net-misc/d4x                                                   # crashing, retired
 media-sound/pavucontrol
diff --git a/sets/desktop-apps b/sets/desktop-apps
index 058c5d6..b1072a8 100644
--- a/sets/desktop-apps
+++ b/sets/desktop-apps
@@ -6,6 +6,7 @@ www-plugins/adobe-flash
 dev-java/icedtea-web
 
 www-client/google-chrome
+www-client/opera
 
 # Mail
 mail-client/thunderbird
diff --git a/sets/dev-gpu b/sets/dev-gpu
index 017afe4..bbda28d 100644
--- a/sets/dev-gpu
+++ b/sets/dev-gpu
@@ -1,5 +1,7 @@
 # NVIDIA
 media-video/nvidia_video_sdk					# ?
+dev-util/nvidia-cuda-sdk
+dev-util/nvidia-cuda-toolkit
 
 # Architecture Analysis
 dev-util/decuda							# CUDA disassembler
diff --git a/sets/legacy b/sets/legacy
index fcb0830..e1d2d4c 100644
--- a/sets/legacy
+++ b/sets/legacy
@@ -2,3 +2,5 @@
 sys-boot/grub:0
 sys-kernel/gentoo-sources:4.7.2
 dev-java/oracle-jdk-bin
+media-libs/libpng:1.2
+
diff --git a/sets/sys b/sets/sys
index c1585f2..26683ec 100644
--- a/sets/sys
+++ b/sets/sys
@@ -10,6 +10,7 @@ app-editors/vim
 app-misc/beep
 net-dns/bind-tools
 net-firewall/iptables
+net-firewall/nftables
 net-misc/bridge-utils
 net-misc/dhcp
 net-misc/ntp
@@ -29,6 +30,7 @@ sys-apps/unscd
 sys-boot/grub
 sys-boot/mbr
 sys-fs/mdadm
+sys-fs/dmraid
 sys-power/acpid
 sys-process/time
 sys-process/vixie-cron
diff --git a/sets/sys-boot b/sets/sys-boot
index 135e3e7..89ba58c 100644
--- a/sets/sys-boot
+++ b/sets/sys-boot
@@ -2,4 +2,5 @@ sys-kernel/genkernel
 sys-boot/syslinux
 
 # This is temporarily (we will likely go for 5.4 or later LTS release)
+# sys-devel/kgcc64:8.3.0
 sys-kernel/gentoo-sources:4.19.66