old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

9 files changed, 16 insertions, 519 deletions

diff --git a/sys-fs/udisks/ChangeLog b/sys-fs/udisks/ChangeLog
index 204e1b2c30d7..3f85c67f1f2e 100644
--- a/sys-fs/udisks/ChangeLog
+++ b/sys-fs/udisks/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/udisks
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.162 2014/03/24 14:34:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.163 2014/03/25 09:19:55 ssuominen Exp $
+
+  25 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/udisks-1.0.4-drop-pci-db.patch,
+  -files/udisks-1.0.4-kernel-2.6.36-compat.patch,
+  -files/udisks-2.1.0-ieee1394.patch, -udisks-1.0.4-r5.ebuild,
+  -udisks-2.1.0.ebuild, -udisks-2.1.1.ebuild, -udisks-2.1.2.ebuild:
+  old
 
   24 Mar 2014; Agostino Sarubbo <ago@gentoo.org> udisks-1.0.5.ebuild,
   udisks-2.1.3.ebuild:
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 062ba9475084..f02205d55d49 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -2,39 +2,22 @@
 Hash: SHA256
 
 AUX udisks-1.0.2-ntfs-3g.patch 198 SHA256 1db923f52619c2dcc6c30ffedcd47dedce048dbec2eb781088738e51f8dc0539 SHA512 3e9ba97d3d413e43df2c9e76dc88d9dc58d2f168509587228fc6c7b353111c9976b3cd1220bd4904d0e12ed2d804cd0807293a0982a8ee397692c676c567e716 WHIRLPOOL 365a00e248d6fe4ac7e5ce18a92b6f76611461ffe5c186e29eda521809381e3ec2c1bcc71b34f35513befdfcc99bec09fd741246a62e1b6feb48e95c31f841cc
-AUX udisks-1.0.4-drop-pci-db.patch 1003 SHA256 f6e735063c492e9bb319762ff92639212b9c2ca9235be0c0758c734218cd591f SHA512 ec0b1fa0dc6b186c1fff0f2101d1216b7b10123b57e6bf008e4c5092d120f15d3ee0a7379b21c85e567756cb165947c3a46669e882c69162903b72f8ae0dcbb8 WHIRLPOOL 8472b2377ba87760c3c10218867d70498f9ec7bf3bc4c67691a2438ee79bd43dcca465fde343e799e721a181335bbab07150bc4fe90deb11e1092743140b67a2
-AUX udisks-1.0.4-kernel-2.6.36-compat.patch 1441 SHA256 6b9ebe47adde63876b890f90b22979dd53c26ffb7e38171e9bd0e152f22f48aa SHA512 da57b1f431606d04a0b4d0590ad58b8caa6a317c301dcb650bd08a9aca292cc983711ba27fd6a8f6e4d0cd4d05198f08a99bb3913eec6079cf73a5fa893f3e01 WHIRLPOOL 4c9a5df9a11841d20945d625510a495c23571d2568c0e2e71851dd6f9d6c044021be268c706931dc7895cbb7a36b9b8a8e8fe9d0a92b0407986e704f2264bbaf
 AUX udisks-1.0.4-revert-floppy.patch 688 SHA256 65c0a6ec9a60762f6771d8e35bc71381feca9d40e27d6aa6374b374d3232d80f SHA512 044f40313ef5c8eeaac512d428e97b420507cd24cf25074768376733cf308676fbb1a429f462e4b06313344de1b7012b43ad4e6607d096758f0dd0e3effafbba WHIRLPOOL f02b378bbfca9c49a9d235aae29818772ef7ae05b5560aa67a326fe930925902bcc091aa121704bd47619b0b2f3b0c8d4ea01d076b603991a486e6c5cb274876
 AUX udisks-2.1.0-W_define.patch 501 SHA256 98cfdc960e206e24c4daea9d37a371b9cd9ee98cedc3110bc53a3782bcb3304c SHA512 e117c863a9822fbc68c04dd5f457a6e2297f9c1f54e9f5598bd6db3b70de115a86adaffe39bf29a022c289560e44d6fa5cbda444edc19ee522c3788c42056d9a WHIRLPOOL bebb6674562e69e8171c4bb95321c2b0f382b4107c8934261c3d684411b30ab78db2fd0bee62a23129ab4dcb38e0523db48dc9985f1f1e79c7073469854a477d
-AUX udisks-2.1.0-ieee1394.patch 1094 SHA256 603e30c8f6c632385a7b77d609a55805a998ba9ac9f2cd8edc80513616c62e90 SHA512 60b54b5f171b7bce9497d0c2592d76b18922ddd757e8a40d96ab609eb40eea03d419dee10bcf2c48600f1e172420e758d5fb5a644f6d6d3bd82bc1eca07631bb WHIRLPOOL 5cd0597efb5b13a11bd65ddff841a84da2364df57e1e6d005f6c7025dbc9e183feee91c3343f5e0dddcd8270289e45fd095eea2a883bd944d17825d340f1d46b
-DIST udisks-1.0.4.tar.gz 719889 SHA256 854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5 SHA512 8c9ac4e234cd7680ab1b024dfa9786ec127961c6bbcef352f7bac09972a39632b824587718177ed35bf036702d716bc893a8f71a374bf99de79342a46907a8ac WHIRLPOOL 9fcbb7112258aec4f0fb4926246521b54805ca850e6ad9d951fda819945c2c15ced1798463da8ba49729ea525e2710c58e4180107b50ab0f1e07af2e494cc421
 DIST udisks-1.0.5.tar.gz 736221 SHA256 f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71 SHA512 bdf4970113975221ff0e17866db18fd969ff9c8e1e851c8ad7572630814ab0c46b59df59433edcb2e7cc41cc8152afd35807f45e07f6d0fa87b21b5a77d0965a WHIRLPOOL 4698911bf53532b5149a71ab1a031fa836193476114ba26f0cde588c3095661f21492feb855e1eb3aa8f1c87ad8125bdc32b7cf56ac43f2de84073f3085f39eb
-DIST udisks-2.1.0.tar.bz2 823805 SHA256 310208e5a10335dae4b52a0125c24d31cf292cce3d15cf65da4cd308e38d15a8 SHA512 dffbceda998aee62f56819111db7c33fd65b8295d14885f28f8209be332ab319353116d51e2c006e434865ac515db04c7d8f5d2639ab9870247cf49136747811 WHIRLPOOL a891e1fed94b6c516a31b291ae4bfcfb8764df51f93781a6da4b1aa4051b7164ddb5ba7d28067dd4418c756af3056dddabc952f531c4d78c8ff60e7ce305835a
-DIST udisks-2.1.1.tar.bz2 837872 SHA256 013b09ff38aa256b89c01525771f4565cb088724d5c8c79b32e9f811e88086fb SHA512 d232bcf60365c8f5687af2c9f95752c6ed4be1aee218f0e3e509c4da5853714642a622298755516e1b9802a2a7acf04100300dee8d94953360d00f53897a4491 WHIRLPOOL 2eaf7a1adfe67a6af166fcb6cafbd5645a66d99c653afa4561ca8a90ce2a797632e8dbb6adc32ee4a6cee2a06c448cb41a91c1295953c21e44b1b53b74967da8
-DIST udisks-2.1.2.tar.bz2 899694 SHA256 afe928fe7f44086b835257efc3fcbe503e2da7c988a773c997d0291bbab4a637 SHA512 24c321627bcc8b5a3e4d048669b35d25ca92cb7f606819c8375fac3994106ce56766fd2a32eb55b6b6f4838e90dc841139faaea52f3cc2229a134963af27c934 WHIRLPOOL 670f4e9c64343a0ad86bf40389e732b39935e061d07c5d59ba6c8cecd47f47845c5f404eacb8e2bc03fd7bc5cabb2fc82cc5db3ac449ac8cc5345ef9166de46d
 DIST udisks-2.1.3.tar.bz2 909945 SHA256 5cc92fd651ee49a7888f90d091282b949afc629b31fdb34e187208750720632d SHA512 52f15ecdb700e91919ce0e2017aa1c185afaf86d936036a0a380b91b322c3d949263c09c16fe02fbe7385c0d0055ca3ddc5f6b69ed3ea87df3acc78413aef494 WHIRLPOOL f81f0a9b030ac25c9aa1c800ed20bd5bd8848da72420ef86567f459bf37ddc59bc09e169f9a58fd9d774c41ef312b7f6f83fef541666a578cea01870df4dbc8a
-EBUILD udisks-1.0.4-r5.ebuild 2715 SHA256 d82b4ac517948e430cbb08725a535bc97b8660b0d2863d2248beae65e0abd74d SHA512 a8ba438402d97ac3c0d6b4d5603f8497a1d73337d8145e69f5304cd78334dfeaa6c3288c62418c928b240b1a0fb4848804f19074bce86e90a4ffe3110a6aa36c WHIRLPOOL 3e561c66b51d36a4e846d0750848134f9503ab8e5e06713b4840fec76fb652fa70c3266740a940a72ddd5d207ca560fdf05645c197ecd7fa13e926caabbf59b5
 EBUILD udisks-1.0.5.ebuild 2645 SHA256 9cb33f2584ec96e410eb28d2a881a7d1f8e570efdc683bd571e5138701c6c34a SHA512 abd09bec85213d248d53d5c30e38520dba108c96729fef02a13e0ce24901a54a863dc6613ed576d960a91cb623109c971b709ed9ec206b84524dd00bc4de29d7 WHIRLPOOL be9becdfe1f7504fe16856fe0c6695cbf4129c882c0e4132599545888801139d89b50498ad56d34c76f4c3e35d19fe777f05133a2a97da0ed586daf3abb86b54
-EBUILD udisks-2.1.0.ebuild 3062 SHA256 da3a9f21a5fb82f64a373fe61b17577f9e3ca54310bf6d003d4f06f0455dc663 SHA512 d5099767669f006756f5875b751915b02b8db89df30e622da6ea2744427a0353e0f8c3fa039c9fe5aa85d1073a223ee0fa52ad0bf7b7c39a571d51c976583ea5 WHIRLPOOL c707e71eb042d16735ebbcd4717ab27c9997167275b4c575d3183bbe73b836496e3e4dec5876c024dacbf178af9654c115bbb9f45de7c329595e134321285bcc
-EBUILD udisks-2.1.1.ebuild 3035 SHA256 20522b95faf2d0d097ddfb45e724ce78396193cda99d2e4707927b21afee4c2d SHA512 353b02c5190e1d1b6c2759118f602d7337fb4e0d175246d3e12da565c3ca8784f27c9890347160285d234550ed621805647cf147e3f45b05a7d141760bf0efdf WHIRLPOOL 35b5de606e461dd7455c970e51229df1421f90b7b7679385ede426a759564d1b3648a3d05d14d1e72f5d1ae39de72bf76d1651fef5d56caf4563378a23cba6ed
-EBUILD udisks-2.1.2.ebuild 3025 SHA256 fcee86ead169c2f4dfb375ce4c96e5d8611012f103544135dc9fc116d9b8bead SHA512 9e0465b5d606af9bfee7330f754eac278d640e99ca7fff32c9cd233f70ab991d136274168e83c7c18513086fa2ab6864f459dedd819908af1be3a793a5ccdb8c WHIRLPOOL 0a0e2bd7ec32b8ae1c0fdcafc75a81a6a38cf41393047e2217b783588c47ca24b7958a9edbbfa354aa2df57333980ab6ed05823e0ca674638d085d31af92e18c
 EBUILD udisks-2.1.3.ebuild 3021 SHA256 39638477ddfd651fbf009eea73660e0b9ca057326b9fb89f95497fefea13d4ae SHA512 9f901d5a16848a1674dcc4583a0ccffff094d2602ef6d9b566076b17a3f5c03db1e7e31ac7b4567a94b315bc4c2ee82da8faaca4e300adcd75d9bab16f057443 WHIRLPOOL ea355f3b5fd84cb0b9d624a1b4327097efb3f24dd91f7adee9afcedc69e6a5191b70ba91041349dcebc7c0461a835047158a27c6ed876deae72e73ad1b9d2245
-MISC ChangeLog 23212 SHA256 9b1c3fec86a4ff991ae59c559c8b348865fdc0d7cf44403f4dc3a9a556dceeeb SHA512 5829b012969b9e56aa8dee77411bd8dfbb995083169cde24e98e133ce8b6f8b240104b1c0cb47df7ef23003fbd4f8853ec8f8f4d72227c98799c733d84fb9526 WHIRLPOOL a1330d5f490b5a056630957d314e6e8a06ab6e034e1d44b3311b950402adf9dcacbf15ad9de46e7575e62d083a882545b3e3c8c7dd8756033b9612c850f69e63
+MISC ChangeLog 23501 SHA256 6cf1c1899bff8889234a30b489ded1e6e608de0d65b57b3e25c4d8a9977e2fa8 SHA512 adc483d26f070e2c4b12a8a570269999dfbb79a1c99b485473569f503a7cd95891b483a06b30267cbc1e2676087fa93208031e2e555d2ce53efeab32f71e7341 WHIRLPOOL 678cc7b8b3eec74f9363c2bda1fe902a4ce8713f2bcb3051d5859d605d136af01d65440041b32580b064e77af055fc2412e35857814cd57e3a4568e6aa75716f
 MISC metadata.xml 735 SHA256 372e32cc56ba43aafbed3fd11af19e74b7b50ea70886d6f10440c7f8ae477c26 SHA512 f55fbe68bfb02178b310b5d455cb04527b255237771809457cea65ca0a8249415e59ff76d5bdac9f402cbb0707ea8cf4d711abb6fc874878ac2107ac070cdccb WHIRLPOOL aea1509c3f0a0d22b803d2382ebf382402c8573d9580abf0598283155b95ad8537a6c5735595db262f8036a73447e642226e26bcea0b826456f6cd396845e6f6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTMEJhAAoJELp701BxlEWfW6gP/361/xVQsHm1B/voIkUPasom
-qouFcFoYZfRPoP12Rt2o5Ov+bjcxrGlF/0zyTlZLpZQMY/9lYVR65nerDpPwjUox
-2cFhkl9xbQidWEpGCvBRf1CLLnv/0Ej/PB8XI2epe1HhkNfGC6b89hJiWlQlsVQe
-wavcFXatBhqKYDABmYxIeaZYSW6vnBwz/cdzalR7+spHFKv3NYiGANl0HtUCN6oj
-GCfP6s+SUVI86uOgQafXfkSh8tnz/456soQee2v5ePbVTu4ZPWpbvvTWq/GST+9W
-XDeumHJnQ9il9P+BU9/nnJrlzIqLJU0LO95tpWm3y80tIRvPHD/Kn38+rZVXjJO+
-DLLAOxe72oufLYMf85VBrAndCmsM+VLFd25JPsn5MKyJHN6UzbcUgVirk/UQ6vDs
-5m+FHFMJCKcLJ7lWvCZhNlwrsFYDo5kd2HdfIXNsex2tzT9rbdAZH2MmWB+5m7YK
-5KOXeUr1RYvMslSmt6ZMbcdy9o3V7Vr1S5AV8aF+Dav+HE9DLFzRxFNRfuxm3nn2
-N2+ikCpeGnZGQ8acfsTmYrHM1fKQTkyEItyvhFjNaJ2okm3okfDzVb6frWCtav3P
-77cV0F7ZHonvtZeJjbWwz47mLxbR2VimCQzLZaQWlCnoqjnk+66vEadXV+bfApV+
-GoBJmk6qf5lbWrkaASJX
-=aaQe
+iQEcBAEBCAAGBQJTMUkcAAoJEEdUh39IaPFNyU8H/0UIsUtsGQE8JyDEk5bzjVye
+3rhBpJhrHuGllh0l1jlBC+8jl+w9feI0G9Vo0XDQ3cGCi029GeVE1Vs2FgTYvMww
+OcMUhRgRSezifWHRqEqSaglW28ssExgM9exjQZqIXpZB2OJz1kniLFC+S+VHrDtX
+qUnlNUk19IVZESIkhHW75DhHIGU6W/ENiy7rPL3/I20hLNlWdjVtP+Gz0a5oe/A+
+7AQVNx03WEQU/4uwlq3c8TCyGI+LuNdGdVdarIbjMjelDIUYqUr1PlJu3cnN/5VH
+IMvQV4lC8SPnlFFI+ndpgsmJT876Wzb6zHpK2gqaYy5B1WBB6q+rAXY5Dsd6yl4=
+=K2HB
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udisks/files/udisks-1.0.4-drop-pci-db.patch b/sys-fs/udisks/files/udisks-1.0.4-drop-pci-db.patch
deleted file mode 100644
index 852835b0287e..000000000000
--- a/sys-fs/udisks/files/udisks-1.0.4-drop-pci-db.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit c73b5ab54378ec6d7df9948c46ce87f98587af9a
-Author: Tom Gundersen <teg@jklm.no>
-Date:   2 days ago
-
-    udev: remove redundant call to deprecated pci-db
-
-    The binary is no longer shipped with systemd/udev. The functionality
-    is taken over by a builtin, which is ran for all devices, rendering
-    this rule superfluous.
-
-    Cc: Jan de Groot <jgc@archlinux.org>
-    Signed-off-by: Tom Gundersen <teg@jklm.no>
-
-diff --git a/data/80-udisks.rules b/data/80-udisks.rules
-index d1c8c5d..4bf2b37 100644
---- a/data/80-udisks.rules
-+++ b/data/80-udisks.rules
-@@ -1,10 +1,6 @@
- # Do not edit this file, it will be overwritten on updates
- #
-
--# import names for PCI storage controllers
--#
--SUBSYSTEM=="pci", ACTION=="add|change", ENV{ID_MODEL_FROM_DATABASE}=="", ATTR{class}=="0x01*", IMPORT{program}="pci-db %p"
--
- # Set eSATA port type for known eSATA CardBus adapters - first we want to ensure
- # the device is on a cardbus controller (upper PCI device) - then we check
- # vid/pid (lower PCI device)
diff --git a/sys-fs/udisks/files/udisks-1.0.4-kernel-2.6.36-compat.patch b/sys-fs/udisks/files/udisks-1.0.4-kernel-2.6.36-compat.patch
deleted file mode 100644
index fef15ea20852..000000000000
--- a/sys-fs/udisks/files/udisks-1.0.4-kernel-2.6.36-compat.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From bf5c28a8dd4eedae51db27fa7b9f84dec425f8bd Mon Sep 17 00:00:00 2001
-From: Edward Sheldrake <ejsheldrake@gmail.com>
-Date: Sun, 04 Sep 2011 18:42:17 +0000
-Subject: Fix power/level deprecation kernel warning
-
-If present, use power/control instead.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=32056
-
-Signed-off-by: David Zeuthen <zeuthen@gmail.com>
----
-diff --git a/src/helpers/job-drive-detach.c b/src/helpers/job-drive-detach.c
-index fc88043..eeafcab 100644
---- a/src/helpers/job-drive-detach.c
-+++ b/src/helpers/job-drive-detach.c
-@@ -235,7 +235,12 @@ main (int argc,
-   if (endp != NULL && num_interfaces == 1)
-     {
-       g_printerr ("Suspending USB device: ");
--      if (!sysfs_write (udev_device_get_syspath (udevice_usb_device), "power/level", "auto") ||
-+      if (sysfs_exists (udev_device_get_syspath (udevice_usb_device), "power/control"))
-+        power_level_path = "power/control";
-+      else
-+        power_level_path = "power/level";
-+      
-+      if (!sysfs_write (udev_device_get_syspath (udevice_usb_device), power_level_path, "auto") ||
-           !sysfs_write (udev_device_get_syspath (udevice_usb_device), "power/autosuspend", "0"))
-         goto out;
-       g_printerr ("OK\n");
-@@ -259,7 +264,6 @@ main (int argc,
-  out:
-   g_free (usb_interface_name);
-   g_free (unbind_path);
--  g_free (power_level_path);
-   if (sg_fd > 0)
-     sg_cmds_close_device (sg_fd);
-   if (udevice != NULL)
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sys-fs/udisks/files/udisks-2.1.0-ieee1394.patch b/sys-fs/udisks/files/udisks-2.1.0-ieee1394.patch
deleted file mode 100644
index 9df3ad41c09a..000000000000
--- a/sys-fs/udisks/files/udisks-2.1.0-ieee1394.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b841e30a98459816dfc49a735d3db4355a88edcd Mon Sep 17 00:00:00 2001
-From: David Zeuthen <zeuthen@gmail.com>
-Date: Tue, 19 Mar 2013 04:31:40 +0000
-Subject: Properly identify firewire devices as non-system devices
-
-This was reported in bug 62077.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=62077
-
-Signed-off-by: David Zeuthen <zeuthen@gmail.com>
----
-diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c
-index a1781cf..d619850 100644
---- a/src/udiskslinuxblock.c
-+++ b/src/udiskslinuxblock.c
-@@ -354,7 +354,7 @@ update_hints (UDisksLinuxBlock  *block,
-       connection_bus = udisks_drive_get_connection_bus (drive);
-       removable = udisks_drive_get_media_removable (drive);
-       if (removable ||
--          (g_strcmp0 (connection_bus, "usb") == 0 || g_strcmp0 (connection_bus, "firewire") == 0) ||
-+          (g_strcmp0 (connection_bus, "usb") == 0 || g_strcmp0 (connection_bus, "ieee1394") == 0) ||
-           (g_str_has_prefix (device_file, "/dev/mmcblk") || g_str_has_prefix (device_file, "/dev/mspblk")))
-         {
-           hint_system = FALSE;
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sys-fs/udisks/udisks-1.0.4-r5.ebuild b/sys-fs/udisks/udisks-1.0.4-r5.ebuild
deleted file mode 100644
index 134b76e97f84..000000000000
--- a/sys-fs/udisks/udisks-1.0.4-r5.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.4-r5.ebuild,v 1.13 2014/02/02 16:35:32 ssuominen Exp $
-
-EAPI=5
-inherit eutils bash-completion-r1 linux-info udev
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"
-SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="debug nls remote-access selinux"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.30
-	>=dev-libs/libatasmart-0.19
-	>=sys-auth/polkit-0.110
-	>=sys-apps/dbus-1.6
-	>=sys-apps/sg3_utils-1.27.20090411
-	>=sys-block/parted-3
-	>=sys-fs/lvm2-2.02.66
-	>=virtual/udev-208[gudev]
-	selinux? ( sec-policy/selinux-devicekit )"
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20.1-r2
-	virtual/eject
-	remote-access? ( net-dns/avahi )"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	# Listing only major arch's here to avoid tracking kernel's defconfig
-	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
-		CONFIG_CHECK="~!IDE" #319829
-		CONFIG_CHECK+=" ~NLS_UTF8" #425562
-		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.0.2-ntfs-3g.patch \
-		"${FILESDIR}"/${P}-kernel-2.6.36-compat.patch \
-		"${FILESDIR}"/${P}-drop-pci-db.patch \
-		"${FILESDIR}"/${P}-revert-floppy.patch
-
-	sed -i -e "s:/lib/udev:$(udev_get_udevdir):" data/80-udisks.rules || die
-}
-
-src_configure() {
-	# device-mapper -> lvm2 -> mandatory depend -> force enabled
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		$(use_enable debug verbose-mode) \
-		--enable-man-pages \
-		--disable-gtk-doc \
-		--enable-lvm2 \
-		--enable-dmmp \
-		$(use_enable remote-access) \
-		$(use_enable nls) \
-		--with-html-dir="${EPREFIX}"/deprecated
-}
-
-src_test() {
-	ewarn "Skipping testsuite because sys-fs/udisks:0 is deprecated"
-	ewarn "in favour of sys-fs/udisks:2."
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		slashsbindir=/usr/sbin \
-		slashlibdir=/usr/lib \
-		udevhelperdir="$(udev_get_udevdir)" \
-		udevrulesdir="$(udev_get_udevdir)"/rules.d \
-		install #398081
-
-	dodoc AUTHORS HACKING NEWS README
-
-	rm -f "${ED}"/etc/profile.d/udisks-bash-completion.sh
-	newbashcomp tools/udisks-bash-completion.sh ${PN}
-
-	prune_libtool_files --all
-
-	keepdir /media
-	keepdir /var/lib/udisks #383091
-
-	rm -rf "${ED}"/deprecated
-}
diff --git a/sys-fs/udisks/udisks-2.1.0.ebuild b/sys-fs/udisks/udisks-2.1.0.ebuild
deleted file mode 100644
index 78fe6dbcb5bc..000000000000
--- a/sys-fs/udisks/udisks-2.1.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-2.1.0.ebuild,v 1.16 2014/02/02 16:35:32 ssuominen Exp $
-
-EAPI=5
-inherit bash-completion-r1 eutils linux-info systemd udev
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"
-SRC_URI="http://udisks.freedesktop.org/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="debug cryptsetup +gptfdisk +introspection selinux systemd"
-
-UDEV_VERSION="208"
-COMMON_DEPEND=">=dev-libs/glib-2.32
-	>=dev-libs/libatasmart-0.19
-	>=sys-auth/polkit-0.110
-	virtual/acl
-	>=virtual/udev-${UDEV_VERSION}[gudev]
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )
-	selinux? ( sec-policy/selinux-devicekit )
-	systemd? ( >=sys-apps/systemd-${UDEV_VERSION} )"
-# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1)
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20.1-r2
-	>=sys-block/parted-3
-	virtual/eject
-	cryptsetup? (
-		sys-fs/cryptsetup[udev(+)]
-		sys-fs/lvm2[udev(+)]
-		)
-	gptfdisk? ( >=sys-apps/gptfdisk-0.8 )"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.32
-	dev-util/intltool
-	>=sys-kernel/linux-headers-3.1
-	virtual/pkgconfig"
-
-QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd"
-
-DOCS="AUTHORS HACKING NEWS README"
-
-pkg_setup() {
-	# Listing only major arch's here to avoid tracking kernel's defconfig
-	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
-		CONFIG_CHECK="~!IDE" #319829
-		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
-		CONFIG_CHECK+=" ~SWAP" # http://forums.gentoo.org/viewtopic-t-923640.html
-		CONFIG_CHECK+=" ~NLS_UTF8" #425562
-		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-ieee1394.patch \
-		"${FILESDIR}"/${P}-W_define.patch
-	use systemd || { sed -i -e 's:libsystemd-login:&disable:' configure || die; }
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		$(use_enable debug) \
-		--disable-gtk-doc \
-		$(use_enable introspection) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-udevdir="$(get_udevdir)" \
-		"$(systemd_with_unitdir)"
-}
-
-src_install() {
-	default
-	prune_libtool_files
-	keepdir /var/lib/udisks2 #383091
-
-	rm -rf "${ED}"/usr/share/bash-completion
-	dobashcomp data/completions/udisksctl
-
-	local htmldir=udisks2
-	if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-		dosym /usr/share/doc/${PF}/html/${htmldir} /usr/share/gtk-doc/html/${htmldir}
-	fi
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"/run #415987
-
-	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
-	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
-		echo
-		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
-	fi
-}
diff --git a/sys-fs/udisks/udisks-2.1.1.ebuild b/sys-fs/udisks/udisks-2.1.1.ebuild
deleted file mode 100644
index 65a0030c557f..000000000000
--- a/sys-fs/udisks/udisks-2.1.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-2.1.1.ebuild,v 1.2 2014/02/02 16:35:32 ssuominen Exp $
-
-EAPI=5
-inherit bash-completion-r1 eutils linux-info systemd udev
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"
-SRC_URI="http://udisks.freedesktop.org/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="debug cryptsetup +gptfdisk +introspection selinux systemd"
-
-UDEV_VERSION="208"
-COMMON_DEPEND=">=dev-libs/glib-2.32
-	>=dev-libs/libatasmart-0.19
-	>=sys-auth/polkit-0.110
-	virtual/acl
-	>=virtual/udev-${UDEV_VERSION}[gudev]
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )
-	selinux? ( sec-policy/selinux-devicekit )
-	systemd? ( >=sys-apps/systemd-${UDEV_VERSION} )"
-# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1)
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20.1-r2
-	>=sys-block/parted-3
-	virtual/eject
-	cryptsetup? (
-		sys-fs/cryptsetup[udev(+)]
-		sys-fs/lvm2[udev(+)]
-		)
-	gptfdisk? ( >=sys-apps/gptfdisk-0.8 )"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.32
-	dev-util/intltool
-	>=sys-kernel/linux-headers-3.1
-	virtual/pkgconfig"
-
-QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd"
-
-DOCS="AUTHORS HACKING NEWS README"
-
-pkg_setup() {
-	# Listing only major arch's here to avoid tracking kernel's defconfig
-	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
-		CONFIG_CHECK="~!IDE" #319829
-		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
-		CONFIG_CHECK+=" ~SWAP" # http://forums.gentoo.org/viewtopic-t-923640.html
-		CONFIG_CHECK+=" ~NLS_UTF8" #425562
-		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.0-W_define.patch
-	use systemd || { sed -i -e 's:libsystemd-login:&disable:' configure || die; }
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		$(use_enable debug) \
-		--disable-gtk-doc \
-		$(use_enable introspection) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-udevdir="$(get_udevdir)" \
-		"$(systemd_with_unitdir)"
-}
-
-src_install() {
-	default
-	prune_libtool_files
-	keepdir /var/lib/udisks2 #383091
-
-	rm -rf "${ED}"/usr/share/bash-completion
-	dobashcomp data/completions/udisksctl
-
-	local htmldir=udisks2
-	if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-		dosym /usr/share/doc/${PF}/html/${htmldir} /usr/share/gtk-doc/html/${htmldir}
-	fi
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"/run #415987
-
-	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
-	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
-		echo
-		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
-	fi
-}
diff --git a/sys-fs/udisks/udisks-2.1.2.ebuild b/sys-fs/udisks/udisks-2.1.2.ebuild
deleted file mode 100644
index ef1c74719c1b..000000000000
--- a/sys-fs/udisks/udisks-2.1.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-2.1.2.ebuild,v 1.5 2014/02/23 08:48:50 ago Exp $
-
-EAPI=5
-inherit bash-completion-r1 eutils linux-info systemd udev
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"
-SRC_URI="http://udisks.freedesktop.org/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86"
-IUSE="debug cryptsetup +gptfdisk +introspection selinux systemd"
-
-UDEV_VERSION="208"
-COMMON_DEPEND=">=dev-libs/glib-2.32
-	>=dev-libs/libatasmart-0.19
-	>=sys-auth/polkit-0.110
-	virtual/acl
-	>=virtual/udev-${UDEV_VERSION}[gudev]
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )
-	selinux? ( sec-policy/selinux-devicekit )
-	systemd? ( >=sys-apps/systemd-${UDEV_VERSION} )"
-# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1)
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20.1-r2
-	>=sys-block/parted-3
-	virtual/eject
-	cryptsetup? (
-		sys-fs/cryptsetup[udev(+)]
-		sys-fs/lvm2[udev(+)]
-		)
-	gptfdisk? ( >=sys-apps/gptfdisk-0.8 )"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.32
-	dev-util/intltool
-	>=sys-kernel/linux-headers-3.1
-	virtual/pkgconfig"
-
-QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd"
-
-DOCS="AUTHORS HACKING NEWS README"
-
-pkg_setup() {
-	# Listing only major arch's here to avoid tracking kernel's defconfig
-	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
-		CONFIG_CHECK="~!IDE" #319829
-		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
-		CONFIG_CHECK+=" ~SWAP" # http://forums.gentoo.org/viewtopic-t-923640.html
-		CONFIG_CHECK+=" ~NLS_UTF8" #425562
-		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.0-W_define.patch
-	use systemd || { sed -i -e 's:libsystemd-login:&disable:' configure || die; }
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		$(use_enable debug) \
-		--disable-gtk-doc \
-		$(use_enable introspection) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-udevdir="$(get_udevdir)" \
-		"$(systemd_with_unitdir)"
-}
-
-src_install() {
-	default
-	prune_libtool_files
-	keepdir /var/lib/udisks2 #383091
-
-	rm -rf "${ED}"/usr/share/bash-completion
-	dobashcomp data/completions/udisksctl
-
-	local htmldir=udisks2
-	if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-		dosym /usr/share/doc/${PF}/html/${htmldir} /usr/share/gtk-doc/html/${htmldir}
-	fi
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"/run #415987
-
-	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
-	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
-		echo
-		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
-	fi
-}