From 9e7486a2dc6b1ffc914dc6d111ee6f7db991a5f0 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Fri, 30 Aug 2024 16:21:46 +0200 Subject: [PATCH 1/8] app-text/wv: Fix gsf-doc-meta-data.patc Thanks-to: Agostino Sarubbo Closes: https://bugs.gentoo.org/936163 Closes: https://bugs.gentoo.org/938551 Signed-off-by: Pacho Ramos --- app-text/wv/files/wv-1.2.9-gsf-doc-meta-data.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-text/wv/files/wv-1.2.9-gsf-doc-meta-data.patch b/app-text/wv/files/wv-1.2.9-gsf-doc-meta-data.patch index 64aa7576224a0..f18f185f62a06 100644 --- a/app-text/wv/files/wv-1.2.9-gsf-doc-meta-data.patch +++ b/app-text/wv/files/wv-1.2.9-gsf-doc-meta-data.patch @@ -1,6 +1,6 @@ Bug: https://bugs.gentoo.org/936163 ---- wvSummary.c -+++ wvSummary.c 2024-08-20 16:14:11.260000000 +0300 +--- a/wvSummary.c ++++ b/wvSummary.c 2024-08-20 16:14:11.260000000 +0300 @@ -33,6 +33,7 @@ #include #include From beb9fff3bebb5f2581c3367e229be93c1261bf28 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Fri, 30 Aug 2024 17:11:13 +0300 Subject: [PATCH 2/8] sys-process/fcron: drop 3.3.1, EAPI7-- Signed-off-by: Arthur Zamarin --- sys-process/fcron/fcron-3.3.1.ebuild | 270 --------------------------- 1 file changed, 270 deletions(-) delete mode 100644 sys-process/fcron/fcron-3.3.1.ebuild diff --git a/sys-process/fcron/fcron-3.3.1.ebuild b/sys-process/fcron/fcron-3.3.1.ebuild deleted file mode 100644 index 88aca353aef98..0000000000000 --- a/sys-process/fcron/fcron-3.3.1.ebuild +++ /dev/null @@ -1,270 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WANT_AUTOMAKE="none" - -inherit autotools cron flag-o-matic pam systemd user-info - -MY_PV="${PV/_beta/}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="A command scheduler with extended capabilities over cron and anacron" -HOMEPAGE="http://fcron.free.fr/" -SRC_URI="http://fcron.free.fr/archives/${MY_P}.src.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" -IUSE="audit debug pam selinux l10n_fr +mta +system-crontab readline" - -DEPEND=" - acct-group/fcron - acct-user/fcron - virtual/libcrypt:= - audit? ( sys-process/audit ) - pam? ( sys-libs/pam ) - readline? ( sys-libs/readline:= ) - selinux? ( sys-libs/libselinux ) -" - -RDEPEND=" - ${DEPEND} - app-misc/editor-wrapper - mta? ( virtual/mta ) - pam? ( sys-auth/pambase ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.1-noreadline.patch - "${FILESDIR}"/${PN}-3.2.1-musl-getopt-order.patch -) - -pkg_setup() { - rootuser=$(egetent passwd 0 | cut -d ':' -f 1) - [[ ${rootuser} ]] || rootuser=root - rootgroup=$(egetent group 0 | cut -d ':' -f 1) - [[ ${rootgroup} ]] || rootgroup=root -} - -src_prepare() { - default - - # respect LDFLAGS - sed "s:\(@LIBS@\):\$(LDFLAGS) \1:" -i Makefile.in || die "sed failed" - - # Adjust fcrontab path - sed -e 's:/etc/fcrontab:/etc/fcron/fcrontab:' -i script/check_system_crontabs.sh || die - - mv configure.in configure.ac || die - - cp "${FILESDIR}"/crontab.2 "${WORKDIR}"/crontab || die - - eautoconf -} - -src_configure() { - # Don't try to pass --with-debug as it'll play with cflags as - # well, and run foreground which is a _very_ nasty idea for - # Gentoo. - use debug && append-cppflags -DDEBUG - - # bindir is used just for calling fcronsighup - local myeconfargs=( - --with-cflags="${CFLAGS}" - --bindir=/usr/libexec - --sbindir=/usr/libexec - $(use_with audit) - $(use_with mta sendmail) - $(use_with pam) - $(use_with readline) - $(use_with selinux) - --sysconfdir=/etc/fcron - --with-username=fcron - --with-groupname=fcron - --with-piddir=/run - --with-spooldir=/var/spool/fcron - --with-fifodir=/run - --with-fcrondyn=yes - --disable-checks - --with-editor=/usr/libexec/editor - --with-shell=/bin/sh - --without-db2man - --without-dsssl-dir - --with-rootname=${rootuser} - --with-rootgroup=${rootgroup} - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - # bug #216460 - sed \ - -e 's:/usr/local/etc/fcron:/etc/fcron/fcron:g' \ - -e 's:/usr/local/etc:/etc:g' \ - -e 's:/usr/local/:/usr/:g' \ - -i doc/*/*/*.{txt,1,5,8,html} \ - || die "unable to fix documentation references" -} - -src_install() { - keepdir /var/spool/fcron - - exeinto /usr/libexec - doexe fcron fcronsighup - - dobin fcrondyn fcrontab - - insinto /etc/fcron - doins files/fcron.{allow,deny,conf} - - if use system-crontab; then - dosym fcrontab /usr/bin/crontab - - exeinto /usr/libexec - newexe script/check_system_crontabs.sh check_system_crontabs - - insinto /etc/fcron - newins "${FILESDIR}"/fcrontab.2 fcrontab - - fowners ${rootuser}:fcron /etc/fcron/fcrontab - fperms 0640 /etc/fcron/fcrontab - - insinto /etc - newins "${FILESDIR}"/crontab.2 crontab - fi - - fowners fcron:fcron \ - /var/spool/fcron \ - /usr/bin/fcron{dyn,tab} - - # fcronsighup needs to be suid root, because it sends a HUP to the - # running fcron daemon, but only has to be called by the fcron group - # anyway - fowners ${rootuser}:fcron \ - /usr/libexec/fcronsighup \ - /etc/fcron/fcron.{allow,deny,conf} \ - /etc/fcron - - fperms 6770 /var/spool/fcron - fperms 6775 /usr/bin/fcron{dyn,tab} - - fperms 4710 /usr/libexec/fcronsighup - - fperms 0750 /etc/fcron - fperms 0640 /etc/fcron/fcron.{allow,deny,conf} - - use pam && pamd_mimic system-services fcron auth account session - cat > "${T}"/fcrontab.pam <<- EOF - # Don't ask for the user's password; fcrontab will only allow to - # change user if running as root. - auth sufficient pam_permit.so - - # Still use the system-auth stack for account and session as the - # sysadmin might have set up stuff properly, and also avoids - # sidestepping limits (since fcrontab will run \$EDITOR). - account include system-auth - session include system-auth - EOF - use pam && newpamd "${T}"/fcrontab.pam fcrontab - - newinitd "${FILESDIR}"/fcron.init-r5 fcron - systemd_newunit "${S}/script/fcron.init.systemd" fcron.service - - newconfd "${FILESDIR}"/fcron.confd fcron - - local DOCS=( MANIFEST VERSION "${WORKDIR}/crontab") - DOCS+=( doc/en/txt/{readme,thanks,faq,todo,relnotes,changes}.txt ) - - local HTML_DOCS=( doc/en/HTML/. ) - - einstalldocs - - newdoc files/fcron.conf fcron.conf.sample - doman doc/en/man/*.{1,5,8} - - for lang in fr; do - use l10n_${lang} || continue - - doman -i18n=${lang} doc/${lang}/man/*.{1,5,8} - - docinto html/${lang} - dodoc -r doc/${lang}/HTML/. - done -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - elog "Make sure you execute" - elog "" - elog " # emerge --config ${CATEGORY}/${PN}" - elog "" - elog "to install the default systab on this system." - else - local v - for v in ${REPLACING_VERSIONS}; do - if ver_test "3.2.1" -gt ${v}; then - # This is an upgrade - - elog "fcron's default systab was updated since your last installation." - elog "You can use" - elog "" - elog " # emerge --config ${CATEGORY}/${PN}" - elog "" - elog "to re-install systab (do not call this command before you" - elog "have merged your configuration files)." - - # Show this elog only once - break - fi - done - fi - - if ! use system-crontab; then - echo "" - ewarn "Remember that fcron will *not* use /etc/cron.d in this configuration" - ewarn "due to USE=-system-crontab!" - echo "" - fi -} - -pkg_config() { - if [[ $(fcrontab -l -u systab 2>/dev/null) ]]; then - eerror "We're not going to make any change to your systab as long as" - eerror "it contains data; please clear it before proceeding." - eerror "You can do that with" - eerror "" - eerror " # fcrontab -u systab -r" - eerror "" - eerror "However you are advised to do this by hand to review existing" - eerror "systab just in case." - return 1 - fi - - if use system-crontab; then - elog "This is going to set up fcron to execute check_system_crontabs." - elog "In this configuration, /etc/crontab and /etc/cron.d are respected." - elog "Per default fcron will check for modifications every 10 minutes." - /usr/libexec/check_system_crontabs -v -i -f - else - elog "This is going to set up fcron to set up a default systab that" - elog "executes /etc/cron.{hourly,daily,weekly,monthly} but will ignore" - elog "/etc/crontab and /etc/cron.d." - fcrontab -u systab - <<- EOF - !serial(true) - 00 * * * * /bin/rm -f /var/spool/cron/lastrun/cron.hourly - 00 00 * * * /bin/rm -f /var/spool/cron/lastrun/cron.daily - 00 00 * * 6 /bin/rm -f /var/spool/cron/lastrun/cron.weekly - 00 00 1 * * /bin/rm -f /var/spool/cron/lastrun/cron.monthly - */10 * * * * /usr/bin/test -x /usr/sbin/run-crons && /usr/sbin/run-crons - !serial(false) - EOF - fi -} From 73482a9645e3ff56a80a469654b39a1cc6611ceb Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Fri, 30 Aug 2024 17:23:31 +0300 Subject: [PATCH 3/8] gui-wm/tinywl: Stabilize 0.18.0 arm64, #938005 Signed-off-by: Arthur Zamarin --- gui-wm/tinywl/tinywl-0.18.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui-wm/tinywl/tinywl-0.18.0.ebuild b/gui-wm/tinywl/tinywl-0.18.0.ebuild index 12057c2b99d39..18001cb2d6604 100644 --- a/gui-wm/tinywl/tinywl-0.18.0.ebuild +++ b/gui-wm/tinywl/tinywl-0.18.0.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${PV}/downloads/wlroots-${PV}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~loong ppc64 ~riscv ~x86" + KEYWORDS="~amd64 arm64 ~loong ppc64 ~riscv ~x86" S="${WORKDIR}/wlroots-${PV}" fi From 7b383a9054e53cbf2b27bbcf4df114506bc37bd6 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Fri, 30 Aug 2024 17:23:32 +0300 Subject: [PATCH 4/8] dev-libs/fddl: Stabilize 20111124-r2 amd64, #938731 Signed-off-by: Arthur Zamarin --- dev-libs/fddl/fddl-20111124-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/fddl/fddl-20111124-r2.ebuild b/dev-libs/fddl/fddl-20111124-r2.ebuild index 97af9c72f804c..7e18c34eddc82 100644 --- a/dev-libs/fddl/fddl-20111124-r2.ebuild +++ b/dev-libs/fddl/fddl-20111124-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" DOCS=( AUTHORS ChangeLog INSTALL RELEASE ) From 74b4d34aa44a875f2ed9f04ab604ec03aab96ff0 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Fri, 30 Aug 2024 17:23:32 +0300 Subject: [PATCH 5/8] app-misc/cmatrix: Stabilize 2.0-r5 x86, #938732 Signed-off-by: Arthur Zamarin --- app-misc/cmatrix/cmatrix-2.0-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/cmatrix/cmatrix-2.0-r5.ebuild b/app-misc/cmatrix/cmatrix-2.0-r5.ebuild index 3d7f701bb30ad..12d75a6bf6b45 100644 --- a/app-misc/cmatrix/cmatrix-2.0-r5.ebuild +++ b/app-misc/cmatrix/cmatrix-2.0-r5.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/abishekvashok/${PN}/archive/v${PV}.tar.gz -> ${P}.ta LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86" IUSE="+unicode" DEPEND="sys-libs/ncurses:=[unicode(+)?]" From 1a8c5ce6536f57341b07304f333de437c5cfdca6 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Fri, 30 Aug 2024 17:23:33 +0300 Subject: [PATCH 6/8] media-libs/vigra: Stabilize 1.11.2_p20240505 arm64, #938737 Signed-off-by: Arthur Zamarin --- media-libs/vigra/vigra-1.11.2_p20240505.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/vigra/vigra-1.11.2_p20240505.ebuild b/media-libs/vigra/vigra-1.11.2_p20240505.ebuild index 09cc7b4ffdc8d..ce1ebe1ad5388 100644 --- a/media-libs/vigra/vigra-1.11.2_p20240505.ebuild +++ b/media-libs/vigra/vigra-1.11.2_p20240505.ebuild @@ -23,7 +23,7 @@ else SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz" fi - KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" + KEYWORDS="~amd64 arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" fi LICENSE="MIT" From dd81af6ead1e36f6404ffb98c99f42b285ce712d Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Fri, 30 Aug 2024 16:22:38 +0200 Subject: [PATCH 7/8] sci-misc/jupyterlab-desktop-bin: add 4.2.5.1 Signed-off-by: Andrew Ammerlaan --- sci-misc/jupyterlab-desktop-bin/Manifest | 1 + .../jupyterlab-desktop-bin-4.2.5.1.ebuild | 110 ++++++++++++++++++ 2 files changed, 111 insertions(+) create mode 100644 sci-misc/jupyterlab-desktop-bin/jupyterlab-desktop-bin-4.2.5.1.ebuild diff --git a/sci-misc/jupyterlab-desktop-bin/Manifest b/sci-misc/jupyterlab-desktop-bin/Manifest index 9cf095be00dd3..9f5e9ac7de4c9 100644 --- a/sci-misc/jupyterlab-desktop-bin/Manifest +++ b/sci-misc/jupyterlab-desktop-bin/Manifest @@ -1,2 +1,3 @@ DIST jupyterlab-desktop-bin-4.1.8.1.rpm 332883125 BLAKE2B e0d46f6eb1718b5f2e2b00b1ac934bfa3bab12b2d5e9c0cafd2874a67cc1fc8a1aabc5ac9d5d3ac4abf53b262a8e5cdc8d27ef4c2cdc30a069420f2227dffed2 SHA512 9a6fa8729c4cab9df7643bbc1c2094e438ff9136b7c2f5897a5e0603ad8740e3ed46b6fe7a01885c063d0df6310dca8fe4aadb45da76c1543841b9eb7d70080d DIST jupyterlab-desktop-bin-4.2.1.1.rpm 333190569 BLAKE2B 838b26ab78aaa42b48877b88f19b80617c2f9dc690c4133ec0797422207f8225264d5d891a9b7d65048449e1b27328503934f690cddef966c9a2e0a659c18ca6 SHA512 82f0f096cffd8ae2f154c03d92ea90ba1e60028b3b1a560337281399639eee78945e37ac158a1e661baeef100c250b089c513949190ab0413bd4aa4276d84f65 +DIST jupyterlab-desktop-bin-4.2.5.1.rpm 336515433 BLAKE2B 7173a3179b848471540070b172f5b196e7a0192bc3dd60d9ba20b129ce1276ac4707c6f37a2371707fdce1c2a4ed8943006e9e08b1464717f0d696ad5e11843d SHA512 62669c48a632441075bdf96796866e4a64601ad06f4e9fc85b52e3956aa6ce85dd7f52816cc3c9c4466eeff7759c92721dbabf274dc6001785cb71cb84e2ed9f diff --git a/sci-misc/jupyterlab-desktop-bin/jupyterlab-desktop-bin-4.2.5.1.ebuild b/sci-misc/jupyterlab-desktop-bin/jupyterlab-desktop-bin-4.2.5.1.ebuild new file mode 100644 index 0000000000000..ca5796ef53de3 --- /dev/null +++ b/sci-misc/jupyterlab-desktop-bin/jupyterlab-desktop-bin-4.2.5.1.ebuild @@ -0,0 +1,110 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CHROMIUM_LANGS=" + af am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi + hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv + sw ta te th tr uk ur vi zh-CN zh-TW +" + +inherit chromium-2 desktop rpm xdg + +DESCRIPTION="JupyterLab desktop application, based on Electron" +HOMEPAGE="https://jupyter.org/" +SRC_URI="https://github.com/jupyterlab/${PN%%-bin}/releases/download/v$(ver_rs 3 -)/JupyterLab-Setup-Fedora-x64.rpm -> ${P}.rpm" +S="${WORKDIR}" + +# Electron bundles a bunch of things +LICENSE=" + MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2 + unRAR OFL-1.1 CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved +" +SLOT="0" +KEYWORDS="-* ~amd64" +RESTRICT="bindist mirror" + +RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0:2 + dev-libs/expat + dev-libs/glib + dev-libs/nspr + dev-libs/nss + >=dev-python/jupyterlab-$(ver_cut 1-3) + media-libs/alsa-lib + media-libs/mesa + net-print/cups + sys-apps/dbus + sys-libs/glibc + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:3 + x11-libs/libdrm + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libxkbcommon + x11-libs/libXrandr + x11-libs/libxshmfence + x11-libs/pango +" + +QA_PREBUILT="opt/JupyterLab/*" + +pkg_pretend() { + chromium_suid_sandbox_check_kernel_config +} + +src_prepare() { + default + # cleanup languages + pushd "opt/JupyterLab/locales" || die + chromium_remove_language_paks + popd || die +} + +src_configure() { + chromium_suid_sandbox_check_kernel_config + default +} + +src_install() { + local size=512 + doicon -s ${size} "usr/share/icons/hicolor/${size}x${size}/apps/jupyterlab-desktop.png" + + domenu usr/share/applications/jupyterlab-desktop.desktop + + local DESTDIR="/opt/JupyterLab" + pushd "opt/JupyterLab" || die + + exeinto "${DESTDIR}" + doexe chrome-sandbox chrome_crashpad_handler jupyterlab-desktop *.so* + + insinto "${DESTDIR}" + doins *.pak *.bin *.json *.dat + insopts -m0755 + doins -r locales resources + + # Chrome-sandbox requires the setuid bit to be specifically set. + # see https://github.com/electron/electron/issues/17972 + fperms 4755 "${DESTDIR}"/chrome-sandbox + + dosym "${DESTDIR}"/jupyterlab-desktop /opt/bin/jupyterlab-desktop + popd || die +} + +pkg_postinst() { + xdg_pkg_postinst + elog "" + elog "On initial startup you will be prompted to select the python environment of" + elog "your choice. Either select a specific python version, e.g. /usr/bin/pythonX.Y," + elog "or choose /usr/bin/python to follow the system wide setting in" + elog "/etc/python-exec/python-exec.conf." + elog "Please note that only python environments corresponding to the enabled" + elog "PYTHON_TARGETS on dev-python/jupyterlab will work." + elog "" +} From 29abc87f010fa79784ebe6cf4a3e0792c83f519c Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Fri, 30 Aug 2024 17:28:59 +0300 Subject: [PATCH 8/8] media-libs/vigra: Stabilize 1.11.2_p20240505 amd64, #938737 Signed-off-by: Arthur Zamarin --- media-libs/vigra/vigra-1.11.2_p20240505.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/vigra/vigra-1.11.2_p20240505.ebuild b/media-libs/vigra/vigra-1.11.2_p20240505.ebuild index ce1ebe1ad5388..2bb45ea5ab6f7 100644 --- a/media-libs/vigra/vigra-1.11.2_p20240505.ebuild +++ b/media-libs/vigra/vigra-1.11.2_p20240505.ebuild @@ -23,7 +23,7 @@ else SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz" fi - KEYWORDS="~amd64 arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" + KEYWORDS="amd64 arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" fi LICENSE="MIT"