Merge updates from master

This commit is contained in:
Repository mirror & CI
2023-02-14 12:18:58 +00:00
73 changed files with 226 additions and 107 deletions

View File

@@ -47,7 +47,7 @@ RDEPEND="
>=dev-python/dnspython-2.2.1[${PYTHON_USEDEP}]
"
distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
distutils_enable_tests pytest
# Same than PATCHES but from repository's root directory,

View File

@@ -47,7 +47,7 @@ RDEPEND="
>=dev-python/dnspython-2.2.1[${PYTHON_USEDEP}]
"
distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
distutils_enable_tests pytest
# Same than PATCHES but from repository's root directory,

View File

@@ -47,7 +47,7 @@ RDEPEND="
>=dev-python/dnspython-2.2.1[${PYTHON_USEDEP}]
"
distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
distutils_enable_tests pytest
# Same than PATCHES but from repository's root directory,

View File

@@ -47,7 +47,7 @@ RDEPEND="
>=dev-python/dnspython-2.2.1[${PYTHON_USEDEP}]
"
distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
distutils_enable_tests pytest
# Same than PATCHES but from repository's root directory,

View File

@@ -45,7 +45,7 @@ distutils_enable_tests pytest
distutils_enable_sphinx docs \
dev-python/sphinx-issues \
dev-python/sphinx_rtd_theme
dev-python/sphinx-rtd-theme
export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}

View File

@@ -3,6 +3,9 @@
EAPI=8
# required because of manual install in src_install
CMAKE_MAKEFILE_GENERATOR="emake"
PYTHON_COMPAT=( python3_{9..11} )
inherit cmake python-any-r1
@@ -47,11 +50,21 @@ src_configure() {
}
src_compile() {
use test && cmake_src_compile xtest
if use doc; then
cd "${WORKDIR}/${P}/docs" || die
emake html BUILDDIR="${BUILD_DIR}"
HTML_DOCS=( "${BUILD_DIR}/html/." )
fi
}
src_test() {
cmake_src_compile xtest
}
src_install() {
# Default install target depends on tests with USE=test enabled.
# However, this is a header-only library.
DESTDIR="${D}" cmake_build install/fast "$@"
einstalldocs
}

View File

@@ -3,7 +3,7 @@
EAPI=8
# required because of manuall install in src_install
# required because of manual install in src_install
CMAKE_MAKEFILE_GENERATOR="emake"
PYTHON_COMPAT=( python3_{9..11} )
@@ -32,7 +32,7 @@ BDEPEND="
$(python_gen_any_dep '
dev-python/breathe[${PYTHON_USEDEP}]
dev-python/sphinx[${PYTHON_USEDEP}]
dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
')
)
test? ( dev-cpp/doctest )
@@ -45,7 +45,7 @@ python_check_deps() {
python_has_version \
"dev-python/breathe[${PYTHON_USEDEP}]" \
"dev-python/sphinx[${PYTHON_USEDEP}]" \
"dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
"dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
}
pkg_pretend() {
@@ -76,8 +76,6 @@ src_configure() {
}
src_compile() {
use test && cmake_src_compile xtest
if use doc; then
cd "${WORKDIR}/${P}/docs" || die
emake html BUILDDIR="${BUILD_DIR}"
@@ -85,10 +83,14 @@ src_compile() {
fi
}
src_test() {
cmake_src_compile xtest
}
src_install() {
# default install starts compiling more tests
# that do not affect the header-only install image
DESTDIR="${D}" emake -C "${BUILD_DIR}" install/fast "$@"
# Default install target depends on tests with USE=test enabled.
# However, this is a header-only library.
DESTDIR="${D}" cmake_build install/fast "$@"
einstalldocs
}

View File

@@ -3,6 +3,9 @@
EAPI=8
# required because of manual install in src_install
CMAKE_MAKEFILE_GENERATOR="emake"
PYTHON_COMPAT=( python3_{9..11} )
inherit cmake python-any-r1
@@ -47,11 +50,21 @@ src_configure() {
}
src_compile() {
use test && cmake_src_compile xtest
if use doc; then
cd "${WORKDIR}/${P}/docs" || die
emake html BUILDDIR="${BUILD_DIR}"
HTML_DOCS=( "${BUILD_DIR}/html/." )
fi
}
src_test() {
cmake_src_compile xtest
}
src_install() {
# Default install target depends on tests with USE=test enabled.
# However, this is a header-only library.
DESTDIR="${D}" cmake_build install/fast "$@"
einstalldocs
}

View File

@@ -5,7 +5,7 @@ EAPI=8
DOCS_BUILDER="sphinx"
DOCS_AUTODOC=1
DOCS_DEPEND="dev-python/sphinx_rtd_theme"
DOCS_DEPEND="dev-python/sphinx-rtd-theme"
DOCS_DIR="${S}/docs/source"
PYTHON_COMPAT=( python3_{8..11} )

View File

@@ -5,7 +5,7 @@ EAPI=8
DOCS_BUILDER="sphinx"
DOCS_AUTODOC=1
DOCS_DEPEND="dev-python/sphinx_rtd_theme"
DOCS_DEPEND="dev-python/sphinx-rtd-theme"
DOCS_DIR="${S}/docs/source"
PYTHON_COMPAT=( python3_{8..11} )

View File

@@ -5,7 +5,7 @@ EAPI=8
DOCS_BUILDER="sphinx"
DOCS_AUTODOC=1
DOCS_DEPEND="dev-python/sphinx_rtd_theme"
DOCS_DEPEND="dev-python/sphinx-rtd-theme"
DOCS_DIR="${S}/docs/source"
PYTHON_COMPAT=( python3_{8..11} )

View File

@@ -30,7 +30,7 @@ BDEPEND="
media-gfx/graphviz
$(python_gen_cond_dep '
dev-python/sphinx[${PYTHON_USEDEP}]
dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
')
)
"

View File

@@ -26,7 +26,7 @@ RDEPEND="
distutils_enable_tests pytest
distutils_enable_sphinx docs/source \
dev-python/sphinx_rtd_theme
dev-python/sphinx-rtd-theme
PROPERTIES="test_network"
RESTRICT="test"

View File

@@ -15,4 +15,4 @@ LICENSE="MIT"
KEYWORDS="~amd64"
SLOT="0"
distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
distutils_enable_sphinx docs dev-python/sphinx-rtd-theme

View File

@@ -26,7 +26,7 @@ BDEPEND="
distutils_enable_tests unittest
distutils_enable_sphinx docs dev-python/sphinxcontrib-asyncio dev-python/sphinx_rtd_theme
distutils_enable_sphinx docs dev-python/sphinxcontrib-asyncio dev-python/sphinx-rtd-theme
python_test() {
cd "${T}" || die

View File

@@ -26,7 +26,7 @@ BDEPEND="
distutils_enable_tests unittest
distutils_enable_sphinx docs dev-python/sphinxcontrib-asyncio dev-python/sphinx_rtd_theme
distutils_enable_sphinx docs dev-python/sphinxcontrib-asyncio dev-python/sphinx-rtd-theme
python_test() {
cd "${T}" || die

View File

@@ -24,7 +24,7 @@ RDEPEND="
dev-python/zope-interface[${PYTHON_USEDEP}]
doc? (
dev-python/repoze-sphinx-autointerface[${PYTHON_USEDEP}]
dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
)
test? (
dev-python/transaction[${PYTHON_USEDEP}]

View File

@@ -19,4 +19,4 @@ KEYWORDS="~amd64"
SLOT="0"
distutils_enable_tests pytest
distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
distutils_enable_sphinx docs dev-python/sphinx-rtd-theme

View File

@@ -21,4 +21,4 @@ RDEPEND="
distutils_enable_tests pytest
distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
distutils_enable_sphinx docs dev-python/sphinx-rtd-theme

View File

@@ -21,4 +21,4 @@ distutils_enable_tests pytest
distutils_enable_sphinx docs \
dev-python/myst_parser \
dev-python/sphinx_rtd_theme
dev-python/sphinx-rtd-theme

View File

@@ -42,7 +42,7 @@ EPYTEST_DESELECT=(
distutils_enable_tests pytest
distutils_enable_sphinx docs \
dev-python/sphinx_rtd_theme
dev-python/sphinx-rtd-theme
pkg_postinst() {
optfeature "calendars support" "dev-python/hijri-converter dev-python/convertdate"

View File

@@ -42,7 +42,7 @@ EPYTEST_DESELECT=(
distutils_enable_tests pytest
distutils_enable_sphinx docs \
dev-python/sphinx_rtd_theme
dev-python/sphinx-rtd-theme
pkg_postinst() {
optfeature "calendars support" "dev-python/hijri-converter dev-python/convertdate"

View File

@@ -1,2 +1 @@
DIST digitalocean-1.16.0.tar.gz 59077 BLAKE2B b44c045716967a192b4e79d562bd7af8af2ed3a0d6ea54490f2e15195c84476f25a661c80b5f1beda54e724a4177083a5d04682ca96855637cf626cd3397df17 SHA512 110614aeb33e2dab0564b4569058233916626d50da14d42f9702c9275f13442dccb7b77829b2dc8e97e8bbbd53d094116cebe9b3aedad920d2b0c156a5680bf7
DIST digitalocean-1.17.0.gh.tar.gz 60261 BLAKE2B 1a3b8ffe955fdea616420d67e9cd1b07d81d3395d673770333b150a8044f6f93d16ab6ec93d0d5efb7579a2bd7fde57c394bc3fc3e58ad02db230f5bd48006bb SHA512 3b5f5adb5fac9693450954e568433cecb43152d4cb2b5709126dc7c69c6b84f19428dcd3688718588a986d3ea9170a956387f3050cd10a69ba89d5dcdf8e100c

View File

@@ -1,17 +1,16 @@
# Copyright 2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_USE_SETUPTOOLS=rdepend
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{9..11} )
inherit distutils-r1
DESCRIPTION="Digitalocean API access library"
HOMEPAGE="https://github.com/koalalorenzo/python-digitalocean"
SRC_URI="https://github.com/koalalorenzo/python-digitalocean/archive/v${PV}.tar.gz -> ${P}.tar.gz"
S=${WORKDIR}/python-digitalocean-${PV}
SRC_URI="https://github.com/koalalorenzo/python-${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
S="${WORKDIR}/python-${P}"
LICENSE="LGPL-3"
SLOT="0"
@@ -21,3 +20,8 @@ RDEPEND="
dev-python/requests[${PYTHON_USEDEP}]
dev-python/jsonpickle[${PYTHON_USEDEP}]
"
BDEPEND="test? ( dev-python/responses[${PYTHON_USEDEP}] )"
distutils_enable_sphinx docs dev-python/alabaster
distutils_enable_tests pytest

View File

@@ -3,7 +3,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
PYTHON_COMPAT=( python3_{9..11} )
inherit distutils-r1
DESCRIPTION="Digitalocean API access library"

View File

@@ -5,4 +5,7 @@
<email>egorr.berd@gmail.com</email>
<name>Yahor Berdnikau</name>
</maintainer>
<upstream>
<remote-id type="github">koalalorenzo/python-digitalocean</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -31,7 +31,7 @@ RDEPEND="
"
BDEPEND="
test? ( ${RDEPEND} )
doc? ( dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] )
doc? ( dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] )
"
distutils_enable_sphinx docs/source --no-autodoc

View File

@@ -24,7 +24,7 @@ BDEPEND="
DOCS=( CHANGES.rst CONTRIBUTING.rst README.rst )
distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
distutils_enable_tests pytest
EPYTEST_DESELECT=(

View File

@@ -41,4 +41,4 @@ python_prepare_all() {
distutils_enable_tests --install unittest
distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-spelling
distutils_enable_sphinx docs dev-python/sphinx-rtd-theme dev-python/sphinxcontrib-spelling

View File

@@ -38,7 +38,7 @@ EPYTEST_DESELECT=(
distutils_enable_tests pytest
distutils_enable_sphinx docs \
dev-python/sphinx_rtd_theme
dev-python/sphinx-rtd-theme
src_unpack() {
default

View File

@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}"
BDEPEND="test? ( dev-vcs/git )"
distutils_enable_tests --install pytest
distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
src_test() {
#it want a git repo

View File

@@ -25,4 +25,4 @@ BDEPEND="
"
distutils_enable_tests pytest
distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
distutils_enable_sphinx docs dev-python/sphinx-rtd-theme

View File

@@ -41,7 +41,7 @@ BDEPEND="
distutils_enable_tests pytest
distutils_enable_sphinx docs \
'dev-python/sphinx_rtd_theme'
'dev-python/sphinx-rtd-theme'
python_test() {
[[ ${EPYTHON} == python3.10 ]] && local EPYTEST_DESELECT=(

View File

@@ -41,4 +41,4 @@ BDEPEND="
distutils_enable_tests pytest
distutils_enable_sphinx docs \
'dev-python/sphinx_rtd_theme'
'dev-python/sphinx-rtd-theme'

View File

@@ -31,7 +31,7 @@ RDEPEND="
distutils_enable_tests unittest
distutils_enable_sphinx docs \
dev-python/sphinx_rtd_theme \
dev-python/sphinx-rtd-theme \
dev-python/sphinxcontrib-autoprogram
python_prepare_all() {

View File

@@ -35,4 +35,4 @@ EPYTEST_IGNORE=(
distutils_enable_tests pytest
distutils_enable_sphinx docs \
dev-python/sphinx_rtd_theme
dev-python/sphinx-rtd-theme

View File

@@ -36,7 +36,7 @@ distutils_enable_tests pytest
distutils_enable_sphinx docs \
dev-python/sphinx-notfound-page \
dev-python/sphinx_rtd_theme
dev-python/sphinx-rtd-theme
src_prepare() {
distutils-r1_src_prepare

View File

@@ -34,7 +34,7 @@ EPYTEST_DESELECT=(
tests/unit/models/reddit/test_submission.py::TestSubmission::test_comment_sort_warning__disabled
)
distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
distutils_enable_tests pytest

View File

@@ -29,7 +29,7 @@ BDEPEND="test? (
distutils_enable_tests pytest
distutils_enable_sphinx docs \
dev-python/sphinx_rtd_theme \
dev-python/sphinx-rtd-theme \
dev-python/sphinx-rtd-dark-mode
python_prepare_all() {

View File

@@ -26,7 +26,7 @@ DEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
"
distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
distutils_enable_sphinx doc dev-python/sphinx-rtd-theme
distutils_enable_tests unittest
python_configure() {

View File

@@ -24,4 +24,4 @@ KEYWORDS="~amd64"
distutils_enable_tests pytest
distutils_enable_sphinx docs/source \
dev-python/sphinx_rtd_theme
dev-python/sphinx-rtd-theme

View File

@@ -24,4 +24,4 @@ KEYWORDS="~amd64"
distutils_enable_tests pytest
distutils_enable_sphinx docs/source \
dev-python/sphinx_rtd_theme
dev-python/sphinx-rtd-theme

View File

@@ -37,7 +37,7 @@ distutils_enable_tests pytest
#distutils_enable_sphinx docs \
# dev-python/sphinxcontrib-apidoc \
# dev-python/sphinx_rtd_theme
# dev-python/sphinx-rtd-theme
src_test() {
ememcached --start 11221

View File

@@ -40,7 +40,7 @@ BDEPEND="
distutils_enable_tests pytest
distutils_enable_sphinx docs \
'>=dev-python/sphinx_rtd_theme-0.5.0'
'>=dev-python/sphinx-rtd-theme-0.5.0'
python_prepare() {
default

View File

@@ -40,7 +40,7 @@ BDEPEND="
distutils_enable_tests pytest
distutils_enable_sphinx docs \
'>=dev-python/sphinx_rtd_theme-0.5.0'
'>=dev-python/sphinx-rtd-theme-0.5.0'
python_prepare() {
default

View File

@@ -5,7 +5,7 @@ EAPI=8
DOCS_BUILDER="sphinx"
DOCS_DIR="${S}/docs"
DOCS_DEPEND="dev-python/sphinx_rtd_theme"
DOCS_DEPEND="dev-python/sphinx-rtd-theme"
PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1 docs

View File

@@ -48,7 +48,7 @@ DEPEND="test? (
)"
distutils_enable_tests pytest
distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
python_prepare_all() {
# do not make a test flaky report

View File

@@ -48,7 +48,7 @@ DEPEND="test? (
)"
distutils_enable_tests pytest
distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
python_prepare_all() {
# do not make a test flaky report

View File

@@ -41,7 +41,7 @@ distutils_enable_tests unittest
distutils_enable_sphinx doc/source \
dev-python/recommonmark \
dev-python/sphinx_rtd_theme
dev-python/sphinx-rtd-theme
python_test() {
[[ ${EPYTHON} == pypy3 ]] && \

View File

@@ -18,7 +18,7 @@ SLOT="0"
KEYWORDS="~amd64"
RDEPEND="
doc? ( dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] )
doc? ( dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] )
test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )
"
DEPEND="${RDEPEND}"

View File

@@ -26,7 +26,7 @@ RDEPEND="
distutils_enable_tests pytest
# requires self to build own documentation
distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinx-argparse
distutils_enable_sphinx docs dev-python/sphinx-rtd-theme dev-python/sphinx-argparse
python_prepare_all() {
# needs test files in workdir to compile docs for some reason

View File

@@ -44,6 +44,6 @@ distutils_enable_sphinx docs \
dev-python/sphinx-prompt \
dev-python/sphinx-tabs \
dev-python/sphinx-version-warning \
dev-python/sphinx_rtd_theme \
dev-python/sphinx-rtd-theme \
dev-python/sphinxcontrib-bibtex \
dev-python/sphinxemoji

View File

@@ -20,7 +20,7 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
RDEPEND="dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
RDEPEND="dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
BDEPEND="
test? (
dev-python/sphinx[${PYTHON_USEDEP}]

View File

@@ -25,5 +25,5 @@ RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
# dev-python/sphinx-autoapi \
# dev-python/sphinx-prompt \
# dev-python/sphinx-tabs \
# dev-python/sphinx_rtd_theme \
# dev-python/sphinx-rtd-theme \
# dev-python/sphinxemoji

View File

@@ -41,7 +41,7 @@ EPYTEST_IGNORE=(
distutils_enable_tests pytest
distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
pkg_postinst() {
optfeature "httpclient support" "dev-python/requests dev-python/websocket-client dev-python/gevent-websocket"

View File

@@ -5,7 +5,7 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
DOCS_DEPEND="
dev-python/sphinx_rtd_theme
dev-python/sphinx-rtd-theme
dev-python/typing-extensions
"
DOCS_DIR="${S}/docs/source"

View File

@@ -24,7 +24,7 @@ BDEPEND="
dev-python/jsonschema[${PYTHON_USEDEP}]
dev-python/sphinx[${PYTHON_USEDEP}]
dev-python/sphinx-tabs[${PYTHON_USEDEP}]
dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
test? (
dev-python/coverage[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]

View File

@@ -52,5 +52,5 @@ distutils_enable_tests pytest
#distutils_enable_sphinx docs \
#dev-python/recommonmark \
#dev-python/sphinx-autodoc-typehints \
#dev-python/sphinx_rtd_theme \
#dev-python/sphinx-rtd-theme \
#dev-python/sphinxcontrib-apidoc

View File

@@ -44,7 +44,7 @@ distutils_enable_tests pytest
#distutils_enable_sphinx docs \
#dev-python/recommonmark \
#dev-python/sphinx-autodoc-typehints \
#dev-python/sphinx_rtd_theme \
#dev-python/sphinx-rtd-theme \
#dev-python/sphinxcontrib-apidoc
src_install() {

View File

@@ -44,6 +44,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
BDEPEND="
dev-cpp/cpp-httplib
dev-cpp/cpp-jwt
dev-cpp/robin-map"
REQUIRED_USE="|| ( qt5 sdl )"
@@ -144,6 +145,9 @@ src_prepare() {
sed -i -e '$afind_package(cubeb REQUIRED)\n' CMakeLists.txt || die
fi
# Unbundle cpp-httplib
sed -i -e '/# httplib/,/target_link_libraries(httplib/d' externals/CMakeLists.txt || die
# Unbundle cpp-jwt
sed -i -e '/# cpp-jwt/,/CPP_JWT_USE_VENDORED_NLOHMANN_JSON/d' externals/CMakeLists.txt || die
sed -i -e 's/ cpp-jwt//' src/web_service/CMakeLists.txt || die

View File

@@ -44,6 +44,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
BDEPEND="
dev-cpp/cpp-httplib
dev-cpp/cpp-jwt
dev-cpp/robin-map"
REQUIRED_USE="|| ( qt5 sdl )"
@@ -126,6 +127,9 @@ src_prepare() {
sed -i -e '$afind_package(cubeb REQUIRED)\n' CMakeLists.txt || die
fi
# Unbundle cpp-httplib
sed -i -e '/# httplib/,/target_link_libraries(httplib/d' externals/CMakeLists.txt || die
# Unbundle cpp-jwt
sed -i -e '/# cpp-jwt/,/CPP_JWT_USE_VENDORED_NLOHMANN_JSON/d' externals/CMakeLists.txt || die
sed -i -e 's/ cpp-jwt//' src/web_service/CMakeLists.txt || die

View File

@@ -1,4 +1,4 @@
# Copyright 2022 Gentoo Authors
# Copyright 2022-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -67,12 +67,17 @@ src_prepare() {
sed -i -e '/add_subdirectory(core\/deps\/glslang/{N;s/.*/find_library(GLSLANG libglslang.so)\nfind_library(SPIRV libSPIRV.so)\ntarget_link_libraries(${PROJECT_NAME} PRIVATE ${GLSLANG} ${SPIRV})/}' CMakeLists.txt || die
sed -i -e '/include.*SPIRV/{s:":<glslang/:;s/"/>/}' core/rend/vulkan/shaders.h \
core/rend/vulkan/compiler.cpp || die
# Crazy commit fix: 8d0654c
sed -i -e '/maxMeshViewCountNV/a256,256,128,128,128,128,128,128,4,' \
core/rend/vulkan/compiler.cpp || die
# Unbundle xxHash
sed -i -e '/XXHASH_BUILD_XXHSUM/{N;N;s/.*/target_link_libraries(${PROJECT_NAME} PRIVATE xxhash)/}' CMakeLists.txt || die
sed -i -e '/XXHASH_BUILD_XXHSUM/{N;N;s/.*/target_link_libraries(${PROJECT_NAME} PRIVATE xxhash)/}' \
CMakeLists.txt || die
# Unbundle chdr
sed -i -e '/add_subdirectory.*chdr/d' -e 's/chdr-static/chdr/' -e 's:core/deps/chdr/include:/usr/include/chdr:' CMakeLists.txt || die
sed -i -e '/add_subdirectory.*chdr/d' -e 's/chdr-static/chdr/' \
-e 's:core/deps/chdr/include:/usr/include/chdr:' CMakeLists.txt || die
# Do not use ccache
sed -i -e '/find_program(CCACHE_FOUND/d' CMakeLists.txt
@@ -87,6 +92,9 @@ src_prepare() {
# Do not use ccache
sed -i -e '/find_program(CCACHE_PROGRAM ccache)/d' CMakeLists.txt
# Revert crazy commit: #4408aa7
sed -i -e '/if(NOT APPLE AND (/s/.*/if( NOT APPLE )/' CMakeLists.txt
cmake_src_prepare
}

View File

@@ -1,16 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<name>Samuel Bauer</name>
<email>samuel.bauer@yahoo.fr</email>
</maintainer>
<use>
<flag name="cubeb">Enables the cubeb audio backend</flag>
<flag name="compatibility-list">Downloads the latest compatibility list</flag>
<flag name="discord">Enables Discord Rich Presence</flag>
<flag name="system-vulkan">Use system dev-util/vulkan-headers</flag>
<flag name="webengine">Use QtWebEngine for web applet implementation</flag>
<flag name="webservice">Enable web services (telemetry, etc.)</flag>
</use>
<maintainer type="person">
<name>Samuel Bauer</name>
<email>samuel.bauer@yahoo.fr</email>
</maintainer>
<use>
<flag name="cubeb">Enables the cubeb audio backend</flag>
<flag name="compatibility-list">Downloads the latest compatibility list</flag>
<flag name="discord">Enables Discord Rich Presence</flag>
<flag name="system-vulkan">Use system dev-util/vulkan-headers</flag>
<flag name="webengine">Use QtWebEngine for web applet implementation</flag>
<flag name="webservice">Enable web services (telemetry, etc.)</flag>
</use>
<upstream>
<remote-id type="github">herumi/xbyak</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -55,7 +55,7 @@ BDEPEND="
dev-util/glslang
discord? ( >=dev-libs/rapidjson-1.1.0 )
"
REQUIRED_USE="|| ( qt5 sdl )"
REQUIRED_USE="|| ( qt5 sdl ) discord? ( webservice )"
RESTRICT="!test? ( test )"
pkg_setup() {
@@ -132,14 +132,14 @@ src_prepare() {
# LZ4 temporary fix: https://github.com/yuzu-emu/yuzu/pull/9054/commits/a8021f5a18bc5251aef54468fa6033366c6b92d9
sed -i 's/lz4::lz4/lz4/' src/common/CMakeLists.txt || die
sed -i '/fmt.*REQUIRED/d' CMakeLists.txt || die # libfmt >= 9
# Temporary use lastest gentoo vulkan
sed -i -e '/Vulkan/s/238/236/' CMakeLists.txt || die
sed -i -e '/VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR/d;' -e '/VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR/d' \
-e '/VK_ERROR_VIDEO_PROFILE_OPERATION_NOT_SUPPORTED_KHR/d' -e '/VK_ERROR_VIDEO_PROFILE_FORMAT_NOT_SUPPORTED_KHR/d' \
-e '/VK_ERROR_VIDEO_PROFILE_CODEC_NOT_SUPPORTED_KHR/d' -e '/VK_ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR/d' \
src/video_core/vulkan_common/vulkan_wrapper.cpp
# Allow compiling using older glslang
if has_version '<dev-util/glslang-1.3.238'; then
sed -i -e '/Vulkan/s/238/236/' CMakeLists.txt || die
sed -i -e '/VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR/d;' -e '/VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR/d' \
-e '/VK_ERROR_VIDEO_PROFILE_OPERATION_NOT_SUPPORTED_KHR/d' -e '/VK_ERROR_VIDEO_PROFILE_FORMAT_NOT_SUPPORTED_KHR/d' \
-e '/VK_ERROR_VIDEO_PROFILE_CODEC_NOT_SUPPORTED_KHR/d' -e '/VK_ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR/d' \
src/video_core/vulkan_common/vulkan_wrapper.cpp
fi
cmake_src_prepare
}

View File

@@ -49,7 +49,7 @@ DEPEND="
distutils_enable_tests pytest
# distutils_enable_sphinx docs/source \
# "<dev-python/sphinx-4.0" \
# dev-python/sphinx_rtd_theme \
# dev-python/sphinx-rtd-theme \
# dev-python/recommonmark
pkg_setup() {

View File

@@ -56,7 +56,7 @@ DEPEND="
distutils_enable_tests pytest
# distutils_enable_sphinx docs/source \
# "<dev-python/sphinx-4.0" \
# dev-python/sphinx_rtd_theme \
# dev-python/sphinx-rtd-theme \
# dev-python/recommonmark
pkg_setup() {

View File

@@ -16,7 +16,7 @@ SRC_URI="https://dl-canary.discordapp.net/apps/linux/${PV}/${MY_PN}-${PV}.deb"
LICENSE="all-rights-reserved"
SLOT="0"
KEYWORDS="~amd64"
RESTRICT="mirror bindist"
RESTRICT="bindist mirror strip test"
RDEPEND="
app-accessibility/at-spi2-atk:2
@@ -55,6 +55,7 @@ S="${WORKDIR}"
QA_PREBUILT="
opt/discord-canary/${MY_BIN}
opt/discord-canary/chrome_crashpad_handler
opt/discord-canary/chrome-sandbox
opt/discord-canary/libffmpeg.so
opt/discord-canary/libvk_swiftshader.so

View File

@@ -3,3 +3,4 @@ DIST limine-3.0.tar.xz 3164168 BLAKE2B fedd161ec8957fd2b3245d8a7a6bffaeab4fa7629
DIST limine-3.4.3.tar.xz 3165344 BLAKE2B fe2afef5c960d9cfb78883ebe02d0fab754e40b466630ec3959d77e3f62f533e94d0ba3ecfda06688b8705140514c9aa4bb5c9e3c91ef884879e9e75c24fcd61 SHA512 986f95e3a12b5d4ae5f166f4d7388aa5feb12fa4b03f0acb8aa00a7494fbd37e53961b5afc2a85b1f399a742a78b72f70c9268792f652a64a491a142d3260256
DIST limine-3.4.4.tar.xz 3166260 BLAKE2B 67645f3461c43b7d600eb9353d8505d2b61abea285eaf4498020c6e19b59b18eccda01316210a918dff712548ad5c08e937c33a5e6ff88bb8a81cc584ae11d87 SHA512 cf5b781963e98379bd8b53819c3afd1e4160f8f088f257131e392aa76f7f7ef71c3a67ae7274514afe30e52f06eb3c52d24a86a482ca6631c4ebddb692be6794
DIST limine-3.4.5.tar.xz 3166660 BLAKE2B 55ddb79af352c1e515b0d423a4e41c50c2ca67f7c3715182c27696c1f41cb271d2d7d967b41430f7782f183899675c3e6c7622805a2953d6e4459cd33ed1d343 SHA512 cc72d3612e757ad79aa5801540581e8e8de568d5cb60b3e4edd6e68ccba40f2a42ceaa6b649aa1c60895be1c528c6e5892a3dfc3791b78d9d3780baf47b98eb0
DIST limine-4.20230212.1.tar.xz 725084 BLAKE2B d602c70d2d716f7025d81ead55139f3a964f23dbf55a30bc74d11ef920cc698e3e519400df119f4b718e654d176c5b3fb23ac08fa506655c331f5866771fe541 SHA512 416b43d205b8034bb0cbd5ffd0eda9cc972ca5718c71ec5253275c3611b4560a92f99a0fa7c207ff9fb35d2636826cd51d0088e1cda7f1d5e83b7d31108c6f01

View File

@@ -0,0 +1,57 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DESCRIPTION="Limine is a modern, advanced x86/x86_64 BIOS/UEFI multiprotocol bootloader"
HOMEPAGE="https://limine-bootloader.org/"
SRC_URI="https://github.com/limine-bootloader/limine/releases/download/v${PV}/limine-${PV}.tar.xz"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~amd64"
IUSE="+bios +bios-pxe +bios-cd +limine-deploy +uefi +cd-efi +uefi32 +uefi64 +uefiaa64"
REQUIRED_USE="
uefi32? ( uefi )
uefi64? ( uefi )
uefiaa64? ( uefi )
cd-efi? ( uefi )
uefi? ( || ( uefi32 uefi64 uefiaa64 cd-efi ) )
bios-pxe? ( bios )
bios-cd? ( bios )
limine-deploy? ( bios )
bios? ( || ( bios-pxe bios-cd limine-deploy ) )
"
MY_LLVM_TARGETS="AArch64 ARM X86"
MY_LLVM_FLAGS="llvm_targets_${MY_LLVM_TARGETS// /(-),llvm_targets_}(-)"
BDEPEND="
app-arch/gzip
dev-lang/nasm
sys-apps/findutils
sys-devel/clang[${MY_LLVM_FLAGS}]
sys-devel/lld
sys-devel/llvm[${MY_LLVM_FLAGS}]
cd-efi? ( sys-fs/mtools )
"
src_configure() {
local myconf=(
"$(use_enable bios)"
"$(use_enable bios-cd)"
"$(use_enable bios-pxe)"
"$(use_enable limine-deploy)"
"$(use_enable uefi)"
"$(use_enable uefi32 uefi-ia32)"
"$(use_enable uefi64 uefi-x86-64)"
"$(use_enable uefiaa64 uefi-aarch64)"
"$(use_enable cd-efi)"
)
CROSS_TOOLCHAIN=llvm \
econf "${myconf[@]}"
}

View File

@@ -2,9 +2,12 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>arsen@aarsen.me</email>
<email>arsen@gentoo.org</email>
<name>Arsen Arsenović</name>
</maintainer>
<upstream>
<remote-id type="github">limine-bootloader/limine</remote-id>
</upstream>
<use>
<flag name="uefi">
Enable UEFI support.
@@ -15,6 +18,9 @@
<flag name="uefi64">
Enable 64-bit UEFI support.
</flag>
<flag name="uefiaa64">
Enable AArch64 UEFI support.
</flag>
<flag name="eltorito-efi">
Enable building eltorito-efi.bin using <pkg>sys-fs/mtools</pkg>.
</flag>

View File

@@ -6,7 +6,7 @@ EAPI="7"
DOCS_BUILDER="sphinx"
DOCS_DEPEND="
dev-python/breathe
dev-python/sphinx_rtd_theme
dev-python/sphinx-rtd-theme
"
DOCS_DIR="${S}/docs/source"
FORTRAN_NEEDED="fortran"

View File

@@ -15,12 +15,13 @@ LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64"
BDEPEND="
dev-lang/lazarus
"
BDEPEND="dev-lang/lazarus"
# I don't know yet how not to strip debug info during lazbuild build
QA_PRESTRIPPED="usr/bin/ddrescueview"
# Pascal ignores CFLAGS and does its own stripping. Nothing else can be done about it.
QA_FLAGS_IGNORED="usr/bin/ddrescueview"
QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
RESTRICT="strip"
S="${WORKDIR}/${MY_P}"

View File

@@ -37,7 +37,7 @@ DEPEND="
BDEPEND="
doc? (
dev-python/sphinx
dev-python/sphinx_rtd_theme
dev-python/sphinx-rtd-theme
dev-python/sphinxemoji
)
"