removed 021, 022, and 023 ebuilds

9 files changed, 11 insertions, 482 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index a0e82ecd19d0..dc040b62ea5f 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.45 2004/04/21 23:57:04 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.46 2004/05/07 21:47:50 gregkh Exp $
+
+*udev-023-r1 (07 May 2004)
+
+  07 May 2004; Greg Kroah-Hartman <gregkh@gentoo.org> -udev-021-r1.ebuild,
+  -udev-022-r1.ebuild, -udev-023-r1.ebuild, udev-025-r1.ebuild:
+  removed 021-r1, 022-r1, and 023-r1 release as they are not needed anymore.
 
 *udev-025-r1 (21 Apr 2004)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 124420a08492..d42057c3ce82 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,13 +1,9 @@
-MD5 ba7987973c8f3c7a0746c976650e48e1 ChangeLog 9911
+MD5 4a5ee025c80113b3b58b6676ea41e763 ChangeLog 10156
 MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
 MD5 b1bbaa88170bd37fdd6af983e701cd90 udev-016-r2.ebuild 3727
-MD5 0a5fd647aa0c1cff0dda9c68d75c5a29 udev-021-r1.ebuild 3844
-MD5 2b332e1c8a1b9d64b37278ff1019e065 udev-022-r1.ebuild 3866
-MD5 c5b96c22bae300fd46cff8cdcf496b0e udev-023-r1.ebuild 3542
 MD5 45db5cce6c6e4b5af07d0bb3ecf8e307 udev-024-r1.ebuild 3731
-MD5 fc87bdc8349571d0dd4b98b7d44a66df udev-025-r1.ebuild 3822
+MD5 67c56623dc9356124a926a6061aad909 udev-025-r1.ebuild 3821
 MD5 a6c3a71920f59dc127d418d7ba3c6a77 files/digest-udev-016-r2 62
-MD5 c646cc33c71e70ad05cc630273712533 files/digest-udev-021-r1 61
 MD5 cf9750c462c35531234ccb5f59b02e6b files/udev-015-no-wait-for-sleep.patch 1617
 MD5 61060bbdbb2d023f1b3ed90beabd89de files/udev-016-logging-config-option.patch 4070
 MD5 d0a7b64f76b612bef576c02a48e83caf files/udev-017-no-wait-for-sleep.patch 1673
@@ -19,8 +15,6 @@ MD5 aba24cfb26a8f0b604a44a0d9ca7f830 files/udev.permissions 3550
 MD5 4c26691abc7f47b0329203056cbcbebc files/udev.rules 3554
 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
 MD5 63c1b792a1470ccaa74195f5debacd2f files/digest-udev-025-r1 61
 MD5 c8041b32f9adf7ab1c2c122787ae2980 files/udev.conf.post_024 1189
diff --git a/sys-fs/udev/files/digest-udev-021-r1 b/sys-fs/udev/files/digest-udev-021-r1
deleted file mode 100644
index 75ed2a68de4c..000000000000
--- a/sys-fs/udev/files/digest-udev-021-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 36e3c05d0a09016693e61b269aca9641 udev-021.tar.bz2 321608
diff --git a/sys-fs/udev/files/digest-udev-022-r1 b/sys-fs/udev/files/digest-udev-022-r1
deleted file mode 100644
index c99cc8d0635a..000000000000
--- a/sys-fs/udev/files/digest-udev-022-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cc14cf751ab4e0515d6388e3da66a8e0 udev-022.tar.bz2 328384
diff --git a/sys-fs/udev/files/digest-udev-023-r1 b/sys-fs/udev/files/digest-udev-023-r1
deleted file mode 100644
index 9013b530b0bd..000000000000
--- a/sys-fs/udev/files/digest-udev-023-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1f900275d2b61196209ca35ea7ae2def udev-023.tar.bz2 334478
diff --git a/sys-fs/udev/udev-021-r1.ebuild b/sys-fs/udev/udev-021-r1.ebuild
deleted file mode 100644
index c1981fd48366..000000000000
--- a/sys-fs/udev/udev-021-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# 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-021-r1.ebuild,v 1.1 2004/03/16 21:41:17 seemant Exp $
-
-# Note: Cannot use external libsysfs with klibc ..
-USE_KLIBC="no"
-USE_EXT_LIBSYSFS="no"
-
-inherit eutils
-
-DESCRIPTION="Linux dynamic 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"
-
-DEPEND="virtual/glibc
-	>=sys-apps/hotplug-20030805-r1
-	>=sys-fs/sysfsutils-0.3.0"
-
-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}
-	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.devfs
-	# (more for my own needs than anything else ...)
-	if [ "`md5sum < "${S}/etc/udev/udev.rules.devfs"`" != \
-	     "6cac1f863e51de110aef311301f6d58c  -" ]
-	then
-		echo
-		eerror "udev.rules.devfs has been updated, please validate!"
-		die "udev.rules.devfs has been updated, please validate!"
-	fi
-
-	# Make sure we do not build included libsysfs, but link to
-	# one in sysfsutils ...
-	if [ "${USE_EXT_LIBSYSFS}" = "yes" -a "${USE_KLIBC}" != "yes" ]
-	then
-		rm -rf ${S}/libsysfs
-		cp -Rd ${ROOT}/usr/include/sysfs ${S}/libsysfs
-	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?
-	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
-	if [ "${USE_EXT_LIBSYSFS}" = "yes" -a "${USE_KLIBC}" != "yes" ]
-	then
-		make EXTRAS="${extras}" \
-			udevdir="/dev/" \
-			ARCH_LIB_OBJS="-lsysfs" \
-			SYSFS="" \
-			${myconf} || die
-	else
-		make EXTRAS="${extras}" \
-			udevdir="/dev/" \
-			${myconf} || die
-	fi
-}
-
-src_install() {
-	dobin udevinfo
-	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
-
-	insinto /etc/udev
-	doins ${FILESDIR}/udev.conf
-#	newins etc/udev/udev.rules udev.rules.example
-	# For devfs style layout
-	newins ${FILESDIR}/udev.rules-018 udev.rules
-	# Our own custom 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
-
-	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}
-}
-
-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
-}
diff --git a/sys-fs/udev/udev-022-r1.ebuild b/sys-fs/udev/udev-022-r1.ebuild
deleted file mode 100644
index f899fd0108ec..000000000000
--- a/sys-fs/udev/udev-022-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# 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-022-r1.ebuild,v 1.2 2004/03/23 02:10:18 kumba Exp $
-
-# Note: Cannot use external libsysfs with klibc ..
-USE_KLIBC="no"
-USE_EXT_LIBSYSFS="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-20030805-r1
-	>=sys-fs/sysfsutils-0.3.0"
-
-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}
-	# 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.devfs
-	# (more for my own needs than anything else ...)
-	if [ "`md5sum < "${S}/etc/udev/udev.rules.devfs"`" != \
-	     "6cac1f863e51de110aef311301f6d58c  -" ]
-	then
-		echo
-		eerror "udev.rules.devfs has been updated, please validate!"
-		die "udev.rules.devfs has been updated, please validate!"
-	fi
-
-	# Make sure we do not build included libsysfs, but link to
-	# one in sysfsutils ...
-	if [ "${USE_EXT_LIBSYSFS}" = "yes" -a "${USE_KLIBC}" != "yes" ]
-	then
-		rm -rf ${S}/libsysfs
-		cp -Rd ${ROOT}/usr/include/sysfs ${S}/libsysfs
-	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?
-	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
-	if [ "${USE_EXT_LIBSYSFS}" = "yes" -a "${USE_KLIBC}" != "yes" ]
-	then
-		make EXTRAS="${extras}" \
-			udevdir="/dev/" \
-			ARCH_LIB_OBJS="-lsysfs" \
-			SYSFS="" \
-			${myconf} || die
-	else
-		make EXTRAS="${extras}" \
-			udevdir="/dev/" \
-			${myconf} || die
-	fi
-}
-
-src_install() {
-	dobin udevinfo
-	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
-
-	insinto /etc/udev
-	doins ${FILESDIR}/udev.conf
-#	newins etc/udev/udev.rules udev.rules.example
-	# For devfs style layout
-	newins ${FILESDIR}/udev.rules-018 udev.rules
-	# Our own custom 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
-
-	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}
-}
-
-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
-}
diff --git a/sys-fs/udev/udev-023-r1.ebuild b/sys-fs/udev/udev-023-r1.ebuild
deleted file mode 100644
index affddc129041..000000000000
--- a/sys-fs/udev/udev-023-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# 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-023-r1.ebuild,v 1.1 2004/03/25 00:51:24 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-20030805-r1"
-
-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.devfs
-	# (more for my own needs than anything else ...)
-	if [ "`md5sum < "${S}/etc/udev/udev.rules.devfs"`" != \
-	     "6cac1f863e51de110aef311301f6d58c  -" ]
-	then
-		echo
-		eerror "udev.rules.devfs has been updated, please validate!"
-		die "udev.rules.devfs 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 ${FILESDIR}/udev.rules-018 udev.rules
-	# Our own custom 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
-
-	dodir /etc/dev.d/default
-
-	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
-}
diff --git a/sys-fs/udev/udev-025-r1.ebuild b/sys-fs/udev/udev-025-r1.ebuild
index 3969cd714f9c..5843a7a4f7bd 100644
--- a/sys-fs/udev/udev-025-r1.ebuild
+++ b/sys-fs/udev/udev-025-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-025-r1.ebuild,v 1.3 2004/04/25 20:43:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-025-r1.ebuild,v 1.4 2004/05/07 21:47:50 gregkh Exp $
 
 # Note: Cannot use external libsysfs with klibc ..
 USE_KLIBC="no"
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha arm ~hppa ~amd64"
 IUSE=""
 
 DEPEND="virtual/glibc