commit:     e20b1b55b07cfdb0d74a1960ca4a342e51e3b332
Author:     Jonathan Davies <jpds <AT> protonmail <DOT> com>
AuthorDate: Tue Sep  1 20:10:58 2020 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 03:40:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e20b1b55

sys-apps/checkpolicy: Version bump to 3.1.

Signed-off-by: Jonathan Davies <jpds <AT> protonmail.com>
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>

 sys-apps/checkpolicy/Manifest                                  |  1 +
 .../{checkpolicy-9999.ebuild => checkpolicy-3.1.ebuild}        | 10 ++++++----
 sys-apps/checkpolicy/checkpolicy-9999.ebuild                   | 10 ++++++----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index c800d814560..2a07ee9daf5 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,2 +1,3 @@
 DIST checkpolicy-2.9.tar.gz 68735 BLAKE2B 
092b7b67ea952be6a829529249f0b209c31245490f263b248cb0208d9f1f4ec922522791c6555c0b913b56b8a0037bfde54a3511940f0be287f13e3a193c8f26
 SHA512 
8dafdd871c5fd32023883149c74891279c386cc87d70cbfc6f0a8dcb0406f17f1158f9078c1b35892a0f0edcb6b5208a031594ab80898eec016ad765ad046e03
 DIST checkpolicy-3.0.tar.gz 69037 BLAKE2B 
30b8a5e19e02472d1cf256636c70f95739098514ef9d630ee5e782085bd09ff58b4ab6b8c97e9fa652e8260211a7803d80eb765e0fd2f1dde9c328682078d3c1
 SHA512 
196d24638ec7fc88d427637e2308c7a0c5a3d4cc88c372a5f5dc61d6c1e2f895e308b8e06ee9e47d340d65a1b2d4486dc4decfa6074594dda14e46f1308ded89
+DIST checkpolicy-3.1.tar.gz 69072 BLAKE2B 
31cb5ef52533b0a62f954e770278fc5766a961d87fb86260b04abe562bcd90d0025b33931c6ad54096c64ab54150c7562c112eac80eb2f60dbcdda57f4cacfe2
 SHA512 
2276a5a0919286049d2ceba386ef5f6de523745b588bb81cb4fed5eced5fd0b8070249b7a3ae5a85e2abb9369a86318f727d4073aad14ab75c43750a46069168

diff --git a/sys-apps/checkpolicy/checkpolicy-9999.ebuild 
b/sys-apps/checkpolicy/checkpolicy-3.1.ebuild
similarity index 83%
copy from sys-apps/checkpolicy/checkpolicy-9999.ebuild
copy to sys-apps/checkpolicy/checkpolicy-3.1.ebuild
index 5be101d66c6..fe88e2f1c07 100644
--- a/sys-apps/checkpolicy/checkpolicy-9999.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-3.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit toolchain-funcs
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20191204"
+MY_RELEASEDATE="20200710"
 
 SEPOL_VER="${PV}"
 SEMNG_VER="${PV}"
@@ -53,5 +53,7 @@ src_install() {
 }
 
 pkg_postinst() {
-       einfo "This checkpolicy can compile version `checkpolicy -V | cut -f 1 
-d ' '` policy."
+       if ! tc-is-cross-compiler; then
+               einfo "This checkpolicy can compile version `checkpolicy -V | 
cut -f 1 -d ' '` policy."
+       fi
 }

diff --git a/sys-apps/checkpolicy/checkpolicy-9999.ebuild 
b/sys-apps/checkpolicy/checkpolicy-9999.ebuild
index 5be101d66c6..fe88e2f1c07 100644
--- a/sys-apps/checkpolicy/checkpolicy-9999.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit toolchain-funcs
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20191204"
+MY_RELEASEDATE="20200710"
 
 SEPOL_VER="${PV}"
 SEMNG_VER="${PV}"
@@ -53,5 +53,7 @@ src_install() {
 }
 
 pkg_postinst() {
-       einfo "This checkpolicy can compile version `checkpolicy -V | cut -f 1 
-d ' '` policy."
+       if ! tc-is-cross-compiler; then
+               einfo "This checkpolicy can compile version `checkpolicy -V | 
cut -f 1 -d ' '` policy."
+       fi
 }

Reply via email to