summaryrefslogtreecommitdiff
path: root/sys-apps
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/Manifest.gzbin49092 -> 49090 bytes
-rw-r--r--sys-apps/busybox/Manifest4
-rw-r--r--sys-apps/busybox/busybox-1.34.1-r1.ebuild2
-rw-r--r--sys-apps/busybox/busybox-1.34.1.ebuild340
-rw-r--r--sys-apps/busybox/busybox-1.35.0.ebuild341
-rw-r--r--sys-apps/file/Manifest3
-rw-r--r--sys-apps/file/file-5.44.ebuild1
-rw-r--r--sys-apps/file/files/file-5.44-limits-solaris.patch19
-rw-r--r--sys-apps/gawk/Manifest5
-rw-r--r--sys-apps/gawk/gawk-5.1.1-r2.ebuild112
-rw-r--r--sys-apps/gawk/gawk-5.2.1.ebuild2
-rw-r--r--sys-apps/nawk/Manifest2
-rw-r--r--sys-apps/nawk/nawk-20220122-r1.ebuild2
-rw-r--r--sys-apps/pkgcore/Manifest6
-rw-r--r--sys-apps/pkgcore/pkgcore-0.12.16-r1.ebuild63
-rw-r--r--sys-apps/pkgcore/pkgcore-0.12.18.ebuild47
-rw-r--r--sys-apps/pkgcore/pkgcore-9999.ebuild2
-rw-r--r--sys-apps/sed/Manifest9
-rw-r--r--sys-apps/sed/files/sed-4.8-avoid-noreturn-diagnostic.patch21
-rw-r--r--sys-apps/sed/metadata.xml16
-rw-r--r--sys-apps/sed/sed-4.8-r1.ebuild60
-rw-r--r--sys-apps/sed/sed-4.8.ebuild50
-rw-r--r--sys-apps/sed/sed-4.9.ebuild2
23 files changed, 90 insertions, 1019 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index d1e465c73275..6c88fba4ed78 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
Binary files differ
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 1efdffec7ce1..14070648972d 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -19,9 +19,7 @@ AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303
AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379afe9d490ad32b19a6d10d456155fdeb0468c67816f061b1cac166db7f104dbadadf0d175082efdb4 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5
DIST busybox-1.34.1.tar.bz2 2476932 BLAKE2B 1f45f58db26ae0bae2eb728db3a7d49680d611f489c4633d1fdf2827d3c33285721e232f722ac1f80f2ad7616352df9fd6b8880bcb5fa0dc6787b70c897dd033 SHA512 fb7e53a56c07b1098a12ee7232ad5401b147816648a0619b3b5358fdcf0915cfbb054500c0e0dd4acb3bc0a93a584b62bc5448e1f16b28004f58b39518a13b9d
DIST busybox-1.35.0.tar.bz2 2480624 BLAKE2B c08656bc863cd3fa8f7269032e808a30832215c36414c12f8233ab00503636ed1979541b7df42df654f1dfdfdd46fc00c8fe790bf0bed629a915b4c806c643b9 SHA512 62b2e718b6669271380445ed6db249618d777a4e8d5e6d879fa39ffee43887b6a2e93ceef874c615c565ad492deb772b03a19b7475c403202741579fb151e16a
-EBUILD busybox-1.34.1-r1.ebuild 10451 BLAKE2B 46c22ca5326c5629241853907669ab574718235381420b3b06c307e71841211c306acf58fbd36c45f56a45000b102007ef97fc66922845453f2a7a3048d159b5 SHA512 efa8679a4b3d2f0c7080c7428192578ce62f6dde9b43d0fefafebe20db9717be8fa735fcaeda087db017ed02c06a327512a8327bdd6162c53be602e30d196cf9
-EBUILD busybox-1.34.1.ebuild 9288 BLAKE2B 5fa6bb05b1dcf8ef759c7b5decc13293a35f4d49929429041f1b3dcd79b4dc929b1184156240cc75a615aafe18c59df04cff3902367ed89e5932168c1ad203ad SHA512 b1db5299f328a819b32c792db343e4c9a0295390690fce12bf60e2da252b6eae461a39b19ae4619ddaf0f2d991f76a3ee99a52cce0e501c960fc45f96baa6a60
+EBUILD busybox-1.34.1-r1.ebuild 10446 BLAKE2B dfb801339c953a69671c06bb51ad1b438ef79fe79a64584f379077a1a7c629e0a83672a68fc2a0166117aa886e30de56ac64ee5e467117d545e89e2332225d4f SHA512 8f4d2bb46c367957522ae1bef4f35b9cc08d6552e477baf49f5810010fd94e5e54640af2d17bc324c40c5d4a86a251ad44201f53283e0917a1bb4a4f5eef3ad1
EBUILD busybox-1.35.0-r1.ebuild 10490 BLAKE2B aac8738d166fc4b4abf59f2c56f7c42394240240e030a65bc8e3ac641e390ab1dad552d0074e1d258b60775e790e233fdda5b71a0b6a00d81d60de76a41665aa SHA512 7e29be4cb897304a2e22e43be1057bee381d45b29b3ca09021ae49a6ff606f7b074f62379e7da77ac8eb92f0cb6eb0bebd78b7b1dc307b863ae9459b57fb2f47
-EBUILD busybox-1.35.0.ebuild 9332 BLAKE2B 79f86e9049a9662760775e18ef7077d446db6a68a2f7eac249e611db11ac0f4b919403e78772b26c3971ab33dec77138b5fee43e8c1a6ca562a33e2c95a9db63 SHA512 f5966479c19c52226553d9f75eacda5e1c4aea4ae62429a1368de0d5192ef361e47d17657f770b84c906a5f223b272bcb08f6dee2ba36ca0fb99e58536f70804
EBUILD busybox-9999.ebuild 10504 BLAKE2B 2d237a219f71a8011fbfa8e452eab54aefa96691d624b791e8ab8524066f757f7708d4e82419043e5eca894e36172789436c1db0018bf5d96982642b5f404342 SHA512 960752c91e7d759ced924d8ad55683ae0d49a7b64c40cc742bbae7eedd105a326285c36312cb355a7f8900f5c915ffec6d55d4cb2c447b2ff4442cb1a795fd11
MISC metadata.xml 873 BLAKE2B d9c3725e1c3587d497894761d9eda08b670522d5c1a5518ea879cb5c9f222519005d28a36d6dea0b34d4bf4a2352e54aa151177f98ac730ce5b83e87ae4d35a2 SHA512 4c74f718046b41fbcf0111c797d6cdfa1f647914bfa5ff9aaedd6844ba1367722f225ed8ac17717d7b44c5ddc3b450e130da46cc0f6e21501b66cfd267a8f9ad
diff --git a/sys-apps/busybox/busybox-1.34.1-r1.ebuild b/sys-apps/busybox/busybox-1.34.1-r1.ebuild
index 45a3ff59d5c1..130d7bd7dce9 100644
--- a/sys-apps/busybox/busybox-1.34.1-r1.ebuild
+++ b/sys-apps/busybox/busybox-1.34.1-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P="${PN}-${PV/_/-}"
SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-apps/busybox/busybox-1.34.1.ebuild b/sys-apps/busybox/busybox-1.34.1.ebuild
deleted file mode 100644
index a983429625d9..000000000000
--- a/sys-apps/busybox/busybox-1.34.1.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI=7
-
-inherit flag-o-matic savedconfig toolchain-funcs
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="https://www.busybox.net/"
-if [[ ${PV} == "9999" ]] ; then
- MY_P="${P}"
- EGIT_REPO_URI="https://git.busybox.net/busybox"
- inherit git-r3
-else
- MY_P="${PN}-${PV/_/-}"
- SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2" # GPL-2 only
-SLOT="0"
-IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd"
-REQUIRED_USE="pam? ( !static )"
-RESTRICT="test"
-
-# TODO: Could make pkgconfig conditional on selinux? bug #782829
-RDEPEND="
- !static? (
- virtual/libc
- virtual/libcrypt:=
- selinux? ( sys-libs/libselinux )
- )
- pam? ( sys-libs/pam )
-"
-DEPEND="${RDEPEND}
- static? (
- virtual/libcrypt[static-libs]
- selinux? ( sys-libs/libselinux[static-libs(+)] )
- )
- sys-kernel/linux-headers"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-busybox_config_option() {
- local flag=$1 ; shift
- if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then
- busybox_config_option $(usex ${flag} y n) "$@"
- return
- fi
- local expr
- while [[ $# -gt 0 ]] ; do
- case ${flag} in
- y) expr="s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" ;;
- n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;;
- *) expr="s:.*\<CONFIG_$1\>.*:CONFIG_$1=${flag}:g" ;;
- esac
- sed -i -e "${expr}" .config || die
- einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find CONFIG_$1 ...")"
- shift
- done
-}
-
-busybox_config_enabled() {
- local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
- case ${val} in
- "") return 1 ;;
- y) return 0 ;;
- *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
- esac
-}
-
-# patches go here!
-PATCHES=(
- "${FILESDIR}"/${PN}-1.26.2-bb.patch
- # "${FILESDIR}"/${P}-*.patch
-)
-
-src_prepare() {
- default
- unset KBUILD_OUTPUT #88088
- append-flags -fno-strict-aliasing #310413
- use ppc64 && append-flags -mminimal-toc #130943
-
- cp "${FILESDIR}"/ginit.c init/ || die
-
- # flag cleanup
- sed -i -r \
- -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
- Makefile.flags || die
- #sed -i '/bbsh/s:^//::' include/applets.h
- sed -i '/^#error Aborting compilation./d' applets/applets.c || die
- use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
- sed -i \
- -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
- -e "/^AR\>/s:=.*:= $(tc-getAR):" \
- -e "/^CC\>/s:=.*:= $(tc-getCC):" \
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
- -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
- Makefile || die
- sed -i \
- -e 's:-static-libgcc::' \
- Makefile.flags || die
-}
-
-src_configure() {
- # check for a busybox config before making one of our own.
- # if one exist lets return and use it.
-
- restore_config .config
- if [ -f .config ]; then
- yes "" | emake -j1 -s oldconfig >/dev/null
- return 0
- else
- ewarn "Could not locate user configfile, so we will save a default one"
- fi
-
- # setup the config file
- emake -j1 -s allyesconfig >/dev/null
- # nommu forces a bunch of things off which we want on #387555
- busybox_config_option n NOMMU
- sed -i '/^#/d' .config
- yes "" | emake -j1 -s oldconfig >/dev/null
-
- # now turn off stuff we really don't want
- busybox_config_option n DMALLOC
- busybox_config_option n FEATURE_2_4_MODULES #607548
- busybox_config_option n FEATURE_SUID_CONFIG
- busybox_config_option n BUILD_AT_ONCE
- busybox_config_option n BUILD_LIBBUSYBOX
- busybox_config_option n FEATURE_CLEAN_UP
- busybox_config_option n MONOTONIC_SYSCALL
- busybox_config_option n USE_PORTABLE_CODE
- busybox_config_option n WERROR
- # triming the BSS size may be dangerous
- busybox_config_option n FEATURE_USE_BSS_TAIL
-
- # These cause trouble with musl.
- if use elibc_musl; then
- busybox_config_option n FEATURE_UTMP
- busybox_config_option n EXTRA_COMPAT
- busybox_config_option n FEATURE_VI_REGEX_SEARCH
- fi
-
- # Disable standalone shell mode when using make-symlinks, else Busybox calls its
- # applets by default without looking up in PATH.
- # This also enables users to disable a builtin by deleting the corresponding symlink.
- if use make-symlinks; then
- busybox_config_option n FEATURE_PREFER_APPLETS
- busybox_config_option n FEATURE_SH_STANDALONE
- fi
-
- # If these are not set and we are using a busybox setup
- # all calls to system() will fail.
- busybox_config_option y ASH
- busybox_config_option y SH_IS_ASH
- busybox_config_option n HUSH
- busybox_config_option n SH_IS_HUSH
-
- busybox_config_option '"/run"' PID_FILE_PATH
- busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH
-
- # disable ipv6 applets
- if ! use ipv6; then
- busybox_config_option n FEATURE_IPV6
- busybox_config_option n TRACEROUTE6
- busybox_config_option n PING6
- busybox_config_option n UDHCPC6
- fi
-
- busybox_config_option pam PAM
- busybox_config_option static STATIC
- busybox_config_option syslog {K,SYS}LOGD LOGGER
- busybox_config_option systemd FEATURE_SYSTEMD
- busybox_config_option math FEATURE_AWK_LIBM
-
- # all the debug options are compiler related, so punt them
- busybox_config_option n DEBUG_SANITIZE
- busybox_config_option n DEBUG
- busybox_config_option y NO_DEBUG_LIB
- busybox_config_option n DMALLOC
- busybox_config_option n EFENCE
- busybox_config_option $(usex debug y n) TFTP_DEBUG
-
- busybox_config_option selinux SELINUX
-
- # this opt only controls mounting with <linux-2.6.23
- busybox_config_option n FEATURE_MOUNT_NFS
-
- # glibc-2.26 and later does not ship RPC implientation
- busybox_config_option n FEATURE_HAVE_RPC
- busybox_config_option n FEATURE_INETD_RPC
-
- # default a bunch of uncommon options to off
- local opt
- for opt in \
- ADD_SHELL \
- BEEP BOOTCHARTD \
- CRONTAB \
- DC DEVFSD DNSD DPKG{,_DEB} \
- FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
- FEATURE_DEVFS \
- HOSTID HUSH \
- INETD INOTIFYD IPCALC \
- LOCALE_SUPPORT LOGNAME LPD \
- MAKEMIME MKFS_MINIX MSH \
- OD \
- RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
- SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
- TASKSET TCPSVD \
- RPM RPM2CPIO \
- UDPSVD UUDECODE UUENCODE
- do
- busybox_config_option n ${opt}
- done
-
- emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
- unset KBUILD_OUTPUT #88088
- export SKIP_STRIP=y
-
- emake V=1 busybox
-
- # bug #701512
- emake V=1 doc
-}
-
-src_install() {
- unset KBUILD_OUTPUT #88088
- save_config .config
-
- into /
- dodir /bin
- if use sep-usr ; then
- # install /ginit to take care of mounting stuff
- exeinto /
- newexe busybox_unstripped ginit
- dosym /ginit /bin/bb
- dosym bb /bin/busybox
- else
- newbin busybox_unstripped busybox
- dosym busybox /bin/bb
- fi
- if use mdev ; then
- dodir /$(get_libdir)/mdev/
- use make-symlinks || dosym /bin/bb /sbin/mdev
- cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
- exeinto /$(get_libdir)/mdev/
- doexe "${FILESDIR}"/mdev/*
-
- newinitd "${FILESDIR}"/mdev.initd mdev
- fi
- if use livecd ; then
- dosym busybox /bin/vi
- fi
-
- # add busybox daemon's, bug #444718
- if busybox_config_enabled FEATURE_NTPD_SERVER; then
- newconfd "${FILESDIR}"/ntpd.confd busybox-ntpd
- newinitd "${FILESDIR}"/ntpd.initd busybox-ntpd
- fi
- if busybox_config_enabled SYSLOGD; then
- newconfd "${FILESDIR}"/syslogd.confd busybox-syslogd
- newinitd "${FILESDIR}"/syslogd.initd busybox-syslogd
- fi
- if busybox_config_enabled KLOGD; then
- newconfd "${FILESDIR}"/klogd.confd busybox-klogd
- newinitd "${FILESDIR}"/klogd.initd busybox-klogd
- fi
- if busybox_config_enabled WATCHDOG; then
- newconfd "${FILESDIR}"/watchdog.confd busybox-watchdog
- newinitd "${FILESDIR}"/watchdog.initd busybox-watchdog
- fi
- if busybox_config_enabled UDHCPC; then
- local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
- exeinto "${path%/*}"
- newexe examples/udhcp/simple.script "${path##*/}"
- fi
- if busybox_config_enabled UDHCPD; then
- insinto /etc
- doins examples/udhcp/udhcpd.conf
- fi
-
- # bundle up the symlink files for use later
- emake DESTDIR="${ED}" install
- rm _install/bin/busybox || die
- # for compatibility, provide /usr/bin/env
- mkdir -p _install/usr/bin || die
- ln -s /bin/env _install/usr/bin/env || die
- tar cf busybox-links.tar -C _install . || : #;die
- insinto /usr/share/${PN}
- use make-symlinks && doins busybox-links.tar
-
- dodoc AUTHORS README TODO
-
- cd docs || die
- doman busybox.1
- docinto txt
- dodoc *.txt
- docinto pod
- dodoc *.pod
- docinto html
- dodoc *.html
-
- cd ../examples || die
- docinto examples
- dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
- if use make-symlinks ; then
- mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
- fi
-}
-
-pkg_postinst() {
- savedconfig_pkg_postinst
-
- if use make-symlinks ; then
- cd "${T}" || die
- mkdir _install
- tar xf busybox-links.tar -C _install || die
- echo n | cp -ivpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
- fi
-
- if use sep-usr ; then
- elog "In order to use the sep-usr support, you have to update your"
- elog "kernel command line. Add the option:"
- elog " init=/ginit"
- elog "To launch a different init than /sbin/init, use:"
- elog " init=/ginit /sbin/yourinit"
- elog "To get a rescue shell, you may boot with:"
- elog " init=/ginit bb"
- fi
-}
diff --git a/sys-apps/busybox/busybox-1.35.0.ebuild b/sys-apps/busybox/busybox-1.35.0.ebuild
deleted file mode 100644
index 223e6ce2486d..000000000000
--- a/sys-apps/busybox/busybox-1.35.0.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI=7
-
-inherit flag-o-matic savedconfig toolchain-funcs
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="https://www.busybox.net/"
-if [[ ${PV} == "9999" ]] ; then
- MY_P="${P}"
- EGIT_REPO_URI="https://git.busybox.net/busybox"
- inherit git-r3
-else
- MY_P="${PN}-${PV/_/-}"
- SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
- # unstable release - no keywords
- # KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2" # GPL-2 only
-SLOT="0"
-IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd"
-REQUIRED_USE="pam? ( !static )"
-RESTRICT="test"
-
-# TODO: Could make pkgconfig conditional on selinux? bug #782829
-RDEPEND="
- !static? (
- virtual/libc
- virtual/libcrypt:=
- selinux? ( sys-libs/libselinux )
- )
- pam? ( sys-libs/pam )
-"
-DEPEND="${RDEPEND}
- static? (
- virtual/libcrypt[static-libs]
- selinux? ( sys-libs/libselinux[static-libs(+)] )
- )
- sys-kernel/linux-headers"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-busybox_config_option() {
- local flag=$1 ; shift
- if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then
- busybox_config_option $(usex ${flag} y n) "$@"
- return
- fi
- local expr
- while [[ $# -gt 0 ]] ; do
- case ${flag} in
- y) expr="s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" ;;
- n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;;
- *) expr="s:.*\<CONFIG_$1\>.*:CONFIG_$1=${flag}:g" ;;
- esac
- sed -i -e "${expr}" .config || die
- einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find CONFIG_$1 ...")"
- shift
- done
-}
-
-busybox_config_enabled() {
- local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
- case ${val} in
- "") return 1 ;;
- y) return 0 ;;
- *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
- esac
-}
-
-# patches go here!
-PATCHES=(
- "${FILESDIR}"/${PN}-1.26.2-bb.patch
- # "${FILESDIR}"/${P}-*.patch
-)
-
-src_prepare() {
- default
- unset KBUILD_OUTPUT #88088
- append-flags -fno-strict-aliasing #310413
- use ppc64 && append-flags -mminimal-toc #130943
-
- cp "${FILESDIR}"/ginit.c init/ || die
-
- # flag cleanup
- sed -i -r \
- -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
- Makefile.flags || die
- #sed -i '/bbsh/s:^//::' include/applets.h
- sed -i '/^#error Aborting compilation./d' applets/applets.c || die
- use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
- sed -i \
- -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
- -e "/^AR\>/s:=.*:= $(tc-getAR):" \
- -e "/^CC\>/s:=.*:= $(tc-getCC):" \
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
- -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
- Makefile || die
- sed -i \
- -e 's:-static-libgcc::' \
- Makefile.flags || die
-}
-
-src_configure() {
- # check for a busybox config before making one of our own.
- # if one exist lets return and use it.
-
- restore_config .config
- if [ -f .config ]; then
- yes "" | emake -j1 -s oldconfig >/dev/null
- return 0
- else
- ewarn "Could not locate user configfile, so we will save a default one"
- fi
-
- # setup the config file
- emake -j1 -s allyesconfig >/dev/null
- # nommu forces a bunch of things off which we want on #387555
- busybox_config_option n NOMMU
- sed -i '/^#/d' .config
- yes "" | emake -j1 -s oldconfig >/dev/null
-
- # now turn off stuff we really don't want
- busybox_config_option n DMALLOC
- busybox_config_option n FEATURE_2_4_MODULES #607548
- busybox_config_option n FEATURE_SUID_CONFIG
- busybox_config_option n BUILD_AT_ONCE
- busybox_config_option n BUILD_LIBBUSYBOX
- busybox_config_option n FEATURE_CLEAN_UP
- busybox_config_option n MONOTONIC_SYSCALL
- busybox_config_option n USE_PORTABLE_CODE
- busybox_config_option n WERROR
- # triming the BSS size may be dangerous
- busybox_config_option n FEATURE_USE_BSS_TAIL
-
- # These cause trouble with musl.
- if use elibc_musl; then
- busybox_config_option n FEATURE_UTMP
- busybox_config_option n EXTRA_COMPAT
- busybox_config_option n FEATURE_VI_REGEX_SEARCH
- fi
-
- # Disable standalone shell mode when using make-symlinks, else Busybox calls its
- # applets by default without looking up in PATH.
- # This also enables users to disable a builtin by deleting the corresponding symlink.
- if use make-symlinks; then
- busybox_config_option n FEATURE_PREFER_APPLETS
- busybox_config_option n FEATURE_SH_STANDALONE
- fi
-
- # If these are not set and we are using a busybox setup
- # all calls to system() will fail.
- busybox_config_option y ASH
- busybox_config_option y SH_IS_ASH
- busybox_config_option n HUSH
- busybox_config_option n SH_IS_HUSH
-
- busybox_config_option '"/run"' PID_FILE_PATH
- busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH
-
- # disable ipv6 applets
- if ! use ipv6; then
- busybox_config_option n FEATURE_IPV6
- busybox_config_option n TRACEROUTE6
- busybox_config_option n PING6
- busybox_config_option n UDHCPC6
- fi
-
- busybox_config_option pam PAM
- busybox_config_option static STATIC
- busybox_config_option syslog {K,SYS}LOGD LOGGER
- busybox_config_option systemd FEATURE_SYSTEMD
- busybox_config_option math FEATURE_AWK_LIBM
-
- # all the debug options are compiler related, so punt them
- busybox_config_option n DEBUG_SANITIZE
- busybox_config_option n DEBUG
- busybox_config_option y NO_DEBUG_LIB
- busybox_config_option n DMALLOC
- busybox_config_option n EFENCE
- busybox_config_option $(usex debug y n) TFTP_DEBUG
-
- busybox_config_option selinux SELINUX
-
- # this opt only controls mounting with <linux-2.6.23
- busybox_config_option n FEATURE_MOUNT_NFS
-
- # glibc-2.26 and later does not ship RPC implientation
- busybox_config_option n FEATURE_HAVE_RPC
- busybox_config_option n FEATURE_INETD_RPC
-
- # default a bunch of uncommon options to off
- local opt
- for opt in \
- ADD_SHELL \
- BEEP BOOTCHARTD \
- CRONTAB \
- DC DEVFSD DNSD DPKG{,_DEB} \
- FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
- FEATURE_DEVFS \
- HOSTID HUSH \
- INETD INOTIFYD IPCALC \
- LOCALE_SUPPORT LOGNAME LPD \
- MAKEMIME MKFS_MINIX MSH \
- OD \
- RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
- SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
- TASKSET TCPSVD \
- RPM RPM2CPIO \
- UDPSVD UUDECODE UUENCODE
- do
- busybox_config_option n ${opt}
- done
-
- emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
- unset KBUILD_OUTPUT #88088
- export SKIP_STRIP=y
-
- emake V=1 busybox
-
- # bug #701512
- emake V=1 doc
-}
-
-src_install() {
- unset KBUILD_OUTPUT #88088
- save_config .config
-
- into /
- dodir /bin
- if use sep-usr ; then
- # install /ginit to take care of mounting stuff
- exeinto /
- newexe busybox_unstripped ginit
- dosym /ginit /bin/bb
- dosym bb /bin/busybox
- else
- newbin busybox_unstripped busybox
- dosym busybox /bin/bb
- fi
- if use mdev ; then
- dodir /$(get_libdir)/mdev/
- use make-symlinks || dosym /bin/bb /sbin/mdev
- cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
- exeinto /$(get_libdir)/mdev/
- doexe "${FILESDIR}"/mdev/*
-
- newinitd "${FILESDIR}"/mdev.initd mdev
- fi
- if use livecd ; then
- dosym busybox /bin/vi
- fi
-
- # add busybox daemon's, bug #444718
- if busybox_config_enabled FEATURE_NTPD_SERVER; then
- newconfd "${FILESDIR}"/ntpd.confd busybox-ntpd
- newinitd "${FILESDIR}"/ntpd.initd busybox-ntpd
- fi
- if busybox_config_enabled SYSLOGD; then
- newconfd "${FILESDIR}"/syslogd.confd busybox-syslogd
- newinitd "${FILESDIR}"/syslogd.initd busybox-syslogd
- fi
- if busybox_config_enabled KLOGD; then
- newconfd "${FILESDIR}"/klogd.confd busybox-klogd
- newinitd "${FILESDIR}"/klogd.initd busybox-klogd
- fi
- if busybox_config_enabled WATCHDOG; then
- newconfd "${FILESDIR}"/watchdog.confd busybox-watchdog
- newinitd "${FILESDIR}"/watchdog.initd busybox-watchdog
- fi
- if busybox_config_enabled UDHCPC; then
- local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
- exeinto "${path%/*}"
- newexe examples/udhcp/simple.script "${path##*/}"
- fi
- if busybox_config_enabled UDHCPD; then
- insinto /etc
- doins examples/udhcp/udhcpd.conf
- fi
-
- # bundle up the symlink files for use later
- emake DESTDIR="${ED}" install
- rm _install/bin/busybox || die
- # for compatibility, provide /usr/bin/env
- mkdir -p _install/usr/bin || die
- ln -s /bin/env _install/usr/bin/env || die
- tar cf busybox-links.tar -C _install . || : #;die
- insinto /usr/share/${PN}
- use make-symlinks && doins busybox-links.tar
-
- dodoc AUTHORS README TODO
-
- cd docs || die
- doman busybox.1
- docinto txt
- dodoc *.txt
- docinto pod
- dodoc *.pod
- docinto html
- dodoc *.html
-
- cd ../examples || die
- docinto examples
- dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
- if use make-symlinks ; then
- mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
- fi
-}
-
-pkg_postinst() {
- savedconfig_pkg_postinst
-
- if use make-symlinks ; then
- cd "${T}" || die
- mkdir _install
- tar xf busybox-links.tar -C _install || die
- echo n | cp -ivpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
- fi
-
- if use sep-usr ; then
- elog "In order to use the sep-usr support, you have to update your"
- elog "kernel command line. Add the option:"
- elog " init=/ginit"
- elog "To launch a different init than /sbin/init, use:"
- elog " init=/ginit /sbin/yourinit"
- elog "To get a rescue shell, you may boot with:"
- elog " init=/ginit bb"
- fi
-}
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index ed4389ebc047..01135f2bff4d 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,11 +1,12 @@
AUX file-5.39-portage-sandbox.patch 457 BLAKE2B ff4b67570144d5995ef62326da5f7a4ac5fe4befc3db56ff6d6a711c84bb4316da9e1a203326a6bc219066acd8e40634bf17f28f95d583bfa2f3d4698bcd57fc SHA512 20f66d918a605233f733fa6f5c038d9c56ec1175e706b76b16ecb8be81d64d79c3a932824b61092bf1edcd55c29fc2bcfa8bdf506e5717c10e849ec6110bbd3d
AUX file-5.40-seccomp-fstatat64-musl.patch 578 BLAKE2B c2c074e4dca62253303bae3af88a7ce0bc7d3efd608bd7269d624ad69b0fe4022db38efc5bb63d8f6d1f7bf45c2a1d749c406e76cf1ce42be731e663e2874ad5 SHA512 008c2a2c18b14eaa49f62b87fa14f4bea46bfd56efda17e49541fd51d87201d4d5511d3aae50b53dfcd68cc8e9a38884711ac59458acff9bf3290e267c2891bb
AUX file-5.43-configure-clang16.patch 473 BLAKE2B 4f98016638a5afb5e7dd8c1085077d562a65811585971f5c5dd3c36b1848754900e2c41779c55b69b65c8ca07533f379623e230f7cd9cecd00318619572f1e24 SHA512 96627055e6a970fbad2f8a3c8d6ad5b326e89fceab081187e012c3a363975bb3d2368320653093121ef132fa80e4c9576278e3d58aee4b5a4afc26aa88ecd5c7
+AUX file-5.44-limits-solaris.patch 443 BLAKE2B d7481f0669b48d6c1a94e50706b6523636adba4e789d8f5a43fe231d26cbe89b8faded72470059cce7064d011eb5587ae4d5ef34c83c0463f04dd322d09aa5a4 SHA512 d96e84db2e87ca616d2d0eea58e188847f5bd98fcb843d1b875786e3f23faf515d199b2ccf5d4cc22834153a889439b7754091f80d5588f7cbd343d218a442c4
DIST file-5.43.tar.gz 1162786 BLAKE2B aaaf32c5054fb83e912af6656e5e67947f45576ec3711c7cba5531ed780e142a448580e0db41a828c8a3c5d2f1bf0c8ed49bc9688499caaae4a08baa16b3610c SHA512 9d02f4e7a69d90468d6bd35df5ec240ddee8c2408b7df3e73427d7f18736baf77db0638a1fe8283f4e6abd1d5ad653890ed3a5a0d48bb52d4023ca4070ecdf06
DIST file-5.43.tar.gz.asc 195 BLAKE2B d7f83b3e21d1390467989f8870e36daa48ebb8c5ac7ab8dc6d667a65d10561126d32cfc5ef3d81a130990b3e46bcba9b5e03f0a7dd169782351b02cebec2471f SHA512 c565958840f2f5c62821cd08d4149ec97c574232913ec00400473364e160250cfaced8c715e109c4c617359e33d2470f7ca6af1891cbdf994329e890f90c8be3
DIST file-5.44.tar.gz 1186437 BLAKE2B a90ccae738a95315d75a0aaee7bbff3624425cc9267daf18ba9147b7c9b9ebfb31288b54c63a73e4695eca0e876f206e40bcb81c422f1bf572b976e753b25a42 SHA512 26c3b9c7a6950649d0b2de896bfeca54289febe4cd487c0f91aa6ff1857fa49f9077f8738a17b86100125668a31dae05b586615c564f78da47ac20a1e4a74f63
DIST file-5.44.tar.gz.asc 195 BLAKE2B a0905d42fec0fa052d75fb5b267c6ae223176451c0f1d3346006d4b760c3d858f2dcda5f0a30c6aa4b09b5afee427b75bc4debd5033d978f39dc1da01d3e1bd1 SHA512 1a4dc39283f4859581441aa35b3ed72b323c4e05ca0960d17126d1b9ec18465c695c0545e24f09f8437a60ab52e582be67b6cbbc656bbb676de00148c3644d23
EBUILD file-5.43-r1.ebuild 3748 BLAKE2B 5cce5b890df2d675984dd049b669d4160e9a714d948b4c7213047eda7d0fb4f68bb94059412df0ec222cf3e1b2d3b0bf249e0f13175e8a6fb266f49e3917a61a SHA512 cbed9dfc83dd46e449533c776440e551e545a4c5d215b583ad10aa20ea61917dfb2d84f62e6a858696ac1193253757c67540476e90b79f69029ed48feb393958
-EBUILD file-5.44.ebuild 3857 BLAKE2B c8faaecdce172d9944b65b35c3ab9344c05ec28104cb234bcc49b532ee1bab378db16c043f0414926a5f66c69627fc6ce1e0c9262cb92593c4c45241108d9df9 SHA512 efeeaf5a72875ed4e06fd438d49a173440ff7eff33680477a80ca9c4af17382e5f9acb7112fdd8b3b8a6b230eb1e8046b79e9df09a2a6c429fb94ce6ad66442b
+EBUILD file-5.44.ebuild 3922 BLAKE2B 830b25f8cc30cff9554f7b82f4250cf5900363b75a211c246ccdea5218906c0ac7528be116bee826e254f513680777a69b697b46d4b7413cca8a2fc28456422a SHA512 f609d49bf6fa3c99b11ee2218de4b6e1bb87bb75c6a709c0658c524fb56ffc61c8fa5595fff0463e80cd9187bd27d0e670162de88141da9b0bf668ea5cc9b0ac
EBUILD file-9999.ebuild 3870 BLAKE2B ac7f37d005c94d589cf9663a2443d7ea49df93e52da2b66c60d1e755ba787810c1885d47268e424857e19755786d69660415f137baf3f4b2325b40e94dc998a3 SHA512 d44ae484b41b20df592a0b69ce054557a963f8b63b956f9ec70564351d7c23ab26d969bc3f1d914a0440da7dad72b1ae413193c1e6cc1a1263e4052a64028309
MISC metadata.xml 565 BLAKE2B 737512e354fedb4483608b04c594a486c0d8a0f70d23d306c59c78dedb0c8116f80ff558926444b9d9b9ef15805b3826163523b5644c88f01a330be1b8c9a76f SHA512 f240bf9e064c6e6f5b63e3265dfe3adf5b1d2c2b5b2456b79ea7451580150271ccb4097d33967de57ba767fecbdbea51fb62ccb683fcc5e1cca101be660ffd19
diff --git a/sys-apps/file/file-5.44.ebuild b/sys-apps/file/file-5.44.ebuild
index 41f62b904bd3..e300174f860d 100644
--- a/sys-apps/file/file-5.44.ebuild
+++ b/sys-apps/file/file-5.44.ebuild
@@ -54,6 +54,7 @@ BDEPEND+="
PATCHES=(
"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
"${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not upstream yet
+ "${FILESDIR}/file-5.44-limits-solaris.patch" # not upstream yet
)
src_prepare() {
diff --git a/sys-apps/file/files/file-5.44-limits-solaris.patch b/sys-apps/file/files/file-5.44-limits-solaris.patch
new file mode 100644
index 000000000000..7a04535577b4
--- /dev/null
+++ b/sys-apps/file/files/file-5.44-limits-solaris.patch
@@ -0,0 +1,19 @@
+softmagic: include limits.h for UINT_MAX usage
+
+Platforms like Solaris need this to compile.
+
+Bug: https://bugs.astron.com/view.php?id=413
+Signed-off-by: Fabian Groffen <grobian@gentoo.org>
+
+--- a/src/softmagic.c
++++ b/src/softmagic.c
+@@ -42,6 +42,7 @@
+ #include <ctype.h>
+ #include <stdlib.h>
+ #include <time.h>
++#include <limits.h>
+ #include "der.h"
+
+ file_private int match(struct magic_set *, struct magic *, file_regex_t **, size_t,
+
+
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 67b33b720ab2..c3bc6cdd5ab5 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,7 +1,4 @@
-DIST gawk-5.1.1.tar.xz 3250860 BLAKE2B 35eec6f4c9bf52496ac16e4b0e1b98947ae0dd46d0ab1df9ec13ede24374a4917214e492182a16e25fc515fa62a765340914feac16a006d980ba1328634a5291 SHA512 794538fff03fdb9a8527a6898b26383d01988e8f8456f8d48131676387669a8bb3e706fa1a17f6b6316ddba0ebe653c24ad5dd769f357de509d6ec25f3ff1a43
-DIST gawk-5.1.1.tar.xz.sig 488 BLAKE2B 1c7813753f3e982e1ef31efc7a1d78da4b977064b395e7b138ce09e68c1b9cb9a7b7de0d0b36afd6d39a2e62d5563cf7ceac6fcc73e9124ab07eceb56c0aa040 SHA512 71ecfa1b3a9e3005f033e83a75abce5c576c7941c62ed571cb6124032426db0e220bcdd577395d1af00a53c13dd1c8e6de71702cbe9c71960d3a3ff76dc026bd
DIST gawk-5.2.1.tar.xz 3411420 BLAKE2B 5dbbfe92ed4c11a38b2f995e9267dd2e392a9f393af1c63aaf3c5dd6d1681c01db900e05a118831125f914fcffe2218de7f30891ccc6f64abc5f572aef5feeff SHA512 f81da3e61987d1460326dc79fdbabacfd4660219bf66ec8ba18877500fd24e160761e401a5b868067f82bec46a6a808098f3f6a1f4c8b710e439cd3f99ffa56c
DIST gawk-5.2.1.tar.xz.sig 488 BLAKE2B 5dcdc9ae90d4744a968cc750526a9c1c38915f85c56c2eca80b219ba8519c927ab55b7f569d55054b0499f7bf37d3413b97e9d3cf36f5573f9ecd4855663064e SHA512 97a9cfb069f235bef31892ec6e5c56ee6a8733129ae3d02e871d5407de4d7a6140fc0a87001b2b21e3cffd714d1b4d164876de47144dfdce6dea92c670ed0217
-EBUILD gawk-5.1.1-r2.ebuild 2762 BLAKE2B dc12406f53b61c3a99cfd3dfbbe0a430b4746920a78be5fb611b8d6c61a8de5e82ff2002d3b8c3d90562d408d26453ada810f60ceb4bef961875b677c8079e64 SHA512 96941cc2cf82f799bca38f8707b9cdce9764a817e5fdd950fd91be3de00f5ae6fee2660a2fd77b7effd9d42263a33ce40927525f076c2140a83d84b3af7fb887
-EBUILD gawk-5.2.1.ebuild 3359 BLAKE2B a42f5d53f2a4693a49325ee2e569b89939fac91ba2aca48bc810031ae9a457e2ac1f434194e28fba7ba64e51154272f61a16e4cc29762081457ca89af0d77964 SHA512 dd44929098af44c2c3951c152492c0f4823e73018e1341ad77a2a47db740c7b3eaf50606bbffa3666ea6dc8b5587737f43350bd0a1a1462d9948358da0de81f4
+EBUILD gawk-5.2.1.ebuild 3354 BLAKE2B b2510a2d01be5b86fe2d8bcc46d0c25b815e72beb5ca9589c5edec25b214650518effc956019f30ca5c51adf4be4c05baf02b71ecb6c42516a4922428a4071c1 SHA512 f45164bfcedebeccad4f9716898873d68cb1d1dcb8aebcb71410f5b8bc29933f0f20dfc6b2750087dd796c94e4e2fdbad9b7941fcf4cd38de157ff3e5c844c43
MISC metadata.xml 654 BLAKE2B e04183a376da2006e727296257a18431f2e4f29fdabcee48edebb1c9dbf099c846af6bfe90d9e551ec4536c2dd034a80b47e6a1b8e442a89c1228929bef7d956 SHA512 9bb5a19c4b9a8ff7669c7ae7320a88d64eb68b4897f06d2046f71efe562a4846cb8c611bcc03b0111dfde19b40275f3357a5cd6285d4d5f0b4464a9c8b3eacb2
diff --git a/sys-apps/gawk/gawk-5.1.1-r2.ebuild b/sys-apps/gawk/gawk-5.1.1-r2.ebuild
deleted file mode 100644
index 3bdae58c5637..000000000000
--- a/sys-apps/gawk/gawk-5.1.1-r2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gawk.asc
-
-inherit verify-sig
-
-DESCRIPTION="GNU awk pattern-matching language"
-HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html"
-SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( mirror://gnu/gawk/${P}.tar.xz.sig )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="mpfr nls readline"
-
-RDEPEND="
- mpfr? (
- dev-libs/gmp:=
- dev-libs/mpfr:=
- )
- readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- >=sys-apps/texinfo-6.7
- >=sys-devel/bison-3.5.4
- nls? ( sys-devel/gettext )
- verify-sig? ( sec-keys/openpgp-keys-gawk )
-"
-
-src_prepare() {
- default
-
- # Use symlinks rather than hardlinks, and disable version links
- sed -i \
- -e '/^LN =/s:=.*:= $(LN_S):' \
- -e '/install-exec-hook:/s|$|\nfoo:|' \
- Makefile.in doc/Makefile.in || die
-
- # bug #413327
- sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in || die
-
- # Fix typo in configure
- # https://lists.gnu.org/archive/html/bug-gawk/2021-10/msg00022.html
- sed -i -e 's/AR_FLAGS = /AR_FLAGS=/' configure || die
-
- # Fix standards conflict on Solaris
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i \
- -e '/\<_XOPEN_SOURCE\>/s/1$/600/' \
- -e '/\<_XOPEN_SOURCE_EXTENDED\>/s/1//' \
- extension/inplace.c || die
- fi
-}
-
-src_configure() {
- # Avoid automagic dependency on libsigsegv
- export ac_cv_libsigsegv=no
-
- local myeconfargs=(
- --cache-file="${S}"/config.cache
- --libexec='$(libdir)/misc'
- $(use_with mpfr)
- $(use_enable nls)
- $(use_with readline)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- # Automatic dodocs barfs
- rm -rf README_d || die
-
- default
-
- # Install headers
- insinto /usr/include/awk
- doins *.h
- rm "${ED}"/usr/include/awk/config.h || die
-}
-
-pkg_postinst() {
- # Symlink creation here as the links do not belong to gawk, but to any awk
- if has_version app-admin/eselect && has_version app-eselect/eselect-awk ; then
- eselect awk update ifunset
- else
- local l
- for l in "${EROOT}"/usr/share/man/man1/gawk.1* "${EROOT}"/usr/bin/gawk ; do
- if [[ -e ${l} ]] && ! [[ -e ${l/gawk/awk} ]] ; then
- ln -s "${l##*/}" "${l/gawk/awk}" || die
- fi
- done
-
- if ! [[ -e ${EROOT}/bin/awk ]] ; then
- # /bin might not exist yet (stage1)
- [[ -d "${EROOT}/bin" ]] || mkdir "${EROOT}/bin" || die
-
- ln -s "../usr/bin/gawk" "${EROOT}/bin/awk" || die
- fi
- fi
-}
-
-pkg_postrm() {
- if has_version app-admin/eselect && has_version app-eselect/eselect-awk ; then
- eselect awk update ifunset
- fi
-}
diff --git a/sys-apps/gawk/gawk-5.2.1.ebuild b/sys-apps/gawk/gawk-5.2.1.ebuild
index 8d7b908fb78c..d4a984a836c7 100644
--- a/sys-apps/gawk/gawk-5.2.1.ebuild
+++ b/sys-apps/gawk/gawk-5.2.1.ebuild
@@ -29,7 +29,7 @@ else
SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
SRC_URI+=" verify-sig? ( mirror://gnu/gawk/${P}.tar.xz.sig )"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-3+"
diff --git a/sys-apps/nawk/Manifest b/sys-apps/nawk/Manifest
index 41bbb8aa957d..74f7d6021346 100644
--- a/sys-apps/nawk/Manifest
+++ b/sys-apps/nawk/Manifest
@@ -1,3 +1,3 @@
DIST nawk-20220122.tar.gz 1832761 BLAKE2B f704ff9cf5012545ec3adc1887c0d43625d7e38e19589cba91fe31f664e72ccce20dee3f2484067a31af793be16439c1389603fbdb33c119efeafb18559a0d97 SHA512 46ab7936705288c9cd22867ad9f5b080ade67c4b05d674304e0e5cae8ea329420a9a46e3578bf3a014b7066a1185b7506b0f74445bb52aafb1090e7a82a5bf28
-EBUILD nawk-20220122-r1.ebuild 1221 BLAKE2B 802b61e7823ac68458a9d738d565c6a6a7acf04096af3074e98678c992ad40f2a906a0196cd1506bcea21936b2acf8d754eacebbbc8da41bbf206e6497b84508 SHA512 b9a035666e449f3fd070d3f82f8b0813808e09d592320cfb3a0397173858d0b291d7b3de329a33d842732af78a193468762a988a47ff453c3ff5d4bd6f853b6f
+EBUILD nawk-20220122-r1.ebuild 1216 BLAKE2B db18c5b169dd2dd6c85e81756674dccd73e395e26cef113d92cd04417691decf5672708f6b239f14ccba830a609b9edf99f3eb4b3739924c111ac8c8d83f9ef0 SHA512 d9855abb66c6fa63b84088fa0621014e9863a5bc0569fea02d0184ae892129f69c2908c206738f346e32bf5db5dc0353ebb9a1206e0a5ca169f6dcbb3127bcfa
MISC metadata.xml 417 BLAKE2B 85317627ae503b37bb2355d4142e2af954870cce4b495daa56d7c6df2bb1d249b4ae824daa23ac8e6013926501827cb39891b184354a4757073e055e43d3601a SHA512 004179548b6f06aa73b658add57f0f2c9755b67ebd3d7e0956c5856090a662d58c8bca35a1de7cebcd3eceeb84e0f0efb0402db9fd743d5152bcf3c74b185b9c
diff --git a/sys-apps/nawk/nawk-20220122-r1.ebuild b/sys-apps/nawk/nawk-20220122-r1.ebuild
index cffd81456266..d25f6713af63 100644
--- a/sys-apps/nawk/nawk-20220122-r1.ebuild
+++ b/sys-apps/nawk/nawk-20220122-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/onetrueawk/awk/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux"
DEPEND="
app-alternatives/yacc
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index f81ce94c8bef..12ab81276717 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,8 +1,8 @@
AUX pkgcore-0.12.17-fix-extra-files.patch 1006 BLAKE2B 72de925e135d33f3cdf52382c4a9cf172f195301de467e01d4218f88b4037d6e7fc824f06401e1838c4a22d25e3132f0b0aace9047bc6b557e413ed65e6e6053 SHA512 1f09f215b544cdbc07935af405f94a5c69f4840a1c1570e9cea23a2a48cf8a4e71a9ac74f8b65cf7f3d391060fc2f8012761f4187e9a4446e4e9de42d6c316c9
AUX pkgcore-0.12.17-fix-prefix.patch 731 BLAKE2B 4487c145393747415717f5bf4845a49741641eb509175d4bcf766ae56625513243f7f0a951ad749a1e5efcf5327e16b8b9d684a5e235a23b18a0af5256e4506c SHA512 edcaa570a6c7606437b3b35f684f9fcd9c1fc2bf493c5199ad209007dec0ae546b31fff3b6adcc9477cda3a7ad35764357107519d8429a254af52d56b3f0c3ee
-DIST pkgcore-0.12.16.tar.gz 623795 BLAKE2B b591aeaa5d780f0b273d446d1bdbdf33a44d085aa4975d3c5f394820a6f479c15da7850a699c92a56cb280ee028d922551c7226801dea6f4c34620bde3859c31 SHA512 acd7c478b342349e66dfda5ed1284663037b221e39b557215d1441e8a908c845fe26e274bcfd97b1879f5792fc017437cd0fbde1cdffc5ebc595a34fa56d2589
DIST pkgcore-0.12.17.tar.gz 615375 BLAKE2B 9aabdeead2997e53ee3c966c908a231ff5e3b85422844538f47ff7bed03611459224ad7e931a9e94f0e376f221bd5c54f0f77f7883543cbd5b03c4dba6ba591b SHA512 9bad9b6e6177873b9187cff66b6b51c644a59a2d9f01b8ca110bc49006d6f0221c2c3b145d7cf5cec6f3c7526b6751100d56df13350b674a68ab5bbf19f10131
-EBUILD pkgcore-0.12.16-r1.ebuild 1449 BLAKE2B a4620deadd0c3e5c59a72b0eea28d15dab8d73449051d59f347a4d37b4a83c69ff8c84cae743b7d8f3344dbac5055c08e6a85282d3680900b9e873131ba9f842 SHA512 cd9676de9f17249a2c0aeb1b266b357c6a700f829a6fe8ba0b9cab5423312ef8874e2f407c29156f894a2c9b64e3a7e98d733f6abff082ec2a199870e629c1e2
+DIST pkgcore-0.12.18.tar.gz 630331 BLAKE2B a3be66c1af3b455733cadfeb0117f37593187dda3d8653532a5f32b6292e9350363514b3d6bf0fcd10b32187b5f257f90985cd752739998bfe4d2f6aa2cab2c7 SHA512 c8ca97cd27f5ba37f6baa160e1a387789e1477ca689e477e9f3f68cb8acd1a27b9fb9f77f3eb11e0babad7461f0c27ce08ec619abfd4c259fdcfd203ec325dc0
EBUILD pkgcore-0.12.17-r2.ebuild 1241 BLAKE2B 67795444045840078c64cad5fb90b58d74ad60e3c991764c5abeae1fc0c9de81366ac8d805d8f83524ea3f11987d07c53746e89568125cd92619233c7259bee5 SHA512 593a11d72ea6db8b6a883533d1e5dedc8e49cec6b90cec7afefa36abe8138ac397860af62af9d94901ed707c08d5493d6ab5017d7c40843a7d182334901f74ab
-EBUILD pkgcore-9999.ebuild 1139 BLAKE2B 1030392abec3f120c6e588b7750cdf03b01cce418ed79c85d4b2de5d62e5474d2e0c690294c80f4f0e66d8b38208de409a41e7f0e4bc805424399935670c828c SHA512 cac9cdada2dc91a8e720d40af32dd61d0f4884766d581cf793c39757a43457c0e680abac4b44fe71975cc017e047b8bc79b1bd5586d45f203679814eb427af32
+EBUILD pkgcore-0.12.18.ebuild 1139 BLAKE2B 0838d6b83edf528dd68a4a15c580cc290a027604995dd8d3f50c7c7fa768f1901f7a7f6c7f3a99e59a7b2b3c217e12b12c1b24ecb3c4f2b57cd70cf3551d593a SHA512 ab3bc9d211059f63c9893c2439e87ce75807c1af7e2621ef9341610bbee93ed284d6a7c18421f06318c4d9e72a264ae4e60e48ab0a4dfe4dfc8d04e5bab92f97
+EBUILD pkgcore-9999.ebuild 1139 BLAKE2B 0838d6b83edf528dd68a4a15c580cc290a027604995dd8d3f50c7c7fa768f1901f7a7f6c7f3a99e59a7b2b3c217e12b12c1b24ecb3c4f2b57cd70cf3551d593a SHA512 ab3bc9d211059f63c9893c2439e87ce75807c1af7e2621ef9341610bbee93ed284d6a7c18421f06318c4d9e72a264ae4e60e48ab0a4dfe4dfc8d04e5bab92f97
MISC metadata.xml 392 BLAKE2B 98797b18321d3133dceaf79389bd35b26344a342c55c477b178359d731c46fa209adbdcf1d14eb009d57c8c20db8b898651dd45d5bcfc6bb3009ceffa1436650 SHA512 097710cc6c1df7455328a1d3feb223e324162ff20ef03964de4682eec7acf4e2d08fa64d3ac4946783f4c2587455d90ee5aa628f637f3a48386d9c9e6b7362e1
diff --git a/sys-apps/pkgcore/pkgcore-0.12.16-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.12.16-r1.ebuild
deleted file mode 100644
index b060b26f7101..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.12.16-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/pkgcore/pkgcore"
- inherit git-r3
-else
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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.10.0[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
- test? (
- >=dev-python/pytest-6[${PYTHON_USEDEP}]
- dev-vcs/git
- )
-"
-
-distutils_enable_tests setup.py
-
-src_prepare() {
- # force Gentoo's prefix
- sed -e "/INSTALL_PREFIX =/s@= .*\$@= '${EPREFIX}/usr'@" -i setup.py || die
-
- distutils-r1_src_prepare
-}
-
-src_test() {
- # With PYTHONDONTWRITEBYTECODE=, python will try rebuild all sorts of modules.
- # https://bugs.gentoo.org/840266
- local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
- addpredict /
-
- 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/pkgcore/pkgcore-0.12.18.ebuild b/sys-apps/pkgcore/pkgcore-0.12.18.ebuild
new file mode 100644
index 000000000000..005d9ddb6987
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.12.18.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcore.git
+ https://github.com/pkgcore/pkgcore.git"
+ inherit git-r3
+else
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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.10.4[${PYTHON_USEDEP}]"
+fi
+BDEPEND="
+ >=dev-python/flit_core-3.8[${PYTHON_USEDEP}]
+ test? (
+ dev-vcs/git
+ )
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+ local DOCS=( NEWS.rst )
+ [[ ${PV} == *9999 ]] || doman build/sphinx/man/*
+ distutils-r1_python_install_all
+}
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index a25e0809c909..005d9ddb6987 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
if [[ ${PV} == *9999 ]]; then
RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
else
- RDEPEND+=" >=dev-python/snakeoil-0.10.1[${PYTHON_USEDEP}]"
+ RDEPEND+=" >=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]"
fi
BDEPEND="
>=dev-python/flit_core-3.8[${PYTHON_USEDEP}]
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index e094e9a3cb19..13142bee570d 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -1,9 +1,4 @@
-AUX sed-4.8-avoid-noreturn-diagnostic.patch 677 BLAKE2B 27738d62b3052e4b39d70f28465b1ed70b363f2d7d01a4f37090d8351a11d4f131e0915d226c0b53dd995d76490542e796dc31efde368d3ca9f82cc7da81ce21 SHA512 9961a68e30608cf52c31265e63963823aa2971807dd501e2f841f4f0b7519488224b08b58e6fec106b56f221a4756a9dd43ce237d2d894d5505c33d593ec6a44
-DIST sed-4.8.tar.xz 1348048 BLAKE2B 62f6b6500cc9a20a35cafc2b09b12bb7da67fa0afb0b1b26153babc0023424b3126f44d29eba14c25fc4490996c90738b191c9440c66da6c120bbb9bc6f6df65 SHA512 7de25d9bc2981c63321c2223f3fbcab61d7b0df4fcf7d4394b72400b91993e1288d8bf53948ed5fffcf5a98c75265726a68ad4fb98e1d571bf768603a108c1c8
-DIST sed-4.8.tar.xz.sig 833 BLAKE2B 8e5b3c69a28ffbfa49ef6f769fbb72c6f1ec14e6e1e0cec3851d15d85e05560a8a74e28e037eefb916b10831b4afbe0e4735d713dc3b90d7d73de7d0b1176d0b SHA512 9b886bdbd18ee2d60608cee3fd2b4193a1b6c3309d887ee05828c14b89b7b515dbf042a9e0ebdd13e6ccfa42e3cd217a408c796d68c4ebedaaa64f795000f095
DIST sed-4.9.tar.xz 1397092 BLAKE2B 6c7c7dc782b87c3bd0b5e826ba46c2f1dc7bd8c1159945fcf14b394711742964628774cf9f27d844b672721d7849e6c31992d82fafb9ed4118b7feb60406d1e1 SHA512 36157a4b4a2430cf421b7bd07f1675d680d9f1616be96cf6ad6ee74a9ec0fe695f8d0b1e1f0b008bbb33cc7fcde5e1c456359bbbc63f8aebdd4fedc3982cf6dc
DIST sed-4.9.tar.xz.sig 833 BLAKE2B 256bb112aa3aec1a8d40544ef1b0a7570f35d66369047ed3d261c57f938042dcb4a169137eaed6639bcfb472e4a6fc6ebec2de243b2c4d4c0ba0e9081f92556d SHA512 ceb235850184b99017783486e182ade9db38313d20b2b34d23f54d8affe180f7a191139b993e8ec7718ca33eff732f547ca4b3b59aaf865feaae611dfeae5c46
-EBUILD sed-4.8-r1.ebuild 1367 BLAKE2B 968433d890a8dc4580dbbc3a838cf30fce88d759ad62ae5a14b46007a817f2ab8a12baf6f8e4a1ed0d4203a69b7fffafae9a904c8dbf26352a44381ccd39967d SHA512 f5e471827bc96436b28501129153b6c2383ec618861ddc78ffe0049d6fd3f2a0c245bff7332fae9da07be1040fbde67f72ae74cf0e198ac4977dd2651b15d40a
-EBUILD sed-4.8.ebuild 1168 BLAKE2B f37487186c7ddd1e36f5aa18c6bfb6e57b8e4ffd947c1e1d43212ecc801d1cc11d1f4ec4c38c82b5baf7a2977fd119daeb2b57db600b6f5aedbef6c6b602bf40 SHA512 dd3c72f6c08075537e71e2760b1cd64dfe12a8c4f20325d92e0994d8dc426c68bbbf800938264276794afa5f120fa16d40cd3401297dfdca97a909f11b1f5610
-EBUILD sed-4.9.ebuild 1294 BLAKE2B 241d60c0784aec939d2565c255e5340e3a477a74515ce28d5c9ee8587fe5f7280390ea0db7291c102a4df4adf145b3528c856bd85004bbcd7eb02ac3c8d1cca0 SHA512 b6285eb988c3ae3bae5fbb2039a08ee317a41f7933a4b3dc92bfa372c607b1cdc061a3d3a1c7faa955e37db43c09b82e83a17edfe87e51991d517b72bae281f3
-MISC metadata.xml 374 BLAKE2B a7f25f18d1ffcd990f11d66f403f5e283af61b7a81127b8a4450506b5432610972d4d28df0c60b5e45d502d2f2e260f0390836b43d9e5efd48e4594796f751c4 SHA512 7efb14e44bc0d9d25b0e90f776f25ee5fbcb8b44b226255dcdd5e54cb1fb414f9c7dcd33ec2aa6f6bfa82159be8bba19069fc9e13576bfe2b99a87c898f2d002
+EBUILD sed-4.9.ebuild 1300 BLAKE2B 081ed00219acebe1d28a97bff2c0bf1bc676cccd5c50d76403a5d832addc83cfb1d19c9b65ce12df7e825f4b0491ae5f8cbae7bd18f3189b77ad3ee42681c331 SHA512 fef401a2d439d2317881395929762fa3e9735e62d86188bb5728d1201078144b9c2cd2a9f677e97fe02bd1d42ddb69b793bb2f98d9d36e143893ece9e3bf92e3
+MISC metadata.xml 379 BLAKE2B 1be9eff00cdbbcf916d5e9d1c2d1bc698d4b0a040d45578a218b43049f7d6e6c2080d987c994006c734838ca744497d815c9177f91455c49248c0de3ac435134 SHA512 464326d075bd875f7dd540bb969486415fd006a6fa779a773b6b7d6048fe2017c932f959e992fa93c7266aa6e70c96e267cb55b21e7955fa4155ffcb7ef53c00
diff --git a/sys-apps/sed/files/sed-4.8-avoid-noreturn-diagnostic.patch b/sys-apps/sed/files/sed-4.8-avoid-noreturn-diagnostic.patch
deleted file mode 100644
index d361780b548d..000000000000
--- a/sys-apps/sed/files/sed-4.8-avoid-noreturn-diagnostic.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/coreutils/gnulib/commit/0cc39712803ade7b2d4b89c36b143dad72404063
-
-From 0cc39712803ade7b2d4b89c36b143dad72404063 Sun Oct 18 00:00:00 2020
-From: Bruno Haible <bruno@clisp.org>
-
-obstack: Fix a clang warning.
-* lib/obstack.c (print_and_abort): Mark as __attribute_noreturn__.
-
-diff --git a/lib/obstack.c b/lib/obstack.c
-index 6e82da054c..e6475a2a09 100644
---- a/lib/obstack.c
-+++ b/lib/obstack.c
-@@ -326,7 +326,7 @@ int obstack_exit_failure = EXIT_FAILURE;
- # include <libio/iolibio.h>
- # endif
-
--static _Noreturn void
-+static __attribute_noreturn__ void
- print_and_abort (void)
- {
- /* Don't change any of these strings. Yes, it would be possible to add
diff --git a/sys-apps/sed/metadata.xml b/sys-apps/sed/metadata.xml
index c1c3d84608ce..e562da12ca90 100644
--- a/sys-apps/sed/metadata.xml
+++ b/sys-apps/sed/metadata.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
-</maintainer>
-<upstream>
- <remote-id type="sourceforge">sed</remote-id>
- <remote-id type="cpe">cpe:/a:gnu:sed</remote-id>
-</upstream>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="savannah">sed</remote-id>
+ <remote-id type="cpe">cpe:/a:gnu:sed</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/sys-apps/sed/sed-4.8-r1.ebuild b/sys-apps/sed/sed-4.8-r1.ebuild
deleted file mode 100644
index 6cea28c227be..000000000000
--- a/sys-apps/sed/sed-4.8-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sed.asc
-inherit flag-o-matic verify-sig
-
-DESCRIPTION="Super-useful stream editor"
-HOMEPAGE="http://sed.sourceforge.net/"
-SRC_URI="mirror://gnu/sed/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( mirror://gnu/sed/${P}.tar.xz.sig )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="acl nls selinux static"
-
-RDEPEND="
- !static? (
- acl? ( virtual/acl )
- nls? ( virtual/libintl )
- selinux? ( sys-libs/libselinux )
- )
-"
-DEPEND="${RDEPEND}
- static? (
- acl? ( virtual/acl[static-libs(+)] )
- nls? ( virtual/libintl[static-libs(+)] )
- selinux? ( sys-libs/libselinux[static-libs(+)] )
- )
-"
-BDEPEND="nls? ( sys-devel/gettext )
- verify-sig? ( sec-keys/openpgp-keys-sed )"
-
-PATCHES=(
- "${FILESDIR}/${P}-avoid-noreturn-diagnostic.patch"
-)
-
-src_configure() {
- use static && append-ldflags -static
-
- local myconf=(
- --exec-prefix="${EPREFIX}"
- $(use_enable acl)
- $(use_enable nls)
- $(use_with selinux)
- # rename to gsed for better BSD compatibility
- --program-prefix=g
- )
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
-
- # symlink to the standard name
- dosym gsed /bin/sed
- dosym gsed.1 /usr/share/man/man1/sed.1
-}
diff --git a/sys-apps/sed/sed-4.8.ebuild b/sys-apps/sed/sed-4.8.ebuild
deleted file mode 100644
index 9b569200aecd..000000000000
--- a/sys-apps/sed/sed-4.8.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sed.asc
-inherit flag-o-matic verify-sig
-
-DESCRIPTION="Super-useful stream editor"
-HOMEPAGE="http://sed.sourceforge.net/"
-SRC_URI="mirror://gnu/sed/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( mirror://gnu/sed/${P}.tar.xz.sig )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="acl nls selinux static"
-
-RDEPEND="
- !static? (
- acl? ( virtual/acl )
- nls? ( virtual/libintl )
- selinux? ( sys-libs/libselinux )
- )
-"
-DEPEND="${RDEPEND}
- static? (
- acl? ( virtual/acl[static-libs(+)] )
- nls? ( virtual/libintl[static-libs(+)] )
- selinux? ( sys-libs/libselinux[static-libs(+)] )
- )
-"
-BDEPEND="nls? ( sys-devel/gettext )
- verify-sig? ( sec-keys/openpgp-keys-sed )"
-
-PATCHES=(
- "${FILESDIR}/${P}-avoid-noreturn-diagnostic.patch"
-)
-
-src_configure() {
- use static && append-ldflags -static
-
- local myconf=(
- --exec-prefix="${EPREFIX}"
- $(use_enable acl)
- $(use_enable nls)
- $(use_with selinux)
- )
- econf "${myconf[@]}"
-}
diff --git a/sys-apps/sed/sed-4.9.ebuild b/sys-apps/sed/sed-4.9.ebuild
index 3052545c1b37..7e3eeeeee600 100644
--- a/sys-apps/sed/sed-4.9.ebuild
+++ b/sys-apps/sed/sed-4.9.ebuild
@@ -7,7 +7,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sed.asc
inherit flag-o-matic verify-sig
DESCRIPTION="Super-useful stream editor"
-HOMEPAGE="http://sed.sourceforge.net/"
+HOMEPAGE="https://www.gnu.org/software/sed/"
SRC_URI="mirror://gnu/sed/${P}.tar.xz"
SRC_URI+=" verify-sig? ( mirror://gnu/sed/${P}.tar.xz.sig )"
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 10:14:19 +0000