[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/

[Mike Gilbert]

commit:     ba246ad2dd3c986fe67ea5bb3147bc89a3fbd9b8
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 22 18:56:00 2019 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Aug 22 18:56:00 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba246ad2

sys-apps/systemd: bump to 243-rc2

Package-Manager: Portage-2.3.71_p6, Repoman-2.3.17_p5
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/systemd/Manifest                                         | 2 +-
 .../systemd/{systemd-243_rc1-r2.ebuild => systemd-243_rc2.ebuild} | 8 ++------
 sys-apps/systemd/systemd-9999.ebuild                              | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index da67bf86c71..097fdeb5e7f 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,2 +1,2 @@
 DIST systemd-242.tar.gz 7831435 BLAKE2B 
288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd
 SHA512 
578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4
-DIST systemd-243-rc1.tar.gz 8209533 BLAKE2B 
6f28d839563104b488bfe030483bf1b24c3d01cedb59ffa655f03a37d7c636c2daef34ca9d13b9fbe848b131d21920138583c63a049c1747f7e569c68384c0bf
 SHA512 
6626d7fd5781578d01a30c0d2647a293668d0819f2f85ce78a6aaf62ae1aa4b2c687cf237ca833c5befbc00321a344ff5ca56747cedc6ce00cd0f51c71dd25ff
+DIST systemd-243-rc2.tar.gz 8239802 BLAKE2B 
9ab6a12f6dff855265be381616601fb2caf79be810bba7f5c24fa6e91ae34d8d1ead0ae1b45c374e8c9752b883daba01863e5622ef1d34718e8390c0ad837cf0
 SHA512 
7e9b996c1eeb299fb971f2fd4a39fa62c7cc9178bacaaae6c168008dec438f392b949deb72d08f27060b3cde54b46b70f6a18b1bc70725a56ca2a28a1f96b6a1

diff --git a/sys-apps/systemd/systemd-243_rc1-r2.ebuild 
b/sys-apps/systemd/systemd-243_rc2.ebuild
similarity index 98%
rename from sys-apps/systemd/systemd-243_rc1-r2.ebuild
rename to sys-apps/systemd/systemd-243_rc2.ebuild
index 988973dd9a7..f00c416fa38 100644
--- a/sys-apps/systemd/systemd-243_rc1-r2.ebuild
+++ b/sys-apps/systemd/systemd-243_rc2.ebuild
@@ -185,10 +185,6 @@ src_prepare() {
 
        # Add local patches here
        PATCHES+=(
-               "${FILESDIR}"/243-rc1-analyze.patch
-               "${FILESDIR}"/243-rc1-cryptsetup.patch
-               "${FILESDIR}"/243-rc1-revert-logind-remove-unused-check.patch
-               "${FILESDIR}"/243-rc1-udev-properties.patch
        )
 
        if ! use vanilla; then
@@ -314,7 +310,7 @@ multilib_src_compile() {
 
 multilib_src_test() {
        unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-       eninja test
+       meson_src_test
 }
 
 multilib_src_install() {
@@ -347,7 +343,7 @@ multilib_src_install_all() {
        # Preserve empty dirs in /etc & /var, bug #437008
        keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
        keepdir /etc/kernel/install.d
-       keepdir /etc/systemd/{network,user}
+       keepdir /etc/systemd/{network,system,user}
        keepdir /etc/udev/{hwdb.d,rules.d}
        keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
        keepdir /usr/lib/{binfmt.d,modules-load.d}

diff --git a/sys-apps/systemd/systemd-9999.ebuild 
b/sys-apps/systemd/systemd-9999.ebuild
index 7556cea0b55..f00c416fa38 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -310,7 +310,7 @@ multilib_src_compile() {
 
 multilib_src_test() {
        unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-       eninja test
+       meson_src_test
 }
 
 multilib_src_install() {