From 33680e8beabc4c8c0b75b4d39be0de947c807194 Mon Sep 17 00:00:00 2001
From: "Anthony G. Basile" <blueness@gentoo.org>
Date: Sat, 25 Jan 2014 17:28:03 +0000
Subject: Fix bug #499236

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA
---
 sys-fs/eudev/ChangeLog           |   8 +-
 sys-fs/eudev/Manifest            |  32 ++---
 sys-fs/eudev/eudev-1.4-r1.ebuild | 280 +++++++++++++++++++++++++++++++++++++++
 sys-fs/eudev/eudev-1.4.ebuild    | 277 --------------------------------------
 sys-fs/eudev/eudev-9999.ebuild   |   5 +-
 5 files changed, 307 insertions(+), 295 deletions(-)
 create mode 100644 sys-fs/eudev/eudev-1.4-r1.ebuild
 delete mode 100644 sys-fs/eudev/eudev-1.4.ebuild

(limited to 'sys-fs/eudev')

diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog
index 37b89141cdb1..0c81ffb9bae6 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.85 2014/01/18 19:53:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.86 2014/01/25 17:27:51 blueness Exp $
+
+*eudev-1.4-r1 (25 Jan 2014)
+
+  25 Jan 2014; Anthony G. Basile <blueness@gentoo.org> +eudev-1.4-r1.ebuild,
+  -eudev-1.4.ebuild, eudev-9999.ebuild:
+  Fix bug #499236
 
   18 Jan 2014; Agostino Sarubbo <ago@gentoo.org> eudev-1.3.ebuild:
   Stable for alpha, wrt bug #487238
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index f3c6db11cebe..e51302a5aff5 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -14,24 +14,24 @@ EBUILD eudev-1.1.ebuild 6459 SHA256 c9f011d52c23511d4186813b3ccacf23086188657bcd
 EBUILD eudev-1.2-r1.ebuild 7831 SHA256 64e04905164c2563caec4ab0bd3534f11250e6698b4e747838ef9fa0806556d8 SHA512 33d48b5d5cc724a43a6f196347d575e00a385a676793830a195d81014a5aa6392bb7ed74409d601e4b5505fa17ff2a14060e77be2bc4088a4ea6096cdf6fd9bb WHIRLPOOL 09c53f350519345c9059eafab46a75ea41dac34621f3ce1cbad200d97b5218d3ebfbb7ba94f62b3c41d78e1ddd64a1465ea9996eba465252448e5d269c08f4d1
 EBUILD eudev-1.2.ebuild 6875 SHA256 0b1f3e857e95748cccba297fb54199af85f2644d0feb6d50a94774498a170dee SHA512 63ac1c3303ee3b754bff194b3c653642ae7f338c5201e8777040c2f6debcfdd8470a048e825f0b43e49439e0e4082e8041aa13c1dba777248a3bd22f2bc44d6a WHIRLPOOL 896d28327c5780a3fb3597e03902bf5aa19bb8a654dab5e0c1d4ea12d043c22e8d1a0b6e77324370db2ae3b9380aed8abadff8ceef72f19ab300eeed951d1cf7
 EBUILD eudev-1.3.ebuild 7931 SHA256 49afcc11c1aca7b3abdfed1763a12fee324ad74359131c8ae1cad31c312370f5 SHA512 c4eb65827642810dfb8898ff342d93114c9bcbbf05365d1600f84706d885eef92722c5ae0ee6c6c8e0d999bf1e4cdf690f3f17cc3c8ae669f199d026432f9555 WHIRLPOOL 9b6d28c003b78163b51048ae19f28630a38fc534d4a0b2456c5f5ceed5fada71ea59f996409c59863355346d222530ea25b2a9e82bf8cbaea73244933db5b09f
-EBUILD eudev-1.4.ebuild 7883 SHA256 87d52aee49660cdf54fbadfe5138de3391bd527e33cfd3dc1a196fd7342b5637 SHA512 38cc383875e1f2244faca0236d7d77805ff36a8a45978950e6637b2102d0f6457a227127b12e709898130966e49a24c030e97ab8d3472d282089d22deb711500 WHIRLPOOL dcacefa727efa1e2d454d09ca756f72c7e3710d5dd9f9c78206c9d5ae8fd67f275e26169190baa309147d6649f82bbecb281b640e9ca20445d258e49b1bdf1df
-EBUILD eudev-9999.ebuild 7885 SHA256 2bd9eb658484752cc8a74bf8ffe4538f696bc60d84f19a97069856d48693d8bc SHA512 9eb3f558803810c73a2b2628673ffc907b8a43817677cc06644098bd85dc406e22f5f247d0bc46924819e86a76580dc892f5b5816596761c4b6bf830a1d0e899 WHIRLPOOL 97cbfd422e7c80436e962c1309434301d11651e778d6c93530672d536c891a343fbd45c02328e246182e55813d946f5a1946cc73dc5306da39b752395e67f538
-MISC ChangeLog 13054 SHA256 7d4e41f30685c0f74440349e06ed4a1af2a9ca9940f7a3ec65692f59b6d1339e SHA512 e541582dda4b976c3e594492d705f6d1c6028aba2c6ae87357d1acf5eb0f4ce8ba0b63a75c3533909668bb0a12c75be5d551e9f569cbb09647bc61bdc843d0b3 WHIRLPOOL bc81b877b10ce9db7822fe0c0aa7774c5d905ba14efffdc08bc3197fb3efb18b96996f355a05146dca1dbecaab99468676c8cd8c592a081e38b5959075d4d015
+EBUILD eudev-1.4-r1.ebuild 7951 SHA256 8c3534cc148093f506f403a2d148de4b2218d70e177816a4052a35f09b3231e5 SHA512 f76bd152ea192c954448631a8d2f48cfc01d47b80893e5686271da7910cec1cba8669fec149aa5d7366702e77dab9df2fd19c6d403f4690b4eecfd7c067d9827 WHIRLPOOL 6a6f751ada95d1be23f4cef16acb793c2d1d16e0556cfb8fba0c0c4a142c6dc540c08d40e51c32c191709a156bc13bbb9540a73b0738c1417e4fba85689e8107
+EBUILD eudev-9999.ebuild 7950 SHA256 27876275702b6ddf3af6b68dd7df50fc093c553deb7d51715e095271c12c0cc2 SHA512 492eaa88f95b31c8d2c5d7b018960d4a06256358afd64b32f232eac418109c89241cf8f73bac8763918b5369455ae68d70f95ae778db6763e77fc4943efa5109 WHIRLPOOL 20b58257342c4c3b1cacd951b2fe4dd54d6011ec48c569238de96bbb84b22771a6e0d6eb4075dab41d9c4686da25ee8d67e85540e08a214f791d09dbac1428e2
+MISC ChangeLog 13224 SHA256 091ace803dfb5195d92cefb315ea79eeaffcb3e3027bc86e26a034645f81980b SHA512 2b95544e7f069bafb83abc7c5062ab0b5202aafd20f6c7169bc99cf832a56e7b979970dcb898e2a5ba1f8c93c359e9b5faf119573ed790bb9a72bc108e1bb869 WHIRLPOOL f3cfbc347305aaf37dc9329b01352574f4db361838bdf945c1f27000567e1f242ba05178a4f745f43115a6a261e63826126b3c769819903e1ebc8cf4afd1ccfa
 MISC metadata.xml 978 SHA256 273446e57cfba7f612e72c3dcc2e1b93ac0003f878c504aa72daa762f2cdbba5 SHA512 244dc230cf7123afef2c4c0f0caa418bbc621f3da0e6303f7cecfb4f3cc53290fcf0adddf2d176ff208991a5bb27801c5c9f6ad5ea3bada513f7ebb22d02d06a WHIRLPOOL e39a5caec32bcd404eb2fdb54e3abff5631f7115786d039a6f2f04a8503e445f971a993dedd0564022e148133e2f15c4579b3cc664ffd393003a858ac77166c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS2tvDAAoJELp701BxlEWfATQP+wUAtuaeBig1PTIXV9hF4sS5
-pmPhrBkM3Zua1Aq6p2KYWFXYHA80JYJwB7djKsLt81Y3emC5M6P0ZzEbq82QrUtS
-bNfi4FE7uK8ApMiGgTdzeCZ486AfKwiAaR+bOv4GRlMNg1zSE4t9hzQlZwVoyA/E
-jN3J8HRr1BK80FACe5BO0ZBUXpNEQSWOKL70uEcsw1m6hzQJKvME14r+a1CUSYh3
-bpXfBp0N3xsEPZGSea5TNcumu1N4Kur1q+7T+7R656+m7uNAPr/z3QXRHAQ2Oqwq
-t7/pKXKzrXS+2XzXsPMR3SJqXAluKxDlOHImHLTfG4gPBE2ItexxJ4Wpmf8gH8hA
-Cw007cFz352Hqv503QOenDtV9Pz0hUS0SWoZiRmuCcJxKcJJiO8ZmiKuL3xz782i
-vRxk6RgibAnkbFz1eGozBrIbsDgQF14p9ea8xjkyr6jYTyjo9jCg6goUvuaRKP2x
-B5uWivON731MBBPHNXg5/c2TN+LUQc6UWK5a3WY0h9H67l8TRmjDFovxCywJco7q
-BakzxLjhN1/z/L9I7KvHw23UTAO6GrkCrB8ZKrTHaCMbA4hQr+IBgPwE5tql09bJ
-A76s2lPBb7WMDnB0xue921xZk1bDSFbyGgpWGRhpQjAECLhshBZQjak0GIVVUxRu
-0Wq+3y6nRc6hrZH1+roo
-=W17q
+iQIcBAEBCAAGBQJS4/QsAAoJEJOE+m71LUu6cpQP/j2DPsU8JgqIRvWzWRanfzYT
+a62DnPHdTqL5W9+79IgYyffOzHdkUAHmHYZirSOp5nZv9X76qjKywQjmKmRAOhRY
+CHOPA/sev86d6Cp6Mi1CX5F8J8XquuRNQhj5cgPCsVXnVr8SHt4XlyBJ0H9oydyb
+JhOdFVSrgCIUXSg1/SiehsOhZDCcYoLrfSoxpOatUeFCM77E/K3Iid1dWvafdvuN
+9AWWjQuq2nCUQz2tjSGiua9fsCBCKVcRk3zRX/ucAHNe8CJGvguYUWtxgiQfpUKG
+VnOffQKWM16tvDNjGpDUFxatL7NgexjGgUoCNYUp+vT2gNGJ716PcRH51NiS9kKo
+RhLZdPr2S+anONxNmtksweWTJx8f01WGqMNJ/DL5cHE1mnGsfDbkf+IfDPI/nELn
+JicSzDBb/LlKbSJO1nhZrhufiw56leOReG/gSzW8v2Nem60KhawmBhhHJbEsMeIM
+kPQLAKxy85Hgvzla/1NobkDmBgmTAvmDqgwcMGWehGKhEallVFzP/nGiIH9vT9WU
+KHVg4NEMvAXXjnalv+otJQfTdjHT8jMfmwreS3IS/0otcKPkLqusnQkjjX5+8dcV
+bXihsE33YevA3Ff4kiH48LZPz81rTiWZL0/gaFzdLaMqwB0cE+I0GUsuD7B9OiNP
+6u+p9O7HGsdEyJvEYBet
+=6q5c
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/eudev/eudev-1.4-r1.ebuild b/sys-fs/eudev/eudev-1.4-r1.ebuild
new file mode 100644
index 000000000000..4ac7510ce780
--- /dev/null
+++ b/sys-fs/eudev/eudev-1.4-r1.ebuild
@@ -0,0 +1,280 @@
+# 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.4-r1.ebuild,v 1.1 2014/01/25 17:27:51 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="gudev? ( dev-libs/glib:2 )
+	kmod? ( sys-apps/kmod )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+	selinux? ( sys-libs/libselinux )
+	>=sys-apps/util-linux-2.20
+	!<sys-libs/glibc-2.11
+	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
+	!<sys-kernel/linux-headers-${KV_min}
+	doc? ( dev-util/gtk-doc )
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	test? ( app-text/tree dev-lang/perl )"
+
+RDEPEND="${COMMON_DEPEND}
+	!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"
+
+PDEPEND="hwdb? ( >=sys-apps/hwids-20130717-r1[udev] )
+	keymap? ( >=sys-apps/hwids-20130717-r1[udev] )
+	>=virtual/udev-206-r2
+	openrc? ( >=sys-fs/udev-init-scripts-18 )"
+
+REQUIRED_USE="keymap? ( hwdb )"
+
+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()
+{
+	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}."
+		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()
+{
+	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=/
+	)
+
+	# 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 gudev)
+		$(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,gudev,introspection,keymap,libkmod,modules,static,selinux,rule-generator})
+		)
+	fi
+	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
+}
+
+multilib_src_compile()
+{
+	if ! multilib_build_binaries; then
+		cd src/libudev || die "Could not change directory"
+	fi
+	emake
+}
+
+multilib_src_install()
+{
+	if ! multilib_build_binaries; then
+		cd src/libudev || die "Could not change directory"
+	fi
+	emake DESTDIR="${D}" install
+}
+
+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
+}
+
+# disable header checks because we only install libudev headers for non-native abi
+multilib_check_headers()
+{
+	:
+}
+
+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 you remove /dev/loop, else losetup"
+		ewarn "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; 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-1.4.ebuild b/sys-fs/eudev/eudev-1.4.ebuild
deleted file mode 100644
index 7c2c7aa324ba..000000000000
--- a/sys-fs/eudev/eudev-1.4.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# 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.4.ebuild,v 1.1 2014/01/15 00:09:16 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="gudev? ( dev-libs/glib:2 )
-	kmod? ( sys-apps/kmod )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
-	selinux? ( sys-libs/libselinux )
-	>=sys-apps/util-linux-2.20
-	!<sys-libs/glibc-2.11
-	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
-	!<sys-kernel/linux-headers-${KV_min}
-	doc? ( dev-util/gtk-doc )
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	test? ( app-text/tree dev-lang/perl )"
-
-RDEPEND="${COMMON_DEPEND}
-	!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"
-
-PDEPEND="hwdb? ( >=sys-apps/hwids-20130717-r1[udev] )
-	keymap? ( >=sys-apps/hwids-20130717-r1[udev] )
-	>=virtual/udev-206-r2
-	openrc? ( >=sys-fs/udev-init-scripts-18 )"
-
-REQUIRED_USE="keymap? ( hwdb )"
-
-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()
-{
-	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}."
-		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()
-{
-	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=/
-	)
-
-	# 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 gudev)
-		$(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,gudev,introspection,keymap,libkmod,modules,static,selinux,rule-generator})
-		)
-	fi
-	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
-}
-
-multilib_src_compile()
-{
-	if ! multilib_build_binaries; then
-		cd src/libudev || die "Could not change directory"
-	fi
-	emake
-}
-
-multilib_src_install()
-{
-	if ! multilib_build_binaries; then
-		cd src/libudev || die "Could not change directory"
-	fi
-	emake DESTDIR="${D}" install
-}
-
-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
-}
-
-# disable header checks because we only install libudev headers for non-native abi
-multilib_check_headers()
-{
-	:
-}
-
-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
-}
-
-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 you remove /dev/loop, else losetup"
-		ewarn "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; 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 a5f185c73fe6..f6cfa2e80cc6 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.42 2014/01/15 00:09:16 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.43 2014/01/25 17:27:51 blueness Exp $
 
 EAPI="5"
 
@@ -204,6 +204,9 @@ multilib_src_install_all()
 
 	# 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()
-- 
cgit v1.2.3-65-gdbad