Merge updates from master

This commit is contained in:
Repository mirror & CI
2022-03-29 11:19:23 +00:00
13 changed files with 76 additions and 92 deletions

View File

@@ -9,7 +9,10 @@ PYTHON_COMPAT=( python3_{8..9} )
inherit distutils-r1
DESCRIPTION="Interrogate and manipulate UFO, TTF and OTF fonts with a common interface"
HOMEPAGE="https://github.com/simoncozens/babelfont"
HOMEPAGE="
https://github.com/simoncozens/babelfont
https://pypi.org/project/babelfont/
"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MYP}.tar.gz"
S="${WORKDIR}/${MYP}"
@@ -25,4 +28,6 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
RESTRICT="test" # no tests in pypi release, pypi alpha releases untagged in github
distutils_enable_tests pytest

View File

@@ -1,2 +1,2 @@
DIST types-requests-2.27.13.tar.gz 10088 BLAKE2B df9bfe125236d76a39ef37d89b5966a8a259568fcb5912bd7b0acde42e023968e783f7c8e6d9d67bca21c55b214ffbfaa939713ed2d8e1d2ae3635507b81b1bb SHA512 20084b63a0984be5f7a5f90187208fc58fdf70abc191ad9840ec1c41e672792c29ca36bc532044c00c28e813f3192e3aab4b95ef8ca0f1821b6d74ca2a8a7f19
DIST types-requests-2.27.14.tar.gz 10258 BLAKE2B 28fefde40669a2e7298ced14e64c22a0a96f7891690023b202dfdf31cb5369130afd11d1b00ed879b78cfd487dc489c617287487e0d1db27041970661be5c8be SHA512 8f25e448688a01319432743849f27aa35e406e23bb5a6ebf43d07875db87d19359ee61831b772777df1bd5674cacd570bdadd05eb1f2eb03979509c9d966be9f
DIST types-requests-2.27.15.tar.gz 10503 BLAKE2B 2c5c1939a9a03f217a947922de2f4c0a5d60e58ef71f03b645a7c9565388c8d325631fa0fd05fc98e0355e14721c2498bbf2eb360826f6b27a4e567ee4859f74 SHA512 8831e5a9b8928e9fc356f3996ee11d548551657026afba3909372ee2e89928757f9e2d434d7adcc41fb1567a439b3f679375ee188d62459b61390beb63753239

View File

@@ -1,2 +1 @@
DIST uharfbuzz-0.22.0.tar.gz 34454 BLAKE2B 32bbb07f94ed532cfd153bac8164c0444cae9ff0b0d5af870a7e656cf7493926b8c78f868e70e111df9f4286a4779872be5430e020e59527e92843365cb42eb9 SHA512 c30b7d6f4981defd88cda4c178adbab31262bcedd9ccc0969ae1b7bee02b4846e69cecd33ab240af84581d1a34d54167fd8603ade7403f898cf03b4936287792
DIST uharfbuzz-0.23.0.tar.gz 36287 BLAKE2B 6f03aa991d53b6fe093879a0cb5d09b5065ad4fb31453f74323f540aadcdace2430ccdc0a466cddc43a356bb1dd62f066537074a208c1b56d51d43c4eb2062ee SHA512 8cacb54a3d48db29f025bd9eb72133e9a11cf61f6b8064cb91c5399e875e7b46f592bb3c4b284741a161f534bea5771f9c471489c8082ee768953b5948ee2c09

View File

@@ -1,31 +0,0 @@
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@
with open(os.path.join(here, 'README.md'), encoding='utf-8') as f:
long_description = f.read()
-define_macros = [('HB_NO_MT', '1'), ('HB_EXPERIMENTAL_API', '1')]
+define_macros = [('HB_EXPERIMENTAL_API', '1')]
linetrace = False
if int(os.environ.get('CYTHON_LINETRACE', '0')):
linetrace = True
@@ -21,7 +21,7 @@
extra_compile_args = []
extra_link_args = []
-libraries = []
+libraries=['harfbuzz']
if platform.system() != 'Windows':
extra_compile_args.append('-std=c++11')
define_macros.append(('HAVE_MMAP', '1'))
@@ -39,8 +39,8 @@
extension = Extension(
'uharfbuzz._harfbuzz',
define_macros=define_macros,
- include_dirs=['harfbuzz/src'],
- sources=['src/uharfbuzz/_harfbuzz.pyx', 'harfbuzz/src/harfbuzz.cc'],
+ include_dirs=['/usr/include/harfbuzz'],
+ sources=['src/uharfbuzz/_harfbuzz.pyx'],
language='c++',
libraries=libraries,
extra_compile_args=extra_compile_args,

View File

@@ -9,6 +9,15 @@
linetrace = False
if int(os.environ.get('CYTHON_LINETRACE', '0')):
linetrace = True
@@ -21,7 +21,7 @@
extra_compile_args = []
extra_link_args = []
-libraries = []
+libraries = ['harfbuzz']
if platform.system() != 'Windows':
extra_compile_args.append('-std=c++11')
define_macros.append(('HAVE_MMAP', '1'))
@@ -39,11 +39,9 @@
extension = Extension(
'uharfbuzz._harfbuzz',

View File

@@ -1,40 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{8..10} pypy3 )
inherit distutils-r1
DESCRIPTION="Streamlined Cython bindings for the HarfBuzz shaping engine"
HOMEPAGE="https://github.com/harfbuzz/uharfbuzz"
SRC_URI="https://github.com/harfbuzz/uharfbuzz/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
LICENSE="Apache-2.0"
SLOT="0"
RDEPEND=">=media-libs/harfbuzz-2.8.1[experimental(-)]"
DEPEND="
${RDEPEND}
>=dev-python/cython-0.28.1[${PYTHON_USEDEP}]
>=dev-python/setuptools_scm-2.1[${PYTHON_USEDEP}]
>=dev-python/wheel-0.31[${PYTHON_USEDEP}]
"
PATCHES=( "${FILESDIR}/${PN}-0.18.0-system-harfbuzz.patch" )
distutils_enable_tests pytest
python_prepare_all() {
distutils-r1_python_prepare_all
export SETUPTOOLS_SCM_PRETEND_VERSION="${PV%_*}"
export USE_SYSTEM_HARFBUZZ=1
}
python_install() {
distutils-r1_python_install
python_optimize "$(python_get_sitedir)/${PN}"
}

View File

@@ -16,7 +16,7 @@ KEYWORDS="~amd64"
LICENSE="Apache-2.0"
SLOT="0"
RDEPEND=">=media-libs/harfbuzz-2.8.1[experimental(-)]"
RDEPEND=">=media-libs/harfbuzz-4.0.0[experimental(-)]"
DEPEND="
${RDEPEND}
>=dev-python/cython-0.28.1[${PYTHON_USEDEP}]
@@ -33,8 +33,3 @@ python_prepare_all() {
export SETUPTOOLS_SCM_PRETEND_VERSION="${PV%_*}"
export USE_SYSTEM_HARFBUZZ=1
}
python_install() {
distutils-r1_python_install
python_optimize "$(python_get_sitedir)/${PN}"
}

View File

@@ -1 +1,2 @@
DIST mapillary_tools-0.8.0.tar.gz 12080089 BLAKE2B a34b68a479ecb85f5a6e53e4e2ce7db92e6e59e7c07c5b7bd20c2153f372fd9ae83a23ded3bde8a655ddfd03146357728679232e186cb576290d55726faa8134 SHA512 45b2228f48874006aa46890f807bcd3c5cfb08036bc7c5b2182f39efced352cc6bf3fc1c49c386654a2f0ed08e1bdec5d6a542b4d43ca012f86891596e0ca870
DIST mapillary_tools-0.8.2.tar.gz 14928332 BLAKE2B 434e6a97b69372b266b684276f816bc77c83e91bc9569d28b20c2b29e04e6ff1def1dbd269abb81bb14b0ad2155759c15c7485712747cbc5af48de58ab85409d SHA512 78843e7b571f54d9d42b71baf9a63a3f64ea67432c2a9c96f129db6d9511ce5f6070a36581eae5500778b41215d27ae892ccca9c62cd1fc82285cb0cbe9807cf

View File

@@ -0,0 +1,38 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..9} )
inherit distutils-r1
DESCRIPTION="Command line tools for processing and uploading Mapillary imagery"
HOMEPAGE="https://github.com/mapillary/mapillary_tools"
SRC_URI="https://github.com/mapillary/mapillary_tools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
KEYWORDS="~amd64"
SLOT="0"
RDEPEND="
>=dev-python/exifread-2.3.2[${PYTHON_USEDEP}]
>=dev-python/piexif-1.1.3[${PYTHON_USEDEP}]
>=dev-python/gpxpy-1.4.2[${PYTHON_USEDEP}]
>=dev-python/pymp4-1.1.0[${PYTHON_USEDEP}]
>=dev-python/pynmea2-1.12.0[${PYTHON_USEDEP}]
>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
>=dev-python/tqdm-4.0[${PYTHON_USEDEP}]
dev-python/typing-extensions[${PYTHON_USEDEP}]
dev-python/jsonschema[${PYTHON_USEDEP}]
"
DEPEND="
${RDEPEND}
>=dev-python/pillow-8.1.2[${PYTHON_USEDEP}]
dev-python/pyinstaller[${PYTHON_USEDEP}]
dev-python/types-python-dateutil[${PYTHON_USEDEP}]
dev-python/types-pytz[${PYTHON_USEDEP}]
dev-python/types-requests[${PYTHON_USEDEP}]
"
distutils_enable_tests pytest

View File

@@ -63,7 +63,10 @@ RDEPEND="
DEPEND="
${RDEPEND}
examples? ( dev-libs/urdfdom_headers )
extras? ( dev-libs/urdfdom_headers )
extras? (
dev-cpp/gtest
dev-libs/urdfdom_headers
)
test? (
dev-cpp/gtest
python? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') )

View File

@@ -1,2 +1 @@
DIST nova-25.0.0.0rc1.tar.gz 9446116 BLAKE2B e747588076c5bd35bab5cf3d3afca37523ee3e2643d9d18e50243ce8320c71151fabf87ef530dab180b871049cd55e5ee4dec6dc9e3d16a68d99b627870e4f93 SHA512 1c07fb6ce81efebd78a519cf6334f47d4dc08d6d949910f6c38b356f3457e2b2c4df6edb90d0760ac17740df0c0116a75eccf9ac85780757614fba110280d013
DIST nova.conf.sample-25.0.0.0_rc1 187107 BLAKE2B e577126b67f2cc1aa6597f89b1632007f726ad85875d5f27041d0f9ac88923b944fe7f45ae2b3332157713b5f93034dad4da2860917b025649a52d7d71986612 SHA512 4149f8f19a573e8717f521183ba330853742bb6731f0e9ef02842d3be1c188ea3a2cdbeb6043086869360b9b1174a17e221c4ad1f543f74220c46cf31b1ca970

View File

@@ -3,11 +3,10 @@
EAPI=8
EPYTEST_DESELECT=( nova/tests/unit/test_hacking.py )
MYP="${P//_/}"
PYTHON_COMPAT=( python3_{8..9} )
inherit distutils-r1 linux-info udev
inherit bash-completion-r1 distutils-r1 linux-info udev
DESCRIPTION="Cloud computing fabric controller"
HOMEPAGE="
@@ -15,14 +14,11 @@ HOMEPAGE="
https://opendev.org/openstack/nova
https://pypi.org/project/nova/
"
SRC_URI="
https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-${PV}
https://tarballs.openstack.org/${PN}/${MYP}.tar.gz
"
SRC_URI="https://tarballs.openstack.org/${PN}/${MYP}.tar.gz"
S="${WORKDIR}/${MYP}"
KEYWORDS="~amd64"
LICENSE="Apache-2.0"
LICENSE="Apache-2.0 iscsi? ( GPL-2 )"
SLOT="0"
IUSE="+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
@@ -170,8 +166,6 @@ REQUIRED_USE="
compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )
test? ( mysql )
"
#PATCHES=(
#)
distutils_enable_tests pytest
@@ -189,10 +183,16 @@ pkg_setup() {
}
python_prepare_all() {
rm nova/tests/unit/test_hacking.py || die
sed -i '/^hacking/d' test-requirements.txt || die
distutils-r1_python_prepare_all
}
python_compile_all() {
oslo-config-generator --config-file=etc/nova/nova-config-generator.conf || die
oslopolicy-sample-generator --config-file=etc/nova/nova-policy-generator.conf || die
}
python_install_all() {
distutils-r1_python_install_all
@@ -210,9 +210,13 @@ python_install_all() {
insinto /etc/nova
insopts -m 0640 -o nova -g nova
newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
doins "nova.conf.sample"
doins "${FILESDIR}/nova-compute.conf"
dodoc etc/nova/README*.txt
rm etc/nova/README*.txt || die
doins "${S}/etc/nova/"*
doins policy.yaml
# rootwrap filters
insopts -m 0644
insinto /etc/nova/rootwrap.d
@@ -223,6 +227,8 @@ python_install_all() {
insopts -m 0600 -o root -g root
doins "${FILESDIR}/nova-sudoers"
newbashcomp tools/nova-manage.bash_completion nova-manage
if use iscsi ; then
# Install udev rules for handle iscsi disk with right links under /dev
udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules