commit: 8c52e9702c82fa2c3ba5a24ffe2d067ecaa3ff74 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed May 26 08:56:21 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed May 26 09:01:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c52e970
sys-apps/busybox: add 1.33.1 Closes: https://bugs.gentoo.org/701512 Closes: https://bugs.gentoo.org/765580 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-apps/busybox/Manifest | 1 + .../{busybox-9999.ebuild => busybox-1.33.1.ebuild} | 17 ++++++++++++----- sys-apps/busybox/busybox-9999.ebuild | 17 ++++++++++++----- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index b15a4a97e0d..b31dc7d8797 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -1,2 +1,3 @@ DIST busybox-1.32.1.tar.bz2 2444679 BLAKE2B b0258345d40628d8c12b4cc5c3efdb318cfb469e029242942cdad22aeec5142963291a746fbac450b43a4a1f2f7e9204442456691fa98f18eeaa58c70d714caf SHA512 3a33e99adaf7cbd51dcbeb31b5361123bf61ac040c0a032656c654ddb69c4074af75fb4335ba63f283067f61a22d7d7cbca8e1ed265c9522982c453ce48ea2fd DIST busybox-1.33.0.tar.bz2 2448841 BLAKE2B bc25c2187cd7e357dd2f75b3eaae33ab9da318bbcec861e0b6b00da8466a86a17a71933035958f70badb9f1f143fa7f11f114c12a52f3680042730471f56cefe SHA512 20f8f5197c5cbc8b244f69d82d6628066296c7306a9736ee1344cb555882854412cf7f264490f9a735251c139b9621004f48e972d06ef2623a3c99278f8e765a +DIST busybox-1.33.1.tar.bz2 2453694 BLAKE2B 2dce3427ab7703c56cbb3bdc0c93c1fe1c6dc24c5b467b6213b8f9cf55223ec63136b3837970e41293cc3d55d320599945d29a69a4ef8b4b3ab9fb5e2a527632 SHA512 d24931432f65e4e79cf54a6c2b91c9cafba817b637d337f456ce8f505434fc06c4345c65cde4fe2a019650a8a089a6f5336bfafb5ef64a4f14659a9d0b3ddb1a diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-1.33.1.ebuild similarity index 97% copy from sys-apps/busybox/busybox-9999.ebuild copy to sys-apps/busybox/busybox-1.33.1.ebuild index d5269107970..e9062e18e44 100644 --- a/sys-apps/busybox/busybox-9999.ebuild +++ b/sys-apps/busybox/busybox-1.33.1.ebuild @@ -27,10 +27,13 @@ RESTRICT="test" # TODO: Could make pkgconfig conditional on selinux? bug #782829 COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam )" + pam? ( sys-libs/pam ) + virtual/libcrypt:=" DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) + static? ( + virtual/libcrypt[static-libs] + selinux? ( sys-libs/libselinux[static-libs(+)] ) + ) >=sys-kernel/linux-headers-2.6.39" BDEPEND="virtual/pkgconfig" RDEPEND="${COMMON_DEPEND} @@ -216,6 +219,9 @@ src_compile() { export SKIP_STRIP=y emake V=1 busybox + + # bug #701512 + emake V=1 doc } src_install() { @@ -287,7 +293,8 @@ src_install() { dodoc AUTHORS README TODO - cd docs + cd docs || die + doman busybox.1 docinto txt dodoc *.txt docinto pod @@ -295,7 +302,7 @@ src_install() { docinto html dodoc *.html - cd ../examples + cd ../examples || die docinto examples dodoc inittab depmod.pl *.conf *.script undeb unrpm } diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild index d5269107970..e9062e18e44 100644 --- a/sys-apps/busybox/busybox-9999.ebuild +++ b/sys-apps/busybox/busybox-9999.ebuild @@ -27,10 +27,13 @@ RESTRICT="test" # TODO: Could make pkgconfig conditional on selinux? bug #782829 COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam )" + pam? ( sys-libs/pam ) + virtual/libcrypt:=" DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) + static? ( + virtual/libcrypt[static-libs] + selinux? ( sys-libs/libselinux[static-libs(+)] ) + ) >=sys-kernel/linux-headers-2.6.39" BDEPEND="virtual/pkgconfig" RDEPEND="${COMMON_DEPEND} @@ -216,6 +219,9 @@ src_compile() { export SKIP_STRIP=y emake V=1 busybox + + # bug #701512 + emake V=1 doc } src_install() { @@ -287,7 +293,8 @@ src_install() { dodoc AUTHORS README TODO - cd docs + cd docs || die + doman busybox.1 docinto txt dodoc *.txt docinto pod @@ -295,7 +302,7 @@ src_install() { docinto html dodoc *.html - cd ../examples + cd ../examples || die docinto examples dodoc inittab depmod.pl *.conf *.script undeb unrpm }
