diff options
Diffstat (limited to 'sys-fs')
41 files changed, 596 insertions, 305 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex 8c43f4fa6acd..b355f11a80e2 100644 --- a/sys-fs/Manifest.gz +++ b/sys-fs/Manifest.gz diff --git a/sys-fs/archivemount/Manifest b/sys-fs/archivemount/Manifest index eea6fec8c259..78f34e24a0db 100644 --- a/sys-fs/archivemount/Manifest +++ b/sys-fs/archivemount/Manifest @@ -1,9 +1,5 @@ -DIST archivemount-0.8.3.tar.gz 127412 BLAKE2B b89030689d1680e5af2b70e9b45b335a3b91e10a44936c5ab6a9b9cf0443c544484c83d52ea16cea284dc7f541693c6817df8e5784c8d9aa12ddace692204f79 SHA512 f0d50cdce44a0ee57f0d3a32cb37af4159a7400e47a8c61360c9c0c1be6fdbe98d2aa1cc530b3a71fe70e4f550ea5ed431204d738931dca757135677e1984733 -DIST archivemount-0.8.4.tar.gz 127751 BLAKE2B c3a87eb8671cd5d7bae51100f52de4cb22d26a599ee4e4d92d69d82a59a41d364b9f52b711180ed94ef12ba55aabc615b2d84701ae8d3b59d069b0f567bcd02a SHA512 bea9461991cfef129a156f682cb83d58c56b5efe64de21a4fff5858c9e3d3aede5b9b265ee1ae7eb7115290e326c4090c364a3b8de8f3399263ffe54142fd619 -DIST archivemount-0.8.5.tar.gz 128998 BLAKE2B ab7bbc20001013526ad77224bcc7029c4411069bccb6bcec883d89454ca1b70572e2b9071ae9d78ef27775bf5ffddd145e61c9d462b666c6a3bead0166a28a0f SHA512 ad0feec23b5fa41481520081d6615a8001168daff88bd7314c4127072b946434ade4e4e7505ea325a594d1cfc2d9438ddf72de2a2a0fe39ec5d1abf050c84b3a +DIST archivemount-0.8.10.tar.gz 131894 BLAKE2B 058fe86bf1b0b57499785bd10c9cae90b85622144c49a639d8c5c67a052f896d4c17471d8190d0229784b3e58856eb96619a2552f9227fc48c48f8465c7c1321 SHA512 85019bf5f79267f9df4b32e746ff61f112be59f842f36401c8e2013f7ad2c4d1cdd2d72afc356d24304c1772a7f974b9612b5f9fb5c8614aed8ee2467823e7c1 DIST archivemount-0.8.7.tar.gz 129305 BLAKE2B 653280dba569127c22de03b56f464e7a855c14ae5693888055b17433eb0d778c7304fb3911ba98ea745ddcb310c6a247e4b08dd3c2df9bd9d4b20e62a1acd994 SHA512 8869786b7fe6ef12eef2150c42a4e152e033a9387383a689a4e9ab4ead7548c11f9db8f19c62ef55ab858a6387b02af59741f39de3d600aee08ed4ddd0afe7c1 -EBUILD archivemount-0.8.3.ebuild 424 BLAKE2B cb1254db10683e0363766ec602a150f1df0aa1b4a2d816663858a02d907b20884183699559dead1c8e0373d3187c9d285f432e4758ecc68e52c5f66d754ca9b8 SHA512 0a5a864ec1ca3511fabaab5af5a9d0bcfe92eff8beea05f53a2a9a7f24a8ce70b156f09114b2c2f5bb3888fcb17328e86bd5b400787b25b6c47b13cf2c641419 -EBUILD archivemount-0.8.4.ebuild 424 BLAKE2B 04d38e36a1eed08d83d29f30b506c61b438f05142da08d129eb34b3b47b0d4a602cfa10226dbd2e349969c77b7ccbb3fcfc80e822435b0fa0f78ce22afc9cf47 SHA512 0431e9345894e1cd0720dc94cb7b6994332ffba082b5df956dc04f19492933d5b864bc4db7e5542c542bec8f6f9d2cac4a2f870a651818ec44b5a989ab16ee76 -EBUILD archivemount-0.8.5.ebuild 424 BLAKE2B 04d38e36a1eed08d83d29f30b506c61b438f05142da08d129eb34b3b47b0d4a602cfa10226dbd2e349969c77b7ccbb3fcfc80e822435b0fa0f78ce22afc9cf47 SHA512 0431e9345894e1cd0720dc94cb7b6994332ffba082b5df956dc04f19492933d5b864bc4db7e5542c542bec8f6f9d2cac4a2f870a651818ec44b5a989ab16ee76 +EBUILD archivemount-0.8.10.ebuild 426 BLAKE2B da6ef1e07d016bf89f6fc52e1956f24098a4bf31363f0104edc33107645906f7657396dc4a3188b84268cae85912cc1e5dcfd59a7d2e46eee1d89f56ca150501 SHA512 24b8d47fd91fdbc37700fb858b62110edbb9fc5854328cc1a537a4e6a2f7df00f6d044704a42ec4ab29ffa171a5af7968a3228f8ef968310ee012555af5ba904 EBUILD archivemount-0.8.7.ebuild 424 BLAKE2B 04d38e36a1eed08d83d29f30b506c61b438f05142da08d129eb34b3b47b0d4a602cfa10226dbd2e349969c77b7ccbb3fcfc80e822435b0fa0f78ce22afc9cf47 SHA512 0431e9345894e1cd0720dc94cb7b6994332ffba082b5df956dc04f19492933d5b864bc4db7e5542c542bec8f6f9d2cac4a2f870a651818ec44b5a989ab16ee76 MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6 diff --git a/sys-fs/archivemount/archivemount-0.8.3.ebuild b/sys-fs/archivemount/archivemount-0.8.10.ebuild index 86378806ce4b..7c97182dffb6 100644 --- a/sys-fs/archivemount/archivemount-0.8.3.ebuild +++ b/sys-fs/archivemount/archivemount-0.8.10.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 DESCRIPTION="Mount archives using libarchive and FUSE" HOMEPAGE="http://www.cybernoia.de/software/archivemount/" @@ -12,6 +12,6 @@ SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND="app-arch/libarchive:= - sys-fs/fuse" + sys-fs/fuse:0" DEPEND="${RDEPEND} virtual/pkgconfig" diff --git a/sys-fs/archivemount/archivemount-0.8.4.ebuild b/sys-fs/archivemount/archivemount-0.8.4.ebuild deleted file mode 100644 index 012a3f1b3820..000000000000 --- a/sys-fs/archivemount/archivemount-0.8.4.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Mount archives using libarchive and FUSE" -HOMEPAGE="http://www.cybernoia.de/software/archivemount/" -SRC_URI="http://www.cybernoia.de/software/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND="app-arch/libarchive:= - sys-fs/fuse" -DEPEND="${RDEPEND} - virtual/pkgconfig" diff --git a/sys-fs/archivemount/archivemount-0.8.5.ebuild b/sys-fs/archivemount/archivemount-0.8.5.ebuild deleted file mode 100644 index 012a3f1b3820..000000000000 --- a/sys-fs/archivemount/archivemount-0.8.5.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Mount archives using libarchive and FUSE" -HOMEPAGE="http://www.cybernoia.de/software/archivemount/" -SRC_URI="http://www.cybernoia.de/software/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND="app-arch/libarchive:= - sys-fs/fuse" -DEPEND="${RDEPEND} - virtual/pkgconfig" diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index 1b274e03367c..ed1246e73c5b 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -1,3 +1,4 @@ +AUX btrfs-progs-4.15.1-e2fsprogs-1.44.0.patch 1168 BLAKE2B d2ebad85f6f15dfe97fbdce1f32170a14655ec3280ee5720fc6abece9b29c1a60eb3ad7207f396f9a4edd792a9f09928dc396e6906f1d2ce561d5d27ed8266b4 SHA512 de99775ec92dd87ed2bcb29885a18a69f781490bd71a26c0b5536f8b180d8a03ebb4fd52eb8b3939c2f28dcae01bcbddc93c0b7b347f15e5295939f5e5dfe9e4 DIST btrfs-progs-v3.16.2.tar.xz 291604 BLAKE2B 66c19a47062386888209b2bb569cc5db8629446554387af971f5ba13ee49b654b2706fd6ed391115075533e6aa5637c7ebfe87b9abc2fa941739baee9fffe1aa SHA512 7dc0f2f8f0bbddbbf1d4d99854425341c4b3997334c65d7e936bcec1ee5ca880101b8b45498721502857b478edae6237a934c7d4acb735de43c6d8ff35efe53b DIST btrfs-progs-v3.18.2.tar.xz 1029228 BLAKE2B be8b3e0151c939135bcac11cdd118b7cafdfefa9d06de4629a0727db781b42dfdfa447265d1b4dafce8711a65ac838b19c38a2a93c0439d92d5b8fb4b4d974f5 SHA512 7fd125eeedabd54178f5198ac09c364b6772125124adcdb2620515a51c331307205ae06ff81375a49ebc62650d537c6f9eed2b63bf1f7e97b9ff047cda8a2cc4 DIST btrfs-progs-v4.1.2.tar.xz 1123080 BLAKE2B 4b6395080c1456321d6923609544da066bd86806588e5860bc2750162a257a94a64cd4e3fb1362065eaa38a73fdee92f053cd2a26c367fe179aa13f068e8b1d2 SHA512 dd159bcc3adb65efd4f612d75f5a6b30df8ad9fa06ef952dd03dac965256de37eab26f4cc2fb3840178403ccbb7368cae11638e27eadb9b1835b636c4b126e2e @@ -12,7 +13,7 @@ EBUILD btrfs-progs-3.18.2.ebuild 1264 BLAKE2B 097f4c5717fb4824868811c82bae7a382a EBUILD btrfs-progs-4.1.2.ebuild 1891 BLAKE2B 6164d918d4452a4d91ee812a84fe7a2859fd303396ccacde0fa2dcd5fe7ed1e974bee47e9deece3b621e62d8176379d45b12c2ce6b52497d406425781cb35a3a SHA512 9f0771068eae7ec9bd54545d1f7d1146e9c1a221599dacb40c15106f73ea15bded433adc13dda8d2f7e302b2b4a989fd3a4442904ab222901eab70652e43d28c EBUILD btrfs-progs-4.10.2.ebuild 2195 BLAKE2B b2fc7318648463c6a9dd12fdca7f92fd4e6f03c85b84cc5e25f6f7ce8c471e8c2830cae58125145a794f42f17724edd82aaf0de71ad73db05b6e4b32da0ea177 SHA512 ad7aee9448e252f09291ddf82ca9e4c992cbb7b3cf25dfe968b3ed1d5a3958b6c63289f49d829621f2d08bbe3fe75f8e8a1888a6802c186db2a1617576a5b2c8 EBUILD btrfs-progs-4.14.1.ebuild 2481 BLAKE2B 3e4db698cb95fdcdb982b424364cced1aa3087eeb77f2d5e86f51995dba2c85b557c5546f659798d593e36cc03307d436a11a98ab768bce47ffa186c7a2da6d2 SHA512 01032adb19e4ebef2bc923c16284274b5177701551c578e8813596f13e938b5504b1735e438f4633cc9131a2e20decd6e5bc58a45b3955f08b7d9c9144f60512 -EBUILD btrfs-progs-4.15.1.ebuild 2522 BLAKE2B e837b8da7893edbe50e9de208b0f0270d326fd4e572111928dcfe5f842083d7dfa4a0351b2f10463a133c971fd28f0d88c2952e691dcab4f10a882f9d0cc5ef4 SHA512 9c60d81ffcb0b44ad8168d93c16b3b5216cfd4208ca9009b395e9938acb36eb0aca99894ac75e6c77a1059b71bce4930f11d337abce8ebf5b3ceb192b5de44dc +EBUILD btrfs-progs-4.15.1.ebuild 2586 BLAKE2B a4f784458b56797d6018ed5bcc84d5270419c3507cc861af002ee7756420e864889414deb713f5f78154d7e0c84bf2ec63e2509ae62cc1b00560f85b37a4a9f8 SHA512 94662ed43680e269ad10be9209b59e5e882839d30ff28e6311420f6298d4e37aeff328ec889b66f661f61bae0b21d0541c79733521dec0b4b8cc0d0c8ab652dc EBUILD btrfs-progs-4.15.ebuild 2515 BLAKE2B 1ea8bdd9f1162533c673c95f251b214260f1bbea58c806803cdf0795e688d624774705765745b63cae047a7f89539e42e10fae7c58b34b35ebeb187c97734477 SHA512 ef7f69cf25c524e26aba8cf2e0889c623faf3aa6dd88a8cf2f944756c52918b825570e6f92581ea8343fb96db0c565541855409afef6e3bed056cf397089276e EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3e7ccb59be25264c1b95f7d2a2a21ddeb338508f8b9a9c060decb0ff4999e87bfd67e4e6d2f00d811b818f13ba75d38972235b8f1685d4d072b8473cbaaa6d43 SHA512 85038dfcffd849ffdd62239f275e63a2fc4ce693c140c598c89f3dc19c92fa5b72c61fef27192d46853f3bcf828aa7efb34e74949acbd919cb358e1a20654dcd EBUILD btrfs-progs-4.9.1.ebuild 2201 BLAKE2B ae5b75a334cce82b436846179ebfa2dea8c1e61c41636821ec85e07c67c1fcbbbf60ecc6cff41bff77ddb0bae82b8b83c411ceb9f2b765fecb043790305c2bfe SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4 diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.15.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.15.1.ebuild index 1a8e2474dfbe..ceeea58afa06 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-4.15.1.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-4.15.1.ebuild @@ -66,6 +66,10 @@ if [[ ${PV} == 9999 ]]; then DEPEND+=" sys-devel/gnuconfig" fi +PATCHES=( + "${FILESDIR}/${PN}-4.15.1-e2fsprogs-1.44.0.patch" +) + src_prepare() { default if [[ ${PV} == 9999 ]]; then diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-4.15.1-e2fsprogs-1.44.0.patch b/sys-fs/btrfs-progs/files/btrfs-progs-4.15.1-e2fsprogs-1.44.0.patch new file mode 100644 index 000000000000..8aa05a54ed62 --- /dev/null +++ b/sys-fs/btrfs-progs/files/btrfs-progs-4.15.1-e2fsprogs-1.44.0.patch @@ -0,0 +1,34 @@ +From 33e9f2bd47a17bd0798a664718b6bfcfc4d044a1 Mon Sep 17 00:00:00 2001 +From: Qu Wenruo <wqu@suse.com> +Date: Wed, 14 Mar 2018 08:56:57 +0800 +Subject: [PATCH] btrfs-progs: convert/ext2: Remove check for + ext2_ext_attr_entry->e_value_block + +In latest e2fsprogs (1.44.0) definition of ext2_ext_attr_entry has +removed member e_value_block, as currently ext* doesn't support it set +anyway. + +So remove such check so that we can pass compile. + +Issue: #110 +Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=199071 +Signed-off-by: Qu Wenruo <wqu@suse.com> +Signed-off-by: David Sterba <dsterba@suse.com> +--- + convert/source-ext2.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/convert/source-ext2.c b/convert/source-ext2.c +index b1492c786..070126ec3 100644 +--- a/convert/source-ext2.c ++++ b/convert/source-ext2.c +@@ -422,8 +422,7 @@ static int ext2_xattr_check_entry(struct ext2_ext_attr_entry *entry, + { + size_t value_size = entry->e_value_size; + +- if (entry->e_value_block != 0 || value_size > size || +- entry->e_value_offs + value_size > size) ++ if (value_size > size || entry->e_value_offs + value_size > size) + return -EIO; + return 0; + } diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index 7eb69487a322..0c8059012cb1 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -12,8 +12,8 @@ DIST e2fsprogs-1.43.3.tar.gz 7405892 BLAKE2B 158aeee327a1ca68ce1bda1f97c9fa25ba1 DIST e2fsprogs-1.43.6.tar.gz 7466907 BLAKE2B 6c19c686432b7990900b239c4a1b3b6675b085ca7adfdb4323d1253ee8c83f22f87f67b0b4a843e48cb71322b1a7454b3ceab669f875b71b967e96054a55f1ac SHA512 95e3e7def177de921d3204aeace4cb8243d79872468d3289cace0547798c84e92af253022deb803cd8c045411283b01431728a86b14b9e8b45cdd5dca739db66 DIST e2fsprogs-1.43.9.tar.gz 7470878 BLAKE2B dcc1a6fda87884a0b3b1d49f4116be060bf39c4820246ba6aa7ce61c6735415542f852b36d3c809b2b52782de2ca9ea9a87086a0d4ff71ee217845939aae00f1 SHA512 7bdc5da165b14e6779aedd9243175018ca8cb2bb0f5aad9c3d04f7e0619da2107f37929e6d8027b682145801106f97d1376345c4c30ce64f2b02b716b0c4ba3b DIST e2fsprogs-1.44.0.tar.gz 7547084 BLAKE2B 32b16453931e33eb21cd42724c7dbe420c21ebdf1650f7eb9b8bc5a1016166e4fd244e97f7dd2c90c934f7244b9cae75bd9d177685b92a9430f29e3349f47b64 SHA512 a084973097bcc806d63b94c106fb22d840a53863c63016d7e0d68094b01679c6985a195e5f7983cfeb356e0a45636a52d6c444af30275c4c42c49c1d94663fed -EBUILD e2fsprogs-1.43.3-r1.ebuild 4040 BLAKE2B a6100687d4e3edeb42d0328c592c9dc896aca97b883ead0bc866afe138dfb3a30126fb448fc5c30516d73c1a94c2fcc75dcf3bb6786ff36920850ca88ea5f84b SHA512 5053ec14ad968d6f4f8bb0cf0a227c0f56af71eaf0201fe7d53448c962f6f097aeb92b561381194aea58f5d3d99421d455ad50f280413d83ada6b281e1361c9c -EBUILD e2fsprogs-1.43.6.ebuild 3794 BLAKE2B 30536b1a22b10fab64223baf79a8717aa6cc736fa94ee74dcbef4ef2a068ff0d5969b1a77fadc324ed8d81fcf1282f8e566faa130975befed2be83e570aaa6ab SHA512 79c0ebff04f84941e0959e52d4a0d5d5804fdca9ccad42c23d9523ce8091a1230f5e50a06d24b0f3bb8e125c9a71c80629d2ed58fc2fc5b49703f97ba176fe77 -EBUILD e2fsprogs-1.43.9.ebuild 3825 BLAKE2B 4362d2301f7a41d03bd49ff2220274f4c459b8ea24b8df081a93eb117f605781c26a4578f1d80b9778a986eac6cfe8bc7d0a00e3b72b17d49789e93feaf4f873 SHA512 7cca30321f643180c7b7457e2e577467a0e85f7cf9523a6285c7fd5699db6b4cf04623dfd22712ba6bc2a3957a3976aa3f4300e22225d92108f6a5b0301900f3 -EBUILD e2fsprogs-1.44.0.ebuild 3825 BLAKE2B 4362d2301f7a41d03bd49ff2220274f4c459b8ea24b8df081a93eb117f605781c26a4578f1d80b9778a986eac6cfe8bc7d0a00e3b72b17d49789e93feaf4f873 SHA512 7cca30321f643180c7b7457e2e577467a0e85f7cf9523a6285c7fd5699db6b4cf04623dfd22712ba6bc2a3957a3976aa3f4300e22225d92108f6a5b0301900f3 +EBUILD e2fsprogs-1.43.3-r1.ebuild 4042 BLAKE2B 9c30738f57c6d066f85eab86b74fd56253a56d1c00d88f40fe95301f51869ed68ecb31f002f44c079b10f4758c9cab09f41ddab3513e26c7d599aa5394c77448 SHA512 8f45b073d5684401e28b44decfa841a0a1ca778a6748081e1f07a3a903220c46a24fc7d5fce4d4e2ecb89bb3dcf54eee7a7b6e581534aaebd88dd2f1b91f16dc +EBUILD e2fsprogs-1.43.6.ebuild 3796 BLAKE2B dda1c06831a1bae190689363561d34a653b51723dd14be8f910c43e77a58ab9aff566eaaae22879c499c1da7a34c72051b3839538b794f8f9d56fe90aa406aa4 SHA512 bebd95aafb0246723b6228ab3152e438a08c8d6a55f988e822cdb989d688a6b69bae1423ce2a5480c631461f00552d65dbe0420fcc094895ee70b809bcfa1dea +EBUILD e2fsprogs-1.43.9.ebuild 3827 BLAKE2B 71bb5aef6c6f5ab2b1fc288821cdeab9f4ba067e481a80115042fd9c2624082a6b9a1dc8fa399071cf85937a451d47ffe007e46d51ab03742bb5fda266ee23e6 SHA512 89086e25c804f89bdd84a870c28e90dd7bb32de1cc4a891fb58f08c3566a53dafada3d65814612e7c0b1d1a34d8ee41de883037da00127a1bc7d769ae47bd9ab +EBUILD e2fsprogs-1.44.0.ebuild 3827 BLAKE2B 71bb5aef6c6f5ab2b1fc288821cdeab9f4ba067e481a80115042fd9c2624082a6b9a1dc8fa399071cf85937a451d47ffe007e46d51ab03742bb5fda266ee23e6 SHA512 89086e25c804f89bdd84a870c28e90dd7bb32de1cc4a891fb58f08c3566a53dafada3d65814612e7c0b1d1a34d8ee41de883037da00127a1bc7d769ae47bd9ab MISC metadata.xml 520 BLAKE2B 3e908938de1132b5cde97c6b51b40f72c03e91301b54c14339379d2e2380414dd33096a87d64ff2fc7d886cd65fb16b9c16a376b7338c826f44917860f380be2 SHA512 a5ff91610ed175147f1a9c2c725a30380908c02fc04c6b7df2792cb4fd805f9137374d2a910e456128a7bf2fec9e83af3063bcb5f2ad51394bed8bed648e3905 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.3-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.3-r1.ebuild index b2af3e041a6a..f53dee8757b2 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.43.3-r1.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -26,7 +26,7 @@ IUSE="fuse nls static-libs elibc_FreeBSD" RDEPEND="~sys-libs/${PN}-libs-${PV} >=sys-apps/util-linux-2.16 - fuse? ( sys-fs/fuse ) + fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl )" DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild index 2cfde8fdf970..9598298848ba 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -23,7 +23,7 @@ IUSE="fuse nls static-libs elibc_FreeBSD" RDEPEND="~sys-libs/${PN}-libs-${PV} >=sys-apps/util-linux-2.16 - fuse? ( sys-fs/fuse ) + fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl )" DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild index ba0347721fd7..76d036d2679c 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild @@ -23,7 +23,7 @@ IUSE="fuse nls static-libs elibc_FreeBSD" RDEPEND="~sys-libs/${PN}-libs-${PV} >=sys-apps/util-linux-2.16 - fuse? ( sys-fs/fuse ) + fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl )" DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.44.0.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.44.0.ebuild index ba0347721fd7..76d036d2679c 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.44.0.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.44.0.ebuild @@ -23,7 +23,7 @@ IUSE="fuse nls static-libs elibc_FreeBSD" RDEPEND="~sys-libs/${PN}-libs-${PV} >=sys-apps/util-linux-2.16 - fuse? ( sys-fs/fuse ) + fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl )" DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest index daa05cecf482..7684e3f9af64 100644 --- a/sys-fs/f2fs-tools/Manifest +++ b/sys-fs/f2fs-tools/Manifest @@ -1,6 +1,5 @@ AUX f2fs-tools-1.10.0-fibmap-include-config_h.patch 401 BLAKE2B 83b0888b5892111165134b858e79bd7b68d3f1f2f66e67745b75e2ab5510f003969a60e8e8d148aba23c2e1b2167d184e20f8acdbbf5dd40cfacc773e9a4f1fc SHA512 d1ccb17c15267a42e64b1760410f1ff5ffeca8bc1545afacd7723e0a86ef7172df63dfbe85c9395f6c2d1b0651dc40bea991b9c30445badde4a1256fa58e6627 AUX f2fs-tools-1.6.1-sysmacros.patch 1555 BLAKE2B a7cf99912c969492ae6d7d6f2db6bda30caf2fa750530b52543d7b4f5d38acb349d87ac2ec839d86fc32afe172ff989450593e5ce55b3c3eea54f69a32c7e23e SHA512 10e3f473f21d00126fc570ad82f9f6218ed1fba7eb0fe24947c4e67186f82db09fa7563c10ccb74398652f41cda4753afa31d8140cdcb003ce0da0f71bc64415 -AUX f2fs-tools-1.8.0-sysmacros.patch 324 BLAKE2B 7d0304c31c3c843bb324acddb45512383256e65c74be32a66b728983361801d43807d050ea7a55ecb7a7e46db08df888eef7d9d8d81fec20b8017b9c100d60f9 SHA512 15e2e79c34efe001c08d059ad4f6a01e7f066b6e8e2466e8d3c6423f8c59a90582cb345ce62cbc340bd0aac2eff6f21113d2cc8b88135e828f36ce5b08b4b6d2 DIST f2fs-tools-1.10.0.tar.xz 342904 BLAKE2B ba4dec55e11959b2dd9461b1b02d173c7766908bfdbca9f6da7aa134b4a3b5cf2bda3c2e380b3fab46afdda0be9181ae5fe85ed9d085f816a1ff96e847e2a836 SHA512 e6e9fc10bd8051db86880c415ceb50900bf0cc919f1d9fe39026b5320de7c93cbcc1d817fab73130817042ed551fc5fd55ef9b589caeca9fca63fd3098f7a853 DIST f2fs-tools-1.6.1.tar.xz 282152 BLAKE2B f8535a5415e012834b749bba2123151d8a39c8fa757905c45be20478d6a795ff64dfbcf0cf9679f2bd70cb1d92717d8df70efb4beb4d749677a6c8758ebdde0e SHA512 108327042079d9e864899a20f2dd94019be1b957fd7ffa295af097c5b93a5065ea9c36de9bae83f84a6412ac496340849fc44de041e24461a2919073eed15cf2 EBUILD f2fs-tools-1.10.0.ebuild 787 BLAKE2B 991737af22a0e26124fd8b99cadfb8e2a8e0fd9c65658913e431e1af74c4a410b9de77d327041a5bfa7e0cc216522c2b3e7bd6f39442bba5ac3dda4ef22d6cae SHA512 c03642d6f5d0bd01d8f93810d8d77b9e38466a544eae48d38108a5ff9bb46aab88e4ab4276cb25c0f49756dde05ae9ea4ccac3fcb82b4d4603a17c8e30cafe1b diff --git a/sys-fs/f2fs-tools/files/f2fs-tools-1.8.0-sysmacros.patch b/sys-fs/f2fs-tools/files/f2fs-tools-1.8.0-sysmacros.patch deleted file mode 100644 index 7ca70222fd5a..000000000000 --- a/sys-fs/f2fs-tools/files/f2fs-tools-1.8.0-sysmacros.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- f2fs-tools-1.8.0/lib/libf2fs.c.orig 2017-07-03 03:01:53.000000000 +0600 -+++ f2fs-tools-1.8.0/lib/libf2fs.c 2017-08-17 00:45:01.638979885 +0600 -@@ -16,6 +16,7 @@ - #include <fcntl.h> - #include <mntent.h> - #include <time.h> -+#include <sys/sysmacros.h> - #include <sys/stat.h> - #include <sys/mount.h> - #include <sys/ioctl.h> diff --git a/sys-fs/fuse-common/Manifest b/sys-fs/fuse-common/Manifest new file mode 100644 index 000000000000..51c508129592 --- /dev/null +++ b/sys-fs/fuse-common/Manifest @@ -0,0 +1,5 @@ +AUX fuse-fbsd.init 468 BLAKE2B 3b84afb0e215064d4944808b87fdc29396e851042a83bb7c031586ec6da49f8f13c0593754ce6f6a92fc35ed4ce2f0f6d9c53089e08bf3ee960df577543bba49 SHA512 c8ae0e1932e34e2078bb8a1ab47c6d2d489f832f7adb118668624d3f0695ebf8b3ac2468a8db98579ef30078eac6989421aae7d7893e30a50e5c35d0a00ad6a9 +AUX fuse.init 757 BLAKE2B 802821596154d3dabae5c56367656d46a714c22a284cadf8ca78b2ca01a68fce8cefc37576cd26a14551452ff910a5317544e39b8fc4bddf74d80879fb7a0334 SHA512 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1 +DIST fuse-3.2.1.tar.xz 1042772 BLAKE2B fe7dccc3b791a3b549815f5015a993c29d9481742a88b0291a03b39b95c0acb709969bdc0f6fbea5a48d0bb97bc362ad351b719d77a4f9f630825308f3fb1913 SHA512 edf08711fa02c40b9d3507c99e0b1bfd7208edc1494888c4e2bad92b621eb5c43c4cb31474d2d3bb1edaaf9cd876f3407cdb00a1bdcf61a0b74c876d3707518e +EBUILD fuse-common-3.2.1.ebuild 1398 BLAKE2B 6948cf83261c2e47891b0990ecd6dc080d1a6a50a57c3fead02edfd68b54f260b458821be37beacf64d72d8fa318713c14bfbaeb580699d17e447e37f8895e72 SHA512 769b9ab430a4a62b25991c5f4cdf4facbdf974530a830d926405695fe7e8ca030f13347e98d46fc45d7795d6a3896befad55dd391719d5d4a9357dfeb3b4f109 +MISC metadata.xml 326 BLAKE2B e3a863aeff43218beaba67d6ca4692dad0b3854a706213db47880058af990e02655a30a55eb16dc3cbe546382f6e55989d0d8321eb115b8270a016d2c1c62ab8 SHA512 fcb872557acd0b8478fd8afe48c408a6dc08fda8eeba46f6db89470b6b3aa5d1287d4be9c5ec2aee80137901d4a1d943b61b22117849d283eafd3bd587c05eae diff --git a/sys-fs/fuse-common/files/fuse-fbsd.init b/sys-fs/fuse-common/files/fuse-fbsd.init new file mode 100644 index 000000000000..27d90cc867f3 --- /dev/null +++ b/sys-fs/fuse-common/files/fuse-fbsd.init @@ -0,0 +1,23 @@ +#!/sbin/openrc-run +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need localmount +} + +start() { + ebegin "Starting fuse" + if ! kldstat -q -m fuse; then + kldload fuse >/dev/null 2>&1 || eerror $? "Error loading fuse module" + fi + eend ${?} +} + +stop() { + ebegin "Stopping fuse" + if kldstat -q -m fuse; then + kldunload fuse >/dev/null 2>&1 || eerror $? "Error unloading fuse module" + fi + eend ${?} +} diff --git a/sys-fs/fuse-common/files/fuse.init b/sys-fs/fuse-common/files/fuse.init new file mode 100644 index 000000000000..6c99929c2266 --- /dev/null +++ b/sys-fs/fuse-common/files/fuse.init @@ -0,0 +1,35 @@ +#!/sbin/openrc-run +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +MOUNTPOINT=/sys/fs/fuse/connections + +depend() { + need localmount +} + +start() { + + ebegin "Starting fuse" + if ! grep -qw fuse /proc/filesystems; then + modprobe fuse >/dev/null 2>&1 || eerror $? "Error loading fuse module" + fi + if grep -qw fusectl /proc/filesystems && \ + ! grep -qw $MOUNTPOINT /proc/mounts; then + mount -t fusectl none $MOUNTPOINT >/dev/null 2>&1 || \ + eerror $? "Error mounting control filesystem" + fi + eend ${?} + +} + +stop() { + + ebegin "Stopping fuse" + if grep -qw $MOUNTPOINT /proc/mounts; then + umount $MOUNTPOINT >/dev/null 2>&1 || \ + eerror $? "Error unmounting control filesystem" + fi + eend ${?} + +} diff --git a/sys-fs/fuse-common/fuse-common-3.2.1.ebuild b/sys-fs/fuse-common/fuse-common-3.2.1.ebuild new file mode 100644 index 000000000000..15d8bd5e11fc --- /dev/null +++ b/sys-fs/fuse-common/fuse-common-3.2.1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit meson udev flag-o-matic + +DESCRIPTION="Common files for multiple slots of sys-fs/fuse" +HOMEPAGE="https://github.com/libfuse/libfuse" +SRC_URI="https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + +DEPEND="virtual/pkgconfig" +RDEPEND="!<sys-fs/fuse-2.9.7-r1:0" + +S=${WORKDIR}/fuse-${PV} + +# tests run in sys-fs/fuse +RESTRICT="test" + +src_prepare() { + default + + # lto not supported yet -- https://github.com/libfuse/libfuse/issues/198 + filter-flags -flto* +} + +src_install() { + newsbin "${BUILD_DIR}"/util/mount.fuse3 mount.fuse + doman doc/mount.fuse.8 + + udev_newrules util/udev.rules 99-fuse.rules + + if use kernel_linux ; then + newinitd "${FILESDIR}"/fuse.init fuse + elif use kernel_FreeBSD ; then + newinitd "${FILESDIR}"/fuse-fbsd.init fuse + else + die "We don't know what init code install for your kernel, please file a bug." + fi + + dodir /etc + cat > "${ED}"/etc/fuse.conf <<-EOF + # Set the maximum number of FUSE mounts allowed to non-root users. + # The default is 1000. + # + #mount_max = 1000 + + # Allow non-root users to specify the 'allow_other' or 'allow_root' + # mount options. + # + #user_allow_other + EOF +} diff --git a/sys-fs/fuse-common/metadata.xml b/sys-fs/fuse-common/metadata.xml new file mode 100644 index 000000000000..b8fe5aef6d9a --- /dev/null +++ b/sys-fs/fuse-common/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>radhermit@gentoo.org</email> + <name>Tim Harder</name> + </maintainer> + <upstream> + <remote-id type="github">libfuse/libfuse</remote-id> + </upstream> +</pkgmetadata> diff --git a/sys-fs/fuse-exfat/Manifest b/sys-fs/fuse-exfat/Manifest index cb1645a9b61d..f2de90337db6 100644 --- a/sys-fs/fuse-exfat/Manifest +++ b/sys-fs/fuse-exfat/Manifest @@ -1,9 +1,3 @@ -DIST fuse-exfat-1.2.4.tar.gz 136048 BLAKE2B b0901531cdbf0432d78bb27070eed846db0cb5c7158f063c1a3dfde3a8183fb110bebbdc480bc4bc7fd295ecd204414ba0fa6d9e9879da2bdddc7cc2dde04ecb SHA512 e425df39b205de017250ae29231a1d485649710fa08d6c46f2c831e3ff6a696f20e5bf2086d7803b992edc7e9296ee28df5cf1321cc21183f96e373aa3b5fcd9 -DIST fuse-exfat-1.2.6.tar.gz 136534 BLAKE2B 56dd5b5cace39804241c55fcd7224264360d106f81e591e7afc58e8937adbf8e4a7a1b4ea9b254d81f851709f827e941291c93bc0163db897ca21911dcf6ecd9 SHA512 93132583b9637c9c48eeaa40d49222686488db7123d0c524d6f70daf6e11fdb5b2b0e44046820b36d3a31a3421165ff9546beb93cb94a6f04cb2d0477aa0c420 -DIST fuse-exfat-1.2.7.tar.gz 135447 BLAKE2B 6cdba6e97643d8705e682540615a9beb191d309817cc8f6d019c25fe088758515b7bedbb1916a47b32ad0f612be36e27adcb6c109e048d3db03597bb4cac6d22 SHA512 dd41a9dac2c0229b42127ef517b15d0f63095bdde57a534a7bf4c473a14164964372ae9c8f8d35bf73f8e0ad3acc66483e34f35e90ed18bb88d2696a5cb9645e DIST fuse-exfat-1.2.8.tar.gz 159588 BLAKE2B 929fb87ee75aa70ba68814763c085c76fa1e263451bc3cd388b67dc6e793383c8eede1ea754a55c7ce7f14b38b7ec40f503acd28b0709d1ef58b10cb977a1d58 SHA512 ce81f15121b9f21bdaaacb09bdeeccdc8d556585967b85f1ab57534a8da07ea45434541fc571069b5795bae0f2ba5f090bbe7a0d5881dd35de06b706abe6d395 -EBUILD fuse-exfat-1.2.4.ebuild 669 BLAKE2B a88507dd06fbd834b73c00505ffb495bc6c903979fe9cd65703fcb2d502ccfa68ab4de66d187cfe63c7d7df6a1993234a79d382474ecd458bceb1a8cd9fb843f SHA512 3668b64925e6ae839a2be8556becb28a88006fb77089b8647af8f89d214e8f054ebf65fe41f0142a79f44f6c523f3adff87487cb00779d9a941819b6654d5787 -EBUILD fuse-exfat-1.2.6.ebuild 671 BLAKE2B d9df58ed7f790162e33fef8552bbbec39abfb3dc93b48581abae46aa5650d5c318475d5cb85dda0a10062150368d01ac1720ae15d47184aa536a68d4be15fd91 SHA512 eb085490011b47985081aed348a4fa908d5dffe0ff27d7ed0a950dccee22aa322685463caff520728d65d1d37739b5f3894f22b683a3e5203681aef209680d55 -EBUILD fuse-exfat-1.2.7.ebuild 671 BLAKE2B d9df58ed7f790162e33fef8552bbbec39abfb3dc93b48581abae46aa5650d5c318475d5cb85dda0a10062150368d01ac1720ae15d47184aa536a68d4be15fd91 SHA512 eb085490011b47985081aed348a4fa908d5dffe0ff27d7ed0a950dccee22aa322685463caff520728d65d1d37739b5f3894f22b683a3e5203681aef209680d55 EBUILD fuse-exfat-1.2.8.ebuild 671 BLAKE2B 9e4875e949740aeaecbf4b38ce421f439db19d9da5eb277b6de3129ead497a1638825710851fbe5e7c646821837308e2fb37dbd4c09ab94120aecc320d2f858c SHA512 6c730ed920af0567044feb6ab2794028a1d3e12c71dfdc192d568a1ab95aea76f48acce2dbb7f4991e8a89ec719d51c6b8def628bbd97b24488c2681422e1396 MISC metadata.xml 451 BLAKE2B 89f419f995928b9d29c5aed14e20792fde2bc90cae84ad31b2df25eedfca4bbe23fef0845989616b5e6f0a44bc50941879bd5928e4f0dfbdb8a2ed4db97b95a0 SHA512 e9b06c7885b8f6d5d114042e9fa8946583b2a481ef74d4269e0d462ff995fb7da3d4ef171d401c48f517c93ca8b954f7f72f1fc0a9ac294b232e7d8a5da228c9 diff --git a/sys-fs/fuse-exfat/fuse-exfat-1.2.4.ebuild b/sys-fs/fuse-exfat/fuse-exfat-1.2.4.ebuild deleted file mode 100644 index 54bbc72c75a4..000000000000 --- a/sys-fs/fuse-exfat/fuse-exfat-1.2.4.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="exFAT filesystem FUSE module" -HOMEPAGE="https://github.com/relan/exfat" -SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz" - -# COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+" -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~arm-linux ~x86-linux" - -RDEPEND="sys-fs/fuse" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( ChangeLog ) - -src_install() { - default - dosym mount.exfat-fuse.8 /usr/share/man/man8/mount.exfat.8 -} diff --git a/sys-fs/fuse-exfat/fuse-exfat-1.2.6.ebuild b/sys-fs/fuse-exfat/fuse-exfat-1.2.6.ebuild deleted file mode 100644 index 5380f93ed279..000000000000 --- a/sys-fs/fuse-exfat/fuse-exfat-1.2.6.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="exFAT filesystem FUSE module" -HOMEPAGE="https://github.com/relan/exfat" -SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz" - -# COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+" -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux" - -RDEPEND="sys-fs/fuse" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( ChangeLog ) - -src_install() { - default - dosym mount.exfat-fuse.8 /usr/share/man/man8/mount.exfat.8 -} diff --git a/sys-fs/fuse-exfat/fuse-exfat-1.2.7.ebuild b/sys-fs/fuse-exfat/fuse-exfat-1.2.7.ebuild deleted file mode 100644 index 5380f93ed279..000000000000 --- a/sys-fs/fuse-exfat/fuse-exfat-1.2.7.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="exFAT filesystem FUSE module" -HOMEPAGE="https://github.com/relan/exfat" -SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz" - -# COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+" -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux" - -RDEPEND="sys-fs/fuse" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( ChangeLog ) - -src_install() { - default - dosym mount.exfat-fuse.8 /usr/share/man/man8/mount.exfat.8 -} diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest index b181bdc880db..76b8c1e592d7 100644 --- a/sys-fs/fuse/Manifest +++ b/sys-fs/fuse/Manifest @@ -2,11 +2,8 @@ AUX fuse-2.9.3-kernel-types.patch 434 BLAKE2B 501d771217a6131c31982a5cee300d1d6f AUX fuse-fbsd.init 468 BLAKE2B 3b84afb0e215064d4944808b87fdc29396e851042a83bb7c031586ec6da49f8f13c0593754ce6f6a92fc35ed4ce2f0f6d9c53089e08bf3ee960df577543bba49 SHA512 c8ae0e1932e34e2078bb8a1ab47c6d2d489f832f7adb118668624d3f0695ebf8b3ac2468a8db98579ef30078eac6989421aae7d7893e30a50e5c35d0a00ad6a9 AUX fuse.init 757 BLAKE2B 802821596154d3dabae5c56367656d46a714c22a284cadf8ca78b2ca01a68fce8cefc37576cd26a14551452ff910a5317544e39b8fc4bddf74d80879fb7a0334 SHA512 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1 DIST fuse-2.9.7.tar.gz 661138 BLAKE2B 8e56cfa8634e919bfc4f9fa589074763bd8c272d5166a2a6fd7d416477ca07a374611639283593df4b06f8d5820b8cf5a375463d4b85fa3644868b2a62611003 SHA512 f47304d9c7a1815f7a2905b7bdb7785d4c10292a80c8dc1ec45d895af96bc6ffd6d84ff2617bd976a1d0867ab8ec1a404a5a05ace85a69ecca830f371d08f8e2 -DIST fuse-3.0.0rc3.tar.gz 744606 BLAKE2B a9e52f7644652ef84da3a825df5327ada3265c5eff1a9e6fa070aa1beaad15e6b77d63b3e355fdff978bcd2285b0f1295acb9324dcc16c33f554b8a1d89a2898 SHA512 a50d12d70ee44c217f198a231bf37b323d36741aacb5d6b2fbf6f8cfc645d9106d7f05f7cc7be29bd64098b48797f8c53a239194bf49e714b9a0dc12bf885e35 -DIST fuse-3.1.0.tar.gz 809470 BLAKE2B 8a2cd4da789a5b533d0e0ad4b87b155aa880b7d87bb7b9c996ed6de79ef14de0126da379d2879ea8de7edda2329514be8c737ecae221db390507652edc0ad25b SHA512 e6278aef67162439b736af28528edb0f39a4513f584e5949a269cc3bc07a14436e6f0b69dbe8002db6f60de9139c452568b5a091baa49119a7f61422b7aec84c -DIST fuse-3.1.1.tar.gz 819205 BLAKE2B 040bf3473c4a403e3b085106d987765b5aa80c91d1d1648762fa4eee8ba611b04c3ea9d584b79b71e9105f4cfe305f602521c997916f0aaab25b0a1a67cff399 SHA512 38c61380f08cc9cde576d4d8fdc3b9a7c703c753ae9c477ec5210fddfe235055dc925e024ba74f3200576974f901d05b5d138cecf1baffe7b17f17ed23fdc391 +DIST fuse-3.2.1.tar.xz 1042772 BLAKE2B fe7dccc3b791a3b549815f5015a993c29d9481742a88b0291a03b39b95c0acb709969bdc0f6fbea5a48d0bb97bc362ad351b719d77a4f9f630825308f3fb1913 SHA512 edf08711fa02c40b9d3507c99e0b1bfd7208edc1494888c4e2bad92b621eb5c43c4cb31474d2d3bb1edaaf9cd876f3407cdb00a1bdcf61a0b74c876d3707518e +EBUILD fuse-2.9.7-r1.ebuild 1967 BLAKE2B c520b94126a010188fbe36391efff49287b41216996bc51179fc33bcbcd1830fad0178d1e62cc568460963512cbd5bb0817648bca39d4934748114fd013a9612 SHA512 16beaf9cbef8060d07f26017adab1364731a75870993d87ab807bb3f6f8023e7d62a3e2ed0c8d540d2350353c0555de8590f9ac2eb1bce3078d161a558b2a1d6 EBUILD fuse-2.9.7.ebuild 2217 BLAKE2B a132222d50317eeac24b49a92e2f381c5f6475e2b89fa5d92823363c726329a0b70de4595b07ea1abf32a3ef95d068ac58b5e18e4d8d86554f9dba407e4d879d SHA512 40735712f825b32f9db1078d78549be073db57329ffc243ef0cd46b8faf06fcb7961143d2779a8bc1ea8cdbfc0328110d9cc460f93e3eed8f51a58894d12287c -EBUILD fuse-3.0.0_rc3.ebuild 2175 BLAKE2B 944085ab9a2c8a191ad81de9e7daeb03b611e48fdf6e29bd37174c133fcd95337349de3161dbe9903e5b4d4e262a395ea015a1193ba7c614d13e4ae82e998bff SHA512 683cb8c47f8d592305e83c01a926a305ebf89b7d1f35394d93c3dc6afdf99c1f778468147191fb2689947491cbbbb23a97ec028f4c68e3eac7460b8318e96e3f -EBUILD fuse-3.1.0.ebuild 982 BLAKE2B 24b4b7bdbc57fb3f15c6f45ea0b9183d5645a8617493ccd027e006b8e85528e253510e046f5dd85ca9106f689d856983dca5ef480890b9ff46613c691a5c31e9 SHA512 8730ae6ce93a3a09574531acfa1029d649c26353aa45da6d25426db93cdcad94df87f0f18ae0fdecc304d6619d2b385d6d3423240356fde7cfd7bac120fc3e36 -EBUILD fuse-3.1.1.ebuild 1032 BLAKE2B 5c92d5b322cdab834ae638e0b2b01fa5c5207eda44b0c24288f4b916422441610827eb3a8f02afab1ac097622b8cb6e4d8a8bc618f7075ab7d5575daeffc6a19 SHA512 4fc85ec2409032548ecc680c851604bdafd9e07a42419800004f04dbd64a7d6604325af8e35716e389194e1d6a97b350ae4b82efb6597232244471570f18790f +EBUILD fuse-3.2.1.ebuild 1652 BLAKE2B 6678f6541c55f65d2fd821fac6451370be6e339b97216e723c75055e5ffddd2c394e906b95452c201a305a84f01373ffce5715e5b82dbeaa7f88b642e7af8b3b SHA512 5022ff659e451f6c1a391e5553075bd706dbd214822c090d3caf7c353fdaaf93663fbe2c3650e4a0a25e0ee27c92c6a4292a52c8d345b328f13ce473fb7478e8 MISC metadata.xml 391 BLAKE2B 69aa72b5ba983496e0b682bcde7d61b33d982031e1c5ca1f4b0181384daeff3a47482fc23e68ae9097321dfa5a0203abc60de4fae5aa99c7e32542e9b8e59f0a SHA512 181d574140e8459c76d7392cf63eec85e1b40142b31b9ac1a19bf657c8482b581c1ea23fdae6a523bbad4943e3245409dfc14eea38243b78ef541e3cad49a180 diff --git a/sys-fs/fuse/fuse-3.0.0_rc3.ebuild b/sys-fs/fuse/fuse-2.9.7-r1.ebuild index 43bf6fd1bdd8..b27dc23c1413 100644 --- a/sys-fs/fuse/fuse-3.0.0_rc3.ebuild +++ b/sys-fs/fuse/fuse-2.9.7-r1.ebuild @@ -1,24 +1,21 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils libtool linux-info udev toolchain-funcs - -MY_P=${P/_/} +inherit ltprune libtool linux-info udev toolchain-funcs DESCRIPTION="An interface for filesystems implemented in userspace" HOMEPAGE="https://github.com/libfuse/libfuse" -SRC_URI="https://github.com/libfuse/libfuse/releases/download/${MY_P}/${MY_P}.tar.gz" +SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" IUSE="examples kernel_linux kernel_FreeBSD static-libs" PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )" DEPEND="virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} +RDEPEND="sys-fs/fuse-common" pkg_setup() { if use kernel_linux ; then @@ -32,6 +29,7 @@ pkg_setup() { } src_prepare() { + local PATCHES=( "${FILESDIR}"/${PN}-2.9.3-kernel-types.patch ) # sandbox violation with mtab writability wrt #438250 # don't sed configure.in without eautoreconf because of maintainer mode sed -i 's:umount --fake:true --fake:' configure || die @@ -50,7 +48,7 @@ src_configure() { } src_install() { - local DOCS=( AUTHORS README.md doc/README.NFS doc/kernel.txt ) + local DOCS=( AUTHORS ChangeLog README.md README.NFS NEWS doc/how-fuse-works doc/kernel.txt ) default if use examples ; then @@ -58,29 +56,18 @@ src_install() { dodoc example/* fi - if use kernel_linux ; then - newinitd "${FILESDIR}"/fuse.init fuse - elif use kernel_FreeBSD ; then + if use kernel_FreeBSD ; then insinto /usr/include/fuse doins include/fuse_kernel.h - newinitd "${FILESDIR}"/fuse-fbsd.init fuse - else - die "We don't know what init code install for your kernel, please file a bug." fi prune_libtool_files - rm -rf "${D}"/dev - dodir /etc - cat > "${ED}"/etc/fuse.conf <<-EOF - # Set the maximum number of FUSE mounts allowed to non-root users. - # The default is 1000. - # - #mount_max = 1000 + # installed via fuse-common + rm -r "${ED%/}"/{etc,$(get_udevdir)} || die + rm "${ED%/}"/usr/share/man/man8/mount.fuse.* || die + rm "${ED%/}"/sbin/mount.fuse || die - # Allow non-root users to specify the 'allow_other' or 'allow_root' - # mount options. - # - #user_allow_other - EOF + # handled by the device manager + rm -r "${ED%/}"/dev || die } diff --git a/sys-fs/fuse/fuse-3.1.0.ebuild b/sys-fs/fuse/fuse-3.1.0.ebuild deleted file mode 100644 index ac994543f9a4..000000000000 --- a/sys-fs/fuse/fuse-3.1.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit meson multilib-minimal - -DESCRIPTION="An interface for filesystems implemented in userspace" -HOMEPAGE="https://github.com/libfuse/libfuse" -SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="3" -#KEYWORDS="~amd64" -RESTRICT="test" - -DOCS=( AUTHORS README.md doc/README.NFS doc/kernel.txt ) - -src_prepare() { - default - # passthough_ll is broken on systems with 32-bit pointers - cat /dev/null > example/meson.build || die -} - -multilib_src_configure() { - meson_src_configure -} - -multilib_src_compile() { - eninja -} - -multilib_src_install() { - DESTDIR="${D}" eninja install -} - -multilib_src_install_all() { - default - rm "${ED%/}"/dev/fuse || die - rmdir "${ED%/}"/dev || die - rm "${ED%/}"/etc/init.d/fuse3 || die - rmdir "${ED%/}"/etc{/init.d,} || die - mv "${ED%/}"/usr/share/man/man8/mount.fuse{,3}.8.gz || die -} diff --git a/sys-fs/fuse/fuse-3.1.1.ebuild b/sys-fs/fuse/fuse-3.1.1.ebuild deleted file mode 100644 index f2e588be8b69..000000000000 --- a/sys-fs/fuse/fuse-3.1.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit meson multilib-minimal - -DESCRIPTION="An interface for filesystems implemented in userspace" -HOMEPAGE="https://github.com/libfuse/libfuse" -SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="3" -#KEYWORDS="~amd64" -RESTRICT="test" - -DEPEND=" - virtual/pkgconfig -" - -DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt ) - -src_prepare() { - default - # passthough_ll is broken on systems with 32-bit pointers - cat /dev/null > example/meson.build || die -} - -multilib_src_configure() { - meson_src_configure -} - -multilib_src_compile() { - eninja -} - -multilib_src_install() { - DESTDIR="${D}" eninja install -} - -multilib_src_install_all() { - einstalldocs - rm "${ED%/}"/dev/fuse || die - rmdir "${ED%/}"/dev || die - rm "${ED%/}"/etc/init.d/fuse3 || die - rmdir "${ED%/}"/etc{/init.d,} || die - mv "${ED%/}"/usr/share/man/man8/mount.fuse{,3}.8.gz || die -} diff --git a/sys-fs/fuse/fuse-3.2.1.ebuild b/sys-fs/fuse/fuse-3.2.1.ebuild new file mode 100644 index 000000000000..4012fc673b62 --- /dev/null +++ b/sys-fs/fuse/fuse-3.2.1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python3_{4,5,6} ) + +inherit meson multilib-minimal flag-o-matic udev python-any-r1 + +DESCRIPTION="An interface for filesystems implemented in userspace" +HOMEPAGE="https://github.com/libfuse/libfuse" +SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="3" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="test" + +DEPEND="virtual/pkgconfig + test? ( + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]') + )" +RDEPEND="sys-fs/fuse-common" + +DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt ) + +python_check_deps() { + has_version "dev-python/pytest[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + + # lto not supported yet -- https://github.com/libfuse/libfuse/issues/198 + filter-flags -flto* + + # passthough_ll is broken on systems with 32-bit pointers + cat /dev/null > example/meson.build || die +} + +multilib_src_configure() { + meson_src_configure +} + +multilib_src_compile() { + eninja +} + +multilib_src_test() { + ${EPYTHON} -m pytest test || die +} + +multilib_src_install() { + DESTDIR="${D}" eninja install +} + +multilib_src_install_all() { + einstalldocs + + # installed via fuse-common + rm -r "${ED%/}"/{etc,$(get_udevdir)} || die + rm "${ED%/}"/usr/sbin/mount.fuse3 || die + + # handled by the device manager + rm -r "${ED%/}"/dev || die + + # manually install man pages + rm -r "${ED%/}"/usr/share/man || die + doman doc/fusermount3.1 +} diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest index f621a4d94d3c..e221d099d7d9 100644 --- a/sys-fs/multipath-tools/Manifest +++ b/sys-fs/multipath-tools/Manifest @@ -3,12 +3,15 @@ AUX multipath-tools-0.5.0-systemd-pkgconfig.patch 1192 BLAKE2B 7d640f27a8b736abf AUX multipath-tools-0.6.2-ignore-modprobe-failures.patch 831 BLAKE2B e30f06a67f8e5f00156f35abf4c60dec71f5b3f8487b8a6822a0a5eae32f6b034fd2be98da34aad085db933a0cef592d0056075819a9e8985a8aab7b3743cfd4 SHA512 62e40c6577bc7cd24f3283de94692cc7550d39a9caa255ca5d77c2d3c324a85c0364fca73b154f17197cf38b82b171eae759f9eb1ecf8ab5801afafd42b1b156 AUX multipath-tools-0.6.4-sysmacros.patch 1554 BLAKE2B d293a6a72fbf0480c711af66b8bbb78da3584270c766cbcdd096bbd46b2f34170a68c459c5cc9b4d472359a80aeb108498209ac926623eb09277af18a5ff1170 SHA512 1f6c862e0fc73859b670d2917b2e0d63731714edb07098929dbd46e7cc61f9d354f30558034993c8e719de103d4b37c16a34483236a040db28a983416772634e AUX multipath-tools-0.7.4-respect-flags.patch 599 BLAKE2B dc4469f96eaff9327125ba40cda675cc608724c9eb0e31ec12134ade4a4e07e3f390454c9a31093e6656ab8790230d99f1ad383960c80515acae668f323f1d5b SHA512 739b09000ac32f386e74f45b6dde268444c250d03dceddafe27fe1c919c43de92f01ad79dbcd9fb495e485d7557b726bd9596f58b4367fa29b8762d35c570428 +AUX multipath-tools-0.7.5-respect-flags.patch 660 BLAKE2B 1efc793d9741b1a732895cbd7cfb4fbf04026db24f834a5bec25c33413132b39e0afe46f8851a6dfd6bd05fe88bfc15fd8cc24f03df435f75c209c401bd68b6a SHA512 58a44988a5c9a82affa3fdc969eaac87b5672a743434f2c8cab269b0b526f1c150bc10655bccccc1e8a26e3237350d4824b0497bb29c925cd42a084f84268fcf AUX multipath.rc 565 BLAKE2B efb26199eddb75c5e87d1ab40aa8cb4fbaf9f7a2bfd7a20add6d55997d25de9a3dbf0d032c977593c2ee8d447539a34be0294ee3a80a80fb004dc2c51c8c64b5 SHA512 f08833fc3c928900f8c29438208b9715581bae426b1f45c246e8c418b210f7f9d35517ef9ad44db3d88944183b34e3411ece909b56892a9f3b7250fed49e43fe AUX rc-multipathd 402 BLAKE2B c44befc14ff361d27278bd7850aada4fb8e309c0459d9d1bdb3ca1a670929b2d8b40275c73cd937ab3245b95460b3e9e12ecf199532ec916e1cf5f3e634d3bbb SHA512 466296ff69c0f56c312a8b88445ca0719c8c6b794511f7e228812d63b859bd120b965301c8923e3411a3e1b196e7fb9c48dd7dbe004efe4c65ee7f9798cc3e11 DIST multipath-tools-0.5.0.tar.bz2 184024 BLAKE2B 1e1b0fdd52bf0aaea3ed281e0cd89d04aed58c03b9b42ac094173bebdf3b81e368d0c7efb23a8748d4598c99d1502fdf5f8b2c9b64a2be4ce7d6b30fa607984a SHA512 dfad21c45d0f69e39041d30d203a582c8ee8329bf390c51cde10155b3de379e7ad8fead2ac4beb268a924fd7e7dc8e1cf538ea3c70d41479fd8786fa30ba22a9 DIST multipath-tools-0.6.4.tar.gz 285448 BLAKE2B 1b63c4e712e682965c595ed988a6590e181abd4d37779b72b52f4e415d4caba33df518a1ea1e3b460d15b5a78f4db5a75c1066439eb40c503023007c1f70752a SHA512 ec35c6c26c3b233ebece7136ea99dd4c0dff2927e7b543e7091219dc7065fe87e609a1eda9ab6d08399d44fe882d70c8dbe6be9ab175d154c5dd2d12ee1d86ea DIST multipath-tools-0.7.4.tar.gz 350361 BLAKE2B a55a5912f040913b2db8a6fe28727dd52fd4be9ceb8544f1b45384e12112775caa6159da3ce774dd529377796a2b9033490ee655f3caac864919708bdc5070ec SHA512 0a00b79920251b685265ab731e5418538f32d6392b101082c71a6c7345ef7d008bcdcf466ee1317e8bf658d0fb01fc9a2e4ec6658fc565129c1bb5949ac91254 +DIST multipath-tools-0.7.5.tar.gz 367762 BLAKE2B de24d3d2b3b06638ba05465125422032044a779e8aa10d6c3aa62d2d4b12c9061c4ede7f03185ea9acb68a6f25d263362416c90076e8c1c1aa3ef8db3045fbdc SHA512 4808d0cea08558ba6c24ee4d12e1caf67603b124044e5c38a10471fb52b0e3ed898c4ca0f1ec01373fc316cd999277da47698968db2b352890c002bbf9e76746 EBUILD multipath-tools-0.5.0-r1.ebuild 1728 BLAKE2B dd525f001463684fe5cb6ccbb112a658bcf02fcf94d672c44b3a9330bd275809486bbd3bd10e35a19185837b1bff349cfe037054e8e4d9fab5f87e7677e1a98c SHA512 e1de58801f4e2b71b44a4d60d385bd2067aa172841a90c078a5f6dc608999bfcd23059cbc730e18c910a7606bc44bfd9524a2e466b49ff38b90cfaac143def86 EBUILD multipath-tools-0.6.4-r1.ebuild 2533 BLAKE2B 5af1de5f156e9274f503e554bccd362e16d138ae52dae6984a5381377e3f4501682602dbd98987c817f8d00007a10d3ec7642a510f52d5582f6b6b5858b4d6e7 SHA512 d25c82d35f79567cb0ff05282743db33b62aa0540e60ae4e0dff6601273dea21d115fa69856ac976a1ec1ea43574a289155d15555123b8d39547e2832e763269 EBUILD multipath-tools-0.7.4.ebuild 2253 BLAKE2B 0cf74d33ac951fbf2f906d35d9ab707320141d33977207a12f264a779011ea9c3b20bee7a02d4a43af42b6f87d228ffd2166f02fa99fd88cc2f563d33fff096d SHA512 72e5403c0c3869074b50d5d00d956b2582fcc297c1bc02cd61f3a2bc9ca57d228cd993499537d0b28d48ec712a43075bfb5e2033058ba71c3ed312572b08f0ab +EBUILD multipath-tools-0.7.5.ebuild 2056 BLAKE2B d70ce245c7e4f2db669631414b7536402bd4844df5f583eaf5f320a6ea3cc2893b3aab16920e4afc946bcc1e379af78dbcb25d09bac91d6e829eb32fdb141d16 SHA512 e2c4c8c0a86fdb53dd79c492d3196b67bfb5c57c2ab1c14097b417bc07ab14b7c12a038f0b6b6967d1a8c57224792854fb18a8866e4b23f824842ef9b46e51ec MISC metadata.xml 364 BLAKE2B d1d285f68ff773055f374ad7f6790708b7fed62a0d9787aff638c6ced762ff34d62a94a90d79426dbf4a81d86cf2447f41947d7650d3f1bc366a9d3338af94ce SHA512 91654145796f3e879d14dc7aab2261099dc0e2cb44e7563bf3c006893b81aa0f84fdd52870aaf317197b87e6c4d9e1341e456daeb2f3b40c926bdaf31c797134 diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.7.5-respect-flags.patch b/sys-fs/multipath-tools/files/multipath-tools-0.7.5-respect-flags.patch new file mode 100644 index 000000000000..fef55ce31e91 --- /dev/null +++ b/sys-fs/multipath-tools/files/multipath-tools-0.7.5-respect-flags.patch @@ -0,0 +1,19 @@ +--- multipath-tools-0.7.5/Makefile.inc ++++ multipath-tools-0.7.5/Makefile.inc +@@ -91,12 +91,13 @@ + -Wp,-D_FORTIFY_SOURCE=2 $(STACKPROT) \ + --param=ssp-buffer-size=4 + +-CFLAGS := $(OPTFLAGS) -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \ +- -MMD -MP $(CFLAGS) ++CFLAGS ?= $(OPTFLAGS) ++CFLAGS += -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \ ++ -MMD -MP + BIN_CFLAGS = -fPIE -DPIE + LIB_CFLAGS = -fPIC + SHARED_FLAGS = -shared +-LDFLAGS = -Wl,-z,relro -Wl,-z,now ++LDFLAGS += -Wl,-z,relro -Wl,-z,now + BIN_LDFLAGS = -pie + + # Check whether a function with name $1 has been declared in header file $2. diff --git a/sys-fs/multipath-tools/multipath-tools-0.7.5.ebuild b/sys-fs/multipath-tools/multipath-tools-0.7.5.ebuild new file mode 100644 index 000000000000..60962fedf534 --- /dev/null +++ b/sys-fs/multipath-tools/multipath-tools-0.7.5.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs + +DESCRIPTION="Device mapper target autoconfig" +HOMEPAGE="http://christophe.varoqui.free.fr/" +SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="systemd rbd" + +RDEPEND=" + dev-libs/json-c:= + dev-libs/libaio + dev-libs/userspace-rcu + >=sys-fs/lvm2-2.02.45 + >=virtual/udev-171 + sys-libs/readline:0= + rbd? ( sys-cluster/ceph ) + systemd? ( sys-apps/systemd ) +" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" + +CONFIG_CHECK="~DM_MULTIPATH" + +RESTRICT="test" + +PATCHES=( "${FILESDIR}"/${PN}-0.7.5-respect-flags.patch ) + +get_systemd_pv() { + use systemd && \ + $(tc-getPKG_CONFIG) --modversion systemd +} + +pkg_pretend() { + linux-info_pkg_setup +} + +pkg_setup() { + linux-info_pkg_setup +} + +src_prepare() { + default + + # The upstream lacks any way to configure the build at present + # and ceph is a huge dependency, so we're using sed to make it + # optional until the upstream has a proper configure system + if ! use rbd ; then + sed \ + -e "s/libcheckrbd.so/# libcheckrbd.so/" \ + -e "s/-lrados//" \ + -i libmultipath/checkers/Makefile \ + || die + fi +} + +src_compile() { + # LIBDM_API_FLUSH involves grepping files in /usr/include, + # so force the test to go the way we want #411337. + emake \ + CC="$(tc-getCC)" \ + LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)" +} + +src_install() { + dodir /sbin /usr/share/man/man{5,8} + emake \ + DESTDIR="${D}" \ + SYSTEMD=$(get_systemd_pv) \ + unitdir="$(systemd_get_systemunitdir)" \ + libudevdir='${prefix}'/"$(get_udevdir)" \ + install + + newinitd "${FILESDIR}"/rc-multipathd multipathd + newinitd "${FILESDIR}"/multipath.rc multipath + + einstalldocs +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "If you need multipath on your system, you must" + elog "add 'multipath' into your boot runlevel!" + fi +} diff --git a/sys-fs/owfs/Manifest b/sys-fs/owfs/Manifest index cb74a4878df0..40504cb01d81 100644 --- a/sys-fs/owfs/Manifest +++ b/sys-fs/owfs/Manifest @@ -9,5 +9,7 @@ AUX owhttpd.initd-r1 820 BLAKE2B 4122ce01036f63083286162f33d576e2a953e7bff7e2150 AUX owserver.confd 108 BLAKE2B 3279ee61b42a9573472657e4297a7988668c081cd66d0f64d53cbd2eb27248abfebd6c368d77a5a3eb84ccd95b41ce65c2f03e3cb8ee1f095e4b776b60e3283a SHA512 c10fb23a60d89348c82f6f5ee6b0ba1c5d59e506dcdf484fa0c9c8c6ae07064cafc39517670b5edb474bcc1921efddfce2e5dd879f59f3bb3a1f80d6df3c0411 AUX owserver.initd-r1 802 BLAKE2B 8273790945eb4df7b8aadf7d19ac3397152d225495dba7e5e8a472ad7420f2e9e97ba35ec5e7655e0e5b3c37ed97ac740dbda8d1ae030dc9b75ba2bbf1dbf391 SHA512 3c2d186df7c3d4549333f90a87c80a44dd8ed67b10bacdc08edce2b45db35bd0bc7f0956bdee8f03a388ae8a5bab039f7bb19e3bad007632608f945c7e54c649 DIST owfs-3.1p4.tar.gz 1455420 BLAKE2B 58a0356d0abffd1bda3585a8e05faed0cf80c3818f33ea9ac32c7930ba37c06addb42c3326eadfd662016d6a15a0c5238a4e7bbf0fe6580d35e10f15bf44efad SHA512 9d04b466fc64761f53dc5fb11b4eb71d10154be5eb335174e8a9002a944bb3f2fbfe1cea3cf5962aa794486830e78d7ba5a7a87c68e3a4d32ab1a95e7ca59cdb -EBUILD owfs-3.1_p4.ebuild 4647 BLAKE2B d7e25bce2011bb222d173303d4b14a6c9c1d6b899c3e23b17c1fe79b98333a4862eb4796e3f600e438c8e6eff2c2e812ddfab3eb091e38a2244cb99971836262 SHA512 1f47dccc49ffab0f6bbeb130fb55ea0c1a8af835f812cc0eeadbae5d812179882e183ca524a288693b8f62539f1b12e48e9ab7fe8d9d862cfebf6abe62c25bd0 +DIST owfs-3.2p2.tar.gz 1491195 BLAKE2B 3e56b954fc61e097d6e39345d689d3ba5386f2ed4383bb7755da6a867d802fe56b9e920fe9b4f24cdd639543bad79a6d13bd549e7ce81afb8eab52372864565a SHA512 d64078639ce4c1c5c42735c720cfa6741a34b91297500d6a7cff6e48a0a87b6391e43fc0c5f6bf44cec27feffb9a2f9b5510e085c602666a5adf803bb8ba3338 +EBUILD owfs-3.1_p4-r1.ebuild 4757 BLAKE2B 7b0bdec4f19c2abada54f6ed210895ca426a61d4aa8b994f1cf17b69f14521fb484a36d99b70868efc49828f4d7ec0187796cb6757448f94fddc48a9ca6ecab4 SHA512 6ad887858e45a066e277f49f4ff2a48244f702a965bf0d5862a9a7a54d3bf9614f705efe005627862a84aae8d139a6d0ad1b1e42e8ba61bddc426f81db6b5f47 +EBUILD owfs-3.2_p2-r1.ebuild 4761 BLAKE2B 89dd1f022fabdcb7a87d16b3bc9b296006f1d24f1f44623b46b20c2ecf6206a3fdf12339d7476a919611837323fd02c89353cc7e4f04b6276baf2cf9ebe9854f SHA512 0deff6a1cb75beb10f7c987fc0cfce7d662b28c209f121f96e4e6dd84c4f414f10c996f31f86078fd33ec133bbfeab35bee7129e637c7c40350d4c1a20904465 MISC metadata.xml 1159 BLAKE2B 6a55584f7bf0ae7b11441169d59f53138a2e82a3ac38a53b9ab77c8a4e6baf5c268864e7f6897eb2fd9b35888f8373a6756b8760d894c5f4aeaae394f8cb3706 SHA512 4cff718d367711e5a99891caa7c19db9f50d885200841096f17ec3ee64cd01d3938fa34d1f2c5e6de575dd3cb36c5ea4f3625fa604b11cfdebe13362ea37cefe diff --git a/sys-fs/owfs/owfs-3.1_p4.ebuild b/sys-fs/owfs/owfs-3.1_p4-r1.ebuild index 50af8d0e122f..51598eaeb803 100644 --- a/sys-fs/owfs/owfs-3.1_p4.ebuild +++ b/sys-fs/owfs/owfs-3.1_p4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,12 +15,13 @@ SRC_URI="mirror://sourceforge/owfs/${MY_P}.tar.gz" HOMEPAGE="http://owfs.org/ https://sourceforge.net/projects/owfs/" KEYWORDS="amd64 arm x86" -SLOT="0/4.0.0" +# Upstream uses crazy SONAME, https://github.com/owfs/owfs/commit/c696fa9b9b44f49c96b9f1c2b3159d277e0c1273 +SLOT="0/${PV}" LICENSE="GPL-2" RDEPEND=" ftdi? ( dev-embedded/libftdi:0 ) - fuse? ( sys-fs/fuse ) + fuse? ( sys-fs/fuse:0= ) perl? ( dev-lang/perl:= ) parport? ( sys-kernel/linux-headers ) php? ( dev-lang/php:=[cli] ) diff --git a/sys-fs/owfs/owfs-3.2_p2-r1.ebuild b/sys-fs/owfs/owfs-3.2_p2-r1.ebuild new file mode 100644 index 000000000000..c795ca7df493 --- /dev/null +++ b/sys-fs/owfs/owfs-3.2_p2-r1.ebuild @@ -0,0 +1,191 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) +DISTUTILS_OPTIONAL=1 + +inherit autotools distutils-r1 ltprune linux-info perl-functions systemd user + +MY_P=${P/_/} + +DESCRIPTION="Access 1-Wire devices like a filesystem" +SRC_URI="mirror://sourceforge/owfs/${MY_P}.tar.gz" +HOMEPAGE="http://owfs.org/ https://sourceforge.net/projects/owfs/" + +KEYWORDS="~amd64 ~arm ~x86" +# Upstream uses crazy SONAME, https://github.com/owfs/owfs/commit/c696fa9b9b44f49c96b9f1c2b3159d277e0c1273 +SLOT="0/${PV}" +LICENSE="GPL-2" + +RDEPEND=" + ftdi? ( dev-embedded/libftdi:0 ) + fuse? ( sys-fs/fuse:0= ) + perl? ( dev-lang/perl:= ) + parport? ( sys-kernel/linux-headers ) + php? ( dev-lang/php:=[cli] ) + python? ( ${PYTHON_DEPS} ) + tcl? ( dev-lang/tcl:0= ) + usb? ( virtual/libusb:0 ) + zeroconf? ( net-dns/avahi[mdnsresponder-compat] )" + +DEPEND="${RDEPEND} + perl? ( dev-lang/swig ) + php? ( dev-lang/swig ) + python? ( dev-lang/swig )" + +IUSE="debug ftdi ftpd fuse httpd parport perl php python tcl usb zeroconf" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +PATCHES=( + "${FILESDIR}"/${PN}-3.1-vendordir.patch + "${FILESDIR}"/${PN}-3.1p4-sysmacros.patch +) + +S=${WORKDIR}/${MY_P} + +OWUID=${OWUID:-owfs} +OWGID=${OWGID:-owfs} + +pkg_setup() { + if use kernel_linux; then + linux-info_pkg_setup + + if linux_config_exists; then + if ! linux_chkconfig_present W1; then + ewarn "CONFIG_W1 isn't set. You will not be able to use 1-wire bus on this system!" + fi + else + elog "Cannot find a linux kernel configuration. Continuing anyway." + fi + fi + + use perl && perl_set_version + + enewgroup ${OWGID} 150 + enewuser ${OWUID} 150 -1 -1 ${OWGID} +} + +src_prepare() { + default + + # Support user's CFLAGS and LDFLAGS. + sed -i "s/@CPPFLAGS@/@CPPFLAGS@ ${CFLAGS}/" \ + module/swig/perl5/OW/Makefile.linux.in || die + sed -i "s/@LIBS@/@LIBS@ ${LDFLAGS}/" \ + module/swig/perl5/OW/Makefile.linux.in || die + + eautoreconf +} + +src_configure() { + # disable owpython since we can build python anyway + # and without it, we don't have to fix the build ;) + local myeconf=( + $(use_enable debug) + $(use_enable fuse owfs) + $(use_enable ftdi) + $(use_enable ftpd owftpd) + $(use_enable httpd owhttpd) + $(use_enable parport) + $(use_enable perl owperl) + $(use_enable php owphp) + --disable-owpython + $(use_enable tcl owtcl) + $(use_enable zeroconf avahi) + $(use_enable zeroconf zero) + $(use_enable usb) + --with-systemdsystemunitdir=$(systemd_get_systemunitdir) + ) + + if use httpd || use ftpd || use fuse; then + myeconf+=( --enable-owserver ) + else + myeconf+=( --disable-owserver ) + fi + + econf ${myeconf[@]} +} + +src_compile() { + default + + if use python; then + local CFLAGS="${CFLAGS} -fno-strict-aliasing" + + pushd module/ownet/python > /dev/null || die + distutils-r1_src_compile + popd > /dev/null || die + + pushd module/swig/python > /dev/null || die + emake ow_wrap.c + distutils-r1_src_compile + popd > /dev/null || die + fi +} + +src_test() { :; } + +src_install() { + default + + if use httpd || use ftpd || use fuse; then + newinitd "${FILESDIR}"/owserver.initd-r1 owserver + newconfd "${FILESDIR}"/owserver.confd owserver + + for i in httpd ftpd; do + if use ${i}; then + newinitd "${FILESDIR}"/ow${i}.initd-r1 ow${i} + newconfd "${FILESDIR}"/ow${i}.confd ow${i} + fi + done + + if use fuse; then + dodir /var/lib/owfs + dodir /var/lib/owfs/mnt + newinitd "${FILESDIR}"/owfs.initd-r1 owfs + newconfd "${FILESDIR}"/owfs.confd owfs + fi + fi + + use perl && perl_delete_localpod + + if use python; then + pushd module/ownet/python > /dev/null || die + distutils-r1_src_install + popd > /dev/null || die + + pushd module/swig/python > /dev/null || die + distutils-r1_src_install + popd > /dev/null || die + fi + + prune_libtool_files +} + +pkg_postinst() { + if use httpd || use ftpd || use fuse; then + echo + if [[ ${OWUID} != root ]]; then + ewarn + ewarn "In order to allow the OWFS daemon user '${OWUID}' to read" + ewarn "from and/or write to a 1 wire bus controller device, make" + ewarn "sure the user has appropriate permission to access the" + ewarn "corresponding device node/path (e.g. /dev/ttyS0), for example" + ewarn "by adding the user to the group 'uucp' (for serial devices)" + ewarn "or 'usb' (for USB devices accessed via usbfs on /proc/bus/usb)," + ewarn "or install an appropriate UDEV rules (see http://owfs.org/index.php?page=udev-and-usb" + ewarn "for more information)." + ewarn + if use fuse; then + ewarn "In order to allow regular users to read from and/or write to" + ewarn "1 wire bus devices accessible via the owfs FUSE filesystem" + ewarn "client and its filesystem mountpoint, make sure the user is" + ewarn "a member of the group '${OWGID}'." + ewarn + fi + echo + fi + fi +} diff --git a/sys-fs/rar2fs/Manifest b/sys-fs/rar2fs/Manifest index 1ed3d0d36b20..b7457169c139 100644 --- a/sys-fs/rar2fs/Manifest +++ b/sys-fs/rar2fs/Manifest @@ -1,5 +1,3 @@ -DIST rar2fs-1.25.2.tar.gz 257550 BLAKE2B afb9562c1d4e0244bdc1aec8e84043e131969844528d6bc647683281737550c01e23238653126f3932d32c248b3b4e7d9077b5072423d28625f914ac33a4bddd SHA512 10fcf2db037bde467781ae4c9b0b1ee95422a9b80f4d3f4643c2660b0a17dcd041eb111330c345f8759adbad7ef864f8ba108a106117adabc836d782becf7bfe DIST rar2fs-1.26.0.tar.gz 258987 BLAKE2B ff1fbac1f6792f0423fffdfac789c9f7b7e56721f231590b85896e59e712628162e5c31ee6798b8e92001fe34157bb476811efd38f965897e02596d7740634b9 SHA512 f67ba9826eb3de9f6a82088a25c20393cec32fff3c51c1e6bec6b95dd9707fdbb56388639c160a487de687cfda18d7b4985462d22722fd7cc581066a24845d1f -EBUILD rar2fs-1.25.2.ebuild 637 BLAKE2B 0028e953cc48a9f51baaee3ee5dcd5c158be1c0a29b27b1369ff9b615205822cbf00c55baa289eb63a54d8ff410e3ba69fa678a7d1a05348a1ca208f696dba64 SHA512 b6c8dfa29dbd076e10258a064d7bb09a18f0de60403380aaf63f0ad957bb73ce925fcb3c789a262b62a1ab2c58c8b0b1d6847881087b91cc8a4ea7d0acb1b161 EBUILD rar2fs-1.26.0.ebuild 639 BLAKE2B 13f95a4c16febae0c97fe42528495c2451e51245c0477e473db95386ca356ba33a78540101c249f14952ad122b3a2db4e7981cdca581508d42ed279cefdb9ab3 SHA512 f3e58c2db1b63331eaaf2f4f155e149c78a1f09941f201217da3dd69c2cdfae4c5bbc4274abd263ed8b3d3f1571311ef61ed217df98dbaf857b7a1522716a220 MISC metadata.xml 325 BLAKE2B 64c8c579024bf3c2468fb6499f749f291d09eb3a2d408ce41520025df21e7f014e5ecc8b16a8225bd8b38f070c5d71f733292279eec426aa9c8ec2809bb2f9e6 SHA512 506c5eada02c3ecb80b891fe5c256eebd85e57d83a515eca336a82e362b0a1c9c6f96c15dc05eb88141ca3a445953ed1c2486fc924868071c50087ec3876cf26 diff --git a/sys-fs/rar2fs/rar2fs-1.25.2.ebuild b/sys-fs/rar2fs/rar2fs-1.25.2.ebuild deleted file mode 100644 index 05cc6b39d684..000000000000 --- a/sys-fs/rar2fs/rar2fs-1.25.2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A FUSE based filesystem that can mount one or multiple RAR archive(s)" -HOMEPAGE="https://hasse69.github.io/rar2fs/ https://github.com/hasse69/rar2fs" -SRC_URI="https://github.com/hasse69/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -RDEPEND=">=app-arch/unrar-5:= - sys-fs/fuse" -DEPEND="${RDEPEND}" - -src_configure() { - export USER_CFLAGS="${CFLAGS}" - - econf \ - --with-unrar=/usr/include/libunrar \ - --disable-static-unrar \ - $(use_enable debug) -} diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 593ba220c920..26010981e99c 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -16,7 +16,7 @@ EBUILD udev-225-r1.ebuild 13566 BLAKE2B 9aba88a7a7edcd0b2f63f590f84af713df2b2bbb EBUILD udev-233.ebuild 13034 BLAKE2B ab219baa2baa309e5b0598bbc1fc9a11d8dfb110e100dc8bf9e63c894df62c217a4ebaf9c2a28d67ce0f61d90c64fe476c3c5c4ba25b52decef9d47d4d72001a SHA512 6382221804b758022770ef3643720bd6780722790d408506fc4357132dc052e2061180ccef904da59302c464d9383de305b01f47835fef33dea5869f75a54d8a EBUILD udev-234-r1.ebuild 9990 BLAKE2B 8759bf272f1f7d2e03692049c11d9cbf106e0169c36b5125f8bf342af00133c70c5ecf88bf10bd1edfecddbc3c5075c7149903d5211c956277d7920191275688 SHA512 347f2941145237bc9732ad94074e5a6be432b15466ef2af4f82110a9314dbd9c6d69d391d8181ca66e9b13998466d9a609d03886e5afb5e250ad0323aaa65ec9 EBUILD udev-235.ebuild 9988 BLAKE2B 275ed1ba897951832d3bcd566aed8c3762002736444fcd808b71c11cdadb194ab59da7df31af42092f474eeba2ae47f87cf8d68ed1c09117990c0bdfeda7fbaf SHA512 8a6fc0f42ccba3f0cbf808d1bf4c2d725347781f156fb36fe39057573f35e8d2a5c01fc091e2a5fc2a9a49ba78b4c86f6fec164ffd4d9d153092c3dfdc46c76f -EBUILD udev-236-r1.ebuild 10185 BLAKE2B 461b607a9672056701d0ac69849168c4363fbc635d2e200426a2f796a1f52bb41a8eb25edce4200a4506359181bfaf7114d8cdbdf53272216c5475d69986de72 SHA512 0ed2e5937152dfc8ee216471bdaa1f409aba394a64b23dec433de69908b14fabfa0c3ae0e01d0e6be6ccc2104067fa0a02eb2d44e9cd84ded72f75ab91441510 +EBUILD udev-236-r1.ebuild 10183 BLAKE2B a2830dae74165b5d7e86cbf60de0c9e621ec0606369661d911ccceaaf2c794ada11aca457ae83cca388957f6fbf03604fee0fab3e74f4c6a3f8cfedc0f9ea115 SHA512 c304ab971260823bf409563f695ddf943af68b4746f67384281ff9ffcf5d5c9205a11db859964c15956ac1b42d0f64775f4f87006710586b149c0f0a501eee28 EBUILD udev-237.ebuild 9737 BLAKE2B 0cb90c1e3f0fcc92a82d12191cbf4c69cbe2ca853e31dda0fc904f40d7ea8b5d9ad25ed6c43c1177a7d80d2b018d800fcbac5d2fdd2b6f33fa3d015f782297e8 SHA512 d03d4fc06b24964ac7cb6de2f5847f22566605934788e612fe186cac76660947e75a7f23d2000929fe061af75878d423c52776846fa9c3e4b49ea4f10c35fcd4 EBUILD udev-238.ebuild 9737 BLAKE2B 0cb90c1e3f0fcc92a82d12191cbf4c69cbe2ca853e31dda0fc904f40d7ea8b5d9ad25ed6c43c1177a7d80d2b018d800fcbac5d2fdd2b6f33fa3d015f782297e8 SHA512 d03d4fc06b24964ac7cb6de2f5847f22566605934788e612fe186cac76660947e75a7f23d2000929fe061af75878d423c52776846fa9c3e4b49ea4f10c35fcd4 EBUILD udev-9999.ebuild 9737 BLAKE2B 0cb90c1e3f0fcc92a82d12191cbf4c69cbe2ca853e31dda0fc904f40d7ea8b5d9ad25ed6c43c1177a7d80d2b018d800fcbac5d2fdd2b6f33fa3d015f782297e8 SHA512 d03d4fc06b24964ac7cb6de2f5847f22566605934788e612fe186cac76660947e75a7f23d2000929fe061af75878d423c52776846fa9c3e4b49ea4f10c35fcd4 diff --git a/sys-fs/udev/udev-236-r1.ebuild b/sys-fs/udev/udev-236-r1.ebuild index 66809cbf4375..6817f1b99076 100644 --- a/sys-fs/udev/udev-236-r1.ebuild +++ b/sys-fs/udev/udev-236-r1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.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)" diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest index 6c1617db5a5d..f3e7efa54bd7 100644 --- a/sys-fs/xfsdump/Manifest +++ b/sys-fs/xfsdump/Manifest @@ -4,5 +4,5 @@ AUX xfsdump-3.1.6-linguas.patch 975 BLAKE2B c4a862aa55e3a473e4253433154e0e9a7032 DIST xfsdump-3.1.6.tar.gz 848698 BLAKE2B c87738640f2d5f424d8e8e9df50a75b2424c1f2741a47cd94f1e63d18b460946f1cb0ff362d2a00345db8fcc8e3518faa720e6495b138aaa51fe4e8d2d1bd24a SHA512 6d8eff10c65e0a0893525590953ccb7ec0095ba528725ffe3f18260e6cb8f66dd3945c60477500e84421a9ed57fae9e8f0f25c3c0900be3671f30ca6951ed5e7 DIST xfsdump-3.1.8.tar.xz 603304 BLAKE2B 8f923ca267f648e88e4e964bcafcfd3bfde0fdb4e6753a9c21bbb8a1ae0f63e868cdad3da4eed5e95ffda861278eaaad49758701384681f3b0a19b93e07a232d SHA512 84720c83627647c75b42c59d180bb31cbb6e064568bef18b73641cf821fa7d39e6f7e0df4a6c7ffd36fba63296ab88cb83f0effdb1f6aa98f4b593ca0e658e0b EBUILD xfsdump-3.1.6.ebuild 1440 BLAKE2B 21fd8b07fd5d0cf97f3ae7bcd44e1527dd8929adf68bbede0baa24bf62fcb7900804beefc3104d21e8844c3600b5d631841fa687cd283929dcd541663b069ff9 SHA512 6f9f3123abad6cc0cf066515020d662bc05097aa511bb9e1666855170dea275422ce096925c7ecc4196ae86472888f4245ed9af8c69b6e4bffd5fa1d3171c669 -EBUILD xfsdump-3.1.8.ebuild 1504 BLAKE2B 50c56bc38360c6efc382b9a3b7d64a761fdb97cf660fc6493c6a0868a290d97c1bf3020826bb9e341865228eff22a5d37d7007e8f071e3504c39ae0281063a1d SHA512 95291407f086a6f4fd264864c19944eb0edadb908ed40b0e7207a9ca985e6ea600b5449c182c2688391a05de6dd1e410bb7146782e22199a37c6031d205b6c18 +EBUILD xfsdump-3.1.8.ebuild 1500 BLAKE2B 1fa3d62b2fee1145fe2b7174760a783d3e00bfd05b924c5a5dae2f6a1cfc28deb339dc36a69ebb5ae00b570e27a030b13c0c769d4cc0facb34533afb47c9c549 SHA512 2230ec50ab5f4970497bceeceb607dbab7984a4e8fc1c5d030f242b1aea3ec658f52b13d2e4b131feb0e77dadb225f0f24a6187e5e045d5e11b5e02e341b5d2e MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-fs/xfsdump/xfsdump-3.1.8.ebuild b/sys-fs/xfsdump/xfsdump-3.1.8.ebuild index ce2ed0fab36f..d0d67db52778 100644 --- a/sys-fs/xfsdump/xfsdump-3.1.8.ebuild +++ b/sys-fs/xfsdump/xfsdump-3.1.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86" +KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ppc ppc64 -sparc ~x86" IUSE="ncurses nls" RDEPEND=" |