summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Luka Šijanec <anton@sijanec.eu>2024-01-30 20:31:54 +0100
committerAnton Luka Šijanec <anton@sijanec.eu>2024-01-30 20:31:54 +0100
commit306e5526a7c21dcd9efd07b8d7c899834e140d79 (patch)
tree2310a77592113ec232db29322765c1fa920c0dbc
parentbtrfsv (diff)
downloadn-306e5526a7c21dcd9efd07b8d7c899834e140d79.tar
n-306e5526a7c21dcd9efd07b8d7c899834e140d79.tar.gz
n-306e5526a7c21dcd9efd07b8d7c899834e140d79.tar.bz2
n-306e5526a7c21dcd9efd07b8d7c899834e140d79.tar.lz
n-306e5526a7c21dcd9efd07b8d7c899834e140d79.tar.xz
n-306e5526a7c21dcd9efd07b8d7c899834e140d79.tar.zst
n-306e5526a7c21dcd9efd07b8d7c899834e140d79.zip
-rw-r--r--etc/portage/make.conf3
-rw-r--r--etc/portage/package.unmask/conf2
-rw-r--r--etc/portage/package.unmask/zz-autounmask (renamed from etc/portage/package.unmask)6
-rwxr-xr-xroot/posodobi.sh2
4 files changed, 9 insertions, 4 deletions
diff --git a/etc/portage/make.conf b/etc/portage/make.conf
index 4af8550..e876941 100644
--- a/etc/portage/make.conf
+++ b/etc/portage/make.conf
@@ -51,7 +51,7 @@ USE="$USE system-png" # za torbrowser
USE="$USE bluetooth"
USE="$USE cutter" # za rz-ghidra
USE="$USE rtlsdr" # za gqrx
-USE="$USE pdo" # za php
+USE="$USE pdo bcmath" # za php
USE="$USE -branding" # za libreoffice
USE="$USE otf" # ta terminus
USE="$USE system-llvm clippy rust-src rust-analyzer rustfmt" # za rust
@@ -73,6 +73,7 @@ USE="$USE fileinfo spell change-password enigma" # za roundcube
USE="$USE tkip" # za wpa_supplicant
USE="$USE hpijs" # za hplip
USE="$USE jmol" # za sage math
+USE="$USE terminal" # za vim
UWSGI_PLUGINS="pam"
NGINX_MODULES_HTTP="$NGINX_MODULES_HTTP addition auth_ldap auth_pam auth_request brotli dav dav_ext echo fancyindex flv gunzip gzip_static headers_more image_filter javascript memc metrics mp4 push_stream random_index realip secure_link sticky stub_status sub upload_progress vhost_traffic_status xslt gzip userid ssi uwsgi slice security rewrite referer proxy perl map limit_req limit_conn fastcgi empty_gif charset browser autoindex access auth_basic"
diff --git a/etc/portage/package.unmask/conf b/etc/portage/package.unmask/conf
new file mode 100644
index 0000000..0fa6f04
--- /dev/null
+++ b/etc/portage/package.unmask/conf
@@ -0,0 +1,2 @@
+dev-java/maven-bin
+sys-firmware/*-bin
diff --git a/etc/portage/package.unmask b/etc/portage/package.unmask/zz-autounmask
index 75c4ec9..5bf678c 100644
--- a/etc/portage/package.unmask
+++ b/etc/portage/package.unmask/zz-autounmask
@@ -1,5 +1,3 @@
-dev-java/maven-bin
-sys-firmware/*-bin
# required by sys-apps/nvme-cli-2.5::gentoo
# required by @selected
# required by @world (argument)
@@ -7,3 +5,7 @@ sys-firmware/*-bin
# Sam James <sam@gentoo.org> (2023-08-18)
# Masked for testing.
=sys-libs/zlib-1.3-r1
+# required by sci-mathematics/sage-10.2::sage-on-gentoo[jmol]
+# required by dev-tex/sagetex-3.6.1::sage-on-gentoo
+# /etc/portage/package.mask/conf:
+=sci-chemistry/sage-jmol-bin-14.29.52
diff --git a/root/posodobi.sh b/root/posodobi.sh
index 510bf17..fd52007 100755
--- a/root/posodobi.sh
+++ b/root/posodobi.sh
@@ -1,7 +1,7 @@
#!/bin/bash
if grep "cron" <<<"$@" > /dev/null
then
- ps aux | grep posod[o]bi > /dev/null && exit 0
+ [ `ps aux | grep posod[o]bi | wc -l` -gt 1 ] && { echo posodobi.sh že teče. takole:; ps aux | grep posod[o]bi; exit 0; }
i=`sed s,^./,,g <<<$0`
t=`mktemp -p "" $i.XXX.html`
status=$?