Drop old x32 patches since the syscall numbers have changed.

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

4 files changed, 9 insertions, 58 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/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
-}