dev-libs/openssl: ebuild code simplification
authorLars Wendler <polynomial-c@gentoo.org>
Sun, 1 Dec 2019 19:28:41 +0000 (20:28 +0100)
committerLars Wendler <polynomial-c@gentoo.org>
Sun, 1 Dec 2019 19:28:52 +0000 (20:28 +0100)
Added sys-process/procps to BDEPEND because of sysctl usage

Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
dev-libs/openssl/openssl-1.1.1d-r3.ebuild

index 932e1a155f542c6dcfd0870ef8264099919a3ffc..774605b4bf1de7b31c947f54f8cc17d5fc8ecbc2 100644 (file)
@@ -41,6 +41,7 @@ BDEPEND="
        test? (
                sys-apps/diffutils
                sys-devel/bc
+               sys-process/procps
        )"
 PDEPEND="app-misc/ca-certificates"
 
@@ -64,14 +65,12 @@ pkg_setup() {
        [[ ${MERGE_TYPE} == binary ]] && return
 
        # must check in pkg_setup; sysctl don't work with userpriv!
-       if has test ${FEATURES}; then
-               if use sctp; then
-                       # test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
-                       # if sctp.auth_enable is not enabled.
-                       local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
-                       if [[ -z "${sctp_auth_status}" || ${sctp_auth_status} != 1 ]]; then
-                               die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
-                       fi
+       if has test ${FEATURES} && use sctp; then
+               # test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+               # if sctp.auth_enable is not enabled.
+               local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+               if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
+                       die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
                fi
        fi
 }
@@ -120,14 +119,10 @@ src_prepare() {
 
        eapply_user #332661
 
-       if has test ${FEATURES}; then
-               if use sctp; then
-                       if has network-sandbox ${FEATURES}; then
-                               ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox"
-                               rm test/recipes/80-test_ssl_new.t || die
-                               eend $?
-                       fi
-               fi
+       if has test ${FEATURES} && use sctp && has network-sandbox ${FEATURES}; then
+               ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox"
+               rm test/recipes/80-test_ssl_new.t || die
+               eend $?
        fi
 
        # make sure the man pages are suffixed #302165