Bug #390563 - Add a udisks USE flag, in order to disable the optional udisks dependency.

Package-Manager: portage-2.2.0_alpha74/cvs/Linux i686

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 3a7707b82da64d37edc1d9a7219857018949ee80..21f03f48e732c91b44a815dc63f8cb4eeba2973b 100644 (file)
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.169 2011/11/12 17:26:14 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.170 2011/11/15 15:55:03 zmedico Exp $
+
+  15 Nov 2011; Zac Medico <zmedico@gentoo.org> calibre-0.8.25.ebuild,
+  calibre-0.8.26.ebuild, metadata.xml:
+  Bug #390563 - Add a udisks USE flag, in order to disable the optional udisks
+  dependency.
 
   12 Nov 2011; Zac Medico <zmedico@gentoo.org> -calibre-0.8.24-r1.ebuild:
   Remove old.

diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index e38efb0dc18d2843c63ae020dd2454fa4b68b4a1..50aa242b1a4bd012245992a4d001d58abebd4271 100644 (file)
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -3,14 +3,14 @@ Hash: SHA1
 
 DIST calibre-0.8.25.tar.gz 37734837 RMD160 a286f18a7f6275cc448522f7ae393c557e7ede0b SHA1 2a9beef5544e7b7d211abb9d248a978a76af9376 SHA256 529ab5a9c404ea28f332562714f55d4e45a299930f00086f0e4e168571f048b1
 DIST calibre-0.8.26.tar.gz 37784724 RMD160 b1700bb3c395d51fd942893a8f25737a01ed7eb4 SHA1 0840c720935968d6349768a26239193d5b5a0720 SHA256 59e713e126ddb5739bfe33acf52581ccad944a9f05c3e1d3d0b3958b4762f91a
-EBUILD calibre-0.8.25.ebuild 5476 RMD160 e1ad95cc46e5da380cd2d7043ae31922e337d5e7 SHA1 af56d6d037ee0e0cca48a2a2dc6b2b99f86b756b SHA256 7bea483549851ef01b28fc8eabb7c65df7cd236b3c07b791d99f3930234a1b1e
-EBUILD calibre-0.8.26.ebuild 5476 RMD160 9efe08b8cc9f3f11982bad314fcbdbe2748f7f77 SHA1 ccc7eae55e9f1e4ffe9b191e9e5f82e790f05569 SHA256 d0d19be33e3aa63aa10efeae542a25cdc40a7c6b90c879bb022b9e3c77dd6613
-MISC ChangeLog 27473 RMD160 725701219615174c45c704417d06344d909577e7 SHA1 5a918991947fb33ab105c9733592c2dc434cd2d3 SHA256 f87dfdc70f53ccbde1ca8eab2211e82fc767b97d4ab1342d8c0e6f1d8e0e3557
-MISC metadata.xml 208 RMD160 745680e46bfd88253fa371a757ae549c24cb4163 SHA1 875f477c578d5f232290883c8f3306facd9ebec4 SHA256 67f4cd233dc8d6d341b8da89aef2654cae64f7e3b62fbcdd3a35e6e30e898e36
+EBUILD calibre-0.8.25.ebuild 5495 RMD160 d413f2b09f2d5aa075b475cdeb9b8370322c5cce SHA1 0107e12529a08ecb0dfa3f56792abd848f1d5f9b SHA256 bd509a34fa03a4d33de20560e44ab039d3b368583a8091814493d7843519b54a
+EBUILD calibre-0.8.26.ebuild 5495 RMD160 1aded5ac31fca26e5f68c44722665f88c2d56b16 SHA1 222a2dba650076cd329c716116985a3b06b7eafc SHA256 e1b8a52856ee14d8aa76da95b40216f480bfdbf1e0f3e97a25b0d2a8fad03c4b
+MISC ChangeLog 27676 RMD160 aa88a7b5397a2afd00b818d64e2403ee347466b6 SHA1 55ffe0e89d98e2170b1ca2803e22da6c942abe1e SHA256 866bbe6623b7e73de965f083e69728ecab5260a1c5634875a63d9a46cc8bb1bb
+MISC metadata.xml 340 RMD160 87b372ab564a33c6eb65bc2656e39cafe431ee97 SHA1 3b79f0e21800238651f138d5e1f7101bb80c8f5a SHA256 db5a0163e41af3aa60492fbffbbd971e2ca9d76097d5da9d3aabf3c16e4294b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6+rDwACgkQ/ejvha5XGaNf6gCbBpZCaVFQ6Q+PJL0YkqZAfK+O
-/0MAoMjvgLf364ju8O3PuYiCS3UZwhUF
-=o3m5
+iEYEARECAAYFAk7Ci14ACgkQ/ejvha5XGaN/hQCZAWr8SxJZByv7a27cAtm3eV13
+BWkAoJwU1+UcN2GNT3IMGu5VJO2np2VS
+=NtBB
 -----END PGP SIGNATURE-----

diff --git a/app-text/calibre/calibre-0.8.25.ebuild b/app-text/calibre/calibre-0.8.25.ebuild
index 3a8297b428533d051daf3c314e692af4cd3b9a20..d1e9c88ec3029a5b6cb60cb9f6536e0ff3de1d21 100644 (file)
--- a/app-text/calibre/calibre-0.8.25.ebuild
+++ b/app-text/calibre/calibre-0.8.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/app-text/calibre/calibre-0.8.25.ebuild,v 1.1 2011/11/06 20:48:29 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.25.ebuild,v 1.2 2011/11/15 15:55:03 zmedico Exp $
 
 EAPI=4
 PYTHON_DEPEND=2:2.7
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 
 SLOT="0"
 
-IUSE=""
+IUSE="+udisks"
 
 COMMON_DEPEND="
        >=app-text/podofo-0.8.2
@@ -41,7 +41,7 @@ COMMON_DEPEND="
 
 RDEPEND="${COMMON_DEPEND}
        >=dev-python/reportlab-2.1
-       sys-fs/udisks"
+       udisks? ( sys-fs/udisks )"
 
 DEPEND="${COMMON_DEPEND}
        >=dev-python/setuptools-0.6_rc5

diff --git a/app-text/calibre/calibre-0.8.26.ebuild b/app-text/calibre/calibre-0.8.26.ebuild
index 619c1843fb7af278345cd471e4475f75617ef3db..153ce791841b9f217f72387709dbcae62958db59 100644 (file)
--- a/app-text/calibre/calibre-0.8.26.ebuild
+++ b/app-text/calibre/calibre-0.8.26.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/app-text/calibre/calibre-0.8.26.ebuild,v 1.1 2011/11/12 17:24:16 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.26.ebuild,v 1.2 2011/11/15 15:55:03 zmedico Exp $
 
 EAPI=4
 PYTHON_DEPEND=2:2.7
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 
 SLOT="0"
 
-IUSE=""
+IUSE="+udisks"
 
 COMMON_DEPEND="
        >=app-text/podofo-0.8.2
@@ -41,7 +41,7 @@ COMMON_DEPEND="
 
 RDEPEND="${COMMON_DEPEND}
        >=dev-python/reportlab-2.1
-       sys-fs/udisks"
+       udisks? ( sys-fs/udisks )"
 
 DEPEND="${COMMON_DEPEND}
        >=dev-python/setuptools-0.6_rc5

diff --git a/app-text/calibre/metadata.xml b/app-text/calibre/metadata.xml
index 059d713e41edf40b4e2d8d0601c6a1304f6044e5..54ca65b687a3845bbbbd7d6cc627b2a09e921f08 100644 (file)
--- a/app-text/calibre/metadata.xml
+++ b/app-text/calibre/metadata.xml
@@ -4,4 +4,7 @@
   <maintainer>
     <email>zmedico@gentoo.org</email>
   </maintainer>
+       <use>
+               <flag name="udisks">Add run-time dependency on sys-fs/udisks in order to mount and unmount reading devices.</flag>
+       </use>
 </pkgmetadata>