Version bump.

Package-Manager: portage-2.1.2_rc4-r1

5 files changed, 104 insertions, 9 deletions

diff --git a/sys-block/nbd/ChangeLog b/sys-block/nbd/ChangeLog
index 4602a4540182..98d364604a4f 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.16 2006/11/02 01:13:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/ChangeLog,v 1.17 2006/12/27 16:04:20 vapier Exp $
+
+*nbd-2.9.1 (27 Dec 2006)
+
+  27 Dec 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/nbd-2.9.1-headers.patch, +nbd-2.9.1.ebuild:
+  Version bump.
 
 *nbd-2.9.0 (02 Nov 2006)
 
diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
index 0fcd137066e1..ffc48c95970a 100644
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -17,10 +17,15 @@ AUX nbd-2.9.0-headers.patch 722 RMD160 b3d85497ce3cfd5f6fccea43aa06daf47754cc9b
 MD5 183c0369193f9b20ad9f4705b6ea8170 files/nbd-2.9.0-headers.patch 722
 RMD160 b3d85497ce3cfd5f6fccea43aa06daf47754cc9b files/nbd-2.9.0-headers.patch 722
 SHA256 7451d26baa922622100d03d20d5bfa5fe94bf6f2e0fbbe5cb33b9f74350a5016 files/nbd-2.9.0-headers.patch 722
+AUX nbd-2.9.1-headers.patch 538 RMD160 39b96e5caa8b398b6cf1117ffff7c8a21325c5df SHA1 5b4b1954cc31edb12f4beabba6726fc5b8c81fcb SHA256 db2852489863bcd765fd723ba6926752920348d01aaecd193ad13906d0654b24
+MD5 11fa5937abb1f46b990a06330bba0504 files/nbd-2.9.1-headers.patch 538
+RMD160 39b96e5caa8b398b6cf1117ffff7c8a21325c5df files/nbd-2.9.1-headers.patch 538
+SHA256 db2852489863bcd765fd723ba6926752920348d01aaecd193ad13906d0654b24 files/nbd-2.9.1-headers.patch 538
 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-2.9.0.tar.bz2 153357 RMD160 b75bcab59f4da2849cc7a8c1217b972fc8a977cc SHA1 d9aeab0d55c1f8dd0c598118162cff4c59f17cbd SHA256 cb621beb7f8374d4ef51733272fc4a4d6902f1ca957d426db899841552ac74fb
+DIST nbd-2.9.1.tar.bz2 156621 RMD160 065afc80d8c744129e0df5d0485c6eef60b59fcc SHA1 2d29ddf2ecdaf29c0a9e3b24fd14a1f5012c1c28 SHA256 b31dfd6e35436bf11b14c574a5cb184da21e316ba3828d6b38c2d8c816681a3f
 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
@@ -38,10 +43,14 @@ EBUILD nbd-2.9.0.ebuild 1057 RMD160 28c976172c3123f3ef23f4b3abdea9d63f941db5 SHA
 MD5 1ab4a7a9d92fe9931e987e1618c6eef3 nbd-2.9.0.ebuild 1057
 RMD160 28c976172c3123f3ef23f4b3abdea9d63f941db5 nbd-2.9.0.ebuild 1057
 SHA256 5170901a44d4d83e1ec0f619e678a144f36a1dd5dfbc36279b9a762adc6219cc nbd-2.9.0.ebuild 1057
-MISC ChangeLog 4081 RMD160 4c251410148b6ac3ee384fa83394276f24c6705c SHA1 8eae223e8741542a9cfb317bdda5f7acbfc4e047 SHA256 8efbeec90a98cb9d86241806adb60b06aac2cda44896d6972418b04e0007b1c2
-MD5 9660805a51aae3abe4f038143bc54d11 ChangeLog 4081
-RMD160 4c251410148b6ac3ee384fa83394276f24c6705c ChangeLog 4081
-SHA256 8efbeec90a98cb9d86241806adb60b06aac2cda44896d6972418b04e0007b1c2 ChangeLog 4081
+EBUILD nbd-2.9.1.ebuild 1057 RMD160 574a979cae7310f27aad0f703243336ecb03867a SHA1 24b211ec4c66add4bfe52acdd7ea06c00e935534 SHA256 f4183694f7d5daab6851637f4604ca34d55b8446950891fb600cf95312502da9
+MD5 e953e8dd60466b403fd4cba85fe49a9a nbd-2.9.1.ebuild 1057
+RMD160 574a979cae7310f27aad0f703243336ecb03867a nbd-2.9.1.ebuild 1057
+SHA256 f4183694f7d5daab6851637f4604ca34d55b8446950891fb600cf95312502da9 nbd-2.9.1.ebuild 1057
+MISC ChangeLog 4227 RMD160 d605a1e417883f5b5a71052f8c134d1a1000f160 SHA1 ad83a29eb397f9b525bcdab370bad0c19a697370 SHA256 04460c489a57b9f96df399b298289ebdfcc8f612d271a66525cbed8ec79376fc
+MD5 18a95a92b4910463f88872052713d98f ChangeLog 4227
+RMD160 d605a1e417883f5b5a71052f8c134d1a1000f160 ChangeLog 4227
+SHA256 04460c489a57b9f96df399b298289ebdfcc8f612d271a66525cbed8ec79376fc ChangeLog 4227
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -58,10 +67,13 @@ SHA256 17a59e0042e8b20dd6f06b2c46acb6d0797b2e2ca0588945649a8999ad5cd036 files/di
 MD5 3c87c9001f9a9ae2b4c24fffe1632ee6 files/digest-nbd-2.9.0 476
 RMD160 961a8217d920bd220e392a4eec9ed0d485d2bf0c files/digest-nbd-2.9.0 476
 SHA256 daae3f70fd411036cbca67ca3abe1b0dac6f4f6e809b197db8eb3d139f0b1aa1 files/digest-nbd-2.9.0 476
+MD5 2ad94a22caea66d5f1495faf65ee88de files/digest-nbd-2.9.1 476
+RMD160 08e57dc51aec6475442870712280a2ef2ae15903 files/digest-nbd-2.9.1 476
+SHA256 9d6dd8c71b04ed7ef1047670060f85850c8567945ce29d2008d38d30e809834f files/digest-nbd-2.9.1 476
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFSUZAamhnQswr0vIRAlyTAJ92UTpiDtp1M1Ua+vXb+OzT/PBv6wCgsfqm
-9v0VZCbITg10TSPCM79JhMo=
-=rrNw
+iD8DBQFFkpm48bi6rjpTunYRAvFeAJ4u4TBny1VsdAvRoU55+ncTcEy2fACeKtMl
+GzMXzIGrqiuEBsTDGTq1/h4=
+=4aAO
 -----END PGP SIGNATURE-----
diff --git a/sys-block/nbd/files/digest-nbd-2.9.1 b/sys-block/nbd/files/digest-nbd-2.9.1
new file mode 100644
index 000000000000..0b5c9e2d2fbe
--- /dev/null
+++ b/sys-block/nbd/files/digest-nbd-2.9.1
@@ -0,0 +1,6 @@
+MD5 f2821abeda879916a9117e3c4cff6353 nbd-2.9.1.tar.bz2 156621
+RMD160 065afc80d8c744129e0df5d0485c6eef60b59fcc nbd-2.9.1.tar.bz2 156621
+SHA256 b31dfd6e35436bf11b14c574a5cb184da21e316ba3828d6b38c2d8c816681a3f nbd-2.9.1.tar.bz2 156621
+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.9.1-headers.patch b/sys-block/nbd/files/nbd-2.9.1-headers.patch
new file mode 100644
index 000000000000..c77b344c8ab3
--- /dev/null
+++ b/sys-block/nbd/files/nbd-2.9.1-headers.patch
@@ -0,0 +1,26 @@
+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
diff --git a/sys-block/nbd/nbd-2.9.1.ebuild b/sys-block/nbd/nbd-2.9.1.ebuild
new file mode 100644
index 000000000000..b54a5424508b
--- /dev/null
+++ b/sys-block/nbd/nbd-2.9.1.ebuild
@@ -0,0 +1,45 @@
+# 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.9.1.ebuild,v 1.1 2006/12/27 16:04:20 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=""
+
+RDEPEND=">=dev-libs/glib-2.0"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-2.8.2-gznbd.patch
+	epatch "${FILESDIR}"/${PN}-2.9.1-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
+}