Move the Gentoo-specific files from the live ebuild to gentoo-systemd-integration. Revbump to ensure smooth migration.

Package-Manager: portage-2.2.0_alpha190/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

3 files changed, 28 insertions, 28 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index c0625f61881f..9436a8fc84ea 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.150 2013/07/28 19:46:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.151 2013/07/29 22:11:19 mgorny Exp $
+
+*systemd-9999-r1 (29 Jul 2013)
+
+  29 Jul 2013; Michał Górny <mgorny@gentoo.org> +systemd-9999-r1.ebuild,
+  -systemd-9999.ebuild:
+  Move the Gentoo-specific files from the live ebuild to gentoo-systemd-
+  integration. Revbump to ensure smooth migration.
 
   28 Jul 2013; Agostino Sarubbo <ago@gentoo.org> systemd-204.ebuild:
   Stable for arm, wrt bug #477910
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 5da9a97494a8..677479b6ff30 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 191-0001-Disable-udev-targets-for-udev-190.patch 9066 SHA256 b884eb4a803ae22ac1bd8475d3cba2eee2206bc421cf9ecb700acffc98e5f06a SHA512 9bdeb93c6f7f96e0bb74f96c01c3b72bea5e9d89800b53ce8ce6dae3a531e4328495e31d7850d07cf5d0537c2f64a5080683fe83e13055c29e9a2c075a6c593f WHIRLPOOL 5989a42ec109002e9887d6e6af46d60e9091517752bab6480a5afc3db6fbc2a17373fb2d26bee50745dc299710b003a1b6347f6a4c1015586e50539f6f50ec22
 AUX 196-0001-Disable-udev-targets.patch 9359 SHA256 5b021ec900b5dfffc0c04e6ef351416b3d42fe621dec05d721bf027d5ed90d91 SHA512 fffc8437cc79acf037601fa83394b19cc8bb495ab0c390617f711f1c65e574185b1ea5bb42803c88c4459020b60158fc423a9a1020d2f3c2200f761781868aec WHIRLPOOL be2b22b713d7bb935cf9aba6877b82416bf58e18ef82c22f2204195e9c3bf63a7d9c5b8c2d73d89ab99f1ca949c454a188de52c68c5d15c2dfbe0b30daaf4536
@@ -21,23 +21,25 @@ EBUILD systemd-201.ebuild 8320 SHA256 a7e696450c4ec2875c38678b26b6445e5b53672edf
 EBUILD systemd-204.ebuild 8475 SHA256 2eda8bc862e52d7eb3cd7b40e6ee24cb466ceef4eb244fc9997f09fd524aa894 SHA512 e7aa30e13e80fe57d0957b02fd3107ade56d68fca32ccdfcc16ed8ffb6d2a9af7b3723d8b8d52b5c8c9497ee5833526f3438286c85bb823078a7851310e8a034 WHIRLPOOL 94dc6234fda3f809eac778a7218e64aadbacd9d973e2466e8b89c27d4a3072f58cffdd404b72057a7fdc966bf9a9a1832f706c22892724757ffb33052575eae4
 EBUILD systemd-205.ebuild 8563 SHA256 690f8f6196e42bcdd6db0f14c055fd890dd7376ce3e72068f0df989094f8e77e SHA512 7a394b36cf72348b473266a3e2f2b7e43aa4c47536e0c24eb82873f528dba1ced841688c99ebfcd318d4c2b785eafaa45a2ecd9bbad3146361fc286f45c6e8de WHIRLPOOL e2390f105eed34e38bd4b581330a821f5c26b19038cac767b33a9ad7ac637a0db72ff0254cd663a2eb05619dc392997b0e5d53acd741bba04f470c00d59c4ea2
 EBUILD systemd-206.ebuild 8535 SHA256 0d137501b31a54f6f09467df1492ce9828b1139e5ac7ca603a7fd083e00113bf SHA512 bf5cf781f2eebdef39abb8549ab0d074968c0f17f20c631f534bf42c386e61b9111a0edd483ff4ee9b6f969294368ca02357d8518b87d02cdacec3eb5c69599d WHIRLPOOL 77acabb5cb2e863a979e77e30b65b75ca7d0555c6ad89ba8e3d2043a7166db2c5e849c13121fb31caa1ebbf15461482f905f89e1738a106c3ce26a528b8fdef3
-EBUILD systemd-9999.ebuild 8914 SHA256 ff091d74ee1623288668a8710cf499ec3c1c32952b8b7ad0a31b0610951923a7 SHA512 da4f8788f3abaa486723ed61aaaaf8f6ee0f5e1633b7f7179eec53d8b37a2cacb820b8a61dc348313326d66f883b05bee12db57b33bf8ddde03649e90555125f WHIRLPOOL 9df00895e194cc74905361ba8546a4e8c36e4aacc503c471e71a80ccdf7a4b89f58548bdce0fba2e98d786fa60c269f0ef9f17dae21657244de6796cb099ae36
-MISC ChangeLog 27815 SHA256 11dd48a1c6468d742eb71ad7e1a1ed9b4bf42c7ae6d4f30a2ef2b42cbd4e3c6c SHA512 d5186cf72779c33c33e504f6cc52faee05e6da1497d4b5fb455a5142b22fb0cd125ac1386d981d3821e6cae9664847aa0f54d4f2b58fbd2e8e8f712ee5ec29ee WHIRLPOOL 32bdfe775e8989e1286ea15bdf4dc6f0b707219b9a2e13d84116f0804ee73e69ee60b7ac8a496850ca9577a6dfd9a218dab97b7e1a2f31127b45c9e5fdc850a0
+EBUILD systemd-9999-r1.ebuild 8601 SHA256 aae6688a764c8b6d903981164135cfdbbdf4f0670d3c103c39fe09a464e44e9c SHA512 86b6cab1c26748d52cf455812324d5853c158710ff7fa6ca9994b64499dff5954cb6a5d1a6fe76fb5307a943da6967e11d6e8a1527a4fb1df29ceaeb8df07a3e WHIRLPOOL 01a5df5746b422e5072155363483ae60fee8960cadd625b5303818e817a3bb97c045652fc65c41264c5bc528928e7c243699f123f862e68ee87197a7598531da
+MISC ChangeLog 28074 SHA256 d434303ba2e20d015eb887225df7fda5b3b3efa2f63fff8280d424c84f725c4e SHA512 b25a1460f0a4198414b9b2dd1abeee0f17bf2e9eb0e749f17a3d26061cc6477210f3a4af54a947e0960e4690f7b9634df696470f2092bcf43308ebb8110bf4d1 WHIRLPOOL 89325c7c1a38db139fbbd84559c355629cc40a78db4ab109bd8a1dd006be468d622e6efecdcf122ea97cf308d3d9c9168da65cecdc6e13986d532496dd79c97c
 MISC metadata.xml 1108 SHA256 7555f673c5676c2efb2696cf49117e1198134e8c2d575052d817c50bbc4f5f45 SHA512 10b8a0dff66f163dc747e294ead1455fa0b84414eab9aa1950da08f92245eb725d77f04346276a4e727bf0d5b6adc5f6c744b770b1a47dc916ddef7d641affd9 WHIRLPOOL ae3413df80c029c8f84e092568d05e02e3c81695c741319be98ceadddbd680c589e68ec6250a653849eca6d0fe3aace7c2004f54cc2f7a9201b60af524edff28
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR9XRGAAoJELp701BxlEWfj0EQAIYnT4ENvreESWlykuUYnr0t
-xzXbM7b8NDGmR2u7aPukI6SMycz/6pJ5y9f7rzK9H/GUATfctcJDjxfS8+pElpQz
-lJIR86O13BQfYUbczEYcK6ZQNHwbFoW9PiAnq/0h5nf60iIwwP66N5Urcuf/JX1W
-g8Hv3XiHw92MoU6ijT0KKWWrQGyphR24T9FVqYLO6IQB+3A+zLzOsjg382JPWN5u
-vkK6Eed9msfqBLMRLTAFpdV/TwrPCDNCUgDFYLKoo/sCsubTt3Gqen4R/3NvGQxb
-3Mvf4G0Tfwvqk2NPyRW9Q6Wv+n6NsZXfwbOfRVI04Yrbv89ZVIpb51N4AfvmEB6X
-kFVQRI3Wpm25VcqtqYXCzS9ulciArYmpsaMLJeb6Wr5pVE5BLFXtTaUKOo+xiYQn
-eXbkfLCMq2e3dLMn+uItGhV4hlq1uETMZyyyRUt30g53G7A3NA2xTRjnQMy2PpR5
-dxOrGHzauFyocxsWdGqpCdz2Z9btKH3NwVBH9Xdx/j7o5gwThydlF4cPU3OTxqn0
-p/ZRZCZbS59Do5R9ZfqxwMeepbwkXCHe/4vAv3NZNr1S/GK87mJkUBn8J7vvlvIa
-WEsgsi1y7ub7EG3mb41NEEZiy9uY2I1YznEFoUca9m1XLX1Py6Qf5rb0VfCQxuI6
-5lRukrtOd2254uyYDTBL
-=ZwVL
+iQJ8BAEBCABmBQJR9uifXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZD3DwP/RwEU81mfZRvMhY65MG8hry7
+xbIKmKzYcfQwQm9IMJU4ixqkPlHGq1jg0ZFnz2QVJZ7/JDec0fvKabj67f0pvgTL
+izm+ZjtH7pjj//uVoJO7sFWjeQb04bo81IJJYetPPsGVNa2FAvM/+c9HqycrRsMg
+0mkBh6bzHouYWfbYktztoPgK+JBiYvGT7jms4qVFhNJfoKRpB5/k4gb/Q52rWRto
+YAPMm/OZiAF96MaOoLgVIafEigwn44YlQa2Jijdm/CTyD1Co+FBUK+OfPN7EpOCa
+JT6AJTnyNu1ECijV1mr/1JRAS2goJxP/n6VqwsF6dZqyjlRGKQbRLdUMWQdR4+VR
+OjHY46UKQR47xq3VFo2QsGKH7UiSJ/QYejTorjjJpcyn/8jkvmMqF/tdTVgzDj9k
+JdQyuovfBBF7rrY0HsnNsUGLeRArdfOjV5y+oPCrI/zaAo4x7XTw5dabLaRhDdnE
+4W5qjxdjUld8YssG5c8POjs3Fs3Lj9ZsdvoKUBaDbViDoAV6wL0es+W/Bhl/ftfy
+XOxho2K0zKq1OHwNezGCvHXuZmeOZOS6mtdckeeIfImd6fBaL3amYpS0KJwhT/Aj
+5HSMU3J8KtwWuBowyfiTRuofS1vuQRpSUlY8EMJTIlzTE/JdouapCCyPGrAnLUcL
+wXXsYkZ+l/hua/BbY8oA
+=18wE
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999-r1.ebuild
index 4f6367cbdfdb..4c9622bd4876 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.65 2013/07/23 08:25:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v 1.1 2013/07/29 22:11:19 mgorny Exp $
 
 EAPI=5
 
@@ -58,6 +58,7 @@ RDEPEND="${COMMON_DEPEND}
 		>=sys-apps/util-linux-2.22
 		<sys-apps/sysvinit-2.88-r4
 	)
+	!vanilla? ( sys-apps/gentoo-systemd-integration )
 	!sys-auth/nss-myhostname
 	!<sys-libs/glibc-2.10
 	!sys-fs/udev"
@@ -233,16 +234,6 @@ src_install() {
 		|| die
 	rm "${D}"/usr/share/man/man1/init.1 || die
 
-	if ! use vanilla; then
-		# Create /run/lock as required by new baselay/OpenRC compat.
-		systemd_dotmpfilesd "${FILESDIR}"/gentoo-run.conf
-
-		# Add mount-rules for /var/lock and /var/run, bug #433607
-		systemd_dounit "${FILESDIR}"/var-{lock,run}.mount
-		systemd_enable_service sysinit.target var-lock.mount
-		systemd_enable_service sysinit.target var-run.mount
-	fi
-
 	# Disable storing coredumps in journald, bug #433457
 	mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die