Pruned 2.6.12 versions.

(Portage version: 2.0.51.22-r3)

9 files changed, 9 insertions, 298 deletions

diff --git a/sys-kernel/suspend2-sources/ChangeLog b/sys-kernel/suspend2-sources/ChangeLog
index 46a08337bd6c..ff81753100ae 100644
--- a/sys-kernel/suspend2-sources/ChangeLog
+++ b/sys-kernel/suspend2-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/suspend2-sources
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/ChangeLog,v 1.19 2005/11/15 13:51:08 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/ChangeLog,v 1.20 2005/11/17 09:37:10 brix Exp $
+
+  17 Nov 2005; Henrik Brix Andersen <brix@gentoo.org>
+  -files/linux-2.6.12-try_to_freeze.patch,
+  -files/4306_dm-bbr-create_workqueue.patch,
+  -files/linux-2.6.12-skge-pm_message_t.patch,
+  -files/linux-2.6.12-vesafb-tng-suspend2.patch,
+  -suspend2-sources-2.6.12-r6.ebuild, -suspend2-sources-2.6.12-r7.ebuild:
+  Pruned 2.6.12 versions.
 
 *suspend2-sources-2.6.14-r1 (15 Nov 2005)
 
diff --git a/sys-kernel/suspend2-sources/files/4306_dm-bbr-create_workqueue.patch b/sys-kernel/suspend2-sources/files/4306_dm-bbr-create_workqueue.patch
deleted file mode 100644
index 59a8e9d6cb77..000000000000
--- a/sys-kernel/suspend2-sources/files/4306_dm-bbr-create_workqueue.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urp linux-2.6.12/drivers/md/dm-bbr.c linux-2.6.12-dm-bbr-create_workqueue/drivers/md/dm-bbr.c
---- linux-2.6.12/drivers/md/dm-bbr.c	2005-06-29 14:35:31.000000000 +0200
-+++ linux-2.6.12-dm-bbr-create_workqueue/drivers/md/dm-bbr.c	2005-06-29 16:58:37.000000000 +0200
-@@ -959,7 +959,11 @@ int __init dm_bbr_init(void)
- 		goto err4;
- 	}
- 
-+#ifdef PF_SYNCTHREAD
-+	dm_bbr_wq = create_workqueue("dm-bbr", 0);
-+#else
- 	dm_bbr_wq = create_workqueue("dm-bbr");
-+#endif
- 	if (!dm_bbr_wq) {
- 		DMERR("dm-bbr: error creating work-queue.");
- 		rc = ENOMEM;
diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.12-r6 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.12-r6
deleted file mode 100644
index e98473571131..000000000000
--- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.12-r6
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2 37511570
-MD5 41af3b58c0fce0f3ab186c713d6fbdce genpatches-2.6.12-13.base.tar.bz2 49335
-MD5 96d4ea6b00288e03c595e5a829cb8f71 genpatches-2.6.12-13.extras.tar.bz2 232634
-MD5 f5b74120554c99d7e6ef592693ad7be6 software-suspend-2.1.9.9-for-2.6.12.tar.bz2 129521
diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.12-r7 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.12-r7
deleted file mode 100644
index be91d9df1777..000000000000
--- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.12-r7
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2 37511570
-MD5 e4ef8778b5c007cffcd5c6a9548c28fa genpatches-2.6.12-14.base.tar.bz2 52185
-MD5 96d4ea6b00288e03c595e5a829cb8f71 genpatches-2.6.12-14.extras.tar.bz2 232634
-MD5 f5b74120554c99d7e6ef592693ad7be6 software-suspend-2.1.9.9-for-2.6.12.tar.bz2 129521
diff --git a/sys-kernel/suspend2-sources/files/linux-2.6.12-skge-pm_message_t.patch b/sys-kernel/suspend2-sources/files/linux-2.6.12-skge-pm_message_t.patch
deleted file mode 100644
index e7d0828b686d..000000000000
--- a/sys-kernel/suspend2-sources/files/linux-2.6.12-skge-pm_message_t.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urp linux-2.6.12/drivers/net/skge.c linux-2.6.12-skge-pm_message_t/drivers/net/skge.c
---- linux-2.6.12/drivers/net/skge.c	2005-08-21 16:41:40.000000000 +0200
-+++ linux-2.6.12-skge-pm_message_t/drivers/net/skge.c	2005-08-21 16:46:53.000000000 +0200
-@@ -3237,7 +3237,7 @@ static void __devexit skge_remove(struct
- }
- 
- #ifdef CONFIG_PM
--static int skge_suspend(struct pci_dev *pdev, u32 state)
-+static int skge_suspend(struct pci_dev *pdev, pm_message_t state)
- {
- 	struct skge_hw *hw  = pci_get_drvdata(pdev);
- 	int i, wol = 0;
-@@ -3257,7 +3257,7 @@ static int skge_suspend(struct pci_dev *
- 	}
- 
- 	pci_save_state(pdev);
--	pci_enable_wake(pdev, state, wol);
-+	pci_enable_wake(pdev, pci_choose_state(pdev, state), wol);
- 	pci_disable_device(pdev);
- 	pci_set_power_state(pdev, pci_choose_state(pdev, state));
- 
diff --git a/sys-kernel/suspend2-sources/files/linux-2.6.12-try_to_freeze.patch b/sys-kernel/suspend2-sources/files/linux-2.6.12-try_to_freeze.patch
deleted file mode 100644
index 09a33d63fc7b..000000000000
--- a/sys-kernel/suspend2-sources/files/linux-2.6.12-try_to_freeze.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -urp linux-2.6.12/arch/arm/kernel/signal.c linux-2.6.12-try_to_freeze/arch/arm/kernel/signal.c
---- linux-2.6.12/arch/arm/kernel/signal.c	2005-06-17 21:48:29.000000000 +0200
-+++ linux-2.6.12-try_to_freeze/arch/arm/kernel/signal.c	2005-07-08 19:48:20.000000000 +0200
-@@ -688,7 +688,7 @@ static int do_signal(sigset_t *oldset, s
- 	if (!user_mode(regs))
- 		return 0;
- 
--	if (try_to_freeze(0))
-+	if (try_to_freeze())
- 		goto no_signal;
- 
- 	if (current->ptrace & PT_SINGLESTEP)
-diff -urp linux-2.6.12/arch/mips/kernel/irixsig.c linux-2.6.12-try_to_freeze/arch/mips/kernel/irixsig.c
---- linux-2.6.12/arch/mips/kernel/irixsig.c	2005-06-17 21:48:29.000000000 +0200
-+++ linux-2.6.12-try_to_freeze/arch/mips/kernel/irixsig.c	2005-07-08 19:48:27.000000000 +0200
-@@ -178,7 +178,7 @@ asmlinkage int do_irix_signal(sigset_t *
- 	if (!user_mode(regs))
- 		return 1;
- 
--	if (try_to_freeze(0))
-+	if (try_to_freeze())
- 		goto no_signal;
- 
- 	if (!oldset)
-diff -urp linux-2.6.12/arch/mips/kernel/signal32.c linux-2.6.12-try_to_freeze/arch/mips/kernel/signal32.c
---- linux-2.6.12/arch/mips/kernel/signal32.c	2005-06-17 21:48:29.000000000 +0200
-+++ linux-2.6.12-try_to_freeze/arch/mips/kernel/signal32.c	2005-07-08 19:48:28.000000000 +0200
-@@ -774,7 +774,7 @@ int do_signal32(sigset_t *oldset, struct
- 	if (!user_mode(regs))
- 		return 1;
- 
--	if (try_to_freeze(0))
-+	if (try_to_freeze())
- 		goto no_signal;
- 
- 	if (!oldset)
-diff -urp linux-2.6.12/arch/mips/kernel/signal.c linux-2.6.12-try_to_freeze/arch/mips/kernel/signal.c
---- linux-2.6.12/arch/mips/kernel/signal.c	2005-06-17 21:48:29.000000000 +0200
-+++ linux-2.6.12-try_to_freeze/arch/mips/kernel/signal.c	2005-07-08 19:48:27.000000000 +0200
-@@ -457,7 +457,7 @@ static int do_signal(sigset_t *oldset, s
- 	if (!user_mode(regs))
- 		return 1;
- 
--	if (try_to_freeze(0))
-+	if (try_to_freeze())
- 		goto no_signal;
- 
- 	if (!oldset)
-diff -urp linux-2.6.12/arch/sh/kernel/signal.c linux-2.6.12-try_to_freeze/arch/sh/kernel/signal.c
---- linux-2.6.12/arch/sh/kernel/signal.c	2005-06-17 21:48:29.000000000 +0200
-+++ linux-2.6.12-try_to_freeze/arch/sh/kernel/signal.c	2005-07-08 19:48:19.000000000 +0200
-@@ -579,7 +579,7 @@ int do_signal(struct pt_regs *regs, sigs
- 	if (!user_mode(regs))
- 		return 1;
- 
--	if (try_to_freeze(0))
-+	if (try_to_freeze())
- 		goto no_signal;
- 
- 	if (!oldset)
-diff -urp linux-2.6.12/arch/sh64/kernel/signal.c linux-2.6.12-try_to_freeze/arch/sh64/kernel/signal.c
---- linux-2.6.12/arch/sh64/kernel/signal.c	2005-06-17 21:48:29.000000000 +0200
-+++ linux-2.6.12-try_to_freeze/arch/sh64/kernel/signal.c	2005-07-08 19:48:29.000000000 +0200
-@@ -697,7 +697,7 @@ int do_signal(struct pt_regs *regs, sigs
- 	if (!user_mode(regs))
- 		return 1;
- 
--	if (try_to_freeze(0))
-+	if (try_to_freeze())
- 		goto no_signal;
- 
- 	if (!oldset)
-diff -urp linux-2.6.12/fs/jffs2/background.c linux-2.6.12-try_to_freeze/fs/jffs2/background.c
---- linux-2.6.12/fs/jffs2/background.c	2005-06-17 21:48:29.000000000 +0200
-+++ linux-2.6.12-try_to_freeze/fs/jffs2/background.c	2005-07-08 19:48:11.000000000 +0200
-@@ -92,7 +92,7 @@ static int jffs2_garbage_collect_thread(
- 			schedule();
- 		}
- 
--		if (try_to_freeze(0))
-+		if (try_to_freeze())
- 			continue;
- 
- 		cond_resched();
diff --git a/sys-kernel/suspend2-sources/files/linux-2.6.12-vesafb-tng-suspend2.patch b/sys-kernel/suspend2-sources/files/linux-2.6.12-vesafb-tng-suspend2.patch
deleted file mode 100644
index f43dd0bcb75b..000000000000
--- a/sys-kernel/suspend2-sources/files/linux-2.6.12-vesafb-tng-suspend2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -urp linux-2.6.12/drivers/video/vesafb-thread.c linux-2.6.12-vesafb-tng-suspend2/drivers/video/vesafb-thread.c
---- linux-2.6.12/drivers/video/vesafb-thread.c	2005-06-29 14:35:32.000000000 +0200
-+++ linux-2.6.12-vesafb-tng-suspend2/drivers/video/vesafb-thread.c	2005-07-04 23:44:38.000000000 +0200
-@@ -540,8 +540,13 @@ int vesafb_thread(void *unused)
- 	while (1) {
- 		vesafb_handle_tasks();
- 		wait_event_interruptible(vesafb_wait, !list_empty(&vesafb_task_list));
-+
-+#ifdef PF_FREEZE
- 		if (current->flags & PF_FREEZE)
- 			refrigerator(PF_FREEZE);
-+#else
-+		try_to_freeze();
-+#endif
- 
- 		if (signal_pending(current))
- 			break;
diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.12-r6.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.12-r6.ebuild
deleted file mode 100644
index c11c9e98bef5..000000000000
--- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.12-r6.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.12-r6.ebuild,v 1.2 2005/08/29 11:07:38 brix Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="13"
-
-inherit eutils kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="Software Suspend 2 + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://www.suspend2.net"
-
-SUSPEND2_VERSION="2.1.9.9"
-SUSPEND2_TARGET="${PV}"
-SUSPEND2_SRC="software-suspend-${SUSPEND2_VERSION}-for-${SUSPEND2_TARGET}"
-SUSPEND2_URI="http://www.suspend2.net/downloads/all/${SUSPEND2_SRC}.tar.bz2"
-
-UNIPATCH_LIST="${FILESDIR}/4306_dm-bbr-create_workqueue.patch
-${FILESDIR}/linux-2.6.12-vesafb-tng-suspend2.patch
-${FILESDIR}/linux-2.6.12-try_to_freeze.patch
-${FILESDIR}/linux-2.6.12-skge-pm_message_t.patch"
-UNIPATCH_STRICTORDER="yes"
-UNIPATCH_DOCS="${WORKDIR}/${SUSPEND2_SRC}/Changelog
-${WORKDIR}/${SUSPEND2_SRC}/ToDo"
-
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${SUSPEND2_URI}"
-
-KEYWORDS="x86"
-
-IUSE="ultra1"
-RDEPEND="${RDEPEND}
-		>=sys-apps/suspend2-userui-0.5.0
-		>=sys-power/hibernate-script-1.09"
-
-K_EXTRAEINFO="If there are issues with this kernel, please direct any
-queries to the suspend2-devel mailing list:
-http://lists.suspend2.net/cgi-bin/mailman/listinfo/suspend2-devel"
-
-pkg_setup() {
-	if use sparc; then
-		# hme lockup hack on ultra1
-		use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch"
-	fi
-}
-
-src_unpack() {
-	kernel-2_src_unpack
-
-	cd ${WORKDIR}
-	unpack ${SUSPEND2_SRC}.tar.bz2
-
-	cd ${S}
-	EPATCH_EXCLUDE="apply Changelog unapply ToDo" \
-	EPATCH_FORCE="yes" \
-	EPATCH_SUFFIX="" \
-	EPATCH_OPTS="-p1" \
-	epatch ${WORKDIR}/${SUSPEND2_SRC}
-}
-
-pkg_postinst() {
-	postinst_sources
-
-	echo
-
-	if [ "${ARCH}" = "sparc" ]; then
-		if [ x"`cat /proc/openprom/name 2>/dev/null`" \
-			 = x"'SUNW,Ultra-1'" ]; then
-			einfo "For users with an Enterprise model Ultra 1 using the HME"
-			einfo "network interface, please emerge the kernel using the"
-			einfo "following command: USE=ultra1 emerge ${PN}"
-		fi
-	fi
-}
diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.12-r7.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.12-r7.ebuild
deleted file mode 100644
index 69eb1b1da6d7..000000000000
--- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.12-r7.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.12-r7.ebuild,v 1.1 2005/09/06 13:40:49 brix Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="14"
-
-inherit eutils kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="Software Suspend 2 + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://www.suspend2.net"
-
-SUSPEND2_VERSION="2.1.9.9"
-SUSPEND2_TARGET="${PV}"
-SUSPEND2_SRC="software-suspend-${SUSPEND2_VERSION}-for-${SUSPEND2_TARGET}"
-SUSPEND2_URI="http://www.suspend2.net/downloads/all/${SUSPEND2_SRC}.tar.bz2"
-
-UNIPATCH_LIST="${FILESDIR}/4306_dm-bbr-create_workqueue.patch
-${FILESDIR}/linux-2.6.12-vesafb-tng-suspend2.patch
-${FILESDIR}/linux-2.6.12-try_to_freeze.patch
-${FILESDIR}/linux-2.6.12-skge-pm_message_t.patch"
-UNIPATCH_STRICTORDER="yes"
-UNIPATCH_DOCS="${WORKDIR}/${SUSPEND2_SRC}/Changelog
-${WORKDIR}/${SUSPEND2_SRC}/ToDo"
-
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${SUSPEND2_URI}"
-
-KEYWORDS="~x86"
-
-IUSE="ultra1"
-RDEPEND="${RDEPEND}
-		>=sys-apps/suspend2-userui-0.5.0
-		>=sys-power/hibernate-script-1.09"
-
-K_EXTRAEINFO="If there are issues with this kernel, please direct any
-queries to the suspend2-devel mailing list:
-http://lists.suspend2.net/cgi-bin/mailman/listinfo/suspend2-devel"
-
-pkg_setup() {
-	if use sparc; then
-		# hme lockup hack on ultra1
-		use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch"
-	fi
-}
-
-src_unpack() {
-	kernel-2_src_unpack
-
-	cd ${WORKDIR}
-	unpack ${SUSPEND2_SRC}.tar.bz2
-
-	cd ${S}
-	EPATCH_EXCLUDE="apply Changelog unapply ToDo" \
-	EPATCH_FORCE="yes" \
-	EPATCH_SUFFIX="" \
-	EPATCH_OPTS="-p1" \
-	epatch ${WORKDIR}/${SUSPEND2_SRC}
-}
-
-pkg_postinst() {
-	postinst_sources
-
-	echo
-
-	if [ "${ARCH}" = "sparc" ]; then
-		if [ x"`cat /proc/openprom/name 2>/dev/null`" \
-			 = x"'SUNW,Ultra-1'" ]; then
-			einfo "For users with an Enterprise model Ultra 1 using the HME"
-			einfo "network interface, please emerge the kernel using the"
-			einfo "following command: USE=ultra1 emerge ${PN}"
-		fi
-	fi
-}