new beta release, many bug fixes. libudev.so.1 is now shared by udevd and all tools, libudev.so.0 can be installed to ease the pain of migration from udev-179 and older, uclibc support restored.

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

9 files changed, 80 insertions, 1388 deletions

diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog
index 2e16cc836f6c..4c7375e4ed67 100644
--- a/sys-fs/eudev/ChangeLog
+++ b/sys-fs/eudev/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-fs/eudev
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.13 2013/01/21 21:25:44 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.14 2013/01/22 21:16:58 axs Exp $
+
+*eudev-1_beta2 (22 Jan 2013)
+
+  22 Jan 2013; Ian Stakenvicius <axs@gentoo.org> -eudev-0.ebuild,
+  -eudev-0-r1.ebuild, -eudev-1_beta1-r2.ebuild, +eudev-1_beta2.ebuild,
+  -files/eudev-1_beta1-fix-modprobe-call.patch,
+  -files/eudev-1_beta1-include-all-search-paths.patch, eudev-9999.ebuild,
+  metadata.xml:
+  new beta release, many bug fixes. libudev.so.1 is now shared by udevd and all
+  tools, libudev.so.0 can be installed to ease the pain of migration from
+  udev-179 and older, uclibc support restored.
 
   21 Jan 2013; Matt Turner <mattst88@gentoo.org> eudev-0-r1.ebuild,
   eudev-0.ebuild, eudev-1_beta1-r2.ebuild, eudev-9999.ebuild:
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 223fb19055f9..e79ff993a259 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -2,35 +2,15 @@
 Hash: SHA256
 
 AUX 40-gentoo.rules 349 SHA256 5d618b899475925ceccc330b6a738644aedd582d039f0cc404502637351347ea SHA512 b8d90037c08f30c9fb9e22a43c59a3627c218313b0421d4b70feba1731cda76ddc4ee6bdb99dca8df61e11f8d656a8769e172f0a584d7620213973dacfbbb4aa WHIRLPOOL a4086cd5f0e8849369389aa29ec42f5d906b00e3d650724d38ff8b4df4e36de7d3a37393b14f2f30a7102d6f2859b6847b5f4b7813be12d945ce1515494ce120
-AUX eudev-1_beta1-fix-modprobe-call.patch 900 SHA256 66925f1969e20673b19f7a8c96e9f65ecd8913e4a699dae561f91600ff8d590a SHA512 371ce3305c3b2eeb35a4947276b011b4146038e51653cb8c6b7e09db7792de68a8328db2cadd7cce76da642c30ca6c8adf8650b17ada3855358494fe34876994 WHIRLPOOL eb35ad870f9ce15564109370c0435472feaa0992617a2b71f4533fd7bfeefb25f336cc449922758abe832618e94474757a197402d1008cb0d049b7ab2fdff5b6
-AUX eudev-1_beta1-include-all-search-paths.patch 2551 SHA256 5f8d08e8d3a3ac3f900e1088b25c84b834fedfaa2356dd8dfbdd3dde99d37297 SHA512 eed48e8c17ebc6d5be65017035ff934ee333b432622ee23e7b5295b38ef02d5357c0dafffb7b150256cb285f73e3d03a47b9f1eb77ebcc2eac06d88cf372cf9d WHIRLPOOL fea8533361abbf919c0ab3efc06e418fde1dfaeca4bafa11ca1306fd484702c82d099742e6b9113c11bd073868cc09ea049466fa0f7705e032b552c337032cc7
-DIST eudev-1_beta1.tar.gz 1626318 SHA256 efd18e20cfef4733ba2922dd3160309faa53685f1c39f03a0c672db2ffc2124d SHA512 e0417a286f12126725c7c2d1592d627271ce0fcaaeb1921071a545a609c27d64f6fb9c2311718528a2620d429eb2260dd9034be06b87e8ab1f77e3ef52c4f863 WHIRLPOOL 2df34e93a4c1b6a28dfd3dcb411d26a0d33979d32d71a3ff1f78d29b6701ff9a21cc73dddfe37fa9a9f522ef7b9ae2e0851b8deb9b04ef25253b715637869bf2
-DIST udev-171-gentoo-patchset-v1.tar.bz2 796 SHA256 9524e64068d67bb55ddad16dd36a27c3ef87323421254a5bfe2431693b1bc983 SHA512 d2eef776c3cc331b5df339e865838b67b70da01e10fa75c5cb0d45cff388adfa6af4dd36677eb05cee9936331445afadcd4158ed7d96f3499ce93d6ee1e3feb6 WHIRLPOOL d1451d2002263db7bd30baa2d126fcb3ffff6a4b310f8ebfea755760b3afbd3a76ab2aa0d16e1a88cff13567a153155720c4c16c1d4624dd2a4405b29dbb3997
-DIST udev-171-gentoo-patchset-v2.tar.bz2 2961 SHA256 9a4a11f8da06337a48291fad02e83b7787c3e5d0fea848f9ac8e67d9306587fd SHA512 2aea1c27596c61a0cfac573d74863783bd81e586ba56de01735856ac7c36738912e1d54663705a2af70fbbbb2043765933ea4e409ab913232913fe22369e78f6 WHIRLPOOL 8d4b54ff916ccf95b78577c5d5ca003460d4d8bdb4065053c03aee937ac28107ffba718cf9fc80bf3a50803ae09c161f72da0a6c57dce806afdcff2057bd17bc
-DIST udev-171-testsys.tar.bz2 155001 SHA256 7383701b64701f58f16e0ddb19fe33b4eb53fac6fc6068bdcbff7e6325b79dcc SHA512 f3f537d771e36b87c71004f5576f7672ffeb815d0b5337bb6bbb6e842c32a28d1d92b4eb0ee2edc60c0b8bd576fc2f36e8b0ed16ec9c0cff9c216e04fb1438ad WHIRLPOOL 0ee66df2f52496d592d0dd3de7c628f6deee7f41c2d21e745f22d74e61c276e01cc6ba584c65b05d36c8a4fb14bc54e3e1a89b975751929b19e91458e3550253
-DIST udev-171.tar.bz2 597937 SHA256 fed1e46074c1a16c828193ebd73b3940b7905cc7dcaeb0b3c720d4615210695e SHA512 dea189d79b195f8c10740507b11de2c2074442301ee52a0b2c62efa8663e1793c1a78b03b95510ba19bc93d4dcc497120fbf6bb5784878aa903973f76b92d42f WHIRLPOOL a93241b0f0645696e6a88ddb152c3ef8f2c73b5bf3591892384f180fc7abeb580c59642013480546eac00ad5028b1900ad35b88f6a27ad2d07792e9f34e59743
-DIST udev-gentoo-legacy-patchset-2.tar.bz2 14282 SHA256 bb2aefa50c3cc6df8cc88903b0e05a8cc9f44a612a8038abd05f37b342f7e235 SHA512 b18ccdbb4373021ee9f32b4e10dc1b846b64a1222d4a556370ee78efac530d7a868c8924d449a2d503ee12667e603c50514e3f3c4fc08b608a9676574587f073 WHIRLPOOL 765c6f411a793bcdd9d452c7f36719b1d0dd741b3d6da0446fa459d2a0207220d609a0a3ef500411faf7e308ddf315f27a19e179cb7f54bee52ef3f033773a3a
-DIST udev-gentoo-scripts-7.1.tar.bz2 16257 SHA256 1923768a98b7f00ffdc9bdf5a2c9982c494b978903ec891184d6fa0d10090fb4 SHA512 663fdd750b3f1e52a4c7639d0692290cdda9d202d4408e8aba9bfd38aaccfaa0acb79e303e98872b721cf109c62ac46921785cb5a373cc6ad8b428d0f5192836 WHIRLPOOL 49b600b034f8a6ad5e0ae6ca769971f1bb517fa0b9e31a0a7d0430ae67cf21bf4ab1db981d3eaaf78819d1e75a24a1f101eeb737448763b2990e38da912636be
-EBUILD eudev-0-r1.ebuild 16475 SHA256 6e0a5f82539bd68539117b4dce95c304c06a29bdc7d8bb2f981604a7809a8257 SHA512 0af0f62ad859d609ce6eae48be77e873270f4e525fb8179234e7c2a8b9cd53d9f0b20aee6a9a04b692782118c1595de7b31035df7428807598291ccdff0c0394 WHIRLPOOL 66478c1f32b676e295a471e5cfe738899cca21d9fcf717995f3df91863d521c5321acbe921ead2073fe9c96af913136089374f8d10668fe0515bb0a0dabeb80f
-EBUILD eudev-0.ebuild 16469 SHA256 c4b5dca29463be524c37b0ce6bd1c4763f08fa767ec40d0ad8b514b4dc525a8b SHA512 117a86aa9319a7052e483c7b25b57f518b8c3a3df22397b06db4998d149414d4b1af58bce37a0347dce8d21d61148c8a51697e337b6045fc3a65b008372f6f86 WHIRLPOOL 3da7f0fcfeab1bba51a8fb90426f9b4fcaa33d6967461d18871d43dbae9b12b0566bead9a0aa5e999ebbd7f0703f3c03de383448fead845fed58c59d23b90c71
-EBUILD eudev-1_beta1-r2.ebuild 6082 SHA256 376d1630e38fce294d2806fd2423775ccdf24c6ee80101858b30551a93b54d96 SHA512 59b148791920dec6654a1eec0c2efdc7f8b29ed5db0e956b1d7b875a20b2765f98b99e248698691e4bc1c4eeabc96d3b98763506a6309c72145d7c26090b94d4 WHIRLPOOL 2e7870266e6ea09de4127ab317b4c09ba94607e6e4836a727b7ea9e213055b3aa4ccad3c8eb9ceca1572324ded656ff0d806904d6612aa94a3d2afb743aa7400
-EBUILD eudev-9999.ebuild 5757 SHA256 6911649e34565576086c867ed3ee8f6debf4b83b6d2ab7feb0aa0745287e9111 SHA512 e0367f76a1b0762dbdf1e7e40d4229d08831f5509bd5085bac20fef3f766c40b2031945e1ed13a550d05a6cd456f798457233e3ac564f512771355e12f3349cf WHIRLPOOL 434e88d98ce67d9fa11127c5595410dac08801436d2b7a9a64e92813e3980db8fb858149305a9c465ee82bc67c3fe87a2d3f23b3dff5958b395582ad568c4e2f
-MISC ChangeLog 2401 SHA256 830000bd5abeb363dffc79734d9278d0162489f00af38a5e1e5a308dee183d68 SHA512 87dd869dbfb080c1bab5fd69784ff73a7bc1a1190600d8620e8a16fe2b594b91dae2eedacb4053878a959fb3dd90664c3431d85d0fe47c9e237ba12490e00dfd WHIRLPOOL 87c8f725fab0b9758cc00ee03eba023846ad7615153206557f67f7ec1f4a101dba863e95994b5cbd64dbc7ab94c870d1bf1f27849d3b42570b05d274981d0f43
-MISC metadata.xml 1835 SHA256 347aea2f4eba8edf6974908b8afe8414cc9b77ba086f9c963e621aee62f7977f SHA512 568222d8fe4387db0e6d01659a399f22b4d6fa1b0be8346c8b8c3627d118d39988af3bbda818cf955a8a7aafe81fa0d7cca5b47c5057b9b28058af8763ad0d23 WHIRLPOOL 4ba012f7df5f4d8c05cc282356d8533db4db21c83729819e0c80292b92bf3d956d7d98e08e32fcf55abd85e4562d93316f6195cbc1c89345c29ccf27932d5b74
+DIST eudev-1_beta2.tar.gz 1671231 SHA256 359ed1a6d8e48599c1337f54a5c796fe3195f210f89ff22b352f622afe112fd6 SHA512 7a63d411221f4e267de95f500d1f4c69017abd26af212dbaf0af770346ad3942bd1af125a525fe1a57185f085710495369dd1495ee2df714f7dbbdca12fa4717 WHIRLPOOL a43777891fe303d68ba59f221c1698e450ab346392a157e82f750e0a7698c35a31801d4f0876b546b4c486b548eb10394e0c5a517af28762edaf2df09745aa32
+EBUILD eudev-1_beta2.ebuild 5922 SHA256 7621da3fb744a25cae05cec968728d9401ea3ff02224e68ac0785f2d6c056512 SHA512 6194b2fe16ce04d77278bf014c3bedc40666f510f553f7d89fb96f3e573978235d6ab7beaba93b7f2b35a6e91cc1ff8f777effcb5cf5185657756b74842f8d5b WHIRLPOOL 235b3401d40ecff1bdadce398c0ae2bdafe6171a8226bc8e6b36e0b547c1424290cb933c906a8e69ad90e60f3903ba4faf4a78188468746ed01d3f48da37508c
+EBUILD eudev-9999.ebuild 5920 SHA256 64ea4e5451aca32f03c15b27e4225bef1450ef71dd8d54607b84d2a3daf36d83 SHA512 ae49af08e95123f1834ef3fe1032b256ba72c451f38caefa23ee977ef61fb13b0b4e81ca8fe53bc342b73c4b6c609bf3da906cef47ab901d9f18e61f99d944ee WHIRLPOOL 0a9f977e9f711bc59cb8f65a36789ee24b5f267ec99739633c1e67ae11945ca7b0c6f759b2558693418de006b1c6d9b26402e5beef5a8179a3b1887ca7b32fd5
+MISC ChangeLog 2903 SHA256 a38f653d8bd52bb1e9f489d4d203db69763c5350f577dc097682ad3a13277ce1 SHA512 009ae6044201d991d74068fc0dfcea1e44a555890c49355cb5b8f6844a0b897a83f86b708ba09c5ade24ca9dbe5d3921464aed37e8db9a864a293cebd79831c0 WHIRLPOOL 2bc83a500fdfe197ed9326da3a3adb35c5786606ef4b0090ead31047fd817c5b78b19c78b99d95ed7ff12044f3a9f58e02851258367841f79ad2acb7f7751fda
+MISC metadata.xml 1437 SHA256 746c57ca543652d7d4bf03da9ad30b43ee4dae3389935224d7d95fabca73b06f SHA512 dd410f423a9273c0b9ec9468be19c4e659cdbf9e968aaba1ef184933e2cc91ee57d2484ad3b9b6919a8173f88aa8aba8f2ca48888070495beeec5ecb80537b88 WHIRLPOOL f16ea7d0535586cb97a932159596fa222f703c38ec23f43acbc6625e72f22fce705fd0d57e25a88634f745fee70df60cbc2a7d0799b1c83e548a9e22bf33c741
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ/bMCAAoJEA/daC2XTKcqjosQAIgVikmYgXw1O2iPLQZEjmZs
-jCTeKX6vsP/Dy5IolEwERp/Rdar1KZnDKjMHyArBnEk+SrRe6ObSBe1keVNAb1Jp
-zy/QNNNKJFstL/O5ixlzDn61sXDLx8fqinZxDMJHBio+ltkMw1S3cEZ/GRndiRm8
-NNuDhig9YnXLtC4KAZlDCLkKmE2CeFAITeFjQIkV4sMeahLB7u8pwfp7rOWXY8rc
-Jksu19/Am+yXs1pxmwwdSTIKW3VCfnNZMefnDofFOWZJbL2MtidAP2FBTqQ7mvg7
-N/+K7OcRlopQYGidPVv25Sm1CdVZxxOLb6oaXkOOUQqSWgTHB/a2J0kuJsKL3O8w
-0PafFQ/YRCY5Jr2tvTTeyjI+hRz+GpRYeW1ADovVmUDaMJarhbP47GGMowCCKFOT
-DhLhrUGJ80wVHi6M+VS9lATIQmmZIXMwsfo3/lBSzxZySAXhYPr1FFkF99pl3XnL
-sqBHEZhyk+GqoNQLy0t7bbVRnVntbGK+DqPj3VxPOYtSz1Mwel5SiSjKAZqMXIGc
-eGpH3f0zc6rbDFffYFrLWuRVfoGpPDOtOikG67ydJZDp2WgsWV05dqIVVtTgl4mw
-hWsfuqu+IxqDwXjE4+EL9SSK+xIGfyZbkNkzg8bE3+56b1h+qNXfFyBnjVMFGa+C
-0iqknEDVZ5qX2fkZ2DEE
-=SV4M
+iF4EAREIAAYFAlD/Ad0ACgkQ2ugaI38ACPDR9AD/SWDOhtpK7uUDveqz4KTDl+xC
+xuqn+Y4FDDZfrUmdYZoBAIE0hUeAL6Oa5fOlWcRjA82jIxNsD7gaNyBCMta8SEmn
+=Ral7
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/eudev/eudev-0-r1.ebuild b/sys-fs/eudev/eudev-0-r1.ebuild
deleted file mode 100644
index 1ae31705ec3d..000000000000
--- a/sys-fs/eudev/eudev-0-r1.ebuild
+++ /dev/null
@@ -1,608 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-0-r1.ebuild,v 1.2 2013/01/21 21:25:44 mattst88 Exp $
-
-EAPI=4
-
-MY_PV=171
-MY_PN=udev
-MY_P=${MY_PN}-${MY_PV}
-KV_min=2.6.32
-KV_reliable=2.6.32
-PATCHSET=${MY_P}-gentoo-patchset-v2
-scriptversion=7.1
-scriptname=udev-gentoo-scripts
-[[ -n "${scriptversion}" ]] && scriptname="${scriptname}-${scriptversion}"
-
-if [[ ${MY_PV} == "9999" ]]
-then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
-	EGIT_BRANCH="master"
-	inherit autotools git-2
-fi
-
-inherit eutils flag-o-matic multilib toolchain-funcs linux-info systemd libtool
-
-if [[ ${MY_PV} != "9999" ]]
-then
-	KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-	SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-		test? ( mirror://gentoo/${MY_PN}-171-testsys.tar.bz2 )
-		mirror://gentoo/${MY_PN}-gentoo-legacy-patchset-2.tar.bz2"
-	if [[ -n "${PATCHSET}" ]]
-	then
-		SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2"
-	fi
-fi
-SRC_URI="${SRC_URI} mirror://gentoo/${scriptname}.tar.bz2"
-
-DESCRIPTION="A copy of sys-fs/udev-171-r9 to support migration from <=udev-180 to eudev"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="build selinux test debug +rule_generator hwdb gudev introspection
-	keymap floppy edd action_modeswitch extras"
-
-COMMON_DEPEND="selinux? ( sys-libs/libselinux )
-	extras? ( dev-libs/glib:2
-		dev-libs/gobject-introspection
-		virtual/libusb:0 )
-	gudev? ( dev-libs/glib:2 )
-	introspection? ( dev-libs/gobject-introspection )
-	action_modeswitch? ( virtual/libusb:0 )
-	>=sys-apps/util-linux-2.16
-	!<sys-libs/glibc-2.11"
-
-DEPEND="${COMMON_DEPEND}
-	keymap? ( dev-util/gperf )
-	extras? ( dev-util/gperf )
-	virtual/pkgconfig
-	virtual/os-headers
-	!<sys-kernel/linux-headers-2.6.34
-	test? ( app-text/tree )"
-
-RDEPEND="${COMMON_DEPEND}
-	hwdb?
-	(
-		>=sys-apps/usbutils-0.82
-		|| (
-			( sys-apps/hwids >=sys-apps/pciutils-3.1.9-r2 )
-			>=sys-apps/pciutils-3.1.9-r1[-compress-db]
-			<sys-apps/pciutils-3.1.9-r1[-zlib]
-			)
-	)
-	extras?
-	(
-		>=sys-apps/usbutils-0.82
-		sys-apps/pciutils
-	)
-	!sys-fs/udev
-	!sys-apps/coldplug
-	!<sys-fs/lvm2-2.02.45
-	!sys-fs/device-mapper
-	>=sys-apps/baselayout-2"
-
-PDEPEND="=virtual/udev-171"
-
-if [[ ${MY_PV} == "9999" ]]
-then
-	# for documentation processing with xsltproc
-	DEPEND="${DEPEND}
-		app-text/docbook-xsl-stylesheets
-		app-text/docbook-xml-dtd
-		dev-util/gtk-doc"
-fi
-
-# this is udev not euvde, so S needs adjustment
-S=${WORKDIR}/${MY_P}
-
-# required kernel options
-CONFIG_CHECK="~INOTIFY_USER ~SIGNALFD ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
-	~!IDE ~BLK_DEV_BSG"
-
-# Return values:
-# 2 - reliable
-# 1 - unreliable
-# 0 - too old
-udev_check_KV() {
-	local ok=0
-	if kernel_is -ge ${KV_reliable//./ }
-	then
-		ok=2
-	elif kernel_is -ge ${KV_min//./ }
-	then
-		ok=1
-	fi
-	return $ok
-}
-
-pkg_pretend() {
-	einfo "Please note that sys-fs/eudev-0 is actually a mirror of sys-fs/udev-171-r9,"
-	einfo "which is necessary to handle the package name change when migrating to eudev"
-	einfo "from udev < 180"
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	# always print kernel version requirements
-	ewarn
-	ewarn "${P} does not support Linux kernel before version ${KV_min}!"
-	if [[ ${KV_min} != ${KV_reliable} ]]
-	then
-		ewarn "For a reliable udev, use at least kernel ${KV_reliable}"
-	fi
-
-	udev_check_KV
-	case "$?" in
-		2)	einfo "Your kernel version (${KV_FULL}) is new enough to run ${P} reliably." ;;
-		1)	ewarn "Your kernel version (${KV_FULL}) is new enough to run ${P},"
-			ewarn "but it may be unreliable in some cases."
-			;;
-		0)	eerror "Your kernel version (${KV_FULL}) is too old to run ${P}"
-			;;
-	esac
-
-	KV_FULL_SRC=${KV_FULL}
-	get_running_version
-	udev_check_KV
-	if [[ "$?" = "0" ]]
-	then
-		eerror
-		eerror "udev cannot be restarted after emerging,"
-		eerror "as your running kernel version (${KV_FULL}) is too old."
-		eerror "You really need to use a newer kernel after a reboot!"
-		NO_RESTART=1
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	if [[ ${MY_PV} == "9999" ]]
-	then
-		git-2_src_unpack
-	fi
-}
-
-src_prepare() {
-	if use test && [[ -d "${WORKDIR}"/test/sys ]]
-	then
-		mv "${WORKDIR}"/test/sys "${S}"/test/
-	fi
-
-	# patches go here...
-	epatch "${WORKDIR}"/${MY_P}-path_id-skip-ATA-transport.patch #437418
-
-	# backport some patches
-	if [[ -n "${PATCHSET}" ]]
-	then
-		EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" \
-			  EPATCH_FORCE="yes" epatch
-	fi
-
-	# change rules back to group uucp instead of dialout for now
-	sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
-		-i rules/{rules.d,arch}/*.rules \
-	|| die "failed to change group dialout to uucp"
-
-	if [[ ${MY_PV} != 9999 ]]
-	then
-		# Make sure there is no sudden changes to upstream rules file
-		# (more for my own needs than anything else ...)
-		MD5=$(md5sum < "${S}/rules/rules.d/50-udev-default.rules")
-		MD5=${MD5/  -/}
-		if [[ ${MD5} != a9954d57e97aa0ad2e0ed53899d9559a ]]
-		then
-			eerror "50-udev-default.rules has been updated, please validate!"
-			eerror "md5sum: ${MD5}"
-			die "50-udev-default.rules has been updated, please validate!"
-		fi
-	fi
-
-	if [[ ${MY_PV} == 9999 ]]
-	then
-		gtkdocize --copy || die "gtkdocize failed"
-		eautoreconf
-	else
-		elibtoolize
-	fi
-}
-
-use_extras() { use extras && echo "--enable-${2:-$1}" || use_enable "$@" ; }
-src_configure() {
-	econf \
-		--prefix="${EPREFIX}/usr" \
-		--sysconfdir="${EPREFIX}/etc" \
-		--sbindir="${EPREFIX}/sbin" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-rootlibdir="${EPREFIX}/$(get_libdir)" \
-		--libexecdir="${EPREFIX}/lib/udev" \
-		--enable-logging \
-		--enable-static \
-		$(use_with selinux) \
-		$(use_enable debug) \
-		$(use_extras rule_generator) \
-		$(use_extras hwdb) \
-		--with-pci-ids-path="${EPREFIX}/usr/share/misc/pci.ids" \
-		--with-usb-ids-path="${EPREFIX}/usr/share/misc/usb.ids" \
-		--disable-udev_acl \
-		$(use_extras gudev) \
-		$(use_extras introspection) \
-		$(use_extras keymap) \
-		$(use_extras floppy) \
-		$(use_extras edd) \
-		$(use_extras action_modeswitch) \
-		$(systemd_with_unitdir)
-}
-
-src_compile() {
-	filter-flags -fprefetch-loop-arrays
-
-	emake
-}
-
-src_install() {
-	into /
-	emake DESTDIR="${D}" install
-
-	exeinto /lib/udev
-	keepdir /lib/udev/state
-	keepdir /lib/udev/devices
-
-	# create symlinks for these utilities to /sbin
-	# where multipath-tools expect them to be (Bug #168588)
-	dosym "../lib/udev/scsi_id" /sbin/scsi_id
-
-	# Add gentoo stuff to udev.conf
-	echo "# If you need to change mount-options, do it in /etc/fstab" \
-	>> "${ED}"/etc/udev/udev.conf
-
-	# let the dir exist at least
-	keepdir /etc/udev/rules.d
-
-	# Now installing rules
-	cd "${S}"/rules
-	insinto /lib/udev/rules.d/
-
-	# support older kernels
-	doins misc/30-kernel-compat.rules
-
-	# Adding arch specific rules
-	if [[ -f arch/40-${ARCH}.rules ]]
-	then
-		doins "arch/40-${ARCH}.rules"
-	fi
-	cd "${S}"
-
-	insinto /etc/modprobe.d
-	newins "${WORKDIR}"/blacklist-146 blacklist.conf
-	newins "${WORKDIR}"/pnp-aliases pnp-aliases.conf
-
-	# documentation
-	dodoc ChangeLog README TODO
-
-	# keep doc in just one directory, Bug #281137
-	rm -rf "${ED}/usr/share/doc/${PN}"
-	if use keymap
-	then
-		dodoc extras/keymap/README.keymap.txt
-	fi
-
-	cd "${WORKDIR}/${scriptname}"
-	sed -i -e 's/2.6.34/2.6.32/' init.d/udev
-	doconfd conf.d/*
-	exeinto /lib/udev
-	doexe helpers/*
-	doexe "${WORKDIR}"/shell-compat-KV.sh
-	doinitd init.d/*
-	insinto /etc/modprobe.d
-	doins modprobe.d/*
-	insinto /lib/udev/rules.d
-	doins rules.d/*
-}
-
-src_test() {
-	local emake_cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}"
-
-	cd "${S}"
-	einfo ">>> Test phase [udev:check]: ${CATEGORY}/${PF}"
-	has userpriv $FEATURES && einfo "Disable FEATURES userpriv to run the udev tests"
-	if ! $emake_cmd -j1 check
-	then
-		has test $FEATURES && die "udev: Make test failed. See above for details."
-		has test $FEATURES || eerror "udev: Make test failed. See above for details."
-	fi
-}
-
-pkg_preinst() {
-	# moving old files to support newer modprobe, 12 May 2009
-	local f dir=${EROOT}/etc/modprobe.d/
-	for f in pnp-aliases blacklist; do
-		if [[ -f $dir/$f && ! -f $dir/$f.conf ]]
-		then
-			elog "Moving $dir/$f to $f.conf"
-			mv -f "$dir/$f" "$dir/$f.conf"
-		fi
-	done
-
-	if [[ -d ${EROOT}/lib/udev-state ]]
-	then
-		mv -f "${EROOT}"/lib/udev-state/* "${ED}"/lib/udev/state/
-		rm -r "${EROOT}"/lib/udev-state
-	fi
-
-	if [[ -f ${EROOT}/etc/udev/udev.config &&
-		 ! -f ${EROOT}/etc/udev/udev.rules ]]
-	then
-		mv -f "${EROOT}"/etc/udev/udev.config "${EROOT}"/etc/udev/udev.rules
-	fi
-
-	# delete the old udev.hotplug symlink if it is present
-	if [[ -h ${EROOT}/etc/hotplug.d/default/udev.hotplug ]]
-	then
-		rm -f "${EROOT}"/etc/hotplug.d/default/udev.hotplug
-	fi
-
-	# delete the old wait_for_sysfs.hotplug symlink if it is present
-	if [[ -h ${EROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug ]]
-	then
-		rm -f "${EROOT}"/etc/hotplug.d/default/05-wait_for_sysfs.hotplug
-	fi
-
-	# delete the old wait_for_sysfs.hotplug symlink if it is present
-	if [[ -h ${EROOT}/etc/hotplug.d/default/10-udev.hotplug ]]
-	then
-		rm -f "${EROOT}"/etc/hotplug.d/default/10-udev.hotplug
-	fi
-
-	has_version "=${CATEGORY}/${MY_PN}-103-r3"
-	previous_equal_to_103_r3=$?
-
-	has_version "<${CATEGORY}/${MY_PN}-104-r5"
-	previous_less_than_104_r5=$?
-
-	has_version "<${CATEGORY}/${MY_PN}-106-r5"
-	previous_less_than_106_r5=$?
-
-	has_version "<${CATEGORY}/${MY_PN}-113"
-	previous_less_than_113=$?
-}
-
-# 19 Nov 2008
-fix_old_persistent_net_rules() {
-	local rules=${EROOT}/etc/udev/rules.d/70-persistent-net.rules
-	[[ -f ${rules} ]] || return
-
-	elog
-	elog "Updating persistent-net rules file"
-
-	# Change ATTRS to ATTR matches, Bug #246927
-	sed -i -e 's/ATTRS{/ATTR{/g' "${rules}"
-
-	# Add KERNEL matches if missing, Bug #246849
-	sed -ri \
-		-e '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \
-		"${rules}"
-}
-
-# See Bug #129204 for a discussion about restarting udevd
-restart_udevd() {
-	if [[ ${NO_RESTART} = "1" ]]
-	then
-		ewarn "Not restarting udevd, as your kernel is too old!"
-		return
-	fi
-
-	# need to merge to our system
-	[[ ${EROOT} = / ]] || return
-
-	# check if root of init-process is identical to ours (not in chroot)
-	[[ -r /proc/1/root && /proc/1/root/ -ef /proc/self/root/ ]] || return
-
-	# abort if there is no udevd running
-	[[ -n $(pidof udevd) ]] || return
-
-	# abort if no /dev/.udev exists
-	[[ -e /dev/.udev ]] || return
-
-	elog
-	elog "restarting udevd now."
-
-	killall -15 udevd &>/dev/null
-	sleep 1
-	killall -9 udevd &>/dev/null
-
-	/sbin/udevd --daemon
-	sleep 3
-	if [[ ! -n $(pidof udevd) ]]
-	then
-		eerror "FATAL: udev died, please check your kernel is"
-		eerror "new enough and configured correctly for ${P}."
-		eerror
-		eerror "Please have a look at this before rebooting."
-		eerror "If in doubt, please downgrade udev back to your old version"
-	fi
-}
-
-postinst_init_scripts() {
-	local enable_postmount=false
-
-	# FIXME: inconsistent handling of init-scripts here
-	#  * udev is added to sysinit in openrc-ebuild
-	#  * we add udev-postmount to default in here
-	#
-
-	# If we are building stages, add udev and udev-mount to the sysinit runlevel
-	# automatically.
-	if use build
-	then
-		if [[ -x "${EROOT}"/etc/init.d/udev  \
-			&& -d "${EROOT}"/etc/runlevels/sysinit ]]
-		then
-			ln -s "${EPREFIX}"/etc/init.d/udev "${EROOT}"/etc/runlevels/sysinit/udev
-		fi
-		if [[ -x "${ROOT}"/etc/init.d/udev-mount \
-			&& -d "${ROOT}"/etc/runlevels/sysinit ]]
-		then
-			ln -s /etc/init.d/udev-mount \
-				"${ROOT}"/etc/runlevels/sysinit/udev-mount
-		fi
-		enable_postmount=true
-	fi
-
-	# Warn the user about adding the scripts to their sysinit runlevel
-	if [[ -e "${EROOT}"/etc/runlevels/sysinit ]]
-	then
-		if [[ ! -e "${EROOT}"/etc/runlevels/sysinit/udev ]]
-		then
-			ewarn
-			ewarn "You need to add udev to the sysinit runlevel."
-			ewarn "If you do not do this,"
-			ewarn "your system will not be able to boot!"
-			ewarn "Run this command:"
-			ewarn "\trc-update add udev sysinit"
-		fi
-		if [[ ! -e "${EROOT}"/etc/runlevels/sysinit/udev-mount ]]
-		then
-			ewarn
-			ewarn "You need to add udev-mount to the sysinit runlevel."
-			ewarn "If you do not do this,"
-			ewarn "your system will not be able to boot!"
-			ewarn "Run this command:"
-			ewarn "\trc-update add udev-mount sysinit"
-		fi
-	fi
-
-	# add udev-postmount to default runlevel instead of that ugly injecting
-	# like a hotplug event, 2009/10/15
-
-	# already enabled?
-	[[ -e "${EROOT}"/etc/runlevels/default/udev-postmount ]] && return
-
-	[[ -e "${EROOT}"/etc/runlevels/sysinit/udev ]] && enable_postmount=true
-	[[ "${EROOT}" = "/" && -d /dev/.udev/ ]] && enable_postmount=true
-
-	if $enable_postmount
-	then
-		local initd=udev-postmount
-
-		if [[ -e ${EROOT}/etc/init.d/${initd} ]] && \
-			[[ ! -e ${EROOT}/etc/runlevels/default/${initd} ]]
-		then
-			ln -snf "${EPREFIX}"/etc/init.d/${initd} "${EROOT}"/etc/runlevels/default/${initd}
-			elog "Auto-adding '${initd}' service to your default runlevel"
-		fi
-	else
-		elog "You should add the udev-postmount service to default runlevel."
-		elog "Run this to add it:"
-		elog "\trc-update add udev-postmount default"
-	fi
-}
-
-pkg_postinst() {
-	fix_old_persistent_net_rules
-
-	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
-	# So try to remove it here (will only work if empty).
-	rmdir "${EROOT}"/dev/loop 2>/dev/null
-	if [[ -d "${EROOT}"/dev/loop ]]
-	then
-		ewarn "Please make sure your remove /dev/loop,"
-		ewarn "else losetup may be confused when looking for unused devices."
-	fi
-
-	restart_udevd
-
-	postinst_init_scripts
-
-	# people want reminders, I'll give them reminders.  Odds are they will
-	# just ignore them anyway...
-
-	# delete 40-scsi-hotplug.rules, it is integrated in 50-udev.rules, 19 Jan 2007
-	if [[ $previous_equal_to_103_r3 = 0 ]] &&
-		[[ -e ${EROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]]
-	then
-		ewarn "Deleting stray 40-scsi-hotplug.rules"
-		ewarn "installed by sys-fs/udev-103-r3"
-		rm -f "${EROOT}"/etc/udev/rules.d/40-scsi-hotplug.rules
-	fi
-
-	# Removing some device-nodes we thought we need some time ago, 25 Jan 2007
-	if [[ -d ${EROOT}/lib/udev/devices ]]
-	then
-		rm -f "${EROOT}"/lib/udev/devices/{null,zero,console,urandom}
-	fi
-
-	# Removing some old file, 29 Jan 2007
-	if [[ $previous_less_than_104_r5 = 0 ]]
-	then
-		rm -f "${EROOT}"/etc/dev.d/net/hotplug.dev
-		rmdir --ignore-fail-on-non-empty "${EROOT}"/etc/dev.d/net 2>/dev/null
-	fi
-
-	# 19 Mar 2007
-	if [[ $previous_less_than_106_r5 = 0 ]] &&
-		[[ -e ${EROOT}/etc/udev/rules.d/95-net.rules ]]
-	then
-		rm -f "${EROOT}"/etc/udev/rules.d/95-net.rules
-	fi
-
-	# Try to remove /etc/dev.d as that is obsolete, 23 Apr 2007
-	if [[ -d ${EROOT}/etc/dev.d ]]
-	then
-		rmdir --ignore-fail-on-non-empty "${EROOT}"/etc/dev.d/default "${EROOT}"/etc/dev.d 2>/dev/null
-		if [[ -d ${EROOT}/etc/dev.d ]]
-		then
-			ewarn "You still have the directory /etc/dev.d on your system."
-			ewarn "This is no longer used by udev and can be removed."
-		fi
-	fi
-
-	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
-	# remove it if user don't has sys-fs/device-mapper installed, 27 Jun 2007
-	if [[ $previous_less_than_113 = 0 ]] &&
-		[[ -f ${EROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
-		! has_version sys-fs/device-mapper
-	then
-			rm -f "${EROOT}"/etc/udev/rules.d/64-device-mapper.rules
-			einfo "Removed unneeded file 64-device-mapper.rules"
-	fi
-
-	# requested in Bug #225033:
-	elog
-	elog "persistent-net does assigning fixed names to network devices."
-	elog "If you have problems with the persistent-net rules,"
-	elog "just delete the rules file"
-	elog "\trm ${EROOT}etc/udev/rules.d/70-persistent-net.rules"
-	elog "and then reboot."
-	elog
-	elog "This may however number your devices in a different way than they are now."
-
-	ewarn
-	ewarn "If you build an initramfs including udev, then please"
-	ewarn "make sure that the /sbin/udevadm binary gets included,"
-	ewarn "and your scripts changed to use it,as it replaces the"
-	ewarn "old helper apps udevinfo, udevtrigger, ..."
-
-	ewarn
-	ewarn "mount options for directory /dev are no longer"
-	ewarn "set in /etc/udev/udev.conf, but in /etc/fstab"
-	ewarn "as for other directories."
-
-	ewarn
-	ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*,"
-	ewarn "then please migrate over to using the device names"
-	ewarn "/dev/md*, /dev/loop* and /dev/ram*."
-	ewarn "The devfs-compat rules have been removed."
-	ewarn "For reference see Bug #269359."
-
-	ewarn
-	ewarn "Rules for /dev/hd* devices have been removed"
-	ewarn "Please migrate to libata."
-
-	elog
-	elog "For more information on udev on Gentoo, writing udev rules, and"
-	elog "         fixing known issues visit:"
-	elog "         http://www.gentoo.org/doc/en/udev-guide.xml"
-}
diff --git a/sys-fs/eudev/eudev-0.ebuild b/sys-fs/eudev/eudev-0.ebuild
deleted file mode 100644
index 908ebc9ba2ba..000000000000
--- a/sys-fs/eudev/eudev-0.ebuild
+++ /dev/null
@@ -1,608 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-0.ebuild,v 1.4 2013/01/21 21:25:44 mattst88 Exp $
-
-EAPI=4
-
-MY_PV=171
-MY_PN=udev
-MY_P=${MY_PN}-${MY_PV}
-KV_min=2.6.32
-KV_reliable=2.6.32
-PATCHSET=${MY_P}-gentoo-patchset-v1
-scriptversion=7.1
-scriptname=udev-gentoo-scripts
-[[ -n "${scriptversion}" ]] && scriptname="${scriptname}-${scriptversion}"
-
-if [[ ${MY_PV} == "9999" ]]
-then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
-	EGIT_BRANCH="master"
-	inherit autotools git-2
-fi
-
-inherit eutils flag-o-matic multilib toolchain-funcs linux-info systemd libtool
-
-if [[ ${MY_PV} != "9999" ]]
-then
-	KEYWORDS="amd64 arm ~mips ~ppc x86"
-	SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-		test? ( mirror://gentoo/${MY_PN}-171-testsys.tar.bz2 )
-		mirror://gentoo/${MY_PN}-gentoo-legacy-patchset-2.tar.bz2"
-	if [[ -n "${PATCHSET}" ]]
-	then
-		SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2"
-	fi
-fi
-SRC_URI="${SRC_URI} mirror://gentoo/${scriptname}.tar.bz2"
-
-DESCRIPTION="A copy of sys-fs/udev-171-r9 to support migration from <=udev-180 to eudev"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="build selinux test debug +rule_generator hwdb gudev introspection
-	keymap floppy edd action_modeswitch extras"
-
-COMMON_DEPEND="selinux? ( sys-libs/libselinux )
-	extras? ( dev-libs/glib:2
-		dev-libs/gobject-introspection
-		virtual/libusb:0 )
-	gudev? ( dev-libs/glib:2 )
-	introspection? ( dev-libs/gobject-introspection )
-	action_modeswitch? ( virtual/libusb:0 )
-	>=sys-apps/util-linux-2.16
-	!<sys-libs/glibc-2.11"
-
-DEPEND="${COMMON_DEPEND}
-	keymap? ( dev-util/gperf )
-	extras? ( dev-util/gperf )
-	virtual/pkgconfig
-	virtual/os-headers
-	!<sys-kernel/linux-headers-2.6.34
-	test? ( app-text/tree )"
-
-RDEPEND="${COMMON_DEPEND}
-	hwdb?
-	(
-		>=sys-apps/usbutils-0.82
-		|| (
-			( sys-apps/hwids >=sys-apps/pciutils-3.1.9-r2 )
-			>=sys-apps/pciutils-3.1.9-r1[-compress-db]
-			<sys-apps/pciutils-3.1.9-r1[-zlib]
-			)
-	)
-	extras?
-	(
-		>=sys-apps/usbutils-0.82
-		sys-apps/pciutils
-	)
-	!sys-fs/udev
-	!sys-apps/coldplug
-	!<sys-fs/lvm2-2.02.45
-	!sys-fs/device-mapper
-	>=sys-apps/baselayout-2"
-
-PDEPEND="=virtual/udev-171"
-
-if [[ ${MY_PV} == "9999" ]]
-then
-	# for documentation processing with xsltproc
-	DEPEND="${DEPEND}
-		app-text/docbook-xsl-stylesheets
-		app-text/docbook-xml-dtd
-		dev-util/gtk-doc"
-fi
-
-# this is udev not euvde, so S needs adjustment
-S=${WORKDIR}/${MY_P}
-
-# required kernel options
-CONFIG_CHECK="~INOTIFY_USER ~SIGNALFD ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
-	~!IDE ~BLK_DEV_BSG"
-
-# Return values:
-# 2 - reliable
-# 1 - unreliable
-# 0 - too old
-udev_check_KV() {
-	local ok=0
-	if kernel_is -ge ${KV_reliable//./ }
-	then
-		ok=2
-	elif kernel_is -ge ${KV_min//./ }
-	then
-		ok=1
-	fi
-	return $ok
-}
-
-pkg_pretend() {
-	einfo "Please note that sys-fs/eudev-0 is actually a mirror of sys-fs/udev-171-r9,"
-	einfo "which is necessary to handle the package name change when migrating to eudev"
-	einfo "from udev < 180"
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	# always print kernel version requirements
-	ewarn
-	ewarn "${P} does not support Linux kernel before version ${KV_min}!"
-	if [[ ${KV_min} != ${KV_reliable} ]]
-	then
-		ewarn "For a reliable udev, use at least kernel ${KV_reliable}"
-	fi
-
-	udev_check_KV
-	case "$?" in
-		2)	einfo "Your kernel version (${KV_FULL}) is new enough to run ${P} reliably." ;;
-		1)	ewarn "Your kernel version (${KV_FULL}) is new enough to run ${P},"
-			ewarn "but it may be unreliable in some cases."
-			;;
-		0)	eerror "Your kernel version (${KV_FULL}) is too old to run ${P}"
-			;;
-	esac
-
-	KV_FULL_SRC=${KV_FULL}
-	get_running_version
-	udev_check_KV
-	if [[ "$?" = "0" ]]
-	then
-		eerror
-		eerror "udev cannot be restarted after emerging,"
-		eerror "as your running kernel version (${KV_FULL}) is too old."
-		eerror "You really need to use a newer kernel after a reboot!"
-		NO_RESTART=1
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	if [[ ${MY_PV} == "9999" ]]
-	then
-		git-2_src_unpack
-	fi
-}
-
-src_prepare() {
-	if use test && [[ -d "${WORKDIR}"/test/sys ]]
-	then
-		mv "${WORKDIR}"/test/sys "${S}"/test/
-	fi
-
-	# patches go here...
-	epatch "${WORKDIR}"/${MY_P}-path_id-skip-ATA-transport.patch #437418
-
-	# backport some patches
-	if [[ -n "${PATCHSET}" ]]
-	then
-		EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" \
-			  EPATCH_FORCE="yes" epatch
-	fi
-
-	# change rules back to group uucp instead of dialout for now
-	sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
-		-i rules/{rules.d,arch}/*.rules \
-	|| die "failed to change group dialout to uucp"
-
-	if [[ ${MY_PV} != 9999 ]]
-	then
-		# Make sure there is no sudden changes to upstream rules file
-		# (more for my own needs than anything else ...)
-		MD5=$(md5sum < "${S}/rules/rules.d/50-udev-default.rules")
-		MD5=${MD5/  -/}
-		if [[ ${MD5} != a9954d57e97aa0ad2e0ed53899d9559a ]]
-		then
-			eerror "50-udev-default.rules has been updated, please validate!"
-			eerror "md5sum: ${MD5}"
-			die "50-udev-default.rules has been updated, please validate!"
-		fi
-	fi
-
-	if [[ ${MY_PV} == 9999 ]]
-	then
-		gtkdocize --copy || die "gtkdocize failed"
-		eautoreconf
-	else
-		elibtoolize
-	fi
-}
-
-use_extras() { use extras && echo "--enable-${2:-$1}" || use_enable "$@" ; }
-src_configure() {
-	econf \
-		--prefix="${EPREFIX}/usr" \
-		--sysconfdir="${EPREFIX}/etc" \
-		--sbindir="${EPREFIX}/sbin" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-rootlibdir="${EPREFIX}/$(get_libdir)" \
-		--libexecdir="${EPREFIX}/lib/udev" \
-		--enable-logging \
-		--enable-static \
-		$(use_with selinux) \
-		$(use_enable debug) \
-		$(use_extras rule_generator) \
-		$(use_extras hwdb) \
-		--with-pci-ids-path="${EPREFIX}/usr/share/misc/pci.ids" \
-		--with-usb-ids-path="${EPREFIX}/usr/share/misc/usb.ids" \
-		--disable-udev_acl \
-		$(use_extras gudev) \
-		$(use_extras introspection) \
-		$(use_extras keymap) \
-		$(use_extras floppy) \
-		$(use_extras edd) \
-		$(use_extras action_modeswitch) \
-		$(systemd_with_unitdir)
-}
-
-src_compile() {
-	filter-flags -fprefetch-loop-arrays
-
-	emake
-}
-
-src_install() {
-	into /
-	emake DESTDIR="${D}" install
-
-	exeinto /lib/udev
-	keepdir /lib/udev/state
-	keepdir /lib/udev/devices
-
-	# create symlinks for these utilities to /sbin
-	# where multipath-tools expect them to be (Bug #168588)
-	dosym "../lib/udev/scsi_id" /sbin/scsi_id
-
-	# Add gentoo stuff to udev.conf
-	echo "# If you need to change mount-options, do it in /etc/fstab" \
-	>> "${ED}"/etc/udev/udev.conf
-
-	# let the dir exist at least
-	keepdir /etc/udev/rules.d
-
-	# Now installing rules
-	cd "${S}"/rules
-	insinto /lib/udev/rules.d/
-
-	# support older kernels
-	doins misc/30-kernel-compat.rules
-
-	# Adding arch specific rules
-	if [[ -f arch/40-${ARCH}.rules ]]
-	then
-		doins "arch/40-${ARCH}.rules"
-	fi
-	cd "${S}"
-
-	insinto /etc/modprobe.d
-	newins "${WORKDIR}"/blacklist-146 blacklist.conf
-	newins "${WORKDIR}"/pnp-aliases pnp-aliases.conf
-
-	# documentation
-	dodoc ChangeLog README TODO
-
-	# keep doc in just one directory, Bug #281137
-	rm -rf "${ED}/usr/share/doc/${PN}"
-	if use keymap
-	then
-		dodoc extras/keymap/README.keymap.txt
-	fi
-
-	cd "${WORKDIR}/${scriptname}"
-	sed -i -e 's/2.6.34/2.6.32/' init.d/udev
-	doconfd conf.d/*
-	exeinto /lib/udev
-	doexe helpers/*
-	doexe "${WORKDIR}"/shell-compat-KV.sh
-	doinitd init.d/*
-	insinto /etc/modprobe.d
-	doins modprobe.d/*
-	insinto /lib/udev/rules.d
-	doins rules.d/*
-}
-
-src_test() {
-	local emake_cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}"
-
-	cd "${S}"
-	einfo ">>> Test phase [udev:check]: ${CATEGORY}/${PF}"
-	has userpriv $FEATURES && einfo "Disable FEATURES userpriv to run the udev tests"
-	if ! $emake_cmd -j1 check
-	then
-		has test $FEATURES && die "udev: Make test failed. See above for details."
-		has test $FEATURES || eerror "udev: Make test failed. See above for details."
-	fi
-}
-
-pkg_preinst() {
-	# moving old files to support newer modprobe, 12 May 2009
-	local f dir=${EROOT}/etc/modprobe.d/
-	for f in pnp-aliases blacklist; do
-		if [[ -f $dir/$f && ! -f $dir/$f.conf ]]
-		then
-			elog "Moving $dir/$f to $f.conf"
-			mv -f "$dir/$f" "$dir/$f.conf"
-		fi
-	done
-
-	if [[ -d ${EROOT}/lib/udev-state ]]
-	then
-		mv -f "${EROOT}"/lib/udev-state/* "${ED}"/lib/udev/state/
-		rm -r "${EROOT}"/lib/udev-state
-	fi
-
-	if [[ -f ${EROOT}/etc/udev/udev.config &&
-		 ! -f ${EROOT}/etc/udev/udev.rules ]]
-	then
-		mv -f "${EROOT}"/etc/udev/udev.config "${EROOT}"/etc/udev/udev.rules
-	fi
-
-	# delete the old udev.hotplug symlink if it is present
-	if [[ -h ${EROOT}/etc/hotplug.d/default/udev.hotplug ]]
-	then
-		rm -f "${EROOT}"/etc/hotplug.d/default/udev.hotplug
-	fi
-
-	# delete the old wait_for_sysfs.hotplug symlink if it is present
-	if [[ -h ${EROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug ]]
-	then
-		rm -f "${EROOT}"/etc/hotplug.d/default/05-wait_for_sysfs.hotplug
-	fi
-
-	# delete the old wait_for_sysfs.hotplug symlink if it is present
-	if [[ -h ${EROOT}/etc/hotplug.d/default/10-udev.hotplug ]]
-	then
-		rm -f "${EROOT}"/etc/hotplug.d/default/10-udev.hotplug
-	fi
-
-	has_version "=${CATEGORY}/${MY_PN}-103-r3"
-	previous_equal_to_103_r3=$?
-
-	has_version "<${CATEGORY}/${MY_PN}-104-r5"
-	previous_less_than_104_r5=$?
-
-	has_version "<${CATEGORY}/${MY_PN}-106-r5"
-	previous_less_than_106_r5=$?
-
-	has_version "<${CATEGORY}/${MY_PN}-113"
-	previous_less_than_113=$?
-}
-
-# 19 Nov 2008
-fix_old_persistent_net_rules() {
-	local rules=${EROOT}/etc/udev/rules.d/70-persistent-net.rules
-	[[ -f ${rules} ]] || return
-
-	elog
-	elog "Updating persistent-net rules file"
-
-	# Change ATTRS to ATTR matches, Bug #246927
-	sed -i -e 's/ATTRS{/ATTR{/g' "${rules}"
-
-	# Add KERNEL matches if missing, Bug #246849
-	sed -ri \
-		-e '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \
-		"${rules}"
-}
-
-# See Bug #129204 for a discussion about restarting udevd
-restart_udevd() {
-	if [[ ${NO_RESTART} = "1" ]]
-	then
-		ewarn "Not restarting udevd, as your kernel is too old!"
-		return
-	fi
-
-	# need to merge to our system
-	[[ ${EROOT} = / ]] || return
-
-	# check if root of init-process is identical to ours (not in chroot)
-	[[ -r /proc/1/root && /proc/1/root/ -ef /proc/self/root/ ]] || return
-
-	# abort if there is no udevd running
-	[[ -n $(pidof udevd) ]] || return
-
-	# abort if no /dev/.udev exists
-	[[ -e /dev/.udev ]] || return
-
-	elog
-	elog "restarting udevd now."
-
-	killall -15 udevd &>/dev/null
-	sleep 1
-	killall -9 udevd &>/dev/null
-
-	/sbin/udevd --daemon
-	sleep 3
-	if [[ ! -n $(pidof udevd) ]]
-	then
-		eerror "FATAL: udev died, please check your kernel is"
-		eerror "new enough and configured correctly for ${P}."
-		eerror
-		eerror "Please have a look at this before rebooting."
-		eerror "If in doubt, please downgrade udev back to your old version"
-	fi
-}
-
-postinst_init_scripts() {
-	local enable_postmount=false
-
-	# FIXME: inconsistent handling of init-scripts here
-	#  * udev is added to sysinit in openrc-ebuild
-	#  * we add udev-postmount to default in here
-	#
-
-	# If we are building stages, add udev and udev-mount to the sysinit runlevel
-	# automatically.
-	if use build
-	then
-		if [[ -x "${EROOT}"/etc/init.d/udev  \
-			&& -d "${EROOT}"/etc/runlevels/sysinit ]]
-		then
-			ln -s "${EPREFIX}"/etc/init.d/udev "${EROOT}"/etc/runlevels/sysinit/udev
-		fi
-		if [[ -x "${ROOT}"/etc/init.d/udev-mount \
-			&& -d "${ROOT}"/etc/runlevels/sysinit ]]
-		then
-			ln -s /etc/init.d/udev-mount \
-				"${ROOT}"/etc/runlevels/sysinit/udev-mount
-		fi
-		enable_postmount=true
-	fi
-
-	# Warn the user about adding the scripts to their sysinit runlevel
-	if [[ -e "${EROOT}"/etc/runlevels/sysinit ]]
-	then
-		if [[ ! -e "${EROOT}"/etc/runlevels/sysinit/udev ]]
-		then
-			ewarn
-			ewarn "You need to add udev to the sysinit runlevel."
-			ewarn "If you do not do this,"
-			ewarn "your system will not be able to boot!"
-			ewarn "Run this command:"
-			ewarn "\trc-update add udev sysinit"
-		fi
-		if [[ ! -e "${EROOT}"/etc/runlevels/sysinit/udev-mount ]]
-		then
-			ewarn
-			ewarn "You need to add udev-mount to the sysinit runlevel."
-			ewarn "If you do not do this,"
-			ewarn "your system will not be able to boot!"
-			ewarn "Run this command:"
-			ewarn "\trc-update add udev-mount sysinit"
-		fi
-	fi
-
-	# add udev-postmount to default runlevel instead of that ugly injecting
-	# like a hotplug event, 2009/10/15
-
-	# already enabled?
-	[[ -e "${EROOT}"/etc/runlevels/default/udev-postmount ]] && return
-
-	[[ -e "${EROOT}"/etc/runlevels/sysinit/udev ]] && enable_postmount=true
-	[[ "${EROOT}" = "/" && -d /dev/.udev/ ]] && enable_postmount=true
-
-	if $enable_postmount
-	then
-		local initd=udev-postmount
-
-		if [[ -e ${EROOT}/etc/init.d/${initd} ]] && \
-			[[ ! -e ${EROOT}/etc/runlevels/default/${initd} ]]
-		then
-			ln -snf "${EPREFIX}"/etc/init.d/${initd} "${EROOT}"/etc/runlevels/default/${initd}
-			elog "Auto-adding '${initd}' service to your default runlevel"
-		fi
-	else
-		elog "You should add the udev-postmount service to default runlevel."
-		elog "Run this to add it:"
-		elog "\trc-update add udev-postmount default"
-	fi
-}
-
-pkg_postinst() {
-	fix_old_persistent_net_rules
-
-	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
-	# So try to remove it here (will only work if empty).
-	rmdir "${EROOT}"/dev/loop 2>/dev/null
-	if [[ -d "${EROOT}"/dev/loop ]]
-	then
-		ewarn "Please make sure your remove /dev/loop,"
-		ewarn "else losetup may be confused when looking for unused devices."
-	fi
-
-	restart_udevd
-
-	postinst_init_scripts
-
-	# people want reminders, I'll give them reminders.  Odds are they will
-	# just ignore them anyway...
-
-	# delete 40-scsi-hotplug.rules, it is integrated in 50-udev.rules, 19 Jan 2007
-	if [[ $previous_equal_to_103_r3 = 0 ]] &&
-		[[ -e ${EROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]]
-	then
-		ewarn "Deleting stray 40-scsi-hotplug.rules"
-		ewarn "installed by sys-fs/udev-103-r3"
-		rm -f "${EROOT}"/etc/udev/rules.d/40-scsi-hotplug.rules
-	fi
-
-	# Removing some device-nodes we thought we need some time ago, 25 Jan 2007
-	if [[ -d ${EROOT}/lib/udev/devices ]]
-	then
-		rm -f "${EROOT}"/lib/udev/devices/{null,zero,console,urandom}
-	fi
-
-	# Removing some old file, 29 Jan 2007
-	if [[ $previous_less_than_104_r5 = 0 ]]
-	then
-		rm -f "${EROOT}"/etc/dev.d/net/hotplug.dev
-		rmdir --ignore-fail-on-non-empty "${EROOT}"/etc/dev.d/net 2>/dev/null
-	fi
-
-	# 19 Mar 2007
-	if [[ $previous_less_than_106_r5 = 0 ]] &&
-		[[ -e ${EROOT}/etc/udev/rules.d/95-net.rules ]]
-	then
-		rm -f "${EROOT}"/etc/udev/rules.d/95-net.rules
-	fi
-
-	# Try to remove /etc/dev.d as that is obsolete, 23 Apr 2007
-	if [[ -d ${EROOT}/etc/dev.d ]]
-	then
-		rmdir --ignore-fail-on-non-empty "${EROOT}"/etc/dev.d/default "${EROOT}"/etc/dev.d 2>/dev/null
-		if [[ -d ${EROOT}/etc/dev.d ]]
-		then
-			ewarn "You still have the directory /etc/dev.d on your system."
-			ewarn "This is no longer used by udev and can be removed."
-		fi
-	fi
-
-	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
-	# remove it if user don't has sys-fs/device-mapper installed, 27 Jun 2007
-	if [[ $previous_less_than_113 = 0 ]] &&
-		[[ -f ${EROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
-		! has_version sys-fs/device-mapper
-	then
-			rm -f "${EROOT}"/etc/udev/rules.d/64-device-mapper.rules
-			einfo "Removed unneeded file 64-device-mapper.rules"
-	fi
-
-	# requested in Bug #225033:
-	elog
-	elog "persistent-net does assigning fixed names to network devices."
-	elog "If you have problems with the persistent-net rules,"
-	elog "just delete the rules file"
-	elog "\trm ${EROOT}etc/udev/rules.d/70-persistent-net.rules"
-	elog "and then reboot."
-	elog
-	elog "This may however number your devices in a different way than they are now."
-
-	ewarn
-	ewarn "If you build an initramfs including udev, then please"
-	ewarn "make sure that the /sbin/udevadm binary gets included,"
-	ewarn "and your scripts changed to use it,as it replaces the"
-	ewarn "old helper apps udevinfo, udevtrigger, ..."
-
-	ewarn
-	ewarn "mount options for directory /dev are no longer"
-	ewarn "set in /etc/udev/udev.conf, but in /etc/fstab"
-	ewarn "as for other directories."
-
-	ewarn
-	ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*,"
-	ewarn "then please migrate over to using the device names"
-	ewarn "/dev/md*, /dev/loop* and /dev/ram*."
-	ewarn "The devfs-compat rules have been removed."
-	ewarn "For reference see Bug #269359."
-
-	ewarn
-	ewarn "Rules for /dev/hd* devices have been removed"
-	ewarn "Please migrate to libata."
-
-	elog
-	elog "For more information on udev on Gentoo, writing udev rules, and"
-	elog "         fixing known issues visit:"
-	elog "         http://www.gentoo.org/doc/en/udev-guide.xml"
-}
diff --git a/sys-fs/eudev/eudev-1_beta1-r2.ebuild b/sys-fs/eudev/eudev-1_beta2.ebuild
index 0556ce93074a..693056ae2f0b 100644
--- a/sys-fs/eudev/eudev-1_beta1-r2.ebuild
+++ b/sys-fs/eudev/eudev-1_beta2.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/eudev/eudev-1_beta1-r2.ebuild,v 1.2 2013/01/21 21:25:44 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1_beta2.ebuild,v 1.1 2013/01/22 21:16:58 axs Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ then
 	EGIT_REPO_URI="git://github.com/gentoo/eudev.git"
 	inherit git-2
 else
-	SRC_URI="https://github.com/downloads/gentoo/${PN}/${P}.tar.gz"
+	SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
 fi
 
@@ -22,12 +22,11 @@ HOMEPAGE="https://github.com/gentoo/eudev"
 
 LICENSE="LGPL-2.1 MIT GPL-2"
 SLOT="0"
-IUSE="doc gudev hwdb kmod introspection keymap +modutils +openrc selinux static-libs"
+IUSE="doc gudev hwdb kmod introspection keymap +modutils +openrc selinux static-libs legacy-libudev"
 
 RESTRICT="test"
 
 COMMON_DEPEND="gudev? ( dev-libs/glib:2 )
-	hwdb? ( sys-apps/hwids[udev(+)] )
 	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
 	selinux? ( sys-libs/libselinux )
 	>=sys-apps/util-linux-2.20
@@ -44,12 +43,12 @@ DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt"
 
 RDEPEND="${COMMON_DEPEND}
+	hwdb? ( >=sys-apps/hwids-20121202.2[udev] )
 	openrc? ( >=sys-fs/udev-init-scripts-18 )
 	!sys-fs/udev
-	!!<=sys-fs/udev-180
 	!sys-apps/coldplug
 	!sys-apps/systemd
-	!<sys-fs/lvm2-2.02.45
+	!<sys-fs/lvm2-2.02.97
 	!sys-fs/device-mapper
 	!<sys-fs/udev-init-scripts-18"
 
@@ -66,20 +65,16 @@ udev_check_KV()
 
 pkg_pretend()
 {
-	if has_version "<sys-fs/udev-180"; then
-	ewarn "This version of eudev does not contain the libudev.so.0 library."
-	ewarn "Although we try to ensure that library file is preseved, this will not work"
-	ewarn "if you manually --unmerge your current version of sys-fs/udev prior to "
-	ewarn "emerging this package, as may be necessary to resolve blockages."
+	if has_version "<sys-fs/udev-180" && ! use legacy-libudev; then
+	ewarn "This version of eudev does not contain the libudev.so.0 library by "
+	ewarn "default.  This is an issue when migrating from sys-fs/udev-180 or older."
 	ewarn ""
-	ewarn "When migrating from udev please emerge sys-fs/eudev-0 before upgrading to this"
-	ewarn "version"
-	ewarn ""
-	ewarn "Removal of libudev.so.0 will effectively break any active Xorg sessions, and "
+	ewarn "Removal of libudev.so.0 will effectively break any active Xorg sessions, and"
 	ewarn "will probably have repercussions with other software as well.  A revdep-rebuild"
 	ewarn "is required to resolve these issues."
 	ewarn ""
-	ewarn "We apologize for the inconvenience that this will cause."
+	ewarn "Add USE=legacy-libudev to tell eudev to install a copy of libudev.so.0, if"
+	ewarn "you wish to continue to use your system while migrating to libudev.so.1"
 	fi
 }
 
@@ -106,13 +101,13 @@ pkg_setup()
 		eerror "for this version of udev."
 		eerror "You must upgrade your kernel or downgrade udev."
 	fi
+
+	# for USE=legacy-libudev
+	QA_SONAME_NO_SYMLINK="$(get_libdir)/libudev.so.0"
 }
 
 src_prepare()
 {
-	epatch "${FILESDIR}"/${P}-include-all-search-paths.patch
-	epatch "${FILESDIR}"/${P}-fix-modprobe-call.patch
-
 	# change rules back to group uucp instead of dialout for now
 	sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
 		-i rules/*.rules \
@@ -159,6 +154,7 @@ src_configure()
 		$(use_enable modutils modules)
 		$(use_enable selinux)
 		$(use_enable static-libs static)
+		$(use_enable legacy-libudev legacylib)
 	)
 	econf "${econf_args[@]}"
 }
@@ -170,13 +166,8 @@ src_install()
 	prune_libtool_files --all
 	rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
 
-	# place the keymaps in /$(libdir)/udev instead of /etc
-	# (fixed upstream but don't want to have to autoreconf)
-	use keymap && \
-	mv "${ED}"/etc/udev/keymaps "${ED}"/$(get_libdir)/udev/keymaps
-
 	# install gentoo-specific rules
-	insinto /usr/lib/udev/rules.d
+	insinto /lib/udev/rules.d
 	doins "${FILESDIR}"/40-gentoo.rules
 }
 
@@ -218,9 +209,16 @@ pkg_postinst()
 		einfo "Removed unneeded file 64-device-mapper.rules"
 	fi
 
+	if use hwdb ; then
+		# drop distributed hwdb files and build hwdb.bin
+		rm -f "${EROOT}"etc/udev/hwdb.d/*.hwdb
+		udevadm hwdb --update
+	fi
+
 	ewarn
 	ewarn "You need to restart eudev as soon as possible to make the"
-	ewarn "upgrade go into effect."
+	ewarn "upgrade go into effect:"
+	ewarn "\t/etc/init.d/udev --nodeps restart"
 
 	elog
 	elog "For more information on eudev on Gentoo, writing udev rules, and"
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index a2920271737f..e045dda8e120 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-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/eudev/eudev-9999.ebuild,v 1.11 2013/01/21 21:25:44 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.12 2013/01/22 21:16:58 axs Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ then
 	EGIT_REPO_URI="git://github.com/gentoo/eudev.git"
 	inherit git-2
 else
-	SRC_URI="https://github.com/downloads/gentoo/${PN}/${P}.tar.gz"
+	SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
 fi
 
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/gentoo/eudev"
 
 LICENSE="LGPL-2.1 MIT GPL-2"
 SLOT="0"
-IUSE="doc gudev hwdb kmod introspection keymap +modutils +openrc selinux static-libs"
+IUSE="doc gudev hwdb kmod introspection keymap +modutils +openrc selinux static-libs legacy-libudev"
 
 RESTRICT="test"
 
@@ -43,7 +43,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt"
 
 RDEPEND="${COMMON_DEPEND}
-	hwdb? ( sys-apps/hwids )
+	hwdb? ( >=sys-apps/hwids-20121202.2[udev] )
 	openrc? ( >=sys-fs/udev-init-scripts-18 )
 	!sys-fs/udev
 	!sys-apps/coldplug
@@ -65,20 +65,16 @@ udev_check_KV()
 
 pkg_pretend()
 {
-	if has_version "<sys-fs/udev-180"; then
-	ewarn "This version of eudev does not contain the libudev.so.0 library."
-	ewarn "Although we try to ensure that library file is preseved, this will not work"
-	ewarn "if you manually --unmerge your current version of sys-fs/udev prior to "
-	ewarn "emerging this package, as may be necessary to resolve blockages."
+	if has_version "<sys-fs/udev-180" && ! use legacy-libudev; then
+	ewarn "This version of eudev does not contain the libudev.so.0 library by "
+	ewarn "default.  This is an issue when migrating from sys-fs/udev-180 or older."
 	ewarn ""
-	ewarn "When migrating from udev please emerge sys-fs/eudev-0 before upgrading to this"
-	ewarn "version"
-	ewarn ""
-	ewarn "Removal of libudev.so.0 will effectively break any active Xorg sessions, and "
+	ewarn "Removal of libudev.so.0 will effectively break any active Xorg sessions, and"
 	ewarn "will probably have repercussions with other software as well.  A revdep-rebuild"
 	ewarn "is required to resolve these issues."
 	ewarn ""
-	ewarn "We apologize for the inconvenience that this will cause."
+	ewarn "Add USE=legacy-libudev to tell eudev to install a copy of libudev.so.0, if"
+	ewarn "you wish to continue to use your system while migrating to libudev.so.1"
 	fi
 }
 
@@ -105,6 +101,9 @@ pkg_setup()
 		eerror "for this version of udev."
 		eerror "You must upgrade your kernel or downgrade udev."
 	fi
+
+	# for USE=legacy-libudev
+	QA_SONAME_NO_SYMLINK="$(get_libdir)/libudev.so.0"
 }
 
 src_prepare()
@@ -140,11 +139,11 @@ src_configure()
 		DBUS_CFLAGS=' '
 		DBUS_LIBS=' '
 		--with-rootprefix="${EROOT}"
-		--docdir="${EROOT}/usr/share/doc/${PF}"
-		--libdir="${EROOT}/usr/$(get_libdir)"
-		--with-firmware-path="${EROOT}/usr/lib/firmware/updates:${EROOT}/usr/lib/firmware:${EROOT}/lib/firmware/updates:${EROOT}/lib/firmware"
-		--with-html-dir="${EROOT}/usr/share/doc/${PF}/html"
-		--with-rootlibdir="${EROOT}/$(get_libdir)"
+		--docdir="${EROOT}usr/share/doc/${PF}"
+		--libdir="${EROOT}usr/$(get_libdir)"
+		--with-firmware-path="${EROOT}usr/lib/firmware/updates:${EROOT}usr/lib/firmware:${EROOT}lib/firmware/updates:${EROOT}lib/firmware"
+		--with-html-dir="${EROOT}usr/share/doc/${PF}/html"
+		--with-rootlibdir="${EROOT}$(get_libdir)"
 		--exec-prefix="${EROOT}"
 		--enable-split-usr
 		$(use_enable doc gtk-doc)
@@ -155,6 +154,7 @@ src_configure()
 		$(use_enable modutils modules)
 		$(use_enable selinux)
 		$(use_enable static-libs static)
+		$(use_enable legacy-libudev legacylib)
 	)
 	econf "${econf_args[@]}"
 }
@@ -167,7 +167,7 @@ src_install()
 	rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
 
 	# install gentoo-specific rules
-	insinto /usr/lib/udev/rules.d
+	insinto /lib/udev/rules.d
 	doins "${FILESDIR}"/40-gentoo.rules
 }
 
@@ -175,9 +175,9 @@ pkg_preinst()
 {
 	local htmldir
 	for htmldir in gudev libudev; do
-		if [[ -d ${EROOT}/usr/share/gtk-doc/html/${htmldir} ]]
+		if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]
 		then
-			rm -rf "${EROOT}"/usr/share/gtk-doc/html/${htmldir}
+			rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
 		fi
 		if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]
 		then
@@ -189,12 +189,12 @@ pkg_preinst()
 
 pkg_postinst()
 {
-	mkdir -p "${EROOT}"/run
+	mkdir -p "${EROOT}"run
 
 	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
 	# So try to remove it here (will only work if empty).
-	rmdir "${EROOT}"/dev/loop 2>/dev/null
-	if [[ -d ${EROOT}/dev/loop ]]
+	rmdir "${EROOT}"dev/loop 2>/dev/null
+	if [[ -d ${EROOT}dev/loop ]]
 	then
 		ewarn "Please make sure you remove /dev/loop,"
 		ewarn "else losetup may be confused when looking for unused devices."
@@ -202,16 +202,23 @@ pkg_postinst()
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
 	# remove it if user don't has sys-fs/device-mapper installed, 27 Jun 2007
-	if [[ -f ${EROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
+	if [[ -f ${EROOT}etc/udev/rules.d/64-device-mapper.rules ]] &&
 		! has_version sys-fs/device-mapper
 	then
-		rm -f "${EROOT}"/etc/udev/rules.d/64-device-mapper.rules
+		rm -f "${EROOT}"etc/udev/rules.d/64-device-mapper.rules
 		einfo "Removed unneeded file 64-device-mapper.rules"
 	fi
 
+	if use hwdb ; then
+		# drop distributed hwdb files and build hwdb.bin
+		rm -f "${EROOT}"etc/udev/hwdb.d/*.hwdb
+		udevadm hwdb --update
+	fi
+
 	ewarn
 	ewarn "You need to restart eudev as soon as possible to make the"
-	ewarn "upgrade go into effect."
+	ewarn "upgrade go into effect:"
+	ewarn "\t/etc/init.d/udev --nodeps restart"
 
 	elog
 	elog "For more information on eudev on Gentoo, writing udev rules, and"
diff --git a/sys-fs/eudev/files/eudev-1_beta1-fix-modprobe-call.patch b/sys-fs/eudev/files/eudev-1_beta1-fix-modprobe-call.patch
deleted file mode 100644
index 12bb57d242e7..000000000000
--- a/sys-fs/eudev/files/eudev-1_beta1-fix-modprobe-call.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/libudev/util.c b/src/libudev/util.c
-index d8c5bb2..92fd227 100644
---- a/src/libudev/util.c
-+++ b/src/libudev/util.c
-@@ -4312,7 +4312,7 @@ int execute_command(const char *command, char *const argv[])
- 
-         if (pid == 0) {
- 
--                execv(command, argv);
-+                execvp(command, argv);
- 
-                 log_error("Failed to execute %s: %m", command);
-                 _exit(EXIT_FAILURE);
-diff --git a/src/udev/udev-builtin-kmod.c b/src/udev/udev-builtin-kmod.c
-index 89c7ab0..300090a 100644
---- a/src/udev/udev-builtin-kmod.c
-+++ b/src/udev/udev-builtin-kmod.c
-@@ -68,7 +68,7 @@ static int load_module(struct udev *udev, char *const alias)
-         kmod_module_unref_list(list);
-         return err;
- #else
--	char * const argv[] = { "-bq", alias, 0 };
-+	char * const argv[] = { MODPROBE, "-bq", alias, 0 };
- 	return execute_command(MODPROBE, argv);
- #endif
- }
\ No newline at end of file
diff --git a/sys-fs/eudev/files/eudev-1_beta1-include-all-search-paths.patch b/sys-fs/eudev/files/eudev-1_beta1-include-all-search-paths.patch
deleted file mode 100644
index 9068bd7a57b7..000000000000
--- a/sys-fs/eudev/files/eudev-1_beta1-include-all-search-paths.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/src/udev/Makefile.in	2012-12-08 10:20:52.000000000 -0500
-+++ b/src/udev/Makefile.in	2012-12-12 11:19:34.000000000 -0500
-@@ -371,6 +371,7 @@
- 	-DROOTPREFIX=\"$(rootprefix)\" \
- 	-DUDEV_HWDB_DIR=\"$(udevhwdbdir)\" \
- 	-DUDEV_HWDB_BIN=\"$(udevhwdbbin)\" \
-+	-DUDEV_CONF_DIR=\"$(udevconfdir)\" \
- 	-DUDEV_RULES_DIR=\"$(udevrulesdir)\" \
- 	-DUDEV_LIBEXEC_DIR=\"$(udevlibexecdir)\" \
- 	-I $(top_srcdir)/src/libudev
---- a/src/udev/udev-event.c
-+++ b/src/udev/udev-event.c
-@@ -687,10 +687,13 @@ int udev_event_spawn(struct udev_event *event,
-         }
- 
-         /* allow programs in /usr/lib/udev/ to be called without the path */
-+	/* NOTE - paths need reworking, see note in udev-rules.c */
-         if (argv[0][0] != '/') {
-                 util_strscpyl(program, sizeof(program), UDEV_LIBEXEC_DIR "/", argv[0], NULL);
- #ifdef HAVE_SPLIT_USR
-                 if(access(program, X_OK))
-+                        util_strscpyl(program, sizeof(program), "/usr/lib/udev/", argv[0], NULL);
-+                if(access(program, X_OK))
-                         util_strscpyl(program, sizeof(program), "/lib/udev/", argv[0], NULL);
- #endif
-                 argv[0] = program;
---- a/src/udev/udev-rules.c
-+++ b/src/udev/udev-rules.c
-@@ -1600,11 +1600,28 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
-         if (!rules->strbuf)
-                 return udev_rules_unref(rules);
- 
--        rules->dirs = strv_new(UDEV_RULES_DIR,
-+	/* Note - need a better way to manage these paths:
-+	 * ie, should have a list of paths we always support, and
-+	 * do not include the #define vars if they are duplicates
-+	 *
-+	 * original - UDEV_RULES_DIR should be /etc/udev/rules.d
-+	 * ..but we have it set to UDEV_LIBEXEC_DIR "/rules.d" so that
-+	 * ..the default rules are installed there instead of in /etc
-+	 * 
-+	 * original2 - UDEV_LIBEXEC_DIR used to be forced to /usr/lib/udev
-+	 * ..by default, we have it as /lib/udev (or whatever rootlibdir is)
-+	 * ..therefore we did not include /usr/lib/udev/rules.d.
-+	 * 
-+	 * Reworked code; there are duplicate paths here but at least
-+	 * everyting is listed.
-+	 */
-+        rules->dirs = strv_new(UDEV_CONF_DIR "/rules.d",
-+                               UDEV_RULES_DIR,
-                                "/run/udev/rules.d",
-                                UDEV_LIBEXEC_DIR "/rules.d",
- #ifdef HAVE_SPLIT_USR
-                                "/lib/udev/rules.d",
-+                               "/usr/lib/udev/rules.d",
- #endif
-                                NULL);
-         if (!rules->dirs) {
diff --git a/sys-fs/eudev/metadata.xml b/sys-fs/eudev/metadata.xml
index 62934604c157..75f0504d1b0e 100644
--- a/sys-fs/eudev/metadata.xml
+++ b/sys-fs/eudev/metadata.xml
@@ -38,10 +38,6 @@
   <flag name="kmod">enable module loading through libkmod (requires modules)</flag>
   <flag name="modutils">enable module loading support</flag>
   <flag name="openrc">install the OpenRC init scripts</flag>
-  <flag name="rule_generator">for eudev-0: enable persistent network and optical device rule generator</flag>
-  <flag name="floppy">for eudev-0: create historical floppy kernel device nodes (/dev/fd0h1440, ...)</flag>
-  <flag name="edd">for eudev-0: create /dev/disk/by-id/edd-* links for BIOS EDD data</flag>
-  <flag name="action_modeswitch">for eudev-0: switch Mobile Action cables into serial mode</flag>
-  <flag name="extras">for eudev-0: Compile udev-extras requiring external dependencies</flag>
+  <flag name="legacy-libudev">install libudev.so.0 to help with migration from udev-179 or older</flag>
 </use>
 </pkgmetadata>