version bump to ensure that kill is not installed by this, but rather by the recently bumped procps only

11 files changed, 62 insertions, 15 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 81386fc162a9..90c2d553d11c 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.61 2003/12/03 00:36:41 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.62 2003/12/08 11:52:46 seemant Exp $
+
+*util-linux-2.11z-r9 (06 Dec 2003)
+
+  06 Dec 2003; Seemant Kulleen <seemant@gentoo.org>
+  util-linux-2.11z-r6.ebuild, util-linux-2.11z-r7.ebuild,
+  util-linux-2.11z-r8.ebuild, util-linux-2.11z-r9.ebuild,
+  util-linux-2.12-r1.ebuild, util-linux-2.12-r2.ebuild,
+  util-linux-2.12-r3.ebuild, util-linux-2.12.ebuild,
+  files/util-linux-no-kill.patch:
+  /bin/kill used to be part of this package. procps will now be the only one
+  providing that
 
 *util-linux-2.12-r1 (02 Dec 2003)
 
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 66d40b7e6bfe..91124bb892ec 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,19 +1,20 @@
+MD5 0d8272e3b73e6da59996f57053c63090 util-linux-2.12-r3.ebuild 3640
+MD5 56da3847e8af00adfb1c3d9d4e7947d9 util-linux-2.11z-r9.ebuild 3414
+MD5 6d685a28db8eb02c63016d7bcd6679e5 util-linux-2.12-r2.ebuild 3305
+MD5 780eb6860abb6d79b37b2bc337a51177 util-linux-2.11z-r8.ebuild 3222
+MD5 01373cdbcfaaf4cae0371f6740569dad ChangeLog 10465
+MD5 e6543624c262cae90cc830cde90ad3ae metadata.xml 165
 MD5 0be8df03dae23c81a0e929e58a4114e0 files/util-linux-2.11z-01-nfsv4.dif 13442
-MD5 830453d37b748b7e2ec454603e33b920 files/digest-util-linux-2.12 151
 MD5 18371db840b08f5782e3f8f96c4efe8d files/util-linux-2.11z-pic.patch 3056
 MD5 8d4f1146f0699deb1e6872e1c81293e3 files/util-linux-2.12-selinux.diff.bz2 2558
 MD5 0f2f1ddaeaf52622fa80f4f08bb25a6b files/util-linux-2.11z-01-nfsv4-crypt.dif 13460
-MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r6 153
-MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r7 153
+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 6aa1c240dd789327ea92e36309052950 files/no-symlink-resolve.patch 316
 MD5 7d35ae646b52391076f7a329af8265bc files/util-linux-2.11z-agetty-domainname-option.patch 1810
-MD5 5a1bf3d383850b6c8ca05cc4fe76c813 files/digest-util-linux-2.12-r1 154
+MD5 830453d37b748b7e2ec454603e33b920 files/digest-util-linux-2.12-r2 151
+MD5 5a1bf3d383850b6c8ca05cc4fe76c813 files/digest-util-linux-2.12-r3 154
 MD5 90b5a47385e394b9112357282c35eb4a files/util-linux-2.11z-script.patch 1580
 MD5 e3697bc8fd6a344e8cba1c7d32e34790 files/util-linux-2.11z-parallel-make.patch 369
-MD5 11c630af9afcb46fa6240b4eac732a50 util-linux-2.11z-r7.ebuild 3333
-MD5 3b0660f770fc2196fcfd1c6e697b2402 util-linux-2.12.ebuild 3222
-MD5 c9ddba73f3eba7bc701c2b727c67a453 util-linux-2.11z-r6.ebuild 3139
-MD5 82e4b62a4ea618bcb4080c244f21edff util-linux-2.12-r1.ebuild 3561
-MD5 348a1dae9021cd820ad472f21f1f607d ChangeLog 10025
-MD5 e6543624c262cae90cc830cde90ad3ae metadata.xml 165
diff --git a/sys-apps/util-linux/files/digest-util-linux-2.11z-r6 b/sys-apps/util-linux/files/digest-util-linux-2.11z-r8
index b479cd78fc10..b479cd78fc10 100644
--- a/sys-apps/util-linux/files/digest-util-linux-2.11z-r6
+++ b/sys-apps/util-linux/files/digest-util-linux-2.11z-r8
diff --git a/sys-apps/util-linux/files/digest-util-linux-2.11z-r7 b/sys-apps/util-linux/files/digest-util-linux-2.11z-r9
index b479cd78fc10..b479cd78fc10 100644
--- a/sys-apps/util-linux/files/digest-util-linux-2.11z-r7
+++ b/sys-apps/util-linux/files/digest-util-linux-2.11z-r9
diff --git a/sys-apps/util-linux/files/digest-util-linux-2.12 b/sys-apps/util-linux/files/digest-util-linux-2.12-r2
index 1d6f1c06a55d..1d6f1c06a55d 100644
--- a/sys-apps/util-linux/files/digest-util-linux-2.12
+++ b/sys-apps/util-linux/files/digest-util-linux-2.12-r2
diff --git a/sys-apps/util-linux/files/digest-util-linux-2.12-r1 b/sys-apps/util-linux/files/digest-util-linux-2.12-r3
index cedffcb9a126..cedffcb9a126 100644
--- a/sys-apps/util-linux/files/digest-util-linux-2.12-r1
+++ b/sys-apps/util-linux/files/digest-util-linux-2.12-r3
diff --git a/sys-apps/util-linux/files/util-linux-no-kill.patch b/sys-apps/util-linux/files/util-linux-no-kill.patch
new file mode 100644
index 000000000000..bd4638bbae6d
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-no-kill.patch
@@ -0,0 +1,23 @@
+diff -urN util-linux-2.11z.old/misc-utils/Makefile util-linux-2.11z/misc-utils/Makefile
+--- util-linux-2.11z.old/misc-utils/Makefile	2002-11-02 05:51:02.000000000 -0800
++++ util-linux-2.11z/misc-utils/Makefile	2003-12-06 20:02:28.000000000 -0800
+@@ -34,11 +34,6 @@
+ MAN1:=$(MAN1) write.1
+ endif
+ 
+-ifeq "$(HAVE_KILL)" "no"
+-BIN:=$(BIN) kill
+-MAN1:=$(MAN1) kill.1
+-endif
+-
+ ifeq "$(HAVE_NCURSES)" "yes"
+ USRBIN:=$(USRBIN) setterm
+ MAN1:=$(MAN1) setterm.1
+@@ -81,7 +76,6 @@
+ cal: cal.o $(ERR_O)
+ chkdupexe: chkdupexe.pl
+ ddate: ddate.o
+-kill: kill.o procs.o
+ logger: logger.o
+ mcookie: mcookie.o $(LIB)/md5.o
+ mcookie.o: mcookie.c $(LIB)/md5.h
diff --git a/sys-apps/util-linux/util-linux-2.11z-r6.ebuild b/sys-apps/util-linux/util-linux-2.11z-r8.ebuild
index 442406567dc3..a45188c8ba75 100644
--- a/sys-apps/util-linux/util-linux-2.11z-r6.ebuild
+++ b/sys-apps/util-linux/util-linux-2.11z-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.11z-r6.ebuild,v 1.7 2003/10/09 18:59:21 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11z-r8.ebuild,v 1.1 2003/12/08 11:52:46 seemant Exp $
 
 IUSE="crypt nls static pam"
 
@@ -88,6 +88,9 @@ src_unpack() {
 		sed -i -e 's/DISABLE_NLS=no/DISABLE_NLS=yes/' MCONFIG ||
 			die "MCONFIG nls sed"
 	fi
+
+	# /bin/kill will come from procps only
+	epatch ${FILESDIR}/${PN}-no-kill.patch
 }
 
 src_compile() {
diff --git a/sys-apps/util-linux/util-linux-2.11z-r7.ebuild b/sys-apps/util-linux/util-linux-2.11z-r9.ebuild
index ccced9b90d66..64dbb7c31bce 100644
--- a/sys-apps/util-linux/util-linux-2.11z-r7.ebuild
+++ b/sys-apps/util-linux/util-linux-2.11z-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.11z-r7.ebuild,v 1.5 2003/09/20 05:14:23 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11z-r9.ebuild,v 1.1 2003/12/08 11:52:46 seemant Exp $
 
 IUSE="crypt nls static pam"
 
@@ -100,6 +100,9 @@ src_unpack() {
 		sed -i -e 's/DISABLE_NLS=no/DISABLE_NLS=yes/' MCONFIG ||
 			die "MCONFIG nls sed"
 	fi
+
+	# /bin/kill is provided by procps only
+	epatch ${FILESDIR}/${PN}-no-kill.patch
 }
 
 src_compile() {
diff --git a/sys-apps/util-linux/util-linux-2.12.ebuild b/sys-apps/util-linux/util-linux-2.12-r2.ebuild
index 998bfbee4c44..58cafd843531 100644
--- a/sys-apps/util-linux/util-linux-2.12.ebuild
+++ b/sys-apps/util-linux/util-linux-2.12-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.ebuild,v 1.5 2003/10/29 03:14:07 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12-r2.ebuild,v 1.1 2003/12/08 11:52:46 seemant Exp $
 
 IUSE="crypt nls static pam selinux"
 
@@ -93,6 +93,9 @@ src_unpack() {
 		sed -i -e 's/DISABLE_NLS=no/DISABLE_NLS=yes/' MCONFIG ||
 			die "MCONFIG nls sed"
 	fi
+
+	# /bin/kill is provided by procps ONLY
+	epatch ${FILESDIR}/${PN}-no-kill.patch
 }
 
 src_compile() {
diff --git a/sys-apps/util-linux/util-linux-2.12-r1.ebuild b/sys-apps/util-linux/util-linux-2.12-r3.ebuild
index cada58935a86..199994b5d0b2 100644
--- a/sys-apps/util-linux/util-linux-2.12-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.12-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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-r1.ebuild,v 1.1 2003/12/03 00:36:41 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12-r3.ebuild,v 1.1 2003/12/08 11:52:46 seemant Exp $
 
 IUSE="crypt nls static pam selinux"
 
@@ -99,6 +99,9 @@ src_unpack() {
 		sed -i -e 's/DISABLE_NLS=no/DISABLE_NLS=yes/' MCONFIG ||
 			die "MCONFIG nls sed"
 	fi
+
+	# /bin/kill is provided by procps ONLY
+	epatch ${FILESDIR}/${PN}-no-kill.patch
 }
 
 src_compile() {