From 4551b41523452c0d743a71cca34e4dca2ca7538c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 4 Jan 2023 12:06:28 +0000 Subject: gentoo auto-resync : 04:01:2023 - 12:06:28 --- sys-apps/Manifest.gz | Bin 48744 -> 48921 bytes sys-apps/baselayout/Manifest | 2 +- sys-apps/baselayout/baselayout-9999.ebuild | 4 +- sys-apps/etckeeper/Manifest | 3 + sys-apps/etckeeper/etckeeper-1.18.19.ebuild | 104 ++++++++++ .../files/etckeeper-1.18.19-backticks-EOF.patch | 37 ++++ sys-apps/kmod/Manifest | 2 + .../kmod/files/kmod-30-configure-clang16.patch | 26 +++ sys-apps/kmod/kmod-30-r1.ebuild | 212 +++++++++++++++++++++ sys-apps/moar/Manifest | 4 + sys-apps/moar/metadata.xml | 11 ++ sys-apps/moar/moar-1.11.3-r1.ebuild | 33 ++++ sys-apps/most/Manifest | 2 + sys-apps/most/most-5.2.0.ebuild | 37 ++++ 14 files changed, 473 insertions(+), 4 deletions(-) create mode 100644 sys-apps/etckeeper/etckeeper-1.18.19.ebuild create mode 100644 sys-apps/etckeeper/files/etckeeper-1.18.19-backticks-EOF.patch create mode 100644 sys-apps/kmod/files/kmod-30-configure-clang16.patch create mode 100644 sys-apps/kmod/kmod-30-r1.ebuild create mode 100644 sys-apps/moar/Manifest create mode 100644 sys-apps/moar/metadata.xml create mode 100644 sys-apps/moar/moar-1.11.3-r1.ebuild create mode 100644 sys-apps/most/most-5.2.0.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index ce67426c90df..51560604dca4 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 05f2f294c8bd..6b60e2a864d9 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,4 +1,4 @@ DIST baselayout-2.9.tar.bz2 30200 BLAKE2B 3a997e847e853a5bcdce7eb06d50fda4727a6c408ca614bdc8dd576bfc9296d3c625c4e8791dbdb078dd5088f818e5ee98eea5d14d737f465ed225554da26180 SHA512 c07726141446c9d9202bac19642baf819b28a838814e1dd3c200d1768af64a913bd9188923029e0b0edf7e420d5aad7bdde278d6c24c4f40029fddbad28d8e02 EBUILD baselayout-2.9.ebuild 11818 BLAKE2B f60a5ccef7e0e77177dc2ad7e15048e3c83bf94981f7274264c0a9d18d2ac0a102456f2c06116a6e3f39bc01a3275d702c3bf7df64a3f81ee34ef744787da321 SHA512 2b07ce978ad790e0f97021af002731015f40291f8b881c08586c856011ebde4b0e4941d7fb557ba413e3c422023412f441803e5ce8860a39e27c7193b1f69537 -EBUILD baselayout-9999.ebuild 11826 BLAKE2B 0d606ac53b5028a2189d2b943b497990da280279aa38bdd65404c9a4c497c7dcb808fd4e9a6f058ed3edd217a24a9b81709142bfdb3398f4252acb5ae694d998 SHA512 b457cbcbdb2f4f276337b1f5da9099d40e3c4ab065e06d18f4a5cbf8b29920d7228df96d0f43c7b0ff82f0cc2c7b161543a808ba8787a6a61e02f8bbd7628896 +EBUILD baselayout-9999.ebuild 11751 BLAKE2B 2eed3b60f9c88b2d58abb07bceb5347863f80a834f5a0bd1d5ae157cc54ab2d9f99391fcc6eebe104757fab6d369e1d05bfed41a9c728b9967acc71b332ed4a6 SHA512 0422e7a70492ecea637d874e5a9dd38235112d5f20924466341295f5dba9efc3f72d88260c464a17ba0c1aeef94cb601064fb538894888d684de19483aa219f5 MISC metadata.xml 383 BLAKE2B 58d0d7a9d2b0e355ca13061b798db482b1894cb805e4c7f70d9b64f301f34aa784ec56783cb670e3c35a69ad383feb3c29d0b8f8164e5e05e24908127759a4aa SHA512 49775deed8635ddd8492a86887c85043e2a16ec46508c08c9eb669eee0aa29db1974c20a338fa09703bfc73fbff29c56d043b2749c0e7046347eb8186da59193 diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild index b7fc36bdb833..35af87850d7c 100644 --- a/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sys-apps/baselayout/baselayout-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -164,7 +164,6 @@ multilib_layout() { # only symlinked the lib dir on systems where we moved it # to "lib32" ... case ${CHOST} in - *-gentoo-freebsd*) ;; # We want it the other way on fbsd. i?86*|x86_64*|powerpc*|sparc*|s390*) if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then rm -f "${prefix}lib32"/.keep || die @@ -257,7 +256,6 @@ src_prepare() { src_install() { emake \ - OS=Linux \ DESTDIR="${ED}" \ install diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest index 054d87682610..de63e73ce4a2 100644 --- a/sys-apps/etckeeper/Manifest +++ b/sys-apps/etckeeper/Manifest @@ -1,8 +1,11 @@ AUX 99etckeeper 60 BLAKE2B 65268cf8095ebe7e59f4986e44f5a4170bc66f70cbeb6ffc2b1ff4bc9dc89665c0747ca62de89ab604d394663615fd2f0b20e9a219439d0159ecf5a38dcee51f SHA512 b2c49d5a1fe2fb8e59d6b4d85b6e2176a8bf8486cb120698050c84e067c3ec47cbd681a7b1fd1739730380f95e9c7c9092462e1f8e4bb6b9c9986b03da83443f AUX bashrc-r1 114 BLAKE2B 9988db1b04fe28ed01d5303a524387d5ebac81568f20b3fc3f74fb5cc3d42a2b5365be292a3b674945e69cd1f4db2a63a362f6aa7fdec0f3a6cbb9187d40d143 SHA512 2c3e068413dec16e14b196a1c3eb945af5cbc0be99c9705dce18a7c6d3f70d625aedd2799cad085236923bbeaeafa0edbf7a1f97736ca548b4269257ffbeb01c AUX etckeeper-1.18.18-gentoo.patch 2413 BLAKE2B 91bbb0196c3038a62cfaed56aee7f8c7a4e4853cdb283a5541e60634882fa6e252aaca629d0588284638f15d36ee520bed2b73c375d7dfcbb683662833c2d8a4 SHA512 34ef7d24e738ea0bb49f97d88045e2963283577cfc1f807a41825ca97ee92cc915ed9b96a258bf2d44f8882472e920087ce0670cc82a0a86b78c314268b9895f +AUX etckeeper-1.18.19-backticks-EOF.patch 1477 BLAKE2B 24e0fbdc4331959c5d5aaa9d04a4c8928fcd866b4bff3b1d1f212db53cadcf7ad149aec66a115a190e0187317a194eb28c05357724adb804b7161188ef307d9d SHA512 58ff5135f22e2500b2110197f15d4b64148208a693a53c07c792ec6d63cdd2fd95219680cf542739d0e89aece7bb36f91a1b6b31f8f5e0baeb32735ed9b9ddc0 AUX etckeeper-conf-update-hook 787 BLAKE2B 39f981c9292559b61a48b23ed18055a668731e47d69efbac4838d88f0fdd44c34912b3c17b51d59c967af4e70fbacab9fc56b76467d693440752b15be05a43be SHA512 7b8a81520166be48235519368ae803125e1f3b20b8e2a27d4095db779135387818e63aed987f89282b809e90f3a50a91c0cb738561ea5a8501afcdb8baec3ed6 AUX etckeeper.tmpfilesd 40 BLAKE2B 870679a3ef88348765025038a64480002c014ecad6e6b6f3db09935716a75cd9c315c13857db81e305e65c47da70ad3367dbf0f0a43dbe88c376ca659697497d SHA512 057871c3c0e416dd52a9879a3dba96347359d98ee884098f55351920c5275e4bfe984f68e13662e4e06f876a8c7cb2d4f0dc1f204e3bcdd74601c1e420861280 DIST etckeeper-1.18.18.tar.gz 101845 BLAKE2B 2072b54db4023211e85fcbed82bd93412eb02707d5447b297bf98e65f1d534e02e790612d9771ae433a07aa6a462dd9b5c5528207d2bcfd4059232417e3186e1 SHA512 57b2f7297c0b71e3d39a7838dd3e6599bb3f1275d86200be9d7986f46f0392aa0ba130cb38ba7a5757fcb5d6fa33b4d32233237dba15e8ce9fb8c52565cf251b +DIST etckeeper-1.18.19.tar.gz 110687 BLAKE2B fe0b1a7cc108b81e15d03fad6f2e10538a4ff991fcbac132bd18930501ea3681786f5e20a942b32c621b6a595bb61d2dc99e33ef4f040e2958a6d8cafa7e4763 SHA512 8b4776f04c98996f0dd1c68694d026cc61e8b8c3b1163a18b98bce37eea95a4676c31bde172996b392fa48e160515a61ddd466798d9e70f4b3dd56615046df16 EBUILD etckeeper-1.18.18.ebuild 2229 BLAKE2B 893d9dd8e5396b7c2e09c257e5a76336de8137fdd48e163d1dec4c3e4e0476c1d8cb18a31eb442bd4367db8066ab401c46359dc8a345f68847dddca7ea66f4a8 SHA512 a0e84e59fb262669829960f02b6ea1d3172a9a5d515900f2328eef73851cd5d8c675f264ba4d82a31a688444c7a6fb11576d570a7fb4c74149be8ec57a5b4fa4 +EBUILD etckeeper-1.18.19.ebuild 2493 BLAKE2B e14ec4cfa0020e786f1d53cae4f55456e1552b4a6ac1d86e88c2ccbf80a53fb2dcb2bad22034470d6e67e9f123bd0833070a33356638019eb0e09acb374afc6f SHA512 21643b9a3c781ee110fc8a9ce50b468c5ea0708f658fa9d2d6fb7844694228af3209bc099ae783db5e5d55ed379faa5cdd516b81672b10d6cf2ef03e8e6cab66 MISC metadata.xml 785 BLAKE2B 7a93b0ed9e98d9e3512a2be8fb0a1f9b1790ab563d6865e46348be6b05c8965937548890ff312d90cc52052c6a177922faacc53fa1eea6f35bec6924bdb69aa9 SHA512 47adfa4031df7a657b55fdf529f4465c704f278804fb9b08ab334e0f44e714b3f106c94a73cd6e0c903c2d2633243d23c93374a35a0ec15686248da6dbd33fde diff --git a/sys-apps/etckeeper/etckeeper-1.18.19.ebuild b/sys-apps/etckeeper/etckeeper-1.18.19.ebuild new file mode 100644 index 000000000000..0174a070e7e3 --- /dev/null +++ b/sys-apps/etckeeper/etckeeper-1.18.19.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 prefix systemd tmpfiles + +DESCRIPTION="A collection of tools to let /etc be stored in a repository" +HOMEPAGE="https://etckeeper.branchable.com/" +SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +SLOT="0" +IUSE="cron test" + +BDEPEND="test? ( + dev-util/bats + dev-vcs/git +)" + +RDEPEND="app-portage/portage-utils + cron? ( virtual/cron ) + || ( + dev-vcs/git + dev-vcs/mercurial + dev-vcs/darcs + ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}/etckeeper-1.18.19-backticks-EOF.patch" # sent upstream +) + +src_prepare() { + default + hprefixify *.d/* etckeeper + local systemdunitdir="$(systemd_get_systemunitdir)" + systemdunitdir="${systemdunitdir#${EPREFIX}}" + sed -i \ + -e s'@zsh/vendor-completions@zsh/site-functions@' \ + -e s"@/lib/systemd/system@"${systemdunitdir}"@" \ + -e '/etckeeper-bzr\/__init__\.py/d' \ + Makefile || die + + # pre-configure for portage. + sed -i \ + -e 's/^HIGHLEVEL_PACKAGE_MANAGER=apt/HIGHLEVEL_PACKAGE_MANAGER=emerge/' \ + -e 's/^LOWLEVEL_PACKAGE_MANAGER=dpkg/LOWLEVEL_PACKAGE_MANAGER=qlist/' \ + etckeeper.conf || die + + rm -v init.d/60darcs-deleted-symlinks || die +} + +src_compile() { + : +} + +src_install() { + emake DESTDIR="${ED}" install + + doenvd "$(prefixify_ro "${FILESDIR}"/99${PN})" + + newbashcomp bash_completion ${PN} + dodoc doc/README.mdwn + newdoc "${FILESDIR}"/bashrc-r1 bashrc.example + + rm -rv "${ED}/var/cache" || die + newtmpfiles "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf + + if use cron ; then + exeinto /etc/cron.daily + newexe - etckeeper <<'_EOF_' +#!/bin/sh +set -e +if [ -e /etc/etckeeper/daily ] && [ -e /etc/etckeeper/etckeeper.conf ]; then + . /etc/etckeeper/etckeeper.conf + if [ "$AVOID_DAILY_AUTOCOMMITS" != "1" ]; then + /etc/etckeeper/daily + fi +fi +_EOF_ + fi + + local conf_update_dir="/etc/portage/conf-update.d" + insinto "${conf_update_dir}" + newins "${FILESDIR}/${PN}-conf-update-hook" "${PN}" + fperms 755 "${conf_update_dir}/${PN}" +} + +pkg_postinst() { + tmpfiles_process "${PN}.conf" + + elog "${PN} supports git, mercurial and darcs" + elog "This ebuild just ensures at least one is installed!" + elog + elog "You may want to adjust your /etc/portage/bashrc" + elog "see the example file in /usr/share/doc/${PF}" + elog + elog "To initialise your etc-dir as a repository run:" + elog "${PN} init -d /etc" +} diff --git a/sys-apps/etckeeper/files/etckeeper-1.18.19-backticks-EOF.patch b/sys-apps/etckeeper/files/etckeeper-1.18.19-backticks-EOF.patch new file mode 100644 index 000000000000..cf47e8108bef --- /dev/null +++ b/sys-apps/etckeeper/files/etckeeper-1.18.19-backticks-EOF.patch @@ -0,0 +1,37 @@ +From 88cc70458f1dd902d001b63148b0df534b1ebdf6 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev +Date: Wed, 4 Jan 2023 01:29:09 -0800 +Subject: [PATCH] init.d/50vcs-pre-commit-hook: replace backticks + +it's in EOF block, so bash tries to execute backticked commands despite +being commented out. + +Initialized empty Git repository in /etc/.git/ +/etc/etckeeper/init.d/50vcs-pre-commit-hook: line 11: rev-parse: command not found +Usage: grep [OPTION]... PATTERNS [FILE]... +Try 'grep --help' for more information. +/etc/etckeeper/init.d/50vcs-pre-commit-hook: line 11: worktree: command not found + +Signed-off-by: Georgy Yakovlev +--- + init.d/50vcs-pre-commit-hook | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/init.d/50vcs-pre-commit-hook b/init.d/50vcs-pre-commit-hook +index 6e0669c..166540d 100755 +--- a/init.d/50vcs-pre-commit-hook ++++ b/init.d/50vcs-pre-commit-hook +@@ -34,8 +34,8 @@ set -e + # + ################################################################################ + +-# Using `rev-parse` + `grep` rather than for instance parsing output from +-# `worktree list` since the worktree command is not present in older git version ++# Using 'rev-parse' + 'grep' rather than for instance parsing output from ++# 'worktree list' since the worktree command is not present in older git version + # and parsing it would be slightly more complex. + if git rev-parse --git-dir | grep -q /.git/worktrees + then +-- +2.39.0 + diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest index 8d56c2e0b1b6..49699f107a2c 100644 --- a/sys-apps/kmod/Manifest +++ b/sys-apps/kmod/Manifest @@ -1,5 +1,7 @@ +AUX kmod-30-configure-clang16.patch 948 BLAKE2B 35403640d79e60d1600abd676be818331ea975f139136bd60cd06df183768d78e11427505e7eda56d501a964420bff07eebff61e414655a7b043076e082ab143 SHA512 5f1b765ba51e224d464814247aa343649d1677f619dcca99d0a00ca244580443cc7615bf5291773062aa03cdeb42c7475d40da749c39d79907ae4ba0c9ed9c29 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63 DIST kmod-30.tar.xz 567484 BLAKE2B c5cb690dbb8fad66ac603648ff330794b417ff2fa2f8f61b6e9cb76dab93f984128b3d83a826203f39f3fb94f174f0db7395db6a47e52e8b7c561486f9d00778 SHA512 e2cd34e600a72e44710760dfda9364b790b8352a99eafbd43e683e4a06f37e6b5c0b5d14e7c28070e30fc5fc6ceddedf7b97f3b6c2c5c2d91204fefd630b9a3e +EBUILD kmod-30-r1.ebuild 5466 BLAKE2B 5e817461d85abfcca73d3f634469cb5cf4d609c457c26214bb55f620bfeea62d92a4a2440f055e7ce457f6360e3f9fa7b7029f97776ddead9ed4a52d1bfb4bda SHA512 55df13f040878412ad00ba5a682c6288c6851f70170df88aa8a7ee2b97678d4ebb83d55e6b6b58ee31597d97ecc70a6633cc8572bfb1564e786840a338013eb1 EBUILD kmod-30.ebuild 5286 BLAKE2B d470f972042ea1e52b84f713442d8314124255505f96d55c08638cf652173e6ca062e0e8af0c8af34de626fd609798a3191e1bd5009d65c6a0ff7bd3b1c41208 SHA512 bbf3f4b499fa76724428fc67db731f468046f6c58a6204e3a44cbf13dd2b09057e9eea086499be1f785020d36ce01bbb7c13c8890f68453489ac9f554d55ba1e EBUILD kmod-9999.ebuild 5291 BLAKE2B 7528b891100e568a324649b865ff22b22d5dcd00294f70514ab62ebea527983b4a2e0a79f9fba4efeaf4a20621fa2243691eb813b70e5495e6ad33aa820580e4 SHA512 52a755c75b47c5d52a4f15ccddba16e21ecabecd7ecbe48f85bae9e5334c22b73ca5677a2ea3397aa0429b562a46b6a46b68bc15d75ec716679c0f2a61e812da MISC metadata.xml 681 BLAKE2B d99a380ff37258528d263ede7c4752ffbb9abfb458674e884504a3618d574cffd0cad0da260e9bca208c5bdce1878ce7b3bf26e48fe883e812c5221c6ae38a53 SHA512 032d9a89779ae60a3e34f4d5cdb6b89c6f07bec68dc23b063e1b06f57825cb071ea89322f3bd9408b2503dab423fef3bac42ab5c8a9ae899849f51e38e0ecef3 diff --git a/sys-apps/kmod/files/kmod-30-configure-clang16.patch b/sys-apps/kmod/files/kmod-30-configure-clang16.patch new file mode 100644 index 000000000000..a9e1093aecff --- /dev/null +++ b/sys-apps/kmod/files/kmod-30-configure-clang16.patch @@ -0,0 +1,26 @@ +https://github.com/kmod-project/kmod/commit/035e6667d1ace2fd77ef36f5e5d93cd4b1e128a2 + +From 035e6667d1ace2fd77ef36f5e5d93cd4b1e128a2 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Sat, 17 Dec 2022 17:52:34 +0100 +Subject: [PATCH] kmod: configure.ac: In _Noreturn check, include + for exit + +Otherwise, an implicit functiona declaration is used, causing +a C99 compatibility issue. + +Signed-off-by: Florian Weimer +Signed-off-by: Lucas De Marchi +--- a/configure.ac ++++ b/configure.ac +@@ -68,7 +68,8 @@ AC_COMPILE_IFELSE( + + AC_MSG_CHECKING([whether _Noreturn is supported]) + AC_COMPILE_IFELSE( +- [AC_LANG_SOURCE([[_Noreturn int foo(void) { exit(0); }]])], ++ [AC_LANG_SOURCE([[#include ++ _Noreturn int foo(void) { exit(0); }]])], + [AC_DEFINE([HAVE_NORETURN], [1], [Define if _Noreturn is available]) + AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no])]) + diff --git a/sys-apps/kmod/kmod-30-r1.ebuild b/sys-apps/kmod/kmod-30-r1.ebuild new file mode 100644 index 000000000000..745848fed41f --- /dev/null +++ b/sys-apps/kmod/kmod-30-r1.ebuild @@ -0,0 +1,212 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit autotools libtool bash-completion-r1 python-r1 + +if [[ ${PV} == 9999* ]]; then + EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" + inherit git-r3 +else + SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +DESCRIPTION="library and tools for managing linux kernel modules" +HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git" + +LICENSE="LGPL-2" +SLOT="0" +IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd" + +# Upstream does not support running the test suite with custom configure flags. +# I was also told that the test suite is intended for kmod developers. +# So we have to restrict it. +# See bug #408915. +RESTRICT="test" + +# - >=zlib-1.2.6 required because of bug #427130 +# - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch +# - >=zstd-1.5.2-r1 required for bug #771078 +RDEPEND="!sys-apps/module-init-tools + !sys-apps/modutils + !=app-arch/xz-utils-5.0.4-r1 ) + python? ( ${PYTHON_DEPS} ) + pkcs7? ( >=dev-libs/openssl-1.1.0:= ) + zlib? ( >=sys-libs/zlib-1.2.6 ) + zstd? ( >=app-arch/zstd-1.5.2-r1:= )" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + dev-util/gtk-doc + dev-util/gtk-doc-am + ) + lzma? ( virtual/pkgconfig ) + python? ( + dev-python/cython[${PYTHON_USEDEP}] + virtual/pkgconfig + ) + zlib? ( virtual/pkgconfig ) +" +if [[ ${PV} == 9999* ]]; then + BDEPEND="${BDEPEND} + dev-libs/libxslt" +fi + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DOCS=( NEWS README.md TODO ) + +PATCHES=( + "${FILESDIR}"/${P}-configure-clang16.patch +) + +src_prepare() { + default + + if [[ ! -e configure ]] || use doc ; then + if use doc; then + cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die + gtkdocize --copy --docdir libkmod/docs || die + else + touch libkmod/docs/gtk-doc.make + fi + eautoreconf + else + #elibtoolize + # TODO: restore to elibtoolize in next release after 30 + # autoreconf only here for clang patch. + eautoreconf + fi + + # Restore possibility of running --enable-static, bug #472608 + sed -i \ + -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \ + configure || die +} + +src_configure() { + local myeconfargs=( + --bindir="${EPREFIX}/bin" + --enable-shared + --with-bashcompletiondir="$(get_bashcompdir)" + --with-rootlibdir="${EPREFIX}/$(get_libdir)" + $(use_enable debug) + $(usex doc '--enable-gtk-doc' '') + $(use_enable static-libs static) + $(use_enable tools) + $(use_with lzma xz) + $(use_with pkcs7 openssl) + $(use_with zlib) + $(use_with zstd) + ) + + local ECONF_SOURCE="${S}" + + kmod_configure() { + mkdir -p "${BUILD_DIR}" || die + run_in_build_dir econf "${myeconfargs[@]}" "$@" + } + + BUILD_DIR="${WORKDIR}/build" + kmod_configure --disable-python + + if use python; then + python_foreach_impl kmod_configure --enable-python + fi +} + +src_compile() { + emake -C "${BUILD_DIR}" + + if use python; then + local native_builddir="${BUILD_DIR}" + + python_compile() { + emake -C "${BUILD_DIR}" -f Makefile -f - python \ + VPATH="${native_builddir}:${S}" \ + native_builddir="${native_builddir}" \ + libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \ + <<< 'python: $(pkgpyexec_LTLIBRARIES)' + } + + python_foreach_impl python_compile + fi +} + +src_install() { + emake -C "${BUILD_DIR}" DESTDIR="${D}" install + + einstalldocs + + if use python; then + local native_builddir="${BUILD_DIR}" + + python_install() { + emake -C "${BUILD_DIR}" DESTDIR="${D}" \ + VPATH="${native_builddir}:${S}" \ + install-pkgpyexecLTLIBRARIES \ + install-dist_pkgpyexecPYTHON + python_optimize + } + + python_foreach_impl python_install + fi + + find "${ED}" -type f -name "*.la" -delete || die + + if use tools; then + local cmd + for cmd in depmod insmod modprobe rmmod; do + dosym ../bin/kmod /sbin/${cmd} + done + + # These are also usable as normal user + for cmd in lsmod modinfo; do + dosym kmod /bin/${cmd} + done + fi + + cat <<-EOF > "${T}"/usb-load-ehci-first.conf + softdep uhci_hcd pre: ehci_hcd + softdep ohci_hcd pre: ehci_hcd + EOF + + insinto /lib/modprobe.d + # bug #260139 + doins "${T}"/usb-load-ehci-first.conf + + newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes +} + +pkg_postinst() { + if [[ -L ${EROOT}/etc/runlevels/boot/static-nodes ]]; then + ewarn "Removing old conflicting static-nodes init script from the boot runlevel" + rm -f "${EROOT}"/etc/runlevels/boot/static-nodes + fi + + # Add kmod to the runlevel automatically if this is the first install of this package. + if [[ -z ${REPLACING_VERSIONS} ]]; then + if [[ ! -d ${EROOT}/etc/runlevels/sysinit ]]; then + mkdir -p "${EROOT}"/etc/runlevels/sysinit + fi + if [[ -x ${EROOT}/etc/init.d/kmod-static-nodes ]]; then + ln -s /etc/init.d/kmod-static-nodes "${EROOT}"/etc/runlevels/sysinit/kmod-static-nodes + fi + fi + + if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then + if ! has_version sys-apps/systemd && [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then + ewarn + ewarn "You need to add kmod-static-nodes to the sysinit runlevel for" + ewarn "kernel modules to have required static nodes!" + ewarn "Run this command:" + ewarn "\trc-update add kmod-static-nodes sysinit" + fi + fi +} diff --git a/sys-apps/moar/Manifest b/sys-apps/moar/Manifest new file mode 100644 index 000000000000..4122989aaa14 --- /dev/null +++ b/sys-apps/moar/Manifest @@ -0,0 +1,4 @@ +DIST moar-1.11.3-deps.tar.xz 25971908 BLAKE2B b0086ed53e9b032bc58e048ce5e5298cbee21e67b85798b2aa58c661293f53383a2191a7bef203a098c954ffc20dc7094e4a0c7b57aa8b456543b42770f30916 SHA512 215db80539767b4900ecac56f84a9f183f9e0581fb7603219feb3e1da44b10b52e7eda69336fc0ed6ab73be3e4efee855a91d3a41b1839c8cb9f357a9b2ed455 +DIST moar-1.11.3.tar.gz 2777421 BLAKE2B 48cc596af11b1163a6ca6cc766670ec917fae4f7232c295e6d87f074ce3c87dd3f06ac440af4d5bedc2735a2d2fe634df2d9f5db8ad05399f470d99c406a7beb SHA512 2367dd81bea3ff20c782aa7b73a70ca2ff54d57164bbcf5e318bca3769adddc8c41c3092cee5bf9c02816c68d4f65200c118e17014ae37ed63b1436dde64688c +EBUILD moar-1.11.3-r1.ebuild 813 BLAKE2B b2dbf35230b55ab7740758b96ce47eb5c0b2d96645a63af3492102fdf7cc63310fa0ad9e4749bb2412f7118384a4ac2a818fa9132136e66378c32502c092df5d SHA512 26eb33642cf62841cf2f1939e7c1898004446fd92ecd926fe367c6507de8e9e5e7b68e2252908212b7abbed50f3cf1ac8599cea2088f02f07a4a91bf5035f552 +MISC metadata.xml 316 BLAKE2B 19b5d071afbcad1f05744cca494156dc634f3fc35afaf4828dcf1e691e75a0f47f162b6cf548e5a333441f25327970f6a71d6acb436b60a68deeb7fb44659d45 SHA512 44155ffd972d79d47e41fe2ed38583e41eaaeb9f6b0de7e52b666930906f561e73d1f604acf602750ae1bed50e516dbbe36327b47ba2005813438e0d2db070e1 diff --git a/sys-apps/moar/metadata.xml b/sys-apps/moar/metadata.xml new file mode 100644 index 000000000000..da115d6b24cf --- /dev/null +++ b/sys-apps/moar/metadata.xml @@ -0,0 +1,11 @@ + + + + + sam@gentoo.org + Sam James + + + walles/moar + + diff --git a/sys-apps/moar/moar-1.11.3-r1.ebuild b/sys-apps/moar/moar-1.11.3-r1.ebuild new file mode 100644 index 000000000000..766ab4317b72 --- /dev/null +++ b/sys-apps/moar/moar-1.11.3-r1.ebuild @@ -0,0 +1,33 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="A pager designed to do the right thing without any configuration" +HOMEPAGE="https://github.com/walles/moar" +SRC_URI=" https://github.com/walles/moar/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" + +LICENSE="BSD-2 BSD MIT" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="!dev-lang/moarvm" + +src_compile() { + # https://github.com/walles/moar/blob/master/build.sh#L28 + ego build -ldflags="-w -X main.versionString=${PV}" -o moar +} + +src_test() { + # From test.sh (we don't run that because it has some linting etc) + ego test -timeout 20s ./... +} + +src_install() { + dobin moar + doman moar.1 + einstalldocs +} diff --git a/sys-apps/most/Manifest b/sys-apps/most/Manifest index b534edfcaac3..f673d2a5de2f 100644 --- a/sys-apps/most/Manifest +++ b/sys-apps/most/Manifest @@ -1,5 +1,7 @@ AUX most-5.0.0a-donot-hardcode-path.patch 969 BLAKE2B 1089149fc01a3081760f422b73d4a691e3078f13df1a7045cf0f94d6991c762e4004088e9a0b89a9b6b39ec70782f1b86edb13c714ef2b2b33bd6ccd9f18435d SHA512 6da3424b5e9763bd8f89998ffe019230cc8e9c7fc9722235cc13830d50647f590f6a934ae025a063fe8fc1e8bdd2b4fc067fbc1569c7a0ebfa220b868b999271 AUX most-5.1.0-fix-parallel-build.patch 761 BLAKE2B b2aeb5019305138ee0ac816c07595afcf95c07f7d3f477ace41931fcb85706909813056f9291d5002e2e583fdd3baec34f09b153a9d736e0009d3d7f6f4cf524 SHA512 492ebbc35c4a94514c252541a644c45b4904ad402fa0c45da03f9acb529dfdf46576429b67352cfde9defd76b772aa12ecd449f461b3f995a4d00f9ed63692c5 DIST most-5.1.0.tar.gz 162172 BLAKE2B a3c0f3d85e7c4f4a014c174efb0d3d22b0fc2758e403ddccc74308399eeec616800e16db33554f0ca53fba674efba9dd93d51ed0c3f887b2c24fd3dd2335387c SHA512 cbc090283bbaafb8ffee9d6d1abc7b49cd58d54b742cf8dc86274351dee6398d1f24841bd1631ac40f861ad9e23569646133d3297317d9d514a7a38dd74533d2 +DIST most-5.2.0.tar.gz 256075 BLAKE2B ae73680cedb0306dd6980c637fd8c0d016537663ab707e925931972822f718dd31fc80d83598af9832c7869b5abf4ec3333bc076ce56c4a6d42f71d30be1a50d SHA512 3aa3cb46ddd456532a009fb9cfcd746971396be33e03e52a15b754a6d7683f4efd020edb0ec4eb36d22ba20f050aaac4ba6cdd3b69bb5701ea58ddb9a903c59d EBUILD most-5.1.0.ebuild 917 BLAKE2B 14508a5b03c06d1fa4f94eb5b25710dfd6ebab34de570b360fc9cc3150fd1309d1d5ba39913ae1fce96af420fa416db6cda271ebcf2c29863a27555d7bd57c50 SHA512 87941a9e5a52f001519074a5e22146e453a253736bf0cf22939d4f6e6876df77e898951e8ed0ea22535bf98ad8e8c1dde4265027f99b22568831208a168cea6e +EBUILD most-5.2.0.ebuild 877 BLAKE2B 166f782883e6a576e8160b45f2702ec06bf4a088440c9ed4e419828d41f1c949458d9b7f679c626941205a478b72a2aa88277a1bd9644d7426f8ac80152b7543 SHA512 8ec470897022752c45aca24adea4927ccc34add4200c3207879aa4936d4893a641068b9b9004f6803ca6603b0831683d584a50bc9ed1b5521ae77fe56a3c707a MISC metadata.xml 353 BLAKE2B 20b4dc12fbe79c13693505e5b0861b89c10f7e89fe0e616550f5e74fb19049b3a7037fc05695ad6c0f29638251d53a9adab2a50c0216da6d77a1b45b1eace811 SHA512 a91058c3bbe915315fe012250d3c9f7be38d7f9a19980cc2df2ccfb102c82ab2eeb8931b47d7350363149a6302dd3d75128d9cf48237f55fbc866155440614e9 diff --git a/sys-apps/most/most-5.2.0.ebuild b/sys-apps/most/most-5.2.0.ebuild new file mode 100644 index 000000000000..20f8f9098a74 --- /dev/null +++ b/sys-apps/most/most-5.2.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Paging program that displays, one windowful at a time, the contents of a file" +HOMEPAGE="https://www.jedsoft.org/most/" +SRC_URI="https://www.jedsoft.org/releases/${PN}/${P}.tar.gz + https://www.jedsoft.org/releases/${PN}/old/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="" + +RDEPEND=">=sys-libs/slang-2.1.3" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-5.0.0a-donot-hardcode-path.patch +) + +src_prepare() { + default + # Do not strip by default + sed -e '/\$(INSTALL)/s@ -s@@' -i src/Makefile.in || die +} + +src_configure() { + unset ARCH + econf +} + +src_install() { + emake DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" \ + install +} -- cgit v1.2.3