Cleanup.

8 files changed, 7 insertions, 294 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index a7bf861f3899..3e00aa6f4912 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udev
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.4 2003/10/21 01:12:50 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.5 2003/10/21 01:14:24 azarah Exp $
+
+  21 Oct 2003; Martin Schlemmer <azarah@gentoo.org> udev-0.2.ebuild,
+  udev-0.3.ebuild, files/udev-0.2-major_minor-in-decimal.patch,
+  files/udev-0.3-fix-partition-support.patch:
+  Cleanup.
 
 *udev-003 (21 Oct 2003)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index fd83c360ecc1..188b76dc5c67 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,11 +1,5 @@
-MD5 eed728de6213759fb6f411579482ffb4 udev-0.3.ebuild 1592
-MD5 6d148a385adabe71d16e7136ab61a0a1 ChangeLog 1010
-MD5 d399ff00f6745741dfa78cfb944fc5b2 udev-0.2.ebuild 1448
+MD5 bd15a0c808246ed7abc675a96a143ba4 ChangeLog 1201
 MD5 7bcfbb3f4f8989b4124402541419d845 udev-003.ebuild 1454
-MD5 ebe0e5db30b74307da3dcbe4fa5c6709 files/digest-udev-0.2 60
 MD5 6a2ddd6bc79a92b74b4da57f442504d4 files/digest-udev-003 61
-MD5 97e31caf42d33ffd640691e3aeed5a73 files/udev-0.2-major_minor-in-decimal.patch 1303
-MD5 2788e369a5b4d4b9377747ad39978a11 files/udev-0.3-fix-partition-support.patch 5493
-MD5 6a2ddd6bc79a92b74b4da57f442504d4 files/digest-udev-0.3 61
 MD5 2788e369a5b4d4b9377747ad39978a11 files/udev-003-fix-partition-support.patch 5493
 MD5 bfcf0cdc893687e50a846b1784b3ea09 files/namedev.permissions 1585
diff --git a/sys-fs/udev/files/digest-udev-0.2 b/sys-fs/udev/files/digest-udev-0.2
deleted file mode 100644
index 89d9f2756efc..000000000000
--- a/sys-fs/udev/files/digest-udev-0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c63d4482cbaa074f937661486e9f2030 udev-0.2.tar.bz2 32643
diff --git a/sys-fs/udev/files/digest-udev-0.3 b/sys-fs/udev/files/digest-udev-0.3
deleted file mode 100644
index 0a0401b74c3a..000000000000
--- a/sys-fs/udev/files/digest-udev-0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 80d228e6345cae18c34ee9182b823ee1 udev-003.tar.bz2 108593
diff --git a/sys-fs/udev/files/udev-0.2-major_minor-in-decimal.patch b/sys-fs/udev/files/udev-0.2-major_minor-in-decimal.patch
deleted file mode 100644
index fadabe96685f..000000000000
--- a/sys-fs/udev/files/udev-0.2-major_minor-in-decimal.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- udev-0.2/udev-add.c.orig	2003-07-24 17:54:49.000000000 +0200
-+++ udev-0.2/udev-add.c	2003-10-12 07:22:56.406960904 +0200
-@@ -47,10 +47,15 @@
-  * Yes, this will probably change when we go to a bigger major/minor
-  * range, and will have to be changed at that time.
-  */
-+/*
-+ * NOTE:  The major/minor values stored in "dev" is no longer in hex!
-+ *
-+ * <azarah@gentoo.org> (12 Sep 2003)
-+ */
- static int get_major_minor(struct sysfs_class_device *class_dev, int *major, int *minor)
- {
- 	char temp[3];
--	int retval = 0;
-+	int retval = 0, i, j;
- 
- 	char *dev;
- 
-@@ -60,15 +65,21 @@
- 
- 	dbg("dev = %s", dev);
- 
--	temp[0] = dev[0];
--	temp[1] = dev[1];
--	temp[2] = 0x00;
--	*major = (int)strtol(&temp[0], NULL, 16);
--
--	temp[0] = dev[2];
--	temp[1] = dev[3];
--	temp[2] = 0x00;
--	*minor = (int)strtol(&temp[0], NULL, 16);
-+	/* Scan from the start of the string stored in "dev"
-+	 * until we get to a ':' ... */
-+	i = 0;
-+	while (dev[i] != ':')
-+		temp[i] = dev[i++];
-+	temp[i] = 0x00;
-+	*major = (int)strtol(&temp[0], NULL, 10);
-+
-+	/* Now continue scanning *after* the ':' until we get
-+	 * to the end of the string ... */
-+	j = ++i;
-+	while (dev[i] != 0x00)
-+		temp[i-j] = dev[i++];
-+	temp[i-j] = 0x00;
-+	*minor = (int)strtol(&temp[0], NULL, 10);
- 
- 	dbg("found major = %d, minor = %d", *major, *minor);
- 
diff --git a/sys-fs/udev/files/udev-0.3-fix-partition-support.patch b/sys-fs/udev/files/udev-0.3-fix-partition-support.patch
deleted file mode 100644
index 6b6092493b70..000000000000
--- a/sys-fs/udev/files/udev-0.3-fix-partition-support.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From linux-kernel-owner@vger.kernel.org Mon Oct 20 16:01:15 2003
-Return-Path: <workshop@cpt.saharapc.co.za>
-X-Original-To: azarah@tamperd.net
-Delivered-To: azarah@tamperd.net
-Received: from localhost (localhost [127.0.0.1]) by mail1.tamperd.net
-	(Postfix) with ESMTP id B3F3C26C0FA for <azarah@tamperd.net>; Mon, 20 Oct
-	2003 16:01:15 +0200 (CEST)
-Received: from emu.gentoo.org (emu.gentoo.oregonstate.edu [128.193.0.39])
-	by mail1.tamperd.net (Postfix) with ESMTP id 9ED4726C0E6 for
-	<azarah@tamperd.net>; Mon, 20 Oct 2003 16:01:14 +0200 (CEST)
-Received: from mail.gentoo.org ([204.126.2.42] helo=gentoo.org) by
-	emu.gentoo.org with esmtp (Exim 4.22) id 1ABaav-00048k-T9 for
-	azarah@dev.gentoo.org; Mon, 20 Oct 2003 14:01:14 +0000
-Received: (qmail 9395 invoked by alias); 20 Oct 2003 14:01:13 -0000
-Delivered-To: azarah@gentoo.org
-Received: (qmail 2656 invoked from network); 20 Oct 2003 14:01:07 -0000
-Received: from unknown (HELO angel.sistech.co.za) (196.41.3.119) by
-	mail.gentoo.org with SMTP; 20 Oct 2003 14:01:07 -0000
-Received: from andromeda.cpt.sahara.co.za (mail.cpt.sahara.co.za
-	[196.41.29.142]) by angel.sistech.co.za (8.11.6/SVW2.4) with ESMTP id
-	h9KE0uv12906 for <azarah@gentoo.org>; Mon, 20 Oct 2003 16:00:57 +0200
-Received: from tom.saharacpt.lan ([10.0.4.50]) by
-	andromeda.cpt.sahara.co.za (8.11.6/8.11.2/SuSE Linux 8.11.1-0.5) with ESMTP
-	id h9KA91518467 for <azarah@gentoo.org>; Mon, 20 Oct 2003 12:09:07 +0200
-Resent-Date: Mon, 20 Oct 2003 12:09:07 +0200
-Resent-Message-Id: <200310201009.h9KA91518467@andromeda.cpt.sahara.co.za>
-Received: from vger.kernel.org (vger.kernel.org [67.72.78.212]) by
-	andromeda.cpt.sahara.co.za (8.11.6/8.11.2/SuSE Linux 8.11.1-0.5) with ESMTP
-	id h9HIX5522452 for <workshop@cpt.saharapc.co.za>; Fri, 17 Oct 2003
-	20:33:06 +0200
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id
-	S263494AbTJQScQ (ORCPT <rfc822;workshop@cpt.saharapc.co.za>); Fri, 17 Oct
-	2003 14:32:16 -0400
-Received: (majordomo@vger.kernel.org) by vger.kernel.org id S263583AbTJQScQ
-	(ORCPT <rfc822;linux-kernel-outgoing>); Fri, 17 Oct 2003 14:32:16 -0400
-Received: from mail.kroah.org ([65.200.24.183]:27032 "EHLO
-	perch.kroah.org") by vger.kernel.org with ESMTP id S263494AbTJQScO (ORCPT
-	<rfc822;linux-kernel@vger.kernel.org>); Fri, 17 Oct 2003 14:32:14 -0400
-Received: from DYN318258BLD.beaverton.ibm.com (bi01p1.co.us.ibm.com
-	[32.97.110.142]) (authenticated) by perch.kroah.org (8.11.6/8.11.6) with
-	ESMTP id h9HIQUh14125; Fri, 17 Oct 2003 11:26:30 -0700
-Received: from greg by echidna.kroah.org with local (masqmail 0.2.19) id
-	1AAZKM-2nK-00; Fri, 17 Oct 2003 11:27:54 -0700
-From: Greg KH <greg@kroah.com>
-To: clemens@dwf.com
-Cc: linux-hotplug-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, reg@orion.dwf.com
-Message-ID: <20031017182754.GA10714@kroah.com>
-References: <20031017055652.GA7712@kroah.com>
-	 <200310171757.h9HHvGiY006997@orion.dwf.com>
-	 <20031017181923.GA10649@kroah.com>
-Mime-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-In-Reply-To: <20031017181923.GA10649@kroah.com>
-User-Agent: Mutt/1.4.1i
-Sender: linux-kernel-owner@vger.kernel.org
-Precedence: bulk
-X-Mailing-List: 	linux-kernel@vger.kernel.org
-X-SAHARACPT-MailScanner: Found to be clean, Found to be clean
-X-UIDL: kRp"!<XG!!T5$"!~DB!!
-Subject: Re: [ANNOUNCE] udev 003 release
-Resent-From: Sahara Workshop <workshop@cpt.saharapc.co.za>
-Resent-To: Martin Schlemmer <azarah@gentoo.org>
-X-Mailer: Ximian Evolution 1.4.4 
-Date: Mon, 20 Oct 2003 12:07:06 +0200
-X-SAHARACPT-MailScanner-Information: Please contact the ISP for more
-	information
-X-ANGEL-MailScanner-Information: Please contact the ISP for more information
-X-ANGEL-MailScanner: Found to be clean
-Resent-Date: Mon, 20 Oct 2003 14:01:14 +0000
-X-Virus-Scanned: by AMaViS 0.3.12
-X-Evolution-Source: pop://azarah%40tamperd.net@lajka.tamperd.net
-Content-Transfer-Encoding: 8bit
-
-On Fri, Oct 17, 2003 at 11:19:23AM -0700, Greg KH wrote:
-> 
-> Ah, yeah, udev seg faults right now for partitions.  Let me try to track
-> down the bug, give me a bit of time...
-
-Here's a patch that fixes the partition logic for me.  Sorry about this, I
-need to make sure to test partitions more next time.
-
-thanks again for testing this.
-
-greg k-h
-
-# fix segfaults when dealing with partitions.
-
-diff -Nru a/udev-add.c b/udev-add.c
---- a/udev-add.c	Fri Oct 17 11:26:37 2003
-+++ b/udev-add.c	Fri Oct 17 11:26:37 2003
-@@ -169,13 +169,13 @@
- 	}
- 	memset(&dbdev, 0, sizeof(dbdev));
- 	strncpy(dbdev.name, attr.name, NAME_SIZE);
--	strncpy(dbdev.sysfs_path, class_dev->sysdevice->directory->path,
--		PATH_SIZE);
-+	if (class_dev->sysdevice) {
-+		strncpy(dbdev.sysfs_path, class_dev->sysdevice->directory->path, PATH_SIZE);
-+		strncpy(dbdev.bus_id, class_dev->sysdevice->bus_id, ID_SIZE);
-+	}
- 	strncpy(dbdev.class_dev_name, class_dev->name, NAME_SIZE);
--	if ((sysfs_get_name_from_path(subsystem, dbdev.class_name, NAME_SIZE))
--	    != 0)
-+	if ((sysfs_get_name_from_path(subsystem, dbdev.class_name, NAME_SIZE)) != 0)
- 		strcpy(dbdev.class_name, "unkown");
--	strncpy(dbdev.bus_id, class_dev->sysdevice->bus_id, ID_SIZE);
- 	strcpy(dbdev.bus_name, "unknown");
- 	if (class_dev->driver != NULL)
- 		strncpy(dbdev.driver, class_dev->driver->name, NAME_SIZE);
--
-To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-Please read the FAQ at  http://www.tux.org/lkml/
-
-
diff --git a/sys-fs/udev/udev-0.2.ebuild b/sys-fs/udev/udev-0.2.ebuild
deleted file mode 100644
index 6d01ee5ecea2..000000000000
--- a/sys-fs/udev/udev-0.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-0.2.ebuild,v 1.2 2003/10/14 04:28:40 vapier Exp $
-
-DESCRIPTION="userspace implementation of devfs"
-HOMEPAGE="http://www.kernel.org/"
-SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-DEPEND="sys-fs/sysfsutils"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# Setup things to our liking
-	sed -ie '/^#define UDEV_ROOT/ c\#define UDEV_ROOT    "/dev/"' udev.h
-	sed -ie '/^#define NAMEDEV_CONFIG_ROOT/ c\#define NAMEDEV_CONFIG_ROOT "/etc/udev/"' \
-		namedev.h
-	# 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
-	# Also use our own CFLAGS for libsysfs
-	sed -ie "/^CFLAGS/ c\CFLAGS = ${CFLAGS}" libsysfs/Makefile
-
-	# Make sure we do not build libsysfs
-	# For now we use included libsysfs, as udev do not work with
-	# latest libsysfs from sysfsutils yet ...
-#	echo 'all:' > libsysfs/Makefile
-
-	epatch ${FILESDIR}/${P}-major_minor-in-decimal.patch
-}
-
-src_compile() {
-	# Do not work with emake
-	make || die
-}
-
-src_install() {
-	into /
-	dosbin udev
-
-	insinto /etc/udev
-	doins namedev.config
-#	doins ${FILESDIR}/namedev.permissions
-	doins namedev.permissions
-
-	dodoc COPYING ChangeLog README TODO
-	dodoc docs/overview
-}
-
diff --git a/sys-fs/udev/udev-0.3.ebuild b/sys-fs/udev/udev-0.3.ebuild
deleted file mode 100644
index 57f2d7d2e092..000000000000
--- a/sys-fs/udev/udev-0.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-0.3.ebuild,v 1.2 2003/10/21 01:02:58 azarah Exp $
-
-MY_PV="${PV/0\./00}"
-S="${WORKDIR}/${PN}-${MY_PV}"
-DESCRIPTION="udev - Linux dynamic device naming support (aka userspace devfs)"
-HOMEPAGE="http://www.kernel.org/"
-SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${PN}-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-DEPEND="virtual/glibc
-	>=sys-apps/hotplug-20030805-r1
-	sys-fs/sysfsutils"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# Get our version in there
-	sed -ie "/^VERSION/ c\VERSION = ${PV}" Makefile
-	# 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
-	# Also use our own CFLAGS for libsysfs
-	sed -ie "/^CFLAGS/ c\CFLAGS = ${CFLAGS}" libsysfs/Makefile
-
-	# Make sure we do not build libsysfs
-	# For now we use included libsysfs, as udev do not work with
-	# latest libsysfs from sysfsutils yet ...
-#	echo 'all:' > libsysfs/Makefile
-
-	epatch ${FILESDIR}/${P}-fix-partition-support.patch
-}
-
-src_compile() {
-	# Do not work with emake
-	make udevdir="/dev/" || die
-}
-
-src_install() {
-	into /
-	dosbin udev
-
-	insinto /etc/udev
-	doins namedev.config
-#	doins ${FILESDIR}/namedev.permissions
-	doins namedev.permissions
-
-	dodir /etc/hotplug.d/default
-	dosym ../../../sbin/udev /etc/hotplug.d/default/udev.hotplug
-
-	doman udev.8
-
-	dodoc COPYING ChangeLog FAQ README TODO
-	dodoc docs/overview
-}
-