Version bump #493010 by Agostino Sarubbo.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

5 files changed, 167 insertions, 10 deletions

diff --git a/sys-block/nbd/ChangeLog b/sys-block/nbd/ChangeLog
index af4e4018b49f..d8f423fcd361 100644
--- a/sys-block/nbd/ChangeLog
+++ b/sys-block/nbd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-block/nbd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/ChangeLog,v 1.82 2013/09/01 18:40:08 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/ChangeLog,v 1.83 2013/12/02 05:35:17 vapier Exp $
+
+*nbd-3.5 (02 Dec 2013)
+
+  02 Dec 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/nbd-3.5-gznbd-printf-u64.patch, +files/nbd-3.5-gznbd-zlib.patch,
+  +nbd-3.5.ebuild:
+  Version bump #493010 by Agostino Sarubbo.
 
 *nbd-3.4 (01 Sep 2013)
 
diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
index e083c6d1646b..124569309100 100644
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -1,6 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX nbd-3.5-gznbd-printf-u64.patch 1702 SHA256 5e4c20f060336688a6ba704e1f5184e2d119887c427b2f29e2d597a3b3eacbf3 SHA512 d6b49fc1b0c0433bd17e5ecd246beacc8e251492b0f606294495494e492f2b0dbc3ea0f34bf40df6c0dc0ce4a0a156096fd8226de181e30d117b270d20514cf6 WHIRLPOOL 9bd2291f006a3969c4cdf9532a7afb16365f119c4ea7a202d6994f17e42e3cdbd7904f84d8baf67c1a02d9ddaef8943c2035fc4bdadd1756ae1e1ffb7a18f0a6
+AUX nbd-3.5-gznbd-zlib.patch 1232 SHA256 796763a8e86ed9ae1f78c643e9b7e4afa06cbf1d07796e699cd86ae1dd3a6bbd SHA512 132cc20ce52ae8a6db62530edb77cc8a1e106c819861dbb9144dd9c2c5138fbf4107196932f5d45da75b4a7b6288f9956c6e04b9938fc5036ebe6d0270893a5e WHIRLPOOL b05b4da4b3748a13474ecb05aedc46f4965b450669eccef7ad83e51d02c0a8c5fd148b185757844c48c1c87110fc463f13459f91de30a060abc39faa017e841c
 DIST nbd-2.9.20.tar.bz2 152395 SHA256 98f0de421f0b2f683d46dff3eb679a3409a41f08e6fad7c2f71f60c5d409939c SHA512 3fb7cc2cd134cc79c352a78875f0579d89eaa3c4d66dc9801126a88ee56e5ff422bce039dddc802bd08fad5b7450d9b95dd3f0590e2c5cb51b59ddf84a5183a6 WHIRLPOOL df0748fec272e74907f13ea4387ec0c80eae500704662792d8d8e48c8fef9396dac9853787bd2f9e1b0881d1c13ef0337dcb00dd0e5cc86e147de1492f91c5e2
 DIST nbd-2.9.21a.tar.bz2 154161 SHA256 9946dd7f4a63cf20ea8617100d0f599211d4a5fd5b6cfb8f50f8975431222bbd SHA512 20b1dacb1503664106e6c1c0a2eb884a104cd484b9bb9396d7b37e1458ef9f824ff1a280edfca37e854818bfa1269379b85d1085b8053349dee9b91e0ff26532 WHIRLPOOL ffd7f5feacea636264be356e6b9f2eae7430a9fb14e3cd253b22344ecf49f742e095e244c8ce13140d3b646270409b0bfff9ad43236dd025536a7bf542a19ecf
 DIST nbd-2.9.22.tar.bz2 490185 SHA256 f9e1a9db1663393fd1f2de2dd70cf15cc4fa17616853b717db7ca6c539f8787d SHA512 7d7d58ca06c9caa5f10836218b27d6889dbb63cd26358eeb84bc3f3c885a7721fbe91782b1fedc13e67e2e66db4c8114175bfb9b92271392ec4d10036be3f912 WHIRLPOOL 0c6598cc0449fb52fc0228ba7ea6aca8a9be10707878c5ef4bdc82adbe600eaabd3005bf3fcb4e4530c7d450b5fd17556d63ff72ba683d7831615e5e74a5c14f
@@ -12,6 +14,7 @@ DIST nbd-3.1.1.tar.bz2 508444 SHA256 5cd150b874f966aacf4a9dfe1e9de9b2139b295241c
 DIST nbd-3.2.tar.bz2 508734 SHA256 e297c1883133f04a55d8e9527a2e4344e577a54046cf81694ffabe13f73793db SHA512 dbb751ec74784d8ea89d4df273ba239d66cf1d6fca16fea44a77502d6241132b960bd41dfdde844854e2df68bf27763b215207c0518bde943a2f3c631e4f76ec WHIRLPOOL b863eb8cc0ef7368ac92b8f58748197bf10c93cad06741491cd2ca29eb1d3cab4947272f6a30ac360a054f641dad67f93031f05a609ffaf8636b9a8f34288946
 DIST nbd-3.3.tar.bz2 515909 SHA256 83105718dcab9eee7ea152d6e5f4928095f0d3e21dcf92e43eef183e29a80c19 SHA512 9e43f0f751172a18e9edf0e312ff4e8aee3b0ce303ed6f69308312a4565fb06d4b9e9e528f11470031c6490a8416d41266e18a0d6e249749305e01f200d0b608 WHIRLPOOL 97e994d953c046492216fcc09333b158304df80a310a28e3dceba581d3098962079af82fd3cf7d4816168a06e987b823bb1759be4afab35bd679ad5d4ac3ee91
 DIST nbd-3.4.tar.bz2 582959 SHA256 552a6dfdd69a13217a0c449892acf70fb3a1f0fce745c72ed6d83ee50a0a32cf SHA512 dd08dc2c238a23b3b6e3b0b4422b3b2bface007ed0b4230cff4bf0d2a3f628666d9b34a385883f4ab65d89be05fce3fe7d86598748f294760d61fd2b9bc969a7 WHIRLPOOL 998f2431e0fe580345b4c5ced94fd087aee8564fe7b3e4c48e57e2e33ddd7faf4768ab7433956f8bbdce14b45acb5152d5202f1df45dfd6e1b635b0b9e8bb600
+DIST nbd-3.5.tar.bz2 523049 SHA256 1d3f049d525f50584d012551d138bf6d291f605a92df7d6bb56085ca5a5d363b SHA512 96d055ce56aa2f2f9ed470168e959260c010b05fe8eee47d20a7a01b5c01734a2a85376279fc948e4a0b34a6cf4532d2e8e5b5e189db7830bebe7b96ee847a57 WHIRLPOOL bd5e85d2aea2fa53b72396c9bea046a2bb4230079636c633248e125f3e3e59ba794454560eac995914fa4f8c5d27316fca0636e4dba7e3722cf515b691373c67
 EBUILD nbd-2.9.20.ebuild 732 SHA256 cd2c7d1fdddf40f8728014a72918dd2468c7d42f1d6e13a3b048e04513887742 SHA512 57d20a7c7acd3f8ca52780f5309927fbe439950e7702253d8ff0b15d817c1c486623f794a69b5378aabe56820d397c04192c9ab3c4b5486edb041486aea9181e WHIRLPOOL a0a46df8e36eb30e526ec8fb10f24f6eaa01dc8fdc8d5d3018d48185216be44ccb1f4cc3e68b228d859b47ed70a1cfcf688315161e2fe62a88234fcb87ead347
 EBUILD nbd-2.9.21a.ebuild 737 SHA256 f3fca68dc2f019c30382a1689cb7b97fd90d0aae392b927c0f7a46a93996fdc7 SHA512 13167e4c24a523b87573d35ec9419200da96fbe0a8e57c7dc6b3070a55e7c2be21a0820a86173da55e9331382207c2810abb9d8ed9fe643fa98480f1df76284e WHIRLPOOL 58b45db7e0174a9881f56ba357a566178ab08d21dfaf63f02c7e8c13a5d6ae5828795c9f0093c24956ad722a5f39f1844165fb4bf62eaf1d04aad4484b2d583a
 EBUILD nbd-2.9.22.ebuild 732 SHA256 ce8cc52546e3ef755338a9ee93e8b61fc64f4b44d8a3bed08c088fb45ce5017d SHA512 a15e8aa592029b3d7168b803e8ab8ddc3e03bd52f3592092cf0f5deffcbe85da1688172b9ed1b8afc9ac6d64c6c3498dcaeb63004b601dc71efd509720fba05b WHIRLPOOL 404e9fdc738bf3695499c8c52e9cecc8b50b0051084bf6c5b6e48a52524838ad965bc7fbf1ec4378fccfafff77588319fca8f76074b643b6ec4b01c3002bd54b
@@ -23,16 +26,23 @@ EBUILD nbd-3.1.1.ebuild 727 SHA256 4500204918e3bd876e62afd299cab485ee7abed81957f
 EBUILD nbd-3.2.ebuild 815 SHA256 36bdee1cc327cea9a74ef55a08b0deda15b21825c4f18d00966c8e515d9cf8ce SHA512 78ee251868705b879ba2d38a4c6c76ff9223b30ea5117380074815ddf3185e1d38fe4313da11998936ab6317ad77b1d414b1559ce4df29c6d0fd28c35b497bbb WHIRLPOOL 534bd2de4d2d90b221b8af59da7c1ee219d4b095866e169c948d8597438148b88b9c29a726ca7c1742c080328162bc6ade6de8ec457119d5514dfdc7c93e5810
 EBUILD nbd-3.3.ebuild 825 SHA256 5d096f565bbcea1b304a1d0e6923219e831abead9eaff730f5b394c66016d6b6 SHA512 0279b70e1d4323f0751ff95cf33624f72a93354f52a91566c1edacc60dfffd28f9c84cace80b09eada34abd7b6ed1d9ae6e18743f559edd492875a4b1c30971d WHIRLPOOL 5e0f5ed13499c04e546125e2d186be9cfceda135efa88200aafe567090bf00472deb036288c73bede0185e2f6e11a5ad48530414372a7523ee4b37d71c005f51
 EBUILD nbd-3.4.ebuild 825 SHA256 672962474d91b01f211783bf1caed809bdf785d9a756f2cc43947cb30908250e SHA512 7ede14dbf774720293047f8b2a66d41857d8fe0a80928af8b4b3347d2cd44acb6b59b1381642613db70f46ba77417ef9cca76be2a6a8c779b7c8e92a2deb5b4b WHIRLPOOL e95a89ceb7d4dc68cc9d184960d2608387ef982b1e1e9a68bd12a276b5843c9e2aa2c0d25f7db8869068d10675d5e8f0d6dbf9d712dfa4498c72b5a3dccacbf8
-MISC ChangeLog 11580 SHA256 ecc7ab6d3a17afb8f5e7f020949ef4154e43cd09e75b0a11eae225cff7a5ed2e SHA512 dc30acf4f1838309ee0a4a4a7737db82f888d182a5750aeb3511ffa26dd39e44a519492a9bcfabae92ea590ecb502aacb7abcb77ab15030ac8e54110cce35481 WHIRLPOOL cb4181568e2e50bfb0437748d736efd03c53b1fd7a777e735ee4a89579b1ef6fd24bd97f871ac79ce385d41320e3988f78ed96f5a6d170db0cc7587297e904de
+EBUILD nbd-3.5.ebuild 942 SHA256 16fc1df5015a325d5006f0fb6ed140903c59c86655b67222faef468d45a93280 SHA512 e5ce0926386f6af6eec2213e3f6f8ec42b3e88e98b91bde0038c08f44fc5bc78fbc98b805c15a033cea2c37b7584844388a18b10bd04ce4bcbdc6f354f3637f0 WHIRLPOOL fea612ad1986922a695132ab0db5fe2a1a5159add304e880598a94f2bd1b0155f49a6ce334927764bba5abf1ef773e1d77277539fa72b3a11c978c59c1d51e34
+MISC ChangeLog 11789 SHA256 521a18d5a6ee92e6401d6b2de25c5d7dc9f62d78aad0f50e2423a435a8fead6e SHA512 f95ff88db0c165bbc76cf95877626474fc1d0b899d0a7b5728283729ec3e9564a9f956de4fb5961488e010a2cadbe052d78ddc85fa18f94f473118ba05efec80 WHIRLPOOL 4bdb341bb801b7db6a23ce7644188d54fbcaf41e0c4b53bcc21f1d49c9a34b2002b78ae7a3a3f6b4e89709deb74b2faa5586598a40aa11c907d2df017055c9fd
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSI4oLAAoJEEqz6FtPBkyj6d8H/Rh/kW9lchAjW2oOrEx3az/1
-ik+S4IKMVdwxVhzfyxNjPj8KzZwxC6/I5lzQHAiwr1ZOn/lFXLhF1+UgxdAiVeAL
-WfYlXnsNG6UbabzaUSV6/AD4Ed0JEb4GD5T54pQc+/Xvg7ugnJ/Hnzv8O17wW5MG
-iicmDcGQkq8eVod8e0LZIbKZmGbCO3U52PgA+NHXsm7gQguUsYWfYdtQVu/sYgb1
-yHH8Q8FXceZ8MmeRraBctr3JUDq7fX/pjzH3O+Q6EAbFx1+oLNuAZzhS1JzRdfH4
-xYBskAoZWkfEhgYFirYmKD/TnaBtMUxn03TB/vqPYryOYUMxyV6yHeCef5wpFmk=
-=Rr1e
+iQIcBAEBCAAGBQJSnBwdAAoJELEHsLL7fEFW+uoQALjJypODGxYnLteWsh7JVxZ0
+8nIL9Z6DxBs4mykQUS40DJpS2OWjKJCXqVSIoKjQrnWbBqJYUjYdZdlDsElsmyqx
+1mz3m4NtAoN3eXBlJY1/o0hs830YRaMgszWO9Ta+awPk4elDK+6AuyjTqIqJK9iM
+Rd6upanxCcfKlm3iwnYAjR1TwplBEcJj7agyPe0GnrAKHAY9BvJTt1fvnKWLRvC2
+cHRuntROHkzjUlu9v0k3dI1e2y9+A5jqptq5NvBbhFi14a/1TbfQtiOIZ+/BqMKs
+71WhiCeX+cMDfyE72PpvOTOXwApI422RWW5WoPvJcF3RzB/yv5Tpj7kCQRpfPdHa
+xyOx+qo+xEYVrJH+c/qCB2h/Afl1H0RyQgFsaDrkLcMN5PzIIZvdrJsTGCpeBzXE
+DO8N6JTSuC/wr+/bDxXLYSvAljJpgyfgRWJ4o0O6gZlQg1Cc9PDV0O9/N42LXcpb
+GM4i7rs4d/WCMSJxsT7lT82lJM7xaLq0VWyFfksnaokGHD+HB3LWWNeW74Uu0UKP
+xjLf5F0yv7bbrQl1ZDcsN99XRsbqDWT44JQ+v3pzjKC3AoYUUndXnoGy6EQMXRx6
+PZ9KyrkL5a9Tv9h0ESJbKmQraW7cePJmkcSweyjzw5bKsPy91QOAfDO/78VHrxGA
+lseiu6blT7b8G6BatTha
+=WD4/
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..eff90faa1962
--- /dev/null
+++ b/sys-block/nbd/files/nbd-3.5-gznbd-printf-u64.patch
@@ -0,0 +1,59 @@
+From 90024f17b682e20a34f35a6ccb437edc10eb5c3b Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+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 <vapier@gentoo.org>
+---
+ 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 <fcntl.h>
+ #include <syslog.h>
+ #include <unistd.h>
++#include <inttypes.h>
+ 
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+@@ -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 b/sys-block/nbd/files/nbd-3.5-gznbd-zlib.patch
new file mode 100644
index 000000000000..e4609e03ab7a
--- /dev/null
+++ b/sys-block/nbd/files/nbd-3.5-gznbd-zlib.patch
@@ -0,0 +1,38 @@
+From 172a5a7c5824237537051247f203a39cc39e3aef Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 2 Dec 2013 00:24:01 -0500
+Subject: [PATCH 2/2] gznbd: fix warning with newer zlib
+
+When you build against newer zlib, you get a lot of warnings like so:
+
+gznbd.c: In function 'main':
+gznbd.c:87:5: warning: assignment from incompatible pointer type [enabled by default]
+gznbd.c:109:5: warning: passing argument 1 of 'gzread' from incompatible pointer type [enabled by default]
+In file included from gznbd.c:37:0:
+/usr/include/zlib.h:1313:21: note: expected 'gzFile' but argument is of type 'struct gzFile_s **'
+gznbd.c:118:9: warning: passing argument 1 of 'gzerror' from incompatible pointer type [enabled by default]
+
+This is because the zlib API uses just gzFile everywhere, not a pointer
+to a gzFile.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ gznbd/gznbd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gznbd/gznbd.c b/gznbd/gznbd.c
+index bb41156..803c1c1 100644
+--- a/gznbd/gznbd.c
++++ b/gznbd/gznbd.c
+@@ -68,7 +68,7 @@ int main(int argc, char **argv)
+   int pr[2];
+   int sk;
+   int nbd;
+-  gzFile *gz;
++  gzFile gz;
+   int gzerr;
+ 
+   char chunk[CHUNK];
+-- 
+1.8.4.3
+
diff --git a/sys-block/nbd/nbd-3.5.ebuild b/sys-block/nbd/nbd-3.5.ebuild
new file mode 100644
index 000000000000..2184a4bf0ba5
--- /dev/null
+++ b/sys-block/nbd/nbd-3.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/nbd-3.5.ebuild,v 1.1 2013/12/02 05:35:17 vapier Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Userland client/server for kernel network block device"
+HOMEPAGE="http://nbd.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nbd/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug zlib"
+
+RDEPEND=">=dev-libs/glib-2.0
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gznbd-printf-u64.patch
+	epatch "${FILESDIR}"/${P}-gznbd-zlib.patch
+}
+
+src_configure() {
+	econf \
+		--enable-lfs \
+		--enable-syslog \
+		$(use_enable debug)
+}
+
+src_compile() {
+	default
+	use zlib && emake -C gznbd CC="$(tc-getCC)"
+}
+
+src_install() {
+	default
+	use zlib && dobin gznbd/gznbd
+}