diff options
| -rw-r--r-- | dev-build/cmake/Manifest | 3 | ||||
| -rw-r--r-- | dev-build/cmake/cmake-4.2.1.ebuild | 323 | ||||
| -rw-r--r-- | dev-util/diffoscope/Manifest | 1 | ||||
| -rw-r--r-- | dev-util/diffoscope/diffoscope-309.ebuild | 143 | ||||
| -rw-r--r-- | media-libs/libjpeg-turbo/libjpeg-turbo-3.1.2.ebuild | 2 | ||||
| -rw-r--r-- | media-libs/libwebp/libwebp-1.6.0.ebuild | 2 | ||||
| -rw-r--r-- | media-libs/tiff-compat/tiff-compat-4.4.0-r4.ebuild | 2 | ||||
| -rw-r--r-- | net-misc/streamlink/Manifest | 1 | ||||
| -rw-r--r-- | net-misc/streamlink/streamlink-7.5.0.ebuild | 73 | ||||
| -rw-r--r-- | sys-apps/moor/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/moor/moor-1.33.0.ebuild | 54 | ||||
| -rw-r--r-- | sys-apps/moor/moor-2.8.2-r1.ebuild | 62 |
12 files changed, 473 insertions, 197 deletions
diff --git a/dev-build/cmake/Manifest b/dev-build/cmake/Manifest index 47d61388f241..3d091833f75f 100644 --- a/dev-build/cmake/Manifest +++ b/dev-build/cmake/Manifest @@ -15,3 +15,6 @@ DIST cmake-4.1.3.tar.gz 12049989 BLAKE2B fa220d86e9fc8f9bdfb20123b6b326f47fced48 DIST cmake-4.1.4-SHA-256.txt 2015 BLAKE2B 6e8b2f7c769fbf7b5dbdec081edd8c9169f80fb9b16119b5ace3e5596a14394abe8287f45c537dc2ded972e521745c909d9b33e242c1d8fe34abda9791cec71d SHA512 c806bc17dbad51b5bd90354bf3df31232bd39f7a8dee30205807cc7e2ba63eaddc1138f8512c860e86d21cc7075f58cda85f4f9f3f9001810a243e6ebef0261c DIST cmake-4.1.4-SHA-256.txt.asc 833 BLAKE2B e2685feadb1565a5d14eea89eb5e505dd3988a10f3539d40d44411f425db7baba7fea7cabe894a706e86f58ff8c7332ed26a56711113d099ab27f874177036c3 SHA512 b316dec0ed3f5df1d03b8fdd17afa997df5da723072c4958fe728d4abf5156b36c9e79e0344735a20d31d4a2366aa22b4ae23f334b831ce67ed6bf23183631da DIST cmake-4.1.4.tar.gz 12051840 BLAKE2B 0d43042b70b1fe27bb1e1eeb2bda1b24923887cb0fdaca2fff11771c980b7a9b24637559315f58c53066a53aa40dd3e2127de8cf4fd7eb0d25844e27a7a08f17 SHA512 c8a5eb269f98f70db1f52675822e1b371864fa86037ed4f1714f77abaf5c7b3fae307bfc4392add29c2c600b502d8876d7d1bb260e331ee6607cb02356a7e8a8 +DIST cmake-4.2.1-SHA-256.txt 2015 BLAKE2B 6896490b0da207448bdcda863296b47fa6be38069743f00e77065427cd68bd7fb7b8893ce4e6dc6213f9d7fe34bc764bd5e48cf32fccbaf24350870188a7dc33 SHA512 1adeac1b105bd16b9f593e87ba3d8ffbf285ec78a36f565549b97c2e796a4bbb594f00184809e0118ad71137b33c9d3298a673d296cf42b7a37ab32b9c05b882 +DIST cmake-4.2.1-SHA-256.txt.asc 833 BLAKE2B 8dbb976c39be74f680070cb9b23689d334daf7518317548fe3ab8eace7007329161b6307aca441238222a8f1cd5674f01e117bab143364eb87876a50e5ca6b1a SHA512 4a07deb385ab72aa20b1fe7d5defa790101e0e6454ef66bdf125feab5ab363e58e856884ebcdbe75677978a616dc99eb181dfdeb9bcc4a67fd8a28ce48019410 +DIST cmake-4.2.1.tar.gz 12341564 BLAKE2B ba5f7acf8b0c8acadab93b159171b12ee866215a2f16f01d424c05520b97dcc7ad19acb19ed047d38cd4e5766e4676b43df0d092ae18db6be7218df58c4933cc SHA512 75617692e975f5974bc015d62983e48d0dedaed2daa1e25d93807d25c6ed836e73e37de064e1e924078162fc20f38f9210ac1c4d699c9bd795050119abc848ce diff --git a/dev-build/cmake/cmake-4.2.1.ebuild b/dev-build/cmake/cmake-4.2.1.ebuild new file mode 100644 index 000000000000..ad820d758f95 --- /dev/null +++ b/dev-build/cmake/cmake-4.2.1.ebuild @@ -0,0 +1,323 @@ +# Copyright 1999-2025 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:=1} + +CMAKE_DOCS_PREBUILT_DEV=sam +CMAKE_DOCS_VERSION=4.0.0_rc1 +#CMAKE_DOCS_VERSION=${PV} +#CMAKE_DOCS_VERSION=$(ver_cut 1-2).0 +# Default to generating docs (inc. man pages) if no prebuilt; overridden later +# See bug #784815 +CMAKE_DOCS_USEFLAG="+doc" + +CMAKE_QA_COMPAT_SKIP=1 # bug #964514; cmake itself is the last pkg we worry about + +# 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 flag-o-matic multiprocessing \ + toolchain-funcs 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 + + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradking.asc + inherit verify-sig + + SRC_URI+=" verify-sig? ( + https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}-SHA-256.txt + https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}-SHA-256.txt.asc + https://github.com/Kitware/CMake/releases/download/v${PV/_/-}/${MY_P}-SHA-256.txt + https://github.com/Kitware/CMake/releases/download/v${PV/_/-}/${MY_P}-SHA-256.txt.asc + )" + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + fi + + BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20250904 )" +fi + +[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc" + +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD" +SLOT="0" +IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses test" +RESTRICT="!test? ( test )" + +# >= 1.51.0-r1 for ppc32 workaround (bug #941738) +RDEPEND=" + >=app-arch/libarchive-3.3.3:= + app-crypt/rhash:0= + >=dev-libs/expat-2.0.1 + >=dev-libs/jsoncpp-1.9.2-r2:0= + >=dev-libs/libuv-1.51.0-r1:= + >=net-misc/curl-7.21.5[ssl] + virtual/zlib:= + virtual/pkgconfig + dap? ( dev-cpp/cppdap ) + gui? ( dev-qt/qtbase:6[gui,widgets] ) + ncurses? ( sys-libs/ncurses:= ) +" +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.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch + "${FILESDIR}"/${PN}-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch + # Misc + "${FILESDIR}"/${PN}-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch + "${FILESDIR}"/${PN}-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch + # Cuda + "${FILESDIR}/${PN}-3.30.3-cudahostld.patch" + + # 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" +} + +pkg_pretend() { + if [[ -z ${EPREFIX} ]] ; then + local file + local errant_files=() + + # See bug #599684 and bug #753581 (at least) + for file in /etc/arch-release /etc/redhat-release /etc/debian_version ; do + if [[ -e ${file} ]]; then + errant_files+=( "${file}" ) + fi + done + + # If errant files exist + if [[ ${#errant_files[@]} -gt 0 ]]; then + eerror "Errant files found!" + eerror "The presence of these files is known to confuse CMake's" + eerror "library path logic. Please (re)move these files:" + + for file in "${errant_files[@]}"; do + eerror " mv ${file} ${file}.bak" + done + + die "Stray files found in /etc/, see above message" + fi + fi +} + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + elif [[ ${PV} == *_rc* ]] || ! use verify-sig ; 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 system integration, bug #933744 + sed -i -e 's/__APPLE__/__DISABLED__/' \ + Source/cmFindProgramCommand.cxx \ + Source/CPack/cmCPackGeneratorFactory.cxx || die + sed -i -e 's/__MAC_OS_X_VERSION_MIN_REQUIRED/__DISABLED__/' \ + Source/cmMachO.cxx || die + sed -i -e 's:CPack/cmCPack\(Bundle\|DragNDrop\|PKG\|ProductBuild\)Generator.cxx::' \ + Source/CMakeLists.txt || 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" + + ## in theory we could handle these flags in src_configure, as we do in many other packages. But we *must* + ## handle them as part of bootstrapping, sadly. + + # Fix linking on Solaris + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl + + # ODR warnings, bug #858335 + # https://gitlab.kitware.com/cmake/cmake/-/issues/20740 + filter-lto + + # 4.0.0_rc1 is missing this, fails to configure + # https://gitlab.kitware.com/cmake/cmake/-/issues/26712 + touch .clang-tidy Utilities/.clang-tidy || die + + 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() { + local mycmakeargs=( + -DCMAKE_USE_SYSTEM_LIBRARIES=ON + -DCMake_ENABLE_DEBUGGER=$(usex dap) + -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) + -DBUILD_QtDialog=$(usex gui) + ) + + use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=6 ) + + cmake_src_configure +} + +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 + + unset CLICOLOR CLICOLOR_FORCE CMAKE_COMPILER_COLOR_DIAGNOSTICS CMAKE_COLOR_DIAGNOSTICS + + pushd "${BUILD_DIR}" > /dev/null || die + + # Excluded tests: + # BootstrapTest: we actually 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)" \ + ) + + local -x QT_QPA_PLATFORM=offscreen + + 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 + + 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() { + if use gui; then + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi +} + +pkg_postrm() { + if use gui; then + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi +} diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest index 1a484714117c..b9338f78b65a 100644 --- a/dev-util/diffoscope/Manifest +++ b/dev-util/diffoscope/Manifest @@ -1,3 +1,4 @@ DIST diffoscope-303.tar.bz2 3153646 BLAKE2B 0761db56b0289cef64d8247139ea1ed3e70775aceda0e69c21c36fef62d649f8ffdf3fbf6eefeb3917052861b202598e1832e01969ed861758c53827b9faaa47 SHA512 725775417f58ab8f47960c7edb73c4f1d4c730afd8ca5a4ff9636e37640d2e6ec089a4e482d83a0232e42c2d4264c52d921781b8104b8c20157669e65eea78f9 DIST diffoscope-306.tar.bz2 3154052 BLAKE2B eda650b7c9a253792e30f132f9b9b54eb0bb56be569cfc22c09e4858bdd5f0f466d6148bb92311eef7af4fd02054a0714914380c0c530fb133e240c3876c5107 SHA512 d29c7aef084d075a2a4a9f8aa738dfb230b277609804341fb3245310a43bedb2e4f0e2cd6b9d9470716fe2de7e4e7a1463ec7b98aac802d069fef91d0c32bfc8 DIST diffoscope-308.tar.bz2 3153203 BLAKE2B f680d6baf8d3172c87b4b1f68757a20a32d98f46ad5f1f26b97f47dd9d71d1ab73fed9beb3ea2e801f08b0c18333e616fdf69304431cb3ad6d3139244b0c1ec5 SHA512 05d9c4cdee081a48f7c2acef444401ccbbbe6b37874eb9182a660a267e9d4b92f3bf45fde66a02037b1cffb0ddd297b36a5768fab3ce7c231e81f4b6231cc292 +DIST diffoscope-309.tar.bz2 3153219 BLAKE2B fc5089e914d1a1a1eb8507a7b696a0d4331c3c7e11c31e5ad19a3128310d817ae1612670a5b4e6636b65b6e221c4f097d5d4f878941d725dbe33639c1e751eb1 SHA512 ef254966348fb9e78cbb1926160b27bf61e5ddc501a4ac174914b0101b246b0574012b0b23e8ca9ca0a58c2a51eff7bf97a5fa343eae9763bf5b72f6729a8062 diff --git a/dev-util/diffoscope/diffoscope-309.ebuild b/dev-util/diffoscope/diffoscope-309.ebuild new file mode 100644 index 000000000000..fe95eb4abf68 --- /dev/null +++ b/dev-util/diffoscope/diffoscope-309.ebuild @@ -0,0 +1,143 @@ +# Copyright 2022-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{12..14} ) +PYTHON_REQ_USE="ncurses" +inherit distutils-r1 toolchain-funcs + +DESCRIPTION="Will try to get to the bottom of what makes files or directories different" +HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/" +# We could use pypi, but upstream provide distribution tarballs, so let's use those. +# TODO: verify-sig +SRC_URI="https://diffoscope.org/archive/${P}.tar.bz2" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file +find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma +mono opendocument pascal pdf postscript R rpm sqlite squashfs +ssh tar test tcpdump zip zlib zstd" +RESTRICT="!test? ( test )" + +RDEPEND=" + || ( + dev-python/python-magic[${PYTHON_USEDEP}] + sys-apps/file[python,${PYTHON_USEDEP}] + ) + dev-python/libarchive-c[${PYTHON_USEDEP}] + dev-python/distro[${PYTHON_USEDEP}] + dev-python/python-tlsh[${PYTHON_USEDEP}] + acl? ( sys-apps/acl ) + binutils? ( sys-devel/binutils ) + bzip2? ( app-arch/bzip2 ) + libcaca? ( media-libs/libcaca ) + colord? ( x11-misc/colord ) + cpio? ( app-alternatives/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 ) + 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? ( llvm-core/llvm ) + lzma? ( app-arch/xz-utils ) + mono? ( dev-lang/mono ) + opendocument? ( app-text/odt2txt ) + pascal? ( dev-lang/fpc ) + pdf? ( + app-text/pdftk + app-text/poppler + dev-python/pypdf[${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? ( virtual/openssh ) + tar? ( app-arch/tar ) + tcpdump? ( net-analyzer/tcpdump ) + zip? ( app-arch/unzip ) + zlib? ( app-arch/gzip ) + zstd? ( app-arch/zstd ) +" + +# pull in optional tools for tests: +# img2txt: bug #797688 +# docx2txt: bug #797688 +BDEPEND=" + test? ( + || ( + >=app-arch/7zip-24.09[symlink(+)] + app-arch/p7zip + ) + app-text/docx2txt + app-text/html2text + media-libs/libcaca + virtual/imagemagick-tools[jpeg] + ) +" + +EPYTEST_DESELECT=( + # Test seems to use different tarball + tests/test_presenters.py::test_text_proper_indentation + + # Needs triage + tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found + tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode + tests/comparators/test_gif.py::test_has_visuals + + # img2txt based failures, bug #797688 + tests/comparators/test_ico_image.py::test_diff + tests/comparators/test_ico_image.py::test_diff_meta + tests/comparators/test_ico_image.py::test_diff_meta2 + tests/comparators/test_ico_image.py::test_has_visuals + tests/comparators/test_jpeg_image.py::test_diff + tests/comparators/test_jpeg_image.py::test_compare_non_existing + tests/comparators/test_jpeg_image.py::test_diff_meta + tests/comparators/test_jpeg_image.py::test_has_visuals + + # docx2txt based falures, bug #797688 + tests/comparators/test_docx.py::test_diff + + # Formatting + tests/test_source.py::test_code_is_black_clean + + # Fails on ZFS + tests/test_main.py::test_non_unicode_filename + + # Fails on (unreleased) LLVM 16 with minor difference + #tests/comparators/test_macho.py::test_llvm_diff + #tests/comparators/test_elf.py::test_libmix_differences +) + +distutils_enable_tests pytest + +src_test() { + case $(tc-get-ptr-size) in + 4) + EPYTEST_IGNORE+=( + # Needs fixing in Perl itself (bug #934443) + tests/comparators/test_epub.py + tests/comparators/test_zip.py + ) + ;; + *) + ;; + esac + + distutils-r1_src_test +} diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-3.1.2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-3.1.2.ebuild index 89890400d96f..2e0a849c656c 100644 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-3.1.2.ebuild +++ b/media-libs/libjpeg-turbo/libjpeg-turbo-3.1.2.ebuild @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="BSD IJG ZLIB java? ( GPL-2-with-classpath-exception )" SLOT="0/0.2" if [[ $(ver_cut 3) -lt 90 ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris" fi IUSE="cpu_flags_arm_neon java static-libs test" RESTRICT="!test? ( test )" diff --git a/media-libs/libwebp/libwebp-1.6.0.ebuild b/media-libs/libwebp/libwebp-1.6.0.ebuild index 2d839c310b79..2f169660cdb6 100644 --- a/media-libs/libwebp/libwebp-1.6.0.ebuild +++ b/media-libs/libwebp/libwebp-1.6.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0/7" # subslot = libwebp soname version if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="cpu_flags_arm_neon cpu_flags_x86_avx2 cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff" diff --git a/media-libs/tiff-compat/tiff-compat-4.4.0-r4.ebuild b/media-libs/tiff-compat/tiff-compat-4.4.0-r4.ebuild index feb12dd8a813..6ff25ff77d18 100644 --- a/media-libs/tiff-compat/tiff-compat-4.4.0-r4.ebuild +++ b/media-libs/tiff-compat/tiff-compat-4.4.0-r4.ebuild @@ -23,7 +23,7 @@ S="${WORKDIR}/${PN/-compat}-$(ver_cut 1-3)" LICENSE="libtiff" SLOT="4" if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="+cxx jbig jpeg lerc lzma test webp zlib zstd" RESTRICT="!test? ( test )" diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest index 408de33fb430..12e343686465 100644 --- a/net-misc/streamlink/Manifest +++ b/net-misc/streamlink/Manifest @@ -1,2 +1 @@ -DIST streamlink-7.5.0.tar.gz 797855 BLAKE2B 1840d157bf0f5d40f089763d08b3758b5f6828df7079a0fbc1d9ce6a9d202f176461e1eed241b747c5720ed94c97f14487cace0455d58c840326288ac57d2d7f SHA512 00a2d801eb9afafa1fd9a1a79f87bfd0feb0fbeb70be28962dbe1e1212eabc8cdf60048cc994d686a5ee46a0658b34a5a583417da40e26e6eb41ae83a796b782 DIST streamlink-7.6.0.tar.gz 808110 BLAKE2B bd77e3deb7663a39904ff666a038214477b95bead2b070be311d60e5a617732bf25a6fec9ee7a8d7515b845e8fef2183537a65becc2db66f43168e273a24e95a SHA512 1efadf85f5a7d0767e258219b83cb1524a10057d90ea89a6a402b35a22fb0545fc730b89e0e683f21bbd406588e872aac392f415df82552c38237746fff79f9f diff --git a/net-misc/streamlink/streamlink-7.5.0.ebuild b/net-misc/streamlink/streamlink-7.5.0.ebuild deleted file mode 100644 index f8d43968899b..000000000000 --- a/net-misc/streamlink/streamlink-7.5.0.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/streamlink/${PN}.git" - inherit git-r3 -fi - -DISTUTILS_SINGLE_IMPL=1 -# >= 6.2.1 uses a bunch of setuptools hooks instead of vanilla setuptools -# https://github.com/streamlink/streamlink/commit/194d9bc193f5285bc1ba33af5fd89209a96ad3a7 -DISTUTILS_USE_PEP517=standalone -PYTHON_COMPAT=( python3_{11..14} ) -PYTHON_REQ_USE='xml(+),threads(+)' -inherit distutils-r1 - -DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" -HOMEPAGE="https://streamlink.github.io/" - -if [[ ${PV} != 9999* ]]; then - SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz" -fi - -LICENSE="BSD-2 Apache-2.0" -SLOT="0" -if [[ ${PV} != 9999* ]]; then - KEYWORDS="amd64 ~arm ~arm64 ~x86" -fi - -# See https://github.com/streamlink/streamlink/commit/9d8156dd794ee0919297cd90d85bcc11b8a28358 for chardet/charset-normalizer dep -RDEPEND=" - media-video/ffmpeg - $(python_gen_cond_dep ' - dev-python/certifi[${PYTHON_USEDEP}] - || ( - dev-python/chardet[${PYTHON_USEDEP}] - dev-python/charset-normalizer[${PYTHON_USEDEP}] - ) - >=dev-python/requests-2.26.0[${PYTHON_USEDEP}] - dev-python/isodate[${PYTHON_USEDEP}] - >=dev-python/lxml-4.6.4[${PYTHON_USEDEP}] - >=dev-python/websocket-client-1.2.1[${PYTHON_USEDEP}] - dev-python/pycountry[${PYTHON_USEDEP}] - >=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}] - >dev-python/pysocks-1.5.7[${PYTHON_USEDEP}] - >=dev-python/trio-0.22.0[${PYTHON_USEDEP}] - >=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}] - >=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}] - ') -" -BDEPEND=" - $(python_gen_cond_dep ' - >=dev-python/setuptools-77[${PYTHON_USEDEP}] - test? ( - >=dev-python/freezegun-1.5.0[${PYTHON_USEDEP}] - dev-python/pytest-trio[${PYTHON_USEDEP}] - dev-python/requests-mock[${PYTHON_USEDEP}] - ) - ') -" -if [[ ${PV} == 9999* ]]; then - BDEPEND+=" - $(python_gen_cond_dep ' - >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}] - ') - " -fi - -EPYTEST_PLUGINS=( pytest-trio freezegun requests-mock ) - -distutils_enable_tests pytest diff --git a/sys-apps/moor/Manifest b/sys-apps/moor/Manifest index 5e1ac1e0bde2..e80d055f56ed 100644 --- a/sys-apps/moor/Manifest +++ b/sys-apps/moor/Manifest @@ -1,8 +1,4 @@ -DIST moar-1.33.0-deps.tar.xz 1455220 BLAKE2B 6cba60dd76f756aa1f7886908167980bdf07834940ef0843e20f7bf75b18860dac1ef5b4196c5b4215e91e6152656e12676ae061f1ca05b2c28553a153a9f278 SHA512 dbc1c19aec4188a07bfd676bf798ede215cf1c453204a9f2774772b5cc539e05d459f1fdf12f28bc61f0b079791c5fb8c6d0e5096d2b57db403090297def16f3 -DIST moar-1.33.0.tar.gz 2870767 BLAKE2B 51f52d23245eed30951d0ba12ed3cff5b441d4d15ae308ede6324da64bbf7c46205b5ba1b1ebb1391af6e12f083297990dc412670262354285700f31d4e9ed23 SHA512 a24272f23da523c2fc0eb0887652c317a9d66d7fb757adcb22a5f1c61c0677480c85fe5ae16f385f15832f102bf248c357806323a006d52f519beabb5a529b20 DIST moor-2.4.1-deps.tar.xz 1461024 BLAKE2B bcdccd79020a6c461ccc81a4e65af3d7efcd2c0c2101ac2896f779efd8ddd1272fac20125522d9a1528c21949783fe87046f15aef2088c6abcc0aeaa4f446583 SHA512 1f854a03fb58b82baf9ba5be6750c0a043c9d1460e75d775d2ae1acca1574927b5da25270247464ace182b7e2e46d3e447e3f36d345e5da957905b7ddebed14b DIST moor-2.4.1.tar.gz 3016333 BLAKE2B dbeae7a1f2d65f83e88c677490332a4c8480367c9934acd3b0277abc495905428934281faf03ab060f1abe0068dfb51d3d9c51121013ff40efa938421ec2f9c7 SHA512 3dcc3b48401853791ad6c38e2fb249c0dd45cd96b33b2e4bc765455b358d658f06ba9732214a778370cc33949d48fe7806445354913df23225d32c9657dd1fd0 -DIST moor-2.8.2-deps.tar.xz 1461024 BLAKE2B bcdccd79020a6c461ccc81a4e65af3d7efcd2c0c2101ac2896f779efd8ddd1272fac20125522d9a1528c21949783fe87046f15aef2088c6abcc0aeaa4f446583 SHA512 1f854a03fb58b82baf9ba5be6750c0a043c9d1460e75d775d2ae1acca1574927b5da25270247464ace182b7e2e46d3e447e3f36d345e5da957905b7ddebed14b -DIST moor-2.8.2.tar.gz 3028081 BLAKE2B b88abcdc7b29653dc89c8a2040f35b24de74d358ce6415b9c89e5a7a1d7c69123c2de5a67f7be090cfa45945bccdee9d7d305b9d193bf350e84e1ffab84246d2 SHA512 cf503489e5d397103276b51fbd1b62525a8f09a94e4584692b275728a8fcf44b899ea5f7e896aece87fcbc9dddbb9ef1228d3c0d62cc97c682b45206078e09af DIST moor-2.9.1-deps.tar.xz 1498364 BLAKE2B f12ea0bb6c4748398e18c741ece3fb8c66905096f62813ff9cf44e27b5c472fb56bd93e06fae8cd7802424707902d5b4cd7852fd4b3819cbe812d9e691aa2bac SHA512 84c491303b8a19d9fb086e9abfbe1f1b1c776877ed1a99ac1328152f62049fe7282ce436758adcf2ef07749c06386b7e7d6d75a84d977985c5a5772d695016df DIST moor-2.9.1.tar.gz 3031521 BLAKE2B 70e8c01bf3c8d91af458393877c80072d0e1a2d38c286f0b6d77cf9a527c290c806f65f446eaddb93860a57cfa7fd3db561448e8d89f9b729a6354d00a62d0ee SHA512 ce1e01b651341b1257fd12f22d89d437596f282355fd604c9720be057d0bb1abe0054a5e67ba2f9d06adfce133bbee3bbc0a3a3c1bca91d51efeda786e47c3c0 diff --git a/sys-apps/moor/moor-1.33.0.ebuild b/sys-apps/moor/moor-1.33.0.ebuild deleted file mode 100644 index b3e21230ef8c..000000000000 --- a/sys-apps/moor/moor-1.33.0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 2023-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit go-env go-module - -DESCRIPTION="Pager designed to do the right thing without any configuration" -HOMEPAGE="https://github.com/walles/moor" -SRC_URI="https://github.com/walles/moor/archive/refs/tags/v${PV}.tar.gz -> moar-${PV}.tar.gz" -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/moar/moar-${PV}-deps.tar.xz" -S="${WORKDIR}"/moar-${PV} - -LICENSE="BSD-2 BSD MIT" -# Dependent licenses -LICENSE+=" Apache-2.0 BSD BSD-2 MIT" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64" -IUSE="test" -RESTRICT="!test? ( test )" - -# moarvm: https://github.com/walles/moar/issues/143 -RDEPEND="!dev-lang/moarvm" -BDEPEND=" - test? ( - app-arch/bzip2 - app-arch/xz-utils - ) -" - -src_unpack() { - default - - if [[ -d "${WORKDIR}"/vendor ]] ; then - mv "${WORKDIR}"/vendor "${S}"/vendor || die - fi - go-env_set_compile_environment -} - -src_compile() { - # https://github.com/walles/moar/blob/master/build.sh#L28 - ego build -ldflags="-w -X main.versionString=${PV}" -o moar -} - -src_test() { - # From test.sh (we don't run that because it has some linting etc) - ego test -timeout 20s ./... -} - -src_install() { - dobin moar - doman moar.1 - einstalldocs -} diff --git a/sys-apps/moor/moor-2.8.2-r1.ebuild b/sys-apps/moor/moor-2.8.2-r1.ebuild deleted file mode 100644 index cf510da05e60..000000000000 --- a/sys-apps/moor/moor-2.8.2-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 2023-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit go-env go-module eapi9-ver - -DESCRIPTION="Pager designed to do the right thing without any configuration" -HOMEPAGE="https://github.com/walles/moor" -SRC_URI="https://github.com/walles/moor/archive/refs/tags/v${PV}.tar.gz -> moor-${PV}.tar.gz" -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/moor/moor-${PV}-deps.tar.xz" - -LICENSE="BSD-2 BSD MIT" -# Dependent licenses -LICENSE+=" Apache-2.0 BSD BSD-2 MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" -IUSE="test l10n_ru" -RESTRICT="!test? ( test )" - -BDEPEND=" - test? ( - app-arch/bzip2 - app-arch/xz-utils - ) -" - -src_unpack() { - default - - if [[ -d "${WORKDIR}"/vendor ]] ; then - mv "${WORKDIR}"/vendor "${S}"/vendor || die - fi - go-env_set_compile_environment -} - -src_compile() { - # https://github.com/walles/moor/blob/master/build.sh#L28 - ego build -ldflags="-w -X main.versionString=${PV}" -o moor ./cmd/moor -} - -src_test() { - # From test.sh (we don't run that because it has some linting etc) - ego test -timeout 20s ./... -} - -src_install() { - dobin moor - doman moor.1 - einstalldocs -} - -pkg_postinst() { - if use l10n_ru ; then - ewarn "This package does not work out of the box with all Russian locales." - ewarn "If using ru_RU.UTF-8, it will not startup. Please see bug #964663." - fi - - if ver_replacing -lt 2 ; then - ewarn "moar has been renamed to moor, please update any scripts." - fi -} |