[gentoo-commits] repo/gentoo:master commit in: sys-libs/libselinux/

[Jason Zaman]

commit:     b5d70155a3d2376070bcebf69e8298d042d4abbb
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 10 15:22:05 2015 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 15:25:08 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5d70155

sys-libs/libselinux: Add python3.5 compat

Also add || die in various places

Package-Manager: portage-2.2.20.1

 sys-libs/libselinux/libselinux-2.4.ebuild  | 12 ++++++------
 sys-libs/libselinux/libselinux-9999.ebuild | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sys-libs/libselinux/libselinux-2.4.ebuild 
b/sys-libs/libselinux/libselinux-2.4.ebuild
index 02d7690..642336e 100644
--- a/sys-libs/libselinux/libselinux-2.4.ebuild
+++ b/sys-libs/libselinux/libselinux-2.4.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
 USE_RUBY="ruby19 ruby20"
 
 # No, I am not calling ruby-ng
@@ -78,7 +78,7 @@ multilib_src_compile() {
                building() {
                        einfo "Calling rubywrap for ${1}"
                        # Clean up .lo file to force rebuild
-                       test -f src/selinuxswig_ruby_wrap.lo && rm 
src/selinuxswig_ruby_wrap.lo
+                       rm -f src/selinuxswig_ruby_wrap.lo || die
                        emake \
                                CC="$(tc-getCC)" \
                                RUBY=${1} \
@@ -125,18 +125,18 @@ multilib_src_install() {
                done
        fi
 
-       use static-libs || rm "${D}"/usr/lib*/*.a
+       use static-libs || rm "${D}"/usr/lib*/*.a || die
 }
 
 pkg_postinst() {
        # Fix bug 473502
        for POLTYPE in ${POLICY_TYPES};
        do
-               mkdir -p /etc/selinux/${POLTYPE}/contexts/files
-               touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local
+               mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die
+               touch 
/etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die
                # Fix bug 516608
                for EXPRFILE in file_contexts file_contexts.homedirs 
file_contexts.local ; do
-                       sefcontext_compile 
/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE};
+                       sefcontext_compile 
/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} || die "Failed to recompile 
contexts"
                done
        done
 }

diff --git a/sys-libs/libselinux/libselinux-9999.ebuild 
b/sys-libs/libselinux/libselinux-9999.ebuild
index d78ace2..1f1d1d2 100644
--- a/sys-libs/libselinux/libselinux-9999.ebuild
+++ b/sys-libs/libselinux/libselinux-9999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
 USE_RUBY="ruby19 ruby20"
 
 # No, I am not calling ruby-ng
@@ -88,7 +88,7 @@ multilib_src_compile() {
                building() {
                        einfo "Calling rubywrap for ${1}"
                        # Clean up .lo file to force rebuild
-                       test -f src/selinuxswig_ruby_wrap.lo && rm 
src/selinuxswig_ruby_wrap.lo
+                       rm -f src/selinuxswig_ruby_wrap.lo || die
                        emake \
                                CC="$(tc-getCC)" \
                                RUBY=${1} \
@@ -135,18 +135,18 @@ multilib_src_install() {
                done
        fi
 
-       use static-libs || rm "${D}"/usr/lib*/*.a
+       use static-libs || rm "${D}"/usr/lib*/*.a || die
 }
 
 pkg_postinst() {
        # Fix bug 473502
        for POLTYPE in ${POLICY_TYPES};
        do
-               mkdir -p /etc/selinux/${POLTYPE}/contexts/files
-               touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local
+               mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die
+               touch 
/etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die
                # Fix bug 516608
                for EXPRFILE in file_contexts file_contexts.homedirs 
file_contexts.local ; do
-                       sefcontext_compile 
/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE};
+                       sefcontext_compile 
/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} || die "Failed to recompile 
contexts"
                done
        done
 }