diff options
Diffstat (limited to 'dev-util/diffoscope')
-rw-r--r-- | dev-util/diffoscope/Manifest | 10 | ||||
-rw-r--r-- | dev-util/diffoscope/diffoscope-266.ebuild | 20 | ||||
-rw-r--r-- | dev-util/diffoscope/diffoscope-272.ebuild | 147 | ||||
-rw-r--r-- | dev-util/diffoscope/diffoscope-276.ebuild (renamed from dev-util/diffoscope/diffoscope-263.ebuild) | 22 | ||||
-rw-r--r-- | dev-util/diffoscope/diffoscope-277.ebuild | 140 |
5 files changed, 331 insertions, 8 deletions
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest index 65b80cfc30a0..a91c3d637112 100644 --- a/dev-util/diffoscope/Manifest +++ b/dev-util/diffoscope/Manifest @@ -1,5 +1,9 @@ -DIST diffoscope-263.tar.bz2 3139927 BLAKE2B 6d13b9a657c4a7618d24487096a0fb94034f4ea2b84384b388dc8441ebe68f8de12dd7a34ec0075bd03ca3d437e65a23fc086184ba7c3764682390f6290a17e4 SHA512 41c5495bd4d4f4a0c340bac444f3cbc4a9b6180227efc02d593590a50b47acd06dc755875419da3a52d8aa831733d76450388c29e856d428b159d3c2c793de1b DIST diffoscope-266.tar.bz2 3148610 BLAKE2B 28090b8a1e2315f9df43d254d3dbd4ed8f6d4ba4d259c764f53b84137ac0b3dc97b51df56ba595eee950c54974e9b6109c423392d198e277d520f11559ecd78e SHA512 2eb7cbd333b6559ba0f66647184f1747cac52cca6304a27eefe914329797469d5fb9519abe92386d3785f4f2c779f8f5dd95ecc8f54f8b08fd4fc94746bf273d -EBUILD diffoscope-263.ebuild 3681 BLAKE2B c4f1f1661fd97e6b04eff67c1aae1db9893df9b5e91aa54aed8fedd4fa1ef7fa071f799c76377db3687f0c7b073be41eabac629118e38e063d8f29d8493e996c SHA512 0f24c5d7d22c8bbeae42d3cab7f7e25c347ac1f3d80320a92e22b33c3447b439a3794e443f939fa3861c82a2c0170b1ac2a6f98f20312a800147d03ce6a22dba -EBUILD diffoscope-266.ebuild 3682 BLAKE2B 9416955c1c9414ea2bcfb9ca5138638a3963dc71ec5443d6d993e3d132a566f62e613dd6dea2e38f26b3af6a176d620da2fabbe2159a8f979d2f8d91ae49332f SHA512 6a1cf8404cb306e7ddba0d19e591f62b622e616118f60285612a75991df02270d772eb647d1649f720da5c709312a4c18ad1eb86d9941c7f8512339fba7904d4 +DIST diffoscope-272.tar.bz2 3155265 BLAKE2B 76f8475993dc8be7297b50a2dda71b965789f6de04143e22b3b28c25e6646d9744088a49181faeb488921eb192b85072d16fee35f41450ba389c491e6a43c7b5 SHA512 f74d0166526da10604f25ba0425d3acc540cb92780776d108b60b07d00fa1039ea5a3fde4fd260497e0cf6ae387457e6fff989c5795bca6ce14199f0c9a15174 +DIST diffoscope-276.tar.bz2 3145876 BLAKE2B 734c35c40f04c843066754e1852f0c2fab90ec90f3700d593bf3439193aea89b747aec2759413eb2e3bdbde49dfdae3cfc6accf4178ec116265454ff75f1db45 SHA512 3891456fbc703b369acfe44daa80b9be68fbe62853c5506617b1f007a8b61e8dd55a7094b9df87c71aedbc2e28f1e5ecc354f51032d8cfe5823a0db29cb284c9 +DIST diffoscope-277.tar.bz2 3143869 BLAKE2B 98f0356060c8430236941ff9ef45c51d34d681a0cb8f8085bf40775aaa98c4c97add603d954b235f8615c539fb591eab3d812261f3b33dbeaee8418fabeeb5af SHA512 7ecc32204ed420ca2547976bd0548f4b9a4dd2cebacbeb2a3faf0fa6ac4015724abb6a764a81f20aea20dafc871b7fb262eeac81b86a1cd9cdfa42353178ea0f +EBUILD diffoscope-266.ebuild 3930 BLAKE2B f3288bcfcbb50b0c6aaaae157d247e535ae5700fde92c7f824a48f28f02c8024214694d8e7ba3c9408704b8aa05608f78dcb7c23e2e7fc5d98806175f12329f7 SHA512 ba418b38ec1cc9567fd51936c465855e1b920939db88dea87ab7f985d47a860e8435ede4eb2bc8d3c9c52498d7fa2955737fa3c8085db1bc795f21cf525ad732 +EBUILD diffoscope-272.ebuild 4220 BLAKE2B 19d0cf009316db3e0e1c962c69dde8932c6f5560fe6c558dc1e27553f337fcba02baf98327bb605d953d19c81145dfebdaee2d43856df601f8e8ba23ae483204 SHA512 d8a7d674db55ac00f73d5d597677bba6f793856308d423e0200ca9a7694fbe82540349a453cc80aefdedeaf83a09557bcfe5eea907e6a7bb53d777ec6a5df777 +EBUILD diffoscope-276.ebuild 3931 BLAKE2B bad2c517773128e97fdf93d2b818691c5bb05fcd6f52988350850f1c1d265fcfbd655cbc5ecea599d2cb8dc20aeb3013c8c917e4a4973e4c226cf5d9ae484adb SHA512 d3495d3306cf5d988b2832efac9af2f5a77aec8b9130f02e98dcb6b3023ca438eb05a6fad395cb73de0e0dea7dd943a3b65623da4fe020c62e7b5b4661b59c46 +EBUILD diffoscope-277.ebuild 3931 BLAKE2B bad2c517773128e97fdf93d2b818691c5bb05fcd6f52988350850f1c1d265fcfbd655cbc5ecea599d2cb8dc20aeb3013c8c917e4a4973e4c226cf5d9ae484adb SHA512 d3495d3306cf5d988b2832efac9af2f5a77aec8b9130f02e98dcb6b3023ca438eb05a6fad395cb73de0e0dea7dd943a3b65623da4fe020c62e7b5b4661b59c46 MISC metadata.xml 2086 BLAKE2B b05c2c3c425a990f64aea25e9dda3e1afb410068d90e034d5d9df7c76363613d309f8bc57c70284f2e607a3e2096a0132724dddba8df487bda3046d8ed7aefa1 SHA512 8c86ddad7fda722956931d73a6f5dfa8e43c25623edb3b20bf3e68765b04ed4d20ba31b68315812978a9546b3c678597fd41132a4a6ad4658ba9fa5f79cfc90d diff --git a/dev-util/diffoscope/diffoscope-266.ebuild b/dev-util/diffoscope/diffoscope-266.ebuild index 7db31ced97d2..09f0f20ea5a9 100644 --- a/dev-util/diffoscope/diffoscope-266.ebuild +++ b/dev-util/diffoscope/diffoscope-266.ebuild @@ -6,7 +6,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="ncurses" -inherit distutils-r1 +inherit distutils-r1 toolchain-funcs DESCRIPTION="Will try to get to the bottom of what makes files or directories different" HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/" @@ -16,7 +16,7 @@ SRC_URI="https://diffoscope.org/archive/${P}.tar.bz2" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86" +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 @@ -122,3 +122,19 @@ EPYTEST_DESELECT=( ) distutils_enable_tests pytest + +src_test() { + case $(tc-get-ptr-size) in + 4) + EPYTEST_IGNORE+=( + # Needs fixing in Perl itself (bug #934443) + tests/comparators/test_epub.py + tests/comparators/test_zip.py + ) + ;; + *) + ;; + esac + + distutils-r1_src_test +} diff --git a/dev-util/diffoscope/diffoscope-272.ebuild b/dev-util/diffoscope/diffoscope-272.ebuild new file mode 100644 index 000000000000..967064c51229 --- /dev/null +++ b/dev-util/diffoscope/diffoscope-272.ebuild @@ -0,0 +1,147 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_REQ_USE="ncurses" +inherit distutils-r1 toolchain-funcs + +DESCRIPTION="Will try to get to the bottom of what makes files or directories different" +HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/" +# We could use pypi, but upstream provide distribution tarballs, so let's use those. +# TODO: verify-sig +SRC_URI="https://diffoscope.org/archive/${P}.tar.bz2" + +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}] + sys-apps/file[python,${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-alternatives/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/pypdf[${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? ( virtual/openssh ) + tar? ( app-arch/tar ) + tcpdump? ( net-analyzer/tcpdump ) + zip? ( app-arch/unzip ) + zlib? ( app-arch/gzip ) + zstd? ( app-arch/zstd ) +" + +# pull in optional tools for tests: +# img2txt: bug #797688 +# docx2txt: bug #797688 +BDEPEND=" + test? ( + app-arch/p7zip + 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 + #tests/comparators/test_elf.py::test_libmix_differences + + # Fails with perl-5.40 + # https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/377 + tests/comparators/test_epub.py::test_differences + tests/comparators/test_zip.py::test_metadata + tests/comparators/test_zip.py::test_extra_fields + tests/comparators/test_zip.py::test_commented +) + +distutils_enable_tests pytest + +src_test() { + case $(tc-get-ptr-size) in + 4) + EPYTEST_IGNORE+=( + # Needs fixing in Perl itself (bug #934443) + tests/comparators/test_epub.py + tests/comparators/test_zip.py + ) + ;; + *) + ;; + esac + + distutils-r1_src_test +} diff --git a/dev-util/diffoscope/diffoscope-263.ebuild b/dev-util/diffoscope/diffoscope-276.ebuild index 7191da7ed124..6653b96fd698 100644 --- a/dev-util/diffoscope/diffoscope-263.ebuild +++ b/dev-util/diffoscope/diffoscope-276.ebuild @@ -4,9 +4,9 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) PYTHON_REQ_USE="ncurses" -inherit distutils-r1 +inherit distutils-r1 toolchain-funcs DESCRIPTION="Will try to get to the bottom of what makes files or directories different" HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/" @@ -16,7 +16,7 @@ SRC_URI="https://diffoscope.org/archive/${P}.tar.bz2" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86" +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 @@ -122,3 +122,19 @@ EPYTEST_DESELECT=( ) distutils_enable_tests pytest + +src_test() { + case $(tc-get-ptr-size) in + 4) + EPYTEST_IGNORE+=( + # Needs fixing in Perl itself (bug #934443) + tests/comparators/test_epub.py + tests/comparators/test_zip.py + ) + ;; + *) + ;; + esac + + distutils-r1_src_test +} diff --git a/dev-util/diffoscope/diffoscope-277.ebuild b/dev-util/diffoscope/diffoscope-277.ebuild new file mode 100644 index 000000000000..6653b96fd698 --- /dev/null +++ b/dev-util/diffoscope/diffoscope-277.ebuild @@ -0,0 +1,140 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_REQ_USE="ncurses" +inherit distutils-r1 toolchain-funcs + +DESCRIPTION="Will try to get to the bottom of what makes files or directories different" +HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/" +# We could use pypi, but upstream provide distribution tarballs, so let's use those. +# TODO: verify-sig +SRC_URI="https://diffoscope.org/archive/${P}.tar.bz2" + +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}] + sys-apps/file[python,${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-alternatives/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/pypdf[${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? ( virtual/openssh ) + tar? ( app-arch/tar ) + tcpdump? ( net-analyzer/tcpdump ) + zip? ( app-arch/unzip ) + zlib? ( app-arch/gzip ) + zstd? ( app-arch/zstd ) +" + +# pull in optional tools for tests: +# img2txt: bug #797688 +# docx2txt: bug #797688 +BDEPEND=" + test? ( + app-arch/p7zip + 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 + #tests/comparators/test_elf.py::test_libmix_differences +) + +distutils_enable_tests pytest + +src_test() { + case $(tc-get-ptr-size) in + 4) + EPYTEST_IGNORE+=( + # Needs fixing in Perl itself (bug #934443) + tests/comparators/test_epub.py + tests/comparators/test_zip.py + ) + ;; + *) + ;; + esac + + distutils-r1_src_test +} |