commit:     ca47d04ee6d550d2e91a29709f05e359d8fd7b26
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 10:00:11 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 13 10:00:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca47d04e

dev-util/diffoscope: drop 238-r2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/diffoscope/Manifest                 |   1 -
 dev-util/diffoscope/diffoscope-238-r2.ebuild | 121 ---------------------------
 2 files changed, 122 deletions(-)

diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 8f890c883c86..028bddddb054 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,3 +1,2 @@
-DIST diffoscope-238.tar.gz 3287285 BLAKE2B 
d745c0b279ce6e29cbe9c6655c48d2fb4c8d230c5d4931048be83b4d97f6b45bff5424409b559988c2efba2dcbb80778c97e3f726174ae154c479ec24b557c34
 SHA512 
8600a3a29f7d4a80f0a0b37e6277e46e377c6f056cf111356f80723f0e4a309e9bae087643019fe1c46f99430b35389083e1156911fa8d3375993b550342b25f
 DIST diffoscope-242.tar.gz 3167814 BLAKE2B 
d6f63f94e312cd9bb48858dd82e50bcae065cd25f332a08940b22d36df75993cd43614ae44cbae3360c38ae30b7910a062ece294680b58b2a654ca3ead078795
 SHA512 
3d724a2349d2040d7072b81b8a77bae75aabe3f39c661c1d68a9f6e76b75048225262b8a9932c39e56429ec4937a398ca45e9f9abd23505aa511a7a8a81f3ab6
 DIST diffoscope-243.tar.gz 3167842 BLAKE2B 
01c8e1a53e78d6243d90b0fcb4ba73158e7a5d379f1602b607bf9c24445d9494124ccb676897c5a63bc7a830f8ea0788d82fc0f735384eddba177142359c8535
 SHA512 
7eaa688a016cacf5f5ccb9759fdc3fdbf8ee3218201ff9b4b950c4e2121f5acd67022b405852a2b4d02838aafd2a316d7579c407abaa0e7399bfd9513981f11f

diff --git a/dev-util/diffoscope/diffoscope-238-r2.ebuild 
b/dev-util/diffoscope/diffoscope-238-r2.ebuild
deleted file mode 100644
index 908ed3aa6de0..000000000000
--- a/dev-util/diffoscope/diffoscope-238-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1 pypi
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories 
different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/";
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~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 )"
-
-# <libarchive-c-5: 
https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/344
-RDEPEND="
-       dev-python/python-magic[${PYTHON_USEDEP}]
-       <dev-python/libarchive-c-5[${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/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 )
-"
-# 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
-       tests/comparators/test_elf.py::test_libmix_differences
-)
-
-distutils_enable_tests pytest

Reply via email to