diff options
Diffstat (limited to 'sys-fs')
43 files changed, 538 insertions, 762 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex c175972806fa..bbe4e80b26f4 100644 --- a/sys-fs/Manifest.gz +++ b/sys-fs/Manifest.gz diff --git a/sys-fs/avfs/Manifest b/sys-fs/avfs/Manifest index f3f6944cbdb0..2d258e7ad466 100644 --- a/sys-fs/avfs/Manifest +++ b/sys-fs/avfs/Manifest @@ -1,3 +1,5 @@ DIST avfs-1.1.1.tar.bz2 606819 BLAKE2B 240bb342dc9f993ac8deb60941411b1419c190f9909b5b1bde65777b82f622e121f44f238d2bd8ddc303c86ef376950d4af773c8fae79848b466ec3a3c5aafc1 SHA512 0707f8e746d8d3633755b1a1efb944a400c095b517a7befd75de4d25e2fad1a1b5132b9cf94285b05ad1344bfc138ec75e9cb5f8a5d7775a69595b9b35266f92 +DIST avfs-1.1.3.tar.bz2 609901 BLAKE2B 2eea31365533372fc5ea252d57da97a8e0d362b6db5f0a6e10af9255105ccdcadbd7f5157aafd63244da2c7a53dcbc6781d0c4ba5ca231ce2937855d400ea4e5 SHA512 8e87655cbdb64f0cbbcc399142957ea9e04a998953cc64def9c8bb338b46abffc85a35e09b5fa52bb9ddcf56e27c4f62503050d32c8201eaad61c54e22bdd005 EBUILD avfs-1.1.1.ebuild 1491 BLAKE2B 4456b482d395814bcc942b915c443593d661284f5d8ac25f6a143b474f00b6bec645af06ffb56f355597195d01213285082bb7288c10f95e238ee9db98100538 SHA512 f983cbc72aaba0a55f88a26d8cb76b34baaa6f0cefd816ab9952eefdb2530dafb2b49ea5790b7281324d27159e37fef63cea9884ce9c6e052f2b5c44e0395e0e -MISC metadata.xml 240 BLAKE2B 05f9c153e966797f11510a8083c2a005bc9fd8e5522e9277599ece1f0c8581033c5e7dff68cb7ca6dcec1a8971073ee3630a0ada4e7be509f05894dc5574f2db SHA512 390e25208a56dc50700ef8e1ad421c72bff56b77aded5ac130433d89be4b9d9df74fb5e54017eacfa795e94c64989dbb2be071358e5f63a1eff84a0018234f3f +EBUILD avfs-1.1.3.ebuild 1616 BLAKE2B d6c930d1dad4142a1fcf45634b3adb3f7dc8983874a88b3f2170b61574c41569ba957552a0c8869f5f20f30d7d4800da55fcf9a57d6f0eef6c023e93290709ab SHA512 22f38e1341d2cb976c5fffed5c886d13111cb6ea1d2dfaa704e73a231380a8021adc9ff0d58decc88d8257a259e807d7ffeb887c1267f39c70ef91fc2dd56ba7 +MISC metadata.xml 421 BLAKE2B f4c3e8cd39e16235b32a251153c5ff5aab035dc31394cec6029ceef4e99c3e34dc4a58c9f0030dfa4c3618e30da404e4dc5e4802b9b4eca1def912cac902d1d2 SHA512 05215354a0ab9d2a810c2b917d345b1cc061fe20c58799d85549efdc7211bfd6be7ae4ad8bd4b7f5e34239c782cf103a272b2b7e04f356c4271e159758b23c89 diff --git a/sys-fs/avfs/avfs-1.1.3.ebuild b/sys-fs/avfs/avfs-1.1.3.ebuild new file mode 100644 index 000000000000..a9d5071514cd --- /dev/null +++ b/sys-fs/avfs/avfs-1.1.3.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="AVFS is a virtual filesystem that allows browsing of compressed files" +HOMEPAGE="https://sourceforge.net/projects/avf/" +SRC_URI="mirror://sourceforge/avf/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" +IUSE="+lzma webdav +zstd" + +BDEPEND=" + sys-devel/libtool + virtual/pkgconfig +" +RDEPEND=" + app-arch/bzip2:= + >=sys-fs/fuse-2.4:0 + sys-libs/zlib + lzma? ( app-arch/xz-utils ) + webdav? ( net-libs/neon:= ) + zstd? ( app-arch/zstd:= ) +" +DEPEND="${RDEPEND}" + +src_configure() { + econf \ + --enable-fuse \ + --enable-library \ + --enable-shared \ + --with-system-zlib \ + --with-system-bzlib \ + --disable-static \ + $(use_enable webdav dav) \ + $(use_with lzma xz) \ + $(use_with zstd) +} + +src_install() { + default + + # remove cruft + rm "${ED}"/usr/bin/{davpass,ftppass} || die + + # install docs + dodoc doc/{api-overview,background,FORMAT,INSTALL.*,README.avfs-fuse} + dosym ../../../$(get_libdir)/avfs/extfs/README /usr/share/doc/${PF}/README.extfs + + docinto scripts + dodoc scripts/*pass + + find "${ED}" -name "*.la" -delete || die +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + einfo "This version of AVFS includes FUSE support. It is user-based." + einfo "To execute:" + einfo "1) as user, mkdir ~/.avfs" + einfo "2) make sure fuse is either compiled into the kernel OR" + einfo " modprobe fuse or add to startup." + einfo "3) run mountavfs" + einfo "To unload daemon, type umountavfs" + einfo + einfo "READ the documentation! Enjoy :)" + fi +} diff --git a/sys-fs/avfs/metadata.xml b/sys-fs/avfs/metadata.xml index 1b7b6a05415d..293141f061c2 100644 --- a/sys-fs/avfs/metadata.xml +++ b/sys-fs/avfs/metadata.xml @@ -2,7 +2,11 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> + <use> + <flag name="webdav">Allow mounting WebDAV shares via <pkg>net-libs/neon</pkg></flag> + </use> <upstream> <remote-id type="sourceforge">avf</remote-id> + <changelog>https://sourceforge.net/p/avf/git/ci/master/tree/NEWS</changelog> </upstream> </pkgmetadata> diff --git a/sys-fs/bees/Manifest b/sys-fs/bees/Manifest index b53b37f27d3a..6a3a2daca408 100644 --- a/sys-fs/bees/Manifest +++ b/sys-fs/bees/Manifest @@ -1,5 +1,6 @@ AUX 0001-HACK-musl-does-not-define-pthread_getname_np.patch 1406 BLAKE2B 92d82eb147a90ca65acfe9b2ff16dd6f514fa1f2a5950b1f6fcdff68963e0f4be4a8b9b2b695a912eb1ac2ffcc0b171749d4c8b38f733451aa48646b2a8653ce SHA512 93bd338ec59fa0601178e3737a4eaeb8af7df83c16b409544ec55bdf7865786785cf6a9a160dd29cb4b8eadc2c6f311f6cd3bbe6e9310ad2356fd69ff5ba35bc +AUX v9999-0001-HACK-musl-does-not-define-pthread_getname_np.patch 1481 BLAKE2B 971b52075858100a0bea860c10af4d6501cc79356730e5510fc4e430695a4f703c7d06c6f651b8403296540570230581f06a7d2fec9426e30ebe99f19ff5df05 SHA512 f36f98eef3ad942ce411331492fc6722201ddf4c9ec46695dbd8af28d87f7188443401e502ce67936d08f3cb6dfa17535264fe30150e4bf2e0652fc2c55378e3 DIST bees-0.6.4.tar.gz 126064 BLAKE2B 562f0cfd63d15978a26f859548eb36cea0bf1be8e363c7ee5d2294e3c6407b4a93d865ffe2d15fabaeb2b3e136ad2d48cab3210c00e5fe39432985186ad62c55 SHA512 ce0eb66ac0770838e13ba6007fd765c02aea3f5eefc09e2834118d420e71693c37b8aa8511cfc9577ca09ab82d37787a1854edbed090c059759b29c70d834672 EBUILD bees-0.6.4.ebuild 3097 BLAKE2B ccab0344ebed9ebd7f764ce15c6a1b0c553055e49b1365cf5a612fc12234cc14e4537267fc7502c6c6284e1a4c0e2bd1a3dfa735918922ce181bab709a7cb423 SHA512 2d3852a1a15739dc357987a659ec2cee1f4c2991aa7a2a8a0735484b4ef67cdebc7c972261ec71e78a19191e5a7dd6ed7f5149f61453b5a5b27bebe6769f73da -EBUILD bees-9999.ebuild 3097 BLAKE2B ccab0344ebed9ebd7f764ce15c6a1b0c553055e49b1365cf5a612fc12234cc14e4537267fc7502c6c6284e1a4c0e2bd1a3dfa735918922ce181bab709a7cb423 SHA512 2d3852a1a15739dc357987a659ec2cee1f4c2991aa7a2a8a0735484b4ef67cdebc7c972261ec71e78a19191e5a7dd6ed7f5149f61453b5a5b27bebe6769f73da +EBUILD bees-9999.ebuild 3103 BLAKE2B 8aac86dc3e6e5ec9fa947ad70d718438fc7befc991c89db9f696c25d4df85a0c664e75a8e97396d48b1d68318f52d864baae428eb4c47c2ec25dff74d9a91e68 SHA512 4267d9824b1f15535c35dae20c442355ec2c05cd16707579df21f19d6478dbcb034af6103b76c4829b6aa5b21e30bcf0bfc83989f709a0dcb2d21c7bcef933ba MISC metadata.xml 591 BLAKE2B 8744c233c9718ce545165c6c8deaa455efe283cfe186aeee9876ad31195891b1255ae20851e5d5f52c19f4bb038558dffd7c2f3bd091af1b0b5c3d6e7a717975 SHA512 333a091d0869955cc3fce76c1d462b44715f8f1b89017c1b240cd5398e53ee1b370f7fc2d76407efa8a045c1088a195786da072d4d6ec30c1f09f42977839b20 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 b020e2b9f422..ebe9899ceec6 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -1,11 +1,8 @@ -AUX btrfs-progs-4.19-be-bswap.patch 1035 BLAKE2B 153ffa73bf79eca3172bd566d7daffd84d52fcb01fd69ad30547ed44a2ce1eec23b6eb95bbcb0259a966a152f796f5c57f022b33cbf7063c4e53236e93c6b3aa SHA512 695d21bd1dab1196596e4f6e2d14020e0b0e938493459feec33ac21f9ab6ecddc5c14a79ba738166d6010662b4f6c75232c6d3393d8eb69c5d7c7d0560448051 -DIST btrfs-progs-v4.19.tar.xz 2001340 BLAKE2B 117087adcb57e4ebf6a2e9c66bf0ad2b098108f7363fc3c015d73bf9afcda9d579831fe0e324125893cdb2510873d052522b15843c461e640a546900e535ce76 SHA512 e5abf637a9c811973422ca05a5530f6cd18263013d141277e2a70099cf8ab7e0eb8781df56368da4321c90f21d1022ad852b661adc4877e9a9ba5c60ccbefdee +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.7.tar.xz 2182728 BLAKE2B 47573baa26cde058003b402dadba28f278b4b3ffd270d002ab8fd72d94ee41d3fdfb3d36c0c579e24ea6afae4b2dea2ca704d9dd809fcd10fbc146d63d48980c SHA512 72c3af13ca589f2e0b96cb7602319035ef8aab6ee224fff3544a5d0bfc013a66552dde4533ec5e64696d404b8905431cd0f25367c40fd34ea39be7c0ed8c2d16 DIST btrfs-progs-v5.9.tar.xz 2189724 BLAKE2B 3692e058e5e52c2a3684548d0b0ca94a9101a66dc8951266a49a71b6848b7f0cce8ade0e914ae8b71345021750e7d20742af13aec69aef7d52e3030fca289529 SHA512 38db047198ab0467d3fe235f7e8e1fd14ade00dd0b182588220c5f5e4b598efbdcd30a3d5d56cf0a0ed8a902d2374af0927eb7f3720cd761172c7291a2a65c94 -EBUILD btrfs-progs-4.19.ebuild 2935 BLAKE2B ec90c74cd306183cf06e9a16551d0bb3c029eed1336ee32ba06fc243fa6598cfeacf896334e36855055031c67c49d4eaac15f27d6c2c13e1dbe125cfef757c7d SHA512 cd4490f127fa27ffd9916c8464c3dcf6453d5da8e9a4ba81e3c4ddcc6fa17740293c7324a80c1bc5d3faa2a28b6f7dbcf5cba577cf6a9e09652fb1a02bb66cff +EBUILD btrfs-progs-5.10.ebuild 3070 BLAKE2B d3fb551cebce7f7d4e19ab71432c7fad7de0aba886fa374058f52da7f685243c4bd02aad0b2d7fb0a84421c3e0b1cc5e730043dab89bf570ac0e40ea15c64a58 SHA512 bb03e7d41b3b7f9b0bdd2e2f1697bba76e63173d999b917d9a02e2159e46fe5fbd871512fac2422120927798a85b8a93ab4dc2263f18626495a33dd3d27ee2ad EBUILD btrfs-progs-5.4.1.ebuild 3058 BLAKE2B d2be1b014f995baf9393b13dbdca9fcb48ecc234874fc17e942132d64b367a6e0b361d75afc4dc8e4fbde1aa117fe946da21470442d914600e170af6e73f17a1 SHA512 3517e324fc6cf4f40a74bbab8979e454b105d790d093f2d614630038b64cc3a3eddfabf90f611612d69ac5c5cba5e9d89c65414a2a95dbce9138c32f1f12ef39 -EBUILD btrfs-progs-5.7.ebuild 3071 BLAKE2B 36dbc24c764f7a903b611b52ce125e06c4e29b54dfd4ab3a89d77b7f52fc5696b0f01dce4b4305e1852d317f7624090e60598ba319a92dd52128424760a6dba6 SHA512 d09374b0ff974ecf54aad32eaf6394289f36bdce10940ed80f4100444db3fff03e847bf4834937a1a9aa8748b6bef32e597ea0a6bf08d0de29f497ef75062190 EBUILD btrfs-progs-5.9.ebuild 3071 BLAKE2B 36dbc24c764f7a903b611b52ce125e06c4e29b54dfd4ab3a89d77b7f52fc5696b0f01dce4b4305e1852d317f7624090e60598ba319a92dd52128424760a6dba6 SHA512 d09374b0ff974ecf54aad32eaf6394289f36bdce10940ed80f4100444db3fff03e847bf4834937a1a9aa8748b6bef32e597ea0a6bf08d0de29f497ef75062190 -EBUILD btrfs-progs-9999.ebuild 3064 BLAKE2B ce781c34885668adeef3e1a0009f0a929122b482e7ef356a33652d791f082c9f2832b280c1f10894f3c43b0724c24f69850b26fbc26ee3d6a56b47dc7c409f9a SHA512 2797cbc83b6716addd885daa532fd17df55da984d8c184ecc37a75cbbc47765cb530909572671adf680f7408a3d75f58aceefcb544ab948d9a5b6cb9c77168ef +EBUILD btrfs-progs-9999.ebuild 3070 BLAKE2B d3fb551cebce7f7d4e19ab71432c7fad7de0aba886fa374058f52da7f685243c4bd02aad0b2d7fb0a84421c3e0b1cc5e730043dab89bf570ac0e40ea15c64a58 SHA512 bb03e7d41b3b7f9b0bdd2e2f1697bba76e63173d999b917d9a02e2159e46fe5fbd871512fac2422120927798a85b8a93ab4dc2263f18626495a33dd3d27ee2ad MISC metadata.xml 523 BLAKE2B 7757fa4d4f1400bf08e2975e5214a1dd0c8258b61366c98089ca9c497b8c62e497cdedad605370f7034519b91c266b23e2e42bcafef3bb2bb69cb6b93319fa00 SHA512 3830f8f555ade672eeb52394a5b262e06e69b8b27d947d81dcde9b341fea9f16b77df8101ee5cd3314b6552543431a5f32a2592bf77a7a50e28cc56c95a4b164 diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild deleted file mode 100644 index 12bf74643416..000000000000 --- a/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 2008-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{6,7} ) - -inherit bash-completion-r1 python-single-r1 - -libbtrfs_soname=0 - -if [[ ${PV} != 9999 ]]; then - MY_PV="v${PV/_/-}" - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86" - SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" - S="${WORKDIR}"/${PN}-${MY_PV} -else - WANT_LIBTOOL=none - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" - EGIT_BRANCH="devel" -fi - -DESCRIPTION="Btrfs filesystem utilities" -HOMEPAGE="https://btrfs.wiki.kernel.org" - -LICENSE="GPL-2" -SLOT="0/${libbtrfs_soname}" -IUSE="+convert python reiserfs static static-libs +zstd" - -RESTRICT=test # tries to mount repared filesystems - -RDEPEND=" - dev-libs/lzo:2= - sys-apps/util-linux:0=[static-libs(+)?] - sys-libs/zlib:0= - convert? ( - sys-fs/e2fsprogs:0= - sys-libs/e2fsprogs-libs:0= - reiserfs? ( - >=sys-fs/reiserfsprogs-3.6.27 - ) - ) - python? ( ${PYTHON_DEPS} ) - zstd? ( app-arch/zstd:0= ) -" -DEPEND="${RDEPEND} - convert? ( sys-apps/acl ) - >=app-text/asciidoc-8.6.0 - app-text/docbook-xml-dtd:4.5 - app-text/xmlto - python? ( - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_MULTI_USEDEP}] - ') - ) - static? ( - dev-libs/lzo:2[static-libs(+)] - sys-apps/util-linux:0[static-libs(+)] - sys-libs/zlib:0[static-libs(+)] - convert? ( - sys-fs/e2fsprogs:0[static-libs(+)] - sys-libs/e2fsprogs-libs:0[static-libs(+)] - reiserfs? ( - >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] - ) - ) - zstd? ( app-arch/zstd:0[static-libs(+)] ) - ) -" - -if [[ ${PV} == 9999 ]]; then - DEPEND+=" sys-devel/gnuconfig" -fi - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -PATCHES=( - "${FILESDIR}"/${P}-be-bswap.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - if [[ ${PV} == 9999 ]]; then - AT_M4DIR=m4 eautoreconf - mkdir config || die - local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" - [[ -e ${automakedir} ]] || die "Could not locate automake directory" - ln -s "${automakedir}"/install-sh config/install-sh || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die - fi -} - -src_configure() { - local myeconfargs=( - --bindir="${EPREFIX}"/sbin - $(use_enable convert) - $(use_enable elibc_glibc backtrace) - $(use_enable python) - $(use_enable static-libs static) - $(use_enable zstd) - --with-convert=ext2$(usex reiserfs ',reiserfs' '') - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake V=1 all $(usev static) -} - -src_install() { - local makeargs=( - $(usex python install_python '') - $(usex static install-static '') - ) - emake V=1 DESTDIR="${D}" install "${makeargs[@]}" - newbashcomp btrfs-completion btrfs - use python && python_optimize -} diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.7.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.10.ebuild index 81e4dc34e2dc..94ac55856448 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-5.7.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-5.10.ebuild @@ -1,9 +1,9 @@ -# Copyright 2008-2020 Gentoo Authors +# Copyright 2008-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6..9} ) inherit bash-completion-r1 python-single-r1 diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild index e8b44f1ff9b4..94ac55856448 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 2008-2020 Gentoo Authors +# Copyright 2008-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6..9} ) inherit bash-completion-r1 python-single-r1 @@ -12,7 +12,7 @@ libbtrfs_soname=0 if [[ ${PV} != 9999 ]]; then MY_PV="v${PV/_/-}" [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" S="${WORKDIR}/${PN}-${MY_PV}" else diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-4.19-be-bswap.patch b/sys-fs/btrfs-progs/files/btrfs-progs-4.19-be-bswap.patch deleted file mode 100644 index b91b32040855..000000000000 --- a/sys-fs/btrfs-progs/files/btrfs-progs-4.19-be-bswap.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix build failure on big-endian platforms. - -Reported-by: ernsteiswuerfel -Bug: https://bugs.gentoo.org/670741 ---- a/kernel-lib/bitops.h -+++ b/kernel-lib/bitops.h -@@ -180,5 +180,5 @@ static inline unsigned long ext2_swab(const unsigned long y) - #if BITS_PER_LONG == 64 -- return (unsigned long) bswap64((u64) y); -+ return (unsigned long) bswap_64((u64) y); - #elif BITS_PER_LONG == 32 -- return (unsigned long) bswap32((u32) y); -+ return (unsigned long) bswap_32((u32) y); - #else -@@ -220,3 +220,3 @@ static inline unsigned long _find_next_bit_le(const unsigned long *addr1, - --unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, -+static inline unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, - unsigned long offset) -@@ -227,3 +227,3 @@ unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, - --unsigned long find_next_bit_le(const void *addr, unsigned long size, -+static inline unsigned long find_next_bit_le(const void *addr, unsigned long size, - unsigned long offset) diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest index 129d442bc20b..e675d3f82fd8 100644 --- a/sys-fs/cryfs/Manifest +++ b/sys-fs/cryfs/Manifest @@ -1,5 +1,5 @@ AUX cryfs-0.10.2-install-targets.patch 1296 BLAKE2B d43ada858124c67242fdf537ae3dd7e6b7bf3566ee564dae47aaa0b0ee3ae20c2beada683d8cda12518f89bda2919ec296c26d004c48a5bbc953aa6c23bc9dc8 SHA512 c097dcc9893dbe7f6098ab80d9937810856de16e6c34ede558dc30edf76571a2e1ef2fdd91fd8d14b2e40d5e32246d08d198cd3ba28f33d19442cd8c2332b4e7 AUX cryfs-0.10.2-unbundle-libs.patch 15634 BLAKE2B dc484cc722cf80e605f52f3b193b1ae5747ad01b796a6b7d8fd81b03be9bcde456591f94d2839c3be3a39dc2a9975ba503d8ad369bf838232157cf1385ef43d6 SHA512 815956b160f5f117a5c4f89babe088e6f485d89a58feb12d514ff0fd3d39752db6695f7a9a2e279d88eb3ef490394dd03ee8b0ca2d04f66793096fac742ae45c DIST cryfs-0.10.2.tar.xz 7902252 BLAKE2B 704d124ed32a8a958f400188af99498cedb706ccfc004131b677a113b6ab2733942becb1ab64fd06d0b9d5b39f7abe832b3b0669caaf2b6feb7c6577c8c7fbfd SHA512 e49dd6d1e402d968cc4df0e8ca0460a01a27e4e73482041dca0fa9cde905a91d12e2bda18d257a044335e32e316b9363cecf374eb2ca621924b394dd2fabcb8f -EBUILD cryfs-0.10.2.ebuild 2295 BLAKE2B 3c3ebc455fdfce6d3bf498e3fced4dfa9270d9434e7224c3763af8380ac635112e4d5110e38fe1e62608d488503bd4011dfe9698737cb66d13b05907ee26877e SHA512 8fc95d23665a10c8f1ffc1f542ae7fca8cc77d73f397595b09dfe7ea1fcc70dcc7af7175f6e2643b620011b2735879360eda3b40562673519c8e8116320b1828 +EBUILD cryfs-0.10.2.ebuild 2294 BLAKE2B ccfd5ba4a688d45eee24e65187ee2ee2f1b20e86f9081a4bebfa043b1946411ae31c10eabcaeb439cb2b840be3ebfa0eec2fbc7744bc53e410c6b4ff8ab208b7 SHA512 99811a7e29ea990277ad165b115f45c9926f6c440a830a4cc8bf903bb6577467f1f5045978d4071f4ade98e7e1c2517aaf97b756b408a5dc8f95076f3a393eef MISC metadata.xml 491 BLAKE2B 481c7242ceac6e8d51121976478817f2acbd7c845992b1d4ead21dab39710a2b465acf3bcbb6a8207e90065875b3563517758df4845ae1e4fc3bf1c8c7f25103 SHA512 11d71adee10ca97cc8a8bba077a9459af2f51d328d53eb63748cafcfe43992d51bf129ea1043f823b299874f6bdf8ab390a714570a5516fbb60d094c9aac6e14 diff --git a/sys-fs/cryfs/cryfs-0.10.2.ebuild b/sys-fs/cryfs/cryfs-0.10.2.ebuild index 5ab97c61f31f..65463581b24d 100644 --- a/sys-fs/cryfs/cryfs-0.10.2.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6..9} ) inherit cmake flag-o-matic linux-info python-any-r1 if [[ ${PV} == 9999 ]] ; then diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index 347a7734ff81..ca7fddbd7481 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -28,7 +28,7 @@ AUX lvmetad.initd-2.02.116-r3 345 BLAKE2B d458efd01fa08debe0857072c880adf9514774 AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c97256a42b725e015a13c9673e79c0d1a10213d1eecb6c75d4ce1ebd99e6200010f19c36d758018bdef303ea08ee5549 SHA512 6359b3cbff1fa05944fb69582234220cac593b2c8f8317162a728bac72ced4f8b492ce11e6ced6d848a7654fa4a506c1e658f546cff302344a739646479a62dc AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22628b785aabb33fc993629e5370788216bd814246aeb3a5546fd5446383ce24342e716579887556edf2bbed2 SHA512 3ce56f0c0d2e7dbcdae5be263199f73ee5c4c052599d53cde9b16500a326d0340893344f4671839be06b5b4225d592175d01c9974db14f2dc220d6e9a1d47e91 -DIST LVM2.2.03.10.tgz 2510568 BLAKE2B 1b4e9d09ef948b79a2e6e70fa8f8c9cd38ec8d8d1462eefb059f93020f65664538cee9bab41b81aaaf719ca428a9e824a2b181f40ebe261c5dd0fc6551ebcbb3 SHA512 8678ae2f99739ccad0250f6f4b4b8e84520f2053835985a1ea9c80196a64df31a48858aebf983170c3dfcafecea83f2c6aa630ef73fd31dd84cf1627a1b421e4 +DIST LVM2.2.03.11.tgz 2528527 BLAKE2B 4c02e630e033f9bfed44468b5b8dff4af52c943cb9d6385bfe568ba50463dfc97cd968d79c34eb2528d66930d6c2895de17fe546a34d80fd17a5892560bcb670 SHA512 50f21337e397fc5b4692bb08e5d48409b907b96b39168343bab2d40bb74fd84ff466e15f3d664305bc044f3f6be4369fa7378399d5a838793632e74706f17653 EBUILD lvm2-2.02.187-r2.ebuild 10065 BLAKE2B 1c218be6a3234cf8da1990991417dc429acc8ce5fc9cee06c0edfc89b1af894a1b2abe6d42ad9341608f39b70fe2e7bc97b4caf5afcb64a4de9baef7cd0b7890 SHA512 bf357c4cfd8eb8e75d20e2157b4f5203b2cfb8b2b16dad298796c4ce8dde8c6da07f6760bda85972bec5cb77fe08b94133a8bef7e793ab9c4c31ac30b7ce7e11 -EBUILD lvm2-2.03.10.ebuild 9512 BLAKE2B 39d40130cd82a79f3ea2e5ecc18a0bc56f739eb7eee4a6974e24af1a1e75a3db222ec12b5b5f9ac513a106d177bb9da03fff9ea0eab57d1768037d5c5d9b8e9e SHA512 a83a7ee5cecf50d677a0ecfb9356d60d01fa12cabff76ca2223f4125a614303766bc90907e967690643030a8296c3b8a5fba0d7ff984340b0ad8e2079feb0ad2 +EBUILD lvm2-2.03.11.ebuild 9519 BLAKE2B 85da508150b02eb5eda4fd27ed7dbd0feade48653e0ffb1856586bf8eec163f8ce65239963c81bbaa3f9aa24be4b837ea2d110de4475cb1cbc7bdf7977184248 SHA512 69f3f20c0ea7601fc787b218f7655a56234a01a5823e428872f0b72248a3404cbea7b439524ecf42c27805e56ead76e1d17514fa8de53616c3eefb1a8a9db5a8 MISC metadata.xml 1020 BLAKE2B 6427d15f63ac775b03758cef58620c77fb2dd6f92de8ac23a87b51d76ae3882acf5f555c3aada81235afa0f52290e35d142083004e53443902a710721228e213 SHA512 834e3798b590e693d6a26c708985ee6c3eea27b958924827d9325fbe7bd00711bdfbfabfd21d408752393f99131588116b3d2b841107afadf67e09cae3289ed9 diff --git a/sys-fs/lvm2/lvm2-2.03.10.ebuild b/sys-fs/lvm2/lvm2-2.03.11.ebuild index 7009b7723550..47f9c06d38dd 100644 --- a/sys-fs/lvm2/lvm2-2.03.10.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.11.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 @@ -11,7 +11,7 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only" REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) systemd? ( udev )" diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest index a7cd1dfa5462..9ddb45b0f816 100644 --- a/sys-fs/lxcfs/Manifest +++ b/sys-fs/lxcfs/Manifest @@ -3,5 +3,8 @@ AUX lxcfs-4.0.0.initd 533 BLAKE2B c4dee71fbbe477c46cf2d661f335a43517158c3c2061de AUX lxcfs-4.0.0.service 427 BLAKE2B 4a681cfe9f856f0a2986fc2934ee3712f02af2ba3b085ff1c9fe4bdb80195ea943e4c9d1640410b9302c7c42d697d3483a0d8e4942a1f494695199bdfd6dfeca SHA512 592847d97ec6afd69de670918fdf5e7e8ef4ba730d917cd78a177c164d69c5d80417fed1b2a41849e08f5b9f3bbe28e3ad99887c195db6fd0ebeb559f23214bf DIST lxcfs-4.0.6.tar.gz 451636 BLAKE2B 97de1825c4a91f4107dbee513246ff48a04956adce7a262a9744730067ac9c31fb6c7802757912640e58eb93504e12338e572acacf3ad300c1253eb517583226 SHA512 843ca196304efc963549c0e081bea4d58182887611da36232e875de4898d738111a967d89b4b49a9df51f25daf119ad2d488b8298cdef82926be03a7fa99a8a2 DIST lxcfs-4.0.6.tar.gz.asc 833 BLAKE2B c5700c962a608fabc1a7ae4cd708c590a26dfebb72ea9c3db81500bb4e936e7f7358fbfb2c2a0e9531ffceb266d719bb3f6415f4d018ac1ba87b7b7ebddd21bf SHA512 ceffb3dfe3b2751b944be08df84dc30c465b8cde12e16d37e54ce616e5f2032f287a475ca280da51bc4fc518904e64ea7f4681dd6070e63ebd7ecba8b09600e5 +DIST lxcfs-4.0.7.tar.gz 454108 BLAKE2B 8af5a9177089d0629ef05b6f28b9945dcf6f1102bbc3c5458fd71959912201d24b9ea31fc4b4dc51dca388d59ba1ad2a4494561108632abe8b90f1bef4a2e85f SHA512 ab66d4278f8a5e0bb0e7495badcd587ef5fa48fb6271d8682cdca8b0f7c5c4b5f889ca43a86520e6aa28d6824be20f050707169bbed5921e3e4f7eaa0be7a1d5 +DIST lxcfs-4.0.7.tar.gz.asc 833 BLAKE2B 26cb25e41471257925600fcab5a01933076c1ab304e14f71defc21c5b7563e2c0acd832051def79f277322e47a0efe76eb41121293a9b796e486e8a7747f5e2f SHA512 3e9ff48197caca2776665171167805627a421741c02ee4a30e22b3c4ff8e9e58d71997302f45772c58de831ba5315fd335e8856553cfbfcbae1909ad8625f505 EBUILD lxcfs-4.0.6.ebuild 1363 BLAKE2B 82731f3940188d78b8503c3b050bedfd06d4c24f6742cd80c006487aeb481bde50b7b444bfef7b1860967da759840088977b2cc2b3cb20b3306f541d81698fba SHA512 a7effe7aec113adf8c48b4bbec38fb0e81a7f5568f6bbf84886ca7a7946648f6a5b427df2d3f567fb6d16ded5fc09ccc89698354db8c99abe0086189059a5a0a +EBUILD lxcfs-4.0.7.ebuild 1447 BLAKE2B e5711cb3ae0d93591afede59b97bafe863486c18d7f6b314905f3c991e08f6764b7fe69005f33ed07bef49a68ecedafd7b1c377a137fd83d97b8a53cab09fb09 SHA512 88fb2e45a0931820bdb1c94e0275a87bbe2989d3ea6f7851dd6adb587936991db178ce388a5cf22341f0dc8a1c3bd48d99aefdd21ece01799b16d4b426710e05 MISC metadata.xml 709 BLAKE2B 7c053869dc93fb8eea0b63604fa137736820ff1e2b8e6ee7d500ffd2a46ab381dc1321f2df0268d8f34eef10935f98959089b9f983c112b6809880b27f93eeb6 SHA512 bba720236a7d3fb0c4e71f624575c14a79abacea4441d672a151a3fe16c220fde0c03fa4bbdb2f7d0171920ccb787e1357a0c7aaa54bea4244e8e6771423f19c diff --git a/sys-fs/lxcfs/lxcfs-4.0.7.ebuild b/sys-fs/lxcfs/lxcfs-4.0.7.ebuild new file mode 100644 index 000000000000..61b57c9974a8 --- /dev/null +++ b/sys-fs/lxcfs/lxcfs-4.0.7.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools systemd verify-sig + +DESCRIPTION="FUSE filesystem for LXC" +HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/" +SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz + verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz.asc )" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="dev-libs/glib:2 + sys-fs/fuse:3" +DEPEND="${RDEPEND}" +BDEPEND="sys-apps/help2man + verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )" + +# Test files need to be updated to fuse:3, #764620 +RESTRICT="test" + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # Without the localstatedir the filesystem isn't mounted correctly + # Without with-distro ./configure will fail when cross-compiling + econf --localstatedir=/var --with-distro=gentoo --disable-static +} + +src_test() { + cd tests/ || die + emake tests + ./main.sh || die "Tests failed" +} + +src_install() { + default + + newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs + newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs + + # Provide our own service file (copy of upstream) due to paths being different from upstream, + # #728470 + systemd_newunit "${FILESDIR}"/lxcfs-4.0.0.service lxcfs.service + + find "${ED}" -name '*.la' -delete || die +} diff --git a/sys-fs/rar2fs/Manifest b/sys-fs/rar2fs/Manifest index 30845575c953..ced00a42bd55 100644 --- a/sys-fs/rar2fs/Manifest +++ b/sys-fs/rar2fs/Manifest @@ -1,3 +1,3 @@ -DIST rar2fs-1.29.3.tar.gz 267415 BLAKE2B 269ad7f301595e6c17899fccd926589f883ab14ae43af9d6a024e6e381b2bf64786eba314431b32a1f6c8add315afdef259a1bc24da9ae93378d2ac38d3f3cce SHA512 75def71f088df0d9c9a62009178d0c1682f1ff75708c7b273dd669ecb1406795e53ff8ad0f6323d275f13cb580bebfaf1ca5b5c76026bb9b83360aed2f26935e -EBUILD rar2fs-1.29.3.ebuild 869 BLAKE2B e6e70a39b962f002b111f63449a8fc44910cd71468f12a742f7149a1d635b5d0eb3db124f3eacedb11f896749d31793f4dc3aa37a8cf25cf3362a950f48f6f44 SHA512 31c3521e8a06b1132d54ce84fde7f068609d1b9d2192d890b3cdfbc4eba5ab021416d651e2392a3100c161e0b6583444423732d5ea03ab6b3d61c876780c0317 +DIST rar2fs-1.29.4.tar.gz 268299 BLAKE2B 771e3dfd4fcf69e34adcca3203069d3820e1ed79b1554967fdde51d4a894303646b027dd54b923f319b2a926535db8cf6f68f5edc0b09759df7dacd7aa988bc0 SHA512 7963e420170ec06caab9321443ae75320e1eb6c034cde53d862cb3203ad36fe20b762e389145a80f1b010825d3a51bdc1d7bdaa7fc52edec11ddd8cec8a0c902 +EBUILD rar2fs-1.29.4.ebuild 869 BLAKE2B e6e70a39b962f002b111f63449a8fc44910cd71468f12a742f7149a1d635b5d0eb3db124f3eacedb11f896749d31793f4dc3aa37a8cf25cf3362a950f48f6f44 SHA512 31c3521e8a06b1132d54ce84fde7f068609d1b9d2192d890b3cdfbc4eba5ab021416d651e2392a3100c161e0b6583444423732d5ea03ab6b3d61c876780c0317 MISC metadata.xml 450 BLAKE2B 376df33314a93fca46449a3f491c4f6e31111a31fcbdd7be9cb6cd4207a45854ba70d7aeceaddc12c60b5b60d63080df5c4355aeeedff45c88605341f894d48f SHA512 c41759771363256abd1bfa7b1bab8dad7b2bdb721c74c7c2e279d94fda8fb68b98abf3f7a486ede01cf6ed6b7a4f9f048053438f414be5222ffad1542e5cf539 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/tmsu/Manifest b/sys-fs/tmsu/Manifest index 313c9e9c068b..09363e3a81d6 100644 --- a/sys-fs/tmsu/Manifest +++ b/sys-fs/tmsu/Manifest @@ -1,7 +1,6 @@ -DIST tmsu-0.6.1.tar.gz 92874 BLAKE2B 492145376c1e96dfab5be2692ae98d5171e6a3797bd132151ecf34db27c223be429fb7ca675f6724f875884b30e2887e0c357f9ed0020de7a2fda6718280dd5d SHA512 53bc9d880f9138e9d88b25a151f72a5a3110418002c2a1a6101d2794c0b6fd854ebd52e589f3b1ffa18f1b5c2f2298550246fc6cb1bfebbfd0131692c2fa5512 -DIST tmsu-0.7.0.tar.gz 98108 BLAKE2B 560d7a241d6e6ca3a0e3cde4a446af458bebf83ae8449d043789756bca56c1cbe03453d23dbc397ae205df68c38e14e9ffff7ebfec107b45a7fc4671a527dbb5 SHA512 c3f719f4962291a9701d2438381aeb65ea470b896ab6acf5a0871b1984bbb2758380a73ddc94c2b37ea2a45477fb66eb1a2afcae3f1e7ca3e469913f7562bd66 +DIST github.com-mattn-go-sqlite3-v1.12.0.tar.gz 2282527 BLAKE2B 34ba9482085c3ab6b9612b01258f6c55cee897c6f60cfefcd51d3e0e5af804fd2951d849f2f89e0907b1493adac69516c543ad721706317881a027f5a577dea3 SHA512 7e8656ecf70b2ffc40f6351b661f5eb75caa63c3e9784a805821bf0ca1f087203f1afe80f58af0e5520ff04baff728c93d670fd7ecb6662bb0fed1dd798ada96 DIST tmsu-0.7.4.tar.gz 98631 BLAKE2B 4af013de08f43b6ee337259b394aafce0862d3f0811174b196785d6e05d520a188ef6a1ce6f320dddcff6b2ab47cae8c248201a27d79bdd09d80b91e12161abd SHA512 28af79a03c774d8c08651cfac794d14a3363d3b5f6b037de1a74968b22053da45e6290ec9c5159950539e1e6577d01c06c62a05eb2b4f01ad5635d98e52b4e20 -EBUILD tmsu-0.6.1.ebuild 828 BLAKE2B 544356fcf009e348278680947a1fa071e7afc74b2406021957353d51ff9bcde27025a97fe02a6c2d314498dd14224fdae0912632f47b1491fd72c6452e31406c SHA512 95b03475431a7d9c539e6bc3a5e49110515cdbb23fb91693ca7d92ae749419a3619f22497581fd0199d6105f2ac785a46798d7ace764026415b2d2216f35767f -EBUILD tmsu-0.7.0.ebuild 828 BLAKE2B 544356fcf009e348278680947a1fa071e7afc74b2406021957353d51ff9bcde27025a97fe02a6c2d314498dd14224fdae0912632f47b1491fd72c6452e31406c SHA512 95b03475431a7d9c539e6bc3a5e49110515cdbb23fb91693ca7d92ae749419a3619f22497581fd0199d6105f2ac785a46798d7ace764026415b2d2216f35767f +DIST tmsu-0.7.5.tar.gz 98766 BLAKE2B 45208c070a92ad2f5791e27437f86702b7ab95bd0d9a0e77a0daad0f3c416bf881e989fc73d064ef3d302d640d7c6f43b7afae475f31f45bcc7f051aa5805429 SHA512 6f89eb156d2be86650ab84847ca0ddea985cdddf35db5f5843632b6a54f88681584b6864e4a14bc36cf1949713e098067e6f8dda0242f27b6061720165f71be1 EBUILD tmsu-0.7.4.ebuild 848 BLAKE2B 73ea7a0136d29c6c0e24cd576b96888b02ab8af284c7b2fb928d7af5188ed164211fd78236b5e21d223c19a0ccf65797d74c407f1d8c46b6c6fcd3a1181221ea SHA512 d70901fe4999ef13483af4ea2996c463c0a96acb522079748d13b04d613c1d902da271159d565b0971d1a649fc5e115070b81f0a57987ee3e0a1de846b37ad01 +EBUILD tmsu-0.7.5.ebuild 1311 BLAKE2B 7f194e69d004dfadb3e8f03adcf271fa70bfe6f6dccf4998273d4bdc0f336ef425251c5a454c5a914389b30d956299f87b31acd65d83a1fa4efd8c4f3cf7ce6a SHA512 d5c25be8c76acdbbe86be7570efda4cc439581f39009f7d8ec532f9e79fc2070262497416a256a6cc73f25d2c63e07b159fd6b9df2918020600e0d2648b97695 MISC metadata.xml 689 BLAKE2B 6cbf6167ef4b57c783e261ddd28d80c3a0fe530b7c8e81e4629c34ab8990b3facc149e6a1498bfdf0558874cbc9ab567ca525abe33e8bf3b398248af98364872 SHA512 a360fbb29b7789f3fe5d43f6e25705d2ee5274903bd58b2dccb6d35bf81aec37af7c397e97a6613a846b68540562fd4143636ba0fef1408a9b0b37d98dcb57c4 diff --git a/sys-fs/tmsu/tmsu-0.6.1.ebuild b/sys-fs/tmsu/tmsu-0.6.1.ebuild deleted file mode 100644 index 425fb4cc2359..000000000000 --- a/sys-fs/tmsu/tmsu-0.6.1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit golang-build - -EGO_PN="github.com/oniony/TMSU/" -DESCRIPTION="Files tagger and virtual tag-based filesystem" -HOMEPAGE="https://github.com/oniony/TMSU/wiki" -SRC_URI="https://github.com/oniony/TMSU/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test zsh-completion" -RESTRICT+=" !test? ( test )" - -RDEPEND=" - zsh-completion? ( app-shells/zsh ) -" -DEPEND=" - dev-go/go-sqlite3 - dev-lang/go - dev-libs/go-fuse -" - -src_unpack() { - default - mv TMSU-${PV} ${P} || die "Failed to move sorce directory." -} - -src_install() { - dobin misc/bin/* - doman misc/man/tmsu.* - newbin TMSU tmsu - - if use zsh-completion ; then - insinto /usr/share/zsh/site-functions - doins misc/zsh/_tmsu - fi -} diff --git a/sys-fs/tmsu/tmsu-0.7.0.ebuild b/sys-fs/tmsu/tmsu-0.7.0.ebuild deleted file mode 100644 index 425fb4cc2359..000000000000 --- a/sys-fs/tmsu/tmsu-0.7.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit golang-build - -EGO_PN="github.com/oniony/TMSU/" -DESCRIPTION="Files tagger and virtual tag-based filesystem" -HOMEPAGE="https://github.com/oniony/TMSU/wiki" -SRC_URI="https://github.com/oniony/TMSU/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test zsh-completion" -RESTRICT+=" !test? ( test )" - -RDEPEND=" - zsh-completion? ( app-shells/zsh ) -" -DEPEND=" - dev-go/go-sqlite3 - dev-lang/go - dev-libs/go-fuse -" - -src_unpack() { - default - mv TMSU-${PV} ${P} || die "Failed to move sorce directory." -} - -src_install() { - dobin misc/bin/* - doman misc/man/tmsu.* - newbin TMSU tmsu - - if use zsh-completion ; then - insinto /usr/share/zsh/site-functions - doins misc/zsh/_tmsu - fi -} diff --git a/sys-fs/tmsu/tmsu-0.7.5.ebuild b/sys-fs/tmsu/tmsu-0.7.5.ebuild new file mode 100644 index 000000000000..4659a209a474 --- /dev/null +++ b/sys-fs/tmsu/tmsu-0.7.5.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGO_PN="github.com/oniony/TMSU/" +EGO_VENDOR=( "github.com/mattn/go-sqlite3 v1.12.0" ) + +inherit golang-build golang-vcs-snapshot + +DESCRIPTION="Files tagger and virtual tag-based filesystem" +HOMEPAGE="https://github.com/oniony/TMSU/wiki" +SRC_URI=" + https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + ${EGO_VENDOR_URI} +" + +LICENSE="AGPL-3 AGPL-3+ BSD-4 GPL-3+ MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="sys-fs/fuse:0" +DEPEND=" + dev-lang/go + dev-libs/go-fuse + test? ( ${RDEPEND} ) +" + +src_prepare() { + default + mkdir "${WORKDIR}/${P}/src/${EGO_PN}vendor/src" || die + mv "${WORKDIR}/${P}/src/${EGO_PN}vendor/github.com" "${WORKDIR}/${P}/src/${EGO_PN}vendor/src/" || die +} + +src_compile() { + pushd "${WORKDIR}/${P}/src/${EGO_PN}" || die + GOPATH="${WORKDIR}/${P}/src/${EGO_PN}vendor/" emake + popd || die +} + +src_test() { + cd "${WORKDIR}/${P}/src/github.com/oniony/TMSU/tests" || die + ./runall || die +} + +src_install() { + dobin "${WORKDIR}/${P}/src/${EGO_PN}bin/tmsu" + dobin "${WORKDIR}/${P}/src/${EGO_PN}misc/bin/"* + doman "${WORKDIR}/${P}/src/${EGO_PN}misc/man/tmsu."* + insinto /usr/share/zsh/site-functions + doins "${WORKDIR}/${P}/src/${EGO_PN}misc/zsh/_tmsu" +} diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 445e12078713..352d6f0fa073 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -1,8 +1,11 @@ +AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0535c93ccf83486bbdae8f68d682714576b072a174df070505cce9c6f4b729e91a6f61ed89da72e8e SHA512 92e2be610839432f46cefab4d128825199dc9f2c5ef33119f9ff84dfe635ef56a4f7aaed64ba52ea2798868b00c3a1b7955caa33219aa298c6a2b8290181f94b DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f DIST systemd-stable-245.5.tar.gz 9020836 BLAKE2B 7753eecceffa86c9208c3e71df2037b58b445f9090b73c6ff499b4170b94488a1fd1cabcd17cbb98506a692875a3eef07a40a54d23e09c331a01319f8d03d13d SHA512 47de4a59980643002f325c499eeb4dd76fa9f1d1267686e7564f103690487bf85974590d7cb3e3641409e5bfba567fe2a66efa80320e7e8adc48af4461e2e172 +DIST systemd-stable-247.2.tar.gz 9890845 BLAKE2B 5363f429f4e629b9a05248b77f7c102da37e23c5678e14621ca67edeea59d7995064d037f04eb0ce57dd17a1b3a40a04e00619f77dbde82a61aabbc02f5bc412 SHA512 220739bedb7ccbb35d9d2ff441a52e0615fbe80da5141f7e0420d469f4d66d3604ea72ce70c3deaa2afa5a32b3c7eec4340738337c96891b471e23ed43cd6a82 EBUILD udev-243-r2.ebuild 9823 BLAKE2B 4eb1fc3edd8f76e556c526828018a16f8c461ecd305abb5a7816296fc4338af724b8063deeb6e85e2d8d168f25f44294cd0a15a1c71db42e6ac76d4ddbed493d SHA512 1c1d0fcc4c12f09b6b4345fdfc29a482ea75c61ddf2e23f996848d89aef4d9cd463dbafcfc69b4ea090d438dd60ddfc4343da2a6a4d4c63b79398332dbfb2126 EBUILD udev-245.5-r1.ebuild 5927 BLAKE2B 866e2c0d9fd44bc1d49911f45b4980e3a2aaae753ae8fd57567cb66c8d66fa5cff1d73a07c839eb31c98ba7824aab1da6a81e08af5574ab1e25052dd40f34834 SHA512 511cb0a7a8b303e164588ffbb119b3d5e814246322efc3e5cf73151937c0ce83f214096643a6109dd05f2bf01aa028b759bb925b8f356dc5ada38e13191f3f3e EBUILD udev-246-r1.ebuild 5927 BLAKE2B 986e1d030d43dcced758482f80fcfbb33c77d90118ad25a11563278073cbdc6ec9f396c8ed5b275a01c57ced487107b21a1cd5873314102b23133a006ebeeccb SHA512 9c5dcc2b22501b3230e76efd775e4dc6ad46c39fafa5faa0c9cf84cac6afc1e4f5978cf5674c8410c55cdcfbd6b13f75960af034763dd798b82a930f2f58c3f0 -EBUILD udev-9999.ebuild 5927 BLAKE2B 986e1d030d43dcced758482f80fcfbb33c77d90118ad25a11563278073cbdc6ec9f396c8ed5b275a01c57ced487107b21a1cd5873314102b23133a006ebeeccb SHA512 9c5dcc2b22501b3230e76efd775e4dc6ad46c39fafa5faa0c9cf84cac6afc1e4f5978cf5674c8410c55cdcfbd6b13f75960af034763dd798b82a930f2f58c3f0 +EBUILD udev-247.2.ebuild 5631 BLAKE2B db245dc56b5f3dfb3b2b935b8bc20515f264e06e7850e610edb24e6279c75439871ad6050b280bf6732a3e15ea06ff47636d5a2356eec09f9738907e1b16f7a8 SHA512 241368ab28bdda3f7bad914e15f9abe7e8b24047a5d98abf72162c86ac518e1ee61190f8c139b5929fd9a58c6564602987c4944d7db04ae60dc52e17f33abdd1 +EBUILD udev-9999.ebuild 5631 BLAKE2B db245dc56b5f3dfb3b2b935b8bc20515f264e06e7850e610edb24e6279c75439871ad6050b280bf6732a3e15ea06ff47636d5a2356eec09f9738907e1b16f7a8 SHA512 241368ab28bdda3f7bad914e15f9abe7e8b24047a5d98abf72162c86ac518e1ee61190f8c139b5929fd9a58c6564602987c4944d7db04ae60dc52e17f33abdd1 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d diff --git a/sys-fs/udev/files/40-gentoo.rules b/sys-fs/udev/files/40-gentoo.rules new file mode 100644 index 000000000000..6b96bd07051e --- /dev/null +++ b/sys-fs/udev/files/40-gentoo.rules @@ -0,0 +1,3 @@ +# Gentoo specific groups +ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy" +ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" diff --git a/sys-fs/udev/udev-247.2.ebuild b/sys-fs/udev/udev-247.2.ebuild new file mode 100644 index 000000000000..f028328e33ef --- /dev/null +++ b/sys-fs/udev/udev-247.2.ebuild @@ -0,0 +1,234 @@ +# Copyright 2003-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6..9} ) + +inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal python-any-r1 toolchain-funcs udev usr-ldscript + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/systemd/systemd.git" + inherit git-r3 +else + if [[ ${PV} == *.* ]]; then + MY_PN=systemd-stable + else + MY_PN=systemd + fi + MY_PV=${PV/_/-} + MY_P=${MY_PN}-${MY_PV} + S=${WORKDIR}/${MY_P} + SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +fi + +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" + +LICENSE="LGPL-2.1 MIT GPL-2" +SLOT="0" +IUSE="acl +kmod selinux static-libs" + +RESTRICT="test" + +BDEPEND=" + dev-util/gperf + >=dev-util/intltool-0.50 + >=sys-apps/coreutils-8.16 + virtual/pkgconfig + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + ${PYTHON_DEPS} +" +COMMON_DEPEND=" + >=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}] + sys-libs/libcap:0=[${MULTILIB_USEDEP}] + acl? ( sys-apps/acl ) + kmod? ( >=sys-apps/kmod-15 ) + selinux? ( >=sys-libs/libselinux-2.1.9 ) +" +DEPEND="${COMMON_DEPEND} + >=sys-kernel/linux-headers-3.9 +" +RDEPEND="${COMMON_DEPEND} + acct-group/kmem + acct-group/tty + acct-group/audio + acct-group/cdrom + acct-group/dialout + acct-group/disk + acct-group/input + acct-group/kvm + acct-group/lp + acct-group/render + acct-group/tape + acct-group/video + !sys-apps/gentoo-systemd-integration + !sys-apps/systemd +" +PDEPEND=">=sys-apps/hwids-20140304[udev] + >=sys-fs/udev-init-scripts-34" + +pkg_setup() { + if [[ ${MERGE_TYPE} != buildonly ]]; then + CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX" + linux-info_pkg_setup + + # CONFIG_FHANDLE was introduced by 2.6.39 + local MINKV=2.6.39 + + if kernel_is -lt ${MINKV//./ }; then + eerror "Your running kernel is too old to run this version of ${P}" + eerror "You need to upgrade kernel at least to ${MINKV}" + fi + + if kernel_is -lt 3 7; then + ewarn "Your running kernel is too old to have firmware loader and" + ewarn "this version of ${P} doesn't have userspace firmware loader" + ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7" + fi + fi +} + +src_prepare() { + local PATCHES=( + ) + + default +} + +meson_multilib_native_use() { + if multilib_is_native_abi && use "$1"; then + echo true + else + echo false + fi +} + +multilib_src_configure() { + local emesonargs=( + -Dacl=$(meson_multilib_native_use acl) + -Defi=false + -Dkmod=$(meson_multilib_native_use kmod) + -Dselinux=$(meson_multilib_native_use selinux) + -Dlink-udev-shared=false + -Dsplit-usr=true + -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" + -Dstatic-libudev=$(usex static-libs true false) + + # Prevent automagic deps + -Dgcrypt=false + -Dlibcryptsetup=false + -Dlibidn=false + -Dlibidn2=false + -Dlibiptc=false + -Dseccomp=false + -Dlz4=false + -Dxz=false + ) + meson_src_configure +} + +src_configure() { + # Prevent conflicts with i686 cross toolchain, bug 559726 + tc-export AR CC NM OBJCOPY RANLIB + python_setup + multilib-minimal_src_configure +} + +multilib_src_compile() { + # meson creates this link + local libudev=$(readlink src/udev/libudev.so.1) + + local targets=( + src/udev/${libudev} + ) + if use static-libs; then + targets+=( src/udev/libudev.a ) + fi + if multilib_is_native_abi; then + targets+=( + udevadm + src/udev/ata_id + src/udev/cdrom_id + src/udev/fido_id + src/udev/mtd_probe + src/udev/scsi_id + src/udev/v4l_id + man/udev.conf.5 + man/systemd.link.5 + man/hwdb.7 + man/udev.7 + man/systemd-udevd.service.8 + man/udevadm.8 + ) + fi + eninja "${targets[@]}" +} + +multilib_src_install() { + local libudev=$(readlink src/udev/libudev.so.1) + + dolib.so src/udev/{${libudev},libudev.so.1,libudev.so} + gen_usr_ldscript -a udev + use static-libs && dolib.a src/udev/libudev.a + + insinto "/usr/$(get_libdir)/pkgconfig" + doins src/libudev/libudev.pc + + if multilib_is_native_abi; then + into / + dobin udevadm + + dosym ../../bin/udevadm /lib/systemd/systemd-udevd + + exeinto /lib/udev + doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id} + + rm rules.d/99-systemd.rules || die + insinto /lib/udev/rules.d + doins rules.d/*.rules + + insinto /usr/share/pkgconfig + doins src/udev/udev.pc + + mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die + rm man/systemd-udevd-{control,kernel}.socket.8 || die + doman man/*.[0-9] + fi +} + +multilib_src_install_all() { + doheader src/libudev/libudev.h + + insinto /etc/udev + doins src/udev/udev.conf + keepdir /etc/udev/{hwdb.d,rules.d} + + insinto /lib/systemd/network + doins network/99-default.link + + # see src_prepare() for content of 40-gentoo.rules + insinto /lib/udev/rules.d + doins "${FILESDIR}"/40-gentoo.rules + doins "${S}"/rules.d/*.rules + + dobashcomp shell-completion/bash/udevadm + + insinto /usr/share/zsh/site-functions + doins shell-completion/zsh/_udevadm + + einstalldocs +} + +pkg_postinst() { + # Update hwdb database in case the format is changed by udev version. + if has_version 'sys-apps/hwids[udev]'; then + udevadm hwdb --update --root="${ROOT}" + # Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd + # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda + [[ -z ${REPLACING_VERSIONS} ]] && udev_reload + fi +} diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index cf615425a349..f028328e33ef 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -93,16 +93,6 @@ pkg_setup() { } src_prepare() { - cat <<-EOF > "${T}"/40-gentoo.rules - # Gentoo specific floppy and usb groups - ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy" - ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" - EOF - - if [[ -d "${WORKDIR}/patches" ]]; then - eapply "${WORKDIR}/patches" - fi - local PATCHES=( ) @@ -222,7 +212,7 @@ multilib_src_install_all() { # see src_prepare() for content of 40-gentoo.rules insinto /lib/udev/rules.d - doins "${T}"/40-gentoo.rules + doins "${FILESDIR}"/40-gentoo.rules doins "${S}"/rules.d/*.rules dobashcomp shell-completion/bash/udevadm diff --git a/sys-fs/udiskie/Manifest b/sys-fs/udiskie/Manifest index 8b1659e3c7a3..008e369ea8b6 100644 --- a/sys-fs/udiskie/Manifest +++ b/sys-fs/udiskie/Manifest @@ -1,7 +1,5 @@ -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 -EBUILD udiskie-2.1.0.ebuild 1094 BLAKE2B 32f5aed7d312f8e5e03e9ff1ca9ef06338f2f9bbcd21c76a7f175f1ba9844cdf8c8b081daff9ef800fc1fa794e0f7292dc8dcf0537acdd280faafb8d60d598ea SHA512 3a91284b4bdb3eddc252be3513eb8d1512d7a40b1b0b19e478d618a253a187d6defb1062dc148362287e09889b7a7a734382ba82bfbee470b5693b7788558970 -EBUILD udiskie-2.1.1.ebuild 1060 BLAKE2B 537b294271d993616124655a924b2b4bf665271fd17507146b9ad59edc7fc6634ec8449f339466c1d1f493734e03765f1ea69e3586296a438dbaf049332cf59d SHA512 04827ea4f09649134f953482d1ac5b90f944e301ee1ffa21ab43695c2109c92cfe8ae1c3eb275fbc388a5f1dd5d80a9637425a35d422cc09df183f326db2e522 +DIST udiskie-2.3.0.tar.gz 89954 BLAKE2B ece40590aee684325a8df4b793a5407a0f15ba07c3d8a0df72d72afe5af2f1d3bb6c072fa33fbe61b647a3ed3b0d5b9f6881be4db3943fdc0208e14ced4acec2 SHA512 4b2d97ac458a70bbb6458fdf2386b5847c1ab590d4f8ae420d4c799871be732f793d31c3c6a51558caea266797da10647de437790237f01cc313e08f74524148 EBUILD udiskie-2.2.0.ebuild 1003 BLAKE2B 20fdd6665401685ff2c97f82b989e916f08060e0085a87a1c327c3fef469a00f8c085456b8d5f5a9cf3a098fb752143fea68b98a99038fe20a1098f29d76555e SHA512 b6283de8d33f593580a566572912750f294544a960ea810c5003aedc2cdb8747848f9893047d91c8ac335efeda5aaf84b0586f500e422abff26e00a90713d39b +EBUILD udiskie-2.3.0.ebuild 1005 BLAKE2B 7f2e1c0083cdb534db439f7f981d0571163802c42482c30c1ac875f66ab472801cc82714cb3ceef819bd3149ef337b9c42aa23570cc5d6ba7b747be84af08f9e SHA512 032997d18db21a3ea5e9badbfebecb00c480adf7289e19f49a785eb41dba216c77bff7556b6d05f1646cb9930bc33e520e569a1ad636d1fe5146dc459e6c282e MISC metadata.xml 369 BLAKE2B 0241a847b1eb2f650f66bc3fd631ccdf1927562d510e08c7bcd3db850752b665894838d0c705b7d03690aeea0aa93372d1faae5b313c9136d46e4913c177b0a4 SHA512 0772b0fa065a42292268b9e6a6b99b7198f5923bcc4697913b6c432db4e206a28b0fb1bd6c14b6363591cca02108a8a91029233824c3ec5bd7fbc592a941137e 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 182cb3d80118..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} ) -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 391ac1d6d382..55fa66a15c5a 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} ) +PYTHON_COMPAT=( python3_{7..9} ) +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}]" diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index 00eba1a9f615..14d82051ecf2 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -6,7 +6,7 @@ DIST xfsprogs-5.6.0.tar.xz 1253112 BLAKE2B 7928b29458e3ad8251b48b6fb14a515e01287 DIST xfsprogs-5.7.0.tar.xz 1258772 BLAKE2B 3dab72c1c64d88194f677ed434fe00c8c2eac10c7c6d471d3b32595eb27a76ec1fa20955a08d7c2e371a0d160bce741afad0998731d2fee497917e0d7a4e70f7 SHA512 6a333b7e4fc6afb1689f6bbbbf07b97058cce2fde437fd3ed5b010276c050f886e5c0317ea16aedb23f579a9fed5edc4e7e64b4af5f0331dc8fd97b3251dd231 DIST xfsprogs-5.8.0.tar.xz 1260580 BLAKE2B d4efb81123d46fd7907dd81605922ba283642ead92f6270a3b0d93a0c7321963d5b8b0068a2b6b4cdb236da0653a6432b74056feff77354d2557e899b01f1a62 SHA512 11f2810402ecb83db204346c45ff9f7d643ff2390767794e311a06a10eb97118095e4c377d2b065be50611ec5fc82ac5cbc0a8c7122ee7e9820a2db4e9f177c1 DIST xfsprogs-5.9.0.tar.xz 1263364 BLAKE2B 0504e06a9b2b664289fec3dbb083508438b4950c623e309f326954b81f2e9ca0e65d9eb0c9fa029c49f6708e7995db2e9cab0bc7f42aa048e7f9feb80fc7ec77 SHA512 76f7da8c57e859326b33bff4ceae9f73af485357252b2b1c09808ebb309af5abbafdceb874b9739a1aa87b8f130e42c5ee143fff117edde20844182e7babd0ce -EBUILD xfsprogs-5.10.0-r1.ebuild 2216 BLAKE2B 8b43efe76eceb3bba0435976a9b12c0a4d5b2f9177f36632669fee15fdf954fa41f3f7cdf923d76fc24cd5c748628bb5ec64cc68e2b18adc42b3a7079727f620 SHA512 54dd5582c8e84480d3c84b453d25d26a06652cdd343903d362dd8582dbad89e172e613c514828f49a7145bc1b19997f9f0ab6d612d46f846e8c46b3ae4b12abd +EBUILD xfsprogs-5.10.0-r1.ebuild 2222 BLAKE2B 59967b933984faf7f6c136d5779932a1f33bd323e386779370bd8a870e80b19f2b5eee5506775e4483ed337ebc77d81078156694502ccb5529d2e9f015585125 SHA512 12abeebfe0b4a1f45b4b28299edffef33b04d83e1dcb275eab1a3bbd3c16eee1956930ace1fb490e5d3b8447c6e325ef654b385f059db1b902cd7181e40f82fa EBUILD xfsprogs-5.4.0-r1.ebuild 2848 BLAKE2B eb3bde0412e145bf9b247d41271f2cd1317de1085173a3fa76d02cba4884124d9de76505af4983d60b016e78b33a7000fae73082fa9576814517b12e4325bda2 SHA512 9348ffcf0249b7089c100e6e8c164fd35f967c6a9bcb4242321708c3e1d017c2597a9e3c88879fffdfbb62bab7d67b6eae56a83a5cd51e4fe90fa576f56c35fc EBUILD xfsprogs-5.6.0.ebuild 2603 BLAKE2B bfa5d557473a872df4f5afd89aab9f7484fdd11c7d567dc1474bcfaa880c03eb7c9fb68cfcac81a9a21f1a5d32b7afe09f1af58b1f25e1669206df423fac394f SHA512 0ff4477ac23129c22f9bcec54fb4335dee11e0b759887909a269b6d01d4b27188f68661269b5b3907d1d84de0a8911f1ca1ff84075644e0eb3fb8df44578e73d EBUILD xfsprogs-5.7.0.ebuild 2255 BLAKE2B 5b64ed3ac748471d4f7131015707bd6f12efcbdfd139b3da96015861f2cdcee9d1662a5771f306af6106f60c66e80e60c5506454ee7b4cabcd08a5ead4a6de46 SHA512 4f45c3320bb13444ae2b0b1cd2990de0115dbc13c1dbea8894fb780b64016c70238fa3fe097350d7c77c2dfc5d594d052622ddca5f744ab9d38f3595fede8eaf diff --git a/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild index 8389e2de7798..8ef46ee1bf89 100644 --- a/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" IUSE="icu libedit nls" RDEPEND=">=sys-apps/util-linux-2.17.2 diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index 102cdc2c8c70..b3f2e2df562c 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -1,11 +1,9 @@ AUX 0.8.6-copy-builtin.patch 988 BLAKE2B f79add4b341075e3cd98b6aee4bb74b8fadd28b5ee1062f9260c0418909d380cdd2d637b52d4959ec19cafec1e55b1d05cd6bc358fdffbd6dc1b159e9935083d SHA512 af6b73a2d9d1b4e028c9b959950934798f4d048211d6e4a7e94595982ad2dc8bb4befd52122e3fa0890548e192f2f2ae41d877cad057543e940a7c2710c81a23 DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce -DIST zfs-2.0.0.tar.gz 12989903 BLAKE2B 2961b97aa6736af9b4a2bc968d1488f49ec0c0fd7bb22b6bc015047239279efd2d48f8d7c593f9b467ac9d40f99d67363ab551bdfaf1dd71335c37c48c759875 SHA512 2706ae1aa54b882b272502e7a46e57ff41f9db9b123e8cd5dafbdd7f61975d05538167016f943804145d22aa018a1f11c884f692dc3992b28c24eac08112650f DIST zfs-2.0.1.tar.gz 12970188 BLAKE2B ec1ec4cfcc64adbe7ac0ce65e4fa118a77495886b1c8f2daea0b76f8bb32f0c4bbb6bc7fc16000b6c828f58e60b6ce8359a55ec1f2d2eef1279dd4f430e54f01 SHA512 7e8f490605cb80747a2e471ac5bdd184038f514da379ea7cadf14d5635d5f4cd1b47a7c92c95c4c1b7b0cf5ec22ea905d0d3e8d24e71733484f34cc9429f0f94 EBUILD zfs-kmod-0.8.5.ebuild 4537 BLAKE2B 4cc63f9a5645b5ea988f9a4ccc3aacb1d0e0091047192210a39273ba35cbf7bdde85c495194e9777c84478de2041ed4b44692bacfc82830c6105264d07c8076a SHA512 9bf1464089fa6b0b1dadf4799174ad87331c9f322b59dd234a01542714eabec8fefdc677cbfe7a7f14af0c0067e58599c7342ef0cfea1517aa913781cb62a322 -EBUILD zfs-kmod-0.8.6.ebuild 4636 BLAKE2B b3fb6e9f08bdae9c641e350076c3ca9281428510c696932014a72216b7622176471055a32d629c38941f87b92fffb3f895718f87dba1fe36513542aa68beb551 SHA512 3f7b55b7d9c93222997f5ce4f2d45dba5840799ecdb86e99ec35cff4a5f855230355c79ff3c9b6b7fb47aee2355c73ae38f806a1e5c6c6a49f7df1fdd1e11c51 -EBUILD zfs-kmod-2.0.0.ebuild 4316 BLAKE2B 1e999fd68487f8fb2f4fa66210a530820858e89984985d069d9b4ec0668fc7d385a316ce724334d92893c30cf115a6c91c674f8f0ea06f4b1b10bb285afaf859 SHA512 18bb55ac74eb466d04832fcfab34b2f7e4d118d341314474f7d25b3fba6769161732d3bb50ac91845c8f6d71350ddf023911ddad2470c5331e1e7c04ef0a6c89 -EBUILD zfs-kmod-2.0.1.ebuild 4317 BLAKE2B 8288eb07f607415f25433fb5b80fc329e9c3063c9a58fd310c536840ed50f5167dc072a5ba782cd20e3ede8db176800fc637cc20b831046916fe8b4c4224157a SHA512 be4dc816b2a7ddd022601cc50e0b7c57192b2138fd8043fdb67d673a9425438a65009e38dcdb41926e1175c688d59d38276b8aab31e0c3858685d08961cca8dd -EBUILD zfs-kmod-9999.ebuild 4317 BLAKE2B 8288eb07f607415f25433fb5b80fc329e9c3063c9a58fd310c536840ed50f5167dc072a5ba782cd20e3ede8db176800fc637cc20b831046916fe8b4c4224157a SHA512 be4dc816b2a7ddd022601cc50e0b7c57192b2138fd8043fdb67d673a9425438a65009e38dcdb41926e1175c688d59d38276b8aab31e0c3858685d08961cca8dd -MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a +EBUILD zfs-kmod-0.8.6.ebuild 4761 BLAKE2B 03ae7e6c75b1e0b2032758272eeef7ac5ceccb367ba9180aee173bbe322580ca9757915eaa13dcd88781d738341748e338f25c41eec95f6293a066850dfe286b SHA512 9991249746e2f912c6978eb8f771d2f25cb082a31b26c9bd5167985a6f8c11dcbae4851e965053dccfa7fcad323e973d150b0a4963f47be39c6513d614097d0e +EBUILD zfs-kmod-2.0.1.ebuild 4445 BLAKE2B bb5601f29a461b9df1a65fa04ae99e76bfa6dfc36d1ae34a55b9b6210079ee61c8010962230cdac17ad8ff5abc5302750e61d158b607002598a45de301bc374e SHA512 b9dfb0464c041251531ac24798c731dc8046831d3f657e40402f142953b3c8f68c0eec64f42d13013723a565608fdce0e6ef07a79ff80962b3299ef883273e41 +EBUILD zfs-kmod-9999.ebuild 4445 BLAKE2B bb5601f29a461b9df1a65fa04ae99e76bfa6dfc36d1ae34a55b9b6210079ee61c8010962230cdac17ad8ff5abc5302750e61d158b607002598a45de301bc374e SHA512 b9dfb0464c041251531ac24798c731dc8046831d3f657e40402f142953b3c8f68c0eec64f42d13013723a565608fdce0e6ef07a79ff80962b3299ef883273e41 +MISC metadata.xml 448 BLAKE2B 4a3c4f00039257710b1afa9fceba0480ea53df29d5c7a7eb0037fe326e9cc19f2dca572fa1122d769b6c432b4f6bbf6864d78cc9d0dd3fa797831d7c497ab8b4 SHA512 09d8c75b14b0934d134e10456074f51feeb35f77b59a089f7c6720ce9aa6c83819cdb7e72aa3879a71621310cdd24466ec2c9fd82e6e8040303547249c5464d5 diff --git a/sys-fs/zfs-kmod/metadata.xml b/sys-fs/zfs-kmod/metadata.xml index f47155ec64df..960c5042093c 100644 --- a/sys-fs/zfs-kmod/metadata.xml +++ b/sys-fs/zfs-kmod/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>ryao@gentoo.org</email> - <name>Richard Yao</name> - </maintainer> - <maintainer type="person"> <email>gyakovlev@gentoo.org</email> <name>Georgy Yakovlev</name> </maintainer> diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild index 9067f3662366..6c07ba52c3ae 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools flag-o-matic linux-mod toolchain-funcs +inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" HOMEPAGE="https://github.com/openzfs/zfs" @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://github.com/openzfs/zfs.git" else SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc64" + KEYWORDS="amd64 arm64 ppc64" S="${WORKDIR}/zfs-${PV}" ZFS_KERNEL_COMPAT="5.9" fi @@ -158,6 +158,10 @@ pkg_postinst() { rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon" fi + if [[ -z ${ROOT} ]] && use dist-kernel; then + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + fi + if use x86 || use arm; then ewarn "32-bit kernels will likely require increasing vmalloc to" ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.0.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.0.ebuild deleted file mode 100644 index 81328da6d290..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-2.0.0.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic linux-mod toolchain-funcs - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="https://github.com/openzfs/zfs" - -if [[ ${PV} == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/openzfs/zfs.git" -else - MY_PV="${PV/_rc/-rc}" - SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc64" - S="${WORKDIR}/zfs-${PV%_rc?}" - ZFS_KERNEL_COMPAT="5.9" -fi - -LICENSE="CDDL MIT debug? ( GPL-2+ )" -SLOT="0" -IUSE="custom-cflags debug +rootfs" - -DEPEND="" - -RDEPEND="${DEPEND} - !sys-kernel/spl -" - -BDEPEND=" - dev-lang/perl - virtual/awk -" - -RESTRICT="debug? ( strip ) test" - -DOCS=( AUTHORS COPYRIGHT META README.md ) - -pkg_setup() { - CONFIG_CHECK=" - !DEBUG_LOCK_ALLOC - EFI_PARTITION - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - !TRIM_UNUSED_KSYMS - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use debug && CONFIG_CHECK="${CONFIG_CHECK} - FRAME_POINTER - DEBUG_INFO - !DEBUG_INFO_REDUCED - " - - use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} - BLK_DEV_INITRD - DEVTMPFS - " - - kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP" - - if [[ ${PV} != "9999" ]]; then - local kv_major_max kv_minor_max zcompat - zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}" - kv_major_max="${zcompat%%.*}" - zcompat="${zcompat#*.}" - kv_minor_max="${zcompat%%.*}" - kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \ - "Linux ${kv_major_max}.${kv_minor_max} is the latest supported version" - - fi - - kernel_is -ge 3 10 || die "Linux 3.10 or newer required" - - linux-mod_pkg_setup -} - -src_prepare() { - default - - if [[ ${PV} == "9999" ]]; then - eautoreconf - else - # Set module revision number - sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" - fi -} - -src_configure() { - set_arch_to_kernel - - use custom-cflags || strip-flags - - filter-ldflags -Wl,* - - local myconf=( - CROSS_COMPILE="${CHOST}-" - HOSTCC="$(tc-getBUILD_CC)" - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - $(use_enable debug) - ) - - econf "${myconf[@]}" -} - -src_compile() { - set_arch_to_kernel - - myemakeargs=( - CROSS_COMPILE="${CHOST}-" - HOSTCC="$(tc-getBUILD_CC)" - V=1 - ) - - emake "${myemakeargs[@]}" -} - -src_install() { - set_arch_to_kernel - - myemakeargs+=( - DEPMOD="/bin/true" - DESTDIR="${D}" - INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" - ) - - emake "${myemakeargs[@]}" install - - einstalldocs -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then - ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs" - ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon" - fi - - if use x86 || use arm; then - ewarn "32-bit kernels will likely require increasing vmalloc to" - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." - fi - - ewarn "This version of OpenZFS includes support for new feature flags" - ewarn "that are incompatible with previous versions. GRUB2 support for" - ewarn "/boot with the new feature flags is not yet available." - ewarn "Do *NOT* upgrade root pools to use the new feature flags." - ewarn "Any new pools will be created with the new feature flags by default" - ewarn "and will not be compatible with older versions of ZFSOnLinux. To" - ewarn "create a newpool that is backward compatible wih GRUB2, use " - ewarn - ewarn "zpool create -d -o feature@async_destroy=enabled " - ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" - ewarn " -o feature@spacemap_histogram=enabled" - ewarn " -o feature@enabled_txg=enabled " - ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" - ewarn " ..." - ewarn - ewarn "GRUB2 support will be updated as soon as either the GRUB2" - ewarn "developers do a tag or the Gentoo developers find time to backport" - ewarn "support from GRUB2 HEAD." -} diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.1.ebuild index 4ea7b063affe..2fbfd85f7ccf 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.0.1.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools flag-o-matic linux-mod toolchain-funcs +inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" HOMEPAGE="https://github.com/openzfs/zfs" @@ -149,6 +149,10 @@ pkg_postinst() { rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon" fi + if [[ -z ${ROOT} ]] && use dist-kernel; then + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + fi + if use x86 || use arm; then ewarn "32-bit kernels will likely require increasing vmalloc to" ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild index 4ea7b063affe..2fbfd85f7ccf 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools flag-o-matic linux-mod toolchain-funcs +inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" HOMEPAGE="https://github.com/openzfs/zfs" @@ -149,6 +149,10 @@ pkg_postinst() { rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon" fi + if [[ -z ${ROOT} ]] && use dist-kernel; then + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + fi + if use x86 || use arm; then ewarn "32-bit kernels will likely require increasing vmalloc to" ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index 0b087c61e94f..8b53b60a231b 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -1,11 +1,9 @@ AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e0699ae82618c4c14caf4b26cb466367a5372d7e0a030aa857d024e3db0faef4bb5fa32c54f41f0d4766693a95ba5ab SHA512 e53c79401f4c634a94af27b2f88a40440b68a4c192fd1944668786650aaa0f1f08dff851dca5b9666ce8bba1f0e2b7cb195314cd9d1314c9bab1194d03122319 DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce -DIST zfs-2.0.0.tar.gz 12989903 BLAKE2B 2961b97aa6736af9b4a2bc968d1488f49ec0c0fd7bb22b6bc015047239279efd2d48f8d7c593f9b467ac9d40f99d67363ab551bdfaf1dd71335c37c48c759875 SHA512 2706ae1aa54b882b272502e7a46e57ff41f9db9b123e8cd5dafbdd7f61975d05538167016f943804145d22aa018a1f11c884f692dc3992b28c24eac08112650f DIST zfs-2.0.1.tar.gz 12970188 BLAKE2B ec1ec4cfcc64adbe7ac0ce65e4fa118a77495886b1c8f2daea0b76f8bb32f0c4bbb6bc7fc16000b6c828f58e60b6ce8359a55ec1f2d2eef1279dd4f430e54f01 SHA512 7e8f490605cb80747a2e471ac5bdd184038f514da379ea7cadf14d5635d5f4cd1b47a7c92c95c4c1b7b0cf5ec22ea905d0d3e8d24e71733484f34cc9429f0f94 EBUILD zfs-0.8.5.ebuild 5695 BLAKE2B 05e6a12ea2ab6c7655b2a62d642ed97a9acaa59959f648896a20f9b2336b81af79a60a398e5ad53844b7173abe95705b18fd420362f7e82182896ef0360a637f SHA512 f879e459304b5a2a3a53c5ebb01c0d54d822c3f1f1abb4d26c7a065bc5a184b744aab2777340b7bee9227a855cae4bf44e9cb1ab61b98031b1190d3b387a9367 -EBUILD zfs-0.8.6.ebuild 5698 BLAKE2B 383ee1f3311147c39630abdf55a8dd0f9295f54fbcc8203c2bc3f070a1cf9c4cba78d8638f47191d09c13c8be22d9e553a7f7cc3c69de44cb7ae55ad8da0c74b SHA512 2603dd8af0282c186602b0d958ffc00d155a5e1599aa41c542dd292e620f90e308338b1690f891c28be1754e443b14320b6037b47baa14d54a1c498361d1439b -EBUILD zfs-2.0.0.ebuild 6017 BLAKE2B 7840d4202527a1ace8caeb8b0ef251e9ffc7382aac43338e4b8f786189be5a11ad06d7024f4c5acaa7aff042341391185e10092860d61b8dcaf262b3ddc42b26 SHA512 5256bec61f8e04e6f7eae77fb57c6d16bf95687a799a49ab51b84c1df9ad089ba94d36c5d08f3f5b1a7728a943b7e94c55521eae6ec813cf9790e9ad4e8deb8a +EBUILD zfs-0.8.6.ebuild 5695 BLAKE2B 1512678bd01715aaabb552739c4a5fdfc2251af572032b8aa4b4402828b18c2b6543d742f41c975f97b3be4c3019f0354f97ca62613dfcb4e79cd54565d090a6 SHA512 d3cc8513012eca1ef0d121e97a9347223278c3f0b6bbaebdbdd70403ddad53c508ee614f682a2280d781d777a74b953f90a9d777edbd744c0a3c45addd20f882 EBUILD zfs-2.0.1.ebuild 6017 BLAKE2B e5103b662623047ae487ce98a339732b26fbf06f91f8c4203ccc48dc628d64bed7cb871f5890aa32cd8f662f3028368ce36a4c13e77758c42f7253032a154d01 SHA512 f07f334e0ec1336028cb3bd02a78222cddc7363312ac1709a02f143e3df5fc97768da2d502bf2ff98ef7815e094de99a9c55630c5d7bc04bd6a229cb499c6705 EBUILD zfs-9999.ebuild 6017 BLAKE2B e5103b662623047ae487ce98a339732b26fbf06f91f8c4203ccc48dc628d64bed7cb871f5890aa32cd8f662f3028368ce36a4c13e77758c42f7253032a154d01 SHA512 f07f334e0ec1336028cb3bd02a78222cddc7363312ac1709a02f143e3df5fc97768da2d502bf2ff98ef7815e094de99a9c55630c5d7bc04bd6a229cb499c6705 -MISC metadata.xml 1003 BLAKE2B 640ef6d6f178ae9c3f3281a8e8539980c4a263f6cf0c5f4e1de3f0572f2acfe409865e85a12473129eb026130c9b76b946ee7698bd990b05f14e6b26c40fcb22 SHA512 965eabb5488a3cb54b360b33c847a2eb0d326a2c6761d86d581e06c2f52db9478fe7df131f68cb57bf32a2a872ecc1597e2a1a6b457d254f578d684cf73810c5 +MISC metadata.xml 900 BLAKE2B d51eb3a6b612d11f2687117c3e26960834de7b2a6071117bcefccd034f7c105f1158fda5263823ae90d20ebfb3e850a298333502d47566aefdb4ec0b871d570a SHA512 a746956ce9e80348503bd924bd592c3a4d8e11614732bcdf5f1ea824f2439141694654591fe7f744a2d08f3dfb7ec0c17476079d3490b0ab1838cbbb487dde0a diff --git a/sys-fs/zfs/metadata.xml b/sys-fs/zfs/metadata.xml index 9ce9230943f9..3bdb5e190ea9 100644 --- a/sys-fs/zfs/metadata.xml +++ b/sys-fs/zfs/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>ryao@gentoo.org</email> - <name>Richard Yao</name> - </maintainer> - <maintainer type="person"> <email>gyakovlev@gentoo.org</email> <name>Georgy Yakovlev</name> </maintainer> diff --git a/sys-fs/zfs/zfs-0.8.6.ebuild b/sys-fs/zfs/zfs-0.8.6.ebuild index da9dfd791b0c..e6a729792a69 100644 --- a/sys-fs/zfs/zfs-0.8.6.ebuild +++ b/sys-fs/zfs/zfs-0.8.6.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 @@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/openzfs/zfs.git" else SRC_URI="https://github.com/openzfs/${PN}/releases/download/${P}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc64" + KEYWORDS="amd64 arm64 ppc64" fi LICENSE="BSD-2 CDDL MIT" diff --git a/sys-fs/zfs/zfs-2.0.0.ebuild b/sys-fs/zfs/zfs-2.0.0.ebuild deleted file mode 100644 index 83e1b87f58a5..000000000000 --- a/sys-fs/zfs/zfs-2.0.0.ebuild +++ /dev/null @@ -1,231 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="https://github.com/openzfs/zfs" - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 linux-mod - EGIT_REPO_URI="https://github.com/openzfs/zfs.git" -else - MY_P="${P/_rc/-rc}" - SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc64" - S="${WORKDIR}/${P%_rc?}" -fi - -LICENSE="BSD-2 CDDL MIT" -# just libzfs soname major for now. -# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered. -SLOT="0/4" -IUSE="custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs" - -DEPEND=" - net-libs/libtirpc[static-libs?] - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk - virtual/libudev[static-libs(-)?] - libressl? ( dev-libs/libressl:0=[static-libs?] ) - !libressl? ( dev-libs/openssl:0=[static-libs?] ) - !minimal? ( ${PYTHON_DEPS} ) - pam? ( sys-libs/pam ) - python? ( - virtual/python-cffi[${PYTHON_USEDEP}] - ) -" - -BDEPEND="virtual/awk - virtual/pkgconfig - nls? ( sys-devel/gettext ) - python? ( - dev-python/setuptools[${PYTHON_USEDEP}] - ) -" - -RDEPEND="${DEPEND} - !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} ) - !prefix? ( virtual/udev ) - sys-fs/udev-init-scripts - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-kernel/genkernel-3.5.1.1 - ) - test-suite? ( - sys-apps/kmod[tools] - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - ) -" - -REQUIRED_USE=" - !minimal? ( ${PYTHON_REQUIRED_USE} ) - python? ( !minimal ) - test-suite? ( !minimal ) -" - -RESTRICT="test" - -PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" ) - -pkg_setup() { - if use kernel_linux && use test-suite; then - linux-info_pkg_setup - - if ! linux_config_exists; then - ewarn "Cannot check the linux kernel configuration." - else - if use test-suite; then - if linux_chkconfig_present BLK_DEV_LOOP; then - eerror "The ZFS test suite requires loop device support enabled." - eerror "Please enable it:" - eerror " CONFIG_BLK_DEV_LOOP=y" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " Block devices --->" - eerror " [X] Loopback device support" - fi - fi - fi - fi -} - -src_prepare() { - default - - if [[ ${PV} == "9999" ]]; then - eautoreconf - else - # Set revision number - sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" - fi - - if use python; then - pushd contrib/pyzfs >/dev/null || die - distutils-r1_src_prepare - popd >/dev/null || die - fi - - # prevent errors showing up on zfs-mount stop, #647688 - # openrc will unmount all filesystems anyway. - sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die -} - -src_configure() { - use custom-cflags || strip-flags - use minimal || python_setup - - local myconf=( - --bindir="${EPREFIX}/bin" - --enable-shared - --enable-systemd - --enable-sysvinit - --localstatedir="${EPREFIX}/var" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="${EPREFIX}/usr/lib/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-pamconfigsdir="${EPREFIX}/unwanted_files" - --with-pammoduledir="$(getpam_mod_dir)" - --with-systemdunitdir="$(systemd_get_systemunitdir)" - --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" - --with-vendor=gentoo - $(use_enable debug) - $(use_enable nls) - $(use_enable pam) - $(use_enable python pyzfs) - $(use_enable static-libs static) - $(usex minimal --without-python --with-python="${EPYTHON}") - ) - - econf "${myconf[@]}" -} - -src_compile() { - default - if use python; then - pushd contrib/pyzfs >/dev/null || die - distutils-r1_src_compile - popd >/dev/null || die - fi -} - -src_install() { - default - - gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool - - use pam && { rm -rv "${ED}/unwanted_files" || die ; } - - use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; } - - if ! use static-libs; then - find "${ED}/" -name '*.la' -delete || die - fi - - dobashcomp contrib/bash_completion.d/zfs - bashcomp_alias zfs zpool - - # strip executable bit from conf.d file - fperms 0644 /etc/conf.d/zfs - - if use python; then - pushd contrib/pyzfs >/dev/null || die - distutils-r1_src_install - popd >/dev/null || die - fi - - # enforce best available python implementation - use minimal || python_fix_shebang "${ED}/bin" -} - -pkg_postinst() { - if use rootfs; then - if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then - elog "root on zfs requires initramfs to boot" - elog "the following packages known to provide one and tested on regular basis:" - elog " sys-kernel/dracut" - elog " sys-kernel/genkernel" - fi - fi - - if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - if systemd_is_booted || has_version sys-apps/systemd; then - einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset" - einfo "for default zfs systemd service configuration" - else - [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ - einfo "You should add zfs-import to the boot runlevel." - [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \ - einfo "You should add zfs-mount to the boot runlevel." - [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \ - einfo "You should add zfs-share to the default runlevel." - [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \ - einfo "You should add zfs-zed to the default runlevel." - fi -} - -pkg_postrm() { - if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then - remove_moduledb - fi -} |