From 6fa3110487606c17c856480265844b2008d29f63 Mon Sep 17 00:00:00 2001 From: "Suren A. Chilingaryan" Date: Fri, 25 Oct 2019 23:23:08 +0200 Subject: Fix building from scratch --- env/network.conf | 1 + extraconf/local.conf | 5 +++++ extraconf/local.conf.disabled | 3 --- extraconf/remote.conf | 2 +- make.conf | 4 ++-- package.env/package.env | 1 + package.keywords/update-bugs.keywords | 7 +++++++ package.mask/darksoft.mask | 2 +- package.unmask/package.unmask | 3 +++ package.use/config_bindings.use | 3 ++- package.use/config_vm.keywords | 1 + package.use/fixes.use | 2 ++ package.use/package32.use | 1 - scripts/bootstrap/builder_sync.sh | 8 ++++++++ sets/deps | 5 +++++ sets/desktop | 1 - sets/desktop-apps | 2 -- sets/desktop-apps-bin | 3 +++ sets/dev-gpu | 2 +- sets/dev-lamps | 12 ++++++------ sets/legacy | 1 - sets/sys | 3 ++- 22 files changed, 51 insertions(+), 21 deletions(-) create mode 100644 env/network.conf create mode 100644 extraconf/local.conf delete mode 100644 extraconf/local.conf.disabled create mode 100644 sets/deps create mode 100644 sets/desktop-apps-bin diff --git a/env/network.conf b/env/network.conf new file mode 100644 index 0000000..9544285 --- /dev/null +++ b/env/network.conf @@ -0,0 +1 @@ +FEATURES="-network-sandbox" diff --git a/extraconf/local.conf b/extraconf/local.conf new file mode 100644 index 0000000..564f184 --- /dev/null +++ b/extraconf/local.conf @@ -0,0 +1,5 @@ +FEATURES="$FEATURES distcc -buildpkg getbinpkg" +PKGDIR="/var/cache/binpkgs" +#Configure libghttpd? inside builder container? https://wiki.gentoo.org/wiki/Binary_package_guide#Web_based_binary_package_host +#PORTAGE_BINHOST="http://ipepdvcompute4.ipe.kit.edu/binpkgs/" +#PORTAGE_BINHOST="ssh://root@ipepdvcompute4.ipe.kit.edu/home/docker/volumes/binpkgs/" diff --git a/extraconf/local.conf.disabled b/extraconf/local.conf.disabled deleted file mode 100644 index c87e1fc..0000000 --- a/extraconf/local.conf.disabled +++ /dev/null @@ -1,3 +0,0 @@ -FEATURES="$FEATURES -buildpkg getbinpkg" -PKGDIR="/var/cache/binpkgs" -PORTAGE_BINHOST="http://ipepdvcompute4.ipe.kit.edu/binpkgs/" diff --git a/extraconf/remote.conf b/extraconf/remote.conf index 90fb43d..af11129 100644 --- a/extraconf/remote.conf +++ b/extraconf/remote.conf @@ -1,4 +1,4 @@ -FEATURES="$FEATURES -getbinpkg buildpkg" +FEATURES="$FEATURES -distcc -getbinpkg buildpkg" PKGDIR="/var/cache/binpkgs" USE="-driver" diff --git a/make.conf b/make.conf index c9e44f0..4923432 100644 --- a/make.conf +++ b/make.conf @@ -33,7 +33,7 @@ FEATURES="${FEATURES} distcc splitdebug -test" #FEATURES="ccache buildpkg getbinpkg nostrip" #FEATURES="${FEATURES} -collision-protect" -USE_SYSTEM="-systemd -consolekit elogind -doc multislot eselect ccache pch dbus timezone syslog unicode nls icu rcc" +USE_SYSTEM="-systemd -consolekit elogind -doc multislot eselect ccache pch dbus timezone syslog unicode nls icu rcc eselect-ldso" USE_GENERAL="utils tools script scripts scripting extensions extras applet plugins importers imaging rendering stream video audio sound encode printsupport extra archive" USE_CONSOLE="ncurses bash-completion fish-completion zsh-completion" USE_DEVEL="python -ruby -fortran profile profiling systemtap nptl threads ithreads ipc libffi exceptions pcre16 graphite jit vala glib introspection" @@ -70,7 +70,7 @@ PYTHON_TARGETS="python2_7 python3_6" PYTHON_SINGLE_TARGET="python3_6" #PYTHON_SINGLE_TARGET="python2_7" #PHP_INI_VERSION="production" -PHP_TARGETS="php5-6" +PHP_TARGETS="php7-3" RUBY_TARGETS="ruby25" CONFIG_PROTECT="/usr/share/X11/app-defaults /usr/share/mc /usr/share/mc.46" diff --git a/package.env/package.env b/package.env/package.env index 7450e6f..76c6687 100644 --- a/package.env/package.env +++ b/package.env/package.env @@ -8,3 +8,4 @@ sys-libs/talloc nonparallel.conf sys-libs/ldb nonparallel.conf net-fs/samba nonparallel.conf dev-python/pycuda cuda.conf +sci-geosciences/mkgmap network.conf diff --git a/package.keywords/update-bugs.keywords b/package.keywords/update-bugs.keywords index e77787a..6ef5b64 100644 --- a/package.keywords/update-bugs.keywords +++ b/package.keywords/update-bugs.keywords @@ -1,5 +1,12 @@ # Update to a specific version is required +=sci-libs/lapack-3.8* ~amd64 # old blas-reference/lapack-reference have problems with eselect +=app-eselect/eselect-blas-0.2 ~amd64 +=virtual/blas-3.8* ~amd64 +=virtual/cblas-3.8* ~amd64 +=virtual/lapack-3.8* ~amd64 +=sci-libs/arpack-3.5* ~amd64 # 3.1.5 fails to find lapack + =sys-fs/fuse-2.9* ~amd64 # potential source of problems with exfat =sys-fs/fuse-3.6* ~amd64 diff --git a/package.mask/darksoft.mask b/package.mask/darksoft.mask index fe1e4e9..7b5178b 100644 --- a/package.mask/darksoft.mask +++ b/package.mask/darksoft.mask @@ -1,6 +1,6 @@ # RusXMMS >media-libs/id3lib-3.8.3-r8 ->media-libs/libid3tag-0.15.1b-r4 +>media-libs/libid3tag-0.15.1b-r5 >media-libs/taglib-1.11.1_p20181028-r1 #>app-arch/unzip-6.0-r3 #>app-arch/p7zip-9.20.1-r5 diff --git a/package.unmask/package.unmask b/package.unmask/package.unmask index fb87bfe..a257630 100644 --- a/package.unmask/package.unmask +++ b/package.unmask/package.unmask @@ -5,3 +5,6 @@ # Java (banned because of licence) =dev-java/oracle-jdk-bin-1.8.0.221 + +# DarkSoft dependecies +dev-python/gnome-keyring-python diff --git a/package.use/config_bindings.use b/package.use/config_bindings.use index 60d339a..d24cb09 100644 --- a/package.use/config_bindings.use +++ b/package.use/config_bindings.use @@ -2,6 +2,7 @@ dev-vcs/subversion -java net-analyzer/rrdtool perl -ruby app-accessibility/speech-dispatcher -python -dev-libs/libsolv ruby rpm +dev-libs/libsolv ruby rpm -python # or should first emerged without python, but then python can be added + # \ No newline at end of file diff --git a/package.use/config_vm.keywords b/package.use/config_vm.keywords index e4c65f9..e99ce21 100644 --- a/package.use/config_vm.keywords +++ b/package.use/config_vm.keywords @@ -1,2 +1,3 @@ app-emulation/buildah -ostree app-emulation/libpod rootless btrfs -ostree +app-emulation/vagrant -virtualbox diff --git a/package.use/fixes.use b/package.use/fixes.use index a30e55d..9a9e137 100644 --- a/package.use/fixes.use +++ b/package.use/fixes.use @@ -5,5 +5,7 @@ app-misc/tracker -thunderbird -firefox-bookmarks =dev-python/ipython-3.2* -qt4 media-plugins/gst-plugins-meta -ffmpeg =media-gfx/blender-2.72* -ffmpeg +media-libs/imlib2 -mp3 +app-admin/syslog-ng -smtp # libesmtp is broken now # \ No newline at end of file diff --git a/package.use/package32.use b/package.use/package32.use index d0fe981..94e8a39 100644 --- a/package.use/package32.use +++ b/package.use/package32.use @@ -129,7 +129,6 @@ >=x11-libs/libXpm-3.5.11 abi_x86_32 >=x11-libs/libXau-1.0.8 abi_x86_32 >=x11-proto/xproto-7.0.27 abi_x86_32 ->=virtual/pam-0-r1 abi_x86_32 >=x11-proto/damageproto-1.2.1-r1 abi_x86_32 >=x11-proto/kbproto-1.0.6-r1 abi_x86_32 >=sys-apps/keyutils-1.5.9-r1 abi_x86_32 diff --git a/scripts/bootstrap/builder_sync.sh b/scripts/bootstrap/builder_sync.sh index e7f1f66..c1db7d7 100644 --- a/scripts/bootstrap/builder_sync.sh +++ b/scripts/bootstrap/builder_sync.sh @@ -4,3 +4,11 @@ cd /darklin/gentoo && git pull cd /darklin/darklin4 && git pull emerge --sync && eix-sync emerge -1 portage + +lftp http://darksoft.org/darklin/ << EOF +lcd /var/cache/ +mirror -c distfiles +bye +EOF + +[ -f /usr/src/linux/.config ] || yes "" | make -C /usr/src/linux oldconfig diff --git a/sets/deps b/sets/deps new file mode 100644 index 0000000..763ce5c --- /dev/null +++ b/sets/deps @@ -0,0 +1,5 @@ +# Missing dependencies +dev-perl/XML-Parser + +# Enforce specific alternative +sci-libs/lapack diff --git a/sets/desktop b/sets/desktop index ea4d527..20cf79d 100644 --- a/sets/desktop +++ b/sets/desktop @@ -16,7 +16,6 @@ x11-plugins/wmvolman # Main apps net-im/psi -net-im/telegram-desktop-bin app-text/stardict net-misc/owncloud-client diff --git a/sets/desktop-apps b/sets/desktop-apps index c75355f..ac2bbc9 100644 --- a/sets/desktop-apps +++ b/sets/desktop-apps @@ -1,6 +1,5 @@ # Browsers www-client/firefox # Consider switching to bin -www-client/firefox-bin www-plugins/google-talkplugin www-plugins/adobe-flash dev-java/icedtea-web @@ -13,7 +12,6 @@ mail-client/thunderbird x11-plugins/enigmail # Office -app-office/libreoffice-bin app-officeext/languagetool # File Viewers diff --git a/sets/desktop-apps-bin b/sets/desktop-apps-bin new file mode 100644 index 0000000..1e33878 --- /dev/null +++ b/sets/desktop-apps-bin @@ -0,0 +1,3 @@ +app-office/libreoffice-bin +www-client/firefox-bin +net-im/telegram-desktop-bin diff --git a/sets/dev-gpu b/sets/dev-gpu index bbda28d..031b2f8 100644 --- a/sets/dev-gpu +++ b/sets/dev-gpu @@ -4,7 +4,7 @@ dev-util/nvidia-cuda-sdk dev-util/nvidia-cuda-toolkit # Architecture Analysis -dev-util/decuda # CUDA disassembler +# dev-util/decuda # CUDA disassembler # GPU/OpenCL stuff dev-libs/pocl # OpenCL + CUDA gateway diff --git a/sets/dev-lamps b/sets/dev-lamps index c14f669..dd1c580 100644 --- a/sets/dev-lamps +++ b/sets/dev-lamps @@ -1,11 +1,11 @@ www-servers/apache # PHP -dev-db/phpmyadmin +#dev-db/phpmyadmin # ADEI dependencies -dev-db/freetds -dev-php/jpgraph -dev-php/pecl-rrd -dev-php/pecl-stats -dev-php/PEAR-Spreadsheet_Excel_Writer +#dev-db/freetds +#dev-php/jpgraph +#dev-php/pecl-rrd +#dev-php/pecl-stats +#dev-php/PEAR-Spreadsheet_Excel_Writer diff --git a/sets/legacy b/sets/legacy index e1d2d4c..4c6e7b2 100644 --- a/sets/legacy +++ b/sets/legacy @@ -3,4 +3,3 @@ 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 26683ec..b1527ab 100644 --- a/sets/sys +++ b/sets/sys @@ -31,6 +31,7 @@ sys-boot/grub sys-boot/mbr sys-fs/mdadm sys-fs/dmraid +sys-fs/lvm2 sys-power/acpid sys-process/time -sys-process/vixie-cron +sys-process/cronie -- cgit v1.2.3