diff options
Diffstat (limited to 'sys-apps')
43 files changed, 1408 insertions, 199 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz Binary files differindex 89084a1e95f8..5e64c41c9d91 100644 --- a/sys-apps/Manifest.gz +++ b/sys-apps/Manifest.gz diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 345262162b8a..690179c75aa6 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,7 +1,9 @@ DIST baselayout-2.7.tar.bz2 30317 BLAKE2B 7b7c284b7d0a9608a0d03dbde0d62d793829b61d5361f5062fdeb8880a2f792c142e20acf7fa92e713e2ebb0bd1609ca65bc8a4191f2bf2c5df4f474eaeef1ee SHA512 8b28d2dc20fd5887db5c0e6b67a4217c4d0730529023fc57fb1ee95a431e1f492fb21e3e66980bef766819e9f542dc7e4ad3ae25465390194bbf970c3653c88e +DIST baselayout-2.8.tar.bz2 30236 BLAKE2B 0bac62dd5585f1f550da8c99d06a7f8ab6cdd473b0499a8f0ac58a5c43e3883b42adb7f80c172d894fae93a6ddb6fec7a65cad9897f4a2532b481c82065ed96b SHA512 506d7cc8399b530eabc9ba2d16cbb6c024350f9487a2a9168c670cee9876f62e5a716942f698c4883013d6ccc9591c2d7fc2ac9d782f0ce8d724371ca94c739a EBUILD baselayout-2.7-r1.ebuild 10197 BLAKE2B 5e5f767f37bdf286cd77d21512a855e1e2f5f26fd794838e3cb21634f089b66cefc4e915c9e88148f0e1f2a0067a57bfb029833572614c0190d54f862ff15659 SHA512 847e2ddae301a856b7719fe9134635ea79f0059107188aad8c554fda4da428f970a2ad4daf56491050acacd822175fa8ae18f22402e19677df9d920c525ce737 EBUILD baselayout-2.7-r2.ebuild 10184 BLAKE2B febfaf2d2a646358c20e12039cd3b224a2fbcf5c12b566e8b33927fa5549b3f0d5b76392bf36cdefe7b14f84bf89b5caff5004ce54b862d238d5928d69526e87 SHA512 a5a45b479dfeac5212291d3d8053c822d06a45d8f82d24f8937b15bd3bf5fd6953ec3520121df243cea2cea52ea8d56894d27b03a272c85ca21ff52190551d8b EBUILD baselayout-2.7-r3.ebuild 11291 BLAKE2B f2794d10f18c74e358ce1e6fc1a9c3e29b7ab7b0cb0d656a53f990781707b29b9e173b96044c9c9e9c8d35b7b020624ad8e9d1bec1cd6b72f287e8c8759dc1cb SHA512 3eaec1f7a1bfd85dd26ad62b3756a7460e890cc893c6967aded70d85df722865664235924c6cbdb7d9be3572e94d059cf1df6a2b240a1e9923b3533ac68906eb EBUILD baselayout-2.7.ebuild 10024 BLAKE2B 490416f9367b1236ac8879b273acc2920f77f1fb23edba5bc825358270f434e0facb8f2794baebce5841b2be2ee3a4da5fffa026585555902e582ff36ab37bd3 SHA512 6a629e68f58d23f8d9653bccca3ad6d52610bd87ab73c5d6b12c9b6e9762f34f2deb452d689c99ea4d66f1c4dbe88e13991f1b2ea900720fd8c8d92067aaca71 -EBUILD baselayout-9999.ebuild 10942 BLAKE2B 74c1d6bf2c6d3eb516fc0fad25dc9b8262a132dba25d02ec7df43a977586d1c118b3e5f0e1c97fdf5f8d11424ce76984e8bcdcff270af834456c3d6147205520 SHA512 589915bc9fe7b7a93e393b0f1ac5a978436c6c56b2415373f198992bc87f4d3d78faf4a2b3fd857a78be2fdf54b0d11e020e38bbbb6d125f7d11bd0a52a6d72a +EBUILD baselayout-2.8.ebuild 10904 BLAKE2B 5321408ff9d87d35030ab117881e167a623a49559fdad536244df844bc0883d75d81c3da522bf0f0bed519fc7c62ea1d967dc0e8880298fec6f0b0b8e248eb6c SHA512 640770bd69a2c521cecd97cee93340c1bae9f6c92b8bcefa08de33cdfdcfa52cbdfa0562d44d1efa6922f132d5bd3a6b7e6463da6ecc259528c8a73ca0b2db8b +EBUILD baselayout-9999.ebuild 10904 BLAKE2B 5321408ff9d87d35030ab117881e167a623a49559fdad536244df844bc0883d75d81c3da522bf0f0bed519fc7c62ea1d967dc0e8880298fec6f0b0b8e248eb6c SHA512 640770bd69a2c521cecd97cee93340c1bae9f6c92b8bcefa08de33cdfdcfa52cbdfa0562d44d1efa6922f132d5bd3a6b7e6463da6ecc259528c8a73ca0b2db8b MISC metadata.xml 383 BLAKE2B 58d0d7a9d2b0e355ca13061b798db482b1894cb805e4c7f70d9b64f301f34aa784ec56783cb670e3c35a69ad383feb3c29d0b8f8164e5e05e24908127759a4aa SHA512 49775deed8635ddd8492a86887c85043e2a16ec46508c08c9eb669eee0aa29db1974c20a338fa09703bfc73fbff29c56d043b2749c0e7046347eb8186da59193 diff --git a/sys-apps/baselayout/baselayout-2.8.ebuild b/sys-apps/baselayout/baselayout-2.8.ebuild new file mode 100644 index 000000000000..c5f4dbf7dda3 --- /dev/null +++ b/sys-apps/baselayout/baselayout-2.8.ebuild @@ -0,0 +1,338 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib prefix + +DESCRIPTION="Filesystem baselayout and init scripts" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +if [[ ${PV} = 9999 ]]; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git" + inherit git-r3 +else + SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="build kernel_FreeBSD kernel_linux +split-usr" + +pkg_setup() { + multilib_layout +} + +riscv_compat_symlink() { + # Here we apply some special sauce for riscv. + # Two multilib layouts exist for now: + # 1) one level libdirs, (32bit) "lib" and (64bit) "lib64" + # these are chosen by us to closely resemble other arches + # 2) two level libdirs, "lib64/lp64d" "lib64/lp64" "lib32/ilp32d" ... + # this is the glibc/gcc default + # Unfortunately, the default has only one fallback, which is "lib" + # for both 32bit and 64bit. So things do not break in 1), we need + # to provide compatibility symlinks... + + # This function has exactly two parameters: + # - the default libdir, to determine if 1) or 2) applies + # - the location of the symlink (which points to ".") + + # Note: we call this only in the ${SYMLINK_LIB} = no codepath, since + # there never was a ${SYMLINK_LIB} = yes riscv profile. + + case ${CHOST} in + riscv*) + # are we on a one level libdir profile? is there no symlink yet? + if [[ ${1} != */* && ! -L ${2} ]] ; then + ln -s . $2 || die "Unable to make $2 riscv compatibility symlink" + fi + ;; + esac +} + +# Create our multilib dirs - the Makefile has no knowledge of this +multilib_layout() { + local dir def_libdir libdir libdirs + local prefix prefix_lst + def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI) + libdirs=$(get_all_libdirs) + + if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then + prefix_lst=( "${EROOT}"/{,usr/,usr/local/} ) + for prefix in "${prefix_lst[@]}"; do + for libdir in ${libdirs}; do + dir="${prefix}${libdir}" + if [[ -e "${dir}" ]]; then + [[ ! -d "${dir}" ]] && + die "${dir} exists but is not a directory" + continue + fi + if ! use split-usr && [[ ${prefix} = ${EROOT}/ ]]; then + libdir="${libdir%%/*}" + dir="${prefix}${libdir}" + einfo "symlinking ${dir} to usr/${libdir}" + ln -s usr/${libdir} ${dir} || + die "Unable to make ${dir} symlink" + else + einfo "creating directory ${dir}" + mkdir -p "${dir}" || + die "Unable to create ${dir} directory" + fi + done + riscv_compat_symlink "${def_libdir}" "${prefix}${def_libdir}/${DEFAULT_ABI}" + done + return 0 + fi + + [ -z "${def_libdir}" ] && + die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid" + + # figure out which paths should be symlinks and which should be directories + local dirs syms exp d + for libdir in ${libdirs} ; do + if use split-usr ; then + exp=( {,usr/,usr/local/}${libdir} ) + else + exp=( {usr/,usr/local/}${libdir} ) + fi + for d in "${exp[@]}" ; do + # most things should be dirs + if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then + [ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}" + else + [ -h "${d}" ] && syms+=" ${d}" + fi + done + done + if [ -n "${syms}${dirs}" ] ; then + ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to" + ewarn "have these paths configured as follows:" + [ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}" + [ -n "${syms}" ] && ewarn "directories:${syms}" + ewarn "The ebuild will attempt to fix these, but only for trivial conversions." + ewarn "If things fail, you will need to manually create/move the directories." + echo + fi + + # setup symlinks and dirs where we expect them to be; do not migrate + # data ... just fall over in that case. + if use split-usr ; then + prefix_lst=( "${EROOT}"/{,usr/,usr/local/} ) + else + prefix_lst=( "${EROOT}"/{usr/,usr/local/} ) + fi + for prefix in "${prefix_lst[@]}"; do + if [ "${SYMLINK_LIB}" = yes ] ; then + # we need to make sure "lib" points to the native libdir + if [ -h "${prefix}lib" ] ; then + # it's already a symlink! assume it's pointing to right place ... + continue + elif [ -d "${prefix}lib" ] ; then + # "lib" is a dir, so need to convert to a symlink + ewarn "Converting ${prefix}lib from a dir to a symlink" + rm -f "${prefix}lib"/.keep || die + if rmdir "${prefix}lib" 2>/dev/null ; then + ln -s ${def_libdir} "${prefix}lib" || die + else + die "non-empty dir found where we needed a symlink: ${prefix}lib" + fi + else + # nothing exists, so just set it up sanely + ewarn "Initializing ${prefix}lib as a symlink" + mkdir -p "${prefix}" || die + rm -f "${prefix}lib" || die + ln -s ${def_libdir} "${prefix}lib" || die + mkdir -p "${prefix}${def_libdir}" || die #423571 + fi + else + # we need to make sure "lib" is a dir + if [ -h "${prefix}lib" ] ; then + # "lib" is a symlink, so need to convert to a dir + ewarn "Converting ${prefix}lib from a symlink to a dir" + rm -f "${prefix}lib" || die + if [ -d "${prefix}lib32" ] ; then + ewarn "Migrating ${prefix}lib32 to ${prefix}lib" + mv "${prefix}lib32" "${prefix}lib" || die + else + mkdir -p "${prefix}lib" || die + fi + elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then + # make sure the old "lib" ABI location does not exist; we + # 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 + if ! rmdir "${prefix}lib32" 2>/dev/null ; then + ewarn "You need to merge ${prefix}lib32 into ${prefix}lib" + die "non-empty dir found where there should be none: ${prefix}lib32" + fi + fi + ;; + esac + else + # nothing exists, so just set it up sanely + ewarn "Initializing ${prefix}lib as a dir" + mkdir -p "${prefix}lib" || die + fi + fi + done + if ! use split-usr ; then + for libdir in ${libdirs}; do + if [[ ! -e "${EROOT}${libdir}" ]]; then + ln -s usr/"${libdir}" "${EROOT}${libdir}" || + die "Unable to make ${EROOT}${libdir} symlink" + fi + done + fi +} + +pkg_preinst() { + # This is written in src_install (so it's in CONTENTS), but punt all + # pending updates to avoid user having to do etc-update (and make the + # pkg_postinst logic simpler). + rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die + + # We need to install directories and maybe some dev nodes when building + # stages, but they cannot be in CONTENTS. + # Also, we cannot reference $S as binpkg will break so we do this. + multilib_layout + if use build ; then + if use split-usr ; then + emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout + else + emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge + fi + fi + rm -f "${ED}"/usr/share/${PN}/Makefile || die +} + +src_prepare() { + default + if use prefix; then + hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile + hprefixify etc/{env.d/50baselayout,shells} share.Linux/passwd + echo PATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host + fi + + # don't want symlinked directories in PATH on systems with usr-merge + if ! use split-usr; then + sed \ + -e 's|/usr/local/sbin:||g' \ + -e 's|:/usr/sbin:|:|g' \ + -e 's|:/sbin:|:|g' \ + -e 's|:/bin:|:|g' \ + -i etc/env.d/50baselayout || die + fi + + # handle multilib paths. do it here because we want this behavior + # regardless of the C library that you're using. we do explicitly + # list paths which the native ldconfig searches, but this isn't + # problematic as it doesn't change the resulting ld.so.cache or + # take longer to generate. similarly, listing both the native + # path and the symlinked path doesn't change the resulting cache. + local libdir ldpaths + for libdir in $(get_all_libdirs) ; do + use split-usr && ldpaths+=":${EPREFIX}/${libdir}" + ldpaths+=":${EPREFIX}/usr/${libdir}" + ldpaths+=":${EPREFIX}/usr/local/${libdir}" + done + echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout +} + +src_install() { + emake \ + OS=$(usex kernel_FreeBSD BSD Linux) \ + DESTDIR="${ED}" \ + install + + # need the makefile in pkg_preinst + insinto /usr/share/${PN} + doins Makefile + + dodoc ChangeLog +} + +pkg_postinst() { + local x + + # We installed some files to /usr/share/baselayout instead of /etc to stop + # (1) overwriting the user's settings + # (2) screwing things up when attempting to merge files + # (3) accidentally packaging up personal files with quickpkg + # If they don't exist then we install them + for x in master.passwd passwd shadow group fstab ; do + [ -e "${EROOT}/etc/${x}" ] && continue + [ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue + cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc || die + done + + # Force shadow permissions to not be world-readable #260993 + for x in shadow ; do + if [ -e "${EROOT}/etc/${x}" ] ; then + chmod o-rwx "${EROOT}/etc/${x}" || die + fi + done + + # Take care of the etc-update for the user + if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then + mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release || die + fi + + # whine about users that lack passwords #193541 + if [[ -e "${EROOT}"/etc/shadow ]] ; then + local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow) + if [[ -n ${bad_users} ]] ; then + echo + ewarn "The following users lack passwords!" + ewarn ${bad_users} + fi + fi + + # whine about users with invalid shells #215698 + if [[ -e "${EROOT}"/etc/passwd ]] ; then + local bad_shells=$(awk -F: 'system("test -e ${ROOT}" $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort) + if [[ -n ${bad_shells} ]] ; then + echo + ewarn "The following users have non-existent shells!" + ewarn "${bad_shells}" + fi + fi + + # https://bugs.gentoo.org/361349 + if use kernel_linux; then + mkdir -p "${EROOT}"/run || die + + local found fstype mountpoint + while read -r _ mountpoint fstype _; do + [[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1 + done < "${ROOT}"/proc/mounts + [[ -z ${found} ]] && + ewarn "You should reboot now to get /run mounted with tmpfs!" + fi + + for x in ${REPLACING_VERSIONS}; do + if ver_test 2.4 -lt ${x}; then + ewarn "After updating ${EROOT}/etc/profile, please run" + ewarn "env-update && . /etc/profile" + fi + + if ver_test 2.6 -lt ${x}; then + ewarn "Please run env-update then log out and back in to" + ewarn "update your path." + fi + # clean up after 2.5 typos + # https://bugs.gentoo.org/show_bug.cgi?id=656380 + if [[ ${x} == 2.5 ]]; then + rm -fr "${EROOT}/{,usr" || die + fi + done + + if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then + ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout" + ewarn "Please migrate your changes." + fi +} diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild index 84c0a536ea3c..c5f4dbf7dda3 100644 --- a/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sys-apps/baselayout/baselayout-9999.ebuild @@ -248,12 +248,12 @@ src_install() { OS=$(usex kernel_FreeBSD BSD Linux) \ DESTDIR="${ED}" \ install - dodoc ChangeLog - rm "${ED}"/etc/sysctl.d/README || die # need the makefile in pkg_preinst insinto /usr/share/${PN} doins Makefile + + dodoc ChangeLog } pkg_postinst() { diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest index 8999b776e326..cef7e114cd5b 100644 --- a/sys-apps/coreutils/Manifest +++ b/sys-apps/coreutils/Manifest @@ -1,8 +1,10 @@ AUX coreutils-8.32-ls-restore-8.31-behavior.patch 2824 BLAKE2B 7df44f4e330225a429678b3d5f20736d7c5c4f7d09f51f71d7e1111c3181d494aa12796c823244473063f7905aef35b74703860343c5e30f38520ee340690ede SHA512 6d55806aa16e0f654b15bfefb20f2c16193c7e9fcf7c087309b3254272d20467dea69ac53fff345b510751e165c33197c3053b7308578f79492afba0a1eeb6e5 AUX coreutils-8.32-sandbox-env-test.patch 1958 BLAKE2B 570f62115f0853abb35290174ad6dd3157be16a28c527b37d1c58b421538a6238e93317689e6cd35b7dc5a0f480a4322c432986697a9e0af60019650eae92c0a SHA512 fd3573cf5a4b4fbba132d0fac5ad6eb4af5aa548a8c0c747653e47acfb97c01e31d7430db543df47d9a2680792d2583de70e1f1d49b2feb75887e9f8638527b7 +AUX coreutils-9.0-fix-chmod-symlink-exit.patch 1133 BLAKE2B 28a3adfb2c8b4e8d557a713d9e83fb61672e74dbc7dc8a8f7adf497825be0e53e1c08bff37122750a6144da70737af558dc018a06816e279879f31daf746a4d1 SHA512 392b94d55c5864e5de637567f7207e5c789a722710c29bead72c41b9f85f535f96f84f4abc64b35ee218c5ec5bc129837a65ec95cbb88113877b302823491991 DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145 DIST coreutils-9.0.tar.xz 5612752 BLAKE2B 59617cd25fd4c70f51bfbef851bd83e73f9c9ba5c11eb539f7f75c0184d55832e004b28e9268fb8064db145cb071ead2b9c0c3346bc35a11934ffe1b15bf17ac SHA512 9be08212891dbf48e5b22e7689dc27dac50df4631ebf29313470b72b7921f0b2aa5242917d05587785358495ca56e3b21f5b3ca81043d53cab92354da6c53a03 -EBUILD coreutils-8.32-r1.ebuild 5952 BLAKE2B f36627a733cc12af6662232d75938deb476470daa22084be267487a38d0ae42d32ff79c17f42dda25f8d8a7d95fb5b5f8a487de0bec45f364249bd25bceeeec8 SHA512 ec173a036db1b88010acfa13b301370ac80c7da2f1e29ee4b9c8c36e64ed60d98c5c9c111d0f14d93bf3c34b517fe47a98b3c30d3ccf0e17dcedbeec17d93908 -EBUILD coreutils-9.0.ebuild 5904 BLAKE2B b4e36bdb7300dc1dd33e180543d239813980cfcede24e201ed7f4c57dfe4af15bc1da7b37c0000b655980e7163f266ffb7716f68735230a589b092b38cf83299 SHA512 85b98a9e7ccf84d97b4f6a3d9d4f8a649a1179e2bbc71a7e4374610ce1c08f09d19ef4100c056aaf8ac7907954d02ff1da2a653f64f3c67ae792c0b204e037b9 +EBUILD coreutils-8.32-r1.ebuild 5967 BLAKE2B e4111bbbcd2c83ee5f25783434a8d841f75bb14dd9cbeb223558bf6c3d22f93ec7ba3d6c4ec740243473c53575776e9700004a0f9695b91a5468837a62b6c4c6 SHA512 adbd3c99b3e3e126e13a468bc66109005a1abdd603c11ea02bf8d8c2c8232ea48f6e2da768439ce4480789df0aa412eaff3849a24f3c81def5efd4479c87c27c +EBUILD coreutils-9.0-r1.ebuild 5990 BLAKE2B aae844fd5650c162c268d9906d533a56d2a6e2e44cc106a031f75ca10fdfbe023e64909cf21409a5994638300e037f6a4be28dbac1d799b0991bca1ad58b0572 SHA512 4c023ab56b5070c52326a42099f8b14597ea3ce0efcb54bfe7098b37e6866f2332281f750a7b552bc38f4236e27c2e5b1ef79ff65662f3a7cf54d5d46d677325 +EBUILD coreutils-9.0.ebuild 5919 BLAKE2B a972080d2584b0bd38e48ee317b44a848767c182fed84f2b740bf3b8fefa79ffced03e885fdb64b689cbc88ac0929b73ecd478ae6071bd2bdaee3bfddf9d95b7 SHA512 5de0a279ed98b04c981f9b37a4e759d95cfa820af642813bf63ffc24a1e819349dd16a4a82c2c2bf93e11c0c29f00093f79add5ad0c97d74dad4aec8781321d0 MISC metadata.xml 959 BLAKE2B 7db7eff5a6e1c45c37e20d66e299b44b7a8334b20f970eac2bb7dbf0f8e149784bb19f28c0baa228bdbfbfe0335793080a99aee7f92a9976864ae53a35fc0ac8 SHA512 c69fdd7a27b7980c6e537387a510cfab65d0b252492576ffae3caac930bd2efad29edb604f654c194cc0a485894c8fbd3a5dc63e44359c95fc62fd055066b595 diff --git a/sys-apps/coreutils/coreutils-8.32-r1.ebuild b/sys-apps/coreutils/coreutils-8.32-r1.ebuild index 47b5462e103f..1a139279ad85 100644 --- a/sys-apps/coreutils/coreutils-8.32-r1.ebuild +++ b/sys-apps/coreutils/coreutils-8.32-r1.ebuild @@ -36,6 +36,7 @@ DEPEND=" " BDEPEND=" app-arch/xz-utils + dev-lang/perl test? ( dev-lang/perl dev-perl/Expect diff --git a/sys-apps/coreutils/coreutils-9.0-r1.ebuild b/sys-apps/coreutils/coreutils-9.0-r1.ebuild new file mode 100644 index 000000000000..ffbc9ea3ef92 --- /dev/null +++ b/sys-apps/coreutils/coreutils-9.0-r1.ebuild @@ -0,0 +1,223 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit flag-o-matic python-any-r1 toolchain-funcs + +PATCH="${PN}-8.30-patches-01" +DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)" +HOMEPAGE="https://www.gnu.org/software/coreutils/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz + !vanilla? ( + mirror://gentoo/${PATCH}.tar.xz + https://dev.gentoo.org/~polynomial-c/dist/${PATCH}.tar.xz + )" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" +IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr" +RESTRICT="!test? ( test )" + +LIB_DEPEND="acl? ( sys-apps/acl[static-libs] ) + caps? ( sys-libs/libcap ) + gmp? ( dev-libs/gmp:=[static-libs] ) + xattr? ( sys-apps/attr[static-libs] )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) + selinux? ( sys-libs/libselinux ) + nls? ( virtual/libintl )" +DEPEND=" + ${RDEPEND} + static? ( ${LIB_DEPEND} ) +" +BDEPEND=" + app-arch/xz-utils + dev-lang/perl + test? ( + dev-lang/perl + dev-perl/Expect + dev-util/strace + ${PYTHON_DEPS} + ) +" +RDEPEND+=" + hostname? ( !sys-apps/net-tools[hostname] ) + kill? ( + !sys-apps/util-linux[kill] + !sys-process/procps[kill] + ) + !app-misc/realpath + !<sys-apps/util-linux-2.13 + !<sys-apps/sandbox-2.10-r4 + !sys-apps/stat + !net-mail/base64 + !sys-apps/mktemp + !<app-forensics/tct-1.18-r1 + !<net-fs/netatalk-2.0.3-r4" + +pkg_setup() { + if use test ; then + python-any-r1_pkg_setup + fi +} + +src_prepare() { + local PATCHES=( + # Upstream patches + "${FILESDIR}"/${P}-fix-chmod-symlink-exit.patch + ) + + if ! use vanilla ; then + PATCHES+=( "${WORKDIR}"/patch ) + PATCHES+=( "${FILESDIR}"/${PN}-8.32-sandbox-env-test.patch ) + fi + + default + + # Since we've patched many .c files, the make process will try to + # re-build the manpages by running `./bin --help`. When doing a + # cross-compile, we can't do that since 'bin' isn't a native bin. + # + # Also, it's not like we changed the usage on any of these things, + # so let's just update the timestamps and skip the help2man step. + set -- man/*.x + touch ${@/%x/1} || die + + # Avoid perl dep for compiled in dircolors default (bug #348642) + if ! has_version dev-lang/perl ; then + touch src/dircolors.h || die + touch ${@/%x/1} || die + fi +} + +src_configure() { + local myconf=( + --with-packager="Gentoo" + --with-packager-version="${PVR} (p${PATCH_VER:-0})" + --with-packager-bug-reports="https://bugs.gentoo.org/" + # kill/uptime - procps + # groups/su - shadow + # hostname - net-tools + --enable-install-program="arch,$(usev hostname),$(usev kill)" + --enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime" + --enable-largefile + $(usex caps '' --disable-libcap) + $(use_enable nls) + $(use_enable acl) + $(use_enable multicall single-binary) + $(use_enable xattr) + $(use_with gmp libgmp) + ) + + if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then + # bug #311569 + export fu_cv_sys_stat_statfs2_bsize=yes + # bug #416629 + export gl_cv_func_realpath_works=yes + fi + + # bug #409919 + export gl_cv_func_mknod_works=yes + + if use static ; then + append-ldflags -static + # bug #321821 + sed -i '/elf_sys=yes/s:yes:no:' configure || die + fi + + if ! use selinux ; then + # bug #301782 + export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no + fi + + econf "${myconf[@]}" +} + +src_test() { + # Known to fail with FEATURES=usersandbox (bug #439574): + # - tests/du/long-from-unreadable.sh} (bug #413621) + # - tests/rm/deep-2.sh (bug #413621) + # - tests/dd/no-allocate.sh (bug #629660) + if has usersandbox ${FEATURES} ; then + ewarn "You are emerging ${P} with 'usersandbox' enabled." \ + "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" + fi + + # Non-root tests will fail if the full path isn't + # accessible to non-root users + chmod -R go-w "${WORKDIR}" || die + chmod a+rx "${WORKDIR}" || die + + # coreutils tests like to do `mount` and such with temp dirs, + # so make sure: + # - /etc/mtab is writable (bug #265725) + # - /dev/loop* can be mounted (bug #269758) + mkdir -p "${T}"/mount-wrappers || die + mkwrap() { + local w ww + for w in "${@}" ; do + ww="${T}/mount-wrappers/${w}" + cat <<-EOF > "${ww}" + #!${EPREFIX}/bin/sh + exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@" + EOF + chmod a+rx "${ww}" || die + done + } + mkwrap mount umount + + addwrite /dev/full + #export RUN_EXPENSIVE_TESTS="yes" + #export FETISH_GROUPS="portage wheel" + env PATH="${T}/mount-wrappers:${PATH}" \ + emake -j1 -k check +} + +src_install() { + default + + insinto /etc + newins src/dircolors.hin DIR_COLORS + + if use split-usr ; then + cd "${ED}"/usr/bin || die + dodir /bin + + # Move critical binaries into /bin (required by FHS) + local fhs="cat chgrp chmod chown cp date dd df echo false ln ls + mkdir mknod mv pwd rm rmdir stty sync true uname" + mv ${fhs} ../../bin/ || die "Could not move FHS bins!" + + if use hostname ; then + mv hostname ../../bin/ || die + fi + + if use kill ; then + mv kill ../../bin/ || die + fi + + # Move critical binaries into /bin (common scripts) + # (Why are these required for booting?) + local com="basename chroot cut dir dirname du env expr head mkfifo + mktemp readlink seq sleep sort tail touch tr tty vdir wc yes" + mv ${com} ../../bin/ || die "Could not move common bins!" + + # Create a symlink for uname in /usr/bin/ since autotools require it. + # (Other than uname, we need to figure out why we are + # creating symlinks for these in /usr/bin instead of leaving + # the files there in the first place...) + local x + for x in ${com} uname ; do + dosym ../../bin/${x} /usr/bin/${x} + done + fi +} + +pkg_postinst() { + ewarn "Make sure you run 'hash -r' in your active shells." + ewarn "You should also re-source your shell settings for LS_COLORS" + ewarn " changes, such as: source /etc/profile" +} diff --git a/sys-apps/coreutils/coreutils-9.0.ebuild b/sys-apps/coreutils/coreutils-9.0.ebuild index 0f0aec04b0bd..b373e1d79b29 100644 --- a/sys-apps/coreutils/coreutils-9.0.ebuild +++ b/sys-apps/coreutils/coreutils-9.0.ebuild @@ -35,6 +35,7 @@ DEPEND=" " BDEPEND=" app-arch/xz-utils + dev-lang/perl test? ( dev-lang/perl dev-perl/Expect diff --git a/sys-apps/coreutils/files/coreutils-9.0-fix-chmod-symlink-exit.patch b/sys-apps/coreutils/files/coreutils-9.0-fix-chmod-symlink-exit.patch new file mode 100644 index 000000000000..25b2b72bcb80 --- /dev/null +++ b/sys-apps/coreutils/files/coreutils-9.0-fix-chmod-symlink-exit.patch @@ -0,0 +1,35 @@ +https://git.savannah.gnu.org/cgit/coreutils.git/patch/?id=e8b56ebd536e82b15542a00c888109471936bfda +https://lists.gnu.org/archive/html/bug-coreutils/2021-09/msg00031.html +(and https://lists.gnu.org/archive/html/bug-coreutils/2021-09/msg00035.html) + +From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com> +Date: Fri, 24 Sep 2021 20:57:41 +0100 +Subject: chmod: fix exit status when ignoring symlinks + +* src/chmod.c: Reorder enum so CH_NOT_APPLIED +can be treated as a non error. +* tests/chmod/ignore-symlink.sh: A new test. +* tests/local.mk: Reference the new test. +* NEWS: Mention the bug fix. +Fixes https://bugs.gnu.org/50784 +--- a/src/chmod.c ++++ b/src/chmod.c +@@ -44,8 +44,8 @@ struct change_status + enum + { + CH_NO_STAT, +- CH_NOT_APPLIED, + CH_FAILED, ++ CH_NOT_APPLIED, + CH_NO_CHANGE_REQUESTED, + CH_SUCCEEDED + } +@@ -322,7 +322,7 @@ process_file (FTS *fts, FTSENT *ent) + if ( ! recurse) + fts_set (fts, ent, FTS_SKIP); + +- return CH_NO_CHANGE_REQUESTED <= ch.status; ++ return CH_NOT_APPLIED <= ch.status; + } + + /* Recursively change the modes of the specified FILES (the last entry diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index e136aa8ae169..785f510206a3 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -5,7 +5,9 @@ AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c61 DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6aeefa5f0ad39a9d15457f96c562ce5cfbc47e1fc450c31c2b9334ca3902ed63ef809e8d2cb5b5459cc54dec28 SHA512 ccd1246ab5b3c876251924a14d1c2c553b2df5702c6673978b1d627ea1028c3950241f73dd54e2fecb5cc204a1dc77e6597f7514eff6467beb50be7874352d78 DIST fwupd-1.6.2.tar.gz 3885963 BLAKE2B 183abc4d620b884a276dece39ad1e57f606c2237a5fa03b76ede2e1c93bb9548d6641e35490d96e22abbbfb3c1852697a688091f62086f6b2e9d3366e796888e SHA512 a743b37c5969939cc3eb708b0af2e8f6c665848868473c29edf9db110cef5ac62da3c042cfa9617a2f10b2a9d153d0d4146a1832a18bc71fadcbf9a7b5cea1b0 DIST fwupd-1.6.3.tar.gz 3888812 BLAKE2B 08d24fde80010d50e2396f59d743a00e640c1fcc06f6ada566ebcff48d25f1dc33676a40d13e1b684e45fd9483af1d9755ef3ac00bdaa8a37236589c03bb8a4c SHA512 837bcfe57873315ade8f3ff82d290d492dcb047387db5a642e6e7fc8e9ff7c3cabe5892692e2d4b5b0c5bd69f8a253bc364c61f23013c161a350b39de7d58e67 +DIST fwupd-1.6.4.tar.gz 3891113 BLAKE2B b4f3a629c0594ee69a0e2ea727c8080f63e970a6e9964b53d007e490d6b538f5441a65de20412673ded181611342c7c1c1ec16eb0d05c69c149f635fed325269 SHA512 d0c788313f8cf00c6e0e238436668ab5885133933cd74202d3eb4a3377d1b123689dd7f3827d45853c92b98196d5d896027b471117af461356e2f3c3ec82f58e EBUILD fwupd-1.5.9-r1.ebuild 4380 BLAKE2B f47d3b9dc882649c85549f3139ea2cd6473c21eee0a1750076b7dfad7c04caa6641f36704bc9bf978e047e16f9a07f12fcc862b22697ae4091c7f5cac31c2256 SHA512 f5d965dc302cd77877f13c0ccc3a952c71a6463b56b5d7aafce11ef4d673e46f9c486159be6e2ccfd1229d42ea014598705b867d7aa7795a5c9e0caf51a76506 EBUILD fwupd-1.6.2.ebuild 4560 BLAKE2B f85eebae29ee6e20705e7db84bbf8ebc33d109a1fc063c6225c24faf70e1289ae693da3ba6bb36c53ab56e5cfefe39c99a684bbf5393abca8c94b082ce5c9a50 SHA512 f9556caeb5e6678a7bded64b97523e5917a81500a2f7791963c18c769e7e650e3d435c4fd0efe4bb3a0e771d95e294be28bee28a798c974abfaa252de90eb5ea EBUILD fwupd-1.6.3.ebuild 4504 BLAKE2B 78cb6e9716c4109fcf2e26cad2c8d5d84d952a1514827f2b48106b8b15d9a65085468396fee88584bc498441ed230dba5b150f682326e982c2fe45620aa3c1ed SHA512 01927eff188e8bf7fa80d394f9666bcc47266bf7e685264da4484ab4c7966adab92669007473c1602b31253cb35ec9bef44737bf4ba78d0ac8b1cb4d9799c255 +EBUILD fwupd-1.6.4-r1.ebuild 4504 BLAKE2B a5efb85ec19fd9484769314b6fcdcdffd1a7d331150496385e1f071421eaa20580c3b7590e52d83e36f752e8953fb6415873cff29fca9a70ea2e66722d4cf105 SHA512 f79dea7b0732564e976507863d39ea2af2d02a4218efc683476f9be1a18248ec8a25f1ff7729a44d5ff0171dc725cac3ebc3057b25c8704365c127a9ac6b9cde MISC metadata.xml 1348 BLAKE2B 118050b55b34009e6c684f563e70801decdbbb72d74fa2f4f3f2f9fc1451dd2bf2ddb63d3303ca9d2f85eba14e9fe302cb4bdf6e487d9fd4883e62e61adc398f SHA512 28988ca295040f8a4abb56a6993c115378e13ef15c6abe96417ad475ad622738663c49b8875eee0e515f767290e2d903f2a483b37a7694f9b91a3d0475627468 diff --git a/sys-apps/fwupd/fwupd-1.6.4-r1.ebuild b/sys-apps/fwupd/fwupd-1.6.4-r1.ebuild new file mode 100644 index 000000000000..a64bc49822db --- /dev/null +++ b/sys-apps/fwupd/fwupd-1.6.4-r1.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit linux-info meson python-single-r1 vala xdg + +DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable" +HOMEPAGE="https://fwupd.org" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="agent amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ^^ ( elogind minimal systemd ) + dell? ( uefi ) + minimal? ( !introspection ) + spi? ( lzma ) + synaptics? ( gnutls ) + uefi? ( gnutls ) +" +RESTRICT="!test? ( test )" + +BDEPEND="$(vala_depend) + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) + introspection? ( dev-libs/gobject-introspection ) + man? ( + app-text/docbook-sgml-utils + sys-apps/help2man + ) + test? ( + thunderbolt? ( dev-util/umockdev ) + net-libs/gnutls[tools] + ) +" +COMMON_DEPEND="${PYTHON_DEPS} + >=app-arch/gcab-1.0 + dev-db/sqlite + >=dev-libs/glib-2.45.8:2 + dev-libs/json-glib + dev-libs/libgpg-error + dev-libs/libgudev:= + >=dev-libs/libjcat-0.1.0[gpg,pkcs7] + >=dev-libs/libxmlb-0.1.13:=[introspection?] + $(python_gen_cond_dep ' + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] + ') + >=net-libs/libsoup-2.51.92:2.4[introspection?] + net-misc/curl + virtual/libelf:0= + virtual/udev + archive? ( app-arch/libarchive:= ) + dell? ( >=sys-libs/libsmbios-2.4.0 ) + elogind? ( >=sys-auth/elogind-211 ) + flashrom? ( >=sys-apps/flashrom-1.2-r3 ) + gnutls? ( net-libs/gnutls ) + gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) + lzma? ( app-arch/xz-utils ) + modemmanager? ( net-misc/modemmanager[qmi] ) + policykit? ( >=sys-auth/polkit-0.103 ) + systemd? ( >=sys-apps/systemd-211 ) + tpm? ( app-crypt/tpm2-tss ) + uefi? ( + sys-apps/fwupd-efi + sys-boot/efibootmgr + sys-fs/udisks + sys-libs/efivar + ) +" +# Block sci-chemistry/chemical-mime-data for bug #701900 +RDEPEND=" + !<sci-chemistry/chemical-mime-data-0.1.94-r4 + ${COMMON_DEPEND} + sys-apps/dbus +" + +DEPEND=" + ${COMMON_DEPEND} + x11-libs/pango[introspection] +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.5.7-logind_plugin.patch +) + +pkg_setup() { + python-single-r1_pkg_setup + if use nvme ; then + kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4" + fi +} + +src_prepare() { + default + # c.f. https://github.com/fwupd/fwupd/issues/1414 + sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ + -i plugins/thunderbolt/meson.build || die + + sed -e '/platform-integrity/d' \ + -i plugins/meson.build || die #753521 + + sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \ + -i data/builder/meson.build || die + + vala_src_prepare +} + +src_configure() { + local plugins=( + $(meson_use amt plugin_amt) + $(meson_use dell plugin_dell) + $(meson_use flashrom plugin_flashrom) + $(meson_use gusb plugin_altos) + $(meson_use modemmanager plugin_modem_manager) + $(meson_use nvme plugin_nvme) + $(meson_use spi plugin_intel_spi) + $(meson_use synaptics plugin_synaptics_mst) + $(meson_use synaptics plugin_synaptics_rmi) + $(meson_use thunderbolt plugin_thunderbolt) + $(meson_use tpm plugin_tpm) + $(meson_use uefi plugin_uefi_capsule) + $(meson_use uefi plugin_uefi_capsule_splash) + $(meson_use uefi plugin_uefi_pk) + ) + use ppc64 && plugins+=( -Dplugin_msr="false" ) + use riscv && plugins+=( -Dplugin_msr="false" ) + + local emesonargs=( + --localstatedir "${EPREFIX}"/var + -Dbuild="$(usex minimal standalone all)" + -Dconsolekit="false" + -Dcurl="true" + -Ddocs="$(usex gtk-doc gtkdoc none)" + -Defi_binary="false" + -Dsupported_build="true" + $(meson_use agent) + $(meson_use archive libarchive) + $(meson_use bluetooth bluez) + $(meson_use elogind) + $(meson_use gnutls) + $(meson_use gusb) + $(meson_use lzma) + $(meson_use man) + $(meson_use introspection) + $(meson_use policykit polkit) + $(meson_use systemd) + $(meson_use test tests) + + ${plugins[@]} + ) + use uefi && emesonargs+=( -Defi_os_dir="gentoo" ) + export CACHE_DIRECTORY="${T}" + meson_src_configure +} + +src_install() { + meson_src_install + + if ! use minimal ; then + newinitd "${FILESDIR}"/${PN}-r2 ${PN} + + if ! use systemd ; then + # Don't timeout when fwupd is running (#673140) + sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ + -i "${ED}"/etc/${PN}/daemon.conf || die + fi + fi +} diff --git a/sys-apps/gpet/Manifest b/sys-apps/gpet/Manifest index 55f25cde28b9..49f3e3881b66 100644 --- a/sys-apps/gpet/Manifest +++ b/sys-apps/gpet/Manifest @@ -1,3 +1,3 @@ DIST gpet-0.4.tar.bz2 352653 BLAKE2B e9bee8cd62332101afea95f427646dfc51a0dcbb95a5807b8cbd0503594090ef2ff5428876bd7d017465d8708e7c3a282602cc48edeb6cafd2976a51568a911d SHA512 e373d57ab67d71fb750ee9af93893d036ff26f764f317328117745a4440c0559c2356866c09acfe579473e950e003744ae0a308df3b284d46097dcfe967c122e -EBUILD gpet-0.4.ebuild 479 BLAKE2B 4cc59195abf756759b4b6e5ea9e42a6ca5a974339711d36b805918af75f9e5f3dae4d960f43840df2faf535935dfc9709f001dcd7ebba1462fdfa5d3834b468a SHA512 9df9ba5abdae33247c01fbcd6875340cefa001a4a38d8bea577cf8174e742ea5b9b92ad082015803ab8dd3b2d87801fdcb71ca1693394e5c6ec898a77f6e51b3 +EBUILD gpet-0.4-r1.ebuild 609 BLAKE2B 6fbcf20b2165b2c7d50889763b465cb2f37bc7cd59f349298ca8939844b3ca464b0f7b4b7a6de65a4789bee1a599668041b031ab99c8c52931a50ab2941d2de7 SHA512 99f4f90bb345bee2cb683381eee49b2f84b1fbad42a8a241b922bd00361a8c4fef30256b9473222478001e4ca84117d89b0481b22f63369341cbf1c6b3739117 MISC metadata.xml 302 BLAKE2B 7424fdf95d939a357153ced679c81cf6495dbe1ea07a81592265a4be83e78388f3d88ff24b424353c94c5eef3f1607c7a27834ba72b8511b5908a6038b65cb95 SHA512 54fae275193922e2c838c0a092c0a6ebd8b742b7d92e96b2a2e63defdaf094179eb7a7836d91aec24f1406140fdf86f24cf277ffb454e6ac48cd43b5848f5577 diff --git a/sys-apps/gpet/gpet-0.4.ebuild b/sys-apps/gpet/gpet-0.4-r1.ebuild index 70a0b701a922..0fc96d64a9fa 100644 --- a/sys-apps/gpet/gpet-0.4.ebuild +++ b/sys-apps/gpet/gpet-0.4-r1.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit autotools + DESCRIPTION="GTK+ based TOMOYO policy editor" HOMEPAGE="http://en.sourceforge.jp/projects/gpet/" SRC_URI="mirror://sourceforge.jp/gpet/53178/${P}.tar.bz2" @@ -21,3 +23,10 @@ DEPEND="${RDEPEND}" BDEPEND=" dev-util/intltool virtual/pkgconfig" + +src_prepare() { + default + + sed -i -e "/^gpetdocdir =/s!doc/gpet!doc/${PF}!" Makefile.am || die + eautoreconf +} diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest index 52fbf7bc8c37..4955197fb6fd 100644 --- a/sys-apps/hwinfo/Manifest +++ b/sys-apps/hwinfo/Manifest @@ -1,5 +1,3 @@ -DIST hwinfo-21.74-1.1.src.rpm 967046 BLAKE2B 305db6eb3184de0e84d166f0e32988ea2a0ec65eceb322c8c451f33ab8656c38a21a74f416ff08442bcbc5fa91fb4fa8439d907c2c244fe62a2048be7f84b181 SHA512 1a681b51934fbed229b7daa96b5e4e0d8fc62d480927034d0c95ae8c89dc2ae43214c63cca273379162353aeb2bf81883e7c02006c4f45fd1deab0d74f8a2988 DIST hwinfo-21.76-1.1.src.rpm 966123 BLAKE2B dbacb4d8605e3529eb94dd91b4a480c73c935024cf119ba12fd1be4850dd3f5e07df6a306b39b04b1e830284be73d0fcb476f396f27312b692b0a424190a1388 SHA512 990c63574531f74949b60e072bb68069aba99594b57b4b1f71150c96a8630c32a56437968b37bff675a837e08f172e0e18743517566460b8120630d8195f8224 -EBUILD hwinfo-21.74.ebuild 1537 BLAKE2B 9940931b974e902a855baa9bb36ccc71980bedfa1205c8c78d9d1e68aaf46164b9a60d693b83dc763a5f227cb9a25f81f04d46ae1a60d3e0f24ba21f5376d280 SHA512 e95bc7124e3e84f714ac43573edfb35e52d96683a44100de95c99129ea97fc50aec7bcbfc5de0f4d7c4a952a9a006bc30ebd7623a04e50ff27409ed9e1e60f83 -EBUILD hwinfo-21.76.ebuild 1537 BLAKE2B 9940931b974e902a855baa9bb36ccc71980bedfa1205c8c78d9d1e68aaf46164b9a60d693b83dc763a5f227cb9a25f81f04d46ae1a60d3e0f24ba21f5376d280 SHA512 e95bc7124e3e84f714ac43573edfb35e52d96683a44100de95c99129ea97fc50aec7bcbfc5de0f4d7c4a952a9a006bc30ebd7623a04e50ff27409ed9e1e60f83 +EBUILD hwinfo-21.76.ebuild 1547 BLAKE2B 9e691103ba93913281be177fc503a73e939ad9f1c3cb01c636d7d69a10ef642e6ca91cf0c2258594103e519135eabd83170c4e1d64792175a14d8f38a8f06ce8 SHA512 27048939938710f67b98c152bd8a4aa11bd3e75fe17e0c30a2cc7c5ba7da466a3a636d4299bdfada88aa190c8dfc89f3058ae12b65e959055a16e99b3156f5a0 MISC metadata.xml 335 BLAKE2B 038b3d0d2c3215e9c141823f3578880ecb43da74b991cce36793a6af5b3549603ad1fa95c1bbe477126c3b84f6493099400d8914d94cdbe1c557b0166c0ca43b SHA512 e24489f0c20cc1cd356f7059c4a2a8d02b2f39fcb43df0d685977ce6e1593c134420daf6d940f96f08fd0d19026618d89946e6ff0a24f449be5d5c8910b10581 diff --git a/sys-apps/hwinfo/hwinfo-21.74.ebuild b/sys-apps/hwinfo/hwinfo-21.74.ebuild deleted file mode 100644 index f1d008f78694..000000000000 --- a/sys-apps/hwinfo/hwinfo-21.74.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit rpm toolchain-funcs - -DESCRIPTION="Hardware detection tool used in SuSE Linux" -HOMEPAGE="https://www.opensuse.org/" -#Using srpms from SUSE to get pregenerated changelog, otherwise we could use GH -#SRC_URI="https://github.com/openSUSE/hwinfo/archive/${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI="http://download.opensuse.org/tumbleweed/repo/src-oss/src/${P}-1.1.src.rpm" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - amd64? ( dev-libs/libx86emu ) - x86? ( dev-libs/libx86emu )" -DEPEND="${RDEPEND} - sys-devel/flex - >=sys-kernel/linux-headers-2.6.17" - -MAKEOPTS="${MAKEOPTS} -j1" - -src_prepare() { - # Respect AR variable. - sed -i \ - -e 's:ar r:$(AR) r:' \ - src/{,isdn,ids,smp,hd}/Makefile || die - - # Respect LDFLAGS. - sed -i -e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' src/ids/Makefile || die - - # Respect MAKE variable. Skip forced -pipe and -g. Respect LDFLAGS. - sed -i \ - -e 's:make:$(MAKE):' \ - -e 's:-pipe -g::' \ - -e 's:LDFLAGS.*=:LDFLAGS +=:' \ - Makefile{,.common} || die - # Workaround from Arch, if using source tarballs from github - # echo 'touch changelog' > git2log - default -} - -src_compile() { - tc-export AR - emake CC="$(tc-getCC)" RPM_OPT_FLAGS="${CFLAGS}" -} - -src_install() { - emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install - keepdir /var/lib/hardware/udi - - dodoc changelog README* - docinto examples - dodoc doc/example*.c - doman doc/*.{1,8} -} diff --git a/sys-apps/hwinfo/hwinfo-21.76.ebuild b/sys-apps/hwinfo/hwinfo-21.76.ebuild index f1d008f78694..09823f8d2035 100644 --- a/sys-apps/hwinfo/hwinfo-21.76.ebuild +++ b/sys-apps/hwinfo/hwinfo-21.76.ebuild @@ -6,7 +6,7 @@ EAPI=7 inherit rpm toolchain-funcs DESCRIPTION="Hardware detection tool used in SuSE Linux" -HOMEPAGE="https://www.opensuse.org/" +HOMEPAGE="https://github.com/openSUSE/hwinfo/" #Using srpms from SUSE to get pregenerated changelog, otherwise we could use GH #SRC_URI="https://github.com/openSUSE/hwinfo/archive/${PV}.tar.gz -> ${P}.tar.gz" SRC_URI="http://download.opensuse.org/tumbleweed/repo/src-oss/src/${P}-1.1.src.rpm" diff --git a/sys-apps/input-utils/Manifest b/sys-apps/input-utils/Manifest index 4797e1c7da1f..b37b1c7409c5 100644 --- a/sys-apps/input-utils/Manifest +++ b/sys-apps/input-utils/Manifest @@ -1,3 +1,3 @@ DIST input-1.3.tar.gz 23755 BLAKE2B 45a9d138f55677da596298d86e18af5849a81f5cff7397dab028c4939b6b385cc3116fc48bd23844edc36330d0f25456931fb903af9adcdc60aa21d8267cf725 SHA512 4f864301e6b7d40882327b26780db1d9b7e37215cb558653738f93b74ea2781f64676e41a440fbd2659f14bd30640c7af6c709315cce4dcc6a157d80ac2cb60d -EBUILD input-utils-1.3.ebuild 563 BLAKE2B 1e980e694a0d14be800110e0f21b637c1c21d5ed8b28117332a312c1c52d42b3792b196b82b0726f610075bc0acae1ad8a832010a49b75bf33847ea938c950d0 SHA512 6d5fd990373f6ece92c61e9fee8901ec05ae90dd41bee785dafacae7e7893f442efe18873379460994aa1d1c926c5a9939d0321c4f939fcbe35c5fad255e6a72 +EBUILD input-utils-1.3.ebuild 570 BLAKE2B e8c662469a4d6503db709904c6d446d91bce0ab9ee9f9d111306797dcc6f01095f128cf5c261b5e3943b138d4b1f10ef0fa2ecbf430a23516d6c53b8430bf962 SHA512 b4741f733570824d38e4a483c10c5e9c3fde5a217fd3c1fe152405e92b1b57966a8499696c8029c4c2ac3ea47c75cb10ffafb7cb10a9ebc307782c56bf8f8890 MISC metadata.xml 580 BLAKE2B dba766179c7ec94124f83b699826a4173a54c189ff3e4dfe2aca140b1cd14755fa70c4ca8bdb693aba6487426c4de15911818b50f79ee1acf92e82120728d13d SHA512 e55a38b9782b54475eda9cda1488bc130031f7504a42b27f310821aedead9ecc76e2eb3fcbe9f3c4d372290a39e840433813300c5731342cafa7a8614d17dd9f diff --git a/sys-apps/input-utils/input-utils-1.3.ebuild b/sys-apps/input-utils/input-utils-1.3.ebuild index d47716258637..d5499f832ba5 100644 --- a/sys-apps/input-utils/input-utils-1.3.ebuild +++ b/sys-apps/input-utils/input-utils-1.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.kraxel.org/releases/input/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ~riscv x86" S="${WORKDIR}/${MY_P}" diff --git a/sys-apps/minijail/Manifest b/sys-apps/minijail/Manifest index d0a0295b9be4..213cfe26a682 100644 --- a/sys-apps/minijail/Manifest +++ b/sys-apps/minijail/Manifest @@ -1,5 +1,4 @@ AUX minijail-12-makefile.patch 1511 BLAKE2B 74b620f44ffa3a3f82771d10dfff5999f223613ee734a38be770ac91e128c3e4f26cbbdff197a0636cb8c3b094c70fbed08443560bea095407736327f9d485ac SHA512 c727ff4752345f08d89dab5bc7489793763bf459bc169f132a285bc40c1d8e1e40d366bc8336e35c5362f4e4b999ec9d07db2b3bcd5f394954dae54cb533515a -AUX minijail-9-makefile.patch 1589 BLAKE2B d2b253f769e79c179fce51b858ce9b7b70dec806e7f3f330928e5befc7a6fc12e4a09e5fca0e29404badbab2f389bb4c9385d0ecc555610d3b45df272c5d34e1 SHA512 38a3afe8c17f591e8172ad6725f04d5a898ee3ec3a97ee99c6118c1c12189061906a442b95243e7907031c194f0477c3bdbc6d96df4923b43487f60ededa403b DIST minijail-12.tar.gz 157030 BLAKE2B 55a1bb2aeb31290c211da8b8322672abadab7a2729b0afd6eafce9854a51320a2515bedc54864debc7ede6e437607dad8532ae76c14828d6c4f4265fec404dbe SHA512 feb829fc113f0041b9ab25e845560af47408f3d5f0704cdf756d0b8162ae7aae331c350908c3b17a4a5593ffa7326044f222a35e6794471cd5ed60173b2befa2 DIST minijail-17.tar.gz 212425 BLAKE2B 411a0e2f1af21dd689fa669f9658e78c3c3c6439fdbea01b41b1d0cb3cbc1dc017634177350a3d5392783201f80874ec2a1604ed2577dbf5d7dbdf584a087267 SHA512 4b9aa29a78f7525ffeedfb927f6b567044ff7c9d32ef0e6771ed2b5c2d47c7a14ccbe000efc988ce6bb4173c5a9ae734b222aac1a00fb0e60777d7dccc149acf EBUILD minijail-12.ebuild 1804 BLAKE2B 7065e7c2dc8bdec18ab687e8b2cbc5ca8ca14adfbba4c1ebf2064d9da0f274823d35e1b79e30975824363373a59affdb795585376019ebd362562d5b59350f8a SHA512 bd180ef8ddfd13e061cac2e8cebf0f200817fd0f9b7894fa7e082461e910a773f670634ad4b889fe406a1dfdccb1f33ef7cdcb1bad5f81f149459eb127df8da6 diff --git a/sys-apps/minijail/files/minijail-9-makefile.patch b/sys-apps/minijail/files/minijail-9-makefile.patch deleted file mode 100644 index 6ec44a8079ad..000000000000 --- a/sys-apps/minijail/files/minijail-9-makefile.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/Makefile b/Makefile -index 54ee978..a50ee9a 100644 ---- a/Makefile -+++ b/Makefile -@@ -46,8 +46,8 @@ ifeq ($(USE_SYSTEM_GTEST),no) - GTEST_CXXFLAGS := -std=gnu++14 - GTEST_LIBS := gtest.a - else --GTEST_CXXFLAGS := $(shell gtest-config --cxxflags) --GTEST_LIBS := $(shell gtest-config --libs) -+GTEST_CXXFLAGS ?= $(shell gtest-config --cxxflags) -+GTEST_LIBS ?= $(shell gtest-config --libs) - endif - - CORE_OBJECT_FILES := libminijail.o syscall_filter.o signal_handler.o \ -@@ -73,6 +73,7 @@ clean: CLEAN(minijail0) - - - CC_LIBRARY(libminijail.so): LDLIBS += -lcap -+CC_LIBRARY(libminijail.so): LDFLAGS += -Wl,-soname,libminijail.so - CC_LIBRARY(libminijail.so): $(CORE_OBJECT_FILES) - clean: CLEAN(libminijail.so) - -@@ -91,6 +92,7 @@ TEST(CXX_BINARY(libminijail_unittest)): CC_LIBRARY(libminijailpreload.so) - - - CC_LIBRARY(libminijailpreload.so): LDLIBS += -lcap -ldl -+CC_LIBRARY(libminijailpreload.so): LDFLAGS += -Wl,-soname,libminijail.so - CC_LIBRARY(libminijailpreload.so): libminijailpreload.o $(CORE_OBJECT_FILES) - clean: CLEAN(libminijailpreload.so) - -diff --git a/common.mk b/common.mk -index 77879d8..1cd815b 100644 ---- a/common.mk -+++ b/common.mk -@@ -323,7 +323,7 @@ COMMON_CFLAGS := -Wall -Wunused -Wno-unused-parameter -Werror -Wformat=2 \ - -fno-strict-aliasing $(SSP_CFLAGS) -O1 - CXXFLAGS += $(COMMON_CFLAGS) $(COMMON_CFLAGS-$(CXXDRIVER)) -std=gnu++14 - CFLAGS += $(COMMON_CFLAGS) $(COMMON_CFLAGS-$(CDRIVER)) -std=gnu11 --CPPFLAGS += -D_FORTIFY_SOURCE=2 -+CPPFLAGS += - - # Enable large file support. - CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest index 449f0d4c76c3..396faa8c1128 100644 --- a/sys-apps/pkgcore/Manifest +++ b/sys-apps/pkgcore/Manifest @@ -1,8 +1,10 @@ DIST pkgcore-0.12.4.tar.gz 622553 BLAKE2B fc9df4f9499ad20cec439275880e469e1ffd8204b894c0a523ed27a3e55748e58634fca2af693fcc453e8aec068733a944331f7cea52e983e50981374239d534 SHA512 bc9eccd8d903e987df97354de008826dd52a7db0d9def064c56bb9425d1aa69e8fdf15dcfd0f86057c98a3c0adefee633a3c1cc9b689a334c126730cbdeafd0c DIST pkgcore-0.12.6.tar.gz 624740 BLAKE2B fb03cffd274d8c31f6eff33a0f9133dc0ef84a7e671d6f29cda938fca3e353d498173ae3e5ce7c5b7433e5e668096ae63ed7c4cc7108ad6edc7db3c247ce85df SHA512 18d01f7a52a7aeae0fcfd8ce81e27f98a204c3743e211a2dd182cabd6521c9d528663affbd98521a41ada17cbece860fce61d9e6a2dff2ca525da26741807c95 DIST pkgcore-0.12.7.tar.gz 624992 BLAKE2B 93058dcf8eae891a7462b3125d648c218c034388daa8be86b4cbea34b82cbe7c484f354f4bf94bb3e4f25858783402d172231f773aded15b4dd902e52f9a3620 SHA512 2d25c3262a3fa806514d64a2f15664b8f0fe3ab2946ae681dd0ba7cebd8c9c9490500f809907f40eb5072763134d4e68cd75d17b2b7321a33fb55ebdad0768a7 +DIST pkgcore-0.12.8.tar.gz 624442 BLAKE2B d7e15fc659820e3cd6e4f7848413c12b2439d38900c9f64c582ba078d3fe874c12d66d39fdf59a7e4ff585d82d29fcad16c9af869b2388ed6e0af0be7d16d887 SHA512 d02087d4bada3bc2f87738b0ddedc72782b2facdf681927e84fed32dc6645e48ebde83de5aeb9eb0f64e01afe2ac511ae0f7450a2708698bbad872a60044319b EBUILD pkgcore-0.12.4.ebuild 1113 BLAKE2B 707e98f4ffdd8b2487c805d08ffe8953c95fc59e2a29e9756effa6dbb4eaafa457687a96032604594b121c32252242400c9a7609ee6be6f1cd61e50b2a67eba7 SHA512 18e5e6ea67c0c476a2232fc427d74ff52c0b92225f03d874f4018fa5b59c23a7a4ac79c4f11f50634e29ee09416f71801565fd26a48039bbf1c2078df09aeb10 EBUILD pkgcore-0.12.6.ebuild 1121 BLAKE2B f4bcdaba4897269b8e3d0b928fe30b4b8d913bed49397fbd6b8c125455c8e92bc6f16986cfa2d8764d38a3d148eab74b67db3d90cc614104fea135124858dab1 SHA512 6eca87f6e49d9f06fb602d6e2c504922dfbe9b7067a51016b8d8c91015f221afd7cf6dca7fd0b0010d83b5122afe5731447bc3cd22f5f49be97d1fa195a82ad6 -EBUILD pkgcore-0.12.7.ebuild 1119 BLAKE2B fce894d6475003f291f3d8c5a631401858308e28000b896d254eaeb612ccc9863c3db6a22b5b9d3528810b92ada15cbeb6f2c6dbc70ee3892c8759ccd4528111 SHA512 5466790abbaabd9b1a1200e048649229f65b793437e7ee30595009eb61b9d9c88a037e7a641c55ab5700946190f71f875af436c70d39cb338b2a66622c8399c5 +EBUILD pkgcore-0.12.7.ebuild 1113 BLAKE2B 707e98f4ffdd8b2487c805d08ffe8953c95fc59e2a29e9756effa6dbb4eaafa457687a96032604594b121c32252242400c9a7609ee6be6f1cd61e50b2a67eba7 SHA512 18e5e6ea67c0c476a2232fc427d74ff52c0b92225f03d874f4018fa5b59c23a7a4ac79c4f11f50634e29ee09416f71801565fd26a48039bbf1c2078df09aeb10 +EBUILD pkgcore-0.12.8.ebuild 1127 BLAKE2B e9ebe5fa39276a8ee620a9e3f322bcc8bf4ac7f5885c1dcb64507137b11a29e33af7ca3d4d75401c6d741e4e3c0abcdcc1a57adbc56a3827d7f536702eb29d4f SHA512 d9c1964fb7968ad83bd01656ca18aa30ce717b0b6e8763c052f1cdf2d84b8f3c86dba88cec165528b49750651cfdb73e48b6bbb628103d2b79f71236fda6dff0 EBUILD pkgcore-9999.ebuild 1121 BLAKE2B f4bcdaba4897269b8e3d0b928fe30b4b8d913bed49397fbd6b8c125455c8e92bc6f16986cfa2d8764d38a3d148eab74b67db3d90cc614104fea135124858dab1 SHA512 6eca87f6e49d9f06fb602d6e2c504922dfbe9b7067a51016b8d8c91015f221afd7cf6dca7fd0b0010d83b5122afe5731447bc3cd22f5f49be97d1fa195a82ad6 MISC metadata.xml 338 BLAKE2B 8e1efa689e0129b002ca035af4d3da753e9ef4d80029e01d2baceaca5a45a4c1c325ed25d58f38094a73564a033611e92a3b60d836967e9c664021d643bd0813 SHA512 019b2e934eb8f3a04148d4426466fc397983487122e10e9a2dc2f42e747bc7675947edf549e5ab5efb284d753de0af994a0a7a4f014ee22183a156afa4a462da diff --git a/sys-apps/pkgcore/pkgcore-0.12.7.ebuild b/sys-apps/pkgcore/pkgcore-0.12.7.ebuild index 7e94ce62b01d..94ce676970ca 100644 --- a/sys-apps/pkgcore/pkgcore-0.12.7.ebuild +++ b/sys-apps/pkgcore/pkgcore-0.12.7.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git" inherit git-r3 else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" fi diff --git a/sys-apps/pkgcore/pkgcore-0.12.8.ebuild b/sys-apps/pkgcore/pkgcore-0.12.8.ebuild new file mode 100644 index 000000000000..bf0996ccbaa8 --- /dev/null +++ b/sys-apps/pkgcore/pkgcore-0.12.8.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_IN_SOURCE_BUILD=1 +inherit distutils-r1 + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git" + inherit git-r3 +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +fi + +DESCRIPTION="a framework for package management" +HOMEPAGE="https://github.com/pkgcore/pkgcore" + +LICENSE="BSD MIT" +SLOT="0" + +RDEPEND=" + >=app-shells/bash-5.0 + dev-python/lxml[${PYTHON_USEDEP}]" +if [[ ${PV} == *9999 ]]; then + RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]" +else + RDEPEND+=" >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]" +fi +BDEPEND=" + test? ( + >=dev-python/pytest-6[${PYTHON_USEDEP}] + dev-vcs/git + ) +" + +distutils_enable_tests setup.py + +src_test() { + local -x PYTHONDONTWRITEBYTECODE= + distutils-r1_src_test +} + +python_install_all() { + local DOCS=( NEWS.rst ) + [[ ${PV} == *9999 ]] || doman man/* + distutils-r1_python_install_all +} diff --git a/sys-apps/plocate/Manifest b/sys-apps/plocate/Manifest index c07aa89dd0cf..ab876f4c67c1 100644 --- a/sys-apps/plocate/Manifest +++ b/sys-apps/plocate/Manifest @@ -6,7 +6,7 @@ AUX updatedb.conf 898 BLAKE2B de832ebc92e103ccaf8923b2eb872ad8e1ef36be2dfaa463a0 DIST plocate-1.1.10.tar.gz 72222 BLAKE2B 2d84177454380c9e806a46a6e7057aca15b65c9d83179ba35062d0b8772e7cb3ff50d594c294d73157e7705d4b2eea3f12d07e614076e6a6c7a9b532f42640f5 SHA512 eee4a8982b8fff18793cd06c35cdea501226fae6409df02e8bed3d14feb3ed4ba6c29e907f36f5efb74202e8926547def83379b03aeb6348e1a6e7b51f12fdb9 DIST plocate-1.1.11.tar.gz 72366 BLAKE2B 2b945b3e61244670e2295e1e5abc2af65d2cdbb2393a96961cd4ae97384a735c327037771e6f41927cec0860207a6f98b7b0c2b03d08678bdb0d72a94dfa04f7 SHA512 59f88a11ebbac5f350acca6d1a5890ac1c1cb10c1de2e4e149df60fc63673eefa7f143b06f79ec4e59c65d435b3e222eba5618c48afab97983d76f56fbe8b433 DIST plocate-1.1.8.tar.gz 71569 BLAKE2B 06ad0e9535b76bf0102cdeeb6014e2d84f85f51f5926520566e9c6871f04ac09651bb0674ed679d2a4c0d4e516e55dfef35a7021112fad3549bf76993554aeb5 SHA512 a685347df64ac1a3eb7789cb7023b4d0ffed5fb7435a4bd88c3943991e145a387829532ec0c01d30d851b97b8d3173ff4c7c274775e639b75f0b1b45e5bca2a6 -EBUILD plocate-1.1.10.ebuild 2077 BLAKE2B 91d876de6fedc8a7ddca2fdc69c15c2621b3bf68f9cd0b99ed5cde99f79d34e60c1455aeed18d41abc6fe3f7ba0c3192e1c79066ccd06504218076fd5d7cade6 SHA512 b3df2ccd26728d8b186ffe9ac29f876f3c3fa1df2ee2aaa8437e7808140ed21884cb4401af22556d20bf5d5d9d6548f17533fa59c8da534bd7ef64e14886d425 +EBUILD plocate-1.1.10.ebuild 2076 BLAKE2B 24b739711c5dea6964cfac26f18ab4f7cff7d1a78a8d2d7d2ed1810d12a417a42bd0257ad14a36c9e65aa7c767fc9cd8a7db151f58ceac2345514964c084d0fe SHA512 0a6c96e085ed11000df8b30e2406c100a2404f0cd72b912493ab3734fca774313e86cb0f489db791fb2daa39bcba21a6452428a0ac1d539617296e72b5ef5c30 EBUILD plocate-1.1.11.ebuild 2077 BLAKE2B 91d876de6fedc8a7ddca2fdc69c15c2621b3bf68f9cd0b99ed5cde99f79d34e60c1455aeed18d41abc6fe3f7ba0c3192e1c79066ccd06504218076fd5d7cade6 SHA512 b3df2ccd26728d8b186ffe9ac29f876f3c3fa1df2ee2aaa8437e7808140ed21884cb4401af22556d20bf5d5d9d6548f17533fa59c8da534bd7ef64e14886d425 EBUILD plocate-1.1.8.ebuild 2063 BLAKE2B 35011f66c0957b50861f4a8e4c658ac6457e1d64bc3171713dd7627fcb358a6dd55d9d270966cfaf928bd007d5897e1c0fffa639d00065d2de06450a57dce0b4 SHA512 24b7f3f25aceba3661c38b60a76d6e4229d8bc57c1ce45e00461bd4f264d43bab8432a592ca9abb0b662bad77e0c8072c6243164f0f395a07abda602b8de3d1d MISC metadata.xml 1393 BLAKE2B 1459e2cc800bad910a9e08a1fd0d6b6a533d3420279a4a89d5c07d91775180669684d5b454962323acb5ecc1d96de650f48623a9f63319004ad25bea7b4ded97 SHA512 16e282b1d1bc1f71631bbde3ca935c1e0747175460860ef068e6855a9efa3d843841e0b9deaa0848a2f4fbff32aa630f0b93c398b196c6619a61f59263ee8e31 diff --git a/sys-apps/plocate/plocate-1.1.10.ebuild b/sys-apps/plocate/plocate-1.1.10.ebuild index d198d630c595..5b617cb2ffc9 100644 --- a/sys-apps/plocate/plocate-1.1.10.ebuild +++ b/sys-apps/plocate/plocate-1.1.10.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://plocate.sesse.net/download/${P}.tar.gz" # GPL-2+ for plocate itself LICENSE="GPL-2 GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm64" +KEYWORDS="amd64 ~arm64" IUSE="+io-uring" RDEPEND=" diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 54dd29dfd62a..2e2ba0dff9c2 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -10,10 +10,14 @@ DIST portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch 10306 BLAKE2B 9ffcf396b983a DIST portage-3.0.20.tar.gz 1348818 BLAKE2B e8af0662d073110a921ef23865872b0440f5e549da92b828af3dc71010d0f49d98c429c52c90ed683407fcfee7bf17a504082166f2fcad9590d7435dd43dfb83 SHA512 69c1846dedf0cfa3f57b2748cf8e077ead05ab0185e785dfc6310439b8624cdd72449209a807f12f59a5175ba065f8cca1409d43bee6012900b2c8b1e7f9b7e9 DIST portage-3.0.22.tar.bz2 1150425 BLAKE2B af9cb1eeb96d887fe13514b14b9820c37b0de3204ebd423e69fea839a2908db2a916a03e82186ee9cc64562b770c27e407431fc00427ec1a5119b80ce35d5128 SHA512 0c227cb5a532235e735f973a5eb8f018189abb067e4b94276a780357b6ce93c9c967a03a3320affddf3c614fd26188e7598eeaee350305013b427a343892b016 DIST portage-3.0.23.tar.bz2 1150929 BLAKE2B 26009cd2c19a138783a713d524744215796d35bb495e753e0fc76a354db89cfd210bdb62eea2dc54609e18024be49cec0e1de96bb6225f6d50fe9d8f52d8cbe5 SHA512 e0b21cd9f2eeaf201e2caf9f39afd9d0525a25d1576955b277ea9b44f0fcfdbe27ff54de16a06da53f72a08bbafc73a14f9d874dba4edebca3cbdf69fbf31862 +DIST portage-3.0.24.tar.bz2 1153838 BLAKE2B b2cbb8b3156987f42ff6c8f140586eae40da4a0a42091a4d11f46b61b66e81ac8e4c366e69b12c06d3a300405f089d68e70175efb7eabe25bb19c47679c19873 SHA512 b16751ba0b4c604cd7d72ad8dfaad40d845f87066b4e54fe264093b88a0b29a6af4e8b72f00be2da501fd288dfa23143d8f61f49048e8565b9d17687ef3732d9 +DIST portage-3.0.26.tar.bz2 1153321 BLAKE2B bec2409fa80b236bff10ba1840f6b11294a2a08148e2fd143e13f09f8baf68a1fe1a0a448169850e33b4bb00eefbd0745e6503ffe61d0e5ca604d949a93c997c SHA512 d3ac941a3f9b24747e66ceda508ca6b6211c6ec412b7fbdfbbc9191696b67516aec4ab5ee5e49a086e32567e54f9156c3bf5c4fddb85ccebb1c61bb4c87e719a EBUILD portage-3.0.18.ebuild 8756 BLAKE2B f4a457de8df4a6c79568de33f898c56016ef44fc44b8965befd5c15dd16b93a800c8797ebfaddb0cb6e81c1a6f7af68eb297d9399bad9aa534ea75117eba73e0 SHA512 40329720f7ea7538da334479835cf21560f2e3c3420863593cbaf7dfb454dae1b01293256622ee09c05d3e7d8949e4f2839d1d1bd0911ccb9d6e63254003790d EBUILD portage-3.0.19.ebuild 8512 BLAKE2B 06282a5646db362eb2031c129fd277ddb9e911579784ef9c156df2aa8b48895e50e5612bb012d3145ffd279ba7c67df642e985fecd186c626969ff5cc7c59cea SHA512 b87c08791772a3d2b349caef7fc2af307fef0152631caa7cc641ebbf9da306ec8c96ee0e0de145b9e962766da1e93c511e068bc23d91585d9d3d084cbb2b0751 EBUILD portage-3.0.20-r6.ebuild 9869 BLAKE2B 9b6a95912f49c38f004384a630439c9d007bf56aa8020a55be7e466497403f0e1a3d82cba0f10678034153c451c5fb730898fa2c0d25e9e524dfffe788ad8e5d SHA512 e64ae862c144824ace31c0b6b65bd2bc34824206f301c52337294c72cab9a679d8b6eeea1fb3cde35499b3970618d3ac075e83eb68ff1a4782a5baa4ea357ed2 EBUILD portage-3.0.22.ebuild 8528 BLAKE2B 74f9bcdb8e92e6b001e9dc7f449c0556a96f268765079eb34c7028893128939eca7b30ac26625849e2b94f2926451e2f2e1c3fbe0939fef88a9ba201ed609276 SHA512 0fe39792c480bcdba77e366b725c5c4f305249a1ba2c34f1d90078f2fc1ea342966f8800db3888506ecc66590b37bcdfd5d5eabeb1554dedc2776afa34e575be EBUILD portage-3.0.23.ebuild 8528 BLAKE2B 74f9bcdb8e92e6b001e9dc7f449c0556a96f268765079eb34c7028893128939eca7b30ac26625849e2b94f2926451e2f2e1c3fbe0939fef88a9ba201ed609276 SHA512 0fe39792c480bcdba77e366b725c5c4f305249a1ba2c34f1d90078f2fc1ea342966f8800db3888506ecc66590b37bcdfd5d5eabeb1554dedc2776afa34e575be -EBUILD portage-9999.ebuild 7824 BLAKE2B bb058756e366050ff60bd9fda782fb36ea8862ae5a62ff520e8ca8e274828d974d8d085c9d03cb94d8494b8fe0fb6f648ba58d508ee44e3d3e6e53a99a83ece9 SHA512 cd5d263d759622de183124f4ebe1bdc1f34f25a02393def436057b802e84ed34bf3a22bd1161e725e7b3c3226b37cf3c844f14e01f61c2d6b1bcde01d9e84fb5 +EBUILD portage-3.0.24.ebuild 8517 BLAKE2B 40317e7f9aba4bae7ee79bd5b199872bbdc8f18a4a1cebbc8fbe30c172fcdc1d79686015317554105766f4055686328c255228ce63b4888ac28c8dd6d22230e6 SHA512 8487aa578431d9db84ad668aca6b0637beab6868c55144a1a42c60a39cd24f18cf1a45f18a60d294fdd8a0e4f98f24b038c7ce2548acedcfb15f720d1bf70174 +EBUILD portage-3.0.26.ebuild 8523 BLAKE2B b7f2e333c662342790a5c2d0513306d5fe7b4d08ba546cb8ce318fa57b4c41a0271bdf9c61b1b6410ed7c1c0abd849d27c41a878aadfd2e3e8ff1665bfd55738 SHA512 6fa4948648dd544e0a75566d24e228605e98de741558637a182454deac454660487bda53aaf0df3dbf0dd23f4d18dcc2f84877f20386bfaa7eee0cae7e880e72 +EBUILD portage-9999.ebuild 7791 BLAKE2B 6b600783f4b3da37fec10c5105cc8d9fbe6bbd9c06b0926b56e7f9ef422b2fcf8ad1be36ed6d4b6c148f3d01438d5331120e336041da116fc6b9141773b4f11e SHA512 bd51dd3e8271a37b90a5250132a9b6bb3ff5f4da00f410a902f6a43fc2871b7b6809babe075b4dbdd5147ec99a71bfe21ba68c777b18cc6a1fb7c761033ae597 MISC metadata.xml 1483 BLAKE2B 5f164044c11b8fc7a103c459be58268403dab87fbbfeedd0f5fa4d1a4edf9ec7d4983cc7d5a3e6d298b268859fc1eb91723f0c98313e9b3b5dfb0368aedb1a20 SHA512 284a46b4708fc88734ca87f041fb6a88bc4a7e6a50ce03533a1eef9602694adcb09679b665a3793e4609ea85fd41b84438b27479ffa00ac53cbf9d4bb89a3402 diff --git a/sys-apps/portage/portage-3.0.24.ebuild b/sys-apps/portage/portage-3.0.24.ebuild new file mode 100644 index 000000000000..cd4bdfc5bc41 --- /dev/null +++ b/sys-apps/portage/portage-3.0.24.ebuild @@ -0,0 +1,264 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_REQ_USE='bzip2(+),threads(+)' +TMPFILES_OPTIONAL=1 + +inherit distutils-r1 linux-info tmpfiles prefix + +DESCRIPTION="The package management and distribution system for Gentoo" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" +SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" + +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +SLOT="0" +IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" +RESTRICT="!test? ( test )" + +BDEPEND=" + app-arch/xz-utils + test? ( dev-vcs/git )" +DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/sed-4.0.5 sys-devel/patch + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) + apidoc? ( + dev-python/sphinx + dev-python/sphinx-epytext + )" +# Require sandbox-2.2 for bug #288863. +# For whirlpool hash, require python[ssl] (bug #425046). +# For compgen, require bash[readline] (bug #445576). +# app-portage/gemato goes without PYTHON_USEDEP since we're calling +# the executable. +RDEPEND=" + acct-user/portage + app-arch/zstd + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/findutils-4.4 + !build? ( + >=sys-apps/sed-4.0.5 + app-shells/bash:0[readline] + >=app-admin/eselect-1.2 + rsync-verify? ( + >=app-portage/gemato-14.5[${PYTHON_USEDEP}] + >=app-crypt/openpgp-keys-gentoo-release-20180706 + >=app-crypt/gnupg-2.2.4-r2[ssl(-)] + ) + ) + elibc_glibc? ( >=sys-apps/sandbox-2.2 ) + elibc_musl? ( >=sys-apps/sandbox-2.2 ) + elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) + kernel_linux? ( sys-apps/util-linux ) + >=app-misc/pax-utils-0.1.17 + selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) + xattr? ( kernel_linux? ( + >=sys-apps/install-xattr-0.3 + ) ) + !<app-admin/logrotate-3.8.0 + !<app-portage/gentoolkit-0.4.6 + !<app-portage/repoman-2.3.10 + !~app-portage/repoman-3.0.0" +PDEPEND=" + !build? ( + >=net-misc/rsync-2.6.4 + userland_GNU? ( >=sys-apps/coreutils-6.4 ) + )" +# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 +# NOTE: FEATURES=installsources requires debugedit and rsync + +pkg_pretend() { + local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS" + + check_extra_config +} + +python_prepare_all() { + distutils-r1_python_prepare_all + + sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die + + if use gentoo-dev; then + einfo "Disabling --dynamic-deps by default for gentoo-dev..." + sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \ + -i lib/_emerge/create_depgraph_params.py || \ + die "failed to patch create_depgraph_params.py" + + einfo "Enabling additional FEATURES for gentoo-dev..." + echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \ + >> cnf/make.globals || die + fi + + if use native-extensions; then + printf "[build_ext]\nportage_ext_modules=true\n" >> \ + setup.cfg || die + fi + + if ! use ipc ; then + einfo "Disabling ipc..." + sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ + -i lib/_emerge/AbstractEbuildProcess.py || \ + die "failed to patch AbstractEbuildProcess.py" + fi + + if use xattr && use kernel_linux ; then + einfo "Adding FEATURES=xattr to make.globals ..." + echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + if use build || ! use rsync-verify; then + sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ + -e '/^sync-webrsync-verify-signature/s|yes|no|' \ + -i cnf/repos.conf || die "sed failed" + fi + + if [[ -n ${EPREFIX} ]] ; then + einfo "Setting portage.const.EPREFIX ..." + hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \ + -w "/_BINARY/" lib/portage/const.py + + einfo "Prefixing shebangs ..." + > "${T}/shebangs" || die + while read -r -d $'\0' ; do + local shebang=$(head -n1 "$REPLY") + if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then + echo "${REPLY}" >> "${T}/shebangs" || die + fi + done < <(find . -type f -executable ! -name etc-update -print0) + + if [[ -s ${T}/shebangs ]]; then + xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed" + fi + + einfo "Adjusting make.globals, repos.conf and etc-update ..." + hprefixify cnf/{make.globals,repos.conf} bin/etc-update + + if use prefix-guest ; then + sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ + -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ + -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ + -i cnf/repos.conf || die "sed failed" + fi + + einfo "Adding FEATURES=force-prefix to make.globals ..." + echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + cd "${S}/cnf" || die + if [ -f "make.conf.example.${ARCH}".diff ]; then + patch make.conf.example "make.conf.example.${ARCH}".diff || \ + die "Failed to patch make.conf.example" + else + eerror "" + eerror "Portage does not have an arch-specific configuration for this arch." + eerror "Please notify the arch maintainer about this issue. Using generic." + eerror "" + fi +} + +python_compile_all() { + local targets=() + use doc && targets+=( docbook ) + use apidoc && targets+=( apidoc ) + + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi +} + +python_test() { + esetup.py test +} + +python_install() { + # Install sbin scripts to bindir for python-exec linking + # they will be relocated in pkg_preinst() + distutils-r1_python_install \ + --system-prefix="${EPREFIX}/usr" \ + --bindir="$(python_get_scriptdir)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +python_install_all() { + distutils-r1_python_install_all + + local targets=() + use doc && targets+=( + install_docbook + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + use apidoc && targets+=( + install_apidoc + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + + # install docs + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi + + dotmpfiles "${FILESDIR}"/portage-ccache.conf + + # Due to distutils/python-exec limitations + # these must be installed to /usr/bin. + local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' + einfo "Moving admin scripts to the correct directory" + dodir /usr/sbin + for target in ${sbin_relocations}; do + einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" + mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!" + done +} + +pkg_preinst() { + python_setup + local sitedir=$(python_get_sitedir) + [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" + env -u DISTDIR \ + -u PORTAGE_OVERRIDE_EPREFIX \ + -u PORTAGE_REPOSITORIES \ + -u PORTDIR \ + -u PORTDIR_OVERLAY \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.default_locations || die + + env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die + + env -u FEATURES -u PORTAGE_REPOSITORIES \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die + + # elog dir must exist to avoid logrotate error for bug #415911. + # This code runs in preinst in order to bypass the mapping of + # portage:portage to root:root which happens after src_install. + keepdir /var/log/portage/elog + # This is allowed to fail if the user/group are invalid for prefix users. + if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then + chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} + fi + + if has_version "<${CATEGORY}/${PN}-2.3.77"; then + elog "The emerge --autounmask option is now disabled by default, except for" + elog "portions of behavior which are controlled by the --autounmask-use and" + elog "--autounmask-license options. For backward compatibility, previous" + elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." + elog "Users can get the old behavior simply by adding --autounmask to the" + elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" + elog "change, see https://bugs.gentoo.org/658648." + fi +} diff --git a/sys-apps/portage/portage-3.0.26.ebuild b/sys-apps/portage/portage-3.0.26.ebuild new file mode 100644 index 000000000000..2520a5c59195 --- /dev/null +++ b/sys-apps/portage/portage-3.0.26.ebuild @@ -0,0 +1,264 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( pypy3 python3_{8..10} ) +PYTHON_REQ_USE='bzip2(+),threads(+)' +TMPFILES_OPTIONAL=1 + +inherit distutils-r1 linux-info tmpfiles prefix + +DESCRIPTION="The package management and distribution system for Gentoo" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" +SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" + +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +SLOT="0" +IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" +RESTRICT="!test? ( test )" + +BDEPEND=" + app-arch/xz-utils + test? ( dev-vcs/git )" +DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/sed-4.0.5 sys-devel/patch + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) + apidoc? ( + dev-python/sphinx + dev-python/sphinx-epytext + )" +# Require sandbox-2.2 for bug #288863. +# For whirlpool hash, require python[ssl] (bug #425046). +# For compgen, require bash[readline] (bug #445576). +# app-portage/gemato goes without PYTHON_USEDEP since we're calling +# the executable. +RDEPEND=" + acct-user/portage + app-arch/zstd + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/findutils-4.4 + !build? ( + >=sys-apps/sed-4.0.5 + app-shells/bash:0[readline] + >=app-admin/eselect-1.2 + rsync-verify? ( + >=app-portage/gemato-14.5[${PYTHON_USEDEP}] + >=app-crypt/openpgp-keys-gentoo-release-20180706 + >=app-crypt/gnupg-2.2.4-r2[ssl(-)] + ) + ) + elibc_glibc? ( >=sys-apps/sandbox-2.2 ) + elibc_musl? ( >=sys-apps/sandbox-2.2 ) + elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) + kernel_linux? ( sys-apps/util-linux ) + >=app-misc/pax-utils-0.1.17 + selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) + xattr? ( kernel_linux? ( + >=sys-apps/install-xattr-0.3 + ) ) + !<app-admin/logrotate-3.8.0 + !<app-portage/gentoolkit-0.4.6 + !<app-portage/repoman-2.3.10 + !~app-portage/repoman-3.0.0" +PDEPEND=" + !build? ( + >=net-misc/rsync-2.6.4 + userland_GNU? ( >=sys-apps/coreutils-6.4 ) + )" +# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 +# NOTE: FEATURES=installsources requires debugedit and rsync + +pkg_pretend() { + local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS" + + check_extra_config +} + +python_prepare_all() { + distutils-r1_python_prepare_all + + sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die + + if use gentoo-dev; then + einfo "Disabling --dynamic-deps by default for gentoo-dev..." + sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \ + -i lib/_emerge/create_depgraph_params.py || \ + die "failed to patch create_depgraph_params.py" + + einfo "Enabling additional FEATURES for gentoo-dev..." + echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \ + >> cnf/make.globals || die + fi + + if use native-extensions; then + printf "[build_ext]\nportage_ext_modules=true\n" >> \ + setup.cfg || die + fi + + if ! use ipc ; then + einfo "Disabling ipc..." + sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ + -i lib/_emerge/AbstractEbuildProcess.py || \ + die "failed to patch AbstractEbuildProcess.py" + fi + + if use xattr && use kernel_linux ; then + einfo "Adding FEATURES=xattr to make.globals ..." + echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + if use build || ! use rsync-verify; then + sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ + -e '/^sync-webrsync-verify-signature/s|yes|no|' \ + -i cnf/repos.conf || die "sed failed" + fi + + if [[ -n ${EPREFIX} ]] ; then + einfo "Setting portage.const.EPREFIX ..." + hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \ + -w "/_BINARY/" lib/portage/const.py + + einfo "Prefixing shebangs ..." + > "${T}/shebangs" || die + while read -r -d $'\0' ; do + local shebang=$(head -n1 "$REPLY") + if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then + echo "${REPLY}" >> "${T}/shebangs" || die + fi + done < <(find . -type f -executable ! -name etc-update -print0) + + if [[ -s ${T}/shebangs ]]; then + xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed" + fi + + einfo "Adjusting make.globals, repos.conf and etc-update ..." + hprefixify cnf/{make.globals,repos.conf} bin/etc-update + + if use prefix-guest ; then + sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ + -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ + -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ + -i cnf/repos.conf || die "sed failed" + fi + + einfo "Adding FEATURES=force-prefix to make.globals ..." + echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + cd "${S}/cnf" || die + if [ -f "make.conf.example.${ARCH}".diff ]; then + patch make.conf.example "make.conf.example.${ARCH}".diff || \ + die "Failed to patch make.conf.example" + else + eerror "" + eerror "Portage does not have an arch-specific configuration for this arch." + eerror "Please notify the arch maintainer about this issue. Using generic." + eerror "" + fi +} + +python_compile_all() { + local targets=() + use doc && targets+=( docbook ) + use apidoc && targets+=( apidoc ) + + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi +} + +python_test() { + esetup.py test +} + +python_install() { + # Install sbin scripts to bindir for python-exec linking + # they will be relocated in pkg_preinst() + distutils-r1_python_install \ + --system-prefix="${EPREFIX}/usr" \ + --bindir="$(python_get_scriptdir)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +python_install_all() { + distutils-r1_python_install_all + + local targets=() + use doc && targets+=( + install_docbook + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + use apidoc && targets+=( + install_apidoc + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + + # install docs + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi + + dotmpfiles "${FILESDIR}"/portage-ccache.conf + + # Due to distutils/python-exec limitations + # these must be installed to /usr/bin. + local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' + einfo "Moving admin scripts to the correct directory" + dodir /usr/sbin + for target in ${sbin_relocations}; do + einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" + mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!" + done +} + +pkg_preinst() { + python_setup + local sitedir=$(python_get_sitedir) + [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" + env -u DISTDIR \ + -u PORTAGE_OVERRIDE_EPREFIX \ + -u PORTAGE_REPOSITORIES \ + -u PORTDIR \ + -u PORTDIR_OVERLAY \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.default_locations || die + + env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die + + env -u FEATURES -u PORTAGE_REPOSITORIES \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die + + # elog dir must exist to avoid logrotate error for bug #415911. + # This code runs in preinst in order to bypass the mapping of + # portage:portage to root:root which happens after src_install. + keepdir /var/log/portage/elog + # This is allowed to fail if the user/group are invalid for prefix users. + if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then + chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} + fi + + if has_version "<${CATEGORY}/${PN}-2.3.77"; then + elog "The emerge --autounmask option is now disabled by default, except for" + elog "portions of behavior which are controlled by the --autounmask-use and" + elog "--autounmask-license options. For backward compatibility, previous" + elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." + elog "Users can get the old behavior simply by adding --autounmask to the" + elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" + elog "change, see https://bugs.gentoo.org/658648." + fi +} diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index 14c3a28ab28f..8d3f85a57721 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -3,8 +3,7 @@ EAPI=7 -DISTUTILS_USE_SETUPTOOLS=bdepend -PYTHON_COMPAT=( pypy3 python3_{7..10} ) +PYTHON_COMPAT=( pypy3 python3_{8..10} ) PYTHON_REQ_USE='bzip2(+),threads(+)' TMPFILES_OPTIONAL=1 diff --git a/sys-apps/qdirstat/Manifest b/sys-apps/qdirstat/Manifest index 60cfbd2f3599..157a5089b562 100644 --- a/sys-apps/qdirstat/Manifest +++ b/sys-apps/qdirstat/Manifest @@ -1,5 +1,3 @@ -DIST qdirstat-1.7.1.tar.gz 8532003 BLAKE2B 4e3eec17dbfedf602580eb94a8264af40e77e2d5f67d4f0b9bf4a073bcd951ec48b9c3cac50463d0c0a2512a31c69adf10c1f77d6df317c617d4260c7fd845cf SHA512 e272cb603262966f6f24ef0dda268b4c9819783ec43e4f09181f7c6c7c9dac576403b8fc0c3a5b90b85bdc381f491ef3fd0db79ed88993f2bed3157529651ce0 DIST qdirstat-1.8.tar.gz 8720791 BLAKE2B fd1da935e82c7cdb2880e3a1e2902627c7f3e2972d08ae83a7ca49c4f641c07184c791471fb7a62211660f6e9bfb6fd0dc309c26c0fcffa1cad98de029e2b384 SHA512 fb7b757cf08c6b6ec0c14be9b08b8b6784a36e100c3ac89dbaef176ef908e43c47c2788fc4002a5e5f7308c990518cb3a104166e12cec605ff1a586bd7a4af10 -EBUILD qdirstat-1.7.1.ebuild 981 BLAKE2B 4573e11212221fe9d1afc86e2767e8292fa0a30b3b8d92bf33251d5465b56761f562fd536f58f69e4e5f0eb1b9942abdb994585cf92a51ed4d5e82550db53fa7 SHA512 438d72ad5a9e91577a5f7c401c588b9bd0670159447f8dac121aacf2ccc69176912aaa92bad5c0cf47a3a4cae5a144cb40df8f680b47e78155d4980c99a81924 -EBUILD qdirstat-1.8.ebuild 993 BLAKE2B f30bd927fdda466dd4bd2638b57200d7a11c5fdaa3a85d5fce2cf7076181f7c713187da8736c175b48401fb27be71865e5bd4c1bec406adf1838e3d2c47e2a60 SHA512 f6ad26d6e18be7a8007945ccac0cf53f3a4161e455b8ef79ad530d8de0caa834b31a1bdd04ff8ec2fca9a4ddb0ac941e2f481688ccfc01f5002014b331454ef7 +EBUILD qdirstat-1.8.ebuild 991 BLAKE2B 4799e6e46bfd638075328690e6a82bf3cc5b01c3d97951352cbf0eeb1261b7594796cc445f3d9b6e1306c15cd6fd5f84ebc0fbfe7b20097a43382db5111939c9 SHA512 7b18d715f765dc7fbf6a1ebf95ff91ed10f90f5ad38e6f0c3e6cb3d5faffa0dc604e608e98d2cef185b8e8b24738780189fdbee56bce4815cbd3b5841e302f02 MISC metadata.xml 883 BLAKE2B b5a3c4f300c991de6174a8e46c9dfe672e9293713d5174b182d9cce2354840c9afa63aea8d5335e1bae365c12440ac93290a3abe46f7cff5264179835ba0a719 SHA512 5b23f2d2bd68dc0562df3cd78a066980cccedb5f7f3dca98b200b7b0ccf739a4a01a2fe84accd6fa96b2ceed5b35087db915b3cdd0d9af2cd080d4a590f4ce08 diff --git a/sys-apps/qdirstat/qdirstat-1.7.1.ebuild b/sys-apps/qdirstat/qdirstat-1.7.1.ebuild deleted file mode 100644 index cf382f9d1410..000000000000 --- a/sys-apps/qdirstat/qdirstat-1.7.1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils xdg-utils - -DESCRIPTION="Qt-based directory statistics" -HOMEPAGE="https://github.com/shundhammer/qdirstat" -SRC_URI="https://github.com/shundhammer/qdirstat/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -DEPEND=" - dev-qt/qtgui:5 - dev-qt/qtcore:5 - dev-qt/qtwidgets:5 - sys-libs/zlib -" - -RDEPEND=" - ${DEPEND} - dev-lang/perl - dev-perl/URI -" - -src_prepare() { - default - - # Fix QA warning about incorrect use of doc path - sed -e "/doc.path/s/${PN}/${PF}/" -i doc/doc.pro doc/stats/stats.pro || die - - # Don't install compressed man pages - sed -e '/gzip/d' -e 's/.gz//g' -i man/man.pro || die -} - -src_configure() { - eqmake5 -} - -src_install() { - emake INSTALL_ROOT="${ED}" install -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/sys-apps/qdirstat/qdirstat-1.8.ebuild b/sys-apps/qdirstat/qdirstat-1.8.ebuild index 6943b8116948..64ab49423bd4 100644 --- a/sys-apps/qdirstat/qdirstat-1.8.ebuild +++ b/sys-apps/qdirstat/qdirstat-1.8.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/shundhammer/qdirstat/archive/refs/tags/${PV}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" DEPEND=" dev-qt/qtgui:5 diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest index 069d37b6a5e1..d4d2296590d5 100644 --- a/sys-apps/rng-tools/Manifest +++ b/sys-apps/rng-tools/Manifest @@ -3,6 +3,6 @@ AUX rngd-confd-6.11 2321 BLAKE2B 6cdf4cf7d61e33415df1c41933d1c38c398fd96370cb4c4 AUX rngd-initd-6.11 1789 BLAKE2B 317c6d3d1b7ad10e137c6b5b615354ba7a6deb256da5ef9d75253a7f84c265536db1b70b290e0029cfaf40e565c8b280e3b1ec79ab93c8f659c969b5dedc7dab SHA512 60bf2c2d4984a1db8fcfaeaebd5249ed6d428c9ccb8412813ce97e146f3143efae23058475ac8baa1c2e88b00012fc119411bcfc14b04a0128696ee69641d98d DIST rng-tools-6.13.tar.gz 59311 BLAKE2B e4601a2fa8158775a8ef7188edbe61a5eb1df35dccc9e1a0ab6b31b559f2f11dd67b682cf9995f0a67834690417e283d443ae6fa54e99ab6462a1185f9b9e09b SHA512 def5f2dcdd1771e8fe5af9476de866ff89a225065416672165af6019cbb166f874fae936b3705221aa47dc13ae99fa63d054d7d49b612f3151cd922a0a129490 DIST rng-tools-6.14.tar.gz 60277 BLAKE2B 177065f9ea68b68459d034d38278f866a0c9d5c499578fabcc29ceb387b49667393f23dcae9f13ff401599846e872dbada73f5e319a99dfa4605cdb77ee3e896 SHA512 6a267257292697023cd349a5bda4998e39e874969f2b437eb2498f2d7d70a7ed293ca76b4c83aebf80955e33f6c8f8bbb65c6636cc0979e0e0d80d148380b8c7 -EBUILD rng-tools-6.13-r1.ebuild 1704 BLAKE2B 3005edac0db4da6d2222973f4a837d025742bb6c6e67fcdba9e4fde45b00ada12b1d3a9ee9e4f42fb4eb4b5d3a7575ee7252eaaa97c3879f85bea56df3dfec2b SHA512 8b7167cc590171dc2ab071b7fb63f245b2647cf086599b76fc5d58c33977af3672c3e6cc842b246bb072bc9b3d66b98856ead1369a009039b58a5a1e7194fd84 -EBUILD rng-tools-6.14-r1.ebuild 1629 BLAKE2B e13a382dcbe0f6a820bc6047213872f705faa1bd7325cb181c7e145e1798a27bb509f5e48038acdf0a27aa9fddbbb2dbd3e7706c7b5b466af45039f5d05d304a SHA512 650546fc3a71c16e976a2e94e09dc1dff2a1bdc2f73ba7b70283c81032969f4ca65631f3be77c9bad0eb8244c04ef54544a3f9087e1451ad1fcad0af82ccd6f0 +EBUILD rng-tools-6.13-r2.ebuild 1706 BLAKE2B 3bf72b094d00456cc61acb2d98ce19a5db21b1f0eb822e722139f696eb81a56e87f0d97ad149b92997827b60c6af10e36ce6594438b68b418586cca58d713c20 SHA512 416a3b5bd41180eda085714ce9e34bb0eac7a925428207aef6f444193a6bb8b6232b00a85e27513bad2921fa318bffe87403fd9fddcf37ce936def6c53685af2 +EBUILD rng-tools-6.14-r2.ebuild 1631 BLAKE2B 7b4b35c429759350d2a5b516ebf2922aef43cde36f5d6a45ae88fac9a027a043f865c96e93f7ce36e62b005ccedc74d74d9e51ae59b3e908614c18b9fb71ba9e SHA512 e4c212ee04442ba3eadb12fac8f7fc77a60ac870281036de185f7b56e1ace223c2b9d560e7bb47450082f9a422a0e2902af2225ad0684c661ae97d632c6564f4 MISC metadata.xml 826 BLAKE2B 6a0fb04e17c209dcbf342357d8b044258533e877bc191d3afea272d379f02e75af2fbf912a840db32313e2fbf418c25556d423aec7793a0fca0fbaca5a4feb18 SHA512 24e9616ab14295a4cc0101752734332e98bb0299c42e831a0db9262527f83433174b704d3b1114841c4a00c82adfbe07b7473b2d57ec85d9358f41bff3797f3c diff --git a/sys-apps/rng-tools/rng-tools-6.13-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.13-r2.ebuild index 1e3e35cf30a9..f70781ca79d6 100644 --- a/sys-apps/rng-tools/rng-tools-6.13-r1.ebuild +++ b/sys-apps/rng-tools/rng-tools-6.13-r2.ebuild @@ -18,7 +18,7 @@ DEPEND=" dev-libs/openssl:0= jitterentropy? ( app-crypt/jitterentropy:= ) nistbeacon? ( - dev-libs/jansson + dev-libs/jansson:= dev-libs/libxml2:2= net-misc/curl[ssl] ) diff --git a/sys-apps/rng-tools/rng-tools-6.14-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.14-r2.ebuild index fa8184cabf28..6d708a77d27f 100644 --- a/sys-apps/rng-tools/rng-tools-6.14-r1.ebuild +++ b/sys-apps/rng-tools/rng-tools-6.14-r2.ebuild @@ -18,7 +18,7 @@ DEPEND=" dev-libs/openssl:0= jitterentropy? ( app-crypt/jitterentropy:= ) nistbeacon? ( - dev-libs/jansson + dev-libs/jansson:= dev-libs/libxml2:2= net-misc/curl[ssl] ) diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest index 98cff3c867cd..950fee7043ab 100644 --- a/sys-apps/sandbox/Manifest +++ b/sys-apps/sandbox/Manifest @@ -1,6 +1,6 @@ AUX 09sandbox 37 BLAKE2B 181213e2cc0bcfa328310cced40bfaba4530d8d2f80e892cb5649d5277c5d59d345ce96ca802a5529a22892c929bafac04c616458fa147a3bee5c89d31b0baf1 SHA512 4e8a9c58debde6480224a45559c5f2db4765213d151e47937f9142f110cac3681bf6402acaf21249a37bb17398e7bc00ae7feee68ecdb5b9363c432eac1b052a DIST sandbox-2.24.tar.xz 438408 BLAKE2B 5e725d17da0abc06d56216f4df2f4034076f50163db1c3bbddbf4fd07dbd5b7d92ef2f1b2c01eb77ff6cf531c5cc6a05e60b028f585310ac56eef96240882843 SHA512 8df5414e334a15f367acfd218ba1b74ba618b93d7bdeca8a039b69cbd81ab048ec5a6cecb24df09fa9a5f4fe214d647acf5138004defd45e6396eec5ae7c93d0 DIST sandbox-2.25.tar.xz 436004 BLAKE2B c9c7d351cdefbb2b1a585904c38742a5a3bde50d3d690c57cff9cdc71ffb822e78a2b56c47afd03fbc70834de5dda13c5a300d9d6b35e09ec400a050d4f8e82c SHA512 4e998c4d9ba6eb69369cc49849060a2e90535eae91fbb64c4d46371fe0ed5182413b14674f10c773fd997b6895bc870ccb23586351f5bb06b69dc11a0cddbe1d -EBUILD sandbox-2.24.ebuild 1620 BLAKE2B 14aae3cf980c2285e1dbf7c735e95801ae646cea389f585aa560bd016f860fd8936bc33ab2428168389910a06e76c20b0a20fe51071df62bd861be41a12c9f27 SHA512 443f9f99cc2e5e303c5c48686bd8f4c1647a39aca7515bc5f847f2cec4ca97cd2b240b221a07742dec94d7cb164075201c4cfbbcd711ade30f7a0a60c2666f16 +EBUILD sandbox-2.24.ebuild 1617 BLAKE2B 5bb22638ea5e5735242e538cb8e0e2598a38237001162fa0cd4d4c3dba6ddb7b9d4607b04ab20b00cb2e7b17c7a759808117d6c0c521a7ba6843fb42e29d1ab2 SHA512 845b5ae83d2c12dc7101d01b76af6693ae888237eda43d2207ef4a1fd3c121d79c554cbb1e7395365867cb96b6a27bbae1c26ff79c301ed00e536acef396dae9 EBUILD sandbox-2.25.ebuild 1623 BLAKE2B 89f1946e8c8984c422bd4837eae4e20e0878496fc2b9dda84e5a53fd3db1d199f449967ed0af3156e26b8d8dedbc38c99db92e57eb2cf928b63da7fff2827e27 SHA512 40ddf4bf456b789e8d45997659057a0247dca25a6f7874860ca63e839cd915c819c2d0faae7e5facd7361dfe76e5e49c391b9f96d8b32967358c5d11f25aa9b5 MISC metadata.xml 253 BLAKE2B 67da03c96f16f23fc1bbed2f09b3ace7f1309ae149005999bf271479a6d142783d69d44aff75f4a7169f20f5bd1f0f605bcda292953a15454896a56c7ba9e7cf SHA512 3148011cc25751dc4d0e6c077963880e10cd49f79b5d9778f31c73f161d958e2dce687dea8dd84e2b5a7762b00d3ff843b1fbc8b1827379ccbd4e3fac8eefcc3 diff --git a/sys-apps/sandbox/sandbox-2.24.ebuild b/sys-apps/sandbox/sandbox-2.24.ebuild index 2d94c2dde836..e95d6bc812a8 100644 --- a/sys-apps/sandbox/sandbox-2.24.ebuild +++ b/sys-apps/sandbox/sandbox-2.24.ebuild @@ -7,7 +7,7 @@ inherit flag-o-matic multilib-minimal multiprocessing DESCRIPTION="sandbox'd LD_PRELOAD hack" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox" -SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz" +SRC_URI="https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest index 10720c7342f2..78eaaf94a3dc 100644 --- a/sys-apps/smartmontools/Manifest +++ b/sys-apps/smartmontools/Manifest @@ -1,7 +1,7 @@ AUX smartd-r1.rc 614 BLAKE2B ec80520e3c8762e39d89eadc63e16bb9d9d4f7dec84507faeba692cfcf106557047ce4ecb2756addff2800f75ae2d550e209a83d1399484f7c1bf1c7f7f859b9 SHA512 7a46212d2d76b335ac7470b51b44e40b1cdd4814e5db4a8a2f013803bb40ea5072fde64590ffd51754b03a6f80a43e835605a5bb3ac2c23e456633995191ec31 AUX smartd.confd 107 BLAKE2B fe687733a13f7a9c32aee16a759feef798fe7db158783497c6cc0ccba2baaff7cf48acffea0a4becb47d470c691855a046617d3f8e934eeebd54df7030ef4877 SHA512 ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437 -AUX smartmontools-update-drivedb 42 BLAKE2B d3a501dc6a3855bd665a16ce0f105269754a29450201f312369acdbf429c8e0c7c4162de8854ca945b2082cb734dbbbb1326df39e4fb1adf271f215329bd2105 SHA512 8ad70fc85ab67b7c32eda95dd37517382c2447862df08b810a54dcdedb1eb8148f3a0e29f402a54adff31d1e88d80d09a258ed9e1e13b597ab2a358ebeda0ce8 +AUX smartmontools-update-drivedb 161 BLAKE2B e1ff7f8f77b6b1afe02228e1b5a3045555ec11f4f1cef86af2a024544ae8714520682ca87592a54d801327f95c4cb3b7c9e1b49592e7bcfcdc0c7837a3a5c881 SHA512 cf460168f1e0cb9a5276a098b62b61044d797ffc992dc0233fae5109769aeab4c04eab56fbcbdc5202513f8a537bc7c40cf463d9260deefd3efa4811e58a249b DIST smartmontools-7.2.tar.gz 992256 BLAKE2B 9f671656e610404b0ab8b6ec51421b4046c64d16331cff821a8d9dbf34dd6c4be4fa63d3a2eaffe2aa869b09acf5f18b9c9750f76e33423710ef9166212e3a92 SHA512 d7e724295b5d53797b5e4136eea5f5cc278db81e4016ba65142438b8c68c54f85a32c582c147a1590b9bc8f74a58952bcb57b9923dd69d34582530a0985799ea -EBUILD smartmontools-7.2.ebuild 4112 BLAKE2B 765864c21f3d938f524f3060e02de878d7720395a5cef885e2be272657450512f009378b1ac919f644036ef5b546b57a716a70ea21fe23472627df8543fc7b85 SHA512 cbd85fad50a8a5e6094fbd0dd75ab906a0650ebf01e3191f8758fba643f7a38ccac1237dd382d79174ba3cc5458671140ff4a827332710ea91dd5df58a26efa6 +EBUILD smartmontools-7.2-r1.ebuild 4112 BLAKE2B 765864c21f3d938f524f3060e02de878d7720395a5cef885e2be272657450512f009378b1ac919f644036ef5b546b57a716a70ea21fe23472627df8543fc7b85 SHA512 cbd85fad50a8a5e6094fbd0dd75ab906a0650ebf01e3191f8758fba643f7a38ccac1237dd382d79174ba3cc5458671140ff4a827332710ea91dd5df58a26efa6 EBUILD smartmontools-9999.ebuild 4120 BLAKE2B 8934c567f80a47f0a3d31a7e97b6a0821bb3cc34cc203c0c8568e78c2023b64bfbc938c4b68584bff6ec9eb41c46f7a6d7edcbc9f1f63a62fa0329b87412c2f8 SHA512 424b6c177004e0d7c706699343e0aa145470e95f6e65cb8d3b326e702c699a02e9bd4a640c30ffec7de635c9d7dfa4db1cd54e46b8d3cc010084103ed494526a MISC metadata.xml 629 BLAKE2B c73896c9de740a685e9032160525ff16cea74570a357add089208502966cd30a8aa9e60cd582ebd739c452e11da41a9e1edf5383d0060b4b6e90e4184d2c7478 SHA512 2263c65a48ab07a4fa6440c38c4d25486f0b55b686983911297becddbacb7549c54d6d8c890e5df5a30654d1b3d589389d83cb4d974bb6c9a5a4aa61907b2478 diff --git a/sys-apps/smartmontools/files/smartmontools-update-drivedb b/sys-apps/smartmontools/files/smartmontools-update-drivedb index 831f1e6541b5..b7d1bb95243f 100644 --- a/sys-apps/smartmontools/files/smartmontools-update-drivedb +++ b/sys-apps/smartmontools/files/smartmontools-update-drivedb @@ -1,3 +1,5 @@ #!/bin/sh -/usr/sbin/update-smart-drivedb +# Hide stdout until a --quiet switch is added: +# https://github.com/smartmontools/smartmontools/issues/110 +/usr/sbin/update-smart-drivedb > /dev/null diff --git a/sys-apps/smartmontools/smartmontools-7.2.ebuild b/sys-apps/smartmontools/smartmontools-7.2-r1.ebuild index 39f90ac1de44..39f90ac1de44 100644 --- a/sys-apps/smartmontools/smartmontools-7.2.ebuild +++ b/sys-apps/smartmontools/smartmontools-7.2-r1.ebuild diff --git a/sys-apps/tuned/Manifest b/sys-apps/tuned/Manifest index f2b46786a1f2..6e46ef246f74 100644 --- a/sys-apps/tuned/Manifest +++ b/sys-apps/tuned/Manifest @@ -1,6 +1,6 @@ AUX tuned.initd 421 BLAKE2B b60d6fbf4110ba7e0b5c36159dc9624460ccb8774f101a50b89e633bb177a8ef9d7c36fa425a27d8c5ec6c7b9b19965212cb5ee4b60e02abb3c3990beb26840a SHA512 0123e60def031887040df8690222cc553d93b3c5eb7413e19f722ef04ccf2aeb6468709f66866d432d4d0b0c0ed6875929f1292fde8ad18c4a6b589d1b40fab4 DIST tuned-2.15.0.tar.gz 207775 BLAKE2B 307b0598d9e99831526f2b26d5544df3832db7e17f28935c6f8d9293ec0d03729fb66906dca4739d48690e488f05383d448e7e714f6ae4824489564c295784c9 SHA512 67acdf10ecccd7910c4dcfd737610b4cb7651c7bf937bc0ed9c51869262d9f3a46f262d0b7636bc7a86a8abf579542a46f551e4f6c7561a061d8d58459be4589 DIST tuned-2.16.0.tar.gz 213111 BLAKE2B 865cfffc89459396aa50c7908c88de405dea365084cf1592134391da961e88cc5610b663d93d531febdf881182624a13771493c61915003c59ad24bc64dd8a5c SHA512 35f04e1ee1ab3d8be711f0787db92c089cc210c75a3be0bc60389effaed8dc3fb502eff54ea0336154563f7b194f8ff286a2e408ab439a472b6d4922c64d5b03 -EBUILD tuned-2.15.0-r1.ebuild 1360 BLAKE2B e0ba83ac9f68884ad57900f55a602242d902ffd8d94af9a58b9c7b825903d871d282f6357ea1a70b8294354c8597d14ccc82d79798daa560ff7a42b6efb3b2fb SHA512 25be2fd64fd25e53d86f8dfb6140bd6e0e899b7893c773412c802ee18b65cfa2703acce16caffcfc378f56564646481c114670893472433becee66451125923e -EBUILD tuned-2.16.0.ebuild 1398 BLAKE2B 68aeb197be15110539f5bb1d2fa05d0325a6fb08faa4ad2ac1f778ee8db31fff434dd610493eb5b812f5f5624e0f467116e4ee94ff7df9dfd1bd258d94ed7533 SHA512 976ba258e4f46073e4dabba51b1e4506523382e056d5631b7d433756c4ab5582f9767afd57dac39fe562f4eb74d381234b7bb26a500a0d14c9410027ae19e7fd +EBUILD tuned-2.15.0-r1.ebuild 1398 BLAKE2B 337e9eae70d78f6cd5144be3a1a23cd14c5d9d2e2e85db195a97d4a84547bd1f8db927d577dfcbefb459eaf70b05fac170c735c3784486c91448fe40afa029e2 SHA512 20643784a9dddcc356b8d6e1bf2dc955f2c3beff3f82f18d2999f1f9fb6a65d10aafb22bfddf9679147fb368f6ec95a09b23c8888a9ad0a22353e01e8b801a43 +EBUILD tuned-2.16.0.ebuild 1398 BLAKE2B 337e9eae70d78f6cd5144be3a1a23cd14c5d9d2e2e85db195a97d4a84547bd1f8db927d577dfcbefb459eaf70b05fac170c735c3784486c91448fe40afa029e2 SHA512 20643784a9dddcc356b8d6e1bf2dc955f2c3beff3f82f18d2999f1f9fb6a65d10aafb22bfddf9679147fb368f6ec95a09b23c8888a9ad0a22353e01e8b801a43 MISC metadata.xml 389 BLAKE2B 52563fa6fe2c0117754a8892f1393c78692dc9952a06ecc3fdf0344a2a4bdf9ff7f72acf9e0789d2ce5c014c8f563c9ce5a553a2bd94adc654982e1c37c1f225 SHA512 9f4a01f5090acff631fa852632f6c4624b08c746afb545aeb215bfbf55f2ae7ef9b6f74af0036ca1e6962ac3a4307b6175afad3eb6b0363fe8868a4185168747 diff --git a/sys-apps/tuned/tuned-2.15.0-r1.ebuild b/sys-apps/tuned/tuned-2.15.0-r1.ebuild index 050ad815152f..cceedf446eba 100644 --- a/sys-apps/tuned/tuned-2.15.0-r1.ebuild +++ b/sys-apps/tuned/tuned-2.15.0-r1.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{8,9} ) -inherit python-single-r1 xdg-utils +inherit python-single-r1 tmpfiles xdg-utils DESCRIPTION="Daemon for monitoring and adaptive tuning of system devices" HOMEPAGE="https://github.com/redhat-performance/tuned" @@ -58,5 +58,6 @@ src_install() { } pkg_postinst() { + tmpfiles_process ${PN}.conf xdg_icon_cache_update } diff --git a/sys-apps/tuned/tuned-2.16.0.ebuild b/sys-apps/tuned/tuned-2.16.0.ebuild index bb7ae49d1f98..cceedf446eba 100644 --- a/sys-apps/tuned/tuned-2.16.0.ebuild +++ b/sys-apps/tuned/tuned-2.16.0.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{8,9} ) -inherit python-single-r1 xdg-utils tmpfiles +inherit python-single-r1 tmpfiles xdg-utils DESCRIPTION="Daemon for monitoring and adaptive tuning of system devices" HOMEPAGE="https://github.com/redhat-performance/tuned" @@ -58,6 +58,6 @@ src_install() { } pkg_postinst() { - xdg_icon_cache_update tmpfiles_process ${PN}.conf + xdg_icon_cache_update } |