From f0050229316e49800e17c87ba49a7b8bda372bef Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Tue, 31 May 2022 19:47:33 +0200 Subject: [PATCH 01/50] octaveforge.eclass: use edo for all commands Signed-off-by: Alessandro Barbieri --- eclass/octaveforge.eclass | 74 +++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/eclass/octaveforge.eclass b/eclass/octaveforge.eclass index 337d21e450..31e1f270d4 100644 --- a/eclass/octaveforge.eclass +++ b/eclass/octaveforge.eclass @@ -10,7 +10,7 @@ # Alessandro Barbieri # @SUPPORTED_EAPIS: 8 -inherit autotools +inherit autotools edo case ${EAPI} in 8) ;; @@ -63,16 +63,16 @@ octaveforge_src_prepare() { _generate_configure if [[ -e "${S}/src/configure.ac" ]]; then - pushd "${S}/src" || die + edo pushd "${S}/src" eautoreconf - popd || die + edo popd elif [[ -e "${S}/src/autogen.sh" ]]; then - pushd "${S}/src" || die - ./autogen.sh || die 'failed to run autogen.sh' - popd || die + edo pushd "${S}/src" + edo ./autogen.sh + edo popd fi if [[ -e "${S}/src/Makefile" ]]; then - sed -i 's/ -s / /g' "${S}/src/Makefile" || die 'sed failed.' + edo sed -i 's/ -s / /g' "${S}/src/Makefile" fi } @@ -82,7 +82,7 @@ octaveforge_src_compile() { export MKOCTFILE="mkoctfile -v" cmd="disp(__octave_config_info__('octlibdir'));" - OCTLIBDIR=$(octavecommand "${cmd}" || die) + OCTLIBDIR=$(edo octavecommand "${cmd}") export LFLAGS="${LFLAGS} -L${OCTLIBDIR}" export LDFLAGS="${LDFLAGS} -L${OCTLIBDIR}" @@ -91,25 +91,25 @@ octaveforge_src_compile() { fi if [[ -e src/Makefile ]]; then - mv src/Makefile src/Makefile.disable || die + edo mv src/Makefile src/Makefile.disable fi if [[ -e src/configure ]]; then - mv src/configure src/configure.disable || die + edo mv src/configure src/configure.disable fi - pushd .. || die - tar -czf "${OCT_PACKAGE}" "${PKGDIR}" || die + edo pushd .. + edo tar -czf "${OCT_PACKAGE}" "${PKGDIR}" } # @FUNCTION: octaveforge_src_install # @DESCRIPTION: # function to install the octave package octaveforge_src_install() { - DESTDIR="${D}" _octaveforge_pkg_install || die + DESTDIR="${D}" edo _octaveforge_pkg_install } octaveforge_src_test() { - DESTDIR="${T}" _octaveforge_pkg_install || die + DESTDIR="${T}" edo _octaveforge_pkg_install # cargo culted from Fedora cmd=" @@ -118,7 +118,7 @@ octaveforge_src_test() { unlink(pkg('local_list')); unlink(pkg('global_list')); " - octavecommand "${cmd}" || die 'failed testing' + edo octavecommand "${cmd}" } # @FUNCTION: octaveforge_pkg_postinst @@ -127,10 +127,10 @@ octaveforge_src_test() { octaveforge_pkg_postinst() { einfo "Registering ${CATEGORY}/${PF} on the Octave package database." if [[ ! -d "${OCT_PKGDIR}" ]] ; then - mkdir -p "${OCT_PKGDIR}" || die + edo mkdir -p "${OCT_PKGDIR}" fi cmd="pkg('rebuild');" - octavecommand "${cmd}" || die 'failed to register the package.' + edo octavecommand "${cmd}" } # @FUNCTION: octaveforge_pkg_prerm @@ -143,16 +143,16 @@ octaveforge_pkg_prerm() { l = pkg('list'); disp(l{cellfun(@(x)strcmp(x.name,'${PN}'),l)}.dir); " - oct_pkgdir=$(octavecommand "${cmd}" || die) - rm -f "${oct_pkgdir}/packinfo/on_uninstall.m" || die + oct_pkgdir=$(edo octavecommand "${cmd}") + edo rm -f "${oct_pkgdir}/packinfo/on_uninstall.m" if [[ -e "${oct_pkgdir}/packinfo/on_uninstall.m.orig" ]]; then - mv "$oct_pkgdir"/packinfo/on_uninstall.m{.orig,} || die - pushd "$oct_pkgdir/packinfo" || die + edo mv "$oct_pkgdir"/packinfo/on_uninstall.m{.orig,} + edo pushd "$oct_pkgdir/packinfo" cmd=" l = pkg('list'); on_uninstall(l{cellfun(@(x)strcmp(x.name,'${PN}'), l)}); " - octavecommand "${cmd}" || die 'failed to remove the package' + edo octavecommand "${cmd}" fi } @@ -162,18 +162,18 @@ octaveforge_pkg_prerm() { octaveforge_pkg_postrm() { einfo 'Rebuilding the Octave package database.' if [[ ! -d "${OCT_PKGDIR}" ]] ; then - mkdir -p "${OCT_PKGDIR}" || die + edo mkdir -p "${OCT_PKGDIR}" fi cmd="pkg('rebuild');" - "${OCT_BIN}" -H --silent --no-gui --eval "${cmd}" || die 'failed to rebuild the package database' + edo "${OCT_BIN}" -H --silent --no-gui --eval "${cmd}" } octavecommand() { - "${OCT_BIN}" -H -q --no-site-file --no-gui --eval "$1" + edo "${OCT_BIN}" -H -q --no-site-file --no-gui --eval "$1" } _generate_configure() { - cat << EOF > configure || die + edo cat << EOF > configure #! /bin/sh -f if [ -e src/configure ]; then @@ -181,14 +181,14 @@ if [ -e src/configure ]; then ./configure $* fi EOF - chmod 0755 "configure" || die + edo chmod 0755 "configure" } _octaveforge_pkg_install() { TMPDIR="${T}" DISTPKG='Gentoo' - pushd ../ || die + edo pushd ../ if [[ "X${DISTPKG}X" != "XX" ]]; then stripcmd=" unlink(pkg('local_list')); @@ -203,19 +203,19 @@ _octaveforge_pkg_install() { disp(l{cellfun(@(x)strcmp(x.name,'${PN}'),l)}.dir); ${stripcmd} " - oct_pkgdir=$(octavecommand "${cmd}" || die) + edo oct_pkgdir=$(edo octavecommand "${cmd}") else cmd="disp(fullfile(__octave_config_info__('datadir'),'octave'));" - shareprefix=${DESTDIR}/$(octavecommand "${cmd}" || die) + shareprefix=${DESTDIR}/$(edo octavecommand "${cmd}") cmd="disp(fullfile(__octave_config_info__('libdir'),'octave'));" - libprefix=${DESTDIR}/$(octavecommand "${cmd}" || die) - octprefix="${shareprefix}/packages" || die - archprefix="${libprefix}/packages" || die + libprefix=${DESTDIR}/$(edo octavecommand "${cmd}") + octprefix="${shareprefix}/packages" + archprefix="${libprefix}/packages" if [[ ! -e "${octprefix}" ]]; then - mkdir -p "${octprefix}" || die + edo mkdir -p "${octprefix}" fi if [[ ! -e "${archprefix}" ]]; then - mkdir -p "${archprefix}" || die + edo mkdir -p "${archprefix}" fi cmd=" warning('off','all'); @@ -224,7 +224,7 @@ _octaveforge_pkg_install() { pkg('local_list',fullfile('${shareprefix}','octave_packages')); pkg('install','-nodeps','-verbose','${OCT_PACKAGE}'); " - octavecommand "${cmd}" || die + edo octavecommand "${cmd}" cmd=" warning('off','all'); pkg('prefix','${octprefix}','${archprefix}'); @@ -234,7 +234,7 @@ _octaveforge_pkg_install() { disp(l{cellfun(@(x)strcmp(x.name,'${PN}'),l)}.dir); ${stripcmd} " - oct_pkgdir=$(octavecommand "${cmd}" || die) + oct_pkgdir=$(edo octavecommand "${cmd}") fi export oct_pkgdir } From f16ca432c7b1c33c7a30fe63ffc162b7f7e6fd0d Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Tue, 31 May 2022 19:52:57 +0200 Subject: [PATCH 02/50] R-packages.eclass: use edo for all the commands Signed-off-by: Alessandro Barbieri --- eclass/R-packages.eclass | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/eclass/R-packages.eclass b/eclass/R-packages.eclass index 0be59a20ca..4c4b16fd9a 100644 --- a/eclass/R-packages.eclass +++ b/eclass/R-packages.eclass @@ -12,7 +12,7 @@ # Alessandro Barbieri # @SUPPORTED_EAPIS: 7 -inherit eutils optfeature toolchain-funcs +inherit edo eutils optfeature toolchain-funcs case ${EAPI} in 7) ;; @@ -37,9 +37,9 @@ BDEPEND="sys-apps/pkgcore" # will contain symlinks to everything in _movelink() { if [[ -e "${1}" ]]; then - local rp1="$(realpath ${1})" || die - mv "${rp1}" "${2}" || die - cp -rsf "${2}" "${rp1}" || die + local rp1="$(edo realpath ${1})" + edo mv "${rp1}" "${2}" + edo cp -rsf "${2}" "${rp1}" fi } @@ -49,7 +49,7 @@ _movelink() { R-packages_src_unpack() { unpack ${A} if [[ -d "${PN//_/.}" ]] && [[ ! -d "${P}" ]]; then - mv "${PN//_/.}" "${P}" || die + edo mv "${PN//_/.}" "${P}" fi } @@ -57,9 +57,9 @@ R-packages_src_unpack() { # @DESCRIPTION: # function to remove unwanted files from the sources R-packages_src_prepare() { - rm -f LICENSE || die + edo rm -f LICENSE default - mkdir -p "${T}/R" || die + edo mkdir -p "${T}/R" } # @FUNCTION: R-packages_src_configure @@ -89,7 +89,7 @@ R-packages_src_compile() { LDFLAGS=${LDFLAGS// /\\ } \ MAKEOPTS=${MAKEOPTS// /\\ } \ " \ - R CMD INSTALL . -d -l "${T}/R" "--byte-compile" || die + edo R CMD INSTALL . -d -l "${T}/R" "--byte-compile" } @@ -99,35 +99,35 @@ R-packages_src_compile() { # documentation and examples to docsdir, symlinked back to R site-library (to allow access from within R) # everything else to R site-library R-packages_src_install() { - pushd "${T}/R/${PN//_/.}" || die + edo pushd "${T}/R/${PN//_/.}" local DOCS_DIR="/usr/share/doc/${PF}" - mkdir -p "${ED}/${DOCS_DIR}" || die + edo mkdir -p "${ED}/${DOCS_DIR}" for i in NEWS.md README.md DESCRIPTION examples CITATION INDEX NEWS WORDLIST News.Rd ; do - _movelink "${i}" "${ED}${DOCS_DIR}/${i}" || die + edo _movelink "${i}" "${ED}${DOCS_DIR}/${i}" docompress -x "${DOCS_DIR}/${i}" done if [[ -e html ]]; then - _movelink html "${ED}${DOCS_DIR}/html" || die + edo _movelink html "${ED}${DOCS_DIR}/html" docompress -x "${DOCS_DIR}/html" fi if [[ -e doc ]]; then - pushd doc || die + edo pushd doc for i in * ; do - _movelink "${i}" "${ED}${DOCS_DIR}/${i}" || die + edo _movelink "${i}" "${ED}${DOCS_DIR}/${i}" docompress -x "${DOCS_DIR}/${i}" done - popd || die + edo popd fi if [[ -e doc/html ]]; then docompress -x "${DOCS_DIR}/html" fi docompress -x "${DOCS_DIR}" - rm -rf tests test || die + edo rm -rf tests test insinto "/usr/$(get_libdir)/R/site-library" doins -r "${T}/R/${PN//_/.}" @@ -139,7 +139,7 @@ R-packages_src_install() { R-packages_pkg_postinst() { if [[ -v SUGGESTED_PACKAGES ]]; then for p in ${SUGGESTED_PACKAGES} ; do - pexist=$(pquery -n1 "${p}" 2>/dev/null) || die + pexist=$(edo pquery -n1 "${p}" 2>/dev/null) if [[ -n "${pexist}" ]]; then optfeature "having the upstream suggested package" "${p}" fi From a90f3f016fb6e7dc559c817200e4a6145556d801 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Wed, 1 Jun 2022 00:47:36 +0200 Subject: [PATCH 03/50] dev-ml/inotify: add 2.4 Signed-off-by: Alessandro Barbieri --- dev-ml/inotify/Manifest | 1 + dev-ml/inotify/inotify-2.4.ebuild | 33 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 dev-ml/inotify/inotify-2.4.ebuild diff --git a/dev-ml/inotify/Manifest b/dev-ml/inotify/Manifest index 5968c94622..6028fefd53 100644 --- a/dev-ml/inotify/Manifest +++ b/dev-ml/inotify/Manifest @@ -1 +1,2 @@ DIST inotify-2.3_p20211118.tar.gz 15870 BLAKE2B cd9b80dcf924ef9fd3c4b95e2e105e17dcfb3b4897b9552ac87b4f8d59dc128f76c6aa95bbf2647b2b60577b53abde003391ba05833ce5ddf0ebbb366b608780 SHA512 3ac6b739797a7d2bafcbe007bd467841eeab8ceecc50dc3a71cd24e0d24da846d9166166a45d6b07d9717d3bab649cd1619ebc8964149700522a7082c1b0d3d5 +DIST inotify-2.4.gh.tar.gz 16439 BLAKE2B 9d96e07b80b594deb3840dd563320de0f53334927e106a4b1e4f9716ad509d97e3cc6003d5386861a4bc00d00031e348a3a32667b4e270dd3aaa2dc46436831f SHA512 d164ab997517008671fdd60ab219cf1539f75928334838f416e31799a2c5198a97eb9d795225c3bb40cc41ac8431022c26b7c8b78ad2d45673158a5e2e554997 diff --git a/dev-ml/inotify/inotify-2.4.ebuild b/dev-ml/inotify/inotify-2.4.ebuild new file mode 100644 index 0000000000..9d9e441113 --- /dev/null +++ b/dev-ml/inotify/inotify-2.4.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +MYPN="ocaml-${PN}" + +DESCRIPTION="OCaml bindings for inotify" +HOMEPAGE=" + https://github.com/whitequark/ocaml-inotify + https://opam.ocaml.org/packages/inotify/ +" +SRC_URI="https://github.com/whitequark/${MYPN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}/${MYPN}-${PV}" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="ocamlopt test" + +RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]" +DEPEND=" + ${RDEPEND} + test? ( + >=dev-ml/ounit2-2.0 + >=dev-ml/ocaml-fileutils-0.4.4 + dev-ml/lwt + ) +" + +RESTRICT="!test? ( test )" From 473d4ede7e72f53122b8ab5bfb5df6a5cffda139 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Wed, 1 Jun 2022 13:06:28 +0200 Subject: [PATCH 04/50] sci-libs/plasma: new package, add 21.8.29 Signed-off-by: Alessandro Barbieri --- sci-libs/plasma/Manifest | 1 + sci-libs/plasma/metadata.xml | 15 ++++++++ sci-libs/plasma/plasma-21.8.29.ebuild | 54 +++++++++++++++++++++++++++ 3 files changed, 70 insertions(+) create mode 100644 sci-libs/plasma/Manifest create mode 100644 sci-libs/plasma/metadata.xml create mode 100644 sci-libs/plasma/plasma-21.8.29.ebuild diff --git a/sci-libs/plasma/Manifest b/sci-libs/plasma/Manifest new file mode 100644 index 0000000000..b805bc355d --- /dev/null +++ b/sci-libs/plasma/Manifest @@ -0,0 +1 @@ +DIST plasma-21.8.29.tar.gz 596586 BLAKE2B c41e8b86827ec0137b35bd882ae09acfdcf81f75dc45c17be79b2f08f237ce9c82c58fb4815f1c7b285df7ce9f7e3308d1fb7d0b5596dbb72d2583ccae9af8fd SHA512 4f56d4e31c2fdf52d4504856d3fb54f49f5f1b946e477a0125b24eabf11737064e81ba4fd87e6c3d480259e8a97bdcf13d7db2925a55e4a5ef595b2fbb94d684 diff --git a/sci-libs/plasma/metadata.xml b/sci-libs/plasma/metadata.xml new file mode 100644 index 0000000000..690a401a99 --- /dev/null +++ b/sci-libs/plasma/metadata.xml @@ -0,0 +1,15 @@ + + + + + lssndrbarbieri@gmail.com + Alessandro Barbieri + + + https://bitbucket.org/icl/plasma/issues + icl/plasma + NLAFET/plasma + + PLASMA is a software package for solving problems in dense linear algebra using OpenMP. PLASMA provides implementations of state-of-the-art algorithms using cutting-edge task scheduling techniques. PLASMA currently offers a collection of routines for solving linear systems of equations, least squares problems, eigenvalue problems, and singular value problems. + + diff --git a/sci-libs/plasma/plasma-21.8.29.ebuild b/sci-libs/plasma/plasma-21.8.29.ebuild new file mode 100644 index 0000000000..7ef1155920 --- /dev/null +++ b/sci-libs/plasma/plasma-21.8.29.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python2_7 ) + +inherit cmake edo python-any-r1 + +DESCRIPTION="PLASMA parallel library for dense linear algebra" +HOMEPAGE=" + https://bitbucket.org/icl/plasma + https://github.com/NLAFET/plasma +" +SRC_URI="https://bitbucket.org/icl/plasma/downloads/${P}.tar.gz" + +KEYWORDS="~amd64" +LICENSE="BSD-2" +SLOT="0" +# TODO: magma (requires cuda) + +RDEPEND=" + dev-lang/lua + virtual/blas + virtual/cblas + virtual/lapack + virtual/lapacke +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig +" + +DOCS=( README.md ChangeLog ) + +src_prepare() { +# edo rm -r tools/lua* + edo sed -e "s|DESTINATION lib|DESTINATION $(get_libdir)|g" -i CMakeLists.txt + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DPLASMA_DETECT_LUA=ON + -DPLASMA_DETECT_MAGMA=OFF + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + einstalldocs +} From 99e0152ae12d0ea0c5b7fc80f7b93529438a04ad Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Wed, 1 Jun 2022 13:50:17 +0200 Subject: [PATCH 05/50] sys-apps/ov: fix completion generation Signed-off-by: Alessandro Barbieri --- sys-apps/ov/ov-0.11.1.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys-apps/ov/ov-0.11.1.ebuild b/sys-apps/ov/ov-0.11.1.ebuild index 7e9bc63ec4..e6ecd04e7b 100644 --- a/sys-apps/ov/ov-0.11.1.ebuild +++ b/sys-apps/ov/ov-0.11.1.ebuild @@ -904,9 +904,9 @@ RESTRICT="!test? ( test )" src_compile() { ego build -v -x -o ${PN} -ldflags="-X main.Version=${PV}" || die - edo ./ov completion fish > ov.fish - edo ./ov completion bash > ov.bash - edo ./ov completion zsh > ov.zsh + edo ./ov --completion fish > ov.fish + edo ./ov --completion bash > ov.bash + edo ./ov --completion zsh > ov.zsh } src_install() { From 5d2dc7843a8f8528829561f47167702168c65fd2 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Thu, 2 Jun 2022 02:22:38 +0200 Subject: [PATCH 06/50] sys-cluster/parsec: EAPI 8 Signed-off-by: Alessandro Barbieri --- sys-cluster/parsec/Manifest | 2 +- ....2012.ebuild => parsec-3.0.2012-r1.ebuild} | 56 ++++++++++++++----- 2 files changed, 43 insertions(+), 15 deletions(-) rename sys-cluster/parsec/{parsec-3.0.2012.ebuild => parsec-3.0.2012-r1.ebuild} (71%) diff --git a/sys-cluster/parsec/Manifest b/sys-cluster/parsec/Manifest index 6f06e9d610..b0a22b5f3e 100644 --- a/sys-cluster/parsec/Manifest +++ b/sys-cluster/parsec/Manifest @@ -1 +1 @@ -DIST parsec-3.0.2012.tar.bz2 735621 BLAKE2B a17a5d6a6c0c0859a4836bc43603181d5468b8b56ffbd3e8263a9e9fe5224bbbfeda3c11ba2271cf3b7ceb3cf6920ce34d79bda23cdec88e410c5235eb5a28df SHA512 34b322338e41b405e918f6ade308c22f77446668fec1ba0600b03131b9ee4e4108ee921e70c857ea47fae5573d1c921fa12d33ddfccaa7ccdbe480e612e9161d +DIST parsec-3.0.2012.tar.gz 918622 BLAKE2B bcf3b8fcb25282bca2b48b1cfdabf0201384d198235868d42e06cfb1773ed31006b0756a3dc60a3740a9cf3fca95676101ab308015b1b7c160767dc751196385 SHA512 1e76cd2d6dcf791c935d2de22ee66329bdda0fb91ee03d0e9ec7d1d42c5762406efbb562a2b87a421c6c32cf141638338a5a90d584fc7611cbe81a061db4f109 diff --git a/sys-cluster/parsec/parsec-3.0.2012.ebuild b/sys-cluster/parsec/parsec-3.0.2012-r1.ebuild similarity index 71% rename from sys-cluster/parsec/parsec-3.0.2012.ebuild rename to sys-cluster/parsec/parsec-3.0.2012-r1.ebuild index 24ab099e36..26286f3dc8 100644 --- a/sys-cluster/parsec/parsec-3.0.2012.ebuild +++ b/sys-cluster/parsec/parsec-3.0.2012-r1.ebuild @@ -1,17 +1,21 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DOCS_BUILDER="doxygen" DOCS_DIR="docs/doxygen" +PYTHON_COMPAT=( python3_{8..11} pypy3 ) -inherit cmake fortran-2 docs +inherit cmake edo fortran-2 docs python-single-r1 DESCRIPTION="Parallel Runtime Scheduler and Execution Controller" -HOMEPAGE="https://bitbucket.org/icldistcomp/parsec" -SRC_URI="https://bitbucket.org/icldistcomp/parsec/get/${P}.tar.bz2" -S="${WORKDIR}/icldistcomp-${PN}-d2ae4175f072" +HOMEPAGE=" + https://github.com/icldisco/parsec + https://bitbucket.org/icldistcomp/parsec +" +SRC_URI="https://github.com/ICLDisco/${PN}/archive/refs/tags/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" LICENSE="BSD" SLOT="0" @@ -40,15 +44,18 @@ IUSE_PARSEC_PROF=" parsec_prof_grapher +parsec_prof_mmap parsec_prof_otf2 - parsec_prof_pins - parsec_prof_ptg - parsec_prof_rusage + +parsec_prof_pins + parsec_prof_ptg-internal-init + parsec_prof_rusage-eu parsec_prof_scheduling-events - +parsec_prof_thread + +parsec_prof_helper-thread +" +IUSE=" +${IUSE_PARSEC_DEBUG} ${IUSE_PARSEC_DIST} ${IUSE_PARSEC_PROF} ++cxx debug +devel-headers fortran +home-config-files +mpi profile +sched-deps-mask sim test +tools " -IUSE="${IUSE_PARSEC_DEBUG} ${IUSE_PARSEC_DIST} ${IUSE_PARSEC_PROF} +cxx debug +devel-headers fortran +home-config-files +mpi profile +sched-deps-mask sim test +tools" -#TODO: gd vite tau +#TODO: opencl vite tau RDEPEND=" dev-util/valgrind sys-apps/hwloc @@ -57,6 +64,15 @@ RDEPEND=" mpi? ( virtual/mpi ) parsec_prof_otf2? ( sys-cluster/otf2 ) parsec_prof_pins? ( dev-libs/papi ) + tools? ( + profile? ( + ${PYTHON_DEPS} + sys-libs/zlib + media-gfx/graphviz + media-libs/gd:2[jpeg,png] + $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]') + ) + ) " DEPEND="${RDEPEND}" BDEPEND=" @@ -66,6 +82,8 @@ BDEPEND=" RESTRICT="!test? ( test )" REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + test? ( parsec_prof_pins ) ?? ( mpi sim ) ?? ( parsec_debug_noisier parsec_debug_history ) ?? ( parsec_prof_dry-body parsec_prof_dry-dep parsec_prof_dry-run ) @@ -76,6 +94,15 @@ REQUIRED_USE=" pkg_setup() { fortran-2_pkg_setup + python-single-r1_pkg_setup +} + +src_prepare() { + edo sed \ + -e "s|\${CMAKE_INSTALL_PREFIX}/|${D}/\${CMAKE_INSTALL_PREFIX}/|g" \ + -e "s|--prefix|--root ${D} --prefix|g" \ + -i tools/profiling/python/CMakeLists.txt + cmake_src_prepare } src_configure() { @@ -94,6 +121,7 @@ src_configure() { -DPARSEC_GPU_WITH_OPENCL=OFF -DPARSEC_PROF_TAU=OFF + -DBUILD_TESTING=$(usex test) -DBUILD_TOOLS=$(usex tools) -DPARSEC_DEBUG=$(usex debug) -DPARSEC_DEBUG_HISTORY=$(usex parsec_debug_history) @@ -110,13 +138,13 @@ src_configure() { -DPARSEC_PROF_DRY_RUN=$(usex parsec_prof_dry-run) -DPARSEC_PROF_GRAPHER=$(usex parsec_prof_grapher) -DPARSEC_PROF_PINS=$(usex parsec_prof_pins) - -DPARSEC_PROF_RUSAGE_EU=$(usex parsec_prof_rusage) + -DPARSEC_PROF_RUSAGE_EU=$(usex parsec_prof_rusage-eu) -DPARSEC_PROF_TRACE=$(usex profile) -DPARSEC_PROF_TRACE_ACTIVE_ARENA_SET=$(usex parsec_prof_active-arena-set) - -DPARSEC_PROF_TRACE_PTG_INTERNAL_INIT=$(usex parsec_prof_ptg) + -DPARSEC_PROF_TRACE_PTG_INTERNAL_INIT=$(usex parsec_prof_ptg-internal-init) -DPARSEC_PROF_TRACE_SCHEDULING_EVENTS=$(usex parsec_prof_scheduling-events) -DPARSEC_PROF_TRACE_SYSTEM="${trace}" - -DPARSEC_PROFILING_USE_HELPER_THREAD=$(usex parsec_prof_thread) + -DPARSEC_PROFILING_USE_HELPER_THREAD=$(usex parsec_prof_helper-thread) -DPARSEC_PROFILING_USE_MMAP=$(usex parsec_prof_mmap) -DPARSEC_WANT_HOME_CONFIG_FILES=$(usex home-config-files) -DPARSEC_WITH_DEVEL_HEADERS=$(usex devel-headers) From 3e358fa62562bfd581b481f436e829487db14715 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Thu, 2 Jun 2022 02:55:14 +0200 Subject: [PATCH 07/50] profiles/desc: fix useflag name Signed-off-by: Alessandro Barbieri --- profiles/desc/parsec_prof.desc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/profiles/desc/parsec_prof.desc b/profiles/desc/parsec_prof.desc index c6f71c4128..b35c79134f 100644 --- a/profiles/desc/parsec_prof.desc +++ b/profiles/desc/parsec_prof.desc @@ -9,10 +9,11 @@ dry-body - Disable calls to the actual bodies, no computation is performed dry-dep - Disable calls to the actual data transport, remote dependencies are notified, but no data movement takes place dry-run - Disable calls to the actual bodies and do not move the data between nodes, unfold the dependencies only grapher - Enable the generation of the dot graph representation during execution +helper-thread - Use an extra thread to progress the data movements mmap - Use MMAP to create the profile files otf2 - Force otf2 to be the profiling system pins - Enable the use of the PaRSEC callback instrumentation system -ptg - Generate Profiling traces for the internal_init tasks in the PTG interface -rusage - Print the rusage per execution unit for each progress +ptg-internal-init - Generate Profiling traces for the internal_init tasks in the PTG interface +rusage-eu - Print the rusage per execution unit for each progress scheduling-events - Enable the tracing of fine-grained scheduling details during execution -prof-tau - Experimental usage of TAU profiling framework +tau - Experimental usage of TAU profiling framework From c5b96369a66f934c2f6a877d61eb2652cf0b47b0 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Thu, 2 Jun 2022 03:03:41 +0200 Subject: [PATCH 08/50] sci-mathematics/clasp: add manpage Signed-off-by: Alessandro Barbieri --- ...asp-3.3.8.ebuild => clasp-3.3.8-r1.ebuild} | 11 ++- .../clasp/files/clasp-manpage.patch | 68 +++++++++++++++++++ 2 files changed, 77 insertions(+), 2 deletions(-) rename sci-mathematics/clasp/{clasp-3.3.8.ebuild => clasp-3.3.8-r1.ebuild} (84%) create mode 100644 sci-mathematics/clasp/files/clasp-manpage.patch diff --git a/sci-mathematics/clasp/clasp-3.3.8.ebuild b/sci-mathematics/clasp/clasp-3.3.8-r1.ebuild similarity index 84% rename from sci-mathematics/clasp/clasp-3.3.8.ebuild rename to sci-mathematics/clasp/clasp-3.3.8-r1.ebuild index d033cf20f8..920e6506a4 100644 --- a/sci-mathematics/clasp/clasp-3.3.8.ebuild +++ b/sci-mathematics/clasp/clasp-3.3.8-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake flag-o-matic +inherit cmake edo flag-o-matic DESCRIPTION="A conflict-driven nogood learning answer set solver" HOMEPAGE=" @@ -24,10 +24,11 @@ DEPEND=" " RESTRICT="!test? ( test )" +PATCHES=( "${FILESDIR}/${PN}-manpage.patch" ) src_prepare() { append-cxxflags "-I/usr/include/catch2" - rm tests/catch.hpp || die + edo rm tests/catch.hpp cmake_src_prepare } @@ -45,3 +46,9 @@ src_configure() { ) cmake_src_configure } + +src_install() { + cmake_src_install + doman clasp.1 + dodoc README.md CHANGES +} diff --git a/sci-mathematics/clasp/files/clasp-manpage.patch b/sci-mathematics/clasp/files/clasp-manpage.patch new file mode 100644 index 0000000000..136ab5ea4d --- /dev/null +++ b/sci-mathematics/clasp/files/clasp-manpage.patch @@ -0,0 +1,68 @@ +From: Thomas Krennwallner +Date: Wed, 30 Nov 2016 08:39:00 +0100 +Subject: Add clasp.1 manpage + +--- /dev/null ++++ b/clasp.1 +@@ -0,0 +1,61 @@ ++.\" Hey, EMACS: -*- nroff -*- ++.\" First parameter, NAME, should be all caps ++.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection ++.\" other parameters are allowed: see man(7), man(1) ++.TH CLASP 1 "March 4, 2010" ++.\" Please adjust this date whenever revising the manpage. ++.\" ++.\" Some roff macros, for reference: ++.\" .nh disable hyphenation ++.\" .hy enable hyphenation ++.\" .ad l left justify ++.\" .ad b justify to both left and right margins ++.\" .nf disable filling ++.\" .fi enable filling ++.\" .br insert line break ++.\" .sp insert n+1 empty lines ++.\" for manpage-specific macros, see man(7) ++.SH NAME ++clasp \- a conflict-driven nogood learning answer set solver ++.SH SYNOPSIS ++.B clasp ++[\fInumber\fR] \fR[\fIoptions\fR] ++.SH DESCRIPTION ++This manual page documents briefly the ++.B clasp ++command. ++.PP ++.\" TeX users may be more comfortable with the \fB\fP and ++.\" \fI\fP escape sequences to invode bold face and italics, ++.\" respectively. ++\fBclasp\fP is an answer set solver for (extended) normal logic ++programs. It combines the high-level modeling capacities of answer set ++programming (ASP) with state-of-the-art techniques from the area of ++Boolean constraint solving. The primary clasp algorithm relies on ++conflict-driven nogood learning, a technique that proved very ++successful for satisfiability checking (SAT). Unlike other learning ++ASP solvers, clasp does not rely on legacy software, such as a SAT ++solver or any other existing ASP solver. Rather, clasp has been ++genuinely developed for answer set solving based on conflict-driven ++nogood learning. clasp can be applied as an ASP solver (on LPARSE ++output format), as a SAT solver (on simplified DIMACS/CNF format), or ++as a PB solver (on OPB format). ++.SH OPTIONS ++These programs follow the usual GNU command line syntax, with long ++options starting with two dashes (`-'). ++A summary of options is included below. ++For a complete description, see . ++.TP ++.B \-h, \-\-help ++Show summary of options. ++.TP ++.B \-v, \-\-version ++Show version of program. ++.SH SEE ALSO ++.BR gringo (1). ++.br ++.SH AUTHOR ++clasp was written by Benjamin Kaufmann . ++.PP ++This manual page was written by Thomas Krennwallner , ++for the Debian project (and may be used by others). From f087637b5be3200d0b9181162aa46bfd77e6bf21 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Thu, 2 Jun 2022 03:05:52 +0200 Subject: [PATCH 09/50] sci-libs/CombBLAS: restrict tests Closes: https://bugs.gentoo.org/849062 Signed-off-by: Alessandro Barbieri --- sci-libs/CombBLAS/CombBLAS-1.16.0_p20220331-r1.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/sci-libs/CombBLAS/CombBLAS-1.16.0_p20220331-r1.ebuild b/sci-libs/CombBLAS/CombBLAS-1.16.0_p20220331-r1.ebuild index f713134d29..a27963ccc9 100644 --- a/sci-libs/CombBLAS/CombBLAS-1.16.0_p20220331-r1.ebuild +++ b/sci-libs/CombBLAS/CombBLAS-1.16.0_p20220331-r1.ebuild @@ -25,6 +25,7 @@ DEPEND=" " RDEPEND="${DEPEND}" +RESTRICT="test" # tests require an MPI setup PATCHES=( "${FILESDIR}/${P}-rename-THRESHOLD.patch" "${FILESDIR}/${P}-psort.patch" From 98a0cf807bab7081a8475a229f6b36df8689f42d Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Thu, 2 Jun 2022 03:17:42 +0200 Subject: [PATCH 10/50] TODO.md: remove plasma Signed-off-by: Alessandro Barbieri --- TODO.md | 1 - sys-cluster/OpenHPC-meta/OpenHPC-meta-2.1.ebuild | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/TODO.md b/TODO.md index 7fd8209ffb..b7ec708112 100644 --- a/TODO.md +++ b/TODO.md @@ -23,7 +23,6 @@ Name | Buildsystem | Category | User | RFH | Dependency [compcert](https://compcert.org) | make | compiler | Alessandro-Barbieri | ✔ | ✖ [predictive](https://www.dr-qubit.org/predictive.html) | make | emacs | Alessandro-Barbieri | ✔ | ✖ [tau](http://www.cs.uoregon.edu/research/tau/home.php) | make | tools | Alessandro-Barbieri | ✖ -[plasma](https://github.com/NLAFET/plasma) | make | science | Alessandro-Barbieri | ✔ | ✔ [imb](https://software.intel.com/content/www/us/en/develop/articles/intel-mpi-benchmarks.html) | make | cluster | Alessandro-Barbieri | ✖ | ✔ [gnat-llvm](https://github.com/AdaCore/gnat-llvm) | make | compiler | Alessandro-Barbieri | ✔ | ✖ [csparse](https://people.sc.fsu.edu/~jburkardt/c_src/csparse/csparse.html) | make | science | Alessandro-Barbieri | ✖ | ✔ diff --git a/sys-cluster/OpenHPC-meta/OpenHPC-meta-2.1.ebuild b/sys-cluster/OpenHPC-meta/OpenHPC-meta-2.1.ebuild index 97a6bd69b1..e6ddfcda46 100644 --- a/sys-cluster/OpenHPC-meta/OpenHPC-meta-2.1.ebuild +++ b/sys-cluster/OpenHPC-meta/OpenHPC-meta-2.1.ebuild @@ -83,6 +83,7 @@ RDEPEND=" sci-libs/gsl[cblas-external] sci-libs/metis sci-libs/openblas[eselect-ldso] + sci-libs/plasma sci-libs/superlu ) @@ -110,9 +111,6 @@ RDEPEND=" #tau #scorep -# serial - #plasma - # slurm-server #pdsh-slurm From 7e254f1cef42ae5a0428c05bb3bd6c4929a8843f Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Wed, 1 Jun 2022 11:40:09 +0500 Subject: [PATCH 11/50] app-vim/openbsd-style: add myself as a maintainer Signed-off-by: Anna (cybertailor) Vyalkova --- app-vim/openbsd-style/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-vim/openbsd-style/metadata.xml b/app-vim/openbsd-style/metadata.xml index 46ff3593dd..c8b0192e7e 100644 --- a/app-vim/openbsd-style/metadata.xml +++ b/app-vim/openbsd-style/metadata.xml @@ -2,7 +2,7 @@ - cyber@sysrq.in + cyber+gentoo@sysrq.in Anna From d64ed75d2042782afbe6faa66d7359ccd30c1c15 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Wed, 1 Jun 2022 12:09:42 +0500 Subject: [PATCH 12/50] app-misc/cheat: update EAPI 7 -> 8 Signed-off-by: Anna (cybertailor) Vyalkova --- app-misc/cheat/Manifest | 59 ----------------------- app-misc/cheat/cheat-4.2.3.ebuild | 77 ++----------------------------- 2 files changed, 5 insertions(+), 131 deletions(-) diff --git a/app-misc/cheat/Manifest b/app-misc/cheat/Manifest index bbccfe8563..d42831bade 100644 --- a/app-misc/cheat/Manifest +++ b/app-misc/cheat/Manifest @@ -1,60 +1 @@ DIST cheat-4.2.3.tar.gz 1615016 BLAKE2B c33ec7bd083580d6a8bee955e85dd8cc7b3a0bafe4dec52928862192aaa67832b4972e05ea97328fd7cbfe35c41fd904832a5473aecfa096e4845e488896bb6f SHA512 c523b3bd815d8db397c9ffa28d66c0ef7fd3c9392bd144ab0710dfd3472a47544cb2b8745b0d700099ea844c15e526f89d71ec6b233bf1d371c48cb86b100467 -DIST github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod 36 BLAKE2B d0745757255951a92d471fdb1eeaae2e118d367caf0fcea00a405536d7e30609f22276e7a453aac1ca38063635df798a0843f279c178d394a7cbef9c9f9b3c27 SHA512 87ff97fea3e25aa903503e56fe5afc337918f7253dd7175833adb144a7296451a7d4ebd76df504737a5b4c5237b1102920728d21a587957d5d25db5d38e1217b -DIST github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip 73310 BLAKE2B b0aaa346be477c14bd504f98219659c8a82ba08afdd94f1a5ffbb44cfcb6cc9b014c1ee35aec6071d4733134931e6d2a569940e9f1f06a5e69b00f56d82579e9 SHA512 adf9a3b8bda92edd028f497ca10648900a7aac4dae9372469b511afc74e79f8b990e448f375ab2a8df651a491bab5413196c06db531adc10358865f74de6f26b -DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.1.mod 687 BLAKE2B 037093f3c31b25f31fdb74e339017a8d9b9d8288c45e17b0f3e2fa68dc2e202a497de538003135ccb129e5011085188ab1cfc170982bd681a318469734931b51 SHA512 3446750138a9161864d481e2ffdb0076dca59e2b0ea4dc9538d40f024b499f4a632e128be53a7da3ecbb4b3205d60ba10890376ff7212fccd8443e77f1aa41ad -DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.1.zip 844766 BLAKE2B 502d3f48542d93e652d32cc95487df9ad03d7e0a6278b3a67ad2d7e8a0b9551241275d44c9688e96d09d5dad81d70100d8d21729f3ee996f1294dbb30d8e95c2 SHA512 ffdc4ccb5b9335406d699bad88a1a1d62b6da4d47c74c1c5a26b6247e2650819a7550bbe6e02b2b2e606d7cfe6f402c8cc8f6309816d8bca6c34921f63146b6c -DIST github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod 36 BLAKE2B 60ece6720c6735e5b01efc335fef7d7f1186087068e573d5fa073b811053ea60b761350f9c371dada8cdeb5b285911c4ff87495b800f9c19ffeb69739f4b143b SHA512 971e35af5346054a0930f5543dc936c5f32ca801433d3ca26461ae7c1583b4f814376e8880f4d5329c46c36a3bde5ee4290b825bf19fd70c6bf2fbbab03f8ff1 -DIST github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip 4919 BLAKE2B a939fbc897831f04ef6995f3d6220d56b8b3a8e3ae4486b605b9601aeb5bf764249cdd619248ba55b650e15e208a720fe1571df99a850a0b742755ab36f86c0f SHA512 7947f0ed3b2b42b8454af3cfb0fb27ec38af8234936d7cfe29017d1168b80873dbb6ac1345719fc5c405df9c814bd732a4ecf6f985da880f4ad83cf2f25b7834 -DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.mod 219 BLAKE2B 188d73a4d4cf4bcb52cea7b32d8d8898086532d50e8ed0e92825e2b34ae1e035111dbc27b995b9a12d70e6be509d99bc693a0af8e3734641dc23cd1da39cf984 SHA512 165cb7ab17309c66d509af018c8a521bd90f9a58fec8fa9437e5b32aa2105ef1be19a1a0a1b13a51300e308c5e63c6cb74897ad938bd6f8b3bfb2d372347d02f -DIST github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mod 34 BLAKE2B 6b3b01c8066b701d0ea30efa5b144fe9bfe8e9f196ce4f0dce058e0947890e4f2d458bdade3816c3df1e35a972bbeef478c91e02579f81116603d0dc20855315 SHA512 5896c9174737c300a726f70b7d6300b892e790e41598b5f82ec82aca020f93159f9ea94afb6a4db605aca196d527a7a42df9b1babb73b8d182fe6749e95975d0 -DIST github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.zip 5773 BLAKE2B c1026dc04da3122194368b90c597d7a3b7a90279d5ca27e6f3b397f0054c4f51dbb61205804fb0257c07ce078ec3b328fdc638e752411b379474cd51d2337488 SHA512 0c048e8778641577f394433483fdd4f916c9ff16ddd4d7b1b37c4b999b5107353e6867c2b2430b183027807e53f160ebb2419ad85f1d1b2e0bc0b190efe47352 -DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod 39 BLAKE2B 71e70b038748ac19649698b1c0e59af99ce0b1c5d7c9177e8c55751eea9e82d4828b27dabb17cc04978142c9fb7a54d90c062a7cc3fdbb86116034026e40baf6 SHA512 9cf1687520933d3d6bbec9d7c51472998d3bdbe1b3d2a7478fca80f9e7944f9040a2b8ec7d49f1458bd46a5121bae4810d314725add41efd413319a5006b944a -DIST github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.mod 39 BLAKE2B 066fe4ec077d7fc003ec3450de6899062f4e0500efa3b410cf2afd8315c2f7166e4a21605d5970d3be17692b8b4d2fd0e4b48b32a01a09a310799c3faa1c31b3 SHA512 ce1047915fc0d4f3dc7148b20b90edbd878c7f0016823997aa5dc030d000f59658ddffcd911fc98a387387ac2175ddad9ceb9c8af18e0595549ea2c3859df6a9 -DIST github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.zip 6032 BLAKE2B 0265eaf68c186fc505148e41ca53a84aa096eae82243502ccb3b3703bd248c3b42ff0cd87015d11e427dccc9564c69d58676df34c353d7fac22ab2260061b137 SHA512 04bbd7a8cef79a432684a2c84f4180401893fda4f43f18e7e78d9dff6380b645aa86a41c54526f8f18b8599889c4a167da364e197f6d090fa3450f71d6aa5177 -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb -DIST github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.4.0.mod 34 BLAKE2B 900b7c39f85b3c32ae1cdcb56063defb238ec2dd7620f1a13b0a7b7a5c1eb237854d00d7a6063cc546fb6c7a41bb0fe6d71ba4589bca57d8dd1183a806685f9e SHA512 91475e539eb45a642590606c6174f07b3461691aa18cc232362694890b446a7f033834676273e33cac54db288a793fd70d07d5997997716f954d1806ac879091 -DIST github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.4.0.zip 692349 BLAKE2B 02c92a8873c16c3cc5d0f558e760e4f6f9a7c08b4d16b264a667c6a78f42264aa156cd1ef4740b08c8d417d9b138d8dabdbf47cd4e28c2708a6650f9adb4c0c6 SHA512 0e0de83ae85cbd89d7594697a9e1786338cf2f27083f2fe3f95d5eb127fe488169472a5efc59bd5023ee3a27eff2074aa4ec2909ccffa38aedd83c529fa2c9a2 -DIST github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod 35 BLAKE2B 03d1120023db31c39a39e5b7f336b05bed30e652c890e12986c81778e49c771e97e8ff0dcbb053f00627ffdb229223b385a9524fa1d35ee83860ca3e0b0701e8 SHA512 7f90935b89bc2fc83b0f52d0090d8cc3f7262415b1feb9c19420f663da4ab8d87bb5cf42c2a558038c57e3e772b468132509b45fe40a4993d0b64b80aeb64ebf -DIST github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.zip 45402 BLAKE2B bcaba5db279468e0879501ec5f859edc4d600d777fad112a7f679b915ca14fce6b8f7b2e0b75d3d76f11d6ee37710c03c83d70e2fb2b793b2f9f1656e52a3a92 SHA512 15d0c4f21eb5fbc1546b79e7c52c553859835fdd2850b82fe03edf5419779c33449074d9ac353e99340096b138c72ef98ca057eb51e0d7777d2d926a847836f2 -DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d -DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb -DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce -DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod 68 BLAKE2B 91222794e2d517a33cb43bb9430e2e7b497ace820ab8c47dcde253226e54f08b922404df7ba7a2dc74555a059e95b81471dc36fc5b63b55e385004fd9a16d61f SHA512 9fbff125d97ce2c4b9b301021a987edbeb686b37927504df4e5c2f0ddbebc8ed28ee5152de7db2eceb0a0fc5728579823dc4145f36df9ba1961b9c2da1ac4461 -DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip 12607 BLAKE2B 40090e35e5bfb0f1570cc11a3d3c3b6f9c4d097ffadb161280ac4dda90e7b74fe3784dbd31a74be243a2a0d6f3f3273f24a0dcb07523c7db8975171327de25d5 SHA512 5fbe5884d311244c5250d4a1b249749a84fc6a50d4d5d6b3967a4bccb317ebb807917fe540f13fea788abd863d7d2f2537a40b57cf156a3f920b15cd8b365ac0 -DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5 -DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503 -DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.14.mod 104 BLAKE2B e859512911c1621e5ba3e46249c5b9b5e4b0bae854bb3a18d7e39d6da27c93e133d43851d5e6bf2ede44fdee31801b19fe274b55a1f37b1291bf27262e2f2385 SHA512 23b01eb4023ff5018437ff98b55ada053eba49feab2777eed36d033f426c5456b143f3defbc3131dad1251205f3ffb3553e3c10bd98de80f0a462e8450d6d56c -DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.14.zip 8919 BLAKE2B fc84f4f16176d14f177f029cae5ecf0221a8f0ce716c499e8b5d49c8e1523673a2fbb600a769ac26be98b591b3cbc3730d447c412b2acd3eff7f878526c271a4 SHA512 c6401cf5af80ea2495cb63800ff39fb9490f212f3aae0ac1d86b3d37ce6734eb35aea00b35bd26532feab77ef80322e765925f302d77f664dd57163f67a8374e -DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee -DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2 -DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod 78 BLAKE2B 7cde27fce0ec4a1c5c2e5205fb962352037c873d6183a6c1d8a9d385fe6a3bc8c9b66590401f8a715960858576d100626889e02361860bde65f8b66074d93837 SHA512 ee531fe5de94a4f4fc57592864a42beaf57be600d3fc11205ff79b44615429ccf46922cc3d80ab8df77b2db31a85bf40248ce0b1e1079d6861f317828b3305ea -DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip 13281 BLAKE2B eb14a393cfba4230af192cd76a63a20568fe80ff650113640eb63d880c276307e792b0bc3339ea37f1387f78ee5e9f15a8ff66d0c4b8c8cfb09fddb1e73288fc SHA512 96747fb5890efdf10e0793afc08df1ced6dc8c71462397a0e4149f32f77470f1af6bf8fb2637693497d33a2a7483c4609380ee89ee0a85ce21102a32b7a1000e -DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0 -DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0 -DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902 -DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2 -DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod 32 BLAKE2B 9c0be7f17fe7a9156f124f7f67c3e15e14719d0b271f36d5d41ccfa5ff6c1b7887e0051df6eb3b29f29b40357d8e438598088b3c4f4df28fb81f030c8efa7ff3 SHA512 8b8b8958405a188b93adcdda0634aaa2961b5b8e0d3b3e1f768fb9c49c02b73cf3bb39027431e0c1d209abea6cb72a651c5776bf26391e81f4dc18c7bafa692c -DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod 281 BLAKE2B 15a1cb67527ae81338a77cffa1432cd83c798bd7094eadfbc88a7eb79f5236690dc2d5c93e3daefedb396516c41bf05da21b5e12966f69fd2663e7621267d015 SHA512 7af123ea69147856e23249740b882d90213ccc3f19cf698d960dd5950fa3f3f72c600854c5e0bb94977e6c5eab617736dcd20e180eebf599399215ad8c5c0051 -DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip 55374 BLAKE2B 39f93770143cb70ef29156c1d31247bcab91ca7cc02f4164ed28a98769f1eede3e680b9b41dc55371a4dcbfe27b92bfce546ee2f1ca447f8623fb3fd88174888 SHA512 908f2454a0722d403aa33ea6cd1d40617ae8b84c62efc9a5de0bcf9c40413b6ba8412ac831e4b54b237190131be56e23266a9e18b0b680da5fd588e889985da3 -DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5 -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383 -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52 -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655 -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.zip 1646674 BLAKE2B a2975e42ede4b3923b53f6c28b8360a49b47734e5512ffe9e52e8920f79af09420d3702d3d7e54e5755c04fddd0836e11c7fb83441065bf9dd31da363f5121a2 SHA512 6a36b9dd8ab6582abf0721e3fdfd19c2cbf9caf02a2f8aeff8952175553e35ab9f9972c2e524ad947e51e24f5eaee23984fc1670d512c04e50b2d71890c5d392 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip 41484 BLAKE2B 34fbdc1525bbea7fc6b7f74e74ab407ed03d3b58e25e9b3b79ec35945acce36b7c4be54388c1244d508c7cf67ac6e4f1ff7c9eb5245f01ff27dec82cfe87bdb8 SHA512 713c79551d48a99cc9feed3bcf71b7f1fe95270701787dfb114237bd358ad104d18ce7ca412f65d1ce6b7f94ffb6c01afe28c9b821e1a5378b05c93340aa8a49 -DIST gopkg.in%2Fyaml.v1%2F@v%2Fv1.0.0-20140924161607-9f9df34309c0.mod 24 BLAKE2B 53c69b9881885300c6a85eaac311d0f82f37e20a413be7d5a9f92b209fab255812d6d133472a77c76b4f388b7cc215e560ce85354f214264a4dfd555ddd9df6b SHA512 fc947323bc63bddcf27391e367d91391c89894a1f28dc0cb644f4ab3e60ede24b0ad82f01dd954943af45043890c8ab99b5047abf0b1d80049020e567ddb98d6 -DIST gopkg.in%2Fyaml.v1%2F@v%2Fv1.0.0-20140924161607-9f9df34309c0.zip 67419 BLAKE2B 2cb2c937d62a330cddc757cc8b1de8a9831fdac7670bce11b83c34a0a25644e3286940406df1417d6194756bbbf28c601a1e438d2c29fd40fd186945da8f3edb SHA512 f731b8df7820132eb2aef828af6c65fe5f43facdec9978807db2873477a1888cc3b0518676a316625bb12907a301bbc08b03c19c521ea20a9960d5264ff4a8d3 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod 95 BLAKE2B 888532a43aa7569fc03a62d78507081f30342eb4be40c01252683b16cd3658dd7b30d5f8a071dffe2c05f57bbee3afbc1ee4324c471788c633a878d498ff7d57 SHA512 2790882fbfa812468b9b3443630b1f1ee67a968eb20da8e4a1bfd410e4b516a8a7e77c07414b64f17e11e2151161b85d019e172cc833a45b19e66d4c70f89f82 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip 81183 BLAKE2B 0e3222d715fe7e9e8e9a10abad817f75bdd095f9af250d6bdf1ee2881930c739111de8b526175c9204995c48e0ade9852541a7f22b0ce1261f473986a2739182 SHA512 d6f4ac547609c943adfc6b518ff03ac09da566ba2b29466abe8f6db3d5a41ae7e5c187068dce4e77271905b1aa88497ca49a43bb9bbf9c94011b7ccf1b4b2f42 diff --git a/app-misc/cheat/cheat-4.2.3.ebuild b/app-misc/cheat/cheat-4.2.3.ebuild index de89eea1bb..d45719a630 100644 --- a/app-misc/cheat/cheat-4.2.3.ebuild +++ b/app-misc/cheat/cheat-4.2.3.ebuild @@ -1,80 +1,13 @@ # Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit bash-completion-r1 go-module optfeature -EGO_SUM=( - "github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38" - "github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod" - "github.com/alecthomas/chroma v0.9.1" - "github.com/alecthomas/chroma v0.9.1/go.mod" - "github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721" - "github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod" - "github.com/alecthomas/kong v0.2.4/go.mod" - "github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897" - "github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod" - "github.com/creack/pty v1.1.9/go.mod" - "github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964" - "github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod" - "github.com/davecgh/go-spew v1.1.0/go.mod" - "github.com/davecgh/go-spew v1.1.1" - "github.com/davecgh/go-spew v1.1.1/go.mod" - "github.com/dlclark/regexp2 v1.4.0" - "github.com/dlclark/regexp2 v1.4.0/go.mod" - "github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815" - "github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod" - "github.com/kr/pretty v0.1.0/go.mod" - "github.com/kr/pty v1.1.1/go.mod" - "github.com/kr/text v0.1.0/go.mod" - "github.com/kr/text v0.2.0" - "github.com/kr/text v0.2.0/go.mod" - "github.com/mattn/go-colorable v0.1.6/go.mod" - "github.com/mattn/go-isatty v0.0.12/go.mod" - "github.com/mattn/go-isatty v0.0.14" - "github.com/mattn/go-isatty v0.0.14/go.mod" - "github.com/mitchellh/go-homedir v1.1.0" - "github.com/mitchellh/go-homedir v1.1.0/go.mod" - "github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e" - "github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod" - "github.com/pkg/errors v0.8.1/go.mod" - "github.com/pkg/errors v0.9.1/go.mod" - "github.com/pmezard/go-difflib v1.0.0" - "github.com/pmezard/go-difflib v1.0.0/go.mod" - "github.com/sergi/go-diff v1.0.0/go.mod" - "github.com/sergi/go-diff v1.1.0" - "github.com/sergi/go-diff v1.1.0/go.mod" - "github.com/stretchr/objx v0.1.0/go.mod" - "github.com/stretchr/testify v1.2.2/go.mod" - "github.com/stretchr/testify v1.3.0/go.mod" - "github.com/stretchr/testify v1.4.0" - "github.com/stretchr/testify v1.4.0/go.mod" - "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod" - "golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod" - "golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod" - "golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c" - "golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod" - "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" - "gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f" - "gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod" - "gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0" - "gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod" - "gopkg.in/yaml.v2 v2.2.2/go.mod" - "gopkg.in/yaml.v2 v2.2.4/go.mod" - "gopkg.in/yaml.v2 v2.4.0" - "gopkg.in/yaml.v2 v2.4.0/go.mod" -) - -go-module_set_globals - DESCRIPTION="cheat allows you to create and view interactive cheatsheets on the command-line" HOMEPAGE="https://github.com/cheat/cheat" -SRC_URI=" - https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - ${EGO_SUM_SRC_URI} -" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" # licenses present in the final built # software. Checked with dev-go/golicense @@ -87,7 +20,7 @@ RDEPEND="zsh-completion? ( !app-shells/zsh-completions )" BDEPEND="man? ( app-text/pandoc )" src_compile() { - go build -o ${PN} ./cmd/${PN} || die "compile failed" + ego build -o ${PN} ./cmd/${PN} if use man; then pandoc -s -t man doc/${PN}.1.md -o doc/${PN}.1 || die "building manpage failed" @@ -95,7 +28,7 @@ src_compile() { } src_test() { - go test ./cmd/${PN} || die + ego test ./cmd/${PN} } src_install() { @@ -114,5 +47,5 @@ src_install() { } pkg_postinst() { - optfeature "To enable fzf integration export CHEAT_USE_FZF=true" app-shells/fzf + optfeature "fzf integration" app-shells/fzf } From af0420fb5d5d6d99e31e9f0b8ff9f37033167c60 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Thu, 2 Jun 2022 09:00:28 +0500 Subject: [PATCH 13/50] sci-biology/cmdock: fix CPU flags detection Signed-off-by: Anna (cybertailor) Vyalkova --- ...cmdock-0.1.4.ebuild => cmdock-0.1.4-r1.ebuild} | 8 +++++--- .../cmdock/files/cmdock-0.1.4-fix-detection.patch | 15 +++++++++++++++ sci-biology/cmdock/metadata.xml | 2 +- 3 files changed, 21 insertions(+), 4 deletions(-) rename sci-biology/cmdock/{cmdock-0.1.4.ebuild => cmdock-0.1.4-r1.ebuild} (90%) create mode 100644 sci-biology/cmdock/files/cmdock-0.1.4-fix-detection.patch diff --git a/sci-biology/cmdock/cmdock-0.1.4.ebuild b/sci-biology/cmdock/cmdock-0.1.4-r1.ebuild similarity index 90% rename from sci-biology/cmdock/cmdock-0.1.4.ebuild rename to sci-biology/cmdock/cmdock-0.1.4-r1.ebuild index 70befcfccb..cf79531ec0 100644 --- a/sci-biology/cmdock/cmdock-0.1.4.ebuild +++ b/sci-biology/cmdock/cmdock-0.1.4-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} pypy3 ) +PYTHON_COMPAT=( python3_{8..11} pypy3 ) BOINC_APP_OPTIONAL="true" @@ -14,7 +14,7 @@ DOCS_DIR="docs" inherit python-any-r1 boinc-app docs flag-o-matic meson DESCRIPTION="Program for docking ligands to proteins and nucleic acids" -HOMEPAGE="https://gitlab.com/Jukic/cmdock https://www.rxdock.org" +HOMEPAGE="https://gitlab.com/Jukic/cmdock" SRC_URI="https://gitlab.com/Jukic/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz" S="${WORKDIR}/${PN}-v${PV}" @@ -35,6 +35,8 @@ BDEPEND=" doc? ( app-doc/doxygen ) " +PATCHES=( "${FILESDIR}"/cmdock-0.1.4-fix-detection.patch ) + DOCS=( INSTALL.md README.md ) BOINC_MASTER_URL="https://www.sidock.si/sidock/" diff --git a/sci-biology/cmdock/files/cmdock-0.1.4-fix-detection.patch b/sci-biology/cmdock/files/cmdock-0.1.4-fix-detection.patch new file mode 100644 index 0000000000..fceae1e5cf --- /dev/null +++ b/sci-biology/cmdock/files/cmdock-0.1.4-fix-detection.patch @@ -0,0 +1,15 @@ +--- a/meson.build ++++ b/meson.build +@@ -79,8 +79,10 @@ + + cpp_compiler = meson.get_compiler('cpp') + +-extended_encoders_available = (cpp_compiler.has_header('emmintrin.h') and +- host_machine.cpu_family() == 'x86' and host_machine.cpu_family() == 'x86_64') ++extended_encoders_available = ( ++ cpp_compiler.has_header('emmintrin.h') and ++ (host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64') ++) + + if not extended_encoders_available + add_project_arguments('-DBUNDLE_NO_SSE', language: 'cpp') diff --git a/sci-biology/cmdock/metadata.xml b/sci-biology/cmdock/metadata.xml index beddf80905..3f0fcb55e2 100644 --- a/sci-biology/cmdock/metadata.xml +++ b/sci-biology/cmdock/metadata.xml @@ -4,7 +4,7 @@ Jukic/cmdock https://gitlab.com/Jukic/cmdock/-/issues - https://www.rxdock.org/documentation/devel/html + https://rxdock.gitlab.io/documentation/devel/html/ cyber+gentoo@sysrq.in From 0376686c148cb9ff7bdce3fd133ad19d6453687d Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Thu, 2 Jun 2022 09:09:11 +0500 Subject: [PATCH 14/50] app-crypt/certbot-dns-digitalocean: add 1.27.0, drop 1.25.0 Signed-off-by: Anna (cybertailor) Vyalkova --- app-crypt/certbot-dns-digitalocean/Manifest | 2 +- ...n-1.25.0.ebuild => certbot-dns-digitalocean-1.27.0.ebuild} | 4 ++-- profiles/package.mask | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) rename app-crypt/certbot-dns-digitalocean/{certbot-dns-digitalocean-1.25.0.ebuild => certbot-dns-digitalocean-1.27.0.ebuild} (84%) diff --git a/app-crypt/certbot-dns-digitalocean/Manifest b/app-crypt/certbot-dns-digitalocean/Manifest index 0c7107b6a7..b893d7e195 100644 --- a/app-crypt/certbot-dns-digitalocean/Manifest +++ b/app-crypt/certbot-dns-digitalocean/Manifest @@ -1 +1 @@ -DIST certbot-dns-digitalocean-1.25.0.tar.gz 1363030 BLAKE2B 7ff180dd61565d54a3b9660eaefa5a8345ae797e292913dcd995170b87df9474c4eabf15150ccd2d53a23106406acbe884363a92e134c82e82ad8c36041343b5 SHA512 50867c3e0d79e6237934a0c7c243c915f2bc7d7b01efb5a2e9694f0384033d131ba5538ad34f355d24b03806a6e30bc64f2fcced6dde41915e16ad75dc6fd855 +DIST certbot-1.27.0.gh.tar.gz 1366469 BLAKE2B e9ec47520e027a9d348e861ea7d070eff4857301be0d42be6965e4159d85ef60866aa70de76edd5e68b0d40d9544075aa28e9aa07a8e04dfbf3e1a7dd77fd1de SHA512 5db7836ae2eda27c088476c149e736ce7f41b85d871cf563c69e021dd8af2d64ed85c1482049edf0dffe6fd0c9591d66be3e22fbf617068600e12691c4802e5e diff --git a/app-crypt/certbot-dns-digitalocean/certbot-dns-digitalocean-1.25.0.ebuild b/app-crypt/certbot-dns-digitalocean/certbot-dns-digitalocean-1.27.0.ebuild similarity index 84% rename from app-crypt/certbot-dns-digitalocean/certbot-dns-digitalocean-1.25.0.ebuild rename to app-crypt/certbot-dns-digitalocean/certbot-dns-digitalocean-1.27.0.ebuild index 2b8b0c4be7..f0d35fa7a7 100644 --- a/app-crypt/certbot-dns-digitalocean/certbot-dns-digitalocean-1.25.0.ebuild +++ b/app-crypt/certbot-dns-digitalocean/certbot-dns-digitalocean-1.27.0.ebuild @@ -4,12 +4,12 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) -DISTUTILS_USE_SETUPTOOLS="rdepend" inherit distutils-r1 +MY_PN="certbot" DESCRIPTION="Digitalocean DNS Authenticator plugin for Certbot (Let's Encrypt Client)" HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/" -SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-${PV}.gh.tar.gz" S="${WORKDIR}/certbot-${PV}/${PN}" LICENSE="Apache-2.0" diff --git a/profiles/package.mask b/profiles/package.mask index bd276ac633..0459c1d3b2 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -26,10 +26,6 @@ gnome-extra/extension-manager # Depends on unavailable dev-python/regex-2022.3.15 dev-python/dateparser -# Andrew Ammerlaan (2022-05-24) -# Hard depends on removed version of app-crypt/certbot, needs bump -app-crypt/certbot-dns-digitalocean - # Andrew Ammerlaan (2022-05-28) # Depends on non-existent versions of pyparsing, invalid dependency # on dev-embedded/esptool. Needs porting to python-single-r1. From 1a5ee32da7edfffa6a43146a5115f15327cf602c Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Thu, 2 Jun 2022 09:12:15 +0500 Subject: [PATCH 15/50] dev-python/digitalocean: fix tests Signed-off-by: Anna (cybertailor) Vyalkova --- dev-python/digitalocean/Manifest | 2 +- dev-python/digitalocean/digitalocean-1.17.0.ebuild | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dev-python/digitalocean/Manifest b/dev-python/digitalocean/Manifest index 73f13fe215..717b207918 100644 --- a/dev-python/digitalocean/Manifest +++ b/dev-python/digitalocean/Manifest @@ -1,2 +1,2 @@ DIST digitalocean-1.16.0.tar.gz 59077 BLAKE2B b44c045716967a192b4e79d562bd7af8af2ed3a0d6ea54490f2e15195c84476f25a661c80b5f1beda54e724a4177083a5d04682ca96855637cf626cd3397df17 SHA512 110614aeb33e2dab0564b4569058233916626d50da14d42f9702c9275f13442dccb7b77829b2dc8e97e8bbbd53d094116cebe9b3aedad920d2b0c156a5680bf7 -DIST digitalocean-1.17.0.tar.gz 60261 BLAKE2B 1a3b8ffe955fdea616420d67e9cd1b07d81d3395d673770333b150a8044f6f93d16ab6ec93d0d5efb7579a2bd7fde57c394bc3fc3e58ad02db230f5bd48006bb SHA512 3b5f5adb5fac9693450954e568433cecb43152d4cb2b5709126dc7c69c6b84f19428dcd3688718588a986d3ea9170a956387f3050cd10a69ba89d5dcdf8e100c +DIST digitalocean-1.17.0.gh.tar.gz 60261 BLAKE2B 1a3b8ffe955fdea616420d67e9cd1b07d81d3395d673770333b150a8044f6f93d16ab6ec93d0d5efb7579a2bd7fde57c394bc3fc3e58ad02db230f5bd48006bb SHA512 3b5f5adb5fac9693450954e568433cecb43152d4cb2b5709126dc7c69c6b84f19428dcd3688718588a986d3ea9170a956387f3050cd10a69ba89d5dcdf8e100c diff --git a/dev-python/digitalocean/digitalocean-1.17.0.ebuild b/dev-python/digitalocean/digitalocean-1.17.0.ebuild index 33ec6bf8d6..79cdca88b9 100644 --- a/dev-python/digitalocean/digitalocean-1.17.0.ebuild +++ b/dev-python/digitalocean/digitalocean-1.17.0.ebuild @@ -8,7 +8,7 @@ inherit distutils-r1 DESCRIPTION="Digitalocean API access library" HOMEPAGE="https://github.com/koalalorenzo/python-digitalocean" -SRC_URI="https://github.com/koalalorenzo/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/koalalorenzo/python-${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" S="${WORKDIR}/python-${P}" LICENSE="LGPL-3" @@ -19,6 +19,7 @@ RDEPEND=" dev-python/requests[${PYTHON_USEDEP}] dev-python/jsonpickle[${PYTHON_USEDEP}] " +BDEPEND="test? ( dev-python/responses[${PYTHON_USEDEP}] )" distutils_enable_sphinx docs dev-python/alabaster From 3eb98fd2a9ca186c41ee83b2de717bdfc003f6d1 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Thu, 2 Jun 2022 15:34:18 +0800 Subject: [PATCH 16/50] media-gfx/zwcad: new package, add 2022.22.2.2.3 Signed-off-by: Huang Rui --- media-gfx/zwcad/Manifest | 2 + media-gfx/zwcad/metadata.xml | 21 ++++ media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild | 107 +++++++++++++++++++++ 3 files changed, 130 insertions(+) create mode 100644 media-gfx/zwcad/Manifest create mode 100644 media-gfx/zwcad/metadata.xml create mode 100644 media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild diff --git a/media-gfx/zwcad/Manifest b/media-gfx/zwcad/Manifest new file mode 100644 index 0000000000..362eed4aba --- /dev/null +++ b/media-gfx/zwcad/Manifest @@ -0,0 +1,2 @@ +DIST zwcad-2022.22.2.2.3.deb 159649900 BLAKE2B 7584f2e4ed61b4f29a75a613ba51494230a4f4db9c3ca73ca25656b058bf45ed2ad66cd92ee9238afc1a3dca649d4e90bcb5fef022c65887d3991f2a5c0de246 SHA512 dc9c415bb9d4c66ad943a5b237c3a52ba1f783ae54a37a586942da47b6b68be9e46146716750f181dfc5a4678d71234a0b18f8b216fc619498d4ebd497553fdf +DIST zwcad-python-3.7.13.tar.bz2 56117484 BLAKE2B b81d58d4c8854c4c014276ef7e03e7a2cc16cd6e5aa50c69ac63346087d527e7083f36ab489530aea59a8e07828e315f53bd5075223471471134842f3c09c084 SHA512 22eaff6624f6dacbc903a033e99738f67faf2e221ba75cd13f201dfb0ec6f1d09e31e7fe82677d8f1f4f5ae732306213c9864c2615d61827316b782dfacceac4 diff --git a/media-gfx/zwcad/metadata.xml b/media-gfx/zwcad/metadata.xml new file mode 100644 index 0000000000..de9f360816 --- /dev/null +++ b/media-gfx/zwcad/metadata.xml @@ -0,0 +1,21 @@ + + + + + vowstar@gmail.com + Huang Rui + + + The visual computer-aided drawing software based on Linux system developed + by Zhongwang Software is compatible with various versions of + DWG/DXF/DWF/DWFX files, providing powerful drawing browsing, drawing, + editing, marking and printing, as well as intelligent voice, + mouse gestures, two-dimensional code functions. + + + 中望CAD是由中望软件研发的基于Linux系统的可视化计算机辅助绘图软件，可兼容查看各种版本 + 的DWG/DXF/DWF/DWFX文件，提供了强大的图纸浏览、绘制、编辑、标注和打印，以及 + 智能语音、鼠标手势、二维码功能，是目前国内首款基于Linux系统的国产CAD产品， + 填补了目前国内无基于Linux系统的纯国产CAD产品的空白。 + + diff --git a/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild b/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild new file mode 100644 index 0000000000..9931adb9dd --- /dev/null +++ b/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PGK_NAME="com.zwsoft.zwcad2022" +inherit desktop unpacker xdg + +DESCRIPTION="CAD software for 2D drawing, reviewing and printing work" +HOMEPAGE="https://www.zwsoft.cn/product/zwcad/linux" +SRC_URI=" + https://download.zwcad.com/zwcad/cad_linux/2022/SP2/signed_com.zwsoft.zwcad2022_22.2.2.3_amd64.deb -> ${P}.deb + https://anaconda.org/anaconda/python/3.7.13/download/linux-64/python-3.7.13-h12debd9_0.tar.bz2 -> ${PN}-python-3.7.13.tar.bz2 +" + +LICENSE="all-rights-reserved" +SLOT="0" +KEYWORDS="-* ~amd64" + +RESTRICT="strip mirror bindist" + +RDEPEND=" + media-libs/fontconfig + media-libs/libglvnd + sys-apps/util-linux + sys-libs/zlib + virtual/libcrypt:= +" + +DEPEND="${RDEPEND}" + +BDEPEND="dev-util/patchelf" + +S=${WORKDIR} + +QA_PREBUILT="*" + +src_unpack() { + unpack_deb "${DISTDIR}/${P}.deb" + tar -xf "${DISTDIR}/${PN}-python-3.7.13.tar.bz2" -C "${S}/opt/apps/"${MY_PGK_NAME}"/files/ZwPyRuntime/python3.7/" || die +} + +src_install() { + # Install scalable icons + doicon -s scalable "${S}"/opt/apps/${MY_PGK_NAME}/files/Icons/ZWCAD.svg + + # Fix python and QA problems about python + rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/ZwPyRuntime/python3.6/" || die + rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/libZwPythonLoad6.so" || die + rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/ZwPyRuntime/python3.5/" || die + rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/libZwPythonLoad5.so" || die + rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/ZwPyRuntime/python3.4/" || die + rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/libZwPythonLoad4.so" || die + rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/ZwPyRuntime/python3.7/compiler_compat" || die + + # Set RPATH for preserve-libs handling + pushd "${S}"/opt/apps/${MY_PGK_NAME}/files || die + local x + for x in $(find) ; do + # Use \x7fELF header to separate ELF executables and libraries + [[ -f "${x}" && "${x: -2}" != ".o" && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue + local RPATH_ROOT="/opt/apps/${MY_PGK_NAME}/files" + local RPATH_S="${RPATH_ROOT}/:${RPATH_ROOT}/lib/:${RPATH_ROOT}/lib/mono/lib/:${RPATH_ROOT}/plugins/:${RPATH_ROOT}/zh-CN/:${RPATH_ROOT}/ZwPyRuntime/python3.7/lib" + patchelf --set-rpath "${RPATH_S}" "${x}" || \ + die "patchelf failed on ${x}" + done + popd || die + + # Fix desktop files + sed -E -i 's/^Exec=.*$/Exec=zwcad %F/g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/com.zwsoft.zwcad.desktop" || die + sed -E -i 's/^Icon=.*$/Icon=ZWCAD/g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/com.zwsoft.zwcad.desktop" || die + sed -E -i 's/Application;//g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/com.zwsoft.zwcad.desktop" || die + # The Version entry in a .desktop file doesn't refer to the version of the + # target program. It's the version of the desktop file specification that + # this desktop file conforms to. + sed -E -i 's/^Version=.*$/Version=1.0/g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/com.zwsoft.zwcad.desktop" || die + sed -E -i 's/^Categories=.*$/Categories=Graphics;VectorGraphics;Engineering;Construction;2DGraphics;/g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/com.zwsoft.zwcad.desktop" || die + domenu "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/com.zwsoft.zwcad.desktop" + + # Add zw3d command + mkdir -p "${S}"/usr/bin/ || die + + cat >> "${S}"/opt/apps/${MY_PGK_NAME}/zwcad <<- EOF || die +#!/bin/sh +export MONO_PATH=/opt/apps/${MY_PGK_NAME}/files/lib/mono/lib/mono/4.5 +sh /opt/apps/${MY_PGK_NAME}/files/ZWCADRUN.sh \$* + EOF + + ln -s /opt/apps/${MY_PGK_NAME}/zwcad "${S}"/usr/bin/zwcad || die + + # Install package and fix permissions + insinto /opt/apps/ + doins -r opt/apps/${MY_PGK_NAME} + insinto /usr + doins -r usr/* + + fperms 0755 /opt/apps/${MY_PGK_NAME}/zwcad + + pushd "${S}" || die + for x in $(find "opt/apps/${MY_PGK_NAME}") ; do + # Fix shell script permissions + [[ "${x: -3}" == ".sh" ]] && fperms 0755 "/${x}" + # Use \x7fELF header to separate ELF executables and libraries + [[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] && fperms 0755 "/${x}" + done + popd || die +} From fff2c7a1851bdd4686561650121c22248a2fec99 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Thu, 2 Jun 2022 10:00:46 +0200 Subject: [PATCH 17/50] dev-python/confluent-kafka: ignore integration tests Closes: https://bugs.gentoo.org/849233 Signed-off-by: Alessandro Barbieri --- dev-python/confluent-kafka/confluent-kafka-1.8.2-r1.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-python/confluent-kafka/confluent-kafka-1.8.2-r1.ebuild b/dev-python/confluent-kafka/confluent-kafka-1.8.2-r1.ebuild index 125a5c5741..bb04a6a993 100644 --- a/dev-python/confluent-kafka/confluent-kafka-1.8.2-r1.ebuild +++ b/dev-python/confluent-kafka/confluent-kafka-1.8.2-r1.ebuild @@ -3,6 +3,7 @@ EAPI=8 +EPYTEST_IGNORE=( tests/integration ) MYPN="${PN}-python" PYTHON_COMPAT=( python3_{8..10} ) From 8c96b338bbc6f354318c4263d4a0d55366567cfd Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Thu, 2 Jun 2022 10:13:16 +0200 Subject: [PATCH 18/50] dev-util/psautohint: move testdata only when USE="test" Closes: https://bugs.gentoo.org/849230 Signed-off-by: Alessandro Barbieri --- dev-util/psautohint/Manifest | 2 +- dev-util/psautohint/psautohint-2.4.0.ebuild | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-util/psautohint/Manifest b/dev-util/psautohint/Manifest index 1463268e7e..a0367e173d 100644 --- a/dev-util/psautohint/Manifest +++ b/dev-util/psautohint/Manifest @@ -1,2 +1,2 @@ DIST psautohint-2.4.0.gh.tar.gz 181009 BLAKE2B bb6ed5ae6b800742d8d1061004bfb49a84e3b9c99977a653ef8eeccf38d9c03261be5b735df20ee93dcf712b8b6ade7a2391937f327206fc2e01f2b5bcbe9022 SHA512 dfc29d020bedf8bd546e395743befb390e9fb01a3025aa10357a32724c9a78236acd57e05300aa26be630c9d43edab8bda731dc4f51c0a07d0bef79112d952aa -DIST psautohint-testdata-1e4c5061d328105c4dcfcb6fdbc27ec49b3e9d23.tar.gz 21949984 BLAKE2B a5da67eb4b9f3d0ce5d86469bc0a5f771fa743198836db35121e9c62b66c8b8df00fef6e40e8832e33aee065fe3bdd0a24d1b590bce6fb66d7c43f6719236242 SHA512 03d4962958d3551ffdf99463d28723f6b43d42029843da1b40493b0bfc2e586ebf40db3a2497b36b5fde345de4b6998cfc1131c6fb4e8352b05fb59fc4e90e7f +DIST psautohint-testdata-1e4c5061d328105c4dcfcb6fdbc27ec49b3e9d23.gh.tar.gz 21949984 BLAKE2B a5da67eb4b9f3d0ce5d86469bc0a5f771fa743198836db35121e9c62b66c8b8df00fef6e40e8832e33aee065fe3bdd0a24d1b590bce6fb66d7c43f6719236242 SHA512 03d4962958d3551ffdf99463d28723f6b43d42029843da1b40493b0bfc2e586ebf40db3a2497b36b5fde345de4b6998cfc1131c6fb4e8352b05fb59fc4e90e7f diff --git a/dev-util/psautohint/psautohint-2.4.0.ebuild b/dev-util/psautohint/psautohint-2.4.0.ebuild index 9d1dc2d012..0b1181eaeb 100644 --- a/dev-util/psautohint/psautohint-2.4.0.ebuild +++ b/dev-util/psautohint/psautohint-2.4.0.ebuild @@ -8,7 +8,7 @@ DISTUTILS_IN_SOURCE_BUILD=1 EMESON_SOURCE="${S}/libpsautohint" PYTHON_COMPAT=( python3_{8..10} ) -inherit meson distutils-r1 +inherit edo meson distutils-r1 DESCRIPTION="A standalone version of AFDKO autohinter" HOMEPAGE=" @@ -18,7 +18,7 @@ HOMEPAGE=" SRC_URI=" https://github.com/adobe-type-tools/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz test? ( - https://github.com/adobe-type-tools/${PN}-testdata/archive/${COMMIT}.tar.gz -> psautohint-testdata-${COMMIT}.tar.gz + https://github.com/adobe-type-tools/${PN}-testdata/archive/${COMMIT}.tar.gz -> psautohint-testdata-${COMMIT}.gh.tar.gz ) " KEYWORDS="~amd64" @@ -58,7 +58,7 @@ pkg_setup() { src_unpack() { default - mv "${WORKDIR}"/psautohint-testdata-${COMMIT}/* "${S}"/tests/integration/data || die + use test && edo mv "${WORKDIR}"/psautohint-testdata-${COMMIT}/* "${S}"/tests/integration/data } python_prepare_all() { From 48862e7540eb7a7edb2cb7215fbe178a5d6350ae Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Thu, 2 Jun 2022 10:16:43 +0200 Subject: [PATCH 19/50] dev-python/trivup: restrict test Closes: https://bugs.gentoo.org/849242 Signed-off-by: Alessandro Barbieri --- dev-python/trivup/trivup-0.10.0.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev-python/trivup/trivup-0.10.0.ebuild b/dev-python/trivup/trivup-0.10.0.ebuild index 3dec678e0d..7458b7cb6b 100644 --- a/dev-python/trivup/trivup-0.10.0.ebuild +++ b/dev-python/trivup/trivup-0.10.0.ebuild @@ -25,4 +25,6 @@ RDEPEND=" " DEPEND="${RDEPEND}" +RESTRICT="test" # tests try to download and install kafka + distutils_enable_tests pytest From 71c6721b890bf8fffb2b877fee660dfa6dd0606a Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Thu, 2 Jun 2022 17:09:57 +0800 Subject: [PATCH 20/50] media-gfx/zwcad: fix fcitx problem and start script Signed-off-by: Huang Rui --- media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild b/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild index 9931adb9dd..6c50bfc2c9 100644 --- a/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild +++ b/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild @@ -77,11 +77,29 @@ src_install() { sed -E -i 's/^Categories=.*$/Categories=Graphics;VectorGraphics;Engineering;Construction;2DGraphics;/g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/com.zwsoft.zwcad.desktop" || die domenu "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/com.zwsoft.zwcad.desktop" + sed -i "1i\\export MONO_PATH=/opt/apps/${MY_PGK_NAME}/files/lib/mono/lib/mono/4.5\n" "${S}/opt/apps/${MY_PGK_NAME}/files/ZWCADRUN.sh" || die + sed -E -i 's/export QT_IM_MODULE=fcitx//g' "${S}/opt/apps/${MY_PGK_NAME}/files/ZWCADRUN.sh" || die + # Add zw3d command mkdir -p "${S}"/usr/bin/ || die cat >> "${S}"/opt/apps/${MY_PGK_NAME}/zwcad <<- EOF || die #!/bin/sh +if [ -z "\${QT_IM_MODULE}" ] +then + if [ -n "\$(pidof fcitx5)" ] + then + export XMODIFIERS="@im=fcitx5" + export QT_IM_MODULE=fcitx5 + elif [ -n "\$(pidof ibus-daemon)" ] + then + export XMODIFIERS="@im=ibus" + export QT_IM_MODULE=ibus + else + export XMODIFIERS="@im=fcitx" + export QT_IM_MODULE=fcitx + fi +fi export MONO_PATH=/opt/apps/${MY_PGK_NAME}/files/lib/mono/lib/mono/4.5 sh /opt/apps/${MY_PGK_NAME}/files/ZWCADRUN.sh \$* EOF From 1cbdb3e1b18f0ecf513ab90433a32eb0f2d4689b Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Thu, 2 Jun 2022 13:39:28 +0500 Subject: [PATCH 21/50] app-backup/timeshift: fix deps Closes: https://bugs.gentoo.org/780606 Closes: https://bugs.gentoo.org/780603 Closes: https://bugs.gentoo.org/784788 Signed-off-by: Anna (cybertailor) Vyalkova --- app-backup/timeshift/Manifest | 2 +- .../files/timeshift-22.06.1-makefile.patch | 53 ++++++++++++++++ app-backup/timeshift/metadata.xml | 2 +- .../timeshift/timeshift-22.06.1-r1.ebuild | 61 +++++++++++++++++++ app-backup/timeshift/timeshift-22.06.1.ebuild | 42 ------------- 5 files changed, 116 insertions(+), 44 deletions(-) create mode 100644 app-backup/timeshift/files/timeshift-22.06.1-makefile.patch create mode 100644 app-backup/timeshift/timeshift-22.06.1-r1.ebuild delete mode 100644 app-backup/timeshift/timeshift-22.06.1.ebuild diff --git a/app-backup/timeshift/Manifest b/app-backup/timeshift/Manifest index ff7788dd30..b883bc2eb7 100644 --- a/app-backup/timeshift/Manifest +++ b/app-backup/timeshift/Manifest @@ -1,2 +1,2 @@ DIST timeshift-21.09.1.tar.gz 1401994 BLAKE2B 5b1b3650fadb02745150d8996b46b53be473c66c73d4f5209c4f8634f58c4019905524516089b9f2a77b3bf1dcc49ee4db5ac9cbd2c1419683ead01e2e36b4e7 SHA512 0e79b41861c1eb041e0592508636f87f77ca240001b238e9e70239898d9a66bcf367380e830682fb8671ade7c1cbdb10ca8c89585f2cb30de35c7480a0fa792b -DIST timeshift-22.06.1.tar.gz 1425559 BLAKE2B 78cf47f65b0bda6bb9bbdb8e3abe250b3b8b4d1c5e651a7b40d8c1d5eab4802930a97520721616eda44f2dbe8a7f06bde097d0ffe24c3a251ddef78b04b8c0d5 SHA512 ee35d7270e7625ae51398392c24aa80b85494c524bb12de4b6c0d5e5ee47d496031feb058fbd6905360b40d63d1088d48faebccabac04020f226b5d05608a9a7 +DIST timeshift-22.06.1-r1.tar.gz 1429399 BLAKE2B 90dcfa50bccedcca07044b6e42cb41773aa9d53f42855e3bfdb28140b8fd4359283225928e1c598116feab301baa6b42aebade2bb4f107eed1d82412d52a9639 SHA512 eb245c358ff2ba8e3b3c367dd0ebe69a3b450ca7bd31f5bd2fd9d5b2281f39ce90e3086c1649f73a8b240c7a05cd308534abc88085653d5bc7b244ba2d9a2ef7 diff --git a/app-backup/timeshift/files/timeshift-22.06.1-makefile.patch b/app-backup/timeshift/files/timeshift-22.06.1-makefile.patch new file mode 100644 index 0000000000..3343bc24d9 --- /dev/null +++ b/app-backup/timeshift/files/timeshift-22.06.1-makefile.patch @@ -0,0 +1,53 @@ +--- a/src/makefile ++++ b/src/makefile +@@ -1,6 +1,6 @@ + SHELL=/bin/bash +-CFLAGS=--std=c99 +-EXECUTABLES = find msgmerge msgfmt install rm mkdir cp chmod valac ++CFLAGS += --std=c99 ++EXECUTABLES = find msgmerge msgfmt install rm mkdir cp chmod $(VALAC) + CHECKEXECS := $(foreach exec,$(EXECUTABLES), $(if $(shell which $(exec)),,$(error No $(exec) found, install it))) + + prefix=/usr +@@ -50,8 +50,8 @@ all: app-gtk app-console + app-gtk: + + #timeshift-gtk +- valac -X -D'GETTEXT_PACKAGE="${app_name}"' \ +- --Xcc="-lm" --Xcc="-O3" ${symbols} \ ++ $(VALAC) -v -X -D'GETTEXT_PACKAGE="${app_name}"' \ ++ --cc=$(CC) $(foreach flag, $(CFLAGS) $(LDFLAGS), -X $(flag)) --Xcc="-lm" ${symbols} \ + Core/*.vala Gtk/*.vala Utility/*.vala Utility/Gtk/*.vala \ + -o ${app_name}-gtk \ + --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix \ +@@ -61,8 +61,8 @@ app-gtk: + app-console: + + #timeshift +- valac -X -D'GETTEXT_PACKAGE="${app_name}"' \ +- --Xcc="-lm" --Xcc="-O3" ${symbols} \ ++ $(VALAC) -v -X -D'GETTEXT_PACKAGE="${app_name}"' \ ++ --cc="$(CC)" $(foreach flag, $(CFLAGS) $(LDFLAGS), -X $(flag)) --Xcc="-lm" ${symbols} \ + Core/*.vala Utility/*.vala Utility/Gtk/*.vala Console/*.vala \ + -o ${app_name} \ + --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix \ +@@ -71,7 +71,6 @@ app-console: + + manpage: + ./${app_name} --help > ../man/${app_name}.1 +- gzip -f ../man/${app_name}.1 + + clean: + rm -rfv ../release/{source,i386,amd64,armel,armhf} +@@ -115,7 +114,7 @@ install: + install -m 0644 ../files/${app_name}.json "$(DESTDIR)$(appconfdir)/default.json" + + # man page +- install -m 0644 ../man/${app_name}.1.gz "$(DESTDIR)$(man1dir)/${app_name}.1.gz" ++ install -m 0644 ../man/${app_name}.1 "$(DESTDIR)$(man1dir)/${app_name}.1" + + # app icons + cp -dpr --no-preserve=ownership -t "$(DESTDIR)$(sharedir)/icons" ./share/icons/* +-- +2.35.1 + diff --git a/app-backup/timeshift/metadata.xml b/app-backup/timeshift/metadata.xml index 78eb91da6b..6347b06626 100644 --- a/app-backup/timeshift/metadata.xml +++ b/app-backup/timeshift/metadata.xml @@ -6,7 +6,7 @@ Ross Charles Campbell - teejee2008/timeshift + linuxmint/timeshift Timeshift for Linux is an application that provides functionality similar to diff --git a/app-backup/timeshift/timeshift-22.06.1-r1.ebuild b/app-backup/timeshift/timeshift-22.06.1-r1.ebuild new file mode 100644 index 0000000000..5bcd648db0 --- /dev/null +++ b/app-backup/timeshift/timeshift-22.06.1-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature toolchain-funcs vala xdg + +DESCRIPTION="A system restore utility for Linux" +HOMEPAGE="https://github.com/linuxmint/timeshift" +SRC_URI="https://github.com/linuxmint/${PN}/archive/v${PV}.tar.gz -> ${PF}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + dev-libs/atk + dev-libs/glib:2 + dev-libs/json-glib + dev-libs/libgee:= + net-libs/libsoup:2.4 + media-libs/harfbuzz:= + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/pango + x11-libs/xapp + x11-libs/vte:2.91[vala] +" +RDEPEND="${DEPEND} + net-misc/rsync + virtual/cron +" +BDEPEND=" + $(vala_depend) + virtual/pkgconfig +" + +PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) + +src_prepare() { + default + vala_setup +} + +src_compile() { + tc-export CC + emake all + emake manpage +} + +src_install() { + emake prefix="${EPREFIX}"/usr sysconfdir="${EPREFIX}"/etc install DESTDIR="${D}" + einstalldocs +} + +pkg_postinst() { + optfeature "btrfs support" sys-fs/btrfs-progs +} diff --git a/app-backup/timeshift/timeshift-22.06.1.ebuild b/app-backup/timeshift/timeshift-22.06.1.ebuild deleted file mode 100644 index 97f794686b..0000000000 --- a/app-backup/timeshift/timeshift-22.06.1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2019-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -VALA_MIN_API_VERSION="0.44" -inherit vala xdg - -DESCRIPTION="A system restore utility for Linux" -HOMEPAGE="https://github.com/teejee2008/timeshift" -SRC_URI="https://github.com/teejee2008/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=" - dev-libs/json-glib - dev-libs/libgee - dev-util/desktop-file-utils - net-libs/libsoup - net-misc/rsync - sys-process/cronie - x11-libs/gtk+:3 - x11-libs/xapp -" -RDEPEND="${DEPEND}" -BDEPEND=" - $(vala_depend) - net-misc/rsync - sys-apps/diffutils - sys-apps/coreutils - sys-fs/btrfs-progs - >=x11-libs/vte-0.60.3[vala] -" - -src_prepare() { -# sed -i -e "s:--thread:& Core/AppExcludeEntry.vala:" "src/makefile" - sed -i -e "s:valac:valac-$(vala_best_api_version):" "src/makefile" - vala_src_prepare - default -} From 583f92578251e4066fa2d0655185413e632ba6d7 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Thu, 2 Jun 2022 14:17:30 +0500 Subject: [PATCH 22/50] profiles: mask dev-python/aionotify Signed-off-by: Anna (cybertailor) Vyalkova --- profiles/package.mask | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 0459c1d3b2..4d9e6de254 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -30,3 +30,7 @@ dev-python/dateparser # Depends on non-existent versions of pyparsing, invalid dependency # on dev-embedded/esptool. Needs porting to python-single-r1. dev-embedded/esp-idf + +# Anna Vyalkova (2022-06-02) +# Test dep (asynctest) doesn't support any recent Python. No revdeps. +dev-python/aionotify From b0a8e5e46636f44293392d14af680889f937cae4 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Thu, 2 Jun 2022 14:18:55 +0500 Subject: [PATCH 23/50] profiles: mask dev-python/kitchen Signed-off-by: Anna (cybertailor) Vyalkova --- profiles/package.mask | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 4d9e6de254..0d1831c8e1 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -34,3 +34,8 @@ dev-embedded/esp-idf # Anna Vyalkova (2022-06-02) # Test dep (asynctest) doesn't support any recent Python. No revdeps. dev-python/aionotify + +# Anna Vyalkova (2022-06-02) +# Doesn't support Python 3.10. +dev-python/kitchen +net-misc/tuir From 6ecf054cdf9eb7c5e54dec5dadf093efad27a6ca Mon Sep 17 00:00:00 2001 From: Oliver Freyermuth Date: Thu, 2 Jun 2022 12:37:20 +0200 Subject: [PATCH 24/50] games-arcade/taisei: Fix install directory for docs. Closes: https://bugs.gentoo.org/849248 Signed-off-by: Oliver Freyermuth --- games-arcade/taisei/taisei-1.3.2-r1.ebuild | 2 +- games-arcade/taisei/taisei-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/games-arcade/taisei/taisei-1.3.2-r1.ebuild b/games-arcade/taisei/taisei-1.3.2-r1.ebuild index 8765e2a2ca..0bd5205c2c 100644 --- a/games-arcade/taisei/taisei-1.3.2-r1.ebuild +++ b/games-arcade/taisei/taisei-1.3.2-r1.ebuild @@ -43,7 +43,7 @@ BDEPEND=" src_prepare() { if use doc; then - sed -i "s/doc_path = join.*/doc_path = join_paths(datadir, \'doc\', \'${P}\')/" \ + sed -i "s/doc_path = join.*/doc_path = join_paths(datadir, \'doc\', \'${PF}\')/" \ meson.build || die "Failed changing doc_path" fi default diff --git a/games-arcade/taisei/taisei-9999.ebuild b/games-arcade/taisei/taisei-9999.ebuild index 1e2549f078..28314b9e78 100644 --- a/games-arcade/taisei/taisei-9999.ebuild +++ b/games-arcade/taisei/taisei-9999.ebuild @@ -51,7 +51,7 @@ python_check_deps() { src_prepare() { if use doc; then - sed -i "s/doc_path = join.*/doc_path = join_paths(datadir, \'doc\', \'${P}\')/" \ + sed -i "s/doc_path = join.*/doc_path = join_paths(datadir, \'doc\', \'${PF}\')/" \ meson.build || die "Failed changing doc_path" fi default From 34dc180aaa2b72704ed86c351b6139cd95149c7d Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Thu, 2 Jun 2022 20:05:51 +0800 Subject: [PATCH 25/50] media-gfx/zwcad: fix fcitx5 environment Signed-off-by: Huang Rui --- media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild b/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild index 6c50bfc2c9..ca643b08b2 100644 --- a/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild +++ b/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild @@ -89,13 +89,14 @@ if [ -z "\${QT_IM_MODULE}" ] then if [ -n "\$(pidof fcitx5)" ] then - export XMODIFIERS="@im=fcitx5" - export QT_IM_MODULE=fcitx5 + export XMODIFIERS="@im=fcitx" + export QT_IM_MODULE=fcitx elif [ -n "\$(pidof ibus-daemon)" ] then export XMODIFIERS="@im=ibus" export QT_IM_MODULE=ibus - else + elif [ -n "\$(pidof fcitx)" ] + then export XMODIFIERS="@im=fcitx" export QT_IM_MODULE=fcitx fi From 62817bd44deeaa5bd49d33792c7931f2c000d8c3 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Thu, 2 Jun 2022 14:30:34 +0200 Subject: [PATCH 26/50] sys-cluster/mpi-benchmarks: new package, add 2021.3 Signed-off-by: Alessandro Barbieri --- sys-cluster/mpi-benchmarks/Manifest | 1 + .../mpi-benchmarks-2021.3-makefile.patch | 142 ++++++++++++++++++ sys-cluster/mpi-benchmarks/metadata.xml | 13 ++ .../mpi-benchmarks-2021.3.ebuild | 28 ++++ 4 files changed, 184 insertions(+) create mode 100644 sys-cluster/mpi-benchmarks/Manifest create mode 100644 sys-cluster/mpi-benchmarks/files/mpi-benchmarks-2021.3-makefile.patch create mode 100644 sys-cluster/mpi-benchmarks/metadata.xml create mode 100644 sys-cluster/mpi-benchmarks/mpi-benchmarks-2021.3.ebuild diff --git a/sys-cluster/mpi-benchmarks/Manifest b/sys-cluster/mpi-benchmarks/Manifest new file mode 100644 index 0000000000..87015f9941 --- /dev/null +++ b/sys-cluster/mpi-benchmarks/Manifest @@ -0,0 +1 @@ +DIST IMB-v2021.3.tar.gz 221038 BLAKE2B d776e482a6632d9a538af0f8b89928322860ca6782f7c96bb47af0f9c6387eddc487bffbf3fde3e5c0477b7c9e9cbe7856857110890389f5ee42865051ef185b SHA512 fdb1a2426b5999c58c5d15228c64a80f28f4051d438e86a132f0fc42c3cda88f0e1bbcb792316617864d0f4d07d89143a96f3824bd4806fc8cde3c2dcb1d4094 diff --git a/sys-cluster/mpi-benchmarks/files/mpi-benchmarks-2021.3-makefile.patch b/sys-cluster/mpi-benchmarks/files/mpi-benchmarks-2021.3-makefile.patch new file mode 100644 index 0000000000..2ba8660e19 --- /dev/null +++ b/sys-cluster/mpi-benchmarks/files/mpi-benchmarks-2021.3-makefile.patch @@ -0,0 +1,142 @@ +--- a/src_c/Makefile ++++ b/src_c/Makefile +@@ -106,10 +106,10 @@ + -mkdir -p $@ + + $(BINARY): $(OBJ) +- $(CC) $(LDFLAGS) $^ -o $@ ++ $(CC) $(CFLAGS) -fPIE $(LDFLAGS) $^ -o $@ + + $(BUILDDIR)/%.o: %.c +- $(CC) $(CFLAGS) -D$(TARGET) -DIMB2018 -c $< -o $@ ++ $(CC) $(CFLAGS) -fPIC -D$(TARGET) -DIMB2018 -c $< -o $@ + + clean: + rm -rf $(BUILDDIR) $(OBJ) $(BINARY) +--- a/src_c/P2P/Makefile ++++ b/src_c/P2P/Makefile +@@ -50,11 +50,11 @@ + TARGET=P2P + BINARY:=IMB-P2P + +-override CFLAGS += -O3 -Wall -Wextra -pedantic -Wno-long-long ++override CFLAGS += -Wall -Wextra -pedantic -Wno-long-long + override LDFLAGS += -lm + + ifeq ($(origin CC),default) +-CC=mpiicc ++CC=mpicc + endif + + all: $(BINARY) +@@ -72,10 +72,10 @@ + IMB_OBJ = $(IMB_SRC:.c=.o) + + $(BINARY): $(IMB_OBJ) +- $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) ++ $(CC) $(CFLAGS) -fPIE -o $@ $^ $(LDFLAGS) + + %.o: %.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) -fPIC -c -o $@ $< + + clean: + rm -f $(IMB_OBJ) $(BINARY) +--- a/src_cpp/Makefile ++++ b/src_cpp/Makefile +@@ -49,11 +49,7 @@ + + all: announce + +-ifdef WITH_YAML_CPP +-all: libyaml-cpp.a +-else + all: +-endif + + ifndef TARGET + TARGET=example +@@ -71,14 +67,14 @@ + endif + + ifeq ($(origin CC),default) +-CC=mpiicc ++CC ?= mpicc + endif + ifeq ($(origin CXX),default) +-CXX=mpiicpc ++CXX ?= mpicxx + endif + override CPPFLAGS += -I. +-override CFLAGS += -g -O0 -Wall -Wno-long-long +-override CXXFLAGS += -g -O0 -Wall -Wextra -pedantic -Wno-long-long ++override CFLAGS += -g -Wall -Wno-long-long ++override CXXFLAGS += -g -Wall -Wextra -pedantic -Wno-long-long + ifdef WITH_OPENMP + override CFLAGS += -fopenmp + override CXXFLAGS += -fopenmp +@@ -103,7 +99,7 @@ + all: $(BINARY) + + ifdef WITH_YAML_CPP +-override CPPFLAGS += -Iyamlcpp/include -Iyamlcpp/test ++override CPPFLAGS += -I/usr/include/yaml-cpp + YAMLCPP_SRC = yamlcpp/src/aliasmanager.cpp \ + yamlcpp/src/binary.cpp \ + yamlcpp/src/conversion.cpp \ +@@ -140,8 +136,6 @@ + yamlcpp/test/old-api/parsertests.cpp \ + yamlcpp/test/old-api/spectests.cpp + +-YAMLCPP_OBJ = $(YAMLCPP_SRC:.cpp=.o) +-YAMLCPP_TEST_OBJ = $(YAMLCPP_TEST_SRC:.cpp=.o) + endif + + IMB_SRC = imb.cpp args_parser.cpp args_parser_utests.cpp scope.cpp +@@ -160,14 +154,7 @@ + scope.h + + ifdef WITH_YAML_CPP +-libyaml-cpp.a: $(YAMLCPP_OBJ) +- ar qc $@ $^ +- ranlib $@ +- +-yamltest: $(YAMLCPP_TEST_OBJ) libyaml-cpp.a +- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ +- +-YAML_CPP_LIB = libyaml-cpp.a ++YAML_CPP_LIB = -lyaml-cpp + YAML_TEST = yamltest + override CPPFLAGS += -DWITH_YAML_CPP + endif +@@ -176,25 +163,21 @@ + @if test "$(ANNOUNCE)" -eq "1"; then echo "NOTE: Building target: $(TARGET), binary name: $(BINARY)"; fi + @if test "$(ANNOUNCE)" -eq "1"; then echo "NOTE: Use make TARGET= to select a target suite"; fi + +-$(BINARY): $(IMB_OBJ) $(BECHMARK_SUITE_OBJ) $(ADDITIONAL_OBJ) $(YAML_CPP_LIB) +- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) ++$(BINARY): $(IMB_OBJ) $(BECHMARK_SUITE_OBJ) $(ADDITIONAL_OBJ) ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIE -o $@ $^ $(LDFLAGS) $(YAML_CPP_LIB) -lmpi_cxx -lmpi + + %.o: %.cpp +- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIC -c -o $@ $< + + %.o: %.c +- $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< ++ $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -c -o $@ $< + + clean: announce +- rm -f $(IMB_OBJ) $(YAMLCPP_OBJ) $(BECHMARK_SUITE_OBJ) $(ADDITIONAL_OBJ) $(BINARY) $(YAML_CPP_LIB) $(YAML_TEST) ++ rm -f $(IMB_OBJ) $(YAMLCPP_OBJ) $(BECHMARK_SUITE_OBJ) $(ADDITIONAL_OBJ) $(BINARY) + + + $(BECHMARK_SUITE_OBJ): $(HEADERS) Makefile + $(IMB_OBJ): $(HEADERS) Makefile + +-ifdef WITH_YAML_CPP +-$(YAMLCPP_OBJ): Makefile +-endif +- + .PHONY: announce clean all + diff --git a/sys-cluster/mpi-benchmarks/metadata.xml b/sys-cluster/mpi-benchmarks/metadata.xml new file mode 100644 index 0000000000..1cccbcabb2 --- /dev/null +++ b/sys-cluster/mpi-benchmarks/metadata.xml @@ -0,0 +1,13 @@ + + + + + lssndrbarbieri@gmail.com + Alessandro Barbieri + + Intel(R) MPI Benchmarks provides a set of elementary benchmarks that conform to MPI-1, MPI-2, and MPI-3 standard. You can run all of the supported benchmarks, or a subset specified in the command line using one executable file. Use command-line parameters to specify various settings, such as time measurement, message lengths, and selection of communicators. + + intel/mpi-benchmarks + https://github.com/intel/mpi-benchmarks/issues + + diff --git a/sys-cluster/mpi-benchmarks/mpi-benchmarks-2021.3.ebuild b/sys-cluster/mpi-benchmarks/mpi-benchmarks-2021.3.ebuild new file mode 100644 index 0000000000..a2c16064d9 --- /dev/null +++ b/sys-cluster/mpi-benchmarks/mpi-benchmarks-2021.3.ebuild @@ -0,0 +1,28 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MYP="IMB-v${PV}" + +DESCRIPTION="Intel MPI Benchmarks" +HOMEPAGE=" + https://www.intel.com/content/www/us/en/developer/articles/technical/intel-mpi-benchmarks.html + https://github.com/intel/mpi-benchmarks +" +SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/${MYP}.tar.gz" +S="${WORKDIR}/${PN}-${MYP}" + +LICENSE="BSD CPL-1.0" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="virtual/mpi" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}/${P}-makefile.patch" ) + +src_install() { + dodoc ReadMe_IMB.txt README.md + dobin IMB-* +} From 413dc97fb9b61c5ec5d1f371b9db2e6dcf205614 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Thu, 2 Jun 2022 14:31:08 +0200 Subject: [PATCH 27/50] TODO.md: remove IMB Signed-off-by: Alessandro Barbieri --- TODO.md | 1 - 1 file changed, 1 deletion(-) diff --git a/TODO.md b/TODO.md index b7ec708112..af9f226209 100644 --- a/TODO.md +++ b/TODO.md @@ -23,7 +23,6 @@ Name | Buildsystem | Category | User | RFH | Dependency [compcert](https://compcert.org) | make | compiler | Alessandro-Barbieri | ✔ | ✖ [predictive](https://www.dr-qubit.org/predictive.html) | make | emacs | Alessandro-Barbieri | ✔ | ✖ [tau](http://www.cs.uoregon.edu/research/tau/home.php) | make | tools | Alessandro-Barbieri | ✖ -[imb](https://software.intel.com/content/www/us/en/develop/articles/intel-mpi-benchmarks.html) | make | cluster | Alessandro-Barbieri | ✖ | ✔ [gnat-llvm](https://github.com/AdaCore/gnat-llvm) | make | compiler | Alessandro-Barbieri | ✔ | ✖ [csparse](https://people.sc.fsu.edu/~jburkardt/c_src/csparse/csparse.html) | make | science | Alessandro-Barbieri | ✖ | ✔ [gslib](https://github.com/Nek5000/gslib) | make | cluster | Alessandro-Barbieri | ✖ | ✔ From 731da4e6f1fdefd80cbf8c5c37d5b616e0be4ef1 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Thu, 2 Jun 2022 14:32:32 +0200 Subject: [PATCH 28/50] sys-cluster/OpenHPC-meta: add mpi-benchmarks Signed-off-by: Alessandro Barbieri --- sys-cluster/OpenHPC-meta/OpenHPC-meta-2.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-cluster/OpenHPC-meta/OpenHPC-meta-2.1.ebuild b/sys-cluster/OpenHPC-meta/OpenHPC-meta-2.1.ebuild index e6ddfcda46..62f3499c44 100644 --- a/sys-cluster/OpenHPC-meta/OpenHPC-meta-2.1.ebuild +++ b/sys-cluster/OpenHPC-meta/OpenHPC-meta-2.1.ebuild @@ -63,6 +63,7 @@ RDEPEND=" dev-libs/papi sys-apps/likwid sys-cluster/extrae[${PYTHON_SINGLE_USEDEP}] + sys-cluster/mpi-benchmarks ) python? ( @@ -105,7 +106,6 @@ RDEPEND=" # perf-tools # sys-cluster/dimemas[libunwind] - #imb #omb #scalasca #tau From 4de836b2cb47b36d693ac6d0e4e6dc056953ab00 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Thu, 2 Jun 2022 15:25:16 +0200 Subject: [PATCH 29/50] sys-cluster/SOS: correctly link to mpi Signed-off-by: Alessandro Barbieri --- sys-cluster/SOS/{SOS-1.5.0.ebuild => SOS-1.5.0-r1.ebuild} | 5 +++++ 1 file changed, 5 insertions(+) rename sys-cluster/SOS/{SOS-1.5.0.ebuild => SOS-1.5.0-r1.ebuild} (97%) diff --git a/sys-cluster/SOS/SOS-1.5.0.ebuild b/sys-cluster/SOS/SOS-1.5.0-r1.ebuild similarity index 97% rename from sys-cluster/SOS/SOS-1.5.0.ebuild rename to sys-cluster/SOS/SOS-1.5.0-r1.ebuild index efe8effda0..3ac0bd9858 100644 --- a/sys-cluster/SOS/SOS-1.5.0.ebuild +++ b/sys-cluster/SOS/SOS-1.5.0-r1.ebuild @@ -79,6 +79,11 @@ src_prepare() { } src_configure() { + if use pmi-mpi; then + export CC=mpicc + export CXX=mpicxx + fi + local ofimr use ofi_mr_basic && ofimr="basic" use ofi_mr_scalable && ofimr="scalable" From 2a816ae3b96eb1f0f95d2bb58ef6470eed0ba9d8 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Thu, 2 Jun 2022 15:47:41 +0200 Subject: [PATCH 30/50] sys-cluster/osu-micro-benchmarks: new package, add 5.9 Signed-off-by: Alessandro Barbieri --- sys-cluster/osu-micro-benchmarks/Manifest | 1 + sys-cluster/osu-micro-benchmarks/metadata.xml | 12 +++ .../osu-micro-benchmarks-5.9.ebuild | 86 +++++++++++++++++++ 3 files changed, 99 insertions(+) create mode 100644 sys-cluster/osu-micro-benchmarks/Manifest create mode 100644 sys-cluster/osu-micro-benchmarks/metadata.xml create mode 100644 sys-cluster/osu-micro-benchmarks/osu-micro-benchmarks-5.9.ebuild diff --git a/sys-cluster/osu-micro-benchmarks/Manifest b/sys-cluster/osu-micro-benchmarks/Manifest new file mode 100644 index 0000000000..4d46654a76 --- /dev/null +++ b/sys-cluster/osu-micro-benchmarks/Manifest @@ -0,0 +1 @@ +DIST osu-micro-benchmarks-5.9.tar.gz 809301 BLAKE2B 84c3fcfe78817a0ab646a63e74f5b8d140cf318c2cfe1d6a533a063c5b5edbbb80991e97f1295948ab5778e1326c7cd7c3057b56d239d87386f0ae45cbd310d5 SHA512 67bc1efedd4eb4a75024c51dd83da46179185171ae9028ca586edb91488600aabe0101a14d4de105517f5fa06ee546b83701034d34d64ad301ad6ea5227dd91d diff --git a/sys-cluster/osu-micro-benchmarks/metadata.xml b/sys-cluster/osu-micro-benchmarks/metadata.xml new file mode 100644 index 0000000000..83a3ae08f6 --- /dev/null +++ b/sys-cluster/osu-micro-benchmarks/metadata.xml @@ -0,0 +1,12 @@ + + + + + lssndrbarbieri@gmail.com + Alessandro Barbieri + + + Build OpenSHMEM benchmarks + Enable ROCm extensions + + diff --git a/sys-cluster/osu-micro-benchmarks/osu-micro-benchmarks-5.9.ebuild b/sys-cluster/osu-micro-benchmarks/osu-micro-benchmarks-5.9.ebuild new file mode 100644 index 0000000000..8171ab7263 --- /dev/null +++ b/sys-cluster/osu-micro-benchmarks/osu-micro-benchmarks-5.9.ebuild @@ -0,0 +1,86 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools edo toolchain-funcs + +DESCRIPTION="MPI, OPC and many other benchmarks" +HOMEPAGE="https://mvapich.cse.ohio-state.edu/benchmarks/" +SRC_URI="https://mvapich.cse.ohio-state.edu/download/mvapich/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="openshmem rocm" + +DEPEND=" + virtual/mpi + + openshmem? ( sys-cluster/SOS ) + rocm? ( dev-util/hip ) +" +RDEPEND="${RDEPEND}" + +# TODO: cuda upc++ NCCL + +src_prepare() { + default + eautoreconf + edo pushd "${WORKDIR}" + edo cp -r "${S}" "${S}_mpi" + use openshmem && edo cp -r "${S}" "${S}_oshm" +} + +src_configure() { + local myconf=( + --disable-cuda + --disable-ncclomb + --disable-openacc + --disable-static + --enable-shared + + $(use_enable rocm) + ) + + CC="$(tc-getCC)" CXX="$(tc-getCXX)" econf "${myconf[@]}" + + edo pushd "${S}_mpi" + CC=mpicc CXX=mpicxx econf "${myconf[@]}" + edo popd + + if use openshmem; then + edo pushd "${S}_oshm" + CC=oshcc CXX=oshc++ econf "${myconf[@]}" + edo popd + fi +} + +src_compile() { + CC="$(tc-getCC)" CXX="$(tc-getCXX)" default + + edo pushd "${S}_mpi" + CC=mpicc CXX=mpicxx default + edo popd + + if use openshmem; then + edo pushd "${S}_oshm" + CC=oshcc CXX=oshc++ default + edo popd + fi +} + +src_install() { + default + + edo pushd "${S}_mpi" + default + edo popd + + if use openshmem; then + edo pushd "${S}_oshm" + default + edo popd + fi +} From a6e2f0bc9d384974588de6bfc9dbc7130f91ac20 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Thu, 2 Jun 2022 15:48:02 +0200 Subject: [PATCH 31/50] TODO.md: remove OMB Signed-off-by: Alessandro Barbieri --- TODO.md | 1 - 1 file changed, 1 deletion(-) diff --git a/TODO.md b/TODO.md index af9f226209..f6686cd70b 100644 --- a/TODO.md +++ b/TODO.md @@ -41,7 +41,6 @@ Name | Buildsystem | Category | User | RFH | Dependency [temanejo](https://www.hlrs.de/solutions-services/service-portfolio/programming/hpc-development-tools/temanejo) | autotools | cluster | Alessandro-Barbieri | ✖ | ✔ [geopm](https://geopm.github.io/) | autotools | power | Alessandro-Barbieri | ✖ | ✔ [warewulf](https://warewulf.lbl.gov/) | autotools | cluster | Alessandro-Barbieri | ✖ | ✔ -[omb](http://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-5.8.tgz) | autotools | cluster | Alessandro-Barbieri | ✖ | ✔ [scalasca](https://scalasca.org/) | autotools | cluster | Alessandro-Barbieri | ✖ | ✔ [scorep](https://www.vi-hps.org/projects/score-p/) | autotools | cluster | Alessandro-Barbieri | ✖ | ✔ [jmodelica](https://github.com/jnorthrup/jmodelica) | autotools | science | Alessandro-Barbieri | ✔ | ✔ From 8275bcc923a3f9ef69b7ba0d753c08dafca08e77 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Thu, 2 Jun 2022 15:49:04 +0200 Subject: [PATCH 32/50] sys-cluster/OpenHPC-meta: add osu-micro-benchmarks Signed-off-by: Alessandro Barbieri --- sys-cluster/OpenHPC-meta/OpenHPC-meta-2.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-cluster/OpenHPC-meta/OpenHPC-meta-2.1.ebuild b/sys-cluster/OpenHPC-meta/OpenHPC-meta-2.1.ebuild index 62f3499c44..a044471548 100644 --- a/sys-cluster/OpenHPC-meta/OpenHPC-meta-2.1.ebuild +++ b/sys-cluster/OpenHPC-meta/OpenHPC-meta-2.1.ebuild @@ -64,6 +64,7 @@ RDEPEND=" sys-apps/likwid sys-cluster/extrae[${PYTHON_SINGLE_USEDEP}] sys-cluster/mpi-benchmarks + sys-cluster/osu-micro-benchmarks ) python? ( @@ -106,7 +107,6 @@ RDEPEND=" # perf-tools # sys-cluster/dimemas[libunwind] - #omb #scalasca #tau #scorep From eaaf15c342f2cd8e5a9eba89b63c300953449f6c Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Thu, 2 Jun 2022 16:17:20 +0200 Subject: [PATCH 33/50] sys-devel/gsl: also respect AR Closes: https://bugs.gentoo.org/849245 Signed-off-by: Alessandro Barbieri --- sys-devel/gsl/files/gsl-4.1.5-respect-flags.patch | 12 ++++++++++++ sys-devel/gsl/gsl-4.1.5-r1.ebuild | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/sys-devel/gsl/files/gsl-4.1.5-respect-flags.patch b/sys-devel/gsl/files/gsl-4.1.5-respect-flags.patch index 9d8ebb5f06..c3b5c89eea 100644 --- a/sys-devel/gsl/files/gsl-4.1.5-respect-flags.patch +++ b/sys-devel/gsl/files/gsl-4.1.5-respect-flags.patch @@ -11,3 +11,15 @@ CCOPTS="-D_REENTRANT -D_GNU_SOURCE -Wall -Wno-unused -fno-strict-aliasing" # We assume the following standard libraries are all present. # If your build is failing because of missing libraries then +@@ -334,9 +334,9 @@ + AR_CREATE_OPT="c" + fi + if [ "$RANLIB" = "1" ]; then +- COMMAND="ar ${AR_CREATE_OPT}r $LIBNAME.a $OBJECT" ++ COMMAND="${AR} ${AR_CREATE_OPT}r $LIBNAME.a $OBJECT" + else +- COMMAND="ar ${AR_CREATE_OPT}rs $LIBNAME.a $OBJECT" ++ COMMAND="${AR} ${AR_CREATE_OPT}rs $LIBNAME.a $OBJECT" + fi + if [ "$QUIET" = "no" ]; then + if [ "$VERBOSE" = "no" ]; then diff --git a/sys-devel/gsl/gsl-4.1.5-r1.ebuild b/sys-devel/gsl/gsl-4.1.5-r1.ebuild index c428752143..2fd4ae01ba 100644 --- a/sys-devel/gsl/gsl-4.1.5-r1.ebuild +++ b/sys-devel/gsl/gsl-4.1.5-r1.ebuild @@ -20,7 +20,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${P}-respect-flags.patch" ) src_prepare() { - tc-export RANLIB + tc-export AR RANLIB export CCNAME="$(tc-getCC)" export CCPLUS="$(tc-getCXX)" default From e1499a574732f641844ec73596f429991fffbfc4 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Thu, 2 Jun 2022 17:54:04 +0200 Subject: [PATCH 34/50] sys-cluster/extrae: add 4.0.1 Signed-off-by: Alessandro Barbieri --- sys-cluster/extrae/Manifest | 1 + sys-cluster/extrae/extrae-4.0.1.ebuild | 234 +++++++++++++++++++++++++ 2 files changed, 235 insertions(+) create mode 100644 sys-cluster/extrae/extrae-4.0.1.ebuild diff --git a/sys-cluster/extrae/Manifest b/sys-cluster/extrae/Manifest index 17608e9bc2..1f63529360 100644 --- a/sys-cluster/extrae/Manifest +++ b/sys-cluster/extrae/Manifest @@ -1 +1,2 @@ DIST extrae-3.8.3.tar.gz 1056317 BLAKE2B 9efe7011ba9474de66deb8c679f10eff37cc3d5699b42cb1b076ed43b539bbc15ecc613b3f17b03df9e93a219ebcafd3e1d56229db9c0d4e7a0a56d5c3edd591 SHA512 3fba66447790e0a1c71c0e5a61f67ad966cdd4e19742799ecc50124a916ef599fff747027ccc803584f0ab2d1d76c29ded7072a70dd0aed5a3be7ff6ecbb8709 +DIST extrae-4.0.1.tar.gz 1082141 BLAKE2B a049f744aa1d2f6770e620939c5d7981098e86908843f0b9d38d06a4aa9103ed2d551a34301dbf57857316340031d536a814d82a9ab0aab5ab70b063171ff52c SHA512 58cbe06b1eb738dba3c9d38a96ca8a9bf442c492214e086876af25b8d7e01c379b46281f6815763e87e0e69214636f95486d48b1b6ce088b54d24b4d77ff0920 diff --git a/sys-cluster/extrae/extrae-4.0.1.ebuild b/sys-cluster/extrae/extrae-4.0.1.ebuild new file mode 100644 index 0000000000..8bcd5ef13d --- /dev/null +++ b/sys-cluster/extrae/extrae-4.0.1.ebuild @@ -0,0 +1,234 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( pypy3 python3_{8..11} ) + +inherit autotools java-pkg-opt-2 python-single-r1 + +DESCRIPTION="Instrumentation framework to generate execution traces of parallel runtimes" +HOMEPAGE="https://github.com/bsc-performance-tools/extrae" +SRC_URI="https://github.com/bsc-performance-tools/extrae/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64" + +IUSE_INSTRUMENT=" + +instrument_dynamic-memory + +instrument_io + +instrument_syscall +" +IUSE="${IUSE_INSTRUMENT} clustering dlsym doc dyninst heterogeneous inotify memkind +merge-in-trace nanos online opencl openmp openshmem +parallel-merge pebs-sampling +peruse +posix-clock pthread sampling +single-mpi-lib sionlib smpss spectral +xml" + +#aspectj needs foo/lib/aspectj.jar and foo/bin/ajc +#TODO: cuda cupti gm mx gaspi aspectj +#TODO: support llvm libunwind, llvm rt, elftoolchain + +# aspectj? ( >=dev-java/aspectj-1.9.6 ) +CDEPEND=" + ${PYTHON_DEPS} + dev-libs/libxml2 + dev-libs/papi + !sys-cluster/openmpi[libompitrace(+)] + sys-libs/binutils-libs + sys-libs/libunwind + sys-libs/zlib + virtual/mpi + + clustering? ( sys-cluster/clusteringsuite[treedbscan] ) + dyninst? ( + dev-libs/boost:= + dev-libs/libdwarf + sys-cluster/dyninst + virtual/libelf + ) + inotify? ( dev-libs/libevent ) + memkind? ( dev-libs/memkind ) + online? ( sys-cluster/synapse ) + opencl? ( dev-util/opencl-headers ) + openshmem? ( sys-cluster/SOS ) + peruse? ( sys-cluster/openmpi[peruse(-)] ) + sionlib? ( sys-cluster/sionlib:= ) + spectral? ( + sci-libs/fftw + sys-cluster/spectral + ) +" +DEPEND=" + ${CDEPEND} + java? ( virtual/jdk:1.8 ) +" +RDEPEND=" + ${CDEPEND} + java? ( virtual/jre:1.8 ) + virtual/opencl +" +BDEPEND=" + sys-devel/binutils-config + doc? ( + app-text/ghostscript-gpl + dev-python/sphinx + dev-tex/latexmk + dev-texlive/texlive-latexextra + ) + java? ( app-admin/chrpath ) +" + +PATCHES=( + "${FILESDIR}/${PN}-3.8.3-link-sionlib.patch" +) +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + + || ( ${IUSE_INSTRUMENT//+/} ) + + java? ( pthread ) +" +# aspectj? ( java ) +# cupti? ( cuda ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + export VARTEXFONTS="${T}/fonts" + + local myconf=( + --disable-mic + --disable-pmapi + --disable-static + --enable-shared + --without-cupti + --without-gm + --without-mx + + --datadir="${T}" + --datarootdir="${T}" + --with-librt="${EPREFIX}/usr" + --with-mpi="${EPREFIX}/usr" + --with-papi="${EPREFIX}/usr" + --with-unwind="${EPREFIX}/usr" + + $(use_enable doc) + $(use_enable heterogeneous) + $(use_enable inotify) + $(use_enable instrument_dynamic-memory) + $(use_enable instrument_io) + $(use_enable instrument_syscall) + $(use_enable merge-in-trace) + $(use_enable nanos) + $(use_enable online) + $(use_enable openmp) + $(use_enable parallel-merge) + $(use_enable pebs-sampling) + $(use_enable peruse) + $(use_enable posix-clock) + $(use_enable pthread) + $(use_enable sampling) + $(use_enable single-mpi-lib) + $(use_enable smpss) + $(use_enable xml) + ) + + use dlsym && myconf+=( "--with-pmpi-hook=dlsym" ) + +# if use aspectj; then +# myconf+=( "--with-java-aspectj=${EPREFIX}/usr/share/aspectj/lib" ) +# myconf+=( "--with-java-aspectj-weaver=${EPREFIX}/usr/share/aspectj/lib" ) +# else + myconf+=( "--without-java-aspectj-weaver" ) + myconf+=( "--without-java-aspectj" ) +# fi + if use clustering; then + myconf+=( "--with-clustering=${EPREFIX}/usr" ) + else + myconf+=( "--without-clustering" ) + fi + if use dyninst; then + myconf+=( "--with-boost=${EPREFIX}/usr" ) + myconf+=( "--with-dyninst=${EPREFIX}/usr" ) + myconf+=( "--with-dyninst-headers=${EPREFIX}/usr/include/dyninst" ) + myconf+=( "--with-dwarf=${EPREFIX}/usr" ) + myconf+=( "--with-elf=${EPREFIX}/usr" ) + else + myconf+=( "--without-boost" ) + myconf+=( "--without-dyninst" ) + myconf+=( "--without-dwarf" ) + myconf+=( "--without-elf" ) + fi + if use java; then + myconf+=( "--with-java-jdk=$(java-config -O)" ) + else + myconf+=( "--without-java-jdk" ) + fi + if use memkind; then + myconf+=( "--with-memkind=${EPREFIX}/usr" ) + else + myconf+=( "--without-memkind" ) + fi + if use online; then + myconf+=( "--with-synapse=${EPREFIX}/usr" ) + else + myconf+=( "--without-synapse" ) + fi + if use opencl; then + myconf+=( "--with-opencl=${EPREFIX}/usr" ) + else + myconf+=( "--without-opencl" ) + fi + if use openshmem; then + myconf+=( "--with-openshmem=${EPREFIX}/usr" ) + else + myconf+=( "--without-openshmem" ) + fi + if use sionlib; then + myconf+=( "--with-sionlib=${EPREFIX}/usr" ) + myconf+=( "--with-sionlib-headers=${EPREFIX}/usr/include/sionlib" ) + fi + if use spectral; then + myconf+=( "--with-fft=${EPREFIX}/usr" ) + myconf+=( "--with-spectral=${EPREFIX}/usr" ) + else + myconf+=( "--without-fft" ) + myconf+=( "--without-spectral" ) + fi + + econf "${myconf[@]}" +} + +src_install() { + default + + #TODO: build examples + + mkdir -p "${D}/$(python_get_sitedir)/" || die + mv "${ED}/usr/libexec/pyextrae" "${D}/$(python_get_sitedir)/" || die + python_optimize "${D}/$(python_get_sitedir)/pyextrae" + + #super-duper workaround + mkdir -p "${ED}/usr/share/doc/${PF}" || die + mv "${ED}/${T}/example" "${ED}/usr/share/doc/${PF}/examples" || die + mv "${ED}/${T}/tests" "${ED}/usr/share/doc/${PF}/" || die + + if use doc ; then + mv "${T}/docs"/* "${ED}/usr/share/doc/${PF}/" || die + mv "${T}/man" "${ED}/usr/share/" || die + docompress -x "/usr/share/doc/${PF}/html" + fi + docompress -x "/usr/share/doc/${PF}/examples" + docompress -x "/usr/share/doc/${PF}/tests" + + if use java; then + chrpath -d "${ED}/usr/$(get_libdir)/libextrae-jvmti-agent.so" || die + chrpath -d "${ED}/usr/$(get_libdir)/libjavatrace.so" || die + fi + + find "${ED}" -name '*.a' -delete || die + find "${ED}" -name '*.la' -delete || die +} From 51ded80176b55c0506b5151e556e959874da9a37 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Thu, 2 Jun 2022 17:54:19 +0200 Subject: [PATCH 35/50] sys-cluster/extrae: drop 3.8.3-r10 Signed-off-by: Alessandro Barbieri --- sys-cluster/extrae/Manifest | 1 - sys-cluster/extrae/extrae-3.8.3-r10.ebuild | 238 --------------------- 2 files changed, 239 deletions(-) delete mode 100644 sys-cluster/extrae/extrae-3.8.3-r10.ebuild diff --git a/sys-cluster/extrae/Manifest b/sys-cluster/extrae/Manifest index 1f63529360..2e81d6e173 100644 --- a/sys-cluster/extrae/Manifest +++ b/sys-cluster/extrae/Manifest @@ -1,2 +1 @@ -DIST extrae-3.8.3.tar.gz 1056317 BLAKE2B 9efe7011ba9474de66deb8c679f10eff37cc3d5699b42cb1b076ed43b539bbc15ecc613b3f17b03df9e93a219ebcafd3e1d56229db9c0d4e7a0a56d5c3edd591 SHA512 3fba66447790e0a1c71c0e5a61f67ad966cdd4e19742799ecc50124a916ef599fff747027ccc803584f0ab2d1d76c29ded7072a70dd0aed5a3be7ff6ecbb8709 DIST extrae-4.0.1.tar.gz 1082141 BLAKE2B a049f744aa1d2f6770e620939c5d7981098e86908843f0b9d38d06a4aa9103ed2d551a34301dbf57857316340031d536a814d82a9ab0aab5ab70b063171ff52c SHA512 58cbe06b1eb738dba3c9d38a96ca8a9bf442c492214e086876af25b8d7e01c379b46281f6815763e87e0e69214636f95486d48b1b6ce088b54d24b4d77ff0920 diff --git a/sys-cluster/extrae/extrae-3.8.3-r10.ebuild b/sys-cluster/extrae/extrae-3.8.3-r10.ebuild deleted file mode 100644 index 20f867fe87..0000000000 --- a/sys-cluster/extrae/extrae-3.8.3-r10.ebuild +++ /dev/null @@ -1,238 +0,0 @@ -# Copyright 2019-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( pypy3 python3_{8..10} ) - -inherit autotools java-pkg-opt-2 python-single-r1 - -DESCRIPTION="Instrumentation framework to generate execution traces of parallel runtimes" -HOMEPAGE="https://github.com/bsc-performance-tools/extrae" -SRC_URI="https://github.com/bsc-performance-tools/extrae/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64" - -IUSE_INSTRUMENT=" - +instrument_dynamic-memory - +instrument_io - +instrument_syscall -" -IUSE="${IUSE_INSTRUMENT} clustering dlsym doc dyninst heterogeneous inotify memkind -merge-in-trace nanos online opencl openmp openshmem +parallel-merge pebs-sampling -peruse +posix-clock pthread sampling +single-mpi-lib sionlib smpss spectral +xml" - -#aspectj and aspectj-weaver need to both be enabled at the same time -#current dev-java/aspectj package only provides aspectj.jar -#aspectj needs foo/lib/aspectj.jar and foo/bin/ajc -#aspectj-weaver needs bar/aspectjweaver.jar -#TODO: cuda cupti gm mx -#TODO: support llvm libunwind, llvm rt, elftoolchain - -CDEPEND=" - ${PYTHON_DEPS} - dev-libs/libxml2 - dev-libs/papi - !sys-cluster/openmpi[libompitrace(+)] - sys-libs/libunwind - sys-libs/zlib - virtual/mpi - - || ( sys-devel/binutils:* sys-libs/binutils-libs ) - - clustering? ( sys-cluster/clusteringsuite[treedbscan] ) - dyninst? ( - dev-libs/boost:= - dev-libs/libdwarf - sys-cluster/dyninst - virtual/libelf - ) - inotify? ( dev-libs/libevent ) - memkind? ( dev-libs/memkind ) - online? ( sys-cluster/synapse ) - opencl? ( dev-util/opencl-headers ) - openshmem? ( sys-cluster/SOS ) - peruse? ( sys-cluster/openmpi[peruse(-)] ) - sionlib? ( sys-cluster/sionlib:= ) - spectral? ( - sci-libs/fftw - sys-cluster/spectral - ) -" -# aspectj? ( >=dev-java/aspectj-1.9.6 ) -DEPEND=" - ${CDEPEND} - java? ( virtual/jdk:1.8 ) -" -RDEPEND=" - ${CDEPEND} - java? ( virtual/jre:1.8 ) - virtual/opencl -" -BDEPEND=" - doc? ( - app-text/ghostscript-gpl - dev-python/sphinx - dev-tex/latexmk - dev-texlive/texlive-latexextra - ) - java? ( app-admin/chrpath ) -" - -PATCHES=( "${FILESDIR}/${P}-link-sionlib.patch" ) -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - - || ( ${IUSE_INSTRUMENT//+/} ) - - java? ( pthread ) -" -# cupti? ( cuda ) -# aspectj? ( java ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - export VARTEXFONTS="${T}/fonts" - - local myconf=( - --datadir="${T}" - --datarootdir="${T}" - - --disable-mic - --disable-pmapi - --disable-static - - --enable-shared - - --with-librt="${EPREFIX}/usr" - --with-mpi="${EPREFIX}/usr" - --with-papi="${EPREFIX}/usr" - --with-unwind="${EPREFIX}/usr" - - --without-cupti - --without-gm - --without-mx - - $(use_enable doc) - $(use_enable heterogeneous) - $(use_enable inotify) - $(use_enable instrument_dynamic-memory) - $(use_enable instrument_io) - $(use_enable instrument_syscall) - $(use_enable merge-in-trace) - $(use_enable nanos) - $(use_enable online) - $(use_enable openmp) - $(use_enable parallel-merge) - $(use_enable pebs-sampling) - $(use_enable peruse) - $(use_enable posix-clock) - $(use_enable pthread) - $(use_enable sampling) - $(use_enable single-mpi-lib) - $(use_enable smpss) - $(use_enable xml) - ) - - use dlsym && myconf+=( "--with-pmpi-hook=dlsym" ) - -# if use aspectj; then -# myconf+=( "--with-java-aspectj=${EPREFIX}/usr/share/aspectj/lib" ) -# myconf+=( "--with-java-aspectj-weaver=${EPREFIX}/usr" ) -# else - myconf+=( "--without-java-aspectj-weaver" ) - myconf+=( "--without-java-aspectj" ) -# fi - if use clustering; then - myconf+=( "--with-clustering=${EPREFIX}/usr" ) - else - myconf+=( "--without-clustering" ) - fi - if use dyninst; then - myconf+=( "--with-boost=${EPREFIX}/usr" ) - myconf+=( "--with-dyninst=${EPREFIX}/usr" ) - myconf+=( "--with-dyninst-headers=${EPREFIX}/usr/include/dyninst" ) - myconf+=( "--with-dwarf=${EPREFIX}/usr" ) - myconf+=( "--with-elf=${EPREFIX}/usr" ) - else - myconf+=( "--without-boost" ) - myconf+=( "--without-dyninst" ) - myconf+=( "--without-dwarf" ) - myconf+=( "--without-elf" ) - fi - if use java; then - myconf+=( "--with-java-jdk=$(java-config -O)" ) - else - myconf+=( "--without-java-jdk" ) - fi - if use memkind; then - myconf+=( "--with-memkind=${EPREFIX}/usr" ) - else - myconf+=( "--without-memkind" ) - fi - if use online; then - myconf+=( "--with-synapse=${EPREFIX}/usr" ) - else - myconf+=( "--without-synapse" ) - fi - if use opencl; then - myconf+=( "--with-opencl=${EPREFIX}/usr" ) - else - myconf+=( "--without-opencl" ) - fi - if use openshmem; then - myconf+=( "--with-openshmem=${EPREFIX}/usr" ) - else - myconf+=( "--without-openshmem" ) - fi - if use sionlib; then - myconf+=( "--with-sionlib=${EPREFIX}/usr" ) - myconf+=( "--with-sionlib-headers=${EPREFIX}/usr/include/sionlib" ) - fi - if use spectral; then - myconf+=( "--with-fft=${EPREFIX}/usr" ) - myconf+=( "--with-spectral=${EPREFIX}/usr" ) - else - myconf+=( "--without-fft" ) - myconf+=( "--without-spectral" ) - fi - - econf "${myconf[@]}" -} - -src_install() { - default - - #TODO: build examples - - mkdir -p "${D}/$(python_get_sitedir)/" || die - mv "${ED}/usr/libexec/pyextrae" "${D}/$(python_get_sitedir)/" || die - python_optimize "${D}/$(python_get_sitedir)/pyextrae" - - #super-duper workaround - mkdir -p "${ED}/usr/share/doc/${PF}" || die - mv "${ED}/${T}/example" "${ED}/usr/share/doc/${PF}/examples" || die - mv "${ED}/${T}/tests" "${ED}/usr/share/doc/${PF}/" || die - - if use doc ; then - mv "${T}/docs"/* "${ED}/usr/share/doc/${PF}/" || die - mv "${T}/man" "${ED}/usr/share/" || die - docompress -x "/usr/share/doc/${PF}/html" - fi - docompress -x "/usr/share/doc/${PF}/examples" - docompress -x "/usr/share/doc/${PF}/tests" - - if use java; then - chrpath -d "${ED}/usr/$(get_libdir)/libextrae-jvmti-agent.so" || die - chrpath -d "${ED}/usr/$(get_libdir)/libjavatrace.so" || die - fi - - find "${ED}" -name '*.a' -delete || die - find "${ED}" -name '*.la' -delete || die -} From 14bd4d98f6f03c8eeb408425b3218588be1e4c85 Mon Sep 17 00:00:00 2001 From: Tony Olagbaiye Date: Fri, 3 Jun 2022 01:23:49 +0100 Subject: [PATCH 36/50] app-editors/neovim-qt: new package, add 0.2.16.1 Signed-off-by: Tony Olagbaiye --- app-editors/neovim-qt/Manifest | 1 + .../neovim-qt/neovim-qt-0.2.16.1.ebuild | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 app-editors/neovim-qt/Manifest create mode 100644 app-editors/neovim-qt/neovim-qt-0.2.16.1.ebuild diff --git a/app-editors/neovim-qt/Manifest b/app-editors/neovim-qt/Manifest new file mode 100644 index 0000000000..653ba816d4 --- /dev/null +++ b/app-editors/neovim-qt/Manifest @@ -0,0 +1 @@ +DIST neovim-qt-0.2.16.1.tar.gz 1069176 BLAKE2B ccb9d7275735969dc0576b498e017068da63e14ba82e3160621822d83c3902e35064be393dda57f8e70d83bcbb22e8e663f2ec996ffb48ff0140099ae0793a88 SHA512 63910b0416103f8c4f2450a07d4790c2b7fd26e2ba324445a20700a12d1dc3cb6fb06c674f3a1173348dad5c2256e8018167765306ca33ad94bc176bf5e4e45c diff --git a/app-editors/neovim-qt/neovim-qt-0.2.16.1.ebuild b/app-editors/neovim-qt/neovim-qt-0.2.16.1.ebuild new file mode 100644 index 0000000000..23a279ca4d --- /dev/null +++ b/app-editors/neovim-qt/neovim-qt-0.2.16.1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2022 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit vcs-snapshot cmake-utils + +DESCRIPTION="Neovim client library and GUI, in Qt5" +HOMEPAGE="https://github.com/equalsraf/neovim-qt" +SRC_URI="https://github.com/equalsraf/neovim-qt/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gcov +msgpack" + +DEPEND=" + msgpack? ( dev-libs/msgpack ) + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qttest:5 + dev-qt/qtwidgets:5" +RDEPEND="${DEPEND} + app-editors/neovim" + +src_configure() { + local mycmakeargs=( + -DUSE_GCOV=$(usex gcov ON OFF) + -DUSE_SYSTEM_MSGPACK=$(usex msgpack ON OFF) + ) + + cmake-utils_src_configure +} From 3d2b0f03985588a66254cf34d48319c6cb1451a2 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Fri, 3 Jun 2022 05:01:58 +0500 Subject: [PATCH 37/50] net-misc/ooni-probe-cli: add 3.15.0 Signed-off-by: Anna (cybertailor) Vyalkova --- net-misc/ooni-probe-cli/Manifest | 1 + .../ooni-probe-cli-3.15.0.ebuild | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 net-misc/ooni-probe-cli/ooni-probe-cli-3.15.0.ebuild diff --git a/net-misc/ooni-probe-cli/Manifest b/net-misc/ooni-probe-cli/Manifest index 8a5ef0b530..855515d4d9 100644 --- a/net-misc/ooni-probe-cli/Manifest +++ b/net-misc/ooni-probe-cli/Manifest @@ -1 +1,2 @@ DIST ooni-probe-cli-3.14.2.tar.gz 20997747 BLAKE2B 45e18e40b280c81935476aa67d73b3d56df34507c3ccdd611f22a979d72ef8cd45c3e70d6d899927e8af353717d944fc84650f2a0417d288c175e4694631be0d SHA512 e35e70363f49cac73bbb4a6ae5f091a33c9e72d565e4fb69d2fac25dfebc961cde3cbd88493ffc17f6330b52cfcc6b093c65a63359a534ca4370010422e0e776 +DIST ooni-probe-cli-3.15.0.tar.gz 21374406 BLAKE2B 05fef6dacee64a58bab319d62c01976a29435b8b938f2c3fffe8f5e57801e1ecc39b4e1a02f1ef64550a13ae35139cb2ca035bf3c9e541ec9821e0fa224fc734 SHA512 b5795fe2ee8de25c3189568f479a6010119f2fb18d6f57642c4d23d9116056bd5a5db20f9eeebe9030705a0e0a65d1ecd57b1c71123d87297036b3affcf433e7 diff --git a/net-misc/ooni-probe-cli/ooni-probe-cli-3.15.0.ebuild b/net-misc/ooni-probe-cli/ooni-probe-cli-3.15.0.ebuild new file mode 100644 index 0000000000..5b479e74a3 --- /dev/null +++ b/net-misc/ooni-probe-cli/ooni-probe-cli-3.15.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +MY_PN=${PN#ooni-} +DESCRIPTION="OONI Probe network measurement tool for detecting internet censorship" +HOMEPAGE="https://ooni.org https://github.com/ooni/probe-cli" +SRC_URI="https://github.com/ooni/${MY_PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" + +RESTRICT="test" # hangs + +DOCS=( docs CODEOWNERS {CONTRIBUTING,Readme}.md ) + +src_compile() { + ego build -v -ldflags="-s -w" ./cmd/ooniprobe +} + +src_test() { + ego test $(ego list ./... | grep -v /vendor/) +} + +src_install() { + dobin ooniprobe + einstalldocs +} From c124d8346bed7e1613c8fe1c95560dcff6100b6c Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Fri, 3 Jun 2022 05:03:10 +0500 Subject: [PATCH 38/50] dev-libs/tfdn: add 1.4.0, drop 1.2.0 Signed-off-by: Anna (cybertailor) Vyalkova --- dev-libs/tfdn/Manifest | 2 +- dev-libs/tfdn/{tfdn-1.2.0.ebuild => tfdn-1.4.0.ebuild} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename dev-libs/tfdn/{tfdn-1.2.0.ebuild => tfdn-1.4.0.ebuild} (97%) diff --git a/dev-libs/tfdn/Manifest b/dev-libs/tfdn/Manifest index bc73ee9f89..b311bffefd 100644 --- a/dev-libs/tfdn/Manifest +++ b/dev-libs/tfdn/Manifest @@ -1,2 +1,2 @@ -DIST tfdn-1.2.0.tar.gz 208334 BLAKE2B 84f48512a398c605201694f3a964b2c24a4a429e3f44d84ff830cc40b43f6fc3ae34e5813cd3a37b44ab8d1c8037af0c34726f144a0e1a8c214b507bbc536979 SHA512 53d0f42b1b5d75a4ff77e8ca1b14dc8426ecc92dff88d216cf4c4f8d1b7ac368a8bbbf6897ac7ece66a9b3eb77b9000cff93b86aa587950888e36dea0472962a DIST tfdn-1.3.0.tar.gz 210376 BLAKE2B 1d2ee5f7c4b48b869dff2669f2d4b2bcc72a2e850bda083f780d378260ab6fe869bea56fc1263024ff3069daf9824148affdeab08ea4f727f548ebda2c8a65b3 SHA512 6bdeeecfe83f08abe54f8c518827f812433aee9e67d267e0f66b1a547e34acb251e65f340498d1f95e264a1d17e88cf11c1014ac0183023752c59a6d79979c8a +DIST tfdn-1.4.0.tar.gz 210489 BLAKE2B fb4f1ca35b502464d64153d022da641d039dc53632104cd5528dc9280cbd760415e917b97aef88fcf32e729d1974470f656ea16651d4ba5805c4a78d45b4f89a SHA512 1b0ff1ff5e243a0caa905f7a744a9ec92695cfe0600f171a6ab11c03799b7cce128bd4809cf70ab7c392f3f8e55c30cabc0bb288cfa26b6b59bd3d9280cd3446 diff --git a/dev-libs/tfdn/tfdn-1.2.0.ebuild b/dev-libs/tfdn/tfdn-1.4.0.ebuild similarity index 97% rename from dev-libs/tfdn/tfdn-1.2.0.ebuild rename to dev-libs/tfdn/tfdn-1.4.0.ebuild index 00a31854d7..8afeec3956 100644 --- a/dev-libs/tfdn/tfdn-1.2.0.ebuild +++ b/dev-libs/tfdn/tfdn-1.4.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://git.skyjake.fi/skyjake/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.t S="${WORKDIR}/${MY_PN}" LICENSE="BSD-2" -SLOT="0/1.2" +SLOT="0/$(ver_cut 1-2)" KEYWORDS="~amd64 ~x86" IUSE="cpu_flags_x86_sse4_1 curl debug ssl" From ba66221273148abc17581f54f01b6e27e6ea77b1 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Fri, 3 Jun 2022 05:25:57 +0500 Subject: [PATCH 39/50] net-client/lagrange: drop 1.11.2 Signed-off-by: Anna (cybertailor) Vyalkova --- net-client/lagrange/Manifest | 2 - net-client/lagrange/lagrange-1.11.2.ebuild | 54 ---------------------- 2 files changed, 56 deletions(-) delete mode 100644 net-client/lagrange/lagrange-1.11.2.ebuild diff --git a/net-client/lagrange/Manifest b/net-client/lagrange/Manifest index 175f49103b..4b16827f1a 100644 --- a/net-client/lagrange/Manifest +++ b/net-client/lagrange/Manifest @@ -1,4 +1,2 @@ -DIST lagrange-1.11.2.tar.gz 8731314 BLAKE2B e173b013db0ffb1bf4823040c458e4e7f6b8466f9ca008e95bf2aab9e95a98a928cedc1f66a98658886b764c7ac394ef1ab921229e7a0cf1259dba267f930c82 SHA512 c3200e52fe123c7086ee2027c6fce8ad678c7539aa0d94f80b8348fad7672e1e92daf91474db8c24afded5acb73c806da7642d9aa19130c37de12c905f03fc27 -DIST lagrange-1.11.2.tar.gz.sig 488 BLAKE2B 20b51e9cda34dbac3f86693170f4abbb60c114083b58894f9cebde81b402a1d8c18c6d58917fe1fa87640ebce2012bbbb1d8a5c899383844ce5a11146a8b1f83 SHA512 cd342f0c1a5e7988ebff8607a1b9b31ad573ce9a7da107b5403a65a3e4986bca133c207ea9e04957c50104ca0b3e0ba6f139f3a6b9abb32ef4a085f1ef9ea002 DIST lagrange-1.12.1.tar.gz 9243569 BLAKE2B d0dda3b6b85b464c2e8c9df287e56e29ac4814800a681afec868b631e871e04849b6b93af39f02586b6a05f60860f6d459db1119e312bbcf48c2e00c83b5297c SHA512 d31f69b9d0e321a736fdfaf482a157ea7d34da6512ab3e6c9e31d8fe9dba69f9c40c64f217999dfed6a2757f82ab5dd84f1b6d69de96470ca43a9823e4fd09ad DIST lagrange-1.12.1.tar.gz.sig 488 BLAKE2B 816add81a1a2adbce1624528be097d9c15c733c3759b1f47230bf0cf4e84f60550fe7e898b2d5beecece01687739d5407acd13f711f7ad494e982235ec2c3129 SHA512 badd058f57cfee0658e9552e7c14214ea1a46839a1eb23e3e48fb609927133c90b2b3c7989bdc681333704264c4824341879edda44dfac81aa9fb822f776f25d diff --git a/net-client/lagrange/lagrange-1.11.2.ebuild b/net-client/lagrange/lagrange-1.11.2.ebuild deleted file mode 100644 index 5afc4bb964..0000000000 --- a/net-client/lagrange/lagrange-1.11.2.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake verify-sig xdg - -DESCRIPTION="Desktop GUI client for browsing Geminispace" -HOMEPAGE="https://gmi.skyjake.fi/lagrange/ https://git.skyjake.fi/gemini/lagrange" -SRC_URI="https://git.skyjake.fi/gemini/${PN}/releases/download/v${PV}/${P}.tar.gz - verify-sig? ( https://git.skyjake.fi/gemini/${PN}/releases/download/v${PV}/${P}.tar.gz.sig )" - -LICENSE="|| ( MIT Unlicense ) Apache-2.0 BSD-2 CC-BY-SA-4.0 OFL-1.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+fribidi +harfbuzz mp3 webp" - -DEPEND=" - >=dev-libs/tfdn-1.1.0:=[ssl] - media-libs/libsdl2[sound(+),video(+)] - fribidi? ( dev-libs/fribidi ) - harfbuzz? ( media-libs/harfbuzz:=[truetype(+)] ) - mp3? ( media-sound/mpg123 ) - webp? ( media-libs/libwebp:= ) -" -RDEPEND="${DEPEND}" -BDEPEND="app-arch/zip - verify-sig? ( sec-keys/openpgp-keys-skyjake )" - -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/skyjake.asc" - -src_prepare() { - # checked by Depends.cmake - rm -r lib/the_Foundation/CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - # do not add use flags that don't pull dependencies - # and only choose which files to compile (e.g. "ipc") - local mycmakeargs=( - -DENABLE_FRIBIDI=$(usex fribidi) - -DENABLE_HARFBUZZ=$(usex harfbuzz) - -DENABLE_MPG123=$(usex mp3) - -DENABLE_WEBP=$(usex webp) - - # never build bundled libs - -DENABLE_FRIBIDI_BUILD=OFF - -DENABLE_HARFBUZZ_MINIMAL=OFF - ) - - cmake_src_configure -} From b77d74aa3dfa16d8e4666c5ab9926f04bee386ea Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Fri, 3 Jun 2022 05:49:31 +0500 Subject: [PATCH 40/50] dev-libs/sealcurses: new package, add 0_pre20220523 Signed-off-by: Anna (cybertailor) Vyalkova --- dev-libs/sealcurses/Manifest | 1 + .../sealcurses-0_pre20220523.ebuild | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 dev-libs/sealcurses/Manifest create mode 100644 dev-libs/sealcurses/sealcurses-0_pre20220523.ebuild diff --git a/dev-libs/sealcurses/Manifest b/dev-libs/sealcurses/Manifest new file mode 100644 index 0000000000..ca763bf0e3 --- /dev/null +++ b/dev-libs/sealcurses/Manifest @@ -0,0 +1 @@ +DIST sealcurses-0_pre20220523.tar.gz 22284 BLAKE2B bbff082a61d0dc8c8d80d4dbdc65b5804796b396692c8ed36af64db785481654ec28408d1219e05ebf975007c93ff0aeedc84ec6d741c323edb040484ac6287a SHA512 a84deb17f75ab66ac37a811da03df12862df73d78a9a53f836376f3be81e2c8bde0f80bf11dd8f42cd8b05e998d87287e373d74050361cf7c974aecaa00eb52e diff --git a/dev-libs/sealcurses/sealcurses-0_pre20220523.ebuild b/dev-libs/sealcurses/sealcurses-0_pre20220523.ebuild new file mode 100644 index 0000000000..5498c6df2e --- /dev/null +++ b/dev-libs/sealcurses/sealcurses-0_pre20220523.ebuild @@ -0,0 +1,27 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +COMMIT="d64caa13bc06b68906bb0a5cc87f1896226b0918" +DESCRIPTION="SDL Emulation and Adaptation Layer for Curses" +HOMEPAGE="https://git.skyjake.fi/skyjake/sealcurses" +SRC_URI="https://git.skyjake.fi/skyjake/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-libs/tfdn:= + sys-libs/ncurses:= +" +DEPEND="${RDEPEND}" + +src_install() { + cmake_src_install + find "${ED}" -name libsealcurses.a -delete || die +} From 3401d0e2f445dbfda0eb5b751f9805a6cb961235 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Fri, 3 Jun 2022 06:11:10 +0500 Subject: [PATCH 41/50] net-client/lagrange: add 1.13.6 Signed-off-by: Anna (cybertailor) Vyalkova --- net-client/lagrange/Manifest | 2 + net-client/lagrange/lagrange-1.13.6.ebuild | 61 ++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 net-client/lagrange/lagrange-1.13.6.ebuild diff --git a/net-client/lagrange/Manifest b/net-client/lagrange/Manifest index 4b16827f1a..3e1a0ef9b0 100644 --- a/net-client/lagrange/Manifest +++ b/net-client/lagrange/Manifest @@ -1,2 +1,4 @@ DIST lagrange-1.12.1.tar.gz 9243569 BLAKE2B d0dda3b6b85b464c2e8c9df287e56e29ac4814800a681afec868b631e871e04849b6b93af39f02586b6a05f60860f6d459db1119e312bbcf48c2e00c83b5297c SHA512 d31f69b9d0e321a736fdfaf482a157ea7d34da6512ab3e6c9e31d8fe9dba69f9c40c64f217999dfed6a2757f82ab5dd84f1b6d69de96470ca43a9823e4fd09ad DIST lagrange-1.12.1.tar.gz.sig 488 BLAKE2B 816add81a1a2adbce1624528be097d9c15c733c3759b1f47230bf0cf4e84f60550fe7e898b2d5beecece01687739d5407acd13f711f7ad494e982235ec2c3129 SHA512 badd058f57cfee0658e9552e7c14214ea1a46839a1eb23e3e48fb609927133c90b2b3c7989bdc681333704264c4824341879edda44dfac81aa9fb822f776f25d +DIST lagrange-1.13.6.tar.gz 9872058 BLAKE2B 222b70954c7e403889d540da5045de23258f63d5cd2e8d06f287bf10f50de2fe0dcd76cd9c2ffe19dc5156ee99c21d831f4c8b886cd1f867f0f08b2fb4fb5455 SHA512 a7693d8bc63c14004def4ce7ae5e5ebcd15c8e91b993b1735dbbaef6fbebb3f732eced8223ae46c4fef951a23e2d8558cd07d3d163c9e3f1c120b7db477d11c1 +DIST lagrange-1.13.6.tar.gz.sig 488 BLAKE2B 3828e0a9c5b108048ebd2376ce017367db6e9e99e2c43a0edd519047e5b2e90bfee18ba38fc605add8058ae0a9bad97c9c1e9797ac255c65bcd4b4456dd762d2 SHA512 4101581d4d62d373e4cfab95a0cdd708ca4d4f83ce6942a07ee57e1ed1aea9f5a4146f262ab50544615fdc1b355d57e97b521b25e93aade7b8f80b71a47dc59f diff --git a/net-client/lagrange/lagrange-1.13.6.ebuild b/net-client/lagrange/lagrange-1.13.6.ebuild new file mode 100644 index 0000000000..84f399d920 --- /dev/null +++ b/net-client/lagrange/lagrange-1.13.6.ebuild @@ -0,0 +1,61 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake verify-sig xdg + +DESCRIPTION="Desktop GUI client for browsing Geminispace" +HOMEPAGE="https://gmi.skyjake.fi/lagrange/ https://git.skyjake.fi/gemini/lagrange" +SRC_URI="https://git.skyjake.fi/gemini/${PN}/releases/download/v${PV}/${P}.tar.gz + verify-sig? ( https://git.skyjake.fi/gemini/${PN}/releases/download/v${PV}/${P}.tar.gz.sig )" + +LICENSE="|| ( MIT Unlicense ) Apache-2.0 BSD-2 CC-BY-SA-4.0 OFL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+fribidi +harfbuzz mp3 ncurses webp" + +DEPEND=" + >=dev-libs/tfdn-1.1.0:=[ssl] + fribidi? ( dev-libs/fribidi ) + ncurses? ( dev-libs/sealcurses ) + !ncurses? ( + harfbuzz? ( media-libs/harfbuzz:=[truetype(+)] ) + media-libs/libsdl2[sound(+),video(+)] + ) + mp3? ( media-sound/mpg123 ) + webp? ( media-libs/libwebp:= ) +" +RDEPEND="${DEPEND}" +BDEPEND="app-arch/zip + verify-sig? ( sec-keys/openpgp-keys-skyjake )" + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/skyjake.asc" + +src_prepare() { + # checked by Depends.cmake + rm -r lib/the_Foundation/CMakeLists.txt || die + + sed "/elseif (ENABLE_TUI AND (UNIX OR MSYS))/a include (GNUInstallDirs)" \ + -i CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + # do not add use flags that don't pull dependencies + # and only choose which files to compile (e.g. "ipc") + local mycmakeargs=( + -DENABLE_FRIBIDI=$(usex fribidi) + -DENABLE_HARFBUZZ=$(usex harfbuzz) + -DENABLE_TUI=$(usex ncurses) + -DENABLE_MPG123=$(usex mp3) + -DENABLE_WEBP=$(usex webp) + + # never build bundled libs + -DENABLE_FRIBIDI_BUILD=OFF + -DENABLE_HARFBUZZ_MINIMAL=OFF + ) + + cmake_src_configure +} From 4d8ac1229518f6f426ad99f073faebb22b90e913 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Fri, 3 Jun 2022 08:51:56 +0500 Subject: [PATCH 42/50] TODO.md: add odilia Signed-off-by: Anna (cybertailor) Vyalkova --- TODO.md | 1 + 1 file changed, 1 insertion(+) diff --git a/TODO.md b/TODO.md index f6686cd70b..22e82298bb 100644 --- a/TODO.md +++ b/TODO.md @@ -4,6 +4,7 @@ If you find an interesting piece of software here, consider to package it, also Name | Buildsystem | Category | User | RFH | Dependency ------------ | ------------- | ------------- | ------------- | ------------- | ------------- +[odilia](https://odilia.app) | cargo | accessibility | - | ? | ✖ [spacelib](https://github.com/Alessandro-Barbieri/SpaceLib) | none | science | Alessandro-Barbieri | ✖ | ✖ [cpp-fuzzy-logic](https://sourceforge.net/projects/cpp-fuzzy-logic) | none | devel | Alessandro-Barbieri | ✖ | ✖ [free fuzzy logic library](http://ffll.sourceforge.net) | none | devel | Alessandro-Barbieri | ✖ | ✖ From 093f06f6514d3d54c986211fd5d16cecd206fdc8 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Fri, 3 Jun 2022 08:52:17 +0500 Subject: [PATCH 43/50] TODO.md: remove gitlab (it's packaged in ::gitlab) Signed-off-by: Anna (cybertailor) Vyalkova --- TODO.md | 1 - 1 file changed, 1 deletion(-) diff --git a/TODO.md b/TODO.md index 22e82298bb..45157707ad 100644 --- a/TODO.md +++ b/TODO.md @@ -110,5 +110,4 @@ Name | Buildsystem | Category | User | RFH | Dependency [kaitai](https://github.com/kaitai-io/kaitai_struct) | sbt | util | Alessandro-Barbieri | ✔ | ✖ [casadi](https://web.casadi.org/) | cmake swig | science | Alessandro-Barbieri | ✖ | ✔ [ipyleaflet](https://github.com/jupyter-widgets/ipyleaflet) | setuptools yarn | jupyter | Alessandro-Barbieri | ✔ | ✖ -[gitlab](https://gitlab.com/gitlab-org/gitlab-foss) | yarn gem | vcs | Alessandro-Barbieri | ✔ | ✖ [HOL4](http://hol-theorem-prover.org/) | ? | math | Alessandro-Barbieri | ✔ | ✖ From 6b304710590791a1f321733c21ff0711c695ba77 Mon Sep 17 00:00:00 2001 From: Jonas Frei Date: Fri, 3 Jun 2022 06:07:03 +0200 Subject: [PATCH 44/50] media-sound/dzr: add 220531, drop 220505 Signed-off-by: Jonas Frei --- media-sound/dzr/Manifest | 2 +- media-sound/dzr/{dzr-220505.ebuild => dzr-220531.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename media-sound/dzr/{dzr-220505.ebuild => dzr-220531.ebuild} (100%) diff --git a/media-sound/dzr/Manifest b/media-sound/dzr/Manifest index f875a1a9fc..020a37fa69 100644 --- a/media-sound/dzr/Manifest +++ b/media-sound/dzr/Manifest @@ -1 +1 @@ -DIST dzr-220505.tar.gz 5741 BLAKE2B 727ca4fe3a2cebe8c5c9c97936d729c58be2eb11905b6549b894eed493aa68a571b40e6d06382a47749b999a69abbb0c84e2d01273cf6b11d0149516bb1cce85 SHA512 d70300ec5352e71b6e1edfb4f5e02ee86f7ff49111e21e95e99993e8b10df79544cef3a47b9e840004bd759da1684e419bca999ce8655501fbd6151735f71ed7 +DIST dzr-220531.tar.gz 5814 BLAKE2B 1f1b2973d8f0e65ed9bfd3184f0afd2cf31a899749cf4d6130d62a45219bced9a7cb07d451d3b268004e0cbb6359a82c9ed5d8bce504b8350f49e7eb67cee039 SHA512 cb7480f830807328bc7e51a1ef5c4c613068de3e49ff203108774fcc704ddc9b22929d985cab6a3eec937b92046a121568d04d2d949cabe5c6bbb8559b500947 diff --git a/media-sound/dzr/dzr-220505.ebuild b/media-sound/dzr/dzr-220531.ebuild similarity index 100% rename from media-sound/dzr/dzr-220505.ebuild rename to media-sound/dzr/dzr-220531.ebuild From 7b9b09b1ff598f9cc693ea20c28ddb58db27723b Mon Sep 17 00:00:00 2001 From: Jonas Frei Date: Fri, 3 Jun 2022 06:44:27 +0200 Subject: [PATCH 45/50] gui-apps/fuzzel: initial import Signed-off-by: Jonas Frei --- gui-apps/fuzzel/Manifest | 1 + gui-apps/fuzzel/fuzzel-1.7.0.ebuild | 54 +++++++++++++++++++++++++++++ gui-apps/fuzzel/fuzzel-9999.ebuild | 54 +++++++++++++++++++++++++++++ gui-apps/fuzzel/metadata.xml | 17 +++++++++ 4 files changed, 126 insertions(+) create mode 100644 gui-apps/fuzzel/Manifest create mode 100644 gui-apps/fuzzel/fuzzel-1.7.0.ebuild create mode 100644 gui-apps/fuzzel/fuzzel-9999.ebuild create mode 100644 gui-apps/fuzzel/metadata.xml diff --git a/gui-apps/fuzzel/Manifest b/gui-apps/fuzzel/Manifest new file mode 100644 index 0000000000..405e81c858 --- /dev/null +++ b/gui-apps/fuzzel/Manifest @@ -0,0 +1 @@ +DIST fuzzel-1.7.0.tar.gz 399615 BLAKE2B 73f3eac98660f5325d1a6547ebc64c473b62b5f70a25ff12166e4592cb08b1d3c415107b65ef639e8500a0011232047acf214d6501aa5714cbc83c46d73c6e20 SHA512 a1c1f97c5964e0afb6ae449d8d2a06635b12719445e3a5f139fa592fa773bf7f9592cdeb2eb81054356831793e91a3c5eb6677b93092982eff346a7fb9078b4e diff --git a/gui-apps/fuzzel/fuzzel-1.7.0.ebuild b/gui-apps/fuzzel/fuzzel-1.7.0.ebuild new file mode 100644 index 0000000000..dd841f9f54 --- /dev/null +++ b/gui-apps/fuzzel/fuzzel-1.7.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://codeberg.org/dnkl/fuzzel.git" +else + SRC_URI="https://codeberg.org/dnkl/fuzzel/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/${PN}" +fi + +DESCRIPTION="Application launcher for wlroots based Wayland compositors." +HOMEPAGE="https://codeberg.org/dnkl/fuzzel" +LICENSE="MIT" +SLOT="0" +IUSE="cairo png svg" + +DEPEND=" + dev-libs/wayland + =media-libs/fcft-3.0.0 + x11-libs/libxkbcommon + x11-libs/pixman + cairo? ( x11-libs/cairo ) + png? ( media-libs/libpng ) + svg? ( gnome-base/librsvg ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + app-text/scdoc + >=dev-libs/tllist-1.0.1 + dev-libs/wayland-protocols + dev-util/wayland-scanner +" + +src_configure() { + local emesonargs=( + -Dwerror=false + -Dpng-backend=$(usex png libpng none) + -Dsvg-backend=$(usex svg librsvg none) + $(meson_feature cairo enable-cairo) + ) + meson_src_configure +} + +src_install() { + meson_src_install + rm -rf "${ED}/usr/share/doc/fuzzel" || die +} diff --git a/gui-apps/fuzzel/fuzzel-9999.ebuild b/gui-apps/fuzzel/fuzzel-9999.ebuild new file mode 100644 index 0000000000..dd841f9f54 --- /dev/null +++ b/gui-apps/fuzzel/fuzzel-9999.ebuild @@ -0,0 +1,54 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://codeberg.org/dnkl/fuzzel.git" +else + SRC_URI="https://codeberg.org/dnkl/fuzzel/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/${PN}" +fi + +DESCRIPTION="Application launcher for wlroots based Wayland compositors." +HOMEPAGE="https://codeberg.org/dnkl/fuzzel" +LICENSE="MIT" +SLOT="0" +IUSE="cairo png svg" + +DEPEND=" + dev-libs/wayland + =media-libs/fcft-3.0.0 + x11-libs/libxkbcommon + x11-libs/pixman + cairo? ( x11-libs/cairo ) + png? ( media-libs/libpng ) + svg? ( gnome-base/librsvg ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + app-text/scdoc + >=dev-libs/tllist-1.0.1 + dev-libs/wayland-protocols + dev-util/wayland-scanner +" + +src_configure() { + local emesonargs=( + -Dwerror=false + -Dpng-backend=$(usex png libpng none) + -Dsvg-backend=$(usex svg librsvg none) + $(meson_feature cairo enable-cairo) + ) + meson_src_configure +} + +src_install() { + meson_src_install + rm -rf "${ED}/usr/share/doc/fuzzel" || die +} diff --git a/gui-apps/fuzzel/metadata.xml b/gui-apps/fuzzel/metadata.xml new file mode 100644 index 0000000000..1f4dc94781 --- /dev/null +++ b/gui-apps/fuzzel/metadata.xml @@ -0,0 +1,17 @@ + + + + + Jonas Frei + freijon@pm.me + + + + Required for rounded corners and SVG icons + Enable support for PNG icons + enables support for SVG icons + + From 385fc9547642476844ff2ab327c7e0de2642a294 Mon Sep 17 00:00:00 2001 From: Jonas Frei Date: Fri, 3 Jun 2022 09:28:18 +0200 Subject: [PATCH 46/50] gui-apps/fuzzel: Removed '-Dwerror=false' which is covered by meson.eclass Signed-off-by: Jonas Frei --- gui-apps/fuzzel/fuzzel-1.7.0.ebuild | 1 - gui-apps/fuzzel/fuzzel-9999.ebuild | 1 - 2 files changed, 2 deletions(-) diff --git a/gui-apps/fuzzel/fuzzel-1.7.0.ebuild b/gui-apps/fuzzel/fuzzel-1.7.0.ebuild index dd841f9f54..3e66166046 100644 --- a/gui-apps/fuzzel/fuzzel-1.7.0.ebuild +++ b/gui-apps/fuzzel/fuzzel-1.7.0.ebuild @@ -40,7 +40,6 @@ BDEPEND=" src_configure() { local emesonargs=( - -Dwerror=false -Dpng-backend=$(usex png libpng none) -Dsvg-backend=$(usex svg librsvg none) $(meson_feature cairo enable-cairo) diff --git a/gui-apps/fuzzel/fuzzel-9999.ebuild b/gui-apps/fuzzel/fuzzel-9999.ebuild index dd841f9f54..3e66166046 100644 --- a/gui-apps/fuzzel/fuzzel-9999.ebuild +++ b/gui-apps/fuzzel/fuzzel-9999.ebuild @@ -40,7 +40,6 @@ BDEPEND=" src_configure() { local emesonargs=( - -Dwerror=false -Dpng-backend=$(usex png libpng none) -Dsvg-backend=$(usex svg librsvg none) $(meson_feature cairo enable-cairo) From 4aa447498d5a5bf0d29cdcd83ac052cce744c8a1 Mon Sep 17 00:00:00 2001 From: David Roman Date: Fri, 3 Jun 2022 10:25:03 +0200 Subject: [PATCH 47/50] app-text/lizard: add 1.17.10, drop 1.17.7 Closes: https://bugs.gentoo.org/848105 Signed-off-by: David Roman --- app-text/lizard/Manifest | 2 +- .../lizard/{lizard-1.17.7.ebuild => lizard-1.17.10.ebuild} | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename app-text/lizard/{lizard-1.17.7.ebuild => lizard-1.17.10.ebuild} (86%) diff --git a/app-text/lizard/Manifest b/app-text/lizard/Manifest index 23a178c0e1..60c953cd46 100644 --- a/app-text/lizard/Manifest +++ b/app-text/lizard/Manifest @@ -1 +1 @@ -DIST lizard-1.17.7.tar.gz 1223565 BLAKE2B d49b7c05d459ff2c24a6c252840fd411a6fa720327d1ef0a7d0bb7fda6684210cca20f5d6e675c2e80f7edf9d4703c31b0e0aca267222037a6167a0265385169 SHA512 c47079e3077ebf87ee42dc361ffa4b68100408215f76d110ba20eaa44de51fbe54d695cefdd0a9e20752aafade865b7ed24551db4d34466b6e2d25df80806e79 +DIST lizard-1.17.10.tar.gz 1230723 BLAKE2B ed6a899088a19c05de7f1a01a0dea23add0ab917a7bf8213bac8417831ad061f0802a742f955ca2dc025e7ad4caf3447ba4f33cd5b020f669dff8aff062f5aa6 SHA512 7b2ebc8ccacec9a72b79f01af76a5574caca28b8d03f28353f29a61cb683cf2fe73e09b7a238f4aa3c487d49aa73b69f040d4040e2d36406c2408d4c1a7d80c3 diff --git a/app-text/lizard/lizard-1.17.7.ebuild b/app-text/lizard/lizard-1.17.10.ebuild similarity index 86% rename from app-text/lizard/lizard-1.17.7.ebuild rename to app-text/lizard/lizard-1.17.10.ebuild index a915a188a9..af001e18da 100644 --- a/app-text/lizard/lizard-1.17.7.ebuild +++ b/app-text/lizard/lizard-1.17.10.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit distutils-r1 From bfd63b023c3c043178936fa94b215019997c5c7b Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Fri, 3 Jun 2022 11:50:38 +0200 Subject: [PATCH 48/50] sys-process/btop: various cleanup, add missing "|| die" to sed Signed-off-by: Florian Schmaus --- sys-process/btop/btop-1.2.7.ebuild | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/sys-process/btop/btop-1.2.7.ebuild b/sys-process/btop/btop-1.2.7.ebuild index 90014cdbe0..44d1c8204f 100644 --- a/sys-process/btop/btop-1.2.7.ebuild +++ b/sys-process/btop/btop-1.2.7.ebuild @@ -11,22 +11,15 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~x86" -DEPEND="" -RDEPEND="${DEPEND}" -BDEPEND=" - >=sys-devel/gcc-10 -" - src_prepare() { default # btop installs README.md to /usr/share/btop by default - sed -i 's/^.*cp -p README.md.*$//' Makefile + sed -i '/^.*cp -p README.md.*$/d' Makefile || die } src_compile() { # Disable btop optimization flags, since we have our flags in CXXFLAGS - emake \ - OPTFLAGS="" + emake OPTFLAGS="" } src_install() { From fcd8e74964296387565d5bf69c6ff68b63701f7d Mon Sep 17 00:00:00 2001 From: David Roman Date: Fri, 3 Jun 2022 12:06:58 +0200 Subject: [PATCH 49/50] dev-python/tweepy: add 4.10.0 Closes: https://bugs.gentoo.org/848348 Signed-off-by: David Roman --- dev-python/tweepy/Manifest | 1 + dev-python/tweepy/tweepy-4.10.0.ebuild | 31 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 dev-python/tweepy/tweepy-4.10.0.ebuild diff --git a/dev-python/tweepy/Manifest b/dev-python/tweepy/Manifest index ec1236764c..3daa794a2d 100644 --- a/dev-python/tweepy/Manifest +++ b/dev-python/tweepy/Manifest @@ -1 +1,2 @@ DIST tweepy-3.10.0.tar.gz 459678 BLAKE2B 8ed612e9a0ad0892110658c94bcf70ec3da4219c74fe9e4600bebd8ce16a81ef03461924aa9d170ccf3ae9127cfa0bc35a7d36a4b379b44ab5557eba8d30972c SHA512 2a40875c5612902e4ff69e6fdf73e9fa10b93a80bf4160b16e44e2dae058a90f86569b3a4bcb67a7acdf5c9c3119ce7ca35a3ae64e393181b78fde10dfd975b5 +DIST tweepy-4.10.0.tar.gz 5898258 BLAKE2B 862eb1b8c804171204ef636be3844e92c8a0ded8dbb3c9d3e9aa7c7379617f5e711385ac5df2849f48505f9ab74acd21b9239694033f9d1f2232c45e8e7f0815 SHA512 b84ff3ba795f0da775970cdf62cb8b614dcf287149398b9457be7a6049b8591369d5b181ec8bcd7bf4c4dd5994040c0eaa6e73179cae550bc56ee8b32324fd71 diff --git a/dev-python/tweepy/tweepy-4.10.0.ebuild b/dev-python/tweepy/tweepy-4.10.0.ebuild new file mode 100644 index 0000000000..ffcb1bdcc3 --- /dev/null +++ b/dev-python/tweepy/tweepy-4.10.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit distutils-r1 + +DESCRIPTION="An easy-to-use Python library for accessing the Twitter API." +HOMEPAGE="https://www.tweepy.org/" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +KEYWORDS="~amd64" +LICENSE="MIT" +SLOT="0" + +RDEPEND=" + dev-python/requests[${PYTHON_USEDEP},socks5] + dev-python/requests-oauthlib[${PYTHON_USEDEP}] +" + +DEPEND=" + ${RDEPEND} + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/vcrpy[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests nose From e9595c31d2012ec5f133154044d84acb10027bc6 Mon Sep 17 00:00:00 2001 From: David Roman Date: Fri, 3 Jun 2022 12:23:32 +0200 Subject: [PATCH 50/50] media-sound/mopidy: add 3.3.0, drop 3.2.0 Closes: https://bugs.gentoo.org/848393 Signed-off-by: David Roman --- media-sound/mopidy/Manifest | 2 +- .../mopidy/{mopidy-3.2.0.ebuild => mopidy-3.3.0.ebuild} | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename media-sound/mopidy/{mopidy-3.2.0.ebuild => mopidy-3.3.0.ebuild} (91%) diff --git a/media-sound/mopidy/Manifest b/media-sound/mopidy/Manifest index 0bb1f26843..fe444ee2f9 100644 --- a/media-sound/mopidy/Manifest +++ b/media-sound/mopidy/Manifest @@ -1 +1 @@ -DIST mopidy-3.2.0.tar.gz 438255 BLAKE2B afab74b9b8217a2481b711708ada81b79de8b2eb2be5892378f672690098d82fb27f715d95fd585cf76b84be2cd4cc07d1cd2d8fc5d42ef4e1710c5a67e08f7b SHA512 cbca5c2f6784754c06f9f6fd80aa0379b606ed4a52f31dfa27c165869cf65171b6203f683ee1150319ab51feae45dadaaa338e22d26af3511cdf56e8f3d81145 +DIST mopidy-3.3.0.tar.gz 443949 BLAKE2B 433c9caef164b9c85ea220f0f1472cb3b78c7291618e46ed16497ec0734f57d6a8a2ea1218c79a6a60fde60179e59c4a4a9bde805ac84109a02935673132ab95 SHA512 9cad7d5013defb9f7edee17b48120286a0b3be568eba15c60fc5363f8ee2ab9041dd79574b2ce1a14a941f41f53101f588e0d0283ee01b82499bc6ffe001cee2 diff --git a/media-sound/mopidy/mopidy-3.2.0.ebuild b/media-sound/mopidy/mopidy-3.3.0.ebuild similarity index 91% rename from media-sound/mopidy/mopidy-3.2.0.ebuild rename to media-sound/mopidy/mopidy-3.3.0.ebuild index 8765cd26b9..454da0a7b4 100644 --- a/media-sound/mopidy/mopidy-3.2.0.ebuild +++ b/media-sound/mopidy/mopidy-3.3.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit distutils-r1