Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-lang/erlang/erlang-23.1.5.ebuild2
-rw-r--r--dev-libs/girara/girara-0.3.5.ebuild2
-rw-r--r--dev-libs/volume_key/volume_key-0.3.12-r3.ebuild2
-rw-r--r--dev-lua/luacheck/luacheck-0.23.0-r1.ebuild4
-rw-r--r--dev-python/pillow/pillow-8.1.0.ebuild2
-rw-r--r--dev-util/sel/sel-0.08.4-r2.ebuild8
-rw-r--r--games-mud/powwow/Manifest1
-rw-r--r--games-mud/powwow/files/powwow-1.2.22-linking.patch39
-rw-r--r--games-mud/powwow/files/powwow-1.2.22-musl-termios.patch21
-rw-r--r--games-mud/powwow/powwow-1.2.22.ebuild49
-rw-r--r--net-libs/libwebsockets/libwebsockets-4.1.6.ebuild4
-rw-r--r--sys-apps/busybox/Manifest1
-rw-r--r--sys-apps/busybox/busybox-1.31.1-r3.ebuild338
-rw-r--r--sys-apps/busybox/busybox-1.32.0-r1.ebuild2
-rw-r--r--sys-libs/glibc/glibc-2.32-r5.ebuild4
15 files changed, 126 insertions, 353 deletions
diff --git a/dev-lang/erlang/erlang-23.1.5.ebuild b/dev-lang/erlang/erlang-23.1.5.ebuild
index e266bd5246c6..05360ab330cf 100644
--- a/dev-lang/erlang/erlang-23.1.5.ebuild
+++ b/dev-lang/erlang/erlang-23.1.5.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
# same build of ERTS that was used when compiling the code. See
# http://erlang.org/doc/system_principles/misc.html for more information.
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
RDEPEND="
diff --git a/dev-libs/girara/girara-0.3.5.ebuild b/dev-libs/girara/girara-0.3.5.ebuild
index 7962c3a508b0..b16354a30a1f 100644
--- a/dev-libs/girara/girara-0.3.5.ebuild
+++ b/dev-libs/girara/girara-0.3.5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *999 ]]; then
EGIT_BRANCH="develop"
else
SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
- KEYWORDS="amd64 ~arm x86"
+ KEYWORDS="amd64 arm x86"
fi
LICENSE="ZLIB"
diff --git a/dev-libs/volume_key/volume_key-0.3.12-r3.ebuild b/dev-libs/volume_key/volume_key-0.3.12-r3.ebuild
index b2c7c39f30b4..92d1cd9db25b 100644
--- a/dev-libs/volume_key/volume_key-0.3.12-r3.ebuild
+++ b/dev-libs/volume_key/volume_key-0.3.12-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild b/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild
index 65aafbf27635..6844adf814e7 100644
--- a/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild
+++ b/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mpeterv/luacheck/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~x86"
IUSE="doc luajit test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pillow/pillow-8.1.0.ebuild b/dev-python/pillow/pillow-8.1.0.ebuild
index e6d69ba52c82..1d082955ce7b 100644
--- a/dev-python/pillow/pillow-8.1.0.ebuild
+++ b/dev-python/pillow/pillow-8.1.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="HPND"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
REQUIRED_USE="test? ( jpeg tiff )"
RESTRICT="!test? ( test )"
diff --git a/dev-util/sel/sel-0.08.4-r2.ebuild b/dev-util/sel/sel-0.08.4-r2.ebuild
index 6c4bae9142a8..c301ba522d1b 100644
--- a/dev-util/sel/sel-0.08.4-r2.ebuild
+++ b/dev-util/sel/sel-0.08.4-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit toolchain-funcs
@@ -14,6 +14,7 @@ LICENSE="GPL-2"
KEYWORDS="amd64 ppc s390 sparc x86"
RDEPEND="sys-libs/ncurses:0="
+BDEPEND="virtual/pkgconfig"
DOCS=( "help.txt" README.GER whatsnew )
@@ -25,7 +26,8 @@ src_prepare() {
}
src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDLIBS="-lncurses"
+ local PKGCONFIG="$(tc-getPKG_CONFIG)"
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDLIBS="$(${PKGCONFIG} --libs ncurses)"
}
src_install() {
diff --git a/games-mud/powwow/Manifest b/games-mud/powwow/Manifest
index 4bdf237f7fba..1aa6fcb5a71d 100644
--- a/games-mud/powwow/Manifest
+++ b/games-mud/powwow/Manifest
@@ -1 +1,2 @@
DIST powwow-1.2.16.tar.gz 295441 BLAKE2B 36f45e57af83b624e8f061ba7cc10ac7429b42bba56b1f61c737d9541ded788e5d94c76e1c70d00f49aac98a2a1fac6a04965d2eb78e587d53cea8b0d17ea736 SHA512 9bc046ba14760d55a7aabb550229d5f5b234f3ef0690d837f1de8df5e1f404b8483e61981cffdf8e82f164bd5a68f4da3f8342b0c09b98155adaabf14d8b079e
+DIST powwow-1.2.22.tar.gz 339521 BLAKE2B abbad1cdce0f1f8d7c5affdb2665231fd3f4faa2439e90a5f37f23455eea0e687c63476fc63a508cbfff2ffc33ea97c31c66b868255aa60a4a9819c0eebe8844 SHA512 558143ab4dfa06798abe7cb6b18ce3ceb70925214ac0125f0f3823f077a6cbbda50557c954af623a2dae003a57df893325085e53a4ee9322250bc7e695b76fe5
diff --git a/games-mud/powwow/files/powwow-1.2.22-linking.patch b/games-mud/powwow/files/powwow-1.2.22-linking.patch
new file mode 100644
index 000000000000..e9dc39177bf4
--- /dev/null
+++ b/games-mud/powwow/files/powwow-1.2.22-linking.patch
@@ -0,0 +1,39 @@
+* Fix ncurses/tinfo linking: https://bugs.gentoo.org/690452
+
+* Fix underlinking (refresh of old patch by hasufell@):
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Mon Feb 18 02:25:38 UTC 2013
+Subject: fix underlinking
+https://bugs.gentoo.org/show_bug.cgi?id=454928
+--- a/configure.ac
++++ b/configure.ac
+@@ -93,10 +93,7 @@ AC_PROG_LN_S
+ AC_CHECK_FUNC(lrand48,,AC_DEFINE(USE_RANDOM))
+
+ if test "x${enable_vt100}" != "xyes"; then
+- AC_SEARCH_LIBS(initscr,[ncurses curses], [], [
+- if test "x${enable_vt100}" = "xno" ; then
+- AC_MSG_ERROR([*** curses libraries not found])
+- fi])
++ PKG_CHECK_MODULES([ncurses], [ncurses])
+ fi
+
+ # Dynamic modules
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -6,7 +6,8 @@ bin_PROGRAMS = powwow powwow-muc powwow-movieplay
+ powwow_SOURCES = beam.c cmd.c log.c edit.c cmd2.c eval.c \
+ utils.c main.c tcp.c list.c map.c tty.c \
+ ptr.c
+-powwow_LDFLAGS = @dl_ldflags@
++powwow_LDADD = @dl_ldflags@ @ncurses_LIBS@
++powwow_muc_LDADD = @ncurses_LIBS@
+ powwowdir = $(pkgincludedir)
+ powwow_HEADERS = beam.h cmd.h log.h edit.h cmd2.h eval.h \
+ utils.h main.h tcp.h list.h map.h tty.h \
+@@ -26,4 +26,4 @@ catrw_SOURCES = catrw.c
+ EXTRA_DIST = plugtest.c
+
+ plugtest.so: plugtest.c
+- gcc -shared -o plugtest.so plugtest.c
++ $(CC) $(CFLAGS) -shared -o plugtest.so plugtest.c
diff --git a/games-mud/powwow/files/powwow-1.2.22-musl-termios.patch b/games-mud/powwow/files/powwow-1.2.22-musl-termios.patch
new file mode 100644
index 000000000000..c8d9192279a6
--- /dev/null
+++ b/games-mud/powwow/files/powwow-1.2.22-musl-termios.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/716584
+--- a/src/follow.c
++++ b/src/follow.c
+@@ -26,7 +26,6 @@
+ * many warnings, but seems to be necessary at times. works anyway.
+ */
+ # include <termios.h>
+-# include <termio.h>
+ # endif
+ /* #else USE_SGTTY */
+ #endif
+--- a/src/tty.c
++++ b/src/tty.c
+@@ -44,7 +44,6 @@
+ * many warnings, but seems to be necessary at times. works anyway.
+ */
+ # include <termios.h>
+-# include <termio.h>
+ # endif
+ /* #else USE_SGTTY */
+ #endif
diff --git a/games-mud/powwow/powwow-1.2.22.ebuild b/games-mud/powwow/powwow-1.2.22.ebuild
new file mode 100644
index 000000000000..aec8423d0bc7
--- /dev/null
+++ b/games-mud/powwow/powwow-1.2.22.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="PowWow Console MUD Client"
+HOMEPAGE="https://www.hoopajoo.net/projects/powwow.html"
+SRC_URI="https://www.hoopajoo.net/static/projects/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="sys-libs/ncurses:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.2.22-linking.patch
+ "${FILESDIR}"/${PN}-1.2.22-musl-termios.patch
+)
+
+src_prepare() {
+ default
+
+ # note that that the extra, seemingly-redundant files installed are
+ # actually used by in-game help commands
+ sed -i \
+ -e "s/pkgdata_DATA = powwow.doc/pkgdata_DATA = /" \
+ Makefile.am || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf --includedir="${EPREFIX}"/usr/include
+}
+
+src_install() {
+ local DOCS=( Hacking powwow.doc powwow.help README.* TODO )
+ # Prepend doc/
+ DOCS=( ${DOCS[@]/#/doc\//} )
+ # Add in the root items
+ DOCS+=( ChangeLog NEWS )
+
+ default
+}
diff --git a/net-libs/libwebsockets/libwebsockets-4.1.6.ebuild b/net-libs/libwebsockets/libwebsockets-4.1.6.ebuild
index 30dbd55c5f2f..cdd2107a385b 100644
--- a/net-libs/libwebsockets/libwebsockets-4.1.6.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.
LICENSE="MIT"
SLOT="0/17" # libwebsockets.so.17
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~x86"
IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
+lejp libev libevent libressl libuv mbedtls peer-limits server-status smtp socks5
sqlite3 ssl static-libs threads zip"
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 37201f3dfaa1..42946ab91979 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,4 +1,3 @@
-DIST busybox-1.31.1.tar.bz2 2430221 BLAKE2B 95c2345bc715eb7a1f08816a40add9b7a6176ef509a84069343ec2caddec58d8d57a07676ca2b03c209734169321433e27ba963b4c8b98dbfda4e409dcc347b4 SHA512 0d1197c25d963d7f95ef21e08c06c0d6124ac7b59c99989e891f744ffee4878a3b1fe44a247241a9da39fa5de0ba87f1b6d862401b591f277e66e89c02764bbf
DIST busybox-1.32.0.tar.bz2 2439463 BLAKE2B 75937ae6e1401d7ab947d80f4b206112023ff2b7d04257ffa2c254cadabb92282ba04d5d608659b6c98fade1ccd0b0f6b204c8758263d59dea6508a3157a7c69 SHA512 1b1227af69a97e820e28f5f1c62413e4e179202ab525725ea0b1afe9b9f9a5f00e5e32f4603e804ba1596b0fedd60d60457a6d2b8fcedfab45b6e049caeb319b
DIST busybox-1.32.1.tar.bz2 2444679 BLAKE2B b0258345d40628d8c12b4cc5c3efdb318cfb469e029242942cdad22aeec5142963291a746fbac450b43a4a1f2f7e9204442456691fa98f18eeaa58c70d714caf SHA512 3a33e99adaf7cbd51dcbeb31b5361123bf61ac040c0a032656c654ddb69c4074af75fb4335ba63f283067f61a22d7d7cbca8e1ed265c9522982c453ce48ea2fd
DIST busybox-1.33.0.tar.bz2 2448841 BLAKE2B bc25c2187cd7e357dd2f75b3eaae33ab9da318bbcec861e0b6b00da8466a86a17a71933035958f70badb9f1f143fa7f11f114c12a52f3680042730471f56cefe SHA512 20f8f5197c5cbc8b244f69d82d6628066296c7306a9736ee1344cb555882854412cf7f264490f9a735251c139b9621004f48e972d06ef2623a3c99278f8e765a
diff --git a/sys-apps/busybox/busybox-1.31.1-r3.ebuild b/sys-apps/busybox/busybox-1.31.1-r3.ebuild
deleted file mode 100644
index af324ce621a7..000000000000
--- a/sys-apps/busybox/busybox-1.31.1-r3.ebuild
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2020 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 ~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"
-
-COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
- pam? ( sys-libs/pam )
- virtual/libcrypt:="
-DEPEND="${COMMON_DEPEND}
- static? (
- virtual/libcrypt[static-libs]
- selinux? ( sys-libs/libselinux[static-libs(+)] )
- )
- >=sys-kernel/linux-headers-2.6.39"
-RDEPEND="${COMMON_DEPEND}
- mdev? ( !<sys-apps/openrc-0.13 )"
-
-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}"/${PN}-1.31.1-glibc-2.31.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
-
- # If these are not set and we are using a uclibc/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
-
- # disable features that uClibc doesn't (yet?) provide.
- if use elibc_uclibc; then
- busybox_config_option n FEATURE_SYNC_FANCY #567598
- busybox_config_option n NSENTER
- fi
-
- # 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
-}
-
-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
- # for compatibility, provide /usr/bin/env
- mkdir -p _install/usr/bin
- ln -s /bin/env _install/usr/bin/env
- 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
- docinto txt
- dodoc *.txt
- docinto pod
- dodoc *.pod
- docinto html
- dodoc *.html
-
- cd ../examples
- docinto examples
- dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
- if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then
- ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
- ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
- ewarn "If you are creating a binary only and not merging this is probably ok."
- ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
- die "silly options will destroy your system"
- fi
-
- 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
- cp -vpPR _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.32.0-r1.ebuild b/sys-apps/busybox/busybox-1.32.0-r1.ebuild
index 2937eb426c15..a0431ffc93b7 100644
--- a/sys-apps/busybox/busybox-1.32.0-r1.ebuild
+++ b/sys-apps/busybox/busybox-1.32.0-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 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
fi
LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-libs/glibc/glibc-2.32-r5.ebuild b/sys-libs/glibc/glibc-2.32-r5.ebuild
index 1ec93676174c..079b70b47983 100644
--- a/sys-libs/glibc/glibc-2.32-r5.ebuild
+++ b/sys-libs/glibc/glibc-2.32-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -22,7 +22,7 @@ PATCH_DEV=slyfox
if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
SRC_URI+=" riscv? ( https://dev.gentoo.org/~dilfridge/distfiles/backport-rv32.txz )"