Version bump to 1.6

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

4 files changed, 358 insertions, 73 deletions

diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog
index f97f2972508d..4c033a717ea5 100644
--- a/sys-fs/eudev/ChangeLog
+++ b/sys-fs/eudev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/eudev
 # Copyright 1999- Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.100 2014/04/05 20:28:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.101 2014/04/15 23:10:20 blueness Exp $
+
+*eudev-1.6 (15 Apr 2014)
+
+  15 Apr 2014; Anthony G. Basile <blueness@gentoo.org> +eudev-1.6.ebuild,
+  eudev-9999.ebuild:
+  Version bump to 1.6
 
   05 Apr 2014; Jeroen Roovers <jer@gentoo.org> eudev-1.5.3-r1.ebuild:
   Stable for HPPA (bug #506078).
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 86809e44d70b..a8425efe3143 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -9,17 +9,29 @@ AUX udev-postmount 1207 SHA256 0220e949b1f31832a205021c0a8615e77b27b73b7c9b16ef4
 DIST eudev-1.3.tar.gz 1679385 SHA256 6f1f0b15971a53c7070a44c902c7c1303f952927aa6370dbdf4d84d8bc09fac2 SHA512 5e0016fbe15eebfa68bb04fa7b5aedd7edc7a508afdc030adb7cbec4e9eca84fe16119ca73f5724ec290ad4bba179b42d2d0bc56f3aaf2a07e3c48b18374b3b3 WHIRLPOOL db748742f9149b7a232b0d630a8734e81fb1077ed581fcde88f57f299b6746bcadec0bdd9e7ad914dae848ace9199c7d664006003dc4999af3bfa1e14099f366
 DIST eudev-1.4.tar.gz 1712371 SHA256 66da90fdd228444b7ac1868d36f1c0fe52476b966e766398bac7448e105c9f53 SHA512 5be490b3c29ae26c22f9dcf60df26e599ab4dd2841cccadd8bf204f6e6d8103e689708ab0ad484c30ba656c3a693f594fb38cd2eef3b4ece8727bdbeaf8dd4d4 WHIRLPOOL 3f448d1b87253f17c35c9268739fa3d01660192956d70d23c5ed3bbb983ecefb39cf193f8658019ecefce81706667022eaa0170cc6ba3a624fbeca9e148ac839
 DIST eudev-1.5.3.tar.gz 1724415 SHA256 8e4362979572719562f600bfd7decd42d4e21506db5483e3d2e88f725396c57b SHA512 c00f34d76d76ebd5c2862310a2ba3d7bf2f8d348a96e0120ed02aa9014857df736e3a2280a4478e50f2537cabc9082b8f5f5e57ef7b3cf925fae6dc3a4688ddb WHIRLPOOL b3fc943f6c3eaeba92aed72dee417738a840f4176182e08f7564a1fd34baa3cf2a52787ac8e936f74f6c13b7896eb929a2f83cf087b8b09e5b8c7d7858471dd5
+DIST eudev-1.6.tar.gz 1729499 SHA256 9d00d6925ccc7763be89472c5058012bd45ce13f14297e40e4cf3a02244a6a47 SHA512 036cb1f43447fd938f0ee93b03cb4cf2ff1e1e5adab6aeb042ef99b791d887165d15206fdb3a11f3b71ce0e3affaa446193da1574c3fc3d3495f6bc057c37927 WHIRLPOOL 31a106e57060987a1f67aebb35a459ef103743365265e973f306868b72f7a7ff024b0ab6af684e2495a90e41e87147b2a0ccfaa12a09e9e21d0aefa6068e0a63
 EBUILD eudev-1.3.ebuild 7914 SHA256 f57d07aba9f1a7bc84a0b76ac688761ceb2632c4b930d3fb98d808e121efeeec SHA512 865c91af87f2b3c91c0963a5c6bc1da6f6b9b3e519b5dea6a3170fe5f4d4f5dc44a5c84d19f05383f802a91dc249c65650c2051014d73fe86c7eedcc7b9695da WHIRLPOOL ac0c66c725665c4958f1ec34602f4ecc347cc5130d4ec3640b5098e3ffa28c44f72fa359a507e7b7a292b71901bbf0ca3dcb01b2aef491d2e76daec51b192219
 EBUILD eudev-1.4-r1.ebuild 7926 SHA256 dc5527b9ec52225551440eecb22951a4297b234c3b9e0903697f3c142773d8ec SHA512 797ff003314fd1c7488443f8207bae905ba92f0220fa470f23abf0dac50324935e855df9cc384d27aaf420cf69b59c64b0fff36bd6c42b2f4c164fc4780cad57 WHIRLPOOL e112de4793a9fe7084df9f10ab2084466bbbd13c7493ddfc2d2b802b0bbf5853fb176c7ba9e727b4b55c91dd5809096b9de6611c68d8b7fc87811bdd6e0d7da1
 EBUILD eudev-1.5.3-r1.ebuild 8116 SHA256 fe9c7ca7eb85ba9d5fecdf2f9c18485c4ee394cab36b1ea1762af4c6bea1ffaa SHA512 48600d9732c6b69bf85ad2a45ec4174280fc871bd4cfb0b735773ead3236bd62c28ee207de94b97e1cf7c122de14f290eff1d7e3670ba843b50fd3265d1f3f3e WHIRLPOOL 4ac5d4e56a714a2b8507b396920b77689dfd8d3a8bb1f8ed89c0590781ed9bf697929abaf195942d1415892d4c354ff50ce666113d309df62ced748672ea6874
 EBUILD eudev-1.5.3.ebuild 7925 SHA256 1815a64d8c7423e1b55bc1d4ed86f1c8d3c7e043370d567d19380b1af19d3d0a SHA512 c6c9bb9beab7a24b5e1ae6409fa4d4c355efade9d3964761f7a65aeac40b913996e32f644b68ab2d254ce7980f17304392595f6864647ce33f9f3f35d48a63fc WHIRLPOOL f2ef7d595214dc2de2408631602696e7a098e5d05d2f5f6286cce0140077829ad67b40cf806f46d263cb5bbc830d8d4f70ff6261934075e4fb3dd5ebb63b2bec
-EBUILD eudev-9999.ebuild 8114 SHA256 90a7e07a53e64861e7c72c93153d32d07e47573d9e979c4431d1c71a3ee02768 SHA512 aa616bd4cb7605e426991250fc0e959eec48c56778b67bc386583626af8bae00833f75ac69f69988ad39fbfa3f68d952784537764ef93b44d94caa778d07ce6b WHIRLPOOL 89f5d99ee690b101070e2b3d1a834aa309b1e7ef9e206b1bb2e817ed13c1548d020b0b4cf29563d87dd88a08cc66d16c59c5e7c6193ddaf900114feb83390e3a
-MISC ChangeLog 15318 SHA256 54ecc45a8b4638dffdc3ba610ae902fba2ac992a809722643c18b1857b240261 SHA512 e12c526f1040c9de9a412f881c48a5c3fa1f3d051d562274e4216d19b8534eee20a3383f272f3af9525f64c947d707cf90ed9d1cc07b5880dceb675d5a587e4d WHIRLPOOL 27201e04668b1938d81ebcc4cc764030f5036f0ffb7ba49debb3d069f691e22381fa390fd08fac1407ec9196bc0cbb3cc264b42c6794a4dd4df7916ecdfafb43
+EBUILD eudev-1.6.ebuild 8630 SHA256 807b4f9cbe8b2c383cc9b567679e065b6c803d69ed46e31651f1ece0f1882bf2 SHA512 8f5ce0b80c941ba382a5f854700c3bebcb2e01ccf6ee7d82b4c39c93b87ed8e96c36cd53519110d9bc10a9735488a1ae76a3ad7bbc3ba392441a510bc17e692f WHIRLPOOL 863b530bea4881bb3fa22d6c843e8a9762ea836013568d291f6c5943c27c23245203891f3959aa54dfacc43f89dd75ffc7668cfd1e1b5e2f4efcbe7a1c14f8e7
+EBUILD eudev-9999.ebuild 8632 SHA256 41dea8e8353ee5548a2912a07bfee2c9531dbc80c6b7739c9c57902883aee0c3 SHA512 6cba9f4fc4a4ed91a7f0adaa45ab91bf1acc18ccc31003154270493febba455bc3b07ec1145a03560fcfadf31ac3de9cadf443bc13ddefa56f136a1137a64d2b WHIRLPOOL d8b851739ab420ffa6fa770968a8d8787876aef4e8d99b3db751a0f324f7336ed6578eb47870bdab01f2be7885c29daf64a05b339780d69251f187fdc078ced7
+MISC ChangeLog 15467 SHA256 50a583dde14581557c3e131bf9912ab9ce310f0cf356da32c7809d628fca9ccc SHA512 ddb5323b04a4ccbfc3fd8efc0e3ec306efe6b7579a44ec11da73dd48fadafa5cbea04caecb1c46107e8b0fc29cd59017baadde6f542a5f723275ad2e1c078b49 WHIRLPOOL 7551ecd7066178b8a086d9f64105e221686994598994e198cbbc877b9f554d248340802bb79439e2aa85127a43afb753b42995eba3bc06084d89bc59a27e8a2f
 MISC metadata.xml 978 SHA256 273446e57cfba7f612e72c3dcc2e1b93ac0003f878c504aa72daa762f2cdbba5 SHA512 244dc230cf7123afef2c4c0f0caa418bbc621f3da0e6303f7cecfb4f3cc53290fcf0adddf2d176ff208991a5bb27801c5c9f6ad5ea3bada513f7ebb22d02d06a WHIRLPOOL e39a5caec32bcd404eb2fdb54e3abff5631f7115786d039a6f2f04a8503e445f971a993dedd0564022e148133e2f15c4579b3cc664ffd393003a858ac77166c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNAZ2IACgkQVWmRsqeSphPyuQCeLUSzAEUKj5xOsHFMNlk/ILfy
-6r4An08Lt5zeIvhEOu+VJg08z3cr9Qew
-=hs7e
+iQIcBAEBCAAGBQJTTbxmAAoJEJOE+m71LUu6cBMP/iSmfnK6ENKZ6BhDngJffwwU
+FCQssU3zfDtryeE4QINwytEccMT0KIdncyUN5RbiKFabNZ4EzmYbJtjKDwqiv8Th
+BRBzKoEbN87mRpHHAzvkAROA7mfBiskIjbHgvuMrDMhVtdrULpkDntY3fp6cYt/A
++2khg4ayvkFvdp0XqeMhTN7pSlVGze/WdfH9714EyavpAes18w2Kgg/yx7w6JXJV
+w9cNH+LZE8V0o7rHdREhz4dWRL5F7yV6Z61aBWBWGnYERpIkM9dcuyCq1MbnEkuj
+5xmaSAoY+hn8Ae9NAxfPbcLGaoLItka+nvJekR+jtpk8X86UhMZkhipK4uPNQi58
+hfEFfBy3F7ZgLR89VD+rfXn1ojxxqaaRTR321o5eOPYtMxkBTAwy45QpQE7gV33D
+NWs9OEFs+Ro+z+fb80wiKcMUI1Ae8XSCeRQ0KcsuY4pq+mvPppWgurNudODYDARF
+TymFzN07+2KesU1DuwA56GgU5oYfz7zOPvPF4bY0RTzGOUdl7MTby3fk3Wtq8Ci7
+GQLNsKw/zoEzUutbo7mH739o+EfhTSgMh3RN8SI5JrTm0tRN/JatLm4AgO7qULax
+N0LzelcuEC+kwQT3FP/goEluf+t9IEWitUfk/cvFRElmg7IIwWcw7xogAYF4Z2ip
+oi5bF9g7oP6AZBSYvecc
+=appI
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/eudev/eudev-1.6.ebuild b/sys-fs/eudev/eudev-1.6.ebuild
new file mode 100644
index 000000000000..93c90ae8083d
--- /dev/null
+++ b/sys-fs/eudev/eudev-1.6.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.6.ebuild,v 1.1 2014/04/15 23:10:20 blueness Exp $
+
+EAPI="5"
+
+KV_min=2.6.31
+
+inherit autotools eutils multilib linux-info multilib-minimal
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="git://github.com/gentoo/eudev.git"
+	inherit git-2
+else
+	SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="https://github.com/gentoo/eudev"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="doc gudev +hwdb kmod introspection +keymap +modutils +openrc +rule-generator selinux static-libs test"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.20
+	gudev? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+	kmod? ( >=sys-apps/kmod-16 )
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+	!<sys-libs/glibc-2.11
+	!sys-apps/gentoo-systemd-integration
+	!sys-apps/systemd
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${COMMON_DEPEND}
+	keymap? ( dev-util/gperf )
+	>=dev-util/intltool-0.40.0
+	virtual/os-headers
+	virtual/pkgconfig
+	!<sys-devel/make-3.82-r4
+	!<sys-kernel/linux-headers-${KV_min}
+	doc? ( >=dev-util/gtk-doc-1.18 )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=dev-util/intltool-0.50
+	test? ( app-text/tree dev-lang/perl )"
+
+RDEPEND="${COMMON_DEPEND}
+	!<sys-fs/lvm2-2.02.103
+	!<sec-policy/selinux-base-2.20120725-r10
+	!sys-fs/udev
+	!sys-apps/systemd
+	!<sys-fs/udev-init-scripts-26"
+
+PDEPEND="hwdb? ( >=sys-apps/hwids-20140304[udev] )
+	keymap? ( >=sys-apps/hwids-20140304[udev] )
+	openrc? ( >=sys-fs/udev-init-scripts-18 )"
+
+REQUIRED_USE="keymap? ( hwdb )"
+
+# The multilib-build.eclass doesn't handle situation where the installed headers
+# are different in ABIs. In this case, we install libgudev headers in native
+# ABI but not for non-native ABI.
+multilib_check_headers() { :; }
+
+pkg_pretend() {
+	if ! use rule-generator; then
+		ewarn
+		ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
+		ewarn "as described in the URL below:"
+		ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+		ewarn
+		ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
+		ewarn "between the default or user-modified choice of sys-fs/udev.  If you wish to disable"
+		ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
+		ewarn "exists:"
+		ewarn "\ttouch /etc/udev/rules.d/80-net-name-slot.rules"
+		ewarn
+		ewarn "We are working on a better solution for the next beta release."
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET"
+	linux-info_pkg_setup
+	get_running_version
+
+	# These are required kernel options, but we don't error out on them
+	# because you can build under one kernel and run under another.
+	if kernel_is lt ${KV_min//./ }; then
+		ewarn
+		ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
+		ewarn "Make sure to run udev under kernel version ${KV_min} or above."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# change rules back to group uucp instead of dialout for now
+	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
+	|| die "failed to change group dialout to uucp"
+
+	epatch_user
+
+	if [[ ! -e configure ]]; then
+		if use doc; then
+			gtkdocize --docdir docs || die "gtkdocize failed"
+		else
+			echo 'EXTRA_DIST =' > docs/gtk-doc.make
+		fi
+		eautoreconf
+	else
+		elibtoolize
+	fi
+}
+
+multilib_src_configure() {
+	tc-export CC #463846
+	export cc_cv_CFLAGS__flto=no #502950
+
+	# Keep sorted by ./configure --help and only pass --disable flags
+	# when *required* to avoid external deps or unnecessary compile
+	local econf_args
+	econf_args=(
+		ac_cv_search_cap_init=
+		ac_cv_header_sys_capability_h=yes
+		DBUS_CFLAGS=' '
+		DBUS_LIBS=' '
+		--with-rootprefix=
+		--docdir=/usr/share/doc/${PF}
+		--libdir=/usr/$(get_libdir)
+		--with-firmware-path="${EPREFIX}usr/lib/firmware/updates:${EPREFIX}usr/lib/firmware:${EPREFIX}lib/firmware/updates:${EPREFIX}lib/firmware"
+		--with-html-dir="/usr/share/doc/${PF}/html"
+		--enable-split-usr
+		--exec-prefix=/
+
+		$(use_enable gudev)
+	)
+
+	# Only build libudev for non-native_abi, and only install it to libdir,
+	# that means all options only apply to native_abi
+	if multilib_build_binaries; then
+		econf_args+=(
+			--with-rootlibdir=/$(get_libdir)
+			$(use_enable doc gtk-doc)
+			$(use_enable introspection)
+			$(use_enable keymap)
+			$(use_enable kmod libkmod)
+			$(usex kmod --enable-modules $(use_enable modutils modules))
+			$(use_enable static-libs static)
+			$(use_enable selinux)
+			$(use_enable rule-generator)
+		)
+	else econf_args+=(
+		$(echo --disable-{gtk-doc,introspection,keymap,libkmod,modules,static,selinux,rule-generator})
+		)
+	fi
+	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_build_binaries; then
+		emake
+	else
+		emake -C src/libudev
+		use gudev && emake -C src/gudev
+	fi
+}
+
+multilib_src_install() {
+	if multilib_build_binaries; then
+		emake DESTDIR="${D}" install
+	else
+		emake -C src/libudev DESTDIR="${D}" install
+		use gudev && emake -C src/gudev DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_test() {
+	# make sandbox get out of the way
+	# these are safe because there is a fake root filesystem put in place,
+	# but sandbox seems to evaluate the paths of the test i/o instead of the
+	# paths of the actual i/o that results.
+	# also only test for native abi
+	if multilib_build_binaries; then
+		addread /sys
+		addwrite /dev
+		addwrite /run
+		default_src_test
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+	rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
+
+	use rule-generator && use openrc && doinitd "${FILESDIR}"/udev-postmount
+
+	# drop distributed hwdb files, they override sys-apps/hwids
+	rm -f "${ED}"/etc/udev/hwdb.d/*.hwdb
+
+	insinto /lib/udev/rules.d
+	doins "${FILESDIR}"/40-gentoo.rules
+}
+
+pkg_preinst() {
+	local htmldir
+	for htmldir in gudev libudev; do
+		if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]; then
+			rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
+		fi
+		if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
+			dosym ../../doc/${PF}/html/${htmldir} \
+				/usr/share/gtk-doc/html/${htmldir}
+		fi
+	done
+}
+
+pkg_postinst() {
+	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 ]]; then
+		ewarn "Please make sure your remove /dev/loop,"
+		ewarn "else losetup may be confused when looking for unused devices."
+	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 [[ -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
+
+	if use hwdb && has_version 'sys-apps/hwids[udev]'; then
+		udevadm hwdb --update --root="${ROOT%/}"
+
+		# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+		# reload database after it has be rebuilt, but only if we are not upgrading
+		# also pass if we are -9999 since who knows what hwdb related changes there might be
+		if [[ ${REPLACING_VERSIONS%-r*} == ${PV} || -z ${REPLACING_VERSIONS} ]] && \
+		[[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
+			udevadm control --reload
+		fi
+	fi
+
+	ewarn
+	ewarn "You need to restart eudev as soon as possible to make the"
+	ewarn "upgrade go into effect:"
+	ewarn "\t/etc/init.d/udev --nodeps restart"
+
+	if use rule-generator && use openrc && \
+	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
+		ewarn
+		ewarn "Please add the udev-postmount init script to your default runlevel"
+		ewarn "to ensure the legacy rule-generator functionality works as reliably"
+		ewarn "as possible."
+		ewarn "\trc-update add udev-postmount default"
+	fi
+
+	elog
+	elog "For more information on eudev on Gentoo, writing udev rules, and"
+	elog "fixing known issues visit:"
+	elog "         http://www.gentoo.org/doc/en/udev-guide.xml"
+	elog
+}
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index 7e731b2574b7..31302676bea5 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-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-fs/eudev/eudev-9999.ebuild,v 1.47 2014/03/28 20:02:03 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.48 2014/04/15 23:10:20 blueness Exp $
 
 EAPI="5"
 
@@ -8,8 +8,7 @@ KV_min=2.6.31
 
 inherit autotools eutils multilib linux-info multilib-minimal
 
-if [[ ${PV} = 9999* ]]
-then
+if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="git://github.com/gentoo/eudev.git"
 	inherit git-2
 else
@@ -24,44 +23,52 @@ LICENSE="LGPL-2.1 MIT GPL-2"
 SLOT="0"
 IUSE="doc gudev +hwdb kmod introspection +keymap +modutils +openrc +rule-generator selinux static-libs test"
 
-COMMON_DEPEND="gudev? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-	kmod? ( sys-apps/kmod )
+COMMON_DEPEND=">=sys-apps/util-linux-2.20
+	gudev? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
 	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
-	selinux? ( sys-libs/libselinux )
-	>=sys-apps/util-linux-2.20
+	kmod? ( >=sys-apps/kmod-16 )
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
 	!<sys-libs/glibc-2.11
+	!sys-apps/gentoo-systemd-integration
+	!sys-apps/systemd
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 	)"
-
 DEPEND="${COMMON_DEPEND}
 	keymap? ( dev-util/gperf )
 	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
 	virtual/os-headers
+	virtual/pkgconfig
+	!<sys-devel/make-3.82-r4
 	!<sys-kernel/linux-headers-${KV_min}
-	doc? ( dev-util/gtk-doc )
+	doc? ( >=dev-util/gtk-doc-1.18 )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
+	>=dev-util/intltool-0.50
 	test? ( app-text/tree dev-lang/perl )"
 
 RDEPEND="${COMMON_DEPEND}
+	!<sys-fs/lvm2-2.02.103
+	!<sec-policy/selinux-base-2.20120725-r10
 	!sys-fs/udev
-	!sys-apps/coldplug
 	!sys-apps/systemd
-	!<sys-fs/lvm2-2.02.97
-	!sys-fs/device-mapper
-	!<sys-fs/udev-init-scripts-18"
+	!<sys-fs/udev-init-scripts-26"
 
-PDEPEND="hwdb? ( >=sys-apps/hwids-20130717-r1[udev] )
-	keymap? ( >=sys-apps/hwids-20130717-r1[udev] )
+PDEPEND="hwdb? ( >=sys-apps/hwids-20140304[udev] )
+	keymap? ( >=sys-apps/hwids-20140304[udev] )
 	openrc? ( >=sys-fs/udev-init-scripts-18 )"
 
 REQUIRED_USE="keymap? ( hwdb )"
 
-pkg_pretend()
-{
+# The multilib-build.eclass doesn't handle situation where the installed headers
+# are different in ABIs. In this case, we install libgudev headers in native
+# ABI but not for non-native ABI.
+multilib_check_headers() { :; }
+
+pkg_pretend() {
 	if ! use rule-generator; then
 		ewarn
 		ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
@@ -79,15 +86,13 @@ pkg_pretend()
 	fi
 }
 
-pkg_setup()
-{
+pkg_setup() {
+	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET"
 	linux-info_pkg_setup
 	get_running_version
 
 	# These are required kernel options, but we don't error out on them
 	# because you can build under one kernel and run under another.
-	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~SIGNALFD ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
-
 	if kernel_is lt ${KV_min//./ }; then
 		ewarn
 		ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
@@ -96,18 +101,15 @@ pkg_setup()
 	fi
 }
 
-src_prepare()
-{
+src_prepare() {
 	# change rules back to group uucp instead of dialout for now
 	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
 	|| die "failed to change group dialout to uucp"
 
 	epatch_user
 
-	if [[ ! -e configure ]]
-	then
-		if use doc
-		then
+	if [[ ! -e configure ]]; then
+		if use doc; then
 			gtkdocize --docdir docs || die "gtkdocize failed"
 		else
 			echo 'EXTRA_DIST =' > docs/gtk-doc.make
@@ -118,10 +120,13 @@ src_prepare()
 	fi
 }
 
-multilib_src_configure()
-{
-	local econf_args
+multilib_src_configure() {
+	tc-export CC #463846
+	export cc_cv_CFLAGS__flto=no #502950
 
+	# Keep sorted by ./configure --help and only pass --disable flags
+	# when *required* to avoid external deps or unnecessary compile
+	local econf_args
 	econf_args=(
 		ac_cv_search_cap_init=
 		ac_cv_header_sys_capability_h=yes
@@ -140,16 +145,17 @@ multilib_src_configure()
 
 	# Only build libudev for non-native_abi, and only install it to libdir,
 	# that means all options only apply to native_abi
-	if multilib_build_binaries; then econf_args+=(
-		--with-rootlibdir=/$(get_libdir)
-		$(use_enable doc gtk-doc)
-		$(use_enable introspection)
-		$(use_enable keymap)
-		$(use_enable kmod libkmod)
-		$(usex kmod --enable-modules $(use_enable modutils modules))
-		$(use_enable static-libs static)
-		$(use_enable selinux)
-		$(use_enable rule-generator)
+	if multilib_build_binaries; then
+		econf_args+=(
+			--with-rootlibdir=/$(get_libdir)
+			$(use_enable doc gtk-doc)
+			$(use_enable introspection)
+			$(use_enable keymap)
+			$(use_enable kmod libkmod)
+			$(usex kmod --enable-modules $(use_enable modutils modules))
+			$(use_enable static-libs static)
+			$(use_enable selinux)
+			$(use_enable rule-generator)
 		)
 	else econf_args+=(
 		$(echo --disable-{gtk-doc,introspection,keymap,libkmod,modules,static,selinux,rule-generator})
@@ -158,8 +164,7 @@ multilib_src_configure()
 	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
 }
 
-multilib_src_compile()
-{
+multilib_src_compile() {
 	if multilib_build_binaries; then
 		emake
 	else
@@ -168,8 +173,7 @@ multilib_src_compile()
 	fi
 }
 
-multilib_src_install()
-{
+multilib_src_install() {
 	if multilib_build_binaries; then
 		emake DESTDIR="${D}" install
 	else
@@ -178,8 +182,7 @@ multilib_src_install()
 	fi
 }
 
-multilib_src_test()
-{
+multilib_src_test() {
 	# make sandbox get out of the way
 	# these are safe because there is a fake root filesystem put in place,
 	# but sandbox seems to evaluate the paths of the test i/o instead of the
@@ -193,14 +196,7 @@ multilib_src_test()
 	fi
 }
 
-# disable header checks because we only install libudev headers for non-native abi
-multilib_check_headers()
-{
-	:
-}
-
-multilib_src_install_all()
-{
+multilib_src_install_all() {
 	prune_libtool_files --all
 	rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
 
@@ -213,33 +209,28 @@ multilib_src_install_all()
 	doins "${FILESDIR}"/40-gentoo.rules
 }
 
-pkg_preinst()
-{
+pkg_preinst() {
 	local htmldir
 	for htmldir in gudev libudev; do
-		if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]
-		then
+		if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]; then
 			rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
 		fi
-		if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]
-		then
+		if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
 			dosym ../../doc/${PF}/html/${htmldir} \
 				/usr/share/gtk-doc/html/${htmldir}
 		fi
 	done
 }
 
-pkg_postinst()
-{
+pkg_postinst() {
 	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 ]]
-	then
-		ewarn "Please make sure you remove /dev/loop, else losetup"
-		ewarn "may be confused when looking for unused devices."
+	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
 
 	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper