diff options
Diffstat (limited to 'app-misc')
22 files changed, 652 insertions, 27 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz Binary files differindex 2c82ced10662..4edb25733b34 100644 --- a/app-misc/Manifest.gz +++ b/app-misc/Manifest.gz diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest index 10a7ea3c1062..bdc4210c2893 100644 --- a/app-misc/anki/Manifest +++ b/app-misc/anki/Manifest @@ -2,5 +2,5 @@ AUX anki-2.1.0_beta25-web-folder.patch 498 BLAKE2B 5a89ac454e8b4c551c7593bc8d428 AUX anki-2.1.15-mpv-args.patch 856 BLAKE2B 02c80c096ee3971cb781ea57ba8ebd63037c37668d57bef8d63f7c551544cd1eec04d134a835af5c918992172493a3b2933b6652e6872da2fe6bd6acb1bf6886 SHA512 ed44a965978dcb2ce85eab99adff59610c51614673415c7e34d1acdc77fa46e05c6b5eba6a4c3fda07ef5b3d3d5d1c9d844276377daff2189cbdf808168dd402 AUX anki-2.1.15-unescape.patch 474 BLAKE2B f78067433039e22e335811dac2af3b8237a96f5d5025fe36cbea32d117d015fc1fab8f9ac806135e2ec910cdbd10131f731b8ea5fcdb5e88cd6dedbb8322bd8d SHA512 90e5123991120e696a94119413add54a205d87969b8b7f7167bd66d9ac12c6ad5f4ecba4692d7dddb4f8b47bb13aeea502e95a9be0cb72ca578531fde1473e1e DIST anki-2.1.15.tgz 4269571 BLAKE2B 00b351f5ffacb363642e02bf806bcd7c0d9446c9815a75328e7fa37c848b271b135510de17cc012e8cc96d8a52a183a49de84b6f85f562a370255bd36c6f866e SHA512 f3acfa6ff62d43fa461efddd81a8570304ada53b97bd494fdbbe0a0439700d7a52aa62ead31cbaed731be0df96a6cc845a7cf92dcf65f3080dc63282fe5941c3 -EBUILD anki-2.1.15-r1.ebuild 2434 BLAKE2B 5d45adb32028e79c0bdcd5b5e9b1f909fa905e136d6f2d177f340dcd7cc712dd69aaff18856b323687dc566d20fcd072d87948aecd4141885e0b16c27f25cdbe SHA512 48c92e9480908a8a0041bc78d12a0446010a7586d7d07e6bd25060764e85297124096aba3fce927a0977fa4aa96cf744fa14003a94ef3c1f868843ac577481d1 +EBUILD anki-2.1.15-r1.ebuild 2433 BLAKE2B 3fbdfccb2b39d8134def3bb0e45759cef4ddbb1b7307263ff3757fb4fa6db3315c2e689cdd1381b11869f528981609f0ab425ac9ed7f9eb6ffb8240a98754126 SHA512 8e92183ad886f3df03b53552201c933ce8db9dd14cae8cb990cc38e204ca143456ae4e9ad084e3c22faae24141f710ca2f9cb75c3688ca9f479f24f96447195e MISC metadata.xml 533 BLAKE2B 25491ed8623750ad197813d9504620f588e2df815a844711f057b544cde1e7622df46018ad32f994c689984dd301049caadf481d67737e94714f3fe57ba7863b SHA512 cc621ffca18afc64c6c1f758d919d950a39d5f447ae7740abe21f5b140fec8e2b8cbcfcfa4422fb5cf55f68c1068686344a8d9020e0aa477b3687ad84bbf9bf0 diff --git a/app-misc/anki/anki-2.1.15-r1.ebuild b/app-misc/anki/anki-2.1.15-r1.ebuild index b5fc94f7294f..4b1316fe462e 100644 --- a/app-misc/anki/anki-2.1.15-r1.ebuild +++ b/app-misc/anki/anki-2.1.15-r1.ebuild @@ -24,7 +24,7 @@ RDEPEND="${PYTHON_DEPS} >=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_USEDEP}] >=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}] >=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}] - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] + dev-python/beautifulsoup4[${PYTHON_USEDEP}] dev-python/decorator[${PYTHON_USEDEP}] dev-python/jsonschema[${PYTHON_USEDEP}] dev-python/markdown[${PYTHON_USEDEP}] diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest index 499161b54003..8c13f23e2784 100644 --- a/app-misc/mc/Manifest +++ b/app-misc/mc/Manifest @@ -5,6 +5,6 @@ DIST mc-4.8.26.tar.xz 2492612 BLAKE2B e13ab99fb7d5a9e2cf1149ad96d763681b0186fbf5 DIST mc-4.8.27.tar.xz 2510296 BLAKE2B efb0f3a8beb7285a793085a8e3b3a49619d0f8a4babff7de90f7a462cf6c013bbc08b92bc48e2c2e2204799332cd0160a86e201d9368cabde78e653b4306763f SHA512 c955d66cee06e3a0e0c795f2f6b98b184762363390a903cf8ef83dc5e98e6e94d5a9c06c4788d9ff4b3ae111541df8c7dc0b864a5c21c40421a81cd8690e9a69 EBUILD mc-4.8.26-r4.ebuild 3294 BLAKE2B d8757bd527ba26203b485b4fb0b84b0efb1d8bc5c43fef9306663d0082798c01ce9d4fd9ec07d7099657d0bc2f45af76dd939723e7c155bac151a7c5c8e59893 SHA512 4aa5ab667b8ba6a075eed3ecf862bc1cf1bfba3de5b741e2eb35e4cf4946aa4102d03482adefd8cdbc7928c9bd263c224b49e5f081ac11f7e37e3825467e6eab EBUILD mc-4.8.26-r5.ebuild 3559 BLAKE2B 2843b66d0604277dde030fceca6c4ace346cba7d73b777548fa96bf7cd4ee8c468c2eb0dfc678764b771e8ad06fa97e6db8c191cc3f05e2384470d4c39fd2654 SHA512 8aefcbaf20baeab318bffc5964e8c507ca3df8153f383cf8517401375d44188aa4b5037cccb02b76b9a46cfbcf00b51b7eaf10c96a02d016f6d4bd5b2c961859 -EBUILD mc-4.8.27.ebuild 3284 BLAKE2B 671e4d759aeeb0042ad4a09e873a0de89b54fb6b9b6885552fde005f32214dc795fae8e8c35cd68af57ce0595fd6eebec0f9b4ec3b45a48fa9d46cfd06d6374b SHA512 773b1954605592c3919c0105f9433d7988e27141029ff79c47e1b1da83319aa0618b1d8eeecdfcfa5351d2ebcf20935a9414b797bd946339561737f0e069851d +EBUILD mc-4.8.27.ebuild 3278 BLAKE2B b82237290f0e161da688ed8b2a35bd168ec42df78320452db4e8ee2ed5cb21bb8652affb84b1abaf31938d650bac57644342189600913a05ebfef1efc52db920 SHA512 47af2109cc65a2ec1b88492129a50c031b1dbb5df93fbb991eb7209a44f036baa253bdcb7f5c9ca07acc38dc075e077d27fcaa92755c46888985cee167a296bb EBUILD mc-9999.ebuild 3187 BLAKE2B e23cd19959a0708d24b5035e6af3df69fa8e345b403f6b8bb7b19d67ee2929e0bcf5148ab1c4a81962afe6db98a7b17733896a1e7bcc8a8485f9fa17950012d2 SHA512 5ae2b7579a5f05c56c39a5d3c568e1ddd1d2f3ceb0bf4a0c10203a10feeae7ecc76a597c8d16d654969bbf80c4f0789e3cfeed0893dc9b209ab5b7deef2a4f86 MISC metadata.xml 886 BLAKE2B 940640f07b9e76e2d2baced47b9ed9a699fad9fcbcd9583b5f78f1ea69f949a26f8f1b34f1de88e5faeeed523fe8b4486724d6f7884c3f186635753391d4d1a7 SHA512 a876eb2a3581ef4e44600c750fa54f7cb85d76ac1a83cbfa982b71313404c89d73dc876cb2d86cb53853ab1e404f93549bef4b4769de11d543cb118e4be8a15b diff --git a/app-misc/mc/mc-4.8.27.ebuild b/app-misc/mc/mc-4.8.27.ebuild index 2f152912e181..6911052874c7 100644 --- a/app-misc/mc/mc-4.8.27.ebuild +++ b/app-misc/mc/mc-4.8.27.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" IUSE="+edit gpm nls samba sftp +slang spell test unicode X" REQUIRED_USE="spell? ( edit )" diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest index 92a3c05cc035..2b830e21563e 100644 --- a/app-misc/mosquitto/Manifest +++ b/app-misc/mosquitto/Manifest @@ -3,6 +3,8 @@ AUX mosquitto 559 BLAKE2B 16a34850c13d9fd6007b5fbd26b4db9e31caa0ee91b8eee8dbca60 AUX mosquitto.service 261 BLAKE2B 6ea8059914acf8730f2e7d04bfd5f79c59a335b65ddecb4773bb4418260c6ed6d0120eaa2e3f7ba4842fc7014e5b51d1ba376cf1db2009b7a55a53a4e6747221 SHA512 3552618733fc106705375c5a1126db72e356694705312072f27f18e21c142cd75ae3ff1f17854ce54cdee092ff9e01fd75c1a8a12d68f75ead8a3697c69623e9 DIST mosquitto-1.6.15.tar.gz 620117 BLAKE2B 0107ed0af902b84c73b857ccd97dfe96b1c7ed8604b843ad40f62d3f1246ded4ef1691158311ac9a672ca331f569d13547165f3a0386c77e94ddc13c8a9e3e00 SHA512 30fa2e8a15b87a33d6c8fc3a1f5d45d8e15d284fade116ac5b7bc8722609d565bed22ac592c303fc74352e3272067b2b0c8da463abffc6490cf959ce177329f3 DIST mosquitto-2.0.11.tar.gz 760325 BLAKE2B adde701bb87ec8071eaaf74fca37f81c4eae97bf98de0fe471f1dfbfb64ccda15b34611b0ffc3d2099a37994151363ad5c717bfa7695fabc1a4927ebd14ae66e SHA512 d0c7c52cb76c4711e54f841217529326d682c4decfc7a1bc96d872904e68df444ca3918fab7ba041b62f7b5420c89c631227b69a8eec51fd2e2dd480d8244710 +DIST mosquitto-2.0.12.tar.gz 783859 BLAKE2B 3bac953fc7f49e19f1914186044c75d7f8b5b23e656acfb7d4c306740d0add20c08760fc206fc871c5cecf8500eb1c88acc4905bddce159d1e8f0c4e2c28b818 SHA512 acf80980f124073fd2fdd99981bde840654fb40a6b6f1d6ef483e35880b45d029cfa9390a98753de6476f4ade068266cb4c6e3c753a0362c0309a5745ac4ebab EBUILD mosquitto-1.6.15.ebuild 2828 BLAKE2B 6f7ebe1099d6a6a606bfebf85afec716951aaaff24a3a2e01d7edcdb2f7a4da15496f47aee5282aab37d6b6a663c980217f79aecffd056d4131a1878911c2f3e SHA512 d4bf9db26020f8bd1eb10c8be04fc7201a8afdbfb9e4c52c40d532aaae8e6b3fa3c3636e67631942d9aa02d75adb82314955aa544b5d33fb92b40d4646a87877 EBUILD mosquitto-2.0.11.ebuild 3245 BLAKE2B 2115f6c8466c39726a0cd09dd7c30df93844dd8535952d41735a9161c45039fe464eb7aad021449e805f6b4457ae49f699a55de25dd213aaa68647caee66aab0 SHA512 fc302efff796ef209f81a859a829cd0ef884c805db1943836c04082a91a6c98813e49f64b2b5961560caac31af1ba88679f62d0e004dc2f37cea35bf082c9928 +EBUILD mosquitto-2.0.12.ebuild 3003 BLAKE2B 03654ebea45e113f62551fc4ef87e37be000b98ce7654e5c97f661bb5d6167e1c02bcb8a86e9ddd20067bea94f4a34b519d1184f871bd531194a20d4355b4b84 SHA512 a32d732894e369a4cd7f169a327cd07f89a0bf0a5df93aa59c44d17e0ea746c1dffd431f80bc5868bffc92ca423c75e5cb2018d1360a1557d5a1e163226f5ee2 MISC metadata.xml 611 BLAKE2B d40adc8754f0c20b5c0634b75f12df935d246c67d3a9edccb8db262888b5dd6154fbfc21c270b854e61bb0389c625e3608623dcec519e05badc96f1bbdadf38f SHA512 93161a58861a9ea1ab372495fb66bb695d3be5e59dea96418aaf1f5fad936827d7d65a154711ef8c6c9fc752a69fef20c90741ac2627dfdefb8d38d63a3121fb diff --git a/app-misc/mosquitto/mosquitto-2.0.12.ebuild b/app-misc/mosquitto/mosquitto-2.0.12.ebuild new file mode 100644 index 000000000000..ca44457030aa --- /dev/null +++ b/app-misc/mosquitto/mosquitto-2.0.12.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{8..10} ) + +inherit python-any-r1 systemd toolchain-funcs + +DESCRIPTION="An Open Source MQTT v3 Broker" +HOMEPAGE="https://mosquitto.org/ https://github.com/eclipse/mosquitto" +SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz" + +LICENSE="EPL-1.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="bridge examples +persistence +srv ssl tcpd test websockets" +RESTRICT="!test? ( test )" + +REQUIRED_USE="test? ( bridge )" + +RDEPEND=" + acct-user/mosquitto + acct-group/mosquitto + dev-libs/cJSON:= + srv? ( net-dns/c-ares:= ) + ssl? ( + dev-libs/openssl:0= + ) + tcpd? ( sys-apps/tcp-wrappers )" + +DEPEND="${PYTHON_DEPS} + ${RDEPEND} + test? ( dev-util/cunit ) + websockets? ( net-libs/libwebsockets[lejp] )" + +_emake() { + local LIBDIR=$(get_libdir) + emake \ + CC="$(tc-getCC)" \ + CLIENT_LDFLAGS="${LDFLAGS}" \ + LIB_SUFFIX="${LIBDIR:3}" \ + WITH_BRIDGE="$(usex bridge)" \ + WITH_PERSISTENCE="$(usex persistence)" \ + WITH_SRV="$(usex srv)" \ + WITH_TLS="$(usex ssl)" \ + WITH_WEBSOCKETS="$(usex websockets)" \ + WITH_WRAP="$(usex tcpd)" \ + "$@" +} + +src_prepare() { + default + if use persistence; then + sed -i -e "/^#autosave_interval/s|^#||" \ + -e "s|^#persistence false$|persistence true|" \ + -e "/^#persistence_file/s|^#||" \ + -e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \ + mosquitto.conf || die + fi + + # Remove prestripping + sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\ + client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die + + # Remove failing tests + sed -i \ + -e '/01-connect-575314.py/d' \ + test/broker/Makefile || die + sed -i \ + -e '/02-subscribe-qos1-async2.test/d' \ + test/lib/Makefile || die + + # Extend test timeout to prevent spurious failures + sed -i -e 's/SUB_TIMEOUT=1/SUB_TIMEOUT=3/' \ + test/client/test.sh || die + + python_setup + python_fix_shebang test +} + +src_compile() { + _emake +} + +src_test() { + _emake test +} + +src_install() { + _emake DESTDIR="${D}" prefix=/usr install + keepdir /var/lib/mosquitto + fowners mosquitto:mosquitto /var/lib/mosquitto + dodoc README.md CONTRIBUTING.md ChangeLog.txt + doinitd "${FILESDIR}"/mosquitto + insinto /etc/mosquitto + doins mosquitto.conf + insinto /usr/share/mosquitto + doins misc/letsencrypt/mosquitto-copy.sh + systemd_dounit "${FILESDIR}/mosquitto.service" + + if use examples; then + docompress -x "/usr/share/doc/${PF}/examples" + dodoc -r examples + fi +} + +pkg_postinst() { + for v in ${REPLACING_VERSIONS}; do + if [[ $(ver_cut 1 "$v") -lt 2 ]]; then + elog + elog "Please read the migration guide at:" + elog "https://mosquitto.org/documentation/migrating-to-2-0/" + elog + elog "If you use Lets Encrypt TLS certificates, take note of" + elog "the changes required to run the daemon as the unprivileged" + elog "mosquitto user. The mosquitto-copy.sh script has been" + elog "installed to /usr/share/mosquitto/ for your convenience." + elog + fi + done +} diff --git a/app-misc/notary/Manifest b/app-misc/notary/Manifest index 6a4e299968ec..9520be75d520 100644 --- a/app-misc/notary/Manifest +++ b/app-misc/notary/Manifest @@ -2,6 +2,6 @@ AUX notary-server.confd 103 BLAKE2B 1f1a9f0e006bfd172218c40980a34314dffc1d06bc2a AUX notary-server.initd 568 BLAKE2B a38ceeadc4d3bd663dced340da3040b352081dce6d27f44afead3fb05a55e9c271fbcb75746201c494cbc6218feea9bca666831443e9fd765bfa6ba6f3f81f9c SHA512 97a4666a5bbb5345103a0b1a2a2f04e5f1e3546b253bcb23d1170ce3ee056ea0baf328d40db67b18116c5cc81a1dd03489cef2edfe94044f08366833e0262c5f AUX notary-signer.confd 103 BLAKE2B 461b38b6c8d97e7c8cedb88e48eca0342174434a819d99883496a9622fd04c19d097a498195c9e37246420f4f01fef07219bd4c9e76dc26cf8b70d9ce43ab1c7 SHA512 088bbd2eabf1e9be673b35a4a481c270ba2ccea479ef1164804ecead730a61465862888e7cbff53976056826d4ff066e1e2ab253cd6e3287109d03873c11777b AUX notary-signer.initd 568 BLAKE2B a0041a57049a1709ffb0906e4cef2e6cad32172c52bddc77917e7f6293a4deba79ae0d965db53fb537d66d91dc6b06230f91d14971c408f60182b350b6a672af SHA512 325614982f75f33a9fd59a6183255fa61158c4b2288f2d06e4d88c8f1f43dc5df83c85e8ecdf40cf19f9a00b51ba641fc024d863f220b6aac8e530e17e7eb3a2 -DIST notary-0.6.1.tar.gz 5741924 BLAKE2B 125e1e09178f090de9d73bb97170737d03c8f43927cf070a2c78e0c5eff3cd56a58aaf703a4ba60aa3e1bd7e22d2ceb0921abaa98e6f871ed1131249e44c622d SHA512 76e223c0c5c59796db924f0e52ea59d2bdbb101a9a059cd70d336928dcac616943d75fc9b8d7703de8609b2f694d2fc5627deb341971dc9401c00974261d57c3 -EBUILD notary-0.6.1-r2.ebuild 1638 BLAKE2B 1c8dcfb00ae808840cbf75499659c3c6855d4c2f84ab976694645008b4208fef84ce2aa26f6ebce6279c0c89b1e611dd4ed8b9130c237faad20000db5879a305 SHA512 535dfbf3a57f8f3e08f600d3badb02c4b3dd07e90713887bfc1f93ea5f597eac528c1fa77e9c5f999f62d94483bb02405147f132619b36ff13cc7c5cf8d71910 +DIST notary-0.7.0.tar.gz 7146025 BLAKE2B 2aafa82e27eb498d21d09781b54f9a40df57ba23fd4386b5d8fdc0eb09a74b761a1bc3c618ad2403b21e049c4dfb9e75281e949cc8f29474da6903d5fc06ede3 SHA512 8996f4d64fda5db54d460ae8168360fdde86986752b30255ab9cf9cf12d475f88d7ac4f2b0e15d6cb9ee8eff2709306fd0b3d38708ee41caa94862d795ca6a75 +EBUILD notary-0.7.0.ebuild 1023 BLAKE2B ddbce4a49463d9509242f2d439d3b04fc59054c22aca4b8e67d4a13593847bd1d6fb9892cc62604ebff3f6d0746b394623766aaa46e54be6a0875a01eb12e89c SHA512 53de0418d81c8a47d6a3085664b63ea6ab83d575963f7bee8b4db92e4f89b5003269895210bdd268a35543398a879008dcb9092b0eea06268731dfa1865c27a6 MISC metadata.xml 262 BLAKE2B 597c3ea2ec2e6106554e720aff9b70c04b0651ebf448d86468b07eef6e07112c3b66cb38296f0eb467e0442b81fcb0e72fc1ad0dcbef949cda8bf400db947649 SHA512 c7d1d7c1af64b0ed60d30a70bea37c9c60030744273c21aef968e5655cc118bcf3a43d3590ea0e162f4c97568c7483e3e86ce59de3673e451e66e62b177e060d diff --git a/app-misc/notary/notary-0.6.1-r2.ebuild b/app-misc/notary/notary-0.7.0.ebuild index 840f089bb574..141759da1bd1 100644 --- a/app-misc/notary/notary-0.6.1-r2.ebuild +++ b/app-misc/notary/notary-0.7.0.ebuild @@ -1,19 +1,17 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 +inherit go-module +GIT_COMMIT=b0b6bfdd -inherit golang-vcs-snapshot golang-build - -KEYWORDS="~amd64" DESCRIPTION="A project that allows anyone to have trust over arbitrary collections of data" -EGO_PN="github.com/theupdateframework/notary" -GIT_COMMIT="d6e1431feb32348e0650bf7551ac5cffd01d857b" - HOMEPAGE="https://github.com/theupdateframework/notary" -SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/theupdateframework/notary/archive/v${PV}.tar.gz -> ${P}.tar.gz" + LICENSE="Apache-2.0" SLOT="0" +KEYWORDS="~amd64" RDEPEND=" acct-group/notary @@ -22,19 +20,11 @@ RDEPEND=" BDEPEND="${RDEPEND}" src_compile() { - pushd src/${EGO_PN} || die - GOPATH=${S} go install -v -tags pkcs11 -ldflags "-w -X ${EGO_PN}/version.GitCommit=${GIT_COMMIT} -X ${EGO_PN}/version.NotaryVersion=${PV}" \ - ${EGO_PN}/cmd/notary-server || die - GOPATH=${S} go install -v -tags pkcs11 -ldflags "-w -X ${EGO_PN}/version.GitCommit=${GIT_COMMIT} -X ${EGO_PN}/version.NotaryVersion=${PV}" \ - ${EGO_PN}/cmd/notary-signer || die - GOPATH=${S} go install -v -tags pkcs11 -ldflags "-w -X ${EGO_PN}/version.GitCommit=${GIT_COMMIT} -X ${EGO_PN}/version.NotaryVersion=${PV}" \ - ${EGO_PN}/cmd/notary || die - popd || die + emake GITCOMMIT=${GIT_COMMIT} NOTARY_VERSION=${PV} binaries } src_install() { dobin bin/${PN}{,-server,-signer} - pushd src/${EGO_PN} || die insinto /var/lib/notary doins -r migrations fixtures fowners -R ${PN}:${PN} /var/lib/notary diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest index d2671013456a..72dfd38f7570 100644 --- a/app-misc/pax-utils/Manifest +++ b/app-misc/pax-utils/Manifest @@ -3,5 +3,5 @@ DIST pax-utils-1.3.2.tar.xz 725916 BLAKE2B ff792288b22c185501123d3e152ebae891585 DIST pax-utils-1.3.3.tar.xz 725900 BLAKE2B 17004a4fe57f05e80e0c51a156931975cbaf73e20d96fa50dedf6bd1538ff3f8383591f4b5fd0df926a6a6b75cb083724aaf92b1a4d4ebc67290500520919c29 SHA512 bb0d03371cf8f0cc26a83cbee888a6d91e70416dedc740476cd5549ddaef67048c6802e30e469ab1aced0fd7f63f84e9644744602b2d483ef7af37191505f72e EBUILD pax-utils-1.3.1.ebuild 1867 BLAKE2B 327542297176ddfbc3fbc6257f1d5c675ea78851d656f29812f2c153e4abfa8cb01c1b0e359dcfc3e8fe2ec0cb72ae89046fefff705775d220ca244602fcb6cb SHA512 ac2ff5161fbb3f7d6c5283f3f75c5f55ee6aded83b26101c326cf504f8ab8bc547be052eda326079b636441e85c69f0fd047fa8bf931dcad7a9f0016a137a347 EBUILD pax-utils-1.3.2.ebuild 1827 BLAKE2B 3df55178a78795994f8cf08b2928aee81457ad56f199c695c049982851fbc3fcd82eb6476c857d9416e7dc97be57cdc277ecda02b4e187cb16f92bfd2dcc2d46 SHA512 f0bb756f0ceab0c85b3fd7f1f2a32a08af7b0363abf14b0873ae74b54a78443acdf699290f82e09b549a97a70f730f3ad7147be9e95ed5d145de37d4ffc737f8 -EBUILD pax-utils-1.3.3.ebuild 1835 BLAKE2B aa715968e80f4e6f908a79c0d4223625e23ac386e02a4830b9a586a610d95e4e13a22cfb770ed1dba66acb194cc5286e1f706e0e7bf28872b175a17bcda0f2b4 SHA512 d98639b4eec3f3d5b3464de67317f5bd83fa62a4e8302030d4b86699602bb11ce61c9d4796268bcd26cd0b5fc7c55b718a493f322bf6dbb825300e9a870b162e +EBUILD pax-utils-1.3.3.ebuild 1993 BLAKE2B 91897bccf4bb5ce8501b0b8039d30a229854d4c349f74f0b4516458866bf2bff116c2ae88e92eaca706de043b9de80857f64f778a667b72dc99321ab6a157d4c SHA512 857b2521041407d382e56bf50e4a8216c9e9cdf422c1dc5057fffa95c9095ecfae61c1f81167c7cf249b3fd5031dd37cb6b3f76fea5cbbae4a361816e829013a MISC metadata.xml 677 BLAKE2B 22c40493c7f29ed8f77b7d5c00d37c70cdc9713c4873c083483513955ec02e2a1fcea7106354d01a31b961072353d4e735c43f8b9cb5f90870931ed387f8208a SHA512 039c93e2ef3ffbd085a67a90163d36eab812691679a644696ebd856b84e09301505dd726387b1c26b619cbc0f17f9608e62ce8f3c3c80273dfaab64ee29d1818 diff --git a/app-misc/pax-utils/pax-utils-1.3.3.ebuild b/app-misc/pax-utils/pax-utils-1.3.3.ebuild index 0a9b82a4936b..ddeb964024a8 100644 --- a/app-misc/pax-utils/pax-utils-1.3.3.ebuild +++ b/app-misc/pax-utils/pax-utils-1.3.3.ebuild @@ -3,6 +3,9 @@ EAPI="7" +# Note: if bumping pax-utils because of syscall changes in glibc, please +# revbump glibc and update the dependency in its ebuild for the affected +# versions. PYTHON_COMPAT=( python3_{8,9,10} ) inherit python-single-r1 toolchain-funcs diff --git a/app-misc/rmlint/Manifest b/app-misc/rmlint/Manifest new file mode 100644 index 000000000000..1dec79011834 --- /dev/null +++ b/app-misc/rmlint/Manifest @@ -0,0 +1,9 @@ +AUX rmlint-2.10.1-cflags.patch 626 BLAKE2B e34590b6cb83399444f6a29379f0c84f3d442ead5dfdcc542822d34da50f00eebcc6b2eb26bf627710b2b8ded428471f22d3bcfa9b2ac367362fcafe208b92e6 SHA512 644ae7ea5dfaefd78942f89d93937598c9ed6c8edc1ee1a342ff35f040e75d7e38e285ad5436ee33597604c6cb456f51624a6f8225c25a62ed727797633139d6 +AUX rmlint-2.10.1-fix-cc.patch 1619 BLAKE2B d0b7267d33e1fd906c6d914c1030e143e42b92d9f814c02b6476e1ccd23af20c810b02a2ddfe2d4b5e2f6e7b5a8a8fbc3225aeca56cb78bb84450e9dca07c925 SHA512 e83a90650e434cee31b889f238bee7c0905abd787931fb7752c82c17e927f840de83790e7258526836e14289c2aaa3dcfc94b2097c19e3ac3ab5ac41a6380951 +AUX rmlint-2.10.1-fix-tests.patch 4833 BLAKE2B 75b1e0a732c833f5684a0d6b3870d9f65d4eb62018728353f24e956be1b3fb12cd98f1cc385c398a8b7ad524b50059f04e9200fd1b07519ce5e4a8d042556dec SHA512 8ad1ac7c0812b0414935b49391152507ef043143a2d13d89d9be590b5eee9e42654869282d989c6ff26a5dc178e76e2b3157b1b3fae57ab6d64a3ff91c7f8b60 +AUX rmlint-2.10.1-scons.patch 3626 BLAKE2B cc9187d2b8926eb36071462d02a60f3a4b06de99ad97adf5b9dbb4bca3f9a42ccb8fd863ec9f78500acabdfe692d18c7141fb165c6c13661463b704117c308c6 SHA512 bf585930651101e3057547442527ad571c193a9e7bcff976544f16fd9bac75e0cc074bbf60bf31c1dd50538aa961a0143b46cd3feac6deec014b8689da048c85 +AUX rmlint-2.10.1-skip-tests.patch 1216 BLAKE2B 8fa9727f5146a26fbd91e8e6c4f8b903e432c386ca8f97b4591bd9244940bf94aa476dfb0390c332fe8fa7e777e31890046423cd88e47181f3a8f30e3fead4be SHA512 c66812da8860a714d1ae368039f95dd86d59b3ba6164fc9141f0c1c0ab6ab7c7245dcef9785a179dc437615cd5d9e8af1a1ee60354e99c02fd3c345fd2e91608 +AUX rmlint-2.10.1-x86-fix-size.patch 1092 BLAKE2B 2cd3e7e68d5252c89b84d1d78a17520e6c5f7b61f5d9bfc05bd25ea96b9057bb195c7afc6e61a8bac121ae749b5f84d28dc032be2d92bd6f5a2ab04f5b3cae9d SHA512 78a41f52aa1af9f9d63227b9a2100cf87806a442f07d153e83ccedf7110a14e4c7fec8c9a4fdf21284301927895a62eedaf666cbfe90092eb4ac41e68bf34c6e +DIST rmlint-2.10.1.tar.gz 2494474 BLAKE2B 40219ff64d54f0e2fc66a958c6ca51520152f77f9038e9756ab601da5180502528be7b2d750c85b5991c31db96c3eb7415841084b6c90db103dc212947864034 SHA512 a1281359798816dadaf3a1e706e671dc63edf8f7d176c114a924a1e03fc9ad6fa54d10de701b09b5e364a9a815e0d11bdbef3d16fb7fec74eb85af20a106db1a +EBUILD rmlint-2.10.1.ebuild 3012 BLAKE2B 99d24e732458443fe1404e5833b0d325e78f7028d4cda1b0038d1728bd70985543836a6464d3ebc07937a6217886b9207a0c13208072a69ad77ef9a2beb38307 SHA512 95a540af450450596496ff5c5a919310cc65c0f5fc098ce0d65a22f07f230317193003557938407b740cbbc525aef08b004436afcbdb06f49c8e592db1ac3210 +MISC metadata.xml 382 BLAKE2B 4a69af19c54000aea42affb0dd9e5a9430f3148aa3a218efe21313db83298d1ef7e684a053055e02542b25de6705a69d209ee6068cd4146ddffdab44ad5cb2ae SHA512 e115294dd4ef57b77b8acd3cde91345faf37413ceaa5d69a37a76fec0d755fbb9881c29b9435c5d37ef54c6a1665a3842d276cfce4be568c39f0e1baa1051f00 diff --git a/app-misc/rmlint/files/rmlint-2.10.1-cflags.patch b/app-misc/rmlint/files/rmlint-2.10.1-cflags.patch new file mode 100644 index 000000000000..6ddfd98d956a --- /dev/null +++ b/app-misc/rmlint/files/rmlint-2.10.1-cflags.patch @@ -0,0 +1,18 @@ +--- a/SConstruct ++++ b/SConstruct +@@ -724,7 +724,6 @@ if ARGUMENTS.get('DEBUG') == "1": + O_value = ARGUMENTS.get('O', O_DEBUG) + else: + conf.env.Append(CCFLAGS=['-DG_DISABLE_ASSERT', '-DNDEBUG']) +- conf.env.Append(LINKFLAGS=['-s']) + O_value = ARGUMENTS.get('O', O_RELEASE) + + if O_value == 'debug': +@@ -735,7 +734,6 @@ elif O_value == 'release': + cc_O_option = '-O' + O_value + + print("Using compiler optimisation {} (to change, run scons with O=[0|1|2|3|s|fast])".format(cc_O_option)) +-conf.env.Append(CCFLAGS=[cc_O_option]) + + if ARGUMENTS.get('SYMBOLS') == '1': + print("Compiling with debugging symbols") diff --git a/app-misc/rmlint/files/rmlint-2.10.1-fix-cc.patch b/app-misc/rmlint/files/rmlint-2.10.1-fix-cc.patch new file mode 100644 index 000000000000..78aac09ce2a7 --- /dev/null +++ b/app-misc/rmlint/files/rmlint-2.10.1-fix-cc.patch @@ -0,0 +1,40 @@ +commit 41056d132ae772b3c050020d68b7daa585e4143c +Author: Louis Sautier <sautier.louis@gmail.com> +Date: Thu Sep 9 13:29:37 2021 +0200 + + Never hardcode compiler, select it based on CC environment variable + +diff --git a/SConstruct b/SConstruct +index 7e12d413..20b080da 100755 +--- a/SConstruct ++++ b/SConstruct +@@ -37,8 +37,9 @@ Export('VERSION_MAJOR VERSION_MINOR VERSION_PATCH VERSION_NAME') + def check_gcc_version(context): + context.Message('Checking for GCC version... ') + ++ gcc = os.environ.get("CC", "gcc") + try: +- v = subprocess.check_output("printf '%s\n' __GNUC__ | gcc -E -P -", shell=True) ++ v = subprocess.check_output("printf '%s\n' __GNUC__ | {} -E -P -".format(gcc), shell=True) + try: + v = int(v) + context.Result(str(v)) +diff --git a/tests/test_types/test_nonstripped.py b/tests/test_types/test_nonstripped.py +index a18648c9..d3190d1b 100644 +--- a/tests/test_types/test_nonstripped.py ++++ b/tests/test_types/test_nonstripped.py +@@ -21,8 +21,12 @@ def create_binary(path, stripped=False): + path = path + '.stripped' if stripped else path + '.nonstripped' + full_path = os.path.join(TESTDIR_NAME, path) + +- command = 'echo \'{src}\' | cc -o {path} {option} -std=c99 -xc -'.format( +- src=SOURCE, path=full_path, option=('-s' if stripped else '-ggdb3') ++ cc = os.environ.get("CC", "cc") ++ command = 'echo \'{src}\' | {cc} -o {path} {option} -std=c99 -xc -'.format( ++ cc=cc, ++ src=SOURCE, ++ path=full_path, ++ option=('-s' if stripped else '-ggdb3') + ) + subprocess.call(command, shell=True) + diff --git a/app-misc/rmlint/files/rmlint-2.10.1-fix-tests.patch b/app-misc/rmlint/files/rmlint-2.10.1-fix-tests.patch new file mode 100644 index 000000000000..db43e366b389 --- /dev/null +++ b/app-misc/rmlint/files/rmlint-2.10.1-fix-tests.patch @@ -0,0 +1,135 @@ +--- a/tests/test_options/test_replay.py ++++ b/tests/test_options/test_replay.py +@@ -69,7 +69,7 @@ def test_replay_match_basename(): + create_file('xxx', 'test1/b') + create_file('xxx', 'test2/a') + +- replay_path = '/tmp/replay.json' ++ replay_path = os.path.join(TESTDIR_NAME, 'replay.json') + + head, *data, footer = run_rmlint('-o json:{p}'.format( + p=replay_path +@@ -104,7 +104,7 @@ def test_replay_hidden(): + create_file('xxx', 'test/.a') + create_file('xxx', 'test/.b') + +- replay_path = '/tmp/replay.json' ++ replay_path = os.path.join(TESTDIR_NAME, 'replay.json') + + head, *data, footer = run_rmlint('--hidden -o json:{p}'.format( + p=replay_path +@@ -130,7 +130,7 @@ def test_replay_must_match_tagged(): + create_file('xxx', 'test_a/a') + create_file('xxx', 'test_b/a') + +- replay_path = '/tmp/replay.json' ++ replay_path = os.path.join(TESTDIR_NAME, 'replay.json') + + head, *data, footer = run_rmlint('-o json:{p}'.format( + p=replay_path +@@ -182,7 +182,7 @@ def test_sorting(): + (''.join(p) for p in permutations(all_opts, n_terms)) + ) + +- replay_path = '/tmp/replay.json' ++ replay_path = os.path.join(TESTDIR_NAME, 'replay.json') + + for combo in combos: + combo_str = '-y ' + combo +@@ -218,7 +218,7 @@ def test_replay_no_dir(): + + try: + os.chdir(TESTDIR_NAME) +- replay_path = '/tmp/replay.json' ++ replay_path = os.path.join(TESTDIR_NAME, 'replay.json') + head, *data, footer = run_rmlint( + '-o json:{p}'.format(p=replay_path), + use_default_dir=False, +@@ -242,7 +242,7 @@ def test_replay_unicode_fuckup(): + create_file('xxx', names[1]) + create_file('xxx', names[2]) + +- replay_path = '/tmp/replay.json' ++ replay_path = os.path.join(TESTDIR_NAME, 'replay.json') + + head, *data, footer = run_rmlint('-o json:{p}'.format(p=replay_path)) + assert len(data) == 3 +@@ -260,8 +260,8 @@ def test_replay_tagged_order(): + create_file('xxx', 'b/1') + create_file('xxx', 'b/2') + +- replay_path_a = '/tmp/replay-a.json' +- replay_path_b = '/tmp/replay-b.json' ++ replay_path_a = os.path.join(TESTDIR_NAME, 'replay-a.json') ++ replay_path_b = os.path.join(TESTDIR_NAME, 'replay-b.json') + + # Create replay-a.json + head, *data, footer = run_rmlint( +@@ -326,7 +326,7 @@ def test_replay_duplicate_directory_size(): + create_file('xxx', 'a/xxx') + create_file('xxx', 'b/xxx') + +- replay_path = '/tmp/replay.json' ++ replay_path = os.path.join(TESTDIR_NAME, 'replay.json') + head, *data, footer = run_rmlint('-o json:{p} -S a'.format(p=replay_path)) + assert len(data) == 2 + +@@ -427,7 +427,7 @@ def test_replay_pack_directories(): + create_pack_and_unpack_scenario() + + # Do a run without -D and pack it later during --replay. +- replay_path = '/tmp/replay.json' ++ replay_path = os.path.join(TESTDIR_NAME, 'replay.json') + + head, *data, footer = run_rmlint('-o json:{p} -S ahD'.format(p=replay_path)) + assert len(data) == 13 +@@ -449,7 +449,7 @@ def test_replay_unpack_directories(): + create_pack_and_unpack_scenario() + + # Do a run with -D and pack it later during --replay. +- replay_path = '/tmp/replay.json' ++ replay_path = os.path.join(TESTDIR_NAME, 'replay.json') + head, *data, footer = run_rmlint('-o json:{p} -S ahD -D'.format(p=replay_path)) + + assert len(data) == 21 +--- a/tests/test_options/test_size.py ++++ b/tests/test_options/test_size.py +@@ -90,7 +90,7 @@ def test_replay_size(): + create_file('yyy', 'b/yyy') + create_testdir('empty_dir') + +- replay_path = '/tmp/replay.json' ++ replay_path = os.path.join(TESTDIR_NAME, 'replay.json') + head, *data, footer = run_rmlint('-o json:{p}'.format( + p=replay_path + )) +--- a/tests/test_options/test_stdin.py ++++ b/tests/test_options/test_stdin.py +@@ -69,7 +69,6 @@ def test_path_starting_with_dash(): + os.chdir(TESTDIR_NAME) + data = check_output( + [cwd + '/rmlint', '-o', 'json', '-S', 'a', '--', subdir], +- stderr=STDOUT + ) + finally: + os.chdir(cwd) +--- a/tests/utils.py ++++ b/tests/utils.py +@@ -133,7 +133,7 @@ def run_rmlint_once(*args, + + cmd += shlex.split(' '.join(args)) + if with_json: +- cmd += ['-o', 'json:/tmp/out.json', '-c', 'json:oneline'] ++ cmd += ['-o', 'json:' + os.path.join(TESTDIR_NAME, 'out.json'), '-c', 'json:oneline'] + + for idx, output in enumerate(outputs or []): + cmd.append('-o') +@@ -168,7 +168,7 @@ def run_rmlint_once(*args, + return output + + if with_json: +- with open('/tmp/out.json', 'r') as f: ++ with open(os.path.join(TESTDIR_NAME, 'out.json'), 'r') as f: + json_data = json.loads(f.read()) + else: + json_data = [] diff --git a/app-misc/rmlint/files/rmlint-2.10.1-scons.patch b/app-misc/rmlint/files/rmlint-2.10.1-scons.patch new file mode 100644 index 000000000000..a60aafe1fa67 --- /dev/null +++ b/app-misc/rmlint/files/rmlint-2.10.1-scons.patch @@ -0,0 +1,93 @@ +--- a/SConstruct ++++ b/SConstruct +@@ -515,7 +515,7 @@ AddOption( + action='store', metavar='DIR', help='libdir name (lib or lib64)' + ) + +-for suffix in ['libelf', 'gettext', 'fiemap', 'blkid', 'json-glib', 'gui']: ++for suffix in ['libelf', 'gettext', 'fiemap', 'blkid', 'json-glib', 'gui', 'docs']: + AddOption( + '--without-' + suffix, action='store_const', default=False, const=False, + dest='with_' + suffix +@@ -804,7 +804,8 @@ env.Default(library) + + SConscript('tests/SConscript', exports='programs') + SConscript('po/SConscript') +-SConscript('docs/SConscript') ++if GetOption("with_docs"): ++ SConscript('docs/SConscript') + SConscript('gui/SConscript') + + +@@ -883,7 +884,6 @@ if 'config' in COMMAND_LINE_TARGETS: + Find non-stripped binaries (needs libelf) : {libelf} + Optimize using ioctl(FS_IOC_FIEMAP) (needs linux) : {fiemap} + Support for SHA512 (needs glib >= 2.31) : {sha512} +- Build manpage from docs/rmlint.1.rst : {sphinx} + Support for caching checksums in file's xattr : {xattr} + Support for reading json caches (needs json-glib) : {json_glib} + Checking for proper support of big files >= 4GB : {bigfiles} +@@ -898,6 +898,9 @@ if 'config' in COMMAND_LINE_TARGETS: + (needs <locale.h> for compile side support) : {locale} + (needs msgfmt to compile .po files) : {msgfmt} + ++ Enable GUI : {gui} ++ Build docs : {docs} ++ + {grey}The following constants will be used during the build:{end} + + Version information : {version} +@@ -925,6 +928,8 @@ Type 'scons' to actually compile rmlint now. Good luck. + bigfiles=yesno(env['HAVE_BIGFILES']), + bigofft=yesno(env['HAVE_BIG_OFF_T']), + bigstat=yesno(env['HAVE_BIG_STAT']), ++ gui=yesno(GetOption("with_gui")), ++ docs=yesno(GetOption("with_docs")), + sphinx=COLORS['green'] + 'yes, using ' + COLORS['end'] + sphinx_bin if sphinx_bin else yesno(sphinx_bin), + compiler=env['CC'], + prefix=GetOption('prefix'), +--- a/gui/setup.py ++++ b/gui/setup.py +@@ -37,7 +37,7 @@ def get_prefix(): + PREFIX = get_prefix() + + +-class PrePlusPostInstall(install): ++class PreInstall(install): + def run(self): + # Compile the resource bundle freshly + print('==> Compiling resource bundle') +@@ -59,24 +59,6 @@ class PrePlusPostInstall(install): + # Run the usual distutils install routine: + install.run(self) + +- # Make sure the schema file is updated. +- # Otherwise the gui will trace trap. +- print('==> Compiling GLib Schema files') +- +- try: +- subprocess.call([ +- 'glib-compile-schemas', +- os.path.join(PREFIX, 'share/glib-2.0/schemas') +- ]) +- except subprocess.CalledProcessError as err: +- print('==> Could not update schemas: ', err) +- print('==> Please run the following manually:\n') +- print(' sudo glib-compile-schemas {prefix}'.format( +- prefix=os.path.join(PREFIX, 'share/glib-2.0/schemas') +- )) +- else: +- print('==> OK!') +- + + setup( + name='Shredder', +@@ -88,7 +70,7 @@ setup( + url='https://rmlint.rtfd.org', + license='GPLv3', + platforms='any', +- cmdclass={'install': PrePlusPostInstall}, ++ cmdclass={'install': PreInstall}, + packages=['shredder', 'shredder.views'], + package_data={'': [ + 'resources/*.gresource' diff --git a/app-misc/rmlint/files/rmlint-2.10.1-skip-tests.patch b/app-misc/rmlint/files/rmlint-2.10.1-skip-tests.patch new file mode 100644 index 000000000000..f5f81fd6d0a0 --- /dev/null +++ b/app-misc/rmlint/files/rmlint-2.10.1-skip-tests.patch @@ -0,0 +1,35 @@ +commit 566198730352f2353fd8332794409d7c9edf80e2 +Author: Louis Sautier <sautier.louis@gmail.com> +Date: Wed Sep 8 00:53:28 2021 +0200 + + tests: skip man and python2 + + Those tests fail respectively when the documentation isn't built and when + python2 isn't available (probably specific to Gentoo). + +diff --git a/tests/test_formatters/test_py.py b/tests/test_formatters/test_py.py +index 92b17604..28d2dd42 100644 +--- a/tests/test_formatters/test_py.py ++++ b/tests/test_formatters/test_py.py +@@ -16,7 +16,7 @@ def _check_interpreter(interpreter): + return False + + +-@parameterized(["python2", "python3"]) ++@parameterized(["python3"]) + @with_setup(usual_setup_func, usual_teardown_func) + def test_paranoia(interpreter): + if not _check_interpreter(interpreter): +diff --git a/tests/test_options/test_help.py b/tests/test_options/test_help.py +index d934724a..60bc40a0 100644 +--- a/tests/test_options/test_help.py ++++ b/tests/test_options/test_help.py +@@ -17,7 +17,7 @@ def test_help(): + + + @with_setup(usual_setup_func, usual_teardown_func) +-def test_man(): ++def _test_man(): + yelp = subprocess.check_output( + ['./rmlint', '--show-man'], stderr=subprocess.STDOUT + ).decode('utf-8') diff --git a/app-misc/rmlint/files/rmlint-2.10.1-x86-fix-size.patch b/app-misc/rmlint/files/rmlint-2.10.1-x86-fix-size.patch new file mode 100644 index 000000000000..b67c13f527ee --- /dev/null +++ b/app-misc/rmlint/files/rmlint-2.10.1-x86-fix-size.patch @@ -0,0 +1,30 @@ +commit 87c53a5cb0ec37412cf9fe748dc90dddc6812733 +Author: Louis Sautier <sautier.louis@gmail.com> +Date: Wed Sep 8 19:39:07 2021 +0200 + + Fix max sizes on x86, closes #522 + + strtoull returns ULLONG_MAX, not ULONG_MAX. + +diff --git a/lib/cmdline.c b/lib/cmdline.c +index 56141d94..36f48c1b 100644 +--- a/lib/cmdline.c ++++ b/lib/cmdline.c +@@ -351,7 +351,7 @@ static RmOff rm_cmd_size_string_to_bytes(const char *size_spec, GError **error) + return 0; + } + +- if(fraction_num == ULONG_MAX && errno == ERANGE) { ++ if(fraction_num == ULLONG_MAX && errno == ERANGE) { + g_set_error(error, RM_ERROR_QUARK, 0, _("Fraction is too big for uint64")); + return 0; + } +@@ -371,7 +371,7 @@ static RmOff rm_cmd_size_string_to_bytes(const char *size_spec, GError **error) + return 0; + } + +- if(base_size == ULONG_MAX && errno == ERANGE) { ++ if(base_size == ULLONG_MAX && errno == ERANGE) { + g_set_error(error, RM_ERROR_QUARK, 0, _("Size is too big for uint64")); + return 0; + } diff --git a/app-misc/rmlint/metadata.xml b/app-misc/rmlint/metadata.xml new file mode 100644 index 000000000000..045b589e3cb0 --- /dev/null +++ b/app-misc/rmlint/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>sbraz@gentoo.org</email> + <name>Louis Sautier</name> + </maintainer> + <upstream> + <remote-id type="github">sahib/rmlint</remote-id> + <bugs-to>https://github.com/sahib/rmlint/issues</bugs-to> + </upstream> +</pkgmetadata> diff --git a/app-misc/rmlint/rmlint-2.10.1.ebuild b/app-misc/rmlint/rmlint-2.10.1.ebuild new file mode 100644 index 000000000000..aaa9a53dd04d --- /dev/null +++ b/app-misc/rmlint/rmlint-2.10.1.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..9} ) + +inherit gnome2-utils python-single-r1 scons-utils toolchain-funcs xdg-utils + +DESCRIPTION="Extremely fast tool to remove duplicates and other lint from your filesystem" +HOMEPAGE="https://rmlint.readthedocs.io/" +SRC_URI="https://github.com/sahib/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc gui nls test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/glib:2 + dev-libs/json-glib + virtual/libelf:0= +" +RDEPEND=" + ${DEPEND} + gui? ( + ${PYTHON_DEPS} + x11-libs/gtksourceview:3.0 + $(python_gen_cond_dep ' + dev-python/colorlog[${PYTHON_MULTI_USEDEP}] + dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] + ') + ) +" +BDEPEND=" + virtual/pkgconfig + doc? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_MULTI_USEDEP}] + dev-python/sphinx-bootstrap-theme[${PYTHON_MULTI_USEDEP}] + ') + ) + nls? ( sys-devel/gettext ) + test? ( + ${PYTHON_DEPS} + app-shells/dash + $(python_gen_cond_dep ' + dev-python/nose[${PYTHON_MULTI_USEDEP}] + dev-python/parameterized[${PYTHON_MULTI_USEDEP}] + dev-python/psutil[${PYTHON_MULTI_USEDEP}] + dev-python/pyxattr[${PYTHON_MULTI_USEDEP}] + ') + ) +" + +DOCS=(CHANGELOG.md README.rst) +PATCHES=( + # The build system tries to override several CFLAGS + "${FILESDIR}/${PN}-2.10.1-cflags.patch" + # https://github.com/sahib/rmlint/pull/520 + "${FILESDIR}/${PN}-2.10.1-scons.patch" + # https://github.com/sahib/rmlint/pull/521 + "${FILESDIR}/${PN}-2.10.1-fix-tests.patch" + # Skip problematic tests + "${FILESDIR}/${PN}-2.10.1-skip-tests.patch" + # https://github.com/sahib/rmlint/pull/523 + "${FILESDIR}/${PN}-2.10.1-x86-fix-size.patch" + # https://github.com/sahib/rmlint/pull/526 + "${FILESDIR}/${PN}-2.10.1-fix-cc.patch" +) + +src_prepare() { + default + if use test && use x86; then + # Skip part of a test until this is fixed: + # https://github.com/sahib/rmlint/issues/522 + sed -i '/--size 0-18446744073709551615\.1/d' \ + tests/test_options/test_size.py || die + fi +} + +src_configure() { + # Needed for USE=-native-symlinks + tc-export AR CC + scons_opts=( + VERBOSE=1 + $(use_with doc docs) + $(use_with gui) + $(use_with nls gettext) + ) + escons "${scons_opts[@]}" config +} + +src_compile() { + escons "${scons_opts[@]}" +} + +src_test() { + RM_TS_DIR="${T}/tests" nosetests -s -v -a '!slow' || \ + die "Tests failed" +} + +src_install() { + escons "${scons_opts[@]}" --prefix="${ED}/usr" --actual-prefix="${EPREFIX}/usr" install + + # https://github.com/sahib/rmlint/pull/525 + if use doc; then + gzip -d "${ED}/usr/share/man/man1/rmlint.1.gz" || die + fi + if use gui; then + python_optimize + fi + einstalldocs +} + +pkg_preinst() { + if use gui; then + gnome2_schemas_savelist + fi +} + +pkg_postinst() { + if use gui; then + gnome2_schemas_update + xdg_icon_cache_update + fi +} + +pkg_postrm() { + if use gui; then + gnome2_schemas_update + xdg_icon_cache_update + fi +} diff --git a/app-misc/tmux-mem-cpu-load/Manifest b/app-misc/tmux-mem-cpu-load/Manifest index 3320574bfc54..32bac16d2b55 100644 --- a/app-misc/tmux-mem-cpu-load/Manifest +++ b/app-misc/tmux-mem-cpu-load/Manifest @@ -1,4 +1,4 @@ DIST tmux-mem-cpu-load-3.4.0.tar.gz 19483 BLAKE2B eeaabcd4447b326dbf77d3e5844971d2b466c93169993d4a16912bc4d0f777b07db1b0c2973dfaef9e0cd5b4f0dfd132043aed20170a1a7856d7a3c1f6a96ba8 SHA512 f963683faa86ff7b20a658787978ce3c4c36c41fabe297e18e4b1483e680d71a3b10c220dbae5c29bc7f7cb65e79839041b53c9aaee75a17bdc78bf0b76e8dc1 -EBUILD tmux-mem-cpu-load-3.4.0.ebuild 581 BLAKE2B 5572059462a46e64382b32562d9a33e603da0e68f9f42e8e6efd23b3d2fe6c4dde69538ed6e2a251c28f0bcbd5cf267b94afc2fa6315b020dc7cca6848eee750 SHA512 b31936ddf8d4af35aee77db6d533ea3da35756a32b44422c0cd387650eca952493462c35eb3905998429e564dc635ecfbc1b893341b42787c84cf256d88207ad +EBUILD tmux-mem-cpu-load-3.4.0.ebuild 585 BLAKE2B 00b10ac18f608e41d223f024e3c51a7aab4a250903ea06b92e550354a88aa199086f0033fc784ec0844cfc22abbf715487ab822d3bbb54b330191bc9c5c51f9a SHA512 d641a82e757b9b01c60d73202843f375a0460c8b97176092d7a857fb87041d35674c7d82ca4f2d435631d384a0f15396875ddbfc967ec912153b176fb8cb1825 EBUILD tmux-mem-cpu-load-9999.ebuild 572 BLAKE2B fb51d056e2ed67a413dcfe13a875d50f897722f204ff0a7502a21e982c6622554c4ca9daffd566c3369ec9d8eabfafffb5c95cb88ff960be4d2e35bf677bae94 SHA512 a1aad3db36b9dcf00bb35ed13c270bb4b168505c1ffbd7455217879e5de5052cb257ed5d9510725f6281f58f16f8c6a91bdafdc110246318aee34d6521876f44 MISC metadata.xml 260 BLAKE2B 14a97b3ad387216977ac6c969bf7ca5dfba37ebf731889e28275e1553920b35c5c963397021e33b8a82453182340e606d3b1a1cbd3cf47d421b1f8560a56bb64 SHA512 6a63e890d5124eab87b5ef43039892d8a85f26f0022edc61671dbd5eabf8297c97fe6718e1ac895ac6bf85bc241dc11c0f4d71b16e42755311d7a25ab94d4dc9 diff --git a/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-3.4.0.ebuild b/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-3.4.0.ebuild index f54b4e254c51..e8fb406d2e50 100644 --- a/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-3.4.0.ebuild +++ b/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-3.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/thewtex/tmux-mem-cpu-load.git"} SRC_URI="" else - KEYWORDS="amd64 x86" + KEYWORDS="amd64 ~arm64 x86" SRC_URI="https://github.com/thewtex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" fi |