From 93a93e9a3b53c1a73142a305ea1f8136846942ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 22 Dec 2021 14:08:05 +0000 Subject: gentoo resync : 22.12.2021 --- dev-util/diffoscope/Manifest | 6 ++ dev-util/diffoscope/diffoscope-195.ebuild | 110 ++++++++++++++++++++++++++++++ dev-util/diffoscope/diffoscope-196.ebuild | 108 +++++++++++++++++++++++++++++ dev-util/diffoscope/diffoscope-197.ebuild | 108 +++++++++++++++++++++++++++++ 4 files changed, 332 insertions(+) create mode 100644 dev-util/diffoscope/diffoscope-195.ebuild create mode 100644 dev-util/diffoscope/diffoscope-196.ebuild create mode 100644 dev-util/diffoscope/diffoscope-197.ebuild (limited to 'dev-util/diffoscope') diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest index 7cab5f6c430b..1b3d7cf8127d 100644 --- a/dev-util/diffoscope/Manifest +++ b/dev-util/diffoscope/Manifest @@ -1,5 +1,11 @@ DIST diffoscope-190.tar.gz 2704083 BLAKE2B a2a0313f87fdb9c20b0dc696a1aea570857dd7005e0f69dc2dd139bca86a4b5711f98862b60f4d1a581bf3e0dfd38ef3be96991b96862584f289f1eb80415480 SHA512 646380d52730cf2efef57e3fa2995c7b2d5958d75597a59a24027bca1fc35c5b59dd96352faac9b7bd1d5bc053064f11760877651d52099f6b1ca0b3ad65d63c DIST diffoscope-194.tar.gz 2704634 BLAKE2B ca080f07ab23d48cd772302f47fff67c38ca3106d2fd96de37b9112aa316ec095acb07062316abf60ac3457de99b6e3f69adef166ab4b24943dff9e8a127f99f SHA512 cfdd30ea12326ca08f200a78fd77b5b681bbe31cd292fa22fcab294a64717a06f431bcc8c3def7c75f9fb554108e48b8043bc3901d5e57a2be3cc38d20a303e5 +DIST diffoscope-195.tar.gz 2704638 BLAKE2B 7d8caeaaf5d844c85254f017e49544e016ea16c4876623c0eae18c78389195f91ba567c1197ea9d1ccf326a92483be11a189afdd96a334fa8e0f766a7e78fafd SHA512 619517ce1900ba5e3e642ca758767aacf8bb3b58e288710cdb425500e6074135a5d2147a34214b284b94eacb781e790f638c57e1489492eae8c4bd557fce8a4e +DIST diffoscope-196.tar.gz 2704695 BLAKE2B aa53848171ce8ff76bffd1ded4ef5f3fb661960f36137a96d00cec380ef090929b694f2ab33244aea29b35be279ba7a10b513bd8333ea809a495e73f22d4901a SHA512 102ff95e33967e17e7437e4270a072fc526ecc96b7b91fa2d5a6c9cefce4d6905a59d3fcf0e3a6727d3452a1f6f90a1b7f329c8ce0552929ec5b49fec5869692 +DIST diffoscope-197.tar.gz 2705041 BLAKE2B 1d66462d3f1cdbba177d24d194ce14ae51274c6b60139e56724213a6b4fc0b41e6a71f9f2e250ecc7d6330186bf774470b2153801b375ffb63e8390c425e1073 SHA512 d8411ad166738b29caa28abbc10f21e0906b7b19bd5ab644db36c04b1f9c5af9f4cbdb31eb850da7249380a6774bde355f0e815f4d3cdd0df76570df9df7fd0a EBUILD diffoscope-190.ebuild 3291 BLAKE2B bc2d73c19425cb02d4594514f9ae8c53e5bf5304360cd82b9bfc338ce914d81e41f6bde68b2aa9c3137a0de1dbb6c15a0992d2808bd97b5a28189d8818bab362 SHA512 bb63244ba0a19fe88ded3a684bf3cf78f7b6519c6708f073b7d1fec1f12373beffd7398066f6f95978dfd25783e1e87fff49dab97202bbd4beef10be7568859e EBUILD diffoscope-194.ebuild 3293 BLAKE2B 26e073fdc8f3fd5d40e8794f6fcba5abf8498652e0a2cf8b15dbe7fb8e1eae67cf6b290233e45ce3af43ae1a9ecb3ccc0afe1166db7a0bd0b428d922dbf6973e SHA512 c11b5e22b64c95763995798f7b153d34c1d866982d82f9dd6b4cc61899e44217d83c2ce9e60a7638fdd8b3d6b7317b535a0b768806fc014d74e427b3c5141db1 +EBUILD diffoscope-195.ebuild 3293 BLAKE2B 26e073fdc8f3fd5d40e8794f6fcba5abf8498652e0a2cf8b15dbe7fb8e1eae67cf6b290233e45ce3af43ae1a9ecb3ccc0afe1166db7a0bd0b428d922dbf6973e SHA512 c11b5e22b64c95763995798f7b153d34c1d866982d82f9dd6b4cc61899e44217d83c2ce9e60a7638fdd8b3d6b7317b535a0b768806fc014d74e427b3c5141db1 +EBUILD diffoscope-196.ebuild 3268 BLAKE2B 6e19f5d74844e0030b23be21b72d74b65787338c3eb0b96696d9ae3657fbcbc65c1ef2e59f0962ce846302bfde1ed7f58d49b12fc841a14e3ddc320deafd1f8e SHA512 82b287f68ebbeaa80af6ae183556094cea84c8c66def200ae538b24676f7f0a8cda6b217e10eb2050dcb9523cce6327edf6d35a34ea83a9596508b7d73c82383 +EBUILD diffoscope-197.ebuild 3268 BLAKE2B 6e19f5d74844e0030b23be21b72d74b65787338c3eb0b96696d9ae3657fbcbc65c1ef2e59f0962ce846302bfde1ed7f58d49b12fc841a14e3ddc320deafd1f8e SHA512 82b287f68ebbeaa80af6ae183556094cea84c8c66def200ae538b24676f7f0a8cda6b217e10eb2050dcb9523cce6327edf6d35a34ea83a9596508b7d73c82383 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5 diff --git a/dev-util/diffoscope/diffoscope-195.ebuild b/dev-util/diffoscope/diffoscope-195.ebuild new file mode 100644 index 000000000000..bd59e85cceb9 --- /dev/null +++ b/dev-util/diffoscope/diffoscope-195.ebuild @@ -0,0 +1,110 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8,9,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 )" + +# pull in optional tools for tests: +# img2txt: bug #797688 +# docx2txt: bug #797688 +BDEPEND="test? ( + app-text/docx2txt + media-libs/libcaca + virtual/imagemagick-tools[jpeg] + )" +RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}] + dev-python/libarchive-c[${PYTHON_USEDEP}] + dev-python/distro[${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 if filemagic's magic.py breaks imports +# of dev-python/python-magic: https://bugs.gentoo.org/716482 +RDEPEND+=" !dev-python/filemagic" + +distutils_enable_tests pytest + +python_test() { + local exclude=( + # 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 + + # needs triage + tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode + + # 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 + ) + epytest ${exclude[@]/#/--deselect } +} diff --git a/dev-util/diffoscope/diffoscope-196.ebuild b/dev-util/diffoscope/diffoscope-196.ebuild new file mode 100644 index 000000000000..57030d324ef8 --- /dev/null +++ b/dev-util/diffoscope/diffoscope-196.ebuild @@ -0,0 +1,108 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8,9,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 )" + +# pull in optional tools for tests: +# img2txt: bug #797688 +# docx2txt: bug #797688 +BDEPEND="test? ( + app-text/docx2txt + media-libs/libcaca + virtual/imagemagick-tools[jpeg] + )" +RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}] + dev-python/libarchive-c[${PYTHON_USEDEP}] + dev-python/distro[${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 if filemagic's magic.py breaks imports +# of dev-python/python-magic: https://bugs.gentoo.org/716482 +RDEPEND+=" !dev-python/filemagic" + +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 + + # 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 +) + +distutils_enable_tests pytest diff --git a/dev-util/diffoscope/diffoscope-197.ebuild b/dev-util/diffoscope/diffoscope-197.ebuild new file mode 100644 index 000000000000..57030d324ef8 --- /dev/null +++ b/dev-util/diffoscope/diffoscope-197.ebuild @@ -0,0 +1,108 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8,9,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 )" + +# pull in optional tools for tests: +# img2txt: bug #797688 +# docx2txt: bug #797688 +BDEPEND="test? ( + app-text/docx2txt + media-libs/libcaca + virtual/imagemagick-tools[jpeg] + )" +RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}] + dev-python/libarchive-c[${PYTHON_USEDEP}] + dev-python/distro[${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 if filemagic's magic.py breaks imports +# of dev-python/python-magic: https://bugs.gentoo.org/716482 +RDEPEND+=" !dev-python/filemagic" + +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 + + # 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 +) + +distutils_enable_tests pytest -- cgit v1.2.3