Use keepdir /var/log/journal/remote instead of removing it.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 17 insertions, 17 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 6d1df6bd34b6..e036f757bd9a 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.316 2014/10/20 22:00:04 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.317 2014/10/22 15:02:44 floppym Exp $
+
+  22 Oct 2014; Mike Gilbert <floppym@gentoo.org> systemd-216-r1.ebuild,
+  systemd-9999.ebuild:
+  Use keepdir /var/log/journal/remote instead of removing it.
 
   20 Oct 2014; Mike Gilbert <floppym@gentoo.org> systemd-216-r1.ebuild,
   systemd-9999.ebuild:
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 9524a1f8d6ff..b4a9d0c71c17 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -11,14 +11,14 @@ DIST systemd-215.tar.xz 2888652 SHA256 ce76a3c05e7d4adc806a3446a5510c0c9b76a33f1
 DIST systemd-216.tar.xz 3612960 SHA256 945d3db7d840d6ffe98aa68394428e13317161ae79905397faab6671619728f3 SHA512 f4eee6664368168eafd61939f1355ac21c7eeecce6247de98ef36f40bb6a942d12c006ced4ee15f3d8f11699c194990222d5a5115b45f2aa81f2a1abafebbdd2 WHIRLPOOL 505e09b55209a4f9d8cec077970571b2e1298e8db02946a6c79df139dece9d1a08e46c86ef6c8053274abfd46c9a5ea09157f5bc9dc1f7461322c596e84ef494
 EBUILD systemd-212-r5.ebuild 14286 SHA256 911b093c8c7b8fa5e63537a2cccf62c89e64229724feec69f0454290a284ffb2 SHA512 ac79890c72d21c108e3348b836979a38c861514504fb52d48d54fdf69400cce3786159817a0ca784dc7051d44624adffea4c3252e19a423709fd21b32baa7baf WHIRLPOOL 307098ec61aba2b58ebb65eb86b5b24e98536b32a989b527fd2d3b82251ebca626075a97e93f80a97d55653974722a2b063f8220aa15428ab3b1fea8e74e82b4
 EBUILD systemd-215-r3.ebuild 16065 SHA256 2c504d90406c54ecb4b6336ac7b6298ef43b4899a561fe23b7041d694c9280ca SHA512 6507693d67408083fa8817753d833a228953a3adc4b65e7007c2cdcdaf5b750f990184e3588273a16b9b073a98457d21ef5698cb3a55ab46a05f843bfb619d63 WHIRLPOOL 1ede766043eb0780d4134c95dba23fa6c3a35579df5151abe53ad45f39d8d9aad5958a32afe2e1ed520ec245559e651c7237bca1ee194828f010c8b9fdbdaa9e
-EBUILD systemd-216-r1.ebuild 15682 SHA256 5040084d9a86e43448331d6247b0162db05b356d1caf77e809186ed883b2feac SHA512 517281d23877df581853dbaf347ae5cb43ccd5aca9614e7ddd7a6e88e4f875b36c7963030ed9e3c3b29683ca8a5abf2f09d8d1f1811cddb744f659bf3c59acdf WHIRLPOOL d607ae64661bdf36d7f322ef5271394d647a112a8964dd9d223494bd934a396774c7acb1d3711f9b1142e50dcd52b10608994f407b7b5bb726cb33d16fcf8da9
-EBUILD systemd-9999.ebuild 15798 SHA256 77f8225c7cd6f090a68b132dd43d8527f051a1dfc7faac89c5f7c236b8500c20 SHA512 c8d8a47d4933ac8466f5df23c23ce56a4dbcc9130e9c7ce2cd407927adfdc7b22c1b1fe8dee25aa281d35fa529ca85a3aa7255bc54f454a0344d13457446267a WHIRLPOOL 494c9a73c199ef6064500f91d58b2c74d2b4b7ec57538868243f56b8ffdae3fcbbc41966361535b78a733d65248feb812dd31ca5d63df685e24c81e03abfc0fe
-MISC ChangeLog 56739 SHA256 69062c070b63a3910c883504f8ed17ab00b23281c40c0c84f7aaf917b5d7c2b1 SHA512 ffdf47968b41536525764f653012fb790d38f4b4998a215272edcdcbd0f84adfb9f45747091661147113399f0a76fe6d2b2d36f51621ce1e108e4097d0f88431 WHIRLPOOL 0f5eb6d01aa93c80f1a4f6e2cb78b8b6525d8ee815f5f094d34cfcf68dfc93275eded071fd8df5b2b11f1fdd4fccc5687f5e757293fbaf33e92d83fcc018bc61
+EBUILD systemd-216-r1.ebuild 15637 SHA256 8fbf530eb7d9b02701571c0a3771ff15e4ad3630fd0616eb508664337e3644a5 SHA512 a1c30c8cfef7f20c52738c84ca5cc149cc080ef46bf778584e7afdd32153f633140ea5211e4a87c96f955fbea6c62d31a1dc9702613c3d905ffcab6bb24c6340 WHIRLPOOL aa9b9e921cd6b59ee82857c1e16fa9bde9087f0aad85813661f41dd6663968c1d68e8ce2277da03a5858457109684e80eb87a76a4c2912f1a0d124bb2e70a884
+EBUILD systemd-9999.ebuild 15753 SHA256 0316445173b93a2007cf49c7ecf45033b5511e851814bbd8a163f44b0371a737 SHA512 e71094135d9abe8ac73ce68ca7d15111f217e9be0c6e61be67f3a70eb28b9744022514e33711d4b3b7196a23decf68190287fb81d181f0bceafb570652c18fc2 WHIRLPOOL 029ec69e06b19c9d942dae9ec941d19e39eca0a9ff6cfdc9413bc50d46762fa9516d9fd59ad4be5b3b2651b0e675e661865571db4764d7bc37468bdd1d6aa41f
+MISC ChangeLog 56897 SHA256 c4384b62f932a0e27b97a71fa6179cb7b1ca8ea52e4921848c63311cb563351e SHA512 2886bc3325266e920ffa561a7bdc03a7812eb8eae084ecb2784d3b93c84de65558290b8d14f8b50834958d225961dd8884049c73844e1440e9e6ab6598311463 WHIRLPOOL 5bc580569bf453422be37fe41b649202a4f96a4432fdab872e4e869b11b204c021410800dc756a1ec799e682c578887f7fadcfde50996b1323cc6ee1b4ca2a13
 MISC metadata.xml 1332 SHA256 f922af5fac3a5df36df50ebc89ed74fd2235383d8a350f24e50f84a7b06d439c SHA512 3455f018730fb82e14262b27b5fc7f7755be82bc469355e31ce0c3f8a230f887296e3e94ed32d82585284fb51b5905c11f3ad964db08590326c84e00f59b7172 WHIRLPOOL 6399019ab3afd9167e5bd75b6f29f37ecf2f5863724c339cc697305c2cb26f525b1b521f77b8858c223d765b71eb6b2dd97aadf4e5e11f6865f17422ede1fb5a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlRFheYACgkQC77qH+pIQ6Tn0QEAkXu8cW2Xha2t4w+F/uFJlfMS
-xbtMP/I6lRa9ixjSWFcA/AppP2wW/8kziOxWY0AF5LQD9D7mbSJZJ46xvAXZz4X+
-=h3XI
+iF4EAREIAAYFAlRHxxcACgkQC77qH+pIQ6RhJAD+PRc8BZ+mb5eZGXFGSqrcuyKs
+5OG/e0qFxl9jsVOJbhQA/RW3PHyAtHLMG7mYgGm2VEqOCz3nNbU9FZbpjOvP57zY
+=w4o8
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-216-r1.ebuild b/sys-apps/systemd/systemd-216-r1.ebuild
index 0aa262154d89..b26b7790887b 100644
--- a/sys-apps/systemd/systemd-216-r1.ebuild
+++ b/sys-apps/systemd/systemd-216-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-216-r1.ebuild,v 1.4 2014/10/20 22:00:04 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-216-r1.ebuild,v 1.5 2014/10/22 15:02:44 floppym Exp $
 
 EAPI=5
 
@@ -336,10 +336,8 @@ multilib_src_install_all() {
 
 	# Preserve empty dirs in /etc & /var, bug #437008
 	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
-		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd
-
-	# Remove empty journal directory.
-	rmdir "${D}"/var/log/journal || die
+		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \
+		/var/log/journal/remote
 
 	# Symlink /etc/sysctl.conf for easy migration.
 	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index eeb57d37e14b..30089420a6f1 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.143 2014/10/20 22:00:04 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.144 2014/10/22 15:02:44 floppym Exp $
 
 EAPI=5
 
@@ -353,10 +353,8 @@ multilib_src_install_all() {
 
 	# Preserve empty dirs in /etc & /var, bug #437008
 	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
-		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd
-
-	# Remove empty journal directory.
-	rmdir "${D}"/var/log/journal || die
+		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \
+		/var/log/journal/remote
 
 	# Symlink /etc/sysctl.conf for easy migration.
 	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf