From f5ba741048051d0bbb2d60587a94ea1cf050c520 Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Thu, 26 Mar 2020 23:56:44 +0100 Subject: sys-fs/udisks: drop old --- sys-fs/udisks/Manifest | 1 - sys-fs/udisks/files/udisks-1.0.2-ntfs-3g.patch | 12 --- .../udisks/files/udisks-1.0.4-revert-floppy.patch | 18 ---- .../udisks/files/udisks-1.0.5-stat-includes.patch | 25 ----- sys-fs/udisks/files/udisks-1.0.5-sysmacros.patch | 72 -------------- sys-fs/udisks/metadata.xml | 1 - sys-fs/udisks/udisks-1.0.5-r3.ebuild | 108 --------------------- 7 files changed, 237 deletions(-) delete mode 100644 sys-fs/udisks/files/udisks-1.0.2-ntfs-3g.patch delete mode 100644 sys-fs/udisks/files/udisks-1.0.4-revert-floppy.patch delete mode 100644 sys-fs/udisks/files/udisks-1.0.5-stat-includes.patch delete mode 100644 sys-fs/udisks/files/udisks-1.0.5-sysmacros.patch delete mode 100644 sys-fs/udisks/udisks-1.0.5-r3.ebuild diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest index 19e0dcde3574..77b360881412 100644 --- a/sys-fs/udisks/Manifest +++ b/sys-fs/udisks/Manifest @@ -1,2 +1 @@ -DIST udisks-1.0.5.tar.gz 736221 BLAKE2B 9a709c5d4fcd390d9a52ac764d0e3c678983a14644f79cfcf92dd4ea7ddecbac90aa046b890b7bdd1ad701f1106d5956d72dab1fbb030606319b4bcc4c297bdd SHA512 bdf4970113975221ff0e17866db18fd969ff9c8e1e851c8ad7572630814ab0c46b59df59433edcb2e7cc41cc8152afd35807f45e07f6d0fa87b21b5a77d0965a DIST udisks-2.8.4.tar.bz2 1619051 BLAKE2B 4fdf3d5ea8ae02eb74efd552afee2dbe94137767c343034dd68f1553b224871a51bb2382eda00de90d45bad18b4088b4812e1f3fbb004cd29e753e92afb34e05 SHA512 70860e5ca9ac73d442ca67f0e0429ce2f33575d8f64945fbf06d1694b080c8b6fed8d65b2485eff0ab66eab59cdebeb9309424820a2ee82c5faaa38029e15e6c diff --git a/sys-fs/udisks/files/udisks-1.0.2-ntfs-3g.patch b/sys-fs/udisks/files/udisks-1.0.2-ntfs-3g.patch deleted file mode 100644 index b6ba4a4849a8..000000000000 --- a/sys-fs/udisks/files/udisks-1.0.2-ntfs-3g.patch +++ /dev/null @@ -1,12 +0,0 @@ -Support ntfs-3g by default without entry in /etc/filesystems for write access. - ---- src/device.c -+++ src/device.c -@@ -5909,6 +5909,7 @@ - "vfat", - "exfat", - "ntfs", -+ "ntfs-3g", - NULL, - }; - \ No newline at end of file diff --git a/sys-fs/udisks/files/udisks-1.0.4-revert-floppy.patch b/sys-fs/udisks/files/udisks-1.0.4-revert-floppy.patch deleted file mode 100644 index 0f13a6aba833..000000000000 --- a/sys-fs/udisks/files/udisks-1.0.4-revert-floppy.patch +++ /dev/null @@ -1,18 +0,0 @@ -This change was done upstream to prevent UDisks1 from polling for floppy drive so often but broke -mounting floppies while at it. - -http://bugs.freedesktop.org/show_bug.cgi?id=30283 -http://bugs.gentoo.org/show_bug.cgi?id=338185 - ---- src/device.c -+++ src/device.c -@@ -4485,7 +4485,8 @@ update_info (Device *device) - } - else - { -- if (g_udev_device_get_property_as_boolean (device->priv->d, "ID_CDROM_MEDIA")) -+ if (g_udev_device_get_property_as_boolean (device->priv->d, "ID_CDROM_MEDIA") || -+ g_udev_device_get_property_as_boolean (device->priv->d, "ID_DRIVE_FLOPPY")) - { - media_available = TRUE; - } diff --git a/sys-fs/udisks/files/udisks-1.0.5-stat-includes.patch b/sys-fs/udisks/files/udisks-1.0.5-stat-includes.patch deleted file mode 100644 index 85ef5208049d..000000000000 --- a/sys-fs/udisks/files/udisks-1.0.5-stat-includes.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0aa652a7b257f98f9e8e7dc7b0ddc9bc62377d09 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Fri, 29 May 2015 21:09:39 -0400 -Subject: [PATCH] Bug 90778 - fix build with newer glibc versions - -https://bugs.freedesktop.org/show_bug.cgi?id=90778 ---- - src/helpers/job-drive-detach.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/helpers/job-drive-detach.c b/src/helpers/job-drive-detach.c -index eeafcab..d122a1f 100644 ---- a/src/helpers/job-drive-detach.c -+++ b/src/helpers/job-drive-detach.c -@@ -18,6 +18,7 @@ - * - */ - -+#include - #include - #include - #include --- -2.4.2 - diff --git a/sys-fs/udisks/files/udisks-1.0.5-sysmacros.patch b/sys-fs/udisks/files/udisks-1.0.5-sysmacros.patch deleted file mode 100644 index 96ce943d385c..000000000000 --- a/sys-fs/udisks/files/udisks-1.0.5-sysmacros.patch +++ /dev/null @@ -1,72 +0,0 @@ -https://bugs.gentoo.org/580230 -https://bugs.freedesktop.org/95028 - -From 245093a15abe985b1746603c00084cb972fb71ae Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Tue, 19 Apr 2016 23:04:32 -0400 -Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev - -Linux C libraries are moving away from implicit includes of -sys/sysmacros.h, so pull in this header directly in the files -that use these funcs. - ---- a/src/daemon.c -+++ b/src/daemon.c -@@ -38,6 +38,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/src/device.c -+++ b/src/device.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/src/mount-monitor.c -+++ b/src/mount-monitor.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/src/probers/part-id.c -+++ b/src/probers/part-id.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/tools/udisks.c -+++ b/tools/udisks.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/tools/umount-udisks.c -+++ b/tools/umount-udisks.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/sys-fs/udisks/metadata.xml b/sys-fs/udisks/metadata.xml index a62a8bcadb90..b4357b2df5b0 100644 --- a/sys-fs/udisks/metadata.xml +++ b/sys-fs/udisks/metadata.xml @@ -7,7 +7,6 @@ Use sys-auth/elogind for session tracking Add support for Logical Volume Management via sys-fs/lvm2. - Control whether connections from other clients over LAN are allowed Support sys-apps/systemd's logind Enable Virtual Data Optimizer support. diff --git a/sys-fs/udisks/udisks-1.0.5-r3.ebuild b/sys-fs/udisks/udisks-1.0.5-r3.ebuild deleted file mode 100644 index f4a4725a5912..000000000000 --- a/sys-fs/udisks/udisks-1.0.5-r3.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils bash-completion-r1 linux-info ltprune udev systemd - -DESCRIPTION="Daemon providing interfaces to work with storage devices" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks" -SRC_URI="https://hal.freedesktop.org/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86" -IUSE="debug +lvm nls remote-access selinux" - -COMMON_DEPEND=">=dev-libs/dbus-glib-0.100 - >=dev-libs/glib-2.30 - >=dev-libs/libatasmart-0.19 - dev-libs/libgudev:= - >=sys-auth/polkit-0.110 - >=sys-apps/dbus-1.6 - >=sys-apps/sg3_utils-1.27.20090411 - >=sys-block/parted-3 - lvm? ( - >=sys-fs/lvm2-2.02.66 - 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" - -QA_MULTILIB_PATHS="usr/lib/${PN}/.*" - -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}"/${PN}-1.0.4-revert-floppy.patch \ - "${FILESDIR}"/${PN}-1.0.5-stat-includes.patch \ - "${FILESDIR}"/${PN}-1.0.5-sysmacros.patch - - sed -i -e "s:/lib/udev:$(get_udevdir):" data/80-udisks.rules || die - - epatch_user -} - -src_configure() { - # device-mapper -> lvm2 -> mandatory depend -> force enabled - econf \ - --libexecdir=/usr/lib/${PN} \ - --localstatedir="${EPREFIX}"/var \ - --disable-static \ - $(use_enable debug verbose-mode) \ - --enable-man-pages \ - --disable-gtk-doc \ - $(use_enable lvm lvm2) \ - --enable-dmmp \ - $(use_enable remote-access) \ - $(use_enable nls) \ - --with-html-dir="${EPREFIX}"/deprecated \ - "$(systemd_with_unitdir)" -} - -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="$(get_udevdir)" \ - udevrulesdir="$(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 -} -- cgit v1.2.3-65-gdbad