summaryrefslogtreecommitdiff
path: root/dev-util/diffoscope
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-04-25 11:37:10 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-04-25 11:37:10 +0100
commit38423c67c8a23f6a1bc42038193182e2da3116eb (patch)
tree04e2cf4bd43601b77daa79fe654e409187093c5e /dev-util/diffoscope
parent623ee73d661e5ed8475cb264511f683407d87365 (diff)
gentoo resync : 25.04.2020
Diffstat (limited to 'dev-util/diffoscope')
-rw-r--r--dev-util/diffoscope/Manifest12
-rw-r--r--dev-util/diffoscope/diffoscope-137.ebuild62
-rw-r--r--dev-util/diffoscope/diffoscope-141.ebuild (renamed from dev-util/diffoscope/diffoscope-138.ebuild)6
-rw-r--r--dev-util/diffoscope/diffoscope-142.ebuild (renamed from dev-util/diffoscope/diffoscope-139.ebuild)6
-rw-r--r--dev-util/diffoscope/metadata.xml1
5 files changed, 16 insertions, 71 deletions
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 32440f9418e9..53582c87b3d8 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,7 +1,5 @@
-DIST diffoscope-137.tar.gz 1557283 BLAKE2B d4b59174eec5919ade87fa04878c469a87bb31407c35eac9a21b13b36fd7b15ca0cb5cdf38dd25c1e964db1987579c74b595b4fd38d2f3e5a028f64176f73202 SHA512 6faa0675cd203e3320071dbf60a14110cb3674984bce9edab40e28b17769cb847179973fe55e0f9a78a3d6bf903e259c432225ae31e7e4f60ece252ac9cac20c
-DIST diffoscope-138.tar.gz 1567753 BLAKE2B 078a61eea53e0d0a66a862ac2c86889ddb95ddb8ccdb2b58b6a8b7e9ab1a3d5550511f73e7187a0539a974f257db6da79ad02b96e179952663f11e50cef23f12 SHA512 7dbc80d9135aba48e4f83b968e39f26e39f701b1ac1e6aaa2d9a6e18f24c1387b49d46067d2b2f2a76421752a8ac06d070cf660afb4a88db79f19339b327c485
-DIST diffoscope-139.tar.gz 1567732 BLAKE2B 14c8715612849e3bbf6590f8ada7c322aa73d9c24c4de5287f5d1f10f5a51b2ee04c8f6d388a8b54a409ddb8fca52d8663b5cd53f301878a94bb302d16874f3e SHA512 cd70a041b3738f7c09c719a17c3b933741b149a9aaee1c8fcb6bae0edd99f63d24b51cf55abdb8b5eb2ec6824fe6dee1a721974f1cf8b62604f26d46d9927d53
-EBUILD diffoscope-137.ebuild 1912 BLAKE2B ec1e126fcf54b48d60a15a9807ee0ff5a94961527e6ce135c0bdefcce77c621437a16a5b46e7d03a245c0911a1a199025ac119dfc1bad6b82687ca1210ae866a SHA512 55747e556c637d812582fb374c126dcfe254dac6a1c665bace0671a279147658e5d338eb228802182917044464eecd48153bf11f5d7b70fade7f037fe9f3cc19
-EBUILD diffoscope-138.ebuild 1986 BLAKE2B 6b1d5eb357a036a5ccdd278ff4b64f4c2d079deaed88a377cee2d87f1ba0ccc1532633478221a9db26caeb9a58bb6a9eaea1b6561ac11df80c9730d3239f81b3 SHA512 1728a19c6a64097116616a4293b2a4b7eb00d1ca92bd86133c4b228162ec21d0ac93d833ef8f2409c6a9840deeb997da3791df3ae9c85007b06919bad61a8e7e
-EBUILD diffoscope-139.ebuild 1986 BLAKE2B 6b1d5eb357a036a5ccdd278ff4b64f4c2d079deaed88a377cee2d87f1ba0ccc1532633478221a9db26caeb9a58bb6a9eaea1b6561ac11df80c9730d3239f81b3 SHA512 1728a19c6a64097116616a4293b2a4b7eb00d1ca92bd86133c4b228162ec21d0ac93d833ef8f2409c6a9840deeb997da3791df3ae9c85007b06919bad61a8e7e
-MISC metadata.xml 2081 BLAKE2B 5675b792346a4864e40f5d8b2181867065d8dac0d3fb17f4d82536aca7fc453490ddf32ae39bbe16514caac81d042adfa0f151e355ec60f27bc9bdda770ccb6b SHA512 c75fe757c122bc8db219013a5c46fa8ab5d23da2dfbf873d6af61e19a92a8c8d4ab9027b105e7757da5dd8caabf33de1b82605d7f8c2efa8095a7be0bd9117d7
+DIST diffoscope-141.tar.gz 1575158 BLAKE2B 56560be430cbb670c5595b57bbc36c09a0b9b2f1d3d0b0c19a27abd77392169bc5136a23a754ef2ec62c91606a54a254a2bf55110bf0981d8176fc94efb87d6d SHA512 bafe5200654362d12818ccd45c07e41c0ecd5430696172e88e323f635bc32c830a042429e792abaf5ddedf0fc7932d1c656699351cc805e76233affc8a762894
+DIST diffoscope-142.tar.gz 1568533 BLAKE2B da16f4bce6fd659bdb581709b10d20611add4bbd3d7bff66183b04b2205efc41a934888cb2a3c865dc6a3b644ac79b8cb3fbd46387d6217e86a8a92060dfe15b SHA512 f0bf339e58d1f77c936f5ef2ad1d45cdfe2d8ef236fe50f8ab2db16918bb8d56c9231f7ea7bbde68999ffde8901003d8bdf0b98e1a3e474252ca49cb83eb3664
+EBUILD diffoscope-141.ebuild 2161 BLAKE2B 9ef4a812c5fec5a923b0b796814052c00842cd36a447832fe65aed32c341454538ddccce2baac0b038d8bf02cbed98a2023eeba33e8a7868f34a882331098c34 SHA512 e508fee8307b2e634ec33877124156fcb8afd43307747b1f61e18ecfeaac00c1140c1906ef87015f3b76f70ac5679c28fed47539e52ce0adc29c6257ad6deacb
+EBUILD diffoscope-142.ebuild 2161 BLAKE2B 9ef4a812c5fec5a923b0b796814052c00842cd36a447832fe65aed32c341454538ddccce2baac0b038d8bf02cbed98a2023eeba33e8a7868f34a882331098c34 SHA512 e508fee8307b2e634ec33877124156fcb8afd43307747b1f61e18ecfeaac00c1140c1906ef87015f3b76f70ac5679c28fed47539e52ce0adc29c6257ad6deacb
+MISC metadata.xml 2137 BLAKE2B 6ff55f85ebf3f769c10c3e17a69900918abe142e491b7b8460bed8fe6a036763a743324bf1a10e7a3772761b38c9632ff1352e9c6677ef691f81acc29dc321e9 SHA512 e782e12dc91d86612768a2e0c498f54a9728691a76008ee1e6cdbc4d8719c2593344f6c37786982abb0de7b85d743d7614652a2e8c9cd9fef053c3a32e1e484c
diff --git a/dev-util/diffoscope/diffoscope-137.ebuild b/dev-util/diffoscope/diffoscope-137.ebuild
deleted file mode 100644
index 12fff8c883c4..000000000000
--- a/dev-util/diffoscope/diffoscope-137.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-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 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg gzip haskell hex imagemagick iso java llvm
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar tcpdump xz zip zstd"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-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 )
- gzip? ( app-arch/gzip )
- haskell? ( dev-lang/ghc )
- hex? ( app-editors/vim-core )
- imagemagick? ( media-gfx/imagemagick )
- iso? ( virtual/cdrtools )
- java? ( virtual/jdk )
- llvm? ( sys-devel/llvm )
- mono? ( dev-lang/mono )
- opendocument? ( app-text/odt2txt )
- pascal? ( dev-lang/fpc )
- pdf? (
- app-text/pdftk
- app-text/poppler
- )
- 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 )
- xz? ( app-arch/xz-utils )
- zip? ( app-arch/unzip )
- zstd? ( app-arch/zstd )
-"
diff --git a/dev-util/diffoscope/diffoscope-138.ebuild b/dev-util/diffoscope/diffoscope-141.ebuild
index a677a10243ad..63058ee2f20a 100644
--- a/dev-util/diffoscope/diffoscope-138.ebuild
+++ b/dev-util/diffoscope/diffoscope-141.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg gzip haskell hex imagemagick iso java llvm
+find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm
mono opendocument pascal pdf postscript R rpm sqlite squashfs
ssh tar tcpdump xz zip zstd"
@@ -40,6 +40,7 @@ RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
gpg? ( app-crypt/gnupg )
gzip? ( app-arch/gzip )
haskell? ( dev-lang/ghc )
+ hdf5? ( sci-libs/hdf5 )
hex? ( app-editors/vim-core )
imagemagick? ( media-gfx/imagemagick )
iso? ( virtual/cdrtools )
@@ -65,3 +66,6 @@ RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
zip? ( app-arch/unzip )
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"
diff --git a/dev-util/diffoscope/diffoscope-139.ebuild b/dev-util/diffoscope/diffoscope-142.ebuild
index a677a10243ad..63058ee2f20a 100644
--- a/dev-util/diffoscope/diffoscope-139.ebuild
+++ b/dev-util/diffoscope/diffoscope-142.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg gzip haskell hex imagemagick iso java llvm
+find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm
mono opendocument pascal pdf postscript R rpm sqlite squashfs
ssh tar tcpdump xz zip zstd"
@@ -40,6 +40,7 @@ RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
gpg? ( app-crypt/gnupg )
gzip? ( app-arch/gzip )
haskell? ( dev-lang/ghc )
+ hdf5? ( sci-libs/hdf5 )
hex? ( app-editors/vim-core )
imagemagick? ( media-gfx/imagemagick )
iso? ( virtual/cdrtools )
@@ -65,3 +66,6 @@ RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
zip? ( app-arch/unzip )
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"
diff --git a/dev-util/diffoscope/metadata.xml b/dev-util/diffoscope/metadata.xml
index 6d4d5794e456..86628d987731 100644
--- a/dev-util/diffoscope/metadata.xml
+++ b/dev-util/diffoscope/metadata.xml
@@ -23,6 +23,7 @@
<flag name="gettext">Use <pkg>sys-devel/gettext</pkg></flag>
<flag name="gpg">Use <pkg>app-crypt/gnupg</pkg></flag>
<flag name="haskell">Use <pkg>dev-lang/ghc</pkg></flag>
+ <flag name="hdf5">Use <pkg>sci-libs/hdf5</pkg></flag>
<flag name="hex">Use <pkg>app-editors/vim-core</pkg></flag>
<flag name="iso">Use <pkg>virtual/cdrtools</pkg></flag>
<flag name="llvm">Use <pkg>sys-devel/llvm</pkg></flag>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 19:28:49 +0000