New version with working ide-cdrom.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 79 insertions, 3 deletions

diff --git a/sys-kernel/hppa-sources/ChangeLog b/sys-kernel/hppa-sources/ChangeLog
index 42cf1d9b4a4d..880078ad53d4 100644
--- a/sys-kernel/hppa-sources/ChangeLog
+++ b/sys-kernel/hppa-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/hppa-sources
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/ChangeLog,v 1.57 2005/07/12 20:14:40 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/ChangeLog,v 1.58 2005/08/10 08:11:28 gmsoft Exp $
+
+*hppa-sources-2.6.12.4_p2 (10 Aug 2005)
+
+  10 Aug 2005; Guy Martin <gmsoft@gentoo.org> +files/ide-cdrom-fix.patch,
+  +hppa-sources-2.6.12.4_p2.ebuild:
+  New version with working ide-cdrom.
 
   12 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
   -files/4705_squashfs-2.1.patch.bz2, hppa-sources-2.6.12.2_p2.ebuild:
diff --git a/sys-kernel/hppa-sources/Manifest b/sys-kernel/hppa-sources/Manifest
index efd15189a4fe..01c137b5805a 100644
--- a/sys-kernel/hppa-sources/Manifest
+++ b/sys-kernel/hppa-sources/Manifest
@@ -1,4 +1,4 @@
-MD5 d6bda04b657df48e8852e9e1a2742d46 ChangeLog 10340
+MD5 dd252c1dc3e2f7d602c82227d8205d57 ChangeLog 10526
 MD5 dcf6adc464035c767d3183e5f7774b26 hppa-sources-2.6.10_p1.ebuild 692
 MD5 f176b7d1c3f6ed8055e2d49209e0fa90 hppa-sources-2.6.10_p10.ebuild 781
 MD5 b3f3f3026234e3e4e09eb594357f2883 hppa-sources-2.6.10_p11.ebuild 755
@@ -6,8 +6,9 @@ MD5 074dd720871b3b04b90e6f39c3664c7c hppa-sources-2.6.10_p2.ebuild 717
 MD5 ca691817130aedfb73c935b3cda1e75b hppa-sources-2.6.10_p4.ebuild 717
 MD5 53ec312f4db825cb5bf2971f99f3d35f hppa-sources-2.6.10_p6.ebuild 717
 MD5 8cee23a5c30baa50ce5a342fe4dddd32 hppa-sources-2.6.11_p2.ebuild 685
-MD5 dfb6127d9409cff2c8890e6a9d58a720 hppa-sources-2.6.12.2_p2.ebuild 1242
 MD5 05ed5731534e9423f109cbec1aa7e993 metadata.xml 223
+MD5 dfb6127d9409cff2c8890e6a9d58a720 hppa-sources-2.6.12.2_p2.ebuild 1242
+MD5 67d537d90ccdb5149d39cf9c90d9283b hppa-sources-2.6.12.4_p2.ebuild 1339
 MD5 001b0a631c9fc28133013a1f8f78f74c files/CAN-2004-1056.patch 8458
 MD5 cd0a7533c43364e377348613c6d76bb7 files/CAN-2004-1235.patch 9736
 MD5 b4f71191d0b9bc4439cdb8645ff474a7 files/LKA-20050107.patch 6122
@@ -20,3 +21,5 @@ MD5 47f5d83813a16f62c031edd2e0c1b79b files/digest-hppa-sources-2.6.10_p4 131
 MD5 db1af05869240e3d6499fb4554fa4540 files/digest-hppa-sources-2.6.10_p6 131
 MD5 373e99cd8f21b64a4fbabdd65d7adbe5 files/digest-hppa-sources-2.6.11_p2 131
 MD5 54105c5c37033ed1472d7a747c522e3e files/digest-hppa-sources-2.6.12.2_p2 262
+MD5 fde206859ab9582a5c727d7ccea34305 files/digest-hppa-sources-2.6.12.4_p2 263
+MD5 7b46dd1f32324db5bdffc2b0b822c546 files/ide-cdrom-fix.patch 480
diff --git a/sys-kernel/hppa-sources/files/digest-hppa-sources-2.6.12.4_p2 b/sys-kernel/hppa-sources/files/digest-hppa-sources-2.6.12.4_p2
new file mode 100644
index 000000000000..e6d3cd8fed59
--- /dev/null
+++ b/sys-kernel/hppa-sources/files/digest-hppa-sources-2.6.12.4_p2
@@ -0,0 +1,4 @@
+MD5 7084f2e6ff4f507db1ee57e472261585 patch-2.6.12.4.bz2 11404
+MD5 c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2 37511570
+MD5 114483c7189926da4afeae6feaba8a16 patch-2.6.12-pa2.gz 84155
+MD5 33af93f8f34ec2437fb41091176f7b14 4705_squashfs-2.1.patch.bz2 14357
diff --git a/sys-kernel/hppa-sources/files/ide-cdrom-fix.patch b/sys-kernel/hppa-sources/files/ide-cdrom-fix.patch
new file mode 100644
index 000000000000..d8aa4d32ba17
--- /dev/null
+++ b/sys-kernel/hppa-sources/files/ide-cdrom-fix.patch
@@ -0,0 +1,12 @@
+diff -uNr linux-2.6.12.4-pa2.orig/drivers/ide/ide-lib.c linux-2.6.12.4-pa2/drivers/ide/ide-lib.c
+--- linux-2.6.12.4-pa2.orig/drivers/ide/ide-lib.c	2005-08-09 18:11:03.000000000 +0200
++++ linux-2.6.12.4-pa2/drivers/ide/ide-lib.c	2005-08-09 18:13:20.000000000 +0200
+@@ -410,7 +410,7 @@
+ {
+ 	u64 addr = BLK_BOUNCE_HIGH;	/* dma64_addr_t */
+ 
+-	if (on && drive->media == ide_disk) {
++	if (on) {
+ 		if (!PCI_DMA_BUS_IS_PHYS)
+ 			addr = BLK_BOUNCE_ANY;
+ 		else if (HWIF(drive)->pci_dev)
diff --git a/sys-kernel/hppa-sources/hppa-sources-2.6.12.4_p2.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.6.12.4_p2.ebuild
new file mode 100644
index 000000000000..08806bda773e
--- /dev/null
+++ b/sys-kernel/hppa-sources/hppa-sources-2.6.12.4_p2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.6.12.4_p2.ebuild,v 1.1 2005/08/10 08:11:28 gmsoft Exp $
+
+ETYPE="sources"
+
+CKV="${PV/_*}"
+K_NOUSENAME=true
+inherit kernel-2
+
+KV_FULL=${CKV}-pa${PATCH_LEVEL}
+detect_version
+
+
+DESCRIPTION="Full sources for the Linux kernel with patch for hppa"
+PATCH_LEVEL="${PV/${CKV}_p/}"
+SRC_URI="${KERNEL_URI}
+http://ftp.parisc-linux.org/cvs/linux-2.6/patch-${OKV}-pa${PATCH_LEVEL}.gz
+http://dev.gentoo.org/~dertobi123/hppa/4705_squashfs-2.1.patch.bz2"
+UNIPATCH_LIST="${T}/patch-${OKV}-pa${PATCH_LEVEL}.patch
+${DISTDIR}/4705_squashfs-2.1.patch.bz2 ${FILESDIR}/ide-cdrom-fix.patch"
+HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://parisc-linux.org"
+KEYWORDS="hppa -*"
+
+
+src_unpack() {
+
+	if [[ -n ${KV_EXTRA} ]]
+	then
+
+		KV_EXTRA=".${KV_EXTRA}"
+
+		zcat ${DISTDIR}/patch-${OKV}-pa${PATCH_LEVEL}.gz | \
+			sed -e "/+EXTRAVERSION/s/=.*\$/=/" > \
+			${T}/patch-${OKV}-pa${PATCH_LEVEL}.patch
+	fi
+
+	EXTRAVERSION=${KV_EXTRA}-pa${PATCH_LEVEL}
+
+	universal_unpack
+
+
+	# We force the order of patching. kernel-2.eclass does weird stuff
+	unipatch  ${UNIPATCH_LIST}
+	unipatch  ${UNIPATCH_LIST_DEFAULT}
+
+	unpack_set_extraversion
+	unpack_fix_docbook
+	unpack_fix_install_path
+
+}