From 29efd7db303b443e103311cc0e458ee5c134e8e5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 6 Jan 2023 12:11:06 +0000 Subject: gentoo auto-resync : 06:01:2023 - 12:11:06 --- sys-fs/Manifest.gz | Bin 22508 -> 22508 bytes sys-fs/btrfs-progs/Manifest | 2 + sys-fs/btrfs-progs/btrfs-progs-6.1.2.ebuild | 150 ++++++++++++++++++++++++++++ sys-fs/xfsprogs/Manifest | 2 + sys-fs/xfsprogs/xfsprogs-6.1.0.ebuild | 95 ++++++++++++++++++ 5 files changed, 249 insertions(+) create mode 100644 sys-fs/btrfs-progs/btrfs-progs-6.1.2.ebuild create mode 100644 sys-fs/xfsprogs/xfsprogs-6.1.0.ebuild (limited to 'sys-fs') diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz index 6971406c9089..9806a29430b1 100644 Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index 4dddd3ef7ca5..0a29145b6ae8 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -3,8 +3,10 @@ AUX btrfs-progs-6.1.1-ioctl-fix.patch 3232 BLAKE2B 3c026b66b6289b03c8839a00232b1 DIST btrfs-progs-v5.15.1.tar.xz 2280796 BLAKE2B b460254a6261d3d04a2d265a3b4e05a89385888f7ea4f2b16ec5b73922646c7f47a546fc78ba7c009e65914125435cf38157eabffc74f5d00df2c21c844922e3 SHA512 68ed89e337ae857fdaf077eaa889e259e9f162ea2222bdaa03f4187783a8682c24d45c91b0559b901d81429ba2cd3f84087d032d354092d5512fb226bdf91549 DIST btrfs-progs-v6.0.2.tar.xz 2321220 BLAKE2B 391bd9dcc7ae2d40c339eb9b7fb466624c3f122149af640bc0ca73abfc85ca7bd076976d47ce2d4eab64fb3b9b1309e3446acdd78ba77e5cb583b939710f8b6c SHA512 8e01fa6e3373d95a8e8577003ceb94722e4dfdf24110bfea79191a9862daf5e6580d72e898fdea134b5e86beeda32948eed572072f7906226189c6f1ac8615e3 DIST btrfs-progs-v6.1.1.tar.xz 2329864 BLAKE2B f3f15829af88f83cdabca30b61dd0e53fc0913615028eac9501204adec5a5beb8654b037617a73bac96c901835a83e8c08d478b8b496518512fea3714e604cfc SHA512 996045bebc441eba269eb5159d6d13c7b1471ba88039389ef221f57d03c535647a5716e23e7a17a20efb4012003f58b4b768f66af633abbdc1fe481192ca1ace +DIST btrfs-progs-v6.1.2.tar.xz 2329940 BLAKE2B d2c86b0077e0269353ac70d948b948dd2984beec0e4225529adb0099a9cfe5d778a893bedc822168141ce29679f66500e32bdf3af8973bef5696657685ebf712 SHA512 0b02502f9f0902b7db04817fcfbaa4f6155035d47dd908c4c1faa86e4677e302d069756bb0935db7c88f0859c0f9ef87975b2777be7ad7f4d2389d2e95c1ff82 EBUILD btrfs-progs-5.15.1.ebuild 3167 BLAKE2B 56951fda134b6eef1a5a044eedd6212203a5214b4f9eb062bd31da41d475216499ffe521b75dcf88b67cb06a6b8c279042e1d46d8eb17d52a68c9e5fa74d8650 SHA512 e77895f4e6d0211168c60e256e56cac5d681593674d85971e49210ccf496fa8344055360130e5ae635dd197ee0e27fa6ed6c50647dc121a7e7392ef2bad7e276 EBUILD btrfs-progs-6.0.2.ebuild 3316 BLAKE2B fb25f51fadbef9d557618ba091b55aadce8d32e1d9ebbdaa11da594ae29e2a568a734a284d6047f4d89c32e35a12d2062edb64be94962fc02c090c0e04473515 SHA512 83b6393f49f62fd949bb39d8775f48d06c4188e944e7c04f998f1377f3da7f4086d6d7e4563bb504c35168a8ae2614a71feb9facc1cad8235bacb64df378d330 EBUILD btrfs-progs-6.1.1-r1.ebuild 3371 BLAKE2B 1a7dea2cb70a6a987d3a5ac2f76ee36632445e6c708cfeeb5c3b889661ed5946d77bb31e82b8461eaca9291a800c4be33d4a5289206c6f8f6b4a4636b1d3dfe0 SHA512 77cdb08d3d39681b7a2289118fe115389f57855ce61e812206145735a346fefb4a3186b14dca8205dc5b42b0b35debe2f6b260c7ac390b6fccbdf743f20bc163 +EBUILD btrfs-progs-6.1.2.ebuild 3322 BLAKE2B ac22e46b7f573e6cd281945b0df4942a73b8a7ee5ee5cdd7b3ab927d2170e941437375e237f67f06e83c054db2dbe5626b4735ecdf8812dfd5f193f962608d95 SHA512 dd709040834ed4826df628b12be8c5660a5792996af673aa2942319c8d176f5c2ac5ae94983b6bc42f15c14953ed75b6bf1d317db2cbcccffdca037d5f9d659b EBUILD btrfs-progs-9999.ebuild 3322 BLAKE2B 6463cd65703acb98f9b0ea498b391fb8cc4d44366481e944b71e2a68c64815aef3ac192a11b1ef3331af6a820cf7e48710ecb3ffd5f0e894464b730dd14a915e SHA512 c132b68c5fdc7eb26c05ac47c16c35aa803ffc21e9aebd7eb75735df51eaa00021673aedc04125326f5f44030a579585c1f8f0eb04aee977ac128280ffd3d018 MISC metadata.xml 524 BLAKE2B 4e27833128aeb064271af7a4f3c05699b4603b1d993b32bef3d9d973182d3d0c88ac799c95f0f35495e9a99e645627afd96049273c08c3e1334d8fe1ccf0debe SHA512 471014a98bc3feb75e7930485e89daf6cb3390c37a330b8373d5c3b0b764b9180cbff133839ce4742a3c76f63e6f18895060d5906e6a113d2cd43af0df3b0d5a diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.1.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.1.2.ebuild new file mode 100644 index 000000000000..2fcbaa6200a9 --- /dev/null +++ b/sys-fs/btrfs-progs/btrfs-progs-6.1.2.ebuild @@ -0,0 +1,150 @@ +# Copyright 2008-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit bash-completion-r1 python-single-r1 udev + +libbtrfs_soname=0 + +if [[ ${PV} != 9999 ]]; then + MY_PV="v${PV/_/-}" + SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + fi + + S="${WORKDIR}"/${PN}-${MY_PV} +else + EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" + EGIT_BRANCH="devel" + WANT_LIBTOOL="none" + inherit autotools git-r3 +fi + +DESCRIPTION="Btrfs filesystem utilities" +HOMEPAGE="https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/" + +LICENSE="GPL-2" +SLOT="0/${libbtrfs_soname}" +IUSE="+convert python +man reiserfs static static-libs udev +zstd" +# Could support it with just !systemd => eudev, see mdadm, but let's +# see if someone asks for it first. +REQUIRED_USE="static? ( !udev )" + +# Tries to mount repaired filesystems +RESTRICT="test" + +RDEPEND=" + dev-libs/lzo:2= + sys-apps/util-linux:=[static-libs(+)?] + sys-libs/zlib:= + convert? ( + sys-fs/e2fsprogs:= + reiserfs? ( + >=sys-fs/reiserfsprogs-3.6.27 + ) + ) + python? ( ${PYTHON_DEPS} ) + udev? ( virtual/libudev:= ) + zstd? ( app-arch/zstd:= ) +" +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-5.10 + convert? ( sys-apps/acl ) + python? ( + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_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[static-libs(+)] + reiserfs? ( + >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] + ) + ) + zstd? ( app-arch/zstd[static-libs(+)] ) + ) +" +BDEPEND="virtual/pkgconfig + man? ( dev-python/sphinx )" + +if [[ ${PV} == 9999 ]]; then + BDEPEND+=" sys-devel/gnuconfig" +fi + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +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 "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die + ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die + fi +} + +src_configure() { + local myeconfargs=( + --bindir="${EPREFIX}"/sbin + + --enable-lzo + --disable-experimental + $(use_enable convert) + $(use_enable man documentation) + $(use_enable elibc_glibc backtrace) + $(use_enable python) + $(use_enable static-libs static) + $(use_enable udev libudev) + $(use_enable zstd) + + # Could support libgcrypt, libsodium, libkcapi + --with-crypto=builtin + --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 +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index 099ef2b0e8b6..a64e6d8dd36d 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -3,6 +3,8 @@ AUX xfsprogs-5.18.0-include.patch 570 BLAKE2B c53be8940cfae61eed0cf75d3ac90c3985 AUX xfsprogs-5.3.0-libdir.patch 1137 BLAKE2B 7e455b8b82c553a819155fb4c1fee3d5c31bef0fa4c7ab0bf4ad4558a9a5b0b2f408138558c3601deb3ba85d465ab2dae5248bc20a4ba83f08cf733b27a796a1 SHA512 eaec31b6dab500c2e9c4fe7d5d82e60a40f3073cff99af0ae2aa817f6e4541f6a3de0a48f9151a274c6dd97e99ca26192b95b920aea1c5227d75232b808c98fa DIST xfsprogs-5.18.0.tar.xz 1310008 BLAKE2B a2a2835d53ee6ac55279636f3f3cdcecab8757911ce5c1ea5f350a4da9ff4c1ca64b2aba1c0e5424c0c0a01fd0504396d5fecca12e4689c372ed5bb76b9ac24e SHA512 47d035a33367edae7357e34c70bdb0fe9219231153fb4c4f418ed1462d137dd77338c12a199eb71cd70e88903e5fc11e1e4fb595c622183786e87346e2f65739 DIST xfsprogs-6.0.0.tar.xz 1320744 BLAKE2B ae1d175e3dc5f0f6819397f8166a419847da07616d472f81928e3086b9fac420c09e9406d752a34a957d6d9c82a45defb17d6773e87e3b5f4ff509952ef3e76e SHA512 a3ddccdea1129038420d933f1e9ae8f9e75b3ad59fd0fe4c61b7a4dc6145f47b4262f68aefc3216d37cc33ee5643cd6f260ec83cd39d6b61a1cd046c03674ad8 +DIST xfsprogs-6.1.0.tar.xz 1322908 BLAKE2B 0be85ec90079bb4cb5888785f872365382dc2bdeb9f64780dfd3dd2c8ec5fdea7eda76f5fe683de7f768d5d4b822e85a59e80ed713f196647f5c4431601fab7b SHA512 6b6896ea2312836642fc3536aa47c1b96074c495dfa5876ebf06370f8b64d36df6149798153f86bb6ba3fde54354694f74ee72446dd4c6ab509013d82d25e8b0 EBUILD xfsprogs-5.18.0-r1.ebuild 2327 BLAKE2B 58e5d854515fcde4f9315c9c718fa8a370ee21239ff7a010473ebe06e9e8bb7f1a02f17bbae308c5918d41d18e89fc01a3f1cb56067d7e602738cbf746cc7c37 SHA512 4249c3b7cf9893b30b708c572b30b7f7f9e377fbcb7ebb970b89c993dee65892819c11c6d3526415fa795276bc420940e0da9f47749a1080b445cb8d60731ee3 EBUILD xfsprogs-6.0.0.ebuild 2327 BLAKE2B 58e5d854515fcde4f9315c9c718fa8a370ee21239ff7a010473ebe06e9e8bb7f1a02f17bbae308c5918d41d18e89fc01a3f1cb56067d7e602738cbf746cc7c37 SHA512 4249c3b7cf9893b30b708c572b30b7f7f9e377fbcb7ebb970b89c993dee65892819c11c6d3526415fa795276bc420940e0da9f47749a1080b445cb8d60731ee3 +EBUILD xfsprogs-6.1.0.ebuild 2335 BLAKE2B 8ea81b9ca1540e56a9754e9f1411b19e36f5a847c95177f5886da15d5b6aec691a54ba5878797c966f8a4d1c0525d4fc6d0a79150d7834466d6567fbbddf6032 SHA512 0dd2c5ea7cd021f867a28e379ab5347d6ff18bf811b056ce549c1c09109bd6b8163179b715b16d71d6052b5bb74ee30e8579e5b5b4924e47edf66224c8b7a4cd MISC metadata.xml 339 BLAKE2B b7d67fc8bcf854e7a2453c23e5d5d8c193525ccd16a643e80415a103d2d22c892458ea6ada32653d04b3d471c780f07b2b0537a317d9e64468130e065c6f5ab1 SHA512 445b4f6d853a272cc6bf8fde42745adf226512fa310f9af4bbabad4cfa5a6888b2c2215dfc0896c07b800820b69417c6d408bb21ed17a5224b5c9e3412c5f62d diff --git a/sys-fs/xfsprogs/xfsprogs-6.1.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.1.0.ebuild new file mode 100644 index 000000000000..22663401ef36 --- /dev/null +++ b/sys-fs/xfsprogs/xfsprogs-6.1.0.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic systemd usr-ldscript + +DESCRIPTION="XFS filesystem utilities" +HOMEPAGE="https://xfs.wiki.kernel.org/" +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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="icu libedit nls selinux" + +RDEPEND="dev-libs/inih + dev-libs/userspace-rcu:= + >=sys-apps/util-linux-2.17.2 + icu? ( dev-libs/icu:= ) + libedit? ( dev-libs/libedit )" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext )" +RDEPEND+=" selinux? ( sec-policy/selinux-xfs )" + +PATCHES=( + "${FILESDIR}"/${PN}-5.3.0-libdir.patch + "${FILESDIR}"/${PN}-5.18.0-docdir.patch + "${FILESDIR}"/${PN}-5.18.0-include.patch +) + +src_prepare() { + default + + # Fix doc dir + sed -i \ + -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ + include/builddefs.in || die + + # Don't install compressed docs + sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die +} + +src_configure() { + # include/builddefs.in will add FCFLAGS to CFLAGS which will + # unnecessarily clutter CFLAGS (and fortran isn't used) + unset FCFLAGS + + # If set in user env, this breaks configure + unset PLATFORM + + export DEBUG=-DNDEBUG + + # Package is honoring CFLAGS; No need to use OPTIMIZER anymore. + # However, we have to provide an empty value to avoid default + # flags. + export OPTIMIZER=" " + + # Avoid automagic on libdevmapper (bug #709694) + export ac_cv_search_dm_task_create=no + + # Build fails with -O3 (bug #712698) + replace-flags -O3 -O2 + + # Upstream does NOT support --disable-static anymore, + # https://www.spinics.net/lists/linux-xfs/msg30185.html + # https://www.spinics.net/lists/linux-xfs/msg30272.html + local myconf=( + --enable-blkid + --with-crond-dir="${EPREFIX}/etc/cron.d" + --with-systemd-unit-dir="$(systemd_get_systemunitdir)" + $(use_enable icu libicu) + $(use_enable nls gettext) + $(use_enable libedit editline) + ) + + if is-flagq -flto ; then + myconf+=( --enable-lto ) + else + myconf+=( --disable-lto ) + fi + + econf "${myconf[@]}" +} + +src_compile() { + emake V=1 +} + +src_install() { + emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install + emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev + + gen_usr_ldscript -a handle +} -- cgit v1.2.3