Backport multilib libgudev, bug #506002

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

3 files changed, 306 insertions, 15 deletions

diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog
index 660a5a6b7532..5686df2f54c7 100644
--- a/sys-fs/eudev/ChangeLog
+++ b/sys-fs/eudev/ChangeLog
@@ -1,6 +1,11 @@
 # 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.95 2014/03/27 22:57:43 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.96 2014/03/28 12:32:46 blueness Exp $
+
+*eudev-1.5.3-r1 (28 Mar 2014)
+
+  28 Mar 2014; Anthony G. Basile <blueness@gentoo.org> +eudev-1.5.3-r1.ebuild:
+  Backport multilib libgudev, bug #506002
 
   27 Mar 2014; Anthony G. Basile <blueness@gentoo.org> eudev-9999.ebuild:
   Install multilib libgudev, bug #506002
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 7acaed850a61..ef0fe357f85c 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -11,24 +11,25 @@ DIST eudev-1.4.tar.gz 1712371 SHA256 66da90fdd228444b7ac1868d36f1c0fe52476b966e7
 DIST eudev-1.5.3.tar.gz 1724415 SHA256 8e4362979572719562f600bfd7decd42d4e21506db5483e3d2e88f725396c57b SHA512 c00f34d76d76ebd5c2862310a2ba3d7bf2f8d348a96e0120ed02aa9014857df736e3a2280a4478e50f2537cabc9082b8f5f5e57ef7b3cf925fae6dc3a4688ddb WHIRLPOOL b3fc943f6c3eaeba92aed72dee417738a840f4176182e08f7564a1fd34baa3cf2a52787ac8e936f74f6c13b7896eb929a2f83cf087b8b09e5b8c7d7858471dd5
 EBUILD eudev-1.3.ebuild 7934 SHA256 8e5b74693deaab4c4951e53052f9f13d66373dff7096887c9b7e3fd7ae171bd1 SHA512 339118158dddac94ec550ff82c4bc402f7820e9d74e8ac0bc0ccb665095537e8d533872196998fc1b4412d4bef75651825749b7077783612fe30c5e238100f3d WHIRLPOOL fb2b7a7121e0fa31403d061ee3c7c39119daf960a5ad10ea115cca38e5b2f187d4c3de9ff1e764d15c50f00a3e9919f2deff6aeb7da940a78b13b7dd94115755
 EBUILD eudev-1.4-r1.ebuild 7951 SHA256 8c3534cc148093f506f403a2d148de4b2218d70e177816a4052a35f09b3231e5 SHA512 f76bd152ea192c954448631a8d2f48cfc01d47b80893e5686271da7910cec1cba8669fec149aa5d7366702e77dab9df2fd19c6d403f4690b4eecfd7c067d9827 WHIRLPOOL 6a6f751ada95d1be23f4cef16acb793c2d1d16e0556cfb8fba0c0c4a142c6dc540c08d40e51c32c191709a156bc13bbb9540a73b0738c1417e4fba85689e8107
+EBUILD eudev-1.5.3-r1.ebuild 8006 SHA256 2b602e2f813231674d45542e61a58d383805627a083422f41547a1515ffc6ce6 SHA512 e28dbb96470787f702e2186848f6ad5c3c08a69c2e531d0e8ae2ebcf1d7b568af691b6a658aa8733147f7e3029fbf528d5ccababa067c8a1d8327b6f8b5190dd WHIRLPOOL 8aa887079371245c0a919bdd29f70e564daec164c55fb63f399b34292f27fcc9d6cffe269731513ea0437b6c5a619a8eed4ddb9757481913debe21fad719d7c2
 EBUILD eudev-1.5.3.ebuild 7950 SHA256 126707f322176a4c4c267631172134ee4dbda0452b4358f815bcdc96de7e19e5 SHA512 c18c1cdc52f1c81732d0ce40849389d803bf7a102c99e8e751845da7d7cf5acf37eae9a9b3fd55310096d3e1097fb476044a03eea96bf0a36a9c86ff2e9a2fde WHIRLPOOL 00b76ce78fa06cf429e3b3f7ca1482ebd859e1527ee89b30d4daebfcb6bdf1744411c813dbf626fbdde98fb049a4ebc9a20abf688e3c036cfadfd3409af7e4e1
 EBUILD eudev-9999.ebuild 8003 SHA256 d7233b0821ed9e8a626b80c21e4dd3f74e468d13d00e3ef3db411df7fb7ff6af SHA512 50ea92dccf49e833c9b621b1d6ffed15aa4174085df64acdde2511bde6339fe6207b17ef4f60b46294f09381279b78bffc7a63b320f440664338ab22474eda4b WHIRLPOOL 6333ce303ead0e59af48b8fb8aea61c64e6123cde2e96de8d1b780d7dff707a48e1425619e97213fffe1099355cd23e7d14f80771c7198d562400570c69d877e
-MISC ChangeLog 14449 SHA256 3e90c1ccb3d656eae2026a07360786a529b4014de6cba15c857a5751372d5682 SHA512 2dafa765b33e77ab12b6b65e72c4343afb89e29b94b06e57b1db1343d993924ea75ece46559826d7ee3947c9a669e362abc87ff397a2b3165260645a24063709 WHIRLPOOL 224f766dfd57aacaf49ded739537f00455e71a9369ade3824eccdcf9384201cb8c1056ab7fbf40abe679a5d7104f9f696ab37e28e74135dfb5c1b47c68f82926
+MISC ChangeLog 14602 SHA256 4156bdaaf06ee56da056e7e109c73abbfe295e3a942ab819061137bd9f596046 SHA512 0428d24d9b5618094b9ad4c3320bca0df5ae4e91b07e3df6e1e08882690ad62ee7a839c1b715368d29844883e9c92acb738c327dbfc4e98d903237402058323d WHIRLPOOL 40c675ef39094bd3ab2232cccf86b8ba9628c90085a2a65dee567826f75a7ecc2e8063d1b25e28c55c337c97ce93b7f45ca94dd4e2aac885ebb5247cba467ab2
 MISC metadata.xml 978 SHA256 273446e57cfba7f612e72c3dcc2e1b93ac0003f878c504aa72daa762f2cdbba5 SHA512 244dc230cf7123afef2c4c0f0caa418bbc621f3da0e6303f7cecfb4f3cc53290fcf0adddf2d176ff208991a5bb27801c5c9f6ad5ea3bada513f7ebb22d02d06a WHIRLPOOL e39a5caec32bcd404eb2fdb54e3abff5631f7115786d039a6f2f04a8503e445f971a993dedd0564022e148133e2f15c4579b3cc664ffd393003a858ac77166c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTNK0ZAAoJEJOE+m71LUu64TgP/2j+pnymAzUAn6JILawMCzhs
-xZpJbAorgZQqF2CmS1yIgUE95hNBUl54E29PRLApi6txuq5ZqAlHH65Fc86uI7m9
-v1ZnK2vdO+Iriwzd4E/6v2PhTn1CuRSjTKxokqenEeTfwHxeuuqjKcbeZ7RWwXlM
-AhQwZ8g4bIZxTFLYWJl4q1OAYHTYMFFHO3iD1x9h51blkYt5jFzQX0s7leKB14m1
-mUN9DQrmEEwKbln7yUZN+RmLW+zxcvqgrF05Po8GQ+9M2rDcvptoS7d2uLj08gLQ
-3Ek8W7DrfqzYOiyaYUrgBdI4tejq4EVpvt4YQPscr8hxvUUorZcdKI39gby/cYKc
-p99Ja7gmefzdSx/x6suve4Xq2GxLhbvzJf7tWEK+9uv0PMHF4z14+5dIuAoNNVww
-SriR6rah/GaoI3NZxqXCpYkmbzw/YV0qS+MQhYO+FHXMdBWzfYrxoFatcFOpBnuY
-SJ0IfxkYMKSiDusWu24vMh/Z73PWL6qX0rFGhHTbv/HUO5rsxjz//g2xMYuE8oFs
-CNLm5Hd9MZnPYuZRTMBT2hxzCgCtopCCaQEzc9VTVEUUssTlrG+T39LAh+4ynHHb
-3dzGSGmf+sP521ihxKmv/4fwcmj98eRUMygYbguu2L/8cio/pz4w2CUFahDTjmJP
-Dh/LOHPkbGuo1ge/SZFv
-=QKzu
+iQIcBAEBCAAGBQJTNWwjAAoJEJOE+m71LUu6tL0P/jeyPe+VBKhn/8BE6SRbS7yP
+nnn3KZ+sz4v8xCoOnrbjLHKFxyybObcnJH2gFx7g27TMw2l8ryWLRyN46xG1btFW
+42oRKK/gyHsZuDnuTjyslvd8z94YtbpWMVYsXujpgv4o9Uod/z5t7hQMIERD6YGR
+54URV1v4yraQGWJgNL4ZaOi7LY9BcP/25cFfzCC+Zv0pL8M5EQTyf//vi9oUu0rU
+A6a2tXMtLKYwAnsSFX84D1+g0bQtdwcP3prL4nfmkShJ3AEdP/mBd24KfoiMnZ79
+1T2zCbOlJvwbQCzfUSvZkw4heylWEbUsDOYLGYme7977ETGpnmK92DnHNnHDoktw
+eBGsBoK/VVSz2jTA/jAo11/0PNttCmi/zhvrPFxrKr84+P3Km/kyVLq7M+3xrsoU
+i0tcxxr2mljHJjGbcWzaBiJPsLtwmjKftoaXCputCEH2hpkm5/l6UrJsUqF8e2jz
+gj1RfreUfZyWuafMbYR2WbUkRWdqj9HMsZYlqtltHl6Uiih9EdPo/PIZUDQWBq7G
+BnTf2IuZY4FWWPE1yCEVAPGQeKcUQiU2jgRfU4BWDG1CxyKlZv5/qzXtQCJcSaHd
+QKyOnYmBY3BqyS0wQZr/V33Kc10c0TjoWkTVlqG3hMrtTVRfgyLWAg8aKZZ99IZj
+HwtJ2pYXMqrZNcImYADs
+=z+FU
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/eudev/eudev-1.5.3-r1.ebuild b/sys-fs/eudev/eudev-1.5.3-r1.ebuild
new file mode 100644
index 000000000000..03e1c1e7a093
--- /dev/null
+++ b/sys-fs/eudev/eudev-1.5.3-r1.ebuild
@@ -0,0 +1,285 @@
+# 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.5.3-r1.ebuild,v 1.1 2014/03/28 12:32:46 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[${MULTILIB_USEDEP}] )
+	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=/
+
+		$(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
+		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
+		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
+}
+
+# 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
+}