From c411f65f26582f4c75d2edbf4fa90a708474ace3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Aug 2022 08:07:19 +0100 Subject: gentoo auto-resync : 05:08:2022 - 08:07:19 --- dev-util/Manifest.gz | Bin 67981 -> 67980 bytes dev-util/cmake/Manifest | 7 +- dev-util/cmake/cmake-3.24.0.ebuild | 288 +++++++++++++++++++++++++++++++++++++ dev-util/cmake/cmake-9999.ebuild | 53 +++++-- dev-util/sh/Manifest | 5 +- dev-util/sh/metadata.xml | 7 + dev-util/sh/sh-3.5.1.ebuild | 30 +++- dev-util/sh/sh-9999.ebuild | 54 +++++++ 8 files changed, 425 insertions(+), 19 deletions(-) create mode 100644 dev-util/cmake/cmake-3.24.0.ebuild create mode 100644 dev-util/sh/sh-9999.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index ea2004b99fa1..14c7b1932657 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index a76a7b33d3b1..d68b05c6db1b 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -20,11 +20,16 @@ DIST cmake-3.23.2.tar.gz 9987716 BLAKE2B 6930deab4849eeb4451297006d7ace37483c4b9 DIST cmake-3.23.3-SHA-256.txt 1452 BLAKE2B aa2e2dfb2757210688a5a9131ca1fffdf6617a52219d373fd908c08e52b7d77f0e980086561a083cabaf8d9f3e24b15064bb74ad2737fcbfe11c8aba5814eb4e SHA512 22808c050e8927867fc5d2daa6999d9eed53e99015f89d1f5bef61397d1b2a9888728e86fdca8716c47f8133e02b3fa726d0cc97c0bb4ab5f5ff16a1fc0ae82f DIST cmake-3.23.3-SHA-256.txt.asc 833 BLAKE2B 10f61d7cfaa5c86d0e372f33d9ba0dbe7ae9cbfe17669107167b3ae72d0e337c63fb1c27a528dcda804323a1f0d4843b630e15427c33e0f5d5c568e27cea769d SHA512 75ff4b25fdd71bc05a7d6fec3c72ec5b8d6ed7ac980d533e6c820855c74a1a58f52d53c1a454dffe1a15568445c4c1c805891997e5709567c9e7709ba1c5e4d9 DIST cmake-3.23.3.tar.gz 9988050 BLAKE2B 55105ce380e5e9f1839fc38cc0eaefe505d58bffa60feab9813a36c7cac92f4fb6aa6b6aaad899f1e8d58cfa5ececb9e7335a470244ccc06848d833b1eddf224 SHA512 75f86abe60ef28ba9bd06546c0c24578921621fb4be942171e629366a759cf1469e430945addc85f8ce977920883c063ed26de1b78fd24dfd98d0eb604800632 +DIST cmake-3.24.0-SHA-256.txt 1646 BLAKE2B f41c0e2f280258c79c0d269a8249dc2a5e6615f50277f452f0b5b71f106f1cbcbb272bce4f28580f422cd8f294d040135abcd0d0a1e00cec3c3d3ceaef99286d SHA512 c1a0d16ba46dad95aacdf5e0985df1b75294e2fa664d15a8eabeae126b7e1517ce303c44746a58d339d2622d4dc8be263bd332af5b804ac614e64a2e633f6ec9 +DIST cmake-3.24.0-SHA-256.txt.asc 833 BLAKE2B 828f1130930635ad78b6829d8cb1780d9fb9a45edf1650e19a2869d18fd3225d869c664d28775a9b29934f1e3958dae542de3a37e5e3aa965b1704c512b2ee86 SHA512 dc0c495892716643f6ce1015240c373c6145ef070b35f7229d8f109a9bf4c771b49da6672ba765f69c293ed438e26afcab4bb6fa8a3c36f8b4ac91b49b6782bb +DIST cmake-3.24.0-docs.tar.xz 490472 BLAKE2B f7dcbee55473add99406d8956657098f78e49eb30df96d73dfc8affc2ee4aca19159956189511e1cea821974e4741fd7b1c5d28f6e8f9cc31ace80c6c504b27d SHA512 dc69388e8ab20eae3c447e95f7d1b0c153a537ae81d18ac4dc4117a7df5348a2a9f35ce8c6c18c3fabe34f7d9ce3dc3f90f2323789c65c089679abe9e359f1f6 +DIST cmake-3.24.0.tar.gz 10395167 BLAKE2B 72b75e3fa4ae1710f5e5d1ac4e356a723ec1b197c9121cd73273f079f7eb31e61fbd5acab228e9b5696c4f8ab85213da4a6cf8e35068f3ca776082742084ae6d SHA512 91507fc0643f2de20e37cd8d6a539d8cb38a80b604bf77de8e88c8446b6d7b6d02b7329d58966dc2412c6c75edcb9dfbdae02fe84965fefeb7ca47f87631fe17 EBUILD cmake-3.22.2.ebuild 7052 BLAKE2B b0c8b15546a0216be79e66918de373cf6eb45eb080fb2871aa543f7518f71876bc79df21e894cfdfbe921718bf30d2915c9242a03cbcc4f19b955a2f2b9d8d85 SHA512 d2627f09f761e83363ef1a0a960dc4660d71160a47329f141cca9c9d0404d784719b258123db1716aec885d091f55206cc85f732b4235f0d19bee4e4e5c28d33 EBUILD cmake-3.22.4.ebuild 6820 BLAKE2B 4e924937ebf2892082c9f8ac216a47376a6aad3a72872dcb8698bcd558acbc0f28e9cbb2a8653543db8fd8c75795c335835c77239e5139e66f8c196df20e4998 SHA512 b9cf3defba50e16668e2c9d04e67d2d8e7f287a68805ff0388cee0c497d592d5d6a76a7653d3a09133224b89a5b670faf54cacdb203c37d1bc567818cb4beb4c EBUILD cmake-3.22.6.ebuild 6827 BLAKE2B c219b7191f3562325b33d75c3958cdf291ada8a892212e6b132ecd43fb77437465462dd4a6adc3958faff0b01a5ead7c0edf6011a0f232cc37d69045d8b6f60a SHA512 d3e5f98312456305149800f784362c37f69b1d50ff09088b474edd450046def404d6fedc02220674caf78bfc118fc5c710c9e85a98d5e13ef81801183fccba8d EBUILD cmake-3.23.1.ebuild 7794 BLAKE2B e891b0a6ca8cf3335a46178040a6d28534277ad9c5ba830ce30d37e59afe92bc147e4bc2fac1a49b9674e7f3fc3bc936453a831a34ccb5e4546fb96ba63de857 SHA512 2fba10f3ba197d9ad36a503c7fad84916716399320b5bfeabf439cab06cfbe0640479a9bd85a5ab3ac341c5a53d74bfa7ef2ea967198073e0cd215e8fff93fc5 EBUILD cmake-3.23.2.ebuild 7794 BLAKE2B e891b0a6ca8cf3335a46178040a6d28534277ad9c5ba830ce30d37e59afe92bc147e4bc2fac1a49b9674e7f3fc3bc936453a831a34ccb5e4546fb96ba63de857 SHA512 2fba10f3ba197d9ad36a503c7fad84916716399320b5bfeabf439cab06cfbe0640479a9bd85a5ab3ac341c5a53d74bfa7ef2ea967198073e0cd215e8fff93fc5 EBUILD cmake-3.23.3.ebuild 7794 BLAKE2B e891b0a6ca8cf3335a46178040a6d28534277ad9c5ba830ce30d37e59afe92bc147e4bc2fac1a49b9674e7f3fc3bc936453a831a34ccb5e4546fb96ba63de857 SHA512 2fba10f3ba197d9ad36a503c7fad84916716399320b5bfeabf439cab06cfbe0640479a9bd85a5ab3ac341c5a53d74bfa7ef2ea967198073e0cd215e8fff93fc5 -EBUILD cmake-9999.ebuild 7794 BLAKE2B e891b0a6ca8cf3335a46178040a6d28534277ad9c5ba830ce30d37e59afe92bc147e4bc2fac1a49b9674e7f3fc3bc936453a831a34ccb5e4546fb96ba63de857 SHA512 2fba10f3ba197d9ad36a503c7fad84916716399320b5bfeabf439cab06cfbe0640479a9bd85a5ab3ac341c5a53d74bfa7ef2ea967198073e0cd215e8fff93fc5 +EBUILD cmake-3.24.0.ebuild 8736 BLAKE2B c43fba21ed32bc615225a84a1675c132bfae50b77a0f57c7aa8b49db32fc680bcc2d02fb4a3e89362184247bdda3557bc0a3841f581a1d07a6df0a5bfd25b0d6 SHA512 84351d32ec2e128467123596f695539da3c157204711726b2ef3c6329c3245301c6c387a4ce6201f021cb838f684960b6cd03375142e81608e2264dc865e93cc +EBUILD cmake-9999.ebuild 8735 BLAKE2B d6b174056d10fd02d4473ff81144b443c8f65eb602e50bdd81c9e738b221ee25ede526209c572f2fdea4f221940863510de2dd7a50e008f598dbdd2fca74f0c3 SHA512 d5fb514cbd9b3333760f989590a7ae97640116a25a2fd3685133d7bc68ece552caee8ea11b1423a93c2f4f210bd78ad35816801b8f25ae4e06e6065e0e445ba1 MISC metadata.xml 456 BLAKE2B 2dc475cae4d2f65744e25381b1e4fe8b6399225380d0f9fa81870813221d180b1c4b538c3f9249f80e921a1db8afab7071db206898fdec294372811dc456d1f5 SHA512 347c1e13f459dfb9bec9d52ce556526eb74e6c432ff28aed28f05dc17bba17934fff1ce2fc27765b390bb55aaa7b02d0800939eb4382eba6c4b85a62ec136f5a diff --git a/dev-util/cmake/cmake-3.24.0.ebuild b/dev-util/cmake/cmake-3.24.0.ebuild new file mode 100644 index 000000000000..f4e5d02e2642 --- /dev/null +++ b/dev-util/cmake/cmake-3.24.0.ebuild @@ -0,0 +1,288 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs +# Set to 1 if prebuilt, 0 if not +# (the construct below is to allow overriding from env for script) +CMAKE_DOCS_PREBUILT=${CMAKE_DOCS_PREBUILT:-1} +CMAKE_DOCS_PREBUILT_DEV=sam +CMAKE_DOCS_VERSION=$(ver_cut 1-3) +# Default to generating docs (inc. man pages) if no prebuilt; overridden later +# See bug #784815 +CMAKE_DOCS_USEFLAG="+doc" + +# 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 + CMAKE_DOCS_PREBUILT=0 + + EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git" + inherit git-r3 +else + SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" + + if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then + SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )" + fi + + 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 + +[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc" + +S="${WORKDIR}/${MY_P}" + +LICENSE="CMake" +SLOT="0" +IUSE="${CMAKE_DOCS_USEFLAG} 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] ) +" + +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=doc, there'll be newly generated docs which we install instead. + if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then + doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8] + fi + + 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 1f441d341fb6..f31888a13431 100644 --- a/dev-util/cmake/cmake-9999.ebuild +++ b/dev-util/cmake/cmake-9999.ebuild @@ -3,6 +3,16 @@ EAPI=8 +# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs +# Set to 1 if prebuilt, 0 if not +# (the construct below is to allow overriding from env for script) +CMAKE_DOCS_PREBUILT=${CMAKE_DOCS_PREBUILT:-1} +CMAKE_DOCS_PREBUILT_DEV=sam +CMAKE_DOCS_VERSION=$(ver_cut 1-3) +# Default to generating docs (inc. man pages) if no prebuilt; overridden later +# See bug #784815 +CMAKE_DOCS_USEFLAG="+doc" + # 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. @@ -16,10 +26,17 @@ MY_P="${P/_/-}" DESCRIPTION="Cross platform Make" HOMEPAGE="https://cmake.org/" if [[ ${PV} == 9999 ]] ; then - inherit git-r3 + CMAKE_DOCS_PREBUILT=0 + EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git" + inherit git-r3 else SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" + + if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then + SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )" + fi + if [[ ${PV} != *_rc* ]] ; then VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc inherit verify-sig @@ -35,9 +52,13 @@ else fi fi +[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc" + +S="${WORKDIR}/${MY_P}" + LICENSE="CMake" SLOT="0" -IUSE="doc emacs ncurses qt5 test" +IUSE="${CMAKE_DOCS_USEFLAG} emacs ncurses qt5 test" RESTRICT="!test? ( test )" RDEPEND=" @@ -66,23 +87,21 @@ BDEPEND+=" test? ( app-arch/libarchive[zstd] ) " -S="${WORKDIR}/${MY_P}" - SITEFILE="50${PN}-gentoo.el" PATCHES=( - # prefix + # 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 + # 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 + # Respect python eclasses "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch @@ -113,7 +132,7 @@ cmake_src_bootstrap() { src_unpack() { if [[ ${PV} == 9999 ]] ; then git-r3_src_unpack - elif ! use verify-sig || [[ ${PV} == *_rc ]] ; then + elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then default else cd "${DISTDIR}" || die @@ -132,20 +151,21 @@ src_prepare() { cmake_src_prepare if [[ ${CHOST} == *-darwin* ]] ; then - # disable Xcode hooks, bug #652134 + # 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 + + # 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 + # 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 + # 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 \ @@ -193,7 +213,7 @@ src_compile() { } src_test() { - # fix OutDir and SelectLibraryConfigurations tests + # 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 \ @@ -225,6 +245,11 @@ src_test() { src_install() { cmake_src_install + # If USE=doc, there'll be newly generated docs which we install instead. + if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then + doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8] + fi + if use emacs; then elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc elisp-site-file-install "${FILESDIR}/${SITEFILE}" @@ -244,6 +269,7 @@ src_install() { pkg_postinst() { use emacs && elisp-site-regen + if use qt5; then xdg_icon_cache_update xdg_desktop_database_update @@ -253,6 +279,7 @@ pkg_postinst() { pkg_postrm() { use emacs && elisp-site-regen + if use qt5; then xdg_icon_cache_update xdg_desktop_database_update diff --git a/dev-util/sh/Manifest b/dev-util/sh/Manifest index d9058b436fa3..4f8acfec5626 100644 --- a/dev-util/sh/Manifest +++ b/dev-util/sh/Manifest @@ -1,4 +1,5 @@ DIST sh-3.5.1-deps.tar.xz 3113476 BLAKE2B 0998ebeacdd7c882542eea25ad5ab3131211c686ac2ba8040b89897a60ab41ecea7fc0c45f6498eda56a4539550622e2693fed0a6a1ed5ca6af060c40a9aaf97 SHA512 b572f7334e04365d3d685ba8b87fff834fb9823e815152646659d66e92410cab03940b5a32f6eb0634c4a0cce34808d03849d8b97b17fdbec939b305b13878e9 DIST sh-3.5.1.tar.gz 222608 BLAKE2B a81af092d0f8d0ee7c05240d816a99f044bce3e35d242a815a238a27893db5bfc320efc4a0237ca9ecfa0276e4687152c87f6e0170f5326e2d0a8604f94f6adb SHA512 fd1084921254b70376b3ac47b97e2108308252fa6bd23aff1e59aaefb45a7e01c1738a46ae6f4eb255ecade77fb9659fbc8184d2473e8e4f70e520757bad506d -EBUILD sh-3.5.1.ebuild 667 BLAKE2B bff7677fb283dd6f6290f700194b363abeeae3d037853d1c36d98d98ffed8b1ceff21c08cc020d33dc8d0ef4e20a249b2979e0316a3fdcab95a555510c89bc01 SHA512 c77a8e89f402680445c1d3aabde7aee6cdd697eb536cc08bdc41d1710246b1193b742d2cd32b05dd0a7a3ea1cab6d54b31b1e426330b9de5a7f401d169064bce -MISC metadata.xml 313 BLAKE2B 17509142cbc5019a0566e03d41377d64c539a4dfd1d0458c5ea97d9d5962dde815fe9101b4d8aa4e0943589222278a255febb283af62441137c5752111b7ef4f SHA512 1d7462856c874a7dec084a7bb3d0f58e5aec0fbee61fc0f6bead7c559aba7a88b867779018f78d7ce42a657b2fc5dd192e0985325cdf9312abce4913216c9397 +EBUILD sh-3.5.1.ebuild 1124 BLAKE2B 0bde749e4856c27ab0125fb3afef356dfcd34afc588d4dc74d45389fadf1b6999245a1455fc15b5ce3424570be96c056ec5e2e06a632659d0d9a2e5dd9f03275 SHA512 94b0e355218e6cdacdd775301e6b779a74111655fbe010e0828b4f9985e753db0611eb9fb723b1f175d8651bec827e345c166a8511401bff944de460a7c283a1 +EBUILD sh-9999.ebuild 1124 BLAKE2B 0bde749e4856c27ab0125fb3afef356dfcd34afc588d4dc74d45389fadf1b6999245a1455fc15b5ce3424570be96c056ec5e2e06a632659d0d9a2e5dd9f03275 SHA512 94b0e355218e6cdacdd775301e6b779a74111655fbe010e0828b4f9985e753db0611eb9fb723b1f175d8651bec827e345c166a8511401bff944de460a7c283a1 +MISC metadata.xml 608 BLAKE2B b5a596e7ef469d9868a472e2529206776ae934de853800c0e0a520532e428fb085556282d21867dd9dd4a5c5a184feba43e119944480836da998f0ffa3c477ca SHA512 32a59e3e7d7c060fe742fd0705d7e9cf371c92df4a34c1f295b93a004e6ddebc46552a5fd54b8ca19770b194bfb79114cfffcbc4c686748a9e1d5ede317d79e9 diff --git a/dev-util/sh/metadata.xml b/dev-util/sh/metadata.xml index 1e811dcb7fc9..02bd9ab81cf5 100644 --- a/dev-util/sh/metadata.xml +++ b/dev-util/sh/metadata.xml @@ -5,6 +5,13 @@ sam@gentoo.org Sam James + + ran.dall@icloud.com + Randall T. Vasquez + + + A shell parser, formatter, and interpreter with bash support; includes shfmt. Supports POSIX Shell, Bash, and mksh. + mvdan/sh diff --git a/dev-util/sh/sh-3.5.1.ebuild b/dev-util/sh/sh-3.5.1.ebuild index f5098aea771b..ea48ab9e9b7d 100644 --- a/dev-util/sh/sh-3.5.1.ebuild +++ b/dev-util/sh/sh-3.5.1.ebuild @@ -7,17 +7,38 @@ inherit go-module DESCRIPTION="A shell parser, formatter, and interpreter with bash support" HOMEPAGE="https://github.com/mvdan/sh" -SRC_URI="https://github.com/mvdan/sh/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" + +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://github.com/mvdan/sh.git" + inherit git-r3 +else + SRC_URI="https://github.com/mvdan/sh/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" + KEYWORDS="~amd64 ~arm64 ~x86" + S="${WORKDIR}/${PN//fmt/}-${PV}" +fi LICENSE="Apache-2.0 BSD" SLOT="0" -KEYWORDS="~amd64" +IUSE="+man" + +BDEPEND="man? ( app-text/scdoc )" + +src_unpack() { + default + if [[ ${PV} == *9999 ]]; then + git-r3_src_unpack + go-module_live_vendor + fi +} src_compile() { # Not bothering with gosh for now as it's very new # https://github.com/mvdan/sh#gosh ego build ./cmd/shfmt + if use man; then + scdoc shfmt.1 || die "conversation of man page failed" + fi } src_test() { @@ -27,4 +48,7 @@ src_test() { src_install() { dobin shfmt + if use man; then + doman shfmt.1 + fi } diff --git a/dev-util/sh/sh-9999.ebuild b/dev-util/sh/sh-9999.ebuild new file mode 100644 index 000000000000..ea48ab9e9b7d --- /dev/null +++ b/dev-util/sh/sh-9999.ebuild @@ -0,0 +1,54 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="A shell parser, formatter, and interpreter with bash support" +HOMEPAGE="https://github.com/mvdan/sh" + +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://github.com/mvdan/sh.git" + inherit git-r3 +else + SRC_URI="https://github.com/mvdan/sh/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" + KEYWORDS="~amd64 ~arm64 ~x86" + S="${WORKDIR}/${PN//fmt/}-${PV}" +fi + +LICENSE="Apache-2.0 BSD" +SLOT="0" +IUSE="+man" + +BDEPEND="man? ( app-text/scdoc )" + +src_unpack() { + default + if [[ ${PV} == *9999 ]]; then + git-r3_src_unpack + go-module_live_vendor + fi +} + +src_compile() { + # Not bothering with gosh for now as it's very new + # https://github.com/mvdan/sh#gosh + ego build ./cmd/shfmt + if use man; then + scdoc shfmt.1 || die "conversation of man page failed" + fi +} + +src_test() { + cd syntax || die + ego test -run=- +} + +src_install() { + dobin shfmt + if use man; then + doman shfmt.1 + fi +} -- cgit v1.2.3