diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2012-10-26 08:28:12 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-10-26 08:28:12 +0000 |
| commit | 3bbd7741f3d015324b98ac458b33a557133f037c (patch) | |
| tree | 16bfb70a377448b41ee10e2fcf838217cab244d5 /app-text/calibre | |
| parent | Version bump. (diff) | |
| download | gentoo-2-3bbd7741f3d015324b98ac458b33a557133f037c.tar.gz gentoo-2-3bbd7741f3d015324b98ac458b33a557133f037c.tar.bz2 gentoo-2-3bbd7741f3d015324b98ac458b33a557133f037c.zip | |
Use preferred || ( udisks:2 udisks:0 ) dependency format for bug #439630.
(Portage version: 2.2.0_alpha141_p19/cvs/Linux i686, RepoMan options: --force, signed Manifest commit with key 0xFDE8EF85AE5719A3)
Diffstat (limited to 'app-text/calibre')
| -rw-r--r-- | app-text/calibre/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/calibre/calibre-0.9.1.ebuild | 4 | ||||
| -rw-r--r-- | app-text/calibre/calibre-0.9.2.ebuild | 4 | ||||
| -rw-r--r-- | app-text/calibre/calibre-0.9.3.ebuild | 4 |
4 files changed, 11 insertions, 7 deletions
diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog index ba6c93712545..00d0408ea3cd 100644 --- a/app-text/calibre/ChangeLog +++ b/app-text/calibre/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/calibre # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.237 2012/10/25 18:54:47 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.238 2012/10/26 08:28:12 zmedico Exp $ + + 26 Oct 2012; Zac Medico <zmedico@gentoo.org> calibre-0.9.1.ebuild, + calibre-0.9.2.ebuild, calibre-0.9.3.ebuild: + Use preferred || ( udisks:2 udisks:0 ) dependency format for bug #439630. 25 Oct 2012; Zac Medico <zmedico@gentoo.org> calibre-0.9.1.ebuild, calibre-0.9.2.ebuild, calibre-0.9.3.ebuild: diff --git a/app-text/calibre/calibre-0.9.1.ebuild b/app-text/calibre/calibre-0.9.1.ebuild index c6246874b35e..6774666758df 100644 --- a/app-text/calibre/calibre-0.9.1.ebuild +++ b/app-text/calibre/calibre-0.9.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.1.ebuild,v 1.5 2012/10/25 18:54:47 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.1.ebuild,v 1.6 2012/10/26 08:28:12 zmedico Exp $ EAPI=4 PYTHON_DEPEND=2:2.7 @@ -47,7 +47,7 @@ COMMON_DEPEND=" >=x11-misc/xdg-utils-1.0.2-r2" RDEPEND="${COMMON_DEPEND} - udisks? ( sys-fs/udisks )" + udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )" DEPEND="${COMMON_DEPEND} >=dev-python/setuptools-0.6_rc5" diff --git a/app-text/calibre/calibre-0.9.2.ebuild b/app-text/calibre/calibre-0.9.2.ebuild index f9eaf92821e4..754843fdf3b3 100644 --- a/app-text/calibre/calibre-0.9.2.ebuild +++ b/app-text/calibre/calibre-0.9.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.2.ebuild,v 1.4 2012/10/25 18:54:47 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.2.ebuild,v 1.5 2012/10/26 08:28:12 zmedico Exp $ EAPI=4 PYTHON_DEPEND=2:2.7 @@ -47,7 +47,7 @@ COMMON_DEPEND=" >=x11-misc/xdg-utils-1.0.2-r2" RDEPEND="${COMMON_DEPEND} - udisks? ( sys-fs/udisks )" + udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )" DEPEND="${COMMON_DEPEND} >=dev-python/setuptools-0.6_rc5" diff --git a/app-text/calibre/calibre-0.9.3.ebuild b/app-text/calibre/calibre-0.9.3.ebuild index fae0e0464f58..5045c657436a 100644 --- a/app-text/calibre/calibre-0.9.3.ebuild +++ b/app-text/calibre/calibre-0.9.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.3.ebuild,v 1.3 2012/10/25 18:54:47 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.3.ebuild,v 1.4 2012/10/26 08:28:12 zmedico Exp $ EAPI=4 PYTHON_DEPEND=2:2.7 @@ -47,7 +47,7 @@ COMMON_DEPEND=" >=x11-misc/xdg-utils-1.0.2-r2" RDEPEND="${COMMON_DEPEND} - udisks? ( sys-fs/udisks )" + udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )" DEPEND="${COMMON_DEPEND} >=dev-python/setuptools-0.6_rc5" |