Make dbus a PDEP + test dep since upstream no longer links to the library. Add BUILT_SOURCES build to fix bug #492370.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 31 insertions, 11 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index dd40a2912f96..b1acf4f3b8f6 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.199 2013/11/24 14:33:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.200 2013/11/25 19:32:38 mgorny Exp $
+
+  25 Nov 2013; Michał Górny <mgorny@gentoo.org> systemd-9999.ebuild:
+  Make dbus a PDEP + test dep since upstream no longer links to the library. Add
+  BUILT_SOURCES build to fix bug #492370.
 
   24 Nov 2013; Pacho Ramos <pacho@gentoo.org> systemd-208-r2.ebuild:
   amd64 stable, bug #487344
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 15a54b197595..603de6ef2f1d 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -23,13 +23,25 @@ EBUILD systemd-204-r3.ebuild 11783 SHA256 0e6dd86ac27a0e822fc5107565980517c0e5b0
 EBUILD systemd-207-r2.ebuild 10609 SHA256 ad703ece01ce7fd1d4833bedcaa2dfa95e4a525a1a16645011773d2983b0859f SHA512 35cca3a8dfd82958f0d1ea9edb7085d432b7033b330a65e221cd3fa0d3fe3c14bb3917bab70eba6e924aa641295dd6e5263ecc8a823f0a1fe6018f4b0a00286c WHIRLPOOL 989cdf9e69bdbc51b140f6cb8e65db6584ff6d235777dd8d24c85f34b1ef57eaecc47f11db1d5dd32844ee01a08ce0df7b8675763d9cafcc20138b9ef85c7060
 EBUILD systemd-208-r1.ebuild 10244 SHA256 d74518178b4e7c5a9b731e94391c4d62da708985e9573775f6a5425cc729a2e8 SHA512 e3647a98e400378d79104cf2594ff5acb345e89f0b262c5f2367d9bf028ebaf739bff7a50fd52d8b3f66c078cd13293dbc80d53434a900309851125c45142d2b WHIRLPOOL f2a24e52bd1701ebde3d8dab52674f73c19077706c442af04328d871ed493ba98e46ae4ea6d87565d73b6d58831566bd031f34315f5c3b9841f15071c9794bf3
 EBUILD systemd-208-r2.ebuild 10549 SHA256 afbfda5a328e68c553e9b1a93db9e5fbfb742bad96005b7b2d0c36370784e5e0 SHA512 216e75a36f0eab0a1e6a77d327fe0f73d33051a61d9cbb2c555a1b2076fe0a6466a8bee2b88cb4e61763e59eb92197d34e5e230bb4c3cce7669ad833c8742ac6 WHIRLPOOL 4bf2aea73b9de1fa1eb879d875d5f0a2392d63f87292de91d348eb0b8cf2d20e1a1708ce6c1a1c4b7a2f0912e645d777e83373ec837358453783f5b9be885d82
-EBUILD systemd-9999.ebuild 10685 SHA256 d685d7e20234d217110008b37055f25f29e4bf454b13cf1b103d044b966089d2 SHA512 c25fcbf25be7cac8d8efe2d967991ea6d1062f645633548c4935d968671807d63fff85c0ed9efa423fd04dec18798cdce40c8407f0217b924859161ec42b3dc2 WHIRLPOOL 2b57d1dd5db323a90f0636b5c810a19a24bd1d767070c9b80fb8cec659be9c931bcce42a42e6b82360b66a85ffe93d26f387d9eb61f091448c62f3aeabdc349f
-MISC ChangeLog 38341 SHA256 a265f3bc2e2e8f008824b681aeec09369de8213e18923ec2eb72751fd3a2729a SHA512 18ccb695ddcc9cfc3ed5bc6dfee216a4bf629e712b405317084cb896f04b2b76c60c133b8b10190ea79fe200b3c32cc465f3375c454029e1034689d90c4f0c15 WHIRLPOOL 03051afac523cae0b03f3ddacf9629d6f7c9cb673724060b797aac921c32f4a1bb24407907f4fea0192ad7283d41cf7ada9473f0abef58e007d87a85ae11eff3
+EBUILD systemd-9999.ebuild 10879 SHA256 ca95974ce3f22804043df76aac803a5b22f0247ce4ac3cc4c458c2b2e8e77ebd SHA512 3f9c232fc2a58367bfebddcaf336cd06fdfed25b0b0eaa0d65e384e2664bbcdb4f582534f9833f36ebcf60ce7866c7ad1f4ffcabf3eb519ad76642fff8363894 WHIRLPOOL e219865c6e2d1374d4a81d54f2e9bd23418f2ce33950f332343b272d77bb48c808538974cc1bdd5ff35a6e282c8c861bf2e48d53964efa44150090e9ec50bb91
+MISC ChangeLog 38537 SHA256 88d3375f4ec6d5e33a4ec9dc4a386b2ae9c17a5344b5b59a2f230d4d55506ed7 SHA512 0d8e6c9e6a0a54d45172939d9f8bd7e40e1681d728055cca876e7d379cab9fc07a7a04dc151422700730c8711b2e4b8f5a02d86fca2c6e3fd96000e1c79de5b8 WHIRLPOOL 53b2be53a47994534c721740cd4b02651b7a141cc88df2e7da85452c75a3e13addfa277e52664779998a44045a031b6056cd5ac0f86e3d39b81cbcd72e620dfe
 MISC metadata.xml 1108 SHA256 7555f673c5676c2efb2696cf49117e1198134e8c2d575052d817c50bbc4f5f45 SHA512 10b8a0dff66f163dc747e294ead1455fa0b84414eab9aa1950da08f92245eb725d77f04346276a4e727bf0d5b6adc5f6c744b770b1a47dc916ddef7d641affd9 WHIRLPOOL ae3413df80c029c8f84e092568d05e02e3c81695c741319be98ceadddbd680c589e68ec6250a653849eca6d0fe3aace7c2004f54cc2f7a9201b60af524edff28
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKSDj0ACgkQCaWpQKGI+9RtQwCcC0mzw0VgQgPKKkz/Yff+Du62
-uEcAni4JuVeWRhCSFAqJlUcCpCSNvxyz
-=D+fn
+iQJ8BAEBCABmBQJSk6XbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOQOoP/jNp3OrXlSDxbn32qZ+U3JGx
+8ttkrDeT2PsH3ZGNuEJc0Nv7TIvmo2PaBxeSHbmM1wt7m4NFPhb0O8bar6RIUynM
+/A3dPL0NvnqMztkxY2P3i8fQcZgh1rNxg1ZHCDhPKfn9A16x5M5zH1zPwi22XUL2
+R2ZN+evMtrq6ACwJoIYVY2e7BcT3LVltI1KrtxKEj93YDYvHFJk76W+2oMoj96if
+ODKf2AFWMyGlcoPa4klOaULfG6/AymxOyvtx2og5UfbmW91SZC1QmAauuKtZURrj
+25AlqzxFC2bDDXPGmVL73YAd5vPTmA1Nb6lVDL5OrOB2knOSpRZVUnvyYgfHyxoe
+N0+eU2C96rpZZtn1HoII1ogq/gz44Vk9lMk4sb/i2IC5nD1YSe1QnFbvuFcEFH95
+36gzoXUZPBhZx6ztq5JM/Oy/UoJq+z4JXuELdfcdcqLwCW+oLRiIQoYOsmVu2k1m
+NPFSnb+DCnS/oTF/FhE7lDU9PJNQqLZT+fU49qV+4s3H31275CvGYdC48VXC/4hc
+A3E2DYVvFnXemE+Tp5bG55mIcqbOBOvTt8N9XdoXpBuMKLAmX+rgLsWEfolLtva5
+6cEFJ6JqLUNa3a99J8539BHHyxbpSLv1ul7EXTKnXJnNRsKbg/ScDuGvYA6vjKZ2
+Q/6E5qI4rOWBFNmxEO+0
+=BP5E
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 77165dc5ea78..1cf008f1ebed 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.72 2013/11/16 13:40:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.73 2013/11/25 19:32:38 mgorny Exp $
 
 EAPI=5
 
@@ -31,8 +31,7 @@ IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection
 
 MINKV="3.0"
 
-COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1:0=
-	>=sys-apps/util-linux-2.20:0=
+COMMON_DEPEND=">=sys-apps/util-linux-2.20:0=
 	sys-libs/libcap:0=
 	acl? ( sys-apps/acl:0= )
 	audit? ( >=sys-process/audit-2:0= )
@@ -64,7 +63,9 @@ RDEPEND="${COMMON_DEPEND}
 	!<sys-libs/glibc-2.10
 	!sys-fs/udev"
 
-PDEPEND=">=sys-apps/hwids-20130717-r1[udev]
+# sys-apps/daemon: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.6.8-r1:0
+	>=sys-apps/hwids-20130717-r1[udev]
 	policykit? ( sys-auth/polkit )
 	!vanilla? ( sys-apps/gentoo-systemd-integration )"
 
@@ -79,7 +80,8 @@ DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gcc-4.6
 	>=sys-kernel/linux-headers-${MINKV}
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.18 )"
+	doc? ( >=dev-util/gtk-doc-1.18 )
+	test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
 
 #if LIVE
 DEPEND="${DEPEND}
@@ -233,6 +235,8 @@ multilib_src_compile() {
 		# prerequisites for gudev
 		use gudev && emake src/gudev/gudev{enumtypes,marshal}.{c,h}
 
+		echo 'gentoo: $(BUILT_SOURCES)' | \
+		emake "${mymakeopts[@]}" -f Makefile -f - gentoo
 		echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \
 		emake "${mymakeopts[@]}" -f Makefile -f - gentoo
 	fi