Fix compilation of skge, bug #103127.

(Portage version: 2.0.51.22-r2)

5 files changed, 113 insertions, 2 deletions

diff --git a/sys-kernel/suspend2-sources/ChangeLog b/sys-kernel/suspend2-sources/ChangeLog
index af3c19268dc5..033c0a092806 100644
--- a/sys-kernel/suspend2-sources/ChangeLog
+++ b/sys-kernel/suspend2-sources/ChangeLog
@@ -1,6 +1,13 @@
 # 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.6 2005/08/17 14:30:52 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/ChangeLog,v 1.7 2005/08/21 14:54:39 brix Exp $
+
+*suspend2-sources-2.6.12-r6 (21 Aug 2005)
+
+  21 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/linux-2.6.12-skge-pm_message_t.patch,
+  +suspend2-sources-2.6.12-r6.ebuild:
+  Fix compilation of skge, bug #103127.
 
 *suspend2-sources-2.6.12-r5 (17 Aug 2005)
 
diff --git a/sys-kernel/suspend2-sources/Manifest b/sys-kernel/suspend2-sources/Manifest
index e06e615cd5db..3f9385ec0a50 100644
--- a/sys-kernel/suspend2-sources/Manifest
+++ b/sys-kernel/suspend2-sources/Manifest
@@ -1,17 +1,20 @@
 MD5 6d55b5f15325967356e18eb771908fb3 suspend2-sources-2.6.12-r2.ebuild 2108
 MD5 2b429ae0891c541752a19e0fd7424c9b suspend2-sources-2.6.12-r4.ebuild 2109
+MD5 0f2e7b1eee8b96772ab727c131174c34 suspend2-sources-2.6.12-r6.ebuild 2037
 MD5 8bded6a42fa287daafcd56e7321d1a16 suspend2-sources-2.6.12-r1.ebuild 2108
 MD5 83edc0c7b4c66c7474a126bf93908df8 suspend2-sources-2.6.12-r3.ebuild 2109
 MD5 af3a2dc84edfa599714c447ccd2b58a2 suspend2-sources-2.6.12.ebuild 1965
-MD5 d10401e6d9d972e8b3ea19466c027e6a ChangeLog 1336
+MD5 0de04f749fa6575bc66ede160d4bb458 ChangeLog 1559
 MD5 6de3f53a09fc1b16a6965fef6cfdc70f suspend2-sources-2.6.12-r5.ebuild 2109
 MD5 e40cb3df546efa5003fe3778c5a50854 metadata.xml 275
 MD5 320c41493bbe3f054a0a90d92c98e67f files/linux-2.6.12-try_to_freeze.patch 3190
+MD5 787fbef2c88ac718b5cca330dc6451ef files/linux-2.6.12-skge-pm_message_t.patch 814
 MD5 2c8a57cd0e140e095595b6ba9e57cead files/digest-suspend2-sources-2.6.12-r1 310
 MD5 b62a3f98230d6a6c2da3d0373b15c073 files/digest-suspend2-sources-2.6.12-r2 310
 MD5 8458667412a03e74ce0536c1bf562f87 files/digest-suspend2-sources-2.6.12-r3 312
 MD5 5a18408a59f2e14d821454f4ab158643 files/digest-suspend2-sources-2.6.12-r4 312
 MD5 a52b2429f74b0629c13f2f028cbd4682 files/digest-suspend2-sources-2.6.12-r5 312
+MD5 a52b2429f74b0629c13f2f028cbd4682 files/digest-suspend2-sources-2.6.12-r6 312
 MD5 2c13f91d861547f897bd8bc3e4d7e9cb files/digest-suspend2-sources-2.6.12 310
 MD5 2b6c45a5cc42e34edf11954e71a95815 files/4306_dm-bbr-create_workqueue.patch 548
 MD5 0b4371d982e38217edb8af1023bb4803 files/linux-2.6.12-vesafb-tng-suspend2.patch 633
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
new file mode 100644
index 000000000000..e98473571131
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.12-r6
@@ -0,0 +1,4 @@
+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/linux-2.6.12-skge-pm_message_t.patch b/sys-kernel/suspend2-sources/files/linux-2.6.12-skge-pm_message_t.patch
new file mode 100644
index 000000000000..e7d0828b686d
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/linux-2.6.12-skge-pm_message_t.patch
@@ -0,0 +1,21 @@
+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/suspend2-sources-2.6.12-r6.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.12-r6.ebuild
new file mode 100644
index 000000000000..4d5e6260bb10
--- /dev/null
+++ b/sys-kernel/suspend2-sources/suspend2-sources-2.6.12-r6.ebuild
@@ -0,0 +1,76 @@
+# 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.1 2005/08/21 14:54:39 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
+}