Merge updates from master

This commit is contained in:
Repository mirror & CI
2024-08-20 16:03:55 +00:00
11 changed files with 106 additions and 327 deletions
-63
View File
@@ -1,63 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit vcs-clean
DESCRIPTION="JavaScript display engine for LaTeX, MathML and AsciiMath"
HOMEPAGE="https://www.mathjax.org/"
SRC_URI="https://github.com/mathjax/MathJax/archive/${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}"/MathJax-${PV}
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="doc examples"
RDEPEND="doc? ( app-doc/mathjax-docs:${SLOT} )"
RESTRICT="binchecks strip"
make_webconf() {
# web server config file - should we really do this?
cat > $1 <<-EOF
Alias /MathJax/ ${EPREFIX}${webinstalldir}/
Alias /mathjax/ ${EPREFIX}${webinstalldir}/
<Directory ${EPREFIX}${webinstalldir}>
Options None
AllowOverride None
Order allow,deny
Allow from all
</Directory>
EOF
}
src_prepare() {
default
egit_clean
}
src_install() {
local DOCS=( README.md )
if use doc; then
dodir /usr/share/doc/${P}
dosym ../${PN}-docs-${SLOT}/html /usr/share/doc/${P}/html
fi
default
if use examples; then
insinto /usr/share/${PN}/examples
doins -r test/*
fi
rm -r test docs LICENSE README.md || die
webinstalldir=/usr/share/${PN}
insinto ${webinstalldir}
doins -r *
make_webconf MathJax.conf
insinto /etc/httpd/conf.d
doins MathJax.conf
}
-47
View File
@@ -1,47 +0,0 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit vcs-clean
DESCRIPTION="JavaScript display engine for LaTeX, MathML and AsciiMath"
HOMEPAGE="https://www.mathjax.org/"
SRC_URI="https://github.com/mathjax/MathJax/archive/${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/MathJax-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="doc"
RDEPEND="doc? ( ~app-doc/mathjax-docs-${PV} )"
src_prepare() {
default
egit_clean
}
src_install() {
local DOCS=( CONTRIBUTING.md README.md )
default
if use doc; then
# We need best_version to determine the right revision for
# app-doc/mathjax-docs.
local docsPF=$(best_version app-doc/mathjax-docs)
# Strip the (known) category from the best_version output.
docsPF=${docsPF#app-doc/}
dosym "../${docsPF}/html" "/usr/share/doc/${PF}/html"
fi
insinto "/usr/share/${PN}"
# Start the install beneath the "es5" directory for compatibility with
# Arch, Solus, and Void Linux, but leave a fake "es5" symlink for
# packages (like doxygen) that expect it.
doins -r es5/*
dosym -r "/usr/share/${PN}" "/usr/share/${PN}/es5"
}
+1
View File
@@ -1 +1,2 @@
DIST ncnn-20240410.tar.gz 12835689 BLAKE2B b4c2ffdf525719dca81d020695f03cd963c3a1f1a0ecc61b6e08c75da212d280210bf1be9b54343a771661fef747675e7f08d0dd9e3ea942adfda1e07d1f6868 SHA512 61865af26aecc6b0eccdfd46c5b3f6e4dd06d7409298051c91d141e64b8c15690f2f982c0aeb3a11d3a575061ab7606710cb0e710f4cb6539c7a14ff440aaaf7
DIST ncnn-20240820.tar.gz 12963701 BLAKE2B cf92ac70fb0256ae4b78f03d5a670622071f6f0e9b4ad1ee6a18238852f66b3d6b0456d33b2cf2eb691c351b1e8c7b0a8427fb20342029c79f33626f09d9bba5 SHA512 cbef59021231df7409c73a270f147e72daefa1230ccc072aec7225078097ec8e99d4dd82e8aaa93665361c4c24b3812e05f08da5c9a82a575ef2aad70c0828fe
+68
View File
@@ -0,0 +1,68 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake toolchain-funcs
DESCRIPTION="High-performance neural network inference framework"
HOMEPAGE="https://github.com/Tencent/ncnn/"
SRC_URI="
https://github.com/Tencent/ncnn/archive/refs/tags/${PV}.tar.gz
-> ${P}.tar.gz
"
LICENSE="BSD ZLIB"
SLOT="0/${PV}" # currently has unstable ABI that often requires rebuilds
KEYWORDS="~amd64 ~x86"
IUSE="openmp tools +vulkan"
# Need the static library to run tests + skip vulkan / GPU:
# -DNCNN_BUILD_TESTS=ON -DNCNN_SHARED_LIB=OFF -DNCNN_VULKAN=OFF
RESTRICT="test"
RDEPEND="
tools? (
dev-cpp/abseil-cpp:=
dev-libs/protobuf:=
)
vulkan? (
dev-util/glslang:=
media-libs/vulkan-loader
)
"
DEPEND="
${RDEPEND}
vulkan? ( dev-util/vulkan-headers )
"
DOCS=( README.md docs/. )
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
pkg_setup() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
src_configure() {
local mycmakeargs=(
-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
-DNCNN_BUILD_EXAMPLES=no
-DNCNN_BUILD_TOOLS=$(usex tools)
-DNCNN_OPENMP=$(usex openmp)
-DNCNN_PYTHON=no # todo if something needs it
-DNCNN_SHARED_LIB=yes
-DNCNN_SIMPLEVK=no
-DNCNN_SYSTEM_GLSLANG=yes
-DNCNN_VERSION=${PV} # avoids libncnn.so.*.%Y%m%d using build date
-DNCNN_VULKAN=$(usex vulkan)
)
# temporary workaround due to a >=clang-18 regression (bug #929228)
tc-is-clang && [[ $(clang-major-version) -ge 18 ]] &&
mycmakeargs+=( -DNCNN_AVX512BF16=no )
cmake_src_configure
}
+2
View File
@@ -12,3 +12,5 @@ DIST gitlab-cli-1.36.0-deps.tar.xz 47874044 BLAKE2B 6d0c2a70a22c4baffe0bd015f10d
DIST gitlab-cli-1.36.0.tar.bz2 16818985 BLAKE2B efae5cd8e9a1851f61259d463b3b772035cbc07c4904b202c259e56af45d22ab5d3ae4865a5d3af781185800f45002249bf2d31065120d36365fdc2942bc6896 SHA512 77114f90f9cc5752761e3dc54590f6886a343484a24738068c78341f4625802e2ae2aea7e183ed568916c5beb9863a09698762945e6b8eb2fca9abc7292a5426
DIST gitlab-cli-1.41.0-deps.tar.xz 16529512 BLAKE2B 263d605ad70546e47984e2ef229f5ebd1ef2709c6f7e1ccb07f60807c16e0f6cdc6881d698454688718da54eb1b386a3f4eabcd9aa09008cf3eddf2fd34c5f52 SHA512 d6565eaac2dbe443080c6846fe0bbb42214ad52414d6885cfe91ce53c93f6d49e29cd2706d650f3a7c34a7d095d1a23336846571ce903faf292e85d983ae5cf2
DIST gitlab-cli-1.41.0.tar.bz2 16825512 BLAKE2B bdb6b271ae78b43fb721f48cc5e2ed272b5fc95b0f2f24b83b5816fa73a6eb276b677dca57ce207453fec696d89b6518846b10be9cf8cfb87a0e964a8fcb5bb5 SHA512 349393cc5893d1a703aaa8bcd933fb2981ed56a071fed662fe775524132b8c09326a61fc626b60733694146f0cf42cf71a0f3cfe45161135a15025c1f3d2969f
DIST gitlab-cli-1.44.1-deps.tar.xz 18136428 BLAKE2B 9fafde045efac7a00029170ee3b9fad61b2d4cf8facb61ae11c1b6e922f5a88627e5c9dc9d127e232c7ad635b2e7a58c65a29f26b5953d5b252580596ac72030 SHA512 aa5b97b361b18cbbb03abf33ee4249ea66e4374f2ca000dcd037758770b62b3fd45d9f2837b98cf2a6507fb509a1f5e1917456663159e0238d30d743a3ec2052
DIST gitlab-cli-1.44.1.tar.bz2 16841236 BLAKE2B 3a9ab7b0ca02c6a4a0652a268364785a6514c7bda688137947f11add4688e30ea547fe211b92a2543b765b8a82dc9ac85a7e189697bdc51c39cf62e82eaef42f SHA512 8b4bc19f78054104ae4551efacade8c2a1e86cf538dba2b31a9e7127cd6a792b8bf00d788a93aa26ba3f9a03684db0dbf67968e66d6048168cec6a512d90b18c
@@ -0,0 +1,32 @@
# Copyright 2023-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit go-module
GIT_COMMIT=bd628d4c3a01800afb00ef8586dd29904340bb68/
DESCRIPTION="the official gitlab command line interface"
HOMEPAGE="https://gitlab.com/gitlab-org/cli"
SRC_URI="https://gitlab.com/gitlab-org/cli/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
# tests communicate with gitlab.com and require a personal access token
RESTRICT="test"
S="${WORKDIR}/cli-v${PV}-${GIT_COMMIT}"
src_compile() {
emake \
GLAB_VERSION=v${PV} \
build manpage
}
src_install() {
dobin bin/glab
dodoc README.md
doman share/man/man1/*
}
-1
View File
@@ -1,2 +1 @@
DIST libpsl-0.21.2.tar.gz 7617025 BLAKE2B b50f805bb467dc3284bc91645a37a2208098ad809d3771c74ef13c3b8f6029a07ad80a56702c7e3d1a1125d272403c85dd97b64a28465b9ff2d095eaf94b9a4d SHA512 f1df72220bf4391d4701007100b0df66c833a2cbcb7481c9d13f0b9e0cad3b66d2d15d4b976e5bad60d2ad1540355112fa1acb07aa925c241d2d7cd20681c71d
DIST libpsl-0.21.5.tar.gz 7624251 BLAKE2B a0076f622b85df99f866de6707850ac216b764bdb68c6d516f4603da42dac8eae3ee4c53d68dbb6af6f779c2c7f1b9caab74c8b558209b1f6823f95c13fc3ceb SHA512 c14d575cecc0f1693894dd79565b6b9220084ddfa43b908a1cefe16d147cdd5ec47796eb0c2135e2f829a951abaf39d8a371ab5c1352f57b36e610e25adf91f5
-66
View File
@@ -1,66 +0,0 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{10..11} )
inherit meson-multilib python-any-r1
DESCRIPTION="C library for the Public Suffix List"
HOMEPAGE="https://github.com/rockdaboot/libpsl"
SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="icu +idn test"
RESTRICT="!test? ( test )"
RDEPEND="
icu? ( !idn? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) )
idn? (
dev-libs/libunistring:=[${MULTILIB_USEDEP}]
net-dns/libidn2:=[${MULTILIB_USEDEP}]
)
"
DEPEND="${RDEPEND}"
BDEPEND="
${PYTHON_DEPS}
sys-devel/gettext
virtual/pkgconfig
"
PATCHES=(
"${FILESDIR}"/${P}-tests-optional.patch
)
pkg_pretend() {
if use icu && use idn ; then
ewarn "\"icu\" and \"idn\" USE flags are enabled. Using \"idn\"."
fi
}
multilib_src_configure() {
local emesonargs=(
$(meson_use test tests)
)
# Prefer idn even if icu is in USE as well
if use idn ; then
emesonargs+=(
-Druntime=libidn2
-Dbuiltin=true
)
elif use icu ; then
emesonargs+=(
-Druntime=libicu
-Dbuiltin=true
)
else
emesonargs+=(
-Druntime=no
)
fi
meson_src_configure
}
+2 -4
View File
@@ -1,6 +1,4 @@
DIST qbittorrent-4.6.3.tar.xz 4512004 BLAKE2B b97022d2380e4cc1c4fdd06e7365136978f64b3ed98a4521e34197dcfa86c6e4032e0f9f7de1310a100a924f9a5250b145236d87f28317c4a79fe5d130d858b6 SHA512 13a7952bc8d0e57c24fcfb00ab8c7e5a1fdcb9c4755cb50f7f6b94a5cb01657e3b21996ff581366d957eaa36d90e14003c544c2376150d6041f14f42c4a03adc
DIST qbittorrent-4.6.3.tar.xz.asc 849 BLAKE2B 34f61400fd340dd3770c600e57be36a434c5fcfed1d2d8ad9e050e7112a141f7aec3e6f94d3bcd7a893a7969344f6d7120aa908a3c8ed9451a475bd25a98a53a SHA512 0d2420be78fd66a7f1e0e8797f73fcbe462f08640adbc0c681f9321423eefb7805d3267ab144e8934f00a7ebeac0931f16c9fef199196e222b57a0153916696e
DIST qbittorrent-4.6.4.tar.xz 4517896 BLAKE2B e2fc721b25e4a8983e8b481061de38a74f84ef32e1b791d658284607b9555791af67424a9a53985514906cd07e66807d4c9020e927ff5f30124af581c6ca2095 SHA512 2c3c364ea9dd11b7230a568036f599e5aeb0a7f2bbaa109cb04a706c88e693b4b4a9df7166227c453315ac9945e0f56066664c216c78111b5671bb798f618181
DIST qbittorrent-4.6.4.tar.xz.asc 849 BLAKE2B 9eff44ee4bec81ee3064d8c8bccdf170144a4dc64c7bb56fb151a4effba5ba360190b7aeebbb284dc89ac888b82321457fd504cdddb6a722d57311cfb2c82f00 SHA512 817026a5695106a7f0a1ed60f221e52fb9c2244565d54ec43f21211dd3bffab89c8e02f2a71ff095e8a364dcfb44a13844af4d759a90d8133e7ef54021d2ab46
DIST qbittorrent-4.6.5.tar.xz 4521852 BLAKE2B e988e73e2493d49a4f5e0ce64ac0d80ced288b9a324cbf8e31392e456aa8155a2d5d7109cd3aa0dd12e5d0332445fad2cc3b13b55e7c5844f53990a50f152e9a SHA512 a6e3c3c87eef6c547e602184105cb40da0b94d9887c61ba393bc71888943a9fa6a0fa990a7e6f69627b6d05208f7d39593ddf337125127985e90f859b6edc877
DIST qbittorrent-4.6.5.tar.xz.asc 849 BLAKE2B c4ca92c7fc3ced048c068b9f0f805e0b511d86d30647e5310bc64ebbb186f35b6d3345436e9176e9e095ac9427d6a4b07b0bc3994e693098adfec07074e10b24 SHA512 b3c3d3740691346f3f48aa556e55702917b031d6f10802ca2a58c94097e096d2bc87d90cf2fefed30cd426f94fc108c7cbed44c95bf3cc0a0128dab0413c147b
DIST qbittorrent-4.6.6.tar.xz 4524468 BLAKE2B 20141bf0bca5dd851950e070172d509b8f7d9d59125808b304ca321f31e4ed2f6fc8e012c05c37485a900db65c5e64b88b807196270a7328e2258ec550de8a7a SHA512 5062a2fe4fa821e76b6f058c1ca761572623bb2c5bf0df288119cd67563a5e2f1811b8c24bac9a9696b4620c3a1068136523add146691b483ed19e00d1000610
DIST qbittorrent-4.6.6.tar.xz.asc 849 BLAKE2B 56ec7c17d3c49661bc156400d6a721767fa2b90e9946b4a6e737fa712bc60dc61ec08a4db638dcc440875a217ae36823d645bbd2a913e14b35747a3128ad9d21 SHA512 09975d8200f9c6c46ace2de95f43f42924ddfebb3140a20f10db2389fc63f1f2117e28bc3084da5605b01a0c040f272bd1e638feea51ebcc4cd56df1e9cb2af4
@@ -1,145 +0,0 @@
# Copyright 2023-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake edo multibuild systemd verify-sig xdg
DESCRIPTION="BitTorrent client in C++ and Qt"
HOMEPAGE="https://www.qbittorrent.org"
if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/qbittorrent/qBittorrent.git"
inherit git-r3
else
SRC_URI="
https://downloads.sourceforge.net/qbittorrent/${P}.tar.xz
verify-sig? ( https://downloads.sourceforge.net/qbittorrent/${P}.tar.xz.asc )
"
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-qbittorrent )"
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qBittorrent.asc
fi
LICENSE="GPL-2"
SLOT="0"
IUSE="+dbus +gui qt6 systemd test webui"
RESTRICT="!test? ( test )"
REQUIRED_USE="|| ( gui webui )
dbus? ( gui )
"
RDEPEND="
>=dev-libs/openssl-1.1.1:=
>=net-libs/libtorrent-rasterbar-1.2.19:=
>=sys-libs/zlib-1.2.11
qt6? ( >=dev-qt/qtbase-6.2:6[network,ssl,sql,sqlite,xml] )
!qt6? (
dev-qt/qtcore:5
dev-qt/qtnetwork:5[ssl]
dev-qt/qtsql:5[sqlite]
dev-qt/qtxml:5
)
gui? (
!qt6? (
dev-qt/qtgui:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dbus? ( dev-qt/qtdbus:5 )
)
qt6? (
>=dev-qt/qtbase-6.2:6[dbus?,gui,widgets]
>=dev-qt/qtsvg-6.2:6
)
)
webui? (
acct-group/qbittorrent
acct-user/qbittorrent
)
"
DEPEND="
${RDEPEND}
>=dev-libs/boost-1.71
test? (
!qt6? ( dev-qt/qttest:5 )
)"
BDEPEND+="
!qt6? ( dev-qt/linguist-tools:5 )
qt6? ( >=dev-qt/qttools-6.2:6[linguist] )
virtual/pkgconfig"
DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md )
src_prepare() {
MULTIBUILD_VARIANTS=()
use gui && MULTIBUILD_VARIANTS+=( gui )
use webui && MULTIBUILD_VARIANTS+=( nogui )
cmake_src_prepare
}
src_configure() {
my_src_configure() {
local mycmakeargs=(
# musl lacks execinfo.h
-DSTACKTRACE=$(usex !elibc_musl)
# More verbose build logs are preferable for bug reports
-DVERBOSE_CONFIGURE=ON
-DQT6=$(usex qt6)
-DWEBUI=$(usex webui)
-DTESTING=$(usex test)
)
if [[ ${MULTIBUILD_VARIANT} == "gui" ]]; then
# We do this in multibuild, see bug #839531 for why.
# Fedora has to do the same thing.
mycmakeargs+=(
-DGUI=ON
-DDBUS=$(usex dbus)
-DSYSTEMD=OFF
)
else
mycmakeargs+=(
-DGUI=OFF
-DDBUS=OFF
)
use systemd && mycmakeargs+=(
# The systemd service calls qbittorrent-nox, which is only
# installed when GUI=OFF.
-DSYSTEMD=ON
-DSYSTEMD_SERVICES_INSTALL_DIR="$(systemd_get_systemunitdir)"
)
fi
cmake_src_configure
}
multibuild_foreach_variant my_src_configure
}
src_compile() {
multibuild_foreach_variant cmake_src_compile
}
src_test() {
my_src_test() {
# cmake does not detect tests by default, if you use enable_testing
# in a subdirectory instead of the root CMakeLists.txt
cd "${BUILD_DIR}"/test || die
edo ctest .
}
multibuild_foreach_variant my_src_test
}
src_install() {
multibuild_foreach_variant cmake_src_install
einstalldocs
if use webui; then
newconfd "${FILESDIR}/${PN}.confd" "${PN}"
newinitd "${FILESDIR}/${PN}.initd" "${PN}"
fi
}
@@ -16,7 +16,7 @@ else
https://downloads.sourceforge.net/qbittorrent/${P}.tar.xz
verify-sig? ( https://downloads.sourceforge.net/qbittorrent/${P}.tar.xz.asc )
"
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-qbittorrent )"
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qBittorrent.asc