Version bump.

(Portage version: 2.1.2_pre2-r9)

4 files changed, 95 insertions, 1 deletions

diff --git a/sys-block/nbd/ChangeLog b/sys-block/nbd/ChangeLog
index 8cc17e343da7..23ac79e687a8 100644
--- a/sys-block/nbd/ChangeLog
+++ b/sys-block/nbd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-block/nbd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/ChangeLog,v 1.14 2006/09/30 21:02:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/ChangeLog,v 1.15 2006/10/17 20:16:30 vapier Exp $
+
+*nbd-2.8.7 (17 Oct 2006)
+
+  17 Oct 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/nbd-2.8.7-headers.patch, +nbd-2.8.7.ebuild:
+  Version bump.
 
   30 Sep 2006; Mike Frysinger <vapier@gentoo.org>
   files/nbd-2.8.2-gznbd.patch:
diff --git a/sys-block/nbd/files/digest-nbd-2.8.7 b/sys-block/nbd/files/digest-nbd-2.8.7
new file mode 100644
index 000000000000..368bb127c476
--- /dev/null
+++ b/sys-block/nbd/files/digest-nbd-2.8.7
@@ -0,0 +1,6 @@
+MD5 bc7995b4961385269abc645575bcaf4d nbd-2.8.7.tar.bz2 141225
+RMD160 2f3d52e586c7895a1c576b70498228c73e1ffaba nbd-2.8.7.tar.bz2 141225
+SHA256 a69d1690ad587d81b85c34d1ef9bf47abf0ba21dc96876d95dd6a9a193a859f1 nbd-2.8.7.tar.bz2 141225
+MD5 3e45be16d413bda30b23bf7dd30c48d7 nbd-linux-include.h.bz2 1248
+RMD160 f20d1ccf6b26a8e8edcb2d7c30ad2766a1a1dc3f nbd-linux-include.h.bz2 1248
+SHA256 df30a55e6cb83ed1a9060db83fd8b908b609c1fc2ce867c4b63b506f065c89fc nbd-linux-include.h.bz2 1248
diff --git a/sys-block/nbd/files/nbd-2.8.7-headers.patch b/sys-block/nbd/files/nbd-2.8.7-headers.patch
new file mode 100644
index 000000000000..5d17d0ac84cf
--- /dev/null
+++ b/sys-block/nbd/files/nbd-2.8.7-headers.patch
@@ -0,0 +1,39 @@
+kernel headers fixes this so no point in hacking the crap out of userspace
+
+--- configure
++++ configure
+@@ -7743,10 +7743,6 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#define u32 int
+-#define u64 int
+-#define __be32 int
+-#define __be64 int
+ #include "nbd.h"
+ 
+ int
+@@ -7803,10 +7803,6 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#define u32 int
+-#define u64 int
+-#define __be32 int
+-#define __be64 int
+ #include <linux/nbd.h>
+ 
+ int
+--- cliserv.h
++++ cliserv.h
+@@ -15,10 +15,6 @@
+ #error I need at least some 64-bit type
+ #endif
+ 
+-/* 2.6.18 and above use __be* rather than u* */
+-#define __be32 u32
+-#define __be64 u64
+-
+ #ifdef NBD_H_LOCAL
+ #include "nbd.h"
+ #else
diff --git a/sys-block/nbd/nbd-2.8.7.ebuild b/sys-block/nbd/nbd-2.8.7.ebuild
new file mode 100644
index 000000000000..1c5f6f805077
--- /dev/null
+++ b/sys-block/nbd/nbd-2.8.7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/nbd-2.8.7.ebuild,v 1.1 2006/10/17 20:16:30 vapier Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Userland client/server for kernel network block device"
+HOMEPAGE="http://nbd.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nbd/${P}.tar.bz2
+	mirror://gentoo/nbd-linux-include.h.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/glib-2.0"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-2.8.2-gznbd.patch
+	epatch "${FILESDIR}"/${PN}-2.8.7-headers.patch
+
+	mkdir -p "${S}"/inc-after/linux
+	mv "${WORKDIR}"/nbd-linux-include.h "${S}"/inc-after/linux/nbd.h
+	append-flags -idirafter "${S}"/inc-after
+}
+
+src_compile() {
+	econf \
+		--enable-lfs \
+		--enable-syslog \
+		|| die
+	emake || die
+	emake -C gznbd || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dobin gznbd/gznbd || die
+	dodoc README
+}