diff options
| -rw-r--r-- | sys-fs/udisks/Manifest | 2 | ||||
| -rw-r--r-- | sys-fs/udisks/files/udisks-2.1.6-musl-fixup.patch | 42 | ||||
| -rw-r--r-- | sys-fs/udisks/files/udisks-2.1.6-musl-fixup1.patch | 11 | ||||
| -rw-r--r-- | sys-fs/udisks/udisks-2.7.4.ebuild (renamed from sys-fs/udisks/udisks-2.1.6.ebuild) | 82 |
4 files changed, 53 insertions, 84 deletions
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest index b806a13e..83c86f66 100644 --- a/sys-fs/udisks/Manifest +++ b/sys-fs/udisks/Manifest @@ -1 +1 @@ -DIST udisks-2.1.6.tar.bz2 908987 SHA256 dec5f5c85fa0f74f39336acbfba1770f9988c096be23873714543c304b09f46a SHA512 33badcf87986504cf13926f23f1ac0386d732920918871e5bdbcbd704bfcee17d9d3c5002bbdd497bf88a47f844595ad06fc2049bc805099c052943ba3750770 WHIRLPOOL 798cfae910b4cc85ebbd0b60aa987fda6bc6009fb37bba8ad3644bca497f1bb5dde04d574aab97f323dd4c4ae8dcbbc3de9fa09cbdbee45ff19a0b1fbf22b797 +DIST udisks-2.7.4.tar.gz 1286465 SHA256 2ca70f67cdfb4bd5b630972f72fd29eb35eb1b644e161132488446776a1d70fc SHA512 d0ad6c6d44f53414de3da68e0cdff1be0e9e6e03f900d5fdb4912560db36af52be32a2615d3d2efeaf134d4721a4a0c3e03515fd670f42e96f42ded08c3bf849 WHIRLPOOL dd99c4287e8b0a3276573da092d8826d32c13ca6b99a6945ed731ca6443b0f74e21f4876ef84c89c7a665d9e1f96fb67c2455b46def60b905fd0cebf95821f93 diff --git a/sys-fs/udisks/files/udisks-2.1.6-musl-fixup.patch b/sys-fs/udisks/files/udisks-2.1.6-musl-fixup.patch deleted file mode 100644 index 6e2277b4..00000000 --- a/sys-fs/udisks/files/udisks-2.1.6-musl-fixup.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 725384004aef55e6f7cfb132ae07afc1a14b429d Mon Sep 17 00:00:00 2001 -From: Kylie McClain <somasis@exherbo.org> -Date: Wed, 25 Nov 2015 21:43:03 -0500 -Subject: [PATCH] Fix building on musl-libc - -Original patches are from https://github.com/voidlinux/void-packages/tree/master/srcpkgs/udisks2/patches ---- - src/udiskslinuxfilesystem.c | 1 + - tools/udisksctl.c | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/udiskslinuxfilesystem.c b/src/udiskslinuxfilesystem.c -index 4db3745..971c5e1 100644 ---- a/src/udiskslinuxfilesystem.c -+++ b/src/udiskslinuxfilesystem.c -@@ -31,6 +31,7 @@ - #include <mntent.h> - #include <sys/types.h> - #include <sys/acl.h> -+#include <sys/wait.h> - #include <errno.h> - - #include <glib/gstdio.h> -diff --git a/tools/udisksctl.c b/tools/udisksctl.c -index 2456a96..3e85e15 100644 ---- a/tools/udisksctl.c -+++ b/tools/udisksctl.c -@@ -229,8 +229,8 @@ _color_run_pager (void) - } - else - { -- fclose (stdout); -- stdout = _color_pager_out; -+ fflush (stdout); -+ dup2 (fileno(_color_pager_out), fileno(stdout)); - } - - out: --- -2.6.3 - - diff --git a/sys-fs/udisks/files/udisks-2.1.6-musl-fixup1.patch b/sys-fs/udisks/files/udisks-2.1.6-musl-fixup1.patch deleted file mode 100644 index fa3507fb..00000000 --- a/sys-fs/udisks/files/udisks-2.1.6-musl-fixup1.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/udiskslinuxblock.c -+++ b/src/udiskslinuxblock.c -@@ -24,6 +24,7 @@ - #include <sys/types.h> - #include <sys/mount.h> - #include <sys/stat.h> -+#define __USE_GNU - #include <fcntl.h> - #include <pwd.h> - #include <grp.h> - diff --git a/sys-fs/udisks/udisks-2.1.6.ebuild b/sys-fs/udisks/udisks-2.7.4.ebuild index d92a3eef..5eee78f6 100644 --- a/sys-fs/udisks/udisks-2.1.6.ebuild +++ b/sys-fs/udisks/udisks-2.7.4.ebuild @@ -1,26 +1,31 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit bash-completion-r1 eutils linux-info systemd udev +EAPI=6 +inherit autotools bash-completion-r1 eutils linux-info systemd udev xdg-utils 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" +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 ~mips ppc x86" -IUSE="debug cryptsetup +gptfdisk +introspection selinux systemd" +KEYWORDS="~amd64 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 - virtual/acl + >=sys-libs/libblockdev-2.14[crypt,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) @@ -32,7 +37,7 @@ RDEPEND="${COMMON_DEPEND} cryptsetup? ( sys-fs/cryptsetup[udev(+)] sys-fs/lvm2[udev(+)] - ) + ) gptfdisk? ( >=sys-apps/gptfdisk-0.8 ) selinux? ( sec-policy/selinux-devicekit ) " @@ -40,15 +45,19 @@ DEPEND="${COMMON_DEPEND} app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/gdbus-codegen-2.32 - >=dev-util/gtk-doc-am-1.3 - dev-util/intltool + >=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}" + QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd" -DOCS="AUTHORS HACKING NEWS README" +DOCS=( AUTHORS HACKING NEWS README.md ) pkg_setup() { # Listing only major arch's here to avoid tracking kernel's defconfig @@ -63,26 +72,37 @@ pkg_setup() { } src_prepare() { - use systemd || { sed -i -e 's:libsystemd-login:&disable:' configure || die; } + xdg_environment_reset - epatch "${FILESDIR}"/${PN}-2.1.6-musl-fixup.patch - epatch "${FILESDIR}"/${PN}-2.1.6-musl-fixup1.patch epatch "${FILESDIR}"/${PN}-musl-nonglibc.patch - epatch_user + default + + eautoreconf + + if ! use systemd ; then + sed -i -e 's:libsystemd-login:&disable:' configure || die + fi } 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)" \ - --enable-compile-warnings=minimum \ - "$(systemd_with_unitdir)" + 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() { @@ -90,12 +110,14 @@ src_install() { prune_libtool_files keepdir /var/lib/udisks2 #383091 - rm -rf "${ED}"/usr/share/bash-completion + 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} +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 } |