Add a compatibility symlink for udevadm and use --exec-prefix to put the binaries...

Package-Manager: portage-2.2.0_alpha80/cvs/Linux x86_64

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 1ada1ea406f6a81af8608d88e76db4c8052c42e7..fee0b11337eb9230d8677daa934d9a06159defb0 100644 (file)
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.623 2011/12/14 22:06:39 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.624 2011/12/15 00:34:27 williamh Exp $
+
+  15 Dec 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+  Add a compatibility symlink for udevadm and use --exec-prefix to put the
+  binaries in the correct directory.
 
   14 Dec 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
   remove prefix support and use bindir to install udevadm in /bin.

diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 6eb94172537c8356d3822b4c29d8f64dedc8fcb3..c1b0d7f51843caa8b044bbd966dc0929534cefac 100644 (file)
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -130,13 +130,13 @@ EBUILD udev-151-r4.ebuild 16852 RMD160 e0d2c7041c102e0e5979a1ed5c99d9f4d5820842
 EBUILD udev-164-r2.ebuild 15294 RMD160 2d7299b463cb765a58ec0840c4c86607fbf37e64 SHA1 cb4060adb3235d261f027be37e56272ac8f4755b SHA256 3f1b289c9c9c2d6ee6cd63b8db530240dcc9532dbc3ff273c052679b3062724b
 EBUILD udev-171-r4.ebuild 15559 RMD160 74fe6aa5874b266ec6dc1ee9d17b24d8320acaf5 SHA1 cdc7306e50ab0304d5bc8d292a6e3eaf32c01fc7 SHA256 5d523637e1ebf68c4c297362556f2daeda7360c3254c761ccf9a78f1a0fd69bf
 EBUILD udev-175-r1.ebuild 12554 RMD160 6b2042c42100cc226bbd52e4bacb384ddd9ab8b4 SHA1 3ce7f532c80ac5e1d6cc3cd66835fcfe7097e0fe SHA256 58e3bdc7a16d314ab0315029dab844729f2d3521bb017efcd05c2e032b42d8c1
-EBUILD udev-9999.ebuild 12400 RMD160 df95b9f3d476beca995d4b5892ab9255a0e1a7bd SHA1 4e391fb476894ccf3993d238f51705f40346838b SHA256 189ceda62dee2134d6d2896c3cdff46979c693a66cf9fb1663875568199102e3
-MISC ChangeLog 127051 RMD160 6c292180bc8e9a7baf46c03b53df2dc2c8c71fc0 SHA1 03421f016f768b48dd96ecb8a583117f0c160f36 SHA256 e53d462e353ed92a76100b383fc121dce5d491b27c7c6cfc5930dfda3f8a28b9
+EBUILD udev-9999.ebuild 12399 RMD160 1c0b680d20708acfb07ee9333f7992b92d06cd10 SHA1 f846c957ee604e06d8eb70321537865b026e6dc0 SHA256 f73e7d4c69b00f09e589aecdb556300a2973b5243ae0389f5782061349b3ee94
+MISC ChangeLog 127233 RMD160 352114ffaf33468d75437ec14f1446bd76798e8e SHA1 ea2a495228c46158e666b8a7d55c9cf74e428c49 SHA256 875cca8b266e0643f62534f86e699dd94680a659d9b75e2ab881ec6c22b2557e
 MISC metadata.xml 1235 RMD160 36ff4665ed99aa392ff8003e9351bd620cc79424 SHA1 3fd0e915598c248b5c7d609b6a98a4cde8431b05 SHA256 dbbbd093a910a5cb541d7be160f749dc87fc699d72165c184965fa056d60f24b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7pHiAACgkQblQW9DDEZTgoYgCcD/c3OeXkXln/ze0ZpA8zJZPa
-cG8AoL07M0KZFocb+LVYyTriSMjPTR6+
-=eBaB
+iEYEARECAAYFAk7pQKQACgkQblQW9DDEZThXSgCgsms72lPRfII/wEOSsQXr/Z5o
+fLEAmwfQidE9OqM/ON9JEmqCgLTz/BBO
+=4PSb
 -----END PGP SIGNATURE-----

diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 80aba28e9c014a27f7b5294803384073aaaa0ae4..624859084ab5bad13c71437e31b92724d9a97ae4 100644 (file)
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.64 2011/12/14 22:06:39 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.65 2011/12/15 00:34:27 williamh Exp $
 
 EAPI=4
 
@@ -164,9 +164,7 @@ src_configure()
 {
        filter-flags -fprefetch-loop-arrays
        econf \
-               --prefix=/usr \
-               --sysconfdir=/etc \
-               --bindir=/bin \
+               --exec-prefix=/ \
                --libdir=/usr/$(get_libdir) \
                --with-rootlibdir=/$(get_libdir) \
                --libexecdir=/lib/udev \
@@ -200,8 +198,10 @@ src_install()
                dodoc extras/keymap/README.keymap.txt
        fi
 
-       # Upstream moved udevd to /lib/udev,, so symlnking it is the easiest option
-       dosym "../lib/udev/udevd" /sbin/udevd
+       # compatibility symlinks:
+       # udevadm is now in /bin and udevd is in /lib/udev.
+       dosym "/bin/udevadm" /sbin/udevadm
+       dosym "/lib/udev/udevd" /sbin/udevd
 
        # create symlinks for these utilities to /sbin
        # where multipath-tools expect them to be (Bug #168588)