diff options
Diffstat (limited to 'dev-util')
86 files changed, 961 insertions, 2828 deletions
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest index caa968a9c39a..16d898727cf0 100644 --- a/dev-util/bitcoin-tx/Manifest +++ b/dev-util/bitcoin-tx/Manifest @@ -1,8 +1,2 @@ -DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893 -DIST bitcoin-0.19.1.knots20200304.patches.tar.xz 399864 BLAKE2B de5591072b62c65c8a0fdcee7a7ed4b74d13614e47b679a05f272207b9ca0a09d476aa8ecb66321f39953a320f4d47f7d2aa62848192d493de02525c3d5abdfa SHA512 3b08023f0788535dc5943e47a595da5637172263ac8c2ad97d42c0707da7468a9843efbf90a2eb6ac99db65e362e99cbe9209ab64785c79de908e20801ba4fe5 -DIST bitcoin-0.20.0.knots20200614.patches.tar.xz 392356 BLAKE2B 17c5d5c89e279c870492ac4f98cfde6545fa3c4b5169f42c020e45ca14c133673e271b248e90286ae875aaef6b031e578d14554777a89dca5366aa4bda079012 SHA512 208234b2e7fa46e19da9954dab9828993aa62a7623d85de8e7d43ffd4b367c5e8641e82154357526a11b95c0426ec16039d2910dbbe9187daba9d14a3b2fda92 DIST bitcoin-0.20.1.knots20200815.patches.tar.xz 413244 BLAKE2B bc8fd6bfe0454439ae514086ea3e728df4f1ba069d33f79b047049a1a4d18543334217f25607b738f7f2d1245f64e5289aed00473c94edf5d660e0953e4d6b93 SHA512 98468f4f22d5b9d35c616796aa5a8fda20f775606f0cd4927b3b822dd5afd0fc208c23136306f79d01dbfd532b14a5905a8fb60a2d171d5022d2008772cf7b58 -DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d -DIST bitcoin-v0.19.1.tar.gz 6660702 BLAKE2B 93ed83f663a833f6be40195ddaf62a8ef9fcd86c3f983fe0cf1e75eaf9ae54cdc88fcdfc36d798842f29636dc8037af5b67e82643c90a6c276fa504ed022f863 SHA512 bc1afad7de5b43042d24780b07e3faf73dda69af9ef0c75fa1a32bd25b0b37e315955614ffbb2864fe827b77b63446fd88cae22da3d0706ff73df495a519ba5d -DIST bitcoin-v0.20.0.tar.gz 6984988 BLAKE2B 2c189826b7171276df62fb8cbf713d8b4cb4307de413247f2951950ec173d069930447d7d420d1c73ba0abc97fd613a05fc527bcc796e5e2d2f3dfb57fb29b80 SHA512 7628efb70bf51e4165605d9e77f6119b855994e99d8cb6653dfbd89628304862f3a98cfe352aa8b435913000e74d297565d8a7e3f22a23006d1779b70d04a8cd DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.16.3.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.16.3.ebuild deleted file mode 100644 index 6931759c939b..000000000000 --- a/dev-util/bitcoin-tx/bitcoin-tx-0.16.3.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 2010-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools bash-completion-r1 - -BITCOINCORE_COMMITHASH="49e34e288005a5b144a642e197b628396f5a0765" -KNOTS_PV="${PV}.knots20180918" -KNOTS_P="bitcoin-${KNOTS_PV}" - -DESCRIPTION="Command-line Bitcoin transaction tool" -HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/" -SRC_URI=" - https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz - https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="knots libressl" - -DEPEND=" - >=dev-libs/boost-1.52.0:=[threads(+)] - >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] - dev-libs/univalue:= - !libressl? ( dev-libs/openssl:0=[-bindist] ) - libressl? ( dev-libs/libressl:0= ) -" -RDEPEND="${DEPEND}" - -DOCS=( doc/bips.md doc/release-notes.md ) - -S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}" - -pkg_pretend() { - if use knots; then - elog "You are building ${PN} from Bitcoin Knots." - elog "For more information, see:" - elog "https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.desc.html" - else - elog "You are building ${PN} from Bitcoin Core." - elog "For more information, see:" - elog "https://bitcoincore.org/en/2018/09/18/release-${PV}/" - fi -} - -src_prepare() { - local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/" - - eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch" - - if use knots; then - eapply "${knots_patchdir}/${KNOTS_P}.f.patch" - eapply "${knots_patchdir}/${KNOTS_P}.branding.patch" - eapply "${knots_patchdir}/${KNOTS_P}.ts.patch" - fi - - eapply_user - - echo '#!/bin/true' >share/genbuild.sh || die - mkdir -p src/obj || die - echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die - - eautoreconf - rm -r src/leveldb src/secp256k1 || die -} - -src_configure() { - local my_econf=( - --disable-asm - --without-qtdbus - --without-libevent - --without-qrencode - --without-miniupnpc - --disable-tests - --disable-wallet - --disable-zmq - --enable-util-tx - --disable-util-cli - --disable-bench - --without-libs - --without-daemon - --without-gui - --disable-ccache - --disable-static - --with-system-libsecp256k1 - --with-system-univalue - ) - econf "${my_econf[@]}" -} - -src_install() { - default - - newbashcomp contrib/${PN}.bash-completion ${PN} -} diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.19.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.19.1.ebuild deleted file mode 100644 index b19f22a49f55..000000000000 --- a/dev-util/bitcoin-tx/bitcoin-tx-0.19.1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools bash-completion-r1 - -BITCOINCORE_COMMITHASH="58ba7c314d552cea8cb024960a8504577aee586f" -KNOTS_PV="${PV}.knots20200304" -KNOTS_P="bitcoin-${KNOTS_PV}" - -DESCRIPTION="Command-line Bitcoin transaction tool" -HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/" -SRC_URI=" - https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz - https://bitcoinknots.org/files/0.19.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="knots libressl" - -DEPEND=" - >=dev-libs/boost-1.52.0:=[threads(+)] - >dev-libs/libsecp256k1-0.1_pre20170321:=[recovery] - >=dev-libs/univalue-1.0.4:= - !libressl? ( dev-libs/openssl:0=[-bindist] ) - libressl? ( dev-libs/libressl:0= ) -" -RDEPEND="${DEPEND}" - -DOCS=( - doc/bips.md - doc/release-notes.md -) - -S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}" - -pkg_pretend() { - if use knots; then - elog "You are building ${PN} from Bitcoin Knots." - elog "For more information, see:" - elog "https://bitcoinknots.org/files/0.19.x/${KNOTS_PV}/${KNOTS_P}.desc.html" - else - elog "You are building ${PN} from Bitcoin Core." - elog "For more information, see:" - elog "https://bitcoincore.org/en/2020/03/04/release-${PV}/" - fi -} - -src_prepare() { - local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/" - - eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch" - - if use knots; then - eapply "${knots_patchdir}/${KNOTS_P}.f.patch" - eapply "${knots_patchdir}/${KNOTS_P}.branding.patch" - eapply "${knots_patchdir}/${KNOTS_P}.ts.patch" - fi - - eapply "${FILESDIR}/${PV}-no-libevent.patch" - - eapply_user - - echo '#!/bin/true' >share/genbuild.sh || die - mkdir -p src/obj || die - echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die - - eautoreconf - rm -r src/leveldb src/secp256k1 || die -} - -src_configure() { - local my_econf=( - --disable-asm - --without-qtdbus - --without-qrencode - --without-miniupnpc - --disable-tests - --disable-wallet - --disable-zmq - --enable-util-tx - --disable-util-cli - --disable-util-wallet - --disable-bench - --without-libs - --without-daemon - --without-gui - --without-rapidcheck - --disable-fuzz - --disable-ccache - --disable-static - --with-system-libsecp256k1 - --with-system-univalue - ) - econf "${my_econf[@]}" -} - -src_install() { - default - - newbashcomp contrib/${PN}.bash-completion ${PN} -} diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.20.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.20.0.ebuild deleted file mode 100644 index 0bb0c0386d5d..000000000000 --- a/dev-util/bitcoin-tx/bitcoin-tx-0.20.0.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools bash-completion-r1 - -BITCOINCORE_COMMITHASH="a62f0ed64f8bbbdfe6467ac5ce92ef5b5222d1bd" -KNOTS_PV="${PV}.knots20200614" -KNOTS_P="bitcoin-${KNOTS_PV}" - -DESCRIPTION="Command-line Bitcoin transaction tool" -HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/" -SRC_URI=" - https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz - https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="knots libressl" - -DEPEND=" - >=dev-libs/boost-1.52.0:=[threads(+)] - >dev-libs/libsecp256k1-0.1_pre20170321:=[recovery] - >=dev-libs/univalue-1.0.4:= - !libressl? ( dev-libs/openssl:0=[-bindist] ) - libressl? ( dev-libs/libressl:0= ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - >=sys-devel/autoconf-2.69 - >=sys-devel/automake-1.13 -" - -DOCS=( - doc/bips.md - doc/release-notes.md -) - -S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}" - -pkg_pretend() { - if use knots; then - elog "You are building ${PN} from Bitcoin Knots." - elog "For more information, see:" - elog "https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.desc.html" - else - elog "You are building ${PN} from Bitcoin Core." - elog "For more information, see:" - elog "https://bitcoincore.org/en/2020/06/03/release-${PV}/" - fi -} - -src_prepare() { - local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/" - - eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch" - - if use knots; then - eapply "${knots_patchdir}/${KNOTS_P}.f.patch" - eapply "${knots_patchdir}/${KNOTS_P}.branding.patch" - eapply "${knots_patchdir}/${KNOTS_P}.ts.patch" - fi - - eapply_user - - echo '#!/bin/true' >share/genbuild.sh || die - mkdir -p src/obj || die - echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die - - eautoreconf - rm -r src/leveldb src/secp256k1 || die -} - -src_configure() { - local my_econf=( - --disable-asm - --without-qtdbus - --without-qrencode - --without-miniupnpc - --disable-tests - --disable-wallet - --disable-zmq - --enable-util-tx - --disable-util-cli - --disable-util-wallet - --disable-bench - --without-libs - --without-daemon - --without-gui - --disable-fuzz - --disable-ccache - --disable-static - --with-system-libsecp256k1 - --with-system-univalue - ) - econf "${my_econf[@]}" -} - -src_install() { - default - - newbashcomp contrib/${PN}.bash-completion ${PN} -} diff --git a/dev-util/bitcoin-tx/files/0.19.1-no-libevent.patch b/dev-util/bitcoin-tx/files/0.19.1-no-libevent.patch deleted file mode 100644 index fa29f8bbac97..000000000000 --- a/dev-util/bitcoin-tx/files/0.19.1-no-libevent.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -1271,7 +1271,7 @@ if test x$use_pkgconfig = xyes; then - BITCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])]) - fi - if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then -- PKG_CHECK_MODULES([EVENT], [libevent],, [AC_MSG_ERROR(libevent not found.)]) -+ PKG_CHECK_MODULES([EVENT], [libevent], [use_libevent=yes], [AC_MSG_ERROR(libevent not found.)]) - if test x$TARGET_OS != xwindows; then - PKG_CHECK_MODULES([EVENT_PTHREADS], [libevent_pthreads],, [AC_MSG_ERROR(libevent_pthreads not found.)]) - fi -@@ -1291,7 +1291,7 @@ if test x$use_pkgconfig = xyes; then - else - - if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then -- AC_CHECK_HEADER([event2/event.h],, AC_MSG_ERROR(libevent headers missing),) -+ AC_CHECK_HEADER([event2/event.h], [use_libevent=yes], AC_MSG_ERROR(libevent headers missing),) - AC_CHECK_LIB([event],[main],EVENT_LIBS=-levent,AC_MSG_ERROR(libevent missing)) - if test x$TARGET_OS != xwindows; then - AC_CHECK_LIB([event_pthreads],[main],EVENT_PTHREADS_LIBS=-levent_pthreads,AC_MSG_ERROR(libevent_pthreads missing)) -@@ -1545,6 +1545,7 @@ AM_CONDITIONAL([ENABLE_QT_TESTS],[test x$BUILD_TEST_QT = xyes]) - AM_CONDITIONAL([ENABLE_BENCH],[test x$use_bench = xyes]) - AM_CONDITIONAL([USE_QRCODE], [test x$use_qr = xyes]) - AM_CONDITIONAL([USE_LCOV],[test x$use_lcov = xyes]) -+AM_CONDITIONAL([USE_LIBEVENT],[test x$use_libevent = xyes]) - AM_CONDITIONAL([GLIBC_BACK_COMPAT],[test x$use_glibc_compat = xyes]) - AM_CONDITIONAL([HARDEN],[test x$use_hardening = xyes]) - AM_CONDITIONAL([ENABLE_SSE42],[test x$enable_sse42 = xyes]) -diff --git a/src/Makefile.am b/src/Makefile.am ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -523,10 +523,13 @@ libbitcoin_util_a_SOURCES = \ - util/strencodings.cpp \ - util/string.cpp \ - util/time.cpp \ -- util/url.cpp \ - util/validation.cpp \ - $(BITCOIN_CORE_H) - -+if USE_LIBEVENT -+libbitcoin_util_a_SOURCES += util/url.cpp -+endif -+ - if GLIBC_BACK_COMPAT - libbitcoin_util_a_SOURCES += compat/glibc_compat.cpp - AM_LDFLAGS += $(COMPAT_LDFLAGS) diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest index f2081f37a928..de5411f0af75 100644 --- a/dev-util/byacc/Manifest +++ b/dev-util/byacc/Manifest @@ -1,2 +1,3 @@ DIST byacc-20200330.tgz 872217 BLAKE2B 870ac1eeb439c96875e343223925414115b500d5b22ccdae9d7b30830ff6805d18d5bc43ec6f7ae1237ec500cfa1693aefad6e9607cfcc74188b541abfd16595 SHA512 df8cc1aa550d633ab547a13a4f091d8c940a9a67b52dc5ecacad5b005fd54c3ceb1269593068c1a7949049e85b6e6eea20cffbbf4b408e049fde75c0ffe51f07 DIST byacc-20200910.tgz 871242 BLAKE2B de0f63b9edfb9451e23d7693daaea59f2661305a6727cd8e986c2557e513ca5dda8f0008d05b5c8f35a153a309bc4b02ecd6f45219bb553f928c9da11b616130 SHA512 491bbde2d5b0fdf2ad57bec5080112ad7c12ce3830b5e14f2289092aad1addae6edd4698368a9c8d69219a95ae5fa47eb32a95a2625841915297972591bebea3 +DIST byacc-20210109.tgz 873282 BLAKE2B 3f856bfba00b692ecc5fd297582ff594873914552d522be5de78bc74c0c52a7e0b7fbcdd31e209e7269d9e00e2449cf7162ac5cd0a1f2060e051f8fca2171460 SHA512 95eafe81948fee1839fed8fff71d65c23d85de02af51672c118b2eed7c680f0dd300cec54cf366a248307c480844edc66a027575b29e20ef2f71f3c243ad5202 diff --git a/dev-util/byacc/byacc-20200910.ebuild b/dev-util/byacc/byacc-20200910.ebuild index 556684fdc8ae..ce042c585aea 100644 --- a/dev-util/byacc/byacc-20200910.ebuild +++ b/dev-util/byacc/byacc-20200910.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz" LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris" DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README ) diff --git a/dev-util/byacc/byacc-20210109.ebuild b/dev-util/byacc/byacc-20210109.ebuild new file mode 100644 index 000000000000..556684fdc8ae --- /dev/null +++ b/dev-util/byacc/byacc-20210109.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="the best variant of the Yacc parser generator" +HOMEPAGE="https://invisible-island.net/byacc/byacc.html" +SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + +DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README ) + +src_configure() { + econf --program-prefix=b +} diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest index 09b6303ba8ab..b8e8250f6ee2 100644 --- a/dev-util/cbindgen/Manifest +++ b/dev-util/cbindgen/Manifest @@ -3,16 +3,22 @@ DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b DIST cbindgen-0.15.0.crate 181832 BLAKE2B 01ba21eb1c5bcd4e562ee2d43c839941a69fcc45d17b31800c54016d815c2fcd998176b96108d73b0146a62924315eec373c3749823a5219942e68cb483f888a SHA512 cb0868ccdd5ae8f46b3c07f7f06bfad0583f2eda5381e4404a679814dcaad62ce95c9c16c22f00dedfaa2b78f25f1e5f3404a3e515ab50cffac05d1e6f936e60 +DIST cbindgen-0.16.0.crate 178160 BLAKE2B 45e6d3054582069abeeb6ac9cd54bfc25392eff48b84ae6d5f05f1a7d416caaa0194889c6ff0aa3090fe6eb844087f5ddc3a7be292d341f86c221d86d646e662 SHA512 aca6a783f4347bb977d115b5a1ae8c532b0cad1509a6ec0ddccb4d5f043c59de1242b4f1f4ab081b7ec04f67b5f137b614ab71374377efeb7b119043b47e089d DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf +DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6 DIST hermit-abi-0.1.16.crate 9889 BLAKE2B 1d1681d484019adb9c27336ef87fe9680c18a57de71ca9bb3022878411ce8f933bcb0f5d03f190425039a53a427ecbe75f8eea654661340ebbc165fbb61322b8 SHA512 b9aa336e195fdbb3c1a1fc7167f3efd284c2c3ab0613ec47f07b5cf5865b56cac3aa0da4936f6a336f036993344126b3d872875c362c516e0ca538d8e36195f9 DIST indexmap-1.6.0.crate 47565 BLAKE2B 4b2c50788be5c5416973133c10caf092468444af6c101eceb5d2f53ec3502d73c034205186974efb335a1d8aa9a797b191a871fcfd573251c95ad1d13c0c47cc SHA512 f91c0d3588da037a2dc728c9cd823b4acf7edfbe7d59b28dbe1f5802294f2677eacf0ccea41235daa30b3d8187a97938653a040d8c9d2d38513440b2e82fd85e DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692 +DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 DIST libc-0.2.77.crate 507233 BLAKE2B f02ee13e41dfa6317a6cf7f0724f891cc9f98a68cd25e865e744ebbe49d93c86f16c2fd71ef4410ff28e0b386c5b4dff605c1236db83bdb91292ae48d0900782 SHA512 1e6dbd6f646a50fffd294ea56146c42dec6c4e027f2cd886ce2bbab9a5a2d036e4787f95201c448bef9ceddd52d863153c849343791d92900bf1378fbacee0f7 +DIST lock_api-0.3.4.crate 18750 BLAKE2B 1aa7cb716efa665df7b09ee8d95c9fe0ef7ec108d89348e413e78e3af4d6274a49530ac03d5438a503a7c6dcfe20973c1c040d79b6cf228c5a15696a1caa4a8c SHA512 1517ec7cb1f9012da78be866e026be40465cc9befbbfff4a5f644ec19653baab6b171323c3fb8ef218df4a7bc4b305e42a6b9d6849654d0542a1c2dc8fe11fd8 DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec +DIST parking_lot-0.10.2.crate 39536 BLAKE2B f5d78c5c7ddbb51e694b93b39a3d06b71de92d903d944e17205b853de4d1275622c76aec17cc362da8f3b601fb7df64636b1ee7c7dadff653fa187abfd3df76f SHA512 fcbc057e3c59a51d3b9eb2cc0d20a0beb36bf480e11954a701c4cce1a795ea7791fc17fbf992a259f855ccd1556704397c58060c93c27bf0828051aeebb35168 +DIST parking_lot_core-0.7.2.crate 33875 BLAKE2B 5725d2c45be7bcc945a0e3765357d2c066684e4c8ba036e5d7da5ba0c15ccde4cd5fbbf02a9ae848aab365a8d71e8cdcf01942511e01b1e1302af7ac346fe2a3 SHA512 96c62ac274343f46f3e0481ba3265bb00a085a4a95c4fb642f923e42852050b04b5d3a4c547b0dc261b83fe91766856df897ea3104545b89962614f7c63dae2b DIST ppv-lite86-0.2.9.crate 20933 BLAKE2B 493fb977d0db8eb4699893ed1d05758ee7cf1b5610b767a2ec352f3f430edf3d1a3bacefae554fb16eb2786fe4fb9b574c7b9961458a938da9a79b9084f062a8 SHA512 d9fe88a221733197b43db2a2a608dd2acdd9aa37129af07ad2405d66171b6f9f4c1a61530013c7f9ad69194a2e52e7480ba80c696e97cf2adaea7677052cb010 DIST proc-macro2-1.0.21.crate 36909 BLAKE2B b4759b2fbbb242aeebc7b8155c6d9f316c96672b37ce3540ae6acc579e6bafa01fe4cca37639125cc38e539000f1f6921d2c104bba80f0c2581a6ddf16d74223 SHA512 bc8ca2254c43c5d0eb799cab503fa89ff49d8e98aba5c9c1f960efd5286dd217351eac6774bdd96fbc392290c8de62ecaf4a6ed1e300715ff014ffd9326f9ae4 DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953 @@ -23,9 +29,13 @@ DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6 DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c +DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d DIST serde-1.0.116.crate 74443 BLAKE2B fec8b7ec294919b72d2ec8e97046f6ba6fae79736567ea7827808d362802bbb8b6542e528613744d9dc5e2765ea3de1a0b1d4f5da04a13e1eefb2724242b8acd SHA512 938cf3c4860a35746810cf46003ab754b02446f481ad91ad3a030c751ef593889f433019626c613add8834b71d855742482d7e7c471f423a4c7b324d809992f8 DIST serde_derive-1.0.116.crate 50697 BLAKE2B 63450a51be3ba880b225fa9d0eaa1df125d63718e95af9345c4d37386ac94e997f25f80f15b6ba5aeb1eb4abc482532542de82049e64f66f6bfad729a90a6e3b SHA512 d0571b9b7346f031514a519da19e53f0fa0381052dc16a40f1a2913518a72558d6fce7712152fa9408cfade6ee7ebaf2c0c84aaee9cd9c961f88d1470747c16d DIST serde_json-1.0.57.crate 114723 BLAKE2B f6097bd4541b369d1d4c1f1d50c787489918bcb71f3786084d0b5e139358f0c66ecc8ed4ca9bd3474fdb44726d0e5d9a099900cec31392968eba80180715c5d1 SHA512 0ca0ed1cf47c87f907b241e696d6aa23b49bec876d3b9e0e011c20d145b797769631ff8ce8d57487633d1d8a8657e601884bc10b5670ce17c136b9579fd921de +DIST serial_test-0.5.0.crate 2305 BLAKE2B 92c8dda1878e66628f5337bd51da1d0d1e0b96e285bd50869f2e4eb3d481382c82f45552bc071a69672fdba74dfa39f50652a9cbae630a91da22ee4681ea26bf SHA512 668d4eaf6d5fa79ba2b3883a6a6f95736fb19a93516031b68991dd35962ce7881d4a9cb8b291ded37dee057352511d5bbab8f8d4e0670a147810ebdc27e1314c +DIST serial_test_derive-0.5.0.crate 2899 BLAKE2B e2de0d823fcbe38022a99d166ddc7659ed34f814dac25167a08f07c975591f0de4109619ff1cc976256780da8005597e9a316c0ff2ab1202e4e7d84597a205fe SHA512 2c9e3a49c726975dfe6ccc7f7fd4bb9365660113c3d4352593285a4e5c6f250b4ba0375f0fa1a4a7b47bf7726cc59d4b63fc37c3bc80e9030eafe9b2c5ddeeac +DIST smallvec-1.4.2.crate 26109 BLAKE2B 7227afe12e1430510bed73e4a97c512d3c7062bc9cdc05024ef5ab4fd1bd66ae0ca74549f8e5f509e9382c33dec2094e3529dc71d8c3ee3fc5102d00a5667c59 SHA512 5fa8ca2bd49dcf23c5f2c241b69811ff92bcca30b9687c3796cd4d4676450640cf5ab15745fd0df07993db42d12e2d4022fc395c55e5464b12ad6a1b3f7f75d5 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34 DIST syn-1.0.41.crate 224979 BLAKE2B 19a47cfb286c0c055683fffcb87c7e04622d35a40ca92ff8558458b64d7c4a70710ebd6fb9b6f9e69aba3adfba76da72a131c5657a3c9f54e7110323edb4ea51 SHA512 0f0cf4adf8b4632a44420243e8cccbf7f8e4fc186a7eea8a775ef70932c9f6a3dbbe331c52e05f3b1ab0fa47a5f5d235d261ac01318ddd6ceb549d434f570e31 DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5 diff --git a/dev-util/cbindgen/cbindgen-0.16.0.ebuild b/dev-util/cbindgen/cbindgen-0.16.0.ebuild new file mode 100644 index 000000000000..f89f82967825 --- /dev/null +++ b/dev-util/cbindgen/cbindgen-0.16.0.ebuild @@ -0,0 +1,68 @@ +# Copyright 2017-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +CRATES=" +ansi_term-0.11.0 +atty-0.2.14 +autocfg-1.0.1 +bitflags-1.2.1 +cbindgen-0.16.0 +cfg-if-0.1.10 +clap-2.33.3 +cloudabi-0.0.3 +getrandom-0.1.15 +hashbrown-0.9.1 +heck-0.3.1 +hermit-abi-0.1.16 +indexmap-1.6.0 +itoa-0.4.6 +lazy_static-1.4.0 +libc-0.2.77 +lock_api-0.3.4 +log-0.4.11 +parking_lot-0.10.2 +parking_lot_core-0.7.2 +ppv-lite86-0.2.9 +proc-macro2-1.0.21 +quote-1.0.7 +rand-0.7.3 +rand_chacha-0.2.2 +rand_core-0.5.1 +rand_hc-0.2.0 +redox_syscall-0.1.57 +remove_dir_all-0.5.3 +ryu-1.0.5 +scopeguard-1.1.0 +serde-1.0.116 +serde_derive-1.0.116 +serde_json-1.0.57 +serial_test-0.5.0 +serial_test_derive-0.5.0 +smallvec-1.4.2 +strsim-0.8.0 +syn-1.0.41 +tempfile-3.1.0 +textwrap-0.11.0 +toml-0.5.6 +unicode-segmentation-1.6.0 +unicode-width-0.1.8 +unicode-xid-0.2.1 +vec_map-0.8.2 +wasi-0.9.0+wasi-snapshot-preview1 +winapi-0.3.9 +winapi-i686-pc-windows-gnu-0.4.0 +winapi-x86_64-pc-windows-gnu-0.4.0 +" + +inherit cargo + +DESCRIPTION="A tool for generating C bindings to Rust code" +HOMEPAGE="https://github.com/eqrion/cbindgen/" +SRC_URI="$(cargo_crate_uris ${CRATES})" +LICENSE="MIT MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +RESTRICT="test" +QA_FLAGS_IGNORED="usr/bin/cbindgen" diff --git a/dev-util/ccls/files/ccls-0.20190823.6-cmake-support-CLANG_LINK_CLANG_DYLIB.patch b/dev-util/ccls/files/ccls-0.20190823.6-cmake-support-CLANG_LINK_CLANG_DYLIB.patch deleted file mode 100644 index e625ba814d8e..000000000000 --- a/dev-util/ccls/files/ccls-0.20190823.6-cmake-support-CLANG_LINK_CLANG_DYLIB.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 7e795e9b9ec20f02cab23e63d1e52189aa33ab4e Mon Sep 17 00:00:00 2001 -From: Fangrui Song <i@maskray.me> -Date: Fri, 1 Nov 2019 10:36:38 -0700 -Subject: [PATCH] cmake: support CLANG_LINK_CLANG_DYLIB - ---- - CMakeLists.txt | 34 +++++++++++++++++++--------------- - 1 file changed, 19 insertions(+), 15 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 278e0735..092f178f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -70,21 +70,25 @@ endif() - - find_package(Clang REQUIRED) - --target_link_libraries(ccls PRIVATE -- clangIndex -- clangFormat -- clangTooling -- clangToolingInclusions -- clangToolingCore -- clangFrontend -- clangParse -- clangSerialization -- clangSema -- clangAST -- clangLex -- clangDriver -- clangBasic --) -+if(CLANG_LINK_CLANG_DYLIB) -+ target_link_libraries(ccls PRIVATE clang-cpp) -+else() -+ target_link_libraries(ccls PRIVATE -+ clangIndex -+ clangFormat -+ clangTooling -+ clangToolingInclusions -+ clangToolingCore -+ clangFrontend -+ clangParse -+ clangSerialization -+ clangSema -+ clangAST -+ clangLex -+ clangDriver -+ clangBasic -+ ) -+endif() - - if(LLVM_LINK_LLVM_DYLIB) - target_link_libraries(ccls PRIVATE LLVM) --- -2.26.2 - diff --git a/dev-util/chroot-wrapper/Manifest b/dev-util/chroot-wrapper/Manifest index 6747becb9576..c21d205f1c7a 100644 --- a/dev-util/chroot-wrapper/Manifest +++ b/dev-util/chroot-wrapper/Manifest @@ -1 +1,3 @@ DIST chroot-wrapper-0.9.3.tar.gz 12511 BLAKE2B 42528f7786a0855cfde9d6dff336544bb99f41dfdaa09782d5df665de997d2cbb6358761a5952865ae380c39e467085cbb110b1367d0422f07e0c519d4935b9d SHA512 16ae36637f3e966716a05f3e0bc16c784bae141837e13d0e4c1f831fefcac423a7d77ac73f49e2c7efd0261c1f9649a18f55cd2a24d22e768cecce6d95b85a74 +DIST chroot-wrapper-0.9.4.tar.gz 12676 BLAKE2B 7d65a0f85540c9ce06bbbc3527d5d26162fa7f5de3035c25033e92a70aa0e7b61e50c5d73ab1db39905b289d4f7d68bbc38e219dc91c59423accfc8ab249def7 SHA512 42343c30eee4c82f31064244c04475236fd3807765e9edabaf8a8d3561344283dfaf5149e2ba30793bcb65592405c0c953914364cb577bcb7737fb9501f8f602 +DIST chroot-wrapper-0.9.8.tar.gz 12691 BLAKE2B e15079386e3d21de0bb0d1ade4b11a8347588819508764e6fbae9b574e59a490f29fd4032c4be0ed1753272ce68476e171249aa8144d4324aee4f9d77e63aeaf SHA512 6881417a36db7bc153e06d8d91dea78a3669474146449c7143be61b2cd9942535c3853db344a230ba35cbffef67a2324afe03cdf419a07d4380bdebc9df873be diff --git a/dev-util/chroot-wrapper/chroot-wrapper-0.9.4.ebuild b/dev-util/chroot-wrapper/chroot-wrapper-0.9.4.ebuild new file mode 100644 index 000000000000..93d2e87ed951 --- /dev/null +++ b/dev-util/chroot-wrapper/chroot-wrapper-0.9.4.ebuild @@ -0,0 +1,32 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info + +DESCRIPTION="Wrapper for chroot to set up some bind mounts, namespaces, and control groups" +HOMEPAGE="https://github.com/chutz/chroot-wrapper" +SRC_URI="https://github.com/chutz/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + >=app-shells/bash-5.0 + sys-apps/util-linux + sys-apps/coreutils +" + +CONFIG_CHECK=" + ~TMPFS + ~IPC_NS + ~UTS_NS +" + +src_install() { + newsbin src/chroot-wrapper chr + insinto /etc/chroot-wrapper + doins config.bash +} diff --git a/dev-util/chroot-wrapper/chroot-wrapper-0.9.8.ebuild b/dev-util/chroot-wrapper/chroot-wrapper-0.9.8.ebuild new file mode 100644 index 000000000000..a2ec853be02e --- /dev/null +++ b/dev-util/chroot-wrapper/chroot-wrapper-0.9.8.ebuild @@ -0,0 +1,32 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info + +DESCRIPTION="Wrapper for chroot to set up some bind mounts, namespaces, and control groups" +HOMEPAGE="https://github.com/chutz/chroot-wrapper" +SRC_URI="https://github.com/chutz/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="" + +RDEPEND=" + >=app-shells/bash-5.0 + sys-apps/util-linux + sys-apps/coreutils +" + +CONFIG_CHECK=" + ~TMPFS + ~IPC_NS + ~UTS_NS +" + +src_install() { + newsbin src/chroot-wrapper chr + insinto /etc/chroot-wrapper + doins config.bash +} diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index 7a303af742e7..fd08f5409809 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -1,5 +1,4 @@ DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26 DIST cmake-3.17.4.tar.gz 9473549 BLAKE2B 2ce29415525b5292ae9e06d73570ed0af2173d8d15612f4d645f22d4f55cb99018663c374c4282731e09f8c6e4ffd59316d65f38aef9db5c34d874ca8992382b SHA512 6af879502e52388f3be02a4edfb006274840ad1afa8f28ffd6ec69b0310c7f718812b2272e5f77ffa422717f61407a6d482deb95941555c21c73fc5f62356a4e DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343 -DIST cmake-3.19.2.tar.gz 9264414 BLAKE2B f45727fd6b6e0e324f618577abbc7fb1830f05f01a9afea4f8713f5f62ede3a612a020ef97385cdd6ede4b575a3b6f63deb57123a222b71e2906a42cba3b3d7f SHA512 d811122af89d46174b8fdb2a26e8553200d9dc7eb6385ece4e4b3e7584880f73a799813d5a81e64e956fd2574b63264fa8944d862c74a076e9d61f5e6521e91a DIST cmake-3.19.3.tar.gz 9265831 BLAKE2B 133ca8b12c0ccff0f9d833543c66cac597d72898d6e8602c74ef2875c90059b0a19d059b8801e407a7d5931b8aa50b253aef970330454789e13e2e63a7bb6d97 SHA512 54c91fa76882152d3933b696d7e547bc4edf6f97f3810e8dd57ca28c98e9fcaf757eac7c77e1e7fab88aced10937ed354917aeac3997edef406313dcf76ba0c5 diff --git a/dev-util/cmake/cmake-3.18.5.ebuild b/dev-util/cmake/cmake-3.18.5.ebuild index 4c0006310904..4cd2e415b0d0 100644 --- a/dev-util/cmake/cmake-3.18.5.ebuild +++ b/dev-util/cmake/cmake-3.18.5.ebuild @@ -3,7 +3,7 @@ EAPI=7 -CMAKE_MAKEFILE_GENERATOR="emake" # TODO: Re-check with 3.19, see commit 491dddfb; bug #596460 +CMAKE_MAKEFILE_GENERATOR="emake" # Fixed in 3.19, see commit 491dddfb; bug #596460 CMAKE_REMOVE_MODULES_LIST=( none ) inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \ toolchain-funcs virtualx xdg-utils @@ -44,6 +44,7 @@ BDEPEND=" dev-python/requests dev-python/sphinx ) + test? ( app-arch/libarchive[zstd] ) " S="${WORKDIR}/${MY_P}" @@ -108,7 +109,6 @@ cmake_src_test() { # CMakeOnly.AllFindModules: pthread issues # CTest.updatecvs: fails to commit as root # Fortran: requires fortran - # RunCMake.CommandLineTar: whatever... # RunCMake.CompilerLauncher: also requires fortran # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because # debugedit binary is not in the expected location @@ -120,7 +120,7 @@ cmake_src_test() { -j "$(makeopts_jobs)" \ --test-load "$(makeopts_loadavg)" \ ${ctestargs} \ - -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CommandLineTar|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \ + -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \ || die "Tests failed" popd > /dev/null diff --git a/dev-util/cmake/cmake-3.19.2.ebuild b/dev-util/cmake/cmake-3.19.2.ebuild deleted file mode 100644 index 3dbd001d5376..000000000000 --- a/dev-util/cmake/cmake-3.19.2.ebuild +++ /dev/null @@ -1,227 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" # TODO: Re-check with 3.19, see commit 491dddfb; bug #596460 -CMAKE_REMOVE_MODULES_LIST=( none ) -inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \ - toolchain-funcs virtualx xdg-utils - -MY_P="${P/_/-}" - -DESCRIPTION="Cross platform Make" -HOMEPAGE="https://cmake.org/" -SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" - -LICENSE="CMake" -SLOT="0" -[[ "${PV}" = *_rc* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc emacs ncurses qt5 test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=app-arch/libarchive-3.3.3:= - app-crypt/rhash - >=dev-libs/expat-2.0.1 - >=dev-libs/jsoncpp-1.9.2-r2:0= - >=dev-libs/libuv-1.10.0:= - >=net-misc/curl-7.21.5[ssl] - sys-libs/zlib - virtual/pkgconfig - emacs? ( >=app-editors/emacs-23.1:* ) - ncurses? ( sys-libs/ncurses:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( - dev-python/requests - dev-python/sphinx - ) -" - -S="${WORKDIR}/${MY_P}" - -SITEFILE="50${PN}-gentoo.el" - -PATCHES=( - # prefix - "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch - "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch - "${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch - - # handle gentoo packaging in find modules - "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch - # Next patch needs to be reworked - #"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch - "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch - - # respect python eclasses - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch - "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch - - "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544 - - # upstream fixes (can usually be removed with a version bump) -) - -cmake_src_bootstrap() { - # disable running of cmake in bootstrap command - sed -i \ - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ - bootstrap || die "sed failed" - - # execinfo.h on Solaris isn't quite what it is on Darwin - if [[ ${CHOST} == *-solaris* ]] ; then - sed -i -e 's/execinfo\.h/blablabla.h/' \ - Source/kwsys/CMakeLists.txt || die - fi - - # bootstrap script isn't exactly /bin/sh compatible - tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \ - --prefix="${T}/cmakestrap/" \ - --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \ - || die "Bootstrap failed" -} - -cmake_src_test() { - # fix OutDir and SelectLibraryConfigurations tests - # these are altered thanks to our eclass - sed -i -e 's:^#_cmake_modify_IGNORE ::g' \ - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ - || die - - pushd "${BUILD_DIR}" > /dev/null - - local ctestargs - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" - - # Excluded tests: - # BootstrapTest: we actually bootstrap it every time so why test it. - # BundleUtilities: bundle creation broken - # CMakeOnly.AllFindModules: pthread issues - # CTest.updatecvs: fails to commit as root - # Fortran: requires fortran - # RunCMake.CommandLineTar: whatever... - # RunCMake.CompilerLauncher: also requires fortran - # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because - # debugedit binary is not in the expected location - # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because - # it can't find a deb package that owns libc - # RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4 - # TestUpload: requires network access - "${BUILD_DIR}"/bin/ctest \ - -j "$(makeopts_jobs)" \ - --test-load "$(makeopts_loadavg)" \ - ${ctestargs} \ - -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CommandLineTar|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \ - || die "Tests failed" - - popd > /dev/null -} - -src_prepare() { - cmake_src_prepare - - if [[ ${CHOST} == *-darwin* ]] ; then - # disable Xcode hooks, bug #652134 - sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \ - Source/cmGlobalXCodeGenerator.cxx || die - # disable isysroot usage with GCC, we've properly instructed - # where things are via GCC configuration and ldwrapper - sed -i -e '/cmake_gnu_set_sysroot_flag/d' \ - Modules/Platform/Apple-GNU-*.cmake || die - # disable isysroot usage with clang as well - sed -i -e '/_SYSROOT_FLAG/d' \ - Modules/Platform/Apple-Clang.cmake || die - # don't set a POSIX standard, system headers don't like that, #757426 - sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ - Source/cmLoadCommandCommand.cxx \ - Source/cmStandardLexer.h \ - Source/cmSystemTools.cxx \ - Source/cmTimestamp.cxx - fi - - # Add gcc libs to the default link paths - sed -i \ - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ - -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \ - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" - if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then - CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - cmake_src_bootstrap - fi -} - -src_configure() { - # Fix linking on Solaris - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl - - local mycmakeargs=( - -DCMAKE_USE_SYSTEM_LIBRARIES=ON - -DCMAKE_DOC_DIR=/share/doc/${PF} - -DCMAKE_MAN_DIR=/share/man - -DCMAKE_DATA_DIR=/share/${PN} - -DSPHINX_MAN=$(usex doc) - -DSPHINX_HTML=$(usex doc) - -DBUILD_CursesDialog="$(usex ncurses)" - -DBUILD_TESTING=$(usex test) - ) - use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - use emacs && elisp-compile Auxiliary/cmake-mode.el -} - -src_test() { - virtx cmake_src_test -} - -src_install() { - cmake_src_install - - if use emacs; then - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - insinto /usr/share/vim/vimfiles/syntax - doins Auxiliary/vim/syntax/cmake.vim - - insinto /usr/share/vim/vimfiles/indent - doins Auxiliary/vim/indent/cmake.vim - - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/${PN}.vim" - - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} -} - -pkg_postinst() { - use emacs && elisp-site-regen - if use qt5; then - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - fi -} - -pkg_postrm() { - use emacs && elisp-site-regen - if use qt5; then - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - fi -} diff --git a/dev-util/cmake/cmake-3.19.3.ebuild b/dev-util/cmake/cmake-3.19.3.ebuild index 930417171292..9137d7d9b384 100644 --- a/dev-util/cmake/cmake-3.19.3.ebuild +++ b/dev-util/cmake/cmake-3.19.3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -CMAKE_MAKEFILE_GENERATOR="emake" # TODO: Re-check with 3.19, see commit 491dddfb; bug #596460 +CMAKE_MAKEFILE_GENERATOR="emake" # TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja CMAKE_REMOVE_MODULES_LIST=( none ) inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \ toolchain-funcs virtualx xdg-utils @@ -44,6 +44,7 @@ BDEPEND=" dev-python/requests dev-python/sphinx ) + test? ( app-arch/libarchive[zstd] ) " S="${WORKDIR}/${MY_P}" @@ -108,7 +109,6 @@ cmake_src_test() { # CMakeOnly.AllFindModules: pthread issues # CTest.updatecvs: fails to commit as root # Fortran: requires fortran - # RunCMake.CommandLineTar: whatever... # RunCMake.CompilerLauncher: also requires fortran # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because # debugedit binary is not in the expected location @@ -120,7 +120,7 @@ cmake_src_test() { -j "$(makeopts_jobs)" \ --test-load "$(makeopts_loadavg)" \ ${ctestargs} \ - -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CommandLineTar|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \ + -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \ || die "Tests failed" popd > /dev/null diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest index 824b062eede2..832965a847db 100644 --- a/dev-util/colm/Manifest +++ b/dev-util/colm/Manifest @@ -1,2 +1,2 @@ -DIST colm-0.14.4.tar.gz 3095846 BLAKE2B 0f31a9cc57ca692b6f16843cd0f71ec119a05fc6917d274a0b36e1c04585d2d6a0182d35672d66ecf543c0605928a145b57a892e43cd8ad8be282e384de2f022 SHA512 82eb86ee37792fafab5089f15bd35c2daab6e43bedd2d4396035ef1f3cb503b3cecb0d3043a9171a5978b2ac18b75ccbfdd17afb383a6db9b45d7f8442431877 DIST colm-0.14.5.tar.gz 3110329 BLAKE2B 75b13e70e01d19cd69f77ead3a6d02f55b355b98aae640e5630becb7995a7f373c26dfbd66eeb3be0dc04cddefc7b70905263118cee0518cb38a0c69623400dc SHA512 83d194d45238f3cc6393c3c5762b94618360f946652aef942be47740c5abeef92d513febe88ad33341f9a83e7093e56df86c77df64fcd3b504e22fb3bec17e07 +DIST colm-0.14.6.tar.gz 3110298 BLAKE2B 430c508ff9db27821baca12a458024cb2caecf2879ac3780fa6ebbc37bed30d3faf68515f21c9b31bd5f1504ab03b5ea63a24812f7117515c63261b8d1683e27 SHA512 a783817f9d348a79e93cac54c042e8366a73df287c14221b9e4a7b963385c1e32eb54d6918d0822b271dc2a0420abce84a3e1a3c9ada84968d1c20178d0310ad diff --git a/dev-util/colm/colm-0.14.5.ebuild b/dev-util/colm/colm-0.14.5.ebuild index f91429367690..6fbdb889f3d0 100644 --- a/dev-util/colm/colm-0.14.5.ebuild +++ b/dev-util/colm/colm-0.14.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2021 Liguros Authors +# Copyright 2020 Liguros Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/dev-util/colm/colm-0.14.4.ebuild b/dev-util/colm/colm-0.14.6.ebuild index 6fbdb889f3d0..f91429367690 100644 --- a/dev-util/colm/colm-0.14.4.ebuild +++ b/dev-util/colm/colm-0.14.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Liguros Authors +# Copyright 2020-2021 Liguros Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/dev-util/cppunit/cppunit-1.15.1.ebuild b/dev-util/cppunit/cppunit-1.15.1-r2.ebuild index a03be99e2df6..09eb8d15a46b 100644 --- a/dev-util/cppunit/cppunit-1.15.1.ebuild +++ b/dev-util/cppunit/cppunit-1.15.1-r2.ebuild @@ -15,7 +15,7 @@ else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi LICENSE="LGPL-2.1" -SLOT="0" +SLOT="0/1.15" IUSE="doc examples static-libs" RDEPEND="" diff --git a/dev-util/crash/Manifest b/dev-util/crash/Manifest index 3faa5d4ea04f..99eb117d6c73 100644 --- a/dev-util/crash/Manifest +++ b/dev-util/crash/Manifest @@ -1,3 +1,2 @@ -DIST crash-7.2.8.tar.gz 32253097 BLAKE2B 26a8a07749cb62947053992ba761b541ba5d06f0f3bf67312d8228c9d851f51edf1201e732574f7f2f2768d6087324b8dd1f843ea47916bd9f95e514df967589 SHA512 3269760a50b49f25af0e1c43d60432e603036793aa542f8ccfb0b8019376da45afa7c053d3860ae2130b6471f3ac72cff78f1096e9ffa8c6f1d34afb52208e70 DIST crash-7.2.9.tar.gz 1324947 BLAKE2B dac5485742119fce1cdcab37a87a2a417e408108a73bffdd6fa215587e4c5dec29508d5f11285dbe2a21cd8365cee437296168b85f2f43dc743461061fd0a26e SHA512 57b7b7780ad71bad09d962bfb2d5ad729dd167d9aaffd86f7b5467c98f52e8cb2c6ebb317bf1ad285dcb78ffa300b5dd733c63efd7aaa4ef03ddfe076c269984 DIST gdb-7.6.tar.gz 31437633 BLAKE2B fb8cb9f0c33f360c864c5776c3dd0233ad534d376a9df8157c7bc9f1c4ccfc8698933409561700f134705c0107038d8bfa23844e512cd3a08e24925d37a1ce58 SHA512 02d9c62fa73bcb79138d14c7fc182443f0ca82d4545b4d260b67d3f0074ed75f899a657814a56727e601032a668b0ddd7b48aabd49215fc012eeea6077bca368 diff --git a/dev-util/crash/crash-7.2.8-r1.ebuild b/dev-util/crash/crash-7.2.8-r1.ebuild deleted file mode 100644 index 45bbff515903..000000000000 --- a/dev-util/crash/crash-7.2.8-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit toolchain-funcs - -DESCRIPTION="Red Hat crash utility; used for analyzing kernel core dumps" -HOMEPAGE="https://people.redhat.com/anderson/" -SRC_URI="https://people.redhat.com/anderson/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86" -IUSE="" -# there is no "make test" target, but there is a test.c so the automatic -# make rules catch it and tests fail -RESTRICT="test" - -src_prepare() { - sed -i -e "s|ar -rs|\${AR} -rs|g" Makefile || die - default -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - AR="$(tc-getAR)" \ - CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -} diff --git a/dev-util/crash/crash-7.2.9.ebuild b/dev-util/crash/crash-7.2.9.ebuild index e807f3d302e0..65a7a71821fd 100644 --- a/dev-util/crash/crash-7.2.9.ebuild +++ b/dev-util/crash/crash-7.2.9.ebuild @@ -18,7 +18,7 @@ else fi DESCRIPTION="Red Hat crash utility; used for analyzing kernel core dumps" -HOMEPAGE="https://github.com/crash-utility/crash" +HOMEPAGE="https://crash-utility.github.io/" LICENSE="GPL-3" SLOT="0" diff --git a/dev-util/crash/crash-9999.ebuild b/dev-util/crash/crash-9999.ebuild index e807f3d302e0..65a7a71821fd 100644 --- a/dev-util/crash/crash-9999.ebuild +++ b/dev-util/crash/crash-9999.ebuild @@ -18,7 +18,7 @@ else fi DESCRIPTION="Red Hat crash utility; used for analyzing kernel core dumps" -HOMEPAGE="https://github.com/crash-utility/crash" +HOMEPAGE="https://crash-utility.github.io/" LICENSE="GPL-3" SLOT="0" diff --git a/dev-util/creduce/Manifest b/dev-util/creduce/Manifest deleted file mode 100644 index cb6764e980eb..000000000000 --- a/dev-util/creduce/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST creduce-2a4480eb6cb72b3d2d131b536c883cc6d41bdcaa.tar.gz 732121 BLAKE2B dad2cf8ec2453a6b210a5303480e7dabfd978b7d7a1326cbc1e4ca40fa7c4e7d18da5f9309ca5f392740bbf55a1c9863e389c9789fceff062a68e9bb9a79de9f SHA512 c598f5c998f0a02d57006e640f88b951cd33a24f24507d6671067842b81bb3fe37c2fccd040b6cedb6fd5857396213e4003ee5fbd3040058050bad67226dc27f diff --git a/dev-util/creduce/creduce-2.11.0_pre20191110.ebuild b/dev-util/creduce/creduce-2.11.0_pre20191110.ebuild deleted file mode 100644 index 4bf63cd40869..000000000000 --- a/dev-util/creduce/creduce-2.11.0_pre20191110.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -: ${CMAKE_MAKEFILE_GENERATOR=ninja} -inherit cmake llvm - -EGIT_COMMIT="2a4480eb6cb72b3d2d131b536c883cc6d41bdcaa" -DESCRIPTION="C-Reduce - a plugin-based C program reducer" -HOMEPAGE="https://embed.cs.utah.edu/creduce/" -SRC_URI="https://github.com/csmith-project/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${PN}-${EGIT_COMMIT}.tar.gz" -S="${WORKDIR}/${PN}-${EGIT_COMMIT}" - -LICENSE="UoI-NCSA" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -LLVM_MAX_SLOT=9 - -DEPEND=" - sys-devel/clang:${LLVM_MAX_SLOT}" -RDEPEND="${DEPEND} - >=dev-lang/perl-5.10.0 - dev-perl/Exporter-Lite - dev-perl/File-Which - dev-perl/Getopt-Tabular - dev-perl/Regexp-Common" -BDEPEND=" - >=dev-lang/perl-5.10.0 - sys-devel/flex" - -PATCHES=( - "${FILESDIR}"/creduce-2.11.0-link-libs.patch -) - -llvm_check_deps() { - has_version "sys-devel/clang:${LLVM_SLOT}" -} diff --git a/dev-util/creduce/files/creduce-2.11.0-link-libs.patch b/dev-util/creduce/files/creduce-2.11.0-link-libs.patch deleted file mode 100644 index 3518003760a6..000000000000 --- a/dev-util/creduce/files/creduce-2.11.0-link-libs.patch +++ /dev/null @@ -1,7 +0,0 @@ -diff --git a/clang_delta/CMakeLists.txt b/clang_delta/CMakeLists.txt -index a94ec0d..764af02 100644 ---- a/clang_delta/CMakeLists.txt -+++ b/clang_delta/CMakeLists.txt -@@ -263 +263 @@ add_executable(clang_delta --target_link_libraries(clang_delta ${CLANG_LIBS}) -+target_link_libraries(clang_delta ${CLANG_LIBS} ${LLVM_LIBS}) diff --git a/dev-util/creduce/metadata.xml b/dev-util/creduce/metadata.xml deleted file mode 100644 index d2c47b33aec8..000000000000 --- a/dev-util/creduce/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>mgorny@gentoo.org</email> - <name>Michał Górny</name> - </maintainer> - <origin>gentoo-staging</origin> -</pkgmetadata> diff --git a/dev-util/ddd/ddd-3.3.12-r4.ebuild b/dev-util/ddd/ddd-3.3.12-r4.ebuild index 101061bf64f5..b0279808edf4 100644 --- a/dev-util/ddd/ddd-3.3.12-r4.ebuild +++ b/dev-util/ddd/ddd-3.3.12-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" -inherit autotools eutils +inherit autotools eutils optfeature DESCRIPTION="Graphical front-end for command-line debuggers" HOMEPAGE="https://www.gnu.org/software/ddd" @@ -74,24 +74,15 @@ src_install() { } pkg_postinst() { - if ! has_version sci-visualization/gnuplot; then - echo - elog "To enable data visualization in DDD, install sci-visualization/gnuplot." - elog "For flat file package.use layout:" - elog " echo '${CATEGORY}/${PN} gnuplot' >> /etc/portage/package.use && emerge -va gnuplot" - elog "For directory package.use layout:" - elog " echo '${CATEGORY}/${PN} gnuplot' > /etc/portage/package.use/ddd && emerge -va gnuplot" - elog - fi + optfeature "Data visualisation" sci-visualization/gnuplot + optfeature "Java debugging" virtual/jdk + optfeature "Bash debugging" app-shells/bashdb + optfeature "Perl debugging" dev-lang/perl + optfeature "Python debugging" dev-python/pydb + echo elog "Important notice: if you encounter DDD crashes during visualization, you might" elog "have hit bug #459324. Try switching to plotting in external window:" elog "Select Edit|Preferences|Helpers and switch 'plot window' to 'external'" - elog - elog "To be able to debug java, bash, perl or python scripts within DDD, install respectively:" - elog " virtual/jdk" - elog " app-shells/bashdb" - elog " dev-lang/perl" - elog " dev-python/pydb" echo } diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest index b4b0a5a288a2..ea1bcc9f3584 100644 --- a/dev-util/diffoscope/Manifest +++ b/dev-util/diffoscope/Manifest @@ -1 +1,2 @@ DIST diffoscope-164.tar.gz 1568354 BLAKE2B ee9aea028e8719d45cc077108c42e36b1a74eff0c6c191e81daf43e68c0f3307eb4335ce8dea547377cd7146f1aa5020ac5b56f24239789a74bec5bc6c3048bc SHA512 816f19801b200a05c01cbc2da408074915b626847eb133e96404a4dce883d5626f31bfd525373e899bf92592d790a4b5ca9920c168859e41f81cb6c4b78bf79f +DIST diffoscope-165.tar.gz 1568656 BLAKE2B 606b2f11bc03da085d51fd10ceefbfe1ba4bf5599e45cc317ec0f555633e1f58219098fc59418dfa380f5afdb143af89e71fd7b90aeb8a77959a4abdbe410722 SHA512 0adbb7032bfff196d7028c6c140268b27d00adbbc253f3914b89dbe0505cc128ecb2c11db6a1efcdcffb8188031aad2557000a7f4de04e0598c9ef6ac05f1f28 diff --git a/dev-util/diffoscope/diffoscope-165.ebuild b/dev-util/diffoscope/diffoscope-165.ebuild new file mode 100644 index 000000000000..1ebe18777dc9 --- /dev/null +++ b/dev-util/diffoscope/diffoscope-165.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +PYTHON_REQ_USE="ncurses" +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 + +DESCRIPTION="Will try to get to the bottom of what makes files or directories different" +HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file +find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm +mono opendocument pascal pdf postscript R rpm sqlite squashfs +ssh tar tcpdump xz zip zstd" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}] + dev-python/libarchive-c[${PYTHON_USEDEP}] + dev-python/distro[${PYTHON_USEDEP}] + acl? ( sys-apps/acl ) + binutils? ( sys-devel/binutils ) + bzip2? ( app-arch/bzip2 ) + libcaca? ( media-libs/libcaca ) + colord? ( x11-misc/colord ) + cpio? ( app-arch/cpio ) + diff? ( sys-apps/diffutils ) + docx? ( app-text/docx2txt ) + dtc? ( sys-apps/dtc ) + e2fsprogs? ( sys-fs/e2fsprogs ) + file? ( sys-apps/file ) + find? ( sys-apps/findutils ) + gettext? ( sys-devel/gettext ) + gif? ( media-libs/giflib ) + gpg? ( app-crypt/gnupg ) + gzip? ( app-arch/gzip ) + haskell? ( dev-lang/ghc ) + hdf5? ( sci-libs/hdf5 ) + hex? ( app-editors/vim-core ) + imagemagick? ( media-gfx/imagemagick ) + iso? ( app-cdr/cdrtools ) + java? ( virtual/jdk ) + llvm? ( sys-devel/llvm ) + mono? ( dev-lang/mono ) + opendocument? ( app-text/odt2txt ) + pascal? ( dev-lang/fpc ) + pdf? ( + app-text/pdftk + app-text/poppler + dev-python/PyPDF2[${PYTHON_USEDEP}] + ) + postscript? ( app-text/ghostscript-gpl ) + R? ( dev-lang/R ) + rpm? ( app-arch/rpm ) + sqlite? ( dev-db/sqlite:3 ) + squashfs? ( sys-fs/squashfs-tools ) + ssh? ( net-misc/openssh ) + tar? ( app-arch/tar ) + tcpdump? ( net-analyzer/tcpdump ) + xz? ( app-arch/xz-utils ) + zip? ( app-arch/unzip ) + zstd? ( app-arch/zstd ) +" +# Presence if filemagic's magic.py breaks imports +# of dev-python/python-magic: https://bugs.gentoo.org/716482 +RDEPEND+=" !dev-python/filemagic" diff --git a/dev-util/dropwatch/files/dropwatch-1.4-makefile.patch b/dev-util/dropwatch/files/dropwatch-1.4-makefile.patch deleted file mode 100644 index 14ffcc83513e..000000000000 --- a/dev-util/dropwatch/files/dropwatch-1.4-makefile.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- src/Makefile.orig 2012-10-24 13:27:12.000000000 +0400 -+++ src/Makefile 2012-10-24 13:27:47.000000000 +0400 -@@ -1,14 +1,14 @@ - all: dropwatch --CFLAGS+=-c -g -D_GNU_SOURCE -Wall -Werror `pkg-config --cflags libnl-3.0` --LDFLAGS=-lbfd -lreadline -lnl-3 -lnl-genl-3 -+CFLAGS+=-c -D_GNU_SOURCE -Wall `pkg-config --cflags libnl-3.0` -+LIBS=-lbfd -lreadline -lnl-3 -lnl-genl-3 - OBJFILES := main.o lookup.o\ - lookup_bfd.o lookup_kas.o - - dropwatch: $(OBJFILES) -- gcc -g -o dropwatch $(OBJFILES) $(LDFLAGS) -+ $(CC) -o dropwatch $(LDFLAGS) $(OBJFILES) $(LIBS) - - %.o: %.c -- gcc $(CFLAGS) $< -+ $(CC) $(CFLAGS) $< - clean: - rm -f dropwatch *.o - diff --git a/dev-util/geany-plugins/geany-plugins-1.37-r100.ebuild b/dev-util/geany-plugins/geany-plugins-1.37-r100.ebuild index b9c9d27a86ea..514fbf583997 100644 --- a/dev-util/geany-plugins/geany-plugins-1.37-r100.ebuild +++ b/dev-util/geany-plugins/geany-plugins-1.37-r100.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 arm ppc ppc64 ~sparc x86" IUSE="gtk2 ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench" REQUIRED_USE="gtk2? ( !markdown ) lua? ( ${LUA_REQUIRED_USE} )" diff --git a/dev-util/geany/geany-1.37.1.ebuild b/dev-util/geany/geany-1.37.1.ebuild index 2dde606ada78..82a87ba680cd 100644 --- a/dev-util/geany/geany-1.37.1.ebuild +++ b/dev-util/geany/geany-1.37.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,7 +17,7 @@ if [[ "${PV}" = 9999* ]] ; then else [[ "${PV}" == *_pre* ]] && inherit autotools SRC_URI="https://download.geany.org/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" fi LICENSE="GPL-2+ HPND" SLOT="0" diff --git a/dev-util/gitlab-runner/Manifest b/dev-util/gitlab-runner/Manifest index 93cc336dbea4..6b603103298f 100644 --- a/dev-util/gitlab-runner/Manifest +++ b/dev-util/gitlab-runner/Manifest @@ -1,4 +1,4 @@ -DIST gitlab-runner-13.6.0.tar.bz2 5886160 BLAKE2B 5d85b3090b114c768b0daeab5556bc1bb3ad13a34a61f49b5fbbe72c8aa3d89a876d6e798b544928bbdf2b09211dcaf68b216872ca692a55d3ee1a99d6329087 SHA512 170668ac86be787ac089fe660ea5d30b5d1536b054cfffecd0e21c0ebb0079e06f5e94393623d2fec19bec27b420f4fd59cf734bef2e44e226491e86c019f9d1 DIST gitlab-runner-13.7.0.tar.bz2 5943215 BLAKE2B 96953ba808ddc6fcf68835f198150a00010ef4df51f047842a243a562e08848f874f0349cf6a79da0831f3b6603ee0d99313fd450644e4ef40b984c86962a8c3 SHA512 f68018a4330b63b366106e52b9107a48110e4b77fdc336e544a45a1aa5b08491aead2bf65bd4d97a0a731274221392e2644b561f70712a9b4a36a52d88897941 -DIST prebuilt-x86_64-v13.6.0.tar.xz 14351696 BLAKE2B 4b56c79143e3567bf8e5eb7b1ac33cef1789e3d1f9819e99e0c03c747ce2ebe65c364ccaf3f9cd86adb90c376a7d1873fe801a7570704577a4bdc223e0befe8d SHA512 ab3b953890817e2ac5e6b26e77edbadbc8305b61a4bd8ed4220b3494444f838040ab5ef71a81701c369610dab5e0515d1dd299efd43753d354ce38835a4e739a +DIST gitlab-runner-13.8.0.tar.bz2 6135637 BLAKE2B 84386ae8df8a2873df8651ce961e6bf4c0618871d6a48d787064b2e4497a8a3495e16f0365d3c539772d1f2108c5c4162dfa2ee4fb11a7ee8d499be2ade8a459 SHA512 b2b2f4716375aa678a29051a01437cd50ea5749a6ffe11cbe4a28fdcd9ebe7d05de1fb7d939ca15c3b831a3a6c15b2f68e1debdae5f8c0d3a45316351994cd72 DIST prebuilt-x86_64-v13.7.0.tar.xz 14340568 BLAKE2B b1ccb1070a1b698926dd50b4d1d5046d742873bb3ac00149dd62546aa295db220c21856749fed593528e4e223e97558a6ad14e7e629201d2a3ba9909d45cb52a SHA512 bd125203ecacc638ba8380580721a7377e03e1439ac477819ec327f45c6c3bfdc8a1c2fa84cd313faafa8776a4cb32de1c66d55968b119e27b7854d00ab2dac5 +DIST prebuilt-x86_64-v13.8.0.tar.xz 14439544 BLAKE2B 610ad3a505b34aef3cafd46aa3100e70ed07064bfcf2909152dad63d49342de2d316d4e7ce0b6271704cb2975f74021cba3e0f27bdda181f154129c8bb2e88a2 SHA512 a366d4a86bd53eeeaaebfc264b51cb203dd4297a5e917d312569e8bb5003ce5a0df76a19c3d89e4745b2a4c4938d820a510fcdc4077fa51cc9ceeaadbaf44441 diff --git a/dev-util/gitlab-runner/gitlab-runner-13.6.0.ebuild b/dev-util/gitlab-runner/gitlab-runner-13.8.0.ebuild index acc32be8af3c..c59aefe786da 100644 --- a/dev-util/gitlab-runner/gitlab-runner-13.6.0.ebuild +++ b/dev-util/gitlab-runner/gitlab-runner-13.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Liguros Authors +# Copyright 2020-2021 Liguros Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/dev-util/glslang/glslang-10.11.0.0_pre20201216.ebuild b/dev-util/glslang/glslang-10.11.0.0_pre20201216.ebuild index 255bf81815b9..bcba88c80620 100644 --- a/dev-util/glslang/glslang-10.11.0.0_pre20201216.ebuild +++ b/dev-util/glslang/glslang-10.11.0.0_pre20201216.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then else SNAPSHOT_COMMIT="c594de23cdd790d64ad5f9c8b059baae0ee2941d" SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~x86" S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}" fi diff --git a/dev-util/gosec/Manifest b/dev-util/gosec/Manifest index 95c07906a740..13c58c8b0a19 100644 --- a/dev-util/gosec/Manifest +++ b/dev-util/gosec/Manifest @@ -1,11 +1,8 @@ -DIST github.com-go-yaml-yaml-53403b5.tar.gz 72861 BLAKE2B 919445f18a0219550b77904f4ee13c44a809d9a38a02156a1846e97628333d8078c2d1526fb00003810f6445a83e0f1b44df907d35323f2eab66b67fd2cf2d70 SHA512 3f4c94a0aa4c185cdb80835d8624b3e97ac0b8c25cd08e7ba7070649513ba3e2332176d8adf7dccbde8944ac6980ff82b4da7343d00570227f5d3d87c2862b0b DIST github.com-go-yaml-yaml-7649d45.tar.gz 73353 BLAKE2B 9209b11394969b5221228358dce0dde675b9c059e02fe8ffc04d233a0f5e25e230dbbe57a47bcc9dee97d48c30b6530003023b68bc115145fea0cdcaea19e9b2 SHA512 2b7b0bd23eda5cd0a61a99b80bdc117bc0ee6630a3432ea7b35c5caad76a7c06f695d20f5c4572b5ad4d29c08684aa9d1957aa252c9f47a7068af97681dbad39 DIST github.com-golang-mod-3bfbaad.tar.gz 102305 BLAKE2B 7d926fd4d878d6e48e0b6bf98d70241c58f377edbea149064a4d84ee68fba0aa95164f1004a8f2fe729b2703b21407c47613fe22dc24dac078d8074bbf43d95a SHA512 85a5b2a63e7b171a4f4234820f389e61671144c59ea271a4f19632eb9c3fab245fa8d861963890b568d56274ab22a0572747975d6efceade3e98469e00672a96 DIST github.com-golang-tools-1eed487.tar.gz 2656602 BLAKE2B 06b726de1d1a749ab6e5b3a075474eacb1eb87f197df365358cae7b299801b368b976258ea7a4a43e8ac66a84083df23325512b22a8ef7655a689101ec101f49 SHA512 6239bf1fb704357b518bf19e86247b3f432400c315c7d65329e757913435da52c68721d82408f455071d750d727883106066084c9835a19f5d04c5535e204bd7 -DIST github.com-golang-tools-23e62d3.tar.gz 2367133 BLAKE2B 2995fc5582197d63f30fcdd9a21758b7641de849cbc32acaa831016571b1c8806ff8b3eb188e9e8a7a053c603ac0e28ff4dd95b369d4ffa5d2b4fcca79a12a36 SHA512 97613acf95e0d2121843ecb197e9e5a2914d344778770cd792e210096a64bfd3a7e3ffac61ea858040ef430c71329d9afc1427bdf3131e1e284a6630b3937b5d DIST github.com-golang-xerrors-5ec99f8.tar.gz 13669 BLAKE2B 8f682918ad53b3849b8304b759066bdb34b48edee67a6d7e940ce26636936b50637357441b87b836196cb2c409cf84fdcb4dab2140f5fb2a3cab27d456d28131 SHA512 d781374ccf578bd5337515ec9d0ee9b85a9169823b8ac464524c8712aef6c8faaaf6a649b3f64b18cf4b6db657501031e7299def1dff9c435f033ca2f79d6efb DIST github.com-gookit-color-1ffb695.tar.gz 2135107 BLAKE2B 3cd42a166eb4945b093a2e8c8827fee6ab4e9e027b9840561a3b8df5bd19445ec79b8e5eb22d4722feb732f3d03bb80f71c62c82074f9d7bd6571ef8446d2a73 SHA512 e112bd636ead10a38c7a99709852a6473b17b2a9de33ccc5bc439ca11f0f919c01233d91c0c8bedd9a641f14f4a6706a07fdda2558190c7bee48af52d645d684 -DIST github.com-nbutton23-zxcvbn-go-ae427f1.tar.gz 980120 BLAKE2B 53f16a722403baedb4f72e0bf081e2c350df289fe84ea60d9b71dfc914fb0fb93588970c77006d687e3ed0708aa0545e22736d80e2bd370158d74b4d7091a1ae SHA512 b1de4ac3c8e29f5f03652367db3052aee015ade3ebbb3f1b63a4efc10eefb5119cba24c5a57d2a7078e6df46f02fb4f32991335643d23c167fe292b6f077c7ba DIST github.com-nbutton23-zxcvbn-go-eafdab6.tar.gz 969223 BLAKE2B afb33486f4cbbe9a0f2ebc28a587683c4a4ff98d159b5c95e7442f4fad11c01265e1b4758ad594a33a78d98fb001cdfdbfaae4f96372611905863533167549e0 SHA512 ed7394cfa5416fede82867fd3f80f7effc54984d56bfd858c465aa2b39d02e65e6bbf916137dc11943e7625e1fd6e29ac822d45649fe028d71adc4bc995d5a80 -DIST gosec-2.2.0.tar.gz 72711 BLAKE2B aea1b23e508e090ff7cabb1e113b4b397de8fffd1bb312585866315785fe40e92cd4db58d364959a48c590be2f9bc7f27fb868ba74bc57a15858c13124c9ec4b SHA512 94d734e6dd7ee12771b6e4121ab2cb27337cc5ab5c7ad811f9d81c21bc8c2c14243baba52cbdc363c114b86288daa546dfa82f43257559de8ba0d9ef98fca610 DIST gosec-2.5.0.tar.gz 81369 BLAKE2B a266eb6e3d60c0efa63f343c2c3196e163f5a4094a7fc3db3b671d16f4f5e4e852864558751c9241fe2f4f86739fdf1aa831505d0e459c9b989e6492a797b1d5 SHA512 2f1946f87b442530af4a343b26224d183af0649b6b23edd98c4f0536cec30410d1bfae0b231853b07fbd876757a954dd41c6345b7ce17ef570cb06cd8fb67b2b +DIST gosec-2.6.1.tar.gz 83168 BLAKE2B d774b91f410707e1aa6191ef36d258e3a67eea09aae4797168ccec207c1e6c670bd78fbbe37a3ee6bc7dc9f85eae0f27167bbf8adf83e33ff6e8f481c9374827 SHA512 00d8c413f86bfadcdfc831d14ec8fa3474480d3bc95b3679c86e863526e756067c733e60bd1f5960fa5f43dd2ce2a3b33c2ee6d3c390d1335225816a2d8d74b9 diff --git a/dev-util/gosec/gosec-2.2.0.ebuild b/dev-util/gosec/gosec-2.6.1.ebuild index 309ca8c68de3..0ecfc4efca14 100644 --- a/dev-util/gosec/gosec-2.2.0.ebuild +++ b/dev-util/gosec/gosec-2.6.1.ebuild @@ -1,6 +1,5 @@ -# Copyright 1999-2020 Go Overlay Authors +# Copyright 2020-2021 Liguros Authors # Distributed under the terms of the GNU General Public License v2 - EAPI=7 GOLANG_PKG_IMPORTPATH="github.com/securego" @@ -9,9 +8,12 @@ GOLANG_PKG_BUILDPATH="/cmd/${PN}" GOLANG_PKG_LDFLAGS="-X main.Version=${PV} -X main.GitTag=${PV}" GOLANG_PKG_DEPENDENCIES=( - "github.com/nbutton23/zxcvbn-go:ae427f1" - "github.com/golang/tools:23e62d3 -> golang.org/x" #v0.3.3 - "github.com/go-yaml/yaml:53403b5 -> gopkg.in/yaml.v2" #v2.2.8 + "github.com/nbutton23/zxcvbn-go:eafdab6" #v0.1 + "github.com/golang/tools:1eed487 -> golang.org/x" #v0.6.1 + "github.com/go-yaml/yaml:7649d45 -> gopkg.in/yaml.v2" #v2.4.0 + "github.com/gookit/color:1ffb695" #v1.3.6 + "github.com/golang/mod:3bfbaad -> golang.org/x" #v0.4.0 + "github.com/golang/xerrors:5ec99f8 -> golang.org/x" ) inherit golang-single diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.24.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.24.ebuild index e69d4d6239b5..2115b409c1cb 100644 --- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.24.ebuild +++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.24.ebuild @@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+" SLOT="0" IUSE="" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # man page was previously installed by gtk+:3 ebuild RDEPEND=" diff --git a/dev-util/hip/hip-4.0.0-r1.ebuild b/dev-util/hip/hip-4.0.0-r1.ebuild new file mode 100644 index 000000000000..9252cfffc779 --- /dev/null +++ b/dev-util/hip/hip-4.0.0-r1.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit cmake flag-o-matic prefix + +DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability" +HOMEPAGE="https://github.com/ROCm-Developer-Tools/HIP" +SRC_URI="https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz" + +KEYWORDS="~amd64" +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" + +IUSE="debug profile" + +# Don't strip to prevent some tests from failing. +RESTRICT="strip" + +DEPEND=">=dev-libs/rocclr-$(ver_cut 1-2) + >=dev-util/rocminfo-$(ver_cut 1-2) + =sys-devel/llvm-roc-${PV}*[runtime]" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-3.9.0-DisableTest.patch" + "${FILESDIR}/${PN}-3.9.0-add-include-directories.patch" + "${FILESDIR}/${PN}-3.5.1-config-cmake-in.patch" + "${FILESDIR}/${PN}-3.5.1-hip_vector_types.patch" + "${FILESDIR}/${PN}-3.5.1-detect_offload-arch_for_clang-roc.patch" + "${FILESDIR}/${PN}-3.9.0-lpl_ca-add-include.patch" +) + +S="${WORKDIR}/HIP-rocm-${PV}" + +src_prepare() { + cmake_src_prepare + eapply_user + + # Use Gentoo version number, otherwise git hash is attempted in vain. + sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${PVR})" -i CMakeLists.txt || die + + # disable PCH, because it results in a build error in ROCm 4.0.0 + sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i "${S}/CMakeLists.txt" || die + + # "hcc" is deprecated and not installed, new platform is "rocclr"; + # Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include" + # which makes "stdlib.h" not found when using "#include_next" in header files; + sed -e "/HIP_PLATFORM.*HIP_COMPILER.*clang/s:hcc:rocclr:" \ + -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \ + -e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \ + -i bin/hipcc || die + + # replace hcc remnants with modern rocclr. + sed -e "/HIP_PLATFORM.*STREQUAL/s:hcc:rocclr:" -i cmake/FindHIP/run_hipcc.cmake || die + + # correctly find HIP_CLANG_INCLUDE_PATH using cmake + sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":/usr/lib/llvm/roc:" -i hip-config.cmake.in || die + + # change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs" + sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \ + -i "${S}/hip-config.cmake.in" || die + + einfo "prefixing hipcc and its utils..." + hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}") +} + +src_configure() { + strip-flags + if ! use debug; then + append-cflags "-DNDEBUG" + append-cxxflags "-DNDEBUG" + buildtype="Release" + else + buildtype="Debug" + fi + + # TODO: Currently a GENTOO configuration is build, + # this is also used in the cmake configuration files + # which will be installed to find HIP; + # Other ROCm packages expect a "RELEASE" configuration, + # see "hipBLAS" + local mycmakeargs=( + -DCMAKE_PREFIX_PATH="${EPREFIX}/usr/lib/llvm/roc" + -DCMAKE_BUILD_TYPE=${buildtype} + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/hip" + -DBUILD_HIPIFY_CLANG=OFF + -DHIP_PLATFORM=rocclr + -DHIP_RUNTIME=ROCclr + -DHIP_COMPILER=clang + -DROCM_PATH="${EPREFIX}/usr" + -DHSA_PATH="${EPREFIX}/usr" + -DUSE_PROF_API=$(usex profile 1 0) + -DROCclr_DIR="${EPREFIX}"/usr/include/rocclr + ) + + cmake_src_configure +} + +src_install() { + echo "HSA_PATH=${EPREFIX}/usr" > 99hip || die + echo "ROCM_PATH=${EPREFIX}/usr" >> 99hip || die + echo "HIP_PLATFORM=rocclr" >> 99hip || die + echo "HIP_RUNTIME=ROCclr" >> 99hip || die + echo "HIP_COMPILER=clang" >> 99hip || die + echo "HIP_CLANG_PATH=${EPREFIX}/usr/lib/llvm/roc/bin" >> 99hip || die + + echo "PATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die + echo "HIP_PATH=${EPREFIX}/usr/lib/hip" >> 99hip || die + echo "LDPATH=${EPREFIX}/usr/lib/hip/lib" >> 99hip || die + echo "ROOTPATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die + + doenvd 99hip + + cmake_src_install +} diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest index 64a6eeb71829..bb36fbf104a4 100644 --- a/dev-util/jenkins-bin/Manifest +++ b/dev-util/jenkins-bin/Manifest @@ -1,4 +1,5 @@ DIST jenkins-bin-2.263.1.war 67270143 BLAKE2B 2c59b2d58632c741a0ce9ba66e4d177779899be01d3e0b9f7ba2e8fa5ff8bac667c2e2c98b9c199a8d55f9c873c1937b80f4aa6ea5f7ff6bbf256047c9a6ee94 SHA512 320dc0d4b365c0b9e11e76d6753b5ba3fbdf81e1acb9a7bbb4082fba1c57f22126810b75c563c4aa75ef3ff1633f2fe1a953c8aa1a25af5f3a0a9b2bc3a104d9 DIST jenkins-bin-2.263.2.war 67285886 BLAKE2B 6bb4922536370744b5e69ebc50b79937865bef13183d48b0cd725e78921bab4433fd63ab1a1a32d52903bd448c31acf29a47a3c03bda8ef2cc2fcdaed673d985 SHA512 f25158373963fd4dfa988381dbb6c84b16129899a596a447ae35dbce5ebed27a796d0b1aea0c4213032ee37a17df7b3dc50d393cf13156944813cbed1e598351 +DIST jenkins-bin-2.263.3.war 67287051 BLAKE2B 376612f444d6827ad270f1121c2df3f134893eb9a501b919e2c1b506f0536b506a1158152541c46a211f55ecc62b39930024bf3457e2e550900e5aa98f368f39 SHA512 c8badbb4704ad60ede50d32b9df36ca8f78da7e4238e9277a26eaa90a16bd27106bf7e04497cf2bf2ef086befc8cfdb64db9af7f4ceccb1dc22d4e21e5898e68 DIST jenkins-bin-2.268.war 70969355 BLAKE2B e24424c8cd0535c04134cd22b8fc5e73de80c8eaa090e9fdf512dfeda4a9d029b0657e7ecaed4934ff996c1f5e8e59e9f10a7bfc31a313792cf759017780aeeb SHA512 b0e55310a21039fc57a7bdcc3b190ec61141f253d084a8279d279cff1778a3a4edc281bcc2cd1f872389d160a77dd2c9ebdf1b6cbc5d90272f2aedd66296535a DIST jenkins-bin-2.275.war 70809238 BLAKE2B 876d7215f55c80352336f4b3a8b47ff655930666e545bf81701c311e7b2ef756e9afbf286fdb8cc33d9dc64502dde3ec4d84c6b9c636d8503df79b8176ea8b9a SHA512 6c473e8d117ba99fa6a25820f0e0793f5b95f2d4c8ae2969c3e6c38fa076cbce91003d9d3e5c41c158a6d9ac69c192addbd3c0487af8b220878a1c08435b2a5a diff --git a/dev-util/jenkins-bin/jenkins-bin-2.263.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.263.3.ebuild new file mode 100644 index 000000000000..e24da02245e6 --- /dev/null +++ b/dev-util/jenkins-bin/jenkins-bin-2.263.3.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit user systemd + +DESCRIPTION="Extensible continuous integration server" +HOMEPAGE="https://jenkins.io/" +LICENSE="MIT" +SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war" +RESTRICT="mirror" +SLOT="lts" +KEYWORDS="~amd64 ~x86 ~amd64-linux" +IUSE="" + +RDEPEND="media-fonts/dejavu + media-libs/freetype + !dev-util/jenkins-bin:0 + >=virtual/jre-1.8.0" + +S=${WORKDIR} + +JENKINS_DIR=/var/lib/jenkins + +pkg_setup() { + enewgroup jenkins + enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins +} + +src_install() { + keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home + + insinto /opt/jenkins + newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war + + insinto /etc/logrotate.d + newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/} + + newinitd "${FILESDIR}"/${PN}.init2 jenkins + newconfd "${FILESDIR}"/${PN}.confd jenkins + + systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service + + fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup +} diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest index 07cacd71fa2f..207853f3401d 100644 --- a/dev-util/lldb/Manifest +++ b/dev-util/lldb/Manifest @@ -2,4 +2,5 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf DIST llvmorg-11.1.0-rc1.tar.gz 122793491 BLAKE2B f4777455f5903cffea284eaffd872be6c287c6c1ebbd0c4b5b5473f146d7f5476f3551998a58d3e976ab90cde7b0d05db2b3be97f4e8e2c3474755ff38739268 SHA512 44e281486c44fa1611042ab658b9833a75f9613b7f896863613cfb99de66d13607fb1e9064f42ea3d89ca7951113465a90fd96ca4544262f165f78bd5261f5a8 +DIST llvmorg-11.1.0-rc2.tar.gz 122794772 BLAKE2B ab533f078d9d6c37e27c578866a07896344a0b4cf4ebf6402f4fa490213e017310d1c882bf63e552e99a5b4f6d1d8c01413420713b200bfa6732eff64f3c47a9 SHA512 88d8f1d938f0ba7ec39478d03a35c09a30bea51735276205494265b1061621b3ebcda8ee4211e896783b1b99a377c9fa68046118b0d6cb7fcb7bea1e960f95b7 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59 diff --git a/dev-util/lldb/lldb-11.1.0_rc2.ebuild b/dev-util/lldb/lldb-11.1.0_rc2.ebuild new file mode 100644 index 000000000000..ae93495f0c83 --- /dev/null +++ b/dev-util/lldb/lldb-11.1.0_rc2.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +inherit cmake llvm llvm.org python-single-r1 toolchain-funcs + +DESCRIPTION="The LLVM debugger" +HOMEPAGE="https://llvm.org/" + +LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" +SLOT="0" +KEYWORDS="" +IUSE="libedit lzma ncurses +python test" +REQUIRED_USE=${PYTHON_REQUIRED_USE} +RESTRICT="test" + +RDEPEND=" + libedit? ( dev-libs/libedit:0= ) + lzma? ( app-arch/xz-utils:= ) + ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) + python? ( + $(python_gen_cond_dep ' + dev-python/six[${PYTHON_USEDEP}] + ') + ${PYTHON_DEPS} + ) + ~sys-devel/clang-${PV}[xml] + ~sys-devel/llvm-${PV} + !<sys-devel/llvm-4.0" +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-util/cmake-3.16 + python? ( >=dev-lang/swig-3.0.11 ) + test? ( + $(python_gen_cond_dep " + ~dev-python/lit-${PV}[\${PYTHON_USEDEP}] + dev-python/psutil[\${PYTHON_USEDEP}] + ") + sys-devel/lld + ) + ${PYTHON_DEPS}" + +LLVM_COMPONENTS=( lldb ) +LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) +llvm.org_set_globals + +pkg_setup() { + LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup + python-single-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DLLDB_ENABLE_CURSES=$(usex ncurses) + -DLLDB_ENABLE_LIBEDIT=$(usex libedit) + -DLLDB_ENABLE_PYTHON=$(usex python) + -DLLDB_ENABLE_LZMA=$(usex lzma) + -DLLDB_USE_SYSTEM_SIX=1 + -DLLVM_ENABLE_TERMINFO=$(usex ncurses) + + -DLLDB_INCLUDE_TESTS=$(usex test) + + -DCLANG_LINK_CLANG_DYLIB=ON + # TODO: fix upstream to detect this properly + -DHAVE_LIBDL=ON + -DHAVE_LIBPTHREAD=ON + + # normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO + # and TERMINFO_LIBS... so just force FindCurses.cmake to use + # ncurses with complete library set (including autodetection + # of -ltinfo) + -DCURSES_NEED_NCURSES=ON + + -DPython3_EXECUTABLE="${PYTHON}" + ) + use test && mycmakeargs+=( + -DLLVM_BUILD_TESTS=$(usex test) + -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" + -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" + -DLLVM_LIT_ARGS="$(get_lit_flags)" + ) + + cmake_src_configure +} + +src_test() { + local -x LIT_PRESERVES_TMP=1 + cmake_build check-lldb-lit + # failures + hangs + #use python && cmake_build check-lldb +} + +src_install() { + cmake_src_install + find "${D}" -name '*.a' -delete || die + + use python && python_optimize +} diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.8.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.8.0.ebuild index ce1e2b0aad19..1c71c8c84462 100644 --- a/dev-util/lxqt-build-tools/lxqt-build-tools-0.8.0.ebuild +++ b/dev-util/lxqt-build-tools/lxqt-build-tools-0.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86" fi LICENSE="BSD" diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest index f94ce96c1c31..05c0cfeafedc 100644 --- a/dev-util/nvidia-cuda-toolkit/Manifest +++ b/dev-util/nvidia-cuda-toolkit/Manifest @@ -1,19 +1,5 @@ -DIST cuda_10.0.130_410.48_linux.run 2020126691 BLAKE2B f784f41c06d81b6f89d07e756347fb94148f79e5fd50650fc340feb6b49dcc2bedd05cf4c7c2662da39955f9393efc048aa17fa921aad86e182186fb6d98ec50 SHA512 409ea4cc6aa0fe7063450e77c3b67b9b41aab1bbe556db673fb1a80610b20bd52e2020bf94034a92ab68c721d3d5739500bae4bd7a3558b2d8e73730a3b4ea25 -DIST cuda_10.1.105_418.39_linux.run 2423314285 BLAKE2B 924872eaaa4e8ecd6b81765c91d5e538d968e4fc88792a805339dd9cae15dd70372f310d39b9668d76cadbab875e3c4abcfca5a5cf71e4d83c9db056dc02f51c SHA512 07cdc053989758e4cdccaad566cae7127fa79780ad85033ea52d33cc4c43c9de08e88dd087390c58b542e51703f256859cdf51a018ee57e6a412f45fb9561622 -DIST cuda_10.1.168_418.67_linux.run 2526901749 BLAKE2B ed2207400730600c63895cc894e02a14dce59c6293f198ea2a94f6dd0fab25a005d4754f91376c267cb95f3fdc66ee08e4353ec17b69d28881c59190b9eb4746 SHA512 85635012ec7081e200fb46f973852939f9709e802f495c288d5f31ff1fbd283a578fdaca0afa8955e6e0c7ca6c4862428da5168e0938b48390952d8633350910 -DIST cuda_10.1.243_418.87.00_linux.run 2572375299 BLAKE2B df9cb4faeeeeecc536e72697c6c73d544219f1b23cacb7fed646b0908fc7e573e85920861d56f76776ba637d84964cd1c789a0fe0d6541a4e0adf618b6c74d3c SHA512 f92b19d0242969a65a6e6db43bc293e442abc07a9e168c9e995692e1a401679504598c782e511be3879e1650b90f71a50bbc63c9ee45654c26b5007cdf33c4fe DIST cuda_10.2.89_440.33.01_linux.run 2645419389 BLAKE2B 236aa70a7b45e3636c2c229fffa7d1ca0699ab4365865a73edab607a209c42c2899133dd6a83c61c5929fa754668ad15aec4d847639af1c00a8e6657c8487c77 SHA512 ad8da539ff5df7caf411d1e497ff3d6978cfa8a1fd9150fa4846089e92a604ea56be8631f3efdfe7229a655b8d2d28e6edb32f5731530a77d6f00241cc7aab6e -DIST cuda_11.0.3_450.51.06_linux.run 3112522594 BLAKE2B f458aeebee3f7145f46c5607d1743d350ed96e9b8fd824fd94d2c998bcd8ccf3ef924cf37e95ce002ba92f464edd5004164497e820084953613ec2deb6edb144 SHA512 e7014c868c0bf40c000b1fd14d156265773a399782937cc85a2b09cd62abddcacdc20b412e1cc91c3877d01563cf054b1e021f047b32cfff4ab516e7167382dd -DIST cuda_11.1.0_455.23.05_linux.run 3498245611 BLAKE2B 754d974acf309a0f2f969bb3312949aa5469b3ec6ebfc4a89f244420cecebc22dc19fb9f63ec7d5c177eeb533a8984cb6bfa8d271ba36d02aacce22d42442ba4 SHA512 b5d64f20dbb51f12c558be4a724c18ddcd6d18670036efb63d19bb8009300463b8051dd1a2d2d7768bf3076681954ea690af399651da832ba00867a3f4a9acdf DIST cuda_11.1.1_455.32.00_linux.run 3532172082 BLAKE2B f4af6bd87c419c002b4913ea7cfcbc84c78e3da485a7ac7dff0da483347cb38bde020e70c7352fe995a2efe0b8e97a156e0536f87aef69ff13fdf6e75fa634d1 SHA512 3da629e6f63548d06050a77d6ad2dbf314db33b2bf4e7d1659f039b3d9ad2ad3f87a6e506ec54db9ca2d21ac7b5ec576748082684bbab3b6642c03d2793d73a9 DIST cuda_11.2.0_460.27.04_linux.run 3046790184 BLAKE2B 5330bc2e12ff131eb993610c95b22e6358b11d6a7a952625a4e88ed856769256c02e165ac7bf6cc43236052c8427cee17bf1e7346995dc2eba84d93c5d444eb3 SHA512 0aa7390490b93be7f359327a8fe364a44b538e742c7ccd560e9bbb40ed8613539c37fcb4aa71a2fbfa0bfdb0416ab43bbdcc09cd0c81db3f1a07b37318d6b2b3 -DIST cuda_6.5.14_linux_32.run 76788277 BLAKE2B 75e79dce6cac5155bde8a3cafa945047c489b10272f8a3b94bf55d499df4b9c8b82506a81a20f9fd816bd4fd0514e515a6435399db1cb62b027c76490bd4dfae SHA512 89649ee0f4543b37037b7c8f5ed0b8bd502512afb4d93e3158b3df4786123be05a5288986b5abbfe15c14eb010777d2527b715225bea96a354a898c34e4a2fcc -DIST cuda_6.5.14_linux_64.run 972320904 BLAKE2B 4a4361fb7a90989ec4b4aa433189e7b358e5a2272fb9b9c59429e0014ac14e3b8de1b247ee98dc30c3f3ee4cc009eca4fdd86027bd3b9527a683353d60bdf5c6 SHA512 fecca731b86955f5bc7b09d88b02951e3ee5d4b1f1cf5f92658227a029b87cd35d6ac22956a5fa0afe62dcdc57191f1d12bb08c9f7cc05128727cd8455947b1e -DIST cuda_6.5.19_linux_32.run 81882112 BLAKE2B cf55ef7c969503c156431fc56301ed4e9a1234ae0cb867f12649636069f35e56bf6fc9df7482b6baade45d78c8baa2d98c41a28696da59294e0f575c4a0344ce SHA512 1ce9bd6b472b7e4f1fb181eb340dfcb757714d59a89aaa02146cfe1a97c8ccb7eb7699b4ec823276f277eb4d82d95050eaba17e7ed5fd2e47b9b5d78531c5d4e -DIST cuda_6.5.19_linux_64.run 982446238 BLAKE2B 517ac07d4717f4f5d9427616a387dbe01fe35b7b6845b5d9e29aad18814243d38cc9a3cd0ff9042c027fcb056618e9a8535d560c16a6ac7998ff39fcf3ada654 SHA512 06854f020a5f72cf4bd714859e6966248ac2f589284113674e869fdaa1254cae27d4101940758ecda5df4724ad3e448a1f6d0c053b6cbc28107750872b6a5797 -DIST cuda_7.5.18_linux.run 1195424633 BLAKE2B 35933c3c3355231cd59e579e6ac6a30cca57ed0e3de26ce5cac368ff22595f39cb041c9696415d4d76a49e772b7828eacab24a3e581c1e9a8ef7981e1b044eee SHA512 97459dfd124060200f1c43f763e5bce0bea53e35ed4bef72bee6c8ba1c04ecffb8695af11755443513316f91fdb5cb4d35662f7b87bca7e3de85d562d4e49363 -DIST cuda_8.0.44_linux.run 1457082926 BLAKE2B a6408ddf8984dc4b0725cc4f53549c4d4fc4b3bd4de2771896953dbe023aa6d04ad38f5d6bf1ab3ff5752d2c18b400f478c9dbb263755267836c5de79e4f8f51 SHA512 1bf9d8e6b853c2a971b8d908a043adc5b11ec7033faed04a773c42680882753f98bc33b46f6b301c24c0f780f74bc237dce5766fc857f1a905e6c1f200728d86 DIST cuda_8.0.61_375.26_linux.run 1465528129 BLAKE2B d52ddf1dcf5246f230f210d10d1f6e7b540c892dea5a8cd770f0d062b30b01f5c8467d930430b383464d40a9b4a14eaaf22a365e081955e4452ec4f55e08da0b SHA512 d22303719a9feff64f95bf6a966f1caa2bf0cf8c955e475ce08ce54faa5e098d336c2db223ef0185c1f23b9c52b7d2f81a63515485219cfc016d72bda979248b -DIST cuda_9.0.176_384.81_linux.run 1643293725 BLAKE2B 4155de544f877f6c420c2463bc68679cc89774f0516d1885d5c3f483ad86e7f25ecf6042b8240431b814230136f3026196a013bb18184fa2ec9af555bb7ea723 SHA512 00e24638c02d049c575732dee5237db21f7c451b606f37cf95e44e89d47d0cb055255e9f70dc013298c9e0d224147f239488558904556b68572e3f31935489a9 -DIST cuda_9.1.85_387.26_linux.run 1639829845 BLAKE2B c9f6544893b8e4d0b4c51d66f1cf17a593e65af6e7748e2994abda8ffcb839a7bb19cb0eebfbc52347293296025f000241d1c9842af0c41d31928770c4639b79 SHA512 492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827 DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc SHA512 2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba diff --git a/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-11.2.0-nsight-systems-launcher.patch b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-11.2.0-nsight-systems-launcher.patch new file mode 100644 index 000000000000..721514729c5c --- /dev/null +++ b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-11.2.0-nsight-systems-launcher.patch @@ -0,0 +1,12 @@ +--- a/builds/integration/nsight-systems/nsight-sys ++++ b/builds/integration/nsight-systems/nsight-sys +@@ -24,7 +24,7 @@ + + DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) + CUDA_INSTALL_DIR=$(cd "$DIR/.." && pwd) +-try_exec "$CUDA_INSTALL_DIR"/nsight-systems-2020.4.3/host-linux-x64/nsight-sys "$@" +-try_exec /opt/nvidia/nsight-systems/2020.4.3/host-linux-x64/nsight-sys "$@" ++try_exec "$CUDA_INSTALL_DIR"/nsight-systems-2020.4.3/host-linux-x64/nsys-ui "$@" ++try_exec /opt/nvidia/nsight-systems/2020.4.3/host-linux-x64/nsys-ui "$@" + + die "Error: Nsight Systems 2020.4.3 hasn't been installed with CUDA Toolkit 11.2" diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml index 59cb921ab1b6..95e0839015c0 100644 --- a/dev-util/nvidia-cuda-toolkit/metadata.xml +++ b/dev-util/nvidia-cuda-toolkit/metadata.xml @@ -10,7 +10,7 @@ <flag name="eclipse">Install Eclipse plugins</flag> <flag name="nsight">Install profiling and optimizing tools (nsight-compute, nsight-systems)</flag> <flag name="profiler">Install the NVIDIA CUDA profiler (nvprof) and the related libraries</flag> - <flag name="sanitizer">Install compute-sanitiazer tool</flag> + <flag name="sanitizer">Install compute-sanitizer tool</flag> <flag name="vis-profiler">Install the NVIDIA CUDA visual profiler (nvvp)</flag> </use> <origin>gentoo-staging</origin> diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.0.130.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.0.130.ebuild deleted file mode 100644 index 580358a10731..000000000000 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.0.130.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit check-reqs cuda eutils toolchain-funcs unpacker versionator - -MYD=$(get_version_component_range 1-2) -DRIVER_PV="410.48" - -DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)" -HOMEPAGE="https://developer.nvidia.com/cuda-zone" -SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux -> cuda_${PV}_${DRIVER_PV}_linux.run" - -LICENSE="NVIDIA-CUDA" -SLOT="0/${PV}" -KEYWORDS="-* ~amd64 ~amd64-linux" -IUSE="debugger doc eclipse profiler" -RESTRICT="bindist mirror" - -DEPEND="" -RDEPEND="${DEPEND} - <sys-devel/gcc-8[cxx] - >=x11-drivers/nvidia-drivers-396.24[X,uvm] - debugger? ( - sys-libs/libtermcap-compat - sys-libs/ncurses-compat:5[tinfo] - ) - eclipse? ( >=virtual/jre-1.6 ) - profiler? ( >=virtual/jre-1.6 )" - -S="${WORKDIR}" - -QA_PREBUILT="opt/cuda/*" - -CHECKREQS_DISK_BUILD="3500M" - -pkg_setup() { - # We don't like to run cuda_pkg_setup as it depends on us - check-reqs_pkg_setup -} - -src_unpack() { - unpacker - unpacker run_files/cuda-linux*.run -} - -src_prepare() { - local cuda_supported_gcc - - # ATTENTION: change requires revbump - cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3" - - sed \ - -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \ - "${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die - - default -} - -src_install() { - local i remove=( doc jre run_files install-linux.pl cuda-installer.pl ) - local cudadir=/opt/cuda - local ecudadir="${EPREFIX}${cudadir}" - - if use doc; then - DOCS+=( doc/pdf/. ) - HTML_DOCS+=( doc/html/. ) - fi - einstalldocs - - mv doc/man/man3/{,cuda-}deprecated.3 || die - doman doc/man/man*/* - - use debugger || remove+=( bin/cuda-gdb extras/Debugger extras/cuda-gdb-${PV}.src.tar.gz ) - - if use profiler; then - # hack found in install-linux.pl - for i in nvvp nsight; do - cat > bin/${i} <<- EOF || die - #!/usr/bin/env sh - LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \ - UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \ - ${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java - EOF - chmod a+x bin/${i} || die - done - else - use eclipse || remove+=( libnvvp libnsight ) - remove+=( extras/CUPTI ) - fi - - for i in "${remove[@]}"; do - ebegin "Cleaning ${i}..." - rm -rf "${i}" || die - eend - done - - dodir ${cudadir} - mv * "${ED%/}${cudadir}" || die - - cat > "${T}"/99cuda <<- EOF || die - PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "") - ROOTPATH=${ecudadir}/bin - LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64 - EOF - doenvd "${T}"/99cuda - - use profiler && \ - make_wrapper nvprof "${ecudadir}/bin/nvprof" "." "${ecudadir}/lib64:${ecudadir}/lib" - - dobin "${T}"/cuda-config -} - -pkg_postinst_check() { - local a b - a="$(version_sort $(cuda-config -s))"; a=( $a ) - # greatest supported version - b="${a[${#a[@]}-1]}" - - # if gcc and if not gcc-version is at least greatest supported - if tc-is-gcc && \ - ! version_is_at_least gcc-version ${b}; then - ewarn "" - ewarn "gcc >= ${b} will not work with CUDA" - ewarn "Make sure you set an earlier version of gcc with gcc-config" - ewarn "or append --compiler-bindir= pointing to a gcc bindir like" - ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}" - ewarn "to the nvcc compiler flags" - ewarn "" - fi -} - -pkg_postinst() { - if [[ ${MERGE_TYPE} != binary ]]; then - pkg_postinst_check - fi -} diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r3.ebuild deleted file mode 100644 index 529ba9f63de0..000000000000 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r3.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit check-reqs cuda toolchain-funcs unpacker - -MYD=$(ver_cut 1-2 ${PV}) -DRIVER_PV="418.39" - -DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)" -HOMEPAGE="https://developer.nvidia.com/cuda-zone" -SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run" - -LICENSE="NVIDIA-CUDA" -SLOT="0/${PV}" -KEYWORDS="-* ~amd64 ~amd64-linux" -IUSE="debugger doc eclipse profiler" -RESTRICT="bindist mirror" - -DEPEND="" -RDEPEND="${DEPEND} - <sys-devel/gcc-9[cxx] - >=x11-drivers/nvidia-drivers-396.24[X,uvm] - debugger? ( - sys-libs/libtermcap-compat - sys-libs/ncurses-compat:5[tinfo] - ) - eclipse? ( >=virtual/jre-1.6 ) - profiler? ( >=virtual/jre-1.6 )" - -S="${WORKDIR}" - -QA_PREBUILT="opt/cuda/*" - -CHECKREQS_DISK_BUILD="6100M" - -pkg_setup() { - # We don't like to run cuda_pkg_setup as it depends on us - check-reqs_pkg_setup -} - -src_prepare() { - local cuda_supported_gcc - - # ATTENTION: change requires revbump - cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4" - - sed \ - -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \ - "${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die - - default -} - -src_install() { - local i remove=( doc jre run_files install-linux.pl cuda-installer.pl ) - local cudadir=/opt/cuda - local ecudadir="${EPREFIX}${cudadir}" - - cd builds/cuda-toolkit - if use doc; then - DOCS+=( doc/pdf/. ) - HTML_DOCS+=( doc/html/. ) - fi - einstalldocs - - mv doc/man/man3/{,cuda-}deprecated.3 || die - doman doc/man/man*/* - - use debugger || remove+=( bin/cuda-gdb bin/cuda-gdbserver extras/Debugger share/gdb extras/cuda-gdb-${PV}.src.tar.gz ) - - if use profiler; then - # hack found in install-linux.pl - for i in nvvp nsight; do - cat > bin/${i} <<- EOF || die - #!/usr/bin/env sh - LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \ - UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \ - ${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java - EOF - chmod a+x bin/${i} || die - done - else - use eclipse || remove+=( libnvvp libnsight nsightee_plugins NsightCompute-2019.1 NsightSystems-2018.3 bin/nsight bin/nsight_ee_plugins_manage.sh bin/nvvp bin/computeprof ) - remove+=( extras/CUPTI bin/nvprof ) - fi - - for i in "${remove[@]}"; do - ebegin "Cleaning ${i}..." - rm -rf "${i}" || die - eend - done - - dodir ${cudadir} - into ${cudadir} - - # Install binaries separately to make sure the X permission is set - local bindirs=( bin nvvm/bin extras/demo_suite $(usex profiler "libnsight/nsight") ) - for i in $(find "${bindirs[@]}" -maxdepth 1 -type f); do - exeinto ${cudadir}/${i%/*} - doexe ${i} - rm ${i} || die - done - exeinto ${cudadir}/bin - doexe "${T}"/cuda-config - - # Install the rest - insinto ${cudadir} - doins -r * - - cat > "${T}"/99cuda <<- EOF || die - PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "") - ROOTPATH=${ecudadir}/bin - LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64 - EOF - doenvd "${T}"/99cuda - - #Cuda prepackages libraries, don't revdep-build on them - echo "SEARCH_DIRS_MASK=\"${ecudadir}\"" > "${T}/80${PN}" || die - insinto "/etc/revdep-rebuild" - doins "${T}/80${PN}" -} - -pkg_postinst_check() { - local a b - a="$(${EROOT}/opt/cuda/bin/cuda-config -s)" - b="0.0" - for v in $a; do - if ver_test "${v}" -gt "${b}"; then - b="${v}" - fi - done - - # if gcc and if not gcc-version is at least greatest supported - if tc-is-gcc && \ - ver_test $(gcc-version) -gt ${b}; then - ewarn "" - ewarn "gcc >= ${b} will not work with CUDA" - ewarn "Make sure you set an earlier version of gcc with gcc-config" - ewarn "or append --compiler-bindir= pointing to a gcc bindir like" - ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}" - ewarn "to the nvcc compiler flags" - ewarn "" - fi -} - -pkg_postinst() { - if [[ ${MERGE_TYPE} != binary ]]; then - pkg_postinst_check - fi -} diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.168-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.168-r2.ebuild deleted file mode 100644 index d9a0f446a8af..000000000000 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.168-r2.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit check-reqs cuda toolchain-funcs unpacker - -MYD=$(ver_cut 1-2 ${PV}) -DRIVER_PV="418.67" - -DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)" -HOMEPAGE="https://developer.nvidia.com/cuda-zone" -SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run" - -LICENSE="NVIDIA-CUDA" -SLOT="0/${PV}" -KEYWORDS="-* ~amd64 ~amd64-linux" -IUSE="debugger doc eclipse profiler" -RESTRICT="bindist mirror" - -DEPEND="" -RDEPEND="${DEPEND} - <sys-devel/gcc-9[cxx] - >=x11-drivers/nvidia-drivers-396.24[X,uvm] - debugger? ( - sys-libs/libtermcap-compat - sys-libs/ncurses-compat:5[tinfo] - ) - eclipse? ( >=virtual/jre-1.6 ) - profiler? ( >=virtual/jre-1.6 )" - -S="${WORKDIR}" - -QA_PREBUILT="opt/cuda/*" - -CHECKREQS_DISK_BUILD="6100M" - -pkg_setup() { - # We don't like to run cuda_pkg_setup as it depends on us - check-reqs_pkg_setup -} - -src_prepare() { - local cuda_supported_gcc - - # ATTENTION: change requires revbump - cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4" - - sed \ - -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \ - "${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die - - default -} - -src_install() { - local i remove=( doc jre run_files install-linux.pl cuda-installer.pl ) - local cudadir=/opt/cuda - local ecudadir="${EPREFIX}${cudadir}" - - cd builds/cuda-toolkit - if use doc; then - DOCS+=( doc/pdf/. ) - HTML_DOCS+=( doc/html/. ) - fi - einstalldocs - - mv doc/man/man3/{,cuda-}deprecated.3 || die - doman doc/man/man*/* - - use debugger || remove+=( bin/cuda-gdb bin/cuda-gdbserver extras/Debugger share/gdb extras/cuda-gdb-${PV}.src.tar.gz ) - - if use profiler; then - # hack found in install-linux.pl - for i in nvvp nsight; do - cat > bin/${i} <<- EOF || die - #!/usr/bin/env sh - LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \ - UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \ - ${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java - EOF - chmod a+x bin/${i} || die - done - else - use eclipse || remove+=( libnvvp libnsight nsightee_plugins NsightCompute-2019.1 NsightSystems-2018.3 bin/nsight bin/nsight_ee_plugins_manage.sh bin/nvvp bin/computeprof ) - remove+=( extras/CUPTI bin/nvprof ) - fi - - for i in "${remove[@]}"; do - ebegin "Cleaning ${i}..." - rm -rf "${i}" || die - eend - done - - dodir ${cudadir} - into ${cudadir} - - # Install binaries separately to make sure the X permission is set - local bindirs=( bin nvvm/bin extras/demo_suite $(usex profiler "libnsight/nsight") ) - for i in $(find "${bindirs[@]}" -maxdepth 1 -type f); do - exeinto ${cudadir}/${i%/*} - doexe ${i} - rm ${i} || die - done - exeinto ${cudadir}/bin - doexe "${T}"/cuda-config - - # Install the rest - insinto ${cudadir} - doins -r * - - cat > "${T}"/99cuda <<- EOF || die - PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "") - ROOTPATH=${ecudadir}/bin - LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64 - EOF - doenvd "${T}"/99cuda - - #Cuda prepackages libraries, don't revdep-build on them - echo "SEARCH_DIRS_MASK=\"${ecudadir}\"" > "${T}/80${PN}" || die - insinto "/etc/revdep-rebuild" - doins "${T}/80${PN}" -} - -pkg_postinst_check() { - local a b - a="$(${EROOT}/opt/cuda/bin/cuda-config -s)" - b="0.0" - for v in $a; do - if ver_test "${v}" -gt "${b}"; then - b="${v}" - fi - done - - # if gcc and if not gcc-version is at least greatest supported - if tc-is-gcc && \ - ver_test $(gcc-version) -gt ${b}; then - ewarn "" - ewarn "gcc >= ${b} will not work with CUDA" - ewarn "Make sure you set an earlier version of gcc with gcc-config" - ewarn "or append --compiler-bindir= pointing to a gcc bindir like" - ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}" - ewarn "to the nvcc compiler flags" - ewarn "" - fi -} - -pkg_postinst() { - if [[ ${MERGE_TYPE} != binary ]]; then - pkg_postinst_check - fi -} diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.243-r3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.243-r3.ebuild deleted file mode 100644 index 89bdb3d3e566..000000000000 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.243-r3.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit check-reqs cuda toolchain-funcs unpacker - -MYD=$(ver_cut 1-2 ${PV}) -DRIVER_PV="418.87.00" - -DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)" -HOMEPAGE="https://developer.nvidia.com/cuda-zone" -SRC_URI="https://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run" - -LICENSE="NVIDIA-CUDA" -SLOT="0/${PV}" -KEYWORDS="-* ~amd64 ~amd64-linux" -IUSE="debugger doc eclipse profiler" -RESTRICT="bindist mirror" - -BDEPEND="" -RDEPEND=" - <sys-devel/gcc-9[cxx] - !prefix? ( >=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm] ) - debugger? ( - dev-libs/openssl-compat:1.0.0 - sys-libs/libtermcap-compat - sys-libs/ncurses-compat:5[tinfo] - ) - eclipse? ( - dev-libs/openssl-compat:1.0.0 - >=virtual/jre-1.6 - ) - profiler? ( - dev-libs/openssl-compat:1.0.0 - >=virtual/jre-1.6 - )" - -S="${WORKDIR}" - -QA_PREBUILT="opt/cuda/*" - -CHECKREQS_DISK_BUILD="6800M" - -pkg_setup() { - # We don't like to run cuda_pkg_setup as it depends on us - check-reqs_pkg_setup -} - -src_prepare() { - local cuda_supported_gcc - - # ATTENTION: change requires revbump - cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4" - - sed \ - -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \ - "${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die - - default -} - -src_install() { - local i remove=( doc ) - local cudadir=/opt/cuda - local ecudadir="${EPREFIX}${cudadir}" - - cd builds/cuda-toolkit - if use doc; then - DOCS+=( doc/pdf/. ) - HTML_DOCS+=( doc/html/. ) - fi - einstalldocs - - mv doc/man/man3/{,cuda-}deprecated.3 || die - doman doc/man/man*/* - - use debugger || remove+=( bin/cuda-gdb bin/cuda-gdbserver extras/Debugger share/gdb extras/cuda-gdb-${PV}.src.tar.gz ) - - if use profiler; then - # hack found in install-linux.pl - for i in nvvp nsight; do - cat > bin/${i} <<- EOF || die - #!/usr/bin/env sh - LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \ - UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \ - ${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java - EOF - chmod a+x bin/${i} || die - done - else - use eclipse || remove+=( libnvvp libnsight nsightee_plugins nsight-compute-2019.4.0 nsight-systems-2019.3.7.5 bin/nsight bin/nsight_ee_plugins_manage.sh bin/nvvp bin/computeprof ) - remove+=( extras/CUPTI bin/nvprof ) - fi - - for i in "${remove[@]}"; do - ebegin "Cleaning ${i}..." - rm -r "${i}" || die - eend - done - - dodir ${cudadir} - into ${cudadir} - - # Install binaries separately to make sure the X permission is set - local bindirs=( bin nvvm/bin extras/demo_suite $(usex profiler "libnsight/nsight") ) - for i in $(find "${bindirs[@]}" -maxdepth 1 -type f); do - exeinto ${cudadir}/${i%/*} - doexe ${i} - rm ${i} || die - done - exeinto ${cudadir}/bin - doexe "${T}"/cuda-config - - # Install the rest - insinto ${cudadir} - doins -r * - - cat > "${T}"/99cuda <<- EOF || die - PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "") - ROOTPATH=${ecudadir}/bin - LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64 - EOF - doenvd "${T}"/99cuda - - #Cuda prepackages libraries, don't revdep-build on them - echo "SEARCH_DIRS_MASK=\"${ecudadir}\"" > "${T}/80${PN}" || die - insinto "/etc/revdep-rebuild" - doins "${T}/80${PN}" -} - -pkg_postinst_check() { - local a b - a="$(${EROOT}/opt/cuda/bin/cuda-config -s)" - b="0.0" - for v in $a; do - if ver_test "${v}" -gt "${b}"; then - b="${v}" - fi - done - - # if gcc and if not gcc-version is at least greatest supported - if tc-is-gcc && \ - ver_test $(gcc-version) -gt ${b}; then - ewarn "" - ewarn "gcc > ${b} will not work with CUDA" - ewarn "Make sure you set an earlier version of gcc with gcc-config" - ewarn "or append --compiler-bindir= pointing to a gcc bindir like" - ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}" - ewarn "to the nvcc compiler flags" - ewarn "" - fi -} - -pkg_postinst() { - if [[ ${MERGE_TYPE} != binary ]]; then - pkg_postinst_check - fi - - if use prefix; then - ewarn "Gentoo Prefix does not manage kernel modules. You need to make certain" - ewarn "the function counterpart to >=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm]" - ewarn "is available from the host" - fi -} diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.0.3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.0.3.ebuild deleted file mode 100644 index f01bcb2da8a6..000000000000 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.0.3.ebuild +++ /dev/null @@ -1,242 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit check-reqs cuda toolchain-funcs unpacker - -DRIVER_PV="450.51.06" - -DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)" -HOMEPAGE="https://developer.nvidia.com/cuda-zone" -SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run" - -LICENSE="NVIDIA-CUDA" -SLOT="0/${PV}" -KEYWORDS="-* ~amd64 ~amd64-linux" -IUSE="debugger doc nsight profiler vis-profiler sanitizer" -RESTRICT="bindist mirror" - -BDEPEND="" -RDEPEND=" - <sys-devel/gcc-10[cxx] - >=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm] - debugger? ( - dev-libs/openssl-compat:1.0.0 - sys-libs/libtermcap-compat - sys-libs/ncurses-compat:5[tinfo] - ) - vis-profiler? ( - dev-libs/openssl-compat:1.0.0 - >=virtual/jre-1.6 - )" - -S="${WORKDIR}" - -QA_PREBUILT="opt/cuda/*" - -CHECKREQS_DISK_BUILD="6800M" - -pkg_setup() { - # We don't like to run cuda_pkg_setup as it depends on us - check-reqs_pkg_setup -} - -src_prepare() { - local cuda_supported_gcc - - # ATTENTION: change requires revbump - cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4 9.2 9.3" - - sed \ - -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \ - "${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die - - default -} - -src_install() { - # Install docs and man pages - pushd builds/cuda_documentation >/dev/null || die - - if use doc; then - DOCS+=( doc/pdf/. ) - HTML_DOCS+=( doc/html/. ) - fi - einstalldocs - - mv doc/man/man3/{,cuda-}deprecated.3 || die - doman doc/man/man*/* - - popd >/dev/null || die - - local cudadir=/opt/cuda - local ecudadir="${EPREFIX}${cudadir}" - dodir ${cudadir} - into ${cudadir} - - # Install standard sub packages - local builddirs=( - builds/cuda_{cudart,cuobjdump,memcheck,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx} - builds/lib{cublas,cufft,curand,cusolver,cusparse,npp,nvjpeg} - $(usex profiler "builds/cuda_nvprof builds/cuda_cupti" "") - $(usex vis-profiler "builds/cuda_nvvp" "") - $(usex debugger "builds/cuda_gdb" "") - ) - - local d - for d in "${builddirs[@]}"; do - ebegin "Installing ${d}" - [[ -d ${d} ]] || die "Directory does not exist: ${d}" - - if [[ -d ${d}/bin ]]; then - local f - for f in ${d}/bin/*; do - if [[ -f ${f} ]]; then - dobin "${f}" - else - insinto ${cudadir}/bin - doins -r "${f}" - fi - done - fi - - insinto ${cudadir} - if [[ -d ${d}/targets ]]; then - doins -r "${d}"/targets - fi - if [[ -d ${d}/share ]]; then - doins -r "${d}"/share - fi - if [[ -d ${d}/extras ]]; then - doins -r "${d}"/extras - fi - eend - done - dobin "${T}"/cuda-config - - doins builds/EULA.txt - # nvml and nvvm need special handling - ebegin "Installing nvvm" - doins -r builds/cuda_nvcc/nvvm - exeinto ${cudadir}/nvvm/bin - doexe builds/cuda_nvcc/nvvm/bin/cicc - eend - - ebegin "Installing nvml" - doins -r builds/cuda_nvml_dev/nvml - eend - - if use sanitizer; then - ebegin "Installing sanitizer" - dobin builds/integration/Sanitizer/compute-sanitizer - doins -r builds/cuda_sanitizer_api/Sanitizer - # special handling for the executable - exeinto ${cudadir}/Sanitizer - doexe builds/cuda_sanitizer_api/Sanitizer/compute-sanitizer - eend - fi - - if use vis-profiler; then - ebegin "Installing libnvvp" - doins -r builds/cuda_nvvp/libnvvp - # special handling for the executable - exeinto ${cudadir}/libnvvp - doexe builds/cuda_nvvp/libnvvp/nvvp - eend - fi - - if use nsight; then - local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml) - ebegin "Installing ${ncu_dir}" - mv builds/nsight_compute builds/${ncu_dir} || die - doins -r builds/${ncu_dir} - - exeinto ${cudadir}/${ncu_dir} - doexe builds/${ncu_dir}/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli} - - exeinto ${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64 - doexe builds/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/{ncu-ui,ncu-ui.bin,CrashReporter} - dobin builds/integration/nsight-compute/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli} - eend - - local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml) - ebegin "Installing ${nsys_dir}" - mv builds/nsight_systems builds/${nsys_dir} || die - doins -r builds/${nsys_dir} - exeinto ${cudadir}/${nsys_dir}/target-linux-x64 - doexe builds/${nsys_dir}/target-linux-x64/nsys - - exeinto ${cudadir}/${nsys_dir}/host-linux-x64 - doexe builds/${nsys_dir}/host-linux-x64/{nsight-sys,nsight-sys.bin,nsys-ui,CrashReporter,ImportNvtxt,QdstrmImporter,ResolveSymbols} - dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-exporter,nsys-ui} - eend - # TODO: unbundle qt5 - # TODO: unbundle boost - # TODO: unbundle icu - # TODO: unbundle openssl - # TODO: unbundle mesa - # TODO: unbundle libz - # TODO: unbundle libstdc++ - # TODO: unbundle libSshClient - # TODO: unbundle sqlite - # TODO: unbundle libpfm ? - fi - - # Add include and lib symlinks - dosym "targets/x86_64-linux/include" ${cudadir}/include - dosym "targets/x86_64-linux/lib" ${cudadir}/lib64 - - newenvd - 99cuda <<-EOF - PATH=${ecudadir}/bin$(usex vis-profiler ":${ecudadir}/libnvvp" "") - ROOTPATH=${ecudadir}/bin - LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64 - EOF - - # Cuda prepackages libraries, don't revdep-build on them - insinto /etc/revdep-rebuild - newins - 80${PN} <<-EOF - SEARCH_DIRS_MASK="${ecudadir}" - EOF - # TODO: Find a better way to add +x permission to installed executables - # TODO: Add pkgconfig files for installed libraries -} - -pkg_postinst_check() { - local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)" - local b="0.0" - local v - for v in ${a}; do - ver_test "${v}" -gt "${b}" && b="${v}" - done - - # if gcc and if not gcc-version is at least greatest supported - if tc-is-gcc && \ - ver_test $(gcc-version) -gt "${b}"; then - ewarn - ewarn "gcc > ${b} will not work with CUDA" - ewarn "Make sure you set an earlier version of gcc with gcc-config" - ewarn "or append --compiler-bindir= pointing to a gcc bindir like" - ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}" - ewarn "to the nvcc compiler flags" - ewarn - fi -} - -pkg_postinst() { - if [[ ${MERGE_TYPE} != binary ]]; then - pkg_postinst_check - fi - - if use profiler || use nsight; then - einfo - einfo "nvidia-drivers restrict access to performance counters." - einfo "You'll need to either run profiling tools (nvprof, nsight) " - einfo "using sudo (needs cap SYS_ADMIN) or add the following line to " - einfo "a modprobe configuration file " - einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): " - einfo - einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0" - einfo - fi -} diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.1.0.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.1.0.ebuild deleted file mode 100644 index 8f77d9e9c6eb..000000000000 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.1.0.ebuild +++ /dev/null @@ -1,228 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit check-reqs cuda toolchain-funcs unpacker - -DRIVER_PV="455.23.05" - -DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)" -HOMEPAGE="https://developer.nvidia.com/cuda-zone" -SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run" - -LICENSE="NVIDIA-CUDA" -SLOT="0/${PV}" -KEYWORDS="-* ~amd64 ~amd64-linux" -IUSE="debugger nsight profiler vis-profiler sanitizer" -RESTRICT="bindist mirror" - -BDEPEND="" -RDEPEND=" - <sys-devel/gcc-11_pre[cxx] - >=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm] - debugger? ( - dev-libs/openssl-compat:1.0.0 - sys-libs/libtermcap-compat - sys-libs/ncurses-compat:5[tinfo] - ) - vis-profiler? ( - dev-libs/openssl-compat:1.0.0 - >=virtual/jre-1.6 - )" - -S="${WORKDIR}" - -QA_PREBUILT="opt/cuda/*" - -CHECKREQS_DISK_BUILD="6800M" - -pkg_setup() { - # We don't like to run cuda_pkg_setup as it depends on us - check-reqs_pkg_setup -} - -src_prepare() { - local cuda_supported_gcc - - # ATTENTION: change requires revbump - cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4 9.2 9.3 10.2" - - sed \ - -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \ - "${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die - - default -} - -src_install() { - local cudadir=/opt/cuda - local ecudadir="${EPREFIX}${cudadir}" - dodir ${cudadir} - into ${cudadir} - - # Install standard sub packages - local builddirs=( - builds/cuda_{cudart,cuobjdump,memcheck,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx} - builds/lib{cublas,cufft,curand,cusolver,cusparse,npp,nvjpeg} - $(usex profiler "builds/cuda_nvprof builds/cuda_cupti" "") - $(usex vis-profiler "builds/cuda_nvvp" "") - $(usex debugger "builds/cuda_gdb" "") - ) - - local d - for d in "${builddirs[@]}"; do - ebegin "Installing ${d}" - [[ -d ${d} ]] || die "Directory does not exist: ${d}" - - if [[ -d ${d}/bin ]]; then - local f - for f in ${d}/bin/*; do - if [[ -f ${f} ]]; then - dobin "${f}" - else - insinto ${cudadir}/bin - doins -r "${f}" - fi - done - fi - - insinto ${cudadir} - if [[ -d ${d}/targets ]]; then - doins -r "${d}"/targets - fi - if [[ -d ${d}/share ]]; then - doins -r "${d}"/share - fi - if [[ -d ${d}/extras ]]; then - doins -r "${d}"/extras - fi - eend - done - dobin "${T}"/cuda-config - - doins builds/EULA.txt - # nvml and nvvm need special handling - ebegin "Installing nvvm" - doins -r builds/cuda_nvcc/nvvm - exeinto ${cudadir}/nvvm/bin - doexe builds/cuda_nvcc/nvvm/bin/cicc - eend - - ebegin "Installing nvml" - doins -r builds/cuda_nvml_dev/nvml - eend - - if use sanitizer; then - ebegin "Installing sanitizer" - dobin builds/integration/Sanitizer/compute-sanitizer - doins -r builds/cuda_sanitizer_api/Sanitizer - # special handling for the executable - exeinto ${cudadir}/Sanitizer - doexe builds/cuda_sanitizer_api/Sanitizer/compute-sanitizer - eend - fi - - if use vis-profiler; then - ebegin "Installing libnvvp" - doins -r builds/cuda_nvvp/libnvvp - # special handling for the executable - exeinto ${cudadir}/libnvvp - doexe builds/cuda_nvvp/libnvvp/nvvp - eend - fi - - if use nsight; then - local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml) - ebegin "Installing ${ncu_dir}" - mv builds/nsight_compute builds/${ncu_dir} || die - doins -r builds/${ncu_dir} - - exeinto ${cudadir}/${ncu_dir} - doexe builds/${ncu_dir}/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli} - - exeinto ${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64 - doexe builds/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/{ncu-ui,ncu-ui.bin,CrashReporter} - dobin builds/integration/nsight-compute/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli} - eend - - local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml) - ebegin "Installing ${nsys_dir}" - mv builds/nsight_systems builds/${nsys_dir} || die - doins -r builds/${nsys_dir} - exeinto ${cudadir}/${nsys_dir}/target-linux-x64 - doexe builds/${nsys_dir}/target-linux-x64/nsys - - exeinto ${cudadir}/${nsys_dir}/host-linux-x64 - doexe builds/${nsys_dir}/host-linux-x64/{nsight-sys,nsight-sys.bin,nsys-ui,CrashReporter,ImportNvtxt,QdstrmImporter,ResolveSymbols} - dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-exporter,nsys-ui} - eend - # TODO: unbundle qt5 - # TODO: unbundle boost - # TODO: unbundle icu - # TODO: unbundle openssl - # TODO: unbundle mesa - # TODO: unbundle libz - # TODO: unbundle libstdc++ - # TODO: unbundle libSshClient - # TODO: unbundle sqlite - # TODO: unbundle libpfm ? - fi - - # Add include and lib symlinks - dosym "targets/x86_64-linux/include" ${cudadir}/include - dosym "targets/x86_64-linux/lib" ${cudadir}/lib64 - - newenvd - 99cuda <<-EOF - PATH=${ecudadir}/bin$(usex vis-profiler ":${ecudadir}/libnvvp" "") - ROOTPATH=${ecudadir}/bin - LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64$(usex profiler ":${ecudadir}/extras/CUPTI/lib64" "") - EOF - - # Cuda prepackages libraries, don't revdep-build on them - insinto /etc/revdep-rebuild - newins - 80${PN} <<-EOF - SEARCH_DIRS_MASK="${ecudadir}" - EOF - # TODO: Find a better way to add +x permission to installed executables - # TODO: Add pkgconfig files for installed libraries -} - -pkg_postinst_check() { - local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)" - local b="0.0" - local v - for v in ${a}; do - ver_test "${v}" -gt "${b}" && b="${v}" - done - - # if gcc and if not gcc-version is at least greatest supported - if tc-is-gcc && \ - ver_test $(gcc-version) -gt "${b}"; then - ewarn - ewarn "gcc > ${b} will not work with CUDA" - ewarn "Make sure you set an earlier version of gcc with gcc-config" - ewarn "or append --compiler-bindir= pointing to a gcc bindir like" - ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}" - ewarn "to the nvcc compiler flags" - ewarn - fi -} - -pkg_postinst() { - if [[ ${MERGE_TYPE} != binary ]]; then - pkg_postinst_check - fi - - if use profiler || use nsight; then - einfo - einfo "nvidia-drivers restrict access to performance counters." - einfo "You'll need to either run profiling tools (nvprof, nsight) " - einfo "using sudo (needs cap SYS_ADMIN) or add the following line to " - einfo "a modprobe configuration file " - einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): " - einfo - einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0" - einfo - fi -} diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0-r1.ebuild index d288d25c6596..aa6f7ee59f5c 100644 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0.ebuild +++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -34,9 +34,10 @@ RDEPEND=" S="${WORKDIR}" QA_PREBUILT="opt/cuda/*" - CHECKREQS_DISK_BUILD="6800M" +PATCHES=( "${FILESDIR}"/${P}-nsight-systems-launcher.patch ) + pkg_setup() { # We don't like to run cuda_pkg_setup as it depends on us check-reqs_pkg_setup @@ -58,6 +59,7 @@ src_prepare() { src_install() { local cudadir=/opt/cuda local ecudadir="${EPREFIX}${cudadir}" + local pathextradirs ldpathextradirs dodir ${cudadir} into ${cudadir} @@ -70,13 +72,12 @@ src_install() { $(usex debugger "builds/cuda_gdb" "") ) - local d + local d f for d in "${builddirs[@]}"; do ebegin "Installing ${d}" [[ -d ${d} ]] || die "Directory does not exist: ${d}" if [[ -d ${d}/bin ]]; then - local f for f in ${d}/bin/*; do if [[ -f ${f} ]]; then dobin "${f}" @@ -105,8 +106,7 @@ src_install() { # nvml and nvvm need special handling ebegin "Installing nvvm" doins -r builds/cuda_nvcc/nvvm - exeinto ${cudadir}/nvvm/bin - doexe builds/cuda_nvcc/nvvm/bin/cicc + fperms +x ${cudadir}/nvvm/bin/cicc eend ebegin "Installing nvml" @@ -116,20 +116,21 @@ src_install() { if use sanitizer; then ebegin "Installing sanitizer" dobin builds/integration/Sanitizer/compute-sanitizer - doins -r builds/cuda_sanitizer_api/Sanitizer + doins -r builds/cuda_sanitizer_api/compute-sanitizer # special handling for the executable - exeinto ${cudadir}/Sanitizer - doexe builds/cuda_sanitizer_api/Sanitizer/compute-sanitizer + fperms +x ${cudadir}/compute-sanitizer/compute-sanitizer eend fi + use profiler && ldpathextradirs+=":${ecudadir}/extras/CUPTI/lib64" + if use vis-profiler; then ebegin "Installing libnvvp" doins -r builds/cuda_nvvp/libnvvp # special handling for the executable - exeinto ${cudadir}/libnvvp - doexe builds/cuda_nvvp/libnvvp/nvvp + fperms +x ${cudadir}/libnvvp/nvvp eend + pathextradirs+=":${ecudadir}/libnvvp" fi if use nsight; then @@ -138,11 +139,17 @@ src_install() { mv builds/nsight_compute builds/${ncu_dir} || die doins -r builds/${ncu_dir} - exeinto ${cudadir}/${ncu_dir} - doexe builds/${ncu_dir}/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli} + # check this list on every bump + local exes=( + ${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libexec/QtWebEngineProcess + ${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/CrashReporter + ${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui + ${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui.bin + ${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherTargetLdPreloadHelper + ${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherSubreaper + ${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/ncu + ) - exeinto ${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64 - doexe builds/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/{ncu-ui,ncu-ui.bin,CrashReporter} dobin builds/integration/nsight-compute/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli} eend @@ -150,13 +157,37 @@ src_install() { ebegin "Installing ${nsys_dir}" mv builds/nsight_systems builds/${nsys_dir} || die doins -r builds/${nsys_dir} - exeinto ${cudadir}/${nsys_dir}/target-linux-x64 - doexe builds/${nsys_dir}/target-linux-x64/nsys - exeinto ${cudadir}/${nsys_dir}/host-linux-x64 - doexe builds/${nsys_dir}/host-linux-x64/{nsight-sys,nsight-sys.bin,nsys-ui,CrashReporter,ImportNvtxt,QdstrmImporter,ResolveSymbols} + # check this list on every bump + exes+=( + ${nsys_dir}/host-linux-x64/nsys-ui + ${nsys_dir}/host-linux-x64/nsys-ui.bin + ${nsys_dir}/host-linux-x64/ResolveSymbols + ${nsys_dir}/host-linux-x64/ImportNvtxt + ${nsys_dir}/host-linux-x64/CrashReporter + ${nsys_dir}/host-linux-x64/QdstrmImporter + ${nsys_dir}/host-linux-x64/libexec/QtWebEngineProcess + ${nsys_dir}/target-linux-x64/nsys + ${nsys_dir}/target-linux-x64/launcher + ${nsys_dir}/target-linux-x64/nvgpucs + ${nsys_dir}/target-linux-x64/nsys-launcher + ${nsys_dir}/target-linux-x64/sqlite3 + ${nsys_dir}/target-linux-x64/python/bin/python + ) + dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-exporter,nsys-ui} eend + + # nsight scripts and binaries need to have their executable bit set, #691284 + for f in "${exes[@]}"; do + fperms +x ${cudadir}/${f} + done + + # remove foreign archs (triggers SONAME warning, #749903) + rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-glibc_2_19_0-ppc64le || die + rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-t210-a64 || die + rm -r "${ED}"/${cudadir}/${nsys_dir}/target-linux-armv8 || die + # TODO: unbundle qt5 # TODO: unbundle boost # TODO: unbundle icu @@ -170,13 +201,13 @@ src_install() { fi # Add include and lib symlinks - dosym "targets/x86_64-linux/include" ${cudadir}/include - dosym "targets/x86_64-linux/lib" ${cudadir}/lib64 + dosym targets/x86_64-linux/include ${cudadir}/include + dosym targets/x86_64-linux/lib ${cudadir}/lib64 newenvd - 99cuda <<-EOF - PATH=${ecudadir}/bin$(usex vis-profiler ":${ecudadir}/libnvvp" "") + PATH=${ecudadir}/bin${pathextradirs} ROOTPATH=${ecudadir}/bin - LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64$(usex profiler ":${ecudadir}/extras/CUPTI/lib64" "") + LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64${ldpathextradirs} EOF # Cuda prepackages libraries, don't revdep-build on them @@ -184,7 +215,6 @@ src_install() { newins - 80${PN} <<-EOF SEARCH_DIRS_MASK="${ecudadir}" EOF - # TODO: Find a better way to add +x permission to installed executables # TODO: Add pkgconfig files for installed libraries } diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild deleted file mode 100644 index 642e84d023ce..000000000000 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit check-reqs cuda eutils toolchain-funcs unpacker versionator - -MYD=$(get_version_component_range 1)_$(get_version_component_range 2) - -DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)" -HOMEPAGE="https://developer.nvidia.com/cuda" -CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/installers" -SRC_URI=" - amd64? ( ${CURI}/cuda_${PV}_linux_64.run ) - x86? ( ${CURI}/cuda_${PV}_linux_32.run )" - -SLOT="0/${PV}" -LICENSE="NVIDIA-CUDA" -KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="debugger doc eclipse profiler" -RESTRICT="bindist mirror" - -DEPEND="" -RDEPEND="${DEPEND} - <sys-devel/gcc-4.9[cxx] - debugger? ( - sys-libs/libtermcap-compat - sys-libs/ncurses[tinfo] - ) - eclipse? ( >=virtual/jre-1.6 ) - profiler? ( >=virtual/jre-1.6 ) - amd64? ( >=x11-drivers/nvidia-drivers-340.32[uvm] ) - x86? ( <x11-drivers/nvidia-drivers-346.35[uvm] ) - " - -S="${WORKDIR}" - -QA_PREBUILT="opt/cuda/*" - -CHECKREQS_DISK_BUILD="1500M" - -pkg_setup() { - # We don't like to run cuda_pkg_setup as it depends on us - check-reqs_pkg_setup - - if use x86; then - ewarn "Starting with version 6.5 NVIDIA dropped more and more" - ewarn "the support for 32bit linux." - ewarn "Be aware that bugfixes and new features may not be available." - ewarn "https://dev.gentoo.org/~jlec/distfiles/CUDA_Toolkit_Release_Notes.pdf" - fi -} - -src_unpack() { - unpacker - unpacker run_files/cuda-linux*.run -} - -src_prepare() { - local cuda_supported_gcc - - # ATTENTION: change requires revbump - cuda_supported_gcc="4.7 4.8" - - sed \ - -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \ - "${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die -} - -src_install() { - local i j - local remove="doc jre run_files install-linux.pl " - local cudadir=/opt/cuda - local ecudadir="${EPREFIX}"${cudadir} - - # dodoc doc/*txt - if use doc; then - dodoc doc/pdf/* - dohtml -r doc/html/* - fi - - if use amd64; then - mv doc/man/man3/{,cuda-}deprecated.3 || die - doman doc/man/man*/* - fi - - use debugger || remove+=" bin/cuda-gdb extras/Debugger" - ( use profiler || use eclipse ) || remove+=" libnsight" - use amd64 || remove+=" cuda-installer.pl" - - if use profiler; then - # hack found in install-linux.pl - for j in nvvp nsight; do - cat > bin/${j} <<- EOF - #!${EPREFIX}/bin/sh - LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \ - UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \ - ${ecudadir}/lib${j}/${j} -vm ${EPREFIX}/usr/bin/java - EOF - chmod a+x bin/${j} - done - else - use eclipse || remove+=" libnvvp" - remove+=" extras/CUPTI" - fi - - for i in ${remove}; do - ebegin "Cleaning ${i}..." - if [[ -e ${i} ]]; then - find ${i} -delete || die - eend - else - eend $1 - fi - done - - dodir ${cudadir} - mv * "${ED}"${cudadir} || die - - cat > "${T}"/99cuda <<- EOF - PATH=${ecudadir}/bin$(use profiler && echo ":${ecudadir}/libnvvp") - ROOTPATH=${ecudadir}/bin - LDPATH=${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib") - EOF - doenvd "${T}"/99cuda - - use profiler && \ - make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib") - - dobin "${T}"/cuda-config -} - -pkg_postinst_check() { - local a b - a="$(version_sort $(cuda-config -s))"; a=( $a ) - # greatest supported version - b=${a[${#a[@]}-1]} - - # if gcc and if not gcc-version is at least greatesst supported - if [[ $(tc-getCC) == *gcc* ]] && \ - ! version_is_at_least $(gcc-version) ${b}; then - echo - ewarn "gcc >= ${b} will not work with CUDA" - ewarn "Make sure you set an earlier version of gcc with gcc-config" - ewarn "or append --compiler-bindir= pointing to a gcc bindir like" - ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}" - ewarn "to the nvcc compiler flags" - echo - fi -} - -pkg_postinst() { - if [[ ${MERGE_TYPE} != binary ]]; then - pkg_postinst_check - fi -} diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild deleted file mode 100644 index 140886125823..000000000000 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit check-reqs cuda eutils toolchain-funcs unpacker versionator - -MYD=$(get_version_component_range 1)_$(get_version_component_range 2) - -DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)" -HOMEPAGE="https://developer.nvidia.com/cuda" -CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/installers" -SRC_URI=" - amd64? ( ${CURI}/cuda_${PV}_linux_64.run ) - x86? ( ${CURI}/cuda_${PV}_linux_32.run )" - -SLOT="0/${PV}" -LICENSE="NVIDIA-CUDA" -KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="debugger doc eclipse profiler" -RESTRICT="bindist mirror" - -DEPEND="" -RDEPEND="${DEPEND} - <sys-devel/gcc-4.9[cxx] - debugger? ( - sys-libs/libtermcap-compat - sys-libs/ncurses[tinfo] - ) - eclipse? ( >=virtual/jre-1.6 ) - profiler? ( >=virtual/jre-1.6 ) - amd64? ( >=x11-drivers/nvidia-drivers-343.22[uvm] ) - x86? ( <x11-drivers/nvidia-drivers-346.35[uvm] ) - " - -S="${WORKDIR}" - -QA_PREBUILT="opt/cuda/*" - -CHECKREQS_DISK_BUILD="1500M" - -pkg_setup() { - # We don't like to run cuda_pkg_setup as it depends on us - check-reqs_pkg_setup - - if use x86; then - ewarn "Starting with version 6.5 NVIDIA dropped more and more" - ewarn "the support for 32bit linux." - ewarn "Be aware that bugfixes and new features may not be available." - ewarn "https://dev.gentoo.org/~jlec/distfiles/CUDA_Toolkit_Release_Notes.pdf" - fi -} - -src_unpack() { - unpacker - unpacker run_files/cuda-linux*.run -} - -src_prepare() { - local cuda_supported_gcc - - # ATTENTION: change requires revbump - cuda_supported_gcc="4.7 4.8" - - sed \ - -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \ - "${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die -} - -src_install() { - local i j - local remove="doc jre run_files install-linux.pl " - local cudadir=/opt/cuda - local ecudadir="${EPREFIX}"${cudadir} - - # dodoc doc/*txt - if use doc; then - dodoc doc/pdf/* - dohtml -r doc/html/* - fi - - if use amd64; then - mv doc/man/man3/{,cuda-}deprecated.3 || die - doman doc/man/man*/* - fi - - use debugger || remove+=" bin/cuda-gdb extras/Debugger" - ( use profiler || use eclipse ) || remove+=" libnsight" - use amd64 || remove+=" cuda-installer.pl" - - if use profiler; then - # hack found in install-linux.pl - for j in nvvp nsight; do - cat > bin/${j} <<- EOF - #!${EPREFIX}/bin/sh - LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \ - UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \ - ${ecudadir}/lib${j}/${j} -vm ${EPREFIX}/usr/bin/java - EOF - chmod a+x bin/${j} - done - else - use eclipse || remove+=" libnvvp" - remove+=" extras/CUPTI" - fi - - for i in ${remove}; do - ebegin "Cleaning ${i}..." - if [[ -e ${i} ]]; then - find ${i} -delete || die - eend - else - eend $1 - fi - done - - ln -sf lib lib32 || die - - dodir ${cudadir} - mv * "${ED}"${cudadir} || die - - cat > "${T}"/99cuda <<- EOF - PATH=${ecudadir}/bin$(use profiler && echo ":${ecudadir}/libnvvp") - ROOTPATH=${ecudadir}/bin - LDPATH=${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib") - EOF - doenvd "${T}"/99cuda - - use profiler && \ - make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib") - - dobin "${T}"/cuda-config -} - -pkg_postinst_check() { - local a b - a="$(version_sort $(cuda-config -s))"; a=( $a ) - # greatest supported version - b=${a[${#a[@]}-1]} - - # if gcc and if not gcc-version is at least greatesst supported - if [[ $(tc-getCC) == *gcc* ]] && \ - ! version_is_at_least $(gcc-version) ${b}; then - echo - ewarn "gcc >= ${b} will not work with CUDA" - ewarn "Make sure you set an earlier version of gcc with gcc-config" - ewarn "or append --compiler-bindir= pointing to a gcc bindir like" - ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}" - ewarn "to the nvcc compiler flags" - echo - fi -} - -pkg_postinst() { - if [[ ${MERGE_TYPE} != binary ]]; then - pkg_postinst_check - fi -} diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild deleted file mode 100644 index dc21690df5f5..000000000000 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit check-reqs cuda eutils toolchain-funcs unpacker versionator - -MYD=$(get_version_component_range 1-2) - -DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)" -HOMEPAGE="https://developer.nvidia.com/cuda" -SRC_URI="http://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_linux.run" - -SLOT="0/${PV}" -LICENSE="NVIDIA-CUDA" -KEYWORDS="-* ~amd64 ~amd64-linux" -IUSE="debugger doc eclipse profiler" -RESTRICT="bindist mirror" - -DEPEND="" -RDEPEND="${DEPEND} - >=sys-devel/gcc-4.7[cxx] - <sys-devel/gcc-5[cxx] - >=x11-drivers/nvidia-drivers-352.39[uvm] - debugger? ( - sys-libs/libtermcap-compat - sys-libs/ncurses[tinfo] - ) - eclipse? ( >=virtual/jre-1.6 ) - profiler? ( >=virtual/jre-1.6 )" - -S="${WORKDIR}" - -QA_PREBUILT="opt/cuda/*" - -CHECKREQS_DISK_BUILD="1500M" - -pkg_setup() { - # We don't like to run cuda_pkg_setup as it depends on us - check-reqs_pkg_setup -} - -src_unpack() { - unpacker - unpacker run_files/cuda-linux*.run -} - -src_prepare() { - local cuda_supported_gcc - - # ATTENTION: change requires revbump - cuda_supported_gcc="4.7 4.8 4.9" - - sed \ - -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \ - "${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die -} - -src_install() { - local i j - local remove="doc jre run_files install-linux.pl " - local cudadir=/opt/cuda - local ecudadir="${EPREFIX}"${cudadir} - - # dodoc doc/*txt - if use doc; then - dodoc doc/pdf/* - dohtml -r doc/html/* - fi - - mv doc/man/man3/{,cuda-}deprecated.3 || die - doman doc/man/man*/* - - use debugger || remove+=" bin/cuda-gdb extras/Debugger" - ( use profiler || use eclipse ) || remove+=" libnsight" - remove+=" cuda-installer.pl" - - if use profiler; then - # hack found in install-linux.pl - for j in nvvp nsight; do - cat > bin/${j} <<- EOF - #!${EPREFIX}/bin/sh - LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \ - UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \ - ${ecudadir}/lib${j}/${j} -vm ${EPREFIX}/usr/bin/java - EOF - chmod a+x bin/${j} - done - else - use eclipse || remove+=" libnvvp" - remove+=" extras/CUPTI" - fi - - for i in ${remove}; do - ebegin "Cleaning ${i}..." - if [[ -e ${i} ]]; then - find ${i} -delete || die - eend - else - eend $1 - fi - done - - ln -sf lib lib32 || die - - dodir ${cudadir} - mv * "${ED}"${cudadir} || die - - cat > "${T}"/99cuda <<- EOF - PATH=${ecudadir}/bin$(use profiler && echo ":${ecudadir}/libnvvp") - ROOTPATH=${ecudadir}/bin - LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64 - EOF - doenvd "${T}"/99cuda - - use profiler && \ - make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib64:${ecudadir}/lib - - dobin "${T}"/cuda-config -} - -pkg_postinst_check() { - local a b - a="$(version_sort $(cuda-config -s))"; a=( $a ) - # greatest supported version - b=${a[${#a[@]}-1]} - - # if gcc and if not gcc-version is at least greatesst supported - if [[ $(tc-getCC) == *gcc* ]] && \ - ! version_is_at_least $(gcc-version) ${b}; then - echo - ewarn "gcc >= ${b} will not work with CUDA" - ewarn "Make sure you set an earlier version of gcc with gcc-config" - ewarn "or append --compiler-bindir= pointing to a gcc bindir like" - ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}" - ewarn "to the nvcc compiler flags" - echo - fi -} - -pkg_postinst() { - if [[ ${MERGE_TYPE} != binary ]]; then - pkg_postinst_check - fi -} diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.44.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.44.ebuild deleted file mode 100644 index 94cf8df882e9..000000000000 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.44.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit check-reqs cuda eutils toolchain-funcs unpacker versionator - -MYD=$(get_version_component_range 1-2) - -DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)" -HOMEPAGE="https://developer.nvidia.com/cuda-zone" -SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/prod/local_installers/cuda_${PV}_linux-run -> cuda_${PV}_linux.run" - -SLOT="0/${PV}" -LICENSE="NVIDIA-CUDA" -KEYWORDS="-* ~amd64 ~amd64-linux" -IUSE="debugger doc eclipse profiler" -RESTRICT="bindist mirror" - -DEPEND="" -RDEPEND="${DEPEND} - >=sys-devel/gcc-4.7[cxx] - <sys-devel/gcc-6[cxx] - >=x11-drivers/nvidia-drivers-367.44[X,uvm] - debugger? ( - sys-libs/libtermcap-compat - sys-libs/ncurses[tinfo] - ) - eclipse? ( >=virtual/jre-1.6 ) - profiler? ( >=virtual/jre-1.6 )" - -S="${WORKDIR}" - -QA_PREBUILT="opt/cuda/*" - -CHECKREQS_DISK_BUILD="3500M" - -pkg_setup() { - # We don't like to run cuda_pkg_setup as it depends on us - check-reqs_pkg_setup -} - -src_unpack() { - unpacker - unpacker run_files/cuda-linux*.run -} - -src_prepare() { - local cuda_supported_gcc - - # ATTENTION: change requires revbump - cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4" - - sed \ - -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \ - "${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die - - default -} - -src_install() { - local i remove=( doc jre run_files install-linux.pl cuda-installer.pl ) - local cudadir=/opt/cuda - local ecudadir="${EPREFIX}${cudadir}" - - if use doc; then - DOCS+=( doc/pdf/. ) - HTML_DOCS+=( doc/html/. ) - fi - einstalldocs - - mv doc/man/man3/{,cuda-}deprecated.3 || die - doman doc/man/man*/* - - use debugger || remove+=( bin/cuda-gdb extras/Debugger extras/cuda-gdb-${PV}.src.tar.gz ) - - if use profiler; then - # hack found in install-linux.pl - for i in nvvp nsight; do - cat > bin/${i} <<- EOF || die - #!/usr/bin/env sh - LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \ - UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \ - ${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java - EOF - chmod a+x bin/${i} || die - done - else - use eclipse || remove+=( libnvvp libnsight ) - remove+=( extras/CUPTI ) - fi - - for i in "${remove[@]}"; do - ebegin "Cleaning ${i}..." - rm -rf "${i}" || die - eend - done - - dodir ${cudadir} - mv * "${ED%/}${cudadir}" || die - - cat > "${T}"/99cuda <<- EOF || die - PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "") - ROOTPATH=${ecudadir}/bin - LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64 - EOF - doenvd "${T}"/99cuda - - use profiler && \ - make_wrapper nvprof "${ecudadir}/bin/nvprof" "." "${ecudadir}/lib64:${ecudadir}/lib" - - dobin "${T}"/cuda-config -} - -pkg_postinst_check() { - local a b - a="$(version_sort $(cuda-config -s))"; a=( $a ) - # greatest supported version - b="${a[${#a[@]}-1]}" - - # if gcc and if not gcc-version is at least greatest supported - if tc-is-gcc && \ - ! version_is_at_least gcc-version ${b}; then - ewarn "" - ewarn "gcc >= ${b} will not work with CUDA" - ewarn "Make sure you set an earlier version of gcc with gcc-config" - ewarn "or append --compiler-bindir= pointing to a gcc bindir like" - ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}" - ewarn "to the nvcc compiler flags" - ewarn "" - fi -} - -pkg_postinst() { - if [[ ${MERGE_TYPE} != binary ]]; then - pkg_postinst_check - fi -} diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.0.176.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.0.176.ebuild deleted file mode 100644 index e56db8e3b47d..000000000000 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.0.176.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit check-reqs cuda eutils toolchain-funcs unpacker versionator - -MYD=$(get_version_component_range 1-2) -DRIVER_PV="384.81" - -DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)" -HOMEPAGE="https://developer.nvidia.com/cuda-zone" -SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux-run -> cuda_${PV}_${DRIVER_PV}_linux.run" - -LICENSE="NVIDIA-CUDA" -SLOT="0/${PV}" -KEYWORDS="-* ~amd64 ~amd64-linux" -IUSE="debugger doc eclipse profiler" -RESTRICT="bindist mirror" - -DEPEND="" -RDEPEND="${DEPEND} - >=sys-devel/gcc-4.7[cxx] - <sys-devel/gcc-7[cxx] - >=x11-drivers/nvidia-drivers-384.81[X,uvm] - debugger? ( - sys-libs/libtermcap-compat - sys-libs/ncurses-compat:5[tinfo] - ) - eclipse? ( >=virtual/jre-1.6 ) - profiler? ( >=virtual/jre-1.6 )" - -S="${WORKDIR}" - -QA_PREBUILT="opt/cuda/*" - -CHECKREQS_DISK_BUILD="3500M" - -pkg_setup() { - # We don't like to run cuda_pkg_setup as it depends on us - check-reqs_pkg_setup -} - -src_unpack() { - unpacker - unpacker run_files/cuda-linux*.run -} - -src_prepare() { - local cuda_supported_gcc - - # ATTENTION: change requires revbump - cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4" - - sed \ - -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \ - "${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die - - default -} - -src_install() { - local i remove=( doc jre run_files install-linux.pl cuda-installer.pl ) - local cudadir=/opt/cuda - local ecudadir="${EPREFIX}${cudadir}" - - if use doc; then - DOCS+=( doc/pdf/. ) - HTML_DOCS+=( doc/html/. ) - fi - einstalldocs - - mv doc/man/man3/{,cuda-}deprecated.3 || die - doman doc/man/man*/* - - use debugger || remove+=( bin/cuda-gdb extras/Debugger extras/cuda-gdb-${PV}.src.tar.gz ) - - if use profiler; then - # hack found in install-linux.pl - for i in nvvp nsight; do - cat > bin/${i} <<- EOF || die - #!/usr/bin/env sh - LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \ - UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \ - ${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java - EOF - chmod a+x bin/${i} || die - done - else - use eclipse || remove+=( libnvvp libnsight ) - remove+=( extras/CUPTI ) - fi - - for i in "${remove[@]}"; do - ebegin "Cleaning ${i}..." - rm -rf "${i}" || die - eend - done - - dodir ${cudadir} - mv * "${ED%/}${cudadir}" || die - - cat > "${T}"/99cuda <<- EOF || die - PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "") - ROOTPATH=${ecudadir}/bin - LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64 - EOF - doenvd "${T}"/99cuda - - use profiler && \ - make_wrapper nvprof "${ecudadir}/bin/nvprof" "." "${ecudadir}/lib64:${ecudadir}/lib" - - dobin "${T}"/cuda-config -} - -pkg_postinst_check() { - local a b - a="$(version_sort $(cuda-config -s))"; a=( $a ) - # greatest supported version - b="${a[${#a[@]}-1]}" - - # if gcc and if not gcc-version is at least greatest supported - if tc-is-gcc && \ - ! version_is_at_least gcc-version ${b}; then - ewarn "" - ewarn "gcc >= ${b} will not work with CUDA" - ewarn "Make sure you set an earlier version of gcc with gcc-config" - ewarn "or append --compiler-bindir= pointing to a gcc bindir like" - ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}" - ewarn "to the nvcc compiler flags" - ewarn "" - fi -} - -pkg_postinst() { - if [[ ${MERGE_TYPE} != binary ]]; then - pkg_postinst_check - fi -} diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.1.85.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.1.85.ebuild deleted file mode 100644 index 532275f52c64..000000000000 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.1.85.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit check-reqs cuda eutils toolchain-funcs unpacker versionator - -MYD=$(get_version_component_range 1-2) -DRIVER_PV="387.26" - -DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)" -HOMEPAGE="https://developer.nvidia.com/cuda-zone" -SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux -> cuda_${PV}_${DRIVER_PV}_linux.run" - -LICENSE="NVIDIA-CUDA" -SLOT="0/${PV}" -KEYWORDS="-* ~amd64 ~amd64-linux" -IUSE="debugger doc eclipse profiler" -RESTRICT="bindist mirror" - -DEPEND="" -RDEPEND="${DEPEND} - <sys-devel/gcc-7[cxx] - >=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm] - debugger? ( - sys-libs/libtermcap-compat - sys-libs/ncurses-compat:5[tinfo] - ) - eclipse? ( >=virtual/jre-1.6 ) - profiler? ( >=virtual/jre-1.6 )" - -S="${WORKDIR}" - -QA_PREBUILT="opt/cuda/*" - -CHECKREQS_DISK_BUILD="3500M" - -pkg_setup() { - # We don't like to run cuda_pkg_setup as it depends on us - check-reqs_pkg_setup -} - -src_unpack() { - unpacker - unpacker run_files/cuda-linux*.run -} - -src_prepare() { - local cuda_supported_gcc - - # ATTENTION: change requires revbump - cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4" - - sed \ - -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \ - "${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die - - default -} - -src_install() { - local i remove=( doc jre run_files install-linux.pl cuda-installer.pl ) - local cudadir=/opt/cuda - local ecudadir="${EPREFIX}${cudadir}" - - if use doc; then - DOCS+=( doc/pdf/. ) - HTML_DOCS+=( doc/html/. ) - fi - einstalldocs - - mv doc/man/man3/{,cuda-}deprecated.3 || die - doman doc/man/man*/* - - use debugger || remove+=( bin/cuda-gdb extras/Debugger extras/cuda-gdb-${PV}.src.tar.gz ) - - if use profiler; then - # hack found in install-linux.pl - for i in nvvp nsight; do - cat > bin/${i} <<- EOF || die - #!/usr/bin/env sh - LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \ - UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \ - ${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java - EOF - chmod a+x bin/${i} || die - done - else - use eclipse || remove+=( libnvvp libnsight ) - remove+=( extras/CUPTI ) - fi - - for i in "${remove[@]}"; do - ebegin "Cleaning ${i}..." - rm -rf "${i}" || die - eend - done - - dodir ${cudadir} - mv * "${ED%/}${cudadir}" || die - - cat > "${T}"/99cuda <<- EOF || die - PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "") - ROOTPATH=${ecudadir}/bin - LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64 - EOF - doenvd "${T}"/99cuda - - use profiler && \ - make_wrapper nvprof "${ecudadir}/bin/nvprof" "." "${ecudadir}/lib64:${ecudadir}/lib" - - dobin "${T}"/cuda-config -} - -pkg_postinst_check() { - local a b - a="$(version_sort $(cuda-config -s))"; a=( $a ) - # greatest supported version - b="${a[${#a[@]}-1]}" - - # if gcc and if not gcc-version is at least greatest supported - if tc-is-gcc && \ - ! version_is_at_least gcc-version ${b}; then - ewarn "" - ewarn "gcc >= ${b} will not work with CUDA" - ewarn "Make sure you set an earlier version of gcc with gcc-config" - ewarn "or append --compiler-bindir= pointing to a gcc bindir like" - ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}" - ewarn "to the nvcc compiler flags" - ewarn "" - fi -} - -pkg_postinst() { - if [[ ${MERGE_TYPE} != binary ]]; then - pkg_postinst_check - fi -} diff --git a/dev-util/ostree/ostree-2020.8.ebuild b/dev-util/ostree/ostree-2020.8.ebuild index e7284c8419d7..19462abbce9e 100644 --- a/dev-util/ostree/ostree-2020.8.ebuild +++ b/dev-util/ostree/ostree-2020.8.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Operating system and container binary deployment and upgrades" HOMEPAGE="https://ostreedev.github.io/ostree/" SRC_URI="https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz" -KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" LICENSE="LGPL-2+" SLOT="0" diff --git a/dev-util/pkgcheck/pkgcheck-0.7.9.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.9.ebuild index e3b927447eee..c115176d6746 100644 --- a/dev-util/pkgcheck/pkgcheck-0.7.9.ebuild +++ b/dev-util/pkgcheck/pkgcheck-0.7.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git" inherit git-r3 else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" fi diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest index 13664a54135e..a8c3e0fba803 100644 --- a/dev-util/radare2/Manifest +++ b/dev-util/radare2/Manifest @@ -1,2 +1,3 @@ DIST radare2-4.5.1.tar.gz 8266567 BLAKE2B 0d23c1d47dd79ffd9398ca7b2c8b383ba6a7e3ec662046d1111ab34cabcdaaf1fdd449686433b3229e3c22c31c705530b0a85bbd22b5fc79891a5ad292ba0ff1 SHA512 f08a4cd1e0d65643463d9f9dbb1aacfe793c7b411ec820a18b75a5975d265cfc2cf91e593522c8823aa369098ded21415939acb07c84d8acd102889bf5aed899 DIST radare2-5.0.0.tar.gz 7897849 BLAKE2B be785b693e9de7264f21b857291286849e054e807d87b4c56a6177a132f9fa141c25661f9d28ea10b61fd298161693794f2ee70279cfd076a2b1a98c563dd2a9 SHA512 059bc341bc34c5f39ef7493af9e2d3b7e52667a2d16f12ef19c9c6ba83c911fd02e07cd527599caea503d5e81a5fedbd8ff343db4d41257e0f48ace9dd52f3ba +DIST radare2-5.1.0.tar.gz 7908690 BLAKE2B 4757eb0f729d6fa0de9bdf41b697c2ba722f8a2815e4ddb267ee1e68d50530596eaf549a7b062fd798aede214f982e309693f27df4f26257968559d35afe3076 SHA512 f973aeeb4d3a1e9eaf889a14bba4d54568dc2527d1160c7d999a7b2c870270cec7dc11a0eed12ae8f1d0aeacf63f14a92c7ca99f44e38573a6ce2276a08180f1 diff --git a/dev-util/radare2/files/radare2-4.5.1-docdir.patch b/dev-util/radare2/files/radare2-4.5.1-docdir.patch deleted file mode 100644 index 51dcd7b16e1b..000000000000 --- a/dev-util/radare2/files/radare2-4.5.1-docdir.patch +++ /dev/null @@ -1,12 +0,0 @@ -Be closer to ${PF} than ${PN}. ---- a/libr/include/r_userconf.h.acr -+++ b/libr/include/r_userconf.h.acr -@@ -53,7 +53,7 @@ - #define R2_ZIGNS R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "zigns") - #define R2_THEMES R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "cons") - #define R2_FLAGS R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "flag") --#define R2_FORTUNES R_JOIN_3_PATHS ("share", "doc", "radare2") -+#define R2_FORTUNES R_JOIN_3_PATHS ("share", "doc", "radare2-" R2_VERSION) - #define R2_HUD R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "hud") - #endif - diff --git a/dev-util/radare2/radare2-4.5.1.ebuild b/dev-util/radare2/radare2-5.1.0.ebuild index d4e5c4fb79f2..bf685edca0bf 100644 --- a/dev-util/radare2/radare2-4.5.1.ebuild +++ b/dev-util/radare2/radare2-5.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,6 +21,10 @@ SLOT="0" IUSE="ssl libressl" RDEPEND=" + dev-libs/libzip + dev-libs/xxhash + sys-apps/file + sys-libs/zlib dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) @@ -30,7 +34,12 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -PATCHES=("${FILESDIR}"/${PN}-4.5.1-docdir.patch) +src_prepare() { + # Fix hardcoded docdir for fortunes + sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \ + libr/include/r_userconf.h.acr + default +} src_configure() { # Ideally these should be set by ./configure @@ -40,6 +49,9 @@ src_configure() { econf \ --without-libuv \ --with-syscapstone \ + --with-sysmagic \ + --with-sysxxhash \ + --with-syszip \ $(use_with ssl openssl) } diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest index 1e144737777b..88fe2d216c26 100644 --- a/dev-util/ragel/Manifest +++ b/dev-util/ragel/Manifest @@ -1,2 +1,2 @@ -DIST ragel-7.0.1.tar.gz 1644746 BLAKE2B 34ea866a0fc05d0de9eef402bee67a12bd17cd972146e0fbb173e0efc670ea830844936973dd6918c6d7160e0f91ad0715aaccf9be519f7d602257a58fa7dddd SHA512 45dc1688206fd1acc014769a166dfecc5a3b2b5d904568baeac5987b2f4b7c4fa6f91a41a1d6c3a23ec85a99a70515f67d55f6b62d4a78901cac71a33db88ce9 DIST ragel-7.0.2.tar.gz 1656530 BLAKE2B 590d4b87b73f72c4f4af4b1562fe9c2c4555b6d30e1a963794b15ff0a7dcdc8b7c4d828a4eadade835dd517b3934c1346e1e8499097927b58e818142d2575d10 SHA512 5550860f167cbf2646d2c1d59dcf38d3612b5f20099576a5191287a8bf1e574ff8d06902224147fcc989a9f5512f85c00b3546b41771ed0940b391f7e5fd600b +DIST ragel-7.0.3.tar.gz 1656577 BLAKE2B 3a9ce560894714a3801039fb944d3c914f2647a0b76bba4a7b790f8d569eb2e9eb807ab4d8af067560b274692be2d98c5dc28632e11c853893971585e847d48e SHA512 16bcb4b44a3ca94918d6c3e4bce468620cc691bf74cb69f0a264c41cbcffd595f897aa18e300952b60a68e680e1223532bbf9e500168d35d92a6559c190f6e78 diff --git a/dev-util/ragel/ragel-7.0.1-r1.ebuild b/dev-util/ragel/ragel-7.0.3.ebuild index 738e14a8e90f..6e6efe86a9ba 100644 --- a/dev-util/ragel/ragel-7.0.1-r1.ebuild +++ b/dev-util/ragel/ragel-7.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Liguros Authors +# Copyright 2020-2021 Liguros Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,10 +16,6 @@ IUSE="vim-syntax" DEPEND=">=dev-util/colm-0.14.2" RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}/colm_version.patch" -) - src_prepare() { default eautoreconf diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest new file mode 100644 index 000000000000..d6046052c242 --- /dev/null +++ b/dev-util/roctracer/Manifest @@ -0,0 +1 @@ +DIST rocm-tracer-4.0.0.tar.gz 462166 BLAKE2B 1294b5639a743a9d32737c72dc0f082b5a33ee1b3365f48221ad6392cdde7637926c42ea344fa96e9fc8410ea04e9ce3f535e188a25130f4be764c4d4a59b69c SHA512 312cd6c4c98a83e28a9f8b9e6123862af2e80a0d0852acff11be65d198f277c6ea194e72f6dbaccab1dd5d4af318bef28ca546e49440f22d024a546a4e5e9e15 diff --git a/dev-util/roctracer/files/roctracer-3.8.0-gen_ostream_ops-toPython3.patch b/dev-util/roctracer/files/roctracer-3.8.0-gen_ostream_ops-toPython3.patch new file mode 100644 index 000000000000..b73949b92331 --- /dev/null +++ b/dev-util/roctracer/files/roctracer-3.8.0-gen_ostream_ops-toPython3.patch @@ -0,0 +1,28 @@ +--- a/script/gen_ostream_ops.py 2020-09-27 11:23:37.833756185 +0200 ++++ b/script/gen_ostream_ops.py 2020-09-27 11:21:25.763756688 +0200 +@@ -176,9 +176,9 @@ + process_struct(f, c, cppHeader, "", apiname) + global_str = "\n".join(global_str.split("\n")[0:-2]) + if structs_depth != -1: #reindent +- global_str = string.split(global_str, '\n') +- global_str = [' ' + string.lstrip(line) for line in global_str] +- global_str = string.join(global_str, '\n') ++ global_str = global_str.split('\n') ++ global_str = [' ' + line.lstrip() for line in global_str] ++ global_str = str.join('\n', global_str) + f.write(global_str+"\n") + if structs_depth != -1: + f.write(" };\n") +@@ -199,9 +199,9 @@ + process_struct(f, c, cppHeader, "", apiname) + global_str = "\n".join(global_str.split("\n")[0:-2]) + if structs_depth != -1: #reindent +- global_str = string.split(global_str, '\n') +- global_str = [' ' + string.lstrip(line) for line in global_str] +- global_str = string.join(global_str, '\n') ++ global_str = global_str.split('\n') ++ global_str = [' ' + line.lstrip() for line in global_str] ++ global_str = str.join('\n', global_str) + f.write(global_str+"\n") + if structs_depth != -1: + f.write(" };\n") diff --git a/dev-util/roctracer/metadata.xml b/dev-util/roctracer/metadata.xml new file mode 100644 index 000000000000..f22138170669 --- /dev/null +++ b/dev-util/roctracer/metadata.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>sci@gentoo.org</email> + <name>Gentoo Science Project</name> + </maintainer> + <maintainer type="person"> + <email>candrews@gentoo.org</email> + <name>Craig Andrews</name> + </maintainer> + <maintainer type="person"> + <email>gentoo@holzke.net</email> + <name>Wilfried Holzke</name> + </maintainer> + <upstream> + <remote-id type="github">ROCm-Developer-Tools/roctracer</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata> diff --git a/dev-util/roctracer/roctracer-4.0.0-r1.ebuild b/dev-util/roctracer/roctracer-4.0.0-r1.ebuild new file mode 100644 index 000000000000..04c9a3080f20 --- /dev/null +++ b/dev-util/roctracer/roctracer-4.0.0-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake prefix + +DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's" +HOMEPAGE="https://github.com/ROCm-Developer-Tools/roctracer.git" +SRC_URI="https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-${PV}.tar.gz -> rocm-tracer-${PV}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="dev-libs/rocr-runtime + sys-devel/llvm-roc + dev-util/hip" +DEPEND="dev-python/CppHeaderParser + dev-python/ply + ${RDEPEND}" + +PATCHES=( + "${FILESDIR}/roctracer-3.8.0-gen_ostream_ops-toPython3.patch" +) + +S="${WORKDIR}/roctracer-rocm-${PV}" + +src_prepare() { + # do not build the tool and it´s library; + # change destination for headers to include/roctracer; + # do not install a second set of header files; + sed -e "/LIBRARY DESTINATION/s,lib,$(get_libdir)," \ + -e "/add_subdirectory ( \${TEST_DIR} \${PROJECT_BINARY_DIR}/d" \ + -e "/DESTINATION/s,\${DEST_NAME}/include,include/roctracer," \ + -e "/install ( FILES \${CMAKE_CURRENT_SOURCE_DIR}/d" \ + -e "/install ( FILES \${PROJECT_BINARY_DIR}/d" \ + -i CMakeLists.txt || die + + # do not download additional sources via git + sed -e "/execute_process ( COMMAND sh -xc \"if/d" \ + -e "/add_subdirectory ( \${TEST_DIR} \${PROJECT_BINARY_DIR}/d" \ + -i test/CMakeLists.txt || die + + hprefixify script/*.py + + eapply_user + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DHIP_VDI=1 + -DCMAKE_PREFIX_PATH="${EPREFIX}/usr/include/hsa:${EPREFIX}/usr/lib" + ) + + cmake_src_configure +} diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest index b311313687ee..ec39364465ca 100644 --- a/dev-util/scons/Manifest +++ b/dev-util/scons/Manifest @@ -8,3 +8,7 @@ DIST scons-4.0.1-user.html 1415152 BLAKE2B 1a94b2ef5e076d883f2960825f055c7cc39cf DIST scons-4.0.1-user.pdf 2468804 BLAKE2B f0af6bc6b41d972b98e955ee3ccec908aa366eabe31bd01022abe1f6d3a94dd6d7da26f71de23a6dfbcbc7bb4e439463f69bb7e8a5780c1300e3ba508b9eb314 SHA512 0d2733e2f1391083522a64117bfd35a2160d1366382f6f630b26eba36fc12ce797467d5e16efeb3b7f58aa9d853f96ae0d50fe78f59e78d24642b146bc7e565d DIST scons-4.0.1.gh.tar.gz 5578800 BLAKE2B f9ece5eaf1b133219f975e484beb5df726560a38969b8e8ad829781b960b438458bfcd7971333da87560c957675b2a4f8675e757fb0a4268cc4ecf72bb60d45f SHA512 f23c5dfd3c236e9f9f85b986ca64a36dbd85e9f3383cb3577e082a7dea4b83283020fbf064c2d919ab116195c6708fc11f906fcf3b0bc0533a4bc49a4f7371c6 DIST scons-4.0.1.tar.gz 2874481 BLAKE2B 98377e62ae31d32758a93c4e04c578b88ea541cc292af63c6ca43e2948745e416ee6d757d98129ee30d0e0bbab90664889441a5bb86d4c9dfc649ca1dbef7536 SHA512 400b11323d48f04395b519dfafb6fce15a6dea92013f599dc4895b112629c0a06c7d2806755c74047d001d60087b94f39a118f512b7ee8de6214a4ffc7310468 +DIST scons-4.1.0-user.html 1454432 BLAKE2B 9fac4d7bfb4b25708bc4cc48d952beb030f88181af5dfee63090f726b1a82443c192c63ec5939869967ef8f374e8599321212971439fb265fb050b263681c9f8 SHA512 74f1349fa61dac9e66cfb863cb3126d07ce5f421b3e87d0220eb32bd5017ba8f6cf96eb8cb5ee45c39022671aa9f2d0408d4039970c438a69c002445aea510be +DIST scons-4.1.0-user.pdf 2691364 BLAKE2B a910a09fa936d4d6f8dc967676d5aa009aac58a5a4566399b3ddc3512ac0259731e6c5399722fefadb3b79d8f89a5257e2e9bc2fa4d65697c8293ab995248d64 SHA512 64584731a59b59b78283be3876ecca91d742f83da2653d0de17922bec01e3c9cea1ce2ce3c8dc718597910ba86ed2c8aff0f7ae371bf763439b57a6d5484e1a7 +DIST scons-4.1.0.gh.tar.gz 5609204 BLAKE2B ede3d47a1ec652b9248681e26738073e9d01daab7ffeccc58f0fcadb79661e30edb9a35a511518e4a58459243acb027afd8fa5849b0f9e4bae451055f7b1a062 SHA512 f79b86bb09783767b3872cfb8efb665372714a604af2aaf3adc66eee63d3afe27bc6b2aab83813743c83f71c81c800d42842e916501787ba402ce2726dda9b44 +DIST scons-4.1.0.tar.gz 3007701 BLAKE2B 70ab64ecfd89fa2af1d78a33fcef82a5f7db9875ffe9d2c16ea75cf40e661b2874359e3a5f75d761b3d9e863f7a434560992cfb020cce3e21e389381331d90de SHA512 24fd493643545a2998b053ed0d68caf6241f05bc2437e7cbeae33d2e1c63517a61449a1a18062f8e4e5a639295a2486925296ba3e54ccfa2ecdd56fa07132de8 diff --git a/dev-util/scons/files/scons-4.1.0-env-passthrough.patch b/dev-util/scons/files/scons-4.1.0-env-passthrough.patch new file mode 100644 index 000000000000..06ec2f217611 --- /dev/null +++ b/dev-util/scons/files/scons-4.1.0-env-passthrough.patch @@ -0,0 +1,41 @@ +From fb07dc4b4fa178b0c424c5f400b18669abd8960e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Wed, 9 May 2018 17:04:49 +0200 +Subject: [PATCH] posix: Support GENTOO_SCONS_ENV_PASSTHROUGH=1 + +Support GENTOO_SCONS_ENV_PASSTHROUGH=1 variable to override the default +of wiping the environment and resetting PATH to default, and instead +pass all variables through. +--- + SCons/Platform/posix.py | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/SCons/Platform/posix.py b/SCons/Platform/posix.py +index 4c9f8f9ba..fbc81196d 100644 +--- a/src/SCons/Platform/posix.py ++++ b/src/SCons/Platform/posix.py +@@ -82,9 +82,18 @@ def generate(env): + pspawn = piped_env_spawn + # Note that this means that 'escape' is no longer used + +- if 'ENV' not in env: +- env['ENV'] = {} +- env['ENV']['PATH'] = '/usr/local/bin:/opt/bin:/bin:/usr/bin:/snap/bin' ++ # Force pass-through of environment variables in Gentoo builds ++ import os ++ if os.environ.get('GENTOO_SCONS_ENV_PASSTHROUGH', False): ++ new_env = os.environ.copy() ++ if 'ENV' in env: ++ new_env.update(env['ENV']) ++ env['ENV'] = new_env ++ else: ++ if 'ENV' not in env: ++ env['ENV'] = {} ++ env['ENV']['PATH'] = '/usr/local/bin:/opt/bin:/bin:/usr/bin:/snap/bin' ++ + env['OBJPREFIX'] = '' + env['OBJSUFFIX'] = '.o' + env['SHOBJPREFIX'] = '$OBJPREFIX' +-- +2.30.0 + diff --git a/dev-util/scons/scons-4.1.0-r1.ebuild b/dev-util/scons/scons-4.1.0-r1.ebuild new file mode 100644 index 000000000000..c820cebf1b75 --- /dev/null +++ b/dev-util/scons/scons-4.1.0-r1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 + +DESCRIPTION="Extensible Python-based build utility" +HOMEPAGE="https://www.scons.org/" +SRC_URI=" + https://downloads.sourceforge.net/project/scons/scons/${PV}/${P}.tar.gz + doc? ( + https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf + https://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html + ) + test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc test" +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( + dev-libs/libxml2[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + ) +" + +S=${WORKDIR}/${P}/src + +PATCHES=( + # support env passthrough for Gentoo ebuilds + "${FILESDIR}"/scons-4.1.0-env-passthrough.patch + # respect CC, CXX, C*FLAGS, LDFLAGS by default + "${FILESDIR}"/scons-4.0.0-respect-cc-etc-r1.patch +) + +src_unpack() { + # use the git directory structure, but put pregenerated release + # inside src/ subdirectory to make our life easier + if use test; then + unpack "${P}.gh.tar.gz" + else + mkdir -p "${P}"/src || die + fi + + tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die +} + +src_prepare() { + # apply patches relatively to top directory + cd "${WORKDIR}/${P}" || die + distutils-r1_src_prepare + + # manpage install is completely broken + sed -i -e '/build\/doc\/man/d' src/setup.cfg || die + + if use test; then + local remove_tests=( + # TODO: does not respect PATH? + test/Clang + # broken + test/DVIPDF/DVIPDFFLAGS.py + test/Java/swig-dependencies.py + test/Java/multi-step.py + ) + rm -r "${remove_tests[@]}" || die + fi +} + +python_test() { + local -x COLUMNS=80 + # set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env + local -x GENTOO_SCONS_ENV_PASSTHROUGH=1 + # unset some env variables to pass appropriate tests + unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS + cd "${WORKDIR}/${P}" || die + "${EPYTHON}" runtest.py -a --passed \ + -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" + + # runtest.py script returns "0" if all tests are passed + # and returns "2" if there are any tests with "no result" + # (i.e. in case if some tools are not installed or it's Windows specific tests) + [[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + distutils-r1_python_install_all + + doman *.1 + use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html} +} diff --git a/dev-util/shards/Manifest b/dev-util/shards/Manifest index 58b22181af73..10589e93a7e5 100644 --- a/dev-util/shards/Manifest +++ b/dev-util/shards/Manifest @@ -1,2 +1,3 @@ DIST crystal-molinillo-0.1.0.tar.gz 23932 BLAKE2B c9bcd707a3208f5d80e6e3030523d50f86cb5977799de8ea6035d014094e3c2fff9bb189fa98f566e72e1e7ad161e47e44c89d9b264d47f109b2e891ecb469e5 SHA512 8d74d95896cd7ff510c87e2ffba6ae5f04ceeddde574930ee609851312b65d713a315cc24f9aa3fab02f9447ccb25ef2dd2e8179640b8c5cfb3d7d6b52d1ded5 DIST shards-0.12.0.tar.gz 52205 BLAKE2B 6aed0be06f1f7e336861705fc0e29fbc3a97336f37d3a1eef09d3ea2ebaf2e61f1e5594f893974a6c13114ee575a69cf6a71fce0cc5f8985b8c365392735e8ca SHA512 3dfdf09be8701e568614923ffd5be90c63bdefc06f310c35b1b38e4b92f8bc1f432398656c08cadd36be52491f2ae8fda3c9b4117dbc4d53dbc8068b78300468 +DIST shards-0.13.0.tar.gz 55407 BLAKE2B 430abf54b5b035e966112a5b300a8924e0d6c6c4866e4cefba816c1b901876210990678a2d9b0c6bbc9da095decc217b64da32da61a5501e6045dfe64e10bfdf SHA512 7b5540b009f23cfc9630b206884a81c80a63991f64e84eed29545fef0e6a888e3854c6b0c8d958d4af3d6cef4718d7cb08d7948dcd2c9629c82b552776500b2b diff --git a/dev-util/shards/shards-0.13.0.ebuild b/dev-util/shards/shards-0.13.0.ebuild new file mode 100644 index 000000000000..ed35979dd3c2 --- /dev/null +++ b/dev-util/shards/shards-0.13.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multiprocessing toolchain-funcs + +CRYSTAL_MOLINILLO_PV=0.1.0 +CRYSTAL_MOLINILLO_P=crystal-molinillo-${CRYSTAL_MOLINILLO_PV} + +DESCRIPTION="Dependency manager for the Crystal language" +HOMEPAGE="https://github.com/crystal-lang/shards" +SRC_URI=" + https://github.com/crystal-lang/shards/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/crystal-lang/crystal-molinillo/archive/v${CRYSTAL_MOLINILLO_PV}.tar.gz -> ${CRYSTAL_MOLINILLO_P}.tar.gz +" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + >dev-lang/crystal-0.11.1[yaml] +" +RDEPEND="${DEPEND}" + +RESTRICT=test # missing files in tarball + +src_prepare() { + default + + # bundle crystal-molinillo to bootstrap 'shards' + mkdir -p lib || die + ln -s ../../${CRYSTAL_MOLINILLO_P} lib/molinillo || die + + tc-export CC +} + +src_compile() { + emake release=1 FLAGS="--link-flags=\"${LDFLAGS}\" --verbose --threads $(makeopts_jobs)" +} + +src_install() { + dobin bin/${PN} + dodoc README.md +} diff --git a/dev-util/spirv-headers/spirv-headers-1.5.4.1.ebuild b/dev-util/spirv-headers/spirv-headers-1.5.4.1.ebuild index 90856517cc36..04183969c896 100644 --- a/dev-util/spirv-headers/spirv-headers-1.5.4.1.ebuild +++ b/dev-util/spirv-headers/spirv-headers-1.5.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,6 +12,6 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.ta LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~x86" S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}" diff --git a/dev-util/spirv-tools/spirv-tools-2020.6.ebuild b/dev-util/spirv-tools/spirv-tools-2020.6.ebuild index abd96728ee58..10cd2d178ba1 100644 --- a/dev-util/spirv-tools/spirv-tools-2020.6.ebuild +++ b/dev-util/spirv-tools/spirv-tools-2020.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then else EGIT_COMMIT="${PV}" SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~x86" S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT} fi diff --git a/dev-util/tkdiff/Manifest b/dev-util/tkdiff/Manifest index 357bd6e37778..11a176ce11c3 100644 --- a/dev-util/tkdiff/Manifest +++ b/dev-util/tkdiff/Manifest @@ -1 +1,2 @@ DIST tkdiff-4.2.tar.gz 92063 BLAKE2B 4c3d1fbbc4bc76c8a39dca454a6630b8022acf33aa11b899db8960534f3df91fa068162fd0a7f16a00c6dde697d8cfd6dbcc4157035a340e162e113ceaf102ac SHA512 6c16475b808a9ac4d51a3e0b348d12739d821743eb205281473408a722ef7329e7dee61b4e0536741fab0c88eb67b00080d84598fca5e3215d4b183a858f6984 +DIST tkdiff-5-1.zip 233467 BLAKE2B 711d5bf0ea1d919d235e5cfcb76c2597a849293652544a5bc5ed969ca8d1a9720a406504b07d382a1ae84447709984fddf627129e70f4d043648731bea54039e SHA512 76301e74a1396ae540470fd0f4b8c7b4e214bdb4027f5ed52d98e5ea48afd99971a7880d1ec54812f6f13a3f1e92c7cd0d2c4d6d0b6e098e47fd36759fe7a047 diff --git a/dev-util/tkdiff/tkdiff-5.1.ebuild b/dev-util/tkdiff/tkdiff-5.1.ebuild new file mode 100644 index 000000000000..9f7a79e43eda --- /dev/null +++ b/dev-util/tkdiff/tkdiff-5.1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MYP=${PN}-$(ver_rs 1- -) + +DESCRIPTION="Graphical front end to the diff program" +HOMEPAGE="https://sourceforge.net/projects/tkdiff/" +SRC_URI="mirror://sourceforge/${PN}/${PV}/${MYP}.zip" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND="dev-lang/tk" +DEPEND="${DEPEND}" +BDEPEND="app-arch/unzip" + +S="${WORKDIR}/${MYP}" + +src_install() { + dobin tkdiff + dodoc CHANGELOG.txt +} diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild index b7d53089df0c..118ed20a994a 100644 --- a/dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild +++ b/dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~x86" S="${WORKDIR}"/${MY_PN}-${PV} fi diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.162.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.162.ebuild index ca07b9093e08..88cb5b2b0dae 100644 --- a/dev-util/vulkan-tools/vulkan-tools-1.2.162.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-1.2.162.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" + KEYWORDS="amd64 arm arm64 ppc ppc64" S="${WORKDIR}"/${MY_PN}-${PV} fi |