Cleanout old pvfs2 versions.

(Portage version: 2.1.4.4)

15 files changed, 12 insertions, 1182 deletions

diff --git a/sys-cluster/pvfs2/ChangeLog b/sys-cluster/pvfs2/ChangeLog
index d69afa989311..63b1833a502b 100644
--- a/sys-cluster/pvfs2/ChangeLog
+++ b/sys-cluster/pvfs2/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-cluster/pvfs2
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/ChangeLog,v 1.12 2008/04/17 02:51:23 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/ChangeLog,v 1.13 2008/04/17 03:00:03 jsbronder Exp $
+
+  17 Apr 2008; Justin Bronder <jsbronder@gentoo.org>
+  -files/2.6.3-no-pointer-sign.patch,
+  -files/2.6.3-register_sysctl_table.patch, -files/2.6.3-soname.patch,
+  -files/2.7.0-lib-install.patch, -files/2.6.3-as-needed.patch,
+  -files/2.6.3-kmem-and-dtor-fix.patch,
+  -files/2.6.3-link-librt-properly.patch, -files/2.7.0-soname.patch,
+  -files/pvfs2-1.5.1-destdir.patch, -pvfs2-1.5.1.ebuild,
+  -pvfs2-2.6.3.ebuild, -pvfs2-2.6.3-r1.ebuild, -pvfs2-2.7.0.ebuild,
+  -pvfs2-2.7.0-r1.ebuild:
+  Cleanout old versions.
 
 *pvfs2-2.7.1 (17 Apr 2008)
 
diff --git a/sys-cluster/pvfs2/files/2.6.3-as-needed.patch b/sys-cluster/pvfs2/files/2.6.3-as-needed.patch
deleted file mode 100644
index 01cff1e2ef76..000000000000
--- a/sys-cluster/pvfs2/files/2.6.3-as-needed.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- maint/config/openssl.m4~	2007-04-16 04:17:53.000000000 +0200
-+++ maint/config/openssl.m4	2007-04-16 04:17:53.000000000 +0200
-@@ -12,7 +12,7 @@
-             LDFLAGS="$LDFLAGS -L${opensslpath}/lib64 -L${opensslpath}/lib"
-             SERVER_LDFLAGS="$SERVER_LDFLAGS -L${opensslpath}/lib64 -L${opensslpath}/lib"
-         fi
--        LIBS="$LIBS -lcrypt -lssl"
-+        LIBS="$LIBS -lcrypt -lcrypto -lssl"
-     
-         AC_COMPILE_IFELSE(
-     	    [#include "openssl/bio.h"],
-@@ -36,7 +36,7 @@
- [
-     AC_MSG_CHECKING([for openssl library])
-     TMPLIBS=${LIBS}
--    LIBS="$LIBS -lcrypt -lssl"
-+    LIBS="$LIBS -lcrypt -lcrypto -lssl"
- 
-     AC_COMPILE_IFELSE(
-       [#include "openssl/bio.h"],
diff --git a/sys-cluster/pvfs2/files/2.6.3-kmem-and-dtor-fix.patch b/sys-cluster/pvfs2/files/2.6.3-kmem-and-dtor-fix.patch
deleted file mode 100644
index 9ad531578767..000000000000
--- a/sys-cluster/pvfs2/files/2.6.3-kmem-and-dtor-fix.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-diff -u -r pvfs-2.6.3/src/kernel/linux-2.6/pvfs2-cache.c pvfs-2.6.3-new/src/kernel/linux-2.6/pvfs2-cache.c
---- pvfs-2.6.3/src/kernel/linux-2.6/pvfs2-cache.c	2007-10-02 14:54:45.000000000 +0200
-+++ pvfs-2.6.3-new/src/kernel/linux-2.6/pvfs2-cache.c	2007-10-02 14:49:10.000000000 +0200
-@@ -203,14 +203,7 @@
-     pvfs2_kmem_cache_t * cachep,
-     unsigned long flags)
- {
--    if (flags & SLAB_CTOR_CONSTRUCTOR)
--    {
--        memset(req, 0, sizeof(MAX_ALIGNED_DEV_REQ_DOWNSIZE));
--    }
--    else
--    {
--        gossip_err("WARNING!! devreq_ctor called without ctor flag\n");
--    }
-+    memset(req, 0, sizeof(MAX_ALIGNED_DEV_REQ_DOWNSIZE));
- }
- 
- int dev_req_cache_initialize(void)
-@@ -269,45 +262,24 @@
- {
-     pvfs2_inode_t *pvfs2_inode = (pvfs2_inode_t *)new_pvfs2_inode;
- 
--    if (flags & SLAB_CTOR_CONSTRUCTOR)
--    {
--        memset(pvfs2_inode, 0, sizeof(pvfs2_inode_t));
--        ClearInitFlag(pvfs2_inode);
-+    memset(pvfs2_inode, 0, sizeof(pvfs2_inode_t));
-+    ClearInitFlag(pvfs2_inode);
- 
--        pvfs2_inode_initialize(pvfs2_inode);
-+    pvfs2_inode_initialize(pvfs2_inode);
- 
- #ifndef PVFS2_LINUX_KERNEL_2_4
--        /*
--           inode_init_once is from 2.6.x's inode.c; it's normally run
--           when an inode is allocated by the system's inode slab
--           allocator.  we call it here since we're overloading the
--           system's inode allocation with this routine, thus we have
--           to init vfs inodes manually
--        */
--        inode_init_once(&pvfs2_inode->vfs_inode);
--        pvfs2_inode->vfs_inode.i_version = 1;
-+    /*
-+       inode_init_once is from 2.6.x's inode.c; it's normally run
-+       when an inode is allocated by the system's inode slab
-+       allocator.  we call it here since we're overloading the
-+       system's inode allocation with this routine, thus we have
-+       to init vfs inodes manually
-+    */
-+    inode_init_once(&pvfs2_inode->vfs_inode);
-+    pvfs2_inode->vfs_inode.i_version = 1;
- #endif
--        /* Initialize the reader/writer semaphore */
--        init_rwsem(&pvfs2_inode->xattr_sem);
--    }
--    else
--    {
--        gossip_err("WARNING!! inode_ctor called without ctor flag\n");
--    }
--}
--
--static void pvfs2_inode_cache_dtor(
--    void *old_pvfs2_inode,
--    pvfs2_kmem_cache_t * cachep,
--    unsigned long flags)
--{
--    pvfs2_inode_t *pvfs2_inode = (pvfs2_inode_t *)old_pvfs2_inode;
--
--    if (pvfs2_inode && pvfs2_inode->link_target)
--    {
--        kfree(pvfs2_inode->link_target);
--        pvfs2_inode->link_target = NULL;
--    }
-+    /* Initialize the reader/writer semaphore */
-+    init_rwsem(&pvfs2_inode->xattr_sem);
- }
- 
- static inline void add_to_pinode_list(pvfs2_inode_t *pvfs2_inode)
-@@ -330,8 +302,7 @@
- {
-     pvfs2_inode_cache = kmem_cache_create(
-         "pvfs2_inode_cache", sizeof(pvfs2_inode_t), 0,
--        PVFS2_CACHE_CREATE_FLAGS, pvfs2_inode_cache_ctor,
--        pvfs2_inode_cache_dtor);
-+        PVFS2_CACHE_CREATE_FLAGS, pvfs2_inode_cache_ctor, NULL);
- 
-     if (!pvfs2_inode_cache)
-     {
-@@ -403,14 +374,7 @@
-     pvfs2_kmem_cache_t * cachep,
-     unsigned long flags)
- {
--    if (flags & SLAB_CTOR_CONSTRUCTOR)
--    {
--        memset(req, 0, sizeof(pvfs2_kiocb));
--    }
--    else
--    {
--        gossip_err("WARNING!! kiocb_ctor called without ctor flag\n");
--    }
-+    memset(req, 0, sizeof(pvfs2_kiocb));
- }
- 
- 
-diff -u -r pvfs-2.6.3/src/kernel/linux-2.6/pvfs2-kernel.h pvfs-2.6.3-new/src/kernel/linux-2.6/pvfs2-kernel.h
---- pvfs-2.6.3/src/kernel/linux-2.6/pvfs2-kernel.h	2007-10-02 14:54:45.000000000 +0200
-+++ pvfs-2.6.3-new/src/kernel/linux-2.6/pvfs2-kernel.h	2007-10-02 14:49:10.000000000 +0200
-@@ -47,6 +47,7 @@
- #include <linux/statfs.h>
- #include <linux/buffer_head.h>
- #include <linux/backing-dev.h>
-+#include <linux/device.h>
- #include <linux/mpage.h>
- #include <linux/namei.h>
- #include <linux/errno.h>
-@@ -363,7 +364,7 @@
- typedef struct
- {
-     PVFS_object_ref refn;
--    char *link_target;
-+    char link_target[PVFS_NAME_MAX];
-     /*
-      * Reading/Writing Extended attributes need to acquire the appropriate
-      * reader/writer semaphore on the pvfs2_inode_t structure.
-@@ -571,6 +572,15 @@
- 
- #endif
- 
-+typedef struct pvfs2_stats {
-+    unsigned long cache_hits;
-+    unsigned long cache_misses;
-+    unsigned long reads;
-+    unsigned long writes;
-+} pvfs2_stats;
-+
-+extern pvfs2_stats g_pvfs2_stats;
-+
- /*
-   NOTE: See Documentation/filesystems/porting for information
-   on implementing FOO_I and properly accessing fs private data
-@@ -821,8 +831,8 @@
-  * defined in devpvfs2-req.c
-  ****************************/
- 
--int     pvfs2_ioctl32_init(void);
--void    pvfs2_ioctl32_cleanup(void);
-+int     pvfs2_dev_init(void);
-+void    pvfs2_dev_cleanup(void);
- int     is_daemon_in_service(void);
- int     fs_mount_pending(PVFS_fs_id fsid);
- 
-@@ -1250,6 +1260,18 @@
- }
- #endif
- 
-+#ifndef HAVE_KZALLOC
-+static void *kzalloc(size_t size, gfp_t mask)
-+{
-+    void *ptr;
-+    ptr = kmalloc(size, mask);
-+    if (ptr) {
-+        memset(ptr, 0, size);
-+    }
-+    return ptr;
-+}
-+#endif
-+
- #endif /* PVFS2_LINUX_KERNEL_2_4 */
- 
- static inline unsigned int diff(struct timeval *end, struct timeval *begin)
-@@ -1268,11 +1290,10 @@
- 	void * ptr;
- 
- 	ptr = kmalloc(size, flags);
--	if(!ptr)
-+	if (ptr)
- 	{
--		return ptr;
-+            memset(ptr, 0, size);
- 	}
--	memset(ptr, 0, size);
- 	return ptr;
- }
- #endif
-diff -u -r pvfs-2.6.3/src/kernel/linux-2.6/pvfs2-utils.c pvfs-2.6.3-new/src/kernel/linux-2.6/pvfs2-utils.c
---- pvfs-2.6.3/src/kernel/linux-2.6/pvfs2-utils.c	2007-10-02 14:54:45.000000000 +0200
-+++ pvfs-2.6.3-new/src/kernel/linux-2.6/pvfs2-utils.c	2007-10-02 15:04:12.000000000 +0200
-@@ -101,18 +101,24 @@
- static void pvfs2_set_inode_flags(struct inode *inode, 
-         PVFS_sys_attr *attrs)
- {
--    if (attrs->flags & PVFS_IMMUTABLE_FL)
-+    if (attrs->flags & PVFS_IMMUTABLE_FL) {
-         inode->i_flags |= S_IMMUTABLE;
--    else 
-+    }
-+    else {
-         inode->i_flags &= ~S_IMMUTABLE;
--    if (attrs->flags & PVFS_APPEND_FL)
-+    }
-+    if (attrs->flags & PVFS_APPEND_FL) {
-         inode->i_flags |= S_APPEND;
--    else
-+    }
-+    else {
-         inode->i_flags &= ~S_APPEND;
--    if (attrs->flags & PVFS_NOATIME_FL)
-+    }
-+    if (attrs->flags & PVFS_NOATIME_FL) {
-         inode->i_flags |= S_NOATIME;
--    else
-+    }
-+    else {
-         inode->i_flags &= ~S_NOATIME;
-+    }
-     return;
- }
- 
-@@ -288,17 +294,7 @@
-                 /* copy link target to inode private data */
-                 if (pvfs2_inode && symname)
-                 {
--                    if (pvfs2_inode->link_target)
--                    {
--                        kfree(pvfs2_inode->link_target);
--                        pvfs2_inode->link_target = NULL;
--                    }
--                    pvfs2_inode->link_target = kmalloc(
--                        (strlen(symname) + 1), PVFS2_GFP_FLAGS);
--                    if (pvfs2_inode->link_target)
--                    {
--                        strcpy(pvfs2_inode->link_target, symname);
--                    }
-+                    strncpy(pvfs2_inode->link_target, symname, PVFS_NAME_MAX);
-                     gossip_debug(GOSSIP_UTILS_DEBUG, "Copied attr link target %s\n",
-                                 pvfs2_inode->link_target);
-                 }
-@@ -1791,7 +1787,8 @@
- {
-     void *buf;
- 
--    buf = kmalloc(sizeof(pvfs2_opaque_handle_t), PVFS2_BUFMAP_GFP_FLAGS);
-+    buf = kmalloc(sizeof(pvfs2_opaque_handle_t), 
-+                  PVFS2_BUFMAP_GFP_FLAGS);
-     return buf;
- }
- 
-@@ -1956,7 +1953,7 @@
-         pvfs2_inode->refn.handle = PVFS_HANDLE_NULL;
-         pvfs2_inode->refn.fs_id = PVFS_FS_ID_NULL;
-         pvfs2_inode->last_failed_block_index_read = 0;
--        pvfs2_inode->link_target = NULL;
-+        memset(pvfs2_inode->link_target, 0, sizeof(pvfs2_inode->link_target));
-         pvfs2_inode->error_code = 0;
-         SetInitFlag(pvfs2_inode);
-     }
-@@ -1964,7 +1961,6 @@
- 
- /*
-   this is called from super:pvfs2_destroy_inode.
--  pvfs2_inode_cache_dtor frees the link_target if any
- */
- void pvfs2_inode_finalize(pvfs2_inode_t *pvfs2_inode)
- {
diff --git a/sys-cluster/pvfs2/files/2.6.3-link-librt-properly.patch b/sys-cluster/pvfs2/files/2.6.3-link-librt-properly.patch
deleted file mode 100644
index ac85f016924e..000000000000
--- a/sys-cluster/pvfs2/files/2.6.3-link-librt-properly.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN pvfs-2.6.0.orig/maint/config/rt.m4 pvfs-2.6.0/maint/config/rt.m4
---- pvfs-2.6.0.orig/maint/config/rt.m4	2006-12-10 23:16:47.000000000 -0800
-+++ pvfs-2.6.0/maint/config/rt.m4	2006-12-10 23:36:17.000000000 -0800
-@@ -12,7 +12,7 @@
- 	[lio_listio(LIO_NOWAIT, NULL, 0, NULL);],
- 	[AC_MSG_RESULT(no)],
- 	[
--		LDFLAGS="$LDFLAGS -lrt"
-+		LIBS="$LIBS -lrt"
- 		AC_TRY_LINK(
- 			[#include <stdlib.h>
- 			 #include <unistd.h>
diff --git a/sys-cluster/pvfs2/files/2.6.3-no-pointer-sign.patch b/sys-cluster/pvfs2/files/2.6.3-no-pointer-sign.patch
deleted file mode 100644
index 39a12fecef0f..000000000000
--- a/sys-cluster/pvfs2/files/2.6.3-no-pointer-sign.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- maint/config/kernel.m4.old	2007-04-30 16:46:16.000000000 +0200
-+++ maint/config/kernel.m4	2007-04-30 16:48:26.000000000 +0200
-@@ -348,11 +348,8 @@
- 		)
- 	fi
- 
--	dnl we need the compiler to error on warnings about prototypes, but
--	dnl certain Fedora FC5 kernel header files throw extra (spurious)
--	dnl warnings, which -Wno-pointer-sign silences.	
-+
-         tmp_cflags=$CFLAGS
--	CFLAGS="$CFLAGS -Werror -Wno-pointer-sign"
- 	dnl if this test passes, there is a struct dentry* argument
- 	AC_MSG_CHECKING(if statfs callbacks' arguments in kernel has struct dentry argument)
- 	dnl if this test passes, the kernel has it
diff --git a/sys-cluster/pvfs2/files/2.6.3-register_sysctl_table.patch b/sys-cluster/pvfs2/files/2.6.3-register_sysctl_table.patch
deleted file mode 100644
index 11e8e2f81e21..000000000000
--- a/sys-cluster/pvfs2/files/2.6.3-register_sysctl_table.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/kernel/linux-2.6/pvfs2-proc.c.old	2007-04-30 10:02:55.000000000 +0200
-+++ src/kernel/linux-2.6/pvfs2-proc.c	2007-04-30 10:01:50.000000000 +0200
-@@ -337,7 +337,7 @@
- #ifdef CONFIG_SYSCTL
-     if (!fs_table_header)
-     {
--        fs_table_header = register_sysctl_table(fs_table, 0);
-+        fs_table_header = register_sysctl_table(fs_table);
-     }
- #endif
- 
diff --git a/sys-cluster/pvfs2/files/2.6.3-soname.patch b/sys-cluster/pvfs2/files/2.6.3-soname.patch
deleted file mode 100644
index c6bea01ab4e1..000000000000
--- a/sys-cluster/pvfs2/files/2.6.3-soname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in	2007-04-15 11:11:51.000000000 +0200
-+++ Makefile.in	2007-04-15 11:11:51.000000000 +0200
-@@ -591,7 +591,7 @@
- lib/libpvfs2.so: $(LIBPICOBJS)
- 	$(Q) "  LDSO		$@"
- 	$(E)$(INSTALL) -d lib
--	$(E)$(LDSHARED) -o $@ $(LIBPICOBJS)
-+	$(E)$(LDSHARED) -Wl,-soname,libpvfs2.so -o $@ $(LIBPICOBJS)
- 
- # rule for building the pvfs2 _multithreaded_ library
- lib/libpvfs2-threaded.so: $(LIBTHREADEDPICOBJS)
diff --git a/sys-cluster/pvfs2/files/2.7.0-lib-install.patch b/sys-cluster/pvfs2/files/2.7.0-lib-install.patch
deleted file mode 100644
index 34803d0cf262..000000000000
--- a/sys-cluster/pvfs2/files/2.7.0-lib-install.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.in.orig	2007-11-30 16:49:56.000000000 -0800
-+++ Makefile.in	2007-11-30 16:53:49.000000000 -0800
-@@ -55,6 +55,7 @@
- prefix = $(DESTDIR)@prefix@
- datarootdir = $(DESTDIR)@datarootdir@
- mandir = $(DESTDIR)@mandir@
-+libdir = $(DESTDIR)@libdir@
- exec_prefix = $(DESTDIR)@exec_prefix@
- 
- VPATH = $(srcdir)
-@@ -893,8 +894,8 @@
- 	install -m 644 $(srcdir)/include/pvfs2-util.h $(prefix)/include
- 	install -m 644 $(srcdir)/include/pvfs2-encode-stubs.h $(prefix)/include
- 
--	install -d $(prefix)/lib
--	install -m 755 $(LIBRARIES) $(prefix)/lib
-+	install -d $(libdir)
-+	install -m 755 $(LIBRARIES) $(libdir)
- 
- ifdef TARGET_OS_DARWIN
- #       TOC needs to be regenerated in libs after they get moved
diff --git a/sys-cluster/pvfs2/files/2.7.0-soname.patch b/sys-cluster/pvfs2/files/2.7.0-soname.patch
deleted file mode 100644
index 8b994182d435..000000000000
--- a/sys-cluster/pvfs2/files/2.7.0-soname.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- Makefile.in.orig	2007-12-02 12:26:02.000000000 -0800
-+++ Makefile.in	2007-12-02 12:47:58.000000000 -0800
-@@ -64,6 +64,7 @@
- # TODO: should probably check for bison and flex in configure
- BISON = bison
- FLEX = flex
-+LN = ln -s
- BUILD_BMI_TCP = @BUILD_BMI_TCP@
- BUILD_GM = @BUILD_GM@
- BUILD_MX = @BUILD_MX@
-@@ -163,6 +164,8 @@
- REDHAT_RELEASE = @REDHAT_RELEASE@
- NPTL_WORKAROUND = @NPTL_WORKAROUND@
- STRICT_CFLAGS = @STRICT_CFLAGS@
-+SO_LIBS = -lcrypt -lssl  -lpthread
-+SO_VER = 2.0
- # for Solaris:
- # LIBS += -lsocket -lnsl
- 
-@@ -436,8 +439,10 @@
- LIBRARIES :=
- LIBRARIES_THREADED :=
- ifeq ($(build_shared),yes)
--LIBRARIES_SHARED = lib/libpvfs2.so
-+LIBRARIES_SHARED = lib/libpvfs2.so.$(SO_VER)
- LIBRARIES += $(LIBRARIES_SHARED)
-+LIBRARIES_THREADED_SHARED = lib/libpvfs2-threaded.so.$(SO_VER)
-+LIBRARIES_THREADED += $(LIBRARIES_THREADED_SHARED)
- endif
- ifeq ($(build_static),yes)
- LIBRARIES_STATIC = lib/libpvfs2.a
-@@ -628,16 +633,16 @@
- 	$(E)ar rcs $@ $(LIBTHREADEDOBJS)
- 
- # rule for building the pvfs2 library
--lib/libpvfs2.so: $(LIBPICOBJS)
-+lib/libpvfs2.so.$(SO_VER): $(LIBPICOBJS)
- 	$(Q) "  LDSO		$@"
- 	$(E)$(INSTALL) -d lib
--	$(E)$(LDSHARED) -o $@ $(LIBPICOBJS)
-+	$(E)$(LDSHARED) -Wl,-soname,libpvfs2.so.$(SO_VER) -o $@ $(LIBPICOBJS) $(SO_LIBS)
- 
- # rule for building the pvfs2 _multithreaded_ library
--lib/libpvfs2-threaded.so: $(LIBTHREADEDPICOBJS)
-+lib/libpvfs2-threaded.so.$(SO_VER): $(LIBTHREADEDPICOBJS)
- 	$(Q) "  LDSO		$@"
- 	$(E)$(INSTALL) -d lib
--	$(E)$(LDSHARED) -o $@ $(LIBTHREADEDPICOBJS)
-+	$(E)$(LDSHARED) -Wl,-soname,libpvfs2-threaded.so.$(SO_VER) -o $@ $(LIBTHREADEDPICOBJS) $(SO_LIBS)
- 
- # rule for building the pvfs2 server library
- lib/libpvfs2-server.a: $(SERVEROBJS)
-@@ -896,6 +901,7 @@
- 
- 	install -d $(libdir)
- 	install -m 755 $(LIBRARIES) $(libdir)
-+	install -m 755 $(LIBRARIES_THREADED) $(libdir)
- 
- ifdef TARGET_OS_DARWIN
- #       TOC needs to be regenerated in libs after they get moved
diff --git a/sys-cluster/pvfs2/files/pvfs2-1.5.1-destdir.patch b/sys-cluster/pvfs2/files/pvfs2-1.5.1-destdir.patch
deleted file mode 100644
index c50933c13c68..000000000000
--- a/sys-cluster/pvfs2/files/pvfs2-1.5.1-destdir.patch
+++ /dev/null
@@ -1,128 +0,0 @@
---- pvfs2-1.5.1/Makefile.in.orig	2006-07-13 02:04:06.000000000 +1000
-+++ pvfs2-1.5.1/Makefile.in	2006-07-13 02:06:06.000000000 +1000
-@@ -55,6 +55,10 @@
- prefix = @prefix@
- mandir = @mandir@
- exec_prefix = @exec_prefix@
-+sbindir = @sbindir@
-+bindir = @bindir@
-+libdir = @libdir@
-+includedir = @includedir@
- 
- VPATH = $(srcdir)
- SHELL = @SHELL@
-@@ -807,48 +811,48 @@
-  --quiet examples/fs.conf examples/server.conf
- 
- install_doc:
--	install -d $(mandir)/man1
--	install -d $(mandir)/man5
--	install -m 644 $(srcdir)/doc/man/*.1 $(mandir)/man1
--	install -m 644 $(srcdir)/doc/man/*.5 $(mandir)/man5
-+	install -d $(DESTDIR)$(mandir)/man1
-+	install -d $(DESTDIR)$(mandir)/man5
-+	install -m 644 $(srcdir)/doc/man/*.1 $(DESTDIR)$(mandir)/man1
-+	install -m 644 $(srcdir)/doc/man/*.5 $(DESTDIR)$(mandir)/man5
- 
- install:: all install_doc
--	install -d $(prefix)/include
--	install -m 644 $(srcdir)/include/pvfs2.h $(prefix)/include
--	install -m 644 $(srcdir)/include/pvfs2-request.h $(prefix)/include
--	install -m 644 $(srcdir)/include/pvfs2-debug.h $(prefix)/include
--	install -m 644 $(srcdir)/include/pvfs2-sysint.h $(prefix)/include
--	install -m 644 $(srcdir)/include/pvfs2-mgmt.h $(prefix)/include
--	install -m 644 $(srcdir)/include/pvfs2-types.h $(prefix)/include
--	install -m 644 $(srcdir)/include/pvfs2-util.h $(prefix)/include
--	install -m 644 $(srcdir)/include/pvfs2-encode-stubs.h $(prefix)/include
-+	install -d $(DESTDIR)$(includedir)
-+	install -m 644 $(srcdir)/include/pvfs2.h $(DESTDIR)$(includedir)
-+	install -m 644 $(srcdir)/include/pvfs2-request.h $(DESTDIR)$(includedir)
-+	install -m 644 $(srcdir)/include/pvfs2-debug.h $(DESTDIR)$(includedir)
-+	install -m 644 $(srcdir)/include/pvfs2-sysint.h $(DESTDIR)$(includedir)
-+	install -m 644 $(srcdir)/include/pvfs2-mgmt.h $(DESTDIR)$(includedir)
-+	install -m 644 $(srcdir)/include/pvfs2-types.h $(DESTDIR)$(includedir)
-+	install -m 644 $(srcdir)/include/pvfs2-util.h $(DESTDIR)$(includedir)
-+	install -m 644 $(srcdir)/include/pvfs2-encode-stubs.h $(DESTDIR)$(includedir)
- 
--	install -d $(prefix)/lib
--	install -m 755 $(LIBRARIES) $(prefix)/lib
-+	install -d $(DESTDIR)$(libdir)
-+	install -m 755 $(LIBRARIES) $(DESTDIR)$(libdir)
- 
- ifdef TARGET_OS_DARWIN
- #       TOC needs to be regenerated in libs after they get moved
- 	ranlib $(patsubst %,$(prefix)/%,$(LIBRARIES))
- endif
- 
--	install -d $(prefix)/bin
--	install -m 755 $(ADMINTOOLS) $(prefix)/bin
--	install -m 755 src/apps/admin/pvfs2-config $(prefix)/bin
-+	install -d $(DESTDIR)$(bindir)
-+	install -m 755 $(ADMINTOOLS) $(DESTDIR)$(bindir)
-+	install -m 755 src/apps/admin/pvfs2-config $(DESTDIR)$(bindir)
- 	@# if we ever auto-generate genconfig, remove the $(srcdir)
--	install -m 755 $(srcdir)/src/apps/admin/pvfs2-genconfig $(prefix)/bin
-+	install -m 755 $(srcdir)/src/apps/admin/pvfs2-genconfig $(DESTDIR)$(bindir)
- ifdef BUILD_KARMA
--	install -m 755 $(KARMA) $(prefix)/bin
-+	install -m 755 $(KARMA) $(DESTDIR)$(bindir)
- endif
- 
--	install -d $(prefix)/sbin
-+	install -d $(DESTDIR)$(sbindir)
- 
- ifdef BUILD_SERVER
--	install -m 755 $(ADMINTOOLS_SERVER) $(prefix)/bin
-+	install -m 755 $(ADMINTOOLS_SERVER) $(DESTDIR)$(bindir)
-     ifeq ($(NPTL_WORKAROUND),)
--	install -m 755 $(SERVER) $(prefix)/sbin
-+	install -m 755 $(SERVER) $(DESTDIR)$(sbindir)
-     else
--	install -m 755 $(srcdir)/$(SERVER_STUB) $(prefix)/sbin/pvfs2-server
--	install -m 755 $(SERVER) $(prefix)/sbin/pvfs2-server.bin
-+	install -m 755 $(srcdir)/$(SERVER_STUB) $(DESTDIR)$(sbindir)/pvfs2-server
-+	install -m 755 $(SERVER) $(DESTDIR)$(sbindir)/pvfs2-server.bin
-     endif
- endif
- 
-@@ -864,13 +868,13 @@
- 
- .PHONY: just_kmod_install
- just_kmod_install: just_kmod
--	install -d $(KMOD_DIR)
--	install -m 755 src/kernel/linux-2.6/pvfs2.ko $(KMOD_DIR)
-+	install -d $(DESTDIR)$(KMOD_DIR)
-+	install -m 755 src/kernel/linux-2.6/pvfs2.ko $(DESTDIR)$(KMOD_DIR)
- 
- .PHONY: kmod_install
- kmod_install: kmod kernapps just_kmod_install
--	install -d $(prefix)/sbin
--	install -m 755 $(KERNAPPS) $(prefix)/sbin
-+	install -d $(DESTDIR)$(sbindir)
-+	install -m 755 $(KERNAPPS) $(DESTDIR)$(sbindir)
- endif
- 
- ifneq (,$(LINUX24_KERNEL_SRC))
-@@ -885,16 +889,16 @@
- 
- .PHONY: just_kmod24_install
- just_kmod24_install: just_kmod24
--	install -d $(KMOD_DIR)
--	install -m 755 src/kernel/linux-2.4/pvfs2.o $(KMOD_DIR)
-+	install -d $(DESTDIR)$(KMOD_DIR)
-+	install -m 755 src/kernel/linux-2.4/pvfs2.o $(DESTDIR)$(KMOD_DIR)
- 
- .PHONY: kmod24_install
- kmod24_install: kmod24 kernapps just_kmod24_install
--	install -d $(prefix)/sbin
--	install -m 755 $(KERNAPPS) $(prefix)/sbin
--	install -m 755 src/apps/kernel/linux/mount.pvfs2 $(prefix)/sbin
-+	install -d $(DESTDIR)$(sbindir)
-+	install -m 755 $(KERNAPPS) $(DESTDIR)$(sbindir)
-+	install -m 755 src/apps/kernel/linux/mount.pvfs2 $(DESTDIR)$(sbindir)
- 	@echo ""
- 	@echo "For improved linux-2.4 support,"
--	@echo "install $(prefix)/sbin/mount.pvfs2 to /sbin/mount.pvfs2"
-+	@echo "install $(sbindir)/mount.pvfs2 to /sbin/mount.pvfs2"
- 	@echo ""
- endif
diff --git a/sys-cluster/pvfs2/pvfs2-1.5.1.ebuild b/sys-cluster/pvfs2/pvfs2-1.5.1.ebuild
deleted file mode 100644
index 0ff8e1a81b74..000000000000
--- a/sys-cluster/pvfs2/pvfs2-1.5.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/pvfs2-1.5.1.ebuild,v 1.3 2007/10/17 02:40:58 nerdboy Exp $
-
-inherit linux-mod
-
-DESCRIPTION="Parallel Virtual File System version 2"
-HOMEPAGE="http://www.pvfs.org/pvfs2/"
-SRC_URI="ftp://ftp.parl.clemson.edu/pub/pvfs2/${P}.tar.gz"
-IUSE="gtk static doc"
-RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
-		 sys-libs/db"
-DEPEND="${RDEPEND}
-		virtual/linux-sources"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~ppc ~x86"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is 2 4; then
-		BUILD_TARGETS="kmod24 all"
-		ECONF_PARAMS="--with-kernel24=${KV_DIR}"
-		MODULE_NAMES="pvfs2(fs::src/kernel/linux-2.4)"
-	else
-		BUILD_TARGETS="kmod all"
-		ECONF_PARAMS="--with-kernel=${KV_DIR}"
-		MODULE_NAMES="pvfs2(fs::src/kernel/linux-2.6)"
-	fi
-	ECONF_PARAMS="${ECONF_PARAMS} --enable-mmap-racache $(use_enable !static shared) $(use_enable static)"
-	ECONF_PARAMS="${ECONF_PARAMS} $(use_enable gtk karma)"
-}
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-destdir.patch
-}
-
-src_install() {
-	linux-mod_src_install
-	emake DESTDIR="${D}" install || die "install failed"
-
-	dodoc AUTHORS CREDITS ChangeLog INSTALL README
-	docinto examples
-	dodoc examples/{fs.conf,pvfs2-server.rc,server.conf-localhost}
-	# this is LARGE (~5mb)
-	if use doc; then
-		docdir="/usr/share/doc/${PF}/"
-		cp -pPR "${S}/doc" "${D}${docdir}"
-		rm -rf "${D}${docdir}/man"
-	fi
-}
diff --git a/sys-cluster/pvfs2/pvfs2-2.6.3-r1.ebuild b/sys-cluster/pvfs2/pvfs2-2.6.3-r1.ebuild
deleted file mode 100644
index 504df0c15bc0..000000000000
--- a/sys-cluster/pvfs2/pvfs2-2.6.3-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/pvfs2-2.6.3-r1.ebuild,v 1.2 2007/10/17 02:40:58 nerdboy Exp $
-
-inherit linux-mod autotools toolchain-funcs
-
-MY_PN="${PN%[0-9]*}"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Parallel Virtual File System version 2"
-HOMEPAGE="http://www.pvfs.org/pvfs2/"
-SRC_URI="ftp://ftp.parl.clemson.edu/pub/pvfs2/${MY_P}.tar.gz"
-IUSE="gtk server static doc"
-RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
-		 sys-libs/db"
-DEPEND="${RDEPEND}
-		virtual/linux-sources"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-S="${WORKDIR}/${MY_P}"
-
-#Without this, the make kmod_install in src_install() would fail.
-#ARCH=$(tc-arch-kernel)
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is 2 4; then
-		BUILD_TARGETS="just_kmod24"
-		ECONF_PARAMS="--with-kernel24=${KV_DIR}"
-		MODULE_NAMES="pvfs2(fs::src/kernel/linux-2.4)"
-	else
-		BUILD_TARGETS="just_kmod"
-		ECONF_PARAMS="--with-kernel=${KV_DIR} --enable-verbose-build"
-		MODULE_NAMES="pvfs2(fs::src/kernel/linux-2.6)"
-	fi
-
-	#Notice I don't include --disable-static because it makes the linker fail due to a missing library
-	#needed by LIBS_THREADED += -lpvfs2-threaded. However that library is only compiled if static is enabled. Anyway
-	#it is used to build pvfs2-client-core-threaded, which is not installed by make kmod_install (unstable perhaps?)
-	ECONF_PARAMS="${ECONF_PARAMS} --enable-mmap-racache $(use_enable !static shared)"
-	ECONF_PARAMS="${ECONF_PARAMS} $(use_enable gtk karma)"
-	ECONF_PARAMS="${ECONF_PARAMS} $(use_enable server)"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.5.1-destdir.patch
-	epatch "${FILESDIR}"/${PV}-link-librt-properly.patch
-	epatch "${FILESDIR}"/${PV}-soname.patch
-	epatch "${FILESDIR}"/${PV}-as-needed.patch
-
-	#Fix so we can install kernapps separate from kmod_install
-	sed -i '/^kmod_install: kmod/{
-		s/\(kmod_install:.*kernapps\)\(.*\)/\1_install\2\n.PHONY: kernapps_install\nkernapps_install: kernapps/}' Makefile.in
-	sed -i '/^kmod24_install: kmod/{
-		s/\(kmod24_install:.*kernapps\)\(.*\)/\1_install\2\n.PHONY: kernapps_install\nkernapps_install: kernapps/}' Makefile.in
-
-	if kernel_is gt 2 6 20 ; then
-		epatch "${FILESDIR}"/${PV}-register_sysctl_table.patch
-	fi
-
-	if kernel_is ge 2 6 22 ; then
-		epatch "${FILESDIR}"/${PV}-kmem-and-dtor-fix.patch
-	fi
-
-	#This is needed when gcc doesn't support -Wno-pointer-sign. Now it will give us some warnings so it also removes -Werror.
-	#It's unsafe, not recommended
-	if [ "$(gcc-major-version)" -lt "4" ]; then
-		ewarn "It's recommended to use gcc >= 4.0 to avoid the following patch"
-		epatch "${FILESDIR}"/${PV}-no-pointer-sign.patch
-	fi
-
-	AT_M4DIR="maint/config" eautoreconf
-}
-
-src_compile() {
-	econf ${ECONF_PARAMS} || die "Unable to run econf ${ECONF_PARAMS}"
-	linux-mod_src_compile || die "Unable to linux-mod_src_compile"
-	emake kernapps || die "Unable to make kernapps."
-	emake all || die "Unable to make all."
-}
-
-src_install() {
-	linux-mod_src_install || die "linux-mod_src_install failed"
-	emake DESTDIR="${D}" kernapps_install || die "kernapps_install failed"
-	emake DESTDIR="${D}" install || die "install failed"
-	if use server; then
-		newinitd "${FILESDIR}"/pvfs2-server.rc pvfs2-server
-		newconfd "${FILESDIR}"/pvfs2-server.conf pvfs2-server
-	fi
-	newinitd "${FILESDIR}"/pvfs2-client-init.d pvfs2-client
-	newconfd "${FILESDIR}"/pvfs2-client.conf pvfs2-client
-	dodoc AUTHORS CREDITS ChangeLog INSTALL README
-	docinto examples
-	dodoc examples/{fs.conf,pvfs2-server.rc,server.conf-localhost}
-	# this is LARGE (~5mb)
-	if use doc; then
-		docdir="/usr/share/doc/${PF}/"
-		cp -pPR "${S}"/doc "${D}${docdir}"
-		rm -rf "${D}${docdir}"/man
-	fi
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	elog "To enable PVFS2 Server on boot you will have to add it to the"
-	elog "default profile, issue the following command as root to do so."
-	elog
-	elog "rc-update add pvfs2-server default"
-}
diff --git a/sys-cluster/pvfs2/pvfs2-2.6.3.ebuild b/sys-cluster/pvfs2/pvfs2-2.6.3.ebuild
deleted file mode 100644
index c4966c14b09c..000000000000
--- a/sys-cluster/pvfs2/pvfs2-2.6.3.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/pvfs2-2.6.3.ebuild,v 1.2 2007/10/17 02:40:58 nerdboy Exp $
-
-inherit linux-mod autotools toolchain-funcs
-
-MY_PN="${PN%[0-9]*}"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Parallel Virtual File System version 2"
-HOMEPAGE="http://www.pvfs.org/pvfs2/"
-SRC_URI="ftp://ftp.parl.clemson.edu/pub/pvfs2/${MY_P}.tar.gz"
-IUSE="gtk static doc"
-RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
-		 sys-libs/db"
-DEPEND="${RDEPEND}
-		virtual/linux-sources"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-S="${WORKDIR}/${MY_P}"
-
-#Without this, the make kmod_install in src_install() would fail.
-#ARCH=$(tc-arch-kernel)
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is 2 4; then
-		BUILD_TARGETS="just_kmod24"
-		ECONF_PARAMS="--with-kernel24=${KV_DIR}"
-		MODULE_NAMES="pvfs2(fs::src/kernel/linux-2.4)"
-	else
-		BUILD_TARGETS="just_kmod"
-		ECONF_PARAMS="--with-kernel=${KV_DIR} --enable-verbose-build"
-		MODULE_NAMES="pvfs2(fs::src/kernel/linux-2.6)"
-	fi
-
-	#Notice I don't include --disable-static because it makes the linker fail due to a missing library
-	#needed by LIBS_THREADED += -lpvfs2-threaded. However that library is only compiled if static is enabled. Anyway
-	#it is used to build pvfs2-client-core-threaded, which is not installed by make kmod_install (unstable perhaps?)
-	ECONF_PARAMS="${ECONF_PARAMS} --enable-mmap-racache $(use_enable !static shared)"
-	ECONF_PARAMS="${ECONF_PARAMS} $(use_enable gtk karma)"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.5.1-destdir.patch
-	epatch "${FILESDIR}"/${PV}-link-librt-properly.patch
-	epatch "${FILESDIR}"/${PV}-soname.patch
-	epatch "${FILESDIR}"/${PV}-as-needed.patch
-
-	#Fix so we can install kernapps separate from kmod_install
-	sed -i '/^kmod_install: kmod/{
-		s/\(kmod_install:.*kernapps\)\(.*\)/\1_install\2\n.PHONY: kernapps_install\nkernapps_install: kernapps/}' Makefile.in
-	sed -i '/^kmod24_install: kmod/{
-		s/\(kmod24_install:.*kernapps\)\(.*\)/\1_install\2\n.PHONY: kernapps_install\nkernapps_install: kernapps/}' Makefile.in
-
-	if kernel_is gt 2 6 20 ; then
-		epatch "${FILESDIR}"/${PV}-register_sysctl_table.patch
-	fi
-
-	if kernel_is ge 2 6 22 ; then
-		epatch "${FILESDIR}"/${PV}-kmem-and-dtor-fix.patch
-	fi
-
-	#This is needed when gcc doesn't support -Wno-pointer-sign. Now it will give us some warnings so it also removes -Werror.
-	#It's unsafe, not recommended
-	if [ "$(gcc-major-version)" -lt "4" ]; then
-		ewarn "It's recommended to use gcc >= 4.0 to avoid the following patch"
-		epatch "${FILESDIR}"/${PV}-no-pointer-sign.patch
-	fi
-
-	AT_M4DIR="maint/config" eautoreconf
-}
-
-src_compile() {
-	econf ${ECONF_PARAMS} || die "Unable to run econf ${ECONF_PARAMS}"
-	linux-mod_src_compile || die "Unable to linux-mod_src_compile"
-	emake kernapps || die "Unable to make kernapps."
-	emake all || die "Unable to make all."
-}
-
-src_install() {
-	linux-mod_src_install || die "linux-mod_src_install failed"
-	emake DESTDIR="${D}" kernapps_install || die "kernapps_install failed"
-	emake DESTDIR="${D}" install || die "install failed"
-	newinitd "${FILESDIR}"/pvfs2-server.rc pvfs2-server
-	newconfd "${FILESDIR}"/pvfs2-server.conf pvfs2-server
-	newinitd "${FILESDIR}"/pvfs2-client-init.d pvfs2-client
-	newconfd "${FILESDIR}"/pvfs2-client.conf pvfs2-client
-	dodoc AUTHORS CREDITS ChangeLog INSTALL README
-	docinto examples
-	dodoc examples/{fs.conf,pvfs2-server.rc,server.conf-localhost}
-	# this is LARGE (~5mb)
-	if use doc; then
-		docdir="/usr/share/doc/${PF}/"
-		cp -pPR "${S}"/doc "${D}${docdir}"
-		rm -rf "${D}${docdir}"/man
-	fi
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	elog "To enable PVFS2 Server on boot you will have to add it to the"
-	elog "default profile, issue the following command as root to do so."
-	elog
-	elog "rc-update add pvfs2-server default"
-}
diff --git a/sys-cluster/pvfs2/pvfs2-2.7.0-r1.ebuild b/sys-cluster/pvfs2/pvfs2-2.7.0-r1.ebuild
deleted file mode 100644
index dc29d0182578..000000000000
--- a/sys-cluster/pvfs2/pvfs2-2.7.0-r1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/pvfs2-2.7.0-r1.ebuild,v 1.2 2008/03/07 02:03:41 mr_bones_ Exp $
-
-inherit linux-mod autotools toolchain-funcs
-
-MY_PN="${PN%[0-9]*}"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Parallel Virtual File System version 2"
-HOMEPAGE="http://www.pvfs.org/"
-SRC_URI="ftp://ftp.parl.clemson.edu/pub/pvfs2/${MY_P}.tar.gz"
-IUSE="gtk server static doc ssl examples apidocs"
-RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
-		ssl? ( dev-libs/openssl )
-		doc? ( dev-tex/latex2html )
-		apidocs? ( app-doc/doxygen )
-		sys-libs/db"
-DEPEND="${RDEPEND}
-		virtual/linux-sources"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc64"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is 2 4; then
-		BUILD_TARGETS="just_kmod24"
-		ECONF_PARAMS="--with-kernel24=${KV_DIR}"
-		MODULE_NAMES="pvfs2(fs::src/kernel/linux-2.4)"
-	else
-		BUILD_TARGETS="just_kmod"
-		ECONF_PARAMS="--with-kernel=${KV_DIR} --enable-verbose-build"
-		MODULE_NAMES="pvfs2(fs::src/kernel/linux-2.6)"
-	fi
-
-	ECONF_PARAMS="${ECONF_PARAMS}
-		--enable-mmap-racache
-		--sysconfdir=/etc/pvfs2
-		$(use_enable !static shared)
-		$(use_enable gtk karma)
-		$(use_enable server)
-		$(use_with ssl openssl /usr/$(get_libdir))"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Upstream packed all of these by mistake.
-	# TODO:  Shouldn't be needed next release.
-	find "${S}" -name '*\.d' | xargs rm -rf
-
-	# All of these must be done in order and are required to fix the bug noted
-	# at: http://www.beowulf-underground.org/pipermail/pvfs2-developers/2008-January/003790.html
-	# TODO:  Shouldn't be needed next release.
-	epatch "${FILESDIR}"/${PV}-ctl_unnumbered.patch
-	epatch "${FILESDIR}"/${PV}-kernel-rt.patch
-	epatch "${FILESDIR}"/${PV}-verbose-checking.patch
-	epatch "${FILESDIR}"/${PV}-kmem_cache.patch
-
-	# Fixes destdir, separates the kernel module from the userland build,
-	# forces enabling of the shared threaded library.  Fixes so names and
-	# makes links.  as-needed fixes for the shared libs.  All to Makefile.in
-	epatch "${FILESDIR}"/2.7.0-gentoo-makefile.patch
-
-	# as-needed patchs
-	sed -i \
-		-e "s:LIBS=\"\$LIBS.*:LIBS=\"\$LIBS -lcrypt -lcrypto -lssl\":g" \
-		maint/config/openssl.m4 || die
-	sed -i 's:LDFLAGS=.*-lrt.*:LIBS="\$LIBS -lrt":' maint/config/rt.m4 || die
-
-	# The following makes some builds die by actually spitting out more errors.
-	# See bug #210923.  If this breaks other things, it's my fault.
-	sed -i 's:-Wno-strict-aliasing=2::' maint/config/kernel.m4 || die
-
-	AT_M4DIR="maint/config" eautoreconf || die
-}
-
-src_compile() {
-	linux-mod_src_compile || die
-	emake kernapps || die
-	emake all || die
-	if use doc; then
-		emake docs || die
-		if use apidocs; then
-			cd "${S}"/doc
-			doxygen doxygen/pvfs2-doxygen.conf || die
-		fi
-	fi
-}
-
-src_install() {
-	linux-mod_src_install || die
-	emake DESTDIR="${D}" kernapps_install
-	emake DESTDIR="${D}" install
-
-	if use server; then
-		newinitd "${FILESDIR}"/pvfs2-server-init.d-2.7.0 pvfs2-server
-		newconfd "${FILESDIR}"/pvfs2-server-conf.d-2.7.0 pvfs2-server
-	fi
-
-	newinitd "${FILESDIR}"/pvfs2-client-init.d-2.7.0 pvfs2-client
-	newconfd "${FILESDIR}"/pvfs2-client-conf.d-2.7.0 pvfs2-client
-
-	dodoc AUTHORS CREDITS ChangeLog INSTALL README
-
-	# this is LARGE (~5mb)
-	if use doc; then
-		dodoc doc/multi-fs-doc.txt doc/add-server-req \
-			doc/add-client-syscall doc/coding/valgrind \
-			doc/coding/backtrace_analysis.txt
-		insinto /usr/share/doc/${PF}
-		doins doc/*.pdf doc/coding/developer-guidelines.pdf \
-			doc/design/*.pdf doc/random/SystemInterfaceTesting.pdf
-		if use apidocs; then
-			dohtml -A map -A md5 doc/doxygen/html/*
-		fi
-	fi
-	if use examples; then
-		docinto examples/heartbeat
-		dodoc examples/heartbeat/*
-		docinto examples
-		dodoc examples/fs.conf
-	fi
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	local f="$(source "${ROOT}"etc/conf.d/pvfs2-server; echo ${PVFS2_FS_CONF})"
-	elog "1.)  Pvfs2 uses a unified configuration file as of 2.7.0.  If you"
-	elog "  have configuration files from an earlier version, use the provided:"
-	elog "  ${ROOT}usr/bin/pvfs2-config-convert"
-	elog "to automatically update to the newer configuration scheme."
-	elog "2.)  Use emerge --config pvfs2 to create new configuration files."
-	elog "3.)  If the storage space has not been previously created, either set"
-	elog "  PVFS2_AUTO_MKFS=1 in ${ROOT}etc/conf.d/pvfs2-server or run:"
-	elog "  ${ROOT}usr/sbin/pvfs2-server --mkfs ${f}"
-}
-
-pkg_config() {
-	local s
-	local f="$(source "${ROOT}"etc/conf.d/pvfs2-server; echo ${PVFS2_FS_CONF})"
-	if [[ -f "${f}" ]]; then
-		ewarn "Previous install detected."
-		ewarn "We're about to wipe out ${f} and replace it with"
-		ewarn "the file generated by running pvfs2-genconfig.  If this is what"
-		ewarn "you want to do, hit any key to continue.  Otherwise hit ctrl+C"
-		ewarn "to abort."
-		read s
-	fi
-	einfo "Creating new unified configuration file"
-	ewarn "WARNING:  pvfs2 is picky about hostnames.  Make sure you use the"
-	ewarn "correct shortname for all nodes and have name resolution for these"
-	ewarn "shortnames correctly configured on all nodes."
-	[ ! -d "${ROOT}$(dirname "${f}")" ] && mkdir -p "${ROOT}$(dirname "${f}")"
-	"${ROOT}"usr/bin/pvfs2-genconfig "${f}"
-}
diff --git a/sys-cluster/pvfs2/pvfs2-2.7.0.ebuild b/sys-cluster/pvfs2/pvfs2-2.7.0.ebuild
deleted file mode 100644
index be981364bc45..000000000000
--- a/sys-cluster/pvfs2/pvfs2-2.7.0.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/pvfs2-2.7.0.ebuild,v 1.2 2007/12/03 07:21:55 mr_bones_ Exp $
-
-inherit linux-mod autotools toolchain-funcs
-
-MY_PN="${PN%[0-9]*}"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Parallel Virtual File System version 2"
-HOMEPAGE="http://www.pvfs.org/"
-SRC_URI="ftp://ftp.parl.clemson.edu/pub/pvfs2/${MY_P}.tar.gz"
-
-RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
-	sys-libs/db
-	dev-libs/openssl
-	apidocs? ( app-doc/doxygen )
-	doc? ( dev-tex/latex2html
-		virtual/tetex )"
-
-DEPEND="${RDEPEND}
-	virtual/linux-sources
-	examples? ( dev-lang/perl )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="apidocs doc examples gtk server static"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is 2 4; then
-	    BUILD_TARGETS="just_kmod24"
-	    ECONF_PARAMS="--with-kernel24=${KV_DIR}"
-	    MODULE_NAMES="pvfs2(fs::src/kernel/linux-2.4)"
-	else
-	    BUILD_TARGETS="just_kmod"
-	    ECONF_PARAMS="--with-kernel=${KV_DIR} --enable-verbose-build"
-	    MODULE_NAMES="pvfs2(fs::src/kernel/linux-2.6)"
-	fi
-
-	# Notice I don't include --disable-static because it makes the linker
-	# fail due to a missing library needed by LIBS_THREADED += -lpvfs2-threaded.
-	# However that library is only compiled if static is enabled. Anyway
-	# it is used to build pvfs2-client-core-threaded, which is not installed
-	# by make kmod_install (unstable perhaps?)
-
-	# As of version 2.7.0 both static and shared versions of lpvfs2-threaded
-	# are built and installed (via the soname patch).  Feel free to test ...
-	ECONF_PARAMS="${ECONF_PARAMS} $(use_enable !static shared)"
-	ECONF_PARAMS="${ECONF_PARAMS} $(use_enable gtk karma)"
-	ECONF_PARAMS="${ECONF_PARAMS} $(use_enable server)"
-	ECONF_PARAMS="${ECONF_PARAMS} --libdir=/usr/$(get_libdir)"
-	ECONF_PARAMS="${ECONF_PARAMS} --enable-mmap-racache"
-	ECONF_PARAMS="${ECONF_PARAMS} --with-openssl=/usr"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	find "${S}" -name '*\.d' | xargs rm -rf
-
-	AT_M4DIR="maint/config" eautoreconf
-
-	epatch "${FILESDIR}"/2.6.3-as-needed.patch || die "as-needed patch failed"
-	epatch "${FILESDIR}/${PV}"-lib-install.patch || die "install patch failed"
-	epatch "${FILESDIR}/${PV}"-soname.patch || die "soname patch failed"
-
-	# Fix so we can install kernapps separate from kmod_install
-	sed -i '/^kmod_install: kmod/{
-		s/\(kmod_install:.*kernapps\)\(.*\)/\1_install\2\n.PHONY: kernapps_install\nkernapps_install: kernapps/}' Makefile.in
-	sed -i '/^kmod24_install: kmod/{
-		s/\(kmod24_install:.*kernapps\)\(.*\)/\1_install\2\n.PHONY: kernapps_install\nkernapps_install: kernapps/}' Makefile.in
-
-	#This is needed when gcc doesn't support -Wno-pointer-sign. Now it will give us some warnings so it also removes -Werror.
-	#It's unsafe, not recommended
-	if [ "$(gcc-major-version)" -lt "4" ]; then
-		ewarn "It's recommended to use gcc >= 4.0 to avoid the following patch"
-		epatch "${FILESDIR}"/2.6.3-no-pointer-sign.patch
-	fi
-}
-
-src_compile() {
-	# since ${ECONF_PARAMS} is set, linux-mod_src_compile will invoke
-	# its own configure, so running econf just makes it go twice...
-
-	linux-mod_src_compile || die "Unable to linux-mod_src_compile"
-	make kernapps || die "Unable to make kernapps."
-	make all || die "Unable to make all."
-
-	if use doc ; then
-	     make docs || die "Unable to make docs."
-	    if use apidocs ; then
-		cd "${S}"/doc
-		doxygen doxygen/pvfs2-doxygen.conf || die "doxygen failed"
-	    fi
-	fi
-}
-
-src_install() {
-	linux-mod_src_install || die "linux-mod_src_install failed"
-	emake DESTDIR="${D}" kernapps_install || die "kernapps_install failed"
-	emake DESTDIR="${D}" install || die "install failed"
-
-	cd "${D}"usr/$(get_libdir)
-	dosym libpvfs2.so.2.0 /usr/$(get_libdir)/libpvfs2.so.2
-	dosym libpvfs2.so.2 /usr/$(get_libdir)/libpvfs2.so
-	dosym libpvfs2-threaded.so.2.0 /usr/$(get_libdir)/libpvfs2-threaded.so.2
-	dosym libpvfs2-threaded.so.2 /usr/$(get_libdir)/libpvfs2-threaded.so
-	cd "${S}"
-
-	if use server; then
-	    newinitd "${FILESDIR}"/pvfs2-server.rc pvfs2-server
-	    newconfd "${FILESDIR}"/pvfs2-server.conf pvfs2-server
-	fi
-
-	newinitd "${FILESDIR}"/pvfs2-client-init.d pvfs2-client
-	newconfd "${FILESDIR}"/pvfs2-client.conf pvfs2-client
-
-	# this is LARGE (~5mb)
-	if use doc; then
-	    dodoc doc/multi-fs-doc.txt doc/add-server-req \
-		doc/add-client-syscall doc/coding/valgrind \
-		doc/coding/backtrace_analysis.txt
-	    insinto /usr/share/doc/"${PF}"/
-	    doins doc/*.pdf doc/coding/developer-guidelines.pdf \
-		doc/design/*.pdf doc/random/SystemInterfaceTesting.pdf
-	    if use apidocs ; then
-		dohtml -A map -A md5 doc/doxygen/html/*
-	    fi
-	fi
-
-	dodoc AUTHORS CREDITS ChangeLog INSTALL README
-	docinto examples
-	dodoc examples/{fs.conf,pvfs2-server.rc}
-	if use examples ; then
-	    insinto /usr/share/doc/"${PF}"/examples/heartbeat
-	    doins examples/heartbeat/*
-	fi
-}
-
-pkg_config () {
-	elog "Creating new unified configuration file; if you have been"
-	elog "running a previous version, you should run the conversion"
-	elog "script instead.  See pvfs2-config-convert --help for more"
-	elog "info."
-	elog
-
-	einfo ">>> Creating new unified config file - you may accept the"
-	einfo ">>> defaults or adjust to suite your desired setup..."
-
-	"${ROOT}"/usr/bin/pvfs2-genconfig "${ROOT}"/etc/pvfs2-fs.conf
-
-	einfo
-	einfo ">>> If this is the first time running the server, you must"
-	einfo ">>> create the storage location first, which is part of the"
-	einfo ">>> config you just specified above.  To do this, run the"
-	einfo ">>> following command once as root, then start the server"
-	einfo ">>> using the init script:"
-	einfo "      /usr/sbin/pvfs2-server /etc/pvfs2-fs.conf -f"
-	einfo
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	ewarn
-	ewarn "You must convert your old config files or create a new one, so"
-	ewarn "either emerge --config =${CATEGORY}/${PF} or run the supplied"
-	ewarn "conversion script to complete the installation."
-	ewarn
-	ewarn "Note that libpvfs2-threaded.so is new and needs testing..."
-	ewarn
-
-	elog "To enable PVFS2 Server on boot you will have to add it to the"
-	elog "default profile, issue the following command as root to do so."
-	elog
-	elog "rc-update add pvfs2-server default"
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-	elog
-	elog "If you're removing this package completely and the file"
-	elog "/lib/modules/${KV_FULL}/fs/pvfs2.ko is still"
-	elog "there, you'll have to remove it yourself."
-}