Fix installing compat pkg-config files for multilib.

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

4 files changed, 34 insertions, 30 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 4e45bf4889c4..b6abfc1865a3 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.228 2014/02/25 15:07:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.229 2014/02/25 18:03:00 mgorny Exp $
+
+  25 Feb 2014; Michał Górny <mgorny@gentoo.org> systemd-210.ebuild,
+  systemd-9999.ebuild:
+  Fix installing compat pkg-config files for multilib.
 
 *systemd-210 (25 Feb 2014)
 
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index cd2218539a53..a82b8fe73944 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -19,26 +19,26 @@ DIST systemd-gentoo-patchset-208_p19.tar.bz2 7351 SHA256 3fce1d7ff628b0f49d4bf45
 EBUILD systemd-204-r1.ebuild 10452 SHA256 3454b43f0e7d1676bbde2b0e8d46d6a35b0a690de6a6a95854be9cc695cb042b SHA512 26fbb8ccc54e6af15b35ece361c2dd31279782563d977240f977997ea0adf72d9557d54dc0302be3107493c8471345a976061c2e26279b88d0d602e9c45c4610 WHIRLPOOL 8398bde7b79315cd2a3eaecdaa80a66ec3693930674078aa9bff16c032a811f3d489fc996d9e213035e3cd14dffb6da0abb493bac4d6c5467fe80c172a74ffdd
 EBUILD systemd-208-r2.ebuild 11085 SHA256 b79d55c36fb612896ec478397a56a451d387ad692060dc5191190a3d3148fbc4 SHA512 a1738d6c6084f78cd13981cf9d037d1e1a9e5cca3e1219a3cbcaceb8578b0b58fb16b0783fb736abe8131d74d8c6906cbf57fc55e22f6b60b90f496cdc51c46d WHIRLPOOL 4096dcacd0f568544eb9a942d4cbfd41eb269d2b5ea9eeeef0f724d5acad98068be8370d89e54f805ebf57a35f80e6b68d0335139c747076664e266165bc8f84
 EBUILD systemd-208-r3.ebuild 11106 SHA256 890d93bbeb6b754cab811d2aa1a67226261ba90abd15a5718fc2cd6527f38ea4 SHA512 96cb00604ec8b2159c1d0a8a516f385fffadaa5a7d86e7d5347a4c85c7e1ff95618d0ecdc4605550a1a626435a6b96f5117fc3f7a818ff5d8c634f581aa7833c WHIRLPOOL c2351970df378fe96551671e1a2af64bc9091b36a2a08b335938936b6eefd7bd6a02eb0998e8f625a19ee327037dc2ae90740aa85ef6adc1a00b7a1e1e5ff828
-EBUILD systemd-210.ebuild 11751 SHA256 9df271fc472f94fb628fde65f17350fc33a566205b5d6a392af0d34c63501922 SHA512 ff418455f630166fb8b90d5b576877aa65b332d3dfbd2d3137715e803e372327200121eeed18af80d85006776f256cecf3194ff440b11490243663656c2d1433 WHIRLPOOL c3c9555d428059ecfa2574de790431cef36268b20b96f14af688519678fba2b3538d9e4f221e148e5e4d28afe8e50df4647b6bd67926a6d2ae88347778341997
-EBUILD systemd-9999.ebuild 12143 SHA256 f1e862254224a3fd007b87e3389786627ae0e83a4503a154d14fff174256e0bf SHA512 50a01669f3ae522e8c68f7ad162080c3b738859fa8386f8e446ddcb090e8c72cdea09bbfa2f2e1f49d1bdc21c2232957e84917f4fc200dca79d690f7c4924073 WHIRLPOOL 0fae06f3abec1216f910208b3af9e070237bc3f2687a377cd9e01302503b37ca9a2bb1f1b38591d9460f13cf1292d31a578e830d715ad0d414fe9d69ec7837b9
-MISC ChangeLog 42452 SHA256 28bdedb7ea1cbe078af3f7221d17f3a9453d69ba7ef7a92cf0e85322149e62be SHA512 28ebf11fe3f29bdd3874f3db320bacf691b94e9a494ef94e9b44329e51f3419f3591ae880153b0fdf0e3ee6e142d16d4fb967c40e1533b06c1b8679aad4bc545 WHIRLPOOL 5128dcee452e8e4db837d9227072f86f876ce9405d644985743069d302b49de1b35213a093b4756956a14abf3f6e2f05705b504c00df581ac4f15c6a4f523674
+EBUILD systemd-210.ebuild 11747 SHA256 dec42872275a786b3f8dd4aaade46e3fe2478b68af7803c245d15e4812bacebe SHA512 f881339f53dabf95dd3973ecf18014be14bfc88113f2bc0d3e9ec9ece6be0495ecc8625af535deafcbef9d3d473a2cf9ff9ab9ba9f042c9db6934bb3d1e619e1 WHIRLPOOL 3c96d42907c2cbcc123ffd09060d2227bff00ca70bed5663415a132c00b55c7edb05bb8122a80f512ca11f4d14464dbd996e53352a4ec4a41d86abb0a4c68e7d
+EBUILD systemd-9999.ebuild 12139 SHA256 f13c51ba0b922e0c9fad9fa24aa24768c00f88ee755820a7b4150e6a78cf97d4 SHA512 ed928ab4809362d9a3b11bac2db36866c4149de3e9225241c3b97a992d91b1360f4e9e7e7984672ac9e3648545ac8b2959bd30bbd2e31bb2351b8272a324218a WHIRLPOOL f75e0612a9add3cf18d75768e779abeffe7cefb18ce0508d45b8588e46ecf99a0567de9ae0af3f97ef1f89be95e0687f6acebf6fa5a38ed7fa491bddbb22ce62
+MISC ChangeLog 42601 SHA256 56d9ccc45fb77203b5ba38196b687f8845ace6784fa86db80f64758d750c3661 SHA512 3b8dee999d8e418d91008de1b66cddd3f0b99d57ff15447ac4d0b0d31544c35478687f1db9cac676c7f04b546259804cf51482ea4dc977b8a095f7f5446579d0 WHIRLPOOL 4e7e19650af64387840fb2a8dc164f4814f16ab396ed31edd2fea06ba269488202c21011ae4d09f656f52335f7e00c3555c52375458452987478353f7575e575
 MISC metadata.xml 1277 SHA256 9fd7887738589446a3c9c289d593d68e602beb06b34f7b98ff1bbb84aeb7b653 SHA512 70cf0143e3e88e2eccc5475730530e732639cee660fff5ba8572eb497c3da69433878b2ded50e0bb2f027e287d73d9dfca08dcc9a38df7da02e8427c08ed904a WHIRLPOOL 7e18b6437f6081fd1640e2977d1657ca5db0acecb0f9e606ad8cd8c3280ba467596cce13cf1cf24d4e34545424252cf6ee5f13030f111dd0334fd6b1f999a83e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTDLGpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTDNrXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOP8oQAJ9H1qNlmQ0jgbtId/cO5alk
-13J02Mo1a9oLzw5Xp3+1C+1JFYWcFfwFHOrdqysJ9FzcqDH4WxFto23LFJnxJhZr
-UO5HutJB3Qzl05Fm5PIkxs755qmwZ6WjWFGDwIF4Fc3FoqkJiz5vtXP3x020VqfG
-0pe8Y9ZToZJouwW26xS3rlHzbSeuVf4RgIUCqWsinbIJmiO6iCMbE2anKTN0+ztZ
-OR7hANESO1qSUJcx9D7ROKe0mZVOtpFyHKRMpR5QycjRvL1/A8nJNCm9VP4yLmON
-rrnicA2rCr7XCiNQ8U30O0Qtqe7G6lbGsZMfC2xHXYNqT29hMqmE43iszp4yo5wH
-yZSOCGJcRS4MTl1K6FieUiOlw/xRAaLe3DGUcVgjkq22S9Hwp22Somg3eCfl3BAR
-VI8qrkwVMi75xdlx0dAmrOGcIoUWs4mnA+XHFLk6vP6kFjgUSqGbeRKDw3Xywrb0
-p1rVx5MB0E4O6Yi3kxqPvgd0WQL4PZ0U2Umnh2xTguudtYgrxCsfk7lIcjyTPCtU
-4Ueoimy99/RBw8Sqd3x6dZAed8aVkFjbWJ9IbM5SKyj8gCIYmd2Am2W9asBW9RI3
-D00S38i4HNjKS4g3QpvTe0P9EaAXCBRszo9PdkRI0Bqyk8p6BEPppVPcI4xQb2bI
-TgV7+JuONND9O6odM+Qh
-=/f1d
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOilAQAKu6nSiHnqudPcDZZRaZCfIG
+Xrb1RqTVFkYZlbZlMsP/+DzMvyHfQpCwfyu/Pm7PrudQUH494DT5mlVqElxRpPjR
+Mr8VtyZIbm+oIAhuPcIxLb7Vw01QweoG0JAXHu2TRcvBYuN+J1GYjWDGcgkTNscC
+qZq8vKw21fVS8rGB1zx05On3efXwNTES+iy/Q1mv2tyTpiMifPqSjuzGOTSl2dPr
+DrG4RwBdLyYxh9NCz1xkIYb7HrlnRqYpGpWFoe1nRkp7l7FqOP6nViTrc4eV4FZO
+CcwIRlzgox6PJjDc7dt4XkzqEoF2EcyKePr75/++CUgKzzjMjuCAO3YsShJA+kVf
+sv+LcIwXFW8w0h7ZR0MCfSl68PTTFelaAb16pn3gyaxGArm7Ao2tJq5iE2MkeMfB
+RUixgikmO/+ml7i3F9kxfVgt8JmInVrpCLvzSE29yo3mHWx+qs012W/Gxo34+w1C
+l7G4d4E/F5djgUYFmMLw28DzRjZWGNYtydtHZFFKsuKXUmCGlmHR0t6Lv6hcZJBM
+N8mh+1gNVztuA9AFkVZJXNeVR7fwmUJkHPyRKgOyWKePDPx1AWDS9m5FWc1ts2x8
+645iNiNSFk5rmdgUTSiK9fGYjxs88Vf3jSOAhSCd9uKkB9cI2Ew52dYmoil+4HMg
+qpUuo3agNIGboWHgdK+n
+=5nD/
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-210.ebuild b/sys-apps/systemd/systemd-210.ebuild
index 4414cc9a0dae..9b36f5992fae 100644
--- a/sys-apps/systemd/systemd-210.ebuild
+++ b/sys-apps/systemd/systemd-210.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-210.ebuild,v 1.1 2014/02/25 15:07:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-210.ebuild,v 1.2 2014/02/25 18:03:00 mgorny Exp $
 
 EAPI=5
 
@@ -271,11 +271,6 @@ multilib_src_install() {
 		# Even with --enable-networkd, it's not right to have this running by default
 		# when it's unconfigured.
 		rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
-
-		# install compat pkg-config files
-		local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc )
-		emake "${mymakeopts[@]}" install-pkgconfiglibDATA \
-			pkgconfiglib_DATA="${pcfiles[*]}"
 	else
 		mymakeopts+=(
 			install-libLTLIBRARIES
@@ -288,6 +283,11 @@ multilib_src_install() {
 
 		emake "${mymakeopts[@]}"
 	fi
+
+	# install compat pkg-config files
+	local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc )
+	emake "${mymakeopts[@]}" install-pkgconfiglibDATA \
+		pkgconfiglib_DATA="${pcfiles[*]}"
 }
 
 multilib_src_install_all() {
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 674242e4962d..210eca4dedba 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.93 2014/02/25 15:07:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.94 2014/02/25 18:03:00 mgorny Exp $
 
 EAPI=5
 
@@ -292,11 +292,6 @@ multilib_src_install() {
 		# Even with --enable-networkd, it's not right to have this running by default
 		# when it's unconfigured.
 		rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
-
-		# install compat pkg-config files
-		local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc )
-		emake "${mymakeopts[@]}" install-pkgconfiglibDATA \
-			pkgconfiglib_DATA="${pcfiles[*]}"
 	else
 		mymakeopts+=(
 			install-libLTLIBRARIES
@@ -309,6 +304,11 @@ multilib_src_install() {
 
 		emake "${mymakeopts[@]}"
 	fi
+
+	# install compat pkg-config files
+	local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc )
+	emake "${mymakeopts[@]}" install-pkgconfiglibDATA \
+		pkgconfiglib_DATA="${pcfiles[*]}"
 }
 
 multilib_src_install_all() {