From 564cd64dc5f2727c4df6aeb1bb51327503c84e78 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 5 Nov 2024 03:03:37 +0000 Subject: gentoo auto-resync : 05:11:2024 - 03:03:37 --- sys-apps/Manifest.gz | Bin 51335 -> 51327 bytes sys-apps/baselayout/Manifest | 6 +- sys-apps/baselayout/baselayout-2.16.ebuild | 364 --------------------- sys-apps/baselayout/baselayout-2.17.ebuild | 364 +++++++++++++++++++++ sys-apps/baselayout/baselayout-9999.ebuild | 2 +- sys-apps/cpuid/Manifest | 3 +- sys-apps/cpuid/cpuid-20241023.ebuild | 2 +- sys-apps/cpuid/files/cpuid-20241023-makefile.patch | 38 +++ sys-apps/gnome-disk-utility/Manifest | 4 +- .../gnome-disk-utility-45.1-r1.ebuild | 66 ++++ .../gnome-disk-utility-45.1.ebuild | 63 ---- .../gnome-disk-utility-46.1-r1.ebuild | 66 ++++ .../gnome-disk-utility-46.1.ebuild | 63 ---- sys-apps/mawk/Manifest | 2 +- sys-apps/mawk/mawk-1.3.4_p20240905.ebuild | 2 +- sys-apps/sandbox/Manifest | 6 +- sys-apps/sandbox/sandbox-2.37.ebuild | 64 ---- sys-apps/sandbox/sandbox-2.38.ebuild | 64 ---- sys-apps/sandbox/sandbox-2.40.ebuild | 64 ++++ 19 files changed, 611 insertions(+), 632 deletions(-) delete mode 100644 sys-apps/baselayout/baselayout-2.16.ebuild create mode 100644 sys-apps/baselayout/baselayout-2.17.ebuild create mode 100644 sys-apps/cpuid/files/cpuid-20241023-makefile.patch create mode 100644 sys-apps/gnome-disk-utility/gnome-disk-utility-45.1-r1.ebuild delete mode 100644 sys-apps/gnome-disk-utility/gnome-disk-utility-45.1.ebuild create mode 100644 sys-apps/gnome-disk-utility/gnome-disk-utility-46.1-r1.ebuild delete mode 100644 sys-apps/gnome-disk-utility/gnome-disk-utility-46.1.ebuild delete mode 100644 sys-apps/sandbox/sandbox-2.37.ebuild delete mode 100644 sys-apps/sandbox/sandbox-2.38.ebuild create mode 100644 sys-apps/sandbox/sandbox-2.40.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index cd543bfd7700..fcc986a5306e 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 2fe608c7ee4b..23bb761e9579 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,9 +1,9 @@ DIST baselayout-2.14.tar.bz2 30182 BLAKE2B c5f67795233e565c2c75c97a55c000aec98e901bb0a25f1aeb52b01b44d7c09bfc6e67813234629ca71ff32d603e82ada8e66e5ab6007fa0664b95367256320d SHA512 bffd118f5e92975b9247d854fc5683a311dbcd03efa37a13dfd05d04e92a6e784858d3a55aa689f782229afc5985e829eb332c08a79eed081bf0a47720ca7e8a DIST baselayout-2.15.tar.bz2 30214 BLAKE2B 58d81b935c52deddeae60314f040a85767c7df30e38c694090dded4a9d593be8fb3c181e6e9496cc8e0987481b6b13f57a74038f9f21a0b27c76528d066cd5f5 SHA512 3d1a64e2802b53bcc537633fd23224ebea60b79d58f4b692175598cd43015e0d60dfdfb81c03f3541d28fe77f04022298236db726ea7e5119cc217d6bfb74d4b -DIST baselayout-2.16.tar.bz2 30260 BLAKE2B 19c213d6ad25f0e200ea75bff481ab4aab45742df67e941211888f017f7ecd4054733878f7e4e19ebb242615fcb7f002765668f97a4f554733173251d4f836f5 SHA512 5668d1eb550c9b422f7ab732f25e0cb53d376501d2ba76b8219eab6a3b7aa60c485d9949bef498a394c099ee592553d8c7413266f4610555cb6dc1ccf7d05500 +DIST baselayout-2.17.tar.bz2 30274 BLAKE2B b5016fd8ec8646fe9fcc05d893a5732f2301bff93fc3c4400f6db955cabadd19f517fab8c73f3ee7e8224d7f5e1cff8f4d3afec1d5ebd1bef25b2c9f1812b2ec SHA512 8991f8064b7b1d7ebbd202479b9e12b955b76640cc3f1728551313517f78a40465e3f11f57c7c5827b9a3312b822a37b556399de36190febeb2343ce203b7681 EBUILD baselayout-2.14-r2.ebuild 11339 BLAKE2B 07fc32bb4153e5ebce26f27967d8ac6a049b3b818f90e64018f77efebf3a5fdc5de388e3d295fded16eec9eb6fb03101d2d02acf5e095cfcd191393e40ff0c6f SHA512 6112ff74282b2363cff0d0fa5ab26d94e6967274c2da7c2a9a150b20a21d6b017607c83ffe5999e7cb188874c20ae545d67cba1d8739230d91b8a834f217838b EBUILD baselayout-2.14-r3.ebuild 11612 BLAKE2B bf1373a141a640239d3156e92789f168141fd5e2d3460db692201dcec7f12803a826948be72ab1f7b8a6ba3c5bcf1876ba06a81953cd273c6fb0e7a9cb166875 SHA512 9ac58944861e0a0da77927df7f07892977116146526a5e461ebc64a99f7aad4b734fc3a8760ef0c1101b8f8af5e64b688141a1f9526b631cde94905b0ea1bf50 EBUILD baselayout-2.15.ebuild 11757 BLAKE2B bb4859998453465dc472dafae3b48a287f78cc93fce90a857fa9642fd2eb74cbcda3b3bb2a5e643faa6cfda8bdd2c6ce8306b0fb0f4840c10f206a5a88447368 SHA512 0ad91c6bc2ea58ebe284392dbbc750c3d21a83f2e115293dbb974bcbfed5af1e326c0c2bff9a6bc4b6d892ea278d9ea5f613d4f364f8704f985d716a33956eac -EBUILD baselayout-2.16.ebuild 11757 BLAKE2B bb4859998453465dc472dafae3b48a287f78cc93fce90a857fa9642fd2eb74cbcda3b3bb2a5e643faa6cfda8bdd2c6ce8306b0fb0f4840c10f206a5a88447368 SHA512 0ad91c6bc2ea58ebe284392dbbc750c3d21a83f2e115293dbb974bcbfed5af1e326c0c2bff9a6bc4b6d892ea278d9ea5f613d4f364f8704f985d716a33956eac -EBUILD baselayout-9999.ebuild 11765 BLAKE2B 43d7318691707d15098888ae7c90b67cd8fae4c9ef4a9989e9fa70f9401d74efb7d4e0e4a267a3cad23744bc00ae05c03d16ebc7ff0bcb65d16986e630c06634 SHA512 0be38d0d40b35eb1cfca04d18a8126d1f7b61ba35e0df9337723f604a5136c72f886232e9390f0d6c81f87334b15d979fdd71f6b6ad71f2bf5e7e0ea4849e9dc +EBUILD baselayout-2.17.ebuild 11757 BLAKE2B bb4859998453465dc472dafae3b48a287f78cc93fce90a857fa9642fd2eb74cbcda3b3bb2a5e643faa6cfda8bdd2c6ce8306b0fb0f4840c10f206a5a88447368 SHA512 0ad91c6bc2ea58ebe284392dbbc750c3d21a83f2e115293dbb974bcbfed5af1e326c0c2bff9a6bc4b6d892ea278d9ea5f613d4f364f8704f985d716a33956eac +EBUILD baselayout-9999.ebuild 11765 BLAKE2B 792842e7ff544594c7910febf40539698983c55fdf36b816c03f46022781be776146d992dd046a9ccb6a19cca3dd7b8c7d2591ac92a20527cb1afcc9a2aa6420 SHA512 37f3568ec17057f150e3194d648dbc857f55387755ffe5acfa34a912db2031e79f6cff8c5c3d5abdc58508808d4938900a8784481cce09961c1ab54e0cdb6b07 MISC metadata.xml 528 BLAKE2B 74766eb4949cff7bc3c896dc2477058a121acdde032be40bb3d2cb35874a830fc1882b5c3e6887799ffcf9cddf9fef54001eadd1b510b635c081b84b9ffeb035 SHA512 08dc12b95610151124e7dcb454a353ed10b30202aac3a7f36013c929fd5ee94436452bb48dfc77fa96bd6bb33dba0eb9c98868ef2e978f32f73fef5defc8a040 diff --git a/sys-apps/baselayout/baselayout-2.16.ebuild b/sys-apps/baselayout/baselayout-2.16.ebuild deleted file mode 100644 index a9bf8ec222fb..000000000000 --- a/sys-apps/baselayout/baselayout-2.16.ebuild +++ /dev/null @@ -1,364 +0,0 @@ -# Copyright 1999-2024 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="build +split-usr" - -RDEPEND="!sys-apps/baselayout-prefix" - -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 - # for the special case of riscv multilib, we drop the - # second part of two-component libdirs, e.g. lib64/lp64 - libdir="${libdir%%/*}" - dir="${prefix}${libdir}" - if [[ -h "${dir}" ]] ; then - if use riscv ; then - # with riscv we get now double entries so we - # need to ignore already existing symlinks - einfo "symlink ${dir} already exists (riscv)" - else - die "symlink ${dir} already exists" - fi - else - einfo "symlinking ${dir} to usr/${libdir}" - ln -s usr/${libdir} ${dir} || - die "Unable to make ${dir} symlink" - fi - else - einfo "creating directory ${dir}" - mkdir -p "${dir}" || - die "Unable to create ${dir} directory" - fi - done - [[ -d "${prefix}${def_libdir}" ]] && 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 - 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_setup() { - multilib_layout -} - -src_prepare() { - default - - # don't want symlinked directories in PATH on systems with usr-merge - if ! use split-usr && ! use prefix-guest; then - sed \ - -e 's|:/usr/sbin:|:|g' \ - -e 's|:/sbin:|:|g' \ - -e 's|:/bin:|:|g' \ - -i etc/env.d/50baselayout || die - fi - - if use prefix; then - hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile - hprefixify etc/shells share/passwd - hprefixify -w '/PATH=/' etc/env.d/50baselayout - hprefixify -w 1 etc/env.d/50baselayout - echo PATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host - echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host - echo MANPATH=/usr/share/man >> etc/env.d/99host - - # change branding - sed -i \ - -e '/gentoo-release/s/Gentoo Base/Gentoo Prefix Base/' \ - -e '/make_os_release/s/${OS}/Prefix/' \ - Makefile || 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 - if use split-usr || use prefix-guest; then - ldpaths+=":${EPREFIX}/${libdir}" - fi - ldpaths+=":${EPREFIX}/usr/${libdir}" - ldpaths+=":${EPREFIX}/usr/local/${libdir}" - done - echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout -} - -src_install() { - emake \ - DESTDIR="${ED}" \ - install - - if [[ ${CHOST} == *-darwin* ]] ; then - # add SDK path which contains development manpages - echo "MANPATH=${EPREFIX}/MacOSX.sdk/usr/share/man" \ - > "${ED}"/etc/env.d/98macos-sdk - fi - - # need the makefile in pkg_preinst - insinto /usr/share/${PN} - doins Makefile - - dodoc ChangeLog - - # bug 858596 - if use prefix-guest ; then - dodir sbin - cat > "${ED}"/sbin/runscript <<- EOF - #!/usr/bin/env sh - source "${EPREFIX}/lib/gentoo/functions.sh" - - eerror "runscript/openrc-run not supported by Gentoo Prefix Base System release ${PV}" 1>&2 - exit 1 - EOF - chmod 755 "${ED}"/sbin/runscript || die - cp "${ED}"/sbin/{runscript,openrc-run} || die - fi -} - -pkg_preinst() { - # 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 - - # Create symlinks in pkg_preinst to avoid Portage collision check. - # Create the symlinks in ${ED} via dosym so that we own it. - # Only create the symlinks if it wont cause a conflict in ${EROOT}. - if [[ -L ${EROOT}/var/lock || ! -e ${EROOT}/var/lock ]]; then - dosym ../run/lock /var/lock - fi - if [[ -L ${EROOT}/var/run || ! -e ${EROOT}/var/run ]]; then - dosym ../run /var/run - fi -} - -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 - # 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 - - 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-2.17.ebuild b/sys-apps/baselayout/baselayout-2.17.ebuild new file mode 100644 index 000000000000..a9bf8ec222fb --- /dev/null +++ b/sys-apps/baselayout/baselayout-2.17.ebuild @@ -0,0 +1,364 @@ +# Copyright 1999-2024 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="build +split-usr" + +RDEPEND="!sys-apps/baselayout-prefix" + +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 + # for the special case of riscv multilib, we drop the + # second part of two-component libdirs, e.g. lib64/lp64 + libdir="${libdir%%/*}" + dir="${prefix}${libdir}" + if [[ -h "${dir}" ]] ; then + if use riscv ; then + # with riscv we get now double entries so we + # need to ignore already existing symlinks + einfo "symlink ${dir} already exists (riscv)" + else + die "symlink ${dir} already exists" + fi + else + einfo "symlinking ${dir} to usr/${libdir}" + ln -s usr/${libdir} ${dir} || + die "Unable to make ${dir} symlink" + fi + else + einfo "creating directory ${dir}" + mkdir -p "${dir}" || + die "Unable to create ${dir} directory" + fi + done + [[ -d "${prefix}${def_libdir}" ]] && 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 + 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_setup() { + multilib_layout +} + +src_prepare() { + default + + # don't want symlinked directories in PATH on systems with usr-merge + if ! use split-usr && ! use prefix-guest; then + sed \ + -e 's|:/usr/sbin:|:|g' \ + -e 's|:/sbin:|:|g' \ + -e 's|:/bin:|:|g' \ + -i etc/env.d/50baselayout || die + fi + + if use prefix; then + hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile + hprefixify etc/shells share/passwd + hprefixify -w '/PATH=/' etc/env.d/50baselayout + hprefixify -w 1 etc/env.d/50baselayout + echo PATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host + echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host + echo MANPATH=/usr/share/man >> etc/env.d/99host + + # change branding + sed -i \ + -e '/gentoo-release/s/Gentoo Base/Gentoo Prefix Base/' \ + -e '/make_os_release/s/${OS}/Prefix/' \ + Makefile || 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 + if use split-usr || use prefix-guest; then + ldpaths+=":${EPREFIX}/${libdir}" + fi + ldpaths+=":${EPREFIX}/usr/${libdir}" + ldpaths+=":${EPREFIX}/usr/local/${libdir}" + done + echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout +} + +src_install() { + emake \ + DESTDIR="${ED}" \ + install + + if [[ ${CHOST} == *-darwin* ]] ; then + # add SDK path which contains development manpages + echo "MANPATH=${EPREFIX}/MacOSX.sdk/usr/share/man" \ + > "${ED}"/etc/env.d/98macos-sdk + fi + + # need the makefile in pkg_preinst + insinto /usr/share/${PN} + doins Makefile + + dodoc ChangeLog + + # bug 858596 + if use prefix-guest ; then + dodir sbin + cat > "${ED}"/sbin/runscript <<- EOF + #!/usr/bin/env sh + source "${EPREFIX}/lib/gentoo/functions.sh" + + eerror "runscript/openrc-run not supported by Gentoo Prefix Base System release ${PV}" 1>&2 + exit 1 + EOF + chmod 755 "${ED}"/sbin/runscript || die + cp "${ED}"/sbin/{runscript,openrc-run} || die + fi +} + +pkg_preinst() { + # 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 + + # Create symlinks in pkg_preinst to avoid Portage collision check. + # Create the symlinks in ${ED} via dosym so that we own it. + # Only create the symlinks if it wont cause a conflict in ${EROOT}. + if [[ -L ${EROOT}/var/lock || ! -e ${EROOT}/var/lock ]]; then + dosym ../run/lock /var/lock + fi + if [[ -L ${EROOT}/var/run || ! -e ${EROOT}/var/run ]]; then + dosym ../run /var/run + fi +} + +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 + # 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 + + 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 b2ffad64281b..8be27c569375 100644 --- a/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sys-apps/baselayout/baselayout-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit multilib prefix diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest index 1b1e34af520f..bea71aa46cf0 100644 --- a/sys-apps/cpuid/Manifest +++ b/sys-apps/cpuid/Manifest @@ -1,6 +1,7 @@ AUX cpuid-20220620-makefile.patch 1359 BLAKE2B b16bd455de251f3989718fa56c1b19f97d79271998ccf774f74f0886ab8072be482e480604bfad462e0ac9c325470d12e80150e6fc588abfae629cd6499e0ea4 SHA512 680e477460679ae016c95d0e0c5cef916486629011b43cafb5f90c1c097b8c245d4c8b7861a20bdeee05b87b2220ad37a5ca589ff952dd9d7580ca301aac0ada +AUX cpuid-20241023-makefile.patch 1409 BLAKE2B 71141aa29ef3e8fdd149506e0f1098dd8c0fc4fa502f99a3105314838106a84ae5d5d4ca4d49adf38f7a8ae52457c1ff9256253ae38af25afd1edb95a6474538 SHA512 64dc0ce070b704180a4a61b47a94365be72fcfabf77adbb2322cb161c4c4e6f041f51b47de2b72d64fe0e7aae20ddfdd4df3a56b5f6d548420866c0e60353281 DIST cpuid-20240916.src.tar.gz 157553 BLAKE2B 2f5ef3264fcc647122a73edf9a2b39110c11a23ac366c99481ec8cec4d7108ce088847b485f6b8e7dece757fb0246bafbbbaad36d0dc8128ade3290988a1f7de SHA512 f78e36400a963d39fb9d1b6dab6d79ea1ab700912aa229a4efc2088e61964fb5ece52c2204fadd34f1f75cfab6f7b659288c8892b86c44568e784283bf3f5278 DIST cpuid-20241023.src.tar.gz 160816 BLAKE2B de3c5750e8bd90882ac3a13ad81196b0287bd2ee321c54adda18a754e128f9c72b72177874c652ccb02d17ace336c70705c899f3e6493e7f4c655a9f992114ef SHA512 81d4b4de609365fb801d785fab9c4f190885569fa97db10ab5e8f7e227a335313c0bafb02696a0bb1d14d11c49e90979a2b9b60eb970e6d7c617be99142a941b EBUILD cpuid-20240916.ebuild 608 BLAKE2B aa200b62c4a747cb023b971149c30f4d6b3c69ea505e248aadd7ae3d8e68166eca457b607c1e953a59660c5486103b4a033cf13ba21de17d97db4355d6dc7dee SHA512 988cb0fb9c34d9cd7f3afb49a289294de88125fec858bb6b3d920a46d869e1b675748301cdb2d869d2397d32eded64b18118004f952a5bab47a1ee36a9d00cf9 -EBUILD cpuid-20241023.ebuild 610 BLAKE2B d07e1630231fdf16335eda46ab506f12c810dcd753e7b78138baab9c1f371790460e1ff51d0ecaeac74ced6bdadc7049e496935e01922a346f1dd6d75089f39a SHA512 e6b88a77b8ca8e7aeb6e66c29ccb5070468cf8348092f879d5d3e3a24d6c606da06b68aa71ea20c948bd164a1a5495850496d9dd6e702d300de45ef96e485eb5 +EBUILD cpuid-20241023.ebuild 610 BLAKE2B c2801812e205dca204aa4c7a59bc22e2c59416c9dd6d989d4dca29405dd33e2b1ba4479596dc47d0332099e0c5889330a7d8582ebda0b2dc84428fa46c52d7aa SHA512 12373735451a97b72717459c524b5b809c95c058302d968e7d87808f146a211f78a7f67518ae19fb2a397e878eb3904bbe91069895b6a856247d48c189f9c347 MISC metadata.xml 532 BLAKE2B 49d1eb34a9859763d42159adcf9a2dca3128af78aef52cedc4483950084238ba780bd841788f4b27eb72fc44e61c2c5bd264b6c6e2c57824ccf146b6ecad50e9 SHA512 f51db55a3cc5478afba39a42731122db8ac720af8685e093b6952efd2778c9f0668ac936d2a1cdacaf2586d62d0f13240d664a7bd4fbd18236c816e9e6745600 diff --git a/sys-apps/cpuid/cpuid-20241023.ebuild b/sys-apps/cpuid/cpuid-20241023.ebuild index c2868c0d5525..f9116f2c451e 100644 --- a/sys-apps/cpuid/cpuid-20241023.ebuild +++ b/sys-apps/cpuid/cpuid-20241023.ebuild @@ -20,7 +20,7 @@ BDEPEND=" DOCS=( "ChangeLog" "FUTURE" ) -PATCHES=( "${FILESDIR}/${PN}-20220620-makefile.patch" ) +PATCHES=( "${FILESDIR}/${PN}-20241023-makefile.patch" ) src_prepare() { default diff --git a/sys-apps/cpuid/files/cpuid-20241023-makefile.patch b/sys-apps/cpuid/files/cpuid-20241023-makefile.patch new file mode 100644 index 000000000000..fa4d4c02e2a9 --- /dev/null +++ b/sys-apps/cpuid/files/cpuid-20241023-makefile.patch @@ -0,0 +1,38 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,4 +1,4 @@ +-CFLAGS+=-g ++CFLAGS+= + CPPFLAGS?= + LDFLAGS?= + ifneq (,$(findstring arch=i386,$(CFLAGS))) +@@ -6,7 +6,7 @@ + endif + CFL=$(CPPFLAGS) $(CFLAGS) $(CISA) -Wall -W -Wshadow -Wcast-align -Wredundant-decls -Wbad-function-cast -Wcast-qual -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wimplicit-fallthrough -Wunused-parameter -Wundef -D_FILE_OFFSET_BITS=64 -DVERSION=$(VERSION) + CFL_OPT=-O3 $(CFL) -Wformat-overflow=2 +-INSTALL_STRIP=-s ++INSTALL_STRIP= + + PACKAGE=cpuid + VERSION=20241023 +@@ -41,7 +41,7 @@ + + BUILDROOT=$(DESTDIR) + +-default: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz ++default: $(PROG) cpuinfo2cpuid + + $(PROG): cpuid.c Makefile + $(CC) $(CFL) $(LDFLAGS) -o $@ cpuid.c +@@ -62,9 +62,9 @@ + + install: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz + install -D $(INSTALL_STRIP) -m 755 $(PROG) $(BUILDROOT)/usr/bin/$(PROG) +- install -D -m 444 $(PROG).man.gz $(BUILDROOT)/usr/share/man/man1/$(PROG).1.gz ++ install -D -m 444 $(PROG).man $(BUILDROOT)/usr/share/man/man1/$(PROG).1 + install -D -m 755 cpuinfo2cpuid $(BUILDROOT)/usr/bin/cpuinfo2cpuid +- install -D -m 444 cpuinfo2cpuid.man.gz $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1.gz ++ install -D -m 444 cpuinfo2cpuid.man $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1 + + clean: + rm -f $(PROG) $(PROG).i386 $(PROG).x86_64 diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest index 5cbdb405ae4e..aed4d08bd3c4 100644 --- a/sys-apps/gnome-disk-utility/Manifest +++ b/sys-apps/gnome-disk-utility/Manifest @@ -1,5 +1,5 @@ DIST gnome-disk-utility-45.1.tar.xz 1774976 BLAKE2B cc7aa559acfec54df2adf725dc2c8e6918f148139fdc96d2378d178cb37a0cea1297a5db678c104cf7c103d7fc2e0d6e9dd965147a5afa10f217346ba5abe720 SHA512 30705f0b123738816e8f18c8951b1172f7b09b7c500aa8afa313b5bc1e7d2f248e086663dbe7ca4f44584bb8c2a09ca19ab6fbd11edabfc0f32a47dd939f2131 DIST gnome-disk-utility-46.1.tar.xz 1571960 BLAKE2B 89d37eeb3eeace2015ee7f2f456242e83e57e53067e32db8540560ada477c32cb81dfec562a824d03fafd024cde17b939b1e5344edbc60cde8eb30af1b3c15ef SHA512 e2b6b6e793e5ad0ca3c22704ccb9ae420acbe41d237eb9aabbda51a47dd3d452daa4f71f07edb37157a03cd2faf76338f80b9044f5d0ff546e74196005ba30bb -EBUILD gnome-disk-utility-45.1.ebuild 1411 BLAKE2B c76423e33e7c93289883e9e7b868e0c923a0661baf4d64d6de8babfd3ce8d45cf609251efb4a5de7af19fc15db676670390a1423bd339c9bef4622888fc86710 SHA512 8c4c193fb036c50cd1643ac4cd152b25b9f3b3eca2cc0478a1ea543d2b6c49d3e6166627f18e52f8db7cde67d317067799fc4774317e70310fccbd96fbb04900 -EBUILD gnome-disk-utility-46.1.ebuild 1419 BLAKE2B a009996af885a52d8baad940561dd28cfef5eacc12054b297d5c2440f89355d9f9714bb0a6b0f6a14e9e83d7b1d51a23551f55addf98a0ffc83042671385109b SHA512 c21ab926649d31d87017ab5b12e0fa41df9996bc7ad0967110f520c4a1824ca9a3fbeb0554934e6cdce282650522eb142210771221c72de2954155442a118f8f +EBUILD gnome-disk-utility-45.1-r1.ebuild 1454 BLAKE2B 1d648aa5a1c4f077e1d25a4bec39456fbe1044dc2423f4a361e34b7d5f31befdbab51c3cede66472ac15bf5be4d6c148caf774cd09eda728c4d84bd9d52caee6 SHA512 e346a7900538c1dc237325b7fc57069d7d5a6005fb3afbaa3ed4bfd41cf29531ebb486fb582b08e212317c955c342a8644187bf4ee05f4ec97b21e46d5c1a1af +EBUILD gnome-disk-utility-46.1-r1.ebuild 1462 BLAKE2B b4eeb7acf75f5629dd3eed538c9be05bfd9d366ef6d3b9ccab0beb436b154d8aef4127b14660c1c6cb9ed0e8814a16d11bc074fd860b89b99cade616af8d287d SHA512 aa3fc96659b755dbcbfe9237fe96ca8a4a7d670cb93fbdfb250fb5627fb83ef0e12a327762c8e64a9334bb2d298371aa0fcdb8b6b274bd9b61a416068959012c MISC metadata.xml 725 BLAKE2B 173521fe25d9d15cc28c6c4abb434b246222a2c6e15392fdf655e4be1006f83026e9fabf7d29f9d41421c5f13f114c6649971defe18bde1ae1c40f7355859902 SHA512 88e461ac9ac3c8d2a321ef3a1ad44d17b8b3e4355f92320857c77b1a5c6d707d3b3613518dda5cfec9fe4e44067f97a9bac9b1b56ac037b7f0d86da82ecc93b3 diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-45.1-r1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-45.1-r1.ebuild new file mode 100644 index 000000000000..f794f9fb98b1 --- /dev/null +++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-45.1-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org gnome2-utils meson xdg + +DESCRIPTION="Disk Utility for GNOME using udisks" +HOMEPAGE="https://wiki.gnome.org/Apps/Disks" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="fat elogind gnome systemd" +REQUIRED_USE="?? ( elogind systemd )" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" + +DEPEND=" + >=media-libs/libdvdread-4.2.0:0= + >=dev-libs/glib-2.31:2 + >=x11-libs/gtk+-3.16.0:3 + || ( + media-libs/libcanberra-gtk3 + >=media-libs/libcanberra-0.1[gtk3(-)] + ) + >=gui-libs/libhandy-1.5.0:1 + >=app-arch/xz-utils-5.0.5 + >=x11-libs/libnotify-0.7 + >=app-crypt/libsecret-0.7 + >=dev-libs/libpwquality-1.0.0 + >=sys-fs/udisks-2.7.6:2 + elogind? ( >=sys-auth/elogind-209 ) + systemd? ( >=sys-apps/systemd-209:0= ) +" +RDEPEND="${DEPEND} + x11-themes/adwaita-icon-theme + fat? ( sys-fs/dosfstools ) + gnome? ( >=gnome-base/gnome-settings-daemon-3.8 ) +" +# libxml2 for xml-stripblanks in gresource +BDEPEND=" + dev-libs/libxml2:2 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +src_configure() { + local emesonargs=( + -Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none)) + $(meson_use gnome gsd_plugin) + -Dman=true + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-45.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-45.1.ebuild deleted file mode 100644 index a533b433edab..000000000000 --- a/sys-apps/gnome-disk-utility/gnome-disk-utility-45.1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org gnome2-utils meson xdg - -DESCRIPTION="Disk Utility for GNOME using udisks" -HOMEPAGE="https://wiki.gnome.org/Apps/Disks" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="fat elogind gnome systemd" -REQUIRED_USE="?? ( elogind systemd )" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" - -DEPEND=" - >=media-libs/libdvdread-4.2.0:0= - >=dev-libs/glib-2.31:2 - >=x11-libs/gtk+-3.16.0:3 - >=media-libs/libcanberra-0.1[gtk3] - >=gui-libs/libhandy-1.5.0:1 - >=app-arch/xz-utils-5.0.5 - >=x11-libs/libnotify-0.7 - >=app-crypt/libsecret-0.7 - >=dev-libs/libpwquality-1.0.0 - >=sys-fs/udisks-2.7.6:2 - elogind? ( >=sys-auth/elogind-209 ) - systemd? ( >=sys-apps/systemd-209:0= ) -" -RDEPEND="${DEPEND} - x11-themes/adwaita-icon-theme - fat? ( sys-fs/dosfstools ) - gnome? ( >=gnome-base/gnome-settings-daemon-3.8 ) -" -# libxml2 for xml-stripblanks in gresource -BDEPEND=" - dev-libs/libxml2:2 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -src_configure() { - local emesonargs=( - -Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none)) - $(meson_use gnome gsd_plugin) - -Dman=true - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-46.1-r1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-46.1-r1.ebuild new file mode 100644 index 000000000000..3de8f05a4da7 --- /dev/null +++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-46.1-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org gnome2-utils meson xdg + +DESCRIPTION="Disk Utility for GNOME using udisks" +HOMEPAGE="https://apps.gnome.org/en/DiskUtility/" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="fat elogind gnome systemd" +REQUIRED_USE="?? ( elogind systemd )" + +DEPEND=" + >=media-libs/libdvdread-4.2.0:0= + >=dev-libs/glib-2.31:2 + >=x11-libs/gtk+-3.16.0:3 + || ( + media-libs/libcanberra-gtk3 + >=media-libs/libcanberra-0.1[gtk3(-)] + ) + >=gui-libs/libhandy-1.5.0:1 + >=app-arch/xz-utils-5.0.5 + >=x11-libs/libnotify-0.7 + >=app-crypt/libsecret-0.7 + >=dev-libs/libpwquality-1.0.0 + >=sys-fs/udisks-2.7.6:2 + elogind? ( >=sys-auth/elogind-209 ) + systemd? ( >=sys-apps/systemd-209:0= ) +" +RDEPEND="${DEPEND} + x11-themes/adwaita-icon-theme + fat? ( sys-fs/dosfstools ) + gnome? ( >=gnome-base/gnome-settings-daemon-3.8 ) +" +# libxml2 for xml-stripblanks in gresource +BDEPEND=" + dev-libs/libxml2:2 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +src_configure() { + local emesonargs=( + -Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none)) + $(meson_use gnome gsd_plugin) + -Dman=true + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-46.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-46.1.ebuild deleted file mode 100644 index 7657f988063e..000000000000 --- a/sys-apps/gnome-disk-utility/gnome-disk-utility-46.1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org gnome2-utils meson xdg - -DESCRIPTION="Disk Utility for GNOME using udisks" -HOMEPAGE="https://apps.gnome.org/en/DiskUtility/" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="fat elogind gnome systemd" -REQUIRED_USE="?? ( elogind systemd )" - -DEPEND=" - >=media-libs/libdvdread-4.2.0:0= - >=dev-libs/glib-2.31:2 - >=x11-libs/gtk+-3.16.0:3 - >=media-libs/libcanberra-0.1[gtk3] - >=gui-libs/libhandy-1.5.0:1 - >=app-arch/xz-utils-5.0.5 - >=x11-libs/libnotify-0.7 - >=app-crypt/libsecret-0.7 - >=dev-libs/libpwquality-1.0.0 - >=sys-fs/udisks-2.7.6:2 - elogind? ( >=sys-auth/elogind-209 ) - systemd? ( >=sys-apps/systemd-209:0= ) -" -RDEPEND="${DEPEND} - x11-themes/adwaita-icon-theme - fat? ( sys-fs/dosfstools ) - gnome? ( >=gnome-base/gnome-settings-daemon-3.8 ) -" -# libxml2 for xml-stripblanks in gresource -BDEPEND=" - dev-libs/libxml2:2 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -src_configure() { - local emesonargs=( - -Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none)) - $(meson_use gnome gsd_plugin) - -Dman=true - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest index c5f336e43ba9..6d39a2c1c9c8 100644 --- a/sys-apps/mawk/Manifest +++ b/sys-apps/mawk/Manifest @@ -13,5 +13,5 @@ EBUILD mawk-1.3.4_p20240123.ebuild 1292 BLAKE2B 5eee6c13ced45b7d9a9d1262843304a9 EBUILD mawk-1.3.4_p20240622.ebuild 1300 BLAKE2B 3efdcb2f4c2c24c069e74e1241b0c47dd1317e6b8bc137b41168e9ee5366e133009e36906b36be15943ade8f21db935a0e8a22c924389bd50052dc194da6042d SHA512 110b5b5f41327d02a9107a2d5598fc008ce8cd63908e3effecdc1df43920d9cf6181064d10581e2b2959e420c1265fadcacc68d5dc95767c04fb9bb97d475127 EBUILD mawk-1.3.4_p20240819.ebuild 1362 BLAKE2B a4a193890918d6bf951765d60fef1a214f6a1afb7f1b577badf2f17878c51b219b8afdbe381941e8404ab699d4ccc249cb0d982a881989a744c2bcf684f45272 SHA512 e6ef5323a03c71adc251ace0db6287a16ab0f911437f2f62191e2a44d0b1e738011797eb43fc9d2cef718e49852d6046a1add6afa6d2e6e95e27daeebdec2c32 EBUILD mawk-1.3.4_p20240827.ebuild 1292 BLAKE2B 5eee6c13ced45b7d9a9d1262843304a9ce56b68532b33f795ff0bce98ff4cd246741683b89f0174d577027847ad8a8531301c4f60c32c4e8e153ad6924bf08a3 SHA512 0a4364d54585eef2b1a23b23678f7f93298b07426b81af065fbf2c63dba55ad421085ab01991337b383bd57c5c76a7095118331d7192c43ede1251ee15c25ef2 -EBUILD mawk-1.3.4_p20240905.ebuild 1353 BLAKE2B f921f7636e5e644ea207bc78c28a75a76d9453a569fc30ce93cb5bd3e665a693a026605f1fea6b4c54f456b06cb359288b3b6daa574cb7b121596559aa866134 SHA512 27648f3ff7ae46e3c302492462ea3a59d19591ec2aa54b7bdb2adfc675ba04bd10a353e67a424a3a0b43695798e393e331022e30f46c8d7715c56de4fe279fae +EBUILD mawk-1.3.4_p20240905.ebuild 1347 BLAKE2B 14cbfa6b0f992a853ea0a00375467eaf115ddd57fff92ed212addbfdcabe5c2ed326363f6ea3d87dce4dc9da027dfa940e881634a91230dd9831562670e57174 SHA512 a005c95b63e372fd346998eebbf49fe9a6038abcd59d370b67165a411f69bc19753b741cac8e74bbedab668ba50568b553edd9abc50ac609cdefc330600b2bdd MISC metadata.xml 422 BLAKE2B 8bd344848b5247eb1858b7cd31d91a796671c321610b826e602d9350e59769a4e6612438d9bf89ee2d6d63c327729d88a9ccb538b162beb816fde2910d0a4d9a SHA512 9adcc3c3b54ee935d3363e874e76f9e9b1efee00faac94184a84d10a6600dad4f11da51d4567acabf63707ca55f9b3d5ac3df107c6de8b38cad1da9891e82086 diff --git a/sys-apps/mawk/mawk-1.3.4_p20240905.ebuild b/sys-apps/mawk/mawk-1.3.4_p20240905.ebuild index b69e235b7eef..15eb57b1d28d 100644 --- a/sys-apps/mawk/mawk-1.3.4_p20240905.ebuild +++ b/sys-apps/mawk/mawk-1.3.4_p20240905.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-thomasdickey-20240114 )" diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest index 2f914ba13d50..62d908f8ab32 100644 --- a/sys-apps/sandbox/Manifest +++ b/sys-apps/sandbox/Manifest @@ -1,8 +1,6 @@ AUX 09sandbox 37 BLAKE2B 181213e2cc0bcfa328310cced40bfaba4530d8d2f80e892cb5649d5277c5d59d345ce96ca802a5529a22892c929bafac04c616458fa147a3bee5c89d31b0baf1 SHA512 4e8a9c58debde6480224a45559c5f2db4765213d151e47937f9142f110cac3681bf6402acaf21249a37bb17398e7bc00ae7feee68ecdb5b9363c432eac1b052a -DIST sandbox-2.37.tar.xz 459420 BLAKE2B 0f6c701f819139f557a5fccb59e67509b04ba6eb22e79250a69ae990b123f9f7b618bb82a43ea86e1b18614c38d0d884aceb77d17af5a92030b2b4ad89eb2bd4 SHA512 91ddb98aa118f2d606aaf64b20598dbed9239069350842ab9fd3af05b1942380c92841d044387bc2d761317faa9c44848b3010e18747d834c115929f64060056 -DIST sandbox-2.38.tar.xz 460776 BLAKE2B 39a93e77301d5b6ea0a352cf1dc7786a1030a3701b0f8beca62e80a4f0d614b26cb3764ecf0174a9fd77acf27ae5d972de352e6fdec5a169aba83e6146a84038 SHA512 a559e32654b2fd7baca70b85f6dbf0a610e5847ccf28d7a0536485aedbfb1ce8394a080e6efdafcf76e01439b2592eebcef6c8f77a976188ce7e3759a2844d3f DIST sandbox-2.39.tar.xz 462796 BLAKE2B 330c6f896eba6ff2a38eb8a5d1ff9b242d0e42ab03734254b1851f36cc851c32e7ed3d32afe07374b6e264cb0a922d25b010af5269f60fc5142b9036008f0945 SHA512 5eed5d828eb904b15d52736ea8835128e805f0274f2152d033ae6d93f1df3bc1f50ed23d7544c37ee06b14cb2c301110730e1de3097d6f7032069ef8dbbbd28c -EBUILD sandbox-2.37.ebuild 1731 BLAKE2B 91faa02a64b6980155cdfcc307a12a196092570b64d20e40c5f41f317fb114543881f5631a9803694c5123c4c5f6318846c42d2ce08c5ee46098e7ca44971890 SHA512 4408a0059eec80c17c660dc8e7b4ad6043aea78dcf964646e5d61fdc6b44a4c3715a81676b7ca2b7fc3eb812e604ff15879a1669ec7fd2e9f0232e9079dd754b -EBUILD sandbox-2.38.ebuild 1731 BLAKE2B 91faa02a64b6980155cdfcc307a12a196092570b64d20e40c5f41f317fb114543881f5631a9803694c5123c4c5f6318846c42d2ce08c5ee46098e7ca44971890 SHA512 4408a0059eec80c17c660dc8e7b4ad6043aea78dcf964646e5d61fdc6b44a4c3715a81676b7ca2b7fc3eb812e604ff15879a1669ec7fd2e9f0232e9079dd754b +DIST sandbox-2.40.tar.xz 465824 BLAKE2B 1e7e8b1c69807d493d5ca242d746b07aa669e18f9aab60cbfd7fe66500ac6822f8b9236077c370ec7e580c8c056f2ccc7825017cd015fca4497e967dcb93cc82 SHA512 e734f380943cc573847f48789a6ad724a3a3fe1017cb7e4bffcd75d2f758d85e937511bbc2eccd0224301b56bc0dd38c92fbaf2d268132be4985f5a768593bdc EBUILD sandbox-2.39.ebuild 1731 BLAKE2B 0597372e7ed3b698e8a45243170e68b175f025f90f2196bc2b789b058939f8c717d8cac43dbbcbf3789012ed95ad897091ee9cec86dde02541592868ed1c7333 SHA512 f60a5bd80147d724937f87c94e468153c552749c16a10265c2ca55e6ab848bb742e7fe2bcb1c2b9095b63ca820f9c409dc62217cd8481234064e20509e584e92 +EBUILD sandbox-2.40.ebuild 1739 BLAKE2B 090794105c6616689b819cbe1c715714402c81777bda0dc5a7c55ac7669080d775b1e3d09f6abceaa92e403f0ffc56d92eba5165ff3199b47a3b521d822be7d7 SHA512 36b0309d807cc86cce508b2ffea5b504338d35b730eb980d5205a4b420d6e9bc05835cc70259d8b76c532f1e3aea241a47457376a1934745bef7bd159dd6f608 MISC metadata.xml 512 BLAKE2B 2befd96e6697e45e04b9e5c6594d30987f035b52fe2d642e10b67b3a2f9657b63f66f48439cd6df71f07ad6fe112220f195d453595c4bf1ef47561cfb8c0428d SHA512 1869fc1c558817f7c7ace988184b74647a82c94e51f0bdb610011bd6736034188abb778e3c5b852ff39daad5a7ef131b09468353b0764a4957dfe72da4767601 diff --git a/sys-apps/sandbox/sandbox-2.37.ebuild b/sys-apps/sandbox/sandbox-2.37.ebuild deleted file mode 100644 index 10350e637a79..000000000000 --- a/sys-apps/sandbox/sandbox-2.37.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="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/~floppym/dist/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="+nnp" - -# pax-utils lower bound for bug #265376 -DEPEND=">=app-misc/pax-utils-0.1.19" -# Avoid folks installing with older file, bug #889046. We still need the -# >= dep in Portage but this is a safety net if people do partial upgrades. -RDEPEND="!= dep in Portage but this is a safety net if people do partial upgrades. -RDEPEND="!= dep in Portage but this is a safety net if people do partial upgrades. +RDEPEND="!