Copy last two changes from live ebuild.

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

4 files changed, 22 insertions, 11 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index dc9327710085..18692aa6a106 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,10 @@
 # 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.107 2013/03/30 09:37:50 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.108 2013/03/30 09:58:53 floppym Exp $
+
+  30 Mar 2013; Mike Gilbert <floppym@gentoo.org> systemd-200.ebuild,
+  systemd-9999.ebuild:
+  Copy last two changes from live ebuild.
 
   30 Mar 2013; Mike Gilbert <floppym@gentoo.org> systemd-9999.ebuild:
   Update hwids version per ssuominen.
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index cb5bbfe36559..22d20cc384d8 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -18,14 +18,14 @@ DIST systemd-200.tar.xz 2109864 SHA256 9a08baa8fa5c48f0aab683b2f771e4be75c3c852a
 EBUILD systemd-197-r1.ebuild 6496 SHA256 0069c8127574ee382c55b790a3ef807c1db064057dc7ab9a24aec195e8907aa5 SHA512 ce8fdb78c5cce5e34474b12e29bed83814746949b676025e8780206ac716c1dab863be31f3d83db02de09be00a5ac26ebe70ca2474ea2e244f4903bbd5e6871a WHIRLPOOL 2f316c077c6fa23d02e12985131a915947aac265009094ff851d65cc403ca10aefbc8c3f3b6ced4ce6f9c551f52223ca01ec46545bc4b3cccd78633c04534dc1
 EBUILD systemd-198-r1.ebuild 6869 SHA256 bd68d6866eed550d86f04c1f365caf2256fb9f552711073864833599a55eb632 SHA512 76394453ded9cdbf364f79c0e1426ee575b3ad88e38dc53661db0ae87b03fafaaae6720c3f231340995af4db73172515e5a0fd6c997ec42d70a4edb70041eb51 WHIRLPOOL a82174d69c02fcbb6ed5c262c6a58706181f047bb306a053500f5833d3819e272282a0bf5d88ca4116e719b8cb50fefaefe105570bd4f35e26ece1caf741fa72
 EBUILD systemd-198-r5.ebuild 7203 SHA256 e919cc434b34107294156166236558170d093db7633adcb9664403b8e975cf2a SHA512 8b20498ad093a387fffc0b338fd4a48441ee38bce903e6ee41c919b4b8d9eee4b2b157aee376f880396fd5dfd01702785db50cd13ff6c11dfee82ee6fe42a850 WHIRLPOOL 7c8409b9c0ea08bc9d1021267cd0613df49d8aaa16399711e87bf6c7d30f2de4d29592ef57c6bf4d23146edbdf73231bb809176181cfc5bed489cc42dfb1e461
-EBUILD systemd-200.ebuild 6951 SHA256 e1384599b0654bc527a73c10fded80e72a09770070c3b9887d6ed4dd9efa8bb5 SHA512 c3105e1b1d116d23d1b2da53004b7921d5348081366d00bd4d2296abe5ff1d572935dc5d4ebba7cf653237557cb999948c462455c8c633301263b371b17481bc WHIRLPOOL c6c6df1c4ed99e54960d4f3796b706ce206faa9a78e85d988888dd65a14aa170948b311b2ea73f530b4b34947759012244f56a5b33ccaca169b7ae88ecc4daca
-EBUILD systemd-9999.ebuild 7819 SHA256 dd196e0d0562742c38b48ce91d3783a1f2a8d7a6f38036a43810af42d26c068e SHA512 1a27390e2f09cc7899780bdc2a7cb4ea58f36880981e1a637bca1a49763ef527a987b05b307d31c5ea4c9f2c7c28e972437baeec091712f871475177b79da26d WHIRLPOOL 6f2fcc3059f004bb9f0196dd88c25bbbef27cb867a20ac0a0c3017b47ecb72cc05ac2182dd7e69b5a0b0a106607ec92c19193285284b9f1312af050e830d7c99
-MISC ChangeLog 20767 SHA256 8034888f6b641d60c1bfed61ec95a5281da0de8416ccc32dfdbc5417c5d1482f SHA512 4450997419074689c41e1165c8b5185b08b92d6aa3f8fc0458285b9e3f320e2723318692c35fa612e2144320fb3f3169394361565f49205e1f76eabac19a7e73 WHIRLPOOL 24f489dddce49de50e09f03a90add292ca3ec8a35662fc6a45b9166baaee4ff47f41c83a40f6ba59af0faf230cad2c72b996b56c4650a97b4acb70c06573efa9
+EBUILD systemd-200.ebuild 7196 SHA256 f168c321b24279dd814d39b51914205a2f8f62f0ce326bb31f1d7ee17833b70b SHA512 2d49c9a138d00ab0b870cd03e8058407cd1746d307d7529740677cf664e1e9d2306f4e10566e236e20c02c6dac86681a669b6d54772839a5e3e5367bc3390cd3 WHIRLPOOL cd54cb46e6e01c169def95115aad80e6724d2f526d6a597feb1ba44fe01e23e08c8b835a347eac78377375b0987921883a386ef17f944087189262eea39fb743
+EBUILD systemd-9999.ebuild 7807 SHA256 3c00904c8055296b245cf7817201ee33e2b3fd85f8457b722e00ccc029ec4707 SHA512 0cdde1a0b83a9add6db0b656aefc3776b43b4f65ec830c17dfe9a03e4fa550b28762035ae0377823e65d661b1b5adea2b01eb28b2f3a6f5cbf2a67d1f2c240e7 WHIRLPOOL d23c3a8d81bf469ee717a61589c09829242ea7b3d7dc198d810c12d5ad35aca0c477adcbae30c26a2b82114989ec8a9345d46c923bdb9aa4052178a796167945
+MISC ChangeLog 20902 SHA256 0a70eca2f75d6822968f702f73a07876f2d7e171a54db19a47c31268ed77c9dc SHA512 954f18ffc4f69a1dc6a2d74ae2db3982ea6d0627a8f16a54ebd2147c2f139372506f066cf54f250971a5bdb5b039c69250aca5c2284e14765d44a8d198526f39 WHIRLPOOL fb684b86263a444193606ab1fe387f9f729bc439baf70c9a012f4dff63c4a46af45786ba2695a4bc8839741c7e51c5a2d75191fc0a78568bd5fe17582ec845ba
 MISC metadata.xml 931 SHA256 62b80c12536efbf1d14d93155aa18e3af1011709efd96c66c0176300d6a468b3 SHA512 ca3eedc144f671828d3555820d4effaccd24e86dedb894fd173d044c08a4213166f2dfe6c58fb6b80cdfa79e5ab2a9a3918971b49b433947389580b75f77ad97 WHIRLPOOL fd5185112548fea3c9f3710e53e073366a2285b6e0e3d30a653db24b9e868cfb57f839ca90ffd9955e0d4b6d687e9946f01ef1f8dd3b724fd1b1197a0285bc1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlFWsm8ACgkQC77qH+pIQ6TV6QEAnPddAP7e2BMrMAnzVfnbY6PV
-mUooLLxgEP+1dIShIlUA/0UNITFZ00MobnazLHK0pcVPjRZn7d+Z1u24p+PJ5wuQ
-=u6nh
+iF4EAREIAAYFAlFWt18ACgkQC77qH+pIQ6SfbAD/VtoL9mWBJUMmIxhhUeYnh2vF
+jhZAXkpDJVrxImVyVS8BAKzisKYPLhc/HEH+/EG8sD8oRfwHlJTpWC7lQ+0fktB0
+=n8w1
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-200.ebuild b/sys-apps/systemd/systemd-200.ebuild
index 92060a8f4dab..6cea869cad13 100644
--- a/sys-apps/systemd/systemd-200.ebuild
+++ b/sys-apps/systemd/systemd-200.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-200.ebuild,v 1.1 2013/03/29 15:49:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-200.ebuild,v 1.2 2013/03/30 09:58:53 floppym Exp $
 
 EAPI=5
 
@@ -42,7 +42,6 @@ COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1
 # baselayout-2.2 has /run
 RDEPEND="${COMMON_DEPEND}
 	>=sys-apps/baselayout-2.2
-	>=sys-apps/hwids-20130309-r1[udev]
 	|| (
 		>=sys-apps/util-linux-2.22
 		<sys-apps/sysvinit-2.88-r4
@@ -51,6 +50,8 @@ RDEPEND="${COMMON_DEPEND}
 	!<sys-libs/glibc-2.10
 	!sys-fs/udev"
 
+PDEPEND=">=sys-apps/hwids-20130326.1[udev]"
+
 # sys-fs/quota is necessary to store correct paths in unit files
 DEPEND="${COMMON_DEPEND}
 	app-arch/xz-utils
@@ -202,6 +203,12 @@ pkg_postinst() {
 	fi
 	systemd_update_catalog
 
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${ROOT%/}"
+	fi
+
 	if [[ ! -L "${ROOT}"/etc/mtab ]]; then
 		ewarn "Upstream suggests that the /etc/mtab file should be a symlink to /proc/mounts."
 		ewarn "It is known to cause users being unable to unmount user mounts. If you don't"
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 754d3335700b..94a3c8c84f19 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.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.35 2013/03/30 09:37:50 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.36 2013/03/30 09:58:53 floppym Exp $
 
 EAPI=5
 
@@ -235,7 +235,7 @@ pkg_postinst() {
 
 	# Keep this here in case the database format changes so it gets updated
 	# when required. Despite that this file is owned by sys-apps/hwids.
-	if use hwdb && has_version "sys-apps/hwids[udev]"; then
+	if has_version "sys-apps/hwids[udev]"; then
 		udevadm hwdb --update --root="${ROOT%/}"
 	fi