| 1 |
commit: b5d70155a3d2376070bcebf69e8298d042d4abbb |
| 2 |
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 10 15:22:05 2015 +0000 |
| 4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 10 15:25:08 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5d70155 |
| 7 |
|
| 8 |
sys-libs/libselinux: Add python3.5 compat |
| 9 |
|
| 10 |
Also add || die in various places |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.20.1 |
| 13 |
|
| 14 |
sys-libs/libselinux/libselinux-2.4.ebuild | 12 ++++++------ |
| 15 |
sys-libs/libselinux/libselinux-9999.ebuild | 12 ++++++------ |
| 16 |
2 files changed, 12 insertions(+), 12 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-libs/libselinux/libselinux-2.4.ebuild b/sys-libs/libselinux/libselinux-2.4.ebuild |
| 19 |
index 02d7690..642336e 100644 |
| 20 |
--- a/sys-libs/libselinux/libselinux-2.4.ebuild |
| 21 |
+++ b/sys-libs/libselinux/libselinux-2.4.ebuild |
| 22 |
@@ -3,7 +3,7 @@ |
| 23 |
# $Id$ |
| 24 |
|
| 25 |
EAPI="5" |
| 26 |
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) |
| 27 |
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 ) |
| 28 |
USE_RUBY="ruby19 ruby20" |
| 29 |
|
| 30 |
# No, I am not calling ruby-ng |
| 31 |
@@ -78,7 +78,7 @@ multilib_src_compile() { |
| 32 |
building() { |
| 33 |
einfo "Calling rubywrap for ${1}" |
| 34 |
# Clean up .lo file to force rebuild |
| 35 |
- test -f src/selinuxswig_ruby_wrap.lo && rm src/selinuxswig_ruby_wrap.lo |
| 36 |
+ rm -f src/selinuxswig_ruby_wrap.lo || die |
| 37 |
emake \ |
| 38 |
CC="$(tc-getCC)" \ |
| 39 |
RUBY=${1} \ |
| 40 |
@@ -125,18 +125,18 @@ multilib_src_install() { |
| 41 |
done |
| 42 |
fi |
| 43 |
|
| 44 |
- use static-libs || rm "${D}"/usr/lib*/*.a |
| 45 |
+ use static-libs || rm "${D}"/usr/lib*/*.a || die |
| 46 |
} |
| 47 |
|
| 48 |
pkg_postinst() { |
| 49 |
# Fix bug 473502 |
| 50 |
for POLTYPE in ${POLICY_TYPES}; |
| 51 |
do |
| 52 |
- mkdir -p /etc/selinux/${POLTYPE}/contexts/files |
| 53 |
- touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local |
| 54 |
+ mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die |
| 55 |
+ touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die |
| 56 |
# Fix bug 516608 |
| 57 |
for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do |
| 58 |
- sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}; |
| 59 |
+ sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} || die "Failed to recompile contexts" |
| 60 |
done |
| 61 |
done |
| 62 |
} |
| 63 |
|
| 64 |
diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild |
| 65 |
index d78ace2..1f1d1d2 100644 |
| 66 |
--- a/sys-libs/libselinux/libselinux-9999.ebuild |
| 67 |
+++ b/sys-libs/libselinux/libselinux-9999.ebuild |
| 68 |
@@ -3,7 +3,7 @@ |
| 69 |
# $Id$ |
| 70 |
|
| 71 |
EAPI="5" |
| 72 |
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) |
| 73 |
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 ) |
| 74 |
USE_RUBY="ruby19 ruby20" |
| 75 |
|
| 76 |
# No, I am not calling ruby-ng |
| 77 |
@@ -88,7 +88,7 @@ multilib_src_compile() { |
| 78 |
building() { |
| 79 |
einfo "Calling rubywrap for ${1}" |
| 80 |
# Clean up .lo file to force rebuild |
| 81 |
- test -f src/selinuxswig_ruby_wrap.lo && rm src/selinuxswig_ruby_wrap.lo |
| 82 |
+ rm -f src/selinuxswig_ruby_wrap.lo || die |
| 83 |
emake \ |
| 84 |
CC="$(tc-getCC)" \ |
| 85 |
RUBY=${1} \ |
| 86 |
@@ -135,18 +135,18 @@ multilib_src_install() { |
| 87 |
done |
| 88 |
fi |
| 89 |
|
| 90 |
- use static-libs || rm "${D}"/usr/lib*/*.a |
| 91 |
+ use static-libs || rm "${D}"/usr/lib*/*.a || die |
| 92 |
} |
| 93 |
|
| 94 |
pkg_postinst() { |
| 95 |
# Fix bug 473502 |
| 96 |
for POLTYPE in ${POLICY_TYPES}; |
| 97 |
do |
| 98 |
- mkdir -p /etc/selinux/${POLTYPE}/contexts/files |
| 99 |
- touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local |
| 100 |
+ mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die |
| 101 |
+ touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die |
| 102 |
# Fix bug 516608 |
| 103 |
for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do |
| 104 |
- sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}; |
| 105 |
+ sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} || die "Failed to recompile contexts" |
| 106 |
done |
| 107 |
done |
| 108 |
} |
Archives