More cruft

4 files changed, 7 insertions, 123 deletions

diff --git a/sys-fs/reiserfsprogs/ChangeLog b/sys-fs/reiserfsprogs/ChangeLog
index 62a28f880e8f..48c31d0125f1 100644
--- a/sys-fs/reiserfsprogs/ChangeLog
+++ b/sys-fs/reiserfsprogs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/reiserfsprogs
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiserfsprogs/ChangeLog,v 1.15 2004/05/13 19:13:18 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiserfsprogs/ChangeLog,v 1.16 2004/05/13 19:14:26 lostlogic Exp $
+
+  13 May 2004; Brandon Low <lostlogic@gentoo.org>
+  -files/reiserfsprogs-3.6.4-bitops.patch,
+  -files/reiserfsprogs-3.6.5-flush_buffers-bug.patch:
+  More cruft
 
   13 May 2004; Brandon Low <lostlogic@gentoo.org>
   -reiserfsprogs-3.6.10.ebuild, -reiserfsprogs-3.6.4-r1.ebuild,
diff --git a/sys-fs/reiserfsprogs/Manifest b/sys-fs/reiserfsprogs/Manifest
index a0fa09fd5eec..62b8e5c52ee9 100644
--- a/sys-fs/reiserfsprogs/Manifest
+++ b/sys-fs/reiserfsprogs/Manifest
@@ -3,13 +3,11 @@ MD5 4bef3863abd4e25f922f95b91d48f8a5 reiserfsprogs-3.6.11.ebuild 835
 MD5 181aa987f6c90780d9db0a1a1d863c7c reiserfsprogs-3.6.8.ebuild 791
 MD5 63407a34295f4e0de9c0dc41d5b7d581 reiserfsprogs-3.6.13.ebuild 783
 MD5 dff576738dba0df38c3f4a1716b8e23b reiserfsprogs-3.6.11-r1.ebuild 1073
-MD5 9f905bbe2847098e152bd614f8c58e2c ChangeLog 6806
+MD5 ad68710217c73ea63afd854be3e2bbb1 ChangeLog 6967
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 b4eeb93b06e335142e6fd3984030f841 files/blk_size.patch 1254
-MD5 209924bdef4a9feb2bd452f3ca3b06dc files/reiserfsprogs-3.6.5-flush_buffers-bug.patch 3086
 MD5 f71b5a7289045ceb19f83e04ff079e09 files/digest-reiserfsprogs-3.6.8 71
 MD5 69ece3a13ceb67d23ad84f8578b83dff files/reiserfsprogs-3.6.11-2.6.patch 574
-MD5 989813ab05fd2ad4954bf998811d9a29 files/reiserfsprogs-3.6.4-bitops.patch 1278
 MD5 c29a2b313930bcc6a2c0fba4354c0520 files/digest-reiserfsprogs-3.6.11-r1 72
 MD5 c29a2b313930bcc6a2c0fba4354c0520 files/digest-reiserfsprogs-3.6.11 72
 MD5 e551421a01540edae18f223f5dca87ff files/digest-reiserfsprogs-3.6.13 72
diff --git a/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.4-bitops.patch b/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.4-bitops.patch
deleted file mode 100644
index 79966165db54..000000000000
--- a/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.4-bitops.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- include/io.h.orig	2002-11-02 11:55:50.000000000 -0600
-+++ include/io.h	2002-11-02 14:02:08.000000000 -0600
-@@ -3,6 +3,10 @@
-  */
- 
- 
-+#define __KERNEL__
-+#include <asm/bitops.h> /* needed for test_bit/set_bit */
-+#undef __KERNEL__
-+
- struct buffer_head {
-     unsigned long b_blocknr;
-     unsigned short b_dev;
---- include/misc.h.orig	2002-11-02 14:17:31.000000000 -0600
-+++ include/misc.h	2002-11-02 14:19:44.000000000 -0600
-@@ -49,7 +49,10 @@
- int uuid_is_correct (unsigned char * uuid);
- int set_uuid (const unsigned char * text, unsigned char * UUID);
- 
-+#define __KERNEL__
- #include <asm/bitops.h>
-+#undef __KERNEL__
-+
- #if __BYTE_ORDER == __LITTLE_ENDIAN
- int le_set_bit (int nr, void * addr);
- int le_clear_bit (int nr, void * addr);
-@@ -64,12 +67,14 @@
- # define le64_to_cpu(val)                 (val)
- #elif __BYTE_ORDER == __BIG_ENDIAN
- 
-+#ifndef cpu_to_le16
- # define cpu_to_le16(val)                 swab16(val)
- # define le16_to_cpu(val)                 swab16(val)
- # define cpu_to_le32(val)                 swab32(val)
- # define le32_to_cpu(val)                 swab32(val)
- # define cpu_to_le64(val)                 swab64(val)
- # define le64_to_cpu(val)                 swab64(val)
-+#endif
- #else
- # error "nuxi/pdp-endian archs are not supported"
- #endif
diff --git a/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.5-flush_buffers-bug.patch b/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.5-flush_buffers-bug.patch
deleted file mode 100644
index a05a35f0f408..000000000000
--- a/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.5-flush_buffers-bug.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -rup reiserfsprogs-3.6.5.old/include/io.h reiserfsprogs-3.6.5/include/io.h
---- reiserfsprogs-3.6.5.old/include/io.h	2003-04-01 20:52:39.000000000 +0400
-+++ reiserfsprogs-3.6.5/include/io.h	2003-04-01 21:00:59.000000000 +0400
-@@ -5,7 +5,7 @@
- 
- struct buffer_head {
-     unsigned long b_blocknr;
--    unsigned short b_dev;
-+    int b_dev;
-     unsigned long b_size;
-     char * b_data;
-     unsigned long b_state;
-@@ -51,7 +51,7 @@ void __wait_on_buffer (struct buffer_hea
- struct buffer_head * getblk (int dev, unsigned long block, int size);
- struct buffer_head * reiserfs_getblk (int dev, unsigned long block, int size, int *repeat);
- 
--struct buffer_head * find_buffer (unsigned short dev, unsigned long block, unsigned long size);
-+struct buffer_head * find_buffer (int dev, unsigned long block, unsigned long size);
- struct buffer_head * get_hash_table(dev_t dev, unsigned long block, int size);
- struct buffer_head * bread (int dev, unsigned long block, size_t size);
- struct buffer_head * reiserfs_bread (int dev, unsigned long block, int size, int *repeat);
-diff -rup reiserfsprogs-3.6.5.old/lib/io.c reiserfsprogs-3.6.5/lib/io.c
---- reiserfsprogs-3.6.5.old/lib/io.c	2003-04-01 20:52:36.000000000 +0400
-+++ reiserfsprogs-3.6.5/lib/io.c	2003-04-01 21:03:08.000000000 +0400
-@@ -102,7 +102,7 @@ static int buffer_writes = 0 ;
- 
- 
- 
--static void _show_buffers(struct buffer_head **list, unsigned short dev, unsigned long size) {
-+static void _show_buffers(struct buffer_head **list, int dev, unsigned long size) {
-     int all = 0;
-     int dirty = 0;
-     int in_use = 0; /* count != 0 */
-@@ -131,7 +131,7 @@ static void _show_buffers(struct buffer_
- 	    break;
-     }
- 
--    printf ("show_buffers (dev %u, size %lu): free %d, count != 0 %d, dirty %d, all %d\n",
-+    printf ("show_buffers (dev %d, size %lu): free %d, count != 0 %d, dirty %d, all %d\n",
- 	dev, size, free, in_use, dirty, all);
- }
- 
-@@ -161,7 +161,7 @@ static void insert_into_hash_queue (stru
- static void remove_from_hash_queue (struct buffer_head * bh)
- {
-     if (bh->b_hash_next == 0 && bh->b_hash_prev == 0 && bh != g_a_hash_queues[bh->b_blocknr % NR_HASH_QUEUES])
--	/* (b_dev == 0) ? */
-+	/* (b_dev == -1) ? */
- 	return;
- 
-     if (bh == g_a_hash_queues[bh->b_blocknr % NR_HASH_QUEUES]) {
-@@ -290,7 +290,7 @@ static int grow_buffers (int size)
- 	tmp->b_data = getmem (size);
- 	if (tmp->b_data == 0)
- 	    die ("grow_buffers: no memory for new buffer data");
--	tmp->b_dev = 0;
-+	tmp->b_dev = -1;
- 	tmp->b_size = size;
- 	put_buffer_list_head (&g_free_buffers, tmp);
-     }
-@@ -300,7 +300,7 @@ static int grow_buffers (int size)
- }
- 
- 
--struct buffer_head * find_buffer (unsigned short dev, unsigned long block, unsigned long size)
-+struct buffer_head * find_buffer (int dev, unsigned long block, unsigned long size)
- {		
-     struct buffer_head * next;
- 
-@@ -390,7 +390,7 @@ restart:
- 
- void flush_buffers (dev_t dev)
- {
--    if (!dev)
-+    if (dev == -1)
- 	die ("flush_buffers: device is not specifed");
-     sync_buffers (&Buffer_list_head, dev, 0/*all*/);
-     buffer_soft_limit = BUFFER_SOFT_LIMIT;