[gentoo-commits] repo/gentoo:master commit in: sys-apps/toybox/

[罗百科]

commit:     d5277109c1b389133963301c5fdaf1f19b054567
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 19 06:34:05 2022 +0000
Commit:     罗百科 <patrick <AT> gentoo <DOT> org>
CommitDate: Fri Aug 19 06:35:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5277109

sys-apps/toybox: Add 0.8.8

Also remove old

Bug: https://bugs.gentoo.org/858110
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>

 sys-apps/toybox/Manifest                           |  5 +-
 sys-apps/toybox/toybox-0.8.4-r1.ebuild             | 58 ----------------------
 sys-apps/toybox/toybox-0.8.5-r1.ebuild             | 58 ----------------------
 sys-apps/toybox/toybox-0.8.6.ebuild                | 58 ----------------------
 .../{toybox-0.8.7.ebuild => toybox-0.8.8.ebuild}   |  2 +-
 5 files changed, 2 insertions(+), 179 deletions(-)

diff --git a/sys-apps/toybox/Manifest b/sys-apps/toybox/Manifest
index acf73a473af1..ba6f861052d8 100644
--- a/sys-apps/toybox/Manifest
+++ b/sys-apps/toybox/Manifest
@@ -1,4 +1 @@
-DIST toybox-0.8.4.tar.gz 1133770 BLAKE2B adc695c2ddd592b9de7137db623621410afaa4cdf2dfde647f24f25d38de99ad38907b5e5aa2ded0d6b2eceafc71763a25e04abc33e8f057934fceed6df22e69 SHA512 507604f96ee89094ca7b4b218985659a8de41578d1a4f267c7282baf11306419e94bb4bfcb06835dff3e46f974a0bb49f89e4c427c69c590738a4a37b62969b8
-DIST toybox-0.8.5.tar.gz 2378469 BLAKE2B 9054c07fd8bd477a4995b14fcea091a1602b039216ec9acb4f60e39eb10bba88924c19084c7e28d4c0b7cd72b0e0ab46a892cd427909e073dfad3e2f7416d600 SHA512 deb3743a10278ba236e95a1f3995555c745c2909381d2692a42920615c002a5cc6f9cccffee84ec2fcf1188d8f8c0a11e2b7f6a7798f0b7f5d33a0c1c3149237
-DIST toybox-0.8.6.tar.gz 3458765 BLAKE2B 2ff0b898758660c242dd9fd11c5911840ce67122214bed6e3ba8af3dc2b3dbf3c0c467863ca69392e473db232130ddba9cac2d888c20990e2e02181be76afe25 SHA512 2d8f9cc3a6bd7ee5bd4bce77399916aa90cd8acb90448f4e1b79c605c7f854c19016f5eb3704f112855c8347e69f0f4dc42f9755dd2ec975ac7799d00bc597be
-DIST toybox-0.8.7.tar.gz 3479081 BLAKE2B 5ccf1fe67cfb1cdc4a86656ca7a6161dfe13e55881b65c2f753d87446d4fd323558384e1dc6e7c8742630e2fcb479aec2c939870e5ab5cd8f8352de920673968 SHA512 a32a764c393edad55fe2e17120daf5b098e42886659a9dc15186db2795e980024be24c6276b4c5936733d3769a90bbf3918251c515450ec3eafb7a50ca8cc59f
+DIST toybox-0.8.8.tar.gz 3492750 BLAKE2B d53864e07392a511e4e861fcf5b0fdc8b43e5d82f13fb9eba62b850053aa547e0e057245062c34d4205019bba6223dff1a514b1bb0dde54734bcd3b1df82b122 SHA512 3ffe4de6b17770ad9c43f98f2c69a110f94e5a85da909f8f770bbc9abaff42a524237b4ffaaa8b9800c8d31f0a8b6d3521f03bfdd0d1260fa421ef2525a34290

diff --git a/sys-apps/toybox/toybox-0.8.4-r1.ebuild b/sys-apps/toybox/toybox-0.8.4-r1.ebuild
deleted file mode 100644
index 888ca615d7a4..000000000000
--- a/sys-apps/toybox/toybox-0.8.4-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing savedconfig toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/landley/toybox.git"
-else
-	SRC_URI="https://landley.net/code/toybox/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Common linux commands in a multicall binary"
-HOMEPAGE="https://landley.net/code/toybox/"
-
-LICENSE="0BSD"
-SLOT="0"
-
-DEPEND="virtual/libcrypt:="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	restore_config .config
-}
-
-src_configure() {
-	tc-export CC STRIP
-	export HOSTCC="$(tc-getBUILD_CC)"
-	# Respect CFLAGS
-	export OPTIMIZE="${CFLAGS}"
-
-	if [[ -f .config ]]; then
-		yes "" | emake -j1 oldconfig > /dev/null
-		return 0
-	else
-		einfo "Could not locate user configfile, so we will save a default one"
-		emake -j1 defconfig > /dev/null
-	fi
-}
-
-src_compile() {
-	unset CROSS_COMPILE
-	export CPUS=$(makeopts_jobs)
-	emake V=1
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	save_config .config
-	newbin generated/unstripped/toybox toybox
-}

diff --git a/sys-apps/toybox/toybox-0.8.5-r1.ebuild b/sys-apps/toybox/toybox-0.8.5-r1.ebuild
deleted file mode 100644
index 323c71ec6cc8..000000000000
--- a/sys-apps/toybox/toybox-0.8.5-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing savedconfig toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/landley/toybox.git"
-else
-	SRC_URI="https://landley.net/code/toybox/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Common linux commands in a multicall binary"
-HOMEPAGE="https://landley.net/code/toybox/"
-
-LICENSE="0BSD"
-SLOT="0"
-
-DEPEND="virtual/libcrypt:="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	restore_config .config
-}
-
-src_configure() {
-	tc-export CC STRIP
-	export HOSTCC="$(tc-getBUILD_CC)"
-	# Respect CFLAGS
-	export OPTIMIZE="${CFLAGS}"
-
-	if [[ -f .config ]]; then
-		yes "" | emake -j1 oldconfig > /dev/null
-		return 0
-	else
-		einfo "Could not locate user configfile, so we will save a default one"
-		emake -j1 defconfig > /dev/null
-	fi
-}
-
-src_compile() {
-	unset CROSS_COMPILE
-	export CPUS=$(makeopts_jobs)
-	emake V=1
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	save_config .config
-	newbin generated/unstripped/toybox toybox
-}

diff --git a/sys-apps/toybox/toybox-0.8.6.ebuild b/sys-apps/toybox/toybox-0.8.6.ebuild
deleted file mode 100644
index 6bd1e37d8b83..000000000000
--- a/sys-apps/toybox/toybox-0.8.6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing savedconfig toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/landley/toybox.git"
-else
-	SRC_URI="https://landley.net/code/toybox/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Common linux commands in a multicall binary"
-HOMEPAGE="https://landley.net/code/toybox/"
-
-LICENSE="0BSD"
-SLOT="0"
-
-DEPEND="virtual/libcrypt:="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	restore_config .config
-}
-
-src_configure() {
-	tc-export CC STRIP
-	export HOSTCC="$(tc-getBUILD_CC)"
-	# Respect CFLAGS
-	export OPTIMIZE="${CFLAGS}"
-
-	if [[ -f .config ]]; then
-		yes "" | emake -j1 oldconfig > /dev/null
-		return 0
-	else
-		einfo "Could not locate user configfile, so we will save a default one"
-		emake -j1 defconfig > /dev/null
-	fi
-}
-
-src_compile() {
-	unset CROSS_COMPILE
-	export CPUS=$(makeopts_jobs)
-	emake V=1
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	save_config .config
-	newbin generated/unstripped/toybox toybox
-}

diff --git a/sys-apps/toybox/toybox-0.8.7.ebuild b/sys-apps/toybox/toybox-0.8.8.ebuild
similarity index 96%
rename from sys-apps/toybox/toybox-0.8.7.ebuild
rename to sys-apps/toybox/toybox-0.8.8.ebuild
index 6bd1e37d8b83..01a70f0ff7e1 100644
--- a/sys-apps/toybox/toybox-0.8.7.ebuild
+++ b/sys-apps/toybox/toybox-0.8.8.ebuild
@@ -54,5 +54,5 @@ src_test() {
 
 src_install() {
 	save_config .config
-	newbin generated/unstripped/toybox toybox
+	newbin toybox toybox
 }