Sync with portage [Thu Nov 11 17:22:04 MSK 2021].

akrasnyh 2126
root 2 years ago
parent 2e07874c8a
commit 3fd93b8c36

Binary file not shown.

Binary file not shown.

@ -5,3 +5,4 @@ DIST awscli-1.21.12.tar.gz 2097963 BLAKE2B e752cb1369be9ee26b517ba1226d3e16fad0a
DIST awscli-1.21.5.tar.gz 2095418 BLAKE2B 152d0ac70e9e0120fb9b10451904af52035bce84168c055695e7dc93e56648bd7689f20ac0ecdbdfc54ccb846d51b33027d2e9ee09c5e5d1e915c0ec05b0fbfe SHA512 e3063252a50fc6033669a0ff80f82d73764a6728d623d75a27f0652e779cbeb452454d887bf5bd70199a7394df40f9758b14619778c6428a164d590e6c8aaa89
DIST awscli-1.22.1.tar.gz 2109309 BLAKE2B 24be9fca3f767745eb2bd8dd77389410a95e583c8b9fb701122c666cd190393aa32299ec2c62f19a917a235853cc6dbde5324ad665c11ec3d54f596584d19470 SHA512 b653a63f1db2f4cfeba0ef463596bd9b7d40a76b06bbeb9671eba9e14cd27f3283ba222ad97172d8399f2c9a8f8fa39f59a25a1e5f8832cba6694f26262797bc
DIST awscli-1.22.2.tar.gz 2109538 BLAKE2B 09ba6020093a80f1505bf945f0e0946cc37368a9ef1425e1ff20cfe3b19d9cb346f52f22513c58e8820a1454dd296474efaeef6349060819bb29dce972216549 SHA512 64a32f6ae4961f20c52801bcc654fbeb2a84e2bcf582e701ab266ffd61a67b1122a2dcb469ae43c363b87b8b79b59c78738adef7c4677d19c5a7bb4dcb11764b
DIST awscli-1.22.3.tar.gz 2109828 BLAKE2B 48424e51dc05a3a23be5b8e0d71b2a9cc946e740862553e52272213ca30c0b2a863b160bd6301b6dad647369c0ee9de5f99cb6cd882000ee32cc7d89401efe2a SHA512 34ca06dc9261580937e752db42374ce104f79dfa982a553e3c11b196f6d59036ae674ff28e7176e26fe7489685e10b45c5fe4dbb0ed806e898d6e2e300bde5ab

@ -0,0 +1,56 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
inherit bash-completion-r1 distutils-r1
DESCRIPTION="Universal Command Line Environment for AWS"
HOMEPAGE="https://pypi.org/project/awscli/"
#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/aws-cli-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
# botocore is x.(y+1).z
BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
RDEPEND="
>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
dev-python/colorama[${PYTHON_USEDEP}]
dev-python/docutils[${PYTHON_USEDEP}]
dev-python/rsa[${PYTHON_USEDEP}]
>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
"
distutils_enable_tests --install pytest
src_prepare() {
# do not rely on bundled deps in botocore (sic!)
find -name '*.py' -exec sed -i \
-e 's:from botocore[.]vendored import:import:' \
-e 's:from botocore[.]vendored[.]:from :' \
{} + || die
distutils-r1_src_prepare
}
python_test() {
distutils_install_for_testing
# integration tests require AWS credentials and Internet access
epytest tests/{functional,unit}
}
python_install_all() {
newbashcomp bin/aws_bash_completer aws
insinto /usr/share/zsh/site-functions
newins bin/aws_zsh_completer.sh _aws
distutils-r1_python_install_all
rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
}

@ -0,0 +1,76 @@
diff --git a/gixy/core/regexp.py b/gixy/core/regexp.py
index 7a96187..f360604 100644
--- a/gixy/core/regexp.py
+++ b/gixy/core/regexp.py
@@ -3,7 +3,11 @@ import logging
import re
import random
import itertools
-from cached_property import cached_property
+
+try:
+ from functools import cached_property
+except ImportError:
+ from cached_property import cached_property
import gixy.core.sre_parse.sre_parse as sre_parse
diff --git a/gixy/directives/block.py b/gixy/directives/block.py
index 5e5b1ed..cc9bcb0 100644
--- a/gixy/directives/block.py
+++ b/gixy/directives/block.py
@@ -1,4 +1,7 @@
-from cached_property import cached_property
+try:
+ from functools import cached_property
+except ImportError:
+ from cached_property import cached_property
from gixy.directives.directive import Directive
from gixy.core.variable import Variable
diff --git a/gixy/parser/raw_parser.py b/gixy/parser/raw_parser.py
index 6a30b7f..0f43308 100644
--- a/gixy/parser/raw_parser.py
+++ b/gixy/parser/raw_parser.py
@@ -1,7 +1,11 @@
import logging
import codecs
import six
-from cached_property import cached_property
+
+try:
+ from functools import cached_property
+except ImportError:
+ from cached_property import cached_property
from pyparsing import (
Literal, Suppress, White, Word, alphanums, Forward, Group, Optional, Combine,
diff --git a/requirements.txt b/requirements.txt
index dbf6d5f..47a1b54 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
pyparsing>=1.5.5
-cached-property>=1.2.0
+cached-property>=1.2.0;python_version<"3.8"
argparse>=1.4.0
six>=1.1.0
Jinja2>=2.8
-ConfigArgParse>=0.11.0
\ No newline at end of file
+ConfigArgParse>=0.11.0
diff --git a/setup.py b/setup.py
index e4314a6..e57842b 100644
--- a/setup.py
+++ b/setup.py
@@ -18,8 +18,8 @@ setup(
url='https://github.com/yandex/gixy',
install_requires=[
'pyparsing>=1.5.5',
- 'cached-property>=1.2.0',
- 'argparse>=1.4.0',
+ 'cached-property>=1.2.0;python_version<"3.8"',
+ 'argparse>=1.4.0;python_version<"3.2"',
'six>=1.1.0',
'Jinja2>=2.8',
'ConfigArgParse>=0.11.0'

@ -1,10 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
DESCRIPTION="Nginx configuration static analyzer"
@ -18,14 +17,12 @@ KEYWORDS="~amd64 ~x86"
RDEPEND="
>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
>=dev-python/configargparse-0.11.0[${PYTHON_USEDEP}]
>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
>=dev-python/six-1.1.0[${PYTHON_USEDEP}]"
distutils_enable_tests nose
python_prepare_all() {
sed -i -e "/argparse/d" setup.py || die
distutils-r1_python_prepare_all
}
PATCHES=(
"${FILESDIR}"/${P}-backports.patch
)

Binary file not shown.

@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="bzip2 doc clamonacc clamdtop clamsubmit iconv ipv6 libclamav-only milter metadata-analysis-api selinux systemd test uclibc xml"
REQUIRED_USE="libclamav-only? ( !clamonacc !clamdtop !clamsubmit !milter !metadata-analysis-api )"

Binary file not shown.

@ -1,2 +1,2 @@
DIST gnome-autoar-0.3.3.tar.xz 298536 BLAKE2B effbd3c15ab851c97f3c69f96bbf806f3639ce4865161df99b7f84ec2c4c8a3df9381517227d9a475b1006d88ac21eb02b4b474fd8bd27524959b56cf486e888 SHA512 41cda2670506e9b3f79c4995d2fdfbd5024777d8f8b3f85a2010af4e5f4303743d26ad9cad787c995362f83b65617ed5773d972c8aa2c7bdcd358d873cb86ec4
DIST gnome-autoar-0.4.0.tar.xz 50176 BLAKE2B 6dce638d180ae8566f45757870cdf0de70a944cbdfde940f13bd139f3ee6fb1c18ff91ca0b1cc9b99dbeb4b5c67314c81448e1876a328e928b2d9787492988ec SHA512 ab4ef47ef65e4fa0dc652b19a9eb94cc307013e4c7ced6980cedc7ced20fb77d53e1807c20b14a69c1ddc536c4ed0007062481e258d36c07e3be837537916b7f
DIST gnome-autoar-0.4.1.tar.xz 50152 BLAKE2B d54677ccd50898d9764e385dfbf27dc5c145aa2cc7b824594e69481f20de1ce34986855c1aba2efd86b4ad56b4261564895b217c58b661d2c20d50b4341fefa4 SHA512 5c082c42342256c3af9dfa49435c1ab884c051a9c47a0313a343a747c2f30de2662505f4d77db20dffbdd39a5d0447d2dfb4ccf3da96a198ea987bc5c0c0dddf

@ -4,17 +4,18 @@
EAPI=7
VALA_USE_DEPEND="vapigen"
inherit gnome2 vala
inherit gnome.org meson vala
DESCRIPTION="Automatic archives creating and extracting library"
HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-autoar"
LICENSE="LGPL-2.1+"
SLOT="0"
IUSE="gtk +introspection vala"
REQUIRED_USE="vala? ( introspection )"
IUSE="gtk gtk-doc +introspection test vala"
REQUIRED_USE="vala? ( introspection ) gtk-doc? ( gtk )"
RESTRICT="!test? ( test )"
KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
RDEPEND="
>=app-arch/libarchive-3.4.0
@ -24,20 +25,24 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
BDEPEND="
>=dev-util/gtk-doc-am-1.14
virtual/pkgconfig
gtk-doc? ( dev-util/gtk-doc
app-text/docbook-xml-dtd:4.3 )
vala? ( $(vala_depend) )
"
src_prepare() {
use vala && vala_src_prepare
gnome2_src_prepare
default
}
src_configure() {
gnome2_src_configure \
--disable-static \
$(use_enable introspection) \
$(use_enable vala) \
$(use_enable gtk)
local emesonargs=(
$(meson_use gtk)
$(meson_feature introspection)
$(meson_use vala vapi)
$(meson_use test tests)
$(meson_use gtk-doc gtk_doc)
)
meson_src_configure
}

@ -1 +1,2 @@
DIST tarsync-0.2.1.tar.bz2 13593 BLAKE2B 4841d501587c8d4932031fe939fce9f41019622af2a4253bfe12c01160956e7eaeebf5ff00174332dce6b17ae150ead42b7c1a57483f948ba191b5c3943f6596 SHA512 bebf8e495ad196c002414c41f9fe9737b5300de18b7c3b16576a7d3bfd94608f36f1b86cb6ed4879c600b71c7706255d9b2d4140b73c5743a473fa2500dbca2d
DIST tarsync-0.2.2.tar.gz 21028 BLAKE2B 33aae739c990a85d8ce9458545b829743a3babd30890988f83d9ad6eebe96ffb48f872b5afb947fe58eb9156000513d65e299cdcc57ffc7e9cb12ee4d986b784 SHA512 88d7ca773538f7d2d612068ce9b6b4389d63e627a12f6377a7e7f397700d92eb29c6f4facc6b698454710e63808a3b4d6acc7901c6999dcca2de93c5d58a2622

@ -0,0 +1,26 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit toolchain-funcs
DESCRIPTION="Delta compression suite for using/generating binary patches"
HOMEPAGE="https://github.com/zmedico/tarsync"
SRC_URI="https://github.com/zmedico/tarsync/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux"
DEPEND=">=dev-util/diffball-0.7"
RDEPEND="${DEPEND}"
src_configure() {
tc-export CC
}
src_install() {
dobin tarsync #make install doesn't support prefix
einstalldocs
}

Binary file not shown.

@ -20,7 +20,6 @@ IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
>=dev-python/docker-py-4.4.4[${PYTHON_USEDEP}]
>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]

@ -20,7 +20,6 @@ IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
>=dev-python/docker-py-5[${PYTHON_USEDEP}]
>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]

@ -20,7 +20,6 @@ IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
>=dev-python/docker-py-5[${PYTHON_USEDEP}]
>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]

@ -17,7 +17,6 @@ SLOT="0"
KEYWORDS="amd64 arm64"
RDEPEND="
>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
>=dev-python/docker-py-5[${PYTHON_USEDEP}]
>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]

@ -2,3 +2,4 @@ DIST free42-nologo-2.5.24.tgz 7423183 BLAKE2B e10425af8d5c30be6ab5b728130bbe3068
DIST free42-nologo-3.0.3.tgz 7443713 BLAKE2B dd9db670aa463343387e66a2ad56f212463c0b02135cb489e8937eb434fa0431228f6120ade8000f357f92a384f5f5bdf53d07fe1d14eb0ad2f81be269a075b8 SHA512 fc5c9520c04eabd5978cc4e8a9e237107605775cf94a4bc3877fedf19d3b94c0c4ee59db9a6a423cf1747ab3e63e479860f3da5968606414824df5b986eba3a1
DIST free42-nologo-3.0.5.tgz 7445153 BLAKE2B dc9ded017b4fa80f0c59c7f59715b00dd23a5b35441f220cd392c3aa1393a132226ab640c3ab049a142ace561de19a6d43904efeaf5bfc37d4fa4fc0174f97f8 SHA512 2e7a3d8808f5dd6568b6abd9a04750726fe6d79eeb9b4cee4f1bec00be6a6156cbc6d6e1c6ccc258ef49d16c22293b50f8a6bdbe7c1b401fffb01afac9ae657a
DIST free42-nologo-3.0.6.tgz 7449542 BLAKE2B 4b7f69c45e16f412247cd8f7b8e0c958124191c19633e4003a78e150236aa53b4853a63c5227e7f3d13301c30ec60202ad08b7048b67cbacb67906511955ef21 SHA512 dec50856ae1732aaf8f556e642e2ccaec81b00991118536ed67865540afcfd04604e13ac28e255c92869d044d0d3634c742f4e2c745427a2a323814be2415142
DIST free42-nologo-3.0.7.tgz 7452538 BLAKE2B 4f51f11b14ca205687be2fe5f805039bdd7bd0a5588a7f9fff63013f1d775f2ebe6f9045f2c09474bc7ff622d9d2dbbad2be2ee6429032b7b17fff1a513afb87 SHA512 93dc71dcb52172fa69cb68336d4d0ca7552725d4a267393c88eb0e646918a6c00653bbd89941d62cbc61ed28a917d25d36ee94e0e1b7983c8b513aa239a2e3ab

@ -0,0 +1,50 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit toolchain-funcs
MY_PV="${PN}-nologo-${PV}"
DESCRIPTION="An HP-42S Calculator Simulator"
HOMEPAGE="https://thomasokken.com/free42/"
SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+alsa"
DEPEND="dev-libs/atk
x11-libs/cairo
x11-libs/gdk-pixbuf
x11-libs/gtk+:3
alsa? ( media-libs/alsa-lib )"
RDEPEND="${DEPEND}"
DOCS=( CREDITS HISTORY README )
S="${WORKDIR}/${MY_PV}"
PATCHES=(
"${FILESDIR}/${PN}-2.5.16-fix-makefile.patch"
"${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch"
)
src_prepare() {
default
}
src_compile() {
local myconf
use alsa && myconf="AUDIO_ALSA=yes"
emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
emake -C gtk clean
emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
}
src_install() {
default
dobin gtk/free42bin gtk/free42dec
}

Binary file not shown.

@ -437,5 +437,6 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918
DIST redis_exporter-1.2.1.tar.gz 1415284 BLAKE2B 8218e36fa11d74e1be49f421ce2074388c434e713d1af57930538e4246744f34aecddeabf7a97a796b51ff5df4beef71b905310f8d96906acea120322551d2f6 SHA512 29faed372225cebcc2db35e8e2d08519e160d27070fed7b90afffcd3865e9ccc54e8aeb82dfbb1ca275eedc64542a67c688062428488cd74234de67b3589fda9
DIST redis_exporter-1.20.0.tar.gz 123536 BLAKE2B ce90e26368e905aa45083290d54aa18733d47d10090a22f775607a5bc0133df215649a8cd6ae6460ebad5807520b33f3d8d62f7a690f4ae05699cf1ea7917258 SHA512 fc545e25cb6be33e81157c4c5b8557ebfbc98ccd7cb8ac4a988eb1120ab8ba6f7875727a1cca8401a9f1f36011b02e9dfdb837a31f679b06794dfdd0a7d5ac69
DIST redis_exporter-1.30.0.tar.gz 172010 BLAKE2B 7da9576c47735d650bd22cf1f6cb721a2ea96bcf0901889b41465e704e07ad8e464d50cad2313aca896bfc157511b5ff6faae3540344ebbf7e165e48b2a02f1f SHA512 f518151a1e188c3dbe42496be8e47af97fbbc2d44e26ffeeed68ac57f05165b8f0900c574f846f4294f163a87a3ea3f2aad64fb85462d4120a9c273e7cd41308
DIST redis_exporter-1.31.1.tar.gz 172100 BLAKE2B fef10834a4278814e0fca141a4258e01cac1b1df2db4c9fe13e60f28a42f4905f064ec3a9db970f9805cef473f03131f2c3277163881f3e17194524e30c2a1c7 SHA512 cd57d78908566eb938acfecc72ceebaa3e150e2261ee481d9073e36cfc4546868bd3f55bd67ca8c830ee38228cd4030492e4d9444a2c37e70edc5d1927dfe519
DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282

@ -0,0 +1,215 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit go-module systemd
EGIT_COMMIT=39d8a4f5e178e4e75ae481fbd9028ff044843c2d
DESCRIPTION="Prometheus Exporter for Redis Metrics. Supports Redis 2.x, 3.x and 4.x"
HOMEPAGE="https://github.com/oliver006/redis_exporter"
EGO_SUM=(
"cloud.google.com/go v0.34.0/go.mod"
"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
"github.com/beorn7/perks v1.0.0/go.mod"
"github.com/beorn7/perks v1.0.1"
"github.com/beorn7/perks v1.0.1/go.mod"
"github.com/cespare/xxhash/v2 v2.1.1"
"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
"github.com/davecgh/go-spew v1.1.0/go.mod"
"github.com/davecgh/go-spew v1.1.1"
"github.com/davecgh/go-spew v1.1.1/go.mod"
"github.com/go-kit/kit v0.8.0/go.mod"
"github.com/go-kit/kit v0.9.0/go.mod"
"github.com/go-kit/log v0.1.0/go.mod"
"github.com/go-logfmt/logfmt v0.3.0/go.mod"
"github.com/go-logfmt/logfmt v0.4.0/go.mod"
"github.com/go-logfmt/logfmt v0.5.0/go.mod"
"github.com/go-stack/stack v1.8.0/go.mod"
"github.com/gogo/protobuf v1.1.1/go.mod"
"github.com/golang/protobuf v1.2.0/go.mod"
"github.com/golang/protobuf v1.3.1/go.mod"
"github.com/golang/protobuf v1.3.2/go.mod"
"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
"github.com/golang/protobuf v1.4.0/go.mod"
"github.com/golang/protobuf v1.4.2/go.mod"
"github.com/golang/protobuf v1.4.3"
"github.com/golang/protobuf v1.4.3/go.mod"
"github.com/gomodule/redigo v1.8.5"
"github.com/gomodule/redigo v1.8.5/go.mod"
"github.com/google/go-cmp v0.3.0/go.mod"
"github.com/google/go-cmp v0.3.1/go.mod"
"github.com/google/go-cmp v0.4.0/go.mod"
"github.com/google/go-cmp v0.5.4/go.mod"
"github.com/google/go-cmp v0.5.5"
"github.com/google/go-cmp v0.5.5/go.mod"
"github.com/google/gofuzz v1.0.0/go.mod"
"github.com/jpillora/backoff v1.0.0/go.mod"
"github.com/json-iterator/go v1.1.6/go.mod"
"github.com/json-iterator/go v1.1.10/go.mod"
"github.com/json-iterator/go v1.1.11/go.mod"
"github.com/julienschmidt/httprouter v1.2.0/go.mod"
"github.com/julienschmidt/httprouter v1.3.0/go.mod"
"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
"github.com/kr/pretty v0.1.0"
"github.com/kr/pretty v0.1.0/go.mod"
"github.com/kr/pty v1.1.1/go.mod"
"github.com/kr/text v0.1.0"
"github.com/kr/text v0.1.0/go.mod"
"github.com/matttproud/golang_protobuf_extensions v1.0.1"
"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
"github.com/mna/redisc v1.1.7"
"github.com/mna/redisc v1.1.7/go.mod"
"github.com/mna/redisc v1.3.2"
"github.com/mna/redisc v1.3.2/go.mod"
"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
"github.com/modern-go/reflect2 v1.0.1/go.mod"
"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod"
"github.com/pkg/errors v0.8.0/go.mod"
"github.com/pkg/errors v0.8.1/go.mod"
"github.com/pkg/errors v0.9.1/go.mod"
"github.com/pmezard/go-difflib v1.0.0"
"github.com/pmezard/go-difflib v1.0.0/go.mod"
"github.com/prometheus/client_golang v0.9.1/go.mod"
"github.com/prometheus/client_golang v1.0.0/go.mod"
"github.com/prometheus/client_golang v1.7.1/go.mod"
"github.com/prometheus/client_golang v1.11.0"
"github.com/prometheus/client_golang v1.11.0/go.mod"
"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
"github.com/prometheus/client_model v0.2.0"
"github.com/prometheus/client_model v0.2.0/go.mod"
"github.com/prometheus/common v0.4.1/go.mod"
"github.com/prometheus/common v0.10.0/go.mod"
"github.com/prometheus/common v0.26.0"
"github.com/prometheus/common v0.26.0/go.mod"
"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
"github.com/prometheus/procfs v0.0.2/go.mod"
"github.com/prometheus/procfs v0.1.3/go.mod"
"github.com/prometheus/procfs v0.6.0"
"github.com/prometheus/procfs v0.6.0/go.mod"
"github.com/sirupsen/logrus v1.2.0/go.mod"
"github.com/sirupsen/logrus v1.4.2/go.mod"
"github.com/sirupsen/logrus v1.6.0/go.mod"
"github.com/sirupsen/logrus v1.8.1"
"github.com/sirupsen/logrus v1.8.1/go.mod"
"github.com/stretchr/objx v0.1.0/go.mod"
"github.com/stretchr/objx v0.1.1/go.mod"
"github.com/stretchr/testify v1.2.2/go.mod"
"github.com/stretchr/testify v1.3.0/go.mod"
"github.com/stretchr/testify v1.4.0/go.mod"
"github.com/stretchr/testify v1.5.1"
"github.com/stretchr/testify v1.5.1/go.mod"
"github.com/stretchr/testify v1.7.0/go.mod"
"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
"golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40"
"golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod"
"golang.org/x/text v0.3.0/go.mod"
"golang.org/x/text v0.3.2/go.mod"
"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
"google.golang.org/appengine v1.4.0/go.mod"
"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
"google.golang.org/protobuf v1.21.0/go.mod"
"google.golang.org/protobuf v1.23.0/go.mod"
"google.golang.org/protobuf v1.26.0-rc.1"
"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
"gopkg.in/yaml.v2 v2.2.1/go.mod"
"gopkg.in/yaml.v2 v2.2.2/go.mod"
"gopkg.in/yaml.v2 v2.2.4/go.mod"
"gopkg.in/yaml.v2 v2.2.5/go.mod"
"gopkg.in/yaml.v2 v2.3.0"
"gopkg.in/yaml.v2 v2.3.0/go.mod"
"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
)
go-module_set_globals
SRC_URI="https://github.com/oliver006/redis_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz
${EGO_SUM_SRC_URI}"
LICENSE="MIT Apache-2.0 BSD"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
RDEPEND="
acct-user/redis_exporter
acct-group/redis_exporter"
DEPEND="${RDEPEND}"
RESTRICT+=" test"
src_prepare() {
default
sed -e "s|\(^[[:space:]]*VERSION[[:space:]]*=[[:space:]]*\).*|\1\"${PV}\"|" \
-e "s|\(^[[:space:]]*BUILD_DATE[[:space:]]*=[[:space:]]*\).*|\1\"$(LC_ALL=C date -u)\"|" \
-e "s|\(^[[:space:]]*COMMIT_SHA1[[:space:]]*=[[:space:]]*\).*|\1\"${EGIT_COMMIT}\"|" \
-i main.go || die
}
src_compile() {
export GOBIN="${S}/bin"
go install \
-ldflags="-X main.BuildVersion=${PV} -X main.BuildCommitSha=${EGIT_COMMIT} -X main.BuildDate=$(date +%F-%T)" \
./... || die
}
src_test() {
go test -work ./... || die
}
src_install() {
dobin "${GOBIN}/redis_exporter"
dodoc README.md
local dir
for dir in /var/{lib,log}/${PN}; do
keepdir "${dir}"
fowners ${PN}:${PN} "${dir}"
done
newinitd "${FILESDIR}"/${PN}.initd ${PN}
newconfd "${FILESDIR}"/${PN}.confd ${PN}
insinto /etc/logrotate.d
newins "${FILESDIR}/${PN}.logrotated" "${PN}"
systemd_dounit "${FILESDIR}/${PN}.service"
}

Binary file not shown.

@ -1,23 +0,0 @@
From d025f3deb6349f56a7fc49551e819cfe13f97917 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 31 Aug 2016 17:48:45 -0400
Subject: [PATCH] TW-1778: Unicode strings are truncated in task description
- Thanks to Andrew, bjonnh, OKOMPer, Vladimir.
---
diff --git a/src/text.cpp b/src/text.cpp
index f5e3496b..bc8353f7 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -248,7 +248,7 @@ bool extractLine (
// Premature EOL.
if (character == '\n')
{
- line = text.substr (offset, line_length);
+ line = text.substr (offset, prior_cursor - offset);
offset = cursor;
return true;
}
--
2.11.0

@ -1,17 +0,0 @@
Do not force the use of libc++ when compiling with Clang
Fix by David Denoncin
https://bugs.gentoo.org/729560
--- a/CMakeLists.txt 2020-08-09 14:04:40.095904996 -0000
+++ b/CMakeLists.txt 2020-08-09 14:04:59.449238208 -0000
@@ -43,10 +43,6 @@
message (FATAL_ERROR "C++11 support missing. Try upgrading your C++ compiler. If you have a good reason for using an outdated compiler, please let us know at support@taskwarrior.org.")
endif (_HAS_CXX11)
-if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
- set (_CXX11_FLAGS "${_CXX11_FLAGS} -stdlib=libc++")
-endif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
-
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set (LINUX true)
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

Binary file not shown.

@ -1,310 +0,0 @@
From ec23228a3a2fc4e8868f7f04b838313be59ad719 Mon Sep 17 00:00:00 2001
From: Jan-Marek Glogowski <glogow@fbihome.de>
Date: Sun, 11 Apr 2021 17:40:26 +0200
Subject: tdf#143796 Qt5/KF5 fix double-buffer graphics
This is a squashed commit for:
"Qt5/KF5 get rid of unneeded own grahics handling"
"tdf#143334 Qt5 don't reset buffer on style change"
"tdf#144008 Qt5/Kf5 create frames in the GUI thread"
commit 963f252cd1ea9c268a6ced68a3454b10cbee1a89
commit ec77a2ed0283cb3446f6e352fc329afd3dfb785c
commit 923b30aa27ceb377d6a540c012000e89ce5db31e
The first commit exposed the same problem to kf5, the 2nd patch is
the real fix and the 3rd partly a regression for kf5 from the 1st
commit but also an additional bugfix for qt5.
Change-Id: I84b8dd106a35a5c2fda08a525f657b0b733a5cb7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121795
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
---
vcl/inc/qt5/Qt5Frame.hxx | 8 +-------
vcl/inc/qt5/Qt5Instance.hxx | 1 +
vcl/qt5/Qt5Frame.cxx | 34 ++++++++++++----------------------
vcl/qt5/Qt5Instance.cxx | 18 +++++++++++++++---
vcl/unx/kf5/KF5SalFrame.cxx | 24 ------------------------
vcl/unx/kf5/KF5SalFrame.hxx | 6 ------
vcl/unx/kf5/KF5SalInstance.cxx | 16 +++++++++++++---
vcl/unx/kf5/KF5SalInstance.hxx | 1 +
8 files changed, 43 insertions(+), 65 deletions(-)
diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx
index 54a721e03730..9b6e3811c3bb 100644
--- a/vcl/inc/qt5/Qt5Frame.hxx
+++ b/vcl/inc/qt5/Qt5Frame.hxx
@@ -77,17 +77,12 @@ class VCLPLUG_QT5_PUBLIC Qt5Frame : public QObject, public SalFrame
std::unique_ptr<QImage> m_pQImage;
std::unique_ptr<Qt5Graphics> m_pQt5Graphics;
UniqueCairoSurface m_pSurface;
- std::unique_ptr<Qt5SvpGraphics> m_pOurSvpGraphics;
- // in base class, this ptr is the same as m_pOurSvpGraphic
- // in derived class, it can point to a derivative
- // of Qt5SvpGraphics (which the derived class then owns)
- Qt5SvpGraphics* m_pSvpGraphics;
+ std::unique_ptr<Qt5SvpGraphics> m_pSvpGraphics;
DamageHandler m_aDamageHandler;
QRegion m_aRegion;
bool m_bNullRegion;
bool m_bGraphicsInUse;
- bool m_bGraphicsInvalid;
SalFrameStyleFlags m_nStyle;
Qt5Frame* m_pParent;
PointerStyle m_ePointerStyle;
@@ -144,7 +139,6 @@ public:
void Damage(sal_Int32 nExtentsX, sal_Int32 nExtentsY, sal_Int32 nExtentsWidth,
sal_Int32 nExtentsHeight) const;
- void InitQt5SvpGraphics(Qt5SvpGraphics* pQt5SvpGraphics);
virtual SalGraphics* AcquireGraphics() override;
virtual void ReleaseGraphics(SalGraphics* pGraphics) override;
diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx
index d73a59de51c1..a2372e58f8c9 100644
--- a/vcl/inc/qt5/Qt5Instance.hxx
+++ b/vcl/inc/qt5/Qt5Instance.hxx
@@ -82,6 +82,7 @@ protected:
virtual Qt5FilePicker*
createPicker(css::uno::Reference<css::uno::XComponentContext> const& context,
QFileDialog::FileMode);
+ bool useCairo() const { return m_bUseCairo; }
public:
explicit Qt5Instance(std::unique_ptr<QApplication>& pQApp, bool bUseCairo = false);
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index b398e9a5cf3b..d39d1729c812 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -104,10 +104,8 @@ sal_Int32 screenNumber(const QScreen* pScreen)
Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo)
: m_pTopLevel(nullptr)
, m_bUseCairo(bUseCairo)
- , m_pSvpGraphics(nullptr)
, m_bNullRegion(true)
, m_bGraphicsInUse(false)
- , m_bGraphicsInvalid(false)
, m_ePointerStyle(PointerStyle::Arrow)
, m_pDragSource(nullptr)
, m_pDropTarget(nullptr)
@@ -288,17 +286,6 @@ void Qt5Frame::Damage(sal_Int32 nExtentsX, sal_Int32 nExtentsY, sal_Int32 nExten
1 / devicePixelRatioF()));
}
-void Qt5Frame::InitQt5SvpGraphics(Qt5SvpGraphics* pQt5SvpGraphics)
-{
- QSize aSize = m_pQWidget->size() * devicePixelRatioF();
- m_pSvpGraphics = pQt5SvpGraphics;
- m_pSurface.reset(
- cairo_image_surface_create(CAIRO_FORMAT_ARGB32, aSize.width(), aSize.height()));
- m_pSvpGraphics->setSurface(m_pSurface.get(), basegfx::B2IVector(aSize.width(), aSize.height()));
- cairo_surface_set_user_data(m_pSurface.get(), Qt5SvpGraphics::getDamageKey(), &m_aDamageHandler,
- nullptr);
-}
-
SalGraphics* Qt5Frame::AcquireGraphics()
{
if (m_bGraphicsInUse)
@@ -308,24 +295,28 @@ SalGraphics* Qt5Frame::AcquireGraphics()
if (m_bUseCairo)
{
- if (!m_pOurSvpGraphics || m_bGraphicsInvalid)
+ if (!m_pSvpGraphics)
{
- m_pOurSvpGraphics.reset(new Qt5SvpGraphics(this));
- InitQt5SvpGraphics(m_pOurSvpGraphics.get());
- m_bGraphicsInvalid = false;
+ QSize aSize = m_pQWidget->size() * devicePixelRatioF();
+ m_pSvpGraphics.reset(new Qt5SvpGraphics(this));
+ m_pSurface.reset(
+ cairo_image_surface_create(CAIRO_FORMAT_ARGB32, aSize.width(), aSize.height()));
+ m_pSvpGraphics->setSurface(m_pSurface.get(),
+ basegfx::B2IVector(aSize.width(), aSize.height()));
+ cairo_surface_set_user_data(m_pSurface.get(), Qt5SvpGraphics::getDamageKey(),
+ &m_aDamageHandler, nullptr);
}
- return m_pOurSvpGraphics.get();
+ return m_pSvpGraphics.get();
}
else
{
- if (!m_pQt5Graphics || m_bGraphicsInvalid)
+ if (!m_pQt5Graphics)
{
m_pQt5Graphics.reset(new Qt5Graphics(this));
m_pQImage.reset(
new QImage(m_pQWidget->size() * devicePixelRatioF(), Qt5_DefaultFormat32));
m_pQImage->fill(Qt::transparent);
m_pQt5Graphics->ChangeQImage(m_pQImage.get());
- m_bGraphicsInvalid = false;
}
return m_pQt5Graphics.get();
}
@@ -335,7 +326,7 @@ void Qt5Frame::ReleaseGraphics(SalGraphics* pSalGraph)
{
(void)pSalGraph;
if (m_bUseCairo)
- assert(pSalGraph == m_pOurSvpGraphics.get());
+ assert(pSalGraph == m_pSvpGraphics.get());
else
assert(pSalGraph == m_pQt5Graphics.get());
m_bGraphicsInUse = false;
@@ -1145,7 +1136,6 @@ void Qt5Frame::UpdateSettings(AllSettings& rSettings)
style.SetShadowColor(toColor(pal.color(QPalette::Disabled, QPalette::WindowText)));
style.SetDarkShadowColor(toColor(pal.color(QPalette::Inactive, QPalette::WindowText)));
- m_bGraphicsInvalid = true;
rSettings.SetStyleSettings(style);
}
diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index ca1f914dd707..bceae35e9016 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -252,13 +252,21 @@ void Qt5Instance::deleteObjectLater(QObject* pObject) { pObject->deleteLater();
SalFrame* Qt5Instance::CreateChildFrame(SystemParentData* /*pParent*/, SalFrameStyleFlags nStyle)
{
- return new Qt5Frame(nullptr, nStyle, m_bUseCairo);
+ SalFrame* pRet(nullptr);
+ RunInMainThread([&, this]() { pRet = new Qt5Frame(nullptr, nStyle, useCairo()); });
+ assert(pRet);
+ return pRet;
}
SalFrame* Qt5Instance::CreateFrame(SalFrame* pParent, SalFrameStyleFlags nStyle)
{
assert(!pParent || dynamic_cast<Qt5Frame*>(pParent));
- return new Qt5Frame(static_cast<Qt5Frame*>(pParent), nStyle, m_bUseCairo);
+
+ SalFrame* pRet(nullptr);
+ RunInMainThread(
+ [&, this]() { pRet = new Qt5Frame(static_cast<Qt5Frame*>(pParent), nStyle, useCairo()); });
+ assert(pRet);
+ return pRet;
}
void Qt5Instance::DestroyFrame(SalFrame* pFrame)
@@ -273,7 +281,11 @@ void Qt5Instance::DestroyFrame(SalFrame* pFrame)
SalObject* Qt5Instance::CreateObject(SalFrame* pParent, SystemWindowData*, bool bShow)
{
assert(!pParent || dynamic_cast<Qt5Frame*>(pParent));
- return new Qt5Object(static_cast<Qt5Frame*>(pParent), bShow);
+
+ SalObject* pRet(nullptr);
+ RunInMainThread([&]() { pRet = new Qt5Object(static_cast<Qt5Frame*>(pParent), bShow); });
+ assert(pRet);
+ return pRet;
}
void Qt5Instance::DestroyObject(SalObject* pObject)
diff --git a/vcl/unx/kf5/KF5SalFrame.cxx b/vcl/unx/kf5/KF5SalFrame.cxx
index 1aa0b9008de7..8f14594586d2 100644
--- a/vcl/unx/kf5/KF5SalFrame.cxx
+++ b/vcl/unx/kf5/KF5SalFrame.cxx
@@ -45,7 +45,6 @@
KF5SalFrame::KF5SalFrame(KF5SalFrame* pParent, SalFrameStyleFlags nState, bool bUseCairo)
: Qt5Frame(pParent, nState, bUseCairo)
- , m_bGraphicsInUse(false)
{
}
@@ -162,27 +161,4 @@ void KF5SalFrame::UpdateSettings(AllSettings& rSettings)
rSettings.SetStyleSettings(style);
}
-SalGraphics* KF5SalFrame::AcquireGraphics()
-{
- if (m_bGraphicsInUse)
- return nullptr;
-
- m_bGraphicsInUse = true;
-
- if (!m_pKF5Graphics)
- {
- m_pKF5Graphics.reset(new Qt5SvpGraphics(this));
- Qt5Frame::InitQt5SvpGraphics(m_pKF5Graphics.get());
- }
-
- return m_pKF5Graphics.get();
-}
-
-void KF5SalFrame::ReleaseGraphics(SalGraphics* pSalGraph)
-{
- (void)pSalGraph;
- assert(pSalGraph == m_pKF5Graphics.get());
- m_bGraphicsInUse = false;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kf5/KF5SalFrame.hxx b/vcl/unx/kf5/KF5SalFrame.hxx
index f757535c2f35..d0fdd91978e6 100644
--- a/vcl/unx/kf5/KF5SalFrame.hxx
+++ b/vcl/unx/kf5/KF5SalFrame.hxx
@@ -28,15 +28,9 @@ class QWidget;
class KF5SalFrame : public Qt5Frame
{
-private:
- std::unique_ptr<Qt5SvpGraphics> m_pKF5Graphics;
- bool m_bGraphicsInUse;
-
public:
KF5SalFrame(KF5SalFrame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo);
- virtual SalGraphics* AcquireGraphics() override;
- virtual void ReleaseGraphics(SalGraphics* pGraphics) override;
virtual void UpdateSettings(AllSettings& rSettings) override;
};
diff --git a/vcl/unx/kf5/KF5SalInstance.cxx b/vcl/unx/kf5/KF5SalInstance.cxx
index 5b95ff8df572..d9d7747fe647 100644
--- a/vcl/unx/kf5/KF5SalInstance.cxx
+++ b/vcl/unx/kf5/KF5SalInstance.cxx
@@ -40,11 +40,21 @@ KF5SalInstance::KF5SalInstance(std::unique_ptr<QApplication>& pQApp)
pSVData->maAppData.mxToolkitName = OUString("kf5");
}
-SalFrame* KF5SalInstance::CreateFrame(SalFrame* pParent, SalFrameStyleFlags nState)
+SalFrame* KF5SalInstance::CreateChildFrame(SystemParentData* /*pParent*/, SalFrameStyleFlags nStyle)
{
SalFrame* pRet(nullptr);
- RunInMainThread([&pRet, pParent, nState]() {
- pRet = new KF5SalFrame(static_cast<KF5SalFrame*>(pParent), nState, true);
+ RunInMainThread([&, this]() { pRet = new KF5SalFrame(nullptr, nStyle, useCairo()); });
+ assert(pRet);
+ return pRet;
+}
+
+SalFrame* KF5SalInstance::CreateFrame(SalFrame* pParent, SalFrameStyleFlags nStyle)
+{
+ assert(!pParent || dynamic_cast<KF5SalFrame*>(pParent));
+
+ SalFrame* pRet(nullptr);
+ RunInMainThread([&, this]() {
+ pRet = new KF5SalFrame(static_cast<KF5SalFrame*>(pParent), nStyle, useCairo());
});
assert(pRet);
return pRet;
diff --git a/vcl/unx/kf5/KF5SalInstance.hxx b/vcl/unx/kf5/KF5SalInstance.hxx
index 5dd306da5231..b951df59ab33 100644
--- a/vcl/unx/kf5/KF5SalInstance.hxx
+++ b/vcl/unx/kf5/KF5SalInstance.hxx
@@ -28,6 +28,7 @@ class KF5SalInstance final : public Qt5Instance
QFileDialog::FileMode) override;
SalFrame* CreateFrame(SalFrame* pParent, SalFrameStyleFlags nStyle) override;
+ SalFrame* CreateChildFrame(SystemParentData* pParent, SalFrameStyleFlags nStyle) override;
public:
explicit KF5SalInstance(std::unique_ptr<QApplication>& pQApp);
--
cgit v1.2.1

Binary file not shown.

@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
EAPI=7
OFFICE_EXTENSIONS=(
"${PN}_${PV}.oxt"
@ -15,4 +15,3 @@ SRC_URI="https://extensions.libreoffice.org/extension-center/${PN}/releases/${PV
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""

@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
EAPI=7
OFFICE_EXTENSIONS=(
"${PN}addon.oxt"
@ -15,4 +15,3 @@ SRC_URI="https://extensions.libreoffice.org/extension-center/${PN}/releases/${PV
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""

@ -1,7 +1,7 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
EAPI=7
OFFICE_EXTENSIONS=(
"472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_${PV}.oxt"
@ -22,4 +22,3 @@ SRC_URI="${URI_EXTENSIONS}"
LICENSE="sun-bcla-j2me"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""

Binary file not shown.

@ -56,7 +56,7 @@ SRC_URI="
LICENSE="MIT BSD-with-disclosure"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
KEYWORDS="amd64 ~arm64 x86"
src_prepare() {
default

Binary file not shown.

@ -1,3 +1,4 @@
DIST lesspipe-1.85.tar.gz 120568 BLAKE2B d2c00f4121dc1bbed6b82220dac038068bbff87c732385399542cb212d4664c74d018db07829f90c38e938cb8623a443888c74b0d003fff725d0ddf207d8109e SHA512 420d087b9fc9783b9404855e4656b88c10852502bd2f1931978b7dc7ff15eba1a375b217184480f9b341322c12e7336d0861ba9c2f673f2b2a7fb340a381f5b2
DIST lesspipe-1.89.tar.gz 121118 BLAKE2B e730b6e8afc767a0118abbcc6221d2c18467393119c26baf71b8758b5826ba52230526b9c5cd67704aadda07b63a62dfe006db10de1dbae0a73ede1885b03ed0 SHA512 b8d7c92d3dae77f2ccee8e314af4354fefc9f3aaec1566af02c9be2640f11ebf7ea1432334470c5d5dbce39d2ac7c3e9f4074bcf9ee4a502dc59b370a21b54f5
DIST lesspipe-1.90.tar.gz 121098 BLAKE2B 269f4193f423e4ac5770171156e2f63d14966d7dcc77bf015c3100f281206424ef334acc1edf2edb6fe31f73aed80b9c3ba6c715d6e97993c5a90dfc1ce42405 SHA512 d402bd46c37d2509c90530e9da0560fa3e5da9002c37a515451a8ab9275576d1af44793a10914e74e804f10a3352439815c6763d2d77e5e41a0e9840286f518e
DIST lesspipe-1.91.tar.gz 121965 BLAKE2B 93c169b2b1a81db7e7b569718a43152a8f2b9ea95258047a00ae4940509817a3eb861fdadb6bafc5861c49e805ce910348a57f634bdae57317811ac6fbfc6945 SHA512 d080ceaae019d8885a53c8abb26f4a159b78578f68c2b9a024960aa69509651e3b6638e78bd6e2e57c23d81123d9a3cab167736f253ba4276a3889890d594bd3

@ -0,0 +1,61 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="A preprocessor for less"
HOMEPAGE="https://github.com/wofr06/lesspipe"
SRC_URI="https://github.com/wofr06/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Tests are broken in 1.84, 1.85.
# Still fragile in 1.88. Passes when lesspipe is not installed.
# ... and in 1.91, things are being overhauled still.
# Please check again on bumps!
# bug #734896
RESTRICT="test"
DEPEND="dev-lang/perl"
RDEPEND="${DEPEND}
!<sys-apps/less-483-r1"
src_prepare() {
default
# Drop a failing test. Not ideal, however:
# The test suite for this package is pretty fragile; it's more valuable
# to have _something_ failing/passing overall, than relying on a single
# test which seems to fail due to an unpredictable external command.
#sed -i -e '/#needs pstotext ps2ascii/d' TESTCMDS || die
}
src_configure() {
# Not an autoconf script.
./configure --fixed || die
}
src_compile() {
# Nothing to build (avoids the "all" target)
:
}
src_test() {
# LC_ALL=C manages to fix one test failure
LC_ALL=C ./test.pl -d || die "Tests failed!"
}
src_install() {
emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
einstalldocs
}
pkg_preinst() {
if [[ -z ${REPLACING_VERSIONS} ]] ; then
elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
elog "The latter is the Gentoo-specific version. Make sure to update your"
elog "LESSOPEN environment variable if you wish to use this copy."
fi
}

Binary file not shown.

@ -1,2 +1,4 @@
DIST glibmm-2.66.1.tar.xz 7509820 BLAKE2B 4750940093cadbae7c32d387ac8b16c8230eb08ed1645e457edfa27542a2e8a01d70de08bb41d1872dd1f03d1506bfaefc2af582250ca64ad480ce5f98f20d56 SHA512 caf57c2c9d163fff45041c33ed70d2692040d7bea44660d68e8c16a76be2609e0f857a5e16ad5220a0ec681a560c864dc86c2988a2c40741b4f29c9fe5b7d8b9
DIST glibmm-2.66.2.tar.xz 7603104 BLAKE2B 5696391bd5dbb35f8c961250af6d9b2644e900ac6a800054e9e7630cbf4882c17ef1bf8cf322e89a3bdbe613d13d4a045920bfc1071442daa3afc78afa8cd759 SHA512 097af6b140a5af3e52cc2c5d251475a5aa923d0c528c3cbc97f31d3a95868bcb3aa2328047ca94a55ef7fd188f271917dfe29faa86f477a441f0a024284216f9
DIST glibmm-2.68.1.tar.xz 7657712 BLAKE2B a8141e53f89c981a9916d5f71dfd8c6d08e45a653b98c507acaadfefbedf2f22e8130a722f3398f5e0dff8196ffc8efa6567ebb2c8290f7373e34377e281db18 SHA512 ca164f986da651e66bb5b98a760853e73d57ff84e035809d4c3b2c0a1b6ddf8ca68ffc49a71d0e0b2e14eca1c00e2e727e3bf3821e0b2b3a808397c3d33c6d5c
DIST glibmm-2.68.2.tar.xz 7844508 BLAKE2B 890f3a8f15580891df000acfe365989a6b09a63712b5f24f999a70e62983c725c9aef2b386b8995933c41b345164bb0b330b6cb0af182476f14657db8ba7d0cf SHA512 96b2970ac47e6a8de2d4352412f0107fbdcb61942d27f20a2f533f9704304e5f55c52829567457e7c925f830a69c739bf00676882741ed2969e52caf3e135c46

@ -0,0 +1,54 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{7..10} )
inherit gnome.org meson-multilib python-any-r1
DESCRIPTION="C++ interface for glib2"
HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="doc debug test"
RESTRICT="!test? ( test )"
RDEPEND="
>=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}]
>=dev-libs/glib-2.61.2:2[${MULTILIB_USEDEP}]
"
DEPEND="${RDEPEND}"
BDEPEND="
${PYTHON_DEPS}
virtual/pkgconfig
doc? (
app-doc/doxygen[dot]
dev-lang/perl
dev-perl/XML-Parser
dev-libs/libxslt
media-gfx/graphviz
)
"
src_prepare() {
default
# giomm_tls_client requires FEATURES=-network-sandbox and glib-networking rdep
sed -i -e '/giomm_tls_client/d' tests/meson.build || die
if ! use test; then
sed -i -e "/^subdir('tests')/d" meson.build || die
fi
}
multilib_src_configure() {
local emesonargs=(
-Dwarnings=min
-Dbuild-deprecated-api=true
$(meson_native_use_bool doc build-documentation)
$(meson_use debug debug-refcounting)
-Dbuild-examples=false
)
meson_src_configure
}

@ -0,0 +1,52 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{7..10} )
inherit gnome.org meson-multilib python-any-r1
DESCRIPTION="C++ interface for glib2"
HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="2.68"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="doc debug test"
RESTRICT="!test? ( test )"
RDEPEND="
>=dev-libs/glib-2.63.0:2[${MULTILIB_USEDEP}]
dev-libs/libsigc++:3[doc?,${MULTILIB_USEDEP}]
"
DEPEND="${RDEPEND}"
BDEPEND="
${PYTHON_DEPS}
virtual/pkgconfig
doc? (
app-doc/doxygen[dot]
dev-lang/perl
dev-libs/libxslt
)
"
src_prepare() {
default
# giomm_tls_client requires FEATURES=-network-sandbox and glib-networking rdep
sed -i -e '/giomm_tls_client/d' tests/meson.build || die
if ! use test; then
sed -i -e "/^subdir('tests')/d" meson.build || die
fi
}
multilib_src_configure() {
local emesonargs=(
-Dwarnings=min
-Dbuild-deprecated-api=true
$(meson_native_use_bool doc build-documentation)
$(meson_use debug debug-refcounting)
-Dbuild-examples=false
)
meson_src_configure
}

@ -1,4 +1,4 @@
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6

Binary file not shown.

@ -13,7 +13,7 @@ HOMEPAGE="http://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations/"
SRC_URI="https://github.com/mojohaus/${MY_PN}/archive/${MY_PN}-parent-${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 ~arm64 ~ppc64 x86"
KEYWORDS="amd64 arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.7"
RDEPEND=">=virtual/jre-1.7"

@ -18,7 +18,7 @@ HOMEPAGE="http://aopalliance.sourceforge.net/"
LICENSE="public-domain"
SLOT="1"
KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux"
KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux"
IUSE=""

@ -14,7 +14,7 @@ SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz htt
LICENSE="BSD"
SLOT="4"
KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~x64-macos"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~x64-macos"
CDEPEND=""
DEPEND=">=virtual/jdk-1.8:*"

@ -14,7 +14,7 @@ HOMEPAGE="http://errorprone.info"
SRC_URI="https://github.com/google/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm64 ~ppc64 x86"
KEYWORDS="amd64 arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.7"
RDEPEND=">=virtual/jre-1.7"

@ -18,7 +18,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PN}-parent-${PV}.tar.gz"
LICENSE="Apache-2.0"
SLOT="2.6"
KEYWORDS="~amd64 ~ppc64 ~x86"
KEYWORDS="amd64 ~ppc64 ~x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"

@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/google/guava"
SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="${PV%.*}"
KEYWORDS="amd64 ~arm64 ~ppc64 x86"
KEYWORDS="amd64 arm64 ppc64 x86"
CP_DEPEND="
dev-java/animal-sniffer-annotations:0

@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="4"
KEYWORDS="amd64 ~arm64 ~ppc64 x86"
KEYWORDS="amd64 arm64 ~ppc64 x86"
RESTRICT="test"
CP_DEPEND="dev-java/aopalliance:1

@ -1,3 +1,2 @@
DIST icu4j-54_1_1.tgz 23457651 BLAKE2B f200d170c32065d2f678247d595085283446e401da2c2433b426466fc5c6f93f5ce629bce23d1114cad7d360aa4d127060750d380da8cc3e7fa1e529b454bae9 SHA512 c41f7f9fb0819767da48ac21c4883a628da8397e0ad5b0d75e51d9185b5511608c9a635933c4ae2e0c8911b2cdecf47bc661050935bbae2ba58abfb5ad04dadf
DIST icu4j-55_1.tgz 23617640 BLAKE2B fe22524761e0c6be4ea440f90ffe5fba8a2f34484207248762ab127c3bb7e4328ced3502a336edd7d3a1026804381cd2b8738b15cd1745af0cee813dc60d7893 SHA512 706daed61d9d3722a0813d175fa66b24570abba492c32704d4df924861e5d2592a4a5ff40fdec2bd3fb662c3679dbc9addd580966c3cc69470d14e3fce27a054
DIST icu4j-56_1.tgz 23189284 BLAKE2B d53aa869d6cde8cc9c83e66b55986b61736fbaf7a890e3c7bacab5abb23623ec64b5a23fd740dca8e51fd2336ced5e79546b4c08edca25beced22e6560f7814d SHA512 9ecc36c03a6713dbfb909e109b5e982525958b6137bd7006c93ff3b8578d816c59fa331555b43c94248f392ba9b456b1adb37be74e02e9ea818c8a9a7c669f4a

@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
EAPI=7
# testdata.jar, icudata.jar and icutzdata.jar do not contain *.class files
# but *.res files. These *.res data files are needed to build the final jar.
@ -19,12 +19,15 @@ SLOT="52"
KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE=""
# Beware of jdk version dependant code #361593
DEPEND=">=virtual/jdk-1.6"
RDEPEND=">=virtual/jre-1.6"
# the build system does not support java > 1.8
# also the package does not compile with newer jdks because of missing classes
DEPEND="virtual/jdk:1.8"
RDEPEND=">=virtual/jre-1.8:*"
S="${WORKDIR}"
HTML_DOCS="readme.html"
JAVA_PKG_BSFIX_NAME+=" common-targets.xml"
EANT_DOC_TARGET="docs"
@ -39,7 +42,7 @@ src_install() {
java-pkg_dojar ${PN}-charset.jar
java-pkg_dojar ${PN}-localespi.jar
dohtml readme.html
einstalldocs
use doc && java-pkg_dojavadoc doc
use examples && java-pkg_doexamples demos samples

@ -1,47 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
JAVA_PKG_IUSE="doc examples source test"
inherit java-pkg-2 java-ant-2
DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
HOMEPAGE="http://www.icu-project.org/"
SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz"
LICENSE="icu"
SLOT="56"
KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.6"
RDEPEND=">=virtual/jre-1.6"
S="${WORKDIR}"
JAVA_PKG_BSFIX_NAME+=" common-targets.xml"
EANT_DOC_TARGET="docs"
EANT_TEST_TARGET="check"
JAVA_RM_FILES=(
tools/build/src/com/ibm/icu/dev/tool/docs/ICUTaglet.java
)
src_test() {
java-pkg-2_src_test
}
src_install() {
java-pkg_dojar ${PN}.jar
java-pkg_dojar ${PN}-charset.jar
java-pkg_dojar ${PN}-localespi.jar
dodoc readme.html
use doc && java-pkg_dojavadoc doc
use examples && java-pkg_doexamples demos samples
use source && java-pkg_dosrc main/classes/*/src/com
}

@ -14,7 +14,7 @@ HOMEPAGE="http://j2objc.org"
SRC_URI="https://github.com/google/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm64 ~ppc64 x86"
KEYWORDS="amd64 arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.7"
RDEPEND=">=virtual/jre-1.7"

@ -17,7 +17,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> $
LICENSE="EPL-1.0"
SLOT="1"
KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"

@ -16,7 +16,7 @@ SRC_URI="http://central.maven.org/maven2/javax/inject/${MY_PN}/${PV}/${MY_P}-sou
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux"
KEYWORDS="~amd64 arm64 ~ppc64 ~x86 ~amd64-linux"
RDEPEND=">=virtual/jre-1.6"
DEPEND=">=virtual/jdk-1.6"

@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/refs/tags/${PV}.tar.gz ->
LICENSE="EPL-1.0"
SLOT="2"
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Common dependencies
# POM: pom.xml

@ -13,7 +13,7 @@ SRC_URI="https://${PN}.de/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~ppc-macos ~x64-macos"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
IUSE="examples test vim-syntax"
RESTRICT="!test? ( test )"

@ -1,121 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
JAVA_PKG_IUSE="doc source"
inherit epatch java-pkg-2 java-pkg-simple
DESCRIPTION="JFlex is a lexical analyzer generator for Java"
HOMEPAGE="https://www.jflex.de/"
SRC_URI="https://${PN}.de/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
IUSE="examples test vim-syntax"
RESTRICT="!test? ( test )"
CDEPEND="dev-java/ant-core:0"
RDEPEND=">=virtual/jre-1.6
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
${CDEPEND}"
DEPEND=">=virtual/jdk-1.6
test? ( dev-java/junit:4 )
${CDEPEND}"
PDEPEND=">=dev-java/javacup-0.11b_p20151001:0"
S="${WORKDIR}/${P}"
JAVA_SRC_DIR="src/main/java"
java_prepare() {
# See below for details.
epatch "${FILESDIR}/icedtea-arm.patch"
# We need the bundled jflex.jar.
rm -rv ${JAVA_SRC_DIR}/java_cup examples/pom.xml || die
# Remove the bundled java-cup.jar if unneeded.
if has_version ${PDEPEND}; then
rm -v lib/java-cup-*.jar || die
fi
}
src_configure() {
# javacup is a cyclic dependency. Use the package if we have it,
# otherwise use the bundled version and install the package later.
if has_version ${PDEPEND}; then
# Use PORTAGE_QUIET to suppress a QA warning that is spurious
# thanks to has_version above. This is Portage-specific but
# showing the warning elsewhere isn't the end of the world.
JAVACUP=$(PORTAGE_QUIET=1 java-pkg_getjar --build-only javacup javacup.jar)
else
JAVACUP=$(echo lib/java-cup-*.jar)
fi
JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only ant-core):${JAVACUP}"
}
jflex_compile() {
java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} --skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die
java-pkg-simple_src_compile
java-pkg_addres ${PN}.jar src/main/resources
}
src_compile() {
java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} -parser LexParse -interface src/main/cup/LexParse.cup || die
# The IcedTea ARM HotSpot port (as of 2.6.1) hangs when running
# jflex. We have patched jflex to fix it but we have to run the
# bundled version first. -Xint works around the problem. See
# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678.
use arm && local JFLEX_ARGS="-Xint"
# First compile (without doc/source) using the bundled jflex.
JAVA_PKG_IUSE= jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS}
# Then recompile using the fresh jflex.
jflex_compile -cp "${PN}.jar:${JAVACUP}"
}
src_install() {
java-pkg-simple_src_install
java-pkg_dolauncher ${PN} --main ${PN}.Main
java-pkg_register-dependency javacup javacup-runtime.jar
java-pkg_register-ant-task
use examples && java-pkg_doexamples examples
dodoc {changelog,README}.md
if use doc; then
dodoc doc/*.pdf
docinto html
dodoc doc/*.{css,html,png} doc/COPYRIGHT
fi
if use vim-syntax; then
insinto /usr/share/vim/vimfiles/syntax
doins lib/${PN}.vim
fi
}
src_test() {
if use arm && java-pkg_current-vm-matches oracle-jdk-bin-1.8; then
# This results in a StackOverflowError as of 1.8.0.65 but works
# fine on icedtea:7. Don't know about icedtea:8 yet.
rm -v src/test/java/jflex/EmitterTest.java || die
fi
local CP="src/test/java:${PN}.jar:${JAVA_GENTOO_CLASSPATH_EXTRA}:$(java-pkg_getjars junit-4)"
local TESTS=$(find src/test/java -name "*Test*.java" -printf "%P\n")
TESTS="${TESTS//.java}"
TESTS="${TESTS//\//.}"
ejavac -classpath "${CP}" $(find src/test/java -name "*.java")
ejunit4 -classpath "${CP}" ${TESTS}
}

@ -14,7 +14,7 @@ SRC_URI="https://github.com/java-native-access/jna/archive/${PV}.tar.gz -> ${P}.
LICENSE="LGPL-2.1"
SLOT="4"
KEYWORDS="~amd64 ~ppc64 ~x86"
KEYWORDS="amd64 ~ppc64 ~x86"
IUSE="+awt +nio-buffers test"
REQUIRED_USE="test? ( awt nio-buffers )"

@ -1 +1,2 @@
DIST jnr-constants-0.10.3-sources.tar.gz 261921 BLAKE2B f8137455c067e774dd30d64fe457dd859692315f43415bdfbffa4870b981db26de23d73fa7682bbd924523ac17dec56caa7078580cf817d8df3eae4d87c61343 SHA512 f7cd6a3778670c9835f8dce87c8470c8b8cfeda6f30d68051c09dae40c4f7dd7db88bed016450c33ab5c8da9a802b4bd050adf358680d5ec6735467e398404dc
DIST jnr-constants-0.8.6.tar.gz 71080 BLAKE2B db86f3c0347b85dd56de72465c4198e74faa877b8a1373ab378728945edaf0c45748ed707e6b591224858f498ae7d43269d8127cb61b7ac2893ef9817e36ca1c SHA512 2098f8e1869b9c018ba3afa70ef386fce2609d9c650ee851dcd7cf7dc9d4d87dbe26886eb2e744d96cc11425f6b66144a018826360b7bab48a4b99e323f3717a

@ -0,0 +1,35 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jnr/jnr-constants/archive/refs/tags/jnr-constants-0.10.3.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~x86" --ebuild jnr-constants-0.10.3.ebuild
EAPI=7
JAVA_PKG_IUSE="doc source test"
MAVEN_ID="com.github.jnr:jnr-constants:0.10.3"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="A set of platform constants (e.g. errno values)"
HOMEPAGE="https://github.com/jnr/jnr-constants"
SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz -> ${P}-sources.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
DEPEND="
>=virtual/jdk-1.8:*
"
RDEPEND="
>=virtual/jre-1.8:*
"
S="${WORKDIR}/${PN}-${P}"
JAVA_SRC_DIR="src/main/java"
JAVA_TEST_GENTOO_CLASSPATH="junit-4"
JAVA_TEST_SRC_DIR="src/test/java"

@ -1 +1 @@
DIST jnr-x86asm-1.0.2.zip 180046 BLAKE2B f346357dadaf4727e061ae4f11cb4a2fcb0aac7056c1ddc902c1779a0aa323ed47a90b7a7fef1148e4aefba2f003853d10718ae01ddcaffeb2b5b6d80d362b83 SHA512 e77124b7f0074dcd8b17ba200a1c99350827e6a3c641d6caa33b6bd900c95af9140f8ab716a5299bc591969f295158709b381f9b45faddbd6b75355949e4f463
DIST jnr-x86asm-1.0.2.tar.gz 114138 BLAKE2B 4fd5d331e271e03771c1165823a3852b0ea9f5c45df26c7a009d356173050aabf99a7ef5a17559ef8fc907e521f8fae96b048867703bc901504fa21bcd24c3d1 SHA512 e3ad28b2d6be36b9e9d3e20bbe5cc6bf98361372fa02a40d0bbf64437fca351c3dac5cb04dfc8c2f08d73b9bffc8ca69276fb6a6fc00c7cc5cc3cf08fa2b6463

@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
EAPI=7
JAVA_PKG_IUSE="doc source"
MAVEN_ID="com.github.jnr:jnr-x86asm:1.0.2"
@ -9,15 +9,15 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="A pure-java port of asmjit"
HOMEPAGE="https://github.com/jnr/jnr-x86asm"
SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.zip -> ${P}.zip"
SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="1.0"
KEYWORDS="amd64 ~arm64 ppc64 x86"
IUSE=""
DEPEND=">=virtual/jdk-1.6"
RDEPEND=">=virtual/jre-1.6"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
S="${WORKDIR}/${P}"

@ -18,7 +18,7 @@ SRC_URI="https://github.com/ymnk/jsch-agent-proxy/archive/${MY_COMMIT}.tar.gz ->
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~ppc64 ~x86"
KEYWORDS="amd64 ~ppc64 ~x86"
# Common dependencies
# POM: ${PN}-12c3d64fc2b0a4fd37659369edfdee26e48954e2/${PN}-jsch/pom.xml

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -12,7 +12,7 @@ SRC_URI="http://central.maven.org/maven2/com/google/code/findbugs/${PN}/${PV}/${
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
KEYWORDS="~amd64 arm64 ppc64 ~x86"
RDEPEND=">=virtual/jre-1.6"
DEPEND=">=virtual/jdk-1.6"

@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/ronmamo/reflections"
SRC_URI="http://search.maven.org/remotecontent?filepath=org/${PN}/${PN}/${PV}/${P}-sources.jar"
LICENSE="WTFPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc64 ~x86"
KEYWORDS="amd64 ~ppc64 ~x86"
CP_DEPEND="dev-java/commons-vfs:2
dev-java/dom4j:1

@ -21,7 +21,7 @@ SRC_URI="https://bitbucket.org/asomov/${PN}/get/${P}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm64 ~ppc64 x86"
KEYWORDS="amd64 ~arm64 ppc64 x86"
# Compile dependencies
# POM: pom.xml

@ -18,7 +18,7 @@ SRC_URI="https://github.com/apache/${PN}-engine/archive/refs/tags/${PV}.tar.gz -
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm64 ~ppc64 x86"
KEYWORDS="amd64 ~arm64 ppc64 x86"
# Common dependencies
# POM: pom.xml

Binary file not shown.

@ -1,98 +0,0 @@
--- a/patch/13_all_default-ssp-fix.patch 2017-06-14 11:29:28.997183865 +0200
+++ b/patch/13_all_default-ssp-fix.patch 2017-06-14 12:24:15.042271863 +0200
@@ -39,9 +39,9 @@
%{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}}\
%{fsyntax-only:-o %j} %{-param*}\
+ %{nostdlib:-nostdlib}\
- %{coverage:-fprofile-arcs -ftest-coverage}";
+ %{coverage:-fprofile-arcs -ftest-coverage}\
+ %{fdump-scos:-fpreserve-decisions-generic}";
- static const char *asm_options =
--- a/gcc/params.def 2016-03-30 09:47:40.000000000 +0200
+++ b/gcc/params.def 2016-09-19 12:56:58.443179039 +0200
@@ -673,7 +673,7 @@ DEFPARAM (PARAM_INTEGER_SHARE_LIMIT,
--- a/gcc-6-gpl-2017-src/gcc/ada/osint.adb 2017-03-10 21:58:02.600710156 +0100
+++ b/gcc-6-gpl-2017-src/gcc/ada/osint.adb 2017-03-10 21:59:38.033983293 +0100
@@ -2229,14 +2229,11 @@
for J in Start_Of_Prefix .. Name_Len - Prog'Length + 1 loop
if Name_Buffer (J .. J + Prog'Length - 1) = Prog then
End_Of_Prefix := J - 1;
+ Start_Of_Suffix := J + Prog'Length;
exit;
end if;
end loop;
- if End_Of_Prefix > 1 then
- Start_Of_Suffix := End_Of_Prefix + Prog'Length + 1;
- end if;
-
-- Create the new program name
return new String'
--- a/gcc-6-gpl-2017-src/libgcc/config/i386/linux-unwind.h 2017-12-07 20:57:02.737224515 +0100
+++ b/gcc-6-gpl-2017-src/libgcc/config/i386/linux-unwind.h 2017-12-07 21:01:59.431929926 +0100
@@ -58,7 +58,7 @@
if (*(unsigned char *)(pc+0) == 0x48
&& *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL)
{
- struct ucontext *uc_ = context->cfa;
+ ucontext_t *uc_ = context->cfa;
/* The void * cast is necessary to avoid an aliasing warning.
The aliasing warning is correct, but should not be a problem
because it does not alias anything. */
@@ -138,7 +138,7 @@
siginfo_t *pinfo;
void *puc;
siginfo_t info;
- struct ucontext uc;
+ ucontext_t uc;
} *rt_ = context->cfa;
/* The void * cast is necessary to avoid an aliasing warning.
The aliasing warning is correct, but should not be a problem
--- a/gcc-6-gpl-2017-src/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc 2017-12-07 22:05:30.512328872 +0100
+++ b/gcc-6-gpl-2017-src/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc 2017-12-07 22:05:53.104950070 +0100
@@ -267,7 +267,7 @@
// Alternate stack for signal handling.
InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize);
- struct sigaltstack handler_stack;
+ stack_t handler_stack;
internal_memset(&handler_stack, 0, sizeof(handler_stack));
handler_stack.ss_sp = handler_stack_memory.data();
handler_stack.ss_size = kHandlerStackSize;
--- a/gcc-6-gpl-2017-src/libsanitizer/sanitizer_common/sanitizer_linux.cc 2017-12-07 22:09:04.912731275 +0100
+++ b/gcc-6-gpl-2017-src/libsanitizer/sanitizer_common/sanitizer_linux.cc 2017-12-07 22:10:03.150754764 +0100
@@ -546,8 +546,7 @@
}
#endif
-uptr internal_sigaltstack(const struct sigaltstack *ss,
- struct sigaltstack *oss) {
+uptr internal_sigaltstack(const void *ss, void *oss) {
return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss);
}
--- a/gcc-6-gpl-2017-src/libsanitizer/sanitizer_common/sanitizer_linux.h 2017-12-07 22:10:10.109638062 +0100
+++ b/gcc-6-gpl-2017-src/libsanitizer/sanitizer_common/sanitizer_linux.h 2017-12-07 22:10:30.991287828 +0100
@@ -28,8 +28,7 @@
// Syscall wrappers.
uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count);
-uptr internal_sigaltstack(const struct sigaltstack* ss,
- struct sigaltstack* oss);
+uptr internal_sigaltstack(const void* ss, void* oss);
uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set,
__sanitizer_sigset_t *oldset);
void internal_sigfillset(__sanitizer_sigset_t *set);
--- a/gcc-6-gpl-2017-src/libsanitizer/tsan/tsan_platform_linux.cc 2017-12-07 22:15:09.626608907 +0100
+++ b/gcc-6-gpl-2017-src/libsanitizer/tsan/tsan_platform_linux.cc 2017-12-07 22:15:28.825286145 +0100
@@ -291,7 +291,7 @@
int ExtractResolvFDs(void *state, int *fds, int nfd) {
#if SANITIZER_LINUX
int cnt = 0;
- __res_state *statp = (__res_state*)state;
+ struct __res_state *statp = (struct __res_state*)state;
for (int i = 0; i < MAXNS && cnt < nfd; i++) {
if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)
fds[cnt++] = statp->_u._ext.nssocks[i];

@ -1,19 +0,0 @@
libatomic does not respect --disable-werror
https://bugs.gentoo.org/475350
--- a/libatomic/configure.ac
+++ b/libatomic/configure.ac
@@ -4282,4 +4282,4 @@ save_CFLAGS="$CFLAGS"
# Add -Wall -Werror if we are using GCC.
if test "x$GCC" = "xyes"; then
- XCFLAGS="$XCFLAGS -Wall -Werror"
+ XCFLAGS="$XCFLAGS -Wall"
fi
--- a/libatomic/configure
+++ b/libatomic/configure
@@ -4282,4 +4282,4 @@ save_CFLAGS="$CFLAGS"
# Add -Wall -Werror if we are using GCC.
if test "x$GCC" = "xyes"; then
- XCFLAGS="$XCFLAGS -Wall -Werror"
+ XCFLAGS="$XCFLAGS -Wall"
fi

@ -1,20 +0,0 @@
libgomp does not respect --disable-werror
https://bugs.gentoo.org/229059
http://gcc.gnu.org/PR38436
--- a/libgomp/configure.ac
+++ b/libgomp/configure.ac
@@ -4282,4 +4282,4 @@ save_CFLAGS="$CFLAGS"
# Add -Wall -Werror if we are using GCC.
if test "x$GCC" = "xyes"; then
- XCFLAGS="$XCFLAGS -Wall -Werror"
+ XCFLAGS="$XCFLAGS -Wall"
fi
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -4282,4 +4282,4 @@ save_CFLAGS="$CFLAGS"
# Add -Wall -Werror if we are using GCC.
if test "x$GCC" = "xyes"; then
- XCFLAGS="$XCFLAGS -Wall -Werror"
+ XCFLAGS="$XCFLAGS -Wall"
fi

@ -1,19 +0,0 @@
libitm does not respect --disable-werror
https://bugs.gentoo.org/475350
--- a/libitm/configure.ac
+++ b/libitm/configure.ac
@@ -4282,4 +4282,4 @@ save_CFLAGS="$CFLAGS"
# Add -Wall -Werror if we are using GCC.
if test "x$GCC" = "xyes"; then
- XCFLAGS="$XCFLAGS -Wall -Werror"
+ XCFLAGS="$XCFLAGS -Wall"
fi
--- a/libitm/configure
+++ b/libitm/configure
@@ -4282,4 +4282,4 @@ save_CFLAGS="$CFLAGS"
# Add -Wall -Werror if we are using GCC.
if test "x$GCC" = "xyes"; then
- XCFLAGS="$XCFLAGS -Wall -Werror"
+ XCFLAGS="$XCFLAGS -Wall"
fi

@ -1,31 +0,0 @@
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 2019-04-19 20:53:11.382114157 +0200
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 2019-04-19 20:57:10.725037767 +0200
@@ -150,7 +150,6 @@
# include <sys/procfs.h>
#endif
#include <sys/user.h>
-#include <sys/ustat.h>
#include <linux/cyclades.h>
#include <linux/if_eql.h>
#include <linux/if_plip.h>
@@ -243,7 +242,19 @@
#endif // SANITIZER_LINUX || SANITIZER_FREEBSD
#if SANITIZER_LINUX && !SANITIZER_ANDROID
- unsigned struct_ustat_sz = sizeof(struct ustat);
+ // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which
+ // has been removed from glibc 2.28.
+#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
+ || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \
+ || defined(__x86_64__)
+#define SIZEOF_STRUCT_USTAT 32
+#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \
+ || defined(__powerpc__) || defined(__s390__) || defined(__sparc__)
+#define SIZEOF_STRUCT_USTAT 20
+#else
+#error Unknown size of struct ustat
+#endif
+ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;
unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
#endif // SANITIZER_LINUX && !SANITIZER_ANDROID

@ -1,18 +0,0 @@
--- a/gcc-7-gpl-2018-src/gcc/ada/osint.adb 2017-03-10 21:58:02.600710156 +0100
+++ b/gcc-7-gpl-2018-src/gcc/ada/osint.adb 2017-03-10 21:59:38.033983293 +0100
@@ -2229,14 +2229,11 @@
for J in Start_Of_Prefix .. Name_Len - Prog'Length + 1 loop
if Name_Buffer (J .. J + Prog'Length - 1) = Prog then
End_Of_Prefix := J - 1;
+ Start_Of_Suffix := J + Prog'Length;
exit;
end if;
end loop;
- if End_Of_Prefix > 1 then
- Start_Of_Suffix := End_Of_Prefix + Prog'Length + 1;
- end if;
-
-- Create the new program name
return new String'

@ -1,32 +0,0 @@
From 54d87ffe4b34052f159ac5b72b250129ce813b2a Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 14 Feb 2020 12:33:27 +0100
Subject: [PATCH] backport: re PR sanitizer/92154 (new glibc breaks arm
bootstrap due to libsanitizer)
Backported from mainline
2019-10-22 Tamar Christina <tamar.christina@arm.com>
PR sanitizer/92154
* sanitizer_common/sanitizer_platform_limits_posix.cc:
Cherry-pick compiler-rt revision r375220.
---
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
@@ -1147,8 +1147,12 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid);
CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)
+#if (!defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)) && \
+ !defined(__arm__)
/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */
+/* On Arm glibc 2.31 and later provide a different mode field, this field is
+ never used by libsanitizer so we can simply ignore this assert for all glibc
+ versions. */
CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
#endif
--
2.25.2

@ -1,59 +0,0 @@
From dbdf86838aaaef76620c00c53096cfe157d5af6e Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 14 Feb 2020 12:38:30 +0100
Subject: [PATCH] backport: re PR sanitizer/92154 (new glibc breaks arm
bootstrap due to libsanitizer)
Backported from mainline
2019-11-26 Jakub Jelinek <jakub@redhat.com>
PR sanitizer/92154
* sanitizer_common/sanitizer_platform_limits_posix.h: Cherry-pick
llvm-project revision 947f9692440836dcb8d88b74b69dd379d85974ce.
* sanitizer_common/sanitizer_platform_limits_posix.cc: Likewise.
---
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
@@ -1147,12 +1147,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid);
CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
-#if (!defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)) && \
- !defined(__arm__)
-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */
-/* On Arm glibc 2.31 and later provide a different mode field, this field is
- never used by libsanitizer so we can simply ignore this assert for all glibc
- versions. */
+#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31)
+/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit
+ on many architectures. */
CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
#endif
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -210,20 +210,13 @@ namespace __sanitizer {
unsigned long __unused1;
unsigned long __unused2;
#elif defined(__sparc__)
-# if defined(__arch64__)
unsigned mode;
- unsigned short __pad1;
-# else
- unsigned short __pad1;
- unsigned short mode;
unsigned short __pad2;
-# endif
unsigned short __seq;
unsigned long long __unused1;
unsigned long long __unused2;
#else
- unsigned short mode;
- unsigned short __pad1;
+ unsigned int mode;
unsigned short __seq;
unsigned short __pad2;
#if defined(__x86_64__) && !defined(_LP64)
--
2.25.2

@ -6,3 +6,4 @@ DIST vala-0.50.7.tar.xz 3540048 BLAKE2B 4f3abdfe7f0448846f22a4d822b803484afd1a23
DIST vala-0.50.9.tar.xz 3543420 BLAKE2B 57b8021746aa554fe78f7e033b7c134a0d840e46ad7666f9abc3f019326282958cf90ddbebffe36fa15f80dff407a46b3a2e1298bfdfee749838d3a730bad5a5 SHA512 f138629fa0840941942796b33fe8cf61391f14e186f2bd70519cafc19bcc453fd16bcfaf7a44713a00531fe181bb9b0c4aafb955fae0a29fd9eaa12b48ed169a
DIST vala-0.52.4.tar.xz 3577796 BLAKE2B 20f541f5429ef52cdcb4b0c5559dc312f62276ac6d91b3ca97f5bce4b954f7d0407637131e16db5a9f059f5ee3e7d44a414cc06311d49c294f22789db821ec79 SHA512 3c7daae4d26e6940b0735cee84f1a25f2aab12c93d2a8a9e9edec45c0c9dc9184cc790acbae19aba0fb31dfd7115afddcf8b9f09b0423b5b6950900641f4c527
DIST vala-0.52.5.tar.xz 3583412 BLAKE2B ee81903be59267ce3499dfd7ef4e73708431641a16ca3c806a64d1660b85e8977f125cd67de0f2cfec610d37395c5a56028eb1c888a024bd9a1b159e2111e75b SHA512 88522ab5d12a8fbf538ed6ca56a1f402f3749bdfcfc9cdee2ad7ebcf98ebcd606e976fded83f2d853ac32cbaf326d96d1d888a5c56d018389753ac43456fa82f
DIST vala-0.52.7.tar.xz 3591372 BLAKE2B 73ae3ffe9ecbcbbe385fc7ec16d45e968872705762de38cf2ef0bb6e33dfe6002adf750b2cd6bdf0d5ec17a6904dde07fbe55ea2f41079add4cb3164917cec1b SHA512 6876c898a601d056c12b59a421883256a480eedbf3098fb62082815775fb5037723c7e8820066e52dfd30053b79c63152822a1a11d70b7c4e372378605d966c9

@ -0,0 +1,52 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit gnome2
DESCRIPTION="Compiler for the GObject type system"
HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
LICENSE="LGPL-2.1+"
SLOT="0.52"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
IUSE="test valadoc"
RESTRICT="!test? ( test )"
RDEPEND="
>=dev-libs/glib-2.48.0:2
>=dev-libs/vala-common-${PV}
valadoc? ( >=media-gfx/graphviz-2.16 )
!<net-libs/libsoup-2.66.2[vala]
" # Older libsoup generates a libsoup-2.4.vapi that isn't fine for vala:0.46 anymore
# We block here, so libsoup[vala] consumers wouldn't have to >= it, which would be bad
# as the newer is not required with older vala when those are picked instead of 0.46.
# vala-0.45.91 ships a broken libsoup-2.4.vapi copy too, but that'll be fixed by 0.45.92
DEPEND="${RDEPEND}
test? (
dev-libs/dbus-glib
>=dev-libs/glib-2.26:2
dev-libs/gobject-introspection
)
"
BDEPEND="
dev-libs/libxslt
sys-devel/flex
virtual/pkgconfig
virtual/yacc
"
src_configure() {
# weasyprint enables generation of PDF from HTML
gnome2_src_configure \
--disable-unversioned \
$(use_enable valadoc) \
VALAC=: \
WEASYPRINT=:
}
src_install() {
default
find "${D}" -name "*.la" -delete || die
}

Binary file not shown.

@ -1 +1,2 @@
DIST elfutils-0.185.tar.bz2 9187627 BLAKE2B 57cfa7e4060975c4bf6170dbd354687a19a92f7069c060db1ac2fa4da5a9d34e8bddd07c7ce376b5c28b5670ad5b8c1df795164cbcfb600a44cf1db60c20c4af SHA512 34de0de1355b11740e036e0fc64f2fc063587c8eb121b19216ee5548d3f0f268d8fc3995176c47190466b9d881007cfa11a9d01e9a50e38af6119492bf8bb47f
DIST elfutils-0.186.tar.bz2 9230491 BLAKE2B 49573d0a1f3519eab81d1ba3e94354cbc0935a36a94a3fdb22fe223a47b78cca8fd6e322870b0e335a809529fa6f54180b13c67936dec0242123c54ba20c9fc9 SHA512 c9180b27ec62935f18b9431268d176f6023d1bb938731d2af6e7626ae460af6608a70ba68483aa1ec7e6cb0fa0528b661ca8b68bc4f58ea8e18af527c5950c78

@ -0,0 +1,104 @@
# Copyright 2003-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit flag-o-matic multilib-minimal
DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
HOMEPAGE="https://elfutils.org/"
SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind zstd"
RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] )
lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] )
zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] )
elibc_musl? (
dev-libs/libbsd
sys-libs/argp-standalone
sys-libs/fts-standalone
sys-libs/obstack-standalone
)
!dev-libs/libelf
"
DEPEND="${RDEPEND}
valgrind? ( dev-util/valgrind )
"
BDEPEND="nls? ( sys-devel/gettext )
>=sys-devel/flex-2.5.4a
sys-devel/m4
"
RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
"${FILESDIR}"/${PN}-0.177-disable-large.patch
"${FILESDIR}"/${PN}-0.180-PaX-support.patch
)
src_prepare() {
default
if use elibc_musl; then
mkdir -p "${T}"/musl || die
cp -rv "${FILESDIR}"/musl/*.patch "${T}"/musl || die
# Delete patches upstreamed in 0.186
rm "${T}/musl/${PN}-0.185-error-h.patch" || die
rm "${T}/musl/${PN}-0.185-strndupa.patch" || die
eapply "${T}"/musl/
fi
if ! use static-libs; then
sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
fi
# https://sourceware.org/PR23914
sed -i 's:-Werror::' */Makefile.in || die
}
src_configure() {
use test && append-flags -g #407135
# Symbol aliases are implemented as asm statements.
# Will require porting: https://gcc.gnu.org/PR48200
filter-flags '-flto*'
multilib-minimal_src_configure
}
multilib_src_configure() {
ECONF_SOURCE="${S}" econf \
$(use_enable nls) \
$(use_enable threads thread-safety) \
$(use_enable valgrind) \
--disable-debuginfod \
--disable-libdebuginfod \
--program-prefix="eu-" \
--with-zlib \
$(use_with bzip2 bzlib) \
$(use_with lzma) \
$(use_with zstd)
}
multilib_src_test() {
env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
LC_ALL="C" \
emake check VERBOSE=1
}
multilib_src_install_all() {
einstalldocs
dodoc NOTES
# These build quick, and are needed for most tests, so don't
# disable their building when the USE flag is disabled.
if ! use utils; then
rm -rf "${ED}"/usr/bin || die
fi
}

@ -10,7 +10,7 @@ if [[ ${PV} =~ [9]{4,} ]]; then
EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
else
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
S="${WORKDIR}/${P}/src"

@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"

@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE="sdl test vnc wayland X"
RESTRICT="!test? ( test )"

@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE=""
BDEPEND="dev-util/netsurf-buildsystem"

@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"

@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE=""
BDEPEND="

@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
IUSE="debug elibc_musl"
MULTILIB_CHOST_TOOLS=(

@ -15,7 +15,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE="cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
RDEPEND="
@ -25,6 +25,7 @@ RDEPEND="
virtual/pkgconfig
"
DEPEND="${RDEPEND}"
BDEPEND="dev-lang/perl"
RESTRICT="test"

@ -15,7 +15,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE="cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
RDEPEND="

@ -1,3 +1,4 @@
DIST vala-0.52.3.tar.xz 3575936 BLAKE2B bef10fdca6af1db5d8ff7b01b624fee5879d82ceb35ccc84d847f9ce26445194d4fc7ec8c3f8177534c0144e9027633ed1b00793e4e2edbe3df51f55f29129cb SHA512 5b757c6a9d1a2e9615fddb014c64a92f6a7c231ba964e449a43e9ad19293d415b66642625aad98d18e436ab438a4530d00bb670c7c7eaae56f43b407f4035bd9
DIST vala-0.52.4.tar.xz 3577796 BLAKE2B 20f541f5429ef52cdcb4b0c5559dc312f62276ac6d91b3ca97f5bce4b954f7d0407637131e16db5a9f059f5ee3e7d44a414cc06311d49c294f22789db821ec79 SHA512 3c7daae4d26e6940b0735cee84f1a25f2aab12c93d2a8a9e9edec45c0c9dc9184cc790acbae19aba0fb31dfd7115afddcf8b9f09b0423b5b6950900641f4c527
DIST vala-0.52.5.tar.xz 3583412 BLAKE2B ee81903be59267ce3499dfd7ef4e73708431641a16ca3c806a64d1660b85e8977f125cd67de0f2cfec610d37395c5a56028eb1c888a024bd9a1b159e2111e75b SHA512 88522ab5d12a8fbf538ed6ca56a1f402f3749bdfcfc9cdee2ad7ebcf98ebcd606e976fded83f2d853ac32cbaf326d96d1d888a5c56d018389753ac43456fa82f
DIST vala-0.52.7.tar.xz 3591372 BLAKE2B 73ae3ffe9ecbcbbe385fc7ec16d45e968872705762de38cf2ef0bb6e33dfe6002adf750b2cd6bdf0d5ec17a6904dde07fbe55ea2f41079add4cb3164917cec1b SHA512 6876c898a601d056c12b59a421883256a480eedbf3098fb62082815775fb5037723c7e8820066e52dfd30053b79c63152822a1a11d70b7c4e372378605d966c9

@ -0,0 +1,29 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
GNOME_ORG_MODULE="vala"
inherit gnome.org
DESCRIPTION="Build infrastructure for packages that use Vala"
HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
RDEPEND=""
DEPEND=""
BDEPEND=""
src_configure() { :; }
src_compile() { :; }
src_install() {
insinto /usr/share/aclocal
doins vala.m4 vapigen/vapigen.m4
insinto /usr/share/vala
doins vapigen/Makefile.vapigen
}

Binary file not shown.

@ -1 +1,2 @@
DIST integers-0.4.0.tar.gz 9980 BLAKE2B ee67c39024d77f4ce20e9ba7e1564b3418397f1e98b9a5f30e238f5c161d7572701e3d824871b46d15b90887d5f3983a9ab440f46e22c4de8cbc68912daea5eb SHA512 73af64654579b27db18c612229044dba094064dc7d36a73f42ffd4ba7040ed326f859f588e7a764bce3b2fd6e9365f9e9f99330ef29bafbe77ca6dcb53d5ed79
DIST integers-0.5.1.tar.gz 12687 BLAKE2B 37807cf0642ff4b85c91b82d7fa6ee46a242750970123b0d9d3bec7c532d0d6ceceb4b2365cc71e0664068b3fcb99e61e5c6621363cd527237cf3051da813791 SHA512 25d90c41d66a73ca18f2cfb5e13e9b3af57d1712dab108e45cb8e9eeb88f4a2f822e03f05e08832080d4764d46c7e5f116fe48bdf060c6ebd80c3e558de41983

@ -0,0 +1,16 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit dune
DESCRIPTION="Various signed and unsigned integer types for OCaml"
HOMEPAGE="https://github.com/ocamllabs/ocaml-integers"
SRC_URI="https://github.com/ocamllabs/ocaml-integers/archive/${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/ocaml-${P}"
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="+ocamlopt"

@ -1,27 +0,0 @@
From a7ce31efae156a93136b07136aead3e44b7d4b6c Mon Sep 17 00:00:00 2001
From: Paul Evans <leonerd-cpan@leonerd.org.uk>
Date: Mon, 27 Feb 2017 11:05:41 +0000
Subject: Fix test failures without '.' in @INC
Bug: https://rt.cpan.org/Ticket/Display.html?id=120418
Bug: https://bugs.gentoo.org/615096
---
t/11weighted_shuffle_by.t | 2 ++
1 file changed, 2 insertions(+)
diff --git a/t/11weighted_shuffle_by.t b/t/11weighted_shuffle_by.t
index 68da739..0d41639 100644
--- a/t/11weighted_shuffle_by.t
+++ b/t/11weighted_shuffle_by.t
@@ -4,6 +4,8 @@ use strict;
use warnings;
use Test::More;
+
+use lib ".";
use t::Unrandom;
use List::UtilsBy qw( weighted_shuffle_by );
--
2.14.3

@ -1,193 +0,0 @@
From f85b4f6c097338ff07c5736fbe77dd09d2bca289 Mon Sep 17 00:00:00 2001
From: Kent Fredric <kentnl@gentoo.org>
Date: Thu, 26 Oct 2017 21:02:47 +1300
Subject: Fix test failures due to '.' removal from @INC under Perl 5.26
when PERL_USE_UNSAFE_INC=0
Bug: https://bugs.gentoo.org/617050
Bug: https://rt.cpan.org/Ticket/Display.html?id=121459
Bug: https://github.com/mrogaski/Log-Agent/pull/13
---
t/caller.t | 2 +-
t/carp.pl | 4 ++--
t/carp_default.t | 2 +-
t/carp_file.t | 2 +-
t/carp_fork.t | 2 +-
t/carp_silent.t | 2 +-
t/default.t | 2 +-
t/default_exp.t | 2 +-
t/file.t | 2 +-
t/fork.t | 2 +-
t/priority.t | 2 +-
t/tag_callback.t | 2 +-
t/tag_string.t | 2 +-
13 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/t/caller.t b/t/caller.t
index 6a14aa6..feb3c2c 100644
--- a/t/caller.t
+++ b/t/caller.t
@@ -14,7 +14,7 @@
print "1..10\n";
-require 't/code.pl';
+require './t/code.pl';
sub ok;
use Log::Agent;
diff --git a/t/carp.pl b/t/carp.pl
index a4327e1..352f7d6 100644
--- a/t/carp.pl
+++ b/t/carp.pl
@@ -14,10 +14,10 @@
print "1..11\n";
-require 't/code.pl';
+require './t/code.pl';
sub ok;
-my $FILE = "t/carp.pl";
+my $FILE = "./t/carp.pl";
package OTHER;
use Log::Agent;
diff --git a/t/carp_default.t b/t/carp_default.t
index 293ddb7..819e438 100644
--- a/t/carp_default.t
+++ b/t/carp_default.t
@@ -20,4 +20,4 @@ select(ORIG_STDOUT);
open(STDOUT, ">t/file.out") || die "can't redirect STDOUT: $!\n";
open(STDERR, ">t/file.err") || die "can't redirect STDOUT: $!\n";
-do 't/carp.pl';
+do './t/carp.pl';
diff --git a/t/carp_file.t b/t/carp_file.t
index 9e5e9a3..8239d62 100644
--- a/t/carp_file.t
+++ b/t/carp_file.t
@@ -27,4 +27,4 @@ my $driver = Log::Agent::Driver::File->make(
);
logconfig(-driver => $driver);
-do 't/carp.pl';
+do './t/carp.pl';
diff --git a/t/carp_fork.t b/t/carp_fork.t
index c81a86b..dcf8131 100644
--- a/t/carp_fork.t
+++ b/t/carp_fork.t
@@ -29,4 +29,4 @@ my $driver = Log::Agent::Driver::Fork->make(
);
logconfig(-driver => $driver);
-do 't/carp.pl';
+do './t/carp.pl';
diff --git a/t/carp_silent.t b/t/carp_silent.t
index 6c7c8ca..c913308 100644
--- a/t/carp_silent.t
+++ b/t/carp_silent.t
@@ -14,7 +14,7 @@
print "1..2\n";
-require 't/code.pl';
+require './t/code.pl';
sub ok;
use Log::Agent;
diff --git a/t/default.t b/t/default.t
index eadca93..73bab3a 100644
--- a/t/default.t
+++ b/t/default.t
@@ -14,7 +14,7 @@
print "1..4\n";
-require 't/code.pl';
+require './t/code.pl';
sub ok;
use Log::Agent;
diff --git a/t/default_exp.t b/t/default_exp.t
index 5fc95b7..940e1eb 100644
--- a/t/default_exp.t
+++ b/t/default_exp.t
@@ -19,7 +19,7 @@
print "1..8\n";
-require 't/code.pl';
+require './t/code.pl';
sub ok;
use Log::Agent;
diff --git a/t/file.t b/t/file.t
index 57caaba..e7487ee 100644
--- a/t/file.t
+++ b/t/file.t
@@ -15,7 +15,7 @@
use Test::More;
use Log::Agent;
require Log::Agent::Driver::File;
-require 't/common.pl';
+require './t/common.pl';
BEGIN { plan tests => 38 }
diff --git a/t/fork.t b/t/fork.t
index a943a89..5726ba2 100644
--- a/t/fork.t
+++ b/t/fork.t
@@ -14,7 +14,7 @@
use strict;
use Test;
-require 't/common.pl';
+require './t/common.pl';
BEGIN { plan tests => 19 }
diff --git a/t/priority.t b/t/priority.t
index 3e5be89..3f6b2c4 100644
--- a/t/priority.t
+++ b/t/priority.t
@@ -14,7 +14,7 @@
print "1..5\n";
-require 't/code.pl';
+require './t/code.pl';
sub ok;
use Log::Agent;
diff --git a/t/tag_callback.t b/t/tag_callback.t
index 64a1bd4..39b749d 100644
--- a/t/tag_callback.t
+++ b/t/tag_callback.t
@@ -12,7 +12,7 @@
#
##########################################################################
-require 't/code.pl';
+require './t/code.pl';
sub ok;
eval "require Callback";
diff --git a/t/tag_string.t b/t/tag_string.t
index 843fc10..b4851c2 100644
--- a/t/tag_string.t
+++ b/t/tag_string.t
@@ -14,7 +14,7 @@
print "1..2\n";
-require 't/code.pl';
+require './t/code.pl';
sub ok;
use Log::Agent;
--
2.14.3

@ -1,18 +1,17 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EAPI=8
DIST_AUTHOR=PREACTION
DIST_VERSION=1.701
DIST_VERSION=1.710
inherit perl-module
DESCRIPTION="Bringing loggers and listeners together"
SLOT="0"
KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
IUSE="test minimal"
RESTRICT="!test? ( test )"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="minimal"
# Test::Builder needed for Log/Any/Adapter/Test.pm
# constant -> perl
@ -25,7 +24,7 @@ RDEPEND="
virtual/perl-Sys-Syslog
virtual/perl-Test-Simple
"
DEPEND="${RDEPEND}
BDEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
test? (
!minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 )

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save