AOSC-Dev · MingcongBai · Dec 26, 2024 · Dec 26, 2024 · Dec 26, 2024 · Dec 26, 2024
diff --git a/app-admin/apparmor/autobuild/prepare b/app-admin/apparmor/autobuild/prepare
@@ -1,10 +1,12 @@
 # Ref: https://gitlab.com/apparmor/apparmor/issues/39
 abinfo "Fixing python discovery for AppArmor profiles..."
-local python_version=$(python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))')
-local path="${PWD}/libraries/libapparmor/swig/python/build/lib.linux-${CARCH}-${python_version}/"
-local libs="${PWD}/libraries/libapparmor/src/.libs"
+export python_version=$(python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))')
+export path="${PWD}/libraries/libapparmor/swig/python/build/lib.linux-${CARCH}-${python_version}/"
+export libs="${PWD}/libraries/libapparmor/src/.libs"
+# FIXME: sed is bad - I know, but this command is generated.
 sed -e "/PYTHONPATH/ s|utils\ |utils:$path\ LD_LIBRARY_PATH=$libs\ |" \
     -i profiles/Makefile
+
 (
 	cd libraries/libapparmor/
 	autoreconf -fiv

diff --git a/app-admin/apparmor/spec b/app-admin/apparmor/spec
@@ -1,5 +1,5 @@
 VER=3.0.8
-REL=2
+REL=3
 SRCS="tbl::https://gitlab.com/apparmor/apparmor/-/archive/v$VER/apparmor-v$VER.tar.gz"
 CHKSUMS="sha256::d68dae9fb7b8b54fa2f9b421e3f11e78233a132ec37bc006ba2ada438b3995ac"
 CHKUPDATE="anitya::id=94819"
diff --git a/app-admin/hivex/spec b/app-admin/hivex/spec
@@ -1,5 +1,4 @@
-VER=1.3.23
+VER=1.3.24
 SRCS="tbl::http://download.libguestfs.org/hivex/hivex-$VER.tar.gz"
-CHKSUMS="sha256::40cf5484f15c94672259fb3b99a90bef6f390e63f37a52a1c06808a2016a6bbd"
+CHKSUMS="sha256::a52fa45cecc9a78adb2d28605d68261e4f1fd4514a778a5473013d2ccc8a193c"
 CHKUPDATE="anitya::id=226764"
-REL=2
diff --git a/app-doc/asciidoctor/spec b/app-doc/asciidoctor/spec
@@ -2,3 +2,4 @@ VER=2.0.23
 SRCS="tbl::https://rubygems.org/downloads/asciidoctor-$VER.gem"
 CHKSUMS="sha256::52208807f237dfa0ca29882f8b13d60b820496116ad191cf197ca56f2b7fddf3"
 CHKUPDATE="anitya::id=4258"
+REL=1
diff --git a/app-doc/graphviz/spec b/app-doc/graphviz/spec
@@ -1,4 +1,4 @@
-VER=12.0.0
+VER=12.2.1
 SRCS="git::commit=tags/$VER::https://gitlab.com/graphviz/graphviz"
 CHKSUMS="SKIP"
 CHKUPDATE="anitya::id=1249"
diff --git a/app-doc/maruku/spec b/app-doc/maruku/spec
@@ -1,5 +1,5 @@
 VER=0.7.3
-REL=5
+REL=6
 SRCS="tbl::https://rubygems.org/downloads/maruku-$VER.gem"
 CHKSUMS="sha256::dd14156f57b5433993710adca63b766d18b36f6e35cb25c21b178a6edfedebe4"
 CHKUPDATE="anitya::id=4347"

diff --git a/app-doc/texlive/spec b/app-doc/texlive/spec
@@ -1,5 +1,5 @@
 VER=20240312
-REL=1
+REL=2
 SRCS="tbl::ftp://tug.org/texlive/historic/${VER:0:4}/texlive-$VER-source.tar.xz \
       file::rename=texlive-$VER-texmf.tar.xz::ftp://tug.org/texlive/historic/${VER:0:4}/texlive-$VER-texmf.tar.xz"
 CHKSUMS="sha256::7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96 \

diff --git a/app-doc/yard/spec b/app-doc/yard/spec
@@ -1,6 +1,5 @@
-VER=0.9.26
+VER=0.9.37
 SRCS="tbl::https://rubygems.org/downloads/yard-$VER.gem"
-CHKSUMS="sha256::30594aa05cf737aa725c73444c7be3d54a443d0e258e1503da4eb1a0822cf963"
+CHKSUMS="sha256::a6e910399e78e613f80ba9add9ba7c394b1a935f083cccbef82903a3d2a26992"
 CHKUPDATE="anitya::id=4675"
 SUBDIR=.
-REL=1
diff --git a/app-editors/vim/spec b/app-editors/vim/spec
@@ -1,4 +1,4 @@
-VER=9.1.0958
+VER=9.1.0961
 SRCS="git::commit=tags/v$VER::https://github.com/vim/vim.git"
 CHKSUMS="SKIP"
 CHKUPDATE="anitya::id=5092"
diff --git a/app-penetration/john/autobuild/build b/app-penetration/john/autobuild/build
diff --git a/app-penetration/john/autobuild/defines b/app-penetration/john/autobuild/defines
diff --git a/app-penetration/john/autobuild/prepare b/app-penetration/john/autobuild/prepare
diff --git a/app-penetration/john/spec b/app-penetration/john/spec
diff --git a/app-utils/dislocker/autobuild/beyond b/app-utils/dislocker/autobuild/beyond
@@ -0,0 +1,4 @@
+if [ -d "$PKGDIR"/usr/lib64 ]; then
+    abinfo "Moving /usr/lib64 => /usr/lib ..."
+    mv -vv "$PKGDIR"/usr/lib{64,}
+fi
diff --git a/app-utils/dislocker/spec b/app-utils/dislocker/spec
@@ -2,3 +2,4 @@ VER=0.7.3
 SRCS="git::commit=tags/v$VER::https://github.com/Aorimn/dislocker"
 CHKSUMS="SKIP"
 CHKUPDATE="anitya::id=88823"
+REL=1
diff --git a/app-utils/teamocil/spec b/app-utils/teamocil/spec
@@ -1,5 +1,5 @@
 VER=1.4.2
-REL=3
+REL=4
 SRCS="tbl::https://rubygems.org/downloads/teamocil-$VER.gem"
 CHKSUMS="sha256::221bf0b600e0a277c98befbecea8a454ee87dbd1c7e8767a2f64dda8dc18aed0"
 SUBDIR=.

diff --git a/app-web/elinks/spec b/app-web/elinks/spec
@@ -1,4 +1,4 @@
-VER=0.17.0
+VER=0.17.1.1
 SRCS="git::commit=tags/v$VER::https://github.com/rkd77/elinks"
 CHKSUMS="SKIP"
 CHKUPDATE="anitya::id=672"
diff --git a/app-web/notmuch/autobuild/beyond b/app-web/notmuch/autobuild/beyond
@@ -11,28 +11,28 @@ make install \
     exec_prefix="$PKGDIR"/usr \
     prefix=/usr
 
-(
-    cd "$SRCDIR"/bindings/python
+cd "$SRCDIR"/bindings/python
 
-    abinfo "Building Python 2 bindings ..."
-    python2 setup.py build
+abinfo "Building Python 2 bindings ..."
+python2 setup.py build
 
-    abinfo "Installing Python 2 bindings ..."
-    python2 setup.py install \
-        --prefix=/usr \
-        --root="$PKGDIR"
+abinfo "Installing Python 2 bindings ..."
+python2 setup.py install \
+    --prefix=/usr \
+    --root="$PKGDIR"
 
-    abinfo "Cleaning up and preparing to build Python 3 bindings ..."
-    python2 setup.py clean
+abinfo "Cleaning up and preparing to build Python 3 bindings ..."
+python2 setup.py clean
 
-    abinfo "Building Python 3 bindings ..."
-    python3 setup.py build
+abinfo "Building Python 3 bindings ..."
+python3 setup.py build
 
-    abinfo "Installing Python 3 bindings ..."
-    python3 setup.py install \
-        --prefix=/usr \
-        --root="$PKGDIR"
-)
+abinfo "Installing Python 3 bindings ..."
+python3 setup.py install \
+    --prefix=/usr \
+    --root="$PKGDIR"
+
+cd "$SRCDIR"
 
 abinfo "Installing man pages and Emacs plugins ..."
 make install-man install-emacs \

diff --git a/app-web/notmuch/autobuild/build b/app-web/notmuch/autobuild/build
@@ -0,0 +1,14 @@
+# Note: This is not a real Autotools source tree.
+abinfo "Configuring notmuch ..."
+"$SRCDIR"/configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --includedir=/usr/include \
+    --without-zsh-completion
+
+abinfo "Building notmuch ..."
+make
+
+abinfo "Installing notmuch ..."
+make install \
+    DESTDIR="$PKGDIR"
diff --git a/app-web/notmuch/autobuild/defines b/app-web/notmuch/autobuild/defines
@@ -3,10 +3,3 @@ PKGSEC=net
 PKGDEP="gmime-3 gnupg talloc xapian-core"
 BUILDDEP="emacs sphinx ruby"
 PKGDES="Notmuch is not much of an email programme"
-
-AUTOTOOLS_STRICT=0
-AUTOTOOLS_AFTER="--prefix=/usr --sysconfdir=/etc \
-                 --includedir=/usr/include --without-zsh-completion"
-MAKE_AFTER="prefix=/usr"
-ABSHADOW=0
-RECONF=0
diff --git a/app-web/notmuch/autobuild/prepare b/app-web/notmuch/autobuild/prepare
diff --git a/app-web/notmuch/spec b/app-web/notmuch/spec
@@ -1,5 +1,4 @@
-VER=0.34
+VER=0.38.3
 SRCS="tbl::https://notmuchmail.org/releases/notmuch-$VER.tar.xz"
-CHKSUMS="sha256::83e9581542b6e387f61f30cf0f5e2d9038912ee1bb73ad64b84d1d9c543761b6"
+CHKSUMS="sha256::9af46cc80da58b4301ca2baefcc25a40d112d0315507e632c0f3f0f08328d054"
 CHKUPDATE="anitya::id=2498"
-REL=1
diff --git a/app-web/weechat/autobuild/defines b/app-web/weechat/autobuild/defines
@@ -2,23 +2,15 @@ PKGNAME=weechat
 PKGSEC=net
 PKGDEP="gnutls curl libgcrypt cjson"
 BUILDDEP="asciidoctor source-highlight cmake pkg-config perl python-3 lua tcl \
-          aspell guile php7 zstd"
+          aspell guile php7 zstd ruby"
 PKGDES="A fast, light and extensible chat client"
 
 ABTYPE=cmakeninja
 
-# FIXME: Disabling Ruby plugin due to SIGSEGV when building WeeChat on
-# loongson3, loongarch64, arm64, and SIGABRT during runtime on other
-# architectures.
 CMAKE_AFTER="-DENABLE_PYTHON=ON \
              -DENABLE_MAN=ON \
              -DENABLE_DOC=ON \
              -DENABLE_TESTS=OFF \
              -DENABLE_JAVASCRIPT=OFF \
-             -DENABLE_RUBY=OFF \
-             -DENABLE_DOC_INCOMPLETE=ON \
+             -DENABLE_RUBY=ON \
              -DCA_FILE=/etc/ssl/ca-bundle.crt"
-# FIXME: Similar to the above issue, asciidoctor causes FTBFS with illegal
-# instruction on riscv64
-CMAKE_AFTER__RISCV64="${CMAKE_AFTER} \
-                      -DENABLE_DOC=OFF"
diff --git a/app-web/weechat/spec b/app-web/weechat/spec
@@ -1,4 +1,5 @@
 VER=4.5.1
+REL=1
 SRCS="tbl::https://weechat.org/files/src/weechat-$VER.tar.xz"
 CHKSUMS="sha256::67c143c7bc70e689b9ea86df674c9a9ff3cf44ccc9cdff21be6a561d5eafc528"
 CHKUPDATE="anitya::id=5122"
diff --git a/desktop-trinity/amarok-trinity/spec b/desktop-trinity/amarok-trinity/spec
@@ -2,4 +2,4 @@ VER=14.1.2
 SRCS="tbl::https://mirror.ppa.trinitydesktop.org/trinity/releases/R$VER/main/applications/multimedia/amarok-trinity-$VER.tar.xz"
 CHKSUMS="sha256::04ed8a9ab69d61ecdd4f621ea18f8e0c95abad689fc7f74f107da222cdd25093"
 CHKUPDATE="anitya::id=16065"
-REL=1
+REL=2
diff --git a/desktop-trinity/koffice-trinity/spec b/desktop-trinity/koffice-trinity/spec
@@ -5,3 +5,4 @@ CHKSUMS="sha256::06aa9488747a3c92a68d6a057b9bd238251465b21afc74c3c0d3faad85f58fe
          sha256::0e3d99fee00cdf3c257166dacc5c8679ad7418c8e8f22d6d71f4a5e67014387e"
 CHKUPDATE="anitya::id=16065"
 SUBDIR="koffice-trinity-$VER"
+REL=1
diff --git a/desktop-trinity/tdebindings/spec b/desktop-trinity/tdebindings/spec
@@ -2,3 +2,4 @@ VER=14.1.2
 SRCS="tbl::https://mirror.ppa.trinitydesktop.org/trinity/releases/R$VER/main/core/tdebindings-trinity-$VER.tar.xz"
 CHKSUMS="sha256::132c13f67b274756f3eb9361f47dbbc65fb6b69dcaf001a0979963b17bb0fec3"
 CHKUPDATE="anitya::id=16065"
+REL=1
diff --git a/groups/ruby-rebuilds b/groups/ruby-rebuilds
@@ -1,31 +1,39 @@
-desktop-trinity/amarok-trinity
 app-admin/apparmor
-app-doc/asciidoctor
 app-admin/hivex
-lang-ruby/hpricot
-lang-ruby/kramdown
-runtime-virtualization/libguestfs
+app-doc/asciidoctor
+app-doc/graphviz
 app-doc/maruku
+app-doc/texlive
+app-doc/yard
+app-editors/vim
+app-utils/dislocker
+app-utils/teamocil
+app-web/elinks
+app-web/notmuch
+desktop-trinity/amarok-trinity
+desktop-trinity/koffice-trinity
+desktop-trinity/tdebindings
+lang-ruby/kramdown
+lang-ruby/kramdown-parser-gfm
 lang-ruby/mini-portile
-runtime-multimedia/mlt
 lang-ruby/mustache
 lang-ruby/nokogiri
-app-web/notmuch
 lang-ruby/racc
-lang-ruby/rb-inotify
 lang-ruby/rdiscount
+lang-ruby/rexml
 lang-ruby/ronn
 lang-ruby/ronn-ng
-lang-ruby/ruby-pkg-config
+lang-ruby/ruby-bundler
 lang-ruby/ruby-ffi
-lang-ruby/ruby-gettext
 lang-ruby/ruby-locale
+lang-ruby/ruby-manpages
 lang-ruby/ruby-native-package-installer
-lang-ruby/ruby-bundler
+lang-ruby/ruby-optimist
+lang-ruby/ruby-paint
 lang-ruby/ruby-pg
+lang-ruby/ruby-pkg-config
+lang-ruby/ruby-rainbow
+lang-ruby/ruby-term-ansicolor
 lang-ruby/ruby-text
-app-devel/sass
-lang-ruby/sass-listen
-desktop-trinity/tdebindings
-app-utils/teamocil
-app-doc/yard
+runtime-electronics/libsigrok
+runtime-virtualization/libguestfs
diff --git a/lang-ruby/hpricot/autobuild/defines b/lang-ruby/hpricot/autobuild/defines
diff --git a/lang-ruby/hpricot/spec b/lang-ruby/hpricot/spec
diff --git a/lang-ruby/kramdown-parser-gfm/spec b/lang-ruby/kramdown-parser-gfm/spec
@@ -3,3 +3,4 @@ SRCS="tbl::https://rubygems.org/downloads/kramdown-parser-gfm-$VER.gem"
 CHKSUMS="sha256::fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729"
 CHKUPDATE="anitya::id=372492"
 SUBDIR="."
+REL=1
diff --git a/lang-ruby/kramdown/spec b/lang-ruby/kramdown/spec
@@ -1,5 +1,5 @@
-VER=2.4.0
+VER=2.5.1
 SRCS="tbl::https://rubygems.org/downloads/kramdown-$VER.gem"
-CHKSUMS="sha256::b62e5bcbd6ea20c7a6730ebbb2a107237856e14f29cebf5b10c876cc1a2481c5"
+CHKSUMS="sha256::87bbb6abd9d3cebe4fc1f33e367c392b4500e6f8fa19dd61c0972cf4afe7368c"
 CHKUPDATE="anitya::id=4451"
 SUBDIR="."
diff --git a/lang-ruby/mini-portile/spec b/lang-ruby/mini-portile/spec
@@ -1,5 +1,5 @@
-VER=2.8.6
+VER=2.8.8
 SRCS="tbl::https://rubygems.org/downloads/mini_portile2-$VER.gem"
-CHKSUMS="sha256::4e2ab09b924906fd42c0b6eb72816db6a435d0404e9cbdcc5d722c133b493991"
+CHKSUMS="sha256::8e47136cdac04ce81750bb6c09733b37895bf06962554e4b4056d78168d70a75"
 CHKUPDATE="anitya::id=78935"
 SUBDIR="."
diff --git a/lang-ruby/mustache/spec b/lang-ruby/mustache/spec
@@ -3,4 +3,4 @@ SRCS="tbl::https://rubygems.org/downloads/mustache-$VER.gem"
 CHKSUMS="sha256::90891fdd50b53919ca334c8c1031eada1215e78d226d5795e523d6123a2717d0"
 SUBDIR=.
 CHKUPDATE="anitya::id=4669"
-REL=1
+REL=2
diff --git a/lang-ruby/nokogiri/spec b/lang-ruby/nokogiri/spec
@@ -1,5 +1,5 @@
-VER=1.16.7
+VER=1.18.0
 SRCS="tbl::https://rubygems.org/downloads/nokogiri-$VER.gem"
-CHKSUMS="sha256::f819cbfdfb0a7b19c9c52c6f2ca63df0e58a6125f4f139707b586b9511d7fe95"
+CHKSUMS="sha256::119dea343386d88849f44dd8c36fb1cc36f4a4fe42cf4d60f26f4bac18b3a709"
 CHKUPDATE="anitya::id=4641"
 SUBDIR="."
diff --git a/lang-ruby/racc/spec b/lang-ruby/racc/spec
@@ -3,4 +3,4 @@ SRCS="tbl::https://rubygems.org/downloads/racc-$VER.gem"
 CHKSUMS="sha256::2dede3b136eeabd0f7b8c9356b958b3d743c00158e2615acab431af141354551"
 CHKUPDATE="anitya::9140"
 SUBDIR="."
-REL=1
+REL=2
diff --git a/lang-ruby/rdiscount/spec b/lang-ruby/rdiscount/spec
@@ -1,6 +1,5 @@
-VER=2.2.0.2
+VER=2.2.7.3
 SRCS="tbl::https://rubygems.org/downloads/rdiscount-$VER.gem"
-CHKSUMS="sha256::ef886926dd97d5b4ff37c80f8ba27a780d951629465303bd53d47a941972599b"
+CHKSUMS="sha256::8a4844f930916fc7215dc369932626be85f2da13cdf48185b836055b63126113"
 SUBDIR=.
 CHKUPDATE="anitya::id=4369"
-REL=1