merge some local cross-compile updates

diff --git a/sys-kernel/linux26-headers/Manifest b/sys-kernel/linux26-headers/Manifest
index 61bf1fb7117cd8c77ecf5dcd66de6a67bd2d9147..6db1418331037577742fe6bc4ac9d2085f5b4304 100644 (file)
--- a/sys-kernel/linux26-headers/Manifest
+++ b/sys-kernel/linux26-headers/Manifest
@@ -3,35 +3,35 @@ Hash: SHA1
 
 MD5 10c84eaa24b525439885d4040b4fd216 ChangeLog 8616
 MD5 58516a09eebcaa2239ea0b70f310484e linux26-headers-2.6.8.1.ebuild 3895
-MD5 91179c84e3dc8dadcfdad16cabede343 linux26-headers-2.6.5.ebuild 4188
-MD5 f47af355016acfd75aa57699c9ac25cd linux26-headers-2.6.8.1-r1.ebuild 4471
 MD5 89403525f4da5e8458fd7f720d6de6ee linux26-headers-2.6.6-r1.ebuild 4223
 MD5 21dcb669b4e8535f0a04f40ad2c4c9ff metadata.xml 224
 MD5 b3d1c41a74dbe1041b4082288cacd3ca linux26-headers-2.6.7-r4.ebuild 4031
+MD5 91179c84e3dc8dadcfdad16cabede343 linux26-headers-2.6.5.ebuild 4188
+MD5 649888756dbdeee5eb8cc380bc30bfba linux26-headers-2.6.8.1-r1.ebuild 4535
 MD5 18bed04a1b45de515096089cc10913ec files/digest-linux26-headers-2.6.8.1 68
 MD5 14a0de85d11206096f05e186cebab07b files/linux26-headers-2.6.8.1-appCompat.patch 53549
 MD5 0501d9fb994e3c9721b2a239e92e30c6 files/linux26-headers-2.6.8.1-strict-ansi-fix.patch 4086
-MD5 a8c4e44a323fbde21b9de3940e2ca5ef files/digest-linux26-headers-2.6.5 66
 MD5 b737234adedfb6dc585af6bbb40bf2d3 files/digest-linux26-headers-2.6.6-r1 66
 MD5 b3e4e51616a061327b46cbd31132c8c8 files/generate-asm-sparc 1654
-MD5 ec3d195f7d40d599802d5c0c5ad8f502 files/linux26-headers-2.6.4-appCompat.patch 17240
 MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux26-headers-2.6.0-fb.patch 386
-MD5 18bed04a1b45de515096089cc10913ec files/digest-linux26-headers-2.6.8.1-r1 68
 MD5 a73786f0b9dda7e9ebacb91a192384f9 files/linux26-headers-2.6.0-sysctl_h-compat.patch 352
-MD5 00e5bea1e925c2d81d32191937eb8d5b files/linux26-headers-soundcard-ppc64.patch 631
 MD5 598136365858338b26557b7587c6725f files/linux26-headers-2.6.3-strict-ansi-fix.patch 4166
 MD5 aa9ba92e8479bdb5f69b03b5c72be866 files/linux26-headers-2.6.4-unistd-nptl-fix.patch 362
 MD5 8fbc202526e4c1b1672c5274bbff4e5f files/linux26-headers-2.6.6-appCompat.patch 26689
 MD5 830c6d1dcb1b22b9095e6f16f3ebdf85 files/linux26-headers-2.6.6-tcp_info-DRS-backport.patch 288
 MD5 7c487aa645f5d88e86c3252ab44ef5ae files/linux26-headers-2.6.7-appCompat.patch 42608
-MD5 6dd79a655f006aebb7206203f3654976 files/linux26-headers-2.6.7-generic-arm-prepare.patch 978
 MD5 b405a908c2cc1e6ed3e25f030c41f4c4 files/digest-linux26-headers-2.6.7-r4 66
+MD5 6dd79a655f006aebb7206203f3654976 files/linux26-headers-2.6.7-generic-arm-prepare.patch 978
 MD5 d78e0d94873de4518bca401d5688401c files/linux26-headers-2.6.7-prefetch.patch 528
+MD5 a8c4e44a323fbde21b9de3940e2ca5ef files/digest-linux26-headers-2.6.5 66
+MD5 ec3d195f7d40d599802d5c0c5ad8f502 files/linux26-headers-2.6.4-appCompat.patch 17240
+MD5 18bed04a1b45de515096089cc10913ec files/digest-linux26-headers-2.6.8.1-r1 68
+MD5 00e5bea1e925c2d81d32191937eb8d5b files/linux26-headers-soundcard-ppc64.patch 631
 MD5 9f83b3bf65ac599e58c5b96ed2569963 files/linux26-headers-2.6.8.1-sparc-signal_h.patch 298
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBqpJ8ArHZZzCEUG0RAuqnAKCLM/GB9sQGB93tsOnnAghRBwJ0AACfbgYA
-iTOU0NULAlGDfBTYLkP+zyk=
-=9QI6
+iD8DBQFBrzRLroRuSHgZdywRAvRwAJwL2pZBLZ78YPrCax6alByv3YxjvgCeKsj4
+WGHXM731XKZoDFxFxU8eHMk=
+=R93x
 -----END PGP SIGNATURE-----

diff --git a/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild b/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild
index 9caef39bcc346eb28ff6752a434e4fc1c229b48e..7608dac067c6189ac6e5d50f52ce2c9325c8502c 100644 (file)
--- a/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild
+++ b/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild
@@ -1,36 +1,40 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild,v 1.9 2004/11/29 03:02:43 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild,v 1.10 2004/12/02 15:26:00 vapier Exp $
+
+# What's in this kernel?
+
+# INCLUDED:
+# 1) linux sources from kernel.org
 
 ETYPE="headers"
 inherit kernel eutils
 
 OKV="${PV/_/-}"
 KV="${OKV}"
-S=${WORKDIR}/linux-${OKV}
 EXTRAVERSION=""
 
-# What's in this kernel?
-
-# INCLUDED:
-# 1) linux sources from kernel.org
-
 DESCRIPTION="Linux ${OKV} headers from kernel.org"
-SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
+SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2"
+
 LICENSE="GPL-2"
-SLOT="0"
-PROVIDE="virtual/kernel virtual/os-headers"
+SLOT="${CTARGET}"
 KEYWORDS="-* amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc sh ~x86"
 IUSE=""
 
 DEPEND="!virtual/os-headers"
+PROVIDE="virtual/kernel virtual/os-headers"
+
+S=${WORKDIR}/linux-${OKV}
 
 headers___fix() {
-       sed -i  -e "s/\([ "$'\t'"]\)u8\([ "$'\t'"]\)/\1__u8\2/g;" \
+       sed -i \
+               -e "s/\([ "$'\t'"]\)u8\([ "$'\t'"]\)/\1__u8\2/g;" \
                -e "s/\([ "$'\t'"]\)u16\([ "$'\t'"]\)/\1__u16\2/g;" \
                -e "s/\([ "$'\t'"]\)u32\([ "$'\t'"]\)/\1__u32\2/g;" \
-               -e "s/\([ "$'\t'"]\)u64\([ "$'\t'"]\)/\1__u64\2/g;" $@
+               -e "s/\([ "$'\t'"]\)u64\([ "$'\t'"]\)/\1__u64\2/g;" \
+               "$@"
 }
 
 pkg_setup() {
@@ -44,7 +48,7 @@ pkg_setup() {
                ;;
        esac
 }
-
+/
 src_unpack() {
        unpack ${A}
        cd ${S}
@@ -77,10 +81,12 @@ src_unpack() {
 src_compile() {
        # autoconf.h isnt generated unless it already exists. plus, we have
        # no guarantee that any headers are installed on the system...
-       [ -f ${ROOT}/usr/include/linux/autoconf.h ] || \
-               touch ${S}/include/linux/autoconf.h
+       [ -f "${ROOT}"/usr/include/linux/autoconf.h ] \
+               || touch include/linux/autoconf.h
+
        # if there arent any installed headers, then there also isnt an asm
-       # symlink in /usr/include/, and make defconfig will fail.
+       # symlink in /usr/include/, and make defconfig will fail, so we have
+       # to force an include path with $S.
        set_arch_to_kernel
        ln -sf ${S}/include/asm-${ARCH} ${S}/include/asm
        make defconfig HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include/" || die "defconfig failed"
@@ -93,8 +99,7 @@ src_install() {
        kernel_src_install
 
        # If this is sparc, then we need to place asm_offsets.h in the proper location(s)
-       if [ "${PROFILE_ARCH}" = "sparc64" ]; then
-
+       if [ "${PROFILE_ARCH}" = "sparc64" ] ; then
                # We don't need /usr/include/asm, generate-asm-sparc will take care of this
                rm -Rf ${D}/usr/include/asm
 
@@ -109,7 +114,6 @@ src_install() {
 
                # Check if generate-asm-sparc exists
                if [ -a "${FILESDIR}/generate-asm-sparc" ]; then
-
                        # Copy generate-asm-sparc into the sandox
                        cp ${FILESDIR}/generate-asm-sparc ${WORKDIR}/generate-asm-sparc