diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2011-06-08 03:36:01 +0000 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2011-06-08 03:36:01 +0000 |
| commit | 64667763b544e5184cfcda4d462e562df01bc1b1 (patch) | |
| tree | 15c025e8ee20ddb8e44b32fab9ab1e9a84abb517 /sys-fs | |
| parent | popt only got pkgconfig in 1.16, and some infra systems have older versions o... (diff) | |
| download | historical-64667763b544e5184cfcda4d462e562df01bc1b1.tar.gz historical-64667763b544e5184cfcda4d462e562df01bc1b1.tar.bz2 historical-64667763b544e5184cfcda4d462e562df01bc1b1.zip | |
sys-fs/udisks: Fix conclit with sys-fs/udev-171 (bug #370283)
Package-Manager: portage-2.1.10/cvs/Linux x86_64
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/udisks/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/udisks/Manifest | 24 | ||||
| -rw-r--r-- | sys-fs/udisks/udisks-1.0.2-r4.ebuild | 5 |
3 files changed, 10 insertions, 25 deletions
diff --git a/sys-fs/udisks/ChangeLog b/sys-fs/udisks/ChangeLog index 4e2f10fb5245..49d1aaaa1091 100644 --- a/sys-fs/udisks/ChangeLog +++ b/sys-fs/udisks/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/udisks # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.42 2011/06/07 08:49:25 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.43 2011/06/08 03:36:01 sping Exp $ + + 08 Jun 2011; Sebastian Pipping <sping@gentoo.org> udisks-1.0.2-r4.ebuild: + Add >=sys-fs/udev-171[gudev] as an alternative dependency to + >=sys-fs/udev-147[extras] (bug #370283) *udisks-1.0.2-r4 (07 Jun 2011) diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest index e2b2c4639127..c1cdcd1129bb 100644 --- a/sys-fs/udisks/Manifest +++ b/sys-fs/udisks/Manifest @@ -1,28 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX udisks-1.0.2-CVE-2010-4661.patch 4790 RMD160 ae379b461830e7b3a201382d3253f62d5fd65c50 SHA1 ced4c739103d1041ee74411118ba8b73658f8e8c SHA256 be4cff70a50d0b69812fb373f381879d492fc3d015cd4162f48633cee1d22812 AUX udisks-1.0.2-missing_comma.patch 582 RMD160 86b30b5635d6802d42132d844fe6d94ddf1b6155 SHA1 fb5bf57c849c9a10dc5b7595b87a2aa84726356a SHA256 680ecd7dfd73b9f2e8b21d39c3c90c2fd545265634df95eaeb2d60619ff39422 AUX udisks-1.0.2-ntfs-3g.patch 198 RMD160 e4b5cb3386184edf90bce5140a1c414ef5e99210 SHA1 d3ee3999b9d0437a6022d85d4535fc72632f6258 SHA256 1db923f52619c2dcc6c30ffedcd47dedce048dbec2eb781088738e51f8dc0539 DIST udisks-1.0.2.tar.gz 716381 RMD160 a022ac752ac75d3bca102adee05be43f2ebb424e SHA1 a8307d726b7f1255e7008ff708c793a1301d1309 SHA256 7dc1a150a6a31b2727144603fa5a8f9852696fc5bdc4a11917b9b0f1b8e3dcf1 EBUILD udisks-1.0.2-r1.ebuild 1948 RMD160 c3c63cba11aa5825fc63edd1236dee2f71f3623b SHA1 bdc0a84045d9ea3338bd3012f44b858a950478e8 SHA256 d01c7a3fb40dd3b80977dd434fbc69fa9faf6afe7335e41d12204a31557cdc38 -EBUILD udisks-1.0.2-r4.ebuild 2008 RMD160 7ba6039cbce8b29f89e120a8737ef40c8f9ed846 SHA1 801bb8efe02a95de67c580a6301c852086d0ed1a SHA256 d3d395618e0a7e42bc74d86d79a0f2bdbfeddee5660adb5bc0af77d6d8cff40d -MISC ChangeLog 5875 RMD160 3beac13d41baf0fbee13caf7474720b4501dd1ed SHA1 42147bbdec4e21468662b83adff89828eac620e8 SHA256 efc4358f31c86b730d7009ee137217e85640d9e1c4a556b87d299782186169b9 +EBUILD udisks-1.0.2-r4.ebuild 2039 RMD160 beb251b47dd6d1c8e16442c2062a16ca5230bf43 SHA1 4a157de146d9a2678f296962267de369b0e4b344 SHA256 3d6ad7952052d50c39401dca25d15efe8a610fa123b8067f6be81e232319f1aa +MISC ChangeLog 6054 RMD160 cfcb6e3571f1b789f6feb8f90e4b7375fc92641d SHA1 67f49f9352ba91c769dc0a697e29d609fb489ca6 SHA256 758f6c5206ebf79aa26841cc6eb0c1bef47d4fc6f79a20c866b978a0fa0e6910 MISC metadata.xml 367 RMD160 3cc82714647236fdce4606ef9e8432ef2753a553 SHA1 6fd0b25ca51d565fdc6c40b9d1fc90ebff4ddb22 SHA256 9da91cf204d0f5616ca669618f4eed4c477140aef9f7f9218217e63e7d88d051 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iQIcBAEBAgAGBQJN7eYcAAoJEO/kOhxWD91k/Z8P/3FH4cFxkrHDa19mHNhMNRA1 -rUju8VMm2d1d6fGBIDmgK4p7LHuNdEpbzjS2/7Fp+/onEmpu66xUAvj44wqjBgT6 -h9ffgYNJVxCXc1EzeOjUVdFO57JPcNVCjm/8WBMFdfVA9P6L9g3704uctPvAg8LO -C/HJU4ynqlBQr8LNUkyipYQVSo4OfAsFOP3qr9P8a+GMcIcUl+lgibZDkzY6ZuLx -uKZsD83Napb9c25sk7ntrDwOX9AEGZsqroCcRklqsvz7lAbdm3WRYzOpOf/kyroz -aGO/lcO5SDNipT75eanLDRg/n+8hx+mvZ6iVWpSLgIQhxP0Fw4uf0Op/NKSqSjgZ -kAv/1PHvP48vVp6TAn4hmXP5h2C/s1WRLXBWE6gPmEfpjWA9ZC/D4EVrt0nuodBP -P3TpiSIdxabtm6V4ZuWGi4yLTRT0YVGnpX7lsGSWAgUSoGl813ePB2boS72iPNbZ -R4L2AWQ+Ek/6YdHyuZ8AcHbFwbSnc35L1+sy678PECcRZLShdqjZIgOOS9s0G9Xi -YkGnO9TsxdnK7BPMFOTOZ7yFOJ3WmW4GSvqX9AfPke/cElRySM4p06pxgTvUjQIQ -OZ4hqt4w0aRFwBZ+LiSfhlRWg+79Dz+W8R2+Zbw3hWcfBMICzKbqB+mi4GS/DvD9 -0FasRSyFoByT6PrEM1u/ -=MNjI ------END PGP SIGNATURE----- diff --git a/sys-fs/udisks/udisks-1.0.2-r4.ebuild b/sys-fs/udisks/udisks-1.0.2-r4.ebuild index 05910cb9dbc4..39acbbe1d150 100644 --- a/sys-fs/udisks/udisks-1.0.2-r4.ebuild +++ b/sys-fs/udisks/udisks-1.0.2-r4.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-fs/udisks/udisks-1.0.2-r4.ebuild,v 1.1 2011/06/07 08:49:26 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.2-r4.ebuild,v 1.2 2011/06/08 03:36:01 sping Exp $ EAPI=4 inherit eutils bash-completion linux-info @@ -14,7 +14,8 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" IUSE="debug doc nls remote-access" -COMMON_DEPEND=">=sys-fs/udev-147[extras] +COMMON_DEPEND=" + || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] ) >=dev-libs/glib-2.16.1:2 >=sys-apps/dbus-1.4.0 >=dev-libs/dbus-glib-0.92 |