From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 052E913888F for ; Sat, 10 Oct 2015 15:25:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5B61E07A7; Sat, 10 Oct 2015 15:25:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 68B8CE07A7 for ; Sat, 10 Oct 2015 15:25:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 47E12340139 for ; Sat, 10 Oct 2015 15:25:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D5DA1DF0 for ; Sat, 10 Oct 2015 15:25:18 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1444490708.b5d70155a3d2376070bcebf69e8298d042d4abbb.perfinion@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libselinux/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libselinux/libselinux-2.4.ebuild sys-libs/libselinux/libselinux-9999.ebuild X-VCS-Directories: sys-libs/libselinux/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: b5d70155a3d2376070bcebf69e8298d042d4abbb X-VCS-Branch: master Date: Sat, 10 Oct 2015 15:25:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f85887b4-bcaf-481b-9073-0b4af076fd8b X-Archives-Hash: e720fbc3dd9fdd36568d75a822ad096f commit: b5d70155a3d2376070bcebf69e8298d042d4abbb Author: Jason Zaman gentoo org> AuthorDate: Sat Oct 10 15:22:05 2015 +0000 Commit: Jason Zaman gentoo 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 }