Changed order of inherits to stop eclasses from overwriting the DESCRIPTION.

11 files changed, 65 insertions, 47 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index 995eb382e004..466b890b24cb 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/linux-headers
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.124 2005/05/12 06:58:27 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.125 2005/05/18 20:16:19 swegener Exp $
+
+  18 May 2005; Sven Wegener <swegener@gentoo.org>
+  linux-headers-2.4.21.ebuild, linux-headers-2.4.21-r1.ebuild,
+  linux-headers-2.4.22.ebuild, linux-headers-2.4.22-r1.ebuild,
+  linux-headers-2.4.23.ebuild, linux-headers-2.4.25.ebuild,
+  linux-headers-2.4.26.ebuild, linux-headers-2.4.26-r1.ebuild,
+  linux-headers-2.6.11.ebuild:
+  Changed order of inherits to stop eclasses from overwriting the DESCRIPTION.
 
   12 May 2005; Markus Rothe <corsair@gentoo.org>
   linux-headers-2.6.11.ebuild:
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 5649a5dbd1b4..30f7cdeaa797 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,44 +1,54 @@
-MD5 3d6f805b0de5e3f0ef6e67866e1415a0 ChangeLog 25974
-MD5 681c761c0afe60e1022ac44d37d3370a linux-headers-2.0.40.ebuild 1820
-MD5 b3099588e509bea5bf8c12f2b3882f58 linux-headers-2.2.26.ebuild 2509
-MD5 93d61e502d62b73d3340cb8837b6d6b2 linux-headers-2.4.21-r1.ebuild 3945
-MD5 abc5561a3a28d6614bd2235022eaadce linux-headers-2.4.21.ebuild 3731
-MD5 7d0d17d2cead1a311fc4e3350395b4cf linux-headers-2.4.22-r1.ebuild 4077
-MD5 213c9243211da20b5a7611507539e99b linux-headers-2.4.22.ebuild 4029
-MD5 c2c4eec01b604c30d0826e73ac02cac4 linux-headers-2.4.23.ebuild 3482
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0cd28051f4bb7be96b6e5e06f74db009 linux-headers-2.6.8.1-r4.ebuild 1262
+MD5 952afa5ec1d18abb7dcf9d4e26970d5a linux-headers-2.4.21-r1.ebuild 3947
+MD5 9f71ae4df8f88b889b9d7bd4c77b44c5 linux-headers-2.6.11.ebuild 1529
+MD5 31e90cfffdf977c955d107db8553d1db linux-headers-2.4.26.ebuild 3354
+MD5 cd10168775609812266f3f571928cde1 linux-headers-2.4.21.ebuild 3733
 MD5 06eb1588f23861450f2d8b2e8379352b linux-headers-2.4.23_p3.ebuild 1267
-MD5 ac78a2e51f08f5e6a70691b7684eb3da linux-headers-2.4.25.ebuild 3422
-MD5 c28313e23ce24b05e25738a685a00cd4 linux-headers-2.4.26.ebuild 3351
-MD5 eaccd9ae7cbe667e41c9db944dbabe7f linux-headers-2.6.11.ebuild 1528
+MD5 1e3350e5596cd13bde8ea8ad3cac169c linux-headers-2.4.23.ebuild 3484
+MD5 74742da16e7d510e5397f5bb1676d3b2 linux-headers-2.4.25.ebuild 3424
+MD5 f229fe4d523bc5e7004c58b70ceab3bf linux-headers-2.4.26-r1.ebuild 456
+MD5 b3099588e509bea5bf8c12f2b3882f58 linux-headers-2.2.26.ebuild 2509
 MD5 1511502d78a6c1835eabffa20b9d91b0 linux-headers-2.6.8.1-r2.ebuild 1256
-MD5 0cd28051f4bb7be96b6e5e06f74db009 linux-headers-2.6.8.1-r4.ebuild 1262
+MD5 bf7a46c9120e942352df3c938a4ecb40 ChangeLog 26385
+MD5 795577bd3aa9ec75d64f69d71d3ee535 linux-headers-2.4.22-r1.ebuild 4080
 MD5 248488cc2cb6484a305e8108b4eaaa6a metadata.xml 489
-MD5 3898ef77203c061e49985d72bc97ce22 linux-headers-2.4.26-r1.ebuild 456
-MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
+MD5 681c761c0afe60e1022ac44d37d3370a linux-headers-2.0.40.ebuild 1820
+MD5 772d16ab14120bf4ed224c143f267b3e linux-headers-2.4.22.ebuild 4031
+MD5 57e8b81485f8a1ba10d41dd7949d40a8 files/linux-headers-2.6.8.1-strict-ansi-fix.patch 4132
+MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux-headers-2.6.0-fb.patch 386
+MD5 fb33a0ba21375f190137b9f478ad9799 files/digest-linux-headers-2.6.8.1-r2 146
+MD5 fb33a0ba21375f190137b9f478ad9799 files/digest-linux-headers-2.6.8.1-r4 146
+MD5 64566ac83b9929cb29c658f140117ee0 files/linux-headers-2.6.10-generic-arm-prepare.patch 1022
+MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21-r1 67
+MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22-r1 67
+MD5 2574d3f1b776f2df365737f456bfe435 files/digest-linux-headers-2.4.26-r1 67
+MD5 545a151ce959e51f4e528e3c27cb5a65 files/digest-linux-headers-2.4.23_p3 131
+MD5 9101139b0720280f338a1823c281ee84 files/linux-headers-2.6.8.1-parisc-syscall.patch 413
+MD5 f265b3be3f242bd5c0d97d4f70a12194 files/unistd.h-i386-pic.patch 4393
+MD5 602f7309c0163c018627f06b5f1ace3a files/linux-headers-2.6.8.1-arm-float.patch 640
 MD5 33d51532d0f696fefa15593b2cf2f6de files/digest-linux-headers-2.0.40 66
 MD5 556c7008fbfdf81750bbd4ab2beb111e files/digest-linux-headers-2.2.26 67
 MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21 67
-MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21-r1 67
 MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22 67
-MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22-r1 67
 MD5 79ee1ad9f4629595cd8d0cd20ca56dc1 files/digest-linux-headers-2.4.23 67
-MD5 545a151ce959e51f4e528e3c27cb5a65 files/digest-linux-headers-2.4.23_p3 131
 MD5 df6b4c19f4a4cb2b3d3a2a0107d7853d files/digest-linux-headers-2.4.25 67
 MD5 2574d3f1b776f2df365737f456bfe435 files/digest-linux-headers-2.4.26 67
 MD5 f21cffda2eeeba9dedb15d75e2417046 files/digest-linux-headers-2.6.11 146
-MD5 fb33a0ba21375f190137b9f478ad9799 files/digest-linux-headers-2.6.8.1-r2 146
-MD5 fb33a0ba21375f190137b9f478ad9799 files/digest-linux-headers-2.6.8.1-r4 146
 MD5 45ff5cde07cfe93ecbb514226def606f files/generate-asm-sparc 1661
-MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux-headers-2.6.0-fb.patch 386
 MD5 a73786f0b9dda7e9ebacb91a192384f9 files/linux-headers-2.6.0-sysctl_h-compat.patch 352
-MD5 64566ac83b9929cb29c658f140117ee0 files/linux-headers-2.6.10-generic-arm-prepare.patch 1022
 MD5 264e079b98318b33dc6fc93234465a00 files/linux-headers-2.6.11-appCompat.patch 77940
-MD5 6dd79a655f006aebb7206203f3654976 files/linux-headers-2.6.7-generic-arm-prepare.patch 978
 MD5 c68a4f50a666c677bea9cccaed04bf0f files/linux-headers-2.6.8.1-appCompat.patch 61683
-MD5 602f7309c0163c018627f06b5f1ace3a files/linux-headers-2.6.8.1-arm-float.patch 640
-MD5 9101139b0720280f338a1823c281ee84 files/linux-headers-2.6.8.1-parisc-syscall.patch 413
-MD5 57e8b81485f8a1ba10d41dd7949d40a8 files/linux-headers-2.6.8.1-strict-ansi-fix.patch 4132
-MD5 14c583e9ea29b2a3fc88349685cce2f4 files/linux-headers-soundcard-ppc64.patch 722
 MD5 459bc20c4015796630e3a9f3dc9125e6 files/linux-headers-strict-ansi-fix.patch 1486
-MD5 f265b3be3f242bd5c0d97d4f70a12194 files/unistd.h-i386-pic.patch 4393
-MD5 2574d3f1b776f2df365737f456bfe435 files/digest-linux-headers-2.4.26-r1 67
+MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
+MD5 14c583e9ea29b2a3fc88349685cce2f4 files/linux-headers-soundcard-ppc64.patch 722
+MD5 6dd79a655f006aebb7206203f3654976 files/linux-headers-2.6.7-generic-arm-prepare.patch 978
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCi6KvI1lqEGTUzyQRAir5AJ4w9Ki5kTFhjfjXgC8Qi4dJDy1eQgCbBi/H
+/kkIHsaeJGmlkabXi1DbqBM=
+=/K+c
+-----END PGP SIGNATURE-----
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.21-r1.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.21-r1.ebuild
index e5b9f23e35de..ff9b01f5a080 100644
--- a/sys-kernel/linux-headers/linux-headers-2.4.21-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.4.21-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.21-r1.ebuild,v 1.16 2005/01/12 02:09:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.21-r1.ebuild,v 1.17 2005/05/18 20:16:19 swegener Exp $
 
 ETYPE="headers"
-inherit kernel eutils
+inherit eutils kernel
 IUSE=""
 OKV=${PV/_/-}
 KV="${OKV}"
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild
index 1cc6a4942683..945fe063ac8f 100644
--- a/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild,v 1.28 2005/01/12 02:09:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild,v 1.29 2005/05/18 20:16:19 swegener Exp $
 
 ETYPE="headers"
-inherit kernel eutils
+inherit eutils kernel
 IUSE=""
 OKV=${PV/_/-}
 KV="${OKV}"
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.22-r1.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.22-r1.ebuild
index f9fe47772387..3ed966a4bc09 100644
--- a/sys-kernel/linux-headers/linux-headers-2.4.22-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.4.22-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.22-r1.ebuild,v 1.2 2005/02/28 21:00:53 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.22-r1.ebuild,v 1.3 2005/05/18 20:16:19 swegener Exp $
 
 ETYPE="headers"
-inherit kernel eutils
+inherit eutils kernel
 IUSE=""
 OKV="${PV/_/-}"
 KV="${OKV}"
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild
index f44ff39ac8b8..c70d8da00b89 100644
--- a/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild,v 1.23 2005/01/12 02:09:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild,v 1.24 2005/05/18 20:16:19 swegener Exp $
 
 ETYPE="headers"
-inherit kernel eutils
+inherit eutils kernel
 IUSE=""
 OKV="${PV/_/-}"
 KV="${OKV}"
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.23.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.23.ebuild
index 06abf4ae1ff5..5fd4837503e9 100644
--- a/sys-kernel/linux-headers/linux-headers-2.4.23.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.4.23.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.23.ebuild,v 1.20 2005/01/12 02:09:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.23.ebuild,v 1.21 2005/05/18 20:16:19 swegener Exp $
 
 ETYPE="headers"
-inherit kernel eutils
+inherit eutils kernel
 IUSE=""
 OKV="${PV/_/-}"
 KV="${OKV}"
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.25.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.25.ebuild
index c83e2ba583b1..fa4aa739eea7 100644
--- a/sys-kernel/linux-headers/linux-headers-2.4.25.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.4.25.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.25.ebuild,v 1.11 2005/01/12 02:09:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.25.ebuild,v 1.12 2005/05/18 20:16:19 swegener Exp $
 
 ETYPE="headers"
-inherit kernel eutils
+inherit eutils kernel
 
 OKV="${PV/_/-}"
 KV="${OKV}"
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.26-r1.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.26-r1.ebuild
index c5d0f8d23121..6b145af71eb2 100644
--- a/sys-kernel/linux-headers/linux-headers-2.4.26-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.4.26-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.26-r1.ebuild,v 1.2 2005/05/05 21:49:34 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.26-r1.ebuild,v 1.3 2005/05/18 20:16:19 swegener Exp $
 
 ETYPE="headers"
 H_SUPPORTEDARCH="arm m68k sparc"
-inherit kernel-2 eutils
+inherit eutils kernel-2
 detect_version
 
 SRC_URI="${KERNEL_URI}"
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.26.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.26.ebuild
index 4d521a2ddd63..9fb58151880b 100644
--- a/sys-kernel/linux-headers/linux-headers-2.4.26.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.4.26.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.26.ebuild,v 1.9 2005/01/12 02:09:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.26.ebuild,v 1.10 2005/05/18 20:16:19 swegener Exp $
 
 ETYPE="headers"
-inherit kernel eutils
+inherit eutils kernel
 
 OKV="${PV/_/-}"
 KV="${OKV}"
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.11.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.11.ebuild
index caa4cd4d179b..a1308145e92d 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.11.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.11.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.11.ebuild,v 1.5 2005/05/12 06:58:27 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.11.ebuild,v 1.6 2005/05/18 20:16:19 swegener Exp $
 
 ETYPE="headers"
 H_SUPPORTEDARCH="alpha amd64 arm hppa m68k ia64 ppc ppc64 s390 sh sparc x86"
-inherit kernel-2 eutils
+inherit eutils kernel-2
 detect_version
 
 SRC_URI="${KERNEL_URI} mirror://gentoo/linux-2.6.11-m68k-headers.patch.bz2"