diff options
Diffstat (limited to 'sys-fs')
53 files changed, 932 insertions, 739 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex 7389dc3d6eec..425cbd513948 100644 --- a/sys-fs/Manifest.gz +++ b/sys-fs/Manifest.gz diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index 3b59cfd0cfb0..12c85f1a01ed 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -8,6 +8,7 @@ DIST btrfs-progs-v4.19.tar.xz 2001340 BLAKE2B 117087adcb57e4ebf6a2e9c66bf0ad2b09 DIST btrfs-progs-v4.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186ebd98f7a633bdbc2689359e6204b3f1db76accee3e648634f319e26b57e6376c13fa31d39413908d0b2308e0ae28d0e SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a DIST btrfs-progs-v4.9.1.tar.xz 1476524 BLAKE2B 3fdd1c040fdf8083fcf5d4106db22112aaba59dd9a6ab8ad164302ec153a83151fbf88d84181dc849c296bb96ad883d4f7329bff111c67c19fdb814db5073fb2 SHA512 143f5c8863f3b9eff2e4ca2c750bb80ffe62f66d0c15d23e6f5bf75dab0133dcd3ff4d4c722360560de24b73e3da1222f265230d18de06d7bccd85ad2cb9a6a5 DIST btrfs-progs-v5.1.1.tar.xz 2041940 BLAKE2B ca032cf17e78e5892788b677b5a0fead7cf1108fd464facb48e713b259c8c75f8b7714377f75e7b9e595c7c8fa5927fa37d11f43f51e4d898698f9fc5d26a808 SHA512 0f7582893e76d73ac7c0061dd43f65c465ca6308d3447a4e12f95397edcf3b74cc4dd3fad4a139739322650a0d228c4b2d43eb6eb9a09eb92f8fa2a5ef1519cd +DIST btrfs-progs-v5.2.1.tar.xz 2049856 BLAKE2B 841a506f07f1d965c3443fbea39c81a833c41ce1215db3feb41650c964a3a6ba8f5f964c61838921f2df90f6de7fdb057f0d41856549f26b9c4d580b4707d18f SHA512 7da495df7dd2ef1c7961eda132c5f587785c7a91d2531a0c5ed3917f07c708d02acd48681520c10c375edd7a8a7ecab371e806077ccae7899eb41a5ddea89c59 DIST btrfs-progs-v5.2.tar.xz 2047448 BLAKE2B 5b30e82036c33d0fb7b562c3fcd512247cd7946eb0679a5389e6891b205e8b06ed9d4c29fdd1f13f13a5dd30c4204a94ffa78843f9e5001dbb715e67f2efb46a SHA512 a62d3977aa62d7bd71a589525b7dde140fa8f5f2d484d6bd0546606be124b9776667ef3a5e9a084a1ea2b905b6a9125e5892637fcf9cabc79f0707b967aac9c0 EBUILD btrfs-progs-3.18.2.ebuild 1264 BLAKE2B 097f4c5717fb4824868811c82bae7a382a4fa7afe15eafe647945e5ba9e72a0157ab9d5bef694bd8836ef46396e79382ceac74c341b26b2a5cc957fef03a94f1 SHA512 152cd4da549f7b2af7fb90b4e06bfa52e1cc06f64a704e72e1172fd39b667fb6e083367901f857334590018845243ec56c4cd03a9886faa80fdc054f1586a148 EBUILD btrfs-progs-4.1.2.ebuild 1891 BLAKE2B 6164d918d4452a4d91ee812a84fe7a2859fd303396ccacde0fa2dcd5fe7ed1e974bee47e9deece3b621e62d8176379d45b12c2ce6b52497d406425781cb35a3a SHA512 9f0771068eae7ec9bd54545d1f7d1146e9c1a221599dacb40c15106f73ea15bded433adc13dda8d2f7e302b2b4a989fd3a4442904ab222901eab70652e43d28c @@ -18,6 +19,7 @@ EBUILD btrfs-progs-4.19.ebuild 2895 BLAKE2B abdc15e7c275830ef675616ca76117145b21 EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3e7ccb59be25264c1b95f7d2a2a21ddeb338508f8b9a9c060decb0ff4999e87bfd67e4e6d2f00d811b818f13ba75d38972235b8f1685d4d072b8473cbaaa6d43 SHA512 85038dfcffd849ffdd62239f275e63a2fc4ce693c140c598c89f3dc19c92fa5b72c61fef27192d46853f3bcf828aa7efb34e74949acbd919cb358e1a20654dcd EBUILD btrfs-progs-4.9.1.ebuild 2201 BLAKE2B ae5b75a334cce82b436846179ebfa2dea8c1e61c41636821ec85e07c67c1fcbbbf60ecc6cff41bff77ddb0bae82b8b83c411ceb9f2b765fecb043790305c2bfe SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4 EBUILD btrfs-progs-5.1.1.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b +EBUILD btrfs-progs-5.2.1.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b EBUILD btrfs-progs-5.2.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b EBUILD btrfs-progs-9999.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b MISC metadata.xml 759 BLAKE2B 3f94ebaadb23c54121e8ffa1b80549b9e8a9d977d26ddcfdd8772e549e55fc762fcca5c8e2374a562dd9992086949eff626be71aa6da8326f8847cbc4f791fb7 SHA512 ababf03834be253af5402e167e7883fc73c6ad47198369eba02557e07ec8baaa81140837315e98979dc4b95ca160d2d984e970acdbf0ea4db9c2a9e9deddc9a8 diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.2.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.2.1.ebuild new file mode 100644 index 000000000000..4680b387969c --- /dev/null +++ b/sys-fs/btrfs-progs/btrfs-progs-5.2.1.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,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 doc 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 ) + python? ( 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: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(+)] ) + ) +" +BDEPEND=" + doc? ( + || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) + app-text/docbook-xml-dtd:4.5 + app-text/xmlto + ) +" + +if [[ ${PV} == 9999 ]]; then + DEPEND+=" 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 "${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 doc documentation) + $(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 + + # install prebuilt subset of manuals + use doc || doman Documentation/*.[58] +} diff --git a/sys-fs/cryptmount/Manifest b/sys-fs/cryptmount/Manifest index 85a90957b2aa..4c1b3224c6b5 100644 --- a/sys-fs/cryptmount/Manifest +++ b/sys-fs/cryptmount/Manifest @@ -1,3 +1,3 @@ DIST cryptmount-5.3.1.tar.gz 748020 BLAKE2B 63c66717ed8a8ede983894564576d26720a571b47bd33f3cd160596d831c017c7239b307eb9fb8112c6a51f91799117a47392675f9fe53c0286ada84887d528e SHA512 c4bfb7a2bd2f672dfed014d3a4b1feaa4d20237f9b658ea981a0a054e83ad4d0282089a006ceb769ee05e0cf6ecd004c97b48d69973ed630330e77bf13925680 -EBUILD cryptmount-5.3.1.ebuild 1711 BLAKE2B 4fe52f5d39d50587e9edcb19cef6646a82d5b19e9e2a9f61b640453fff5141804fff0de5c9c275f40ed2a6a00b371644b8e7f12839d61560ac241620c0aaaee4 SHA512 9696011888cac486764b90f9f94df669bc49a978aa25ce04d9bb4704f181aec8af89e26414b14e4e9e8b63a9f1fb38d84a127a1e1d6e559d6d0ea8dd6c579184 +EBUILD cryptmount-5.3.1.ebuild 1710 BLAKE2B b456d128fa175c855938b09c308d273b8f1e520f108b2bf6d3a56669f833a1c220aaefe15b01799a89ef0b6174ab792fa36e4afa82b59a2354653d63da6bb38e SHA512 133b17fa9557d9084954441a6bedf63f6b538f96b7ca3beb22cd298c75cdff1bec0e0bead8afcecaae1f15ef0ffc35ac36736bfeeb5a8204ed4d1a0eebfed2dd MISC metadata.xml 2231 BLAKE2B f4b90363aa03426bcbf4a908d226ae1c5a1256fc62007005c58e97607bc2d0a984b9fd1fe78460d236c1d11ffd2bc3dd387fc5b97910c32fc7d21d67556379b2 SHA512 ff5bb67a85f5312b1df9be3a596fcfa08a7e7089df44d50efb63603946c8cfac9e6061519469b1b7126222b6ad7479110f092f629ea05ce9e0692caf52e463c4 diff --git a/sys-fs/cryptmount/cryptmount-5.3.1.ebuild b/sys-fs/cryptmount/cryptmount-5.3.1.ebuild index 2562091101a1..26f6030e5f5c 100644 --- a/sys-fs/cryptmount/cryptmount-5.3.1.ebuild +++ b/sys-fs/cryptmount/cryptmount-5.3.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="argv0switch cswap fsck +gcrypt +largefile mount +nls +luks +openssl selinux systemd udev" REQUIRED_USE=" luks? ( gcrypt ) diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest index eacdb816fbb7..e689d31db6b0 100644 --- a/sys-fs/cryptsetup/Manifest +++ b/sys-fs/cryptsetup/Manifest @@ -12,6 +12,6 @@ DIST cryptsetup-2.2.0-rc1.tar.xz 10720888 BLAKE2B 6a8ee7d3ffa8d536627ba1be19e013 EBUILD cryptsetup-1.7.5-r1.ebuild 4033 BLAKE2B 77146c613eefaf677f4a0f77cb773b48829f520f988fb37c7ebc2b1df2e8d6269a02562a2e2f959029f563e9c89e0591160bbc5e22ec35875e4775bf20ba1da0 SHA512 0397db7c62308400767776b3caa614b8fe2dec4545ee1416eafb9116f9e458a6e26008ece4df870f40bc6270cd1b4340746b8fabb5f90418c7d9f18de852cf78 EBUILD cryptsetup-2.0.5-r1.ebuild 4151 BLAKE2B eb67cb9e3424b5444bf298fafeb3cbf050e5420b4a2137c75e437a13b2b8a1ff642b40186d37f10ee92785074833f833cad44eca3bc3e9c0f91fd710ac9fcc50 SHA512 71c6948ff51c919ac6052ad65355ffb620049049ef21fe6545d39bb6d56adb843d5de25b722911d979becca9945f7d05d7cf1b240bb0d5448513a4fa7baad8cd EBUILD cryptsetup-2.0.6.ebuild 4167 BLAKE2B 0aaa413b365a5b3986e3908709e54af38af8191c2086168076d380321c8577cc686826b7f57fb1671bdf45adf141630f65e815842f0cf4703636a8caf7cee46b SHA512 c707d533fcfc71e5adcd3eacd9556ae0d87c65b9e283008daafe5aaa29056ed175bf5354c08638454677b75e99f0f77d51a0ea76a0006bb8812d721a46e8cef7 -EBUILD cryptsetup-2.1.0.ebuild 4412 BLAKE2B 25098926b3eda1c13d4db4ea2db3f969acc921cd2446e6ee3b801fff91b965599097e02d585f4cc32b5f6e90331b007fb136b70f32cb9f16da72eeed27b3547e SHA512 5ae39da6521c69dcd04df070c783eb533e664ab08c14be1578c6918a586bbbacf54e9b0e3e4f7d57eda97a8ae78276dd01246c433644a49f0f84f9718584cb07 +EBUILD cryptsetup-2.1.0.ebuild 4411 BLAKE2B 4098102c4571866c9030bb68c489d078b590fe0e7b5cac6e134a90ecff3e083277d82cb9bad9778eaec098268d3ce5b8d89dcbf34f4108334536cc5e7529c789 SHA512 4fc4743afac269525e2bd108bf7bf033719df987acf5d1431be98d75f4af1fee9a3abb07397ec9cba2bb527cbf7f225e235142ed4bb6968eb3a2a721c9f25579 EBUILD cryptsetup-2.2.0_rc1.ebuild 4420 BLAKE2B dbe506b39f4bf619ba67273c5e39dcffcadfb87bafadcca89f7c57b16d09e9c36b27681ed18523a2d14289d2d37bf00cf5f9207d8bf711ac11b86c8cbbc462bf SHA512 71deb108361f6bd7c716b3ed1398dff73308f03a1c574a8457e2a04ad3df4241dc95726f48fa7ac652d67702b0ab2b6f5bd06e55a333c7e349e79c18ff9bfecc MISC metadata.xml 1074 BLAKE2B b1a6789b42307eb919717d35dabb48fc060490e561a1b5d4b0a25a2ba4dfe1399a7bf564c5477be61a68b7b5248153843f6892f95893e36257b9d790f8501779 SHA512 d070c22187874175ae93078fc80f4d150da102557cc680c8dd324ffe21de533ad67b4478f0d83e385ef5d4e75541bb04fd8308697db0ebf6ecd9f1e11382847b diff --git a/sys-fs/cryptsetup/cryptsetup-2.1.0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.1.0.ebuild index 92b25f4f9572..c8b41a45c12c 100644 --- a/sys-fs/cryptsetup/cryptsetup-2.1.0.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-2.1.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz" LICENSE="GPL-2+" SLOT="0/12" # libcryptsetup.so version [[ ${PV} != *_rc* ]] && \ -KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" +KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86" # cryptsetup does _not_ have a libressl backend. We only have this for REQUIRED_USE # and change "libressl" to "openssl" in our econf call. CRYPTO_BACKENDS="gcrypt kernel libressl nettle +openssl" diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index 385f96e87d47..fd09a3118cb5 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -11,6 +11,6 @@ DIST e2fsprogs-1.44.5.tar.xz 5375996 BLAKE2B a6069e7c4889cdd3a30d94994d179c024ed DIST e2fsprogs-1.45.2.tar.xz 5560504 BLAKE2B c7764eb7fd67c422007cf2d884496babf78663ce6dab674fb023738b69e270c601dded89fc65fe4e7e1853cf8234772bfc2e28a1189b8dfd3f9e6fa34677f664 SHA512 50fdb7769c789fb143b2e4bd56e6b55eac8f84be5b7074008134fa56d980342c2307e62380f9ba6a8ab9bbc6bbf45b349aad540c8f239cf859706fd33e521e5e DIST e2fsprogs-1.45.3.tar.xz 5561452 BLAKE2B ee41f35c3294ccb8dad4274e44d9c07dc94f93d2e921472c34da7913cdb2d60f998fa154c98f6ba4f9e598de152006a0fdb63a9006bbf3bb1847166d9342a29f SHA512 9f898d353af48a1d357cb01f64187b6dfef671bb2e0450438530fe4fa9454fccc6b755c9469d81e702e6d85a4defd02ae0a493897a4b3284cb112e8444c9bf52 EBUILD e2fsprogs-1.44.5.ebuild 3928 BLAKE2B a71cb0b55c3c27cd64cdff8f30c4df93487682665919bae9a36cf7edd9b05204d95dbd88614110e27b8ab607041ad6a089ad86e6dd684db8e571c41da097322f SHA512 017fe80104dedd930c47be814858693ed110b1bf969213ec161e260ff000ea23b8c925e5b94a1bd34db883cd5132e7f785aa0e7b9c7ff328c1451369dc452c1b -EBUILD e2fsprogs-1.45.2.ebuild 4098 BLAKE2B f929988f23463e9432552895f672eb6c80e81a87eef37861db58e651aa43afad7d5964eeaf5566f4d358a235f7b715ec5e2af700ba615e317152acf5617a5aff SHA512 28883832ccb4712b5bd634c578824e7ace1b5c609b84df25cf23d1701b81d61cca8d59efc3f77763a56bd72cd5c97f1d09f8a66429845e07abec88bf449960e5 +EBUILD e2fsprogs-1.45.2.ebuild 4094 BLAKE2B 926c3cb6a6bed8b0d42541d6272b19eb270d00e08507148a9bd56f1f188730916c3b289bbca86d4aeedf1ee21ff6404b1141b7ce20b3f9edf43e030439646827 SHA512 d8358629d11e074c2bff189d54e540c46fa9875ff9b13e41ada9d567f0df02ea8f75b3d8aca287c4281973725e3cd852adbe916ebfe429b7976e6cd1edf335f8 EBUILD e2fsprogs-1.45.3.ebuild 4107 BLAKE2B 1dca4c3e02522b493e10a29612bcf11786c05295cc7dfe62a6076d47905d20d51ad798aa07c6e31894be51a234a83bf57ae4fb0d2dbc7f601cdadcd462f61e3b SHA512 9f412d36677410a52e5e3bbc3170c534a06bb7badf5ad576ae5ea61597cc4b02b364e11f4467e2bc46ac322e5af26417230884c309e39f45976766ba8b90fc05 MISC metadata.xml 578 BLAKE2B 08094a62570e432f1ed7370d2eb402523f17e7cea8ca1370302b602de949e812e6d277a280be23d0a0f515b6b39ee18d974b1ef0d008d2267fcc4e7bb41ff3d9 SHA512 094625d323bca75af0884ee4d2c1503437a50aa1a323c52e054b49edf890afc0b20f936b2833c82e944b58615996b76e7fc2a502aa87b3c66a385e7698d2d6cf diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild index 6cef4fccf605..698cbac81158 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz LICENSE="GPL-2 BSD" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint" IUSE="cron fuse nls static-libs elibc_FreeBSD" RDEPEND="~sys-libs/${PN}-libs-${PV} diff --git a/sys-fs/e2tools/Manifest b/sys-fs/e2tools/Manifest index 89cccfece57e..e539fd37a7cc 100644 --- a/sys-fs/e2tools/Manifest +++ b/sys-fs/e2tools/Manifest @@ -1,7 +1,3 @@ -AUX e2tools-0.0.16-prototypes.patch 5088 BLAKE2B cbf4fce72342d0e76b0ded01bdf332d129fae59a67dc4207eaefc1937abcd50aea13c93c41c38f3eab1557381c9314cbd86cb2be08965186cad63b8fdca50e7a SHA512 88deb44d0534901c5238281459a06c4d15022bccf363ec27d62faa56d1a78ea90a77a5a46d0b6752067ff83ddf53791398e64f518fd9c59dba1203dd651796fa -AUX e2tools-0.0.16-qsort-const.patch 3298 BLAKE2B 18bf14782936dc40b59a9daa1343a1f493c11bd7635853e9c9862b39166148040e2a174390b3dacfa90e8bafb3c409a25f1bdd38a5d1374fb655efb188760b8d SHA512 a063eceb7ccfbc5a2289d877ad3b5f025d7f3b40a445a40804743858d29822fdaae304b0718d71fbdd0d77f477e91caa23bc43914a1b11d7241b109a946208ea DIST e2tools-0.0.16.4.tar.gz 70444 BLAKE2B 3db75ca2ecca27bfbd65890f595c9523f373555e771f21113ca1c3bd1f08d74f5e1d70db39bbe0ac215a1766e702a37c2c2752f671320d45f3bfa56b39fd8296 SHA512 35bda0005d0ba4d9541eabf45bd9bed0e7e85144dce88c3bd8afd8eb5ed5db610bc5654aee82978b2a4955d363fd5af4ff40667fa8001955267c96cb84e6792b -DIST e2tools-0.0.16.tar.gz 72333 BLAKE2B c843938b2217bfe1e36fcb1197b3a0d27d6fb5867c99d89b5e2af2eebe807aa6cf264b8fb0ea5573f22507f19e676eb124ef694866b8f76bf815880ce2a0f876 SHA512 8be79385c07027286951755a7ca0407215b517d4abba5546a0958fcb5e8feaffc993d35dd56bde39e14d397875941fc812c713db3d27247cd8e9ee7ed6a153b4 -EBUILD e2tools-0.0.16.4.ebuild 655 BLAKE2B 53b781a383efcc4446f3098be26580d89ec5b1160d8f97712a13418d2250e193d2fdbd531670758889c1801e7da140eeaa26d9ceea1c8da3044b113a84d3fbba SHA512 9a6be0396ac1291de7a836669869268aadc59f1d12172046545e8613dae63f3024d36d29a8addd09159c8be57ebbc17f014ff9a11fcf155c333d0ae811601d79 -EBUILD e2tools-0.0.16.ebuild 767 BLAKE2B d336901a4c02280e743dc95dd96890706cbec3a99e75e8b7a12d6ac89c9255531c4d7c7ffadf1b42066f17f56265ff87783eef35d068fce191517e4687031c2a SHA512 274dd304d3452efb511e8f721724487beebcda085e894b2db078c41a843885d6b7f3de0eec3ce982f5e34fe19ee610e1b0f14dba2f16acb9766407c2c0b3633c +EBUILD e2tools-0.0.16.4.ebuild 640 BLAKE2B 166fae0012433e143891089b28161581a526f95e4f53851261cdd3c4796d54e1e2482d1ad54145cbfa1ca86cc0678d9f89b7a9bd0db43e7c2dbeb85e05415d8d SHA512 859e8640438d0e28a7e89c9157a13cc00232d99479fcefebb2ce134ee93fb9708f1cd6c91a11cdb0eec999d2cd36983b18345bb8f7e5a96e4e5f24e332a9d49d MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-fs/e2tools/e2tools-0.0.16.4.ebuild b/sys-fs/e2tools/e2tools-0.0.16.4.ebuild index e869d21197a5..538223db686f 100644 --- a/sys-fs/e2tools/e2tools-0.0.16.4.ebuild +++ b/sys-fs/e2tools/e2tools-0.0.16.4.ebuild @@ -6,7 +6,7 @@ EAPI=6 inherit autotools toolchain-funcs DESCRIPTION="utilities to read, write, and manipulate files in an ext2/ext3 filesystem" -HOMEPAGE="http://home.earthlink.net/~k_sheff/sw/e2tools/" +HOMEPAGE="https://github.com/ndim/e2tools" SRC_URI="https://github.com/ndim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" diff --git a/sys-fs/e2tools/e2tools-0.0.16.ebuild b/sys-fs/e2tools/e2tools-0.0.16.ebuild deleted file mode 100644 index 2471b9e8b1b6..000000000000 --- a/sys-fs/e2tools/e2tools-0.0.16.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit toolchain-funcs eutils - -DESCRIPTION="utilities to read, write, and manipulate files in an ext2/ext3 filesystem" -HOMEPAGE="http://home.earthlink.net/~k_sheff/sw/e2tools/" -SRC_URI="http://home.earthlink.net/~k_sheff/sw/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="sys-fs/e2fsprogs - sys-libs/e2fsprogs-libs" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-prototypes.patch - epatch "${FILESDIR}"/${P}-qsort-const.patch - sed -i '/e2cp_LDADD/s:-L@[^@]*@::' Makefile.in || die -} - -src_configure() { - # The configure script is ancient. - export CONFIG_SHELL="/bin/bash" - tc-export CC - default -} diff --git a/sys-fs/e2tools/files/e2tools-0.0.16-prototypes.patch b/sys-fs/e2tools/files/e2tools-0.0.16-prototypes.patch deleted file mode 100644 index 39a9ddb7daad..000000000000 --- a/sys-fs/e2tools/files/e2tools-0.0.16-prototypes.patch +++ /dev/null @@ -1,167 +0,0 @@ -fix various missing prototype warnings - ---- a/e2tools.h -+++ b/e2tools.h -@@ -63,38 +63,33 @@ - #define E2T_FORCE 1 - #define E2T_DO_MV 2 - --#ifndef COPY_C -+/* copy.c */ - extern long copy(int argc, char *argv[]); - extern int my_strcmp(const void *n1, const void *n2); --#endif - --#ifdef LN_C -+/* ln.c */ - extern long do_ln(int argc, char *argv[]); - - extern long create_hard_link(ext2_filsys fs, ext2_ino_t cwd, ext2_ino_t - new_file_ino, char *newfile, int ln_flags); --#endif - --#ifndef LS_C -+/* ls.c */ - extern long do_list_dir(int argc, char *argv[]); --#endif - --#ifndef MKDIR_C -+/* mkdir.c */ - extern long e2mkdir(int argc, char *argv[]); - extern long create_dir(ext2_filsys fs, ext2_ino_t root, ext2_ino_t *cwd, - char *dirname, struct stat *def_stat); --#endif -+extern long change_cwd(ext2_filsys fs, ext2_ino_t root, ext2_ino_t *cwd, -+ char *dirname); - --#ifdef MV_C -+/* mv.c */ - extern long do_mv(int argc, char *argv[]); - extern long get_file_parts(ext2_filsys fs, ext2_ino_t root, char *pathname, - ext2_ino_t *dir_ino, char **dir_name, - char **base_name); - --#endif -- -- --#ifndef READ_C -+/* read.c */ - extern long get_file(ext2_filsys fs, ext2_ino_t root, ext2_ino_t cwd, - char *infile, char *outfile, int keep); - extern long retrieve_data(ext2_filsys fs, ext2_ino_t src, int dest_fd, -@@ -102,17 +97,14 @@ extern long retrieve_data(ext2_filsys fs, ext2_ino_t src, int dest_fd, - ext2_off_t *ret_pos); - extern long read_to_eof(ext2_file_t infile, int dest_fd, ext2_off_t offset, - ext2_off_t *ret_pos); --#endif - --#ifndef RM_C -+/* rm.c */ - extern long e2rm(int argc, char *argv[]); --#endif - --#ifndef TAIL_C -+/* tail.c */ - extern long do_tail(int argc, char *argv[]); --#endif - --#ifndef UTIL_C -+/* util.c */ - extern mode_t ext2_mode_xlate(__u16 lmode); - extern __u16 host_mode_xlate(mode_t hmode); - extern long open_filesystem(char *name, ext2_filsys *fs, ext2_ino_t *root, int -@@ -125,13 +117,14 @@ extern long rm_file(ext2_filsys fs, ext2_ino_t cwd, char *outfile, ext2_ino_t - delfile); - extern long delete_file(ext2_filsys fs, ext2_ino_t inode); - extern void init_stat_buf(struct stat *buf); --#endif -+#include <regex.h> -+extern regex_t *make_regexp(char *shell); -+extern int is_file_regexp(char *ptr); - --#ifndef WRITE_C -+/* write.c */ - extern long - put_file(ext2_filsys fs, ext2_ino_t cwd, char *infile, char *outfile, - ext2_ino_t *outfile_ino, int keep, struct stat *def_stat); --#endif - - #endif - ---- a/elist.c -+++ b/elist.c -@@ -41,12 +41,9 @@ - /* Feature Test Switches */ - /* Headers */ - #include <memory.h> -+#include <stdlib.h> - #include "elist.h" - --#ifndef NULL --#define NULL ((void *)0) --#endif -- - elist_t * - elist_new() - { ---- a/ls.c -+++ b/ls.c -@@ -703,7 +703,7 @@ void short_disp(ls_file_t *info, int *col, int options) - char lbr, rbr; - char tmp[300]; - int thislen; -- static max_col_size = 0; -+ static int max_col_size = 0; - - if (max_col_size == 0) - { ---- a/mkdir.c -+++ b/mkdir.c -@@ -357,7 +357,7 @@ create_dir(ext2_filsys fs, ext2_ino_t root, ext2_ino_t *cwd, - def_stat))) - { - fprintf(stderr, -- "create_dir: error creating directory %s/%s:%d\n", -+ "create_dir: error creating directory %s/%s:%ld\n", - dirname, dname, retval); - ext2fs_free_mem((void **) &buf); - return(retval); -@@ -415,7 +415,7 @@ create_dir(ext2_filsys fs, ext2_ino_t root, ext2_ino_t *cwd, - if ((retval = create_subdir(fs, root, cwd, dirname, def_stat))) - { - fprintf(stderr, -- "create_dir: error creating directory %s:%d\n", -+ "create_dir: error creating directory %s:%ld\n", - dirname, retval); - return(retval); - } ---- a/progress.c -+++ b/progress.c -@@ -26,6 +26,8 @@ - /* Feature Test Switches */ - /* System Headers */ - #include <stdio.h> -+#include <stdlib.h> -+#include <string.h> - #include <unistd.h> - #include <sys/stat.h> - #include <sys/time.h> -@@ -154,7 +156,7 @@ void update_progress(unsigned long num_bytes) - if (prog_sbuf != NULL && prog_time != tv.tv_sec) - { - prog_time = tv.tv_sec; -- fprintf(stderr, "%s %10d / %10d\r", prog_file, num_bytes, -+ fprintf(stderr, "%s %10lu / %10jd\r", prog_file, num_bytes, - prog_sbuf->st_size); - fflush(stderr); - } ---- a/rm.c -+++ b/rm.c -@@ -244,7 +244,6 @@ e2rm(int argc, char *argv[]) - retval = ext2fs_dir_iterate2(gbl_fs, curr_ino, - DIRENT_FLAG_INCLUDE_EMPTY, 0, - rm_dir_proc, -- (void *) - (verbose) ? &verbose : NULL); - } - else diff --git a/sys-fs/e2tools/files/e2tools-0.0.16-qsort-const.patch b/sys-fs/e2tools/files/e2tools-0.0.16-qsort-const.patch deleted file mode 100644 index 532b8fb45630..000000000000 --- a/sys-fs/e2tools/files/e2tools-0.0.16-qsort-const.patch +++ /dev/null @@ -1,102 +0,0 @@ -the qsort func expects a callback with const pointers, so update all the -prototypes to match - ---- a/elist.c -+++ b/elist.c -@@ -136,7 +133,7 @@ elist_insert(elist_t *l, void *data) - return(l); - } - --void elist_sort(elist_t *l, int (sort_func)(void *, void *), int reverse) -+void elist_sort(elist_t *l, int (sort_func)(const void *, const void *), int reverse) - { - int c=0; - elist_t *tl; ---- a/elist.h -+++ b/elist.h -@@ -33,7 +33,7 @@ extern void elist_free(elist_t *l, void (*data_free)(void *)); - extern elist_t * elist_append(elist_t *l, void *data); - extern elist_t * elist_insert(elist_t *l, void *data); - extern void --elist_sort(elist_t *l, int (sort_func)(void *, void *), int reverse); -+elist_sort(elist_t *l, int (sort_func)(const void *, const void *), int reverse); - #endif - - #endif ---- a/ls.c -+++ b/ls.c -@@ -98,15 +98,15 @@ long_disp(ls_file_t *info, int *col, int options); - void - short_disp(ls_file_t *info, int *col, int options); - int --no_sort(void *n1, void *n2); -+no_sort(const void *n1, const void *n2); - int --name_sort(void *n1, void *n2); -+name_sort(const void *n1, const void *n2); - int --inode_sort(void *n1, void *n2); -+inode_sort(const void *n1, const void *n2); - int --mod_time_sort(void *n1, void *n2); -+mod_time_sort(const void *n1, const void *n2); - int --creat_time_sort(void *n1, void *n2); -+creat_time_sort(const void *n1, const void *n2); - long - add_ls_file(char *name, int namelen, ext2_ino_t dir, ext2_ino_t ino, - int entry, int type, struct list_dir_struct *ls); -@@ -331,7 +331,7 @@ do_list_dir(int argc, char *argv[]) - char *dup_path = NULL; - char *dir_name; - char *base_name; -- int (*file_sort)(void *n1, void *n2) = name_sort; -+ int (*file_sort)(const void *n1, const void *n2) = name_sort; - void (*file_disp)(ls_file_t *n, int *col, int options) = short_disp; - elist_t *files=NULL; - int col=0; -@@ -791,7 +791,7 @@ void short_disp(ls_file_t *info, int *col, int options) - * MM/DD/YY Name Description - * - */ --int no_sort(void *n1, void *n2) -+int no_sort(const void *n1, const void *n2) - { - ls_file_t *f1 = *((ls_file_t **) n1); - ls_file_t *f2 = *((ls_file_t **) n2); -@@ -835,7 +835,7 @@ int no_sort(void *n1, void *n2) - * MM/DD/YY Name Description - * - */ --int name_sort(void *n1, void *n2) -+int name_sort(const void *n1, const void *n2) - { - ls_file_t *f1 = *((ls_file_t **) n1); - ls_file_t *f2 = *((ls_file_t **) n2); -@@ -880,7 +880,7 @@ int name_sort(void *n1, void *n2) - * MM/DD/YY Name Description - * - */ --int inode_sort(void *n1, void *n2) -+int inode_sort(const void *n1, const void *n2) - { - ls_file_t *f1 = *((ls_file_t **) n1); - ls_file_t *f2 = *((ls_file_t **) n2); -@@ -925,7 +925,7 @@ int inode_sort(void *n1, void *n2) - * MM/DD/YY Name Description - * - */ --int mod_time_sort(void *n1, void *n2) -+int mod_time_sort(const void *n1, const void *n2) - { - ls_file_t *f1 = *((ls_file_t **) n1); - ls_file_t *f2 = *((ls_file_t **) n2); -@@ -971,7 +971,7 @@ int mod_time_sort(void *n1, void *n2) - * MM/DD/YY Name Description - * - */ --int creat_time_sort(void *n1, void *n2) -+int creat_time_sort(const void *n1, const void *n2) - { - ls_file_t *f1 = *((ls_file_t **) n1); - ls_file_t *f2 = *((ls_file_t **) n2); diff --git a/sys-fs/encfs/Manifest b/sys-fs/encfs/Manifest index 7100e4eed8cf..701ff993b822 100644 --- a/sys-fs/encfs/Manifest +++ b/sys-fs/encfs/Manifest @@ -1,7 +1,3 @@ -DIST encfs-1.9.2.tar.gz 11043181 BLAKE2B 5e1ada5b85166312010dade2537b83d44b67dcfa0cdbdc1cf4076e4a92ed593aed6129457c241492ea8afe7049ab12889dbe292c4d427710ff16c11a67085819 SHA512 7664a2f48dddde77cae005aba70962704b002f60afb2da35c4661f7e4e22ce5c003d3b674ce125fcc72e9f0588164c1f7dbf22f2b9061d0736b8c164c1ec70a5 -DIST encfs-1.9.4.tar.gz 2794574 BLAKE2B 95f0a96eedf52984fadfc6fb34c938d61b80310f97dc163cb7f8340fca8d6a56be574190cc56cad00fdfde2b907fc594ecaba3e4f2a90da171c84d8c4ab43630 SHA512 082e35e6eae4730b5e7827eed729422f9d995ebe9e441c5f9725f39cc2f46f014ac1479c7b0a7ce04e9e7228c1a93ecf5b4228e667fc48e6a7d3b68d2324cd0b DIST encfs-1.9.5.tar.gz 2798888 BLAKE2B d95e0ea8b807e2cbf4c20907bcc1b163c5397402eea934a7155e83c9d18a84db3097e1d4266a5e632acf39ecadf9812d5104b1565d25a149979e0f72523bb09d SHA512 036e08ca9bc13b44742aebdee49bf7029d0c6b7e59cd6dedc9a09da2af99482859f6a79eddf07e3db296edaf45aafc48fe08488840e765682e9b192dd6ae4c46 -EBUILD encfs-1.9.2.ebuild 923 BLAKE2B 127b7ba531627540a93b45dc75cd1cd8eb7b751103bdbd2930a81688b41d5669a807746a4b9f3b39baba302d34422555bbc526d726e74879d436588179311739 SHA512 e608948c6fa46ce5ea156a23928f5c216d14da89bf0233f30a478d99faaa753f5d1e74135d9a2f40d9fdfcaf6e7e52d9fc78be9aad86edb17cf575bb0e10eff0 -EBUILD encfs-1.9.4.ebuild 949 BLAKE2B 8db5d431d43eb66a365342e27bbacb0f52ef74784362c60e366c4b722652f5481534079c3f36050fc3813bc0bdd4b0e3d6240ab518dc92996e6c084cfbd54faa SHA512 ca29eb93717a1087e55c6a15ddcaa15b7ba5016748d7f18cfa20dd3e4a346bcb5a055c8556e469628262d48a56f29518b5a9eab82fb7a3dbb5a3f2805720d7f9 -EBUILD encfs-1.9.5.ebuild 947 BLAKE2B f20169f43d5473e31ecb0a0dc37d840793a5a7bee3764c0bf8d30d3ba62151d890af6174be94f76e09a1c9bd6fc2a1263074b6d00246a89bdc355e1d7d0cf183 SHA512 b86cc19b766de4acd74e9197f1902643fee40cb9711c06247dc603d16ed2efad6f2d64b26cc9de06dbae5021d94722ac12ac8bc816ae590332ff1069f0ca6c1d +EBUILD encfs-1.9.5.ebuild 946 BLAKE2B fac85f87374c6804b7640f9dad130f89311ae6416860a361c46d748e9cb6432003b250c48dc62fd360b4260e28917124f496c6aafbf50eba5bfedfaa0554e863 SHA512 3f41700863bca65d1759d7aaa166a1dd2754b9aaabe949324ea11d7f3b2ca2209f95c6fdbd5e7334da85145775e7e6f34bd1ca4f5db4b8f31b92793e443d5ecc MISC metadata.xml 379 BLAKE2B 87ea00a89eb0bc59a7bd2df418d8ac3b04bd3560f1a47365235bd72dbb3cb342f8039cbade3524109bdba5139b1fd3adb5c6b6dd1ea1da45811cbacdd37ad803 SHA512 f94de3e423b8666aafc57201813f1b4e7a1be7da71736957aa70c4aa2d92d2b64a240e58c82bec472d97df0afefe5ba95e863243fda973804555e1625118b59f diff --git a/sys-fs/encfs/encfs-1.9.2.ebuild b/sys-fs/encfs/encfs-1.9.2.ebuild deleted file mode 100644 index 3fd739dd5bd8..000000000000 --- a/sys-fs/encfs/encfs-1.9.2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -inherit cmake-utils - -DESCRIPTION="An implementation of encrypted filesystem in user-space using FUSE" -HOMEPAGE="https://vgough.github.io/encfs/" -SRC_URI="https://github.com/vgough/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3 LGPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm sparc ~x86" -IUSE="libressl nls" - -RDEPEND=" - !libressl? ( dev-libs/openssl:= ) - libressl? ( dev-libs/libressl:= ) - dev-libs/tinyxml2:0= - sys-fs/fuse:= - sys-libs/zlib" -DEPEND=" - ${RDEPEND} - dev-lang/perl - sys-devel/gettext - virtual/pkgconfig" - -# Build dir is hardcoded in test suite, but we restrict them -# because they can lead to false negatives, bug #630486 -RESTRICT="test" -BUILD_DIR="${S}/build" - -src_configure() { - local mycmakeargs=( - -DENABLE_NLS="$(usex nls)" - -DUSE_INTERNAL_TINYXML=OFF - ) - cmake-utils_src_configure -} diff --git a/sys-fs/encfs/encfs-1.9.4.ebuild b/sys-fs/encfs/encfs-1.9.4.ebuild deleted file mode 100644 index 03e7838e87d8..000000000000 --- a/sys-fs/encfs/encfs-1.9.4.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -inherit cmake-utils - -DESCRIPTION="An implementation of encrypted filesystem in user-space using FUSE" -HOMEPAGE="https://vgough.github.io/encfs/" -SRC_URI="https://github.com/vgough/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3 LGPL-3" -SLOT="0" -KEYWORDS="amd64 arm ~sparc x86" -IUSE="libressl nls" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - dev-libs/tinyxml2:0= - sys-fs/fuse:= - sys-libs/zlib" -DEPEND=" - ${RDEPEND} - dev-lang/perl - sys-devel/gettext - virtual/pkgconfig" - -# Build dir is hardcoded in test suite, but we restrict them -# because they can lead to false negatives, bug #630486 -RESTRICT="test" -BUILD_DIR="${S}/build" - -src_configure() { - local mycmakeargs=( - -DENABLE_NLS="$(usex nls)" - -DUSE_INTERNAL_TINYXML=OFF - -DBUILD_UNIT_TESTS=OFF - ) - cmake-utils_src_configure -} diff --git a/sys-fs/encfs/encfs-1.9.5.ebuild b/sys-fs/encfs/encfs-1.9.5.ebuild index 2fb4537fec78..6fb74e919e15 100644 --- a/sys-fs/encfs/encfs-1.9.5.ebuild +++ b/sys-fs/encfs/encfs-1.9.5.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/vgough/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3 LGPL-3" SLOT="0" -KEYWORDS="amd64 ~arm ~sparc x86" +KEYWORDS="amd64 arm ~sparc x86" IUSE="libressl nls" RDEPEND=" diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest index 8d8992850dbb..fad2ee8bba88 100644 --- a/sys-fs/eudev/Manifest +++ b/sys-fs/eudev/Manifest @@ -3,9 +3,9 @@ AUX udev-postmount 1208 BLAKE2B bcfbaee26ea666304091092deabcc068c533c7707252917a DIST eudev-3.2.5.tar.gz 1856958 BLAKE2B 8ca5706a91395ffa38c9bc552df874c1521d18103a6568bcf82d0664a20f8e38b58b67a74798f9f0c10a5adc99a7524318055b79dc2e360aee684c2a2a5983a4 SHA512 f73efde0d2dafcf79be4ebe9f6e6abb44329ea4ae45ccc4d9662c1d5ca6f4d45c27ca0b3135d7fa85f305bf7c5825dc1000079eb93fe7179c36a229fe63e372c DIST eudev-3.2.7.tar.gz 1892931 BLAKE2B 9ae903d624e8fb1b334735527329e6074a194dd6e22073c54acc58010d0f8f2d29bdc42d3e6d72dd388c1012be273ca27626ffe1173382d7dde9ad3aee942cd0 SHA512 e6c8ec86ae434c967f6a568fa0b281229bb87be7e3fec025dc3e0225de7843ffaa5dd65bdeffefbc91e9e2911aa3de9df84c76148fe8863ff60fba4c88653c40 DIST eudev-3.2.8.tar.gz 1894193 BLAKE2B 8709a13031744d5dd2f57853375b920bdaa6ea028624111dc96be9d46748de8423ac749f27183c668336701c16735d7ca2db4566621e0e741a2604785c14c64f SHA512 13221e6f9696a8630d867eb7d73f3bf5dd1bc2dfd80d62af00342be4cbf39a862e644ea3776fa4d91463e594ca50c5deecbeb7e05d161097e889ea58a66ccc42 -EBUILD eudev-3.2.5.ebuild 7019 BLAKE2B 39a12a772b0f543cf6c76a988d3c485423da493a695200d6e18a38916e3c1ce0442979549191683c5aee04efa0bbcbbb32e15d1f92381cffe41658438496d634 SHA512 271017380e0713c76126a8a34d53b974cbf657da1b0e31a4fe869cddc6327c992f722acc5f08bf9cc1f49f9d053867a9978cc42b4d481db0021dc8c12715d7fa -EBUILD eudev-3.2.7-r2.ebuild 7132 BLAKE2B 0b7abc784437186fb6cb7ff2c73243a4ae984857e610efc712b6a01e530da8bcf2a295dc4fcd4fcd32ed7dffa46eb0dcbb8d1f7f1527da641a14b4601f27b9ba SHA512 36fecb8c52ffa02a3846c26b2e95bd33ee565a74bef7a6b5e1311a28cf218c183fc77025911f0df160196ed8fb27c93922e7c2868a1ff8ccf8c86e9f7b0a8d39 -EBUILD eudev-3.2.8.ebuild 7132 BLAKE2B 0b7abc784437186fb6cb7ff2c73243a4ae984857e610efc712b6a01e530da8bcf2a295dc4fcd4fcd32ed7dffa46eb0dcbb8d1f7f1527da641a14b4601f27b9ba SHA512 36fecb8c52ffa02a3846c26b2e95bd33ee565a74bef7a6b5e1311a28cf218c183fc77025911f0df160196ed8fb27c93922e7c2868a1ff8ccf8c86e9f7b0a8d39 -EBUILD eudev-4.9999.ebuild 6318 BLAKE2B d3e72bb51f49893b56b24274657f18af4cbfaa28a71ea585b6d44d6789246d9c90ab473ddc3672906607f4fe5f3007c6d7c00a9de1e58a572d6de12466720b93 SHA512 66f28775f97062f5967224543c6c9741ec7999b490ae172c66791f1eb8055ed4aa3f7c2a327e632c6d7ce42d52fe4ef5feaf6f76eb5fdd54ecc1ef67a889b095 -EBUILD eudev-9999.ebuild 7132 BLAKE2B 0b7abc784437186fb6cb7ff2c73243a4ae984857e610efc712b6a01e530da8bcf2a295dc4fcd4fcd32ed7dffa46eb0dcbb8d1f7f1527da641a14b4601f27b9ba SHA512 36fecb8c52ffa02a3846c26b2e95bd33ee565a74bef7a6b5e1311a28cf218c183fc77025911f0df160196ed8fb27c93922e7c2868a1ff8ccf8c86e9f7b0a8d39 +EBUILD eudev-3.2.5.ebuild 6766 BLAKE2B 7007467747f127831b358fdc62a559a209a9b49d643c4eb1f3c9a44d11e1ed62ec00fadf8b939ec0b27fe20dc6b01a28f7d2e9c3e1f884af8b5b62b93e2d9ffb SHA512 eee2fa087a18778225b053d21a3ef091370a9f960676d68baa4b2d7094641c2906de6dbd0345af6de25316188817bf2ea0b9e223da152a39dd055eccdf70cf79 +EBUILD eudev-3.2.7-r2.ebuild 6931 BLAKE2B 3c75f45f6cd87110ce66b8e2f644178fb913670c6434dccff6a96dcd8afb7ef1097c1af7761d99ec9c9acba08c312f96f38b55dffa01f47dcd0cb24649bf4054 SHA512 c9c3067d102107ed5fb58027738eda2f608b80323473f16f438feb30aa2c0b0819954267edf240d82b21be2abbcb54ea98ea55affb400f7af539422b1141c215 +EBUILD eudev-3.2.8.ebuild 6931 BLAKE2B 3c75f45f6cd87110ce66b8e2f644178fb913670c6434dccff6a96dcd8afb7ef1097c1af7761d99ec9c9acba08c312f96f38b55dffa01f47dcd0cb24649bf4054 SHA512 c9c3067d102107ed5fb58027738eda2f608b80323473f16f438feb30aa2c0b0819954267edf240d82b21be2abbcb54ea98ea55affb400f7af539422b1141c215 +EBUILD eudev-4.9999.ebuild 6068 BLAKE2B 129380de118a1bb7389ffda2b3954f1cd3b64e92ab41e23eb0de153a338f6e7e74bcf0e06125061b22bdc2f48fdb5202a43cc212d87090cf7306e59a2b9ceafd SHA512 fcbfc2635093d4c88e95f413a39ee7b08c473797b2b8afc50a5f73b84e58c67e96b316f996c3f2ce7be90304c14139ec813bf877c9374583509a29df2451de83 +EBUILD eudev-9999.ebuild 6931 BLAKE2B 3c75f45f6cd87110ce66b8e2f644178fb913670c6434dccff6a96dcd8afb7ef1097c1af7761d99ec9c9acba08c312f96f38b55dffa01f47dcd0cb24649bf4054 SHA512 c9c3067d102107ed5fb58027738eda2f608b80323473f16f438feb30aa2c0b0819954267edf240d82b21be2abbcb54ea98ea55affb400f7af539422b1141c215 MISC metadata.xml 858 BLAKE2B dda0b6f29e9bce44b437db2236a94db9924c1e0999bcd68833ffae35fb6b390cfe0b6373d2e66d45eaa78059a89e9824f14c8ec775d085f51aa2b9ee7eb80a42 SHA512 bfffbea2229a0beabe8e979857b9f9761ade64faa0fc421a5f4d8ec1030aed60cce1505ff7d964f0128220773865d7f564db746fee1d68e611851c73406d1a79 diff --git a/sys-fs/eudev/eudev-3.2.5.ebuild b/sys-fs/eudev/eudev-3.2.5.ebuild index d84528595794..292095d63780 100644 --- a/sys-fs/eudev/eudev-3.2.5.ebuild +++ b/sys-fs/eudev/eudev-3.2.5.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" KV_min=2.6.39 -inherit autotools linux-info multilib multilib-minimal user +inherit autotools linux-info multilib multilib-minimal if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://github.com/gentoo/eudev.git" @@ -39,6 +39,9 @@ DEPEND="${COMMON_DEPEND} test? ( app-text/tree dev-lang/perl )" RDEPEND="${COMMON_DEPEND} + acct-group/input + acct-group/kvm + acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev @@ -184,12 +187,6 @@ pkg_postinst() { ewarn "else losetup may be confused when looking for unused devices." fi - # https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69 - # https://bugs.gentoo.org/246847 - # https://bugs.gentoo.org/514174 - enewgroup input - - # REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't, # process it as a list. We only care about the zero case (new install) or the case where # the same version is being re-emerged. If there is a second version, allow it to abort. local rv rvres=doitnew diff --git a/sys-fs/eudev/eudev-3.2.7-r2.ebuild b/sys-fs/eudev/eudev-3.2.7-r2.ebuild index 9ab6b6a42a2c..a9b3e55a1b92 100644 --- a/sys-fs/eudev/eudev-3.2.7-r2.ebuild +++ b/sys-fs/eudev/eudev-3.2.7-r2.ebuild @@ -5,7 +5,7 @@ EAPI="6" KV_min=2.6.39 -inherit autotools linux-info multilib multilib-minimal user +inherit autotools linux-info multilib multilib-minimal if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://github.com/gentoo/eudev.git" @@ -39,6 +39,9 @@ DEPEND="${COMMON_DEPEND} test? ( app-text/tree dev-lang/perl )" RDEPEND="${COMMON_DEPEND} + acct-group/input + acct-group/kvm + acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev @@ -186,13 +189,6 @@ pkg_postinst() { ewarn "else losetup may be confused when looking for unused devices." fi - # https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69 - # https://bugs.gentoo.org/246847 - # https://bugs.gentoo.org/514174 - enewgroup input - enewgroup kvm 78 - enewgroup render - # REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't, # process it as a list. We only care about the zero case (new install) or the case where # the same version is being re-emerged. If there is a second version, allow it to abort. diff --git a/sys-fs/eudev/eudev-3.2.8.ebuild b/sys-fs/eudev/eudev-3.2.8.ebuild index 9ab6b6a42a2c..a9b3e55a1b92 100644 --- a/sys-fs/eudev/eudev-3.2.8.ebuild +++ b/sys-fs/eudev/eudev-3.2.8.ebuild @@ -5,7 +5,7 @@ EAPI="6" KV_min=2.6.39 -inherit autotools linux-info multilib multilib-minimal user +inherit autotools linux-info multilib multilib-minimal if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://github.com/gentoo/eudev.git" @@ -39,6 +39,9 @@ DEPEND="${COMMON_DEPEND} test? ( app-text/tree dev-lang/perl )" RDEPEND="${COMMON_DEPEND} + acct-group/input + acct-group/kvm + acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev @@ -186,13 +189,6 @@ pkg_postinst() { ewarn "else losetup may be confused when looking for unused devices." fi - # https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69 - # https://bugs.gentoo.org/246847 - # https://bugs.gentoo.org/514174 - enewgroup input - enewgroup kvm 78 - enewgroup render - # REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't, # process it as a list. We only care about the zero case (new install) or the case where # the same version is being re-emerged. If there is a second version, allow it to abort. diff --git a/sys-fs/eudev/eudev-4.9999.ebuild b/sys-fs/eudev/eudev-4.9999.ebuild index a2f3610f835c..da2372754cf1 100644 --- a/sys-fs/eudev/eudev-4.9999.ebuild +++ b/sys-fs/eudev/eudev-4.9999.ebuild @@ -5,7 +5,7 @@ EAPI="6" KV_min=2.6.39 -inherit autotools linux-info multilib multilib-minimal user +inherit autotools linux-info multilib multilib-minimal if [[ ${PV} = 4.9999* ]]; then EGIT_REPO_URI="https://github.com/gentoo/eudev.git" @@ -40,6 +40,9 @@ DEPEND="${COMMON_DEPEND} test? ( app-text/tree dev-lang/perl )" RDEPEND="${COMMON_DEPEND} + acct-group/input + acct-group/kvm + acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev @@ -178,12 +181,6 @@ pkg_postinst() { ewarn "else losetup may be confused when looking for unused devices." fi - # https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69 - # https://bugs.gentoo.org/246847 - # https://bugs.gentoo.org/514174 - enewgroup input - - # REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't, # process it as a list. We only care about the zero case (new install) or the case where # the same version is being re-emerged. If there is a second version, allow it to abort. local rv rvres=doitnew diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild index 9ab6b6a42a2c..a9b3e55a1b92 100644 --- a/sys-fs/eudev/eudev-9999.ebuild +++ b/sys-fs/eudev/eudev-9999.ebuild @@ -5,7 +5,7 @@ EAPI="6" KV_min=2.6.39 -inherit autotools linux-info multilib multilib-minimal user +inherit autotools linux-info multilib multilib-minimal if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://github.com/gentoo/eudev.git" @@ -39,6 +39,9 @@ DEPEND="${COMMON_DEPEND} test? ( app-text/tree dev-lang/perl )" RDEPEND="${COMMON_DEPEND} + acct-group/input + acct-group/kvm + acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev @@ -186,13 +189,6 @@ pkg_postinst() { ewarn "else losetup may be confused when looking for unused devices." fi - # https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69 - # https://bugs.gentoo.org/246847 - # https://bugs.gentoo.org/514174 - enewgroup input - enewgroup kvm 78 - enewgroup render - # REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't, # process it as a list. We only care about the zero case (new install) or the case where # the same version is being re-emerged. If there is a second version, allow it to abort. diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index 6d85090cacfb..69f745499cf4 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -11,6 +11,7 @@ AUX lvm.rc-2.02.116-r6 3780 BLAKE2B e5a293e9f493a49776b539e30e6a8452e93ea3723e36 AUX lvm.rc-2.02.172 4266 BLAKE2B 50d2bee47ee2fd6f4a56eaed7df4fc736c5a2158353af113bd8ee6915055f2a196b9feb37678d928d7e73a71783f6918219e9e6143ae53bd09839cd1560ff35f SHA512 718ac4495623c495c6697c992d07f618459748d03a960566896cea981639c655ecb3ddcb876150f9129d0b6bc1bd90ef1092a3326ac7234519702675bdb1db6a AUX lvm.rc-2.02.183 4363 BLAKE2B b80351d20a87937f331b34c2007b2ccd27543273b672d002607b02f56d5a15fb142111c5f0939fcc40c52b3123b3b3fc15aa39424139bd00692158f20784489b SHA512 7cd6aa621d022190cd45c44e39ac48445f244643e5c537adbe61e4fbc2d688ce450bfddece92853cc324b0bb2c52c32c4169fc251914eda429de418a0ffe8aba AUX lvm.rc-2.02.184-r3 4474 BLAKE2B c08e1c338b8b788927d05f87eb83b2f3a95d35dad9b86e5f9be8809b2883bac56c973c9c2dc8f7775c6e05c3c2ea66dd5268699af3dba47e9a842262e659a121 SHA512 ca7fef98fd074018223be65f6aa20a0abfbb78afbf3d8ff50e1f2656a1cbb7a54570381c9a5328f3766774dce819c1f48e4433c0e7bec69f6bf70747a3375699 +AUX lvm.rc-2.03.05 3923 BLAKE2B bbb17f64ba56e4f2eaa75020116fff637d13f35ebccf27c2bfa98a9bb7d0e9b53e4afc5d2d1266db61486281d09a2a1c3ec3540edac9dcccd8655bcb17cb44bb SHA512 eb9f76aaf8af5bee7315481de2aa99091150c69f281f58d07e8955856316a7ef41c7f0e3e5c5b4ee14c76108f03a7a396c6f1113fafec49883a09b5049a85e93 AUX lvm2-2.02.106-pthread-pkgconfig.patch 860 BLAKE2B 73c23ba460787dccc1412a8fdba9cdf60172fecab9a732b154af7e7bc4c927a751fbd1107c86cd997221b963748644885a4f525eae351aa2857c4d7e1498f755 SHA512 ae073936ee15fdeabde4d3948a65f6a435b82e62aa0ddadbad399b69bd5c9bfc181d5e0be1beae9f6e899a6e8b9d7c21add13f7a1606cb5ed4762ed5aa5aa223 AUX lvm2-2.02.108-example.conf.in.patch 1681 BLAKE2B 3b7f1fcd005687aa3b4469d88a6fea71c6d5745df0b8ec76dbc6e4e6ad11828785f705503a992a25bae9fc77772fca03f023dbf515bc34e498dd718ed97aaa63 SHA512 b4e983892b7ff47e5e7617376197daa62cfd063cf398235dc4a436fd9025ec4b1e263d7418e2c2943d53be494cba4209e9d4230d54a78762b0ca526f92e9746c AUX lvm2-2.02.108-static-pkgconfig-libs.patch 3302 BLAKE2B c44b0602e010c7e774d87de808d739987b0bed6e1c963b6a6005b42933edbcaf43dabfbcb26a668c6ba4f0b1e3ddcb2f727f7b57d1c5b8e0c41b201d974a15ac SHA512 246f1029f9346d6bc57c2062c8a223535d0b832fa6bd86947b8b91b094dbc388706a9914f9ca0531666f77e73544612e2819335435b7576b4e91cdb1b0e4f041 @@ -35,6 +36,10 @@ AUX lvm2-2.02.67-createinitrd.patch 660 BLAKE2B 23e784e6769bc1f47fa57d690e6bebdf AUX lvm2-2.02.70-asneeded.patch 336 BLAKE2B 4d5b59f62107bce7a8bc6bacddd84b4f3bc8a53c5b5552b32d4bf058a83fe0eb79380ce6fe0dd7e8dd596ef783f02c50d3080d852a051e825f46eba0c286b9c5 SHA512 c4aa5b7120c5b28a3d646b50b561060553dedba766348260e5db6d56776f1474cec09daeab50e1aca2e1d2d166b9ed57e83673b92bc1c305669c13a719696600 AUX lvm2-2.02.92-dynamic-static-ldflags.patch 3031 BLAKE2B 4e0e8bf8335420087470ca2b5ba01d1fbc1164a53f768415f2a6e4208ba9f65865719eececdbf1b8bbfd021813fb9cf5505a4066529e019fc25b9695feb29bff SHA512 edb78081d12bebaccd31c2474cb531563b729f1ad966afaff7892556177ee7a68217cc699c65383318066139ba62183adc8334f46f8f8933d62b6b5dcd11a023 AUX lvm2-2.02.99-locale-muck.patch 405 BLAKE2B 07ac7c7f54d06dbdeae1c6bf0959fd0c223b30cbd67c08f853e02f520d212f7b6dcf7c3b6c3d3b7370bb004adbb23b226bf0d0792b5799ddbaff5ab655124ca2 SHA512 1c898693f71d165d55458ab87886a25206930c202b5aea95eba394ad06162cc710c1435e598acb9bcd3fbf46abf5409be972f6ce73bd02b2e177e1af780ae7ad +AUX lvm2-2.03.05-dmeventd-no-idle-exit.patch 2737 BLAKE2B 957f51a45f41920e73141cff56612e1bc334ef455fe262f1563d7c476ed534922f8f7a5f99d4f8ad69bb8830b7b1b97cf7afeb9a628058d54ffcef9d6497956f SHA512 c8ba4930114d8f6af230c21840e966def269e064c2236db6402a527f4e4050762082f37a770c551d3dab8d1b21642cfee701e48231f2bf42d50e41056725b711 +AUX lvm2-2.03.05-dynamic-static-ldflags.patch 2696 BLAKE2B 7464ee428e2cb8834181d3023399f2f913912bc58cb69af1fe9bb4418aecea1e4815c79d349e335cf60a7566052a34eb48db75f4f69bc0b0c2454def45edb18d SHA512 cb8e517967501fe11fe6c19543c37b26ada300bc06156b9f84e96fed96818e4a63e5a4322736d8e1eff4025a268dfb5570c4ec514bdf92df219a626f8bacd607 +AUX lvm2-2.03.05-example.conf.in.patch 1831 BLAKE2B aac73c92dfc81df0a7144f5c91cc74a162539030b2e576e21abf5588de386a1ef8173a28b3a47ad5474fb58afcb6f263f281f94abc7c442ddc03a20bc0645907 SHA512 d538b05769a92c4cac5ff39d21cf8975602b55e859e3f6e439b641de103a1097d703cbc133069e30cc9d512bc7d091c64b223af7012d5d47dc7ac724d2e3b18d +AUX lvm2-2.03.05-pthread-pkgconfig.patch 1442 BLAKE2B 6d2864c91fc38ba3c8e97641610c028bcd67b16bccf380b9fa8d7c5d18b714f91e35a4eeaa668f6b07dd057a663ac8c9f7e0936fb040d6ab258652327ca9bf22 SHA512 f20104a2f78900211bfadca486961039ce3e153dba9a242e4a2400c7e7efe06d061a76a4691f45233cc85aa15858cb8f44bf7bacb44007a8026c7c4794de4873 AUX lvmetad.initd-2.02.105-r2 284 BLAKE2B 6be707673353492efd5030958b42e6d4f388d2edc367e6c4964d5d88c9d1dd43e3e69e00f755bd801d7e39ea6c99d8717552c6d3d96f9cb3d4f3f9f0d8c5df18 SHA512 af87eb77cc3091b55fcac51398ad3a489c0a4e34d4d5274596b8504bfb69b37e10d432fe314e3d65de5e6de23df95d0476855cb85dabfa2ac8a61a25aef68226 AUX lvmetad.initd-2.02.116-r3 345 BLAKE2B d458efd01fa08debe0857072c880adf951477445dd619a052f50cab9da39d8a38c9d480fc2d20fe899e01dcbcdaea0696d5c3e65af128652feea3186857d206e SHA512 f3143c6e1d00893009c68141f5ffd7e1e6bcf5b7ef0ff8505bc6c7049d83b2f9ddd2dc5a3cfdc2641a20603830b5dba07d73740cc5ce82e6b1b602a9b737a241 AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c97256a42b725e015a13c9673e79c0d1a10213d1eecb6c75d4ce1ebd99e6200010f19c36d758018bdef303ea08ee5549 SHA512 6359b3cbff1fa05944fb69582234220cac593b2c8f8317162a728bac72ced4f8b492ce11e6ced6d848a7654fa4a506c1e658f546cff302344a739646479a62dc @@ -47,8 +52,8 @@ DIST LVM2.2.02.185.tgz 2386328 BLAKE2B d2e31de3eedd7518ea2d239cb9b36b38e351d7fc0 DIST LVM2.2.03.05.tgz 2427412 BLAKE2B a66f199b6b9b593746ff7738657d80c3dc6201b417736e8136e8c894532611d9a4b44c3c791cb7dac539e6e2683b348ba17917a2a9ba539ec15cac5c25713816 SHA512 3b00f53771e99faa6459ae73353bff06ae37c64bd2659586ec25d0bb43bc3ff8ba5f713c68617fd7662a5f6cb65bca1ad0aea554819048d79c1cce20bf67c50a EBUILD lvm2-2.02.116.ebuild 8450 BLAKE2B 1e028c3b1c14ac9e0e8bad95c4882bd05d5227f462f594f9af5b4fb58c1cb89412006e497211645dbadbf3fcca35f95c88d5b30bd7415ea4ecf53be26e8465cc SHA512 6aebbe79f13bc0ce8422c9d0ed73f30efe9f04cbbdc190b5d52dc63be981be1cd350c9dd586a6dc2704e4c5abb7ca16eee878350eddbcee46ebdd21f148ef07b EBUILD lvm2-2.02.145-r2.ebuild 8637 BLAKE2B e21d693c8428d8704be6f5065939081f0c1992f016a55ca2d2074caf9a4066ee45cb02b57c84d6377d0e993110da67164716f1974ed474a095c54c3dd30f0c90 SHA512 cd63c1e595901e17f9cd0fb7d780ea8538e3fbc48111fbd6e3d3ba9c7aff23d7deeeb8e556aa7c206884f49891a534911f0186750a15d4bbdc81424f1316025a -EBUILD lvm2-2.02.183.ebuild 8774 BLAKE2B 6f22c453991e96abb3ad32d94fb767772e4a8144e61d6e9870aaf1c2910926d1e1276664c56e33b8f1eb78134b7d8f930232c685e0a5a33602fb76b698903180 SHA512 3118a7752add5a12bcca7626a8ab5db67f7ea43514c118a1bacb2be8dea51fae41586ee93036c547089fdf10cc657830b2d19613089060d0341c9a17bdf795a3 -EBUILD lvm2-2.02.184-r4.ebuild 9315 BLAKE2B c7dd13a55b50a0e4c5c05211d5744de4c15e5c68bae0d620628a64cc6c93285f3a251bbe594d8556be31341805bd82502d715632adca69eeb51febc427bb9b1f SHA512 28f11e48ab1237876f77f48a3b30f26a3344091dd18c0a7e609dbcfed699bb6c76b90111f603a7c8d03a420c9a031ba1a24081457b67a9d10835de7aad990c72 -EBUILD lvm2-2.02.185.ebuild 9434 BLAKE2B bb5038e31f201fa2b9b30291826695c9d90be9895354d6532a2c1ad901259c46fa16196ead233145ca68b5a150794125df21cb3df0af0f20141d412287f1ced3 SHA512 6e2861fa5bc2dffd1c46e35bb7d70e027afbbb8343cbf1c4a78f301b5edd78a77bc377b093c63422a4a7b37a4772eae3b847158ebe10baf6afbccff0f966f91f -EBUILD lvm2-2.03.05.ebuild 9343 BLAKE2B 361c8f9ee72d73ce7f9a70f56bc2fb96e686dc351e5510a0fc1546584e0efff51e1e2a9d5c001f988987005d3467b4ad4f49396428acca995c6d6c8934d0e708 SHA512 b4a37dbab3c533bc17b1a2f577cdacea6f1bbd1412587c92bda60c3e45fdc723c2e15497f840bd395ee28ab1c1085a5a39f06af58f58a5fcce02b0496d0a54ea +EBUILD lvm2-2.02.183.ebuild 8886 BLAKE2B f70bfabc88eeacfd2ea52a22ade436296276f53db341ed1be96e72e5309f4494c6ecd14b5a057f33c67efc36c5029c146a90aa3db6580c03290598043597fc26 SHA512 87c6dcce5a9731e3d0f4c8ddee25db5324dd25ac66a70f632a9653d1874a10eef84ec4ab6089651b00a8663cb3af9bf7c10df352353e32d04d7a74fc80438922 +EBUILD lvm2-2.02.184-r4.ebuild 9424 BLAKE2B bf506a9a4cd7bd4a307ffb274943c502aadddfe35bed56841116d6cf8e2dd33d051e769f36dae1a678dc292f68d49b337634c2cc16ceddd284495da319075505 SHA512 a69837d3c29391fcc907a641340e96d46d49085a10c43c31fb2236ee113f1be9331ad8d75cf3152de87ce765f93bcabea7cef1183d7bf6176654ff410b048e92 +EBUILD lvm2-2.02.185.ebuild 9546 BLAKE2B 5340d3dd5b5644ac8c6edb7379610950d5f0cd94ce09b7e3d9b68d1bcb67c78cc79ed2f5fb16ecc070119a7a050c95dd3df666238b0544abd4e76d4f154b3e45 SHA512 d675da33cba6f0de1e5fa614f60ee01f4fb0461f3776a7dce9dd2c7c93008373f081fcd817db2183f05d697e6f9077f6a8de032f806eb23e12130c48be558451 +EBUILD lvm2-2.03.05.ebuild 8925 BLAKE2B b34bb9025be56cbd85a0c9c886527252b254fffc62452bfd8b0d7229c91eddbc815cf3d0b005c783d28a42980fd2173c169fbf4472629fa21696d65b97e2a864 SHA512 af7b0c8a801022f753a0268a7bde1e88c6a05c636722eb9cddd8cc54b2c73042078f5c6fc571e8189b30daa6fadbae40012779316a27649f9b3bbe6af01bbae9 MISC metadata.xml 1146 BLAKE2B 7a4bbf38d2e752523c2909c240a2c90ada04aee8efe96c62c5989887f4997e00a4ed7312dd9803d8ddcae02e8bbc3ba8f0fa9e5da0f484bc9768e0ed99ab8be3 SHA512 24240ba35d93d9f9171f2b164d949846a5ea2126eceed4b4454dd0b4efb9b1132f9f6717d2c7364f20820b792bbaf26dc274f7c10767993b35a565a76e042f4f diff --git a/sys-fs/lvm2/files/lvm.rc-2.03.05 b/sys-fs/lvm2/files/lvm.rc-2.03.05 new file mode 100644 index 000000000000..7b7d90b98269 --- /dev/null +++ b/sys-fs/lvm2/files/lvm.rc-2.03.05 @@ -0,0 +1,132 @@ +#!/sbin/openrc-run +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +_get_lvm_path() { + local lvm_path= + for lvm_path in /bin/lvm /sbin/lvm ; do + [ -x "$lvm_path" ] && break + done + echo "${lvm_path}" +} + +_need_lvmlockd() +{ + local lvm_path="$(_get_lvm_path)" + [ ! -x "${lvm_path}" ] && return 1 + ${lvm_path} dumpconfig global 2>/dev/null | grep -q 'use_lvmlockd=1' +} + +depend() { + before checkfs fsck + after modules device-mapper + config /etc/lvm/lvm.conf + local _need= + if service_started; then + _need=$(service_get_value need) + else + if _need_lvmlockd; then + _need="${_need} lvmlockd" + fi + fi + # Make sure you review /etc/conf.d/lvm as well! + # Depending on your system, it might also introduce udev & mdraid + need sysfs ${_need} +} + +config='global { locking_dir = "/run/lock/lvm" }' + +dm_in_proc() { + local retval=0 + for x in devices misc ; do + grep -qs 'device-mapper' /proc/${x} + retval=$((${retval} + $?)) + done + return ${retval} +} + +start() { + # LVM support for /usr, /home, /opt .... + # This should be done *before* checking local + # volumes, or they never get checked. + + # NOTE: Add needed modules for LVM or RAID, etc + # to /etc/modules.autoload if needed + lvm_path="$(_get_lvm_path)" + for lvm_path in /bin/lvm /sbin/lvm ; do + [ -x "$lvm_path" ] && break + done + if [ ! -x "$lvm_path" ]; then + eerror "Cannot find lvm binary in /sbin or /bin!" + return 1 + fi + if [ -z "${CDBOOT}" ] ; then + if [ -e /proc/modules ] && ! dm_in_proc ; then + modprobe dm-mod 2>/dev/null + fi + if [ -d /proc/lvm ] || dm_in_proc ; then + ebegin "Setting up the Logical Volume Manager" + #still echo stderr for debugging + lvm_commands="#!${lvm_path}\n" + # Extra PV find pass because some devices might not have been available until very recently + lvm_commands="${lvm_commands}pvscan --config '${config}'\n" + # Now make the nodes + lvm_commands="${lvm_commands}vgscan --config '${config}' --mknodes\n" + # And turn them on! + lvm_commands="${lvm_commands}vgchange --config '${config}' --sysinit -a ly\n" + if _need_lvmlockd; then + # Start lockd VGs as required + lvm_commands="${lvm_commands}vgchange --config '${config}' --lock-start --lock-opt auto\n" + fi + # Order of this is important, have to work around dash and LVM readline + printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 >/dev/null + eend $? "Failed to setup the LVM" + fi + fi +} + +stop() { + for lvm_path in /bin/lvm /sbin/lvm ; do + [ -x "$lvm_path" ] && break + done + if [ ! -x "$lvm_path" ]; then + eerror "Cannot find lvm binary in /sbin or /bin!" + return 1 + fi + + # Stop LVM2 + if [ -x /sbin/vgs ] && \ + [ -x /sbin/vgchange ] && \ + [ -x /sbin/lvchange ] && \ + [ -f /etc/lvmtab -o -d /etc/lvm ] && \ + [ -d /proc/lvm -o "`grep device-mapper /proc/misc 2>/dev/null`" ] + then + einfo "Shutting down the Logical Volume Manager" + + VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix --rows 2> /dev/null) + + if [ "$VGS" ] + then + local _ending="eend" + [ "$RC_RUNLEVEL" = shutdown ] && _ending="ewend" + ebegin " Shutting Down LVs & VGs" + #still echo stderr for debugging + lvm_commands="#!${lvm_path}\n" + # Extra PV find pass because some devices might not have been available until very recently + lvm_commands="${lvm_commands}lvchange --config '${config}' --sysinit -a ln ${VGS}\n" + # Now make the nodes + lvm_commands="${lvm_commands}vgchange --config '${config}' --sysinit -a ln ${VGS}\n" + # Order of this is important, have to work around dash and LVM readline + printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null + rc=$? + msg="Failed (possibly some LVs still needed for /usr or root)" + [ "$RC_RUNLEVEL" = shutdown ] && msg="${msg} [rc=$rc]" && rc=0 + ${_ending} $rc "${msg}" + fi + + einfo "Finished shutting down the Logical Volume Manager" + return 0 + fi +} + +# vim:ts=4 diff --git a/sys-fs/lvm2/files/lvm2-2.03.05-dmeventd-no-idle-exit.patch b/sys-fs/lvm2/files/lvm2-2.03.05-dmeventd-no-idle-exit.patch new file mode 100644 index 000000000000..ec37e5da1dc7 --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.03.05-dmeventd-no-idle-exit.patch @@ -0,0 +1,81 @@ +From ab3ae0a22dfbe20e2d17e7dc60e0f76184ec098c Mon Sep 17 00:00:00 2001 +From: "Robin H. Johnson" <robbat2@gentoo.org> +Date: Wed, 24 Jul 2019 11:22:32 +0200 +Subject: [PATCH] dmeventd configurable idle exit time + +dmeventd nominally exits after 1 hour of idle time. There are use cases for +this, esp. with socket activation, but also cases where users don't expect +dmeventd to exit. + +Provide a tuning knob via environment variable, DMEVENTD_IDLE_EXIT_TIMEOUT, +that can be -1 to not exit, or a configurable time for different idle exit. + +Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> +Fixes: https://bugs.gentoo.org/682556 + +Forward-ported from 2.02.184 to 2.03.05 +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> +--- + daemons/dmeventd/dmeventd.c | 16 ++++++++++++++-- + man/dmeventd.8_main | 4 ++++ + 2 files changed, 18 insertions(+), 2 deletions(-) + +diff --git a/daemons/dmeventd/dmeventd.c b/daemons/dmeventd/dmeventd.c +index 33859ef414..ac0b9743fc 100644 +--- a/daemons/dmeventd/dmeventd.c ++++ b/daemons/dmeventd/dmeventd.c +@@ -2158,6 +2158,18 @@ int main(int argc, char *argv[]) + .server_path = DM_EVENT_FIFO_SERVER + }; + time_t now, idle_exit_timeout = DMEVENTD_IDLE_EXIT_TIMEOUT; ++ ++ /* Provide a basic way to config the idle timeout */ ++ char* idle_exit_timeout_env = getenv("DMEVENTD_IDLE_EXIT_TIMEOUT") ? : NULL; ++ if(NULL != idle_exit_timeout_env) { ++ char* endptr; ++ idle_exit_timeout = strtol(idle_exit_timeout_env, &endptr, 10); ++ if (errno == ERANGE || *endptr != '\0') { ++ fprintf(stderr, "DMEVENTD_IDLE_EXIT_TIMEOUT: bad time input\n"); ++ exit(EXIT_FAILURE); ++ } ++ } ++ + opterr = 0; + optind = 0; + +@@ -2253,7 +2265,7 @@ int main(int argc, char *argv[]) + _process_initial_registrations(); + + for (;;) { +- if (_idle_since) { ++ if (_idle_since || _exit_now) { + if (_exit_now) { + if (_exit_now == DM_SCHEDULED_EXIT) + break; /* Only prints shutdown message */ +@@ -2262,7 +2274,7 @@ int main(int argc, char *argv[]) + (long) (time(NULL) - _idle_since)); + break; + } +- if (idle_exit_timeout) { ++ if (idle_exit_timeout && idle_exit_timeout > 0) { + now = time(NULL); + if (now < _idle_since) + _idle_since = now; /* clock change? */ +diff --git a/man/dmeventd.8_main b/man/dmeventd.8_main +index dc4abf627e..4b0e522041 100644 +--- a/man/dmeventd.8_main ++++ b/man/dmeventd.8_main +@@ -178,6 +178,10 @@ is processed. + Variable is set by thin and vdo plugin to prohibit recursive interation + with dmeventd by any executed lvm2 command from + a thin_command, vdo_command environment. ++.TP ++.B DMEVENTD_IDLE_EXIT_TIMEOUT ++Configure the dmeventd idle exit timeout behavior, value in seconds. Default ++is 3600 (1 hour). -1 means do not exit. + . + .SH SEE ALSO + . +-- +2.22.0 + diff --git a/sys-fs/lvm2/files/lvm2-2.03.05-dynamic-static-ldflags.patch b/sys-fs/lvm2/files/lvm2-2.03.05-dynamic-static-ldflags.patch new file mode 100644 index 000000000000..2b9a5dd945c5 --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.03.05-dynamic-static-ldflags.patch @@ -0,0 +1,75 @@ +From 93101699f5e1190184c00c99ab7b6e9717e5019a Mon Sep 17 00:00:00 2001 +From: "Robin H. Johnson" <robbat2@gentoo.org> +Date: Wed, 24 Jul 2019 11:11:35 +0200 +Subject: [PATCH] Add dynamic static ldflags + +Forward-ported from 2.02.178 to 2.03.05 +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> +--- + configure.ac | 2 ++ + daemons/dmeventd/Makefile.in | 2 +- + make.tmpl.in | 1 + + tools/Makefile.in | 2 +- + 4 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1e45c0edcb..cc2625294a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -33,6 +33,7 @@ case "$host_os" in + CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym" + # equivalent to -rdynamic + ELDFLAGS="-Wl,--export-dynamic" ++ STATIC_LDFLAGS="-Wl,--no-export-dynamic" + # FIXME Generate list and use --dynamic-list=.dlopen.sym + CLDWHOLEARCHIVE="-Wl,-whole-archive" + CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive" +@@ -1758,6 +1759,7 @@ AC_SUBST(SYSCONFDIR) + AC_SUBST(SYSTEMD_LIBS) + AC_SUBST(SNAPSHOTS) + AC_SUBST(STATICDIR) ++AC_SUBST(STATIC_LDFLAGS) + AC_SUBST(STATIC_LINK) + AC_SUBST(TESTSUITE_DATA) + AC_SUBST(THIN) +diff --git a/daemons/dmeventd/Makefile.in b/daemons/dmeventd/Makefile.in +index 6bd36d0325..a3c30ec1a0 100644 +--- a/daemons/dmeventd/Makefile.in ++++ b/daemons/dmeventd/Makefile.in +@@ -66,7 +66,7 @@ dmeventd: $(LIB_SHARED) dmeventd.o + + dmeventd.static: $(LIB_STATIC) dmeventd.o + @echo " [CC] $@" +- $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacebuilddir) dmeventd.o \ ++ $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L. -L$(interfacebuilddir) dmeventd.o \ + -o $@ $(DL_LIBS) $(DMEVENT_LIBS) $(LIBS) $(STATIC_LIBS) + + ifeq ("@PKGCONFIG@", "yes") +diff --git a/make.tmpl.in b/make.tmpl.in +index f3332e91c1..1489c2afad 100644 +--- a/make.tmpl.in ++++ b/make.tmpl.in +@@ -68,6 +68,7 @@ DEFS += @DEFS@ + # FIXME set this only where it's needed, not globally? + CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ + LDFLAGS ?= @LDFLAGS@ ++STATIC_LDFLAGS += @STATIC_LDFLAGS@ + CLDFLAGS += @CLDFLAGS@ + ELDFLAGS += @ELDFLAGS@ + LDDEPS += @LDDEPS@ +diff --git a/tools/Makefile.in b/tools/Makefile.in +index 2620daa17c..e5fc9c4ae4 100644 +--- a/tools/Makefile.in ++++ b/tools/Makefile.in +@@ -136,7 +136,7 @@ man-generator: man-generator.o + + lvm.static: $(OBJECTS) lvm-static.o $(LVMINTERNAL_LIBS) + @echo " [CC] $@" +- $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ $+ \ ++ $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) -o $@ $+ \ + $(DMEVENT_LIBS) $(STATIC_LIBS) $(LVMLIBS) + + liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o +-- +2.22.0 + diff --git a/sys-fs/lvm2/files/lvm2-2.03.05-example.conf.in.patch b/sys-fs/lvm2/files/lvm2-2.03.05-example.conf.in.patch new file mode 100644 index 000000000000..a79250b8b4fd --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.03.05-example.conf.in.patch @@ -0,0 +1,56 @@ +From d5755288f23fdeaca4c6d317583f5f119ea8801c Mon Sep 17 00:00:00 2001 +From: "Robin H. Johnson" <robbat2@gentoo.org> +Date: Wed, 24 Jul 2019 11:01:03 +0200 +Subject: [PATCH] Add Gentoo specific changes + +Forward-ported from 2.02.178 to 2.03.05 +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> +--- + conf/example.conf.in | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/conf/example.conf.in b/conf/example.conf.in +index 154f621bcf..83124ddea3 100644 +--- a/conf/example.conf.in ++++ b/conf/example.conf.in +@@ -143,6 +143,9 @@ devices { + # Example + # Accept every block device: + # filter = [ "a|.*/|" ] ++ # Gentoo: we exclude /dev/nbd by default, because it makes a lot of kernel ++ # noise when you probed while not available. ++ filter = [ "r|/dev/nbd.*|", "a/.*/" ] + # Reject the cdrom drive: + # filter = [ "r|/dev/cdrom|" ] + # Work with just loopback devices, e.g. for testing: +@@ -1677,7 +1680,7 @@ activation { + + # Configuration section metadata. + # This configuration section has an automatic default value. +-# metadata { ++metadata { + + # Configuration option metadata/check_pv_device_sizes. + # Check device sizes are not smaller than corresponding PV sizes. +@@ -1722,7 +1725,8 @@ activation { + # + # This configuration option is advanced. + # This configuration option has an automatic default value. +- # pvmetadatacopies = 1 ++ # Gentoo: enable for data safety, but PV resize is then disabled. ++ # pvmetadatacopies = 2 + + # Configuration option metadata/vgmetadatacopies. + # Number of copies of metadata to maintain for each VG. +@@ -1766,7 +1770,7 @@ activation { + # This configuration option is advanced. + # This configuration option has an automatic default value. + # stripesize = 64 +-# } ++} + + # Configuration section report. + # LVM report command output formatting. +-- +2.22.0 + diff --git a/sys-fs/lvm2/files/lvm2-2.03.05-pthread-pkgconfig.patch b/sys-fs/lvm2/files/lvm2-2.03.05-pthread-pkgconfig.patch new file mode 100644 index 000000000000..56aa2a7b79fc --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.03.05-pthread-pkgconfig.patch @@ -0,0 +1,48 @@ +From dbb68df8d02eff87f10df331e17bd0940e158f56 Mon Sep 17 00:00:00 2001 +From: "Robin H. Johnson" <robbat2@gentoo.org> +Date: Wed, 24 Jul 2019 11:15:59 +0200 +Subject: [PATCH] Add pthread to libdevmapper pkgconfig file + +Forward-ported from 2.02.176 to 2.03.05 +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> +--- + libdm/libdevmapper.pc.in | 2 +- + tools/Makefile.in | 5 +++++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/libdm/libdevmapper.pc.in b/libdm/libdevmapper.pc.in +index a325aeb9e0..aa0980378f 100644 +--- a/libdm/libdevmapper.pc.in ++++ b/libdm/libdevmapper.pc.in +@@ -9,4 +9,4 @@ Version: @DM_LIB_PATCHLEVEL@ + Cflags: -I${includedir} + Libs: -L${libdir} -ldevmapper + Requires.private: @SELINUX_PC@ @UDEV_PC@ +-Libs.private: -lm @RT_LIBS@ ++Libs.private: -lm @RT_LIBS@ @PTHREAD_LIBS@ +diff --git a/tools/Makefile.in b/tools/Makefile.in +index e5fc9c4ae4..12e4de2c63 100644 +--- a/tools/Makefile.in ++++ b/tools/Makefile.in +@@ -87,6 +87,7 @@ ifeq ("@STATIC_LINK@", "yes") + TARGETS += lvm.static + INSTALL_LVM_TARGETS += install_tools_static + INSTALL_CMDLIB_TARGETS += install_cmdlib_static ++ STATIC_LIBS += @PTHREAD_LIBS@ + endif + + LVMLIBS = $(SYSTEMD_LIBS) -L$(top_builddir)/libdm -ldevmapper $(LIBS) -laio +@@ -113,6 +114,10 @@ CFLOW_TARGET = lvm + + include $(top_builddir)/make.tmpl + ++ifeq ("@STATIC_LINK@", "yes") ++ STATIC_LIBS += @PTHREAD_LIBS@ ++endif ++ + device-mapper: + + all: device-mapper +-- +2.22.0 + diff --git a/sys-fs/lvm2/lvm2-2.02.183.ebuild b/sys-fs/lvm2/lvm2-2.02.183.ebuild index 1b37eab4af34..595dd187372a 100644 --- a/sys-fs/lvm2/lvm2-2.02.183.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.183.ebuild @@ -180,6 +180,9 @@ src_configure() { --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" CLDFLAGS="${LDFLAGS}" ) + # Hard-wire this to bash as some shells (dash) don't know + # "-o pipefail" #682404 + CONFIG_SHELL="/bin/bash" \ econf "${myeconfargs[@]}" } diff --git a/sys-fs/lvm2/lvm2-2.02.184-r4.ebuild b/sys-fs/lvm2/lvm2-2.02.184-r4.ebuild index 8bdc388eb348..eab949397c29 100644 --- a/sys-fs/lvm2/lvm2-2.02.184-r4.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.184-r4.ebuild @@ -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 ~sh sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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 )" @@ -185,6 +185,9 @@ src_configure() { --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" CLDFLAGS="${LDFLAGS}" ) + # Hard-wire this to bash as some shells (dash) don't know + # "-o pipefail" #682404 + CONFIG_SHELL="/bin/bash" \ econf "${myeconfargs[@]}" } diff --git a/sys-fs/lvm2/lvm2-2.02.185.ebuild b/sys-fs/lvm2/lvm2-2.02.185.ebuild index 2912f4832990..812f84d2b656 100644 --- a/sys-fs/lvm2/lvm2-2.02.185.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.185.ebuild @@ -188,6 +188,9 @@ src_configure() { --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" CLDFLAGS="${LDFLAGS}" ) + # Hard-wire this to bash as some shells (dash) don't know + # "-o pipefail" #682404 + CONFIG_SHELL="/bin/bash" \ econf "${myeconfargs[@]}" } diff --git a/sys-fs/lvm2/lvm2-2.03.05.ebuild b/sys-fs/lvm2/lvm2-2.03.05.ebuild index c605404faf84..12b13a5e36e6 100644 --- a/sys-fs/lvm2/lvm2-2.03.05.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.05.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic usr-ldscript DESCRIPTION="User-land utilities for LVM2 (device-mapper) software" @@ -38,35 +38,38 @@ RDEPEND="${DEPEND_COMMON} # note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check # USE 'static' currently only works with eudev, bug 520450 DEPEND="${DEPEND_COMMON} - virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 - sys-devel/autoconf-archive static? ( selinux? ( sys-libs/libselinux[static-libs] ) udev? ( >=sys-fs/eudev-3.1.2[static-libs] ) >=sys-apps/util-linux-2.16[static-libs] )" +BDEPEND=" + sys-devel/autoconf-archive + virtual/pkgconfig +" -S=${WORKDIR}/${PN/lvm/LVM}.${PV} +S="${WORKDIR}/${PN/lvm/LVM}.${PV}" PATCHES=( # Gentoo specific modification(s): - "${FILESDIR}"/${PN}-2.02.178-example.conf.in.patch + "${FILESDIR}"/${PN}-2.03.05-example.conf.in.patch # For upstream -- review and forward: - "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch + #"${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch # FIXME: breaks libdm/dm-tools build "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331 "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 - "${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed - "${FILESDIR}"/${PN}-2.02.178-dynamic-static-ldflags.patch #332905 + #"${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed + "${FILESDIR}"/${PN}-2.03.05-dynamic-static-ldflags.patch #332905 "${FILESDIR}"/${PN}-2.02.178-static-pkgconfig-libs.patch #370217, #439414 + blkid - "${FILESDIR}"/${PN}-2.02.176-pthread-pkgconfig.patch #492450 + "${FILESDIR}"/${PN}-2.03.05-pthread-pkgconfig.patch #492450 "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756 "${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446 #"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream - "${FILESDIR}"/${PN}-2.02.184-dmeventd-no-idle-exit.patch + "${FILESDIR}"/${PN}-2.03.05-dmeventd-no-idle-exit.patch #"${FILESDIR}"/${PN}-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch #682380 # merged upstream + "${FILESDIR}"/${PN}-2.02.184-mksh_build.patch #686652 ) pkg_setup() { @@ -76,7 +79,7 @@ pkg_setup() { local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n" if linux_config_exists; then local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) - if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then + if [[ -n "${uevent_helper_path}" ]] && [[ "${uevent_helper_path}" != '""' ]]; then ewarn "It's recommended to set an empty value to the following kernel config option:" ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" fi @@ -103,13 +106,6 @@ src_prepare() { sed -i -e '/FLAG/s:-O2::' configure{.ac,} || die #480212 - if use udev && ! use device-mapper-only; then - sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196 - elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in" - elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad" - elog "if it was previously disabled." - fi - sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514 # Without thin-privision-tools, there is nothing to install for target install_man7: @@ -131,9 +127,7 @@ src_configure() { $(use_enable !device-mapper-only dmfilemapd) $(use_enable !device-mapper-only dmeventd) $(use_enable !device-mapper-only cmdlib) - $(use_enable !device-mapper-only applib) $(use_enable !device-mapper-only fsadm) - $(use_enable !device-mapper-only lvmetad) $(use_enable !device-mapper-only lvmpolld) $(usex device-mapper-only --disable-udev-systemd-background-jobs '') @@ -160,8 +154,6 @@ src_configure() { myeconfargs+=( --with-thin=none --with-cache=none ) fi - myeconfargs+=( --with-clvmd=none --with-cluster=none ) - myeconfargs+=( $(use_enable readline) $(use_enable selinux) @@ -178,26 +170,29 @@ src_configure() { --with-default-pid-dir=/run $(use_enable udev udev_rules) $(use_enable udev udev_sync) - $(use_with udev udevdir "$(get_udevdir)"/rules.d) + $(use_with udev udevdir "${EPREFIX}$(get_udevdir)"/rules.d) $(use_enable sanlock lvmlockd-sanlock) $(use_enable systemd udev-systemd-background-jobs) $(use_enable systemd notify-dbus) --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" CLDFLAGS="${LDFLAGS}" ) + # Hard-wire this to bash as some shells (dash) don't know + # "-o pipefail" #682404 + CONFIG_SHELL="/bin/bash" \ econf "${myeconfargs[@]}" } src_compile() { pushd include >/dev/null - emake + emake V=1 popd >/dev/null if use device-mapper-only ; then - emake device-mapper + emake V=1 device-mapper else - emake - emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat + emake V=1 + emake V=1 CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat fi } @@ -208,7 +203,7 @@ src_install() { use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators ) use device-mapper-only && INSTALL_TARGETS=( install_device-mapper ) for inst in ${INSTALL_TARGETS[@]}; do - emake DESTDIR="${D}" ${inst} + emake V=1 DESTDIR="${D}" ${inst} done newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper @@ -216,7 +211,7 @@ src_install() { if use !device-mapper-only ; then newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd - newinitd "${FILESDIR}"/lvm.rc-2.02.184-r3 lvm + newinitd "${FILESDIR}"/lvm.rc-2.03.05 lvm newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm if ! use udev ; then # We keep the variable but remove udev from it. @@ -226,7 +221,6 @@ src_install() { fi newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring - newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld fi @@ -241,7 +235,7 @@ src_install() { dolib.a daemons/dmeventd/libdevmapper-event.a #gen_usr_ldscript libdevmapper-event.so else - rm -f "${ED%/}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a + rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a fi if use lvm2create_initrd; then @@ -259,9 +253,6 @@ src_install() { pkg_postinst() { ewarn "Make sure the \"lvm\" init script is in the runlevels:" ewarn "# rc-update add lvm boot" - ewarn - ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want" - ewarn "to enable lvm autoactivation and metadata caching." } src_test() { diff --git a/sys-fs/mtd-utils/Manifest b/sys-fs/mtd-utils/Manifest index fba003d4ef88..4214cbdc9abf 100644 --- a/sys-fs/mtd-utils/Manifest +++ b/sys-fs/mtd-utils/Manifest @@ -2,6 +2,6 @@ AUX mtd-utils-1.5.2-sysmacros.patch 927 BLAKE2B 5ff3cba6a47443b747c272f535c983cc DIST mtd-utils-1.5.2.tar.gz 343843 BLAKE2B 7f6612c4b9185583e9bbc785f7f96b08b7897c4af0c442a6206a446dc25f3c2aae9670c9344fba09606f73b87c73a96150f77bd974c96abe475d204ba5c28068 SHA512 81eb5cf27814234af65409fe93798ec50d9f733978dc606bd33e63d98eb99afb3f988df47dc66a9368a11baee0a35fa1d0d6677af8c23428919e34bd11a25697 DIST mtd-utils-2.0.2.tar.gz 355964 BLAKE2B 9a795ddac1287c7c44f52215faa4b6295cf5ac3917392a407c7824f8715f4a180feab95621e6b1aa738fba38950c8e12b722b7c518c3362227e6da25deecd3fb SHA512 e61f4bb24d3b96d39fe262f73e01b7bf3e15a9258fd5766657ef0d807d7b5bb0b489ade9dc45068b2a25bcf378ca2877177df3915398b367f50ff1ef9bc5be7a EBUILD mtd-utils-1.5.2.ebuild 1564 BLAKE2B de9628c6cff455da5ed55f2f5822cd561ac9a487e6b9510d3b7ece0ae26edece2d02045cbadae63c4e6e48421c0babb4b77bb2ebf076f3fb86c7170bc671c301 SHA512 934327b7a547dff08509bbf956a00eb22188d0a0bf1275bcf2c2b07b7a2a5faaefe64ce6665de31c8dfd74c835a10e7d9de9b9404630109e4dbaad51e8780410 -EBUILD mtd-utils-2.0.2.ebuild 1328 BLAKE2B eacb6ee18df1e42eb997fb8764a973034cd8dcd4ac9b881520004f159d30ce749431b8965e65036d08642a5eeffeeb7e68955197ce1dc7f71ed0ef4f698b10e4 SHA512 1388b8fd2804bc041f5dcc628f4c43ff8fbfc24a596ff27742aa031863729fcc0438b0cc2d584f7e44f66df080b19986c5cf7e85f0604e4ad7888d618fd4122a +EBUILD mtd-utils-2.0.2.ebuild 1327 BLAKE2B 02cd485785eb0c8f112a9868701cf64674057592c89bfa2958cea23885afca964c8d743b303a213fb00231a73364bdbed528ea0e8db03d3acbbc81718ddf573a SHA512 1e0b35ec4fb7cecd48eed123ba20b8121014e0f5bf7836a0247e09c5f5b8624e235ebe1ab6dd9b02cc015a701a83e92b24504e5e558af7b32181289d7fa46fb6 EBUILD mtd-utils-99999999.ebuild 1510 BLAKE2B 6b49689495715cb470e1c386dd0ab7006610aaed89935a2d9c75eae5b7c08a8566a89060bc9ab1d8da73ce18a5e8826b6bf7f2e724531d93103a298ad894f241 SHA512 8fd85aaed72cf2a59f783a366a01ba93f3929c15eb098500be0025a6a2e388db397c385a9d97293cba1b14913ae6a2d93f90be082d129312e9fc49601f95a5f8 MISC metadata.xml 323 BLAKE2B d1d9d3f24dc9d2fe5790f0999f787a331b5b0f261b2bf73946841c8a7f40a3b7c1a8e7bd7e516eaae87f82210f4d558c11f3ff1a3f302b71bb98e993a59c421c SHA512 191d5a9dbe4c6a0a72815092a0668070ff39bc121b30a3e55abd894ca62fd3641a205662a23a6a87aeeedd8ab000e4d2d40bbba278acbc0f7d74c97d0571d0c1 diff --git a/sys-fs/mtd-utils/mtd-utils-2.0.2.ebuild b/sys-fs/mtd-utils/mtd-utils-2.0.2.ebuild index 0a208914e003..3f9c4583bd0f 100644 --- a/sys-fs/mtd-utils/mtd-utils-2.0.2.ebuild +++ b/sys-fs/mtd-utils/mtd-utils-2.0.2.ebuild @@ -19,7 +19,7 @@ else MY_PV="${PV}-02ae0aac87576d07202a62d11294ea55b56f450b" SRC_URI="mirror://gentoo/${PN}-snapshot-${MY_PV}.tar.xz" fi - KEYWORDS="amd64 ~arm ~mips ppc x86 ~amd64-linux ~x86-linux" + KEYWORDS="amd64 arm ~mips ppc x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)" diff --git a/sys-fs/squashfs-tools-ng/Manifest b/sys-fs/squashfs-tools-ng/Manifest new file mode 100644 index 000000000000..fcd9270dc6fe --- /dev/null +++ b/sys-fs/squashfs-tools-ng/Manifest @@ -0,0 +1,4 @@ +DIST squashfs-tools-ng-0.5.tar.xz 158048 BLAKE2B e8d53336a0955875eaf5a301329f620f6efd27d27d985c760a7eaaded94a60e1a7384f076311101b4a6de36b1330d7b42866079b074b6af1829d4162c1f62b38 SHA512 b39cd6e9627e71eb0fcc59a587612fe062c3f437e11342e6ec1a1fee1e6a51b38dcc881bf9a1d69578ad4686f939ece8ec02ed79a6cc6c69afe06bc6753390bf +EBUILD squashfs-tools-ng-0.5.ebuild 1069 BLAKE2B fe678e7d13fffbaaeb7722b78db10a16d37f38788ac3850b785ad59aed89787cdc9cb6b867549f78532835e269684efaa74aa7ed6d4f6a5fb2ded18cae5fc380 SHA512 d332d401829b10aac7518df6717ee53f0152380a49789d893b489f8b8895fcda4bc76114346caae218403ba5470a8f4696bec8be22454f94b3cc8207f938c047 +EBUILD squashfs-tools-ng-9999.ebuild 1069 BLAKE2B fe678e7d13fffbaaeb7722b78db10a16d37f38788ac3850b785ad59aed89787cdc9cb6b867549f78532835e269684efaa74aa7ed6d4f6a5fb2ded18cae5fc380 SHA512 d332d401829b10aac7518df6717ee53f0152380a49789d893b489f8b8895fcda4bc76114346caae218403ba5470a8f4696bec8be22454f94b3cc8207f938c047 +MISC metadata.xml 545 BLAKE2B 23c96d1109e1a1e89bba2c00bbbd80954b900f6a40aa45a97d29d15aa31ec10ee1020f43013bdfebba29df7cc1dff106ef7f56b65d175953992629edbdbc79c6 SHA512 0de80916d5a7a88a356533ce0194542e5e26792c0c2d0fc0336ac3d0524e1d78c47b2f0870a2c34d886a83ed2017eab2f56edce325c8344c31865a426016d485 diff --git a/sys-fs/squashfs-tools-ng/metadata.xml b/sys-fs/squashfs-tools-ng/metadata.xml new file mode 100644 index 000000000000..b1a0267dd913 --- /dev/null +++ b/sys-fs/squashfs-tools-ng/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>mattst88@gentoo.org</email> + <name>Matt Turner</name> + </maintainer> + <use> + <flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag> + <flag name="xz">Enable support for XZ ("LZMA2") compression using <pkg>app-arch/xz-utils</pkg></flag> + </use> + <upstream> + <remote-id type="github">AgentD/squashfs-tools-ng</remote-id> + </upstream> +</pkgmetadata> diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.5.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.5.ebuild new file mode 100644 index 000000000000..fc732972175d --- /dev/null +++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.5.ebuild @@ -0,0 +1,46 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="A new set of tools for working with SquashFS images" +HOMEPAGE="https://github.com/AgentD/squashfs-tools-ng" +if [[ ${PV} = 9999* ]]; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/AgentD/${PN}.git" +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz" +fi + +LICENSE="GPL-3+" +SLOT="0" +IUSE="lz4 lzo selinux +xz +zlib zstd" +REQUIRED_USE="|| ( lz4 lzo xz zlib zstd )" + +DEPEND=" + lz4? ( app-arch/lz4:= ) + lzo? ( dev-libs/lzo:= ) + xz? ( app-arch/xz-utils:= ) + selinux? ( sys-libs/libselinux:= ) + zlib? ( sys-libs/zlib:= ) + zstd? ( app-arch/zstd:= ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + default + [[ ${PV} == "9999" ]] && eautoreconf +} + +src_configure() { + local myconf=( + $(use_with lz4) + $(use_with lzo) + $(use_with selinux) + $(use_with xz) + $(use_with zlib gzip) + $(use_with zstd) + ) + econf "${myconf[@]}" +} diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild new file mode 100644 index 000000000000..fc732972175d --- /dev/null +++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild @@ -0,0 +1,46 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="A new set of tools for working with SquashFS images" +HOMEPAGE="https://github.com/AgentD/squashfs-tools-ng" +if [[ ${PV} = 9999* ]]; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/AgentD/${PN}.git" +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz" +fi + +LICENSE="GPL-3+" +SLOT="0" +IUSE="lz4 lzo selinux +xz +zlib zstd" +REQUIRED_USE="|| ( lz4 lzo xz zlib zstd )" + +DEPEND=" + lz4? ( app-arch/lz4:= ) + lzo? ( dev-libs/lzo:= ) + xz? ( app-arch/xz-utils:= ) + selinux? ( sys-libs/libselinux:= ) + zlib? ( sys-libs/zlib:= ) + zstd? ( app-arch/zstd:= ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + default + [[ ${PV} == "9999" ]] && eautoreconf +} + +src_configure() { + local myconf=( + $(use_with lz4) + $(use_with lzo) + $(use_with selinux) + $(use_with xz) + $(use_with zlib gzip) + $(use_with zstd) + ) + econf "${myconf[@]}" +} diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 8ca86f738cc8..e3a69c3fee15 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -3,6 +3,7 @@ AUX 239-basic-add-missing-comma-in-raw_clone-assembly-for-sp.patch 1098 BLAKE2B AUX 239-debug-extra.patch 1641 BLAKE2B 37dae0aa6fb95be3f6b7ad5647ddc7e6e7cf6654e0119c5a41280a0db630d13746d5aaa0d1de8e66f49525a0b5a25f4f1136e0b8edc27e628cc82b386f5c0759 SHA512 091f4a0a6d8f4f5963002f33ebafa36f00f7635caafa14ac618ed7c5e08538cffbe655930802e14a0f744851ed7acacc217d2ad7e625627eeb82e14cc3fabd4a AUX 239-stat-0.patch 3553 BLAKE2B 225dd5e8e001a10a33c7ecb5c1378589b3eeecbea4fc746f27cc72d8eb8787c6966b8787c5922f0d0cefa28ac966c7c4f65ed341335d4105bc109df14110604c SHA512 a982c6384fcad2a1ad709564e932231e837ef799b764bbfa73eff5c42635a4bdc0dcf36e72300482ed188b492da723d3cd7ae04dda9b2c16c70fd1871c556a46 AUX 239-stat-1.patch 2553 BLAKE2B 123a9488f7e2c9c2b70cb87ecc45be54b19b18660a2b238d028227e19cb7ba4933a115e2e82652b3179462ed0d2115058bff5d8d0212f439a919857f083c318d SHA512 6aee279728d0e609956c825ced6d2c00d8f4905327492c0348ad6ee8e862287b101ec4e2f1daa19533cf51f2ba1a15f0ea2dd6ccde44a4ff1b0fb151ffc7381e +AUX 242-gcc-9.patch 7672 BLAKE2B 1cd98213f70e6813582706e7b523925fd7956507bd5bf113889189d3a5da3e0eb287163449d023755269827e3b5dc8db758a51cd9f37c3f3a69510de31b43109 SHA512 57add7e3215f25ec5547a905c7257ca06adca30d2f4a031eee9882ac16586ea5c5c9d3b50206674dffdb182c78f048834b6c73ab1490253a1ddae15c35878554 DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8 DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f @@ -21,6 +22,6 @@ EBUILD udev-240-r3.ebuild 9664 BLAKE2B 2daaa3124df1ce0ea5b3247200a55020d75b92383 EBUILD udev-241.ebuild 9673 BLAKE2B 33c6d4cf7c1d58645481dcb957f1a3e28587911dc5a2ead16d1a91d2b0eca5ad0765203661a8088fac4699e501162759cc927f2692bfb170c98394b8e03e7978 SHA512 f1d6f1aa6d131605b6a63aea994bd7c7c2354714a41f0de85fe884389d0893d737ebbacea2a34d9a15f7173cf10f0d225125aacef33725684565044c6d1edcd8 EBUILD udev-241_rc1.ebuild 9637 BLAKE2B 0c5f05d169bf4e7318e46d7b5a2eff8f31cae9c4b5b14ac6fa0ec5029b120cb97d71341ddad3d89a197653b4b3fda330d03d15fd2f45507c808dba375437d6cf SHA512 03ae6bd7929e67d557e347e0c4a034deb3f802c34b9ecd9faeeb4970230f2bac12a77544fdb36986744f87711fd326c3d928587bcfbd1d6042bb9e44c740cc20 EBUILD udev-241_rc2.ebuild 9637 BLAKE2B 0c5f05d169bf4e7318e46d7b5a2eff8f31cae9c4b5b14ac6fa0ec5029b120cb97d71341ddad3d89a197653b4b3fda330d03d15fd2f45507c808dba375437d6cf SHA512 03ae6bd7929e67d557e347e0c4a034deb3f802c34b9ecd9faeeb4970230f2bac12a77544fdb36986744f87711fd326c3d928587bcfbd1d6042bb9e44c740cc20 -EBUILD udev-242.ebuild 9673 BLAKE2B 33c6d4cf7c1d58645481dcb957f1a3e28587911dc5a2ead16d1a91d2b0eca5ad0765203661a8088fac4699e501162759cc927f2692bfb170c98394b8e03e7978 SHA512 f1d6f1aa6d131605b6a63aea994bd7c7c2354714a41f0de85fe884389d0893d737ebbacea2a34d9a15f7173cf10f0d225125aacef33725684565044c6d1edcd8 -EBUILD udev-9999.ebuild 9637 BLAKE2B 0c5f05d169bf4e7318e46d7b5a2eff8f31cae9c4b5b14ac6fa0ec5029b120cb97d71341ddad3d89a197653b4b3fda330d03d15fd2f45507c808dba375437d6cf SHA512 03ae6bd7929e67d557e347e0c4a034deb3f802c34b9ecd9faeeb4970230f2bac12a77544fdb36986744f87711fd326c3d928587bcfbd1d6042bb9e44c740cc20 +EBUILD udev-242.ebuild 9611 BLAKE2B 44037308847edaa3d7050392784e10e17dabb1b6d2b906b62ec815a6daf394b7d99d02b85ca8fe1c096ae1cd25bc53dae57738e1a16bb859bb72961d037efb67 SHA512 6f24c9c2b115ba77c09911080795b2d9c8e40f5a111ff5e91da58d125f3235cc66e9e885c5fe343990f2130de5fdf3a517ebf20090ecf94b978bc2aeb751d06a +EBUILD udev-9999.ebuild 9591 BLAKE2B 72ccdcaf7791558859483b8d161908a040cae8284e01b3c3f333ce55715d5c61f4173a34fdbf3b910a8b258a5d6f4feff5880b3366853f5b2c39c3b3ed5eafbb SHA512 f8d7823de0ff335ea169c312a5e79111463005714858ccd248de73df76fce4dfab872b5387bef596f4113dfb4c3a97c0c4d14680c53fe194aaa37816fcab79bf MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d diff --git a/sys-fs/udev/files/242-gcc-9.patch b/sys-fs/udev/files/242-gcc-9.patch new file mode 100644 index 000000000000..e9f690a65be5 --- /dev/null +++ b/sys-fs/udev/files/242-gcc-9.patch @@ -0,0 +1,163 @@ +From c98b3545008d8e984ab456dcf79787418fcbfe13 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> +Date: Tue, 7 May 2019 13:46:55 +0200 +Subject: [PATCH] network: remove redunant link name in message + +Fixes #12454. + +gcc was complaining that the link->ifname argument is NULL. Adding +assert(link->ifname) right before the call has no effect. It seems that +gcc is confused by the fact that log_link_warning_errno() internally +calls log_object(), with link->ifname passed as the object. log_object() +is also a macro and is does a check whether the passed object is NULL. +So we have a check if something is NULL right next an unconditional use +of it where it cannot be NULL. I think it's a bug in gcc. + +Anyway, we don't need to use link->ifname here. log_object() already prepends +the object name to the message. +--- + src/network/networkd-link.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c +index 533193ac932..6fc82940033 100644 +--- a/src/network/networkd-link.c ++++ b/src/network/networkd-link.c +@@ -338,8 +338,7 @@ static int link_enable_ipv6(Link *link) { + + r = sysctl_write_ip_property_boolean(AF_INET6, link->ifname, "disable_ipv6", disabled); + if (r < 0) +- log_link_warning_errno(link, r, "Cannot %s IPv6 for interface %s: %m", +- enable_disable(!disabled), link->ifname); ++ log_link_warning_errno(link, r, "Cannot %s IPv6: %m", enable_disable(!disabled)); + else + log_link_info(link, "IPv6 successfully %sd", enable_disable(!disabled)); + +From bcb846f30f9ca8f42e79d109706aee9f2032261b Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Wed, 22 May 2019 10:31:01 -0400 +Subject: [PATCH] shared/machine-image: avoid passing NULL to log_debug_errno + +Fixes: https://github.com/systemd/systemd/issues/12534 +--- + src/shared/machine-image.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c +index 6b9d8fb97a6..6a6d952b424 100644 +--- a/src/shared/machine-image.c ++++ b/src/shared/machine-image.c +@@ -201,11 +201,13 @@ static int image_make( + Image **ret) { + + _cleanup_free_ char *pretty_buffer = NULL; ++ _cleanup_free_ char *cwd = NULL; + struct stat stbuf; + bool read_only; + int r; + + assert(dfd >= 0 || dfd == AT_FDCWD); ++ assert(path || dfd == AT_FDCWD); + assert(filename); + + /* We explicitly *do* follow symlinks here, since we want to allow symlinking trees, raw files and block +@@ -221,6 +223,9 @@ static int image_make( + st = &stbuf; + } + ++ if (!path) ++ safe_getcwd(&cwd); ++ + read_only = + (path && path_startswith(path, "/usr")) || + (faccessat(dfd, filename, W_OK, AT_EACCESS) < 0 && errno == EROFS); +@@ -359,7 +364,7 @@ static int image_make( + + block_fd = openat(dfd, filename, O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY); + if (block_fd < 0) +- log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path, filename); ++ log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(cwd), filename); + else { + /* Refresh stat data after opening the node */ + if (fstat(block_fd, &stbuf) < 0) +@@ -373,13 +378,13 @@ static int image_make( + int state = 0; + + if (ioctl(block_fd, BLKROGET, &state) < 0) +- log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path, filename); ++ log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename); + else if (state) + read_only = true; + } + + if (ioctl(block_fd, BLKGETSIZE64, &size) < 0) +- log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path, filename); ++ log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename); + + block_fd = safe_close(block_fd); + } +From 2570578d908a8e010828fa1f88826b1c45d534ff Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Fri, 24 May 2019 10:54:09 +0200 +Subject: [PATCH] machine-image: openat() doesn't operate on the cwd if the + first argument is specified + +A fix-up for bcb846f30f9ca8f42e79d109706aee9f2032261b. +--- + src/shared/machine-image.c | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) + +diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c +index 6a6d952b424..55e5f08f91e 100644 +--- a/src/shared/machine-image.c ++++ b/src/shared/machine-image.c +@@ -200,8 +200,7 @@ static int image_make( + const struct stat *st, + Image **ret) { + +- _cleanup_free_ char *pretty_buffer = NULL; +- _cleanup_free_ char *cwd = NULL; ++ _cleanup_free_ char *pretty_buffer = NULL, *parent = NULL; + struct stat stbuf; + bool read_only; + int r; +@@ -223,8 +222,12 @@ static int image_make( + st = &stbuf; + } + +- if (!path) +- safe_getcwd(&cwd); ++ if (!path) { ++ if (dfd == AT_FDCWD) ++ (void) safe_getcwd(&parent); ++ else ++ (void) fd_get_path(dfd, &parent); ++ } + + read_only = + (path && path_startswith(path, "/usr")) || +@@ -364,7 +367,7 @@ static int image_make( + + block_fd = openat(dfd, filename, O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY); + if (block_fd < 0) +- log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(cwd), filename); ++ log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(parent), filename); + else { + /* Refresh stat data after opening the node */ + if (fstat(block_fd, &stbuf) < 0) +@@ -378,13 +381,13 @@ static int image_make( + int state = 0; + + if (ioctl(block_fd, BLKROGET, &state) < 0) +- log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename); ++ log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(parent), filename); + else if (state) + read_only = true; + } + + if (ioctl(block_fd, BLKGETSIZE64, &size) < 0) +- log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename); ++ log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(parent), filename); + + block_fd = safe_close(block_fd); + } diff --git a/sys-fs/udev/udev-242.ebuild b/sys-fs/udev/udev-242.ebuild index e3c9cbfb5d88..6aa2af42bb05 100644 --- a/sys-fs/udev/udev-242.ebuild +++ b/sys-fs/udev/udev-242.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev user +inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://github.com/systemd/systemd.git" @@ -13,7 +13,7 @@ else MY_P=systemd-${MY_PV} S=${WORKDIR}/${MY_P} SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" fi DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" @@ -47,6 +47,18 @@ DEPEND="${COMMON_DEPEND} app-text/docbook-xsl-stylesheets dev-libs/libxslt" 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-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10" PDEPEND=">=sys-apps/hwids-20140304[udev] @@ -85,7 +97,7 @@ src_prepare() { fi local PATCHES=( - "${FILESDIR}/236-uucp-group.patch" + "${FILESDIR}"/242-gcc-9.patch ) default @@ -311,13 +323,6 @@ pkg_postinst() { eend $? fi - # https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69 - # https://bugs.gentoo.org/246847 - # https://bugs.gentoo.org/514174 - enewgroup input - enewgroup kvm 78 - enewgroup render - # 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%/}" diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index ba1551d202d3..0490d5f1dea2 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev user +inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://github.com/systemd/systemd.git" @@ -47,6 +47,18 @@ DEPEND="${COMMON_DEPEND} app-text/docbook-xsl-stylesheets dev-libs/libxslt" 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-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10" PDEPEND=">=sys-apps/hwids-20140304[udev] @@ -85,7 +97,6 @@ src_prepare() { fi local PATCHES=( - "${FILESDIR}/236-uucp-group.patch" ) default @@ -311,11 +322,6 @@ pkg_postinst() { eend $? fi - # https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69 - # https://bugs.gentoo.org/246847 - # https://bugs.gentoo.org/514174 - enewgroup input - # 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%/}" diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest index 56e5db2c9612..c6939dac6aa5 100644 --- a/sys-fs/udisks/Manifest +++ b/sys-fs/udisks/Manifest @@ -3,13 +3,11 @@ AUX udisks-1.0.4-revert-floppy.patch 688 BLAKE2B 6af71c88eec724cb4e61f45c82a288f AUX udisks-1.0.5-stat-includes.patch 656 BLAKE2B 6deb3f7fbdce118480572ac50ac896f56123579c93f1d91165796a806cef1bbd07f301f8f085cc6ea801990206b06004b54815efc2c972309d17cf55ca5c29a0 SHA512 f399d3e242839a339412f03c174975834c2c6e6515ed50b6b87b33974ae091421b5179b12b78cc06d339b41046d3a70ab78767e194081467c2cbd4c8fdc61c02 AUX udisks-1.0.5-sysmacros.patch 1773 BLAKE2B 9ff54a1a134c798ddb9ef1c9d0eb770f45595ba8cf6832f560e6fb314e47139104c981b332f0a6b0db3a3eb63b2b771525e3903ad67b3eeb9f1749bd6f86538d SHA512 9402c931dda2f415577f3b6d60cab03891e83cc804a0cbd790bb3bc71d160d8b6fa14d13829281ffb55a9032ac289798ee5f2d6e14348c96a4e9b1e922111bb2 DIST udisks-1.0.5.tar.gz 736221 BLAKE2B 9a709c5d4fcd390d9a52ac764d0e3c678983a14644f79cfcf92dd4ea7ddecbac90aa046b890b7bdd1ad701f1106d5956d72dab1fbb030606319b4bcc4c297bdd SHA512 bdf4970113975221ff0e17866db18fd969ff9c8e1e851c8ad7572630814ab0c46b59df59433edcb2e7cc41cc8152afd35807f45e07f6d0fa87b21b5a77d0965a -DIST udisks-2.7.4.tar.gz 1286465 BLAKE2B 8c52199215bc4ee3840ded2ccf9e3d61bc99bf0f505abb55a5ce18aa2676a60f788bc235e0f6be308c8bb50ec653a559010970e827d3bb4c1212afea291e7a8d SHA512 d0ad6c6d44f53414de3da68e0cdff1be0e9e6e03f900d5fdb4912560db36af52be32a2615d3d2efeaf134d4721a4a0c3e03515fd670f42e96f42ded08c3bf849 -DIST udisks-2.8.1.tar.bz2 1354879 BLAKE2B c2e5fc11dc29d43c6ff2cfb048c8f5540e72ea9c966e75b70754ed9491e3d4bfa9693718ab735c61ec110c480037064d610d238df92a839b4b4222dd624397bf SHA512 a3c7d26cd1bbd9cce59b25d118076c34482a698d7dca9e0468b6f9c928f40c8dbdd0b1cb61cf288ae77151643dc4a3eacf31e22af2c7b35a2828e49ee335e70b DIST udisks-2.8.2.tar.bz2 1589149 BLAKE2B eaa9d95e175bbdd4255c627a0dcd93ff6f0a3660134d2117551c2d61298733570409481393ceeafc92ff26b74277b3a754b70d9359ed402c19d73fea2f39ec04 SHA512 dc0087ed2d3ab71dc66f63f868a6e2cd0e4e7578c40b2240739cecaffd6f50f5a2cecfc7ef7df9304e291d84ab12f59a940b9fb42b34a5a60d12061e6aaffc1a DIST udisks-2.8.3.tar.bz2 1613373 BLAKE2B d2f5e145ee0fefaafab71ff2cfec40962d835c7df22fee47702bc8406760b2463cbe334404e8d27b21e0c05134c67d336d24a6de7b19c0dc5d16ea78553a2738 SHA512 6d1d9ed18cb1742de13aad48709356f3dd9b8324967fd47107bd0f1e16b697d0928bd722397062495bdea51190774a25309834d27a5160feb7915becb474468f +DIST udisks-2.8.4.tar.bz2 1619051 BLAKE2B 4fdf3d5ea8ae02eb74efd552afee2dbe94137767c343034dd68f1553b224871a51bb2382eda00de90d45bad18b4088b4812e1f3fbb004cd29e753e92afb34e05 SHA512 70860e5ca9ac73d442ca67f0e0429ce2f33575d8f64945fbf06d1694b080c8b6fed8d65b2485eff0ab66eab59cdebeb9309424820a2ee82c5faaa38029e15e6c EBUILD udisks-1.0.5-r3.ebuild 2795 BLAKE2B 45da28dd3571bad3921197cb8aa68487067a58e905a6802581924d54a64bc39b4a203129c2bdb7a69bbfa63da6259ab48aeb21e039799bce547f6c4c58ff31d6 SHA512 d795d5a8c564afccb2f41c1062ad5485074db7daa4416e2c4babd8665633a21038107e8e8c5356c9d49edb7108a7126a905b57420741239de41b9925a320e80d -EBUILD udisks-2.7.4-r1.ebuild 3328 BLAKE2B f97ca16814ccf01e774c7a44474c95d0876795024578985023031e42ac429377167718f6de01e093dc658db9e3855f6c5801993fb4870c39d7c1e2ea0a6e2897 SHA512 8b319ed1f9e9f76fe93e4a8ae4fdd5aad1610ad22f3fdc6f7d6f5f5c2a77db27ad8aedc18e15f8e8dc6cccb003c5e8221397142d14a75aaa693c2eac4184ebe5 -EBUILD udisks-2.8.1.ebuild 3233 BLAKE2B 2e6032785c926aec9cd36a2e12e7984825a44190b72d0c76edf60abf9903d04f005a94b258eaac299fa310ba7f801de45ca1cd194e5cf194cf7752cfdbd21f02 SHA512 00a2ad198df800bcc4e2faa99d98d80a3cbccd8d9b63071ec07d49dcf0e85d5e5bc14a36de73ac20ff20cddab21c82f38ee4f422f0d0f6e500d6bc51f4e9aee6 -EBUILD udisks-2.8.2.ebuild 3235 BLAKE2B fa8624bc87962f3bf2ed0da9ebecb01dc680fdaf97aaba7eee752d0e482ac90ed8913528da88aa765c88c364b7c1213f6e99a9ff6df23561a76cba770e25c581 SHA512 2d2dc6333efa601fa8348763dd347e1f41950233d5fb037bafeb8e70ad1cbe9968bd276eaf15fc1574bcac75d9745a3f1af492eb687fa7c377a04fab62681148 +EBUILD udisks-2.8.2.ebuild 3231 BLAKE2B 671706422d94397c4d211acf03518dc83b63e11f67f40a616df99913b34ea4c8e31a990d36a2db709367a04d9b065a55d7d67dee295e70fcb995812610cc93c9 SHA512 5dce9091a7a57365258d2c26e03f484133817ae428a3489dac15a1fda2fcb66a33a16318d6b4c224e81bd35838f596ebfd2aa6395c095c31e0779aa647eb6475 EBUILD udisks-2.8.3.ebuild 3291 BLAKE2B 1ab8b3a8da16d0dc5a1b6ab9367ed6eaf5403248febf05e9625b06dadb1745ac751f893e3318642323716388c6d5c1f807e7a1f31ed8a02a48c6c8f0a5af0655 SHA512 701e97a14015902892c2ea414bbcd61b0d579b53048839a79304fe9d874f5939ba996cd0680fee4fbfb74dfb69d4ad08763fb22ae37e5bcc30226780ed8dbccd -MISC metadata.xml 868 BLAKE2B 8d4ef3d2fae9d22074a87c65ced87d1e523b8b935084845b4cdd11389648e5071852cde39b18afb34c33dd352f3b1acb6ffbed68a5dc6c999033c5567693967e SHA512 e5b0ccda409fe0b7c7be656f5834399f2819da68ee811e70c2cdf97370b860efa1ca58188543f9cc46f17cfa340c9d31c18b050b6e6f049928afe8d1ad7ffae5 +EBUILD udisks-2.8.4.ebuild 3291 BLAKE2B 1ab8b3a8da16d0dc5a1b6ab9367ed6eaf5403248febf05e9625b06dadb1745ac751f893e3318642323716388c6d5c1f807e7a1f31ed8a02a48c6c8f0a5af0655 SHA512 701e97a14015902892c2ea414bbcd61b0d579b53048839a79304fe9d874f5939ba996cd0680fee4fbfb74dfb69d4ad08763fb22ae37e5bcc30226780ed8dbccd +MISC metadata.xml 666 BLAKE2B 901164cd5d79ae10dedfe4905228912e88f38d9c555f512a31a55dfd5c61a5156f2498af7e1aef59713afda07e7218e922757f8ced95443557e0b8e8d088ceea SHA512 f2f854b15d66c994008195a9b24a6a98db493e3faf38da7324c7ed780df4f34bd029ae5083b0f52e46e5c6ada490e1427ce45cb1a56c07059789c7b12fe4863e diff --git a/sys-fs/udisks/metadata.xml b/sys-fs/udisks/metadata.xml index 521f6870035c..a62a8bcadb90 100644 --- a/sys-fs/udisks/metadata.xml +++ b/sys-fs/udisks/metadata.xml @@ -5,9 +5,7 @@ <email>freedesktop-bugs@gentoo.org</email> </maintainer> <use> - <flag name="cryptsetup">Enable <pkg>sys-fs/cryptsetup</pkg> support</flag> <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag> - <flag name="gptfdisk">Pull in <pkg>sys-apps/gptfdisk</pkg> for sgdisk command as used by partitioning functionality</flag> <flag name="lvm">Add support for Logical Volume Management via <pkg>sys-fs/lvm2</pkg>.</flag> <flag name="remote-access">Control whether connections from other clients over LAN are allowed</flag> <flag name="systemd">Support <pkg>sys-apps/systemd</pkg>'s logind</flag> diff --git a/sys-fs/udisks/udisks-2.7.4-r1.ebuild b/sys-fs/udisks/udisks-2.7.4-r1.ebuild deleted file mode 100644 index 3a51cabba1d7..000000000000 --- a/sys-fs/udisks/udisks-2.7.4-r1.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools bash-completion-r1 eutils linux-info systemd udev xdg-utils - -DESCRIPTION="Daemon providing interfaces to work with storage devices" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks" -SRC_URI="https://github.com/storaged-project/${PN}/archive/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 x86" -IUSE="acl cryptsetup debug elogind +gptfdisk +introspection lvm nls selinux systemd" - -REQUIRED_USE="?? ( elogind systemd )" - -COMMON_DEPEND=" - >=dev-libs/glib-2.36:2 - >=dev-libs/libatasmart-0.19 - >=sys-auth/polkit-0.110 - >=sys-libs/libblockdev-2.14[cryptsetup,lvm?] - >=virtual/libgudev-165:= - virtual/udev - acl? ( virtual/acl ) - elogind? ( >=sys-auth/elogind-219 ) - introspection? ( >=dev-libs/gobject-introspection-1.30:= ) - lvm? ( sys-fs/lvm2 ) - systemd? ( >=sys-apps/systemd-209 ) -" -# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1) -# util-linux -> mount, umount, swapon, swapoff (see also #403073) -RDEPEND="${COMMON_DEPEND} - >=sys-apps/util-linux-2.20.1-r2 - >=sys-block/parted-3 - virtual/eject - cryptsetup? ( - sys-fs/cryptsetup[udev(+)] - sys-fs/lvm2[udev(+)] - ) - gptfdisk? ( >=sys-apps/gptfdisk-0.8 ) - selinux? ( sec-policy/selinux-devicekit ) -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - >=dev-util/gdbus-codegen-2.32 - >=dev-util/gtk-doc-1.3 - gnome-base/gnome-common:3 - sys-devel/autoconf-archive - >=sys-kernel/linux-headers-3.1 - virtual/pkgconfig - nls? ( dev-util/intltool ) -" - -S="${WORKDIR}/${PN}-${P}" - -DOCS=( AUTHORS HACKING NEWS README.md ) - -pkg_setup() { - # Listing only major arch's here to avoid tracking kernel's defconfig - if use amd64 || use arm || use ppc || use ppc64 || use x86; then - CONFIG_CHECK="~!IDE" #319829 - CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377 - CONFIG_CHECK+=" ~NLS_UTF8" #425562 - kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278 - linux-info_pkg_setup - fi -} - -src_prepare() { - xdg_environment_reset - - default - - eautoreconf - - if ! use systemd ; then - sed -i -e 's:libsystemd-login:&disable:' configure || die - fi -} - -src_configure() { - local myeconfargs=( - --enable-btrfs - --disable-gtk-doc - --disable-static - --localstatedir="${EPREFIX%/}"/var - --with-html-dir="${EPREFIX%/}"/usr/share/gtk-doc/html - --with-modprobedir="${EPREFIX%/}"/lib/modprobe.d - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - --with-udevdir="$(get_udevdir)" - $(use_enable acl) - $(use_enable debug) - $(use_enable introspection) - $(use_enable lvm lvm2) - $(use_enable lvm lvmcache) - $(use_enable nls) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - prune_libtool_files - keepdir /var/lib/udisks2 #383091 - - rm -rf "${ED%/}"/usr/share/bash-completion - dobashcomp data/completions/udisksctl -} - -pkg_preinst() { - # Remove gtk-doc symlink, #597628 - if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then - rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die - fi -} - -pkg_postinst() { - mkdir -p "${EROOT}"/run #415987 - - # See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync? - if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then - echo - ewarn "You should reboot the system now to get /run mounted with tmpfs!" - fi -} diff --git a/sys-fs/udisks/udisks-2.8.2.ebuild b/sys-fs/udisks/udisks-2.8.2.ebuild index a68c0e67661f..61965b270ccd 100644 --- a/sys-fs/udisks/udisks-2.8.2.ebuild +++ b/sys-fs/udisks/udisks-2.8.2.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}. LICENSE="LGPL-2+ GPL-2+" SLOT="2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86" IUSE="acl debug elogind +introspection lvm nls selinux systemd vdo" REQUIRED_USE="?? ( elogind systemd )" diff --git a/sys-fs/udisks/udisks-2.8.1.ebuild b/sys-fs/udisks/udisks-2.8.4.ebuild index 39172881d7dc..2db934f25193 100644 --- a/sys-fs/udisks/udisks-2.8.1.ebuild +++ b/sys-fs/udisks/udisks-2.8.4.ebuild @@ -1,16 +1,16 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit bash-completion-r1 linux-info systemd udev xdg-utils DESCRIPTION="Daemon providing interfaces to work with storage devices" HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks" SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2" -LICENSE="GPL-2" +LICENSE="LGPL-2+ GPL-2+" SLOT="2" -KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="acl debug elogind +introspection lvm nls selinux systemd vdo" REQUIRED_USE="?? ( elogind systemd )" @@ -36,16 +36,17 @@ RDEPEND="${COMMON_DEPEND} selinux? ( sec-policy/selinux-devicekit ) " DEPEND="${COMMON_DEPEND} + >=sys-kernel/linux-headers-3.1 +" +BDEPEND=" app-text/docbook-xsl-stylesheets >=dev-util/gdbus-codegen-2.32 >=dev-util/gtk-doc-am-1.3 - >=sys-kernel/linux-headers-3.1 virtual/pkgconfig - nls? ( dev-util/intltool ) + nls? ( >=sys-devel/gettext-0.19.8 ) " # If adding a eautoreconf, then these might be needed at buildtime: # dev-libs/gobject-introspection-common -# gnome-base/gnome-common:3 # sys-devel/autoconf-archive DOCS=( AUTHORS HACKING NEWS README.md ) @@ -63,7 +64,6 @@ pkg_setup() { src_prepare() { xdg_environment_reset - default if ! use systemd ; then @@ -80,6 +80,7 @@ src_configure() { --with-html-dir="${EPREFIX%/}"/usr/share/gtk-doc/html --with-modprobedir="${EPREFIX%/}"/lib/modprobe.d --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + --with-tmpfilesdir="/usr/lib/tmpfiles.d" --with-udevdir="$(get_udevdir)" $(use_enable acl) $(use_enable debug) @@ -94,10 +95,10 @@ src_configure() { src_install() { default - find "${ED}" -name "*.la" -delete || die + find "${ED}" -type f -name "*.la" -delete || die keepdir /var/lib/udisks2 #383091 - rm -rf "${ED%/}"/usr/share/bash-completion + rm -rf "${ED}"/usr/share/bash-completion dobashcomp data/completions/udisksctl } diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index 07d87afca018..cbb56325e9ed 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -1,12 +1,10 @@ AUX xfsprogs-4.15.0-docdir.patch 299 BLAKE2B 1ef9dd458806f33ca989dd977ae3b62fb5b1953ded3cd211ca7fc4235cfc59c2eeb6cf2474e79378782696a9feb324a5c32e541873d8493ff019adfe1ff006c2 SHA512 f6492ab8b4f8a417752a0b38538e0fdc06808968df07ecc5d752261cbc11d683acdd0e83ebf2744ea0068a5216f817a3816029cbf74da91c8eccf391574b931e AUX xfsprogs-4.15.0-sharedlibs.patch 3022 BLAKE2B cfa23520a55750af375ada8c35fb9f4b3ea2f401ddebd95aef6d46f9195ac6ab3fb38f5f9d08529d3c2658623a49eadc7db0be68159753025310605fdfc35a6b SHA512 5a6e62f2914e372f2bf679b10c32fe65f60677b4bf0e58f60c40a297ed8974d5ec0af3bcba5801ba19cadbb689a6dad62c1e2cd88587f6f3d30f21f1472f3ac0 AUX xfsprogs-4.9.0-underlinking.patch 731 BLAKE2B 501b3967487d89c56c986f0c03e13fe3d217a6c4c8dd21fce1986793cefaa4777e827945adb3807f2d644665fbf66e7fbd5318d6f5c58d37c49260c24ca46181 SHA512 2fcbaab48ca33cd2e8724cdc55d814a970beb5127c861f4b829ede9f501516733c6dabbfe0bfb1d23df01bb69538af5ca31eb403030e3d2ad9efd8643c509ac7 -DIST xfsprogs-4.17.0.tar.xz 1205508 BLAKE2B 46168792c1e4c335b7ed9e7489afc20d7df4b4e554eb86043b2c19303879491cc4746b18d23fdff3e2f92ca3887ac27957ae57e85ba784476d8891ea6909d67e SHA512 996de920c76de596b6175e4ae4ba9de208c16fbcf9362bbb44d25ee1c12b249d0178fc5cc93dc5a434ab20e6d515d64a3f51b8e89905b5b033b28a3638f4d400 DIST xfsprogs-4.19.0.tar.xz 1212852 BLAKE2B 2d04390765c5e0dd7d51366f0310c9e680651d49bdd1ecd220b4eec50540a66c97bf6e54f976414351bc77381ffd463803836b27ca25b53960a278a34bc09775 SHA512 a96d0ce406534e70b0a531dfab296de420ec710cd0682dffaf5211602adf82dd59f84b9eb7793c54eabb782a9e0229acf7b247ab644d531ee9e5b51fe9dc0f58 -DIST xfsprogs-4.20.0.tar.xz 1215968 BLAKE2B 40aefb8fb899ae96c256f5fdb1c6e841bb450c3fad0487a6097c7f17c40a96a340e073538932d746f04f078afb960f16a34f5d15f500ce804fc842b91a0787e9 SHA512 6adf93fbe20d6b3250c4690237bda041a6dd0cfdc2387f5c88704fc06e6f095bf047964d701ccd65efef7607c15fb8e97b6046f3d631ef327aa8f4c118a36e22 DIST xfsprogs-5.0.0.tar.xz 1218476 BLAKE2B ef6eaab43531f696f739972c362e31c3304baaecb3485b45c16441a8bf7f1da7f47cd74a21660ba2c2bb45858a2b13b7af41c94671135f6a32a36eb745c024a0 SHA512 cebe3d2ea80676a99cc7f9cc014894398fbe3bdaf237829e9c7aa0404558c1ab16f2055acb5afd8234b2bc8475117bcef3c7500c553adb12bbaf3262bd077d18 -EBUILD xfsprogs-4.17.0-r1.ebuild 2315 BLAKE2B 302744fa4a6e6f66abd980cf12dee916f56711e2a090ccb40a22a14261925de0dc3cbb38ea5af1bbc9f2c5b57ae4915b52d93f0e66eb01bdf87d84b3e94da2b9 SHA512 4089c0f073f991788760fe70ed5f3c73a72e77b7859277915ec7138b5b76e6462ae6e30ae0939e997aa34187e5f5f9d8043f1bf0568778af2f5e3b7a95898819 -EBUILD xfsprogs-4.19.0.ebuild 2446 BLAKE2B 678837172232d4616c35aa1d518618853d3e4ae0039d9bf58ac5eb7b9f483f78ab47631bfbd67effe63825ad9e480a9868715b9690836f562c41e5eb18220d68 SHA512 3071cc3575f39928c63f755314abe500146c8acb160fd7115ec4c38a7db940ab21bd445fc54a15ecc01a7ad0a68cf9ce38911e2088ee094d8b965bbf59b7b98b -EBUILD xfsprogs-4.20.0.ebuild 2446 BLAKE2B 56b0df730592b592b2fec03628d77b23c85fa83c327aa79576a4e7a3ade9eeb2b7ce37c94ec28372cfd90ca627e975aaeb9410d3b92976e40b7efa046a6ce613 SHA512 0346edc9cca81230879dd85b7eec3db552c48ae14cc97d2ca00c7a47e743c360b5a7a66533705f302e6062368e4497df7bbc114294cc0693c02acb804f4221a9 +DIST xfsprogs-5.1.0.tar.xz 1223736 BLAKE2B bfadb13cf3a4f9231eb13f4e7d3c803c2143abb776c0fee758ea7257097ef3fb79253c16133942041c20ff6078a1704fa18d08866c6a2e1a61b63f4de11d00c7 SHA512 ca5959edb299be8574b2ca51e907a418fab796ae92f588075a2aab0c2a3cf8dae49e2b68679c65c361201223e8f8ac29b1e5618eb1e519496c3aca9218620881 +EBUILD xfsprogs-4.19.0.ebuild 2434 BLAKE2B cc6ca0e0425994414497bb9ac27541408958d9da936a659028b38cdaf3ed6527c741efeff812b023ce513b091b301723fa21fce1a4512939c5d3f6ddb8f42ab4 SHA512 bcef5fcc339809950886dd2a37fa696892216e1ddc5fc85b773ba40fe94fd1430a0b34b71a1ea22ce5d3cb947a8de23c800993067b5f909358ed037a2c18a198 EBUILD xfsprogs-5.0.0.ebuild 2446 BLAKE2B 56b0df730592b592b2fec03628d77b23c85fa83c327aa79576a4e7a3ade9eeb2b7ce37c94ec28372cfd90ca627e975aaeb9410d3b92976e40b7efa046a6ce613 SHA512 0346edc9cca81230879dd85b7eec3db552c48ae14cc97d2ca00c7a47e743c360b5a7a66533705f302e6062368e4497df7bbc114294cc0693c02acb804f4221a9 +EBUILD xfsprogs-5.1.0.ebuild 2466 BLAKE2B 568609a5a361342a9eba9c591910ef0304f0a362dcddd3c4629671bcc28600b9155e17a59111bdd28e90d4be51f26d9e0ca4c313b0daea82fe4eafd4af77813e SHA512 5a4c27c82ea4e20c0e8a1428cbbff72e58c84e72281dbe2e5a91fb52ab3e6824fe778e375c0c8318df1ebf83975c5bef637b4749e21fc5f5309d8b82743867a0 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1 diff --git a/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild deleted file mode 100644 index 1fd9976f056b..000000000000 --- a/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs multilib 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 sh sparc x86" -IUSE="icu libedit nls readline static-libs" - -LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)] - icu? ( dev-libs/icu:=[static-libs(+)] ) - readline? ( sys-libs/readline:0=[static-libs(+)] ) - !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )" -RDEPEND="${LIB_DEPEND//\[static-libs(+)]} - !<sys-fs/xfsdump-3" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.9.0-underlinking.patch - "${FILESDIR}"/${PN}-4.15.0-sharedlibs.patch - "${FILESDIR}"/${PN}-4.15.0-docdir.patch -) - -pkg_setup() { - if use readline && use libedit ; then - ewarn "You have USE='readline libedit' but these are exclusive." - ewarn "Defaulting to readline; please disable this USE flag if you want libedit." - fi -} - -src_prepare() { - default - - # Clear out -static from all flags since we want to link against dynamic xfs libs. - sed -i \ - -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ - include/builddefs.in || die - find -name Makefile -exec \ - sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} + -} - -src_configure() { - export DEBUG=-DNDEBUG - export OPTIMIZER=${CFLAGS} - unset PLATFORM # if set in user env, this breaks configure - - local myconf=( - --disable-lto #655638 - --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 readline) - $(usex readline --disable-editline $(use_enable libedit editline)) - $(use_enable static-libs static) - ) - - econf "${myconf[@]}" - - MAKEOPTS+=" V=1" -} - -src_install() { - emake DIST_ROOT="${ED}" install - # parallel install fails on this target for >=xfsprogs-3.2.0 - emake -j1 DIST_ROOT="${ED}" install-dev - - # handle is for xfsdump, the rest for xfsprogs - gen_usr_ldscript -a handle xcmd xfs xlog frog - # removing unnecessary .la files if not needed - use static-libs || find "${ED}" -name '*.la' -delete -} diff --git a/sys-fs/xfsprogs/xfsprogs-4.19.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.19.0.ebuild index ae8d51e34a04..2f8e9a1c6ef2 100644 --- a/sys-fs/xfsprogs/xfsprogs-4.19.0.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-4.19.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" IUSE="icu libedit nls readline static-libs" LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)] diff --git a/sys-fs/xfsprogs/xfsprogs-4.20.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.1.0.ebuild index 79a212d5e50d..2bba45900dee 100644 --- a/sys-fs/xfsprogs/xfsprogs-4.20.0.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-5.1.0.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit toolchain-funcs multilib systemd usr-ldscript @@ -20,8 +20,10 @@ LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)] !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )" RDEPEND="${LIB_DEPEND//\[static-libs(+)]} !<sys-fs/xfsdump-3" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" +DEPEND="${RDEPEND}" +BDEPEND=" + nls? ( sys-devel/gettext ) +" PATCHES=( "${FILESDIR}"/${PN}-4.9.0-underlinking.patch @@ -80,6 +82,6 @@ src_install() { gen_usr_ldscript -a handle xcmd xfs xlog frog # removing unnecessary .la files if not needed if ! use static-libs ; then - find "${ED}" -name '*.la' -delete || die + find "${ED}" -type f -name '*.la' -delete || die fi } |