026 version bump

4 files changed, 153 insertions, 1 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 1d67864386b3..b2c351b7be64 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,12 @@
 # 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.47 2004/06/07 22:36:18 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.48 2004/06/07 23:01:35 gregkh Exp $
+
+*udev-026-r1 (07 Jun 2004)
+
+  07 Jun 2004; Greg Kroah-Hartman <gregkh@gentoo.org> +udev-026-r1.ebuild:
+  026 version bump
+  Added udev_volume_id to built files for people who want to use it.
 
   07 Jun 2004; Greg Kroah-Hartman <gregkh@gentoo.org>
   files/udev.conf.post_024:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 3f3b88256140..79520d4e05bc 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,9 +1,11 @@
 MD5 6c97db9cdf1d7dd818f5fb544cefe814 ChangeLog 10330
 MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
 MD5 b1bbaa88170bd37fdd6af983e701cd90 udev-016-r2.ebuild 3727
+MD5 1afa08d31e7c77a6f1861750827849d7 udev-026-r1.ebuild 3527
 MD5 45db5cce6c6e4b5af07d0bb3ecf8e307 udev-024-r1.ebuild 3731
 MD5 67c56623dc9356124a926a6061aad909 udev-025-r1.ebuild 3821
 MD5 a6c3a71920f59dc127d418d7ba3c6a77 files/digest-udev-016-r2 62
+MD5 a691746515d05e3574c0a26b4cc6f0cc files/digest-udev-026-r1 61
 MD5 7ce9bba52fe0dc39b7b2ced37200fce2 files/udev.conf.post_024 1189
 MD5 cf9750c462c35531234ccb5f59b02e6b files/udev-015-no-wait-for-sleep.patch 1617
 MD5 61060bbdbb2d023f1b3ed90beabd89de files/udev-016-logging-config-option.patch 4070
diff --git a/sys-fs/udev/files/digest-udev-026-r1 b/sys-fs/udev/files/digest-udev-026-r1
new file mode 100644
index 000000000000..7f2f8caa9d97
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-026-r1
@@ -0,0 +1 @@
+MD5 bc0abc2fab36802d557de51a29ba6d1a udev-026.tar.bz2 374831
diff --git a/sys-fs/udev/udev-026-r1.ebuild b/sys-fs/udev/udev-026-r1.ebuild
new file mode 100644
index 000000000000..bb4d01e17679
--- /dev/null
+++ b/sys-fs/udev/udev-026-r1.ebuild
@@ -0,0 +1,143 @@
+# 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-026-r1.ebuild,v 1.1 2004/06/07 23:01:35 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 ~mips ~alpha ~arm ~hppa ~amd64"
+IUSE=""
+
+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"`" != \
+	     "1b240acdcf4cbfacf9b749b55271e26b  -" ]
+	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 extras/volume_id"
+
+	# 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
+	dosbin extras/volume_id/udev_volume_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
+	newins ${FILESDIR}/udev.conf.post_024 udev.conf
+#	newins etc/udev/udev.rules udev.rules.example
+	# For devfs style layout
+	insinto /etc/udev/rules.d/
+	newins etc/udev/udev.rules.gentoo 50-udev.rules
+	# Our own custom udev.permissions
+	insinto /etc/udev/permissions.d/
+	newins etc/udev/udev.permissions.gentoo 50-udev.permissions
+#	doins ${FILESDIR}/udev.permissions
+#	doins etc/udev/udev.permissions
+	insinto /etc
+	doins extras/scsi_id/scsi_id.config
+
+	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
+}