From: Jeremy Huddleston <eradicator@gentoo.org>
Date: Mon, 27 Dec 2004 05:14:38 +0000 (+0000)
Subject: Remove some sparc stuff from global scope.  Exclude some patches on sparc that add... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2cc14cf96a5d91640dc1db5643458dc2e9cac0df;p=gentoo.git

Remove some sparc stuff from global scope.  Exclude some patches on sparc that add features we can't use.  Excluding Kconfig patch for sparc32 as it broke (my bad... will be fixed soon).
---

diff --git a/sys-kernel/gentoo-dev-sources/ChangeLog b/sys-kernel/gentoo-dev-sources/ChangeLog
index 28330b5fe493..b426f5d2121e 100644
--- a/sys-kernel/gentoo-dev-sources/ChangeLog
+++ b/sys-kernel/gentoo-dev-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/gentoo-dev-sources
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/ChangeLog,v 1.158 2004/12/26 09:53:11 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/ChangeLog,v 1.159 2004/12/27 05:14:38 eradicator Exp $
+
+  26 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gentoo-dev-sources-2.6.10-r1.ebuild:
+  Remove some sparc stuff from global scope. Exclude some patches on sparc
+  that add features we can't use. Excluding Kconfig patch for sparc32 as it
+  broke (my bad... will be fixed soon).
 
   26 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
   -gentoo-dev-sources-2.6.7-r10.ebuild,
diff --git a/sys-kernel/gentoo-dev-sources/Manifest b/sys-kernel/gentoo-dev-sources/Manifest
index 7fcf5ced27f2..fc6561cc6229 100644
--- a/sys-kernel/gentoo-dev-sources/Manifest
+++ b/sys-kernel/gentoo-dev-sources/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6c37d45a017e8c4d75d78ce24594c92d ChangeLog 31956
+MD5 ef8f6ac1ef0bc1adc27617b91cf87f79 ChangeLog 32244
 MD5 de01a0fea9dc2f379a9e1aac1c7fae40 gentoo-dev-sources-2.6.1-r2.ebuild 2246
 MD5 e3be6c172f0abb44dac6e0c52daef4d4 gentoo-dev-sources-2.6.10.ebuild 1633
 MD5 7f9d67acdc1d107e10512e331ebee60b gentoo-dev-sources-2.6.7-r14.ebuild 1404
@@ -23,7 +23,7 @@ MD5 d289c7fc0d1472c14a14cc5a80bde42c gentoo-dev-sources-2.6.9-r8.ebuild 1582
 MD5 61b99dc1994bb68fb82301b35b5397bf gentoo-dev-sources-2.6.9-r9.ebuild 1675
 MD5 dac463dbae34ff481634429cd97e9597 gentoo-dev-sources-2.6.9.ebuild 1440
 MD5 1b8c89170c8fd1603b5f09adfa0ed5e9 metadata.xml 549
-MD5 71b88493a7537cec0eb5aef8d84f4906 gentoo-dev-sources-2.6.10-r1.ebuild 1663
+MD5 7d620f7be7962e0751542d03c0906817 gentoo-dev-sources-2.6.10-r1.ebuild 2119
 MD5 7c6cdf7ac417b2764ee697057991ea14 gentoo-dev-sources-2.6.9-r13.ebuild 1640
 MD5 980949de52189c7d9c1d791b7f5cc27e files/2.6-do_munmap.patch 743
 MD5 150fc6d514e8cb2b07a3a7b14b8d92ef files/digest-gentoo-dev-sources-2.6.1-r2 138
@@ -51,7 +51,7 @@ MD5 13a02a65ee259e68c9e12ddeb1899912 files/digest-gentoo-dev-sources-2.6.9-r13 2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBzoojArHZZzCEUG0RAlruAJ9kBdjg/WxBWIhL6bu1XHlSFs2UoQCfSwyV
-hdCFQxXe5NAfOtPXrFtelWI=
-=Raqz
+iD8DBQFBz5p7ArHZZzCEUG0RAqB/AJ95NYuZ2FGChmF1WIoBa8DjkA8V/gCeKjM+
+8wbbWT0Nsl7jNh0hKk/P1nQ=
+=/Bmc
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.10-r1.ebuild b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.10-r1.ebuild
index efd10425d822..8b73bf6be32c 100644
--- a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.10-r1.ebuild
+++ b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.10-r1.ebuild,v 1.3 2004/12/26 09:43:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.10-r1.ebuild,v 1.4 2004/12/27 05:14:38 eradicator Exp $
 
 ETYPE="sources"
 inherit kernel-2
@@ -26,8 +26,19 @@ SRC_URI="${KERNEL_URI} ${GPV_SRC} ${ARCH_URI}"
 DEPEND="${DEPEND} >=dev-libs/ucl-1"
 
 IUSE="ultra1"
-use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch"
-use sparc && UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 4905_speakup-20041020.patch"
+
+pkg_setup() {
+	if use sparc; then
+		# hme lockup hack on ultra1
+		use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch"
+
+		# sparc32's Kconfig is broken by this patch... It'll be fixed soon, but use vanilla for now.
+		[ "${PROFILE_ARCH}" = "sparc" ] && UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1362_sparc-kconfig-rework.patch 1363_sparc-kconfig-driver-rework.patch"
+
+		# Don't include features that don't work on sparc
+		UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 4300_evms-dm-bbr.patch 4305_dm-multipath.patch 4306_dm-mp-version.patch 4500_fbsplash-0.9.1.patch 4905_speakup-20041020.patch"
+	fi
+}
 
 pkg_postinst() {
 	postinst_sources