| 1 |
commit: 3d0d4e7d6834fbb5a7e5a5a0ab819df74c5c61fd |
| 2 |
Author: Jonathan Davies <jpds <AT> protonmail <DOT> com> |
| 3 |
AuthorDate: Tue Sep 1 20:28:38 2020 +0000 |
| 4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 15 03:40:31 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d0d4e7d |
| 7 |
|
| 8 |
sys-apps/restorecond: Version bump to 3.1. |
| 9 |
|
| 10 |
Signed-off-by: Jonathan Davies <jpds <AT> protonmail.com> |
| 11 |
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-apps/restorecond/Manifest | 1 + |
| 14 |
sys-apps/restorecond/files/restorecond.init | 0 |
| 15 |
.../{restorecond-9999.ebuild => restorecond-3.1.ebuild} | 15 ++++++++------- |
| 16 |
sys-apps/restorecond/restorecond-9999.ebuild | 15 ++++++++------- |
| 17 |
4 files changed, 17 insertions(+), 14 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-apps/restorecond/Manifest b/sys-apps/restorecond/Manifest |
| 20 |
index 887422d4fd5..84f10cfb46b 100644 |
| 21 |
--- a/sys-apps/restorecond/Manifest |
| 22 |
+++ b/sys-apps/restorecond/Manifest |
| 23 |
@@ -1,2 +1,3 @@ |
| 24 |
DIST restorecond-2.9.tar.gz 18893 BLAKE2B fcdae1a4ec489f3f581212cdd3c13c5561feac3ee758f354dca75c97938c62b9ed04aedbd4b3b5cde09a5887247389262718145620d0b9749e364d1614f57241 SHA512 6de9dd4c6b8e5d8275221aba5df27437998f635cfe83a5da75de479e260ceea884a36253eb873a8d71e1a77ed67544d8657fb75fe409af1f630052ce73ec5d8a |
| 25 |
DIST restorecond-3.0.tar.gz 18797 BLAKE2B 354477ea9f57cc27c14a2648b99b32c45ac6d4e32caeb0fb108ed8f40a2e2e04101e2658d0107a1f2741717c242ad80b2e14db03488ab62b88eeb8b1a9ac0dd4 SHA512 f75088f72a17f1f7550ef67052202cea1fd9cf1bb1eec0355f4a0641ba25097b289f629df328ee79aec00f8361cbc6df10efc4a5af2f0b67f9922ceaf92aa956 |
| 26 |
+DIST restorecond-3.1.tar.gz 18939 BLAKE2B 3a3fcde057dad3ed05692d679ba27e0b24f191d92ed5114fa38cb5f846c4cc00d85bb09b5d4e560ed2b914444e0c2d1c407f6c03900610624d5626d05f2991bc SHA512 cdcf299f48b89a7c641ded9507b9b966bf648497394f8e988a9cb1ceb3224c86369706027f3416a4f9750836f7a8f4580a4b3df76673e03f897b383d7ed0e2c8 |
| 27 |
|
| 28 |
diff --git a/sys-apps/restorecond/files/restorecond.init b/sys-apps/restorecond/files/restorecond.init |
| 29 |
old mode 100755 |
| 30 |
new mode 100644 |
| 31 |
|
| 32 |
diff --git a/sys-apps/restorecond/restorecond-9999.ebuild b/sys-apps/restorecond/restorecond-3.1.ebuild |
| 33 |
similarity index 78% |
| 34 |
copy from sys-apps/restorecond/restorecond-9999.ebuild |
| 35 |
copy to sys-apps/restorecond/restorecond-3.1.ebuild |
| 36 |
index efe40fb0d73..001d8cd6d3f 100644 |
| 37 |
--- a/sys-apps/restorecond/restorecond-9999.ebuild |
| 38 |
+++ b/sys-apps/restorecond/restorecond-3.1.ebuild |
| 39 |
@@ -1,11 +1,11 @@ |
| 40 |
-# Copyright 1999-2019 Gentoo Authors |
| 41 |
+# Copyright 1999-2020 Gentoo Authors |
| 42 |
# Distributed under the terms of the GNU General Public License v2 |
| 43 |
|
| 44 |
-EAPI="6" |
| 45 |
+EAPI="7" |
| 46 |
|
| 47 |
-inherit toolchain-funcs |
| 48 |
+inherit systemd toolchain-funcs |
| 49 |
|
| 50 |
-MY_RELEASEDATE="20191204" |
| 51 |
+MY_RELEASEDATE="20200710" |
| 52 |
|
| 53 |
MY_P="${P//_/-}" |
| 54 |
IUSE="" |
| 55 |
@@ -32,8 +32,7 @@ DEPEND=">=sys-libs/libsepol-${PV}:= |
| 56 |
dev-libs/libpcre:= |
| 57 |
>=sys-libs/libcap-1.10-r10:=" |
| 58 |
|
| 59 |
-RDEPEND="${DEPEND} |
| 60 |
- !<sys-apps/policycoreutils-2.7_pre" |
| 61 |
+RDEPEND="${DEPEND}" |
| 62 |
|
| 63 |
src_prepare() { |
| 64 |
default |
| 65 |
@@ -47,7 +46,9 @@ src_compile() { |
| 66 |
} |
| 67 |
|
| 68 |
src_install() { |
| 69 |
- emake DESTDIR="${D}" install |
| 70 |
+ SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" \ |
| 71 |
+ SYSTEMDUSERUNITDIR=$(systemd_get_userunitdir) \ |
| 72 |
+ emake DESTDIR="${D}" install |
| 73 |
|
| 74 |
rm -rf "${D}/etc/rc.d" || die |
| 75 |
|
| 76 |
|
| 77 |
diff --git a/sys-apps/restorecond/restorecond-9999.ebuild b/sys-apps/restorecond/restorecond-9999.ebuild |
| 78 |
index efe40fb0d73..001d8cd6d3f 100644 |
| 79 |
--- a/sys-apps/restorecond/restorecond-9999.ebuild |
| 80 |
+++ b/sys-apps/restorecond/restorecond-9999.ebuild |
| 81 |
@@ -1,11 +1,11 @@ |
| 82 |
-# Copyright 1999-2019 Gentoo Authors |
| 83 |
+# Copyright 1999-2020 Gentoo Authors |
| 84 |
# Distributed under the terms of the GNU General Public License v2 |
| 85 |
|
| 86 |
-EAPI="6" |
| 87 |
+EAPI="7" |
| 88 |
|
| 89 |
-inherit toolchain-funcs |
| 90 |
+inherit systemd toolchain-funcs |
| 91 |
|
| 92 |
-MY_RELEASEDATE="20191204" |
| 93 |
+MY_RELEASEDATE="20200710" |
| 94 |
|
| 95 |
MY_P="${P//_/-}" |
| 96 |
IUSE="" |
| 97 |
@@ -32,8 +32,7 @@ DEPEND=">=sys-libs/libsepol-${PV}:= |
| 98 |
dev-libs/libpcre:= |
| 99 |
>=sys-libs/libcap-1.10-r10:=" |
| 100 |
|
| 101 |
-RDEPEND="${DEPEND} |
| 102 |
- !<sys-apps/policycoreutils-2.7_pre" |
| 103 |
+RDEPEND="${DEPEND}" |
| 104 |
|
| 105 |
src_prepare() { |
| 106 |
default |
| 107 |
@@ -47,7 +46,9 @@ src_compile() { |
| 108 |
} |
| 109 |
|
| 110 |
src_install() { |
| 111 |
- emake DESTDIR="${D}" install |
| 112 |
+ SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" \ |
| 113 |
+ SYSTEMDUSERUNITDIR=$(systemd_get_userunitdir) \ |
| 114 |
+ emake DESTDIR="${D}" install |
| 115 |
|
| 116 |
rm -rf "${D}/etc/rc.d" || die |
Archives