diff options
Diffstat (limited to 'sys-fs/xfsprogs')
-rw-r--r-- | sys-fs/xfsprogs/Manifest | 9 | ||||
-rw-r--r-- | sys-fs/xfsprogs/files/xfsprogs-5.18.0-docdir.patch | 11 | ||||
-rw-r--r-- | sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild | 95 | ||||
-rw-r--r-- | sys-fs/xfsprogs/xfsprogs-5.15.0.ebuild | 94 | ||||
-rw-r--r-- | sys-fs/xfsprogs/xfsprogs-5.18.0.ebuild (renamed from sys-fs/xfsprogs/xfsprogs-5.16.0.ebuild) | 10 |
5 files changed, 19 insertions, 200 deletions
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index 70c36201f59f..9dc007c159b8 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -1,11 +1,8 @@ AUX xfsprogs-4.15.0-docdir.patch 299 BLAKE2B 1ef9dd458806f33ca989dd977ae3b62fb5b1953ded3cd211ca7fc4235cfc59c2eeb6cf2474e79378782696a9feb324a5c32e541873d8493ff019adfe1ff006c2 SHA512 f6492ab8b4f8a417752a0b38538e0fdc06808968df07ecc5d752261cbc11d683acdd0e83ebf2744ea0068a5216f817a3816029cbf74da91c8eccf391574b931e +AUX xfsprogs-5.18.0-docdir.patch 278 BLAKE2B 5277fff17f26b4da946535a430878bfe1e91f92f41c44f2eaaac80703d58176f8d15e14f0586fcf23f29ce207f193303dc662ae5cca6877d6eca9f5ae698620f SHA512 0a94f24b292bece9786bceb99100c25b6d697b9ecf1566bb52b8266683e3adaee415bf7d79c81eed7f2adf846f982f3d91122c9a6dcbb7e16231983037fe9cae AUX xfsprogs-5.3.0-libdir.patch 1137 BLAKE2B 7e455b8b82c553a819155fb4c1fee3d5c31bef0fa4c7ab0bf4ad4558a9a5b0b2f408138558c3601deb3ba85d465ab2dae5248bc20a4ba83f08cf733b27a796a1 SHA512 eaec31b6dab500c2e9c4fe7d5d82e60a40f3073cff99af0ae2aa817f6e4541f6a3de0a48f9151a274c6dd97e99ca26192b95b920aea1c5227d75232b808c98fa -DIST xfsprogs-5.10.0.tar.xz 1273332 BLAKE2B 8caaa0ca8a94480f131d36b383afcf732b3a5a7a3c7927b4b4da4855fc5a0fb97a56fcebb98391a4dd0f02465868a4bd857e57eeba053a419df47d42f74bc958 SHA512 da09e687c87c4b133888dba7b4458017ec028020637ea5066be0232bf5c7da18239cc33eadd02d9b99d1c835aab38cab1ec9d45ae8b83897f9157cfcb0271fbd DIST xfsprogs-5.14.2.tar.xz 1308912 BLAKE2B 04083bf7952015d64f16e1aec0fa74be1957543e2264914f69defe45a3dc9f2524d941abc064a25a2fd760ebd6dcdcdc2404fd305e08fff7f6be6c5fc11d4d2f SHA512 cb9794247a2eed8bd9f10ff811d38f97e4adbed97bad334b0fa8a26503ec224237eddd92fd78892584a153967417ab2009fb2fc8bab6ef12cd53fd20bdba1b4e -DIST xfsprogs-5.15.0.tar.xz 1303080 BLAKE2B e2d60eb554d206b2d2910d07e20051fb0abd71723186bcdfa07f1ebd2c10c0a7ae387ea5f41e1be008d8e8cede97371581da06505e1675aa210fc3ac242d0782 SHA512 be7ee319fd13c103d88c7fc939277594a386d88d65349594a33eea2899ec4f28115b4ea53b64176cacbd52f3c801e103a085388e3539fc445a4ecd2775766438 -DIST xfsprogs-5.16.0.tar.xz 1306100 BLAKE2B da328fe0c146a7b8ba866c5872f26ce95010939e05da51c73ed6374f00474605a81f4a822d65b60a132a4de47fff286e9f5f1ac809c1aa29420633f573b61aef SHA512 949ddb42d37523d6494aa33d1f73757a6379ee661147b9bb84372bdc3ccf60cdf07580f5337b2f0aebdc5d9c2b7de37cc05d010a2b094d1119d900225fc5b711 -EBUILD xfsprogs-5.10.0-r1.ebuild 2259 BLAKE2B 8a3a5d59bb1985b0b6ae1d12a6b4ab4083837ff8931547cabb87acb40574b50786ed1e9c8c7f1a7ce07c235164f670d6a5aef4b336537389951e11628d47deb1 SHA512 6ec3293027fcafe8ae56ad5329a0e617a879ef89cff14d9e2ef306f77443b7f45e4377e1eefdc175078195581d5766324284a737e759ab0db9a6d4bc1a1de431 +DIST xfsprogs-5.18.0.tar.xz 1310008 BLAKE2B a2a2835d53ee6ac55279636f3f3cdcecab8757911ce5c1ea5f350a4da9ff4c1ca64b2aba1c0e5424c0c0a01fd0504396d5fecca12e4689c372ed5bb76b9ac24e SHA512 47d035a33367edae7357e34c70bdb0fe9219231153fb4c4f418ed1462d137dd77338c12a199eb71cd70e88903e5fc11e1e4fb595c622183786e87346e2f65739 EBUILD xfsprogs-5.14.2.ebuild 2274 BLAKE2B 7c5cd884f8cb6283d7ab70094c0d50ef7eade177ae250110fce0d8180aca1b90d4b540cbdd8fff3f8ee3e8264d836bba5c85eec3878f02fd49f7ea7a36512ac7 SHA512 e90ba8d24e23e3a6ea057e050a1c9cf0426954e335bd95b8b826259ac145e6fd080e0a8fe2f9eb90d6c47c215ac5ef62baf764e9dee6326474220f7aafd5415e -EBUILD xfsprogs-5.15.0.ebuild 2281 BLAKE2B fa5bd52e32c96195aec3473ab64ff4a022d2b6641a10ede9dec23d54e0b22b13bf469c7dff66537ee3a93507e7290159aa082eb0e358a9a7c5aa401604be1aa4 SHA512 50bdefc559d2b59bac64ef7b7fc4c2af0c803685bbdac1563144c4ef21eeed6196505f6ba2a89868fceb6683df36e0d74a6427cd1df30d2ff1dfa7745108cdc5 -EBUILD xfsprogs-5.16.0.ebuild 2286 BLAKE2B 5bb87182052869e0864178e98f1f3ba491671cd81e7975b31271e7629e91892ce96a821247251f82aaccb7955b8797d69fc385de2ec7cebcbde1cd0398ef828e SHA512 69e9d33e72610c476699815d2b684fd2a10fb9ad05bd23dfe0f2456b971c24bc27d822ef3276583ef64e469c4f6cc487e726b3d702dc3e867098483973b901fb +EBUILD xfsprogs-5.18.0.ebuild 2293 BLAKE2B 4705752c2043a67f57e023c49ce03ad6584c1fdfe36d4e2a2361e8ad20f852ac54b47472088440d734ff0041e4bbd3ac19c59694dc81fb5644b029ec29af8d14 SHA512 8d032ddc14d79ccd762f23e7c1aecae87e81860ce8cd0caa687373fe3da38d40be720b019e6211a54c6194d4c0dc20931654b204e4d48b8eec81e2634a86bd86 MISC metadata.xml 339 BLAKE2B b7d67fc8bcf854e7a2453c23e5d5d8c193525ccd16a643e80415a103d2d22c892458ea6ada32653d04b3d471c780f07b2b0537a317d9e64468130e065c6f5ab1 SHA512 445b4f6d853a272cc6bf8fde42745adf226512fa310f9af4bbabad4cfa5a6888b2c2215dfc0896c07b800820b69417c6d408bb21ed17a5224b5c9e3412c5f62d diff --git a/sys-fs/xfsprogs/files/xfsprogs-5.18.0-docdir.patch b/sys-fs/xfsprogs/files/xfsprogs-5.18.0-docdir.patch new file mode 100644 index 000000000000..480f44cf6079 --- /dev/null +++ b/sys-fs/xfsprogs/files/xfsprogs-5.18.0-docdir.patch @@ -0,0 +1,11 @@ +--- a/scrub/Makefile ++++ b/scrub/Makefile +@@ -25,7 +25,7 @@ + CRONTABS = xfs_scrub_all.cron + OPTIONAL_TARGETS += $(CRONTABS) + # Don't enable the crontab by default for now +-CROND_DIR = $(PKG_LIB_SCRIPT_DIR)/$(PKG_NAME) ++CROND_DIR = $(PKG_DOC_DIR) + endif + + endif # scrub_prereqs diff --git a/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild deleted file mode 100644 index 09adcd120083..000000000000 --- a/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs 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 ~mips ppc ppc64 ~s390 sparc x86" -IUSE="icu libedit nls selinux" - -RDEPEND=">=sys-apps/util-linux-2.17.2 - dev-libs/inih - icu? ( dev-libs/icu:= ) - libedit? ( dev-libs/libedit ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - nls? ( sys-devel/gettext ) -" -RDEPEND+=" selinux? ( sec-policy/selinux-xfs )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.15.0-docdir.patch - "${FILESDIR}"/${PN}-5.3.0-libdir.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 - - 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=" " - - unset PLATFORM # if set in user env, this breaks configure - - # Avoid automagic on libdevmapper, #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 -} diff --git a/sys-fs/xfsprogs/xfsprogs-5.15.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.15.0.ebuild deleted file mode 100644 index 202d1ea4a5fa..000000000000 --- a/sys-fs/xfsprogs/xfsprogs-5.15.0.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2022 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="icu libedit nls selinux" - -RDEPEND=">=sys-apps/util-linux-2.17.2 - dev-libs/inih - dev-libs/userspace-rcu:= - icu? ( dev-libs/icu:= ) - libedit? ( dev-libs/libedit ) -" -DEPEND="${RDEPEND}" -BDEPEND="nls? ( sys-devel/gettext )" -RDEPEND+=" selinux? ( sec-policy/selinux-xfs )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.15.0-docdir.patch - "${FILESDIR}"/${PN}-5.3.0-libdir.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 - - 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=" " - - unset PLATFORM # if set in user env, this breaks configure - - # Avoid automagic on libdevmapper, #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 -} diff --git a/sys-fs/xfsprogs/xfsprogs-5.16.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.18.0.ebuild index 0253d8cfb586..b9facc52f475 100644 --- a/sys-fs/xfsprogs/xfsprogs-5.16.0.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-5.18.0.ebuild @@ -5,18 +5,18 @@ EAPI=7 inherit flag-o-matic systemd usr-ldscript -DESCRIPTION="xfs filesystem utilities" +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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="icu libedit nls selinux" -RDEPEND=">=sys-apps/util-linux-2.17.2 - dev-libs/inih +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}" @@ -24,8 +24,8 @@ BDEPEND="nls? ( sys-devel/gettext )" RDEPEND+=" selinux? ( sec-policy/selinux-xfs )" PATCHES=( - "${FILESDIR}"/${PN}-4.15.0-docdir.patch "${FILESDIR}"/${PN}-5.3.0-libdir.patch + "${FILESDIR}"/${PN}-5.18.0-docdir.patch ) src_prepare() { |