diff options
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/clazy/clazy-1.11-r1.ebuild | 2 | ||||
| -rw-r--r-- | dev-util/cmake/Manifest | 3 | ||||
| -rw-r--r-- | dev-util/cmake/cmake-3.22.4.ebuild | 2 | ||||
| -rw-r--r-- | dev-util/cmake/cmake-3.23.2.ebuild | 261 | ||||
| -rw-r--r-- | dev-util/cmake/cmake-9999.ebuild | 2 | ||||
| -rw-r--r-- | dev-util/itstool/itstool-2.0.7.ebuild | 2 | ||||
| -rw-r--r-- | dev-util/maturin/Manifest | 2 | ||||
| -rw-r--r-- | dev-util/maturin/maturin-0.12.16.ebuild | 393 | ||||
| -rw-r--r-- | dev-util/shfmt/Manifest | 8 | ||||
| -rw-r--r-- | dev-util/shfmt/metadata.xml | 10 | ||||
| -rw-r--r-- | dev-util/shfmt/shfmt-3.1.2.ebuild | 38 | ||||
| -rw-r--r-- | dev-util/shfmt/shfmt-3.5.0.ebuild | 53 | ||||
| -rw-r--r-- | dev-util/shfmt/shfmt-9999.ebuild | 53 |
13 files changed, 316 insertions, 513 deletions
diff --git a/dev-util/clazy/clazy-1.11-r1.ebuild b/dev-util/clazy/clazy-1.11-r1.ebuild index 08c5e3a695cb..26ec49b36df2 100644 --- a/dev-util/clazy/clazy-1.11-r1.ebuild +++ b/dev-util/clazy/clazy-1.11-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm64 x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index fe03556997dd..1ff3bda5419e 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -3,3 +3,6 @@ DIST cmake-3.22.4.tar.gz 9781548 BLAKE2B d07172091c8ff695f9af398321e4bf7b64643e9 DIST cmake-3.23.1-SHA-256.txt 1452 BLAKE2B 8cce350435aeffdb7b903d87be611ed0362f601f7cfcff96f444859e40227b46e03baac6427587cafec79e9e1c8ab7ac4ee3dc915131c13badf2bcac99e1e8b7 SHA512 fd2dec42f51344a15d1a8e6afd35e96399765c5283925c4708aed5fa84117d0415ef014652cc740600bf75265baadac0559b6b8b1a0e60342a6e88eb61cbb4e5 DIST cmake-3.23.1-SHA-256.txt.asc 833 BLAKE2B 28ce9f5c99b263895ad19f9df43050156ad399846daf03be96b9c4439c41d57e9c26244ab872692e98db321ba919639881d68b81237a9f443316cfa0aea1b8af SHA512 55b1808668b17a3bee0055e3736b6312e3260297ee02137e6bd90ba7a75d2a3e094e06fbe16cd299325f0c191a5f5924fadd075e5edbe3275933356df7b11b12 DIST cmake-3.23.1.tar.gz 9982020 BLAKE2B a51eedeb78657caf86409ea8bdf4e61b09c66c6a0f3102c9b9ed42976a239f9c4561d7168b4bb24152b80cd773505166ca87e241dad3b36919b5e26573fb149e SHA512 94893f888c0cbfc58e54a0bd65d6c0697fe4a0e95c678b7cb35e7dc8854d57eb360bfc952750f97983348817f847f6df85903f21a5857b1a3880b2a7eb6cc029 +DIST cmake-3.23.2-SHA-256.txt 1452 BLAKE2B 7871939af36eafe321b835e0b34b58149227f757530465b20170a286946cc342a1fb5f3c98d5a5e9d16487931cbc3d005437c94af51b6622166092caed31f7e1 SHA512 4c96cbb45b92a5a72476d232b3c6747be418850a2fc993f2daeb22dcc4d50bcc57c747cdaec65382a3dee5f57823dbf2e06ca2b32f025fd21afec34ac4462656 +DIST cmake-3.23.2-SHA-256.txt.asc 833 BLAKE2B eaa699b3a46d0d638a426b91e54aec07fb608650f089d83fb145f3f4689edfe8b970a9e7b653746a86ed8e4d866703b51730bca6a4537d9aa90104639bbb989c SHA512 2face6d9e4556f41b3c858b30ab3fadaf931b0e110a5bfadc4ce54cb66d56039d9f129637dd9ba2135f2361384d841916da1319c2cb41a9050dc9053b44eb28e +DIST cmake-3.23.2.tar.gz 9987716 BLAKE2B 6930deab4849eeb4451297006d7ace37483c4b9b66ddbfaf78b2393da670aa95e054b61f59763efb719a4a30342270c1fc13d298f90caff58b9b3fde97ff1c31 SHA512 0925adf973d642fd76d4089b61b3882babb0a85050c4c57d5f5f3bd6b17564a9feb0beed236cd636e25f69072fa30b67ea3f80932380b6b6576f2dd78b8e6931 diff --git a/dev-util/cmake/cmake-3.22.4.ebuild b/dev-util/cmake/cmake-3.22.4.ebuild index 0d8e28da59fd..a931b95820f4 100644 --- a/dev-util/cmake/cmake-3.22.4.ebuild +++ b/dev-util/cmake/cmake-3.22.4.ebuild @@ -20,7 +20,7 @@ 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 ~sparc64-solaris ~x64-solaris ~x86-solaris" +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 ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc emacs ncurses qt5 test" RESTRICT="!test? ( test )" diff --git a/dev-util/cmake/cmake-3.23.2.ebuild b/dev-util/cmake/cmake-3.23.2.ebuild new file mode 100644 index 000000000000..1f441d341fb6 --- /dev/null +++ b/dev-util/cmake/cmake-3.23.2.ebuild @@ -0,0 +1,261 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja +# ... but seems fine as of 3.22.3? +# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759. +CMAKE_MAKEFILE_GENERATOR="emake" +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/" +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git" +else + SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" + if [[ ${PV} != *_rc* ]] ; then + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc + inherit verify-sig + + SRC_URI+=" verify-sig? ( + https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt + https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc + )" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )" + fi +fi + +LICENSE="CMake" +SLOT="0" +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 + ) + test? ( app-arch/libarchive[zstd] ) +" + +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" +} + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + elif ! use verify-sig || [[ ${PV} == *_rc ]] ; then + default + else + cd "${DISTDIR}" || die + + # See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature + verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc} + verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz + + cd "${WORKDIR}" || die + + default + fi +} + +src_prepare() { + cmake_src_prepare + + if [[ ${CHOST} == *-darwin* ]] ; then + # disable Xcode hooks, bug #652134 + sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \ + Source/CMakeLists.txt || die + sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \ + -e '/cmGlobalXCodeGenerator.h/d' \ + Source/cmake.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 + sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ + Source/cmStandardLexer.h + 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.13 || ! 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() { + # 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 || die + + # Excluded tests: + # BootstrapTest: we actualy bootstrap it every time so why test it. + # BundleUtilities: bundle creation broken + # CMakeOnly.AllFindModules: pthread issues + # CTest.updatecvs: which fails to commit as root + # Fortran: requires fortran + # 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 + # TestUpload, which requires network access + # RunCMake.CMP0125, known failure reported upstream (bug #829414) + local myctestargs=( + --output-on-failure + -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \ + ) + + 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-9999.ebuild b/dev-util/cmake/cmake-9999.ebuild index 2380055102e9..1f441d341fb6 100644 --- a/dev-util/cmake/cmake-9999.ebuild +++ b/dev-util/cmake/cmake-9999.ebuild @@ -29,7 +29,7 @@ else https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc )" - 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 ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )" fi diff --git a/dev-util/itstool/itstool-2.0.7.ebuild b/dev-util/itstool/itstool-2.0.7.ebuild index 5a5b9f09bdf5..bbed79cf032f 100644 --- a/dev-util/itstool/itstool-2.0.7.ebuild +++ b/dev-util/itstool/itstool-2.0.7.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2" # files in /usr/share/itstool/its are under a special exception || GPL-3+ LICENSE="GPL-3+" SLOT="0" -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 ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest index 3d99b9a2beaf..6b2250878483 100644 --- a/dev-util/maturin/Manifest +++ b/dev-util/maturin/Manifest @@ -139,7 +139,6 @@ DIST mailparse-0.13.8.crate 36008 BLAKE2B 8112658b4ceb5b3528375f4f8a178a26c18b54 DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a61f51674e0df6a571db352b2bbabfb99cdbdcfb4e511ae783165bf0258f5163f240a229b9087f9edbd0df41a SHA512 84214c1a84952d85631aa1ab5115df7cda223ac64e2acf055b6129ba1aa26ddc87615a8b51ca890ce3fee0419053fa7fe1599ae128f1d211b58c07b0c4af3b19 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305 DIST maturin-0.12.15.tar.gz 293054 BLAKE2B dde49d096561afac552567bd54b06b9ece49a7d4c57e461d94869d1b57028f959287e18ec816101b9d972fb1ba5d2124fa5dea5e7d178e7c0a538a8f7d4176ff SHA512 0ae2f8ac7b32c4560b7c5ebb9305c2587a5bd10fb9a2d0a32a35a6df315ff8c5511bf2a5b5e76e2c4eeba73868e87e718b304854ce8964207af832c72a5014d0 -DIST maturin-0.12.16.tar.gz 299116 BLAKE2B 401107c57d2919683f4cd21579354e89d7916a3f723130d40d1e8e9aea606e4d9e0ac133e1d2a863367ebe93473c89429839d37ddf012a5139734f7cf6597c1e SHA512 e568836e04296523c0bf8b673d1ce67103a34a6fb8c5d73f7aab3e58a883fc0daaffa730b2e2e1849bbad9f59f080ac1aaa4a0da7f4acd2439fd359e8ed755c5 DIST maturin-0.12.17.tar.gz 299343 BLAKE2B 28daf0ae1aead28075c730c8acdef875918f0c65fcb6828987ffd1b6967221dea201c7988574e216826a35a7938972318e1ec22ade3977259dc610464c940b7e SHA512 21649167f9fc6ebd1388e2cf5aa58a1656fec3bbd1f4d97e4753de7992171faf56bb2a9c0e5d19d2965076ae0e0333db0c1958e7af13473b4af7ccd3c2039992 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f @@ -232,7 +231,6 @@ DIST rpassword-6.0.1.crate 11505 BLAKE2B e637ad3199e65e8ea44eec0ab7115073a68acda DIST rustc-demangle-0.1.21.crate 27920 BLAKE2B 73ada923b9b293c5a9893f86fda0586139afbb7d56894cabbd70612d1fb0330a9e491d5143fe3498a0c8d3e1a3f8e63c14b20865926e4c831915592486ae32d0 SHA512 4031b26863a726cc6d3398b48682e0f0f9e5665abf20a5d35343a904ebd7c0d3752dcdd3a049b2bfa3e2a303214dc39a2980700bcc64464f7029be3c7f34727c DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db DIST rustls-0.20.4.crate 256347 BLAKE2B 96989d813691a70066958b5c30554237cf86f25bf06e0ccd098044b4329d26fff19bc5863f8c2390c03813aedc67be5f4da433d82b5a9c6b120efaaedf51dc2c SHA512 897e93f7fd06be64773db0630a06dc440c0f5b43f12d5780523b2419d11bdec62ece3ce12a317badc2ec8cb1536d8bfd82d7c69105196929e7fa5471b29d0462 -DIST rustls-0.20.5.crate 258873 BLAKE2B 80dbf19be222e7f973b7f5aebb784cc19b5414e374fabe532ceaa767f576408cbefa2d961622a782add0c093a767383cd6c2883bed83ca0c74f6d3b6fffb968d SHA512 e0aadf16ccd9b10964fdfc3c3261238010b9c57bfd488b6ef36dad66d9458c35654720da98ac5691324e68b0d164341c0dd0258666dc916efab35e767a8c0cf9 DIST rustls-0.20.6.crate 259289 BLAKE2B 36359bc14e87853752fe55a327bcd15a26cdb053b6e7b5d5a1e83ef940d1c2cf4c2acc899eeec35d01b9360a8814396938f2a1faacdf44bf38ce137ffd3238a5 SHA512 04a7922b3456b53d88904af925bbc3b4cc6f0b45256af46e1ebaac2446b73e2645f3b6a3a40ea9ff783acedfa2cc5ab94feaf3513a337d4e06564ab9008d2178 DIST ryu-1.0.10.crate 48485 BLAKE2B cbc0ab4e0b2031f4ca3a34914bd61395d14706d42e2414757aa23a67530d549382d61b630159c92a169d1dd3315951b0071ff18349d2b090ae262de536aa29e2 SHA512 1bd0af71a20715251dd42596df6e7677e44f712bbb40b0d9544109c1b2478a7bd2c9393535f0d4f3bfe2d1b75b3a2b899044051715a7da7d165d6d586e0775f2 DIST ryu-1.0.9.crate 48391 BLAKE2B d5c1035ffd6340d846009953cb4303fb8c250a3a6ac60b51a2fec77a6cb3648524420064b7380fe31af33c57011f950f6f739a1f0114196675b3b5de4b54efc6 SHA512 4e7c2c7ec73da1ddb32e18d36b8159cb4047b9f4feeb975361e7ba68135e671e11419bb7786df789f5d08e5895231d2c98e36035b515f2c64ac40474d08905cb diff --git a/dev-util/maturin/maturin-0.12.16.ebuild b/dev-util/maturin/maturin-0.12.16.ebuild deleted file mode 100644 index acd7cc444873..000000000000 --- a/dev-util/maturin/maturin-0.12.16.ebuild +++ /dev/null @@ -1,393 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CRATES=" - addr2line-0.17.0 - adler-1.0.2 - aes-0.6.0 - aes-soft-0.6.4 - aesni-0.10.0 - aho-corasick-0.7.18 - anyhow-1.0.57 - async-io-1.6.0 - atty-0.2.14 - autocfg-1.1.0 - backtrace-0.3.65 - base64-0.13.0 - bitflags-1.3.2 - block-buffer-0.10.2 - block-buffer-0.9.0 - block-modes-0.7.0 - block-padding-0.2.1 - bstr-0.2.17 - bumpalo-3.9.1 - byteorder-1.4.3 - bytes-1.1.0 - bytesize-1.1.0 - bzip2-0.4.3 - bzip2-sys-0.1.11+1.0.8 - cab-0.4.0 - cache-padded-1.2.0 - camino-1.0.8 - cargo-options-0.1.4 - cargo-platform-0.1.2 - cargo-xwin-0.8.5 - cargo-zigbuild-0.8.7 - cargo_metadata-0.14.2 - cbindgen-0.23.0 - cc-1.0.73 - cfb-0.7.0 - cfg-if-0.1.10 - cfg-if-1.0.0 - charset-0.1.3 - chunked_transfer-1.4.0 - cipher-0.2.5 - clap-3.1.18 - clap_complete-3.1.4 - clap_complete_fig-3.1.5 - clap_derive-3.1.18 - clap_lex-0.2.0 - cli-table-0.4.7 - combine-4.6.4 - concurrent-queue-1.2.2 - configparser-3.0.0 - console-0.15.0 - core-foundation-0.9.3 - core-foundation-sys-0.8.3 - cpufeatures-0.2.2 - crc32fast-1.3.2 - crossbeam-channel-0.5.4 - crossbeam-deque-0.8.1 - crossbeam-epoch-0.9.8 - crossbeam-utils-0.8.8 - crypto-common-0.1.3 - crypto-mac-0.10.1 - data-encoding-2.3.2 - derivative-2.2.0 - dialoguer-0.10.1 - digest-0.10.3 - digest-0.9.0 - dirs-4.0.0 - dirs-sys-0.3.7 - either-1.6.1 - encode_unicode-0.3.6 - encoding-0.2.33 - encoding-index-japanese-1.20141219.5 - encoding-index-korean-1.20141219.5 - encoding-index-simpchinese-1.20141219.5 - encoding-index-singlebyte-1.20141219.5 - encoding-index-tradchinese-1.20141219.5 - encoding_index_tests-0.1.4 - encoding_rs-0.8.31 - enumflags2-0.6.4 - enumflags2_derive-0.6.4 - env_logger-0.7.1 - fastrand-1.7.0 - fat-macho-0.4.5 - filetime-0.2.16 - flate2-1.0.23 - fnv-1.0.7 - foreign-types-0.3.2 - foreign-types-shared-0.1.1 - form_urlencoded-1.0.1 - fs-err-2.7.0 - futures-0.3.21 - futures-channel-0.3.21 - futures-core-0.3.21 - futures-executor-0.3.21 - futures-io-0.3.21 - futures-lite-1.12.0 - futures-macro-0.3.21 - futures-sink-0.3.21 - futures-task-0.3.21 - futures-util-0.3.21 - generic-array-0.14.5 - getrandom-0.2.6 - gimli-0.26.1 - glob-0.3.0 - globset-0.4.8 - goblin-0.5.1 - hashbrown-0.11.2 - heck-0.4.0 - hermit-abi-0.1.19 - hkdf-0.10.0 - hmac-0.10.1 - human-panic-1.0.3 - humantime-1.3.0 - idna-0.2.3 - ignore-0.4.18 - indexmap-1.8.1 - indicatif-0.17.0-rc.6 - indoc-1.0.6 - instant-0.1.12 - itertools-0.10.3 - itoa-1.0.2 - js-sys-0.3.57 - keyring-1.1.2 - lazy_static-1.4.0 - lddtree-0.2.9 - libc-0.2.125 - lock_api-0.4.7 - log-0.4.17 - lzxd-0.1.4 - mailparse-0.13.8 - matchers-0.1.0 - matches-0.1.9 - memchr-2.5.0 - memoffset-0.6.5 - mime-0.3.16 - mime_guess-2.0.4 - minijinja-0.15.0 - miniz_oxide-0.5.1 - msi-0.5.0 - multipart-0.18.0 - native-tls-0.2.10 - nb-connect-1.2.0 - nix-0.17.0 - num-0.3.1 - num-bigint-0.3.3 - num-complex-0.3.1 - num-integer-0.1.45 - num-iter-0.1.43 - num-rational-0.3.2 - num-traits-0.2.15 - num_cpus-1.13.1 - num_threads-0.1.6 - number_prefix-0.4.0 - object-0.28.4 - once_cell-1.10.0 - opaque-debug-0.3.0 - openssl-0.10.40 - openssl-macros-0.1.0 - openssl-probe-0.1.5 - openssl-src-111.18.0+1.1.1n - openssl-sys-0.9.73 - os_str_bytes-6.0.1 - os_type-2.4.0 - parking-2.0.0 - parking_lot-0.12.0 - parking_lot_core-0.9.3 - path-slash-0.1.4 - percent-encoding-2.1.0 - pin-project-lite-0.2.9 - pin-utils-0.1.0 - pkg-config-0.3.25 - plain-0.2.3 - platform-info-0.2.0 - polling-2.2.0 - ppv-lite86-0.2.16 - pretty_env_logger-0.4.0 - proc-macro-crate-0.1.5 - proc-macro-crate-1.1.3 - proc-macro-error-1.0.4 - proc-macro-error-attr-1.0.4 - proc-macro2-1.0.38 - pyproject-toml-0.3.1 - python-pkginfo-0.5.4 - quick-error-1.2.3 - quote-1.0.18 - quoted_printable-0.4.5 - rand-0.8.5 - rand_chacha-0.3.1 - rand_core-0.6.3 - rayon-1.5.3 - rayon-core-1.9.3 - redox_syscall-0.2.13 - redox_users-0.4.3 - regex-1.5.5 - regex-automata-0.1.10 - regex-syntax-0.6.25 - remove_dir_all-0.5.3 - rfc2047-decoder-0.1.2 - ring-0.16.20 - rpassword-6.0.1 - rustc-demangle-0.1.21 - rustc_version-0.4.0 - rustls-0.20.5 - ryu-1.0.10 - same-file-1.0.6 - schannel-0.1.19 - scoped-tls-1.0.0 - scopeguard-1.1.0 - scroll-0.11.0 - scroll_derive-0.11.0 - sct-0.7.0 - secret-service-2.0.1 - security-framework-2.6.1 - security-framework-sys-2.6.1 - semver-1.0.9 - serde-1.0.137 - serde_derive-1.0.137 - serde_json-1.0.81 - serde_repr-0.1.8 - sha2-0.10.2 - sha2-0.9.9 - sharded-slab-0.1.4 - shlex-1.1.0 - slab-0.4.6 - smallvec-1.8.0 - smawk-0.3.1 - socket2-0.4.4 - spin-0.5.2 - static_assertions-1.1.0 - strsim-0.10.0 - subtle-2.4.1 - syn-1.0.94 - tar-0.4.38 - target-lexicon-0.12.3 - tempfile-3.3.0 - termcolor-1.1.3 - terminal_size-0.1.17 - textwrap-0.15.0 - thiserror-1.0.31 - thiserror-impl-1.0.31 - thread_local-1.1.4 - time-0.3.9 - time-macros-0.2.4 - tinyvec-1.6.0 - tinyvec_macros-0.1.0 - toml-0.5.9 - toml_edit-0.14.4 - tracing-0.1.34 - tracing-attributes-0.1.21 - tracing-core-0.1.26 - tracing-serde-0.1.3 - tracing-subscriber-0.3.11 - twox-hash-1.6.3 - typenum-1.15.0 - unicase-2.6.0 - unicode-bidi-0.3.8 - unicode-linebreak-0.1.2 - unicode-normalization-0.1.19 - unicode-width-0.1.9 - unicode-xid-0.2.3 - untrusted-0.7.1 - ureq-2.4.0 - url-2.2.2 - uuid-0.8.2 - uuid-1.0.0 - valuable-0.1.0 - vcpkg-0.2.15 - version_check-0.9.4 - void-1.0.2 - waker-fn-1.1.0 - walkdir-2.3.2 - wasi-0.10.2+wasi-snapshot-preview1 - wasm-bindgen-0.2.80 - wasm-bindgen-backend-0.2.80 - wasm-bindgen-macro-0.2.80 - wasm-bindgen-macro-support-0.2.80 - wasm-bindgen-shared-0.2.80 - web-sys-0.3.57 - webpki-0.22.0 - webpki-roots-0.22.3 - wepoll-ffi-0.1.2 - which-4.2.5 - winapi-0.3.9 - winapi-i686-pc-windows-gnu-0.4.0 - winapi-util-0.1.5 - winapi-x86_64-pc-windows-gnu-0.4.0 - windows-sys-0.36.1 - windows_aarch64_msvc-0.36.1 - windows_i686_gnu-0.36.1 - windows_i686_msvc-0.36.1 - windows_x86_64_gnu-0.36.1 - windows_x86_64_msvc-0.36.1 - xattr-0.2.3 - xwin-0.2.3 - zbus-1.9.1 - zbus_macros-1.9.1 - zip-0.6.2 - zvariant-2.10.0 - zvariant_derive-2.10.0" -CRATES_TEST=" - libc-0.2.119 - once_cell-1.9.0 - pyo3-0.16.5 - pyo3-build-config-0.16.0 - pyo3-build-config-0.16.5 - pyo3-ffi-0.16.0 - pyo3-ffi-0.16.5 - pyo3-macros-0.16.5 - pyo3-macros-backend-0.16.5 - python3-dll-a-0.2.2 - unindent-0.1.9" -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{7,8,9,10} ) -inherit cargo distutils-r1 flag-o-matic - -DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings" -HOMEPAGE="https://maturin.rs/" -SRC_URI=" - https://github.com/PyO3/maturin/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - $(cargo_crate_uris) - test? ( $(cargo_crate_uris ${CRATES_TEST}) )" - -LICENSE=" - 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC MIT MPL-2.0 openssl - doc? ( CC-BY-4.0 OFL-1.1 )" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc test" -RESTRICT="!test? ( test )" - -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/tomli[${PYTHON_USEDEP}] - ' 3.{8..10})" -BDEPEND=" - dev-python/setuptools-rust[${PYTHON_USEDEP}] - doc? ( app-text/mdbook ) - test? ( - dev-python/cffi[${PYTHON_USEDEP}] - dev-python/boltons[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - )" - -QA_FLAGS_IGNORED=".*/${PN}" - -PATCHES=( - "${FILESDIR}"/${PN}-0.12.8-zig-tests.patch -) - -src_prepare() { - distutils-r1_src_prepare - - if use test; then - # used to prevent use of network during tests - cat > "${T}"/pip.conf <<-EOF || die - [install] - no-index = yes - no-dependencies = yes - EOF - - # run plain 'python' from eclass rather than auto-detect 'python3.x' - sed -i 's/"build",/&"-i","python",/' tests/common/integration.rs || die - fi - - # TODO: package-agnostic way to handle IUSE=debug with setuptools-rust? - use !debug || sed -i "s/^cargo_args = \[/&'--profile','dev',/" setup.py || die - - filter-flags '-flto*' # undefined references with ring crate -} - -python_compile_all() { - use !doc || mdbook build -d html guide || die -} - -python_test() { - local -x PIP_CONFIG_FILE=${T}/pip.conf - local -x VIRTUALENV_SYSTEM_SITE_PACKAGES=1 - - # pyo3_no_extension_module is xfail but passes with >=rust-1.60, still - # need looking into but is not known to cause issues, disable for now. - cargo_src_test -- --skip locked_doesnt_build_without_cargo_lock \ - --skip pyo3_no_extension_module -} - -python_install_all() { - dodoc Changelog.md Readme.md - use doc && dodoc -r guide/html -} diff --git a/dev-util/shfmt/Manifest b/dev-util/shfmt/Manifest index 2a1bf631ebc5..418b8f58afae 100644 --- a/dev-util/shfmt/Manifest +++ b/dev-util/shfmt/Manifest @@ -1,2 +1,6 @@ -DIST shfmt-3.5.0-deps.tar.xz 3121980 BLAKE2B 411e7df230864d1692899b89c4b5e25f54582752a10bde30a8a5e1ae03da3b325353d9bab71b46795f3d285747fbbcc63dd367ecddc8055d5df45013c5f491ae SHA512 562fc2a58c0c115d132c9107c569f5139d7e1f817c91077b80151d0043601c328b083ce8261301689ce72deecabe3957bc11e4dc4388024234a2791c9f118743 -DIST shfmt-3.5.0.tar.gz 222262 BLAKE2B a54c91afd1da39084637aba43dc9e3af82c2c57dabdd3e24cd80bbfc5fed9632da0e98b5a65169dc439216218a4664afcc8dc77cd409f15a35cd0b505d39dd39 SHA512 9071a015369088dbba8eb7221305893095ebeaa72124e1ca964b7b1e6f34dedc9d11f2daa2f679d24637b04925cbf58427a24cc4885d8e918cb81844e71d3c6b +DIST github.com-golang-sys-9197077.tar.gz 1540407 BLAKE2B d1ae2fbbbb1aba2db1b3bbab07ce6ca7a8eb43ea1e4fbf690348c9ba3e5bcbc48add0619430a08a273e70b5c0e4380c237108198ccf74a8ac6aa538fc6b6b20a SHA512 9bff781a71306cfe2f8791a309f39e7ad5a904b1b82cca0caab77cea19e517ecc9da97949e44ee24e74dfee9acae20e9f14b069ef7fabd3a1baf4db27b512985 +DIST github.com-golang-term-ad39bd3.tar.gz 3891 BLAKE2B 16c707e5b25296e3f0f700d644ebfc84bb602aaf9f8490110197f1a6e0d7a8ea1eadef497f7e09a7aa751162aefae4ca9343d9a3cf95addd4c1af54bb19b2afe SHA512 c23cd5da67a6734cc8fb8c9bbda7286581cdd7d0182a0a8ddcc999e256c2c41ee3c4aa10cd000e7bc6734c8be61e48c709acee005e4fae02df903f56ba1bb22c +DIST github.com-google-renameio-f0e3298.tar.gz 9724 BLAKE2B 82e818a97eceb2d6917e5c1f21afe6284cc88d223b1af5992219d03dd6bc1f59a072413b913c3f6ffd2a919a40bf6c6db480bb36d7f15aafca513e156ab1f7fc SHA512 556d6df5328dde7aa46619fbe8cf2f1f00289544d1e96b23c97521d9f8b2773276c628a424f45f8d5720d17a3aec0080a3bbfcd3bcc8203ad30bac6a41a31b39 +DIST github.com-mvdan-editorconfig-e40951b.tar.gz 9303 BLAKE2B 46cefb76c0537c1dba29ed6ece9a8b29f9404c0adac03a08aa254de34a443a21c2302b5c8af6e71784a656cce04305e2085d06b9ac3ec9808cf00185ee84f458 SHA512 48c836caf69d8b751415ccc00b00451cc2aeed132b6f7662c3525bd059d6f231e78db789677e63b5f25637429f6eff4bd63ec7ace1b036293f22648d44038592 +DIST github.com-pkg-diff-5319263.tar.gz 11597 BLAKE2B 5be0365f1a3456710e4ad2e94da6b05b33fae6c8c611c7016568c6d2d3a8257994cc658320e25a8fd5e0ef9b02f9063dc73716ce68f9aba8425f92a0aefcca54 SHA512 63f5b5c1e0df55ceaecdd1988585639c3e5bfc4624e3ae85b419d3e3015a2de6944319636b387298b89ff406878ac26894aff66dd2837a670b1f6f999bafcdc6 +DIST shfmt-3.1.2.tar.gz 193379 BLAKE2B e970ccb34989e3272c9c937917370a1d60d3f19891d8cae1f390e69789755bec46ec6de17d5af77084150dc6c6ab4d6d2f9acb431d5da5dd3adbe5f5cd2b56ff SHA512 6e367a7a05c5e18d6de7f822ef181443b22d05f94a5fe5a0cf4759bc1e4a07dfac0e2704eb3025868e0f44c0e04a9cbd28dfe5a977381b2ba6fe274ac97ef29a diff --git a/dev-util/shfmt/metadata.xml b/dev-util/shfmt/metadata.xml index c20d3da1c785..7cf1ac1fff23 100644 --- a/dev-util/shfmt/metadata.xml +++ b/dev-util/shfmt/metadata.xml @@ -2,12 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>ran.dall@icloud.com</email> - <name>Randall Vasquez</name> + <email>toffanin.mauro@gmail.com</email> + <name>Mauro Toffanin</name> + <description>Maintainer. Assign bugs to him</description> </maintainer> - <longdescription lang="en"> - A shell parser, formatter, and interpreter with bash support; includes shfmt. Supports POSIX Shell, Bash, and mksh. - </longdescription> - <origin>gentoo-guru-overlay</origin> + <origin>go-overlay</origin> </pkgmetadata>
\ No newline at end of file diff --git a/dev-util/shfmt/shfmt-3.1.2.ebuild b/dev-util/shfmt/shfmt-3.1.2.ebuild new file mode 100644 index 000000000000..dba936db29bc --- /dev/null +++ b/dev-util/shfmt/shfmt-3.1.2.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2020 Go Overlay Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +GOLANG_PKG_IMPORTPATH="github.com/mvdan" +GOLANG_PKG_IMPORTPATH_ALIAS="mvdan.cc" +GOLANG_PKG_NAME="sh" +GOLANG_PKG_ARCHIVEPREFIX="v" +GOLANG_PKG_BUILDPATH="/cmd/${PN}" +GOLANG_PKG_LDFLAGS="-X main.version=v${PV} -extldflags=-static" +GOLANG_PKG_HAVE_TEST=1 + +GOLANG_PKG_DEPENDENCIES=( + "github.com/google/renameio:f0e3298" #v0.1.0 + "github.com/pkg/diff:5319263" + "github.com/mvdan/editorconfig:e40951b" #v0.1.1 + + "github.com/golang/sys:9197077 -> golang.org/x" + "github.com/golang/term:ad39bd3 -> golang.org/x" +) + +inherit golang-single + +HOMEPAGE="https://github.com/mvdan/sh" +DESCRIPTION="A shell parser and formatter for POSIX shell and bash" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm arm64 x86" + +src_prepare() { + golang-single_src_prepare + + golang_fix_importpath_alias \ + "github.com/mvdan/editorconfig" \ + "mvdan.cc/editorconfig" +} diff --git a/dev-util/shfmt/shfmt-3.5.0.ebuild b/dev-util/shfmt/shfmt-3.5.0.ebuild deleted file mode 100644 index eacbfc8404c7..000000000000 --- a/dev-util/shfmt/shfmt-3.5.0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit go-module - -DESCRIPTION="Shell script formatter" -HOMEPAGE="https://github.com/mvdan/sh" -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/mvdan/sh.git" - RESTRICT="fetch mirror test" -else - SRC_URI="https://github.com/mvdan/sh/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - SRC_URI+=" https://github.com/ran-dall/portage-deps/raw/master/${P}-deps.tar.xz" - KEYWORDS="~amd64 ~arm64 ~x86" - RESTRICT="mirror test" - S="${WORKDIR}/${PN//fmt}-${PV}" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="+man" - -BDEPEND="man? ( app-text/scdoc )" - -src_unpack() { - if [[ ${PV} == *9999 ]]; then - git-r3_fetch - git-r3_checkout - pushd ${P}/cmd/shfmt || die "location change for module building failed" - ego get - popd || die "location reset from module building failed" - else - go-module_src_unpack - fi - default -} - -src_compile() { - ego build -v -ldflags "-s -w" -o "${PN}" "./cmd/shfmt" - if use man; then - scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1 || die "conversation of man page failed" - fi -} - -src_install() { - dobin ${PN} - if use man; then - doman shfmt.1 - fi -} diff --git a/dev-util/shfmt/shfmt-9999.ebuild b/dev-util/shfmt/shfmt-9999.ebuild deleted file mode 100644 index eacbfc8404c7..000000000000 --- a/dev-util/shfmt/shfmt-9999.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit go-module - -DESCRIPTION="Shell script formatter" -HOMEPAGE="https://github.com/mvdan/sh" -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/mvdan/sh.git" - RESTRICT="fetch mirror test" -else - SRC_URI="https://github.com/mvdan/sh/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - SRC_URI+=" https://github.com/ran-dall/portage-deps/raw/master/${P}-deps.tar.xz" - KEYWORDS="~amd64 ~arm64 ~x86" - RESTRICT="mirror test" - S="${WORKDIR}/${PN//fmt}-${PV}" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="+man" - -BDEPEND="man? ( app-text/scdoc )" - -src_unpack() { - if [[ ${PV} == *9999 ]]; then - git-r3_fetch - git-r3_checkout - pushd ${P}/cmd/shfmt || die "location change for module building failed" - ego get - popd || die "location reset from module building failed" - else - go-module_src_unpack - fi - default -} - -src_compile() { - ego build -v -ldflags "-s -w" -o "${PN}" "./cmd/shfmt" - if use man; then - scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1 || die "conversation of man page failed" - fi -} - -src_install() { - dobin ${PN} - if use man; then - doman shfmt.1 - fi -} |
