Drop old x32 patches since the syscall numbers have changed.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

5 files changed, 27 insertions, 78 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index d4f6db859369..6326909cb09d 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/linux-headers
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.340 2012/02/24 22:01:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.341 2012/03/19 16:09:23 vapier Exp $
+
+  19 Mar 2012; Mike Frysinger <vapier@gentoo.org> linux-headers-3.1.ebuild,
+  -linux-headers-3.2.ebuild, linux-headers-3.2-r1.ebuild:
+  Drop old x32 patches since the syscall numbers have changed.
 
 *linux-headers-3.2-r1 (24 Feb 2012)
 
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 81205cdfe0f1..d93782a790ba 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -9,9 +9,8 @@ DIST gentoo-headers-2.6.33-1.tar.lzma 9219 RMD160 a236c5f70989c0a9c3329790f08a3a
 DIST gentoo-headers-2.6.36-1.tar.xz 5032 RMD160 543bb84c17668a67e0f56c314eff7cd74333cff3 SHA1 d74ee20e1ed0efe0311e8a673b8549f60b334dbd SHA256 053be8c1fbd72e2f0cd5baed8f057652e0e8506fff882605606b7fa2c119c5ba
 DIST gentoo-headers-2.6.38-1.tar.xz 3992 RMD160 50921db8cde371d89d3df75f8ffa681570c49a4f SHA1 9c5801dc9634e5693d43357fa1f07c28c26816e8 SHA256 0d38cffc99b9279337ca0f2b789a8db2f73ba856c668998e497aa4d7cc004924
 DIST gentoo-headers-2.6.39-1.tar.xz 3216 RMD160 27feab992d4f845acd5f6fc880b37ae9698e4058 SHA1 8629f82a7b2693a54c16dcf4f58a1e3edc1e1307 SHA256 bb16e4fb1c4566c01ff06fcdcd01c129d9920afac0c097923c08e37cc8e861a1
-DIST gentoo-headers-3.1-1.tar.xz 16000 RMD160 7ca0e0d245d8051cc8f8b568a00c55b03025f939 SHA1 bc57a527f86ab8fc72783808143065e96552d9f8 SHA256 255fd3e2abafcede9d36ae882d3cd06671b2250820caa987640ddea674500cb9
-DIST gentoo-headers-3.2-1.tar.xz 16376 RMD160 0918e09f351528042c16134ff074f48f2f98dd4e SHA1 fcd8195be6a50c2010baa6d8f25763e5120db424 SHA256 da62cfcf76c4ba4a9e37039bde439d9850f30ef098593caaf8a50f68c38b7373
-DIST gentoo-headers-3.2-2.tar.xz 16792 RMD160 965c1d77cf66d3afed06ad155575c7d7d8e41a60 SHA1 ad15d9e315e0519ff8c06d91f61b413ec8a77f86 SHA256 68052d3576ea46f81551197316fa36325d0439ab4c31958a8aec60322ce59008
+DIST gentoo-headers-3.1-2.tar.xz 3656 RMD160 f219313ee3004826cfa2e93a6d9c2a13c4c9ea7a SHA1 0708051dba8d1ea8dc91d507f63e7515e1f246bd SHA256 ee30fed6c594ff56309aa7cad018419e8c8cde8b2ba85332ba7473d967ebe972
+DIST gentoo-headers-3.2-3.tar.xz 3972 RMD160 dcdf45de828ef98bd6ab3a2803857d530e657fb2 SHA1 0951087e798c9e426b2746d1f641456db3c1036f SHA256 f3c676a71429ae9309637790651cabee9c190915b3b15462abca35971e0d8822
 DIST gentoo-headers-base-2.6.27.tar.lzma 3584132 RMD160 824b540cfa897b6b63a22bc3179f29b15c66d835 SHA1 05d7e26b4bc0cf80481f289e8263834b202ec573 SHA256 c86343d77613555760871838608bdf08429e48f96e261039e206de4411546437
 DIST gentoo-headers-base-2.6.30.tar.lzma 3861176 RMD160 a43c85ceaadd9b06d8b50962a3e965bd5ce2a226 SHA1 aa1624d161c7c58ebdbde9d2e1a2695f45835c74 SHA256 8201ae0871b561a6c309d2be365204744a0412086c1b1664e748fd1338127f2f
 DIST gentoo-headers-base-2.6.33.tar.lzma 4248910 RMD160 142c31de9d99b175770bc2eb6d1909532989daff SHA1 3de62655fa9108df7a1c969c0e2bcbc000dae71b SHA256 9e9284b45c754996808d9eeeacf7af756e3622c3778c0e0d9e26a929ca589c50
@@ -31,25 +30,24 @@ EBUILD linux-headers-2.6.33.ebuild 1413 RMD160 a988105ed3ddba208b731bd0255366d06
 EBUILD linux-headers-2.6.36.1.ebuild 1392 RMD160 2cf83ab20fb317d8ae1dfc3a02f938415adcc5bb SHA1 5d5811c1cb617b45ee9ed725d4ff917b50d1138a SHA256 13f9f3f17ba4476ffa83d573b99096bda07f5020fa48bd50713e2d4eb76dca39
 EBUILD linux-headers-2.6.38.ebuild 1399 RMD160 70759f5e5c7103f225cacbd5e0542cc368b9d2db SHA1 f1935e06a16a4efde476af4cab4a56d741046857 SHA256 293a343e6a720136304eed740deb5939c1c76a09cea32b648e2ae22af788bc84
 EBUILD linux-headers-2.6.39.ebuild 1400 RMD160 870b2f9328d5c41136db86646003adeb4aa9de23 SHA1 862b6a009f1855d86163c0e65427640342483807 SHA256 59a15a1eaa31d97596dcb9d57718e249b9f7687e6da44d83db97da48c779adee
-EBUILD linux-headers-3.1.ebuild 1474 RMD160 12cd1ec99586e209c92c5a76226573d7cd60927d SHA1 f9cf72e687b0b8ce6d7eed551a8000807dcda308 SHA256 45e24d361c20830086db35b6715ba87426cb0795a4e94b4e1a49ee3fb570ec88
-EBUILD linux-headers-3.2-r1.ebuild 1479 RMD160 2974f60d14e5f84f7309f4faecef8c89f0d4f6e7 SHA1 8582082324fdf4e20dd544bb5a9ad2ffe2405238 SHA256 fccc21feab16e84504fedfbfa68e94fd66b1a94fad14f4f20d3f181679c864a5
-EBUILD linux-headers-3.2.ebuild 1476 RMD160 9f63baf65fd374ca7e1309317559d7f7d83c1870 SHA1 dcf6569e8034aee44e7aebe695d2134f3d4f44e7 SHA256 71121eecc6b3fc5650a5f0e29c0f517a7b90fae79063f30a68fb170819523e53
-MISC ChangeLog 56253 RMD160 7d06f5a4d66711715f3dc177a44f76507bef49cb SHA1 4446fa0998209a7a7a067808f483d8d56518bf87 SHA256 21b35462c84dd559c183b8e84104bef3cea7141b251ec7aee368d6c27405a8d9
+EBUILD linux-headers-3.1.ebuild 1470 RMD160 a02234c4199c081fe79cabe50e71f2460d2cfe15 SHA1 c5fe7cd15dae2fbca8a66ba90ae46e46a47f7cad SHA256 b4799569c78040865db6cbbb2e6fc62ad0b935468744305b0abf0a266659600d
+EBUILD linux-headers-3.2-r1.ebuild 1479 RMD160 a7d3eb13aa5db13b8999de5c2c8422f75a07cf30 SHA1 f33b5d36bc68cf98d70a9d369ad747bc54aa75f3 SHA256 1e1bf8e4222bd637e15bf63cfa3d237cdc2fe766d08416aba8931c403b2be943
+MISC ChangeLog 56451 RMD160 ddcef19de0962d89dc4f92ce49f97d3c421c24ce SHA1 7d01a618dd5cf85009cc085e8fff08c57a29e059 SHA256 a1fdfbbcf1d9d7e86284f0f9e0738c3e42f638aa717adc2b550e3e474467376b
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPSAjKAAoJELEHsLL7fEFWjiYQAKV3IiZUV2h239za35y4HdMh
-Q4HOxanPhgcX6AJvm2iNmTMEjPjeUMJ+Kp+BRKGK/jf8t+X0X8fepgtrY0iF8Fh9
-jCBJ1T9JAX/dHcumzr0U9pplbGkNcWMfMvPv+TDYM4MXUHuWBjV7V2+4yvl6Ye1i
-1ZJot57NCDvvNaYMHHsqaN2xXcWd7zNjTIGSwhRfI/kM7yLv50t5da+3bEYJ8ZDS
-Gtt3rgrxe7i3qxnZuW6XebLKIScGFLWYFT1z8D9/KH0iPKG8OAepaQG47cb4l5IJ
-jGovm8al8C34D64R7f7j7bQ/xmyQu20ywScTwNfGk6XlGQc4XPUiqWiMXjm6cYls
-ReFQKPs2TTqruTjls7vRDK9h5ul/bdgG+VU5MlnD4blykLPKtlWBO89E3lU+KuwZ
-0FKtTXaWsCCsMlLPdpJViTtKYWReS5rIJS4m/qI0VeBWbAzKI5Mn/ITVujsnbp+X
-77UujXuACQjsbkBHXP0/sWV1ZTEtirD1aGb7hi+o9SvThvM/H7GP2jwcU5tJgVTo
-OJopdtrkfXx4dVQ+Bc7pHDVD5ZYV3wWTq/mrV6IdEX69kRHG/RjmNYm+eLonnhmf
-zyYA2Wwyo+eiNdyAzzYInH/uIoq4lYDmJThATEoMz8BageWa6r+04+vrYmjEX+Fs
-w0ngDqKacx29bZn2PFpm
-=hnnE
+iQIcBAEBAgAGBQJPZ1o6AAoJELEHsLL7fEFWtXQP/j+2eDL/8RnpkzIquvdg6hFU
+fmok5Xj95FKUW+AG4u6TH37UtiDIYogmRqyaDx759URAnZ/+5vafjX9s/dEDUFLp
+BhDCNJA4kXd2siCifxcsPd6tuHlV51LDAA4+XrqhxOeVUXrmiLCz4BwIu/y2TUN/
+qrsPVt3QWBfn8fKo+XkXZN7FycGif7byGvYTVBko1muD3B5slVmKgxA+x0kC3maK
+PK0erY6f7cE2zPEPFhDXtt8INiH2t6YK5LuXPOzlaLDALxE8fQNMMcoel1HVDSig
+51/nPHXKI6suIfK9OQk+GnYZql/UEFkbh7xNvx0lZeNTJ2Ijz33C4TQvbE9pnNSW
+VPTBp2z8rwrL+LKNNlMxCKkR4eYnUtTTe81I5jVpKw4jvtuM0hrGJRZOMl7Qi+xX
+ESZX/IB4+GMbh1erfmq5pz4dvuY1BX2v/pz4NEncjFkTatM/9ijPz4rhaIwCM2PL
+1tIbYwDnsUN3FG+G+hIidVcVAow388VrFffj1owa0uBBLSrJnvZFz9Kb0y7mr5vu
+jG/fJc4CIWjxrB62pYDWipV4IE6Gzqak4u74ad8/208vGE3cIs9u1lk3tpc1AYcT
+dthcqyqt+r0+uyoaUt+EHQQhl2ODzTXP0ZeHBqe/ljWRmGWK8287yrQUkGA+zbpA
+YMdEXNUgc3+bEJWpIgdR
+=e8aw
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/linux-headers/linux-headers-3.1.ebuild b/sys-kernel/linux-headers/linux-headers-3.1.ebuild
index 514e93f26222..70b7a1deb75a 100644
--- a/sys-kernel/linux-headers/linux-headers-3.1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-3.1.ebuild,v 1.7 2012/02/13 12:42:14 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-3.1.ebuild,v 1.8 2012/03/19 16:09:23 vapier Exp $
 
 EAPI="3"
 
@@ -9,7 +9,7 @@ H_SUPPORTEDARCH="alpha amd64 arm bfin cris hppa m68k mips ia64 ppc ppc64 s390 sh
 inherit kernel-2
 detect_version
 
-PATCH_VER="1"
+PATCH_VER="2"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz"
 [[ -n ${PATCH_VER} ]] && SRC_URI="${SRC_URI} mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz"
 
diff --git a/sys-kernel/linux-headers/linux-headers-3.2-r1.ebuild b/sys-kernel/linux-headers/linux-headers-3.2-r1.ebuild
index 38669fe4e92c..a6e244adcdc4 100644
--- a/sys-kernel/linux-headers/linux-headers-3.2-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-3.2-r1.ebuild,v 1.1 2012/02/24 22:01:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-3.2-r1.ebuild,v 1.2 2012/03/19 16:09:23 vapier Exp $
 
 EAPI="3"
 
@@ -9,7 +9,7 @@ H_SUPPORTEDARCH="alpha amd64 arm bfin cris hppa m68k mips ia64 ppc ppc64 s390 sh
 inherit kernel-2
 detect_version
 
-PATCH_VER="2"
+PATCH_VER="3"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz"
 [[ -n ${PATCH_VER} ]] && SRC_URI="${SRC_URI} mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz"
 
diff --git a/sys-kernel/linux-headers/linux-headers-3.2.ebuild b/sys-kernel/linux-headers/linux-headers-3.2.ebuild
deleted file mode 100644
index 02d56da2b0b0..000000000000
--- a/sys-kernel/linux-headers/linux-headers-3.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-3.2.ebuild,v 1.1 2012/01/07 04:29:53 vapier Exp $
-
-EAPI="3"
-
-ETYPE="headers"
-H_SUPPORTEDARCH="alpha amd64 arm bfin cris hppa m68k mips ia64 ppc ppc64 s390 sh sparc x86"
-inherit kernel-2
-detect_version
-
-PATCH_VER="1"
-SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz"
-[[ -n ${PATCH_VER} ]] && SRC_URI="${SRC_URI} mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="app-arch/xz-utils
-	dev-lang/perl"
-RDEPEND=""
-
-S=${WORKDIR}/gentoo-headers-base-${PV}
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_prepare() {
-	has x32 $(get_all_abis) || EPATCH_EXCLUDE+=" 90_all_x32-3.2.patch"
-	[[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV}
-}
-
-src_install() {
-	kernel-2_src_install
-	cd "${D}"
-	egrep -r \
-		-e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \
-		-e '\<([us](8|16|32|64))\>' \
-		.
-	headers___fix $(find -type f)
-
-	egrep -l -r -e '__[us](8|16|32|64)' "${D}" | xargs grep -L linux/types.h
-
-	# hrm, build system sucks
-	find "${D}" '(' -name '.install' -o -name '*.cmd' ')' -print0 | xargs -0 rm -f
-
-	# provided by libdrm (for now?)
-	rm -rf "${D}"/$(kernel_header_destdir)/drm
-}
-
-src_test() {
-	emake ARCH=$(tc-arch-kernel) headers_check || die
-}