Removing vanilla-sources-2.4.32-r1 as the patch (alpha-pci_iommu.patch) is included in 2.4.33.

Package-Manager: portage-2.1.1_pre5

4 files changed, 7 insertions, 76 deletions

diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index ef110a18bbd5..20505dc81d69 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -1,10 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX vanilla-sources-2.4.32-alpha-pci_iommu.patch 1609 RMD160 c20a8fd73785f8bd6e8bc697d53036df89baa9f9 SHA1 63ea456d7c8db6d42d2bc9d3d38aad840d93d4b8 SHA256 a72fced8538f6b8c873bd11716c6db86f550b9c394fc8fae56dae9efaf30941b
-MD5 3a1c5a8c0174918ac064d22316727e65 files/vanilla-sources-2.4.32-alpha-pci_iommu.patch 1609
-RMD160 c20a8fd73785f8bd6e8bc697d53036df89baa9f9 files/vanilla-sources-2.4.32-alpha-pci_iommu.patch 1609
-SHA256 a72fced8538f6b8c873bd11716c6db86f550b9c394fc8fae56dae9efaf30941b files/vanilla-sources-2.4.32-alpha-pci_iommu.patch 1609
 DIST linux-2.0.40.tar.bz2 6121108 RMD160 fbbbd2afa19a6242d31b6a1240f394440f556382 SHA1 01128e27f2871235196ed1d9432264a7a35a29d3 SHA256 80db7850ff829b5cb567c9c2498dc560c808a6cb49d0d12b6de0eb09a799e969
 DIST linux-2.2.26.tar.bz2 15754692 RMD160 ce8e808a61566b9ee1acf1f812be12d0a7e9907d SHA1 7e20bf5bbeb0eb7c893e3d69d4ca25ad2774e7ed SHA256 7efbd131c3d243a85eae5ecec7f60394594d0ac1519ad684c4ac8d4f4eb8fa45
 DIST linux-2.4.21.tar.bz2 28533733 RMD160 d602ee1c39c856e82974861223227b1a08b9ebd0 SHA1 791dc5041a109972a826d9e91244bec1d05f78d3 SHA256 dd197b9b80535591c0dc0505fae31c8eceeb07a891e85b85396494a0f97688db
@@ -47,10 +43,6 @@ EBUILD vanilla-sources-2.4.31.ebuild 424 RMD160 78594d44294b740098744ffe51fd815b
 MD5 4a499828cbeb14b6831255395ac375f5 vanilla-sources-2.4.31.ebuild 424
 RMD160 78594d44294b740098744ffe51fd815bad5617ec vanilla-sources-2.4.31.ebuild 424
 SHA256 b3f340511dc43bd74ead5fde2fbfe3c8bf51e02f4a15a1764aea962302bdf3b2 vanilla-sources-2.4.31.ebuild 424
-EBUILD vanilla-sources-2.4.32-r1.ebuild 500 RMD160 ee3850c261fabefefb0a72916477262cf0dfc8a3 SHA1 2950070f39eaa712e54748476e7d54d6fefe6680 SHA256 41cbb891c30cc4448414c3e59f838cfa23c9aaae6cd6308cefec71ca133b60e1
-MD5 7e9ac8bf4d8a1e5100ed9fb2c294f969 vanilla-sources-2.4.32-r1.ebuild 500
-RMD160 ee3850c261fabefefb0a72916477262cf0dfc8a3 vanilla-sources-2.4.32-r1.ebuild 500
-SHA256 41cbb891c30cc4448414c3e59f838cfa23c9aaae6cd6308cefec71ca133b60e1 vanilla-sources-2.4.32-r1.ebuild 500
 EBUILD vanilla-sources-2.4.32.ebuild 424 RMD160 7295bd287ccfffdd79d2a9c46662f927f8776452 SHA1 277061f8614bd1f9cbcfb99f4cbd25deba583d71 SHA256 5d15ee45698b7daa87168b1fb19009d2f573ee128e4bea7c69226b3f67d922c0
 MD5 29d8cfbab0bcb4029fc02e74feea3830 vanilla-sources-2.4.32.ebuild 424
 RMD160 7295bd287ccfffdd79d2a9c46662f927f8776452 vanilla-sources-2.4.32.ebuild 424
@@ -107,10 +99,10 @@ EBUILD vanilla-sources-2.6.18_rc4.ebuild 502 RMD160 d5fb713049b1ffb72c2833e7c830
 MD5 086c63d3102f8f788f6ba864b6c951ec vanilla-sources-2.6.18_rc4.ebuild 502
 RMD160 d5fb713049b1ffb72c2833e7c830adb9f14b7f21 vanilla-sources-2.6.18_rc4.ebuild 502
 SHA256 16010d3e464ea299322fad3a60a92a3cffbb51daa181e5e4d84fa9e53c587167 vanilla-sources-2.6.18_rc4.ebuild 502
-MISC ChangeLog 38182 RMD160 b9aaa83576e14cb4175624533ad040e173e8239f SHA1 92a3c35c774c5cbb29e6f521300337af2fa04e3c SHA256 b0e5ff6aeaef2e271158e9d02302cdea1416f48bcf202846f759c271b1fd9949
-MD5 c18b6ab70938e470fef841bae63864dd ChangeLog 38182
-RMD160 b9aaa83576e14cb4175624533ad040e173e8239f ChangeLog 38182
-SHA256 b0e5ff6aeaef2e271158e9d02302cdea1416f48bcf202846f759c271b1fd9949 ChangeLog 38182
+MISC ChangeLog 38424 RMD160 0ec78046ff515a371745139a7669cc18dc48fa04 SHA1 8ba05741d9a58da5845b73b432e87aa76fe3b0ce SHA256 4967e830508cd8dc7b47817fb29c489b4ee46ed4eb8e014feb3a7d8bc0e46c66
+MD5 d05270cec09a8e0648cd4220e8993a57 ChangeLog 38424
+RMD160 0ec78046ff515a371745139a7669cc18dc48fa04 ChangeLog 38424
+SHA256 4967e830508cd8dc7b47817fb29c489b4ee46ed4eb8e014feb3a7d8bc0e46c66 ChangeLog 38424
 MISC metadata.xml 533 RMD160 9ae06a39c477c2a6db1cddd49e841bf03a0870d0 SHA1 230630899f3dc95a0b08ea3f874f96ec116c7f4f SHA256 bd5766e7795aa154d9092b53af20eceede078d3298eed21715771810288b0776
 MD5 0910b9fcd2457ee66bb7d82cc3291c35 metadata.xml 533
 RMD160 9ae06a39c477c2a6db1cddd49e841bf03a0870d0 metadata.xml 533
@@ -133,9 +125,6 @@ SHA256 b03615bcb3f5f5c813a39faba9989cf981fe2bfc96f6d160daded5044b68ea95 files/di
 MD5 71567ed784b1a5fa652ce8b08f1f6bd6 files/digest-vanilla-sources-2.4.32 247
 RMD160 481fc2ed3ba7d371f3257d4514b58f61d8ba08c4 files/digest-vanilla-sources-2.4.32 247
 SHA256 25e8f6159aa791208cad447bef9f0847466e1ed2171cb040fb2162f4e2f5edc3 files/digest-vanilla-sources-2.4.32 247
-MD5 71567ed784b1a5fa652ce8b08f1f6bd6 files/digest-vanilla-sources-2.4.32-r1 247
-RMD160 481fc2ed3ba7d371f3257d4514b58f61d8ba08c4 files/digest-vanilla-sources-2.4.32-r1 247
-SHA256 25e8f6159aa791208cad447bef9f0847466e1ed2171cb040fb2162f4e2f5edc3 files/digest-vanilla-sources-2.4.32-r1 247
 MD5 8252c650ca9dc29d6514eca6c5120c87 files/digest-vanilla-sources-2.4.33 247
 RMD160 97618f041a25ee2affb31adf0af2618a14349c23 files/digest-vanilla-sources-2.4.33 247
 SHA256 267b6276888b43bcae983921df817194897696bef5d9d42cc1a9344cd2fc9869 files/digest-vanilla-sources-2.4.33 247
@@ -178,7 +167,7 @@ SHA256 330e010af0be8aeadb1908226fce13ada4d3a32ab0c4413a661123f1b465aaec files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE3B1eyuNVb5qfaOYRApEjAJ9wVUdrufateKvC+Nj+yDXDLS4PzwCeMD9k
-m85g8ItIJgTS0wO3mw43vnI=
-=hEmu
+iD8DBQFE3bAlyuNVb5qfaOYRAtaoAJ9g1bM5SSLn9vEnJ+RkVM8kRhm0jACdGApQ
+hgVLpYtvz5E0ew9MtVtohM8=
+=BvO4
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/vanilla-sources/files/digest-vanilla-sources-2.4.32-r1 b/sys-kernel/vanilla-sources/files/digest-vanilla-sources-2.4.32-r1
deleted file mode 100644
index 277996b4438a..000000000000
--- a/sys-kernel/vanilla-sources/files/digest-vanilla-sources-2.4.32-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 38f4d0830e95a20f4bfed17622d5557c linux-2.4.32.tar.bz2 31132159
-RMD160 63ab1a0b18e690170f60de9da7392416311dc609 linux-2.4.32.tar.bz2 31132159
-SHA256 7dace89c3f0850c3d5c32c38c20b600259c314e8cbec29fe3ee59c2fbbee1759 linux-2.4.32.tar.bz2 31132159
diff --git a/sys-kernel/vanilla-sources/files/vanilla-sources-2.4.32-alpha-pci_iommu.patch b/sys-kernel/vanilla-sources/files/vanilla-sources-2.4.32-alpha-pci_iommu.patch
deleted file mode 100644
index 8d5b14f817af..000000000000
--- a/sys-kernel/vanilla-sources/files/vanilla-sources-2.4.32-alpha-pci_iommu.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Marcelo Tosatti <marcelo@dmt.cnet>
-Date: Tue, 31 Jan 2006 22:26:40 +0000 (-0600)
-Subject: Alpha: fix recursive inlining failure in pci_iommu.c
-X-Git-Tag: v2.4.33-pre2
-X-Git-Url: http://kernel.org/git/?p=linux/kernel/git/marcelo/linux-2.4.git;a=commitdiff;h=0c283a469515ac2eb468921a73058a892f67a96e
-
-Alpha: fix recursive inlining failure in pci_iommu.c
-
-From: Solar Designer <solar@openwall.com>
-
-2.4.32 fails to build on my Alpha like this:
-
-make[1]: Entering directory
-`/stuff/owl-2006-1/usr/src/linux-2.4.32-ow1/arch/alpha/kernel'
-gcc -D__KERNEL__ -I/stuff/owl-2006-1/usr/src/linux-2.4.32-ow1/include
--Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing
--fno-common -fomit-frame-pointer -pipe -mno-fp-regs -ffixed-8 -mcpu=pca56
--Wa,-mev6   -nostdinc -iwithprefix include -DKBUILD_BASENAME=pci_iommu
--c -o pci_iommu.o pci_iommu.c
-pci_iommu.c: In function `sg_fill':
-pci_iommu.c:510: sorry, unimplemented: inlining failed in call to
-'sg_fill': recursive inlining
-pci_iommu.c:558: sorry, unimplemented: called from here
-make[1]: *** [pci_iommu.o] Error 1
-
-This is with gcc 3.4.5.  Simply removing the "inline" from the
-declaration
-of sg_fill() makes it build and work.
----
-
---- a/arch/alpha/kernel/pci_iommu.c
-+++ b/arch/alpha/kernel/pci_iommu.c
-@@ -503,7 +503,7 @@ sg_classify(struct scatterlist *sg, stru
- /* Given a scatterlist leader, choose an allocation method and fill
-    in the blanks.  */
- 
--static inline int
-+static int
- sg_fill(struct scatterlist *leader, struct scatterlist *end,
- 	struct scatterlist *out, struct pci_iommu_arena *arena,
- 	dma_addr_t max_dma, int dac_allowed)
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-2.4.32-r1.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-2.4.32-r1.ebuild
deleted file mode 100644
index cfb93c08861a..000000000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-2.4.32-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.32-r1.ebuild,v 1.1 2006/08/09 18:09:39 phreak Exp $
-
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-HOMEPAGE="http://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-KEYWORDS="~alpha ~ppc ~sparc ~x86"
-UNIPATCH_LIST="${FILESDIR}/vanilla-sources-2.4.32-alpha-pci_iommu.patch"