--- /usr/portage/sys-apps/util-linux/util-linux-2.22.2.ebuild	2013-03-28 22:01:29.000000000 +0400
+++ util-linux-2.22.2-r1.ebuild	2013-05-21 23:22:24.000000000 +0400
@@ -5,7 +5,7 @@
 EAPI="3"
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-inherit eutils toolchain-funcs libtool flag-o-matic
+inherit eutils toolchain-funcs libtool flag-o-matic systemd user
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-2 autotools
 	#KEYWORDS=""
@@ -27,7 +27,7 @@
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="+cramfs crypt ddate ncurses nls old-linux perl selinux slang static-libs +suid test udev unicode"
+IUSE="+cramfs crypt ddate ncurses nls old-linux perl selinux slang static-libs +suid test udev unicode uuidd"
 
 RDEPEND="!sys-process/schedutils
 	!sys-apps/setarch
@@ -96,6 +96,9 @@
 		$(use_with slang) \
 		$(use_enable static-libs static) \
 		$(use_with udev) \
+		$(use_enable uuidd) \
+		--enable-socket-activation \
+		$(systemd_with_unitdir) \
 		$(tc-has-tls || echo --disable-tls)
 }
 
@@ -112,9 +115,22 @@
 		newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die
 		newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop || die
 	fi
+
+	if use uuidd; then
+		keepdir /var/lib/uuidd
+		newinitd "${FILESDIR}"/uuidd.initd uuidd || die
+	fi
 }
 
 pkg_postinst() {
 	elog "The agetty util now clears the terminal by default.  You"
 	elog "might want to add --noclear to your /etc/inittab lines."
+
+	if use uuidd; then
+		enewgroup uuidd
+		enewuser uuidd -1 -1 /var/lib/uuidd uuidd
+		elog "Forcing proper permissions on"
+		elog "${ROOT}var/lib/uuidd"
+		chown uuidd:uuidd "${ROOT}var/lib/uuidd" || die "chown failed"
+	fi
 }