aboutsummaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorDave Hughes <davidhughes205@gmail.com>2021-03-13 00:41:59 -0500
committerSam James <sam@gentoo.org>2021-03-13 21:02:39 +0000
commitbc0bd6455a92ddeccae22473d69c2def585b880c (patch)
treec99fedc421264af8a73ea10dd6bf27d72a296edf /sys-fs
parentsys-apps/lshw: fix manifest (diff)
downloadmusl-bc0bd6455a92ddeccae22473d69c2def585b880c.tar.gz
musl-bc0bd6455a92ddeccae22473d69c2def585b880c.tar.bz2
musl-bc0bd6455a92ddeccae22473d69c2def585b880c.zip
sys-fs/udisks: remove from overlay
Package-Manager: Portage-3.0.17, Repoman-3.0.2 RepoMan-Options: --force Manifest-Sign-Key: 0xA1919C830E9498E0 Signed-off-by: Dave Hughes <davidhughes205@gmail.com> Closes: https://github.com/gentoo/musl/pull/399 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/udisks/Manifest1
-rw-r--r--sys-fs/udisks/files/udisks-musl-nonglibc.patch26
-rw-r--r--sys-fs/udisks/metadata.xml14
-rw-r--r--sys-fs/udisks/udisks-2.7.4-r1.ebuild129
4 files changed, 0 insertions, 170 deletions
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
deleted file mode 100644
index 769a62f..0000000
--- a/sys-fs/udisks/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST udisks-2.7.4.tar.gz 1286465 BLAKE2B 8c52199215bc4ee3840ded2ccf9e3d61bc99bf0f505abb55a5ce18aa2676a60f788bc235e0f6be308c8bb50ec653a559010970e827d3bb4c1212afea291e7a8d SHA512 d0ad6c6d44f53414de3da68e0cdff1be0e9e6e03f900d5fdb4912560db36af52be32a2615d3d2efeaf134d4721a4a0c3e03515fd670f42e96f42ded08c3bf849
diff --git a/sys-fs/udisks/files/udisks-musl-nonglibc.patch b/sys-fs/udisks/files/udisks-musl-nonglibc.patch
deleted file mode 100644
index 98e6c75..0000000
--- a/sys-fs/udisks/files/udisks-musl-nonglibc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-musl does not define __GNUC_PREREQ therefore check for C library being glibc
-if not then define the macro
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Index: udisks-2.1.7/udisks/udisksclient.c
-===================================================================
---- udisks-2.1.7.orig/udisks/udisksclient.c
-+++ udisks-2.1.7/udisks/udisksclient.c
-@@ -27,8 +27,15 @@
- #include "udisksobjectinfo.h"
-
- /* For __GNUC_PREREQ usage below */
--#ifdef __GNUC__
-+#ifdef __GLIBC__
- # include <features.h>
-+#else
-+#if defined(__GNUC__)
-+#define __GNUC_PREREQ(__maj, __min) \
-+ (__GNUC__ > (__maj) || __GNUC__ == (__maj) && __GNUC_MINOR__ >= (__min))
-+#else
-+#define __GNUC_PREREQ(__maj, __min) 0
-+#endif
- #endif
-
- /**
diff --git a/sys-fs/udisks/metadata.xml b/sys-fs/udisks/metadata.xml
deleted file mode 100644
index fcc5962..0000000
--- a/sys-fs/udisks/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>freedesktop-bugs@gentoo.org</email>
- </maintainer>
- <use>
- <flag name="cryptsetup">Enable <pkg>sys-fs/cryptsetup</pkg> support</flag>
- <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag>
- <flag name="gptfdisk">Pull in <pkg>sys-apps/gptfdisk</pkg> for sgdisk command as used by partitioning functionality</flag>
- <flag name="lvm">Add support for Logical Volume Management via <pkg>sys-fs/lvm2</pkg>.</flag>
- <flag name="systemd">Support <pkg>sys-apps/systemd</pkg>'s logind</flag>
- </use>
-</pkgmetadata>
diff --git a/sys-fs/udisks/udisks-2.7.4-r1.ebuild b/sys-fs/udisks/udisks-2.7.4-r1.ebuild
deleted file mode 100644
index 6173ff5..0000000
--- a/sys-fs/udisks/udisks-2.7.4-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools bash-completion-r1 eutils linux-info systemd udev xdg-utils
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
-SRC_URI="https://github.com/storaged-project/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
-IUSE="acl cryptsetup debug elogind +gptfdisk +introspection lvm nls selinux systemd"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.36:2
- >=dev-libs/libatasmart-0.19
- >=sys-auth/polkit-0.110
- >=sys-libs/libblockdev-2.14[cryptsetup,lvm?]
- >=virtual/libgudev-165:=
- virtual/udev
- acl? ( virtual/acl )
- elogind? ( >=sys-auth/elogind-219 )
- introspection? ( >=dev-libs/gobject-introspection-1.30:= )
- lvm? ( sys-fs/lvm2 )
- systemd? ( >=sys-apps/systemd-209 )
-"
-# 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 )
- selinux? ( sec-policy/selinux-devicekit )
-"
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- >=dev-util/gdbus-codegen-2.32
- >=dev-util/gtk-doc-1.3
- gnome-base/gnome-common:3
- sys-devel/autoconf-archive
- >=sys-kernel/linux-headers-3.1
- virtual/pkgconfig
- nls? ( dev-util/intltool )
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-DOCS=( AUTHORS HACKING NEWS README.md )
-
-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+=" ~NLS_UTF8" #425562
- kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- xdg_environment_reset
-
- epatch "${FILESDIR}"/${PN}-musl-nonglibc.patch
-
- default
-
- eautoreconf
-
- if ! use systemd ; then
- sed -i -e 's:libsystemd-login:&disable:' configure || die
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- --enable-btrfs
- --disable-gtk-doc
- --disable-static
- --localstatedir="${EPREFIX%/}"/var
- --with-html-dir="${EPREFIX%/}"/usr/share/gtk-doc/html
- --with-modprobedir="${EPREFIX%/}"/lib/modprobe.d
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- --with-udevdir="$(get_udevdir)"
- $(use_enable acl)
- $(use_enable debug)
- $(use_enable introspection)
- $(use_enable lvm lvm2)
- $(use_enable lvm lvmcache)
- $(use_enable nls)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- prune_libtool_files
- keepdir /var/lib/udisks2 #383091
-
- rm -rf "${ED%/}"/usr/share/bash-completion
- dobashcomp data/completions/udisksctl
-}
-
-pkg_preinst() {
- # Remove gtk-doc symlink, #597628
- if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then
- rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die
- 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
-}