024 version bump goodness

4 files changed, 169 insertions, 2 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 174c607c8f82..e4f90486f261 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-fs/udev
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.41 2004/03/25 00:51:24 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.42 2004/04/02 23:48:15 gregkh Exp $
+
+*udev-024-r1 (02 Apr 2004)
+
+  02 Apr 2004; Greg Kroah-Hartman <gregkh@gentoo.org> udev-024-r1.ebuild:
+  024 release bump
+  
+  Use the udev.rules.gentoo and udev.permissions.gentoo files from the main
+  udev tarball now, as they are synced up properly.
+  
+  Add the etc/dev.d/net/hotplug.dev script to properly handle renaming network
+  devices with udev.
 
   24 Mar 2004; Greg Kroah-Hartman <gregkh@gentoo.org> :
   Took k the sysfsutils dependancy off, as it is onot needed.
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 17e2e8b9e6ce..2a440af17fef 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,4 +1,4 @@
-MD5 e1308d8a270e091c578faf4a33d3cc5a ChangeLog 8928
+MD5 5aacf843ea80d9016b12bf32a6dc7d6f ChangeLog 9284
 MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
 MD5 b1bbaa88170bd37fdd6af983e701cd90 udev-016-r2.ebuild 3727
 MD5 955749ba7774fe3a10a517e250f4399d udev-017-r1.ebuild 3640
@@ -10,6 +10,7 @@ MD5 747ac68ee7604c5c96bb33f6e189b1d1 udev-019-r3.ebuild 3884
 MD5 0a5fd647aa0c1cff0dda9c68d75c5a29 udev-021-r1.ebuild 3844
 MD5 2b332e1c8a1b9d64b37278ff1019e065 udev-022-r1.ebuild 3866
 MD5 c5b96c22bae300fd46cff8cdcf496b0e udev-023-r1.ebuild 3542
+MD5 1e4fcb1c5f4a7e3b879e83913e314ebe udev-024-r1.ebuild 3715
 MD5 a6c3a71920f59dc127d418d7ba3c6a77 files/digest-udev-016-r2 62
 MD5 c7b3c31e1f8d7843d2b3672cf5f120c1 files/digest-udev-017-r1 61
 MD5 6cf3f436068259264e186080dbdf6640 files/digest-udev-018-r3 61
@@ -31,3 +32,4 @@ MD5 ba39120cb35ab65a5b77b9036cc83beb files/udev.rules-018 4366
 MD5 5a1604faa5c8a1b5cf7a6a66f13fe226 files/udev.rules.post_012 4185
 MD5 2307973356422a7496eea98636a8d667 files/digest-udev-022-r1 61
 MD5 3163c259f50298207d2bf5b80c92eab1 files/digest-udev-023-r1 61
+MD5 882b525738c554bce2449356cd1fb9c5 files/digest-udev-024-r1 61
diff --git a/sys-fs/udev/files/digest-udev-024-r1 b/sys-fs/udev/files/digest-udev-024-r1
new file mode 100644
index 000000000000..0bc8b3ecc1ab
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-024-r1
@@ -0,0 +1 @@
+MD5 1e9a16f35814975d55c78258f3c4a498 udev-024.tar.bz2 349272
diff --git a/sys-fs/udev/udev-024-r1.ebuild b/sys-fs/udev/udev-024-r1.ebuild
new file mode 100644
index 000000000000..7ba73d9ba4c3
--- /dev/null
+++ b/sys-fs/udev/udev-024-r1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-024-r1.ebuild,v 1.1 2004/04/02 23:48:15 gregkh Exp $
+
+# Note: Cannot use external libsysfs with klibc ..
+USE_KLIBC="no"
+
+inherit eutils
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-FAQ"
+SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~hppa ~amd64 ~mips"
+
+DEPEND="virtual/glibc
+	sys-apps/hotplug-base"
+
+RDEPEND="${DEPEND}
+	>=sys-apps/baselayout-1.8.6.12-r3"
+# We need some changes for devfs type layout
+
+PROVIDE="virtual/dev-manager"
+
+pkg_setup() {
+	[ "${USE_KLIBC}" = "yes" ] && check_KV
+
+	return 0
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# patches go here...
+	# epatch ${FILESDIR}/${P}-udev_add_c-gcc295-compat.patch
+
+	# No need to clutter the logs ...
+	sed -ie '/^DEBUG/ c\DEBUG = false' Makefile
+	# Do not use optimization flags from the package
+	sed -ie 's|$(OPTIMIZATION)||g' Makefile
+
+	# Make sure there is no sudden changes to udev.rules.gentoo
+	# (more for my own needs than anything else ...)
+	if [ "`md5sum < "${S}/etc/udev/udev.rules.gentoo"`" != \
+	     "9c319a3ec523f5407e0fc12a9da4f713  -" ]
+	then
+		echo
+		eerror "udev.rules.gentoo has been updated, please validate!"
+		die "udev.rules.gentoo has been updated, please validate!"
+	fi
+
+	# Setup things for klibc
+	if [ "${USE_KLIBC}" = "yes" ]
+	then
+		ln -snf ${ROOT}/usr/src/linux ${S}/klibc/linux
+	fi
+}
+
+src_compile() {
+	local myconf=
+	local extras="extras/scsi_id"
+
+	# DBUS support?
+	# disabled for now as it's currently broken.
+#	if which pkg-config &>/dev/null && pkg-config dbus-1 &>/dev/null
+#	then
+#		myconf="USE_DBUS=true"
+#	fi
+
+	# Device-mapper support?
+	if false
+	then
+		extras="${extras} extras/multipath"
+	fi
+
+	# Do not work with emake
+	make EXTRAS="${extras}" \
+		udevdir="/dev/" \
+		${myconf} || die
+}
+
+src_install() {
+	dobin udevinfo udevtest
+	into /
+	dosbin udev udevd udevsend udevstart
+	dosbin extras/scsi_id/scsi_id
+	# Device-mapper support?
+	if false
+	then
+		dosbin extras/multipath/{multipath,devmap_name}
+		exeinto /etc/hotplug.d/scsi/
+		doexe extras/multipath/multipath.hotplug
+	fi
+
+	exeinto /etc/udev/scripts
+	doexe extras/ide-devfs.sh
+	doexe extras/scsi-devfs.sh
+
+	insinto /etc/udev
+	doins ${FILESDIR}/udev.conf
+#	newins etc/udev/udev.rules udev.rules.example
+	# For devfs style layout
+	newins etc/udev/udev.rules.gentoo udev.rules
+	# Our own custom udev.permissions
+	newins etc/udev/udev.permissions.gentoo udev.permissions
+#	doins ${FILESDIR}/udev.permissions
+#	doins etc/udev/udev.permissions
+	insinto /etc
+	doins extras/scsi_id/scsi_id.config
+
+	# DBUS support?
+#	if which pkg-config &>/dev/null && pkg-config dbus-1 &>/dev/null
+#	then
+#		insinto /etc/dbus-1/system.d
+#		doins etc/dbus-1/system.d/udev_sysbus_policy.conf
+#	fi
+
+	dodir /etc/hotplug.d/default
+	dosym ../../../sbin/udevsend /etc/hotplug.d/default/udev.hotplug
+
+	# set up the /etc/dev.d directory tree
+	dodir /etc/dev.d/default
+	dodir /etc/dev.d/net
+	exeinto /etc/dev.d/net
+	doexe etc/dev.d/net/hotplug.dev
+
+	doman *.8
+	doman extras/scsi_id/scsi_id.8
+
+	dodoc COPYING ChangeLog FAQ HOWTO-udev_for_dev README TODO
+	dodoc docs/{overview,udev-OLS2003.pdf,udev_vs_devfs,RFC-dev.d}
+}
+
+pkg_preinst() {
+	if [ -f "${ROOT}/etc/udev/udev.config" -a \
+	     ! -f "${ROOT}/etc/udev/udev.rules" ]
+	then
+		mv -f ${ROOT}/etc/udev/udev.config ${ROOT}/etc/udev/udev.rules
+	fi
+}
+
+pkg_postinst() {
+	if [ "${ROOT}" = "/" -a -n "`pidof udevd`" ]
+	then
+		killall -15 udevd &>/dev/null
+		sleep 1
+		killall -9 udevd &>/dev/null
+	fi
+}