gentoo resync : 31.05.2021

4 files changed, 28 insertions, 13 deletions

diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 0202d3735b29..bc68281b9fb7 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -14,8 +14,8 @@ AUX syslogd.initd 267 BLAKE2B 1daf252138bfb5904feb04dcc2127b8e8058d9d43652474e75
 AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303396569ffca3633b3e048497f85649c20d769233baa430a4cb54d2d5e5d63646db8113761960552d SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232
 AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379afe9d490ad32b19a6d10d456155fdeb0468c67816f061b1cac166db7f104dbadadf0d175082efdb4 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5
 DIST busybox-1.32.1.tar.bz2 2444679 BLAKE2B b0258345d40628d8c12b4cc5c3efdb318cfb469e029242942cdad22aeec5142963291a746fbac450b43a4a1f2f7e9204442456691fa98f18eeaa58c70d714caf SHA512 3a33e99adaf7cbd51dcbeb31b5361123bf61ac040c0a032656c654ddb69c4074af75fb4335ba63f283067f61a22d7d7cbca8e1ed265c9522982c453ce48ea2fd
-DIST busybox-1.33.0.tar.bz2 2448841 BLAKE2B bc25c2187cd7e357dd2f75b3eaae33ab9da318bbcec861e0b6b00da8466a86a17a71933035958f70badb9f1f143fa7f11f114c12a52f3680042730471f56cefe SHA512 20f8f5197c5cbc8b244f69d82d6628066296c7306a9736ee1344cb555882854412cf7f264490f9a735251c139b9621004f48e972d06ef2623a3c99278f8e765a
-EBUILD busybox-1.32.1.ebuild 9579 BLAKE2B ca46d5c3161015e8623926604d79dd230eb7587ba442e5249fcaede9c9156ddcbd19e0a15eeacda3816dd51ec8ea0b11a9a4177a4ebb4dcdfd327612e2f4ad4e SHA512 ee80215d96d29bee8d675ba462046139dba49a00e4d089e29f471d296acc1d5b7ba04143a2821ca13cbc46d1814c9c8380abe2ef82a065ee926e34d67acfcf4a
-EBUILD busybox-1.33.0.ebuild 9586 BLAKE2B 8e8f1adbd071258c916ec7be204528854b9a8312f86ea67eaeab08b0b9b3a1b8a71bd802e338a105f6e32c7784aa1c7b038f9d786c776844865a2918c2dcfdc5 SHA512 43d16032edae71ed1c03a141c82525086f454dbc320c6f3746d0a6e17a124271a0eefa75cc2ac90e8faad11cee86e382fcb4002ee046e4772aada0498d517227
-EBUILD busybox-9999.ebuild 9550 BLAKE2B 2c2706c0ba15593df3b377c4b2fd10dc163c7f07ca1d99307ffd2a5ea3de8d5ebfa6c0876f3d5319d3d75fc15e2aca7d6873abb0424341b0d3b8a7677e473fde SHA512 ff39fd205050834de39a706df3c7b360d5a9b394d55d2f2633c7f7bcfe739e8f6d5ce566656593a01c351c69d54468cac2f0ebbd470d557b6106cf23544f5c92
+DIST busybox-1.33.1.tar.bz2 2453694 BLAKE2B 2dce3427ab7703c56cbb3bdc0c93c1fe1c6dc24c5b467b6213b8f9cf55223ec63136b3837970e41293cc3d55d320599945d29a69a4ef8b4b3ab9fb5e2a527632 SHA512 d24931432f65e4e79cf54a6c2b91c9cafba817b637d337f456ce8f505434fc06c4345c65cde4fe2a019650a8a089a6f5336bfafb5ef64a4f14659a9d0b3ddb1a
+EBUILD busybox-1.32.1-r1.ebuild 9641 BLAKE2B 95830049ca9fd1ba62152d401bfab07c1f85221b2df691055d31c8eebda7ebe7441c51704b00dbc80529929e8e34a24ffbdbeb57ed46eb5d11cde24bec912f1d SHA512 7b1a7849cb2ca44237156533c48ca942663cdaa9794876ae3f5ac8d5052ce41695de561d32779ebb79c53ef07453b22bb1cdbb581b9f6a6999909f0c4f7b667e
+EBUILD busybox-1.33.1.ebuild 9648 BLAKE2B 59715aafaca840cdac5b941fb5ad66619510b5cffc2fd252c2b1c8068638449c6ea7bff34f7262e64728b39c663185483db6ee74cedea07c669f6a4528ec4741 SHA512 c1b22a7535b4441ed47e53cac5a27dda04a6b58bdc8eaa96de558ae88cb4e2d10d720473284e569d3a93a53f14214566401bf7766c4fa5fe2a4d46a3a3803406
+EBUILD busybox-9999.ebuild 9648 BLAKE2B 59715aafaca840cdac5b941fb5ad66619510b5cffc2fd252c2b1c8068638449c6ea7bff34f7262e64728b39c663185483db6ee74cedea07c669f6a4528ec4741 SHA512 c1b22a7535b4441ed47e53cac5a27dda04a6b58bdc8eaa96de558ae88cb4e2d10d720473284e569d3a93a53f14214566401bf7766c4fa5fe2a4d46a3a3803406
 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07
diff --git a/sys-apps/busybox/busybox-1.32.1.ebuild b/sys-apps/busybox/busybox-1.32.1-r1.ebuild
index 56929b85f919..7deed6114019 100644
--- a/sys-apps/busybox/busybox-1.32.1.ebuild
+++ b/sys-apps/busybox/busybox-1.32.1-r1.ebuild
@@ -219,6 +219,9 @@ src_compile() {
 	export SKIP_STRIP=y
 
 	emake V=1 busybox
+
+	# bug #701512
+	emake V=1 doc
 }
 
 src_install() {
@@ -290,7 +293,8 @@ src_install() {
 
 	dodoc AUTHORS README TODO
 
-	cd docs
+	cd docs || die
+	doman busybox.1
 	docinto txt
 	dodoc *.txt
 	docinto pod
@@ -298,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-1.33.0.ebuild b/sys-apps/busybox/busybox-1.33.1.ebuild
index 1b069a81190c..e9062e18e44c 100644
--- a/sys-apps/busybox/busybox-1.33.0.ebuild
+++ b/sys-apps/busybox/busybox-1.33.1.ebuild
@@ -219,6 +219,9 @@ src_compile() {
 	export SKIP_STRIP=y
 
 	emake V=1 busybox
+
+	# bug #701512
+	emake V=1 doc
 }
 
 src_install() {
@@ -290,7 +293,8 @@ src_install() {
 
 	dodoc AUTHORS README TODO
 
-	cd docs
+	cd docs || die
+	doman busybox.1
 	docinto txt
 	dodoc *.txt
 	docinto pod
@@ -298,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 d52691079702..e9062e18e44c 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
 }