diff options
Diffstat (limited to 'sys-fs')
18 files changed, 111 insertions, 220 deletions
diff --git a/sys-fs/bees/bees-9999.ebuild b/sys-fs/bees/bees-9999.ebuild index 6c38f7b9c91e..d656c4e6cded 100644 --- a/sys-fs/bees/bees-9999.ebuild +++ b/sys-fs/bees/bees-9999.ebuild @@ -29,7 +29,7 @@ RDEPEND="${DEPEND}" CONFIG_CHECK="~BTRFS_FS" ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs" -PATCHES=( "${FILESDIR}/0001-HACK-musl-does-not-define-pthread_getname_np.patch" ) +PATCHES=( "${FILESDIR}/v9999-0001-HACK-musl-does-not-define-pthread_getname_np.patch" ) pkg_pretend() { if [[ ${MERGE_TYPE} != buildonly ]]; then diff --git a/sys-fs/bees/files/v9999-0001-HACK-musl-does-not-define-pthread_getname_np.patch b/sys-fs/bees/files/v9999-0001-HACK-musl-does-not-define-pthread_getname_np.patch new file mode 100644 index 000000000000..6b8224a5a56f --- /dev/null +++ b/sys-fs/bees/files/v9999-0001-HACK-musl-does-not-define-pthread_getname_np.patch @@ -0,0 +1,50 @@ +From 02bdb636be5abd15836e5e43e9b53517595686c9 Mon Sep 17 00:00:00 2001 +From: Kai Krakow <kai@kaishome.de> +Date: Thu, 16 Apr 2020 21:21:57 +0200 +Subject: [PATCH v9999] HACK: musl does not define pthread_getname_np() + +The glibc alternative musl does not define this setter function. This +fix is probably wrong because it resets the thread names used for +logging internally to empty strings. + +Link: https://www.openwall.com/lists/musl/2019/07/17/3 +Signed-off-by: Kai Krakow <kai@kaishome.de> +--- + lib/task.cc | 2 ++ + src/bees.cc | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/lib/task.cc b/lib/task.cc +index 937a477..85da59b 100644 +--- a/lib/task.cc ++++ b/lib/task.cc +@@ -194,7 +194,9 @@ namespace crucible { + lock.unlock(); + + char buf[24] = { 0 }; ++#ifdef _GNU_SOURCE + DIE_IF_MINUS_ERRNO(pthread_getname_np(pthread_self(), buf, sizeof(buf))); ++#endif + DIE_IF_MINUS_ERRNO(pthread_setname_np(pthread_self(), m_title.c_str())); + + sched_param param = { .sched_priority = 0 }; +diff --git a/src/bees.cc b/src/bees.cc +index 03a626c..3db5d73 100644 +--- a/src/bees.cc ++++ b/src/bees.cc +@@ -152,10 +152,12 @@ BeesNote::get_name() + // OK try the pthread name next. + char buf[24]; + memset(buf, '\0', sizeof(buf)); ++#ifdef _GNU_SOURCE + int err = pthread_getname_np(pthread_self(), buf, sizeof(buf)); + if (err) { + return string("pthread_getname_np: ") + strerror(err); + } ++#endif + buf[sizeof(buf) - 1] = '\0'; + + // thread_getname_np returns process name +-- +2.26.2 + diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index 57f02eca17a1..bfed17e3c2a5 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -1,3 +1,3 @@ -DIST btrfs-progs-v5.10-rc1.tar.xz 2203156 BLAKE2B 55f63cd5fecc06f1004848f0bec4ba6dea3476a2b8b0a133d32e13b895ce305af1f9125126a937675649541c4f93fdd64689dfa2660764027216aa0e048116fa SHA512 50fe512beaf3459c520ca76896f1c12958a59e7837538e8bcad09acea9b92495baa435d321fa272e55f21a06c1799e0240747091abd44ae3bc717052c59cae82 +DIST btrfs-progs-v5.10.tar.xz 2203516 BLAKE2B 17cc6ccc0e9ae489c5eebd8dfc52fc7edcd4b22ca49c2b5e44febeea2f57b84ceb34e75d1a009126e1c865d63bbe8384be7b2a6b3eeb4933baf8befb7f131be2 SHA512 c94b978ec4aaac272c32e3c91332e85327cec7c7d2ae4d27ba0181f94e14e0dcc50f4f7a53ee9b5a2fe2c76a54dd18aa6c6821e05a592cb5f151abaefd0b12ca DIST btrfs-progs-v5.4.1.tar.xz 2107476 BLAKE2B 1ea58f49b0f8185e944010804e544643a2eafeea58fecb480b13095c362350c218f0602fbb43a96705a81befe88ec3e3abe35cc90d4732006479b059aa7fed32 SHA512 56381b37036aecea61b758fb4971abfeda24a387bb3a828f7d54eb068982a37763a8ebe2bcc6be61d6a8bc2057dddcd4754325b236e14d8ec02e58cf711f192f DIST btrfs-progs-v5.9.tar.xz 2189724 BLAKE2B 3692e058e5e52c2a3684548d0b0ca94a9101a66dc8951266a49a71b6848b7f0cce8ade0e914ae8b71345021750e7d20742af13aec69aef7d52e3030fca289529 SHA512 38db047198ab0467d3fe235f7e8e1fd14ade00dd0b182588220c5f5e4b598efbdcd30a3d5d56cf0a0ed8a902d2374af0927eb7f3720cd761172c7291a2a65c94 diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.10_rc1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.10.ebuild index a41d4690e34d..a41d4690e34d 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-5.10_rc1.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-5.10.ebuild diff --git a/sys-fs/cryfs/cryfs-0.10.2.ebuild b/sys-fs/cryfs/cryfs-0.10.2.ebuild index a4afa56821a7..ea0c14caa57e 100644 --- a/sys-fs/cryfs/cryfs-0.10.2.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild index 54f28eab2cbe..413eaae8b611 100644 --- a/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -37,7 +37,6 @@ RDEPEND="${DEPEND_COMMON} thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )" # note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check DEPEND="${DEPEND_COMMON} - >=sys-devel/binutils-2.20.1-r1 static? ( selinux? ( sys-libs/libselinux[static-libs] ) >=sys-apps/util-linux-2.16[static-libs] diff --git a/sys-fs/lvm2/lvm2-2.03.11.ebuild b/sys-fs/lvm2/lvm2-2.03.11.ebuild index 47f9c06d38dd..d8d945f5a7d3 100644 --- a/sys-fs/lvm2/lvm2-2.03.11.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.11.ebuild @@ -37,7 +37,6 @@ RDEPEND="${DEPEND_COMMON} thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )" # note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check DEPEND="${DEPEND_COMMON} - >=sys-devel/binutils-2.20.1-r1 static? ( selinux? ( sys-libs/libselinux[static-libs] ) >=sys-apps/util-linux-2.16[static-libs] diff --git a/sys-fs/mtd-utils/Manifest b/sys-fs/mtd-utils/Manifest index e714b58a58c1..3d9a152fe05a 100644 --- a/sys-fs/mtd-utils/Manifest +++ b/sys-fs/mtd-utils/Manifest @@ -1,3 +1 @@ -DIST mtd-utils-1.5.2.tar.gz 343843 BLAKE2B 7f6612c4b9185583e9bbc785f7f96b08b7897c4af0c442a6206a446dc25f3c2aae9670c9344fba09606f73b87c73a96150f77bd974c96abe475d204ba5c28068 SHA512 81eb5cf27814234af65409fe93798ec50d9f733978dc606bd33e63d98eb99afb3f988df47dc66a9368a11baee0a35fa1d0d6677af8c23428919e34bd11a25697 -DIST mtd-utils-2.0.2.tar.gz 355964 BLAKE2B 9a795ddac1287c7c44f52215faa4b6295cf5ac3917392a407c7824f8715f4a180feab95621e6b1aa738fba38950c8e12b722b7c518c3362227e6da25deecd3fb SHA512 e61f4bb24d3b96d39fe262f73e01b7bf3e15a9258fd5766657ef0d807d7b5bb0b489ade9dc45068b2a25bcf378ca2877177df3915398b367f50ff1ef9bc5be7a DIST mtd-utils-2.1.2.tar.gz 380333 BLAKE2B 46cccf9cbe870f3415237deaa00a3ff57fbaacc019d4adc69e1ed516e752e58776ed5f53be0d46baef69dff8a0d90e1df5ca32a80ecbb620dd4bb0231f8c94dd SHA512 bd2d61d81f367a1d9f5345fa3985f5403e37fad1c1f811e2ab291b64339170514aa1fbceb89b78ba7a357f8cc3d7ade99796e9318c9624a40e2266fa0b3a9921 diff --git a/sys-fs/mtd-utils/files/mtd-utils-1.5.2-sysmacros.patch b/sys-fs/mtd-utils/files/mtd-utils-1.5.2-sysmacros.patch deleted file mode 100644 index 5fc055d07da9..000000000000 --- a/sys-fs/mtd-utils/files/mtd-utils-1.5.2-sysmacros.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://bugs.gentoo.org/580206 - -From 9a06f45ec71116d76ee4b268ebe1b33d45b06fc0 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sat, 16 Apr 2016 22:10:43 -0400 -Subject: [PATCH mtd-utils] include sys/sysmacros.h for major/minor/makedev - -These functions have always been defined in sys/sysmacros.h under -Linux C libraries. For some, including sys/types.h implicitly -includes that as well, but glibc wants to deprecate that, and some -others already have. Include the header explicitly for the funcs. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - include/common.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/common.h b/include/common.h -index fb0ca83..8cb3142 100644 ---- a/include/common.h -+++ b/include/common.h -@@ -28,6 +28,7 @@ - #include <errno.h> - #include <features.h> - #include <inttypes.h> -+#include <sys/sysmacros.h> - #include "version.h" - - #ifndef PROGRAM_NAME --- -2.7.4 - diff --git a/sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild b/sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild deleted file mode 100644 index 863348736315..000000000000 --- a/sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils vcs-snapshot toolchain-funcs - -if [[ ${PV} == "99999999" ]] ; then - EGIT_REPO_URI="git://git.infradead.org/mtd-utils.git" - - inherit git-2 - SRC_URI="" - #KEYWORDS="" -else - if [[ ${PV} == *.*.* ]] ; then - MY_PV="${PV}-*" - SRC_URI="http://git.infradead.org/mtd-utils.git/snapshot/v${PV}.tar.gz -> ${P}.tar.gz" - else - MY_PV="${PV}-02ae0aac87576d07202a62d11294ea55b56f450b" - SRC_URI="mirror://gentoo/${PN}-snapshot-${MY_PV}.tar.xz" - fi - KEYWORDS="amd64 arm ~mips ppc x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)" -HOMEPAGE="https://git.infradead.org/?p=mtd-utils.git;a=summary" - -LICENSE="GPL-2" -SLOT="0" -IUSE="xattr" - -# We need libuuid -RDEPEND="!sys-fs/mtd - dev-libs/lzo - sys-libs/zlib - >=sys-apps/util-linux-2.16" -# ACL is only required for the <sys/acl.h> header file to build mkfs.jffs2 -# And ACL brings in Attr as well. -DEPEND="${RDEPEND} - xattr? ( sys-apps/acl )" - -src_prepare() { - epatch "${FILESDIR}"/${P}-sysmacros.patch #580206 -} - -makeopts() { - # These affect build output, so keep it common between compile & install. - echo CROSS=${CHOST}- V=1 - use xattr || echo WITHOUT_XATTR=1 -} - -src_compile() { - tc-export AR CC RANLIB - local compileopts=( - AR="${AR}" CC="${CC}" RANLIB="${RANLIB}" - ) - emake $(makeopts) "${compileopts[@]}" -} - -src_install() { - emake $(makeopts) install DESTDIR="${ED}" - dodoc *.txt - newdoc mkfs.ubifs/README README.mkfs.ubifs - # TODO: check ubi-utils for docs+scripts -} diff --git a/sys-fs/mtd-utils/mtd-utils-2.0.2.ebuild b/sys-fs/mtd-utils/mtd-utils-2.0.2.ebuild deleted file mode 100644 index 5a9ab3ce7c37..000000000000 --- a/sys-fs/mtd-utils/mtd-utils-2.0.2.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eutils vcs-snapshot - -if [[ ${PV} == "99999999" ]] ; then - EGIT_REPO_URI="git://git.infradead.org/mtd-utils.git" - - inherit git-2 - SRC_URI="" - #KEYWORDS="" -else - if [[ ${PV} == *.*.* ]] ; then - MY_PV="${PV}-*" - SRC_URI="http://git.infradead.org/mtd-utils.git/snapshot/v${PV}.tar.gz -> ${P}.tar.gz" - else - MY_PV="${PV}-02ae0aac87576d07202a62d11294ea55b56f450b" - SRC_URI="mirror://gentoo/${PN}-snapshot-${MY_PV}.tar.xz" - fi - KEYWORDS="amd64 arm ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)" -HOMEPAGE="https://git.infradead.org/?p=mtd-utils.git;a=summary" - -LICENSE="GPL-2" -SLOT="0" -IUSE="xattr" - -# We need libuuid -RDEPEND="!sys-fs/mtd - dev-libs/lzo - sys-libs/zlib - >=sys-apps/util-linux-2.16" -# ACL is only required for the <sys/acl.h> header file to build mkfs.jffs2 -# And ACL brings in Attr as well. -DEPEND="${RDEPEND} - xattr? ( sys-apps/acl ) - sys-devel/libtool" - -src_prepare() { - default - ./autogen.sh || die -} - -src_configure() { - econf \ - $(use_with xattr) -} - -src_install() { - default - dodoc jffsX-utils/device_table.txt - newdoc ubifs-utils/mkfs.ubifs/README README.mkfs.ubifs - doman \ - jffsX-utils/mkfs.jffs2.1 \ - ubi-utils/ubinize.8 -} diff --git a/sys-fs/rar2fs/Manifest b/sys-fs/rar2fs/Manifest index 4c49e1fc5464..99d17cdc2a21 100644 --- a/sys-fs/rar2fs/Manifest +++ b/sys-fs/rar2fs/Manifest @@ -1 +1 @@ -DIST rar2fs-1.29.3.tar.gz 267415 BLAKE2B 269ad7f301595e6c17899fccd926589f883ab14ae43af9d6a024e6e381b2bf64786eba314431b32a1f6c8add315afdef259a1bc24da9ae93378d2ac38d3f3cce SHA512 75def71f088df0d9c9a62009178d0c1682f1ff75708c7b273dd669ecb1406795e53ff8ad0f6323d275f13cb580bebfaf1ca5b5c76026bb9b83360aed2f26935e +DIST rar2fs-1.29.4.tar.gz 268299 BLAKE2B 771e3dfd4fcf69e34adcca3203069d3820e1ed79b1554967fdde51d4a894303646b027dd54b923f319b2a926535db8cf6f68f5edc0b09759df7dacd7aa988bc0 SHA512 7963e420170ec06caab9321443ae75320e1eb6c034cde53d862cb3203ad36fe20b762e389145a80f1b010825d3a51bdc1d7bdaa7fc52edec11ddd8cec8a0c902 diff --git a/sys-fs/rar2fs/rar2fs-1.29.3.ebuild b/sys-fs/rar2fs/rar2fs-1.29.4.ebuild index 88a18a26d4e7..88a18a26d4e7 100644 --- a/sys-fs/rar2fs/rar2fs-1.29.3.ebuild +++ b/sys-fs/rar2fs/rar2fs-1.29.4.ebuild diff --git a/sys-fs/squashfs-tools-ng/Manifest b/sys-fs/squashfs-tools-ng/Manifest index 95a9c26ffb1d..96953e6a9a48 100644 --- a/sys-fs/squashfs-tools-ng/Manifest +++ b/sys-fs/squashfs-tools-ng/Manifest @@ -1 +1,2 @@ DIST squashfs-tools-ng-1.0.3.tar.xz 1101820 BLAKE2B f21cef44d5dc3cae01733bb720ba472d02777d2b69a3e428dbf4d0f64ad46a18131dae807a9ef719e29698b06ff04a82de1906876c40aef336aa57a75eb3fde3 SHA512 32e0084b1343de07b450e5337398618475a57c91c6f351c73bb7aa3dd6b5dc83aeca924f3d624ce802c9e1d600389a76cbca7b841104259d32f3ef2c7f13db67 +DIST squashfs-tools-ng-1.0.4.tar.xz 1103996 BLAKE2B c56b02932cdb4116fcec582f674771f27f67cbec51ca8d31beb1fbccef72fd06a82ee5981fb2dd5f6e7297180d1774d856c24ae447e95687f6f7b970357b807c SHA512 c0a24be6b07739713213fc5936506ea7c1f62fa461f60955986ac4dda6958203e74336418abe615ecc85c62deb085039ca375891538ae01c21672d4911091614 diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.4.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.4.ebuild new file mode 100644 index 000000000000..22a2dbc93b62 --- /dev/null +++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.4.ebuild @@ -0,0 +1,51 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="A new set of tools for working with SquashFS images" +HOMEPAGE="https://github.com/AgentD/squashfs-tools-ng" +if [[ ${PV} = 9999* ]]; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/AgentD/${PN}.git" +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz" +fi + +LICENSE="LGPL-3+ tools? ( GPL-3+ )" +SLOT="0" +IUSE="lz4 lzo selinux +tools +xz zstd" + +DEPEND=" + sys-libs/zlib:= + lz4? ( app-arch/lz4:= ) + lzo? ( dev-libs/lzo:= ) + xz? ( app-arch/xz-utils:= ) + selinux? ( sys-libs/libselinux:= ) + zstd? ( app-arch/zstd:= ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + default + [[ ${PV} == "9999" ]] && eautoreconf +} + +src_configure() { + local myconf=( + --disable-static + $(use_with lz4) + $(use_with lzo) + $(use_with selinux) + $(use_with tools) + $(use_with xz) + $(use_with zstd) + ) + econf "${myconf[@]}" +} + +src_install() { + default + find "${D}" -name "*.la" -delete || die +} diff --git a/sys-fs/udiskie/Manifest b/sys-fs/udiskie/Manifest index ea280fce1bac..3c053d2a766e 100644 --- a/sys-fs/udiskie/Manifest +++ b/sys-fs/udiskie/Manifest @@ -1,3 +1,2 @@ -DIST udiskie-2.1.0.tar.gz 86339 BLAKE2B e92c61ac61aaab81bb91874ed1ed0c8bab60524fe79c9432053968418767b6ebc5c15c33abc74f37471fcc5a799152a50d88528a4b7bbd91e015d448fb36d0cb SHA512 704bdf8226dd2eeb6b13c5a4facca76d9f5fa7119cef7b5af08d0d399f9e65318ed5a921638cd9b7db3acbadcff1029f2e7698a942350f31b8f94f5032c25663 -DIST udiskie-2.1.1.tar.gz 87216 BLAKE2B 4860e8ae7310c89d3292fe7fadcd49f6c92f05628ea0c398f0e7f77183b93c5e34c4119f0ae4b4e031109cc8bc6ea23ddc14c9478709cdce594bfea3b39a1af8 SHA512 bad0f024c64a7d2c48dd6c3bc59f5bc223789bec9a8201f763cabf97096312bbdc9779711d15a9f7f8f9545a7088042b159f856c9a9db12413e9bea41b215ef4 DIST udiskie-2.2.0.tar.gz 88232 BLAKE2B ba037b0828b7bf42b00be481ecec807bc9ed591ad3990cb6b6f0db21b4894c184ff2fcb5410272a55f3f78caae999458cb159cd450ede540606138e5e9dab1af SHA512 7c6c096eeb52458a2e30415c1489a640ca679489a34729f5502ae35f178f810476111a17f082a092d61d6d08022cfd208cb1f71ab34d6b88ea7f1f4e4a1ae49c +DIST udiskie-2.3.0.tar.gz 89954 BLAKE2B ece40590aee684325a8df4b793a5407a0f15ba07c3d8a0df72d72afe5af2f1d3bb6c072fa33fbe61b647a3ed3b0d5b9f6881be4db3943fdc0208e14ced4acec2 SHA512 4b2d97ac458a70bbb6458fdf2386b5847c1ab590d4f8ae420d4c799871be732f793d31c3c6a51558caea266797da10647de437790237f01cc313e08f74524148 diff --git a/sys-fs/udiskie/udiskie-2.1.0.ebuild b/sys-fs/udiskie/udiskie-2.1.0.ebuild deleted file mode 100644 index 771e4e3e14ba..000000000000 --- a/sys-fs/udiskie/udiskie-2.1.0.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit distutils-r1 gnome2-utils - -DESCRIPTION="An automatic disk mounting service using udisks" -HOMEPAGE="https://pypi.org/project/udiskie/ https://github.com/coldfix/udiskie" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="" - -RDEPEND="dev-python/docopt[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/pyxdg[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - sys-fs/udisks:2 - $(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' 'python3_6')" -DEPEND="app-text/asciidoc - dev-python/setuptools[${PYTHON_USEDEP}]" - -src_prepare() { - sed -i -e 's:gtk-update-icon-cache:true:' setup.py || die - default - - distutils-r1_src_prepare -} - -src_compile() { - distutils-r1_src_compile - emake -C doc -} - -src_install() { - distutils-r1_src_install - doman doc/${PN}.8 -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/sys-fs/udiskie/udiskie-2.1.1.ebuild b/sys-fs/udiskie/udiskie-2.3.0.ebuild index bb080212454b..e3441f08df50 100644 --- a/sys-fs/udiskie/udiskie-2.1.1.ebuild +++ b/sys-fs/udiskie/udiskie-2.3.0.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 gnome2-utils DESCRIPTION="An automatic disk mounting service using udisks" @@ -17,8 +18,7 @@ IUSE="" RDEPEND="dev-python/docopt[${PYTHON_USEDEP}] dev-python/pygobject:3[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] - sys-fs/udisks:2 - $(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' 'python3_6')" + sys-fs/udisks:2" DEPEND="app-text/asciidoc dev-python/setuptools[${PYTHON_USEDEP}]" |