Remove systemd-daemon targets. Allow parallel building again.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 22 insertions, 33 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 10d9156e7ce1..2174e453082d 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,12 +1,14 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.822 2013/02/08 11:55:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.823 2013/02/08 12:28:41 ssuominen Exp $
 
   08 Feb 2013; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
-  Update live ebuild to use new --root switch from git for hwdb --update.
-  Remove target systemd-install-hook (and udev-confdirs) to match current git.
-  This will mean content of /usr/lib/systemd/system/sysinit.target.wants/ is
-  not installed with udev anymore.
+  Remove multiple targets that installed systemd files since libudev and
+  libgudev doesn't link against libsystemd-daemon anymore. Unfortunately
+  this will mean content of /usr/lib/systemd/system/sysinit.target.wants/
+  went away because the new target install-target-wants-hook would install
+  too much of unrelated systemd files.
+  Use --root switch for udevadm hwdb --update.
 
 *udev-197-r8 (07 Feb 2013)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index db6ee540f009..885669f8f528 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -17,18 +17,18 @@ EBUILD udev-197-r4.ebuild 14461 SHA256 f20825f4ff3bdd184372facfba03c690ed6a7c874
 EBUILD udev-197-r6.ebuild 14957 SHA256 9bafd7485f02708c425ef8d54300641a05224934dc1db384e919d041930b2957 SHA512 c05d33fd584d6f4e561ac5073d1cff3be7ba8a5a81aa3ead2ee8ada0f290e5ed4c20f1a76d8b80a5431842b376685437bf8989ad2a8f4f9f5e9349f4213a6ea1 WHIRLPOOL 474b4f185deb816e24a7e20a9814033cd66b381c408213ee2dc00b93648a262815bee9b8bdb09ed0d003ed07b5d5185a5716980ee133a05d9462ed841b160a2f
 EBUILD udev-197-r7.ebuild 14974 SHA256 180599cd8ae4e1b551de927f84d27092066fd90c9fba8487246d6f9b09b05a13 SHA512 e26c765c94180385cc0a3e34a92423b1de4ea2fe6ab1bb2af2242250f764a503348baefa3b1e8a56c6dafeb71a7cc27502b7073d31c45c5b384bfda5a676b140 WHIRLPOOL 7af977c7842087a26d87543759fc0bb4452ba810064a4600f92ad64aec03482aeecd729bc20403c6bee0ea4721922878c2ab0c6b3c674990553650913b1082d8
 EBUILD udev-197-r8.ebuild 14994 SHA256 117bc623e3ed97822ce55c319f443022165fd4628f844bb063d8e18aa80a15be SHA512 32f6640f5da6b9fd2e1bbc426db57b355c1b25be5bc2c892f07483cb6c9e69925ace980d601c1e5b93cb0dc7c41110117206ab134d5c0dd54fc5b7ed640ccac4 WHIRLPOOL 359cfceb8e5495bd4619e4ebfd019e9ae4ce6fa7b6f2aa59a4f1d553c65e3d95e5e7c31944135ebd6fe7eae050923e184ad13ebb6af146aa68242be665219ec3
-EBUILD udev-9999.ebuild 14954 SHA256 e3c2a51248eb27cf0f183acc148498f43efa5ca123cd9b7cc59f90e0736538f0 SHA512 2e71807703887da36b4f25b98ecfc730d158aed439abacd5c0664d8a805accd11fb0806161a66670e14c4f872a274cf4ab2319bd2ab82ad6cebd110a77242461 WHIRLPOOL 4d31616d49f2f93a3106f057dea1dd9bb5846d8fbb9dc77e2985cb0372d98cd568c1c571830bac904fe31b51c5bb251f0b504d3eba11b8c918e7fbc315a84330
-MISC ChangeLog 57155 SHA256 e973e03f15bd52eb83053172c6e3802e1a9feb24c85401ae4b0efa7776175181 SHA512 0a4121440c9cec5728797d02f4a89708dfffa9fa66f6e5fa31e4db7d8cfbc9154be78ab50cd07ffd375be0ce7c209b41cde1f2ff161fbe3a0510b9138b78db6e WHIRLPOOL c20272a398f095a950af265bb4f65f199b2220c2c5e2c4cfd1e188a80cfa4b762c9beb453dec1fee73f4931b87e51a8ee848da07ce4ec745641dae7252263270
+EBUILD udev-9999.ebuild 14319 SHA256 3910718a4f0ef8d85740a8f6813dde65737b9f971415e967f8069ed544ca7ec9 SHA512 0d0d9c9ca39f7ae176221d5879b66bd99727591769a1dcbc0085f689747cb30bd68b0fb66498c712de25fe7b5bdf498c976ec3aff8981cb81ce10a98f86678c9 WHIRLPOOL 50ecf25837f9558dd84cac91c47400b42e58f0d7d8d99f390a0c2611c552e763d829206f61fa5365d0dbc755789640bfb38c650b840bbf9aa7f3236491dd4c51
+MISC ChangeLog 57271 SHA256 59572122f374242f1c30f51eba50517e4c7eaf354256693458e5233bcdbfafff SHA512 d28771727f5ef10a4b83c24490a6898de0d0a013cf78de581d9393236fb53972974b56e4bc61887c9abdd53b8515214f59cc17e1632f83880179bd683f4c85bc WHIRLPOOL a9ae84283bc329dc54e618d090299bb06380aca8c8b4fc23defe08121b0e89beaec8976aba96252630181400b5e3dfc3808f6faea50575ca831fd5a981fc7a6a
 MISC ChangeLog-2009 105929 SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c SHA512 3b577c97224e7f85ae5fb0a0ead538f8aa83c738e6014fadaf5247f34d3863df4bc10f9d15a5e117813d081a8af1913ea41a5e60d00ed521ea0c1e5b71a91a2b WHIRLPOOL c9f527ba19e787f9973a26ed535dbf7af760c3a519f4b062cf2a8069e134a803ebe669450deace804be70619995b389529febf03e8aeb7183c3ea984c0dfdaa5
 MISC metadata.xml 1098 SHA256 69d8c28e0c2439c252068ae2e0141a9bad7b05e65b9dec27aa2dd3feb4f2393c SHA512 87354f467c3f2ed005a10652a2f80ffda010fbc0c6fb88436b906c92f4cf1543ed1a6cf4a49c93f15c6fea3ba0dcd108e1e120954f7b0860e7ac90072d2b3d67 WHIRLPOOL 9c01df67041d2093e5a2ee4a9ad65df613cdcb163bc366c8592e8e2be84b176da13198261a012687188918c906291d765856665806efe03b8dfb22a5b4eb6834
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRFOeSAAoJEEdUh39IaPFNo7kH/3AtcZRhUTKlURDQLsINthTU
-buQHLseko09EHXFgFn9mHZ9bO6XNtoI22yq2P3cR2Ld6aUYCFcWPZ5HTjUkEU3qv
-CiFJMJjDyLjvRWareL3QZBlxd/t4fNm/RoXIyApOotfPtKQI6yl37OANHq8kHhcL
-P5WQS9iLJcnPCvr6ruItV15EjYykR9vZquQgFUZHubz7SvHTR9dNEWc6mNFE2fsN
-DRxFAG+ZSZgr8NxYA01EJqpLIDhOD7jfuMafaArVgbZvxRqc6Sr8Mvb+nHzKsjiw
-ykexUHxTzIB5ATQCNO0joKb0M/1x/1eiYAg/Ad/KazRuSSCv/Dh7IXKIh2NAMQg=
-=iNHS
+iQEcBAEBCAAGBQJRFO9HAAoJEEdUh39IaPFNtSUIAJ2dKwVIisKsJswwVZZfUmWa
+oJOPSK+vp8DWmpcR0V5Ey+iPpiJE9kze5RArlfipN2lv4p7aSIxSS+2EfY6aiWJv
+qfk7WpjeQz1Wpn6KfdG3ZLKkpWYskk8qAJVLHF1YHUmmfConxA4anLU2XyCDB1Tq
+uQqqbnMdSwPpPxefvFy/min1mtxzCW2Kse9Z82+37PjQ29TPp1VsIE7rfjXqgyuq
+L80aoaXeFsmicBBnNeAODJyIsJe1TT3SOWafBdAV/6A6t13AWRCoZGuwH8Jay9Rv
+awDfB+zHL7R1qLqIVMzNXGuHrU0b1MdC/zKhTiNea0j+872ehKw75uY27CCxZqM=
+=U0cQ
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 47471512341a..d37bcde5a6a6 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-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-fs/udev/udev-9999.ebuild,v 1.173 2013/02/08 11:55:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.174 2013/02/08 12:28:41 ssuominen Exp $
 
 EAPI=4
 
@@ -251,7 +251,6 @@ src_compile()
 		systemd-udevd
 		udevadm
 		libudev.la
-		libsystemd-daemon.la
 		ata_id
 		cdrom_id
 		collect
@@ -259,10 +258,6 @@ src_compile()
 		v4l_id
 		accelerometer
 		mtd_probe
-		man/sd_is_fifo.3
-		man/sd_notify.3
-		man/sd_listen_fds.3
-		man/sd-daemon.3
 		man/udev.7
 		man/udevadm.8
 		man/systemd-udevd.8
@@ -281,8 +276,8 @@ src_compile()
 
 src_install()
 {
-	local lib_LTLIBRARIES="libsystemd-daemon.la libudev.la" \
-		pkgconfiglib_DATA="src/libsystemd-daemon/libsystemd-daemon.pc src/libudev/libudev.pc"
+	local lib_LTLIBRARIES="libudev.la" \
+		pkgconfiglib_DATA="src/libudev/libudev.pc"
 
 	local targets=(
 		install-libLTLIBRARIES
@@ -307,8 +302,6 @@ src_install()
 		install-typelibsDATA
 		install-dist_docDATA
 		libudev-install-hook
-		libsystemd-daemon-install-hook
-		install-pkgincludeHEADERS
 	)
 
 	if use gudev
@@ -322,14 +315,9 @@ src_install()
 		rootlibexec_PROGRAMS=systemd-udevd
 		bin_PROGRAMS=udevadm
 		lib_LTLIBRARIES="${lib_LTLIBRARIES}"
-		MANPAGES="man/sd-daemon.3 man/sd_notify.3 man/sd_listen_fds.3 \
-				man/sd_is_fifo.3 man/sd_booted.3 man/udev.7 man/udevadm.8 \
+		MANPAGES="man/udev.7 man/udevadm.8 \
 				man/systemd-udevd.service.8"
-		MANPAGES_ALIAS="man/sd_is_socket.3 man/sd_is_socket_unix.3 \
-				man/sd_is_socket_inet.3 man/sd_is_mq.3 man/sd_notifyf.3 \
-				man/SD_LISTEN_FDS_START.3 man/SD_EMERG.3 man/SD_ALERT.3 \
-				man/SD_CRIT.3 man/SD_ERR.3 man/SD_WARNING.3 man/SD_NOTICE.3 \
-				man/SD_INFO.3 man/SD_DEBUG.3 man/systemd-udevd.8"
+		MANPAGES_ALIAS="man/systemd-udevd.8"
 		dist_systemunit_DATA="units/systemd-udevd-control.socket \
 				units/systemd-udevd-kernel.socket"
 		nodist_systemunit_DATA="units/systemd-udevd.service \
@@ -337,9 +325,8 @@ src_install()
 				units/systemd-udev-settle.service"
 		pkgconfiglib_DATA="${pkgconfiglib_DATA}"
 		systemunitdir="$(systemd_get_unitdir)"
-		pkginclude_HEADERS="src/systemd/sd-daemon.h"
 	)
-	emake -j1 DESTDIR="${D}" "${targets[@]}"
+	emake DESTDIR="${D}" "${targets[@]}"
 	if use doc
 	then
 		emake -C docs/libudev DESTDIR="${D}" install