old

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

3 files changed, 5 insertions, 529 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index e62afad7f1cb..0bfeb5cfc7ab 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.842 2013/03/02 01:11:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.843 2013/03/02 01:12:43 ssuominen Exp $
+
+  02 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> -files/40-gentoo.rules,
+  -udev-197-r4.ebuild:
+  old
 
   02 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> udev-197-r8.ebuild,
   udev-197-r9.ebuild, udev-9999.ebuild:
diff --git a/sys-fs/udev/files/40-gentoo.rules b/sys-fs/udev/files/40-gentoo.rules
deleted file mode 100644
index fa99ba9fe5e6..000000000000
--- a/sys-fs/udev/files/40-gentoo.rules
+++ /dev/null
@@ -1,14 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-# setting permissions
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
-
-# dialout devices
-KERNEL=="ippp*|isdn*|dcbri*|rfcomm*|ttyACM[0-9]*|pilot", GROUP="uucp"
-
-# sound devices (oss)
-SUBSYSTEM=="snd",	GROUP="audio"
-
-# Sony Vaio Jogdial sonypi device
-KERNEL=="sonypi",	MODE="0666"
-
diff --git a/sys-fs/udev/udev-197-r4.ebuild b/sys-fs/udev/udev-197-r4.ebuild
deleted file mode 100644
index fdd647460fa7..000000000000
--- a/sys-fs/udev/udev-197-r4.ebuild
+++ /dev/null
@@ -1,514 +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-197-r4.ebuild,v 1.34 2013/02/09 23:00:03 ssuominen Exp $
-
-EAPI=4
-
-KV_min=2.6.39
-
-inherit autotools eutils linux-info multilib systemd 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/~williamh/dist/${P}-patches-${patchset}.tar.bz2"
-			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 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-12 )
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-	!<sys-libs/glibc-2.11
-	!<sys-apps/systemd-${PV}"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	virtual/pkgconfig
-	!<sys-kernel/linux-headers-${KV_min}
-	doc? ( >=dev-util/gtk-doc-1.18 )
-	hwdb? ( >=sys-apps/hwids-20130114[udev] )
-	keymap? ( dev-util/gperf )"
-
-if [[ ${PV} = 9999* ]]
-then
-	DEPEND="${DEPEND}
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-		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-19
-	!<sys-kernel/dracut-017-r1
-	!<sys-kernel/genkernel-3.4.25
-	!<sec-policy/selinux-base-2.20120725-r10"
-
-PDEPEND=">=virtual/udev-197
-	openrc? ( >=sys-fs/udev-init-scripts-19-r1 )"
-
-S=${WORKDIR}/systemd-${PV}
-
-QA_MULTILIB_PATHS="lib/systemd/systemd-udevd"
-
-udev_check_KV()
-{
-	# accept4 came late for ia64
-	use ia64 && KV_min=3.3
-	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=66bb698deeae64ab444b710baf54a412
-	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()
-{
-	# required kernel options
-	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD"
-	ERROR_DEVTMPFS="DEVTMPFS is not set in this kernel. Udev will not run."
-
-	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()
-{
-	# backport some patches
-	if [[ -n "${patchset}" ]]
-	then
-		EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
-	fi
-
-	# 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
-	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 [[ ${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 24 ]]; then
-			eerror "The line count for gperf references failed, see bug 452760"
-			die
-		fi
-	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
-}
-
-src_configure()
-{
-	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)
-		--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-silent-rules
-		$(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
-	econf "${econf_args[@]}"
-}
-
-src_compile()
-{
-	echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra
-	emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES
-	local targets=(
-		systemd-udevd
-		udevadm
-		libudev.la
-		libsystemd-daemon.la
-		ata_id
-		cdrom_id
-		collect
-		scsi_id
-		v4l_id
-		accelerometer
-		mtd_probe
-		man/sd_is_fifo.3
-		man/sd_notify.3
-		man/sd_listen_fds.3
-		man/sd-daemon.3
-		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="libsystemd-daemon.la libudev.la" \
-		pkgconfiglib_DATA="src/libsystemd-daemon/libsystemd-daemon.pc src/libudev/libudev.pc"
-
-	local targets=(
-		install-libLTLIBRARIES
-		install-includeHEADERS
-		install-libgudev_includeHEADERS
-		install-binPROGRAMS
-		install-rootlibexecPROGRAMS
-		install-udevlibexecPROGRAMS
-		install-dist_systemunitDATA
-		install-dist_udevconfDATA
-		install-dist_udevhomeSCRIPTS
-		install-dist_udevkeymapDATA
-		install-dist_udevkeymapforcerelDATA
-		install-dist_udevrulesDATA
-		install-girDATA
-		install-man3
-		install-man7
-		install-man8
-		install-nodist_systemunitDATA
-		install-pkgconfiglibDATA
-		install-sharepkgconfigDATA
-		install-typelibsDATA
-		install-dist_docDATA
-		udev-confdirs
-		systemd-install-hook
-		libudev-install-hook
-		libsystemd-daemon-install-hook
-		install-pkgincludeHEADERS
-	)
-
-	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/sd-daemon.3 man/sd_notify.3 man/sd_listen_fds.3 \
-				man/sd_is_fifo.3 man/sd_booted.3 man/udev.7 man/udevadm.8 \
-				man/systemd-udevd.service.8"
-		MANPAGES_ALIAS="man/sd_is_socket.3 man/sd_is_socket_unix.3 \
-				man/sd_is_socket_inet.3 man/sd_is_mq.3 man/sd_notifyf.3 \
-				man/SD_LISTEN_FDS_START.3 man/SD_EMERG.3 man/SD_ALERT.3 \
-				man/SD_CRIT.3 man/SD_ERR.3 man/SD_WARNING.3 man/SD_NOTICE.3 \
-				man/SD_INFO.3 man/SD_DEBUG.3 man/systemd-udevd.8"
-		dist_systemunit_DATA="units/systemd-udevd-control.socket \
-				units/systemd-udevd-kernel.socket"
-		nodist_systemunit_DATA="units/systemd-udevd.service \
-				units/systemd-udev-trigger.service \
-				units/systemd-udev-settle.service"
-		pkgconfiglib_DATA="${pkgconfiglib_DATA}"
-		systemunitdir="$(systemd_get_unitdir)"
-		pkginclude_HEADERS="src/systemd/sd-daemon.h"
-	)
-	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
-	rm -rf "${D}"/usr/share/doc/${PF}/LICENSE.*
-
-	# install gentoo-specific rules
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/40-gentoo.rules
-
-	# install udevadm symlink
-	dosym ../bin/udevadm /sbin/udevadm
-
-	# move udevd where it should be and remove unlogical /lib/systemd
-	mv "${ED}"/lib/systemd/systemd-udevd "${ED}"/sbin/udevd || die
-	rm -r "${ED}"/lib/systemd
-
-	# install compability symlink for systemd and initramfs tools
-	dosym /sbin/udevd "$(systemd_get_utildir)"/systemd-udevd
-	find "${ED}/$(systemd_get_unitdir)" -name '*.service' -exec \
-		sed -i -e "/ExecStart/s:/lib/systemd:$(systemd_get_utildir):" {} +
-
-	docinto gentoo
-	dodoc "${FILESDIR}"/80-net-name-slot.rules
-	docompress -x /usr/share/doc/${PF}/gentoo/80-net-name-slot.rules
-}
-
-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)
-}
-
-# This function determines if a directory is a mount point.
-# It was lifted from dracut.
-ismounted()
-{
-	while read a m a; do
-		[[ $m = $1 ]] && return 0
-	done < "${ROOT}"/proc/mounts
-	return 1
-}
-
-pkg_postinst()
-{
-	mkdir -p "${ROOT}"run
-
-	net_rules="${ROOT}"etc/udev/rules.d/80-net-name-slot.rules
-	copy_net_rules() {
-		[[ -f ${net_rules} ]] || cp "${ROOT}"usr/share/doc/${PF}/gentoo/80-net-name-slot.rules "${net_rules}"
-	}
-
-	copy_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 "${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 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 ${ROOT}etc/udev/rules.d/64-device-mapper.rules ]] &&
-		! has_version sys-fs/device-mapper
-	then
-			rm -f "${ROOT}"etc/udev/rules.d/64-device-mapper.rules
-			einfo "Removed unneeded file 64-device-mapper.rules"
-	fi
-
-	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 189 ]]; then
-		ewarn
-		ewarn "Upstream has removed the persistent-cd rules"
-		ewarn "generator. If you need persistent names for these devices,"
-		ewarn "place udev rules for them in ${ROOT}etc/udev/rules.d."
-	fi
-
-	if ismounted /usr
-	then
-		ewarn
-		ewarn "Your system has /usr on a separate partition. This means"
-		ewarn "you will need to use an initramfs to pre-mount /usr before"
-		ewarn "udev runs."
-		ewarn
-		ewarn "If this is not set up before your next reboot, udev may work;"
-		ewarn "However, you also may experience failures which are very"
-		ewarn "difficult to troubleshoot."
-		ewarn
-		ewarn "For a more detailed explanation, see the following URL:"
-		ewarn "http://www.freedesktop.org/wiki/Software/systemd/separate-usr-is-broken"
-		ewarn
-		ewarn "For more information on setting up an initramfs, see the"
-		ewarn "following URL:"
-		ewarn "http://www.gentoo.org/doc/en/initramfs-guide.xml"
-	fi
-
-	if [ -n "${net_rules}" ]; then
-			ewarn
-			ewarn "udev-197 and newer introduces a new method of naming network"
-			ewarn "interfaces. The new names are a very significant change, so"
-			ewarn "they are disabled by default on live systems."
-			ewarn "Please see the contents of ${net_rules} for more"
-			ewarn "information on this feature."
-	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
-
-	old_net_rules=${ROOT}etc/udev/rules.d/70-persistent-net.rules
-	if [[ -f ${old_net_rules} ]]; then
-		ewarn "You still have ${old_net_rules} in place from previous udev release."
-		ewarn "Upstream has removed the possibility of renaming to existing"
-		ewarn "network interfaces. For example, it's not possible to assign based"
-		ewarn "on MAC address to existing interface eth0."
-		ewarn "See http://bugs.gentoo.org/453494 for more information."
-		ewarn "Rename your file to something else starting with 70- to silence"
-		ewarn "this warning."
-	fi
-
-	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."
-	ewarn
-
-	preserve_old_lib_notify /{,usr/}$(get_libdir)/libudev$(get_libname 0)
-
-	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"
-
-	use hwdb && udevadm hwdb --update
-}