Version bump, use linux-mod.eclass thanks to Daniel Black <dragonheart@gentoo.org> in bug 121962

(Portage version: 2.1.1_pre3-r3)

4 files changed, 192 insertions, 2 deletions

diff --git a/sys-cluster/pvfs2/ChangeLog b/sys-cluster/pvfs2/ChangeLog
index ebf41bae4a4d..64a955e2c0ee 100644
--- a/sys-cluster/pvfs2/ChangeLog
+++ b/sys-cluster/pvfs2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/pvfs2
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/ChangeLog,v 1.3 2005/09/06 00:14:48 spyderous Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/ChangeLog,v 1.4 2006/07/24 22:06:41 genstef Exp $
+
+  24 Jul 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/pvfs2-1.5.1-destdir.patch:
+  Version bump, use linux-mod.eclass thanks to Daniel Black
+  <dragonheart@gentoo.org> in bug 121962
 
   06 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; pvfs2-1.2.0.ebuild:
   (#103487) Don't use cp -a, it's GNU-specific.
diff --git a/sys-cluster/pvfs2/files/digest-pvfs2-1.5.1 b/sys-cluster/pvfs2/files/digest-pvfs2-1.5.1
new file mode 100644
index 000000000000..bdf2fc8dcba3
--- /dev/null
+++ b/sys-cluster/pvfs2/files/digest-pvfs2-1.5.1
@@ -0,0 +1,3 @@
+MD5 5f1aa49e552aab5d4b9897efa45ec764 pvfs2-1.5.1.tar.gz 3295116
+RMD160 fcb2c61318efa73a55e19a592f1b6c429a34ea4d pvfs2-1.5.1.tar.gz 3295116
+SHA256 7312a753500baff8d6bd9bda2cbba29efed397f868b94859df0ff17fde57d5af pvfs2-1.5.1.tar.gz 3295116
diff --git a/sys-cluster/pvfs2/files/pvfs2-1.5.1-destdir.patch b/sys-cluster/pvfs2/files/pvfs2-1.5.1-destdir.patch
new file mode 100644
index 000000000000..c50933c13c68
--- /dev/null
+++ b/sys-cluster/pvfs2/files/pvfs2-1.5.1-destdir.patch
@@ -0,0 +1,128 @@
+--- 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
new file mode 100644
index 000000000000..77020e551299
--- /dev/null
+++ b/sys-cluster/pvfs2/pvfs2-1.5.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2005 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.1 2006/07/24 22:06:41 genstef 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
+}