old

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 5 insertions, 1057 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 9294da1d1358..5f28f959960c 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.908 2013/04/22 11:52:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.909 2013/04/24 19:39:33 ssuominen Exp $
+
+  24 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> -udev-171-r10.ebuild,
+  -udev-201.ebuild:
+  old
 
   22 Apr 2013; Jeroen Roovers <jer@gentoo.org> udev-200.ebuild:
   Stable for HPPA (bug #463614).
diff --git a/sys-fs/udev/udev-171-r10.ebuild b/sys-fs/udev/udev-171-r10.ebuild
deleted file mode 100644
index 4c2265dc8454..000000000000
--- a/sys-fs/udev/udev-171-r10.ebuild
+++ /dev/null
@@ -1,593 +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/udev/udev-171-r10.ebuild,v 1.4 2013/02/02 16:16:22 grobian Exp $
-
-EAPI=4
-
-KV_min=2.6.31
-KV_reliable=2.6.31
-PATCHSET=${P}-gentoo-patchset-v2
-scriptversion=7.1
-scriptname=udev-gentoo-scripts
-[[ -n "${scriptversion}" ]] && scriptname="${scriptname}-${scriptversion}"
-
-if [[ ${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 [[ ${PV} != "9999" ]]
-then
-	KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		test? ( mirror://gentoo/${PN}-171-testsys.tar.bz2 )
-		mirror://gentoo/${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="Linux dynamic and persistent device naming support (aka userspace devfs)"
-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-apps/coldplug
-	!<sys-fs/lvm2-2.02.45
-	!sys-fs/device-mapper
-	>=sys-apps/baselayout-2"
-
-if [[ ${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
-
-# 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_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 [[ ${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}"/${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 [[ ${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 [[ ${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.31/' 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}/${PN}-103-r3"
-	previous_equal_to_103_r3=$?
-
-	has_version "<${CATEGORY}/${PN}-104-r5"
-	previous_less_than_104_r5=$?
-
-	has_version "<${CATEGORY}/${PN}-106-r5"
-	previous_less_than_106_r5=$?
-
-	has_version "<${CATEGORY}/${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/udev/udev-201.ebuild b/sys-fs/udev/udev-201.ebuild
deleted file mode 100644
index 25b053da0d44..000000000000
--- a/sys-fs/udev/udev-201.ebuild
+++ /dev/null
@@ -1,463 +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/udev/udev-201.ebuild,v 1.2 2013/04/10 07:15:33 ssuominen Exp $
-
-EAPI=5
-
-# accept4() patch is only in non-live version
-if [[ ${PV} = 9999* ]]; then
-	KV_min=2.6.39
-else
-	KV_min=2.6.32
-fi
-
-inherit autotools eutils linux-info multilib toolchain-funcs versionator
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd"
-	inherit git-2
-else
-	patchset=1
-	SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz"
-	if [[ -n "${patchset}" ]]; then
-				SRC_URI="${SRC_URI}
-					http://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
-					http://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
-			fi
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="acl doc +firmware-loader gudev hwdb introspection keymap +kmod +openrc selinux static-libs"
-
-RESTRICT="test"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.20
-	acl? ( sys-apps/acl )
-	gudev? ( >=dev-libs/glib-2 )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
-	kmod? ( >=sys-apps/kmod-13 )
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-	!<sys-libs/glibc-2.11
-	!sys-apps/systemd"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/make-3.82-r4
-	virtual/os-headers
-	virtual/pkgconfig
-	!<sys-kernel/linux-headers-${KV_min}
-	doc? ( >=dev-util/gtk-doc-1.18 )
-	keymap? ( dev-util/gperf )"
-
-if [[ ${PV} = 9999* ]]; then
-	DEPEND="${DEPEND}
-		dev-util/gperf
-		>=dev-util/intltool-0.50"
-fi
-
-RDEPEND="${COMMON_DEPEND}
-	openrc? ( !<sys-apps/openrc-0.9.9 )
-	!sys-apps/coldplug
-	!<sys-fs/lvm2-2.02.97-r1
-	!sys-fs/device-mapper
-	!<sys-fs/udev-init-scripts-22
-	!<sys-kernel/dracut-017-r1
-	!<sys-kernel/genkernel-3.4.25
-	!<sec-policy/selinux-base-2.20120725-r10"
-
-PDEPEND=">=virtual/udev-197-r1
-	hwdb? ( >=sys-apps/hwids-20130326.1[udev] )
-	openrc? ( >=sys-fs/udev-init-scripts-25 )"
-
-S=${WORKDIR}/systemd-${PV}
-
-#QA_MULTILIB_PATHS="lib/systemd/systemd-udevd"
-
-udev_check_KV() {
-	if kernel_is lt ${KV_min//./ }; then
-		return 1
-	fi
-	return 0
-}
-
-check_default_rules() {
-	# Make sure there are no sudden changes to upstream rules file
-	# (more for my own needs than anything else ...)
-	local udev_rules_md5=3708dcb06e69ef2d3597cad0c98625e1
-	MD5=$(md5sum < "${S}"/rules/50-udev-default.rules)
-	MD5=${MD5/  -/}
-	if [[ ${MD5} != ${udev_rules_md5} ]]; 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
-}
-
-pkg_setup() {
-	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL"
-
-	linux-info_pkg_setup
-
-	if ! udev_check_KV; then
-		eerror "Your kernel version (${KV_FULL}) is too old to run ${P}"
-		eerror "It must be at least ${KV_min}!"
-	fi
-
-	KV_FULL_SRC=${KV_FULL}
-	get_running_version
-	if ! udev_check_KV; then
-		eerror
-		eerror "Your running kernel version (${KV_FULL}) is too old"
-		eerror "for this version of udev."
-		eerror "You must upgrade your kernel or downgrade udev."
-	fi
-}
-
-src_prepare() {
-	if ! [[ ${PV} = 9999* ]]; then
-		# secure_getenv() disable for non-glibc systems wrt bug #443030
-		if ! [[ $(grep -r secure_getenv * | wc -l) -eq 16 ]]; then
-			eerror "The line count for secure_getenv() failed, see bug #443030"
-			die
-		fi
-
-		# gperf disable if keymaps are not requested wrt bug #452760
-		if ! [[ $(grep -i gperf Makefile.am | wc -l) -eq 27 ]]; then
-			eerror "The line count for gperf references failed, see bug 452760"
-			die
-		fi
-	fi
-
-	# backport some patches
-	if [[ -n "${patchset}" ]]; then
-		EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
-	fi
-
-	# These are missing from upstream 50-udev-default.rules
-	cat <<-EOF > "${T}"/40-gentoo.rules
-	# Gentoo specific usb group
-	SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
-	# Keep this for Linux 2.6.32 kernels with accept4() support like .60 wrt #457868
-	SUBSYSTEM=="mem", KERNEL=="null|zero|full|random|urandom", MODE="0666"
-	EOF
-
-	# Remove requirements for gettext and intltool wrt bug #443028
-	if ! has_version dev-util/intltool && ! [[ ${PV} = 9999* ]]; then
-		sed -i \
-			-e '/INTLTOOL_APPLIED_VERSION=/s:=.*:=0.40.0:' \
-			-e '/XML::Parser perl module is required for intltool/s|^|:|' \
-			configure || die
-		eval export INTLTOOL_{EXTRACT,MERGE,UPDATE}=/bin/true
-		eval export {MSG{FMT,MERGE},XGETTEXT}=/bin/true
-	fi
-
-	# apply user patches
-	epatch_user
-
-	# compile with older versions of gcc #451110
-	version_is_at_least 4.6 $(gcc-version) || \
-		sed -i 's:static_assert:alsdjflkasjdfa:' src/shared/macro.h
-
-	# change rules back to group uucp instead of dialout for now wrt #454556
-	sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
-		-i rules/*.rules \
-	|| die "failed to change group dialout to uucp"
-
-	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
-		check_default_rules
-		elibtoolize
-	fi
-
-	if ! use elibc_glibc; then #443030
-		echo '#define secure_getenv(x) NULL' >> config.h.in
-		sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die
-	fi
-
-	# link udevd(8) to systemd-udevd.service(8) manpage
-	echo '.so systemd-udevd.service.8' > "${T}"/udevd.8
-}
-
-src_configure() {
-	tc-export CC #463846
-	use keymap || export ac_cv_path_GPERF=true #452760
-
-	local econf_args
-
-	econf_args=(
-		ac_cv_search_cap_init=
-		ac_cv_header_sys_capability_h=yes
-		DBUS_CFLAGS=' '
-		DBUS_LIBS=' '
-		--bindir=/bin
-		--docdir=/usr/share/doc/${PF}
-		--libdir=/usr/$(get_libdir)
-		--with-html-dir=/usr/share/doc/${PF}/html
-		--with-rootprefix=
-		--with-rootlibdir=/$(get_libdir)
-		--with-bashcompletiondir=/usr/share/bash-completion
-		--without-python
-		--disable-audit
-		--disable-coredump
-		--disable-hostnamed
-		--disable-ima
-		--disable-libcryptsetup
-		--disable-localed
-		--disable-logind
-		--disable-myhostname
-		--disable-nls
-		--disable-pam
-		--disable-quotacheck
-		--disable-readahead
-		--enable-split-usr
-		--disable-tcpwrap
-		--disable-timedated
-		--disable-xz
-		--disable-polkit
-		$(use_enable acl)
-		$(use_enable doc gtk-doc)
-		$(use_enable gudev)
-		$(use_enable keymap)
-		$(use_enable kmod)
-		$(use_enable selinux)
-		$(use_enable static-libs static)
-	)
-	if use introspection; then
-		econf_args+=(
-			--enable-introspection=$(usex introspection)
-		)
-	fi
-	if use firmware-loader; then
-		econf_args+=(
-			--with-firmware-path="/lib/firmware/updates:/lib/firmware"
-		)
-	fi
-	econf "${econf_args[@]}"
-}
-
-src_compile() {
-	echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra
-	emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES
-	local targets=(
-		libudev.la
-		systemd-udevd
-		udevadm
-		ata_id
-		cdrom_id
-		collect
-		scsi_id
-		v4l_id
-		accelerometer
-		mtd_probe
-		man/udev.7
-		man/udevadm.8
-		man/systemd-udevd.8
-		man/systemd-udevd.service.8
-	)
-	use keymap && targets+=( keymap )
-	use gudev && targets+=( libgudev-1.0.la )
-
-	emake "${targets[@]}"
-	if use doc; then
-		emake -C docs/libudev
-		use gudev && emake -C docs/gudev
-	fi
-}
-
-src_install() {
-	local lib_LTLIBRARIES="libudev.la" \
-		pkgconfiglib_DATA="src/libudev/libudev.pc"
-
-	local targets=(
-		install-libLTLIBRARIES
-		install-includeHEADERS
-		install-libgudev_includeHEADERS
-		install-binPROGRAMS
-		install-rootlibexecPROGRAMS
-		install-udevlibexecPROGRAMS
-		install-dist_udevconfDATA
-		install-dist_udevhomeSCRIPTS
-		install-dist_udevkeymapDATA
-		install-dist_udevkeymapforcerelDATA
-		install-dist_udevrulesDATA
-		install-girDATA
-		install-man7
-		install-man8
-		install-pkgconfiglibDATA
-		install-sharepkgconfigDATA
-		install-typelibsDATA
-		install-dist_docDATA
-		libudev-install-hook
-		install-directories-hook
-		install-dist_bashcompletionDATA
-	)
-
-	if use gudev; then
-		lib_LTLIBRARIES+=" libgudev-1.0.la"
-		pkgconfiglib_DATA+=" src/gudev/gudev-1.0.pc"
-	fi
-
-	# add final values of variables:
-	targets+=(
-		rootlibexec_PROGRAMS=systemd-udevd
-		bin_PROGRAMS=udevadm
-		lib_LTLIBRARIES="${lib_LTLIBRARIES}"
-		MANPAGES="man/udev.7 man/udevadm.8 \
-				man/systemd-udevd.service.8"
-		MANPAGES_ALIAS="man/systemd-udevd.8"
-		pkgconfiglib_DATA="${pkgconfiglib_DATA}"
-		INSTALL_DIRS='$(sysconfdir)/udev/rules.d \
-				$(sysconfdir)/udev/hwdb.d'
-		dist_bashcompletion_DATA="shell-completion/bash/udevadm"
-	)
-	emake -j1 DESTDIR="${D}" "${targets[@]}"
-	if use doc; then
-		emake -C docs/libudev DESTDIR="${D}" install
-		use gudev && emake -C docs/gudev DESTDIR="${D}" install
-	fi
-	dodoc TODO
-
-	prune_libtool_files --all
-	rm -f \
-		"${D}"/lib/udev/rules.d/99-systemd.rules \
-		"${D}"/usr/share/doc/${PF}/LICENSE.*
-
-	# see src_prepare() for content of these files
-	insinto /lib/udev/rules.d
-	doins "${T}"/40-gentoo.rules
-	doman "${T}"/udevd.8
-
-	# install udevadm compatibility symlink
-	dosym {../bin,sbin}/udevadm
-
-	# install udevd to /sbin and remove empty and redudant directory
-	# /lib/systemd because systemd is installed to /usr wrt #462750
-	mv "${D}"/{lib/systemd/systemd-,sbin/}udevd || die
-	rm -r "${D}"/lib/systemd
-}
-
-pkg_preinst() {
-	local htmldir
-	for htmldir in gudev libudev; do
-		if [[ -d ${ROOT}usr/share/gtk-doc/html/${htmldir} ]]; then
-			rm -rf "${ROOT}"usr/share/gtk-doc/html/${htmldir}
-		fi
-		if [[ -d ${D}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-			dosym ../../doc/${PF}/html/${htmldir} \
-				/usr/share/gtk-doc/html/${htmldir}
-		fi
-	done
-	preserve_old_lib /{,usr/}$(get_libdir)/libudev$(get_libname 0)
-}
-
-pkg_postinst() {
-	mkdir -p "${ROOT}"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 "${ROOT}"dev/loop 2>/dev/null
-	if [[ -d ${ROOT}dev/loop ]]; then
-		ewarn "Please make sure your remove /dev/loop,"
-		ewarn "else losetup may be confused when looking for unused devices."
-	fi
-
-	# people want reminders, I'll give them reminders.  Odds are they will
-	# just ignore them anyway...
-
-	# 64-device-mapper.rules is related to sys-fs/device-mapper which we block
-	# in favor of sys-fs/lvm2
-	old_dm_rules=${ROOT}etc/udev/rules.d/64-device-mapper.rules
-	if [[ -f ${old_dm_rules} ]]; then
-		rm -f "${old_dm_rules}"
-		einfo "Removed unneeded file ${old_dm_rules}"
-	fi
-
-	local fstab="${ROOT}"etc/fstab dev path fstype rest
-	while read -r dev path fstype rest; do
-		if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
-			ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
-			ewarn "filesystem. Otherwise udev won't be able to boot."
-			ewarn "See, http://bugs.gentoo.org/453186"
-		fi
-	done < "${fstab}"
-
-	if [[ -d ${ROOT}usr/lib/udev ]]; then
-		ewarn
-		ewarn "Please re-emerge all packages on your system which install"
-		ewarn "rules and helpers in /usr/lib/udev. They should now be in"
-		ewarn "/lib/udev."
-		ewarn
-		ewarn "One way to do this is to run the following command:"
-		ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)"
-		ewarn "Note that qfile can be found in app-portage/portage-utils"
-	fi
-
-	local old_net_name="${ROOT}"etc/udev/rules.d/80-net-name-slot.rules
-	if [[ -f ${old_net_name} ]]; then
-		local old_net_sum=bebf4bd1b6b668e9ff34a3999aa6ff32
-		MD5=$(md5sum < "${old_net_name}")
-		MD5=${MD5/  -/}
-		if [[ ${MD5} == ${old_net_sum} ]]; then
-			ewarn "Removing unmodified file ${old_net_name} from old udev installation to enable"
-			ewarn "the new predictable network interface naming."
-			rm -f "${old_net_name}"
-		fi
-	fi
-
-	local old_cd_rules="${ROOT}"etc/udev/rules.d/70-persistent-cd.rules
-	local old_net_rules="${ROOT}"etc/udev/rules.d/70-persistent-net.rules
-	for old_rules in "${old_cd_rules}" "${old_net_rules}"; do
-		if [[ -f ${old_rules} ]]; then
-			ewarn
-			ewarn "File ${old_rules} is from old udev installation but if you still use it,"
-			ewarn "rename it to something else starting with 70- to silence this deprecation"
-			ewarn "warning."
-		fi
-	done
-
-	if has_version sys-apps/biosdevname; then
-		ewarn
-		ewarn "You have sys-apps/biosdevname installed which has been deprecated"
-		ewarn "in favor of the predictable network interface names."
-	fi
-
-	ewarn
-	ewarn "The new predictable network interface names are used by default, see:"
-	ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
-	ewarn
-	ewarn "Example command to get the information for the new interface name before booting"
-	ewarn "(replace <ifname> with, for example, eth0):"
-	ewarn "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null"
-	ewarn
-	ewarn "You can use kernel commandline net.ifnames=0 to disable this feature."
-
-	ewarn
-	ewarn "You need to restart udev as soon as possible to make the upgrade go"
-	ewarn "into effect."
-	ewarn "The method you use to do this depends on your init system."
-
-	preserve_old_lib_notify /{,usr/}$(get_libdir)/libudev$(get_libname 0)
-
-	elog
-	elog "For more information on udev on Gentoo, upgrading, writing udev rules, and"
-	elog "         fixing known issues visit:"
-	elog "         http://wiki.gentoo.org/wiki/Udev/upgrade"
-	elog "         http://www.gentoo.org/doc/en/udev-guide.xml"
-
-	# Update hwdb database in case the format is changed by udev version.
-	if use hwdb && has_version 'sys-apps/hwids[udev]'; then
-		udevadm hwdb --update --root="${ROOT%/}"
-	fi
-}