Closing #35902.

4 files changed, 55 insertions, 21 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index a9cc3deafb2d..844e62a269d3 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.68 2004/02/17 16:47:05 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.69 2004/02/22 20:50:14 aliz Exp $
+
+  22 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> util-linux-2.12-r5.ebuild:
+  Add installation of rdev on amd64. Closing #35902.
 
 *util-linux-2.12-r5 (17 Feb 2004)
 
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index a7153123c82f..0d50492135a7 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,26 +1,28 @@
-MD5 342d0d1ac6bcc5a9ebab35f5f7cfc549 ChangeLog 11304
-MD5 056e730aa51b97a01b08eb6236e2a9d2 util-linux-2.12-r5.ebuild 3914
+MD5 32ba56421301097af1db48df06fb3581 util-linux-2.12-r3.ebuild 3749
+MD5 5f7676ff13a428729e26385679a144a2 util-linux-2.12-r5.ebuild 4002
+MD5 56da3847e8af00adfb1c3d9d4e7947d9 util-linux-2.11z-r9.ebuild 3414
+MD5 6d685a28db8eb02c63016d7bcd6679e5 util-linux-2.12-r2.ebuild 3305
+MD5 e647c55610ed3db5e31b7aa575fe9f2e util-linux-2.12-r4.ebuild 3848
+MD5 780eb6860abb6d79b37b2bc337a51177 util-linux-2.11z-r8.ebuild 3222
+MD5 7e4ce8a112ad90295b15e98ed1c37b6e ChangeLog 11431
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 dffe1a2b1de957dcb30ba68152ade8a0 util-linux-2.11z-r9.ebuild 3413
-MD5 cc3d1f9d5845a2a07d36358bfbc24c79 util-linux-2.11z-r8.ebuild 3221
-MD5 1d4d761f9314a0b263acfbf0be64e399 util-linux-2.12-r4.ebuild 3847
-MD5 a88439ff67042ff70da71aef1cc2ec0c util-linux-2.12-r3.ebuild 3748
-MD5 4d61c2fe53a74c629800dcd8d2246c11 util-linux-2.12-r2.ebuild 3304
-MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r9 153
-MD5 5a1bf3d383850b6c8ca05cc4fe76c813 files/digest-util-linux-2.12-r5 154
-MD5 d927611f34139a40f1fc9f4162c61f8a files/util-linux-2.12-kernel-2.6.patch 2964
-MD5 6aa1c240dd789327ea92e36309052950 files/no-symlink-resolve.patch 316
-MD5 5a1bf3d383850b6c8ca05cc4fe76c813 files/digest-util-linux-2.12-r4 154
 MD5 0be8df03dae23c81a0e929e58a4114e0 files/util-linux-2.11z-01-nfsv4.dif 13442
-MD5 7ce604460c5607e6eb5d894b6c8b2064 files/util-linux-2.12-fat-LABEL-support.patch 11583
+MD5 18371db840b08f5782e3f8f96c4efe8d files/util-linux-2.11z-pic.patch 3056
 MD5 4460875a6ebcf24a7ca5b41ed12f9fe5 files/util-linux-2.12-gcloop.patch 3806
-MD5 830453d37b748b7e2ec454603e33b920 files/digest-util-linux-2.12-r2 151
+MD5 7ce604460c5607e6eb5d894b6c8b2064 files/util-linux-2.12-fat-LABEL-support.patch 11583
+MD5 8d4f1146f0699deb1e6872e1c81293e3 files/util-linux-2.12-selinux.diff.bz2 2558
+MD5 d927611f34139a40f1fc9f4162c61f8a files/util-linux-2.12-kernel-2.6.patch 2964
+MD5 0f2f1ddaeaf52622fa80f4f08bb25a6b files/util-linux-2.11z-01-nfsv4-crypt.dif 13460
+MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r8 153
+MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r9 153
 MD5 6dc0134d8d5f325a86257698d2184718 files/util-linux-2.11z-mips-fdisk-fix.patch 1698
 MD5 65f42fbf981464410f7d5d84a429e920 files/util-linux-no-kill.patch 642
-MD5 e3697bc8fd6a344e8cba1c7d32e34790 files/util-linux-2.11z-parallel-make.patch 369
-MD5 5a1bf3d383850b6c8ca05cc4fe76c813 files/digest-util-linux-2.12-r3 154
-MD5 8d4f1146f0699deb1e6872e1c81293e3 files/util-linux-2.12-selinux.diff.bz2 2558
-MD5 18371db840b08f5782e3f8f96c4efe8d files/util-linux-2.11z-pic.patch 3056
+MD5 11fdaf3d68904b318fbffd7243e719b7 files/util-linux-2.12-amd64_rdev_installation.patch 737
+MD5 6aa1c240dd789327ea92e36309052950 files/no-symlink-resolve.patch 316
 MD5 7d35ae646b52391076f7a329af8265bc files/util-linux-2.11z-agetty-domainname-option.patch 1810
-MD5 0f2f1ddaeaf52622fa80f4f08bb25a6b files/util-linux-2.11z-01-nfsv4-crypt.dif 13460
+MD5 830453d37b748b7e2ec454603e33b920 files/digest-util-linux-2.12-r2 151
+MD5 5a1bf3d383850b6c8ca05cc4fe76c813 files/digest-util-linux-2.12-r3 154
+MD5 5a1bf3d383850b6c8ca05cc4fe76c813 files/digest-util-linux-2.12-r4 154
+MD5 5a1bf3d383850b6c8ca05cc4fe76c813 files/digest-util-linux-2.12-r5 154
 MD5 90b5a47385e394b9112357282c35eb4a files/util-linux-2.11z-script.patch 1580
+MD5 e3697bc8fd6a344e8cba1c7d32e34790 files/util-linux-2.11z-parallel-make.patch 369
diff --git a/sys-apps/util-linux/files/util-linux-2.12-amd64_rdev_installation.patch b/sys-apps/util-linux/files/util-linux-2.12-amd64_rdev_installation.patch
new file mode 100644
index 000000000000..213dacaa13d4
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.12-amd64_rdev_installation.patch
@@ -0,0 +1,26 @@
+--- sys-utils/Makefile	2004-02-22 20:26:11.047106770 +0000
++++ sys-utils/Makefile	2004-02-22 20:42:58.036626756 +0000
+@@ -42,6 +42,11 @@
+ USRSBIN:=$(USRSBIN) rdev
+ endif
+ 
++ifeq "$(ARCH)" "x86_64"
++MAN8:=$(MAN8) rdev.8 ramsize.8 rootflags.8 vidmode.8
++USRSBIN:=$(USRSBIN) rdev
++endif
++
+ # Where to put datebase files?
+ 
+ USRINFO=        ipc.info
+@@ -91,6 +96,11 @@
+ 	(cd $(USRSBINDIR); ln -sf rdev vidmode)
+ 	(cd $(USRSBINDIR); ln -sf rdev rootflags)
+ endif
++ifeq "$(ARCH)" "x86_64"
++	(cd $(USRSBINDIR); ln -sf rdev ramsize)
++	(cd $(USRSBINDIR); ln -sf rdev vidmode)
++	(cd $(USRSBINDIR); ln -sf rdev rootflags)
++endif
+ 	$(INSTALLDIR) $(MAN1DIR) $(MAN8DIR) $(INFODIR)
+ 	$(INSTALLMAN) $(MAN1) $(MAN1DIR)
+ 	$(INSTALLMAN) $(MAN8) $(MAN8DIR)
diff --git a/sys-apps/util-linux/util-linux-2.12-r5.ebuild b/sys-apps/util-linux/util-linux-2.12-r5.ebuild
index 5465423728bd..2a09f7a7a034 100644
--- a/sys-apps/util-linux/util-linux-2.12-r5.ebuild
+++ b/sys-apps/util-linux/util-linux-2.12-r5.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-apps/util-linux/util-linux-2.12-r5.ebuild,v 1.1 2004/02/17 16:47:05 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12-r5.ebuild,v 1.2 2004/02/22 20:50:14 aliz Exp $
 
 IUSE="crypt nls static pam selinux"
 
@@ -111,6 +111,9 @@ src_unpack() {
 
 	# /bin/kill is provided by procps ONLY
 	epatch ${FILESDIR}/${PN}-no-kill.patch
+
+	# Install rdev on amd64 platform
+	epatch ${FILESDIR}/${P}-amd64_rdev_installation.patch
 }
 
 src_compile() {