From 0ebf740b9c9bc7c10ac41bea315ecc6c01c79166 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 21 Jan 2018 19:03:35 +0000 Subject: gentoo resync : 21.01.2018 --- sys-fs/Manifest.gz | Bin 22015 -> 22012 bytes sys-fs/cryfs/Manifest | 2 +- sys-fs/cryfs/cryfs-0.9.7.ebuild | 2 +- sys-fs/udisks/Manifest | 4 +- sys-fs/udisks/udisks-2.7.4-r1.ebuild | 130 +++++++++++++++++++++++++++++++++++ sys-fs/udisks/udisks-2.7.4.ebuild | 130 ----------------------------------- sys-fs/udisks/udisks-2.7.5-r1.ebuild | 127 ++++++++++++++++++++++++++++++++++ sys-fs/udisks/udisks-2.7.5.ebuild | 127 ---------------------------------- 8 files changed, 261 insertions(+), 261 deletions(-) create mode 100644 sys-fs/udisks/udisks-2.7.4-r1.ebuild delete mode 100644 sys-fs/udisks/udisks-2.7.4.ebuild create mode 100644 sys-fs/udisks/udisks-2.7.5-r1.ebuild delete mode 100644 sys-fs/udisks/udisks-2.7.5.ebuild (limited to 'sys-fs') diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz index d6ba26195c18..f0462e297aa8 100644 Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest index 9e1502008b8e..d94844ef7255 100644 --- a/sys-fs/cryfs/Manifest +++ b/sys-fs/cryfs/Manifest @@ -1,5 +1,5 @@ DIST cryfs-0.9.7-spdlog.patch.xz 28204 BLAKE2B 0905971713b2d709aa34bfd11333a0aaea21ba08bbed12eee20e668fae4c19b17fe25d2fecf17dfff67abadd896b5e3eda2344655e2fb32ea1f28961d850d158 SHA512 a09adf3d9ce47bd38bfc9e3b35f23df8ce971e6d115d7e6eaa907c7eab71e73d495bda9d1ab96e25b4a9a9d551fa07a71f37d17c9779679b3a95dfff1d311a86 DIST cryfs-0.9.7.tar.xz 970588 BLAKE2B b3d79ed44c2280ef34bafa5613f51918093686da9a4637987745bd9601817033049115754e235b9a9a0f2045401182bc9cb48291173df6571887e9dec3f73636 SHA512 962c7e5e7ea153ed41cb47094b71bc41457e26203b94cc5e349c4d21e86630e32113c0193a248eee8ead41bede1c712d4c006150f84a6e1c2a0a0a7c02a1911b -EBUILD cryfs-0.9.7.ebuild 2162 BLAKE2B c11cd941b8c5fc3d4d3c05b4d52fefb1b070f3208fba21543ed807248114140c59b4f9cce0d99409fc0ff9a5d1900b37a02d668e9c5c4c82b0f994dd93bc9edc SHA512 ee7311ca786a821328549894f60981b28e1e894ea8b0156a494185b818b1321237becbd4627343157751512dc0c24200de2481201ad66f78730e6359c58ab63e +EBUILD cryfs-0.9.7.ebuild 2161 BLAKE2B 510387d69d01a43b6111e7d4a8f424458c3620873c9fbbf009e16f38c0e89e6d04f58c691e1a2769f22b495b01efd9b64f1bfe37ac0804bdc1c7cc1f43cd83ce SHA512 1cc4252e9353ba04f484153ba8f6f997e6bb54513e6b709dbf4bad08069c3e981c469c64141f00cc28504d86f3c615ecf31c4686a300bd2d65663106c86f4feb EBUILD cryfs-9999.ebuild 1971 BLAKE2B 83abba1c2167ad53a16487fa1e637b3de05d681fcdd70bde98f9647e5f1bc974df8d4e7e333704ae9a081e4fef1919d164de76d4c1f52d9160394c881e6be02a SHA512 6a8d717593da53d4db604c4bb49c1f742d57c9d2058edbec416fbf26f30c470cc89cc17a1c7b7d44fc98a6f21d14e6a3692465fea7da4f6040978eda902e69c8 MISC metadata.xml 516 BLAKE2B 7ff79d057c37e85960937024f889ca49839b9fa0c611084ee762f37fec64e31e74d31faabebfc0ae5b9e9d7a39798f65213fc2a178bf386868e3b3949d7b50cc SHA512 d452400e202e5f1ce607cdd554e7e40ee626b43dcc344b3d9f87bbdd2bc4b6bf072615e09b26adcf5a0a751837db62f2f02c4c5421510d929be6e935bcf03dd4 diff --git a/sys-fs/cryfs/cryfs-0.9.7.ebuild b/sys-fs/cryfs/cryfs-0.9.7.ebuild index 0c24d0a7e632..334af780fba6 100644 --- a/sys-fs/cryfs/cryfs-0.9.7.ebuild +++ b/sys-fs/cryfs/cryfs-0.9.7.ebuild @@ -23,7 +23,7 @@ if [[ "${PV}" == 9999 ]] ; then else SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz https://dev.gentoo.org/~johu/distfiles/${P}-spdlog.patch.xz" - KEYWORDS="amd64 ~x86" + KEYWORDS="amd64 x86" S="${WORKDIR}" fi diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest index 0f0993c8a6ef..6028c91377be 100644 --- a/sys-fs/udisks/Manifest +++ b/sys-fs/udisks/Manifest @@ -10,6 +10,6 @@ DIST udisks-2.7.5.tar.bz2 1270965 BLAKE2B 42044f00b09764bb15c665e5a301c39fb9d14e EBUILD udisks-1.0.5-r1.ebuild 2748 BLAKE2B 3970cd26a0d7661f05d74f8f71d678ba0903da3ca34828e523891354ba6d5bde0fec54f71026c4c58ab865d900cd99950f58219d38206bb83252ba9d98cea44d SHA512 bf49bb19bbddc413b06af20f5a1863f1d870c4ff5286e6c736a27f9e9ce769f6d1fc81e00edd0ee3a84b16241105eb91588046e2e2dc3b8767248b32703b61ee EBUILD udisks-2.1.8.ebuild 2997 BLAKE2B 3339216fdb9ab778f5601ab798be81ffe76ecf9c50d4e493cd86c80a2a6e150fb174d5ba0127e6b8cde3f81e9bf114ad6529bc1d45876dc02555d36e5f61b90e SHA512 b035b304e9585c5cfced81a4700eede5de731f850e06eb76bd391ba7ab333c3acba8775c493ca83bde42679877e9ad8ce436fc202486c04db2a34cfca7485c25 EBUILD udisks-2.6.5.ebuild 3348 BLAKE2B f227e1c664937ff73880f50d4847f61a7f42d681d7320d580863578abf4d2d6b41b5c38513cfdfb76311b6baf107b7b32ecbe9826213828c3936454d27d57736 SHA512 ed5146d860532c61b6cda0f4dcffd8ad3ce4907b671369f4032b58070a3252f65959f5fe33bc44914b3f872d0f40d5bc1f7b9fe2e1345fb7ef04019fb3554cbc -EBUILD udisks-2.7.4.ebuild 3434 BLAKE2B bf1a9ede6b6faef5c1ed6ee2fa935b2abf46479035dba551f1f57f0cfc43627615820e3335c7ba62ea3bd6dc2c467b1192762f95f919c49c4ba19079228e3247 SHA512 109d5a2052b632ebcce964770703f4e5f25d6b1d0a5981d87c66742a932d6202ae11ece57e22e9ecb15b8c04c394886b16820022a47c6b7c8af8e8b31c0d0242 -EBUILD udisks-2.7.5.ebuild 3503 BLAKE2B 5aa11ad64789c01674579d8de9486f8b56a71fe84a33ca30f6279e478d42e68cae0a929b2720f863e9479348e255b6444e9a6884fec2eb46a183d9a1b70e447b SHA512 cf390eef1066db7dfb5aaeaadbe6d8ca57afd172b901eef5f25bb7aedf52c6758f83731642cc1fe8ec412582cc4ea47f095686c35ae10eedbe718e992f2d1f4f +EBUILD udisks-2.7.4-r1.ebuild 3434 BLAKE2B bf1a9ede6b6faef5c1ed6ee2fa935b2abf46479035dba551f1f57f0cfc43627615820e3335c7ba62ea3bd6dc2c467b1192762f95f919c49c4ba19079228e3247 SHA512 109d5a2052b632ebcce964770703f4e5f25d6b1d0a5981d87c66742a932d6202ae11ece57e22e9ecb15b8c04c394886b16820022a47c6b7c8af8e8b31c0d0242 +EBUILD udisks-2.7.5-r1.ebuild 3503 BLAKE2B 5aa11ad64789c01674579d8de9486f8b56a71fe84a33ca30f6279e478d42e68cae0a929b2720f863e9479348e255b6444e9a6884fec2eb46a183d9a1b70e447b SHA512 cf390eef1066db7dfb5aaeaadbe6d8ca57afd172b901eef5f25bb7aedf52c6758f83731642cc1fe8ec412582cc4ea47f095686c35ae10eedbe718e992f2d1f4f MISC metadata.xml 803 BLAKE2B d703b430613a9e0527eb00c5b8b78ebcd04a76d28c5029980e818624aa2acbb486d9076ccb7636ce1df285d98ad64ffe45aa06989ff6d9df4a313b7d8b365c3f SHA512 c371035f733d2537c445d2fdd25e8754a6e92dc66e30e8610ec1112569799bce3101f98c5965df69c0fed25cc376a69e3f93d84c0c540e09b839cca44ad9585e diff --git a/sys-fs/udisks/udisks-2.7.4-r1.ebuild b/sys-fs/udisks/udisks-2.7.4-r1.ebuild new file mode 100644 index 000000000000..833fa85161b7 --- /dev/null +++ b/sys-fs/udisks/udisks-2.7.4-r1.ebuild @@ -0,0 +1,130 @@ +# 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 ia64 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}" + +QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd" + +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+=" ~SWAP" # https://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() { + xdg_environment_reset + + 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 +} diff --git a/sys-fs/udisks/udisks-2.7.4.ebuild b/sys-fs/udisks/udisks-2.7.4.ebuild deleted file mode 100644 index 833fa85161b7..000000000000 --- a/sys-fs/udisks/udisks-2.7.4.ebuild +++ /dev/null @@ -1,130 +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 ia64 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}" - -QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd" - -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+=" ~SWAP" # https://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() { - xdg_environment_reset - - 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 -} diff --git a/sys-fs/udisks/udisks-2.7.5-r1.ebuild b/sys-fs/udisks/udisks-2.7.5-r1.ebuild new file mode 100644 index 000000000000..cf2e42b967fa --- /dev/null +++ b/sys-fs/udisks/udisks-2.7.5-r1.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit 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/udisks/releases/download/${P}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~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-am-1.3 + >=sys-kernel/linux-headers-3.1 + virtual/pkgconfig + nls? ( dev-util/intltool ) +" +# If adding a eautoreconf, then these might be needed at buildtime: +# gnome-base/gnome-common:3 +# sys-devel/autoconf-archive + +QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd" + +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+=" ~SWAP" # https://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() { + xdg_environment_reset + + default + + 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 +} diff --git a/sys-fs/udisks/udisks-2.7.5.ebuild b/sys-fs/udisks/udisks-2.7.5.ebuild deleted file mode 100644 index cf2e42b967fa..000000000000 --- a/sys-fs/udisks/udisks-2.7.5.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit 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/udisks/releases/download/${P}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~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-am-1.3 - >=sys-kernel/linux-headers-3.1 - virtual/pkgconfig - nls? ( dev-util/intltool ) -" -# If adding a eautoreconf, then these might be needed at buildtime: -# gnome-base/gnome-common:3 -# sys-devel/autoconf-archive - -QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd" - -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+=" ~SWAP" # https://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() { - xdg_environment_reset - - default - - 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 -} -- cgit v1.2.3