diff options
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/ccache/Manifest | 1 | ||||
| -rw-r--r-- | dev-util/ccache/ccache-4.5.ebuild | 88 | ||||
| -rw-r--r-- | dev-util/diffoscope/Manifest | 6 | ||||
| -rw-r--r-- | dev-util/diffoscope/diffoscope-180.ebuild | 112 | ||||
| -rw-r--r-- | dev-util/diffoscope/diffoscope-186.ebuild | 109 | ||||
| -rw-r--r-- | dev-util/diffoscope/diffoscope-187.ebuild | 109 | ||||
| -rw-r--r-- | dev-util/diffoscope/diffoscope-188.ebuild | 109 | ||||
| -rw-r--r-- | dev-util/diffoscope/diffoscope-192.ebuild (renamed from dev-util/diffoscope/diffoscope-189.ebuild) | 0 | ||||
| -rw-r--r-- | dev-util/glslang/glslang-11.6.0.ebuild | 2 | ||||
| -rw-r--r-- | dev-util/mdds/Manifest | 1 | ||||
| -rw-r--r-- | dev-util/mdds/mdds-2.0.0.ebuild | 65 | ||||
| -rw-r--r-- | dev-util/mdds/mdds-9999.ebuild | 6 | ||||
| -rw-r--r-- | dev-util/pkgcheck/pkgcheck-0.10.8.ebuild | 2 | ||||
| -rw-r--r-- | dev-util/spirv-headers/spirv-headers-20210817.ebuild | 2 | ||||
| -rw-r--r-- | dev-util/spirv-tools/spirv-tools-20210825.ebuild | 2 | ||||
| -rw-r--r-- | dev-util/vulkan-headers/vulkan-headers-1.2.189.ebuild | 2 | ||||
| -rw-r--r-- | dev-util/vulkan-tools/vulkan-tools-1.2.189-r1.ebuild | 2 |
17 files changed, 165 insertions, 453 deletions
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest index de030f992e6b..350ed7ee59cf 100644 --- a/dev-util/ccache/Manifest +++ b/dev-util/ccache/Manifest @@ -2,3 +2,4 @@ DIST ccache-4.3.tar.xz 433508 BLAKE2B 6ab48aa587b4dc86020e3b0f722003dc5c03709626 DIST ccache-4.4.1.tar.xz 509916 BLAKE2B 54fec9480c37c144667ae2dd969cabc1526a01312200b2b9b26ef1d5533836e2070d28e6a7fbc580f232b22dbd6f1a56a43494b8960d96c5a97d8f041e8f31ca SHA512 820c0b05d2b0209e8478c7409da0e27de8e9621c683aa0f147f9c025b8ac7bc3d06d6945d346143790168da79dfbd14b0ccfb284c7ac05c35f85b492be07d676 DIST ccache-4.4.2.tar.xz 510260 BLAKE2B f0d8b9ac6e1972592ce5a51a392279a01f01c09e6bffc498ff0b20aa46acb6d7f949ae9f4c6006e20b15cdea9fa2fa057c78b69ef66c2e13b3ddee13367e91b1 SHA512 afcec4806b1e307ec16006ecd9e39eb69fc1376407877f024c882926725d41f2b08eccdcfb3efd8dac9e481d07f9c08c043b8cea5ea563a0f49b2f587325e4a7 DIST ccache-4.4.tar.xz 509516 BLAKE2B 6c4519d3cd93be49dfff09f22ada798894c9f4475395443e0dcfcf768178f1520cf26bc5c2e0ea22e06cc3ebd6ddaf930a2d1b517593a10c3253f7faa3131f43 SHA512 a857d1aded9c352eabba9c0f31b43fd17ae91672dabdfc086851448867c9dff6ad6dd7ee60f8e39102d41b7d8cf7866c6bf104e0214e865de45e75a8df7626f0 +DIST ccache-4.5.tar.xz 512772 BLAKE2B 6cfd80aeee140c18e0b6c1e30c15d717caeaa6ef17ebf6400773fc957e02285242cd8f8861cf137b542272258a81fe8fd128ee69eea0fe6ecd12cf20acc5b2d8 SHA512 c05dd4280c68f64e799cee5704d879df1348f970ff4bbee2278a15ce99c2c52c337ee64713edbd8111634484e9159c1ce3d93fe9351ef388b65a9cbd6c0fc6ab diff --git a/dev-util/ccache/ccache-4.5.ebuild b/dev-util/ccache/ccache-4.5.ebuild new file mode 100644 index 000000000000..39deaa2e861d --- /dev/null +++ b/dev-util/ccache/ccache-4.5.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake toolchain-funcs flag-o-matic + +DESCRIPTION="Fast compiler cache" +HOMEPAGE="https://ccache.dev/" +SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz" + +LICENSE="GPL-3 LGPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220 +IUSE="doc redis +static-c++ test" +RESTRICT="!test? ( test )" + +DEPEND="app-arch/zstd:= + redis? ( dev-libs/hiredis:= )" +RDEPEND="${DEPEND} + dev-util/shadowman + sys-apps/gentoo-functions" +# clang-specific tests use dev-libs/elfutils to compare objects for equality. +# Let's pull in the dependency unconditionally. +DEPEND+=" test? ( dev-libs/elfutils )" +BDEPEND=" doc? ( dev-ruby/asciidoctor )" + +DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md ) + +PATCHES=( + "${FILESDIR}"/${PN}-3.5-nvcc-test.patch + "${FILESDIR}"/${PN}-4.0-objdump.patch + "${FILESDIR}"/${PN}-4.1-avoid-run-user.patch +) + +src_prepare() { + cmake_src_prepare + + sed \ + -e "/^EPREFIX=/s:'':'${EPREFIX}':" \ + "${FILESDIR}"/ccache-config-3 > ccache-config || die + + # mainly used in tests + tc-export CC OBJDUMP + + # Avoid dependency on libstdc++.so. Useful for cases when + # we would like to use ccache to build older gcc which injects + # into ccache locally built (possibly outdated) libstdc++ + # See bug #761220 for examples. + # + # Ideally gcc should not use LD_PRELOAD to avoid this type of failures. + use static-c++ && append-ldflags -static-libstdc++ +} + +src_configure() { + local mycmakeargs=( + -DENABLE_DOCUMENTATION=$(usex doc) + -DENABLE_TESTING=$(usex test) + -DUSE_CCACHE=OFF + -DZSTD_FROM_INTERNET=OFF + -DREDIS_STORAGE_BACKEND=$(usex redis) + ) + + use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=OFF ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + dobin ccache-config + insinto /usr/share/shadowman/tools + newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin" +} + +pkg_prerm() { + if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then + eselect compiler-shadow remove ccache + fi +} + +pkg_postinst() { + if [[ ${ROOT:-/} == / ]]; then + eselect compiler-shadow update ccache + fi +} diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest index 1e8f7a5ec47c..1804ded11ced 100644 --- a/dev-util/diffoscope/Manifest +++ b/dev-util/diffoscope/Manifest @@ -1,6 +1,2 @@ -DIST diffoscope-180.tar.gz 1600542 BLAKE2B 0cc34106f039e0682b32de284b3ce1be90e8629fb4ba18cffa31d7c970a9d18392060f37b201d4ee9ab3f4f65401684c72edf2d00d56827cbaacbfde0ce81d11 SHA512 abf2c514b9f3b074a5b9a6e19f09a474a8ba58e00974a48ebd860cc31547204fb4690224cb752b4248a0674d979bd20c6d4c77ffb912f2b85499d48d90affeb4 -DIST diffoscope-186.tar.gz 2685030 BLAKE2B b9fcb05fbdd939ece3727f232777c56119aa5df837699dcdc752a816bb656aa09c4cce99e225425e09d55914523a6456587bf232877fa22924c623f854016712 SHA512 13d42ba600cc9c5e716162a73f42d8453358f689f4148b138121e1f2190b1334a66a01fd0e227bc9e7190d3229c286be91d6ccbdd21c13694fc2edab8e5019cd -DIST diffoscope-187.tar.gz 2699208 BLAKE2B 193eb0575814df7ee1d0a0e989a936782a52d4c8dc3e56d47db7ff5d631776559a604755e1d1be6687c1168ef7bb9d899f3b5ea8cab9506ef5b2da195485d7e0 SHA512 b3ba6743c9c4e0460f56a0830801f72e00bf7500c54dd9392e6e1de470a3b7348d900a8b9012f17b509abbc59575c7b9ee8e1048b3b23e5813a5ddabeadb1be4 -DIST diffoscope-188.tar.gz 2703049 BLAKE2B 2d517a6067a70221a34545456e23eefb42b5dbae1daa3459366ad429446844d64714ab5d229cd909de533b8994e870d16314282454ce2ebbf3408685e6b94f5f SHA512 b2c17bd577d5450439d2871f027f675f4e5bbfdc26e0f18bbe3579f214b023e1610a2095aec4b9d91c52e4a4c3e5fb226209e8f1c643b1c82ec190124d5d47d5 -DIST diffoscope-189.tar.gz 2703482 BLAKE2B 9c3a86b71d02c456b72955ddc2c9df580c60c898b00cdebaeea369065536b531fd93cbc12f25d9d94ca6bf1cb11bf90f28e6c77f3573a623b35174e59466778d SHA512 4c9a8c909cc18fa524be3979e211420b1240b7336a5895ec7e8682786e01952c6ae2ed494796aa08cdff2b21d13a55c4f47cb8e947743407e38790e8b40fb04c DIST diffoscope-190.tar.gz 2704083 BLAKE2B a2a0313f87fdb9c20b0dc696a1aea570857dd7005e0f69dc2dd139bca86a4b5711f98862b60f4d1a581bf3e0dfd38ef3be96991b96862584f289f1eb80415480 SHA512 646380d52730cf2efef57e3fa2995c7b2d5958d75597a59a24027bca1fc35c5b59dd96352faac9b7bd1d5bc053064f11760877651d52099f6b1ca0b3ad65d63c +DIST diffoscope-192.tar.gz 2815127 BLAKE2B 61aaf7485452751196b1d50f5423deb332f362107a559e2b2fc807b5b00b75e49ce5a26d1e8d24b40e765d182f76f17523efa01333f78cf68395389e6dcdb028 SHA512 3db57b650b7dc02a144f995cc9fd481e8fc36470e1e2fbaf29269d229d300336f08ff3fae847340de48ea3be6873fb75b86b7a7be3c7efec958523d3110847dd diff --git a/dev-util/diffoscope/diffoscope-180.ebuild b/dev-util/diffoscope/diffoscope-180.ebuild deleted file mode 100644 index dc5176712df4..000000000000 --- a/dev-util/diffoscope/diffoscope-180.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{6,7,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 -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - app-text/docx2txt - media-libs/libcaca - ) -" -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-186.ebuild b/dev-util/diffoscope/diffoscope-186.ebuild deleted file mode 100644 index 82e3b65959a2..000000000000 --- a/dev-util/diffoscope/diffoscope-186.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{6,7,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 - )" -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-187.ebuild b/dev-util/diffoscope/diffoscope-187.ebuild deleted file mode 100644 index b219a660d297..000000000000 --- a/dev-util/diffoscope/diffoscope-187.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{6,7,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 - )" -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-188.ebuild b/dev-util/diffoscope/diffoscope-188.ebuild deleted file mode 100644 index b219a660d297..000000000000 --- a/dev-util/diffoscope/diffoscope-188.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{6,7,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 - )" -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-189.ebuild b/dev-util/diffoscope/diffoscope-192.ebuild index c3a480f06545..c3a480f06545 100644 --- a/dev-util/diffoscope/diffoscope-189.ebuild +++ b/dev-util/diffoscope/diffoscope-192.ebuild diff --git a/dev-util/glslang/glslang-11.6.0.ebuild b/dev-util/glslang/glslang-11.6.0.ebuild index 98e5c36f213f..a2189d105b91 100644 --- a/dev-util/glslang/glslang-11.6.0.ebuild +++ b/dev-util/glslang/glslang-11.6.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then else SNAPSHOT_COMMIT="${PV}" SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86" + KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv x86" S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}" fi diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest index bbcf1672121a..bd6171d8e4f7 100644 --- a/dev-util/mdds/Manifest +++ b/dev-util/mdds/Manifest @@ -1 +1,2 @@ DIST mdds-1.7.0.tar.xz 313220 BLAKE2B 02ab09ad1338223da2911c05fc8d67c9d0d5414d1dcedac066dc95a2b0853f3801347c9791a5fc5700d666933be78efc52f735453769f9f2123ce06eca1fa67f SHA512 ac2bfe5186d499a79f4379c1dc7cc869bbbd9a59d4943399409dd4dd1ef7e3567a993deda5d5a06ad67dbd94b0a534439805837f2f405c5aca0aeb197178291a +DIST mdds-2.0.0.tar.xz 409984 BLAKE2B 39c8e6946f53d0cb51d1ce9b47c036eae78b0c276e50718f1837836caab3ffa341d8df3908ca332dec3549eb9541a50c1870b17f70b29c46162ff8a721cb10b2 SHA512 bc6b7629d69cb8a685c611e371c998579eea66ac006cfe3d7a39d216714767093832cc0978d1bfb73912c7f200921a44c477dadd311cd6e28586af55ae678f14 diff --git a/dev-util/mdds/mdds-2.0.0.ebuild b/dev-util/mdds/mdds-2.0.0.ebuild new file mode 100644 index 000000000000..58f1c940cdf9 --- /dev/null +++ b/dev-util/mdds/mdds-2.0.0.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git" + inherit git-r3 +else + SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.xz" + # Unkeyworded while libreoffice has no release making use of this slot + # KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +fi +inherit autotools toolchain-funcs + +DESCRIPTION="Collection of multi-dimensional data structure and indexing algorithm" +HOMEPAGE="https://gitlab.com/mdds/mdds" + +LICENSE="MIT" +SLOT="1/2.0" # Check API version on version bumps! +IUSE="doc openmp valgrind test" +RESTRICT="!test? ( test )" + +BDEPEND=" + doc? ( + app-doc/doxygen + dev-python/sphinx + ) + valgrind? ( dev-util/valgrind ) +" +DEPEND="dev-libs/boost:=" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-1.5.0-buildsystem.patch" ) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_enable doc docs) + $(use_enable valgrind memory_tests) + ) + if use openmp && tc-has-openmp; then + myeconfargs+=( --enable-openmp ) + else + myeconfargs+=( --disable-openmp ) + fi + econf "${myeconfargs[@]}" +} + +src_test() { + tc-export CXX + default +} diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-9999.ebuild index 37a5d8728339..dc57a4506ee2 100644 --- a/dev-util/mdds/mdds-9999.ebuild +++ b/dev-util/mdds/mdds-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -if [[ ${PV} == *9999 ]]; then +if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git" inherit git-r3 else diff --git a/dev-util/pkgcheck/pkgcheck-0.10.8.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.8.ebuild index f0f443848625..d1ae29a03975 100644 --- a/dev-util/pkgcheck/pkgcheck-0.10.8.ebuild +++ b/dev-util/pkgcheck/pkgcheck-0.10.8.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git" inherit git-r3 else - KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos" + KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" fi diff --git a/dev-util/spirv-headers/spirv-headers-20210817.ebuild b/dev-util/spirv-headers/spirv-headers-20210817.ebuild index cac83cb1c2c5..45ad49402dfb 100644 --- a/dev-util/spirv-headers/spirv-headers-20210817.ebuild +++ b/dev-util/spirv-headers/spirv-headers-20210817.ebuild @@ -12,6 +12,6 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.ta LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86" +KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv x86" S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}" diff --git a/dev-util/spirv-tools/spirv-tools-20210825.ebuild b/dev-util/spirv-tools/spirv-tools-20210825.ebuild index d4c81ce6db2a..8889099a45c6 100644 --- a/dev-util/spirv-tools/spirv-tools-20210825.ebuild +++ b/dev-util/spirv-tools/spirv-tools-20210825.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then else EGIT_COMMIT="1fbed83c8aab8517d821fcb4164c08567951938f" SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86" + KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv x86" S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT} fi diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.189.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.189.ebuild index c9511160c2e4..78c590a6eb0c 100644 --- a/dev-util/vulkan-headers/vulkan-headers-1.2.189.ebuild +++ b/dev-util/vulkan-headers/vulkan-headers-1.2.189.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86" + KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv x86" S="${WORKDIR}"/${MY_PN}-${PV} fi diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.189-r1.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.189-r1.ebuild index 833dda303d3d..28ceb4b20531 100644 --- a/dev-util/vulkan-tools/vulkan-tools-1.2.189-r1.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-1.2.189-r1.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv" + KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv" S="${WORKDIR}"/${MY_PN}-${PV} fi |
