diff options
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/diffoscope/Manifest | 1 | ||||
| -rw-r--r-- | dev-util/diffoscope/diffoscope-163.ebuild | 71 | ||||
| -rw-r--r-- | dev-util/mdds/Manifest | 1 | ||||
| -rw-r--r-- | dev-util/mdds/files/mdds-1.6.0-bashism.patch | 75 | ||||
| -rw-r--r-- | dev-util/mdds/mdds-1.6.0.ebuild | 69 |
5 files changed, 72 insertions, 145 deletions
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest index bf0dc40bc876..f14592d65b93 100644 --- a/dev-util/diffoscope/Manifest +++ b/dev-util/diffoscope/Manifest @@ -1 +1,2 @@ DIST diffoscope-162.tar.gz 1564386 BLAKE2B e5ea37ae48c65dae3c850a04152c322e1e8535ad982107689f23a4111ec04b9b7766681b7e61f69c75bece271d8875ef2d109b315ec5d55ad77658a065148ed6 SHA512 a5de428b491adfadc432322eba524dc8031a6be9709887f2f290376bb94b358cec45a4a0a31b8fb5f25377a33752044882245a22d7f2b71b17d5efe002c850f4 +DIST diffoscope-163.tar.gz 1566445 BLAKE2B 4985d3a1e63fd2d4ef7cdf9e933e3ac6d1bc6c18a703bc92a8dc573b368c5989107debd57d96cfa40fe9e48d43b8ef0a07143ee48dd982a4a71b914a8e4d64ae SHA512 fc02d864c9a4b799aec45b88646f68de4f559366462b2057094592dfd3bff94213c17ea048b98070ae9a1f2f30d0e8d58d630b643e198dd85369cadea227a7e4 diff --git a/dev-util/diffoscope/diffoscope-163.ebuild b/dev-util/diffoscope/diffoscope-163.ebuild new file mode 100644 index 000000000000..8b3fee434220 --- /dev/null +++ b/dev-util/diffoscope/diffoscope-163.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +DISTUTILS_USE_SETUPTOOLS=rdepend +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 hdf5 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 ) + hdf5? ( sci-libs/hdf5 ) + 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 + 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 ) + xz? ( app-arch/xz-utils ) + 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/mdds/Manifest b/dev-util/mdds/Manifest index 4483da3da7c9..bbcf1672121a 100644 --- a/dev-util/mdds/Manifest +++ b/dev-util/mdds/Manifest @@ -1,2 +1 @@ -DIST mdds-1.6.0.tar.bz2 350406 BLAKE2B 70a99d779f318140f37bb3f873f1845c153f389a9e671a4d9ee4d1f0e762db312d536392061923c3c02494df6945a5a7743480eca1020d9cda6f3495888d7b00 SHA512 7c66894748e998f24374a5c6ea342ae2736e4bdba53be89510a1674690517ed7303786e1290fcfa26b07f236788c192ad29790129c228074397ab43699cdb290 DIST mdds-1.7.0.tar.xz 313220 BLAKE2B 02ab09ad1338223da2911c05fc8d67c9d0d5414d1dcedac066dc95a2b0853f3801347c9791a5fc5700d666933be78efc52f735453769f9f2123ce06eca1fa67f SHA512 ac2bfe5186d499a79f4379c1dc7cc869bbbd9a59d4943399409dd4dd1ef7e3567a993deda5d5a06ad67dbd94b0a534439805837f2f405c5aca0aeb197178291a diff --git a/dev-util/mdds/files/mdds-1.6.0-bashism.patch b/dev-util/mdds/files/mdds-1.6.0-bashism.patch deleted file mode 100644 index 4fa155c653fb..000000000000 --- a/dev-util/mdds/files/mdds-1.6.0-bashism.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 65da7c25f4d8204b1379a0afb46d82dc1b263ab0 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Thu, 28 May 2020 18:36:07 +0200 -Subject: [PATCH] Fix bashisms in configure.ac - ---- - configure.ac | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 00ab937..2282165 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -32,7 +32,7 @@ AC_ARG_ENABLE(debug-stdcxx, - ] - ,debug_stdcxx=yes) - --AS_IF([test x"$debug_stdcxx" == "xyes"], [ -+AS_IF([test x"$debug_stdcxx" = "xyes"], [ - CXXFLAGS="$CXXFLAGS -D_GLIBCXX_DEBUG" - ]) - -@@ -42,7 +42,7 @@ AC_ARG_ENABLE(release-tests, - ] - ,release_tests=yes) - --AS_IF([test x"$release_tests" == "xyes"], [ -+AS_IF([test x"$release_tests" = "xyes"], [ - CXXFLAGS="$CXXFLAGS -DNDEBUG -O2" - ]) - -@@ -56,11 +56,11 @@ AC_ARG_ENABLE(loop-unrolling, - [enable_loop_unrolling="$enableval"],[enable_loop_unrolling=yes] - ) - --AS_IF([test x"$enable_loop_unrolling" == "xno"], [ -+AS_IF([test x"$enable_loop_unrolling" = "xno"], [ - CXXFLAGS="$CXXFLAGS -DMDDS_LOOP_UNROLLING=0" - ]) - --AS_IF([test x"$enable_gcov" == "xyes"], [ -+AS_IF([test x"$enable_gcov" = "xyes"], [ - CXXFLAGS="$CXXFLAGS --coverage -O0" - ]) - -@@ -69,7 +69,7 @@ AC_ARG_ENABLE(openmp, - [enable_openmp="$enableval"],[enable_openmp=yes] - ) - --AS_IF([test x"$enable_openmp" == "xyes"], [ -+AS_IF([test x"$enable_openmp" = "xyes"], [ - CXXFLAGS="$CXXFLAGS -fopenmp" - LDFLAGS="$LDFLAGS -fopenmp" - ]) -@@ -79,7 +79,7 @@ AC_ARG_ENABLE(sanitizer-coverage, - [enable_sanitizer_coverage="$enableval"],[enable_sanitizer_coverage=no] - ) - --AS_IF([test x"$enable_sanitizer_coverage" == "xyes"], [ -+AS_IF([test x"$enable_sanitizer_coverage" = "xyes"], [ - CXXFLAGS="$CXXFLAGS -fprofile-instr-generate -fcoverage-mapping -O0" - ]) - -@@ -122,7 +122,7 @@ AC_ARG_ENABLE([werror], - [enable_werror="$enableval"], - [enable_werror=no] - ) --AS_IF([test x"$enable_werror" == "xyes"], [ -+AS_IF([test x"$enable_werror" = "xyes"], [ - CXXFLAGS="$CXXFLAGS -Werror" - ]) - --- -2.26.2 - diff --git a/dev-util/mdds/mdds-1.6.0.ebuild b/dev-util/mdds/mdds-1.6.0.ebuild deleted file mode 100644 index 916b5bce61ac..000000000000 --- a/dev-util/mdds/mdds-1.6.0.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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.bz2" - KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" -fi -inherit autotools toolchain-funcs - -DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm" -HOMEPAGE="https://gitlab.com/mdds/mdds" - -LICENSE="MIT" -SLOT="1/1.5" # 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" - "${FILESDIR}/${P}-bashism.patch" # bug 723094 -) - -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 -} |