[gentoo-commits] repo/gentoo:master commit in: sys-block/nbd/, sys-block/nbd/files/

[Lars Wendler]

commit: a7381c039443092262fc1be972fe960fd4cf6c96
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Dec 23 13:39:57 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Dec 23 13:39:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7381c03

sys-block/nbd: Removed old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-block/nbd/Manifest |  1 -
 .../nbd/files/nbd-3.12.1-readit-and-weep.patch | 16 --
 sys-block/nbd/files/nbd-3.5-gznbd-printf-u64.patch | 59 --
 sys-block/nbd/files/nbd-3.5-gznbd-zlib.patch   | 38 --
 sys-block/nbd/nbd-3.13.ebuild  | 29 ---
 5 files changed, 143 deletions(-)

diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
index d71f296..8a000c8 100644
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -1,4 +1,3 @@
 DIST nbd-3.11.tar.xz 451992 SHA256 
14420f74cb16dc609a9302ed1efd653064bed7a8357e9d73daabc33608e3f2a0 SHA512 
8d0abf673c7a2a7fbc5a57e0ee1093c86ca205eb664ea08143ff4ce3c8fd94b81a0e89491145159d863d181f70e9ba109487b967097c91fc2399316226bcec0a
 WHIRLPOOL 
23f29b0e82e4672f5edfa223b7b26552ceb7505b6ff43efa151e3357811a2d4f1b599d6b9553a89e07b90b7322a3ac88f256a66d5d7e850758ea5cee4125d849
-DIST nbd-3.13.tar.xz 459756 SHA256 
8597cd97a41930dfcbcc6ce7cf910f6b609771718a4f1680713c2f2ba5cc200d SHA512 
da1f6c1aab10baf7ef10062481f3a26dfa142f5cfc21fb7abc90f6eb9906df619331dbb36b693c52d4a7a5fe0923f6179b59eea74033cb1278dca99b192cdbff
 WHIRLPOOL 
e2d875c31215bc3e1594143b198d8a87abcfe1faf508057db9f766561edd3ca7d35f243330af71938228b61c2fe31250a59ece9f87291d967fdbd0575eec99b9
 DIST nbd-3.14.tar.xz 480260 SHA256 
4d3d230ecc0a1302dc08d89f2a12d7596a8745f2b10da9bb035bbeb9ede78631 SHA512 
f65c8bfb9f35931da6ec41bbcf94a34268fb7166b5df224ce525319bb053aa3ed174d242369cffc57a2e0d685c6a540cd2498f8044cd25c0c5bdeb92e9f099d0
 WHIRLPOOL 
7aef5b4ef84a2667ef7bdf1415f0a724acbf9aba8a67996cdb7721754b5ec0209814e46736dc362f49ffd7324163a4a979d94fd339a2055e419625100678eea7
 DIST nbd-3.15.1.tar.xz 505360 SHA256 
ac1108dfdaffe1cf01f5f0f34c738771184bf6ff4a503edefaf10a961f8b8745 SHA512 
7ed3cf32c3f5b865b831a62b2dcbd303a173b21a74881d4ad71dd775e284d86193a9b269db23f57489df70c95c325a20fabf03f4d20e6bd56aca3f9cd83e9821
 WHIRLPOOL 
057bea2e1c0631070c457b2516b7041169bdfb69eee448352ed2f28ed80942f329fa529696b7bdcfee66a293be14845affa24673348de1f1e8962029f28f5f68

diff --git a/sys-block/nbd/files/nbd-3.12.1-readit-and-weep.patch 
b/sys-block/nbd/files/nbd-3.12.1-readit-and-weep.patch
deleted file mode 100644
index 6e0a31d..
--- a/sys-block/nbd/files/nbd-3.12.1-readit-and-weep.patch
+++ /dev/null
@@ -1,16 +0,0 @@
 a/cliserv.c
-+++ b/cliserv.c
-@@ -81,6 +81,7 @@
-   hi = ntohl(hi);
-   return ((u64) lo) << 32U | hi;
- }
-+#endif
- 
- /**
-  * Read data from a file descriptor into a buffer
-@@ -103,5 +104,3 @@
-   }
-   }
- }
--
--#endif

diff --git a/sys-block/nbd/files/nbd-3.5-gznbd-printf-u64.patch 
b/sys-block/nbd/files/nbd-3.5-gznbd-printf-u64.patch
deleted file mode 100644
index eff90fa..
--- a/sys-block/nbd/files/nbd-3.5-gznbd-printf-u64.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 90024f17b682e20a34f35a6ccb437edc10eb5c3b Mon Sep 17 00:00:00 2001
-From: Mike Frysinger 
-Date: Mon, 2 Dec 2013 00:22:46 -0500
-Subject: [PATCH 1/2] gznbd: use PRId64 for printing 64bit types
-
-Gcc complains about printing these 64bit types:
-
-gznbd.c:199:1: warning: format '%Ld' expects argument of type 'long long int',
-   but argument 5 has type 'u64' [-Wformat]
-
-Use the standard defines from inttypes.h to avoid this issue.
-
-Signed-off-by: Mike Frysinger 

- gznbd/gznbd.c | 7 ---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/gznbd/gznbd.c b/gznbd/gznbd.c
-index 09f3d49..bb41156 100644
 a/gznbd/gznbd.c
-+++ b/gznbd/gznbd.c
-@@ -40,6 +40,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include 
- #include 
-@@ -95,7 +96,7 @@ int main(int argc, char **argv)
-   fprintf(stderr,"%s: %s does not appear to be a valid 
size\n",argv[0],argv[3]);
-   exit(1);
- }
--printf("%s: file=%s, size=%Ld\n",argv[0],argv[2],size);
-+printf("%s: file=%s, size=%"PRId64"\n",argv[0],argv[2],size);
-   } else {
- char buffer[BLOCK];
- int result;
-@@ -110,7 +111,7 @@ int main(int argc, char **argv)
- }
- 
- if(result==0){
--  printf("size=%Ld\n",size);
-+  printf("size=%"PRId64"\n",size);
- } else {
-   printf("failed\n");
-   if(result<0){
-@@ -195,7 +196,7 @@ int main(int argc, char **argv)
- from=ntohll(request.from);
- 
- #ifdef TRACE
--fprintf(stderr,"%s: len=%d, from=%Ld\n",argv[0],len,from);
-+fprintf(stderr,"%s: len=%d, from=%"PRId64"\n",argv[0],len,from);
- #endif
- 
- if(request.magic!=htonl(NBD_REQUEST_MAGIC)){
--- 
-1.8.4.3
-

diff --git a/sys-block/nbd/files/nbd-3.5-gznbd-zlib.patch 

[gentoo-commits] repo/gentoo:master commit in: sys-block/nbd/, sys-block/nbd/files/

[Jeroen Roovers]

commit: 2a458168fe8d4dc408090302aabc0c4711a28a4b
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Jan  2 08:31:44 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Jan  2 08:36:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a458168

sys-block/nbd: Fix bigendian build.

Package-Manager: portage-2.2.26

 sys-block/nbd/files/nbd-3.12.1-readit-and-weep.patch | 16 
 sys-block/nbd/nbd-3.12.1.ebuild  |  6 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/sys-block/nbd/files/nbd-3.12.1-readit-and-weep.patch 
b/sys-block/nbd/files/nbd-3.12.1-readit-and-weep.patch
new file mode 100644
index 000..6e0a31d
--- /dev/null
+++ b/sys-block/nbd/files/nbd-3.12.1-readit-and-weep.patch
@@ -0,0 +1,16 @@
+--- a/cliserv.c
 b/cliserv.c
+@@ -81,6 +81,7 @@
+   hi = ntohl(hi);
+   return ((u64) lo) << 32U | hi;
+ }
++#endif
+ 
+ /**
+  * Read data from a file descriptor into a buffer
+@@ -103,5 +104,3 @@
+   }
+   }
+ }
+-
+-#endif

diff --git a/sys-block/nbd/nbd-3.12.1.ebuild b/sys-block/nbd/nbd-3.12.1.ebuild
index 566cdcf..9d504e4 100644
--- a/sys-block/nbd/nbd-3.12.1.ebuild
+++ b/sys-block/nbd/nbd-3.12.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Userland client/server for kernel network block device"
 HOMEPAGE="http://nbd.sourceforge.net/;
@@ -20,6 +20,10 @@ RDEPEND=">=dev-libs/glib-2.0
 DEPEND="${RDEPEND}
virtual/pkgconfig"
 
+src_prepare() {
+   epatch "${FILESDIR}"/nbd-3.12.1-readit-and-weep.patch
+}
+
 src_configure() {
econf \
--enable-lfs \