From 0f9dedece27e09582438eb6d1823f92bd567e3c0 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Sat, 3 Dec 2022 13:48:14 +0200 Subject: [PATCH 1/4] net-mail/mu: Stabilize 1.8.11 amd64, #884113 Signed-off-by: Arthur Zamarin --- net-mail/mu/mu-1.8.11.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-mail/mu/mu-1.8.11.ebuild b/net-mail/mu/mu-1.8.11.ebuild index e519f4a502faa..ece19ae53d620 100644 --- a/net-mail/mu/mu-1.8.11.ebuild +++ b/net-mail/mu/mu-1.8.11.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 arm arm64 ~riscv ~x86 ~x64-macos" +KEYWORDS="amd64 arm arm64 ~riscv ~x86 ~x64-macos" IUSE="emacs readline" DEPEND=" From 61a072e950e07c3276e58dc4ded1a56d2d2784d5 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Sat, 3 Dec 2022 13:48:18 +0200 Subject: [PATCH 2/4] net-misc/xmrig: Stabilize 6.18.1 amd64, #884111 Signed-off-by: Arthur Zamarin --- net-misc/xmrig/xmrig-6.18.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/xmrig/xmrig-6.18.1.ebuild b/net-misc/xmrig/xmrig-6.18.1.ebuild index 5e038e7002701..6039933960435 100644 --- a/net-misc/xmrig/xmrig-6.18.1.ebuild +++ b/net-misc/xmrig/xmrig-6.18.1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64" + KEYWORDS="amd64 ~arm64" fi LICENSE="Apache-2.0 GPL-3+ MIT" From bc00396b4613714b25277107f0a9ad591f869a97 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Sat, 3 Dec 2022 13:48:21 +0200 Subject: [PATCH 3/4] dev-ruby/tilt: Stabilize 2.0.11 amd64, #883999 Signed-off-by: Arthur Zamarin --- dev-ruby/tilt/tilt-2.0.11.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ruby/tilt/tilt-2.0.11.ebuild b/dev-ruby/tilt/tilt-2.0.11.ebuild index f4f73230a0235..f4d2ea07632e2 100644 --- a/dev-ruby/tilt/tilt-2.0.11.ebuild +++ b/dev-ruby/tilt/tilt-2.0.11.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/rtomayko/tilt/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="2" -KEYWORDS="~amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" # Block on some of the potential test dependencies. These dependencies From a5158e1e501776f5edc51f8f06731d18aed13c69 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 3 Dec 2022 11:58:02 +0000 Subject: [PATCH 4/4] dev-util/diffoscope: add 228 Signed-off-by: Sam James --- dev-util/diffoscope/Manifest | 1 + dev-util/diffoscope/diffoscope-228.ebuild | 120 ++++++++++++++++++++++ 2 files changed, 121 insertions(+) create mode 100644 dev-util/diffoscope/diffoscope-228.ebuild diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest index 237a9e2d1ee5b..5d2f2f08ed24f 100644 --- a/dev-util/diffoscope/Manifest +++ b/dev-util/diffoscope/Manifest @@ -1,2 +1,3 @@ DIST diffoscope-223.tar.gz 3145330 BLAKE2B 47ebe733c6330c2c8a7a78dfaad4c364ac3570d5a691b889f3154dcc5f7bec7b97744f04433cf56544ca208233271bbbca8bb767ed43844786fca4e77505d95b SHA512 5f83177133fd4689a77fb08038222998f9597cd63b0f328d3ae55c2ef6f5136f55ab1f5841b70ce1f64a62d216e2332bb4cecb82a3edcc90a6a5841e95955d4c DIST diffoscope-227.tar.gz 3163754 BLAKE2B 8a93b168e8ac404b6cfb08ebf9de5adf0288ae6e741653f8194a2d3d45e30b5826ca3d21a37b5db3867c73816e862f1d4593fe7a77487736f8a6e5f2b15057f2 SHA512 1e8a143006c4e734cf30d4110241ed164c3ee893801efa2a7b81a917146a0643dd8b38af0cac937847506a4338d59f4bb03211179742bb076fc4d4dd5f7cb585 +DIST diffoscope-228.tar.gz 3164190 BLAKE2B 21e75cb8e297540b149f22c52949d33a2e6ddd8c0fa8641e5d8b0c20045f1a7f6638b6b844631c2a5353cd23dc4d8447fadd9b8b3f5cd87fa33eb4b85abe3e2b SHA512 5ea3f0dfa17d2e17167241f9388a6fba919deec4c26a39e238fc282b0011f30e77b4daf27c0b076eadcc13ca51eb408eba983ea427adbaee3233db222b60948a diff --git a/dev-util/diffoscope/diffoscope-228.ebuild b/dev-util/diffoscope/diffoscope-228.ebuild new file mode 100644 index 0000000000000..e7f6e7cb72c05 --- /dev/null +++ b/dev-util/diffoscope/diffoscope-228.ebuild @@ -0,0 +1,120 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="ncurses" +inherit distutils-r1 + +DESCRIPTION="Will try to get to the bottom of what makes files or directories different" +HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file +find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma +mono opendocument pascal pdf postscript R rpm sqlite squashfs +ssh tar test tcpdump zip zlib zstd" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-python/python-magic[${PYTHON_USEDEP}] + dev-python/libarchive-c[${PYTHON_USEDEP}] + dev-python/distro[${PYTHON_USEDEP}] + dev-python/tlsh[${PYTHON_USEDEP}] + acl? ( sys-apps/acl ) + binutils? ( sys-devel/binutils ) + bzip2? ( app-arch/bzip2 ) + libcaca? ( media-libs/libcaca ) + colord? ( x11-misc/colord ) + cpio? ( app-arch/cpio ) + diff? ( sys-apps/diffutils ) + docx? ( app-text/docx2txt ) + dtc? ( sys-apps/dtc ) + e2fsprogs? ( sys-fs/e2fsprogs ) + file? ( sys-apps/file ) + find? ( sys-apps/findutils ) + gettext? ( sys-devel/gettext ) + gif? ( media-libs/giflib ) + gpg? ( app-crypt/gnupg ) + haskell? ( dev-lang/ghc ) + hdf5? ( sci-libs/hdf5 ) + hex? ( app-editors/vim-core ) + imagemagick? ( media-gfx/imagemagick ) + iso? ( app-cdr/cdrtools ) + java? ( virtual/jdk ) + llvm? ( sys-devel/llvm ) + lzma? ( app-arch/xz-utils ) + mono? ( dev-lang/mono ) + opendocument? ( app-text/odt2txt ) + pascal? ( dev-lang/fpc ) + pdf? ( + app-text/pdftk + app-text/poppler + dev-python/PyPDF2[${PYTHON_USEDEP}] + ) + postscript? ( app-text/ghostscript-gpl ) + R? ( dev-lang/R ) + rpm? ( app-arch/rpm ) + sqlite? ( dev-db/sqlite:3 ) + squashfs? ( sys-fs/squashfs-tools ) + ssh? ( net-misc/openssh ) + tar? ( app-arch/tar ) + tcpdump? ( net-analyzer/tcpdump ) + zip? ( app-arch/unzip ) + zlib? ( app-arch/gzip ) + zstd? ( app-arch/zstd ) +" +# Presence of filemagic's magic.py breaks imports +# of dev-python/python-magic: bug #716482 +RDEPEND+=" !dev-python/filemagic" + +# pull in optional tools for tests: +# img2txt: bug #797688 +# docx2txt: bug #797688 +BDEPEND=" + test? ( + app-text/docx2txt + app-text/html2text + media-libs/libcaca + virtual/imagemagick-tools[jpeg] + ) +" + +EPYTEST_DESELECT=( + # Test seems to use different tarball + tests/test_presenters.py::test_text_proper_indentation + + # Needs triage + tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found + tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode + tests/comparators/test_gif.py::test_has_visuals + + # img2txt based failures, bug #797688 + tests/comparators/test_ico_image.py::test_diff + tests/comparators/test_ico_image.py::test_diff_meta + tests/comparators/test_ico_image.py::test_diff_meta2 + tests/comparators/test_ico_image.py::test_has_visuals + tests/comparators/test_jpeg_image.py::test_diff + tests/comparators/test_jpeg_image.py::test_compare_non_existing + tests/comparators/test_jpeg_image.py::test_diff_meta + tests/comparators/test_jpeg_image.py::test_has_visuals + + # docx2txt based falures, bug #797688 + tests/comparators/test_docx.py::test_diff + + # Formatting + tests/test_source.py::test_code_is_black_clean + + # Fails on ZFS + tests/test_main.py::test_non_unicode_filename + + # Fails on (unreleased) LLVM 16 with minor difference + tests/comparators/test_macho.py::test_llvm_diff +) + +distutils_enable_tests pytest