4 files changed, 4 insertions, 29 deletions

diff --git a/emulators/linux_dist-gentoo-stage3/Makefile b/emulators/linux_dist-gentoo-stage3/Makefile
index fab097501440..e7a56bf5fd83 100644
--- a/emulators/linux_dist-gentoo-stage3/Makefile
+++ b/emulators/linux_dist-gentoo-stage3/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	gentoo-stage3
 PORTVERSION=	2006.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators linux
 MASTER_SITES=	${MASTER_SITE_GENTOO}
 MASTER_SITE_SUBDIR=	releases/x86/${PORTVERSION}/stages
@@ -85,7 +85,9 @@ pre-fetch:
 do-install:
 	@${MKDIR} ${PREFIX}/${PREFIX_SUBDIR}
 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-	@${TAR} --exclude=./dev -xpy --exclude=./proc -C ${PREFIX}/${PREFIX_SUBDIR} \
+	@${TAR} --exclude=./dev -xpy --exclude=./proc --exclude=./lib/udev \
+		--exclude=./lib/udev-state \
+		 -C ${PREFIX}/${PREFIX_SUBDIR} \
 		-f ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}
 	@${CP} -p /etc/resolv.conf ${PREFIX}/${PREFIX_SUBDIR}/etc/
 	@${FIND} ${PREFIX}/${PREFIX_SUBDIR}bin ${PREFIX}/${PREFIX_SUBDIR}sbin/ \
diff --git a/emulators/linux_dist-gentoo-stage3/pkg-plist.i586 b/emulators/linux_dist-gentoo-stage3/pkg-plist.i586
index a07a6e5539ce..faf783b5ef95 100644
--- a/emulators/linux_dist-gentoo-stage3/pkg-plist.i586
+++ b/emulators/linux_dist-gentoo-stage3/pkg-plist.i586
@@ -1,7 +1,4 @@
 %%PREFIX_SUBDIR%%etc/resolv.conf
-%%PREFIX_SUBDIR%%lib/udev/devices/console
-%%PREFIX_SUBDIR%%lib/udev/devices/null
-%%PREFIX_SUBDIR%%lib/udev/devices/zero
 %%PREFIX_SUBDIR%%bin/unlink
 %%PREFIX_SUBDIR%%bin/bzgrep
 %%PREFIX_SUBDIR%%bin/who
@@ -709,14 +706,11 @@
 %%PREFIX_SUBDIR%%lib/libnss_nis-2.3.5.so
 %%PREFIX_SUBDIR%%lib/libcidn.so.1
 %%PREFIX_SUBDIR%%lib/librt.so.1
-%%PREFIX_SUBDIR%%lib/udev-state/.keep
-%%PREFIX_SUBDIR%%lib/udev-state/devices.tar.bz2
 %%PREFIX_SUBDIR%%lib/libnss_hesiod.so.2
 %%PREFIX_SUBDIR%%lib/libutil-2.3.5.so
 %%PREFIX_SUBDIR%%lib/libuuid.so.1.2
 %%PREFIX_SUBDIR%%lib/libnsl.so.1
 %%PREFIX_SUBDIR%%lib/libwrap.so.0
-%%PREFIX_SUBDIR%%lib/udev/raid-devfs.sh
 %%PREFIX_SUBDIR%%lib/libcidn-2.3.5.so
 %%PREFIX_SUBDIR%%lib/libpam_misc.so
 %%PREFIX_SUBDIR%%lib/libpam.so.0
@@ -33387,9 +33381,6 @@
 @dirrm %%PREFIX_SUBDIR%%mnt/floppy
 @dirrm %%PREFIX_SUBDIR%%mnt/cdrom
 @dirrm %%PREFIX_SUBDIR%%mnt
-@dirrm %%PREFIX_SUBDIR%%lib/udev/devices
-@dirrm %%PREFIX_SUBDIR%%lib/udev-state
-@dirrm %%PREFIX_SUBDIR%%lib/udev
 @dirrm %%PREFIX_SUBDIR%%lib/tls
 @dirrm %%PREFIX_SUBDIR%%lib/security/pam_filter
 @dirrm %%PREFIX_SUBDIR%%lib/security
diff --git a/emulators/linux_dist-gentoo-stage3/pkg-plist.i686 b/emulators/linux_dist-gentoo-stage3/pkg-plist.i686
index 05d2bb48b199..f8848f5df208 100644
--- a/emulators/linux_dist-gentoo-stage3/pkg-plist.i686
+++ b/emulators/linux_dist-gentoo-stage3/pkg-plist.i686
@@ -1,7 +1,4 @@
 %%PREFIX_SUBDIR%%etc/resolv.conf
-%%PREFIX_SUBDIR%%lib/udev/devices/console
-%%PREFIX_SUBDIR%%lib/udev/devices/null
-%%PREFIX_SUBDIR%%lib/udev/devices/zero
 %%PREFIX_SUBDIR%%bin/unlink
 %%PREFIX_SUBDIR%%bin/bzgrep
 %%PREFIX_SUBDIR%%bin/who
@@ -709,14 +706,11 @@
 %%PREFIX_SUBDIR%%lib/libnss_nis-2.3.5.so
 %%PREFIX_SUBDIR%%lib/libcidn.so.1
 %%PREFIX_SUBDIR%%lib/librt.so.1
-%%PREFIX_SUBDIR%%lib/udev-state/.keep
-%%PREFIX_SUBDIR%%lib/udev-state/devices.tar.bz2
 %%PREFIX_SUBDIR%%lib/libnss_hesiod.so.2
 %%PREFIX_SUBDIR%%lib/libutil-2.3.5.so
 %%PREFIX_SUBDIR%%lib/libuuid.so.1.2
 %%PREFIX_SUBDIR%%lib/libnsl.so.1
 %%PREFIX_SUBDIR%%lib/libwrap.so.0
-%%PREFIX_SUBDIR%%lib/udev/raid-devfs.sh
 %%PREFIX_SUBDIR%%lib/libcidn-2.3.5.so
 %%PREFIX_SUBDIR%%lib/libpam_misc.so
 %%PREFIX_SUBDIR%%lib/libpam.so.0
@@ -33387,9 +33381,6 @@
 @dirrm %%PREFIX_SUBDIR%%mnt/floppy
 @dirrm %%PREFIX_SUBDIR%%mnt/cdrom
 @dirrm %%PREFIX_SUBDIR%%mnt
-@dirrm %%PREFIX_SUBDIR%%lib/udev/devices
-@dirrm %%PREFIX_SUBDIR%%lib/udev-state
-@dirrm %%PREFIX_SUBDIR%%lib/udev
 @dirrm %%PREFIX_SUBDIR%%lib/tls
 @dirrm %%PREFIX_SUBDIR%%lib/security/pam_filter
 @dirrm %%PREFIX_SUBDIR%%lib/security
diff --git a/emulators/linux_dist-gentoo-stage3/pkg-plist.x86 b/emulators/linux_dist-gentoo-stage3/pkg-plist.x86
index 064501918016..3f18a786b472 100644
--- a/emulators/linux_dist-gentoo-stage3/pkg-plist.x86
+++ b/emulators/linux_dist-gentoo-stage3/pkg-plist.x86
@@ -1,7 +1,4 @@
 %%PREFIX_SUBDIR%%etc/resolv.conf
-%%PREFIX_SUBDIR%%lib/udev/devices/console
-%%PREFIX_SUBDIR%%lib/udev/devices/null
-%%PREFIX_SUBDIR%%lib/udev/devices/zero
 %%PREFIX_SUBDIR%%bin/unlink
 %%PREFIX_SUBDIR%%bin/bzgrep
 %%PREFIX_SUBDIR%%bin/who
@@ -698,15 +695,12 @@
 %%PREFIX_SUBDIR%%lib/libnss_nis-2.3.5.so
 %%PREFIX_SUBDIR%%lib/libcidn.so.1
 %%PREFIX_SUBDIR%%lib/librt.so.1
-%%PREFIX_SUBDIR%%lib/udev-state/.keep
-%%PREFIX_SUBDIR%%lib/udev-state/devices.tar.bz2
 %%PREFIX_SUBDIR%%lib/cpp
 %%PREFIX_SUBDIR%%lib/libnss_hesiod.so.2
 %%PREFIX_SUBDIR%%lib/libutil-2.3.5.so
 %%PREFIX_SUBDIR%%lib/libuuid.so.1.2
 %%PREFIX_SUBDIR%%lib/libnsl.so.1
 %%PREFIX_SUBDIR%%lib/libwrap.so.0
-%%PREFIX_SUBDIR%%lib/udev/raid-devfs.sh
 %%PREFIX_SUBDIR%%lib/libcidn-2.3.5.so
 %%PREFIX_SUBDIR%%lib/libpam_misc.so
 %%PREFIX_SUBDIR%%lib/libpam.so.0
@@ -33318,9 +33312,6 @@
 @dirrm %%PREFIX_SUBDIR%%mnt/floppy
 @dirrm %%PREFIX_SUBDIR%%mnt/cdrom
 @dirrm %%PREFIX_SUBDIR%%mnt
-@dirrm %%PREFIX_SUBDIR%%lib/udev/devices
-@dirrm %%PREFIX_SUBDIR%%lib/udev-state
-@dirrm %%PREFIX_SUBDIR%%lib/udev
 @dirrm %%PREFIX_SUBDIR%%lib/security/pam_filter
 @dirrm %%PREFIX_SUBDIR%%lib/security
 @dirrm %%PREFIX_SUBDIR%%lib/rcscripts/sh