Add USE=zlib control over zlib dep.

Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64

diff --git a/sys-block/nbd/ChangeLog b/sys-block/nbd/ChangeLog
index 3fa82fb0e24399bcc8d0b407c54d76fd852b4664..a63dc8c8a34fa97b82bc0069394a4beb943edd7c 100644 (file)
--- a/sys-block/nbd/ChangeLog
+++ b/sys-block/nbd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-block/nbd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/ChangeLog,v 1.64 2011/11/29 15:27:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/ChangeLog,v 1.65 2011/11/29 20:18:54 vapier Exp $
+
+  29 Nov 2011; Mike Frysinger <vapier@gentoo.org> nbd-2.9.25.ebuild:
+  Add USE=zlib control over zlib dep.
 
 *nbd-2.9.25 (29 Nov 2011)
 

diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
index 863526bb0f18ec1593c6d93e74816c6ea617d235..08589771515c0fc482db7ab3f87dbc3140f2c2c3 100644 (file)
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -12,13 +12,13 @@ EBUILD nbd-2.9.21a.ebuild 738 RMD160 1f82acaef2e0f7a23ad827b3ed88405396d34010 SH
 EBUILD nbd-2.9.22.ebuild 737 RMD160 fb92046acad861182b7809f4b086c73f9a6c527e SHA1 8cacd4f17810b9f040743ee8ece757e8dedb7c84 SHA256 f8bde0c2a2e7db59d0b55f3e34a81ae39692997614286b5d27b54a113cc855f6
 EBUILD nbd-2.9.23.ebuild 737 RMD160 233e17fc6a082e831949fc9dd64c2e8a6761d14f SHA1 a0d18b73165e63313357e67d68e0a5fbd9834cf5 SHA256 7da8d784c9720ecbd583b8db6e3044975fe48c01b5e0c4d7f4f853dacea30471
 EBUILD nbd-2.9.24.ebuild 677 RMD160 5eddc70c7f279d850abb3c7855b2a8bb23cee14a SHA1 68e48ea9b5a1ef7ac88371150096cdc5786a4ecd SHA256 754c45fe437aeaa476504cea6d2f89df609224e34220a4ff8d67bc185fa0bc76
-EBUILD nbd-2.9.25.ebuild 674 RMD160 8bcf2a79debe72cb6fe2acc04f270b2d3b660c71 SHA1 5754260d05d423c9f6ac4620ebd1d2140d04f2e0 SHA256 d211ee6491c2b017a567bbe6ff54f5e2c5d255b2c113d518f46f3101db4dac67
-MISC ChangeLog 9503 RMD160 01b2b2b1b8b0a1db2165faaec382d55dc7d75ebf SHA1 b6be5ab85986832c3578b312694887fbb642f7f3 SHA256 d4e62d83743eea82d5f89f84fe93a65783809459cb60b6a485db57c6f4f38bfc
+EBUILD nbd-2.9.25.ebuild 729 RMD160 c58cb641bbf886bdb5616207905baa44f6c3cea5 SHA1 2c1c912a99d5370949efa09b121d6ad78acdb97c SHA256 5419d3f906bbdc2e63e0c7b605d1012a1376627da3239d1ca922203fef6559ec
+MISC ChangeLog 9611 RMD160 2f76ec0db846e919cfadabfa40de3512fbcbfcff SHA1 d7e1301d56a1f387476e6d763553f9b6badb7152 SHA256 b2e60cea0f938171e1fc6c34f684c7d19589b519529def138c7cdeb7bba094ba
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7U+doACgkQaC/OocHi7JZADQD9G/EJlPbkuit8GRkedpDJQZrB
-D46sbtP1XpOwGpRkOw0A/1pKCJLyo0DESN6UEhhjXi7oR4snD3Al/4QtMH9j0O/N
-=bS7G
+iF4EAREIAAYFAk7VPjUACgkQaC/OocHi7JY6BgD+PnvyeyLUyjZe60EZ7CcpBbj2
+Os+ViFY20xm1IPMIto8BAJ3E13+/mx5H5SK4DviuptU+aSVaxnPxx8HGLqr6I0bM
+=RoZ6
 -----END PGP SIGNATURE-----

diff --git a/sys-block/nbd/nbd-2.9.25.ebuild b/sys-block/nbd/nbd-2.9.25.ebuild
index 59b42de1ade3310ba6f9db374dce8388baf1aaff..c7a15efc1284fb882d73abd0da7ac6ee4705b591 100644 (file)
--- a/sys-block/nbd/nbd-2.9.25.ebuild
+++ b/sys-block/nbd/nbd-2.9.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/nbd-2.9.25.ebuild,v 1.1 2011/11/29 15:27:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/nbd-2.9.25.ebuild,v 1.2 2011/11/29 20:18:54 vapier Exp $
 
 EAPI="4"
 
@@ -11,9 +11,10 @@ SRC_URI="mirror://sourceforge/nbd/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
+IUSE="zlib"
 
-RDEPEND=">=dev-libs/glib-2.0"
+RDEPEND=">=dev-libs/glib-2.0
+       zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
        dev-util/pkgconfig"
 
@@ -24,11 +25,11 @@ src_configure() {
 }
 
 src_compile() {
-       emake
-       emake -C gznbd
+       default
+       use zlib && emake -C gznbd
 }
 
 src_install() {
        default
-       dobin gznbd/gznbd
+       use zlib && dobin gznbd/gznbd
 }