From b7ebc951da8800f711142f69d9d958bde67a112d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 28 Apr 2019 09:54:45 +0100 Subject: gentoo resync : 28.04.2019 --- sys-fs/udisks/Manifest | 4 +- sys-fs/udisks/udisks-1.0.5-r2.ebuild | 105 ---------------------------------- sys-fs/udisks/udisks-1.0.5-r3.ebuild | 108 +++++++++++++++++++++++++++++++++++ sys-fs/udisks/udisks-2.8.2.ebuild | 5 +- 4 files changed, 112 insertions(+), 110 deletions(-) delete mode 100644 sys-fs/udisks/udisks-1.0.5-r2.ebuild create mode 100644 sys-fs/udisks/udisks-1.0.5-r3.ebuild (limited to 'sys-fs/udisks') diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest index cc72fe6fbba3..f2443afbf57d 100644 --- a/sys-fs/udisks/Manifest +++ b/sys-fs/udisks/Manifest @@ -6,8 +6,8 @@ DIST udisks-1.0.5.tar.gz 736221 BLAKE2B 9a709c5d4fcd390d9a52ac764d0e3c678983a146 DIST udisks-2.7.4.tar.gz 1286465 BLAKE2B 8c52199215bc4ee3840ded2ccf9e3d61bc99bf0f505abb55a5ce18aa2676a60f788bc235e0f6be308c8bb50ec653a559010970e827d3bb4c1212afea291e7a8d SHA512 d0ad6c6d44f53414de3da68e0cdff1be0e9e6e03f900d5fdb4912560db36af52be32a2615d3d2efeaf134d4721a4a0c3e03515fd670f42e96f42ded08c3bf849 DIST udisks-2.8.1.tar.bz2 1354879 BLAKE2B c2e5fc11dc29d43c6ff2cfb048c8f5540e72ea9c966e75b70754ed9491e3d4bfa9693718ab735c61ec110c480037064d610d238df92a839b4b4222dd624397bf SHA512 a3c7d26cd1bbd9cce59b25d118076c34482a698d7dca9e0468b6f9c928f40c8dbdd0b1cb61cf288ae77151643dc4a3eacf31e22af2c7b35a2828e49ee335e70b DIST udisks-2.8.2.tar.bz2 1589149 BLAKE2B eaa9d95e175bbdd4255c627a0dcd93ff6f0a3660134d2117551c2d61298733570409481393ceeafc92ff26b74277b3a754b70d9359ed402c19d73fea2f39ec04 SHA512 dc0087ed2d3ab71dc66f63f868a6e2cd0e4e7578c40b2240739cecaffd6f50f5a2cecfc7ef7df9304e291d84ab12f59a940b9fb42b34a5a60d12061e6aaffc1a -EBUILD udisks-1.0.5-r2.ebuild 2748 BLAKE2B 3970cd26a0d7661f05d74f8f71d678ba0903da3ca34828e523891354ba6d5bde0fec54f71026c4c58ab865d900cd99950f58219d38206bb83252ba9d98cea44d SHA512 bf49bb19bbddc413b06af20f5a1863f1d870c4ff5286e6c736a27f9e9ce769f6d1fc81e00edd0ee3a84b16241105eb91588046e2e2dc3b8767248b32703b61ee +EBUILD udisks-1.0.5-r3.ebuild 2795 BLAKE2B 45da28dd3571bad3921197cb8aa68487067a58e905a6802581924d54a64bc39b4a203129c2bdb7a69bbfa63da6259ab48aeb21e039799bce547f6c4c58ff31d6 SHA512 d795d5a8c564afccb2f41c1062ad5485074db7daa4416e2c4babd8665633a21038107e8e8c5356c9d49edb7108a7126a905b57420741239de41b9925a320e80d EBUILD udisks-2.7.4-r1.ebuild 3328 BLAKE2B f97ca16814ccf01e774c7a44474c95d0876795024578985023031e42ac429377167718f6de01e093dc658db9e3855f6c5801993fb4870c39d7c1e2ea0a6e2897 SHA512 8b319ed1f9e9f76fe93e4a8ae4fdd5aad1610ad22f3fdc6f7d6f5f5c2a77db27ad8aedc18e15f8e8dc6cccb003c5e8221397142d14a75aaa693c2eac4184ebe5 EBUILD udisks-2.8.1.ebuild 3234 BLAKE2B b0be42f25f2a9c3a5b3305bc9907f2b8fcd81470e25b0910f72f733dad6e6803f528bbfe2c450e97ab257cd42311ede04c5b9d65c37b13068729563c3a649f99 SHA512 cfe0d8c6b1b60f160b2eceac6eec64951a56aadd930cadd0c38a6c6b8a9d5fb9d74a13738a3d40dd1afe71373e8106143586126da9de62d57afe49f0e498cccf -EBUILD udisks-2.8.2.ebuild 3250 BLAKE2B d6d03713258187074cbccf5b5b088bafe3ef0f7be9134051136a5855ceb858b00961a10cde4b098d24d9cdf933171eb780c0bcfff136b957cc8fbd7988488d22 SHA512 9509455b4b82c8c39ece13d6ede774bca9097a71954408f0a06f299409ce513ea75abfc7aef9de679ca63d974ef7e8d48ed508b2d392f6f99d131988862e8523 +EBUILD udisks-2.8.2.ebuild 3240 BLAKE2B a887061b0302b102597b146f6597b365b4964f372ec829f8178c419a3e3bcb2b3ed00e11157b75ef0ff8766e2d851391a1ae6a76c4d4a5119966ff4b4e441ea5 SHA512 99278667326d8ae9e4e316eae3eca0628b89cb04c8750a6f822b6f9a024c8d26bfb8d2399988e6f8b9ded8aff4691dd382df68a7aa99b423fcba71cefa67d97f MISC metadata.xml 868 BLAKE2B 8d4ef3d2fae9d22074a87c65ced87d1e523b8b935084845b4cdd11389648e5071852cde39b18afb34c33dd352f3b1acb6ffbed68a5dc6c999033c5567693967e SHA512 e5b0ccda409fe0b7c7be656f5834399f2819da68ee811e70c2cdf97370b860efa1ca58188543f9cc46f17cfa340c9d31c18b050b6e6f049928afe8d1ad7ffae5 diff --git a/sys-fs/udisks/udisks-1.0.5-r2.ebuild b/sys-fs/udisks/udisks-1.0.5-r2.ebuild deleted file mode 100644 index 513b9e8dcb5a..000000000000 --- a/sys-fs/udisks/udisks-1.0.5-r2.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils bash-completion-r1 linux-info 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 ~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/libgudev:= - virtual/libudev:= - virtual/udev - 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" - -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 \ - --enable-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 -} diff --git a/sys-fs/udisks/udisks-1.0.5-r3.ebuild b/sys-fs/udisks/udisks-1.0.5-r3.ebuild new file mode 100644 index 000000000000..74ffc984dd33 --- /dev/null +++ b/sys-fs/udisks/udisks-1.0.5-r3.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit eutils bash-completion-r1 linux-info 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 ~sh 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 + >=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 +} diff --git a/sys-fs/udisks/udisks-2.8.2.ebuild b/sys-fs/udisks/udisks-2.8.2.ebuild index b95599147fc8..50ffc5f311e2 100644 --- a/sys-fs/udisks/udisks-2.8.2.ebuild +++ b/sys-fs/udisks/udisks-2.8.2.ebuild @@ -8,7 +8,7 @@ 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" +LICENSE="LGPL-2+ GPL-2+" SLOT="2" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="acl debug elogind +introspection lvm nls selinux systemd vdo" @@ -43,11 +43,10 @@ BDEPEND=" >=dev-util/gdbus-codegen-2.32 >=dev-util/gtk-doc-am-1.3 virtual/pkgconfig - nls? ( sys-devel/gettext ) + nls? ( >=sys-devel/gettext-0.19.8 ) " # If adding a eautoreconf, then these might be needed at buildtime: # dev-libs/gobject-introspection-common -# gnome-base/gnome-common:3 # sys-devel/autoconf-archive DOCS=( AUTHORS HACKING NEWS README.md ) -- cgit v1.2.3