Move symlinking udevadm and renaming of udevd from multilib_src_install_all() to multilib_src_install() inside the if and else for multilib_is_native_abi.

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

4 files changed, 34 insertions, 29 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index d30b0b78ef2b..36d198b47e5f 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,11 @@
 # 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.953 2013/08/11 17:47:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.954 2013/08/11 18:29:21 ssuominen Exp $
+
+  11 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> udev-206-r3.ebuild,
+  udev-9999.ebuild:
+  Move symlinking udevadm and renaming of udevd from multilib_src_install_all()
+  to multilib_src_install() inside the if and else for multilib_is_native_abi.
 
   11 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> udev-206-r3.ebuild,
   udev-9999.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index c97e38893220..be32f5efe5c5 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -6,9 +6,9 @@ DIST systemd-206.tar.xz 2340536 SHA256 4c993de071118ea1df7ffc4be26ef0b0d78354ef1
 DIST udev-204-patches-2.tar.xz 1824 SHA256 d693c79b93865dd4f3092f5f9e69221a494d286f15dcc5418de1e09120289404 SHA512 e5004a8bdaca6ead9bd5f345ff86c94b05579cb3aaa032782dc13e1a1d574ef65e294c01b44143f78517db6f64fb630470c082f43b6989134a8e68f48d444e6a WHIRLPOOL ba21f3d8f4964da79476102eb82c1b5ffd7e91b5d60be705cb9784fc2150dba3faf4afe7718e2f9dfc5cc7e79644bf21b8312fec328a733e056eb60dc0269222
 DIST udev-206-patches-2.tar.xz 1840 SHA256 02643ba4a3c4c5312a2f4c22e06925509d923955046de260468d696d1b9a5672 SHA512 cd316356d1b23ed3c3047d7129cda6ed26bb0334c4becc802b727edf40e026fb5ae228075eb7143b3071887ce1dd493326d6b071058c5f862372b616cc731fc1 WHIRLPOOL 0685afcd08ace9f67d143b275dc724d540a2c2204b6f52cf60ad2195f5dbd665b20775ed40f70816d9ccdb2bf354f60e026ef4e781cf9dcccd93ff29121a6cb1
 EBUILD udev-204.ebuild 13475 SHA256 5604664100abcd19d5e849e4b2ea4501706b38fa8da18389a6f147c419593661 SHA512 dc53345e87d722594a3182b2dc991938f03d89d8ab703134334a36f53340dba2112536153cd9c5ffc56ba7d57dc0e11e0afaab40c97d48700186cf5748ef635a WHIRLPOOL 0e50da3273399f8d8e5b6ddab71eca233d0993dcfa7928c90aba2644c96340a1045bfa8208f4006965c1dc466316eb90a946bd4157e71eaadc6c032180771d25
-EBUILD udev-206-r3.ebuild 15284 SHA256 98f1d0f825a685b610a6d527364032ea9de7b3270396e3155b1f5ee0ba1f594e SHA512 35838bd4e344890844df085f846b1adbe7677f96a1ff7e715aace1a1c5f40420ebdd53e19248654211b2f13da35bde46c0615cbabe3649ba956618a55511be59 WHIRLPOOL 3a5b925e75f384c40604271f64f4f60ed41da443b37c09b0c35463261f459c46863f2b6853e0df12d16e3ea8217da7a609140e2c0192f09ce5da4d06039da0f6
-EBUILD udev-9999.ebuild 15283 SHA256 d906fff1c88524e6211f60482c7940073e57da435c437367dae4bec7ab77ccf9 SHA512 8bc292fe1120cd8233acc4c9bdac1e78490bb5f9b2d371234be991791f34fe9f99ee49a0d3ae8c87432a477715231449c8769d9f5a6a5a31d1e0e24015449888 WHIRLPOOL 811e316b0ce492f11bd627631dd617f47690ae629e215bd711fb8ed770e8eb49e0c683a6096eec10df6169c97f58554678b76047c490f233b397aba507d740fa
-MISC ChangeLog 33376 SHA256 799c449ea2f66baf240bbe1f8e1c57085f9fd7a9912f7767d1729ef0f7dde684 SHA512 1ed76cc80f0ef57a1aa8caa944a54dc674c4e7205a9b43941bba16a863e638eae02b25df482c97f0b84cd31b08ca3609953ac1324d91ea9e44046b904f9b21fe WHIRLPOOL 1c2f0caa95fe9b5f0f35cb566e6af0bbfe6b6474b08500c29150592aad2181ce87d44767b7bf1df57ff40d0930f4f6fd812c313d26dc875a689d78feee09bbd6
+EBUILD udev-206-r3.ebuild 15290 SHA256 c2ead2ec93c30e1e3ad54348b407c2a6fb2236f6a06d0ddd064b8db1c5b62d21 SHA512 a7320dd62feb4c469c71a22b727a989d3b54159e440f416adb2dad7e1d1f54b8a2d82290bff52b9ec1abffec0c43fb3f289b763b01c1044d1af4d9cb05b8d7df WHIRLPOOL e67febbe35e8ec4977c69d38611095d3cf99c1d36f5447dbee31a3337e791237af589c75bffc5e09128c8f92ca12c61787242d06be2876d94a9cff146a8c3dab
+EBUILD udev-9999.ebuild 15289 SHA256 8d81b9625d2b15155696eb189bb1adc05854efbc7666287651d4aef81155e00f SHA512 2df3492f713bc047e3bdb1966e02cda54eae955b5b0de6698f4d655d3c5c51041f69d2de46109b47404bee2cdc3670ee3c33aba749db1c0412f607661c1535cb WHIRLPOOL b5b182529680ae89780ac360ae6874e45cc6e34db8dc46ad3681b875967028a910a5f11603d603968de25d63b70e2c4929f25bedc9bd72defd6b92c589a3ee4a
+MISC ChangeLog 33630 SHA256 f0ae04f11a5152fafdbb37792ba641a0c7039293efe9ea3bff49063d444add6d SHA512 033c5c2e5567a1ebf7c22af9c2a0947003b9deaf7bd88c46430b14f5087a32a43ce16e34920db7c15ea3bf57a33ca97654582166ed768a8367ccee86498f468e WHIRLPOOL 172c63977a2e53c7935b5f5f2f903d333a5ac108e6cba391504f2ade55e8b3e74fd6075088a287a7a9b9d02221b63a07d433fd624955c34055a03a33e6ae4a5a
 MISC ChangeLog-2009 105929 SHA256 94137298457e8d6361cf25e664279d2f9b424f6758814e7ba90e9e2cbf1ea7e5 SHA512 f110e1aa70b11c28263ec5e88973c99426717bce62400c8e9ad860b9e7b67d4aadc053596a9e54faa9435a774c1e8aa0954ae8541760cf061beef26867871548 WHIRLPOOL 215252c0a5c249241813d1bb208da62e68c858e07d1df327cf9175ac739f214813a33c09a64afb4821445e93394dd6d6d500b33e35ed912c1eeccff3365cb7fb
 MISC ChangeLog-2010 10729 SHA256 44fe328d57b1ba342b328c7a256632e7960976a12e8e9c9791a5fc8ce52c67ca SHA512 a8c371aafe757923e24c023cbf55f3ad084f15f0f038eceaee0dffe58919a17b17bc16cb4b7b1d3f65a19c82b20330a854ec2c801f6d7c7799723ab92d255b49 WHIRLPOOL 3d34e758def921d3d2ed7369392ba5f833fc3a899181c2895fd3da6c9846cf41c9eddbf56de60a52fadd76ffd4c66d92b660b0bc6ca4dddbb2fa49fe0f93cb0b
 MISC ChangeLog-2011 11721 SHA256 363429a267f251b1ac1c34479e7afa5d7ea13811aa1ba46d7c5489860e542276 SHA512 be7bbaa68602c30ba9cb3e5037ee91ff94c35a0c2ff0b96c5eee14c0e81f8e52232bae44f1d01ff23acedabdb03fdc78f3d11a40cfed2cfef1c45fe2492f7bf4 WHIRLPOOL 3e85eb967f26a8224fd0ed5824009c62271fa5269a6a207da8c8abd7b09cc4308ff847021afcae5a86cedd723a5aeca1ce2f6712a187dfbd36118e097d74510f
@@ -17,11 +17,11 @@ MISC metadata.xml 804 SHA256 2489d91db9d09f0d411b17dff6c8a595fb48ca65e8b6abcbdf9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSB83FAAoJEEdUh39IaPFNc+oH/jBjAKzhuxiOCu0EJV+v519u
-vc8PFg3AvL6ddo7oToWlhJr66YoNmh8lVkT6jmgcTpRKenRyNAsDU4oyEN8peMqe
-xsULq1lw40oTVilRczNNMC2ZpIwJwA+h/4Z12EPlFvTjQ40cK/vBuuZ0O5nOucoj
-2YL6Il3ykRb0o/h+sGxdNT2W9pKpencNtQZ8VqJbUei3CYDjw++PE0Dr0FD4bb2G
-+cCA70PrH3BkCoFMjazLsqcKzmJrd7niiWBOV/YqqdQsHhGWsKrU+DpNeoTbow/P
-Z2syZpYVVIEnNrLpy2ZVh3YGpaXgauLa8rbNys9XSKUFz6RxB5x/vUNSPoRR9Dg=
-=8ujn
+iQEcBAEBCAAGBQJSB9d+AAoJEEdUh39IaPFNklEIAIRpv6O/jxAWI4BCKLp1gpay
+LLX2W+PBZB93sejj5A9lIfWwNiwp1y33WKEx8hF2arhqbeCVD5MjPViiQFQL46nQ
+ji2/agCdmsmzvl14+OdVjmV3TSu/v73NNw2PlxthxgyBER3AIhA5NRw8uz+uKlAQ
+mWqZXOUg1H1662BRff92tasKPVpf8vQs4cfiL9Ep14BiWbNYrMQwDNswVrtPdSse
+3Qk+7ZfBFNajY3TeZlglc0mUzMC0hjHBgv1uYwwbbMctUmM2Dt3A433D6QETDo09
+0HskCDXSfrlugMqXqAlvtKFTplhEfrniBFS2y3icSADCvagVwoqtK0RGhfjCNcY=
+=BJKi
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-206-r3.ebuild b/sys-fs/udev/udev-206-r3.ebuild
index d0ba506eacee..f4262da15f1c 100644
--- a/sys-fs/udev/udev-206-r3.ebuild
+++ b/sys-fs/udev/udev-206-r3.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-206-r3.ebuild,v 1.2 2013/08/11 17:47:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-206-r3.ebuild,v 1.3 2013/08/11 18:29:21 ssuominen Exp $
 
 EAPI=5
 
@@ -359,6 +359,14 @@ multilib_src_install() {
 			emake -C docs/libudev DESTDIR="${D}" install
 			use gudev && emake -C docs/gudev DESTDIR="${D}" install
 		fi
+
+		# install udevadm compatibility symlink
+		dosym {../bin,sbin}/udevadm
+
+		# install udevd to /sbin and remove empty and redudant directory
+		# /lib/systemd because systemd is installed to /usr wrt #462750
+		mv "${D}"/{lib/systemd/systemd-,sbin/}udevd || die
+		rm -r "${D}"/lib/systemd
 	else
 		local lib_LTLIBRARIES="libudev.la" \
 			pkgconfiglib_DATA="src/libudev/libudev.pc" \
@@ -391,14 +399,6 @@ multilib_src_install_all() {
 	insinto /lib/udev/rules.d
 	doins "${T}"/40-gentoo.rules
 	doman "${T}"/{systemd-,}udevd.8
-
-	# install udevadm compatibility symlink
-	dosym {../bin,sbin}/udevadm
-
-	# install udevd to /sbin and remove empty and redudant directory
-	# /lib/systemd because systemd is installed to /usr wrt #462750
-	mv "${D}"/{lib/systemd/systemd-,sbin/}udevd || die
-	rm -r "${D}"/lib/systemd
 }
 
 pkg_preinst() {
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 65e0ea25367d..3d9b7193a5cf 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.248 2013/08/11 17:47:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.249 2013/08/11 18:29:21 ssuominen Exp $
 
 EAPI=5
 
@@ -359,6 +359,14 @@ multilib_src_install() {
 			emake -C docs/libudev DESTDIR="${D}" install
 			use gudev && emake -C docs/gudev DESTDIR="${D}" install
 		fi
+
+		# install udevadm compatibility symlink
+		dosym {../bin,sbin}/udevadm
+
+		# install udevd to /sbin and remove empty and redudant directory
+		# /lib/systemd because systemd is installed to /usr wrt #462750
+		mv "${D}"/{lib/systemd/systemd-,sbin/}udevd || die
+		rm -r "${D}"/lib/systemd
 	else
 		local lib_LTLIBRARIES="libudev.la" \
 			pkgconfiglib_DATA="src/libudev/libudev.pc" \
@@ -391,14 +399,6 @@ multilib_src_install_all() {
 	insinto /lib/udev/rules.d
 	doins "${T}"/40-gentoo.rules
 	doman "${T}"/{systemd-,}udevd.8
-
-	# install udevadm compatibility symlink
-	dosym {../bin,sbin}/udevadm
-
-	# install udevd to /sbin and remove empty and redudant directory
-	# /lib/systemd because systemd is installed to /usr wrt #462750
-	mv "${D}"/{lib/systemd/systemd-,sbin/}udevd || die
-	rm -r "${D}"/lib/systemd
 }
 
 pkg_preinst() {