Version bump.

Package-Manager: portage-2.1.2_pre2-r9

5 files changed, 114 insertions, 8 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/Manifest b/sys-block/nbd/Manifest
index 91339b222b8d..95b5b299972a 100644
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -9,8 +9,13 @@ AUX nbd-2.8.2-gznbd.patch 506 RMD160 bc05e83aac6b11b9b56a5a08152d5405badc6cf8 SH
 MD5 bcc468feeadb67c893e4564fbb1fd35e files/nbd-2.8.2-gznbd.patch 506
 RMD160 bc05e83aac6b11b9b56a5a08152d5405badc6cf8 files/nbd-2.8.2-gznbd.patch 506
 SHA256 3d45d24db84ed16a1b822921690d27fb3b2b2bdcabaec71d9fb29b342f53ccad files/nbd-2.8.2-gznbd.patch 506
+AUX nbd-2.8.7-headers.patch 772 RMD160 559e85665b5862216e3e77587e6b0aedc64be73e SHA1 77190d630948fc52b32c21e23f6b0b7055043b33 SHA256 c000d526c06626e40ff1faec9e28f72438cff42749ca46a6834beda044434c96
+MD5 f823f0338357fe41b73417a9728f1496 files/nbd-2.8.7-headers.patch 772
+RMD160 559e85665b5862216e3e77587e6b0aedc64be73e files/nbd-2.8.7-headers.patch 772
+SHA256 c000d526c06626e40ff1faec9e28f72438cff42749ca46a6834beda044434c96 files/nbd-2.8.7-headers.patch 772
 DIST nbd-2.8.2.tar.gz 154065 RMD160 b922d739c3111e62a966f875be979245829ce8b2 SHA1 22d39cdbf2087fc4b04c66b9c60ca70fa51e64b9 SHA256 6577f70df239f23244f5617f8f31eafc0a2b0119c1f3b2ee58d49f9b612229e2
 DIST nbd-2.8.6.tar.gz 196643 RMD160 e58fa43592a220a6ebe1a3f8d819472c96318fc5 SHA1 458dda6e40f9b521de69c781869eb50afbe6569e SHA256 28d6e99dc9107d4fc46faa260d7707e6bd40f7388694f6362c098aded487e675
+DIST nbd-2.8.7.tar.bz2 141225 RMD160 2f3d52e586c7895a1c576b70498228c73e1ffaba SHA1 629c12fad9a497c080fa445c83298199fc821dd9 SHA256 a69d1690ad587d81b85c34d1ef9bf47abf0ba21dc96876d95dd6a9a193a859f1
 DIST nbd-linux-include.h.bz2 1248 RMD160 f20d1ccf6b26a8e8edcb2d7c30ad2766a1a1dc3f SHA1 fe57ad39cad5ecd1dba76a05546239abc165a11a SHA256 df30a55e6cb83ed1a9060db83fd8b908b609c1fc2ce867c4b63b506f065c89fc
 EBUILD nbd-2.8.2-r1.ebuild 1005 RMD160 4450b4c4bac06ce0c1e32c221bd4b8093d1a5043 SHA1 44f9a09c3383cd1563543245bec59fe11a7b16b8 SHA256 0f032fca8ebfd317d60e879039770a0611f47b0d08cdc58a3256845ad93c3015
 MD5 7d2b8c5d309afdb9d06a276a6f57f566 nbd-2.8.2-r1.ebuild 1005
@@ -20,10 +25,14 @@ EBUILD nbd-2.8.6.ebuild 967 RMD160 9aa17984562e2436e43364fc0e0bc6a23f9740dc SHA1
 MD5 721d93e48db6d8059a321876cdc12fee nbd-2.8.6.ebuild 967
 RMD160 9aa17984562e2436e43364fc0e0bc6a23f9740dc nbd-2.8.6.ebuild 967
 SHA256 5e0ef4937e064c72ea462720af9804223827896f2c0be81f81c4c3ef56157571 nbd-2.8.6.ebuild 967
-MISC ChangeLog 3789 RMD160 04a4cb0981ac494d6b999373f10fbe32129cc7ee SHA1 9f45e3efd7814e7b12700c9e88b084dd4c6c288f SHA256 753b92af0e094ef250ea624b17498808ad17903601f077cdc5b394354ff4be47
-MD5 5308330def6518664f2fdcf076c2e9c6 ChangeLog 3789
-RMD160 04a4cb0981ac494d6b999373f10fbe32129cc7ee ChangeLog 3789
-SHA256 753b92af0e094ef250ea624b17498808ad17903601f077cdc5b394354ff4be47 ChangeLog 3789
+EBUILD nbd-2.8.7.ebuild 1016 RMD160 26d9bea901129fff783144ce7b9194ae0109d2ab SHA1 c21ffcf4af011ee7854af977fc4662ea9e15b7b7 SHA256 388e031e98c601c5c78be2a0014c633c75b56d4ab8f5388516320e9fda1b5097
+MD5 442a83c431912a60a39ee28a13ba2438 nbd-2.8.7.ebuild 1016
+RMD160 26d9bea901129fff783144ce7b9194ae0109d2ab nbd-2.8.7.ebuild 1016
+SHA256 388e031e98c601c5c78be2a0014c633c75b56d4ab8f5388516320e9fda1b5097 nbd-2.8.7.ebuild 1016
+MISC ChangeLog 3935 RMD160 34a218b3bf27c0f701789217f95b350108c63aca SHA1 3028a1db7c9b02d7b8c999c10c7db7c8d9c9a22e SHA256 978495cdcdcc9c774647959ec723dcae0034ac7e386207ef40a1901e959b1e2c
+MD5 680b7e8ada406a3551ed5abcabd1595b ChangeLog 3935
+RMD160 34a218b3bf27c0f701789217f95b350108c63aca ChangeLog 3935
+SHA256 978495cdcdcc9c774647959ec723dcae0034ac7e386207ef40a1901e959b1e2c ChangeLog 3935
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -34,10 +43,13 @@ SHA256 ced76c3d482cbb938189c5fce9e474f1dd8fe69bdde9613bb0bf048f1491c1a7 files/di
 MD5 23bc66761e0a6a9efd535a6e3eab894e files/digest-nbd-2.8.6 473
 RMD160 fbaa75c6f724b8422475aaa7e565a57e73683165 files/digest-nbd-2.8.6 473
 SHA256 aba599c0a7b008a9900b617f62c72bb130f275e1e020d8afdd6a345337a2815c files/digest-nbd-2.8.6 473
+MD5 49af34d10bb4772a7ab11b40d9d6ffb1 files/digest-nbd-2.8.7 476
+RMD160 9d22b5d13ef376b56cf08d55a1996a30b752aa4f files/digest-nbd-2.8.7 476
+SHA256 17a59e0042e8b20dd6f06b2c46acb6d0797b2e2ca0588945649a8999ad5cd036 files/digest-nbd-2.8.7 476
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFHtuZamhnQswr0vIRAiSSAJ9T/SXkUb5jQeSQWxVbBSmpcb2mRgCgs0xl
-jOXYXitXstxiXZj7G5xBGzw=
-=WE/k
+iD8DBQFFNToxamhnQswr0vIRAnX0AKCgc0hhFSu2qOWncc/NYYz50JgZiQCeLoO9
+S5C4UHgf1ubnnrsokTh0UVc=
+=w8/v
 -----END PGP SIGNATURE-----
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
+}