[gentoo-commits] repo/gentoo:master commit in: media-video/wireplumber/

2022-07-04 Thread Sam James
commit: 051c90e409a0b576a1c6b006e53974323ad9693d
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 05:45:24 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 05:45:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=051c90e4

media-video/wireplumber: depend on newer PW for plugin enablement

This version of WP disables its plugins, so depend on a PW which enables them
again.

Signed-off-by: Sam James  gentoo.org>

 .../{wireplumber-0.4.10-r5.ebuild => wireplumber-0.4.10-r6.ebuild}  | 2 +-
 media-video/wireplumber/wireplumber-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/wireplumber/wireplumber-0.4.10-r5.ebuild 
b/media-video/wireplumber/wireplumber-0.4.10-r6.ebuild
similarity index 99%
rename from media-video/wireplumber/wireplumber-0.4.10-r5.ebuild
rename to media-video/wireplumber/wireplumber-0.4.10-r6.ebuild
index 80e5772a49b4..84e7919f00ed 100644
--- a/media-video/wireplumber/wireplumber-0.4.10-r5.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.10-r6.ebuild
@@ -42,7 +42,7 @@ BDEPEND="
 DEPEND="
${LUA_DEPS}
>=dev-libs/glib-2.62
-   >=media-video/pipewire-0.3.48:=
+   >=media-video/pipewire-0.3.53-r1:=
virtual/libc
virtual/libintl
elogind? ( sys-auth/elogind )

diff --git a/media-video/wireplumber/wireplumber-.ebuild 
b/media-video/wireplumber/wireplumber-.ebuild
index ca50e19600e4..f40f12b41eae 100644
--- a/media-video/wireplumber/wireplumber-.ebuild
+++ b/media-video/wireplumber/wireplumber-.ebuild
@@ -42,7 +42,7 @@ BDEPEND="
 DEPEND="
${LUA_DEPS}
>=dev-libs/glib-2.62
-   >=media-video/pipewire-0.3.48:=
+   >=media-video/pipewire-0.3.53-r1:=
virtual/libc
virtual/libintl
elogind? ( sys-auth/elogind )



[gentoo-commits] repo/gentoo:master commit in: media-video/wireplumber/

2022-07-04 Thread Sam James
commit: 8aa3f1714ef74b678a3aee5530708be7b1e32462
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 05:25:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 05:27:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aa3f171

media-video/wireplumber: only apply alsa/bluez patch in ~arch

I think ed5e534a1cd4ae88036e99bcb81420e28f824768 was the result
of a mis-rebase/issue vs when the PR was filed and then later merged
-- at the time, wireplumber 0.4.10-r3 wasn't stable, but now it is.

The intention was to have it with the new PW changes which are
now only in ~arch. Revbump in ~arch for that new patch (the config one)
and also revbump stable to drop the patch to ensure anyone who emerged it within
an unfortunate window has a consistent experience.

Fixes: ed5e534a1cd4ae88036e99bcb81420e28f824768
Signed-off-by: Sam James  gentoo.org>

 .../{wireplumber-0.4.10-r3.ebuild => wireplumber-0.4.10-r4.ebuild}  | 1 -
 .../{wireplumber-0.4.10-r3.ebuild => wireplumber-0.4.10-r5.ebuild}  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild 
b/media-video/wireplumber/wireplumber-0.4.10-r4.ebuild
similarity index 97%
copy from media-video/wireplumber/wireplumber-0.4.10-r3.ebuild
copy to media-video/wireplumber/wireplumber-0.4.10-r4.ebuild
index 82772e332ad8..ac75996452f4 100644
--- a/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.10-r4.ebuild
@@ -68,7 +68,6 @@ PATCHES=(

"${FILESDIR}"/${P}-alsa.lua-fix-device-name-deduplication-when-reserva.patch

"${FILESDIR}"/${P}-m-default-nodes-don-t-check-if-all-device-nodes-are.patch
"${FILESDIR}"/${P}-m-lua-scripting-fix-object-refcounting.patch
-   "${FILESDIR}"/${P}-config-disable-sound-server-parts.patch # defer 
enabling sound server parts to media-video/pipewire
 )
 
 src_configure() {

diff --git a/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild 
b/media-video/wireplumber/wireplumber-0.4.10-r5.ebuild
similarity index 98%
rename from media-video/wireplumber/wireplumber-0.4.10-r3.ebuild
rename to media-video/wireplumber/wireplumber-0.4.10-r5.ebuild
index 82772e332ad8..80e5772a49b4 100644
--- a/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.10-r5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} ==  ]]; then
inherit git-r3
 else

SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz;
-   KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Replacement for pipewire-media-session"



[gentoo-commits] repo/gentoo:master commit in: dev-ruby/simplecov/

2022-07-04 Thread Hans de Graaff
commit: c187bd1d6dd9998678a1d70440a06196c4da1b5f
Author: Hans de Graaff  gentoo  org>
AuthorDate: Tue Jul  5 05:10:28 2022 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Tue Jul  5 05:15:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c187bd1d

dev-ruby/simplecov: add 0.21.2

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-ruby/simplecov/Manifest|  1 +
 dev-ruby/simplecov/simplecov-0.21.2.ebuild | 50 ++
 2 files changed, 51 insertions(+)

diff --git a/dev-ruby/simplecov/Manifest b/dev-ruby/simplecov/Manifest
index c119b765e596..68692cc5b902 100644
--- a/dev-ruby/simplecov/Manifest
+++ b/dev-ruby/simplecov/Manifest
@@ -1 +1,2 @@
 DIST simplecov-0.19.1.tar.gz 107430 BLAKE2B 
0f18cd4c8ddfd324f4e3326ad8503530862f0ae67658865183984b81a59ad9aa5fcf650fa9f64fa6841ea23afa07d25e38443a79ad0be26b966fa99b6805a090
 SHA512 
2d781008769abd79020be96f7c1f91cfb9f27d51d00436f737c408a9b9d57a82955cbe5ba5ee5a628b9a7e8835d9b3e1542b67499355373c4f9b2638bee83235
+DIST simplecov-0.21.2.tar.gz 114080 BLAKE2B 
b1bdfd45a39f97072d871a6d4ba4a2d9f2b94642cbbe329fba91b53b1d6a9b024e224e822ca49c28c4849b7bc3ade19027c6aab739d3acf28c09cd3c773ce4eb
 SHA512 
68e9a901b2ecef07aebad214ea86a092871b0ebf5b62881ca97ca0033c1ee5b9ba395116f9960e69cd88b90f569a3b573a3879178e9ccfa06d28c94de8b4f918

diff --git a/dev-ruby/simplecov/simplecov-0.21.2.ebuild 
b/dev-ruby/simplecov/simplecov-0.21.2.ebuild
new file mode 100644
index ..8dfe63648ed6
--- /dev/null
+++ b/dev-ruby/simplecov/simplecov-0.21.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_GEMSPEC="simplecov.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Code coverage with a configuration library and merging across 
test suites"
+HOMEPAGE="https://github.com/simplecov-ruby/simplecov;
+SRC_URI="https://github.com/simplecov-ruby/simplecov/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~riscv"
+SLOT="0.8"
+IUSE="doc"
+
+ruby_add_rdepend "
+   dev-ruby/simplecov-html:0.12
+   >=dev-ruby/simplecov_json_formatter-0.1:0
+   >=dev-ruby/docile-1.1:0"
+
+ruby_add_bdepend "test? (
+   dev-ruby/bundler
+   dev-ruby/rspec:3
+   dev-ruby/test-unit:2
+)"
+
+# There are also cucumber tests that require poltergeist and unpackaged 
phantomjs gem.
+
+all_ruby_prepare() {
+   # Avoid test depending on spawning ruby and having timing issues
+   sed -i -e '/blocks other processes/askip "gentoo"' 
spec/result_merger_spec.rb || die
+
+   sed -i -e '5i require "bundler"' spec/helper.rb || die
+}
+
+each_ruby_test() {
+   RSPEC_VERSION=3 ruby-ng_rspec spec/*spec.rb || die
+
+   #${RUBY} -S cucumber features || die
+}



[gentoo-commits] repo/gentoo:master commit in: dev-ruby/simplecov_json_formatter/

2022-07-04 Thread Hans de Graaff
commit: 337c9695711cc16ecffe7b45951450069e4dea27
Author: Hans de Graaff  gentoo  org>
AuthorDate: Tue Jul  5 04:59:14 2022 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Tue Jul  5 05:15:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=337c9695

dev-ruby/simplecov_json_formatter: initial import of 0.1.4

Restrict tests because there are not many tests and they are strongly
bound to a specific simplecov version. They are also not packaged in the
gem.

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-ruby/simplecov_json_formatter/Manifest |  1 +
 dev-ruby/simplecov_json_formatter/metadata.xml | 11 +++
 .../simplecov_json_formatter-0.1.4.ebuild  | 22 ++
 3 files changed, 34 insertions(+)

diff --git a/dev-ruby/simplecov_json_formatter/Manifest 
b/dev-ruby/simplecov_json_formatter/Manifest
new file mode 100644
index ..1bb9762f6cd8
--- /dev/null
+++ b/dev-ruby/simplecov_json_formatter/Manifest
@@ -0,0 +1 @@
+DIST simplecov_json_formatter-0.1.4.gem 6656 BLAKE2B 
57a03ca27911ed798ec2aa7e84a8d037e4565b0b9fec261d0a72d9276355ba27eb8fedea31195bc8b6e6b67b94b9a5f903f326720b862a46790bacd282e83c63
 SHA512 
1b90167acf4ad9565084488b455ee25ab8930a70a849191228e2868c15f29d257dc5256bb578e11351a942d887dcdeda9191a541cd0fb70e3f0eb8466fb13ddf

diff --git a/dev-ruby/simplecov_json_formatter/metadata.xml 
b/dev-ruby/simplecov_json_formatter/metadata.xml
new file mode 100644
index ..0670a7dfae0d
--- /dev/null
+++ b/dev-ruby/simplecov_json_formatter/metadata.xml
@@ -0,0 +1,11 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+  
+r...@gentoo.org
+Gentoo Ruby Project
+  
+  
+codeclimate-community/simplecov_json_formatter
+  
+

diff --git 
a/dev-ruby/simplecov_json_formatter/simplecov_json_formatter-0.1.4.ebuild 
b/dev-ruby/simplecov_json_formatter/simplecov_json_formatter-0.1.4.ebuild
new file mode 100644
index ..5201e28824d9
--- /dev/null
+++ b/dev-ruby/simplecov_json_formatter/simplecov_json_formatter-0.1.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="JSON formatter for SimpleCov"
+HOMEPAGE="https://github.com/codeclimate-community/simplecov_json_formatter;
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~riscv"
+SLOT="$(ver_cut 1)"
+IUSE="doc"
+
+# Not packaged in the gem and very fragile for e.g. simplecov versions
+RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: dev-ruby/flog/

2022-07-04 Thread Hans de Graaff
commit: 1dd8bae0d16913b52f967d65da3d98677a715565
Author: Hans de Graaff  gentoo  org>
AuthorDate: Tue Jul  5 05:12:46 2022 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Tue Jul  5 05:15:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dd8bae0

dev-ruby/flog: add 4.6.6

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-ruby/flog/Manifest  |  1 +
 dev-ruby/flog/flog-4.6.6.ebuild | 28 
 2 files changed, 29 insertions(+)

diff --git a/dev-ruby/flog/Manifest b/dev-ruby/flog/Manifest
index 698f560d180c..614fcc112b25 100644
--- a/dev-ruby/flog/Manifest
+++ b/dev-ruby/flog/Manifest
@@ -1,2 +1,3 @@
 DIST flog-4.6.4.gem 26624 BLAKE2B 
27090f9a47619b63c8c34e0d6992c1d0ff29193a7de3af839d72d5754c2b149f38c1c1e3caec981170c408123bc38e3fc3e38e87fb9a83818e1cb356d31070c3
 SHA512 
495601bfc560c2d18973234c41706aa07b76ea95bc3803f93fb16b42ae071b65fc9a1c36e8d4a9bfaf3c88a1167ab714f4bbc7a982b9e606aa799f8480a23f4d
 DIST flog-4.6.5.gem 26624 BLAKE2B 
c1cf4377be7a2b9856e4f370b6a559ac1ebac6aba7da28bd6a27bb84fe8df613680cb7c96e3d30e42d30011b97309c60e7f4bec2c322bcc3b2ed8ad5f93172a1
 SHA512 
81eaf3871f6111b442fb82371720709073f00a17044885e85498e7f943e1c9f8b5345ae8ff06a56ff68db8919ee0e696284bf017b1e1e66d76419306bed90866
+DIST flog-4.6.6.gem 26624 BLAKE2B 
7643813d436ca516d60bbde6cefb18d561a1ffd6fde3586a7104450a96b6d363dc6b794620b41e8ffeffd831e252cf15d681b2fdf41acb3b3c0d0cb5b4e95c25
 SHA512 
0689f85de19eee0d992e094f43b74f2eaf08696cfdaab849760e5f017b83bd0acb538bd0a6d6289538ac5b7f888069e12507eb6139fa35532a310122c4412c64

diff --git a/dev-ruby/flog/flog-4.6.6.ebuild b/dev-ruby/flog/flog-4.6.6.ebuild
new file mode 100644
index ..b2b88b559e64
--- /dev/null
+++ b/dev-ruby/flog/flog-4.6.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Flog reports the most tortured code in an easy to read pain 
report"
+HOMEPAGE="https://ruby.sadi.st/;
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+ruby_add_rdepend "
+   dev-ruby/path_expander:1
+   >dev-ruby/ruby_parser-3.1.0:3
+   >=dev-ruby/sexp_processor-4.8:4"
+
+each_ruby_test() {
+   ${RUBY} -Ilib test/test_flog.rb || die
+}



[gentoo-commits] repo/gentoo:master commit in: games-emulation/openmsx/

2022-07-04 Thread John Helmert III
commit: 14e0c4f8621d34756ee0bad785a32c663bf3376f
Author: John Helmert III  gentoo  org>
AuthorDate: Tue Jul  5 04:52:41 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Tue Jul  5 04:53:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14e0c4f8

games-emulation/openmsx: add missing harfbuzz dep

Signed-off-by: John Helmert III  gentoo.org>

 games-emulation/openmsx/{openmsx-18.0.ebuild => openmsx-18.0-r1.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-emulation/openmsx/openmsx-18.0.ebuild 
b/games-emulation/openmsx/openmsx-18.0-r1.ebuild
similarity index 99%
rename from games-emulation/openmsx/openmsx-18.0.ebuild
rename to games-emulation/openmsx/openmsx-18.0-r1.ebuild
index 1fbd9a8dba20..74a4c7604b70 100644
--- a/games-emulation/openmsx/openmsx-18.0.ebuild
+++ b/games-emulation/openmsx/openmsx-18.0-r1.ebuild
@@ -18,6 +18,7 @@ IUSE="+joystick"
 
 RDEPEND="dev-lang/tcl:0=
media-libs/alsa-lib
+   media-libs/harfbuzz:=
media-libs/libogg
media-libs/libpng:0=
media-libs/libsdl2[joystick=,sound,video]



[gentoo-commits] repo/gentoo:master commit in: dev-python/cssutils/

2022-07-04 Thread Michał Górny
commit: d4234d3e09a753c50060ecee286f8ed4c7af342b
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Jul  4 13:07:44 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul  5 04:41:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4234d3e

dev-python/cssutils: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/cssutils/Manifest  |  2 --
 dev-python/cssutils/cssutils-2.4.0.ebuild | 37 
 dev-python/cssutils/cssutils-2.4.1.ebuild | 41 ---
 3 files changed, 80 deletions(-)

diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
index fc355a40e7c7..b5f4ab512ccf 100644
--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@@ -1,3 +1 @@
-DIST cssutils-2.4.0.tar.gz 725986 BLAKE2B 
2f8d0166288e3af1f838fec3443293b4166bab6e2e115e198f3e6f7a0ec0949262de77eaeebe7437b3cf27567780f94ce1225b94c379cabddcae0fe10543
 SHA512 
53e18f9d06905dbda5382a3ed6ef1808571e8a32204864364b0a344e641c774f0998bf23ad0997b34ddbe9f04d3d2c7d622249cfeb0a9e846f7fb1530ae9b12b
-DIST cssutils-2.4.1.tar.gz 726348 BLAKE2B 
a6049a6326c9ffaf399b163a1819bff58445ab798a9c6b697abcadf29fcd00ef4812b516ad7b8c4bfdfd0df804a3ed9a1bbde192783600939b485de1d0b2da38
 SHA512 
f1107a761f20204c214a09647dde3d2e1900ccbe71ecca332049441f3c8916714efaece2b702167326fde016bd1817a76a4fffa6cd4fda9f91359d0a055fe7a3
 DIST cssutils-2.4.2.tar.gz 726519 BLAKE2B 
c087e06d25aa78cac35e936fe06d37ffc973b022a611a4a294683929b4c553adfbeb475330e8ce4b27b5aea3b9d4c89df6f52d02fef49236a81245505ab80d5b
 SHA512 
0757fa73170c0287ee7be9c931103bb1781c93fba63870bb11e257797af7033e77e5417ed1c7aa219eeaff5c524a84c920ead0e2b8a4599ce499b17a83fdc8f7

diff --git a/dev-python/cssutils/cssutils-2.4.0.ebuild 
b/dev-python/cssutils/cssutils-2.4.0.ebuild
deleted file mode 100644
index 7d9c3d3258c2..
--- a/dev-python/cssutils/cssutils-2.4.0.ebuild
+++ /dev/null
@@ -1,37 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="A CSS Cascading Style Sheets library"
-HOMEPAGE="https://pypi.org/project/cssutils/ https://cthedot.de/cssutils/;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc x86"
-
-BDEPEND="
-   dev-python/setuptools_scm[${PYTHON_USEDEP}]
-   test? (
-   dev-python/cssselect[${PYTHON_USEDEP}]
-   dev-python/lxml[${PYTHON_USEDEP}]
-   dev-python/mock[${PYTHON_USEDEP}]
-   $(python_gen_cond_dep '
-   dev-python/importlib_resources[${PYTHON_USEDEP}]
-   ' 3.8)
-   )"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-   # network
-   encutils/__init__.py::encutils
-   cssutils/tests/test_parse.py::CSSParserTestCase::test_parseUrl
-   examples/website.py::website.logging
-)

diff --git a/dev-python/cssutils/cssutils-2.4.1.ebuild 
b/dev-python/cssutils/cssutils-2.4.1.ebuild
deleted file mode 100644
index cb097928cb94..
--- a/dev-python/cssutils/cssutils-2.4.1.ebuild
+++ /dev/null
@@ -1,41 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="A CSS Cascading Style Sheets library"
-HOMEPAGE="
-   https://pypi.org/project/cssutils/
-   https://github.com/jaraco/cssutils/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-
-BDEPEND="
-   dev-python/setuptools_scm[${PYTHON_USEDEP}]
-   test? (
-   dev-python/cssselect[${PYTHON_USEDEP}]
-   dev-python/lxml[${PYTHON_USEDEP}]
-   dev-python/mock[${PYTHON_USEDEP}]
-   $(python_gen_cond_dep '
-   dev-python/importlib_resources[${PYTHON_USEDEP}]
-   ' 3.8)
-   )
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-   # network
-   encutils/__init__.py::encutils
-   cssutils/tests/test_parse.py::CSSParserTestCase::test_parseUrl
-   examples/website.py::website.logging
-)



[gentoo-commits] repo/gentoo:master commit in: games-emulation/openmsx/

2022-07-04 Thread John Helmert III
commit: 59f5af28fafefaa5aa1decf4d47b0c8f7f0d95c0
Author: John Helmert III  gentoo  org>
AuthorDate: Tue Jul  5 04:27:31 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Tue Jul  5 04:28:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59f5af28

games-emulation/openmsx: add 18.0

Signed-off-by: John Helmert III  gentoo.org>

 games-emulation/openmsx/Manifest|   1 +
 games-emulation/openmsx/openmsx-18.0.ebuild | 112 
 2 files changed, 113 insertions(+)

diff --git a/games-emulation/openmsx/Manifest b/games-emulation/openmsx/Manifest
index 61bc81a9d708..5c3a8475c626 100644
--- a/games-emulation/openmsx/Manifest
+++ b/games-emulation/openmsx/Manifest
@@ -1 +1,2 @@
 DIST openmsx-17.0.tar.gz 4045461 BLAKE2B 
46c70ce3f853aecebf8bdeddc5786903634d88d013497383490d79b0dbf455f48a70b3658b9913db197cf7e66cbc6f4da37da58b1b24d77c75b731e842c663df
 SHA512 
4fc87efd2bfbcd12bebb4e005b18b1cb2048f5d8f3188ef9b55f1e003c8d021fb47bd67d647137daa6a8640b5656b0db363f3b62158d690ddb5f7bf1af3459e1
+DIST openmsx-18.0.tar.gz 4151084 BLAKE2B 
0d5b4e4745c12689e4227408481367b4b4faaa4c7c2830ec0c4b9a5eb90c4b415628cd21834384d39fa4a820c725431848e98f7ef722c437f7bb4f96ae7b14c4
 SHA512 
f395fae8eac3bcb9334251c1c266a8c4d2951d6510a7c4885ddbc95aaed39f4ef8ae12a177d4a9ff44745ca368055f55f9983029b47441f4fd9731696f79809f

diff --git a/games-emulation/openmsx/openmsx-18.0.ebuild 
b/games-emulation/openmsx/openmsx-18.0.ebuild
new file mode 100644
index ..1fbd9a8dba20
--- /dev/null
+++ b/games-emulation/openmsx/openmsx-18.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10,11} )
+
+inherit desktop flag-o-matic python-any-r1 readme.gentoo-r1 toolchain-funcs xdg
+
+DESCRIPTION="MSX emulator that aims for perfection"
+HOMEPAGE="https://openmsx.org/;
+SRC_URI="https://github.com/openMSX/openMSX/releases/download/RELEASE_${PV//./_}/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+joystick"
+
+RDEPEND="dev-lang/tcl:0=
+   media-libs/alsa-lib
+   media-libs/libogg
+   media-libs/libpng:0=
+   media-libs/libsdl2[joystick=,sound,video]
+   media-libs/libtheora
+   media-libs/libvorbis
+   media-libs/sdl2-ttf
+   >=media-libs/glew-1.3.2:0=
+   sys-libs/zlib
+   virtual/opengl"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+DOC_CONTENTS="
+If you want to if you want to emulate real MSX systems and not
+only the free C-BIOS machines, put the system ROMs in one of
+the following directories: /usr/share/${PN}/systemroms
+or ~/.openMSX/share/systemroms
+"
+
+src_prepare() {
+   default
+   sed -i \
+   -e '/^LDFLAGS:=/d' \
+   -e '/LINK_FLAGS_PREFIX/d' \
+   -e '/LINK_FLAGS+=/s/-s//' \
+   -e '/LINK_FLAGS+=\$(TARGET_FLAGS)/s/$/ $(LDFLAGS)/' \
+   build/main.mk \
+   || die
+   sed -i -e '/SYMLINK/s:true:false:' build/custom.mk || die
+   sed -i -e 's/GPL.txt//' doc/node.mk || die
+
+   # Build system only configured to use bundled version - but not from the
+   # directory it's distributed in
+   cp "${S}/Contrib/catch2/catch.hpp" "${S}/src/unittest" || die
+}
+
+src_configure() {
+   tc-export CXX
+
+   # Doesn't compile without this, and build system doesn't consistently 
add
+   # it properly for all compilers
+   append-cxxflags '-std=c++17'
+
+   default
+}
+
+src_compile() {
+   emake \
+   CXXFLAGS="${CXXFLAGS}" \
+   INSTALL_SHARE_DIR="${EPREFIX}/usr/share/${PN}" \
+   V=1
+}
+
+src_test() {
+   # To get tests, we need to build with OPENMSX_FLAVOUR=unittest and then 
the
+   # build is stored in a directory of the pattern
+   # ${WORKDIR}/derived/*-unittest/. This is separate from the actual 
build,
+   # stored in ${WORKDIR}/derived/*-opt. The unittest binary and the 
workdir
+   # binary are in each of these directories under their `bin` directories.
+   emake \
+   V=1 \
+   CXXFLAGS="${CXXFLAGS}" \
+   OPENMSX_FLAVOUR=unittest
+
+   # There will only ever be one *-unittest directory
+   "${S}"/derived/*-unittest/bin/openmsx || die
+}
+
+src_install() {
+   # To guarantee installing the proper binary in case tests were built,
+   # specify the default OPENMSX_FLAVOUR
+   emake \
+   V=1 \
+   INSTALL_BINARY_DIR="${ED}/usr/bin" \
+   INSTALL_SHARE_DIR="${ED}/usr/share/${PN}" \
+   INSTALL_DOC_DIR="${ED}/usr/share/doc/${PF}" \
+   OPENMSX_FLAVOUR=opt \
+   install
+
+   einstalldocs
+   readme.gentoo_create_doc
+
+   for i in 16 32 48 64 128 256 ; do
+   newicon -s "${i}" "share/icons/openMSX-logo-${i}.png" 
"${PN}.png"
+   done
+   

[gentoo-commits] repo/proj/guru:dev commit in: app-misc/fastfetch/

2022-07-04 Thread Viorel Munteanu
commit: e153d6c4277b5e801d48e28515d21f96a96b0a6b
Author: Viorel Munteanu  gmail  com>
AuthorDate: Tue Jul  5 04:22:15 2022 +
Commit: Viorel Munteanu  gmail  com>
CommitDate: Tue Jul  5 04:22:15 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e153d6c4

app-misc/fastfetch: add 1.5.6

Signed-off-by: Viorel Munteanu  gmail.com>

 app-misc/fastfetch/Manifest   |  1 +
 app-misc/fastfetch/fastfetch-1.5.6.ebuild | 96 +++
 2 files changed, 97 insertions(+)

diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
index 5b2a0c5f0..c9c7f9eaf 100644
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -1 +1,2 @@
 DIST fastfetch-1.5.5.tar.gz 346289 BLAKE2B 
db6e321150429343a1660ea384b43a8a35a2bbf11cd6acdf9089f0d020059afa28cd4f42ac8d956974f8bb0cd6c3fe9750393ecb154f5449ab5d14a27057daaa
 SHA512 
3c51ff0e82982bf1974b113709eacf323c5a4080a8292d4ffd4575b10cf8ddbd0a55bda57dcaec5bd61bebe4b4f16e6634fa067d01d8df5be0120b2b5f5f886c
+DIST fastfetch-1.5.6.tar.gz 346273 BLAKE2B 
4fa12c32905e1c3ed2ab1ba91e52da95a87b8c2ac8ce96076dd81e43ac491b100c44260d83833f1da18bd4fcb6646d71ee0b81bd0841e57ad174d2b2344be594
 SHA512 
fcc9e7c7c0742167253dcf01a0cc2ff906fe24769e2e87f9110d2c18ea8657eb1d7477aeb87ea2c805acaebb703542d3c36546ae90a7da3d40a96815aabb32c7

diff --git a/app-misc/fastfetch/fastfetch-1.5.6.ebuild 
b/app-misc/fastfetch/fastfetch-1.5.6.ebuild
new file mode 100644
index 0..31e8aeeb4
--- /dev/null
+++ b/app-misc/fastfetch/fastfetch-1.5.6.ebuild
@@ -0,0 +1,96 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Like neofetch but faster"
+HOMEPAGE="https://github.com/LinusDierheimer/fastfetch;
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/LinusDierheimer/fastfetch.git;
+else
+   
SRC_URI="https://github.com/LinusDierheimer/fastfetch/archive/refs/tags/${PV}.tar.gz
 -> ${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="X chafa dbus gnome imagemagick opencl opengl osmesa pci sqlite vulkan 
wayland xcb xfce xrandr"
+
+# note - qa-vdb will always report errors because fastfetch loads the libs 
dynamically
+RDEPEND="
+   sys-libs/zlib
+   X? ( x11-libs/libX11 )
+   chafa? (
+   media-gfx/chafa
+   media-gfx/imagemagick:=
+   )
+   dbus? ( sys-apps/dbus )
+   gnome? (
+   dev-libs/glib
+   gnome-base/dconf
+   )
+   imagemagick? ( media-gfx/imagemagick:= )
+   opencl? ( virtual/opencl )
+   opengl? ( media-libs/libglvnd[X] )
+   osmesa? ( media-libs/mesa[osmesa] )
+   pci? ( sys-apps/pciutils )
+   sqlite? ( dev-db/sqlite:3 )
+   vulkan? ( media-libs/vulkan-loader )
+   wayland? ( dev-libs/wayland )
+   xcb? ( x11-libs/libxcb )
+   xfce? ( xfce-base/xfconf )
+   xrandr? ( x11-libs/libXrandr )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="xrandr? ( X )"
+
+pkg_setup() {
+   if use chafa && ! use imagemagick; then
+   elog "USE chafa depends on imagemagick, but that is currently 
disabled.  Enabling imagemagick"
+   fi
+
+   if use imagemagick || use chafa; then
+   export fastfetch_enable_imagemagick7=$(has_version 
'>=media-gfx/imagemagick-7.0.0' && echo yes || echo no)
+   else
+   export fastfetch_enable_imagemagick7=no
+   fi
+
+   if use imagemagick || use chafa; then
+   export fastfetch_enable_imagemagick6=$(has_version 
'

[gentoo-commits] repo/proj/guru:dev commit in: app-misc/fastfetch/

2022-07-04 Thread Viorel Munteanu
commit: b03eaf5402ce1afd5010ed42f4a8ae25ab1c784b
Author: Viorel Munteanu  gmail  com>
AuthorDate: Tue Jul  5 04:22:23 2022 +
Commit: Viorel Munteanu  gmail  com>
CommitDate: Tue Jul  5 04:22:23 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b03eaf54

app-misc/fastfetch: drop 1.5.5

Signed-off-by: Viorel Munteanu  gmail.com>

 app-misc/fastfetch/Manifest   |  1 -
 app-misc/fastfetch/fastfetch-1.5.5.ebuild | 96 ---
 2 files changed, 97 deletions(-)

diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
index c9c7f9eaf..1e278362e 100644
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -1,2 +1 @@
-DIST fastfetch-1.5.5.tar.gz 346289 BLAKE2B 
db6e321150429343a1660ea384b43a8a35a2bbf11cd6acdf9089f0d020059afa28cd4f42ac8d956974f8bb0cd6c3fe9750393ecb154f5449ab5d14a27057daaa
 SHA512 
3c51ff0e82982bf1974b113709eacf323c5a4080a8292d4ffd4575b10cf8ddbd0a55bda57dcaec5bd61bebe4b4f16e6634fa067d01d8df5be0120b2b5f5f886c
 DIST fastfetch-1.5.6.tar.gz 346273 BLAKE2B 
4fa12c32905e1c3ed2ab1ba91e52da95a87b8c2ac8ce96076dd81e43ac491b100c44260d83833f1da18bd4fcb6646d71ee0b81bd0841e57ad174d2b2344be594
 SHA512 
fcc9e7c7c0742167253dcf01a0cc2ff906fe24769e2e87f9110d2c18ea8657eb1d7477aeb87ea2c805acaebb703542d3c36546ae90a7da3d40a96815aabb32c7

diff --git a/app-misc/fastfetch/fastfetch-1.5.5.ebuild 
b/app-misc/fastfetch/fastfetch-1.5.5.ebuild
deleted file mode 100644
index 31e8aeeb4..0
--- a/app-misc/fastfetch/fastfetch-1.5.5.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Like neofetch but faster"
-HOMEPAGE="https://github.com/LinusDierheimer/fastfetch;
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/LinusDierheimer/fastfetch.git;
-else
-   
SRC_URI="https://github.com/LinusDierheimer/fastfetch/archive/refs/tags/${PV}.tar.gz
 -> ${P}.tar.gz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="X chafa dbus gnome imagemagick opencl opengl osmesa pci sqlite vulkan 
wayland xcb xfce xrandr"
-
-# note - qa-vdb will always report errors because fastfetch loads the libs 
dynamically
-RDEPEND="
-   sys-libs/zlib
-   X? ( x11-libs/libX11 )
-   chafa? (
-   media-gfx/chafa
-   media-gfx/imagemagick:=
-   )
-   dbus? ( sys-apps/dbus )
-   gnome? (
-   dev-libs/glib
-   gnome-base/dconf
-   )
-   imagemagick? ( media-gfx/imagemagick:= )
-   opencl? ( virtual/opencl )
-   opengl? ( media-libs/libglvnd[X] )
-   osmesa? ( media-libs/mesa[osmesa] )
-   pci? ( sys-apps/pciutils )
-   sqlite? ( dev-db/sqlite:3 )
-   vulkan? ( media-libs/vulkan-loader )
-   wayland? ( dev-libs/wayland )
-   xcb? ( x11-libs/libxcb )
-   xfce? ( xfce-base/xfconf )
-   xrandr? ( x11-libs/libXrandr )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="xrandr? ( X )"
-
-pkg_setup() {
-   if use chafa && ! use imagemagick; then
-   elog "USE chafa depends on imagemagick, but that is currently 
disabled.  Enabling imagemagick"
-   fi
-
-   if use imagemagick || use chafa; then
-   export fastfetch_enable_imagemagick7=$(has_version 
'>=media-gfx/imagemagick-7.0.0' && echo yes || echo no)
-   else
-   export fastfetch_enable_imagemagick7=no
-   fi
-
-   if use imagemagick || use chafa; then
-   export fastfetch_enable_imagemagick6=$(has_version 
'

[gentoo-commits] repo/gentoo:master commit in: x11-libs/spread-sheet-widget/

2022-07-04 Thread Sam James
commit: 8b7f625f3d23b586f5d5d6461e5f783a209f7daa
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 04:16:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 04:16:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b7f625f

x11-libs/spread-sheet-widget: add glib-utils BDEPEND

Closes: https://bugs.gentoo.org/672770
Signed-off-by: Sam James  gentoo.org>

 x11-libs/spread-sheet-widget/spread-sheet-widget-0.8.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.8.ebuild 
b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.8.ebuild
index ecc9dcf4f0d1..3a9a54ad0f27 100644
--- a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.8.ebuild
+++ b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.8.ebuild
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~x86"
 DEPEND="dev-libs/glib
x11-libs/gtk+:3"
 RDEPEND="${DEPEND}"
+BDEPEND="dev-util/glib-utils"
 
 src_install() {
default



[gentoo-commits] repo/gentoo:master commit in: dev-libs/isl/

2022-07-04 Thread Sam James
commit: dffbf461a870de57c4b4b37051ae2c5691008548
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 04:12:47 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 04:13:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dffbf461

dev-libs/isl: unkeyword 0.25

They haven't made a new release in a while until now and
a fair bit changed. Let's be cautious.

Signed-off-by: Sam James  gentoo.org>

 dev-libs/isl/isl-0.25.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-libs/isl/isl-0.25.ebuild b/dev-libs/isl/isl-0.25.ebuild
index cc920b7c0e49..48733d37f1a9 100644
--- a/dev-libs/isl/isl-0.25.ebuild
+++ b/dev-libs/isl/isl-0.25.ebuild
@@ -11,7 +11,9 @@ SRC_URI="https://libisl.sourceforge.io/${P}.tar.xz;
 
 LICENSE="LGPL-2.1"
 SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+# They haven't made a new release in a while until now and
+# a fair bit changed. Let's be cautious.
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]"



[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/

2022-07-04 Thread Andreas K. Hüttel
commit: 386e65695cf6804a315f1a5f01e7ec29a7faf4b9
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Tue Jul  5 04:11:46 2022 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Tue Jul  5 04:12:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=386e6569

sys-libs/glibc: 2.35 patchset bump, untested, no keywords

Signed-off-by: Andreas K. Hüttel  gentoo.org>

 sys-libs/glibc/Manifest |1 +
 sys-libs/glibc/glibc-2.35-r8.ebuild | 1604 +++
 2 files changed, 1605 insertions(+)

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 83ff9fc22d84..3ba78c344c4b 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -20,6 +20,7 @@ DIST glibc-2.35-loongarch-patches-20220522.tar.xz 44728 
BLAKE2B 09e7a061f3269ebd
 DIST glibc-2.35-patches-6.tar.xz 57236 BLAKE2B 
a03845733e2f0ebe179523458695963d729b4211b4ce14310d55163cd33aff502f9e14a4bb0068410777e9b9bb5be4ef7ad1a1fd51debf9191dcf89dc9ff08b8
 SHA512 
59c5e1669677e969873f5bba38958316a3b32523cac628b97513aed864e191da10499edac77bb5e9a07179d14cf3c75073fd03e8427f7bcfd68fedcedc35083e
 DIST glibc-2.35-patches-7.tar.xz 163840 BLAKE2B 
55352eeaf70f74fd8fcd21bd7f3ba14121b496dcfb59e06b5a73be36838dda4b39fc22201c4320c0c38a454c7f1539aae7f3307107e460bede25be33c0525c11
 SHA512 
d39bb2fecad8cd9213c61e279823f89c3daf9a4f630ac71503df2e9bfb74e019c996bed9a93aaad89083a729a1d3792e7ed8313ac54d757f47d5614ac3469e59
 DIST glibc-2.35-patches-8.tar.xz 178384 BLAKE2B 
89ca0ab51f60a25b0d0c00e619f35e71cb18f1794f3656c5e10d87e41f461c43aca51e40f3d8375014d485100098e18f333d3f99888e062f54e632eabd6ebc31
 SHA512 
cb0945eda142eebb71315b0fcf570e9410acce3b1153fdc3a9148151a7a37624d4cfb91d06ecf20b4045c70051d4c297f0f58f57ba56d9b0a4304b6b7ce2783f
+DIST glibc-2.35-patches-9.tar.xz 183612 BLAKE2B 
921664953ed39560ab850754209dbda1f71fbcc5bcc9ec21c187385ea659b90ea055e60961eca266ab3cc81213ed04747aa925dd96a352676fa19d2e63306968
 SHA512 
24c9ecb6ad890c95bc0e7db3e0c1f20768c728ac0590450fad05aed578623bc33d256d2c4d14a8d8e5c5e9fed7acfab3683053d236f51886cd5a6de93f925ddc
 DIST glibc-2.35.tar.xz 18165952 BLAKE2B 
623c728884f070cd87ffeb9203f74206197c52405ac9bc44f3dd519a3468b8e8ae2536c883e5d17d94417dbd1e91775de2e674314e4ff7424f9720026d6b7063
 SHA512 
e7336ce27561be5d7c217832a1136fb327e057bd8d3f92925b35c97e3e9f9e486948b5a1e03e5e4090772ef06437a074d10b82e68f17f1ad8f22077ee39e1b66
 DIST glibc-systemd-20210729.tar.gz 1480 BLAKE2B 
37722c7579df782d890e44dbab99c3de52ab466eb9de80d82405e9bb5620bf39ffc8c5f466a435bdb86ef6d36dd7019c0736573916bda6c67d02a2581e0ec979
 SHA512 
efd75af58b50522c28cdac7abd1fc56555bc1bb042512c90d8340c1ec09c5791b3872a305bf83723252bbde5855b75d958c041083457765c4cfd170732d09238
 DIST glibc-systemd-20210814.tar.gz 1469 BLAKE2B 
10fa7bcb46d4fdce9c0ab353cbd30871e9b09a347a13a9c9a3b5777f931aa3c826c158d2e49532c604d4a834f2fab4089b67495fb88d0398945dc50d45ad9ef1
 SHA512 
5346a9ea459a1e6ccf665389f2a294de1e16f1e3e05cdf07e3dd99ed0e4f6f8b52cc333d4bff3c75ac90ab6ce70cd4ab2b3e126f920ce7979abd6dda56315efc

diff --git a/sys-libs/glibc/glibc-2.35-r8.ebuild 
b/sys-libs/glibc/glibc-2.35-r8.ebuild
new file mode 100644
index ..5310e14a026f
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.35-r8.ebuild
@@ -0,0 +1,1604 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Bumping notes: https://wiki.gentoo.org/wiki/Project:Toolchain/sys-libs/glibc
+# Please read & adapt the page as necessary if obsolete.
+
+PYTHON_COMPAT=( python3_{8..11} )
+TMPFILES_OPTIONAL=1
+
+inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic 
gnuconfig \
+   multilib systemd multiprocessing tmpfiles
+
+DESCRIPTION="GNU libc C library"
+HOMEPAGE="https://www.gnu.org/software/libc/;
+LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
+SLOT="2.2"
+
+EMULTILIB_PKG="true"
+
+# Gentoo patchset (ignored for live ebuilds)
+PATCH_VER=9
+PATCH_DEV=dilfridge
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+else
+   #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+   SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
+   SRC_URI+=" 
https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz;
+   SRC_URI+=" experimental-loong? ( 
https://dev.gentoo.org/~xen0n/distfiles/glibc-2.35-loongarch-patches-20220522.tar.xz
 )"
+fi
+
+RELEASE_VER=${PV}
+
+GCC_BOOTSTRAP_VER=20201208
+
+LOCALE_GEN_VER=2.22
+
+GLIBC_SYSTEMD_VER=20210729
+
+SRC_URI+=" 
https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${LOCALE_GEN_VER}.tar.gz;
+SRC_URI+=" multilib-bootstrap? ( 
https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
 )"
+SRC_URI+=" systemd? ( 
https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz
 )"
+
+IUSE="audit caps cet +clone3 compile-locales +crypt custom-cflags doc 

[gentoo-commits] proj/toolchain/glibc-patches:master commit in: 9999/

2022-07-04 Thread Andreas K. Hüttel
commit: dc60b86d63c8bd0421ccace84f8ae2929c790074
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Tue Jul  5 04:01:43 2022 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Tue Jul  5 04:01:43 2022 +
URL:
https://gitweb.gentoo.org/proj/toolchain/glibc-patches.git/commit/?id=dc60b86d

Chromium sandbox related fixes not needed anymore, upstreamed

Signed-off-by: Andreas K. Hüttel  gentoo.org>

 ...ault-in-getpwuid-when-stat-fails-BZ-28752.patch | 38 --
 ...0014-Drop-glibc-lock-when-returning-early.patch | 36 
 2 files changed, 74 deletions(-)

diff --git a//0013-Fix-segfault-in-getpwuid-when-stat-fails-BZ-28752.patch 
b//0013-Fix-segfault-in-getpwuid-when-stat-fails-BZ-28752.patch
deleted file mode 100644
index 32fd8a6..000
--- a//0013-Fix-segfault-in-getpwuid-when-stat-fails-BZ-28752.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ce54d71af85a735b3ddf29bde1f6ee6e0844d352 Mon Sep 17 00:00:00 2001
-From: Adhemerval Zanella 
-Date: Sat, 12 Feb 2022 19:40:58 +0100
-Subject: [PATCH 13/14] Fix segfault in getpwuid when stat fails (BZ #28752)
-
-[azanella proposed this patch to sam when discussing the issue,
- but it's not anywhere upstream yet- dilfridge]
-
-Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=28752
-Bug: https://bugs.gentoo.org/828070
-(cherry picked from commit 1bcdcd4fec9bfe2f1d3fef67a43825903f6a5f2b)

- nss/nss_database.c | 9 +
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/nss/nss_database.c b/nss/nss_database.c
-index d56c5b798d..133682b858 100644
 a/nss/nss_database.c
-+++ b/nss/nss_database.c
-@@ -424,10 +424,11 @@ nss_database_check_reload_and_get (struct 
nss_database_state *local,
-  errors here are very unlikely, but the chance that we're entering
-  a container is also very unlikely, so we err on the side of both
-  very unlikely things not happening at the same time.  */
--  if (__stat64_time64 ("/", ) != 0
--  || (local->root_ino != 0
--&& (str.st_ino != local->root_ino
--||  str.st_dev != local->root_dev)))
-+  if (__stat64_time64 ("/", ) != 0)
-+return false;
-+
-+  if (local->root_ino != 0 && (str.st_ino != local->root_ino
-+  || str.st_dev != local->root_dev))
- {
-   /* Change detected; disable reloading and return current state.  */
-   atomic_store_release (>data.reload_disabled, 1);
--- 
-2.35.1
-

diff --git a//0014-Drop-glibc-lock-when-returning-early.patch 
b//0014-Drop-glibc-lock-when-returning-early.patch
deleted file mode 100644
index ccb544e..000
--- a//0014-Drop-glibc-lock-when-returning-early.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From f0967c21f82d9b6db6faa41315f668f56e38562f Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Mon, 7 Mar 2022 01:59:53 +0100
-Subject: [PATCH 14/14] Drop glibc lock when returning early
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes 1bcdcd4fec9bfe2f1d3fef67a43825903f6a5f2b
-
-Bug: https://bugs.gentoo.org/828070
-Signed-off-by: Andreas K. Hüttel 
-(cherry picked from commit 81f6a812264e375a695e5b00e2906da8102cc9b6)

- nss/nss_database.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/nss/nss_database.c b/nss/nss_database.c
-index 133682b858..5f58baf34b 100644
 a/nss/nss_database.c
-+++ b/nss/nss_database.c
-@@ -424,8 +424,10 @@ nss_database_check_reload_and_get (struct 
nss_database_state *local,
-  errors here are very unlikely, but the chance that we're entering
-  a container is also very unlikely, so we err on the side of both
-  very unlikely things not happening at the same time.  */
--  if (__stat64_time64 ("/", ) != 0)
-+  if (__stat64_time64 ("/", ) != 0) {
-+__libc_lock_unlock (local->lock);
- return false;
-+  }
- 
-   if (local->root_ino != 0 && (str.st_ino != local->root_ino
-   || str.st_dev != local->root_dev))
--- 
-2.35.1
-



[gentoo-commits] repo/gentoo:master commit in: x11-libs/spread-sheet-widget/

2022-07-04 Thread Sam James
commit: b9df41a367900bbb1374182e3926aea212805821
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 03:52:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 03:57:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9df41a3

x11-libs/spread-sheet-widget: drop 0.3-r1, 0.6

Signed-off-by: Sam James  gentoo.org>

 x11-libs/spread-sheet-widget/Manifest  |  2 --
 .../spread-sheet-widget-0.3-r1.ebuild  | 26 --
 .../spread-sheet-widget-0.6.ebuild | 26 --
 3 files changed, 54 deletions(-)

diff --git a/x11-libs/spread-sheet-widget/Manifest 
b/x11-libs/spread-sheet-widget/Manifest
index b65bf0860ea2..5f57cc65025f 100644
--- a/x11-libs/spread-sheet-widget/Manifest
+++ b/x11-libs/spread-sheet-widget/Manifest
@@ -1,4 +1,2 @@
-DIST spread-sheet-widget-0.3.tar.gz 501469 BLAKE2B 
92acf196966271086b02ad3a172d0f439a84701b3074677be87c84643c6a9180685121370611b21f1c9d65ed0aeae169a6f53d9f7f418f5e8469744fb19b
 SHA512 
1b667c901e42f00e7862dab70fd9df65e69aaa09d1f9eb0e7d83ccbeb74239b24188ff096b5645150ee8c98f4881501402704db96642a41b804674cbb95d1bcc
-DIST spread-sheet-widget-0.6.tar.gz 522827 BLAKE2B 
0e68fff897915b9a74fb954d604efde4180c82550d5af7ec43cdb3bc843fefa5eaf33994e95dcd65cadf5f04c24e1d0a7f08f0c7465a35c62c434c42c48bd366
 SHA512 
7a5b436cb0411fa4759b467935b7e14a15ae83c971a449525ef19cb50584ef9293efb1f6160e3b373b5bf7b48c2688c36f8396b5942599ebcb8e2957e07179b9
 DIST spread-sheet-widget-0.7.tar.gz 517216 BLAKE2B 
920fa2bc648d60f041e1b5d9d2faa7edb5b93310759de498e75bae42bcbba8493c7985e013a5099e405f2a748904e702ef8f431fa51a5d19c4e5a7a1efeceed0
 SHA512 
c27647a55e3ae878037a764e879244ac4396406f331ea6bd3795544165dc1a894c21be1bbd7314c45a4e1734f97c70d711520edb4f26438ade00b2ef39732c65
 DIST spread-sheet-widget-0.8.tar.gz 517294 BLAKE2B 
05fe434a4b6f40b365defa03fe5f058c353f955837bbe7d1b5c5229dde7a644bc37319d8e8b887f01c2a27b0ee30c9552837ec93ebe80bbff07750065f61e370
 SHA512 
022941d9064bad83835345a999358b57ec2897650079326427be78600269762dc492d2d7674c6c5c2c3b46fa619786e5f02c15bd731a163cf2ff98ea22d25682

diff --git a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.3-r1.ebuild 
b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.3-r1.ebuild
deleted file mode 100644
index 0069e657f950..
--- a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="GNU Spread Sheet Widget"
-HOMEPAGE="https://www.gnu.org/software/ssw/;
-SRC_URI="https://alpha.gnu.org/gnu/ssw/${P}.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="x11-libs/gtk+:3"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-   econf --disable-static
-}
-
-src_install() {
-   default
-
-   # no static archives
-   find "${ED}" -name '*.la' -delete || die
-}

diff --git a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.6.ebuild 
b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.6.ebuild
deleted file mode 100644
index 83ccfcaab678..
--- a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="GNU Spread Sheet Widget"
-HOMEPAGE="https://www.gnu.org/software/ssw/;
-SRC_URI="https://alpha.gnu.org/gnu/ssw/${P}.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="x11-libs/gtk+:3"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-   econf --disable-static
-}
-
-src_install() {
-   default
-
-   # no static archives
-   find "${ED}" -name '*.la' -delete || die
-}



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pspp/

2022-07-04 Thread Sam James
commit: ca781a9ccbf5601f1a72ed2410c27939bef530f0
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 03:57:43 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 03:57:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca781a9c

sci-mathematics/pspp: add 1.6.2

Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/pspp/Manifest  |  1 +
 sci-mathematics/pspp/pspp-1.6.2.ebuild | 84 ++
 2 files changed, 85 insertions(+)

diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
index 27d27d926ddf..bbd88e3c34d3 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -1,2 +1,3 @@
 DIST pspp-1.6.0.tar.gz 9553836 BLAKE2B 
4c12003838d7f6c3613d76626d88b24f4dac4b6f507db54b03be5f09027472704ae8ee6ce44d8756c7cd1e12a65ab836cb1f7d004220df8da47f47af85c4a771
 SHA512 
c8b746b9ea802a95f048e377b22d723701c5e532358aa3e4993edcc73046c4823c440dd988833b69b4ea84ac6b02a442db7daac415bef4c1081efddd9857982d
 DIST pspp-1.6.1.tar.gz 9249022 BLAKE2B 
306596cd428436df7f97dec627dbad6a089ff0b00b59b8152dac382a091687f4a82afd0ada7c98dea5bbc0369f0e07f1a85dcdbd84a21bfe09cbee9b43b02610
 SHA512 
29b475393cbe594bc93af681ec9414e56bdd664a29042017025b8f52e4e67eec1bfab638e79313a5a39929873d1d3a29095c33dbcdf40e226cc3e6010bb040a7
+DIST pspp-1.6.2.tar.gz 9249366 BLAKE2B 
d1a4fb352615be8d5f3af3125d10760648ab16e8d2b42dbf0632de64a5bb5bbe87b9b56661c7f600ea09c6a359e477376d3efb821280023d1825d6eb7b0a299f
 SHA512 
fd8b6b23ae4e4a1a560bf4d20c35e761d84dcde2e220648303303f11e9c17d56285a3d5b3c26e7dad44d52ecc82fdf93fdc51a3533ff907f2ca1f1474922e31f

diff --git a/sci-mathematics/pspp/pspp-1.6.2.ebuild 
b/sci-mathematics/pspp/pspp-1.6.2.ebuild
new file mode 100644
index ..ead310f8260b
--- /dev/null
+++ b/sci-mathematics/pspp/pspp-1.6.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit python-any-r1 xdg
+
+DESCRIPTION="Program for statistical analysis of sampled data"
+HOMEPAGE="https://www.gnu.org/software/pspp/pspp.html;
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+# Note: can drop test infra + which dep in next release!
+IUSE="doc examples gtk ncurses nls perl postgres test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   dev-libs/libxml2:2
+   sci-libs/gsl:0=
+   sys-devel/gettext
+   sys-libs/ncurses:0=
+   sys-libs/readline:0=
+   sys-libs/zlib
+   virtual/libiconv
+   x11-libs/cairo[svg]
+   x11-libs/pango
+   gtk? (
+   dev-util/glib-utils
+   x11-libs/gtk+:3
+   x11-libs/gtksourceview:4=
+   >=x11-libs/spread-sheet-widget-0.7
+   )
+   postgres? ( dev-db/postgresql:=[server] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   ${PYTHON_DEPS}
+   sys-devel/gettext
+   virtual/pkgconfig
+   doc? ( virtual/latex-base )"
+
+pkg_pretend() {
+   ewarn "Starting with pspp-1.4.0 the pspp-mode emacs package is no 
longer"
+   ewarn "shipped with pspp itself, and should instead be fetched from 
ELPA:"
+   ewarn "https://elpa.gnu.org/packages/pspp-mode.html;
+}
+
+src_prepare() {
+   default
+
+   sed -i '/appdata$/s/appdata$/metainfo/' Makefile.in || die
+}
+
+src_configure() {
+   econf \
+   $(use_enable nls) \
+   $(use_with gtk gui) \
+   $(use_with perl perl-module) \
+   $(use_with postgres libpq)
+}
+
+src_compile() {
+   default
+
+   if use doc; then
+   emake html pdf
+   HTML_DOCS=( doc/pspp{,-dev}.html )
+   fi
+}
+
+src_install() {
+   default
+
+   use doc && dodoc doc/pspp{,-dev}.pdf
+   if use examples; then
+   dodoc -r examples
+   docompress -x /usr/share/doc/${PF}/examples
+   fi
+
+   find "${ED}" -name '*.la' -type f -delete || die
+}



[gentoo-commits] repo/gentoo:master commit in: x11-libs/spread-sheet-widget/

2022-07-04 Thread Sam James
commit: e40f02f8135e61b50daee3e91b94ffe708a323db
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 03:52:10 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 03:57:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e40f02f8

x11-libs/spread-sheet-widget: add 0.8

Signed-off-by: Sam James  gentoo.org>

 x11-libs/spread-sheet-widget/Manifest  |  1 +
 .../spread-sheet-widget-0.8.ebuild | 23 ++
 2 files changed, 24 insertions(+)

diff --git a/x11-libs/spread-sheet-widget/Manifest 
b/x11-libs/spread-sheet-widget/Manifest
index ff66147e6a6f..b65bf0860ea2 100644
--- a/x11-libs/spread-sheet-widget/Manifest
+++ b/x11-libs/spread-sheet-widget/Manifest
@@ -1,3 +1,4 @@
 DIST spread-sheet-widget-0.3.tar.gz 501469 BLAKE2B 
92acf196966271086b02ad3a172d0f439a84701b3074677be87c84643c6a9180685121370611b21f1c9d65ed0aeae169a6f53d9f7f418f5e8469744fb19b
 SHA512 
1b667c901e42f00e7862dab70fd9df65e69aaa09d1f9eb0e7d83ccbeb74239b24188ff096b5645150ee8c98f4881501402704db96642a41b804674cbb95d1bcc
 DIST spread-sheet-widget-0.6.tar.gz 522827 BLAKE2B 
0e68fff897915b9a74fb954d604efde4180c82550d5af7ec43cdb3bc843fefa5eaf33994e95dcd65cadf5f04c24e1d0a7f08f0c7465a35c62c434c42c48bd366
 SHA512 
7a5b436cb0411fa4759b467935b7e14a15ae83c971a449525ef19cb50584ef9293efb1f6160e3b373b5bf7b48c2688c36f8396b5942599ebcb8e2957e07179b9
 DIST spread-sheet-widget-0.7.tar.gz 517216 BLAKE2B 
920fa2bc648d60f041e1b5d9d2faa7edb5b93310759de498e75bae42bcbba8493c7985e013a5099e405f2a748904e702ef8f431fa51a5d19c4e5a7a1efeceed0
 SHA512 
c27647a55e3ae878037a764e879244ac4396406f331ea6bd3795544165dc1a894c21be1bbd7314c45a4e1734f97c70d711520edb4f26438ade00b2ef39732c65
+DIST spread-sheet-widget-0.8.tar.gz 517294 BLAKE2B 
05fe434a4b6f40b365defa03fe5f058c353f955837bbe7d1b5c5229dde7a644bc37319d8e8b887f01c2a27b0ee30c9552837ec93ebe80bbff07750065f61e370
 SHA512 
022941d9064bad83835345a999358b57ec2897650079326427be78600269762dc492d2d7674c6c5c2c3b46fa619786e5f02c15bd731a163cf2ff98ea22d25682

diff --git a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.8.ebuild 
b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.8.ebuild
new file mode 100644
index ..ecc9dcf4f0d1
--- /dev/null
+++ b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="GNU Spread Sheet Widget"
+HOMEPAGE="https://www.gnu.org/software/ssw/;
+SRC_URI="https://alpha.gnu.org/gnu/ssw/${P}.tar.gz;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/glib
+   x11-libs/gtk+:3"
+RDEPEND="${DEPEND}"
+
+src_install() {
+   default
+
+   # no static archives
+   find "${ED}" -name '*.la' -delete || die
+}



[gentoo-commits] repo/gentoo:master commit in: net-p2p/arti/

2022-07-04 Thread John Helmert III
commit: 986062e97004b3d4d5f414faedec32bdadf81939
Author: John Helmert III  gentoo  org>
AuthorDate: Tue Jul  5 03:53:22 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Tue Jul  5 03:55:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=986062e9

net-p2p/arti: add 0.5.0

Signed-off-by: John Helmert III  gentoo.org>

 net-p2p/arti/Manifest  |  71 +++
 net-p2p/arti/arti-0.5.0.ebuild | 440 +
 2 files changed, 511 insertions(+)

diff --git a/net-p2p/arti/Manifest b/net-p2p/arti/Manifest
index d12c72d108c8..a7d9d5c61537 100644
--- a/net-p2p/arti/Manifest
+++ b/net-p2p/arti/Manifest
@@ -5,9 +5,12 @@ DIST ahash-0.7.6.crate 38030 BLAKE2B 
aca3661477fcd7822d6d10970151e05c28e1615f8cd
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 
4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f
 SHA512 
7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B 
f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791
 SHA512 
b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST anyhow-1.0.57.crate 44614 BLAKE2B 
b8d8274325b7959cedb2b8f4023d13b0d3824034c8433aea9a0a6f3c3fa6a6d7460b93bf624dff4b7168075524545f1a312e454ed0b15e8dff2109cf3c6dc433
 SHA512 
311b9280aa7d573c11752ca2ffe810e2d4b55fe4c34cca948bbd42f1ddb1d36a51eda39684cffb7f6c4a18508cb53a5a38495521562a0088e3374fee800ff004
+DIST anyhow-1.0.58.crate 43137 BLAKE2B 
8e797dfab555d7076128851203ec1c6cb3c448bad52fe28c82b10518549971e6daaaca52d4a0dbb126549fd819706d6788e5322c6433ed71836c7f6051230b7a
 SHA512 
78b21c51efd37e2be8f5672dc57f23ecd222d910604276da094754e06b86eb5a899d7ca7fb9f92566a13f70c116b05fed93d68a06320894d76a14a31e6c557b7
+DIST approx-0.5.1.crate 15100 BLAKE2B 
8fe84d52263521c0b72a1d1e82ed283828f680b8b56f532df2c14ea86ca09e793686d823c5d58ecfd7a829948543bb375e85223c866cf036e9432be5d6aa7399
 SHA512 
c6d768496c974b6ff4cf7ad8e65f3fc9faf29a1957da497968ee112c6a0b9d7a0ff9a2579206e864976c0f65ed2190bc9d2b63b31a09ced7b57879e207c46407
 DIST arrayref-0.3.6.crate 10035 BLAKE2B 
88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34
 SHA512 
368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
 DIST arti-0.3.0.tar.gz 966554 BLAKE2B 
dc088b4354824559b56fecedb149844554735cadd8e5f5da4235ed7800fd7060f57785856d0770c121d661557aaf77d6bf7b8d498b0ca18acdfb5d37c599c431
 SHA512 
42a93648cca2cdae907d73cbf456e114c5dc80adb4d3a1ac5b1805eb3fb934b02de976038129d1b51e6adc3529f2d12288c1d27cb74153a3bff0a905cd15fd01
 DIST arti-0.4.0.tar.gz 1009762 BLAKE2B 
47c3917847bb854ecaaeedf2d1836abf7f35cf0cd0a10833ff03294b97f71a8281ccd99a63ea4b06db9686199a5f6a3f52668c37ecefd8a8260b721fd52e4a2d
 SHA512 
fa3f1aa4bae28aff5757fc845e7cfe8ac3759530b963425b06d51e98d65308a4ea63cbd71e5450872771f3a518986d7b79a49cc24e49dc4078b326bb1a70f285
+DIST arti-0.5.0.tar.gz 1073378 BLAKE2B 
396517f2689b10d8f56508b09b02fdf117bae92d58067f027b2bfd44bbc312827873f804c46ce9c1d9852d33bdbfecb99db671ec7a8132aacb34c9eae4ef0688
 SHA512 
60f1bf1fa3d01451293e5596c48e999de6330c44c4324e3a1199fb6ab85847dc84a13c2a8b8c2b0319ae179b2321fdc4f8fe16011fa06593952e2568f1b96c7e
 DIST async-broadcast-0.4.0.crate 19657 BLAKE2B 
ec7c50cd2fb8e8268b98e72a5a785d388bc28f6d33179157101ba778783b46b17276f5d9381e2e43892fbb7bbe18df15f6c9e16375f5baf67df1750e24363eb1
 SHA512 
bbc72a254c115781f1a291a8aa562ab4354b7f7762a13ca280a68d6fdb0e23e09f23b75e7ef555141ae3f4f00835299d9b2ed632060c33e9412f4ea07b94252f
 DIST async-channel-1.6.1.crate 12574 BLAKE2B 
5c5c8f1cf1458d952637a439a1534e68bcb4a1cf478cec6b6d224387f56c59dc6cffd2e3621dc24e03e20df3fdbda5b8855fccfbbc26a2aa03656aff3a17d02f
 SHA512 
797b1f5b4c07853f78670e62b67fb787c329ffa2c89475a3767a963d524a69dce082cc7f3a2878d9c990f00ae2d9cd7e0d21743fc4186769c238467bdb20c65e
 DIST async-compression-0.3.12.crate 57646 BLAKE2B 
66b801ea92dbf5911815874c2df967ace5a89a15d9af95b89116976228c45cb2f42e9d4c0090527528b09827a6d1c195ceb8566a9a6817a89c8ce6ac5356104b
 SHA512 
03e47d9c9df03e4db1faba4abbddec0cbeaf1273a970cac7d8b58ee8965a5ead8500c5031b6c3f7a32f03abd2191d17609aa2af9deae35fcc4882bd19aa115d1
@@ -15,6 +18,7 @@ DIST async-compression-0.3.14.crate 57942 BLAKE2B 
00314cddd0e561d3107d297ceedbfa
 DIST async-ctrlc-1.2.0.crate 12413 BLAKE2B 
8a3850b2528d768af4c3f1681df2eca8a46e0d81b281f91bcf5da9fb06597fa32163ef81bec143f921839a172695e6837fb059f557140566a6fa7d670b0b1224
 SHA512 
62e648b216630b3a8309e8619bda64f1f12263fc97598618813921d79d9bb0d6eea80f4612512bca802d4f2b71654b9bb5e768460f35c528ae9494a8bc1a236f
 DIST async-executor-1.4.1.crate 15490 BLAKE2B 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/isl/

2022-07-04 Thread Sam James
commit: 663fce3e0904a6b30bb2fca6a773755dbf2f6a50
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 03:48:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 03:49:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=663fce3e

dev-libs/isl: add 0.25

Signed-off-by: Sam James  gentoo.org>

 dev-libs/isl/Manifest|  1 +
 dev-libs/isl/isl-0.25.ebuild | 78 
 2 files changed, 79 insertions(+)

diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest
index efecf2e95178..8d951bfe898a 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -1 +1,2 @@
 DIST isl-0.24.tar.xz 1930956 BLAKE2B 
39cbfd18ad05778e3a5a44429261b45e4abc3efe7730ee890674d968890fe5e52c73bc1f8d271c7c3bc72d5754e3f7fcb209bd139e823d19cb9ea4ce1440164d
 SHA512 
ff6bdcff839e1cd473f2a0c1e4dd4a3612ec6fee4544ccbc62b530a7248db2cf93b4b99bf493a86ddf2aba00e768927265d5d411f92061ea85fd7929073428e8
+DIST isl-0.25.tar.xz 1977048 BLAKE2B 
54a13ba8a5d7666f62f3fb20db278d15b803400cb8b69f119b18fd1f54f7d02f1e07cd1e189803fc416afaa81b35e2247ef6b3da3d8cddc463b05cc9b3921890
 SHA512 
81ac6b404a71e146bb705efe647ecf3bee19c3254f534cb44228cec13ffc7a33d7d58b980106dbb120ffdc557403d966619e219328edd0a4b3cbc4ac66acb255

diff --git a/dev-libs/isl/isl-0.25.ebuild b/dev-libs/isl/isl-0.25.ebuild
new file mode 100644
index ..cc920b7c0e49
--- /dev/null
+++ b/dev-libs/isl/isl-0.25.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib multilib-minimal preserve-libs toolchain-funcs
+
+DESCRIPTION="A library for manipulating integer points bounded by linear 
constraints"
+HOMEPAGE="https://libisl.sourceforge.io/;
+SRC_URI="https://libisl.sourceforge.io/${P}.tar.xz;
+
+LICENSE="LGPL-2.1"
+SLOT="0/23"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/xz-utils
+   virtual/pkgconfig"
+
+DOCS=( ChangeLog AUTHORS doc/manual.pdf )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.24-gdb-autoload-dir.patch
+   "${FILESDIR}"/${PN}-0.24-respect-flags.patch
+)
+
+src_prepare() {
+   default
+
+   eautoreconf
+}
+
+multilib_src_configure() {
+   local econf_opts=(
+   $(use_enable static-libs static)
+
+   # AX_PROG_CC_FOR_BUILD deficiency:
+   # 
https://wiki.gentoo.org/wiki/Project:Toolchain/use_native_symlinks
+   CC_FOR_BUILD="$(tc-getBUILD_CC)"
+   )
+
+   if ! tc-is-cross-compiler; then
+   # Incorrect CFLAGS handling as CFLAGS_FOR_BUILD
+   # even for native builds. As a result -O3 is being used
+   # regardless of user's CFLAGS.
+   econf_opts+=(
+   CFLAGS_FOR_BUILD="${CFLAGS}"
+   )
+   fi
+
+   ECONF_SOURCE="${S}" econf "${econf_opts[@]}"
+}
+
+multilib_src_install_all() {
+   einstalldocs
+
+   find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+   preserve_old_lib \
+   /usr/$(get_libdir)/libisl$(get_libname 14) \
+   /usr/$(get_libdir)/libisl$(get_libname 15) \
+   /usr/$(get_libdir)/libisl$(get_libname 19) \
+   /usr/$(get_libdir)/libisl$(get_libname 21) \
+   /usr/$(get_libdir)/libisl$(get_libname 22)
+}
+
+pkg_postinst() {
+   preserve_old_lib_notify \
+   /usr/$(get_libdir)/libisl$(get_libname 14) \
+   /usr/$(get_libdir)/libisl$(get_libname 15) \
+   /usr/$(get_libdir)/libisl$(get_libname 19) \
+   /usr/$(get_libdir)/libisl$(get_libname 21) \
+   /usr/$(get_libdir)/libisl$(get_libname 22)
+}



[gentoo-commits] repo/gentoo:master commit in: www-misc/buku/

2022-07-04 Thread John Helmert III
commit: 8c998960e9acb4ddbe211c15f9e6db84fbbd704e
Author: John Helmert III  gentoo  org>
AuthorDate: Tue Jul  5 03:33:21 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Tue Jul  5 03:33:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c998960

www-misc/buku: add 4.7

Signed-off-by: John Helmert III  gentoo.org>

 www-misc/buku/Manifest|  1 +
 www-misc/buku/buku-4.7.ebuild | 90 +++
 2 files changed, 91 insertions(+)

diff --git a/www-misc/buku/Manifest b/www-misc/buku/Manifest
index 535588ada185..d274f0444203 100644
--- a/www-misc/buku/Manifest
+++ b/www-misc/buku/Manifest
@@ -1 +1,2 @@
 DIST buku-4.6.tar.gz 491809 BLAKE2B 
82597b845c56dadf1cc6973d1f3ce6cc4970230d08ac700cf286a8c41420144fb1f42817ab808041600ab8414d96f3a3883c1bd8fbe89f29570d877a495dcd96
 SHA512 
1c46006d8c950811493a8c11453d51557cac3f6346ea28d66dcb2ae3e4c52727af7349b4b6ea088f9c08a7e9d09e3a4d80679b41497b6cd0844d811f81c9811a
+DIST buku-4.7.tar.gz 495773 BLAKE2B 
193849333bae9436573d596285f56b17b1b69c4352acbd883d0a82ed3645a7888a509f36ee33fa29526bd3d429e482ef8f43a0e1fd8def7d499f48afd9adba17
 SHA512 
f5e8984638d2fadeb1227f6ed9015c17fc46f490b6dc3ede7b66db79489cc96c9a8e3426f4722503a7e5a918d874813cf4f1462c4a32ea247e8c581e34555c07

diff --git a/www-misc/buku/buku-4.7.ebuild b/www-misc/buku/buku-4.7.ebuild
new file mode 100644
index ..e27904a3d54b
--- /dev/null
+++ b/www-misc/buku/buku-4.7.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_REQ_USE="sqlite"
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Powerful command-line bookmark manager"
+HOMEPAGE="https://github.com/jarun/buku;
+SRC_URI="https://github.com/jarun/${PN}/archive/v$(ver_cut 1-2).tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   >=dev-python/beautifulsoup4-4.6.0[${PYTHON_USEDEP}]
+   dev-python/cryptography[${PYTHON_USEDEP}]
+   >=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
+   dev-python/urllib3[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+   test? (
+   dev-python/attrs[${PYTHON_USEDEP}]
+   >=dev-python/click-7.0[${PYTHON_USEDEP}]
+   dev-python/hypothesis[${PYTHON_USEDEP}]
+   >=dev-python/py-1.5.0[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
+   >=dev-python/pyyaml-4.2[${PYTHON_USEDEP}]
+   >=dev-python/vcrpy-4.0.2[${PYTHON_USEDEP}]
+   )
+"
+
+python_prepare_all() {
+   # Remove support for bukuserver - complex depgraph which isn't all
+   # sufficiently packaged in Gentoo
+   sed -ie '/console_scripts/s/,.*/]/' setup.py || die
+   sed -ie 's/.*bukuserver.*//' tests/test_views.py || die
+   sed -ie 's/.*flask.*//' tests/test_views.py || die
+
+   distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+   distutils-r1_python_install_all
+
+   insinto /usr/share/zsh/site-functions
+   doins auto-completion/zsh/_*
+
+   newbashcomp auto-completion/bash/buku-completion.bash "${PN}"
+
+   doman buku.1
+}
+
+python_test() {
+   local skipped_tests=(
+   # Disable tests related to bukuserver
+   tests/test_setup.py::test_bukuserver_requirement
+   tests/test_views.py::test_bmv_create_form
+   tests/test_views.py::test_bookmark_model_view
+   tests/test_views.py::test_load_firefox_database
+   tests/test_views.py::test_tag_model_view_get_list
+   tests/test_views.py::test_tag_model_view_get_list_empty_db
+
+   # Broken with network-sandbox
+   tests/test_buku.py::test_network_handler_with_url
+   tests/test_bukuDb.py::TestBukuDb::test_tnyfy_url
+   tests/test_bukuDb.py::test_add_rec_exec_arg
+   tests/test_bukuDb.py::test_load_firefox
+   tests/test_bukuDb.py::test_print_db
+   tests/test_bukuDb.py::test_print_rec
+   tests/test_bukuDb.py::test_refreshdb
+
+   # Hard to debug sandbox issue - these pass when run outside 
portage
+   # There also appears to be some state issue between these, 
because
+   # skipping one can result in a later one failing.
+   
tests/test_bukuDb.py::test_delete_rec_index_and_delay_commit[1-True-False]
+   
tests/test_bukuDb.py::test_delete_rec_index_and_delay_commit[1-False-True]
+   
tests/test_bukuDb.py::test_delete_rec_index_and_delay_commit[1-False-False]
+   
tests/test_bukuDb.py::test_delete_rec_index_and_delay_commit[1-True-True]
+   )
+
+   # tests/test_server.py is bukuserver tests, ignore it
+   pytest -p no:verbose-parametrize -v --ignore tests/test_server.py 

[gentoo-commits] repo/gentoo:master commit in: net-libs/libtrace/

2022-07-04 Thread Sam James
commit: 21dd4bb425f87915b163ce72d7f0d1ac3e051d51
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 02:47:34 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 03:02:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21dd4bb4

net-libs/libtrace: add 4.0.19_p1, drop 

Signed-off-by: Sam James  gentoo.org>

 net-libs/libtrace/Manifest |  1 +
 ...trace-.ebuild => libtrace-4.0.19_p1.ebuild} | 46 --
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index b1de7ff5ca58..f884ace25641 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -1,3 +1,4 @@
 DIST libtrace-4.0.15_p1.tar.gz 1891845 BLAKE2B 
08faf395f5fdda21829b89a9276649b297d2266ef10d2162b588b39d4d8d2da1306c74bb180d63b92f4422bb157fb451d34cd8167f0bff42322776e3b1ee0e7c
 SHA512 
82f18b03e824f3ac89330854c3659244106ab5323f5e7a43ec7d2280f6ad3d427a906708688469b3f5aa479d11fef99a4bbecea585b81c916029132375582a4e
 DIST libtrace-4.0.17_p1.tar.gz 1961123 BLAKE2B 
be961bc58496414415b9affb0a6b77e5f234b92196fb719f3a2e8058ae80ade90977c44d57c75d37cbf26ff2e0c8816a4b376b77b6e44d13833960c6095b7e2c
 SHA512 
85280edd515acf52361c34ebe5324fd95f4fafc72aa22c2c8bd43a6bca9a6b5fc9a046480fc760bb39d8b577532ed416caf10a630cea9465d305f2ed4dcb318e
 DIST libtrace-4.0.18_p1.tar.gz 1963425 BLAKE2B 
fdacd4a44f899dc49fe9571d8e695cd726ea07d1c0595bd7c1f59d53721bd5610126924323c9c7098caf65276219e61265e5e05f23b4a92ae6377268c618202f
 SHA512 
fc2979fa56b0eee25149a3571d0a06e2a46ab6d6fa419b2fc37635ebcf4a8814250005c4dfc5dddb5fb6aa9c74161ab4f475a037e021388054bb62f414b9c5d2
+DIST libtrace-4.0.19.tar.bz2 844871 BLAKE2B 
ff55935b46fb2193ae2e4ab10971d0983da18be20a52a18664f0e72cb829ab444a22e00aeedbd2df85aebbcd6b8352636c559e55d05466a599cc332f018f14ad
 SHA512 
f2744337b4dcff8fc782cd90e44ea6f21cfe120840f626dfac365d3ffaecb82bfdd04a35458b67f663addc1f7ae792c5b0ec7538ed90a2deb386586bc55e1c54

diff --git a/net-libs/libtrace/libtrace-.ebuild 
b/net-libs/libtrace/libtrace-4.0.19_p1.ebuild
similarity index 60%
rename from net-libs/libtrace/libtrace-.ebuild
rename to net-libs/libtrace/libtrace-4.0.19_p1.ebuild
index f8ed9c02d13b..744613536b3f 100644
--- a/net-libs/libtrace/libtrace-.ebuild
+++ b/net-libs/libtrace/libtrace-4.0.19_p1.ebuild
@@ -1,49 +1,36 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools git-r3
-
 DESCRIPTION="A library and tools for trace processing"
 HOMEPAGE="https://research.wand.net.nz/software/libtrace.php;
-S="${WORKDIR}/${P/_beta/}"
-EGIT_REPO_URI="https://github.com/LibtraceTeam/libtrace;
-EGIT_SUBMODULES=()
+SRC_URI="https://research.wand.net.nz/software/libtrace/${PN}-$(ver_cut 
1-3).tar.bz2"
+S="${WORKDIR}"/${PN}-$(ver_cut 1-3)
 
 LICENSE="LGPL-3"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# doxygen is always needed for man pages, but USE=doc controls installing docs 
themselves
+# (not man pages)
 IUSE="doc ncurses numa"
 
-BDEPEND="
-   app-doc/doxygen[dot]
-   sys-devel/flex
-   virtual/os-headers
-   virtual/pkgconfig
-   virtual/yacc
-"
-RDEPEND="
-   >=net-libs/libpcap-0.8
+RDEPEND=">=net-libs/libpcap-0.8
dev-libs/libyaml
-   dev-libs/openssl:0=
+   dev-libs/openssl:=
net-libs/wandio
-   ncurses? ( sys-libs/ncurses:0= )
-   numa? ( sys-process/numactl )
-"
+   ncurses? ( sys-libs/ncurses:= )
+   numa? ( sys-process/numactl )"
 DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch
-   "${FILESDIR}"/${PN}-4.0.0-no-examples.patch
-   "${FILESDIR}"/${PN}-4.0.0-with-numa.patch
-   "${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch
-)
+BDEPEND="app-doc/doxygen[dot]
+   sys-devel/flex
+   virtual/os-headers
+   virtual/pkgconfig
+   virtual/yacc"
 
 src_prepare() {
default
 
-   eautoreconf
-
# Comment out FILE_PATTERNS definition (bug #706230)
if has_version ~app-doc/doxygen-1.8.16; then
sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die
@@ -57,7 +44,8 @@ src_configure() {
econf \
$(use_with ncurses) \
$(use_with numa) \
-   --with-man
+   --with-man \
+   --without-dpdk
 }
 
 src_install() {



[gentoo-commits] repo/gentoo:master commit in: net-libs/libtrace/

2022-07-04 Thread Sam James
commit: 37e4fce0d465ace9f827a024beb220a1ca555b5e
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 02:47:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 03:02:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37e4fce0

net-libs/libtrace: drop 4.0.15_p1, 4.0.17_p1

Signed-off-by: Sam James  gentoo.org>

 net-libs/libtrace/Manifest  |  2 -
 net-libs/libtrace/libtrace-4.0.15_p1.ebuild | 76 -
 net-libs/libtrace/libtrace-4.0.17_p1.ebuild | 75 
 3 files changed, 153 deletions(-)

diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index f884ace25641..7a6670a15793 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -1,4 +1,2 @@
-DIST libtrace-4.0.15_p1.tar.gz 1891845 BLAKE2B 
08faf395f5fdda21829b89a9276649b297d2266ef10d2162b588b39d4d8d2da1306c74bb180d63b92f4422bb157fb451d34cd8167f0bff42322776e3b1ee0e7c
 SHA512 
82f18b03e824f3ac89330854c3659244106ab5323f5e7a43ec7d2280f6ad3d427a906708688469b3f5aa479d11fef99a4bbecea585b81c916029132375582a4e
-DIST libtrace-4.0.17_p1.tar.gz 1961123 BLAKE2B 
be961bc58496414415b9affb0a6b77e5f234b92196fb719f3a2e8058ae80ade90977c44d57c75d37cbf26ff2e0c8816a4b376b77b6e44d13833960c6095b7e2c
 SHA512 
85280edd515acf52361c34ebe5324fd95f4fafc72aa22c2c8bd43a6bca9a6b5fc9a046480fc760bb39d8b577532ed416caf10a630cea9465d305f2ed4dcb318e
 DIST libtrace-4.0.18_p1.tar.gz 1963425 BLAKE2B 
fdacd4a44f899dc49fe9571d8e695cd726ea07d1c0595bd7c1f59d53721bd5610126924323c9c7098caf65276219e61265e5e05f23b4a92ae6377268c618202f
 SHA512 
fc2979fa56b0eee25149a3571d0a06e2a46ab6d6fa419b2fc37635ebcf4a8814250005c4dfc5dddb5fb6aa9c74161ab4f475a037e021388054bb62f414b9c5d2
 DIST libtrace-4.0.19.tar.bz2 844871 BLAKE2B 
ff55935b46fb2193ae2e4ab10971d0983da18be20a52a18664f0e72cb829ab444a22e00aeedbd2df85aebbcd6b8352636c559e55d05466a599cc332f018f14ad
 SHA512 
f2744337b4dcff8fc782cd90e44ea6f21cfe120840f626dfac365d3ffaecb82bfdd04a35458b67f663addc1f7ae792c5b0ec7538ed90a2deb386586bc55e1c54

diff --git a/net-libs/libtrace/libtrace-4.0.15_p1.ebuild 
b/net-libs/libtrace/libtrace-4.0.15_p1.ebuild
deleted file mode 100644
index 4f14188b0ead..
--- a/net-libs/libtrace/libtrace-4.0.15_p1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A library and tools for trace processing"
-HOMEPAGE="https://research.wand.net.nz/software/libtrace.php;
-SRC_URI="https://github.com/${PN^}Team/${PN}/archive//${PV/_p/-}.tar.gz -> 
${P}.tar.gz"
-S="${WORKDIR}/${P/_p/-}"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ncurses numa"
-
-BDEPEND="
-   app-doc/doxygen[dot]
-   sys-devel/flex
-   virtual/os-headers
-   virtual/pkgconfig
-   virtual/yacc
-"
-RDEPEND="
-   >=net-libs/libpcap-0.8
-   dev-libs/libyaml
-   dev-libs/openssl:0=
-   net-libs/wandio
-   ncurses? ( sys-libs/ncurses:0= )
-   numa? ( sys-process/numactl )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch
-   "${FILESDIR}"/${PN}-4.0.0-no-examples.patch
-   "${FILESDIR}"/${PN}-4.0.0-with-numa.patch
-   "${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch
-)
-
-src_prepare() {
-   default
-
-   mv configure.{in,ac} || die
-
-   eautoreconf
-
-   # Comment out FILE_PATTERNS definition (bug #706230)
-   if has_version ~app-doc/doxygen-1.8.16; then
-   sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die
-   fi
-
-   # Update doxygen configuration
-   doxygen -u docs/libtrace.doxygen.in || die
-}
-
-src_configure() {
-   econf \
-   $(use_with ncurses) \
-   $(use_with numa) \
-   --disable-static \
-   --with-man \
-   --without-dpdk
-}
-
-src_install() {
-   default
-
-   if use doc ; then
-   docinto html
-   dodoc -r docs/doxygen/html
-   fi
-
-   find "${ED}" -name "*.la" -delete || die
-}

diff --git a/net-libs/libtrace/libtrace-4.0.17_p1.ebuild 
b/net-libs/libtrace/libtrace-4.0.17_p1.ebuild
deleted file mode 100644
index fedc23bfe00e..
--- a/net-libs/libtrace/libtrace-4.0.17_p1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A library and tools for trace processing"
-HOMEPAGE="https://research.wand.net.nz/software/libtrace.php;
-SRC_URI="https://github.com/${PN^}Team/${PN}/archive//${PV/_p/-}.tar.gz -> 
${P}.tar.gz"
-S="${WORKDIR}/${P/_p/-}"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ncurses numa"
-
-BDEPEND="
-   app-doc/doxygen[dot]
-   sys-devel/flex
-   virtual/os-headers
-   virtual/pkgconfig
-   virtual/yacc
-"

[gentoo-commits] repo/gentoo:master commit in: net-libs/wandio/files/, net-libs/wandio/

2022-07-04 Thread Sam James
commit: 49775e284a9ce5cee4e57f20c0462ed56786a0f4
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 03:00:14 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 03:02:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49775e28

net-libs/wandio: update EAPI 7 -> 8

Signed-off-by: Sam James  gentoo.org>

 .../files/wandio-4.2.3_p1-fix-lz4-check.patch  | 12 
 net-libs/wandio/wandio-4.2.3_p1-r2.ebuild  | 65 ++
 2 files changed, 77 insertions(+)

diff --git a/net-libs/wandio/files/wandio-4.2.3_p1-fix-lz4-check.patch 
b/net-libs/wandio/files/wandio-4.2.3_p1-fix-lz4-check.patch
new file mode 100644
index ..db50cf1c0c04
--- /dev/null
+++ b/net-libs/wandio/files/wandio-4.2.3_p1-fix-lz4-check.patch
@@ -0,0 +1,12 @@
+https://github.com/wanduow/wandio/pull/51
+--- a/configure.ac
 b/configure.ac
+@@ -260,7 +260,7 @@ AC_ARG_WITH([lz4],
+ AS_IF([test "x$with_lz4" != "xno"],
+ [
+ AC_CHECK_LIB(lz4, LZ4F_createDecompressionContext, have_lz4f=yes, 
have_lz4f=no)
+-], [have_zstd=no])
++], [have_lz4f=no])
+ 
+ AS_IF([test "x$have_lz4f" = "xyes"], [
+ if test "$ac_cv_lib_lz4_code" != "none required"; then

diff --git a/net-libs/wandio/wandio-4.2.3_p1-r2.ebuild 
b/net-libs/wandio/wandio-4.2.3_p1-r2.ebuild
new file mode 100644
index ..d927232b4f66
--- /dev/null
+++ b/net-libs/wandio/wandio-4.2.3_p1-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="C library for simple and efficient file IO"
+HOMEPAGE="https://research.wand.net.nz/software/libwandio.php;
+SRC_URI="https://github.com/wanduow/${PN}/archive/${PV/_p/-}.tar.gz -> 
${P}.tar.gz"
+S="${WORKDIR}/${P/_p/-}"
+
+LICENSE="LGPL-3"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 http lzma lzo lz4 test zlib zstd"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( lzma lzo )"
+
+RDEPEND="
+   !

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sngrep/, net-analyzer/sngrep/files/

2022-07-04 Thread Sam James
commit: 196a34a7a190fb4d21b82e1bce71a819580030e4
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 03:11:02 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 03:15:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=196a34a7

net-analyzer/sngrep: add 1.5.0

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/sngrep/Manifest   |  1 +
 .../sngrep/files/sngrep-1.5.0-bashisms.patch   | 79 ++
 net-analyzer/sngrep/sngrep-1.5.0.ebuild| 50 ++
 3 files changed, 130 insertions(+)

diff --git a/net-analyzer/sngrep/Manifest b/net-analyzer/sngrep/Manifest
index b9cdc0865f89..664514feffc7 100644
--- a/net-analyzer/sngrep/Manifest
+++ b/net-analyzer/sngrep/Manifest
@@ -1 +1,2 @@
 DIST sngrep-1.4.7.tar.gz 237978 BLAKE2B 
30172748aeab2910e7fa13f35b447d7bd1688bb206576af6233c8c47405eb3fe93316cc72255169f19f3752e7fe3ada63c5c0bba0d9ab75706c1b0d3ac296474
 SHA512 
f414f9cc49b0c34cbbf5a77d285f12eb4091af3395953ed93dbe2f57d4ba3731d16c4b56c37e90744cf3784572975f485aed48cdd100898ffaee18e9a18943b1
+DIST sngrep-1.5.0.tar.gz 244965 BLAKE2B 
85c8ddbbb5c81dfa886086543df9ccb6f4a297c95a23afddfcf1a359e4af19a1f37cd75136881aba07fd70c177737fa93440f04f97ed9ffd01afef3055971472
 SHA512 
20be55f80d029739b1db4c0ccbc028604019acd8ca45181eb9952759ced4f20549d991c2916c9d1c84c989ccb123cad44f545a9146471a79273c0a6053615fbe

diff --git a/net-analyzer/sngrep/files/sngrep-1.5.0-bashisms.patch 
b/net-analyzer/sngrep/files/sngrep-1.5.0-bashisms.patch
new file mode 100644
index ..ffcd38d2f7f3
--- /dev/null
+++ b/net-analyzer/sngrep/files/sngrep-1.5.0-bashisms.patch
@@ -0,0 +1,79 @@
+https://github.com/irontec/sngrep/pull/404
+--- a/configure.ac
 b/configure.ac
+@@ -51,7 +51,7 @@ AC_ARG_ENABLE([unicode],
+   [AC_SUBST(UNICODE, no)]
+ )
+ 
+-AS_IF([test "x$enable_unicode" == "xyes"], [
++AS_IF([test "x$enable_unicode" = "xyes"], [
+   # Ncurses with wide-character support
+   AC_DEFINE([WITH_UNICODE], [], [Compile With Unicode compatibility])
+ 
+@@ -123,7 +123,7 @@ AC_ARG_WITH([gnutls],
+ [AC_SUBST(WITH_GNUTLS, no)]
+ )
+ 
+-AS_IF([test "x$WITH_GNUTLS" == "xyes"], [
++AS_IF([test "x$WITH_GNUTLS" = "xyes"], [
+ 
+ m4_ifdef([PKG_CHECK_MODULES], [
+ PKG_CHECK_MODULES([LIBGNUTLS], [gnutls])
+@@ -160,8 +160,8 @@ AC_ARG_WITH([openssl],
+ [AC_SUBST(WITH_OPENSSL, no)]
+ )
+ 
+-AS_IF([test "x$WITH_OPENSSL" == "xyes"], [
+-  AS_IF([test "x$WITH_GNUTLS" == "xyes"], [
++AS_IF([test "x$WITH_OPENSSL" = "xyes"], [
++  AS_IF([test "x$WITH_GNUTLS" = "xyes"], [
+   AC_MSG_ERROR([ GnuTLS and OpenSSL can not be enabled at the same 
time ])
+   ], [])
+ m4_ifdef([PKG_CHECK_MODULES], [
+@@ -187,7 +187,7 @@ AC_ARG_WITH([pcre],
+ [AC_SUBST(WITH_PCRE, no)]
+ )
+ 
+-AS_IF([test "x$WITH_PCRE" == "xyes"], [
++AS_IF([test "x$WITH_PCRE" = "xyes"], [
+   AC_CHECK_HEADER([pcre.h], [], [
+   AC_MSG_ERROR([ You need libpcre development files installed to 
compile with pcre support.])
+   ])
+@@ -206,7 +206,7 @@ AC_ARG_ENABLE([ipv6],
+ [AC_SUBST(USE_IPV6, no)]
+ )
+ 
+-AS_IF([test "x$USE_IPV6" == "xyes"], [
++AS_IF([test "x$USE_IPV6" = "xyes"], [
+   AC_CHECK_HEADERS([netinet/in.h netinet/ip6.h], [], [
+   AC_MSG_ERROR([ You dont seem to have ipv6 support (no ip6.h 
found).])
+   ], [
+@@ -231,15 +231,15 @@ AC_ARG_ENABLE([eep],
+ [AC_SUBST(USE_EEP, no)]
+ )
+ 
+-AS_IF([test "x$USE_EEP" == "xyes"], [
++AS_IF([test "x$USE_EEP" = "xyes"], [
+   AC_DEFINE([USE_EEP],[],[Compile With EEP support])
+ ], [])
+ 
+ 
+ # Conditional Source inclusion 
+-AM_CONDITIONAL([WITH_GNUTLS], [test "x$WITH_GNUTLS" == "xyes"])
+-AM_CONDITIONAL([WITH_OPENSSL], [test "x$WITH_OPENSSL" == "xyes"])
+-AM_CONDITIONAL([USE_EEP], [test "x$USE_EEP" == "xyes"])
++AM_CONDITIONAL([WITH_GNUTLS], [test "x$WITH_GNUTLS" = "xyes"])
++AM_CONDITIONAL([WITH_OPENSSL], [test "x$WITH_OPENSSL" = "xyes"])
++AM_CONDITIONAL([USE_EEP], [test "x$USE_EEP" = "xyes"])
+ 
+ 
+ ##
+@@ -249,7 +249,7 @@ AC_ARG_ENABLE(logo,
+ [ enable_logo=$enableval],
+ [ enable_logo=yes])
+ 
+-AS_IF([test "x$enable_logo" == "xyes"], [
++AS_IF([test "x$enable_logo" = "xyes"], [
+ echo ''
+ echo ' ██╗██╗  ██╗ ███╗   ██╗╗███╗ ██╗'
+ echo ' ██║██╔══██╗██╔═══██╗╗  ██║╚══██╔══╝██╔╝██╔╝'

diff --git a/net-analyzer/sngrep/sngrep-1.5.0.ebuild 
b/net-analyzer/sngrep/sngrep-1.5.0.ebuild
new file mode 100644
index ..af7e30fcebf6
--- /dev/null
+++ b/net-analyzer/sngrep/sngrep-1.5.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Ncurses SIP Messages flow viewer"
+HOMEPAGE="https://github.com/irontec/sngrep;

[gentoo-commits] repo/gentoo:master commit in: app-crypt/certbot-nginx/

2022-07-04 Thread Matthew Thode
commit: f23c86542a769392659bf00807c76b4878c6866f
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Jul  5 03:01:15 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Jul  5 03:01:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f23c8654

app-crypt/certbot-nginx: 1.26.0 cleanup

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 app-crypt/certbot-nginx/Manifest   |  1 -
 .../certbot-nginx/certbot-nginx-1.26.0.ebuild  | 35 --
 2 files changed, 36 deletions(-)

diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index ba10cdacbdf6..8476da658e84 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,3 +1,2 @@
-DIST certbot-1.26.0.tar.gz 1364070 BLAKE2B 
f9b13df8fb424e579293280202b71756c37a3ec7f986da38a5fd318d00ab7e2ed89223c62a20448ad30271783bb3c44db11a0ce4afebced9f1e9ca4e4c6de3f2
 SHA512 
bd27cb0a0ef6fc143a3d0dcf5d530d336b93a24d7010e6427c25614befb815f33076b4a3043bb247cafdfad17b8714a19ead43257c64f4fd72ac99f02cb07cde
 DIST certbot-1.27.0.tar.gz 1366469 BLAKE2B 
e9ec47520e027a9d348e861ea7d070eff4857301be0d42be6965e4159d85ef60866aa70de76edd5e68b0d40d9544075aa28e9aa07a8e04dfbf3e1a7dd77fd1de
 SHA512 
5db7836ae2eda27c088476c149e736ce7f41b85d871cf563c69e021dd8af2d64ed85c1482049edf0dffe6fd0c9591d66be3e22fbf617068600e12691c4802e5e
 DIST certbot-1.28.0.tar.gz 1367671 BLAKE2B 
01fda6c068217e32273b2c1ac97faa099f98da687d41796e1c98971ed6779ab4ff78e3309b7a6f82b9b0a891c5f00b5201bb3ce1bc879e5acbab3ccc4988ec31
 SHA512 
888f51dfcf4712b70ce7c99abfc52106384dcba2eef486db8b033bfcca3043bd0beaadce1c1e59f19c3a58b7fe454b2b64774de2e23f5d93579b3e1be1a7c08b

diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.26.0.ebuild 
b/app-crypt/certbot-nginx/certbot-nginx-1.26.0.ebuild
deleted file mode 100644
index 3566b27d06f7..
--- a/app-crypt/certbot-nginx/certbot-nginx-1.26.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == * ]]; then
-   EGIT_REPO_URI="https://github.com/certbot/certbot.git;
-   inherit git-r3
-   S=${WORKDIR}/${P}/${PN}
-else
-   
SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> 
${PN%-nginx}-${PV}.tar.gz"
-   KEYWORDS="amd64 ~arm ~arm64 x86"
-   S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/;
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-   >=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-   >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-   >=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
-   >=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
-   dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest



[gentoo-commits] repo/gentoo:master commit in: app-crypt/certbot/

2022-07-04 Thread Matthew Thode
commit: 0f22a481e477f08e8b5349fe4ab122e5b9558152
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Jul  5 03:00:29 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Jul  5 03:00:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f22a481

app-crypt/certbot: 1.26.0 cleanup

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 app-crypt/certbot/Manifest  |  1 -
 app-crypt/certbot/certbot-1.26.0.ebuild | 42 -
 2 files changed, 43 deletions(-)

diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index ba10cdacbdf6..8476da658e84 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,3 +1,2 @@
-DIST certbot-1.26.0.tar.gz 1364070 BLAKE2B 
f9b13df8fb424e579293280202b71756c37a3ec7f986da38a5fd318d00ab7e2ed89223c62a20448ad30271783bb3c44db11a0ce4afebced9f1e9ca4e4c6de3f2
 SHA512 
bd27cb0a0ef6fc143a3d0dcf5d530d336b93a24d7010e6427c25614befb815f33076b4a3043bb247cafdfad17b8714a19ead43257c64f4fd72ac99f02cb07cde
 DIST certbot-1.27.0.tar.gz 1366469 BLAKE2B 
e9ec47520e027a9d348e861ea7d070eff4857301be0d42be6965e4159d85ef60866aa70de76edd5e68b0d40d9544075aa28e9aa07a8e04dfbf3e1a7dd77fd1de
 SHA512 
5db7836ae2eda27c088476c149e736ce7f41b85d871cf563c69e021dd8af2d64ed85c1482049edf0dffe6fd0c9591d66be3e22fbf617068600e12691c4802e5e
 DIST certbot-1.28.0.tar.gz 1367671 BLAKE2B 
01fda6c068217e32273b2c1ac97faa099f98da687d41796e1c98971ed6779ab4ff78e3309b7a6f82b9b0a891c5f00b5201bb3ce1bc879e5acbab3ccc4988ec31
 SHA512 
888f51dfcf4712b70ce7c99abfc52106384dcba2eef486db8b033bfcca3043bd0beaadce1c1e59f19c3a58b7fe454b2b64774de2e23f5d93579b3e1be1a7c08b

diff --git a/app-crypt/certbot/certbot-1.26.0.ebuild 
b/app-crypt/certbot/certbot-1.26.0.ebuild
deleted file mode 100644
index 3b7237a33e98..
--- a/app-crypt/certbot/certbot-1.26.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == * ]]; then
-   EGIT_REPO_URI="https://github.com/certbot/certbot.git;
-   inherit git-r3
-else
-   SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-fi
-S=${WORKDIR}/${P}/${PN}
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/;
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-IUSE="selinux"
-
-RDEPEND="
-   >=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-   >=dev-python/ConfigArgParse-0.9.3[${PYTHON_USEDEP}]
-   >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-   >=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
-   >=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
-   >=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
-   >=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
-   dev-python/pyrfc3339[${PYTHON_USEDEP}]
-   >=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-   dev-python/zope-component[${PYTHON_USEDEP}]
-   dev-python/zope-interface[${PYTHON_USEDEP}]
-   selinux? ( sec-policy/selinux-certbot )"
-
-distutils_enable_tests pytest



[gentoo-commits] repo/gentoo:master commit in: app-crypt/certbot-apache/

2022-07-04 Thread Matthew Thode
commit: 8d72910f681ff3409186ddfcafc1411f9d01a5d2
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Jul  5 03:00:52 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Jul  5 03:00:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d72910f

app-crypt/certbot-apache: 1.26.0 cleanup

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 app-crypt/certbot-apache/Manifest  |  1 -
 .../certbot-apache/certbot-apache-1.26.0.ebuild| 33 --
 2 files changed, 34 deletions(-)

diff --git a/app-crypt/certbot-apache/Manifest 
b/app-crypt/certbot-apache/Manifest
index ba10cdacbdf6..8476da658e84 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,3 +1,2 @@
-DIST certbot-1.26.0.tar.gz 1364070 BLAKE2B 
f9b13df8fb424e579293280202b71756c37a3ec7f986da38a5fd318d00ab7e2ed89223c62a20448ad30271783bb3c44db11a0ce4afebced9f1e9ca4e4c6de3f2
 SHA512 
bd27cb0a0ef6fc143a3d0dcf5d530d336b93a24d7010e6427c25614befb815f33076b4a3043bb247cafdfad17b8714a19ead43257c64f4fd72ac99f02cb07cde
 DIST certbot-1.27.0.tar.gz 1366469 BLAKE2B 
e9ec47520e027a9d348e861ea7d070eff4857301be0d42be6965e4159d85ef60866aa70de76edd5e68b0d40d9544075aa28e9aa07a8e04dfbf3e1a7dd77fd1de
 SHA512 
5db7836ae2eda27c088476c149e736ce7f41b85d871cf563c69e021dd8af2d64ed85c1482049edf0dffe6fd0c9591d66be3e22fbf617068600e12691c4802e5e
 DIST certbot-1.28.0.tar.gz 1367671 BLAKE2B 
01fda6c068217e32273b2c1ac97faa099f98da687d41796e1c98971ed6779ab4ff78e3309b7a6f82b9b0a891c5f00b5201bb3ce1bc879e5acbab3ccc4988ec31
 SHA512 
888f51dfcf4712b70ce7c99abfc52106384dcba2eef486db8b033bfcca3043bd0beaadce1c1e59f19c3a58b7fe454b2b64774de2e23f5d93579b3e1be1a7c08b

diff --git a/app-crypt/certbot-apache/certbot-apache-1.26.0.ebuild 
b/app-crypt/certbot-apache/certbot-apache-1.26.0.ebuild
deleted file mode 100644
index 85b55229a0d2..
--- a/app-crypt/certbot-apache/certbot-apache-1.26.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == * ]]; then
-   EGIT_REPO_URI="https://github.com/certbot/certbot.git;
-   inherit git-r3
-   S=${WORKDIR}/${P}/${PN}
-else
-   
SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz 
-> ${PN%-apache}-${PV}.tar.gz"
-   KEYWORDS="amd64 ~arm64 x86"
-   S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/;
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-   >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-   dev-python/python-augeas[${PYTHON_USEDEP}]
-   dev-python/zope-component[${PYTHON_USEDEP}]
-   dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest



[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet-agent/

2022-07-04 Thread Matthew Thode
commit: 34ed3655edeecbd036cfc542938d704f43573844
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Jul  5 02:58:53 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Jul  5 02:58:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34ed3655

app-admin/puppet-agent: 7.17.0 stable amd64

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 app-admin/puppet-agent/puppet-agent-7.17.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/puppet-agent/puppet-agent-7.17.0.ebuild 
b/app-admin/puppet-agent/puppet-agent-7.17.0.ebuild
index 3ef55d1516d2..0776db0b3b8b 100644
--- a/app-admin/puppet-agent/puppet-agent-7.17.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-7.17.0.ebuild
@@ -11,7 +11,7 @@ arm64? ( 
http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 



[gentoo-commits] repo/gentoo:master commit in: app-crypt/acme/

2022-07-04 Thread Matthew Thode
commit: 6d94914e556bf8c681656912dc2475fe4e3e9a26
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Jul  5 03:00:04 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Jul  5 03:00:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d94914e

app-crypt/acme: 1.26.0 cleanup

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 app-crypt/acme/Manifest   |  1 -
 app-crypt/acme/acme-1.26.0.ebuild | 39 ---
 2 files changed, 40 deletions(-)

diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index ba10cdacbdf6..8476da658e84 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,3 +1,2 @@
-DIST certbot-1.26.0.tar.gz 1364070 BLAKE2B 
f9b13df8fb424e579293280202b71756c37a3ec7f986da38a5fd318d00ab7e2ed89223c62a20448ad30271783bb3c44db11a0ce4afebced9f1e9ca4e4c6de3f2
 SHA512 
bd27cb0a0ef6fc143a3d0dcf5d530d336b93a24d7010e6427c25614befb815f33076b4a3043bb247cafdfad17b8714a19ead43257c64f4fd72ac99f02cb07cde
 DIST certbot-1.27.0.tar.gz 1366469 BLAKE2B 
e9ec47520e027a9d348e861ea7d070eff4857301be0d42be6965e4159d85ef60866aa70de76edd5e68b0d40d9544075aa28e9aa07a8e04dfbf3e1a7dd77fd1de
 SHA512 
5db7836ae2eda27c088476c149e736ce7f41b85d871cf563c69e021dd8af2d64ed85c1482049edf0dffe6fd0c9591d66be3e22fbf617068600e12691c4802e5e
 DIST certbot-1.28.0.tar.gz 1367671 BLAKE2B 
01fda6c068217e32273b2c1ac97faa099f98da687d41796e1c98971ed6779ab4ff78e3309b7a6f82b9b0a891c5f00b5201bb3ce1bc879e5acbab3ccc4988ec31
 SHA512 
888f51dfcf4712b70ce7c99abfc52106384dcba2eef486db8b033bfcca3043bd0beaadce1c1e59f19c3a58b7fe454b2b64774de2e23f5d93579b3e1be1a7c08b

diff --git a/app-crypt/acme/acme-1.26.0.ebuild 
b/app-crypt/acme/acme-1.26.0.ebuild
deleted file mode 100644
index da63ed453043..
--- a/app-crypt/acme/acme-1.26.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-if [[ ${PV} == * ]]; then
-   EGIT_REPO_URI="https://github.com/certbot/certbot.git;
-   inherit git-r3
-   S=${WORKDIR}/${P}/${PN}
-else
-   SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> 
certbot-${PV}.tar.gz"
-   KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-   S=${WORKDIR}/certbot-${PV}/acme
-fi
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/;
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-   dev-python/chardet[${PYTHON_USEDEP}]
-   >=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
-   >=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
-   >=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
-   dev-python/pyrfc3339[${PYTHON_USEDEP}]
-   >=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-   >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-   >=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest



[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/

2022-07-04 Thread Matthew Thode
commit: 9b88e2f76a7361b4eb23f8979ce500269c0ef83e
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Jul  5 02:58:19 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Jul  5 02:58:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b88e2f7

app-admin/puppet: 7.17.0 stable amd64/x86

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 app-admin/puppet/puppet-7.17.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/puppet/puppet-7.17.0.ebuild 
b/app-admin/puppet/puppet-7.17.0.ebuild
index 98baf706218d..b0c6d6d3ffe3 100644
--- a/app-admin/puppet/puppet-7.17.0.ebuild
+++ b/app-admin/puppet/puppet-7.17.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz;
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 



[gentoo-commits] repo/gentoo:master commit in: app-admin/puppetserver/

2022-07-04 Thread Matthew Thode
commit: 136199941c4ed8bd225c4f4262ca564999ac0565
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Jul  5 02:59:22 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Jul  5 02:59:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13619994

app-admin/puppetserver: 7.7.0 stable amd64

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 app-admin/puppetserver/puppetserver-7.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/puppetserver/puppetserver-7.8.0.ebuild 
b/app-admin/puppetserver/puppetserver-7.8.0.ebuild
index 6877b38e3a99..7323a3ecf896 100644
--- a/app-admin/puppetserver/puppetserver-7.8.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-7.8.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords in puppet-agent (puppet-agent now has arm64)
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND+="
>=virtual/jdk-1.8.0



[gentoo-commits] repo/gentoo:master commit in: app-misc/ca-certificates/

2022-07-04 Thread Sam James
commit: 60d367a7338ed09a0cd47772c40c1c8f1f79376e
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 02:23:25 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 02:23:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60d367a7

app-misc/ca-certificates: add 20211016.3.80

Signed-off-by: Sam James  gentoo.org>

 app-misc/ca-certificates/Manifest  |   1 +
 .../ca-certificates-20211016.3.80.ebuild   | 203 +
 2 files changed, 204 insertions(+)

diff --git a/app-misc/ca-certificates/Manifest 
b/app-misc/ca-certificates/Manifest
index af407c7a558c..e71914efa52e 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -2,4 +2,5 @@ DIST ca-certificates_20210119.tar.xz 232964 BLAKE2B 
593352912d2b490e3f46ea032ac1
 DIST ca-certificates_20211016.tar.xz 239608 BLAKE2B 
9b4730b54fd9f472fe4e5427bf912d9a61d10d2c289d1e443b54cca469fa87f9e02b8f67e7e087aceceffc7dd2b4043cdb5380e2652bc619d51f3a224c64f717
 SHA512 
bedf072c8aa1b05b249ea272f5cecfe16bdcd762c02c712323f12ac7a278e8814453f5f3caad86a2581e451788b292ed3a76a6a81620926459bb890133cffde1
 DIST nss-3.66.tar.gz 82401896 BLAKE2B 
ae369899af681e1c6ea8046098c83da08c2112b16d85a0eaee46e9d4f97dfb3f7c3e97eb681ec947b5648446c6db51e8f1396ec9bb6c731c9678ecf925e7f743
 SHA512 
327129cb065a8c19246e081e3cbc4798c81dc52eab6ee366eade151e9d308990592075c52a7c672165725fd855a0c539d56a803c26ef066561c584d693e0e467
 DIST nss-3.79.tar.gz 84830113 BLAKE2B 
f558592bf0983d3c44f11e079512865d310b4f4c225bcc8e2058cb6a4a721d471c575965a1c2b5d0a130dcf27840da3d7b0ee8aa27fc63791414e22ef7804fa8
 SHA512 
d3311da3bd0e6907760390221c1307a63d84dd8ad9b85dbfdbf59fe4678341c9856b6f93235731999a1236c98dc0ac66d2dc023eb439cb696f73509dae70c41d
+DIST nss-3.80.tar.gz 84841312 BLAKE2B 
6244193849a9277bc68c5225b4f836309bdf07bc415b23793d14c5343f5236b27bb7552fa7fb9975f410ea4732e9fc37185fee7bb950bf5d15b478f8bdec3ba7
 SHA512 
db05df17fea12bf3ec83882bf761663f8f10f3a8ce9a33519c7985d6003945068adb658250cf05d8b598c34ecb4ba7ea5cdc468d9cc7bc786aedb72d7be65923
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 
7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d
 SHA512 
1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4

diff --git a/app-misc/ca-certificates/ca-certificates-20211016.3.80.ebuild 
b/app-misc/ca-certificates/ca-certificates-20211016.3.80.ebuild
new file mode 100644
index ..24e049209a49
--- /dev/null
+++ b/app-misc/ca-certificates/ca-certificates-20211016.3.80.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# The Debian ca-certificates package merely takes the CA database as it exists
+# in the nss package and repackages it for use by openssl.
+#
+# The issue with using the compiled debs directly is two fold:
+# - they do not update frequently enough for us to rely on them
+# - they pull the CA database from nss tip of tree rather than the release
+#
+# So we take the Debian source tools and combine them with the latest nss
+# release to produce (largely) the same end result.  The difference is that
+# now we know our cert database is kept in sync with nss and, if need be,
+# can be sync with nss tip of tree more frequently to respond to bugs.
+
+# Where possible, bump to stable/LTS releases of NSS for the last part
+# of the version (when not using a pure Debian release).
+
+# When triaging user reports, refer to our wiki for tips:
+# https://wiki.gentoo.org/wiki/Certificates#Debugging_certificate_issues
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit python-any-r1
+
+if [[ ${PV} == *.* ]] ; then
+   # Compile from source ourselves.
+   PRECOMPILED=false
+
+   DEB_VER=$(ver_cut 1)
+   NSS_VER=$(ver_cut 2-)
+   RTM_NAME="NSS_${NSS_VER//./_}_RTM"
+else
+   # Debian precompiled version.
+   PRECOMPILED=true
+   inherit unpacker
+fi
+
+DESCRIPTION="Common CA Certificates PEM files"
+HOMEPAGE="https://packages.debian.org/sid/ca-certificates;
+NMU_PR=""
+if ${PRECOMPILED} ; then
+   
SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
+else
+   
SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
+   
https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
+   cacert? (
+   
https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch
+   )"
+fi
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"

[gentoo-commits] repo/gentoo:master commit in: dev-python/nbconvert/

2022-07-04 Thread Sam James
commit: a7719631a05d613c8d6c2daaca0c983502db2b1b
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 02:29:52 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 02:30:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7719631

dev-python/nbconvert: add tinycss2 dep

Closes: https://bugs.gentoo.org/856289
Signed-off-by: Sam James  gentoo.org>

 dev-python/nbconvert/nbconvert-6.5.0-r2.ebuild | 83 ++
 1 file changed, 83 insertions(+)

diff --git a/dev-python/nbconvert/nbconvert-6.5.0-r2.ebuild 
b/dev-python/nbconvert/nbconvert-6.5.0-r2.ebuild
new file mode 100644
index ..171e7a133509
--- /dev/null
+++ b/dev-python/nbconvert/nbconvert-6.5.0-r2.ebuild
@@ -0,0 +1,83 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Converting Jupyter Notebooks"
+HOMEPAGE="
+   https://nbconvert.readthedocs.io/
+   https://github.com/jupyter/nbconvert/
+   https://pypi.org/project/nbconvert/
+"
+SRC_URI="
+   mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+   dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+   dev-python/bleach[${PYTHON_USEDEP}]
+   dev-python/defusedxml[${PYTHON_USEDEP}]
+   >=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
+   dev-python/jinja[${PYTHON_USEDEP}]
+   dev-python/jupyter_core[${PYTHON_USEDEP}]
+   dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
+   >=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
+   >=dev-python/mistune-2.0.2[${PYTHON_USEDEP}]
+   dev-python/nbclient[${PYTHON_USEDEP}]
+   dev-python/nbformat[${PYTHON_USEDEP}]
+   >=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
+   dev-python/pygments[${PYTHON_USEDEP}]
+   dev-python/tinycss2[${PYTHON_USEDEP}]
+   >=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
+   dev-python/testpath[${PYTHON_USEDEP}]
+   www-servers/tornado[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   test? (
+   dev-python/pebble[${PYTHON_USEDEP}]
+   dev-python/ipykernel[${PYTHON_USEDEP}]
+   dev-python/ipywidgets[${PYTHON_USEDEP}]
+   >=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
+   )
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+   "${FILESDIR}"/${P}-mistune-2.patch
+)
+
+src_test() {
+   mkdir -p "${HOME}/.local" || die
+   cp -r share "${HOME}/.local/" || die
+   distutils-r1_src_test
+}
+
+python_test() {
+   local EPYTEST_DESELECT=(
+   # Missing pyppeteer for now
+   # TODO: Doesn't skip?
+   nbconvert/exporters/tests/test_webpdf.py
+   # Needs pyppeteer too
+   
'nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
+   )
+
+   epytest --pyargs nbconvert
+}
+
+pkg_postinst() {
+   if ! has_version app-text/pandoc ; then
+   einfo "Pandoc is required for converting to formats other than 
Python,"
+   einfo "HTML, and Markdown. If you need this functionality, 
install"
+   einfo "app-text/pandoc."
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: dev-python/meson-python/, dev-python/meson-python/files/

2022-07-04 Thread Sam James
commit: dd267aff1c6278d5895031a664388a9935874647
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 02:26:47 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 02:27:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd267aff

dev-python/meson-python: drop 0.5.0-r1

Signed-off-by: Sam James  gentoo.org>

 dev-python/meson-python/Manifest   |   1 -
 .../meson-python-0.5.0-pyproject-metadata.patch| 110 -
 .../meson-python/meson-python-0.5.0-r1.ebuild  |  46 -
 3 files changed, 157 deletions(-)

diff --git a/dev-python/meson-python/Manifest b/dev-python/meson-python/Manifest
index 25059d789196..bfaef08c5220 100644
--- a/dev-python/meson-python/Manifest
+++ b/dev-python/meson-python/Manifest
@@ -1,2 +1 @@
-DIST meson-python-0.5.0.gh.tar.gz 30525 BLAKE2B 
f9afcb0edfdb06ce001b5185bf8c09de18a35d0f2d12f8fd69ed35cf17cc5e987c73724403fe1d6c44c80f1fad41b4b66b07b26e050b551673b3860a3d453a29
 SHA512 
e3941d258c5d16d0355752aff2f6458705a6af7d83850f679c5304d61699c393e186b9da2fe1a6405cb616a319250351e02ad81ddc8abf042f64c6b42b0be1cf
 DIST meson-python-0.6.0.gh.tar.gz 26783 BLAKE2B 
d5c5b95d5d609487a0efee1ce05b133794705cdb16f2d05d6e08b9201541e31f61a832c7770b4b5ad675f8dd91860c30c67769ce8fc0af2c48e65b0aad187ddb
 SHA512 
25042ea030d2ad323c67daa0a520db936a4a4efa0de1c9f631c47fac22d797e01d1f1707ed407e2931164a35b3916e19a774ee16ab1d45fc91e41c75add57fa1

diff --git 
a/dev-python/meson-python/files/meson-python-0.5.0-pyproject-metadata.patch 
b/dev-python/meson-python/files/meson-python-0.5.0-pyproject-metadata.patch
deleted file mode 100644
index fd96d942eb73..
--- a/dev-python/meson-python/files/meson-python-0.5.0-pyproject-metadata.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-https://github.com/FFY00/meson-python/commit/678a586427088a58dfac15bb3fe89b3d7ff0178e
-https://github.com/FFY00/meson-python/commit/c01645aa3617ccd424ef3ec052d13ac25e7df433
-
-From 678a586427088a58dfac15bb3fe89b3d7ff0178e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Filipe=20La=C3=ADns?= 
-Date: Thu, 9 Jun 2022 20:24:32 +0100
-Subject: [PATCH] mesonpy: replace pep621 dependency with pyproject-metadata
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes #33
-
-Signed-off-by: Filipe Laíns 
 a/mesonpy/__init__.py
-+++ b/mesonpy/__init__.py
-@@ -46,7 +46,7 @@
- 
- 
- if typing.TYPE_CHECKING:  # pragma: no cover
--import pep621 as _pep621  # noqa: F401
-+import pyproject_metadata  # noqa: F401
- import wheel.wheelfile  # noqa: F401
- 
- 
-@@ -353,7 +353,7 @@ class Project():
- _ALLOWED_DYNAMIC_FIELDS: ClassVar[List[str]] = [
- 'version',
- ]
--_metadata: Optional[_pep621.StandardMetadata]
-+_metadata: Optional[pyproject_metadata.StandardMetadata]
- 
- def __init__(
- self,
-@@ -372,11 +372,11 @@ def __init__(
- self._pep621 = 'project' in self._config
- if self.pep621:
- try:
--import pep621  # noqa: F811
-+import pyproject_metadata  # noqa: F811
- except ModuleNotFoundError:  # pragma: no cover
- self._metadata = None
- else:
--self._metadata = 
pep621.StandardMetadata.from_pyproject(self._config, self._source_dir)
-+self._metadata = 
pyproject_metadata.StandardMetadata.from_pyproject(self._config, 
self._source_dir)
- else:
- print(
- '{yellow}{bold}! Using Meson to generate the project metadata 
'
-@@ -550,8 +550,8 @@ def metadata(self) -> bytes:  # noqa: C901
- Name: {self.name}
- Version: {self.version}
- ''').strip().encode()
--# re-import pep621 to raise ModuleNotFoundError if it is really 
missing
--import pep621  # noqa: F401, F811
-+# re-import pyproject_metadata to raise ModuleNotFoundError if it is 
really missing
-+import pyproject_metadata  # noqa: F401, F811
- assert self._metadata
- # use self.version as the version may be dynamic -- fetched from Meson
- core_metadata = self._metadata.as_rfc822()
 a/pyproject.toml
-+++ b/pyproject.toml
-@@ -4,7 +4,7 @@ backend-path = ['.']
- requires = [
-   'meson>=0.62.0',
-   'ninja',
--  'pep621>=0.3.0',
-+  'pyproject-metadata>=0.5.0',
-   'tomli>=1.0.0',
-   'typing-extensions>=3.7.4; python_version<"3.8"',
- ]
-@@ -29,7 +29,7 @@ dependencies = [
-   'colorama; os_name == "nt"',
-   'meson>=0.60.0',
-   'ninja',
--  'pep621>=0.3.0', # not a hard dependency, only needed for projects that use 
PEP 621 metadata
-+  'pyproject-metadata>=0.5.0', # not a hard dependency, only needed for 
projects that use PEP 621 metadata
-   'tomli>=1.0.0',
-   'typing-extensions>=3.7.4; python_version<"3.8"',
- ]
-@@ -41,7 +41,6 @@ test = [
-   'pytest-mock',
-   'GitPython',
-   'auditwheel',
--  'pep621 >= 0.4.0',
- ]
- docs = [
-   'furo>=2021.08.31',

[gentoo-commits] repo/gentoo:master commit in: xfce-base/exo/

2022-07-04 Thread Sam James
commit: 62affed13d9f64bbab18f516d802cb443cbbe912
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 02:05:42 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 02:05:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62affed1

xfce-base/exo: Stabilize 4.16.4 ppc, #851204

Signed-off-by: Sam James  gentoo.org>

 xfce-base/exo/exo-4.16.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xfce-base/exo/exo-4.16.4.ebuild b/xfce-base/exo/exo-4.16.4.ebuild
index b3f85d5a8334..41f28387f549 100644
--- a/xfce-base/exo/exo-4.16.4.ebuild
+++ b/xfce-base/exo/exo-4.16.4.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2;
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc 
x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 RDEPEND="
>=dev-libs/glib-2.50



[gentoo-commits] repo/gentoo:master commit in: net-p2p/nicotine+/

2022-07-04 Thread Sam James
commit: 509de337cb6e37a18897371f7a12d8cb6a5f93d0
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 02:05:39 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 02:05:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=509de337

net-p2p/nicotine+: Stabilize 3.2.2-r1 ppc, #850556

Signed-off-by: Sam James  gentoo.org>

 net-p2p/nicotine+/nicotine+-3.2.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/nicotine+/nicotine+-3.2.2-r1.ebuild 
b/net-p2p/nicotine+/nicotine+-3.2.2-r1.ebuild
index cc9c130b97f3..575d53dcf361 100644
--- a/net-p2p/nicotine+/nicotine+-3.2.2-r1.ebuild
+++ b/net-p2p/nicotine+/nicotine+-3.2.2-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/Nicotine-Plus/nicotine-plus/archive/${PV}.tar.gz ->
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"



[gentoo-commits] repo/gentoo:master commit in: dev-python/scipy/

2022-07-04 Thread Sam James
commit: 9df55e4f0c2556c83ccb51eebce70fefc76989ca
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 01:57:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 01:57:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9df55e4f

dev-python/scipy: add 1.9.0_rc2

Signed-off-by: Sam James  gentoo.org>

 dev-python/scipy/Manifest   |  2 +-
 .../{scipy-1.9.0_rc1.ebuild => scipy-1.9.0_rc2.ebuild}  |  4 ++--
 dev-python/scipy/scipy-1.9..ebuild  | 13 +
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index 3155ebc0d471..06d764c811f0 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,4 +1,4 @@
 DIST scipy-1.8.1.tar.gz 38196215 BLAKE2B 
180ae646adba2031a4bf99cd4feefe652b8e340110b3b2872e61aa1083054aadf369c7e3b3e3fd8fb71fcd831c95841d2dadd1c71e35e5f7d95800e5551173f0
 SHA512 
f6fc71c209991fe82baa4b10d8ade0deb1057f6f5942a91dfb7ae45f3eb78a4535efa2861badf5e2d37239fa99dbd99de760aa7e4854b95991ade0263004e7ea
-DIST scipy-1.9.0rc1.tar.gz 42045828 BLAKE2B 
8ecb112f611d52a69564329764b63d6f97bdcf6ba2fedc32134fb9f0da0c7f91d8507136bd81e2193c8a796273019cf2cf1a0f6009f6ac0803924a27ad216c37
 SHA512 
74d0ec0b94d33da683549b9c56966ec58dc807a5b60101413530501d2b1e789209b1b0e6cbca0a3bd0317dd0911406efc900dee5f90f1ea71c9aefa00f4c2dbe
+DIST scipy-1.9.0rc2.tar.gz 41994528 BLAKE2B 
a1f72c54dda09a2086756e61cf35be30485e5f237b8a5c339002aa6532017fd215e029e9762b8b669d36975d0df751f7cbe1b0d1da60e12376f70e706af4bdf7
 SHA512 
dce69ee783d6a234c0a9300af055a59a4de23ba4fedfd2aa16e8dfd244eff72a217c242b332ab500389b236d3bac81ebb202a9f0ed8d1cffa82c36290fd49f77
 DIST scipy-html-1.8.1.zip 37060661 BLAKE2B 
2fa617c58eb47463f8a61f9798b32c6da255d26b8e86c1558e427a715093f5a29ced3847ab6ecfe88ce1017664f36ac3e9fa9bbf72ede7e0fd3812b5f41fe933
 SHA512 
95153dc1f404aa64898a700c94c0deea3ca842c3152167d0987edabcf4a8eba16b6c8e6bc38a6775a849dc621e6a21434baf53d1669b1865fa5049cffa4387ac
 DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B 
9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2
 SHA512 
8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728

diff --git a/dev-python/scipy/scipy-1.9.0_rc1.ebuild 
b/dev-python/scipy/scipy-1.9.0_rc2.ebuild
similarity index 95%
rename from dev-python/scipy/scipy-1.9.0_rc1.ebuild
rename to dev-python/scipy/scipy-1.9.0_rc2.ebuild
index aa0db9c53032..19c83a0756f4 100644
--- a/dev-python/scipy/scipy-1.9.0_rc1.ebuild
+++ b/dev-python/scipy/scipy-1.9.0_rc2.ebuild
@@ -47,10 +47,10 @@ SLOT="0"
 IUSE="doc +sparse"
 
 DEPEND="
-   >=dev-python/numpy-1.17.3[lapack,${PYTHON_USEDEP}]
+   >=dev-python/numpy-1.18.5[lapack,${PYTHON_USEDEP}]
sci-libs/arpack:0=
virtual/cblas
-   virtual/lapack
+   >=virtual/lapack-3.8
sparse? ( sci-libs/umfpack:0= )"
 RDEPEND="${DEPEND}
dev-python/pillow[${PYTHON_USEDEP}]"

diff --git a/dev-python/scipy/scipy-1.9..ebuild 
b/dev-python/scipy/scipy-1.9..ebuild
index a25a63827ff7..19c83a0756f4 100644
--- a/dev-python/scipy/scipy-1.9..ebuild
+++ b/dev-python/scipy/scipy-1.9..ebuild
@@ -26,15 +26,20 @@ if [[ ${PV} == ** ]] ; then
 else
# Upstream is often behind with doc updates
DOC_PV=1.8.1
+   MY_PV=${PV/_rc/rc}
+   MY_P=${PN}-${MY_PV}
 
SRC_URI="
-   mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+   mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
doc? (

https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip

https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf
)"
+   S="${WORKDIR}"/${MY_P}
 
-   KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+   if [[ ${PV} != *rc* ]] ; then
+   KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+   fi
 fi
 
 LICENSE="BSD LGPL-2"
@@ -42,10 +47,10 @@ SLOT="0"
 IUSE="doc +sparse"
 
 DEPEND="
-   >=dev-python/numpy-1.17.3[lapack,${PYTHON_USEDEP}]
+   >=dev-python/numpy-1.18.5[lapack,${PYTHON_USEDEP}]
sci-libs/arpack:0=
virtual/cblas
-   virtual/lapack
+   >=virtual/lapack-3.8
sparse? ( sci-libs/umfpack:0= )"
 RDEPEND="${DEPEND}
dev-python/pillow[${PYTHON_USEDEP}]"



[gentoo-commits] repo/proj/guru:dev commit in: app-admin/chamber/

2022-07-04 Thread Alexey Zapparov
commit: d5ce8005aced09f73982424c23e5fd805273e7fb
Author: Alexey Zapparov  zapparov  com>
AuthorDate: Tue Jul  5 01:30:41 2022 +
Commit: Alexey Zapparov  zapparov  com>
CommitDate: Tue Jul  5 01:31:07 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d5ce8005

app-admin/chamber: drop 2.10.7

Signed-off-by: Alexey Zapparov  zapparov.com>

 app-admin/chamber/Manifest  |  1 -
 app-admin/chamber/chamber-2.10.7.ebuild | 88 -
 2 files changed, 89 deletions(-)

diff --git a/app-admin/chamber/Manifest b/app-admin/chamber/Manifest
index 292d8046f..81e309bf0 100644
--- a/app-admin/chamber/Manifest
+++ b/app-admin/chamber/Manifest
@@ -1,6 +1,5 @@
 DIST chamber-2.10.12-deps.tar.gz 69739521 BLAKE2B 
3a67a4204debb168b2c643ee7deb0406240575dd7623162f763d3fa834cfdc3aa848815e77db82c919c0c0e494bb91fb98ae2a5a2ad16d85b21b765649462b37
 SHA512 
2ad2bc3d27218d9c2f127034567e5064b9e0e117aad0c0dd071af10639de597a64e4eadc4a4418bcda3498a6a8627c9da36217733fee594aba72bd72c372e3ae
 DIST chamber-2.10.12.tar.gz 44423 BLAKE2B 
bf5bfc5ebf81abc5abe0f20e147fe591c51c2da9a26a63fb288cf7ea414fba94052f6bd24fd801775ded78aff0b493be190e921a5b9ca27e3ae7f7198cd60e2d
 SHA512 
a022f1f2dab3d621827875867497a60814ca2ea39488413a07c58a2a2e8620f5fe91ab506dabc7d185f1a53b2b27fcdcc866c8b04ad5d08d8a83114be0f272c9
-DIST chamber-2.10.7.tar.gz 45895 BLAKE2B 
611c3da244ffde369788c1c75405fc806afffe9b80522d8647bf281ef465a435227806baa25e43912c2b7ded7de9981547e862d4b94516663a6bd0beada168ee
 SHA512 
2d40463991f13448bd5ce27cfaf61baeb26fb4cf8fb4ee767c29d8657c8fbe1063ac824b94a0b31c0598c70a400781570fd89d3ceb58ea5c22cebef5537669dd
 DIST chamber-2.10.9.tar.gz 45921 BLAKE2B 
2fa2b9c973ccc7b25848326472281b589970b4e07667328a103122db8c96991390afbb018c2b3e104b5d18f2482f5f3f30220b7b9555f7d266bb89844823c89c
 SHA512 
cf77fa1c9795f80e3c369b4f6fd6395b73ea0fb64496fa2b729da2490dffef6c5fbd2419342b3c40cf7d6503888384b513725a5856cc08776a6385b9b7875f3f
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.22.mod 178 BLAKE2B 
1aa7ac654a0577f654dd63b5950fe13b02c6b0cce274f43cef0c850b44e507fe37a78286cb3326a5eb1c6ce15e969381dee14ff2a474f7a183cc40e56d81efa3
 SHA512 
376db876c55dce630bbe0b3bc3898bbcca0169965e8d12a76a1018da34301e1654159957142b4e6f103c0d9e1713e9e158fcf598e5c87131a3904e4452f12a7b
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.22.zip 20516549 BLAKE2B 
7ed0d49d6b00807f90d9c1c84e2cc562ca6ccba401d2a3b954ce5db7a0671ccefbe4904fa816a8bba7cd11a2fcb749a69a47eff7c9ed28762bce170b825bab73
 SHA512 
ef7022f803fbb1d948eff921b52f59a2e705206a56963f597ae7536461249aa6faad2258bf6248d4bfb5087b5457a4f0f4bd96b6377e59f8ebb285ed3fa11656

diff --git a/app-admin/chamber/chamber-2.10.7.ebuild 
b/app-admin/chamber/chamber-2.10.7.ebuild
deleted file mode 100644
index 6273ada80..0
--- a/app-admin/chamber/chamber-2.10.7.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-EGO_SUM=(
-   "github.com/aws/aws-sdk-go v1.38.22"
-   "github.com/aws/aws-sdk-go v1.38.22/go.mod"
-   "github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869"
-   "github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/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/inconshreveable/mousetrap v1.0.0"
-   "github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-   "github.com/jmespath/go-jmespath v0.4.0"
-   "github.com/jmespath/go-jmespath v0.4.0/go.mod"
-   "github.com/jmespath/go-jmespath/internal/testify v1.5.1"
-   "github.com/jmespath/go-jmespath/internal/testify v1.5.1/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/magiconair/properties v1.8.0"
-   "github.com/magiconair/properties v1.8.0/go.mod"
-   "github.com/pkg/errors v0.9.1"
-   "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/segmentio/backo-go v0.0.0-20160424052352-204274ad699c"
-   "github.com/segmentio/backo-go 
v0.0.0-20160424052352-204274ad699c/go.mod"
-   "github.com/spf13/cobra v0.0.3"
-   "github.com/spf13/cobra v0.0.3/go.mod"
-   "github.com/spf13/pflag v1.0.2"
-   "github.com/spf13/pflag v1.0.2/go.mod"
-   "github.com/stretchr/objx v0.1.0/go.mod"
-   "github.com/stretchr/testify v1.2.2"
-   "github.com/stretchr/testify v1.2.2/go.mod"
-   "github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c"
-   "github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c/go.mod"
-   "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-   

[gentoo-commits] repo/proj/guru:dev commit in: app-admin/chamber/

2022-07-04 Thread Alexey Zapparov
commit: 945a50ba85b1a905509526a057d1b7b6ff4f995a
Author: Alexey Zapparov  zapparov  com>
AuthorDate: Tue Jul  5 01:30:29 2022 +
Commit: Alexey Zapparov  zapparov  com>
CommitDate: Tue Jul  5 01:31:07 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=945a50ba

app-admin/chamber: add 2.10.12

Signed-off-by: Alexey Zapparov  zapparov.com>

 app-admin/chamber/Manifest   |  2 ++
 app-admin/chamber/chamber-2.10.12.ebuild | 30 ++
 2 files changed, 32 insertions(+)

diff --git a/app-admin/chamber/Manifest b/app-admin/chamber/Manifest
index 18a6ae135..292d8046f 100644
--- a/app-admin/chamber/Manifest
+++ b/app-admin/chamber/Manifest
@@ -1,3 +1,5 @@
+DIST chamber-2.10.12-deps.tar.gz 69739521 BLAKE2B 
3a67a4204debb168b2c643ee7deb0406240575dd7623162f763d3fa834cfdc3aa848815e77db82c919c0c0e494bb91fb98ae2a5a2ad16d85b21b765649462b37
 SHA512 
2ad2bc3d27218d9c2f127034567e5064b9e0e117aad0c0dd071af10639de597a64e4eadc4a4418bcda3498a6a8627c9da36217733fee594aba72bd72c372e3ae
+DIST chamber-2.10.12.tar.gz 44423 BLAKE2B 
bf5bfc5ebf81abc5abe0f20e147fe591c51c2da9a26a63fb288cf7ea414fba94052f6bd24fd801775ded78aff0b493be190e921a5b9ca27e3ae7f7198cd60e2d
 SHA512 
a022f1f2dab3d621827875867497a60814ca2ea39488413a07c58a2a2e8620f5fe91ab506dabc7d185f1a53b2b27fcdcc866c8b04ad5d08d8a83114be0f272c9
 DIST chamber-2.10.7.tar.gz 45895 BLAKE2B 
611c3da244ffde369788c1c75405fc806afffe9b80522d8647bf281ef465a435227806baa25e43912c2b7ded7de9981547e862d4b94516663a6bd0beada168ee
 SHA512 
2d40463991f13448bd5ce27cfaf61baeb26fb4cf8fb4ee767c29d8657c8fbe1063ac824b94a0b31c0598c70a400781570fd89d3ceb58ea5c22cebef5537669dd
 DIST chamber-2.10.9.tar.gz 45921 BLAKE2B 
2fa2b9c973ccc7b25848326472281b589970b4e07667328a103122db8c96991390afbb018c2b3e104b5d18f2482f5f3f30220b7b9555f7d266bb89844823c89c
 SHA512 
cf77fa1c9795f80e3c369b4f6fd6395b73ea0fb64496fa2b729da2490dffef6c5fbd2419342b3c40cf7d6503888384b513725a5856cc08776a6385b9b7875f3f
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.22.mod 178 BLAKE2B 
1aa7ac654a0577f654dd63b5950fe13b02c6b0cce274f43cef0c850b44e507fe37a78286cb3326a5eb1c6ce15e969381dee14ff2a474f7a183cc40e56d81efa3
 SHA512 
376db876c55dce630bbe0b3bc3898bbcca0169965e8d12a76a1018da34301e1654159957142b4e6f103c0d9e1713e9e158fcf598e5c87131a3904e4452f12a7b

diff --git a/app-admin/chamber/chamber-2.10.12.ebuild 
b/app-admin/chamber/chamber-2.10.12.ebuild
new file mode 100644
index 0..b83bf397f
--- /dev/null
+++ b/app-admin/chamber/chamber-2.10.12.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Managing secrets in AWS SSM Parameter Store"
+HOMEPAGE="https://github.com/segmentio/chamber;
+SRC_URI="
+   https://github.com/segmentio/chamber/archive/v${PV}.tar.gz -> 
${P}.tar.gz
+   
https://github.com/ixti/chamber/releases/download/v${PV}/${P}-deps.tar.gz
+"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_compile() {
+   go build -ldflags "-s -w -X \"main.Version=${PV}\"" -o "${PN}" || die 
"go build failed"
+}
+
+src_install() {
+   dobin "${PN}"
+   dodoc README.md CHANGELOG.md
+}



[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/

2022-07-04 Thread Sam James
commit: 188ca6ba0a28ffdcbb063d0bf126a2ed8769448b
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 01:13:04 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 01:13:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=188ca6ba

app-arch/rpm: add 4.17.1

Bug: https://bugs.gentoo.org/830380
Signed-off-by: Sam James  gentoo.org>

 app-arch/rpm/Manifest  |   1 +
 app-arch/rpm/rpm-4.17.1.ebuild | 161 +
 2 files changed, 162 insertions(+)

diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 949c468c6cc6..620e4e3efa8b 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1 +1,2 @@
 DIST rpm-4.17.0.tar.bz2 4514138 BLAKE2B 
e2618f7ac59189fb880d6be853aae99080b5008865298d095a123a010ab70f9e2e3ad9402124afbf8291a3863e9e805c9c65ab47cc435df82a729e81984394bf
 SHA512 
d32af8649c6d47796a645b6ecbe580df97f5423bfb17414d5ed0016373f5cfab86ebcfad6c480fb8bfafaf3a960f9bc095ef6faad7b40bdb208cc60e4080b0c8
+DIST rpm-4.17.1.tar.bz2 4642016 BLAKE2B 
d82926845e523c82fcf6a985d8de00f7a5bcc981e15d3115c310260713c482dc43e23b43f887644415b5a51ee382297d6d3569b6914595c91b9b89cc813af8e8
 SHA512 
d0429510140f25a25b6c9441abe2027d27c485bbd4969752f69e1c843435c9508b9f85e5bb68085dd64b7da533801aa5c04d8c9d962e08d2ddd3199d0265cc85

diff --git a/app-arch/rpm/rpm-4.17.1.ebuild b/app-arch/rpm/rpm-4.17.1.ebuild
new file mode 100644
index ..ac7a9dc24a1f
--- /dev/null
+++ b/app-arch/rpm/rpm-4.17.1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{3,4} )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools lua-single perl-module python-single-r1 toolchain-funcs
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="https://rpm.org
+   https://github.com/rpm-software-management/rpm;
+SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 
1-2).x/${P}.tar.bz2
+   http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# Tests are broken. See bug 657500
+RESTRICT="test"
+
+IUSE="acl audit caps +berkdb doc dbus nls openmp python selinux +sqlite test 
+zstd"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+   python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="!app-arch/rpm5
+   app-arch/libarchive:=
+   >=app-arch/bzip2-1.0.1
+   app-arch/xz-utils
+   >=app-crypt/gnupg-1.2
+   >=dev-lang/perl-5.8.8
+   dev-libs/elfutils
+   dev-libs/libgcrypt:=
+   >=dev-libs/popt-1.7
+   sys-apps/file
+   >=sys-libs/zlib-1.2.3-r1
+   virtual/libintl
+   ${LUA_DEPS}
+   acl? ( virtual/acl )
+   audit? ( sys-process/audit )
+   caps? ( >=sys-libs/libcap-2.0 )
+   dbus? ( sys-apps/dbus )
+   sqlite? ( dev-db/sqlite:3 )
+   python? ( ${PYTHON_DEPS} )
+   nls? ( virtual/libintl )
+   zstd? ( app-arch/zstd:= )
+"
+BDEPEND="
+   virtual/pkgconfig
+   doc? ( app-doc/doxygen )
+   nls? ( sys-devel/gettext )
+   test? ( sys-apps/fakechroot )
+"
+RDEPEND="${DEPEND}
+   selinux? ( sec-policy/selinux-rpm )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.8.1-db-path.patch
+   "${FILESDIR}"/${PN}-4.17.0-libdir.patch
+)
+
+pkg_pretend() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+   lua-single_pkg_setup
+
+   use python && python-single-r1_pkg_setup
+
+   # Added USE=openmp and this check for bug #779769
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+   default
+
+   # bug #356769
+   sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath 
failed"
+   # bug #492642
+   sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python 
failed"
+
+   # Prevent automake maintainer mode from kicking in (bug #450448).
+   #touch -r Makefile.am preinstall.am || die
+
+   eautoreconf
+}
+
+src_configure() {
+   # rpm no longer supports berkdb, but has readonly support.
+   # 
https://github.com/rpm-software-management/rpm/commit/4290300e24c5ab17c615b6108f38438e31eeb1d0
+   econf \
+   --without-selinux \
+   --disable-inhibit-plugin \
+   --with-crypto=libgcrypt \
+   $(use_enable berkdb bdb-ro) \
+   $(use_enable python) \
+   $(use_enable nls) \
+   $(use_enable openmp) \
+   $(use_enable dbus inhibit-plugin) \
+   $(use_enable sqlite) \
+   $(use_with caps cap) \
+   $(use_with acl) \
+   $(use_with audit) \
+   $(use_enable zstd zstd $(usex zstd yes no))
+}
+
+src_test() {
+   # Known to fail with FEATURES=usersandbox (bug #657500)
+   if has usersandbox 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/files/, app-emulation/qemu/

2022-07-04 Thread WANG Xuerui
commit: e7e343979dbfd7e4b4fcf85f36c17d414fc1e41e
Author: WANG Xuerui  gentoo  org>
AuthorDate: Tue Jul  5 00:39:29 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Tue Jul  5 00:53:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7e34397

app-emulation/qemu: forward port 6.1.0-strings.patch to latest main branch

Due to upstream commit 
https://gitlab.com/qemu-project/qemu/-/commit/158bb2249ed9
("configure: Add cross prefix for widl tool").

Tentatively named 7.1.0, as 7.1.0 will be the first upstream version
this forwarded patch is applicable to.

Signed-off-by: WANG Xuerui  gentoo.org>

 app-emulation/qemu/files/qemu-7.1.0-strings.patch | 26 +++
 app-emulation/qemu/qemu-.ebuild   |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/app-emulation/qemu/files/qemu-7.1.0-strings.patch 
b/app-emulation/qemu/files/qemu-7.1.0-strings.patch
new file mode 100644
index ..01f235b9a33c
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-7.1.0-strings.patch
@@ -0,0 +1,26 @@
+Forward-ported from original patch for 5.2.0.
+
+diff --git a/configure b/configure
+index da2501489f..4660ee3ee5 100755
+--- a/configure
 b/configure
+@@ -400,6 +400,7 @@ ld="${LD-${cross_prefix}ld}"
+ nm="${NM-${cross_prefix}nm}"
+ smbd="$SMBD"
+ strip="${STRIP-${cross_prefix}strip}"
++strings="${STRINGS-${cross_prefix}strings}"
+ widl="${WIDL-${cross_prefix}widl}"
+ windres="${WINDRES-${cross_prefix}windres}"
+ pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}"
+@@ -1466,9 +1467,9 @@ int main(int argc, char *argv[])
+ EOF
+ 
+ if compile_prog ; then
+-if strings -a $TMPE | grep -q BiGeNdIaN ; then
++if $strings -a $TMPE | grep -q BiGeNdIaN ; then
+ bigendian="yes"
+-elif strings -a $TMPE | grep -q LiTtLeEnDiAn ; then
++elif $strings -a $TMPE | grep -q LiTtLeEnDiAn ; then
+ bigendian="no"
+ else
+ echo big/little test failed

diff --git a/app-emulation/qemu/qemu-.ebuild 
b/app-emulation/qemu/qemu-.ebuild
index 33c2357b1386..4b02fd9f5f85 100644
--- a/app-emulation/qemu/qemu-.ebuild
+++ b/app-emulation/qemu/qemu-.ebuild
@@ -278,8 +278,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
"${FILESDIR}"/${PN}-6.0.0-make.patch
-   "${FILESDIR}"/${PN}-6.1.0-strings.patch
"${FILESDIR}"/${PN}-7.0.0-also-build-virtfs-proxy-helper.patch
+   "${FILESDIR}"/${PN}-7.1.0-strings.patch
 )
 
 QA_PREBUILT="



[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/, app-emulation/qemu/files/

2022-07-04 Thread WANG Xuerui
commit: 62ef6e8524251a91d96e54f11c87a485b25c5f70
Author: WANG Xuerui  gentoo  org>
AuthorDate: Tue Jul  5 00:52:11 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Tue Jul  5 00:53:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62ef6e85

app-emulation/qemu: forward 7.0.0-also-build-virtfs-proxy-helper.patch to avoid 
fuzz

Due to upstream commit 
https://gitlab.com/qemu-project/qemu/-/commit/622d64fffe4f
("meson, configure: move bdrv whitelists to meson").

Signed-off-by: WANG Xuerui  gentoo.org>

 ...qemu-7.1.0-also-build-virtfs-proxy-helper.patch | 32 ++
 app-emulation/qemu/qemu-.ebuild|  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git 
a/app-emulation/qemu/files/qemu-7.1.0-also-build-virtfs-proxy-helper.patch 
b/app-emulation/qemu/files/qemu-7.1.0-also-build-virtfs-proxy-helper.patch
new file mode 100644
index ..b6f3078a6906
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-7.1.0-also-build-virtfs-proxy-helper.patch
@@ -0,0 +1,32 @@
+From d02ea89239768c93651a161d057f2bf04d56a024 Mon Sep 17 00:00:00 2001
+From: Matthias Maier 
+Date: Mon, 4 Apr 2022 12:56:59 +0200
+Subject: [PATCH] also build virtfs-proxy-helper
+
+The Gentoo ebuild splits the qemu build into a softmmu, user and tool
+phase in order to be able to build and link some of the qemu emulators
+statically. This unfortunately has the consequence that we never
+configure with "have_virtfs" and "have_tools" at the same time.
+
+As a workaround, simply build the virtfs userland unconditionally. After
+all, it is a tiny executable
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 65a885ea69..29ce7a5a8e 100644
+--- a/meson.build
 b/meson.build
+@@ -1684,7 +1684,7 @@ have_virtfs = get_option('virtfs') \
+ .disable_auto_if(not have_tools and not have_system) \
+ .allowed()
+ 
+-have_virtfs_proxy_helper = targetos != 'darwin' and have_virtfs and have_tools
++have_virtfs_proxy_helper = have_tools and libattr.found() and 
libcap_ng.found()
+ 
+ if get_option('block_drv_ro_whitelist') == ''
+   config_host_data.set('CONFIG_BDRV_RO_WHITELIST', '')
+-- 
+2.35.1
+

diff --git a/app-emulation/qemu/qemu-.ebuild 
b/app-emulation/qemu/qemu-.ebuild
index 8c83655b794e..336c80bd859c 100644
--- a/app-emulation/qemu/qemu-.ebuild
+++ b/app-emulation/qemu/qemu-.ebuild
@@ -278,7 +278,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
"${FILESDIR}"/${PN}-6.0.0-make.patch
-   "${FILESDIR}"/${PN}-7.0.0-also-build-virtfs-proxy-helper.patch
+   "${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch
"${FILESDIR}"/${PN}-7.1.0-strings.patch
 )
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2022-07-04 Thread WANG Xuerui
commit: b3a414075bd1c08a66766e007d68912e12ca866b
Author: WANG Xuerui  gentoo  org>
AuthorDate: Tue Jul  5 00:44:45 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Tue Jul  5 00:53:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3a41407

app-emulation/qemu: update configure option corresponding to USE=png

Due to upstream commit 
https://gitlab.com/qemu-project/qemu/-/commit/95f8510ef428
("Replacing CONFIG_VNC_PNG with CONFIG_PNG").

Signed-off-by: WANG Xuerui  gentoo.org>

 app-emulation/qemu/qemu-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-.ebuild 
b/app-emulation/qemu/qemu-.ebuild
index 4b02fd9f5f85..8c83655b794e 100644
--- a/app-emulation/qemu/qemu-.ebuild
+++ b/app-emulation/qemu/qemu-.ebuild
@@ -547,7 +547,7 @@ qemu_src_configure() {
$(conf_notuser numa)
$(conf_notuser opengl)
$(conf_notuser pam auth-pam)
-   $(conf_notuser png vnc-png)
+   $(conf_notuser png)
$(conf_notuser rbd)
$(conf_notuser sasl vnc-sasl)
$(conf_notuser sdl)



[gentoo-commits] repo/gentoo:master commit in: profiles/desc/, app-emulation/qemu/

2022-07-04 Thread Sam James
commit: e91f2e435553a7d3d2717ea0b66034d99bc9b7a5
Author: WANG Xuerui  gentoo  org>
AuthorDate: Tue Jul  5 00:30:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 00:38:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e91f2e43

app-emulation/qemu: sync targets USE flags, add loongarch64

This is fully upstream as of 
https://gitlab.com/qemu-project/qemu/-/commit/1437479e5ee1a49ccd84cad9e7b010fb2ee9d805.

Signed-off-by: WANG Xuerui  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/26226
Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/qemu-.ebuild | 1 +
 profiles/desc/qemu_softmmu_targets.desc | 1 +
 profiles/desc/qemu_user_targets.desc| 1 +
 3 files changed, 3 insertions(+)

diff --git a/app-emulation/qemu/qemu-.ebuild 
b/app-emulation/qemu/qemu-.ebuild
index b9d896ec56bc..33c2357b1386 100644
--- a/app-emulation/qemu/qemu-.ebuild
+++ b/app-emulation/qemu/qemu-.ebuild
@@ -52,6 +52,7 @@ COMMON_TARGETS="
cris
hppa
i386
+   loongarch64
m68k
microblaze
microblazeel

diff --git a/profiles/desc/qemu_softmmu_targets.desc 
b/profiles/desc/qemu_softmmu_targets.desc
index 662ca903f314..fbb7b6d8511f 100644
--- a/profiles/desc/qemu_softmmu_targets.desc
+++ b/profiles/desc/qemu_softmmu_targets.desc
@@ -12,6 +12,7 @@ avr - system emulation target
 cris - system emulation target
 hppa - system emulation target
 i386 - system emulation target
+loongarch64 - system emulation target
 m68k - system emulation target
 microblazeel - system emulation target
 microblaze - system emulation target

diff --git a/profiles/desc/qemu_user_targets.desc 
b/profiles/desc/qemu_user_targets.desc
index aa37a655f686..548f2e154541 100644
--- a/profiles/desc/qemu_user_targets.desc
+++ b/profiles/desc/qemu_user_targets.desc
@@ -14,6 +14,7 @@ cris - userspace emulation target
 hexagon - Qualcomm hexagon userspace emulation target
 hppa - userspace emulation target
 i386 - userspace emulation target
+loongarch64 - userspace emulation target
 m68k - userspace emulation target
 microblazeel - userspace emulation target
 microblaze - userspace emulation target



[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/, app-editors/neovim/

2022-07-04 Thread Sam James
commit: 3601fb65d0a06dbd5f19820609461085532ef9a3
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 00:37:10 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 00:37:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3601fb65

app-editors/neovim: backport Darwin patch to 0.7.2

Closes: https://github.com/gentoo/gentoo/pull/25889
Signed-off-by: Sam James  gentoo.org>

 .../neovim/files/neovim-0.7.2-cmake-darwin.patch   | 55 ++
 app-editors/neovim/neovim-0.7.2.ebuild |  1 +
 app-editors/neovim/neovim-.ebuild  |  2 +-
 3 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/app-editors/neovim/files/neovim-0.7.2-cmake-darwin.patch 
b/app-editors/neovim/files/neovim-0.7.2-cmake-darwin.patch
new file mode 100644
index ..a8404bd4a97a
--- /dev/null
+++ b/app-editors/neovim/files/neovim-0.7.2-cmake-darwin.patch
@@ -0,0 +1,55 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -80,23 +80,6 @@ set(ENV{PKG_CONFIG_PATH} 
"$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/lib/pkgconfig")
+ # used for check_c_compiler_flag
+ include(CheckCCompilerFlag)
+ 
+-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+-  # CMake tries to treat /sw and /opt/local as extension of the system path, 
but
+-  # that doesn't really work out very well.  Once you have a dependency that
+-  # resides there and have to add it as an include directory, then any other
+-  # dependency that could be satisfied from there must be--otherwise you can 
end
+-  # up with conflicting versions.  So, let's make them more of a priority 
having
+-  # them be included as one of the first places to look for dependencies.
+-  list(APPEND CMAKE_PREFIX_PATH /sw /opt/local)
+-
+-  # Work around some old, broken detection by CMake for knowing when to use 
the
+-  # isystem flag.  Apple's compilers have supported this for quite some time
+-  # now.
+-  if(CMAKE_COMPILER_IS_GNUCC)
+-set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
+-  endif()
+-endif()
+-
+ if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+   # Ignore case when comparing filenames on Windows and Mac.
+   set(CASE_INSENSITIVE_FILENAME TRUE)
+--- a/src/nvim/CMakeLists.txt
 b/src/nvim/CMakeLists.txt
+@@ -205,10 +205,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES)
+ foreach(gen_include ${gen_includes} ${LUA_PREFERRED_INCLUDE_DIRS})
+   list(APPEND gen_cflags "-I${gen_include}")
+ endforeach()
+-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT)
+-  list(APPEND gen_cflags "-isysroot")
+-  list(APPEND gen_cflags "${CMAKE_OSX_SYSROOT}")
+-endif()
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" build_type)
+ separate_arguments(C_FLAGS_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS})
+ separate_arguments(C_FLAGS_${build_type}_ARRAY UNIX_COMMAND 
${CMAKE_C_FLAGS_${build_type}})
+--- a/third-party/CMakeLists.txt
 b/third-party/CMakeLists.txt
+@@ -117,13 +117,6 @@ if(CMAKE_CXX_COMPILER)
+   set(DEPS_CXX_COMPILER "${CMAKE_CXX_COMPILER}")
+ endif()
+ 
+-if(CMAKE_OSX_SYSROOT)
+-  set(DEPS_C_COMPILER "${DEPS_C_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}")
+-  if(DEPS_CXX_COMPILER)
+-set(DEPS_CXX_COMPILER "${DEPS_CXX_COMPILER} 
-isysroot${CMAKE_OSX_SYSROOT}")
+-  endif()
+-endif()
+-
+ if(CMAKE_OSX_ARCHITECTURES)
+   string(REPLACE ";" "|" CMAKE_OSX_ARCHITECTURES_ALT_SEP 
"${CMAKE_OSX_ARCHITECTURES}")
+   # The LuaJIT build does not like being passed multiple `-arch` flags

diff --git a/app-editors/neovim/neovim-0.7.2.ebuild 
b/app-editors/neovim/neovim-0.7.2.ebuild
index a340a82ba6a5..0c951d155648 100644
--- a/app-editors/neovim/neovim-0.7.2.ebuild
+++ b/app-editors/neovim/neovim-0.7.2.ebuild
@@ -69,6 +69,7 @@ BDEPEND="
 PATCHES=(
"${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
"${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
+   "${FILESDIR}/${PN}-0.7.2-cmake-darwin.patch"
 )
 
 src_prepare() {

diff --git a/app-editors/neovim/neovim-.ebuild 
b/app-editors/neovim/neovim-.ebuild
index 5f18e490acbb..dc40449cb307 100644
--- a/app-editors/neovim/neovim-.ebuild
+++ b/app-editors/neovim/neovim-.ebuild
@@ -78,7 +78,7 @@ if [[ ${PV} ==  ]]; then
 else
PATCHES+=(
"${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
-   "${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch"
+   "${FILESDIR}/${PN}-0.7.2-cmake-darwin.patch"
)
 fi
 



[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/, app-editors/neovim/files/

2022-07-04 Thread Sam James
commit: bd47d534eab9e010022944bf9f9e98aa198a6860
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 00:32:52 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 00:32:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd47d534

app-editors/neovim: rebase Darwin patch

Closes: https://github.com/gentoo/gentoo/pull/25889
Signed-off-by: Sam James  gentoo.org>

 .../neovim/files/neovim--cmake-darwin.patch| 55 ++
 app-editors/neovim/neovim-.ebuild  | 12 +++--
 2 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/app-editors/neovim/files/neovim--cmake-darwin.patch 
b/app-editors/neovim/files/neovim--cmake-darwin.patch
new file mode 100644
index ..5b829904a13e
--- /dev/null
+++ b/app-editors/neovim/files/neovim--cmake-darwin.patch
@@ -0,0 +1,55 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -80,23 +80,6 @@ set(ENV{PKG_CONFIG_PATH} 
"$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/lib/pkgconfig")
+ # used for check_c_compiler_flag
+ include(CheckCCompilerFlag)
+ 
+-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+-  # CMake tries to treat /sw and /opt/local as extension of the system path, 
but
+-  # that doesn't really work out very well.  Once you have a dependency that
+-  # resides there and have to add it as an include directory, then any other
+-  # dependency that could be satisfied from there must be--otherwise you can 
end
+-  # up with conflicting versions.  So, let's make them more of a priority 
having
+-  # them be included as one of the first places to look for dependencies.
+-  list(APPEND CMAKE_PREFIX_PATH /sw /opt/local)
+-
+-  # Work around some old, broken detection by CMake for knowing when to use 
the
+-  # isystem flag.  Apple's compilers have supported this for quite some time
+-  # now.
+-  if(CMAKE_COMPILER_IS_GNUCC)
+-set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
+-  endif()
+-endif()
+-
+ if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+   # Ignore case when comparing filenames on Windows and Mac.
+   set(CASE_INSENSITIVE_FILENAME TRUE)
+--- a/cmake.deps/CMakeLists.txt
 b/cmake.deps/CMakeLists.txt
+@@ -112,13 +112,6 @@ if(CMAKE_CXX_COMPILER)
+   set(DEPS_CXX_COMPILER "${CMAKE_CXX_COMPILER}")
+ endif()
+ 
+-if(CMAKE_OSX_SYSROOT)
+-  set(DEPS_C_COMPILER "${DEPS_C_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}")
+-  if(DEPS_CXX_COMPILER)
+-set(DEPS_CXX_COMPILER "${DEPS_CXX_COMPILER} 
-isysroot${CMAKE_OSX_SYSROOT}")
+-  endif()
+-endif()
+-
+ if(CMAKE_OSX_ARCHITECTURES)
+   string(REPLACE ";" "|" CMAKE_OSX_ARCHITECTURES_ALT_SEP 
"${CMAKE_OSX_ARCHITECTURES}")
+   # The LuaJIT build does not like being passed multiple `-arch` flags
+--- a/src/nvim/CMakeLists.txt
 b/src/nvim/CMakeLists.txt
+@@ -205,10 +205,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES)
+ foreach(gen_include ${gen_includes} ${LUA_PREFERRED_INCLUDE_DIRS})
+   list(APPEND gen_cflags "-I${gen_include}")
+ endforeach()
+-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT)
+-  list(APPEND gen_cflags "-isysroot")
+-  list(APPEND gen_cflags "${CMAKE_OSX_SYSROOT}")
+-endif()
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" build_type)
+ separate_arguments(C_FLAGS_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS})
+ separate_arguments(C_FLAGS_${build_type}_ARRAY UNIX_COMMAND 
${CMAKE_C_FLAGS_${build_type}})

diff --git a/app-editors/neovim/neovim-.ebuild 
b/app-editors/neovim/neovim-.ebuild
index 4316da6d93cc..5f18e490acbb 100644
--- a/app-editors/neovim/neovim-.ebuild
+++ b/app-editors/neovim/neovim-.ebuild
@@ -68,12 +68,18 @@ BDEPEND="
 
 PATCHES=(
"${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
-   "${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch"
 )
+
 if [[ ${PV} ==  ]]; then
-   PATCHES+=("${FILESDIR}/${PN}--cmake_lua_version.patch")
+   PATCHES+=(
+   "${FILESDIR}/${PN}--cmake_lua_version.patch"
+   "${FILESDIR}/${PN}--cmake-darwin.patch"
+   )
 else
-   PATCHES+=("${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch")
+   PATCHES+=(
+   "${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
+   "${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch"
+   )
 fi
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: sys-apps/grep/

2022-07-04 Thread Sam James
commit: b48c340cdf0df551ac25fcf937f2995f8162ae47
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 00:23:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 00:23:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b48c340c

sys-apps/grep: add 3.7_p20220702

Signed-off-by: Sam James  gentoo.org>

 sys-apps/grep/Manifest  |  2 +
 sys-apps/grep/grep-3.7_p20220702.ebuild | 72 +
 2 files changed, 74 insertions(+)

diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 78f9926f70a4..68382ec881fc 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,4 +1,6 @@
 DIST grep-3.7.62-9a668.tar.xz 1687820 BLAKE2B 
95f5deccb3b3b223cb429f5c515674bed5209e6ca1d295b5ddfcf09614c6c10f6c6f56df9931a3dc0926b48abced15ab1099d8e84840c74846cb89270e248473
 SHA512 
b24a11138e683d75e75b4f04a42f4d202526a691aa70c303af4d257e2a395a4266b4bc05afff4fff7ab0efc5564af3efe0f9108cbeddf406d4dc3f171a642f25
 DIST grep-3.7.62-9a668.tar.xz.sig 833 BLAKE2B 
9be6a33b1d2e29eeaea6bfbcbeade37eb4d7c8b2fdf37ec82376b1cc158f02c6916c87c21378cd099f863787ae46e2bc7dd40df77b263fe971f50b7bbe67cced
 SHA512 
5245b7af4202bd49ef8937eda3ad91949e6bd9e16e217c0a326e8d6abc17d8f47e068197cb5df16829298912eed0d811164da4d1d7bd3ce3ff679a87a281f33b
+DIST grep-3.7.98-c9ac.tar.xz 1701736 BLAKE2B 
ac7fa0a45179b25b241e2f57b6731f3ccd4a1950aeab749d47ef286f1723ec6324e894b452c24877224bf61f54584447a2cb4278d6911eca7debf92a7d0b8698
 SHA512 
9325db663350b47493434f01639f17a383ccf5b18d45c8de2d38d529b60982d426b1a09f0d653ff4e716933fb9a429e18c69a832d667f12c37ccab9d90a07f4b
+DIST grep-3.7.98-c9ac.tar.xz.sig 833 BLAKE2B 
d215edbe769bdbb1afbfe3cc560509ba7e1c9ddcbc149cdd173ffd41f4d195c66b2119847b7383dbd7f9ff613e9a21a34c28a14ad4c2422846ad4e5cfb0eb369
 SHA512 
7a781df1c1b072f752b70bbfd843f71d8ef76cc68d908d1f2e9dd6058b706a3ee2d8013ff73300c3d9d3019a5a98e901a088f2630de666a997eb52825955cadb
 DIST grep-3.7.tar.xz 1641196 BLAKE2B 
acf03b1fe8065dac48d686de070bab9ecddae65c97f3b0e2be484e8abdd06d1fbdbb396f3d73dadadf9618aad2f02cf6416094bad64d5f2f15eab6b6b3adfeda
 SHA512 
e9e45dcd40af8367f819f2b93c5e1b4e98a251a9aa251841fa67a875380fae52cfa27c68c6dbdd6a4dde1b1017ee0f6b9833ef6dd6e419d32d71b6df5e972b82
 DIST grep-3.7.tar.xz.sig 833 BLAKE2B 
02a2850e22e8054dcfd02b6f08747a97d43dae9adb908516bdaed35750aa7f773832ad1b0b4c53d7b0ebc8f1fe2979e7938bbbeeb09ea00c11b4a0d5846c7b9c
 SHA512 
9db28883b696fbbb0fad32f4ecd168954dc475d5f0a8f2b4f960ff615ef7dd8348a7caaee85a96287824472a29485ff921af121c582083ca5ad5c30960f99cf4

diff --git a/sys-apps/grep/grep-3.7_p20220702.ebuild 
b/sys-apps/grep/grep-3.7_p20220702.ebuild
new file mode 100644
index ..7f5d56e74b26
--- /dev/null
+++ b/sys-apps/grep/grep-3.7_p20220702.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/grep.asc
+inherit flag-o-matic verify-sig
+
+DESCRIPTION="GNU regular expression matcher"
+HOMEPAGE="https://www.gnu.org/software/grep/;
+
+if [[ ${PV} == *_p* ]] ; then
+   # Subscribe to the 'platform-testers' ML to find these.
+   # Useful to test on our especially more niche arches and report issues 
upstream.
+   MY_COMMIT="98-c9ac"
+   MY_P=${PN}-$(ver_cut 1-2).${MY_COMMIT}
+   SRC_URI="https://meyering.net/${PN}/${MY_P}.tar.xz;
+   SRC_URI+=" verify-sig? ( https://meyering.net/${PN}/${MY_P}.tar.xz.sig 
)"
+   S="${WORKDIR}"/${MY_P}
+else
+   SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+   SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="nls pcre static"
+
+# We lack dev-libs/libsigsegv[static-libs] for now
+REQUIRED_USE="static? ( !sparc )"
+
+LIB_DEPEND="pcre? ( >=dev-libs/libpcre2-7.8-r1[static-libs(+)] )
+   sparc? ( dev-libs/libsigsegv )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+   nls? ( virtual/libintl )
+   virtual/libiconv"
+DEPEND="${RDEPEND}
+   static? ( ${LIB_DEPEND} )"
+BDEPEND="virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+   verify-sig? ( sec-keys/openpgp-keys-grep )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+   default
+
+   # bug #523898
+   sed -i \
+   -e "s:@SHELL@:${EPREFIX}/bin/sh:g" \
+   -e "s:@grep@:${EPREFIX}/bin/grep:" \
+   src/egrep.sh || die
+}
+
+src_configure() {
+   use static && append-ldflags -static
+
+   # We used to turn this off unconditionally (bug #673524) but we now
+   # allow it for cases where libsigsegv is better for userspace handling
+   # of stack overflows.
+   # In 

[gentoo-commits] repo/gentoo:master commit in: dev-python/django/

2022-07-04 Thread Sam James
commit: 61cb54063b29c4fe914d77169a8cba42a90fb0ac
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 00:23:36 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 00:23:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61cb5406

dev-python/django: add 3.2.14

Bug: https://bugs.gentoo.org/856448
Signed-off-by: Sam James  gentoo.org>

 dev-python/django/Manifest |   2 +
 dev-python/django/django-3.2.14.ebuild | 109 +
 2 files changed, 111 insertions(+)

diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index dc9a75ee3939..cdbf41a44aae 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -2,6 +2,8 @@ DIST Django-2.2.28.checksum.txt 2554 BLAKE2B 
23421008f45040be56c417fb4d31ab8cb72
 DIST Django-2.2.28.tar.gz 9187543 BLAKE2B 
da6ae04b84a858a678b9740694cf1b638128b783da1aa8443c0e85ea3d7f71104e433de043ff7264575e2df36b6fea7275874ff04391b41eb70ba6c7c78306dc
 SHA512 
228aec6ee8619ff3d0397ff867bd59352900fb95557bd02cfea594b3bc3f813b5bcd13f488b451b0ee79a4d52deab19c5e97aa40f1075ba06db72542d119228e
 DIST Django-3.2.13.checksum.txt 2554 BLAKE2B 
301d816685f6d97c4a18b4f9d015b063521a7e90a870f1c95ec37ebbc1d4e7311abfee7f7c4aafaa40932334d0eab68fc768dcf21acfffe1d098cabd71ea161a
 SHA512 
ef4a5d0fb8e885cbc2854a4b9b2380dec1cec0e8f6d9bc54179354eb6170755bd6f02268ad5bdc81fdea9d30022422462b0b14894ccc0f37d2e7288aeda83abb
 DIST Django-3.2.13.tar.gz 9813985 BLAKE2B 
eb8319cc225491fc71f719d2eef6daa05114a97b1302093a0cf0f77bb2a51f398e7a034df7aa52c6a64e9796b9cc66b127fccee810cb38508506ba4cd121cfbf
 SHA512 
08f056b18bc04b95d6705cf70c2ecc5be0c1324e0b38582991b907ed5977c4e3d35417ccf4ec06c2436a718e3aae007b015f0d40dd94ce5cfb129a54cceb6578
+DIST Django-3.2.14.checksum.txt 2552 BLAKE2B 
8949b6bbc05160539ba26e4a9a2b774e450890b1668ee9794b087e97c772a78e010f0f33d7f15b9b43fb749bc7804a6c9ea7f24125b6f93c8af6d408d29e530d
 SHA512 
84de32c72c72f2dd8d7c5e159fb77d82b04fe3cb66f30e808249eb1778305f29c75569c3ebf7e89ffdeca12a68a6f8334830db202f230901ddff1f47a3b03b8f
+DIST Django-3.2.14.tar.gz 9814965 BLAKE2B 
d2081621598ca9743b056b752775d8fe87748e7e0ad4e252f9bb0d50bbdd942cf5908aafc7757668a5dd041aafecd94f63b38441e4dbb8e1810babde1aaec436
 SHA512 
daa18a0a64870789af4627b1cd345fef66d4b227d71cbd9b4766332728c37e3fb17472924c290851f8bc2111efe90c5e22eebf9b6f7a26e77bdc8edaa8e42e16
 DIST Django-4.0.4.checksum.txt 2545 BLAKE2B 
d82f7b01f49f2b37de3cfd9eb8738e4af69c8eda0c3ed2b6d80a5f876989f36a9335640c5cd5916dcc682fcbf5453c299cb8b3f52e05f2d29413a4c75d274cbc
 SHA512 
9889e086f35192432084fd2ae1104c316e63fa2ab0d34f6954d5eb98b810b5f2e10861a4136c480b54178d2a5453a36f3b893c7720a92f35b44cd578902a8bf9
 DIST Django-4.0.4.tar.gz 10388499 BLAKE2B 
f839b343bf5c2f83810f2bb22e93a91b18ccc30754589fef2931ebdf29d4600a3bf5493f9e977a3b647097c3a379ea1ef4e0e25366efb54082bc0f43ed00485f
 SHA512 
75ecf5991763237297b458f546d245a25f62272f7013364783aea19469586fa54ce94a16323ac9a6d6b81097f8e962ea7a20f26c7afd8acda842812409215bb1
 DIST Django-4.0.5.checksum.txt 2549 BLAKE2B 
e0aae25d6e9b15eddc9f6be566d611d03b3cd2aa97020b99372eebbc5183e2f04f27bfc9c1faa9f4b5ec0e4da453a5812a8c8afd7dbb61c10424c458c81bf453
 SHA512 
45c628253a530df210c94b7c2e8493faaa5eecd68c1f84c4d61936f0f85d590ddc96d64be0313a6353435bed884fde6f6cf0bd54dc04d361dac093f259c5927b

diff --git a/dev-python/django/django-3.2.14.ebuild 
b/dev-python/django/django-3.2.14.ebuild
new file mode 100644
index ..306963a8
--- /dev/null
+++ b/dev-python/django/django-3.2.14.ebuild
@@ -0,0 +1,109 @@
+# 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} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="
+   https://www.djangoproject.com/
+   https://pypi.org/project/Django/
+"
+SRC_URI="
+   https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+   verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   >=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
+   dev-python/pytz[${PYTHON_USEDEP}]
+   >=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   test? (
+   $(python_gen_impl_dep sqlite)
+   ${RDEPEND}
+   dev-python/docutils[${PYTHON_USEDEP}]
+   dev-python/jinja[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/pillow[webp,${PYTHON_USEDEP}]
+   dev-python/pyyaml[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: app-admin/bastille/

2022-07-04 Thread Sam James
commit: 8ac4a6ded4ffb18c7d2825d1aea99806f0066b5c
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 00:15:37 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 00:15:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ac4a6de

app-admin/bastille: update EAPI 6 -> EAPI 8

Bug: https://bugs.gentoo.org/455542
Signed-off-by: Sam James  gentoo.org>

 .../{bastille-3.0.9-r2.ebuild => bastille-3.0.9-r3.ebuild}  | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app-admin/bastille/bastille-3.0.9-r2.ebuild 
b/app-admin/bastille/bastille-3.0.9-r3.ebuild
similarity index 89%
rename from app-admin/bastille/bastille-3.0.9-r2.ebuild
rename to app-admin/bastille/bastille-3.0.9-r3.ebuild
index ae6415282920..365b97b97bad 100644
--- a/app-admin/bastille/bastille-3.0.9-r2.ebuild
+++ b/app-admin/bastille/bastille-3.0.9-r3.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit perl-functions
 
 PATCHVER=0.2
 MY_PN=${PN/b/B}
 MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_PN}
 DESCRIPTION="Bastille-Linux is a security hardening tool"
 HOMEPAGE="http://bastille-linux.sourceforge.net/;
 SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2"
+S="${WORKDIR}"/${MY_PN}
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -21,7 +21,7 @@ IUSE="X"
 
 RDEPEND="
app-admin/logrotate
-   dev-lang/perl:=
+   dev-lang/perl
dev-perl/Curses
net-firewall/iptables
net-firewall/psad
@@ -62,6 +62,11 @@ src_install() {
 
newinitd ${PN}-firewall.gentoo-init ${PN}-firewall
 
+   # See bug #455542
+   keepdir /var/lock/subsys
+   keepdir /var/lock/bastille
+   keepdir /var/lock/subsys/bastille
+
# Documentation
cd "${S}" || die
dodoc *.txt BUGS Change* README*



[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2022-07-04 Thread Sam James
commit: 57a51585a7f26f9a123662344c6ca57a107b2a10
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 00:00:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 00:00:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57a51585

media-libs/openjpeg: Stabilize 2.5.0-r2 arm, #856304

Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
index 9dcc96b4ff23..c671b28ec40f 100644
--- a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2022-07-04 Thread Sam James
commit: 95d40c5fba17cf3aca380449620c386ba20e6f7f
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul  4 23:53:32 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 23:53:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95d40c5f

media-video/pipewire: drop 0.3.49-r2

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |   1 -
 .../pipewire/files/pipewire-0.3.49-x86-cast.patch  |  20 --
 media-video/pipewire/pipewire-0.3.49-r2.ebuild | 360 -
 3 files changed, 381 deletions(-)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 4d01a2bceef0..de58b4a0f18d 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,4 +1,3 @@
-DIST pipewire-0.3.49.tar.gz 1769037 BLAKE2B 
2567bc98933bfbb295358886e8f97db2af2f0a6ee3c2586c1718e39f7eedaed8528a4663753ba56d3295e42576da015ce9278f22aff9bbd9ca43d883bff5a2f6
 SHA512 
36398872f7d7b31193d7a8885bbdfb415a122bd779874107a0642202dfd8408f39fddf769bfbae4533c2cc99fe9ef67903d50cc721e936aa4802229f1c46d809
 DIST pipewire-0.3.51.tar.gz 1789070 BLAKE2B 
8538eb9f2178efa26365f30b324b707826e580caa1fd9c09b62c561c140c14186e0d2b04808fa78eb5642ddccf1a347def19934ecd654be06b215a693075b6fc
 SHA512 
a762fd260b4b14ad9ef142be11ab1c22268da6726e2179559ffb254f0ce7daf7a502779e33c64313a9c6a9fc1bd15150b76be04ec81aa27c35dbb4333cecdb4a
 DIST pipewire-0.3.52.tar.gz 1810238 BLAKE2B 
bb75eff5fe7700d0a303fbfed7910aebd82346a5a21c4a0d17c06e6991bc90bb6d4f6b9559c25788494cb11faff957523dcd7f0c4c8a40be11b81c63a5a9e5ef
 SHA512 
30e9cf74c92babafe386f02a03bb5c41a8ee5591a02f15845cca1ee44f091ce68eb14d48943d43b680cb525026a19e0290997670f9a82156eaa72e974fe6d01a
 DIST pipewire-0.3.53.tar.gz 1783505 BLAKE2B 
269466c6ba78cb85516dc714f3aa5d71cdf72a859b6e1a11c60062da6dcd56eefc78958fe026b9fd11d61fd6fbe6f2aac54a2a9fd77d4ee474687f5d54628c38
 SHA512 
50f23a7b71f3eb20657ff75de54a9f3056270bf05a5472ec9c7dea1c9d0ed391b6b09496d58b065c3cbc40f9be8088b6737cbf0731973498bcd5a8176c42d443

diff --git a/media-video/pipewire/files/pipewire-0.3.49-x86-cast.patch 
b/media-video/pipewire/files/pipewire-0.3.49-x86-cast.patch
deleted file mode 100644
index 58b4b331e03e..
--- a/media-video/pipewire/files/pipewire-0.3.49-x86-cast.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/5a023c8c84fb053d452983a64a33a41b931fc99b
-https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2271
-
-From: Wim Taymans 
-Date: Thu, 21 Apr 2022 22:12:38 +0200
-Subject: [PATCH] alsa: fix argument type for Long
-
-Fixes #2271
 a/spa/plugins/alsa/alsa-pcm.c
-+++ b/spa/plugins/alsa/alsa-pcm.c
-@@ -311,7 +311,7 @@ struct spa_pod *spa_alsa_enum_propinfo(struct state *state,
-   SPA_PROP_INFO_name, 
SPA_POD_String("latency.internal.ns"),
-   SPA_PROP_INFO_description, SPA_POD_String("Internal 
latency in nanoseconds"),
-   SPA_PROP_INFO_type, 
SPA_POD_CHOICE_RANGE_Long(state->process_latency.ns,
--  0, 2 * SPA_NSEC_PER_SEC),
-+  0LL, 2 * SPA_NSEC_PER_SEC),
-   SPA_PROP_INFO_params, SPA_POD_Bool(true));
-   break;
-   case 15:
-GitLab

diff --git a/media-video/pipewire/pipewire-0.3.49-r2.ebuild 
b/media-video/pipewire/pipewire-0.3.49-r2.ebuild
deleted file mode 100644
index b7acb4f37fa8..
--- a/media-video/pipewire/pipewire-0.3.49-r2.ebuild
+++ /dev/null
@@ -1,360 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd 
udev
-
-if [[ ${PV} ==  ]]; then
-   EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git;
-   inherit git-r3
-else
-   if [[ ${PV} == *_p* ]] ; then
-   MY_COMMIT=""
-   
SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2
 -> ${P}.tar.bz2"
-   S="${WORKDIR}"/${PN}-${MY_COMMIT}
-   else
-   
SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz;
-   fi
-
-   KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/;
-
-LICENSE="MIT LGPL-2.1+ GPL-2"
-# ABI was broken in 0.3.42 for 
https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
-SLOT="0/0.4"
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 
pipewire-alsa ssl system-service systemd test udev v4l X zeroconf"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield 

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/

2022-07-04 Thread Sam James
commit: 033bdb6a2662ed9d0efc23ffc1fe746c1590ba93
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul  4 23:52:14 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 23:52:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=033bdb6a

media-video/pipewire: Stabilize 0.3.51-r2 ppc, #852230

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/pipewire-0.3.51-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/pipewire/pipewire-0.3.51-r2.ebuild 
b/media-video/pipewire/pipewire-0.3.51-r2.ebuild
index 36646e433754..dd429a538658 100644
--- a/media-video/pipewire/pipewire-0.3.51-r2.ebuild
+++ b/media-video/pipewire/pipewire-0.3.51-r2.ebuild
@@ -19,7 +19,7 @@ else

SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz;
fi
 
-   KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+   KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"



[gentoo-commits] repo/gentoo:master commit in: media-video/wireplumber/

2022-07-04 Thread Sam James
commit: dc36debe43fe5ae80226483250e20dca43320aa1
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul  4 23:52:14 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 23:52:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc36debe

media-video/wireplumber: Stabilize 0.4.10-r3 ppc, #852230

Signed-off-by: Sam James  gentoo.org>

 media-video/wireplumber/wireplumber-0.4.10-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild 
b/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild
index 5789bd9c46fb..82772e332ad8 100644
--- a/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} ==  ]]; then
inherit git-r3
 else

SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz;
-   KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+   KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Replacement for pipewire-media-session"



[gentoo-commits] repo/gentoo:master commit in: media-video/wireplumber/, media-video/wireplumber/files/

2022-07-04 Thread Sam James
commit: 0e2ff88702f11a324a4978df9d7d960b1b2992c9
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul  4 23:37:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 23:37:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e2ff887

media-video/wireplumber: drop 0.4.9, 0.4.9-r1, 0.4.10-r1

Signed-off-by: Sam James  gentoo.org>

 media-video/wireplumber/Manifest   |   1 -
 ...ment-which-options-need-to-be-turned-off-.patch |  87 ---
 ...icy-device-profile-clear-tables-when-devi.patch |  33 --
 .../wireplumber/wireplumber-0.4.10-r1.ebuild   | 122 -
 .../wireplumber/wireplumber-0.4.9-r1.ebuild| 121 
 media-video/wireplumber/wireplumber-0.4.9.ebuild   | 116 
 6 files changed, 480 deletions(-)

diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index cf271da67018..ece045dc24b3 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -1,2 +1 @@
 DIST wireplumber-0.4.10.tar.gz 395588 BLAKE2B 
6df1af17d1e53ab1449a2f6f9af5a0c4f7b1cd981e07556e5ea3c6b4d5d624e66b97ce4f945f7ebbf72b75d35d10990fac11b5228275f27e5320885ff1ec
 SHA512 
342e8bba2cf00faab71ef39bb361b5ada66ff3a68ccf7a756ea1ca402da6e94784eece277ca02992bc7573c51cb8b1bad33aa9c593b3d1bfe0bb0286e2f4506f
-DIST wireplumber-0.4.9.tar.gz 376170 BLAKE2B 
50f552c730ac543fc2e8b0e054c861bcd22ed281a62f2921fb956f39b917cce6eb53287dfcfc81db240476f82f5cf1d7556fa34be8bf507ff847089536b81f44
 SHA512 
39b9e9be014489042fe480219b99d7591e0b68dd44b889bd5c6aeee73e771adb807bc21f48d031217f097182827bd2f48b68d52291036d52e95d4fa75e7f9929

diff --git 
a/media-video/wireplumber/files/wireplumber-0.4.9-config-document-which-options-need-to-be-turned-off-.patch
 
b/media-video/wireplumber/files/wireplumber-0.4.9-config-document-which-options-need-to-be-turned-off-.patch
deleted file mode 100644
index 9e664ec56564..
--- 
a/media-video/wireplumber/files/wireplumber-0.4.9-config-document-which-options-need-to-be-turned-off-.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/0da29f38181e391160fa8702623050b8544ec775
-
-From 0da29f38181e391160fa8702623050b8544ec775 Mon Sep 17 00:00:00 2001
-From: George Kiagiadakis 
-Date: Mon, 4 Apr 2022 14:38:28 +0300
-Subject: [PATCH] config: document which options need to be turned off to use
- wp without D-Bus
-
-and actually implement an option for the logind module
-
-Related to: #237

- src/config/bluetooth.lua.d/30-bluez-monitor.lua| 4 +++-
- src/config/bluetooth.lua.d/50-bluez-config.lua | 8 
- src/config/main.lua.d/50-alsa-config.lua   | 4 +++-
- src/config/main.lua.d/50-default-access-config.lua | 3 +++
- 4 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/src/config/bluetooth.lua.d/30-bluez-monitor.lua 
b/src/config/bluetooth.lua.d/30-bluez-monitor.lua
-index 266d3e2f..ba86657f 100644
 a/src/config/bluetooth.lua.d/30-bluez-monitor.lua
-+++ b/src/config/bluetooth.lua.d/30-bluez-monitor.lua
-@@ -8,5 +8,7 @@ function bluez_monitor.enable()
- rules = bluez_monitor.rules,
-   })
- 
--  load_optional_module("logind")
-+  if bluez_monitor.properties["with-logind"] then
-+load_optional_module("logind")
-+  end
- end
-diff --git a/src/config/bluetooth.lua.d/50-bluez-config.lua 
b/src/config/bluetooth.lua.d/50-bluez-config.lua
-index 072504ec..dd8033ff 100644
 a/src/config/bluetooth.lua.d/50-bluez-config.lua
-+++ b/src/config/bluetooth.lua.d/50-bluez-config.lua
-@@ -34,6 +34,14 @@ bluez_monitor.properties = {
-   -- Register dummy AVRCP player, required for AVRCP volume function.
-   -- Disable if you are running mpris-proxy or equivalent.
-   --["bluez5.dummy-avrcp-player"] = true,
-+
-+  -- Enable the logind module, which arbitrates which user will be allowed
-+  -- to have bluetooth audio enabled at any given time (particularly useful
-+  -- if you are using GDM as a display manager, as the gdm user also launches
-+  -- pipewire and wireplumber).
-+  -- This requires access to the D-Bus user session; disable if you are 
running
-+  -- a system-wide instance of wireplumber.
-+  ["with-logind"] = true,
- }
- 
- bluez_monitor.rules = {
-diff --git a/src/config/main.lua.d/50-alsa-config.lua 
b/src/config/main.lua.d/50-alsa-config.lua
-index 6c97e8ad..d29b0b6f 100644
 a/src/config/main.lua.d/50-alsa-config.lua
-+++ b/src/config/main.lua.d/50-alsa-config.lua
-@@ -7,6 +7,8 @@ alsa_monitor.properties = {
-   --["alsa.jack-device"] = false,
- 
-   -- Reserve devices via org.freedesktop.ReserveDevice1 on D-Bus
-+  -- Disable if you are running a system-wide instance, which
-+  -- doesn't have access to the D-Bus user session
-   ["alsa.reserve"] = true,
-   --["alsa.reserve.priority"] = -20,
-   --["alsa.reserve.application-name"] = "WirePlumber",
-@@ -20,7 +22,7 @@ alsa_monitor.properties = {
- 
- alsa_monitor.rules = {
-   -- An 

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/, media-video/pipewire/files/

2022-07-04 Thread Sam James
commit: 83048813c27caef3b8d3e0ba27acdab663ebc2a8
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul  4 23:35:16 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 23:36:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83048813

media-video/pipewire: drop 0.3.30-r2, 0.3.36

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |   2 -
 .../pipewire-0.3.25-non-systemd-integration.patch  |  18 --
 ...pewire-0.3.29-revert-openaptx-restriction.patch |  30 ---
 .../pipewire-0.3.35-non-systemd-integration.patch  |  20 --
 ...pewire-0.3.36-fix-crash-uaf-media-session.patch |  36 ---
 .../files/pipewire-0.3.36-fix-version.patch|  25 --
 .../pipewire-0.3.36-missing-limits-include.patch   |  17 --
 media-video/pipewire/pipewire-0.3.30-r2.ebuild | 274 
 media-video/pipewire/pipewire-0.3.36.ebuild| 284 -
 9 files changed, 706 deletions(-)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index d473d3c32798..4d01a2bceef0 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,5 +1,3 @@
-DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 
69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407
 SHA512 
ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3
-DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 
20fce0d7f88347fe594491d4fae7b6a8edee67ff7749f1a40b807a5d5094d792e61e3efd05dca2221f781c263e34ff0a50ad3c162231911d4b1d87704df6c775
 SHA512 
f0fc68ea005018b420a4f65a24dc9c85eb6263c24e66852a7ce2b03f966990d62487b388c7d73ff5adfc10c80c439b1200ae876e41d78f91db190036a1799a14
 DIST pipewire-0.3.49.tar.gz 1769037 BLAKE2B 
2567bc98933bfbb295358886e8f97db2af2f0a6ee3c2586c1718e39f7eedaed8528a4663753ba56d3295e42576da015ce9278f22aff9bbd9ca43d883bff5a2f6
 SHA512 
36398872f7d7b31193d7a8885bbdfb415a122bd779874107a0642202dfd8408f39fddf769bfbae4533c2cc99fe9ef67903d50cc721e936aa4802229f1c46d809
 DIST pipewire-0.3.51.tar.gz 1789070 BLAKE2B 
8538eb9f2178efa26365f30b324b707826e580caa1fd9c09b62c561c140c14186e0d2b04808fa78eb5642ddccf1a347def19934ecd654be06b215a693075b6fc
 SHA512 
a762fd260b4b14ad9ef142be11ab1c22268da6726e2179559ffb254f0ce7daf7a502779e33c64313a9c6a9fc1bd15150b76be04ec81aa27c35dbb4333cecdb4a
 DIST pipewire-0.3.52.tar.gz 1810238 BLAKE2B 
bb75eff5fe7700d0a303fbfed7910aebd82346a5a21c4a0d17c06e6991bc90bb6d4f6b9559c25788494cb11faff957523dcd7f0c4c8a40be11b81c63a5a9e5ef
 SHA512 
30e9cf74c92babafe386f02a03bb5c41a8ee5591a02f15845cca1ee44f091ce68eb14d48943d43b680cb525026a19e0290997670f9a82156eaa72e974fe6d01a

diff --git 
a/media-video/pipewire/files/pipewire-0.3.25-non-systemd-integration.patch 
b/media-video/pipewire/files/pipewire-0.3.25-non-systemd-integration.patch
deleted file mode 100644
index 51455a3b84b8..
--- a/media-video/pipewire/files/pipewire-0.3.25-non-systemd-integration.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in
 a/src/daemon/pipewire.conf.in
-+++ b/src/daemon/pipewire.conf.in
-@@ -204,12 +204,12 @@ context.exec = [
- # but it is better to start it as a systemd service.
- # Run the session manager with -h for options.
- #
--@comment@{ path = "@media_session_path@"  args = "" }
-+{ path = "@media_session_path@"  args = "" }
- #
- # You can optionally start the pulseaudio-server here as well
- # but it is better to start it as a systemd service.
- # It can be interesting to start another daemon here that listens
- # on another address with the -a option (eg. -a tcp:4713).
- #
--@comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
-+{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
- ]

diff --git 
a/media-video/pipewire/files/pipewire-0.3.29-revert-openaptx-restriction.patch 
b/media-video/pipewire/files/pipewire-0.3.29-revert-openaptx-restriction.patch
deleted file mode 100644
index 9da495f12d0d..
--- 
a/media-video/pipewire/files/pipewire-0.3.29-revert-openaptx-restriction.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 6d2e45a67cadd9498b24e8e4ea7adc6cf627333d Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann 
-Date: Thu, 3 Jun 2021 14:15:44 +0200
-Subject: [PATCH] Revert "openaptx: Blacklist >= 0.2.1 due to license change"
-
-This reverts commit d08b6fac6bec0d334ee9fc785d551a67832f95fe.
-
-Doesn't apply to us.
-
-Bug: https://bugs.gentoo.org/785634

- spa/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spa/meson.build b/spa/meson.build
-index 263af4c2..7671c74b 100644
 a/spa/meson.build
-+++ b/spa/meson.build
-@@ -23,7 +23,7 @@ if not get_option('spa-plugins').disabled()
- sbc_dep = dependency('sbc', required: get_option('bluez5'))
- ldac_dep = 

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/

2022-07-04 Thread Sam James
commit: 77fd2dde343591434deb5067c570abca01dfaf37
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul  4 23:36:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 23:36:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77fd2dde

media-video/pipewire: tidy up 0.3.53-r1 too

Fixed in the later versions, but eh.

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/pipewire-0.3.53-r1.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-video/pipewire/pipewire-0.3.53-r1.ebuild 
b/media-video/pipewire/pipewire-0.3.53-r1.ebuild
index f881800c5a79..1c8969b1cff1 100644
--- a/media-video/pipewire/pipewire-0.3.53-r1.ebuild
+++ b/media-video/pipewire/pipewire-0.3.53-r1.ebuild
@@ -264,9 +264,10 @@ multilib_src_install_all() {
# Enable required wireplumber alsa and bluez monitors
if use sound-server; then
dodir /etc/wireplumber/main.lua.d
-   echo "alsa_monitor.enabled = true" > 
${D}/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua
+   echo "alsa_monitor.enabled = true" > 
"${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua
 || die
+
dodir /etc/wireplumber/bluetooth.lua.d
-   echo "bluez_monitor.enabled = true" > 
${D}/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua
+   echo "bluez_monitor.enabled = true" > 
"${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua
 || die
fi
 
if ! use systemd; then



[gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/

2022-07-04 Thread Mike Gilbert
commit: 41fe3ce6f1b34ad62c4672fc0146b2268b813711
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Jul  4 23:18:40 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Jul  4 23:28:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41fe3ce6

sys-kernel/dracut: add 057

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-kernel/dracut/Manifest |  1 +
 .../{dracut-.ebuild => dracut-057.ebuild}  |  8 ++--
 sys-kernel/dracut/dracut-.ebuild   |  7 ++--
 .../dracut/files/057-virtiofs-split-usr.patch  | 43 ++
 4 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 8f585a4e1527..7633cae497de 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1,3 +1,4 @@
 DIST dracut-053.tar.xz 354668 BLAKE2B 
d20d0f1675e18cf44615a98255c8b1a73f23e9c665a771a1fe99716d3bf0b6082961ab20fe058bf31c106c4f521d9e8708e2ae98cff00f613197bbf9dd3abda3
 SHA512 
4736f84442bda208a38d3285ffeb8b845f06e52e3bf60d2aaea121240cf695e1369208c2d2cee1137a6c1d3f8f7794385675006beaf5cd86ade259d5f42d039a
 DIST dracut-055.tar.xz 361752 BLAKE2B 
9fcb0bce9ead2e079c70a377ea53701e4634d3dc64ae163e0e157d7d85822a274813e05f6079768640e1807818fad7a8158626413d773686a8d52fcd95fb5680
 SHA512 
2d2ea2889d9013bc94245bd7d1a2154f24d02bd9c2f7dbb28e5968e17d918e6598c68d85b0f551f968218980a80b19361ca0c9e8e94997ba54f4c09afcd6d866
 DIST dracut-056.tar.xz 384196 BLAKE2B 
e3e4fa3024b401cc954ba6069c54e95912691ff68a838e3c43bfc6a5b284bdee1669c782b30503c0246b7146c545ee8825febefcff93bae76ec46067cb7b87e1
 SHA512 
19268763e128984d20cab766bbdf2de12fe534ce2562fc688203099ef9b4cf83d0ccd2129499c70cdc6dd4ad53f0ffc2f3378eff5b8a15fda27c23b20f903df2
+DIST dracut-057.tar.gz 481345 BLAKE2B 
dcf663a1955753256866e9dfa318b0b46a132ea39223ab634d72af1611f7db394c23c1bb4326979a5ee919df6ce3b107c955c9c77ce1ec4f99de835352932901
 SHA512 
8acdc8db2233a9abbaeea218cc5b1be68c4985088995f42624750783f8d40ecbb7fa97ab4f6468f67c079c8418590ace317c143a92d9305640b48c7c0edd4089

diff --git a/sys-kernel/dracut/dracut-.ebuild 
b/sys-kernel/dracut/dracut-057.ebuild
similarity index 94%
copy from sys-kernel/dracut/dracut-.ebuild
copy to sys-kernel/dracut/dracut-057.ebuild
index 35a294f43e10..2e0def4acdca 100644
--- a/sys-kernel/dracut/dracut-.ebuild
+++ b/sys-kernel/dracut/dracut-057.ebuild
@@ -9,9 +9,10 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/dracutdevs/dracut;
 else
-   [[ "${PV}" = *_rc* ]] || \
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~sparc ~x86"
-   SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz;
+   if [[ "${PV}" != *_rc* ]]; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips 
~ppc ~ppc64 ~riscv ~sparc ~x86"
+   fi
+   
SRC_URI="https://github.com/dracutdevs/dracut/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
 fi
 
 DESCRIPTION="Generic initramfs generation tool"
@@ -61,6 +62,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*"
 
 PATCHES=(
"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
+   "${FILESDIR}"/057-virtiofs-split-usr.patch
 )
 
 src_configure() {

diff --git a/sys-kernel/dracut/dracut-.ebuild 
b/sys-kernel/dracut/dracut-.ebuild
index 35a294f43e10..3721fec06569 100644
--- a/sys-kernel/dracut/dracut-.ebuild
+++ b/sys-kernel/dracut/dracut-.ebuild
@@ -9,9 +9,10 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/dracutdevs/dracut;
 else
-   [[ "${PV}" = *_rc* ]] || \
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~sparc ~x86"
-   SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz;
+   if [[ "${PV}" != *_rc* ]]; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips 
~ppc ~ppc64 ~riscv ~sparc ~x86"
+   fi
+   
SRC_URI="https://github.com/dracutdevs/dracut/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
 fi
 
 DESCRIPTION="Generic initramfs generation tool"

diff --git a/sys-kernel/dracut/files/057-virtiofs-split-usr.patch 
b/sys-kernel/dracut/files/057-virtiofs-split-usr.patch
new file mode 100644
index ..5bb51a9b3535
--- /dev/null
+++ b/sys-kernel/dracut/files/057-virtiofs-split-usr.patch
@@ -0,0 +1,43 @@
+From dd63cc0a25f9fb34a2f28306c06a668d66564463 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+Date: Mon, 4 Jul 2022 19:08:45 -0400
+Subject: [PATCH] fix(virtiofs): make shebangs work on split-usr systems
+
+Fixes: c29325a982013a315418cdb2318e90cf77e387b5
+Signed-off-by: Mike Gilbert 
+---
+ modules.d/95virtiofs/module-setup.sh   | 2 +-
+ modules.d/95virtiofs/mount-virtiofs.sh | 2 +-
+ modules.d/95virtiofs/parse-virtiofs.sh | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/modules.d/95virtiofs/module-setup.sh 

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/

2022-07-04 Thread Mike Gilbert
commit: 034c37b09c552c46d0c8fc6fba03439452b6c7e9
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Jul  4 23:19:09 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Jul  4 23:28:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=034c37b0

sys-kernel/dracut: drop 053-r1

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-kernel/dracut/Manifest |   1 -
 sys-kernel/dracut/dracut-053-r1.ebuild | 156 -
 2 files changed, 157 deletions(-)

diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 7633cae497de..b62dc908356f 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1,4 +1,3 @@
-DIST dracut-053.tar.xz 354668 BLAKE2B 
d20d0f1675e18cf44615a98255c8b1a73f23e9c665a771a1fe99716d3bf0b6082961ab20fe058bf31c106c4f521d9e8708e2ae98cff00f613197bbf9dd3abda3
 SHA512 
4736f84442bda208a38d3285ffeb8b845f06e52e3bf60d2aaea121240cf695e1369208c2d2cee1137a6c1d3f8f7794385675006beaf5cd86ade259d5f42d039a
 DIST dracut-055.tar.xz 361752 BLAKE2B 
9fcb0bce9ead2e079c70a377ea53701e4634d3dc64ae163e0e157d7d85822a274813e05f6079768640e1807818fad7a8158626413d773686a8d52fcd95fb5680
 SHA512 
2d2ea2889d9013bc94245bd7d1a2154f24d02bd9c2f7dbb28e5968e17d918e6598c68d85b0f551f968218980a80b19361ca0c9e8e94997ba54f4c09afcd6d866
 DIST dracut-056.tar.xz 384196 BLAKE2B 
e3e4fa3024b401cc954ba6069c54e95912691ff68a838e3c43bfc6a5b284bdee1669c782b30503c0246b7146c545ee8825febefcff93bae76ec46067cb7b87e1
 SHA512 
19268763e128984d20cab766bbdf2de12fe534ce2562fc688203099ef9b4cf83d0ccd2129499c70cdc6dd4ad53f0ffc2f3378eff5b8a15fda27c23b20f903df2
 DIST dracut-057.tar.gz 481345 BLAKE2B 
dcf663a1955753256866e9dfa318b0b46a132ea39223ab634d72af1611f7db394c23c1bb4326979a5ee919df6ce3b107c955c9c77ce1ec4f99de835352932901
 SHA512 
8acdc8db2233a9abbaeea218cc5b1be68c4985088995f42624750783f8d40ecbb7fa97ab4f6468f67c079c8418590ace317c143a92d9305640b48c7c0edd4089

diff --git a/sys-kernel/dracut/dracut-053-r1.ebuild 
b/sys-kernel/dracut/dracut-053-r1.ebuild
deleted file mode 100644
index aabffa07bfb6..
--- a/sys-kernel/dracut/dracut-053-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 linux-info optfeature systemd toolchain-funcs
-
-if [[ ${PV} ==  ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/dracutdevs/dracut;
-else
-   [[ "${PV}" = *_rc* ]] || \
-   KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-   SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz;
-fi
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux"
-
-# Tests need root privileges, bug #298014
-RESTRICT="test"
-
-RDEPEND="
-   app-arch/cpio
-   >=app-shells/bash-4.0:0
-   sys-apps/coreutils[xattr(-)]
-   >=sys-apps/kmod-23[tools]
-   || (
-   >=sys-apps/sysvinit-2.87-r3
-   sys-apps/openrc[sysv-utils(-),selinux?]
-   sys-apps/systemd[sysv-utils]
-   )
-   >=sys-apps/util-linux-2.21
-   virtual/pkgconfig
-   virtual/udev
-
-   elibc_musl? ( sys-libs/fts-standalone )
-   selinux? (
-   sec-policy/selinux-dracut
-   sys-libs/libselinux
-   sys-libs/libsepol
-   )
-"
-DEPEND="
-   >=sys-apps/kmod-23
-   elibc_musl? ( sys-libs/fts-standalone )
-"
-
-BDEPEND="
-   app-text/asciidoc
-   app-text/docbook-xml-dtd:4.5
-   >=app-text/docbook-xsl-stylesheets-1.75.2
-   >=dev-libs/libxslt-1.1.26
-   virtual/pkgconfig
-"
-
-DOCS=( AUTHORS README.md README.generic README.kernel )
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-PATCHES=(
-   "${FILESDIR}"/053-network-manager.patch
-   "${FILESDIR}"/gentoo-ldconfig-paths.patch
-)
-
-src_configure() {
-   local myconf=(
-   --prefix="${EPREFIX}/usr"
-   --sysconfdir="${EPREFIX}/etc"
-   --bashcompletiondir="$(get_bashcompdir)"
-   --systemdsystemunitdir="$(systemd_get_systemunitdir)"
-   )
-
-   tc-export CC PKG_CONFIG
-
-   echo ./configure "${myconf[@]}"
-   ./configure "${myconf[@]}" || die
-
-   if [[ ${PV} !=  && ! -f dracut-version.sh ]] ; then
-   # Source tarball from github doesn't include this file
-   echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
-   fi
-}
-
-src_install() {
-   default
-
-   docinto html
-   dodoc dracut.html
-}
-
-pkg_postinst() {
-   if linux-info_get_any_version && linux_config_exists; then
-   ewarn ""
-   ewarn "If the following test report contains a missing kernel"
-   ewarn "configuration option, you should reconfigure and rebuild 
your"
-   ewarn "kernel before booting image generated 

[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

2022-07-04 Thread Mike Gilbert
commit: 2487d4ba31de3d00fdaf429bda9f2c85c4ec04fb
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Jul  4 22:56:57 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Jul  4 23:28:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2487d4ba

dev-util/meson: add 0.63.0, drop 0.63.0_rc2

Signed-off-by: Mike Gilbert  gentoo.org>

 dev-util/meson/Manifest | 2 +-
 dev-util/meson/{meson-0.63.0_rc2.ebuild => meson-0.63.0.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 0c22c22504d7..115618ae4227 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -2,4 +2,4 @@ DIST meson-0.60.3.tar.gz 2001124 BLAKE2B 
f66fb29d309f5dea9c0b1934e8b5dfc2b33586e
 DIST meson-0.61.4.tar.gz 2014265 BLAKE2B 
09e6630f8a1786143832007c929e652e743bbf11d1b55ffcf366dd127779f61e8fd4a8be5cb23fa6bc949938a3bd0222f19ad1fec883f0ca6ed8cd6d4bbd6aef
 SHA512 
005f52c678016f3183d36b69254cceab16c682d2389ec9cae41889955a13cb643aea03f2247f3473cfeca9c4dd6c1cc8b9b8b9906dc324c08016c72380a5f195
 DIST meson-0.62.1.tar.gz 2034805 BLAKE2B 
6370b6bf07e6e875f6a0cabbf6284f97c89a4653b62c4765f365fbf083e607853094aa37d5dc97042f086ca1db569b2f8dabd14b37f674615d3b9d267d3d0d0f
 SHA512 
52d2d06c27275b824046164403908be8555faed33aef862940623cef3e4f84b4c9b8d461c291642e6ea2c0db30b2ec4a99f46bde5d54945a26c1dbeca219cc32
 DIST meson-0.62.2.tar.gz 2038542 BLAKE2B 
51446cd348f3e8681a61ebecf95f5aafcafd90654e3c86d87ee2b68239237bd889b667f3c6543faba7d4b98d7e0ed73d96c6a988913e5262d3b9611b80ff8db2
 SHA512 
4089588701f0f702eb3b794e0ede78b99f13ec7545d1a7470c7bfd6a857de59673684a543928dd578402578c53f38365a3a59e3e29022fd30a525353818a4195
-DIST meson-0.63.0rc2.tar.gz 2059282 BLAKE2B 
4b90ccc87fddcd9d1e6edc71d508990e68da8eeb6349de76f170a4951d64b106d098fc23ef46424b6af2210ccc5be1d79a5c12f18c2ac70c3f8162ceaa4e2b6b
 SHA512 
898e2dbb8b1dc4145c70c9042054cd2bc9568ce363cfb9b9ac697f2d8f406f7d4e312f7c7233b1cfd8d74946b253d597231d2dbc4f7803f98a33cdd03237a1a5
+DIST meson-0.63.0.tar.gz 2060688 BLAKE2B 
763d35a6dee42d7ef61b00c472681042289f38737374178d43eb8e66c3abe38affd372fca7aea4f4c7cd52f25ad3754485f54f24ac5e453b7a58011397ddbbb8
 SHA512 
8d427261bb42d2bd1da7d4f7b5f53908044aa2cea6d020fb320b0ab9d9848e17cf28deb12ae6dc139807f9e377db0c8a546561e94301216b634bd77703f17cea

diff --git a/dev-util/meson/meson-0.63.0_rc2.ebuild 
b/dev-util/meson/meson-0.63.0.ebuild
similarity index 92%
rename from dev-util/meson/meson-0.63.0_rc2.ebuild
rename to dev-util/meson/meson-0.63.0.ebuild
index a7a111a382b8..14ecaa4f465b 100644
--- a/dev-util/meson/meson-0.63.0_rc2.ebuild
+++ b/dev-util/meson/meson-0.63.0.ebuild
@@ -13,7 +13,7 @@ else
MY_P=${P/_/}
S=${WORKDIR}/${MY_P}
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-   #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit bash-completion-r1 distutils-r1 toolchain-funcs



[gentoo-commits] repo/gentoo:master commit in: app-forensics/aflplusplus/, app-forensics/aflplusplus/files/

2022-07-04 Thread Sam James
commit: 54b1cd46b846e631eff7431ca55bdd73806f110b
Author: Alexander Miller  gmx  de>
AuthorDate: Mon Jul  4 17:21:47 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 23:24:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54b1cd46

app-forensics/aflplusplus: Fix lld detection

Signed-off-by: Alexander Miller  gmx.de>
Signed-off-by: Sam James  gentoo.org>

 app-forensics/aflplusplus/aflplusplus-4.01c.ebuild |  1 +
 .../aflplusplus/files/aflplusplus-4.01c-lld-detect.patch   | 14 ++
 2 files changed, 15 insertions(+)

diff --git a/app-forensics/aflplusplus/aflplusplus-4.01c.ebuild 
b/app-forensics/aflplusplus/aflplusplus-4.01c.ebuild
index b304644ff905..18186168e86e 100644
--- a/app-forensics/aflplusplus/aflplusplus-4.01c.ebuild
+++ b/app-forensics/aflplusplus/aflplusplus-4.01c.ebuild
@@ -40,6 +40,7 @@ 
QA_PREBUILT="usr/share/afl/testcases/others/elf/small_exec.elf"
 PATCHES=(
"${FILESDIR}"/${PN}-4.01c-respect-flags.patch
"${FILESDIR}"/${PN}-4.01c-no-ignore-errors-makefile.patch
+   "${FILESDIR}"/${PN}-4.01c-lld-detect.patch
 )
 
 llvm_check_deps() {

diff --git a/app-forensics/aflplusplus/files/aflplusplus-4.01c-lld-detect.patch 
b/app-forensics/aflplusplus/files/aflplusplus-4.01c-lld-detect.patch
new file mode 100644
index ..cec2c9d17979
--- /dev/null
+++ b/app-forensics/aflplusplus/files/aflplusplus-4.01c-lld-detect.patch
@@ -0,0 +1,14 @@
+--- a/GNUmakefile.llvm
 b/GNUmakefile.llvm
+@@ -218,9 +218,8 @@ endif
+ ifeq "$(LLVM_LTO)" "1"
+   ifneq "$(AFL_CLANG_FLTO)" ""
+ ifeq "$(AFL_REAL_LD)" ""
+-  ifneq "$(shell readlink $(LLVM_BINDIR)/ld.lld 2>&1)" ""
+-AFL_REAL_LD = $(LLVM_BINDIR)/ld.lld
+-  else
++  AFL_REAL_LD = "$(shell command -v $(LLVM_BINDIR)/ld.lld 2>/dev/null || 
command -v ld.lld 2>/dev/null)"
++  ifeq "$(AFL_REAL_LD)" ""
+ $(warning ld.lld not found, cannot enable LTO mode)
+ LLVM_LTO = 0
+   endif



[gentoo-commits] repo/gentoo:master commit in: app-forensics/aflplusplus/files/

2022-07-04 Thread Sam James
commit: 0a69da48bddc8566105c52fe6f23cfbabb615bc7
Author: Alexander Miller  gmx  de>
AuthorDate: Mon Jul  4 16:31:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 23:24:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a69da48

app-forensics/aflplusplus: Don't use *FLAGS when testing CC wrappers

The flags used to build the package could be incompatible with the wrapper
due to gcc vs. clang differences. Doesn't affect installed files.

Signed-off-by: Alexander Miller  gmx.de>
Signed-off-by: Sam James  gentoo.org>

 ...flplusplus-4.01c-no-ignore-errors-makefile.patch |  2 +-
 .../files/aflplusplus-4.01c-respect-flags.patch | 21 -
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git 
a/app-forensics/aflplusplus/files/aflplusplus-4.01c-no-ignore-errors-makefile.patch
 
b/app-forensics/aflplusplus/files/aflplusplus-4.01c-no-ignore-errors-makefile.patch
index 95718bb3a32d..8a78e7d791d8 100644
--- 
a/app-forensics/aflplusplus/files/aflplusplus-4.01c-no-ignore-errors-makefile.patch
+++ 
b/app-forensics/aflplusplus/files/aflplusplus-4.01c-no-ignore-errors-makefile.patch
@@ -147,7 +147,7 @@ https://bugs.gentoo.org/800941
 @@ -463,6 +463,7 @@ document:
  test_build: $(PROGS)
@echo "[*] Testing the CC wrapper and instrumentation output..."
-   unset AFL_USE_ASAN AFL_USE_MSAN AFL_INST_RATIO; 
ASAN_OPTIONS=detect_leaks=0 AFL_QUIET=1 AFL_PATH=. AFL_LLVM_LAF_ALL=1 ./afl-cc 
$(CFLAGS) $(CPPFLAGS) ./test-instr.c -o test-instr $(LDFLAGS)
+   unset AFL_USE_ASAN AFL_USE_MSAN AFL_INST_RATIO; 
ASAN_OPTIONS=detect_leaks=0 AFL_QUIET=1 AFL_PATH=. AFL_LLVM_LAF_ALL=1 ./afl-cc 
./test-instr.c -o test-instr
 +  @test -e test-instr || { echo "[-] Testing CC wrapper failed. You seem 
not to have a working compiler." ; exit 1; }
ASAN_OPTIONS=detect_leaks=0 ./afl-showmap -m none -q -o .test-instr0 
./test-instr < /dev/null
echo 1 | ASAN_OPTIONS=detect_leaks=0 ./afl-showmap -m none -q -o 
.test-instr1 ./test-instr

diff --git 
a/app-forensics/aflplusplus/files/aflplusplus-4.01c-respect-flags.patch 
b/app-forensics/aflplusplus/files/aflplusplus-4.01c-respect-flags.patch
index d22d582ecaa9..e4d56c25095e 100644
--- a/app-forensics/aflplusplus/files/aflplusplus-4.01c-respect-flags.patch
+++ b/app-forensics/aflplusplus/files/aflplusplus-4.01c-respect-flags.patch
@@ -1,3 +1,7 @@
+* Respect CFLAGS everywhere when building.
+* Ignore build flags then when testing the CC wrappers (could contain
+  incompatible flags).
+
 --- a/GNUmakefile
 +++ b/GNUmakefile
 @@ -423,7 +423,7 @@ afl-as: src/afl-as.c include/afl-as.h $(COMM_HDR) | 
test_x86
@@ -9,6 +13,15 @@
  
  src/afl-common.o : $(COMM_HDR) src/afl-common.c include/common.h
$(CC) $(CFLAGS) $(CFLAGS_FLTO) -c src/afl-common.c -o src/afl-common.o
+@@ -531,7 +531,7 @@ .PHONY: test_build
+ ifndef AFL_NO_X86
+ test_build: afl-cc afl-gcc afl-as afl-showmap
+   @echo "[*] Testing the CC wrapper afl-cc and its instrumentation 
output..."
+-  @unset AFL_MAP_SIZE AFL_USE_UBSAN AFL_USE_CFISAN AFL_USE_LSAN 
AFL_USE_ASAN AFL_USE_MSAN; ASAN_OPTIONS=detect_leaks=0 AFL_INST_RATIO=100 
AFL_PATH=. ./afl-cc test-instr.c $(LDFLAGS) -o test-instr 2>&1 || (echo "Oops, 
afl-cc failed"; exit 1 )
++  @unset AFL_MAP_SIZE AFL_USE_UBSAN AFL_USE_CFISAN AFL_USE_LSAN 
AFL_USE_ASAN AFL_USE_MSAN; ASAN_OPTIONS=detect_leaks=0 AFL_INST_RATIO=100 
AFL_PATH=. ./afl-cc test-instr.c -o test-instr 2>&1 || (echo "Oops, afl-cc 
failed"; exit 1 )
+   ASAN_OPTIONS=detect_leaks=0 ./afl-showmap -m none -q -o .test-instr0 
./test-instr < /dev/null
+   echo 1 | ASAN_OPTIONS=detect_leaks=0 ./afl-showmap -m none -q -o 
.test-instr1 ./test-instr
+   @rm -f test-instr
 --- a/GNUmakefile.gcc_plugin
 +++ b/GNUmakefile.gcc_plugin
 @@ -131,18 +131,18 @@ afl-common.o: ./src/afl-common.c
@@ -36,7 +49,7 @@
ln -sf afl-cc.8 afl-gcc-fast.8
 --- a/GNUmakefile.llvm
 +++ b/GNUmakefile.llvm
-@@ -444,20 +444,20 @@ afl-llvm-dict2file.so:   
instrumentation/afl-llvm-dict2file.so.cc instrumentation/
+@@ -444,25 +444,25 @@ afl-llvm-dict2file.so:   
instrumentation/afl-llvm-dict2file.so.cc instrumentation/
  
  .PHONY: document
  document:
@@ -63,6 +76,12 @@
  
  .PHONY: test_build
  test_build: $(PROGS)
+   @echo "[*] Testing the CC wrapper and instrumentation output..."
+-  unset AFL_USE_ASAN AFL_USE_MSAN AFL_INST_RATIO; 
ASAN_OPTIONS=detect_leaks=0 AFL_QUIET=1 AFL_PATH=. AFL_LLVM_LAF_ALL=1 ./afl-cc 
$(CFLAGS) $(CPPFLAGS) ./test-instr.c -o test-instr $(LDFLAGS)
++  unset AFL_USE_ASAN AFL_USE_MSAN AFL_INST_RATIO; 
ASAN_OPTIONS=detect_leaks=0 AFL_QUIET=1 AFL_PATH=. AFL_LLVM_LAF_ALL=1 ./afl-cc 
./test-instr.c -o test-instr
+   ASAN_OPTIONS=detect_leaks=0 ./afl-showmap -m none -q -o .test-instr0 
./test-instr < /dev/null
+   echo 1 | ASAN_OPTIONS=detect_leaks=0 ./afl-showmap -m none -q -o 
.test-instr1 ./test-instr
+   @rm -f test-instr
 --- a/custom_mutators/honggfuzz/Makefile
 

[gentoo-commits] repo/gentoo:master commit in: app-forensics/aflplusplus/files/

2022-07-04 Thread Sam James
commit: b36373978816cbcf1840cc1f445d4602de2093f2
Author: Alexander Miller  gmx  de>
AuthorDate: Mon Jul  4 17:04:52 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 23:24:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3637397

app-forensics/aflplusplus: Don't override jobs parameter for sub-makes

Signed-off-by: Alexander Miller  gmx.de>
Signed-off-by: Sam James  gentoo.org>

 .../files/aflplusplus-4.01c-no-ignore-errors-makefile.patch| 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/app-forensics/aflplusplus/files/aflplusplus-4.01c-no-ignore-errors-makefile.patch
 
b/app-forensics/aflplusplus/files/aflplusplus-4.01c-no-ignore-errors-makefile.patch
index 8a78e7d791d8..861835892bb5 100644
--- 
a/app-forensics/aflplusplus/files/aflplusplus-4.01c-no-ignore-errors-makefile.patch
+++ 
b/app-forensics/aflplusplus/files/aflplusplus-4.01c-no-ignore-errors-makefile.patch
@@ -1,4 +1,5 @@
 https://bugs.gentoo.org/800941
+(also don't override jobs for sub-makes)
 
 --- a/GNUmakefile
 +++ b/GNUmakefile
@@ -12,7 +13,7 @@ https://bugs.gentoo.org/800941
  .PHONY: llvm
  llvm:
 -  -$(MAKE) -j4 -f GNUmakefile.llvm
-+  $(MAKE) -j4 -f GNUmakefile.llvm
++  $(MAKE) -f GNUmakefile.llvm
@test -e afl-cc || { echo "[-] Compiling afl-cc failed. You seem not to 
have a working compiler." ; exit 1; }
  
  .PHONY: gcc_plugin
@@ -60,7 +61,7 @@ https://bugs.gentoo.org/800941
  .PHONY: distrib
  distrib: all
 -  -$(MAKE) -j4 -f GNUmakefile.llvm
-+  $(MAKE) -j4 -f GNUmakefile.llvm
++  $(MAKE) -f GNUmakefile.llvm
  ifneq "$(SYS)" "Darwin"
 -  -$(MAKE) -f GNUmakefile.gcc_plugin
 +  $(MAKE) -f GNUmakefile.gcc_plugin
@@ -116,7 +117,7 @@ https://bugs.gentoo.org/800941
  .PHONY: source-only
  source-only: all
 -  -$(MAKE) -j4 -f GNUmakefile.llvm
-+  $(MAKE) -j4 -f GNUmakefile.llvm
++  $(MAKE) -f GNUmakefile.llvm
  ifneq "$(SYS)" "Darwin"
 -  -$(MAKE) -f GNUmakefile.gcc_plugin
 +  $(MAKE) -f GNUmakefile.gcc_plugin



[gentoo-commits] repo/gentoo:master commit in: app-emacs/nxml-libvirt-schemas/

2022-07-04 Thread Sam James
commit: e7290b9b5d96d41dd50b167e548c4ff45ee48dc7
Author: Michal Privoznik  gmail  com>
AuthorDate: Mon Jul  4 07:06:09 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 23:20:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7290b9b

app-emacs/nxml-libvirt-schemas: add 8.5.0

Signed-off-by: Michal Privoznik  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26215
Signed-off-by: Sam James  gentoo.org>

 app-emacs/nxml-libvirt-schemas/Manifest|  1 +
 .../nxml-libvirt-schemas-8.5.0.ebuild  | 41 ++
 2 files changed, 42 insertions(+)

diff --git a/app-emacs/nxml-libvirt-schemas/Manifest 
b/app-emacs/nxml-libvirt-schemas/Manifest
index 6187b57663cd..6fbfa78b364f 100644
--- a/app-emacs/nxml-libvirt-schemas/Manifest
+++ b/app-emacs/nxml-libvirt-schemas/Manifest
@@ -2,3 +2,4 @@ DIST libvirt-5.8.0.tar.xz 13129328 BLAKE2B 
ff49b0b6dca86f35c68edfb880677c88e0aed
 DIST libvirt-7.10.0.tar.xz 8798000 BLAKE2B 
6cb2ab5913d382b11d24b46154dc3250355050cd3038f64ba571b35f33ae5bd0a322d4b96469bd6c78fd848c87f2e6fc7213c33e5bdb9d375a9b81d2a40899bb
 SHA512 
c7eecc9538b68852a8cc67565566d64ec7b087b6f009858b2eb524bc3ef0f6ca3c0da67edf801e6a3ae3fcc0364e65e108fa92bcb01ee810c85fa5f37785aa32
 DIST libvirt-8.3.0.tar.xz 8829288 BLAKE2B 
37890dac8f46e14c5f0329f7f3318b611bfe3b97b7beddcdb91541e71a619738baa2a3e9847fee2d0b63abb630895860555a5337686702fc6fb06cc4f060f8b5
 SHA512 
914c8a4884d703f368849b852ba8330d1b17cf598a359f70d344e0a94e02f60337216e9011cbeba90eb4e87fa644e7eb9e8a407ca58632b2b41511d3f598ff71
 DIST libvirt-8.4.0.tar.xz 8846528 BLAKE2B 
479d7d47a9d711e0240da09eb295f1a644bc4cfddbe544908f2011eb45dff9cf9ffdfff87ba63ded96f5b69024c65832326f9fb0837c5338114ad5dbbada7af1
 SHA512 
e9dcaa489f162e3a26fe1ca7bb83a22e3f1952594c3541ddd2a7f8e8a0e6ad37e193fb89421df1efe3d2a4d9bb7cf5455c7b7a0b59e133eb6c0ff3cbbd8403b6
+DIST libvirt-8.5.0.tar.xz 8886088 BLAKE2B 
a789b5d4d4f3d359403b53b1b6bdc31ddd8938d12fce3c77e953a30be359a3f75071c385bc8ce3df11ccc7ad682e433c067781948cf107abef84e54d5aadd0d9
 SHA512 
62b05c5cd58eab0ab2d945b832fd85807aea9b5f12a7ef5d1205fe0edac8d361ba3a9245f60f200a8548c96f718943d4502d87fff87c4495bd1e2637f14aaccf

diff --git a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.5.0.ebuild 
b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.5.0.ebuild
new file mode 100644
index ..acb053083ec6
--- /dev/null
+++ b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.5.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+inherit elisp
+
+MY_P="libvirt-${PV}"
+DESCRIPTION="Extension for nxml-mode with libvirt schemas"
+HOMEPAGE="http://www.libvirt.org/;
+SRC_URI="http://libvirt.org/sources/${MY_P}.tar.xz;
+S="${WORKDIR}/${MY_P%-rc*}/src/conf/schemas"
+
+# This is the license of the package, but the schema files are
+# provided without license, maybe it's bad.
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Yes this requires Java, but I'd rather not repackage this, if you
+# know something better in C, I'll be glad to use that.
+BDEPEND="app-text/trang"
+
+SITEFILE="60${PN}-gentoo.el"
+
+src_compile() {
+   emake -f "${FILESDIR}"/Makefile-trang
+}
+
+src_install() {
+   insinto "${SITEETC}/${PN}"
+   doins "${FILESDIR}"/schemas.xml *.rnc
+   elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}



[gentoo-commits] repo/gentoo:master commit in: app-forensics/aflplusplus/

2022-07-04 Thread Sam James
commit: 85db2b0d3b94be573a063b56b4181e92eaa901d5
Author: Alexander Miller  gmx  de>
AuthorDate: Mon Jul  4 20:06:24 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 23:24:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85db2b0d

app-forensics/aflplusplus: Don't try to strip test cases

Signed-off-by: Alexander Miller  gmx.de>
Signed-off-by: Sam James  gentoo.org>

 app-forensics/aflplusplus/aflplusplus-4.01c.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-forensics/aflplusplus/aflplusplus-4.01c.ebuild 
b/app-forensics/aflplusplus/aflplusplus-4.01c.ebuild
index 18186168e86e..5ff60c119327 100644
--- a/app-forensics/aflplusplus/aflplusplus-4.01c.ebuild
+++ b/app-forensics/aflplusplus/aflplusplus-4.01c.ebuild
@@ -80,6 +80,7 @@ src_install() {
DOC_PATH="${EPREFIX}/usr/share/doc/${PF}" \
MAN_PATH="${EPREFIX}/usr/share/man/man8" \
install
+   dostrip -x /usr/share/afl/testcases/
 }
 
 pkg_postinst() {



[gentoo-commits] repo/gentoo:master commit in: app-forensics/yara/

2022-07-04 Thread Sam James
commit: 400298c4db1d19f1d1bdcdfdcbca688563c29a02
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Mon Jul  4 19:44:34 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 23:23:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=400298c4

app-forensics/yara: don't install static libraries with FEATURES=test

Closes: https://bugs.gentoo.org/856085
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/26224
Signed-off-by: Sam James  gentoo.org>

 app-forensics/yara/yara-4.2.0-r1.ebuild | 2 +-
 app-forensics/yara/yara-4.2.1.ebuild| 2 +-
 app-forensics/yara/yara-4.2.2.ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-forensics/yara/yara-4.2.0-r1.ebuild 
b/app-forensics/yara/yara-4.2.0-r1.ebuild
index 55e7f11069d5..a4761519106a 100644
--- a/app-forensics/yara/yara-4.2.0-r1.ebuild
+++ b/app-forensics/yara/yara-4.2.0-r1.ebuild
@@ -53,5 +53,5 @@ src_install() {
 
# TODO: Allow tests to work against dyn. lib rather than building
# statically just for tests.
-   find "${ED}" -name '*.a' -o -name '*.la' -delete || die
+   find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
 }

diff --git a/app-forensics/yara/yara-4.2.1.ebuild 
b/app-forensics/yara/yara-4.2.1.ebuild
index 55e7f11069d5..a4761519106a 100644
--- a/app-forensics/yara/yara-4.2.1.ebuild
+++ b/app-forensics/yara/yara-4.2.1.ebuild
@@ -53,5 +53,5 @@ src_install() {
 
# TODO: Allow tests to work against dyn. lib rather than building
# statically just for tests.
-   find "${ED}" -name '*.a' -o -name '*.la' -delete || die
+   find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
 }

diff --git a/app-forensics/yara/yara-4.2.2.ebuild 
b/app-forensics/yara/yara-4.2.2.ebuild
index 6370d398ea67..cf8905b87957 100644
--- a/app-forensics/yara/yara-4.2.2.ebuild
+++ b/app-forensics/yara/yara-4.2.2.ebuild
@@ -53,5 +53,5 @@ src_install() {
 
# TODO: Allow tests to work against dyn. lib rather than building
# statically just for tests.
-   find "${ED}" -name '*.a' -o -name '*.la' -delete || die
+   find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
 }



[gentoo-commits] repo/gentoo:master commit in: app-forensics/aflplusplus/files/

2022-07-04 Thread Sam James
commit: 6c36e7b2994f088b837e6c6bbafba573ecd9ff50
Author: Alexander Miller  gmx  de>
AuthorDate: Mon Jul  4 16:56:28 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 23:24:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c36e7b2

app-forensics/aflplusplus: Disable LTO for runtime

Runtime files get installed as object files or static archives and
shouldn't contain IR. Otherwise, gcc/clang mismatches can cause failures.

Signed-off-by: Alexander Miller  gmx.de>
Signed-off-by: Sam James  gentoo.org>

 .../files/aflplusplus-4.01c-respect-flags.patch   | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git 
a/app-forensics/aflplusplus/files/aflplusplus-4.01c-respect-flags.patch 
b/app-forensics/aflplusplus/files/aflplusplus-4.01c-respect-flags.patch
index e4d56c25095e..ebe638f1a86c 100644
--- a/app-forensics/aflplusplus/files/aflplusplus-4.01c-respect-flags.patch
+++ b/app-forensics/aflplusplus/files/aflplusplus-4.01c-respect-flags.patch
@@ -1,6 +1,7 @@
 * Respect CFLAGS everywhere when building.
 * Ignore build flags then when testing the CC wrappers (could contain
   incompatible flags).
+* Disable LTO for runtime objects, these shouldn't contain IR.
 
 --- a/GNUmakefile
 +++ b/GNUmakefile
@@ -29,17 +30,17 @@
  
  ./afl-compiler-rt.o: instrumentation/afl-compiler-rt.o.c
 -  $(CC) $(CFLAGS_SAFE) $(CPPFLAGS) -O3 -Wno-unused-result -fPIC -c $< -o 
$@
-+  $(CC) $(CFLAGS) $(CFLAGS_SAFE) $(CPPFLAGS) -Wno-unused-result -fPIC -c 
$< -o $@
++  $(CC) $(CFLAGS) $(CFLAGS_SAFE) $(CPPFLAGS) -Wno-unused-result -fPIC 
-fno-lto -c $< -o $@
  
  ./afl-compiler-rt-32.o: instrumentation/afl-compiler-rt.o.c
@printf "[*] Building 32-bit variant of the runtime (-m32)... "
 -  @$(CC) $(CFLAGS_SAFE) $(CPPFLAGS) -O3 -Wno-unused-result -m32 -fPIC -c 
$< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; else echo 
"failed (that's fine)"; fi
-+  @$(CC) $(CFLAGS) $(CFLAGS_SAFE) $(CPPFLAGS) -Wno-unused-result -m32 
-fPIC -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; else 
echo "failed (that's fine)"; fi
++  @$(CC) $(CFLAGS) $(CFLAGS_SAFE) $(CPPFLAGS) -Wno-unused-result -m32 
-fPIC -fno-lto -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo 
"success!"; else echo "failed (that's fine)"; fi
  
  ./afl-compiler-rt-64.o: instrumentation/afl-compiler-rt.o.c
@printf "[*] Building 64-bit variant of the runtime (-m64)... "
 -  @$(CC) $(CFLAGS_SAFE) $(CPPFLAGS) -O3 -Wno-unused-result -m64 -fPIC -c 
$< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; else echo 
"failed (that's fine)"; fi
-+  @$(CC) $(CFLAGS) $(CFLAGS_SAFE) $(CPPFLAGS) -Wno-unused-result -m64 
-fPIC -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; else 
echo "failed (that's fine)"; fi
++  @$(CC) $(CFLAGS) $(CFLAGS_SAFE) $(CPPFLAGS) -Wno-unused-result -m64 
-fPIC -fno-lto -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo 
"success!"; else echo "failed (that's fine)"; fi
  
  ./afl-gcc-pass.so: instrumentation/afl-gcc-pass.so.cc | test_deps
 -  $(CXX) $(CXXEFLAGS) $(PLUGIN_FLAGS) -shared $< -o $@
@@ -62,17 +63,17 @@
  
  ./afl-compiler-rt.o: instrumentation/afl-compiler-rt.o.c
 -  $(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -O3 -Wno-unused-result 
-fPIC -c $< -o $@
-+  $(CC) $(CFLAGS) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) 
-Wno-unused-result -fPIC -c $< -o $@
++  $(CC) $(CFLAGS) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) 
-Wno-unused-result -fPIC -fno-lto -c $< -o $@
  
  ./afl-compiler-rt-32.o: instrumentation/afl-compiler-rt.o.c
@printf "[*] Building 32-bit variant of the runtime (-m32)... "
 -  @$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -O3 -Wno-unused-result 
-m32 -fPIC -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; 
else echo "failed (that's fine)"; fi
-+  @$(CC) $(CFLAGS) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) 
-Wno-unused-result -m32 -fPIC -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then 
echo "success!"; else echo "failed (that's fine)"; fi
++  @$(CC) $(CFLAGS) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) 
-Wno-unused-result -m32 -fPIC -fno-lto -c $< -o $@ 2>/dev/null; if [ "$$?" = 
"0" ]; then echo "success!"; else echo "failed (that's fine)"; fi
  
  ./afl-compiler-rt-64.o: instrumentation/afl-compiler-rt.o.c
@printf "[*] Building 64-bit variant of the runtime (-m64)... "
 -  @$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -O3 -Wno-unused-result 
-m64 -fPIC -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; 
else echo "failed (that's fine)"; fi
-+  @$(CC) $(CFLAGS) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) 
-Wno-unused-result -m64 -fPIC -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then 
echo "success!"; else echo "failed (that's fine)"; fi
++  @$(CC) $(CFLAGS) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) 
-Wno-unused-result -m64 -fPIC -fno-lto -c $< -o $@ 2>/dev/null; if [ 

[gentoo-commits] repo/gentoo:master commit in: app-forensics/aflplusplus/, app-forensics/aflplusplus/files/

2022-07-04 Thread Sam James
commit: 4c38bde47bbac4eaf8654581b9806a11780b298f
Author: Alexander Miller  gmx  de>
AuthorDate: Mon Jul  4 16:10:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 23:24:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c38bde4

app-forensics/aflplusplus: add 4.01c

Closes: https://bugs.gentoo.org/856337
Signed-off-by: Alexander Miller  gmx.de>
Signed-off-by: Sam James  gentoo.org>

 app-forensics/aflplusplus/Manifest |   1 +
 app-forensics/aflplusplus/aflplusplus-4.01c.ebuild |  88 
 ...lplusplus-4.01c-no-ignore-errors-makefile.patch | 154 +
 .../files/aflplusplus-4.01c-respect-flags.patch| 123 
 4 files changed, 366 insertions(+)

diff --git a/app-forensics/aflplusplus/Manifest 
b/app-forensics/aflplusplus/Manifest
index a99f8f055073..3e2e5b638831 100644
--- a/app-forensics/aflplusplus/Manifest
+++ b/app-forensics/aflplusplus/Manifest
@@ -1 +1,2 @@
 DIST aflplusplus-4.00c.tar.gz 2805041 BLAKE2B 
c1ce15aa9860fc02a7d6f608cae9dd8987b72253b465ea734c721d1b6927e482c31b907aeafe82c00618465227e2e140bfc595151ea5d73037638c3ee630872c
 SHA512 
23a7a4260e581f7c212393e1e14704464bbbc3ff5465b3472db31c6c7f2cd25a9ecc5ad81fad8958c775fcd01b22269085e6c69419a07fbbdb9ec317a3e39beb
+DIST aflplusplus-4.01c.tar.gz 2818445 BLAKE2B 
f3699c4b2fabec0ab238277c3b2c7b19b35af7a0b82b14a57c34b8579121cfa0644ef432132cf4a3382547db3faf799d2ab601512ddfb469e4a2246cdb61aa7f
 SHA512 
d2b03ab4ff9538fe0b52aa3ed4778a6e5657d64d6f0e5f75a99305bad69c5179d6b1c882650f19a884a740577acb73dab7cee3d5c9c7b06ff2326ffeba37d1fe

diff --git a/app-forensics/aflplusplus/aflplusplus-4.01c.ebuild 
b/app-forensics/aflplusplus/aflplusplus-4.01c.ebuild
new file mode 100644
index ..b304644ff905
--- /dev/null
+++ b/app-forensics/aflplusplus/aflplusplus-4.01c.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+LLVM_MAX_SLOT=14
+inherit toolchain-funcs llvm optfeature python-single-r1
+
+DESCRIPTION="A fork of AFL, the popular compile-time instrumentation fuzzer"
+HOMEPAGE="https://github.com/AFLplusplus/AFLplusplus;
+SRC_URI="https://github.com/AFLplusplus/AFLplusplus/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+S="${WORKDIR}/AFLplusplus-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Tests involve heavy use of LD_PRELOAD in some cases
+# This isn't compatible with sandbox
+RESTRICT="test"
+
+# It turns out we need Clang too
+RDEPEND="${PYTHON_DEPS}
+   >=sys-devel/llvm-12:=
+   || (
+   sys-devel/clang:12
+   sys-devel/clang:13
+   sys-devel/clang:${LLVM_MAX_SLOT}
+   )
+   !app-forensics/afl"
+DEPEND="${RDEPEND}
+   test? ( dev-util/cmocka )"
+
+QA_PREBUILT="usr/share/afl/testcases/others/elf/small_exec.elf"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.01c-respect-flags.patch
+   "${FILESDIR}"/${PN}-4.01c-no-ignore-errors-makefile.patch
+)
+
+llvm_check_deps() {
+   has_version -b "sys-devel/clang:${LLVM_SLOT}" && \
+   has_version -b "sys-devel/llvm:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+   llvm_pkg_setup
+   python-single-r1_pkg_setup
+}
+
+src_compile() {
+   emake \
+   CC="$(tc-getCC)" \
+   CXX="$(tc-getCXX)" \
+   CFLAGS_FLTO="" \
+   PREFIX="${EPREFIX}/usr" \
+   HELPER_PATH="${EPREFIX}/usr/$(get_libdir)/afl" \
+   DOC_PATH="${EPREFIX}/usr/share/doc/${PF}" \
+   MAN_PATH="${EPREFIX}/usr/share/man/man8"
+}
+
+src_test() {
+   emake \
+   CC="$(tc-getCC)" \
+   CXX="$(tc-getCXX)"
+}
+
+src_install() {
+   emake \
+   CC="$(tc-getCC)" \
+   CXX="$(tc-getCXX)" \
+   DESTDIR="${D}" \
+   PREFIX="${EPREFIX}/usr" \
+   HELPER_PATH="${EPREFIX}/usr/$(get_libdir)/afl" \
+   DOC_PATH="${EPREFIX}/usr/share/doc/${PF}" \
+   MAN_PATH="${EPREFIX}/usr/share/man/man8" \
+   install
+}
+
+pkg_postinst() {
+   # TODO: Any others?
+   optfeature "fuzzing with AFL_USE_ASAN" 
sys-libs/compiler-rt-sanitizers[asan]
+   optfeature "fuzzing with AFL_USE_MSAN" 
sys-libs/compiler-rt-sanitizers[msan]
+}

diff --git 
a/app-forensics/aflplusplus/files/aflplusplus-4.01c-no-ignore-errors-makefile.patch
 
b/app-forensics/aflplusplus/files/aflplusplus-4.01c-no-ignore-errors-makefile.patch
new file mode 100644
index ..95718bb3a32d
--- /dev/null
+++ 
b/app-forensics/aflplusplus/files/aflplusplus-4.01c-no-ignore-errors-makefile.patch
@@ -0,0 +1,154 @@
+https://bugs.gentoo.org/800941
+
+--- a/GNUmakefile
 b/GNUmakefile
+@@ -308,17 +308,17 @@ endif
+ 
+ .PHONY: all
+ all:  test_x86 test_shm test_python ready $(PROGS) afl-as llvm gcc_plugin 
test_build 

[gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/

2022-07-04 Thread Sam James
commit: a38cc9e5a1c3263d46a419eabda387e020ac54eb
Author: Thomas Bracht Laumann Jespersen  laumann  xyz>
AuthorDate: Mon Jul  4 14:38:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 23:22:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a38cc9e5

app-shells/zsh: fix docs building on live ebuild

Original proposed patch was provided in the docs, but adjusted to
generate docs in src_compile instead of src_install.

Closes: https://bugs.gentoo.org/661802
Co-authored-by: Aidan Harris  aidanharr.is>
Signed-off-by: Thomas Bracht Laumann Jespersen  laumann.xyz>
Closes: https://github.com/gentoo/gentoo/pull/26220
Signed-off-by: Sam James  gentoo.org>

 app-shells/zsh/zsh-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/zsh/zsh-.ebuild b/app-shells/zsh/zsh-.ebuild
index d50d9b419785..3493b711314b 100644
--- a/app-shells/zsh/zsh-.ebuild
+++ b/app-shells/zsh/zsh-.ebuild
@@ -127,7 +127,7 @@ src_compile() {
default
 
if [[ ${PV} == * ]] && use doc ; then
-   emake -C Doc everything
+   emake -C Doc everything pdf dvi
fi
 }
 



[gentoo-commits] repo/gentoo:master commit in: app-forensics/aflplusplus/files/

2022-07-04 Thread Sam James
commit: 55dbef339a5303eea0c707b2c1b5fa9f523276ae
Author: Alexander Miller  gmx  de>
AuthorDate: Mon Jul  4 17:15:04 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 23:24:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55dbef33

app-forensics/aflplusplus: Respect CC and CPPFLAGS when building aflpp_driver

Note that using user's CFLAGS with hard-coded clang can cause trouble.

Signed-off-by: Alexander Miller  gmx.de>
Signed-off-by: Sam James  gentoo.org>

 .../files/aflplusplus-4.01c-respect-flags.patch| 47 +-
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git 
a/app-forensics/aflplusplus/files/aflplusplus-4.01c-respect-flags.patch 
b/app-forensics/aflplusplus/files/aflplusplus-4.01c-respect-flags.patch
index ebe638f1a86c..1cfc03d5f42b 100644
--- a/app-forensics/aflplusplus/files/aflplusplus-4.01c-respect-flags.patch
+++ b/app-forensics/aflplusplus/files/aflplusplus-4.01c-respect-flags.patch
@@ -1,4 +1,4 @@
-* Respect CFLAGS everywhere when building.
+* Respect CC, CFLAGS, CPPFLAGS, LDFLAGS everywhere when building.
 * Ignore build flags then when testing the CC wrappers (could contain
   incompatible flags).
 * Disable LTO for runtime objects, these shouldn't contain IR.
@@ -131,7 +131,7 @@
  
 --- a/utils/aflpp_driver/GNUmakefile
 +++ b/utils/aflpp_driver/GNUmakefile
-@@ -13,7 +13,8 @@ ifneq "" "$(LLVM_BINDIR)"
+@@ -13,40 +13,41 @@ ifneq "" "$(LLVM_BINDIR)"
LLVM_BINDIR := $(LLVM_BINDIR)/
  endif
  
@@ -141,3 +141,46 @@
  
  all:  libAFLDriver.a libAFLQemuDriver.a aflpp_qemu_driver_hook.so
  
+ aflpp_driver.o:   aflpp_driver.c
+-  -$(LLVM_BINDIR)clang -I. -I../../include $(CFLAGS) -c aflpp_driver.c
++  $(CC) $(CPPFLAGS) -I. -I../../include $(CFLAGS) -c aflpp_driver.c
+ 
+ libAFLDriver.a:   aflpp_driver.o
+-  @ar rc libAFLDriver.a aflpp_driver.o
++  ar rc libAFLDriver.a aflpp_driver.o
+   @cp -vf libAFLDriver.a ../../
+ 
+ debug:
+-  $(LLVM_BINDIR)clang -Wno-deprecated -I../../include $(CFLAGS) 
-D_DEBUG=\"1\" -c -o afl-performance.o ../../src/afl-performance.c
+-  $(LLVM_BINDIR)clang -I../../include -D_DEBUG=\"1\" -g -funroll-loops -c 
aflpp_driver.c
++  $(CC) $(CPPFLAGS) -Wno-deprecated -I../../include $(CFLAGS) 
-D_DEBUG=\"1\" -c -o afl-performance.o ../../src/afl-performance.c
++  $(CC) $(CPPFLAGS) -I../../include -D_DEBUG=\"1\" $(CFLAGS) -g 
-funroll-loops -c aflpp_driver.c
+   #$(LLVM_BINDIR)clang -S -emit-llvm -Wno-deprecated -I../../include 
$(CFLAGS) -D_DEBUG=\"1\" -c -o afl-performance.ll ../../src/afl-performance.c
+   #$(LLVM_BINDIR)clang -S -emit-llvm -I../../include -D_DEBUG=\"1\" -g 
-funroll-loops -c aflpp_driver.c
+   ar rc libAFLDriver.a afl-performance.o aflpp_driver.o
+ 
+ aflpp_qemu_driver.o:  aflpp_qemu_driver.c
+-  -$(LLVM_BINDIR)clang $(CFLAGS) -O0 -funroll-loops -c aflpp_qemu_driver.c
++  $(CC) $(CPPFLAGS) $(CFLAGS) -O0 -funroll-loops -c aflpp_qemu_driver.c
+ 
+ libAFLQemuDriver.a:   aflpp_qemu_driver.o
+-  @-ar rc libAFLQemuDriver.a aflpp_qemu_driver.o
+-  @-cp -vf libAFLQemuDriver.a ../../
++  ar rc libAFLQemuDriver.a aflpp_qemu_driver.o
++  @cp -vf libAFLQemuDriver.a ../../
+ 
+ aflpp_qemu_driver_hook.so:aflpp_qemu_driver_hook.o
+-  @-test -e aflpp_qemu_driver_hook.o && $(LLVM_BINDIR)clang $(LDFLAGS) 
-shared aflpp_qemu_driver_hook.o -o aflpp_qemu_driver_hook.so || echo "Note: 
Optional aflpp_qemu_driver_hook.so not built."
++  @test -e aflpp_qemu_driver_hook.o && $(CC) $(LDFLAGS) -shared 
aflpp_qemu_driver_hook.o -o aflpp_qemu_driver_hook.so || echo "Note: Optional 
aflpp_qemu_driver_hook.so not built."
+ 
+ aflpp_qemu_driver_hook.o: aflpp_qemu_driver_hook.c
+-  @-test -e ../../qemu_mode/qemuafl/qemuafl/api.h && $(LLVM_BINDIR)clang 
$(CFLAGS) -funroll-loops -c aflpp_qemu_driver_hook.c || echo "Note: Optional 
aflpp_qemu_driver_hook.o not built."
++  @test -e ../../qemu_mode/qemuafl/qemuafl/api.h && $(CC) $(CPPFLAGS) 
$(CFLAGS) -funroll-loops -c aflpp_qemu_driver_hook.c || echo "Note: Optional 
aflpp_qemu_driver_hook.o not built."
+ 
+ test: debug
+   #clang -S -emit-llvm -D_DEBUG=\"1\" -I../../include 
-Wl,--allow-multiple-definition -funroll-loops -o aflpp_driver_test.ll 
aflpp_driver_test.c
+-  afl-clang-fast -D_DEBUG=\"1\" -I../../include 
-Wl,--allow-multiple-definition -funroll-loops -o aflpp_driver_test 
aflpp_driver_test.c libAFLDriver.a afl-performance.o
++  ../../afl-clang-fast -D_DEBUG=\"1\" -I../../include 
-Wl,--allow-multiple-definition -funroll-loops -o aflpp_driver_test 
aflpp_driver_test.c libAFLDriver.a afl-performance.o
+ 
+ clean:
+   rm -f *.o libAFLDriver*.a libAFLQemuDriver.a aflpp_qemu_driver_hook.so 
*~ core aflpp_driver_test



[gentoo-commits] repo/gentoo:master commit in: dev-python/libvirt-python/

2022-07-04 Thread Sam James
commit: a59b640581a2ec32d6c2a2768d73a2b65d982a14
Author: Michal Privoznik  gmail  com>
AuthorDate: Mon Jul  4 07:05:15 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 23:20:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a59b6405

dev-python/libvirt-python: add 8.5.0

Signed-off-by: Michal Privoznik  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 dev-python/libvirt-python/Manifest |  2 +
 .../libvirt-python/libvirt-python-8.5.0.ebuild | 56 ++
 2 files changed, 58 insertions(+)

diff --git a/dev-python/libvirt-python/Manifest 
b/dev-python/libvirt-python/Manifest
index bc4ae5f19b75..95cd7e51cc42 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -12,3 +12,5 @@ DIST libvirt-python-8.3.0.tar.gz 231579 BLAKE2B 
0bd169b66f490e100eab95f94f412d27
 DIST libvirt-python-8.3.0.tar.gz.asc 833 BLAKE2B 
bb19bef914e39d04b6580dcce1813bc21c5213a2b4c88d44686eeecc9ffc9383db3bab62d46840138a9a9e80d6429662aec43d586dddc041bca4543ff49c465b
 SHA512 
65d417a6849614f94a59dca94cb258b7de487fbc409cd2cfc8c3e9cbdc76ae83c6c2c40a0cf4c12877d2fa78bbcf371512ca6f71973466d2151be690a8b4422c
 DIST libvirt-python-8.4.0.tar.gz 231985 BLAKE2B 
64d37074e04cdb02332987dc46e6dd7b38dbc8fa4de0e6e1cbde1caba370f5eed650c4a135f6101c355f189a91fbba82dcac3d50f8c0d0678ce4def448a4b168
 SHA512 
6c831ae45549ab0c4d720826e2f5cb219eaab0943b8c71fe70c02fd49097fb5565ee6f651b19e34f72d6b0133bf3b4bb8bfe56b37723b24eaf336f65ab0a5865
 DIST libvirt-python-8.4.0.tar.gz.asc 833 BLAKE2B 
fa6f5e10ca3e06c017e9988e676dd2beca2bcb88f4d55d7a1740d42b4ea56ff0cdb4fd7698392ce1eead7a81fafcc1475eb6270329f56e191a4a4551120e982b
 SHA512 
855869856ff41338c4ed1b707db4a0ace97a60e51d19183a0c1f904695b8a367249ae6266a45d79449443325cc85485db89dc73b09ac318c206cc03ab36ef179
+DIST libvirt-python-8.5.0.tar.gz 235414 BLAKE2B 
616c8415f94a6c53b9bcd6ff7433993a3d40eb49ff13eaf81eee52c52806fb1d281216e8bd591d6058e2cb5161310d0ae1217467cd1f0525c00d7252214d
 SHA512 
0e922301243200229c01659e57b4abad69a85931ea3ffcb70b117f313971d266d036dc6c1dbe42d48380d5ad9ed72326603101eb33d6a68dd6b7253a6e197aff
+DIST libvirt-python-8.5.0.tar.gz.asc 833 BLAKE2B 
5b3c37ee02d6a5cefcc81945b9f4c67f19d297f03ad16e2666e87c3ea54ac609d774d3bb90a47e4098914460fd0928f66641f52185fe367cad9794636a809836
 SHA512 
4fae1d23f7ef2fccb38dee397173f3571b64969672cbe297e3622b9a0194e4a434329de543e886a4a20a9e1e0e3f1fec10a08d924ec0e728b9e29a44877c7e24

diff --git a/dev-python/libvirt-python/libvirt-python-8.5.0.ebuild 
b/dev-python/libvirt-python/libvirt-python-8.5.0.ebuild
new file mode 100644
index ..59818c6c51d9
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-8.5.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+MY_P="${P/_rc/-rc}"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
+inherit distutils-r1 verify-sig
+
+if [[ ${PV} == ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt-python.git;
+   RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+   SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
+   verify-sig? ( 
https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
+   KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+   RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org;
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+   virtual/pkgconfig
+   test? (
+   dev-python/lxml[${PYTHON_USEDEP}]
+   )
+   verify-sig? ( sec-keys/openpgp-keys-libvirt )
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+   if use examples; then
+   dodoc -r examples
+   docompress -x /usr/share/doc/${PF}/examples
+   fi
+
+   distutils-r1_python_install_all
+}



[gentoo-commits] repo/gentoo:master commit in: dev-perl/Sys-Virt/

2022-07-04 Thread Sam James
commit: 2fd8a7722ac7fdf4ba9443cf775b840e460a1c15
Author: Michal Privoznik  gmail  com>
AuthorDate: Mon Jul  4 07:05:43 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 23:20:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fd8a772

dev-perl/Sys-Virt: add 8.5.0

Signed-off-by: Michal Privoznik  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 dev-perl/Sys-Virt/Manifest  |  1 +
 dev-perl/Sys-Virt/Sys-Virt-8.5.0.ebuild | 44 +
 2 files changed, 45 insertions(+)

diff --git a/dev-perl/Sys-Virt/Manifest b/dev-perl/Sys-Virt/Manifest
index ecf1e0a7606e..017095d5197e 100644
--- a/dev-perl/Sys-Virt/Manifest
+++ b/dev-perl/Sys-Virt/Manifest
@@ -3,3 +3,4 @@ DIST Sys-Virt-v7.5.0.tar.gz 166656 BLAKE2B 
466341cc081d1dedc0ad5ae9042a829256a31
 DIST Sys-Virt-v8.1.0.tar.gz 169008 BLAKE2B 
23d3aee186b4ede35c1b5b99691a491e64995abf34e7ce65143c7b88851dca0841cfa27a3033e246f35bacda879dd09c3b31f9dcff54d04c0d47a77b4b61d723
 SHA512 
9d7660f96cf370a0e08140bf7badddae2dac84d7231f1fe7a616650ac4d333ba17c6531ab0662f34c4cb12b00ce39abe36ff24a1913f554026346725d0148fa7
 DIST Sys-Virt-v8.3.0.tar.gz 169060 BLAKE2B 
cff54463afe9cc8ac2c6fab5f00bb00b3bb38eba816e09e417fc3d9881ae6efe8c076066b7d5c61bda2043eb6c728d025072069a059f61e954f8b482793cfa94
 SHA512 
902a1a16fbe64b1146998c57dce35dc32d9c717d3609933a288c9f449c12faeab9a1ef178c53b627869261b8036df50c2f39596df657d3a20cc6ceb9612634a3
 DIST Sys-Virt-v8.4.0.tar.gz 170680 BLAKE2B 
0b6c40bcfeba0f5c98fea0e17e3ecc434cc5adf14ed5a92c9c7424a5745e3327c1a8ef05c79ba182d4eebd04b50abcafc68c59e8064ba28faf78bebbb500dbc2
 SHA512 
25c5b9013df2a916352c07be693c9a9410a4d3caf92a1da106176df314efa534078b5d4dc2501b9afda5ae1628ccf1394a346410972f6ebdd2282971c3efc17a
+DIST Sys-Virt-v8.5.0.tar.gz 170318 BLAKE2B 
7ec1bef9814d85ed5aad1e50c6f01d8c133cb5d537ca9f0bc1e21c4bb955a9bc1bf8bee127da7747c7ed8b29509b84cba4c52d5b49d343cd393056b29b32ba5d
 SHA512 
acc839c4ff9e8dfd6660f32959b2baea94ea0e9fd77a6455a8c0c2010f7bb983ad7457349e77ee8494080fe62c4493462ac53b66a8eae1ad28e67828fef60434

diff --git a/dev-perl/Sys-Virt/Sys-Virt-8.5.0.ebuild 
b/dev-perl/Sys-Virt/Sys-Virt-8.5.0.ebuild
new file mode 100644
index ..102da3e02976
--- /dev/null
+++ b/dev-perl/Sys-Virt/Sys-Virt-8.5.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+DIST_AUTHOR=DANBERR
+DIST_VERSION=v${PV}
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="API for using the libvirt library from Perl"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+   >=app-emulation/libvirt-${PV}
+"
+BDEPEND="${RDEPEND}
+   virtual/perl-ExtUtils-CBuilder
+   dev-perl/Module-Build
+   virtual/pkgconfig
+   test? (
+   dev-perl/CPAN-Changes
+   dev-perl/Test-More-UTF8
+   dev-perl/Test-Pod-Coverage
+   dev-perl/XML-XPath
+   virtual/perl-Test-Simple
+   virtual/perl-Time-HiRes
+   )"
+DEPEND="
+   >=app-emulation/libvirt-${PV}
+"
+
+src_compile() {
+   MAKEOPTS+=" -j1" perl-module_src_compile
+}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/

2022-07-04 Thread Sam James
commit: 29fbca71c7b3066edae261709f796c33db4463e5
Author: Michal Privoznik  gmail  com>
AuthorDate: Mon Jul  4 07:03:40 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 23:20:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29fbca71

app-emulation/libvirt: add 8.5.0

Signed-off-by: Michal Privoznik  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-emulation/libvirt/Manifest |   2 +
 app-emulation/libvirt/libvirt-8.5.0.ebuild | 340 +
 2 files changed, 342 insertions(+)

diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 879c08d531e1..d365dcb0b366 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -12,3 +12,5 @@ DIST libvirt-8.3.0.tar.xz 8829288 BLAKE2B 
37890dac8f46e14c5f0329f7f3318b611bfe3b
 DIST libvirt-8.3.0.tar.xz.asc 833 BLAKE2B 
d1faf041532fc4c33641cab0510401db2fb1c45004f2615df6807729d7a83a8a28bd2410eb5478e479e7cd1b28272ee92885b30ecdccb8a9390536df51377d5e
 SHA512 
5c32087769aba0d2a245a4ce317e1428842a682cf71e03e5f33fc4476309f40c08118241b1ad2b4be14933971431960b89960858a1f841ab1b7c9bda9f571d52
 DIST libvirt-8.4.0.tar.xz 8846528 BLAKE2B 
479d7d47a9d711e0240da09eb295f1a644bc4cfddbe544908f2011eb45dff9cf9ffdfff87ba63ded96f5b69024c65832326f9fb0837c5338114ad5dbbada7af1
 SHA512 
e9dcaa489f162e3a26fe1ca7bb83a22e3f1952594c3541ddd2a7f8e8a0e6ad37e193fb89421df1efe3d2a4d9bb7cf5455c7b7a0b59e133eb6c0ff3cbbd8403b6
 DIST libvirt-8.4.0.tar.xz.asc 833 BLAKE2B 
7bfbfc05ce7d95018c07e92d475bc0fddbb0b396132c12defd0205638d22534ba83fea8180345635b9f59b8a10fd3177b1a84ad748f1ddb9e533e11700bd4cbd
 SHA512 
5d85ce4764dc36d940033c5feda59b9cff64844a52e3a25b1b8d0278adbc2378978a7dbe6f577f82bc760d617edc75c4a6ab8e1325a38847e1d40e3bf7c9684b
+DIST libvirt-8.5.0.tar.xz 8886088 BLAKE2B 
a789b5d4d4f3d359403b53b1b6bdc31ddd8938d12fce3c77e953a30be359a3f75071c385bc8ce3df11ccc7ad682e433c067781948cf107abef84e54d5aadd0d9
 SHA512 
62b05c5cd58eab0ab2d945b832fd85807aea9b5f12a7ef5d1205fe0edac8d361ba3a9245f60f200a8548c96f718943d4502d87fff87c4495bd1e2637f14aaccf
+DIST libvirt-8.5.0.tar.xz.asc 833 BLAKE2B 
2e4ee3309e409fa700b0e09c067d2d7978f5033bc947108012582a9ba4b6a5438a2f419375e10b342dd0082560768eab1913aea86558293abc9a51bdb87111eb
 SHA512 
d05482a7d0ef5649428368553e7a9c49a116435b273179c13248081711ecc2d8fa1f6ad82a3d5ce43efc2afee51718bc3362e483463c61ebd10dbcc41875749e

diff --git a/app-emulation/libvirt/libvirt-8.5.0.ebuild 
b/app-emulation/libvirt/libvirt-8.5.0.ebuild
new file mode 100644
index ..1ac6f7431bdb
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-8.5.0.ebuild
@@ -0,0 +1,340 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+PYTHON_COMPAT=( python3_{8..11} )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
+inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 
tmpfiles verify-sig
+
+if [[ ${PV} = ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git;
+   EGIT_BRANCH="master"
+else
+   SRC_URI="https://libvirt.org/sources/${P}.tar.xz
+   verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/;
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+IUSE="
+   apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
+   iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz
+   parted pcap policykit +qemu rbd sasl selinux +udev
+   virtualbox +virt-network wireshark-plugins xen zfs
+"
+
+REQUIRED_USE="
+   firewalld? ( virt-network )
+   libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
+   lxc? ( caps libvirtd )
+   openvz? ( libvirtd )
+   qemu? ( libvirtd )
+   virt-network? ( libvirtd )
+   virtualbox? ( libvirtd )
+   xen? ( libvirtd )"
+
+BDEPEND="
+   app-text/xhtml1
+   dev-lang/perl
+   dev-libs/libxslt
+   dev-perl/XML-XPath
+   dev-python/docutils
+   virtual/pkgconfig
+   net-libs/rpcsvc-proto
+   bash-completion? ( >=app-shells/bash-completion-2.0 )
+   verify-sig? ( sec-keys/openpgp-keys-libvirt )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+   acct-user/qemu
+   app-misc/scrub
+   >=dev-libs/glib-2.56.0
+   dev-libs/libgcrypt
+ 

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/

2022-07-04 Thread Sam James
commit: fac4d19f4f5f8f0ff0c9514dd58f24d0ccc55662
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul  4 23:16:11 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 23:16:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fac4d19f

media-video/pipewire: add ewarn for upgrades w/o USE=sound-server; sync live

Signed-off-by: Sam James  gentoo.org>

 ...ire-0.3.53.ebuild => pipewire-0.3.53-r1.ebuild} | 12 +++
 media-video/pipewire/pipewire-.ebuild  | 42 --
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/media-video/pipewire/pipewire-0.3.53.ebuild 
b/media-video/pipewire/pipewire-0.3.53-r1.ebuild
similarity index 97%
rename from media-video/pipewire/pipewire-0.3.53.ebuild
rename to media-video/pipewire/pipewire-0.3.53-r1.ebuild
index e9b41b72f455..f881800c5a79 100644
--- a/media-video/pipewire/pipewire-0.3.53.ebuild
+++ b/media-video/pipewire/pipewire-0.3.53-r1.ebuild
@@ -295,6 +295,18 @@ pkg_postinst() {
elog "  usermod -aG audio "
elog
 
+   local ver
+   for ver in ${REPLACING_VERSIONS} ; do
+   if ver_test ${ver} -le 0.3.53-r1 && ! use sound-server ; then
+   ewarn "USE=sound-server is disabled! If you want 
PipeWire to provide"
+   ewarn "your sound, please enable it. See the wiki at"
+   ewarn 
"https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio;
+   ewarn "for more details."
+
+   break
+   fi
+   done
+
if ! use jack-sdk; then
elog "JACK emulation is incomplete and not all programs will 
work. PipeWire's"
elog "alternative libraries have been installed to a 
non-default location."

diff --git a/media-video/pipewire/pipewire-.ebuild 
b/media-video/pipewire/pipewire-.ebuild
index 9ab78449ccc3..f881800c5a79 100644
--- a/media-video/pipewire/pipewire-.ebuild
+++ b/media-video/pipewire/pipewire-.ebuild
@@ -28,7 +28,8 @@ HOMEPAGE="https://pipewire.org/;
 LICENSE="MIT LGPL-2.1+ GPL-2"
 # ABI was broken in 0.3.42 for 
https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
 SLOT="0/0.4"
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 
pipewire-alsa ssl system-service systemd test udev v4l X zeroconf"
+IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 
pipewire-alsa
+sound-server ssl system-service systemd test udev v4l X zeroconf"
 
 # Once replacing system JACK libraries is possible, it's likely that
 # jack-client IUSE will need blocking to avoid users accidentally
@@ -36,9 +37,15 @@ IUSE="bluetooth doc echo-cancel extra gstreamer jack-client 
jack-sdk lv2 pipewir
 # JACK's sink - doing so is likely to yield no audio, cause a CPU
 # cycles consuming loop (and may even cause GUI crashes)!
 
+# TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but 
ALSA is always enabled
+# TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server 
connection will work
+# which provides adequate guarantee that alsa-lib will be able to provide 
audio services.
+# If that works, pulseaudio defaults are loaded into alsa-lib runtime 
replacing default PCM and CTL.
+# When pipewire-alsa will be able to perform similar check, pipewire-alsa can 
be enabled unconditionally.
 REQUIRED_USE="
jack-sdk? ( !jack-client )
system-service? ( systemd )
+   !sound-server? ( !pipewire-alsa )
 "
 
 RESTRICT="!test? ( test )"
@@ -87,6 +94,10 @@ RDEPEND="
>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
)
!pipewire-alsa? ( 
media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
+   sound-server? (
+   !media-sound/pulseaudio[daemon(+)]
+   !media-sound/pulseaudio-daemon
+   )
ssl? ( dev-libs/openssl:= )
systemd? ( sys-apps/systemd )
system-service? (
@@ -250,12 +261,26 @@ multilib_src_install_all() {
dosym 
../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf 
/etc/alsa/conf.d/99-pipewire-default-hook.conf
fi
 
+   # Enable required wireplumber alsa and bluez monitors
+   if use sound-server; then
+   dodir /etc/wireplumber/main.lua.d
+   echo "alsa_monitor.enabled = true" > 
${D}/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua
+   dodir /etc/wireplumber/bluetooth.lua.d
+   echo "bluez_monitor.enabled = true" > 
${D}/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua
+   fi
+
if ! use systemd; then
insinto /etc/xdg/autostart
newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
 
exeinto /usr/bin
newexe "${FILESDIR}"/gentoo-pipewire-launcher.in 
gentoo-pipewire-launcher
+
+   # Disable 

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/

2022-07-04 Thread Sam James
commit: 709727f934a830cf9d0b7628620db295131f834e
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul  4 23:18:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 23:18:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=709727f9

media-video/pipewire: add 0.3.53_p20220704

Bunch of upstream regressions since fixed. New release is around the
corner apparently but...

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/pipewire-0.3.53_p20220704.ebuild | 5 +++--
 media-video/pipewire/pipewire-.ebuild | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/media-video/pipewire/pipewire-0.3.53_p20220704.ebuild 
b/media-video/pipewire/pipewire-0.3.53_p20220704.ebuild
index 22ba18c624e0..8c5648e7fe72 100644
--- a/media-video/pipewire/pipewire-0.3.53_p20220704.ebuild
+++ b/media-video/pipewire/pipewire-0.3.53_p20220704.ebuild
@@ -264,9 +264,10 @@ multilib_src_install_all() {
# Enable required wireplumber alsa and bluez monitors
if use sound-server; then
dodir /etc/wireplumber/main.lua.d
-   echo "alsa_monitor.enabled = true" > 
${D}/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua
+   echo "alsa_monitor.enabled = true" > 
"${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua
 || die
+
dodir /etc/wireplumber/bluetooth.lua.d
-   echo "bluez_monitor.enabled = true" > 
${D}/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua
+   echo "bluez_monitor.enabled = true" > 
"${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua
 || die
fi
 
if ! use systemd; then

diff --git a/media-video/pipewire/pipewire-.ebuild 
b/media-video/pipewire/pipewire-.ebuild
index f881800c5a79..1c8969b1cff1 100644
--- a/media-video/pipewire/pipewire-.ebuild
+++ b/media-video/pipewire/pipewire-.ebuild
@@ -264,9 +264,10 @@ multilib_src_install_all() {
# Enable required wireplumber alsa and bluez monitors
if use sound-server; then
dodir /etc/wireplumber/main.lua.d
-   echo "alsa_monitor.enabled = true" > 
${D}/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua
+   echo "alsa_monitor.enabled = true" > 
"${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua
 || die
+
dodir /etc/wireplumber/bluetooth.lua.d
-   echo "bluez_monitor.enabled = true" > 
${D}/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua
+   echo "bluez_monitor.enabled = true" > 
"${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua
 || die
fi
 
if ! use systemd; then



[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/

2022-07-04 Thread Sam James
commit: 7642ec84e4d09b4cc25b63a649c76bba1185a11c
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul  4 23:18:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 23:18:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7642ec84

media-video/pipewire: add 0.3.53_p20220704

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |   1 +
 .../pipewire/pipewire-0.3.53_p20220704.ebuild  | 403 +
 2 files changed, 404 insertions(+)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 0e00a3adc380..d473d3c32798 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -4,3 +4,4 @@ DIST pipewire-0.3.49.tar.gz 1769037 BLAKE2B 
2567bc98933bfbb295358886e8f97db2af2f
 DIST pipewire-0.3.51.tar.gz 1789070 BLAKE2B 
8538eb9f2178efa26365f30b324b707826e580caa1fd9c09b62c561c140c14186e0d2b04808fa78eb5642ddccf1a347def19934ecd654be06b215a693075b6fc
 SHA512 
a762fd260b4b14ad9ef142be11ab1c22268da6726e2179559ffb254f0ce7daf7a502779e33c64313a9c6a9fc1bd15150b76be04ec81aa27c35dbb4333cecdb4a
 DIST pipewire-0.3.52.tar.gz 1810238 BLAKE2B 
bb75eff5fe7700d0a303fbfed7910aebd82346a5a21c4a0d17c06e6991bc90bb6d4f6b9559c25788494cb11faff957523dcd7f0c4c8a40be11b81c63a5a9e5ef
 SHA512 
30e9cf74c92babafe386f02a03bb5c41a8ee5591a02f15845cca1ee44f091ce68eb14d48943d43b680cb525026a19e0290997670f9a82156eaa72e974fe6d01a
 DIST pipewire-0.3.53.tar.gz 1783505 BLAKE2B 
269466c6ba78cb85516dc714f3aa5d71cdf72a859b6e1a11c60062da6dcd56eefc78958fe026b9fd11d61fd6fbe6f2aac54a2a9fd77d4ee474687f5d54628c38
 SHA512 
50f23a7b71f3eb20657ff75de54a9f3056270bf05a5472ec9c7dea1c9d0ed391b6b09496d58b065c3cbc40f9be8088b6737cbf0731973498bcd5a8176c42d443
+DIST pipewire-0.3.53_p20220704.tar.bz2 1351516 BLAKE2B 
3d4e4859c66e9cbe47adc0f1c0e2e512632793d70853e0105984c06d2e66744b68d1c01dc7a85784ca2007a96aa5fd1c62c7f47ea6360df58ff76b87de4d3ee2
 SHA512 
87819aa5bdd3caa685c0fc93b0ddcf8212f115cecc130155918876c10883bd98ce923fef3f9716b2562ef5ae2b5465d9e39816f4b6e0c48cf9f28303755584b6

diff --git a/media-video/pipewire/pipewire-0.3.53_p20220704.ebuild 
b/media-video/pipewire/pipewire-0.3.53_p20220704.ebuild
new file mode 100644
index ..22ba18c624e0
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.53_p20220704.ebuild
@@ -0,0 +1,403 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd 
udev
+
+if [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git;
+   inherit git-r3
+else
+   if [[ ${PV} == *_p* ]] ; then
+   MY_COMMIT="a46d4aedd7934cf1068e360f80e61fa2b68f20ff"
+   
SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2
 -> ${P}.tar.bz2"
+   S="${WORKDIR}"/${PN}-${MY_COMMIT}
+   else
+   
SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz;
+   fi
+
+   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/;
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+# ABI was broken in 0.3.42 for 
https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
+SLOT="0/0.4"
+IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 
pipewire-alsa
+sound-server ssl system-service systemd test udev v4l X zeroconf"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+# TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but 
ALSA is always enabled
+# TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server 
connection will work
+# which provides adequate guarantee that alsa-lib will be able to provide 
audio services.
+# If that works, pulseaudio defaults are loaded into alsa-lib runtime 
replacing default PCM and CTL.
+# When pipewire-alsa will be able to perform similar check, pipewire-alsa can 
be enabled unconditionally.
+REQUIRED_USE="
+   jack-sdk? ( !jack-client )
+   system-service? ( systemd )
+   !sound-server? ( !pipewire-alsa )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+   >=dev-util/meson-0.59
+   virtual/pkgconfig
+   ${PYTHON_DEPS}
+   $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
+   doc? (
+   app-doc/doxygen
+   media-gfx/graphviz
+   )
+"
+RDEPEND="
+   acct-group/audio
+   media-libs/alsa-lib
+   sys-apps/dbus[${MULTILIB_USEDEP}]
+   

[gentoo-commits] repo/gentoo:master commit in: net-im/pidgin/

2022-07-04 Thread Sam James
commit: 9e76cb192c37af695445ee2181d4967b248e683f
Author: matoro  users  noreply  github  com>
AuthorDate: Mon Jul  4 17:55:34 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 23:01:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e76cb19

net-im/pidgin: Stabilize 2.14.10 sparc, #848579

Signed-off-by: matoro  users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/26221
Signed-off-by: Sam James  gentoo.org>

 net-im/pidgin/pidgin-2.14.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-im/pidgin/pidgin-2.14.10.ebuild 
b/net-im/pidgin/pidgin-2.14.10.ebuild
index 78e466aed03c..e8df9c8671e5 100644
--- a/net-im/pidgin/pidgin-2.14.10.ebuild
+++ b/net-im/pidgin/pidgin-2.14.10.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0/2" # libpurple version
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86 
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux 
~x86-linux"
 IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
 meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
 test tk v4l +xscreensaver zephyr zeroconf"



[gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-shell-extensions/

2022-07-04 Thread Matt Turner
commit: 5f02021303d0c80b076b13886600e843d2ad48ed
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jul  4 22:41:55 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jul  4 22:52:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f020213

gnome-extra/gnome-shell-extensions: Version bump to 42.3

Signed-off-by: Matt Turner  gentoo.org>

 gnome-extra/gnome-shell-extensions/Manifest|  1 +
 .../gnome-shell-extensions-42.3.ebuild | 70 ++
 2 files changed, 71 insertions(+)

diff --git a/gnome-extra/gnome-shell-extensions/Manifest 
b/gnome-extra/gnome-shell-extensions/Manifest
index 0a125e458e3f..f785e712754e 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-shell-extensions-42.1.tar.xz 225068 BLAKE2B 
9041259a480be745476278f638be20ae6ac0b86019d01609cf6b0ba3fa129dac74d56851d0301a6e1b8a0b172b6d375aeeb2f2df389f3c0dfe0e01384248b5d8
 SHA512 
b139400d239be2dbc7685afc666d0b17ab187b68fa2631b586b0e04bf05de3d59ac70d2f692ade8e0003fea99f207b05871deab3898ba34586521dda747970c3
 DIST gnome-shell-extensions-42.2.tar.xz 225040 BLAKE2B 
992207185af12ee8f41e91d3b60536ce0f70359abce58c57ca372823925d948d23372fea7dc8d09e2734549044cd89e7a644e3815e985c75ee64eaf34992
 SHA512 
175cf5dd7cdd29ee30857e4960355ce164f2ae8c038473409b26e0f201f0b19782924ffc532a05d58cf76ade332ab87afffa52512cb9b8ff69fa36b78da293c9
+DIST gnome-shell-extensions-42.3.tar.xz 225332 BLAKE2B 
4a5d26ac0f8563d6e9c607ad06998470257c1c25a8d2f50207b4fed48f785b983be0fae9a6590a36652c25c1f685679af37dcbd4d5edc7d6c9ebaad0946766b4
 SHA512 
60b7f7d85536c2d00b69383a3c5fffe8ce13e09555c533ccbe024bcbfa1c90d97e69491d9066c5c2da64719c23990cdf88f07076ca4494841a5489deb33de7d0

diff --git 
a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.3.ebuild 
b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.3.ebuild
new file mode 100644
index ..763ce0e49faf
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org readme.gentoo-r1 meson xdg
+
+DESCRIPTION="JavaScript extensions for GNOME Shell"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+   >=dev-libs/glib-2.26:2
+   >=gnome-base/libgtop-2.28.3[introspection]
+   >=app-eselect/eselect-gnome-shell-extensions-20111211
+"
+RDEPEND="${DEPEND}
+   >=dev-libs/gjs-1.29
+   dev-libs/gobject-introspection:=
+   dev-libs/atk[introspection]
+   gnome-base/gnome-menus:3[introspection]
+   =gnome-base/gnome-shell-$(ver_cut 1)*
+   media-libs/clutter:1.0[introspection]
+   net-libs/telepathy-glib[introspection]
+   x11-libs/gdk-pixbuf:2[introspection]
+   x11-libs/gtk+:3[introspection]
+   x11-libs/pango[introspection]
+   x11-themes/adwaita-icon-theme
+   >=x11-wm/mutter-3.32[introspection]
+"
+BDEPEND="
+   >=sys-devel/gettext-0.19.8
+   virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Installed extensions installed are initially disabled by default.
+To change the system default and enable some extensions, you can use
+# eselect gnome-shell-extensions
+
+Alternatively, to enable/disable extensions on a per-user basis,
+you can use the gnome-extensions-app (included with gnome-shell),
+https://extensions.gnome.org/ web interface, or modify the
+org.gnome.shell enabled-extensions gsettings key from the command
+line or a script."
+
+src_configure() {
+   local emesonargs=(
+   -Dextension_set=all
+   -Dclassic_mode=true
+   )
+   meson_src_configure
+}
+
+src_install() {
+   meson_src_install
+   readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+
+   ebegin "Updating list of installed extensions"
+   eselect gnome-shell-extensions update
+   eend $?
+
+   readme.gentoo_print_elog
+}



[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/

2022-07-04 Thread Matt Turner
commit: 4f1b13b61781ff803bc4c938098528c67de4d07d
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jul  4 22:38:54 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jul  4 22:52:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f1b13b6

x11-wm/mutter: Version bump to 42.3

Closes: https://bugs.gentoo.org/848510
Signed-off-by: Matt Turner  gentoo.org>

 x11-wm/mutter/Manifest   |   1 +
 x11-wm/mutter/mutter-42.3.ebuild | 190 +++
 2 files changed, 191 insertions(+)

diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index e67a6fa1c769..1bfbf125ce14 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,2 +1,3 @@
 DIST mutter-42.1.tar.xz 2747056 BLAKE2B 
7973e6178e3a61078c37c593a8ffabbd002b791b8251fdf9aa7c90b40efa76591f9946cdd31dd6f274c2a4455157c8661d63714619f3966250eeca5ddae34689
 SHA512 
b7c7011f1c3c4361ddfdcffc61057f8821c37cfb602d7f7ec97fdd1f0ab19dd331f396ca4f61c83253d003d1d866b0d2ff1e7f34bbc9e98b48aacb973aabd6d5
 DIST mutter-42.2.tar.xz 2747612 BLAKE2B 
39d83283dc04473e47263d463849030c1076bb5b8d6fbc37f03e1936cb999ab554784f02ad9a04cdbfa2f35ad95c74c0899ee44e9710e435e66de613628cc683
 SHA512 
e43bdc7c9183b2578ae1f777fdf84bfde550a26bfc28fd4a1a183c7f310d852110f3dcabd50a2fabdafba4cfb8aa6577aec4c65775075f0afff7bd1bb4dde957
+DIST mutter-42.3.tar.xz 2746756 BLAKE2B 
818b2ac8cd264c6b8e30b6731ef2641dbcbba6dce7628d0a934c3f49a5857874d9e6a97cd53ec689c2a9ae7f52d49ed98b7cc551eafbb32b74cbebbe027d9f43
 SHA512 
f346d2299143ceb6c9164977df2e23655b1c204f3a2d1f713377f3cc2f3609c56914c5e8a0b940d4fdd3d040a9af210f724350bb4f74ffac293e6a82e2b0785b

diff --git a/x11-wm/mutter/mutter-42.3.ebuild b/x11-wm/mutter/mutter-42.3.ebuild
new file mode 100644
index ..f47197d0b90f
--- /dev/null
+++ b/x11-wm/mutter/mutter-42.3.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+inherit gnome.org gnome2-utils meson python-any-r1 udev xdg
+
+DESCRIPTION="GNOME compositing window manager based on Clutter"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/;
+
+LICENSE="GPL-2+"
+SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell 
(or anything using mutter-clutter-.pc) should use the subslot
+
+IUSE="doc elogind gnome input_devices_wacom +introspection screencast sysprof 
systemd test udev wayland video_cards_nvidia"
+# native backend requires gles3 for hybrid graphics blitting support, udev and 
a logind provider
+REQUIRED_USE="
+   wayland? ( ^^ ( elogind systemd ) udev )
+   test? ( wayland )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# gnome-settings-daemon is build checked, but used at runtime only for 
org.gnome.settings-daemon.peripherals.keyboard gschema
+# xorg-server is needed at build and runtime with USE=wayland for Xwayland
+# v3.32.2 has many excessive or unused *_req variables declared, thus 
currently the dep order ignores those and goes via dependency() call order
+DEPEND="
+   >=x11-libs/libX11-1.7.0
+   >=media-libs/graphene-1.10.2[introspection?]
+   >=x11-libs/gtk+-3.19.8:3[X,introspection?]
+   x11-libs/gdk-pixbuf:2
+   >=x11-libs/pango-1.46[introspection?]
+   >=dev-libs/fribidi-1.0.0
+   >=x11-libs/cairo-1.14[X]
+   >=gnome-base/gsettings-desktop-schemas-42.0[introspection?]
+   >=dev-libs/glib-2.69.0:2
+   gnome-base/gnome-settings-daemon
+   >=dev-libs/json-glib-0.12.0[introspection?]
+   >=x11-libs/libXcomposite-0.4
+   x11-libs/libXcursor
+   x11-libs/libXdamage
+   x11-libs/libXext
+   >=x11-libs/libXfixes-3
+   >=x11-libs/libXi-1.7.4
+   x11-libs/libXtst
+   x11-libs/libxkbfile
+   x11-misc/xkeyboard-config
+   >=x11-libs/libxkbcommon-0.4.3[X]
+   x11-libs/libXrender
+   >=x11-libs/libXrandr-1.5.0
+   x11-libs/libxcb:=
+   x11-libs/libXinerama
+   x11-libs/libXau
+   x11-libs/libICE
+   >=dev-libs/atk-2.5.3[introspection?]
+   >=media-libs/libcanberra-0.26
+   sys-apps/dbus
+   gnome? ( gnome-base/gnome-desktop:3= )
+   media-libs/mesa[X(+),egl(+)]
+   sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+   systemd? ( sys-apps/systemd )
+   wayland? (
+   >=dev-libs/wayland-protocols-1.21
+   >=dev-libs/wayland-1.18.0
+   x11-libs/libdrm
+   >=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2]
+   >=dev-libs/libinput-1.18.0:=
+   elogind? ( sys-auth/elogind )
+   x11-base/xwayland
+   video_cards_nvidia? ( gui-libs/egl-wayland )
+   )
+   udev? ( >=dev-libs/libgudev-232
+   >=virtual/libudev-232-r1:=
+   )
+   x11-libs/libSM
+   input_devices_wacom? ( >=dev-libs/libwacom-0.13:= )
+   >=x11-libs/startup-notification-0.7
+   

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/

2022-07-04 Thread Matt Turner
commit: cee952a11a436fc50435caae84c3db52400ff4be
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jul  4 22:41:34 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jul  4 22:52:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cee952a1

gnome-base/gnome-shell: Version bump to 42.3

Signed-off-by: Matt Turner  gentoo.org>

 gnome-base/gnome-shell/Manifest|   1 +
 gnome-base/gnome-shell/gnome-shell-42.3.ebuild | 208 +
 2 files changed, 209 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 84ca4b6dfd5b..8bfcc23f6f59 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-shell-42.1.tar.xz 1928924 BLAKE2B 
c8a1aed79a93d713a52ef0161ff9f06c39f7fb9a762086c78505d220e1e8ec43d7a0e376421f912dc91b33da8fd9394c6a233bb2d9d8b361d63ea2ad0406cee6
 SHA512 
3d27fdbcf5359f631a71b0fa6495fa50e2b43bb2b3c5c0efd740d9a6a88128ae54fe0ba11ea88990ba10ee2fc9f55211d0a21e60beca250bd197535d944d07ed
 DIST gnome-shell-42.2.tar.xz 1928948 BLAKE2B 
e263acfc9e6929accfb46b65b91b1173cfa4c778405c0852e93b83d78e1bf3a85e3b5c49b73445f604c0fdecb48f294931ab2403806661013bcef3a71b99f911
 SHA512 
dd77195772e23d8260e55a2db1103fa6dee8945ad168478c293e43e9971698aa191e17f7f5ef46cf46eeaae5051c34f0eb5df134690f7dc5ca98d6ca747e4eb0
+DIST gnome-shell-42.3.tar.xz 1927500 BLAKE2B 
942c1fcb374cbaa4542484d03ed09c196658a8b830a2c2a84dc112c56d6bdb6070de8d2f463f147f41803ff52d8f937444e6c7e2b704d636d872b2dc332444af
 SHA512 
9c8d967f7a46a3a93f9f07b2e8cdeae698fd0de9fdd61ce5fff10b89e44a68eb7ae3a4ef72d5605bf5fc78d4fbd24ccad220306749c1886919ee4668feada729

diff --git a/gnome-base/gnome-shell/gnome-shell-42.3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-42.3.ebuild
new file mode 100644
index ..4eb1bfeb86f9
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-42.3.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell;
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer/pipewire support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5:=[introspection]
+   >=dev-libs/glib-2.68:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.71.1
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-42.0:0/10[introspection,test?]
+   >=sys-auth/polkit-0.120_p20220509[introspection]
+   >=gnome-base/gsettings-desktop-schemas-42_beta[introspection]
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.19
+   >=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+   bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   >=media-video/pipewire-0.3.0:=
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib
+   )
+   systemd? (
+   >=sys-apps/systemd-242:=
+   >=gnome-base/gnome-desktop-3.34.2:3=[systemd]
+   )
+   elogind? ( >=sys-auth/elogind-237 )
+
+   app-arch/gnome-autoar
+   dev-libs/json-glib
+
+   >=app-accessibility/at-spi2-atk-2.5.3:2
+   x11-libs/gdk-pixbuf:2[introspection]
+   dev-libs/libxml2:2
+   x11-libs/libX11
+
+   >=media-libs/libpulse-2[glib]
+   >=dev-libs/atk-2[introspection]
+   dev-libs/libical:=
+   >=x11-libs/libXfixes-5.0
+
+   gui-libs/gtk:4[introspection]
+
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/pygobject:3[${PYTHON_USEDEP}]
+   ')
+   media-libs/mesa[X(+)]
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Introspection deps generated from inspection of the output of:
+#  for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort 
-u`; do echo $i ;done |cut -d, -f1 |sort -u
+# or
+#  rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 
's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | 
sort -u | sed -e 's/://g'
+# These will give a lot of unnecessary things due to greedy matching (TODO), 
and `(?s).*?` doesn't seem to work as desired.
+# 

[gentoo-commits] repo/gentoo:master commit in: media-libs/libpulse/

2022-07-04 Thread Sam James
commit: f561aab954fbd1737c25cbb7c99d709ae71ae742
Author: Igor V. Kovalenko  gmail  com>
AuthorDate: Fri Jun 24 06:37:13 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 21:35:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f561aab9

media-libs/libpulse: PDEPEND on sound servers

When a package depends on pulseaudio client libraries only, make sure there is
a compatible sound server installed.

Signed-off-by: Igor V. Kovalenko  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25502
Signed-off-by: Sam James  gentoo.org>

 media-libs/libpulse/libpulse-16.1.ebuild | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/media-libs/libpulse/libpulse-16.1.ebuild 
b/media-libs/libpulse/libpulse-16.1.ebuild
index a3bd8e6f7528..fe632b3d640b 100644
--- a/media-libs/libpulse/libpulse-16.1.ebuild
+++ b/media-libs/libpulse/libpulse-16.1.ebuild
@@ -67,6 +67,13 @@ BDEPEND="
virtual/pkgconfig
doc? ( app-doc/doxygen )
 "
+PDEPEND="
+   || (
+   media-video/pipewire[sound-server(+)]
+   media-sound/pulseaudio-daemon
+   media-sound/pulseaudio[daemon(+)]
+   )
+"
 
 DOCS=( NEWS README )
 



[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/

2022-07-04 Thread Sam James
commit: 1ee08222702d6afb3d03a9e95cbb3a2b91d8a1ee
Author: Igor V. Kovalenko  gmail  com>
AuthorDate: Sat Jul  2 06:13:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 21:35:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ee08222

media-video/pipewire: Disable pipewire-alsa without sound server

Until pipewire-alsa can be dynamically enabled in alsa-lib runtime
configuration, make sure it is disabled if sound-server is disabled,
otherwise users will end up wuth broken alsa audio by default.

Signed-off-by: Igor V. Kovalenko  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/pipewire-0.3.53.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/media-video/pipewire/pipewire-0.3.53.ebuild 
b/media-video/pipewire/pipewire-0.3.53.ebuild
index 75e304738b78..e9b41b72f455 100644
--- a/media-video/pipewire/pipewire-0.3.53.ebuild
+++ b/media-video/pipewire/pipewire-0.3.53.ebuild
@@ -38,9 +38,14 @@ sound-server ssl system-service systemd test udev v4l X 
zeroconf"
 # cycles consuming loop (and may even cause GUI crashes)!
 
 # TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but 
ALSA is always enabled
+# TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server 
connection will work
+# which provides adequate guarantee that alsa-lib will be able to provide 
audio services.
+# If that works, pulseaudio defaults are loaded into alsa-lib runtime 
replacing default PCM and CTL.
+# When pipewire-alsa will be able to perform similar check, pipewire-alsa can 
be enabled unconditionally.
 REQUIRED_USE="
jack-sdk? ( !jack-client )
system-service? ( systemd )
+   !sound-server? ( !pipewire-alsa )
 "
 
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/

2022-07-04 Thread Sam James
commit: 21f12bb743b94242f73cef85ef24fdf6ff703eed
Author: Igor V. Kovalenko  gmail  com>
AuthorDate: Sat Jul  2 06:13:11 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 21:35:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21f12bb7

media-video/pipewire: Add USE sound-server

Add USE sound-server to enable sound server with alsa and bluetooth devices.
Conditionally enable required wireplumber monitor parts and pipewire-pulse.

Signed-off-by: Igor V. Kovalenko  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/metadata.xml   |  1 +
 media-video/pipewire/pipewire-0.3.53.ebuild | 21 +++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/media-video/pipewire/metadata.xml 
b/media-video/pipewire/metadata.xml
index b7e4f57f5480..08adc4c25b4f 100644
--- a/media-video/pipewire/metadata.xml
+++ b/media-video/pipewire/metadata.xml
@@ -28,5 +28,6 @@
Enable raop-sink support (needs 
dev-libs/openssl)
Install systemd unit files for 
running as a system service. Not recommended.
Enable audible bell for X11
+   Provide sound server using ALSA and 
bluetooth devices

 

diff --git a/media-video/pipewire/pipewire-0.3.53.ebuild 
b/media-video/pipewire/pipewire-0.3.53.ebuild
index 9ab78449ccc3..a2f1daf3b80c 100644
--- a/media-video/pipewire/pipewire-0.3.53.ebuild
+++ b/media-video/pipewire/pipewire-0.3.53.ebuild
@@ -28,7 +28,8 @@ HOMEPAGE="https://pipewire.org/;
 LICENSE="MIT LGPL-2.1+ GPL-2"
 # ABI was broken in 0.3.42 for 
https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
 SLOT="0/0.4"
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 
pipewire-alsa ssl system-service systemd test udev v4l X zeroconf"
+IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 
pipewire-alsa
+sound-server ssl system-service systemd test udev v4l X zeroconf"
 
 # Once replacing system JACK libraries is possible, it's likely that
 # jack-client IUSE will need blocking to avoid users accidentally
@@ -36,6 +37,7 @@ IUSE="bluetooth doc echo-cancel extra gstreamer jack-client 
jack-sdk lv2 pipewir
 # JACK's sink - doing so is likely to yield no audio, cause a CPU
 # cycles consuming loop (and may even cause GUI crashes)!
 
+# TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but 
ALSA is always enabled
 REQUIRED_USE="
jack-sdk? ( !jack-client )
system-service? ( systemd )
@@ -250,12 +252,26 @@ multilib_src_install_all() {
dosym 
../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf 
/etc/alsa/conf.d/99-pipewire-default-hook.conf
fi
 
+   # Enable required wireplumber alsa and bluez monitors
+   if use sound-server; then
+   dodir /etc/wireplumber/main.lua.d
+   echo "alsa_monitor.enabled = true" > 
${D}/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua
+   dodir /etc/wireplumber/bluetooth.lua.d
+   echo "bluez_monitor.enabled = true" > 
${D}/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua
+   fi
+
if ! use systemd; then
insinto /etc/xdg/autostart
newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
 
exeinto /usr/bin
newexe "${FILESDIR}"/gentoo-pipewire-launcher.in 
gentoo-pipewire-launcher
+
+   # Disable pipewire-pulse if sound-server is disabled.
+   if ! use sound-server ; then
+   sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' 
"${ED}"/usr/bin/gentoo-pipewire-launcher || die
+   fi
+
eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
fi
 }
@@ -310,7 +326,8 @@ pkg_postinst() {
ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher 
instead! It is highly"
ewarn "advised that a D-Bus user session is set up before 
starting the script."
ewarn
-   if has_version 'media-sound/pulseaudio[daemon]' || has_version 
'media-sound/pulseaudio-daemon'; then
+
+   if use sound-server && ( has_version 
'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' 
) ; then
elog "This ebuild auto-enables PulseAudio replacement. 
Because of that, users"
elog "are recommended to edit pulseaudio client 
configuration files:"
elog "${EROOT}/etc/pulse/client.conf and 
${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"



[gentoo-commits] repo/gentoo:master commit in: media-video/wireplumber/, media-video/wireplumber/files/

2022-07-04 Thread Sam James
commit: ed5e534a1cd4ae88036e99bcb81420e28f824768
Author: Igor V. Kovalenko  gmail  com>
AuthorDate: Mon May 30 06:09:36 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 21:35:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed5e534a

media-video/wireplumber: Disable sound server parts

Disable alsa and bluetooth monitors in wireplumber configuration.
Let media-video/pipewire conditionally enable these instead.

Signed-off-by: Igor V. Kovalenko  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 ...-0.4.10-config-disable-sound-server-parts.patch | 26 ++
 .../wireplumber/wireplumber-0.4.10-r3.ebuild   |  1 +
 2 files changed, 27 insertions(+)

diff --git 
a/media-video/wireplumber/files/wireplumber-0.4.10-config-disable-sound-server-parts.patch
 
b/media-video/wireplumber/files/wireplumber-0.4.10-config-disable-sound-server-parts.patch
new file mode 100644
index ..a8bf6f106129
--- /dev/null
+++ 
b/media-video/wireplumber/files/wireplumber-0.4.10-config-disable-sound-server-parts.patch
@@ -0,0 +1,26 @@
+commit 3d86f51d2c43fd76be2450a8c27836fdd8619cfa
+Author: Igor V. Kovalenko 
+Date:   Sun May 15 18:19:03 2022 +0300
+
+config: Disable alsa and bluez monitors by default
+
+diff --git a/src/config/bluetooth.lua.d/50-bluez-config.lua 
b/src/config/bluetooth.lua.d/50-bluez-config.lua
+index d5727d3..938eae0 100644
+--- a/src/config/bluetooth.lua.d/50-bluez-config.lua
 b/src/config/bluetooth.lua.d/50-bluez-config.lua
+@@ -1,4 +1,4 @@
+-bluez_monitor.enabled = true
++bluez_monitor.enabled = false
+ 
+ bluez_monitor.properties = {
+   -- These features do not work on all headsets, so they are enabled
+diff --git a/src/config/main.lua.d/50-alsa-config.lua 
b/src/config/main.lua.d/50-alsa-config.lua
+index 3468333..d4c065b 100644
+--- a/src/config/main.lua.d/50-alsa-config.lua
 b/src/config/main.lua.d/50-alsa-config.lua
+@@ -1,4 +1,4 @@
+-alsa_monitor.enabled = true
++alsa_monitor.enabled = false
+ 
+ alsa_monitor.properties = {
+   -- Create a JACK device. This is not enabled by default because

diff --git a/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild 
b/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild
index ae1bbb1ec14c..5789bd9c46fb 100644
--- a/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild
@@ -68,6 +68,7 @@ PATCHES=(

"${FILESDIR}"/${P}-alsa.lua-fix-device-name-deduplication-when-reserva.patch

"${FILESDIR}"/${P}-m-default-nodes-don-t-check-if-all-device-nodes-are.patch
"${FILESDIR}"/${P}-m-lua-scripting-fix-object-refcounting.patch
+   "${FILESDIR}"/${P}-config-disable-sound-server-parts.patch # defer 
enabling sound server parts to media-video/pipewire
 )
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/

2022-07-04 Thread Sam James
commit: 18fb28ad4e21657a6e40691ca3bb32fae572dbf9
Author: Igor V. Kovalenko  gmail  com>
AuthorDate: Sat Jul  2 06:13:32 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 21:35:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18fb28ad

media-video/pipewire: Add conflict with pulseaudio sound server

Signed-off-by: Igor V. Kovalenko  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/pipewire-0.3.53.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/media-video/pipewire/pipewire-0.3.53.ebuild 
b/media-video/pipewire/pipewire-0.3.53.ebuild
index a2f1daf3b80c..75e304738b78 100644
--- a/media-video/pipewire/pipewire-0.3.53.ebuild
+++ b/media-video/pipewire/pipewire-0.3.53.ebuild
@@ -89,6 +89,10 @@ RDEPEND="
>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
)
!pipewire-alsa? ( 
media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
+   sound-server? (
+   !media-sound/pulseaudio[daemon(+)]
+   !media-sound/pulseaudio-daemon
+   )
ssl? ( dev-libs/openssl:= )
systemd? ( sys-apps/systemd )
system-service? (



[gentoo-commits] repo/gentoo:master commit in: media-sound/pulseaudio-daemon/

2022-07-04 Thread Sam James
commit: b1317ae146f1e56946d781e5c5501b5ac8230b96
Author: Igor V. Kovalenko  gmail  com>
AuthorDate: Sun May 15 12:32:16 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 21:35:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1317ae1

media-sound/pulseaudio-daemon: Add conflict with pipewire sound server

Signed-off-by: Igor V. Kovalenko  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1.ebuild 
b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1.ebuild
index eddb6f54e7b5..52f26408de4d 100644
--- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1.ebuild
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1.ebuild
@@ -138,6 +138,7 @@ RDEPEND="
ldac? ( media-plugins/gst-plugins-ldac )
aptx? ( media-plugins/gst-plugins-openaptx )
)
+   !media-video/pipewire[sound-server(+)]
 "
 unset gstreamer_deps
 



[gentoo-commits] proj/sci:master commit in: dev-python/zarr/

2022-07-04 Thread Horea Christian
commit: 0b38d28bc9bb3620532c6cde5c6ac341c52503ac
Author: Horea Christian  chymera  eu>
AuthorDate: Mon Jul  4 21:17:40 2022 +
Commit: Horea Christian  gmail  com>
CommitDate: Mon Jul  4 21:18:27 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=0b38d28b

dev-python/zarr: skipping tests reported upstream

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Horea Christian  chymera.eu>

 dev-python/zarr/zarr-2.11.1.ebuild | 5 +
 dev-python/zarr/zarr-2.11.3.ebuild | 5 +
 2 files changed, 10 insertions(+)

diff --git a/dev-python/zarr/zarr-2.11.1.ebuild 
b/dev-python/zarr/zarr-2.11.1.ebuild
index 9822cb161..8cb175408 100644
--- a/dev-python/zarr/zarr-2.11.1.ebuild
+++ b/dev-python/zarr/zarr-2.11.1.ebuild
@@ -51,6 +51,11 @@ EPYTEST_DESELECT=(
zarr/tests/test_sync.py::TestArray::test_object_arrays_vlen_bytes

zarr/tests/test_sync.py::TestArrayWithThreadSynchronizer::test_object_arrays_vlen_bytes

zarr/tests/test_sync.py::TestArrayWithProcessSynchronizer::test_object_arrays_vlen_bytes
+   
zarr/tests/test_core.py::TestArrayWithFSStore::test_object_arrays_vlen_bytes
+   
zarr/tests/test_core.py::TestArrayWithFSStoreFromFilesystem::test_object_arrays_vlen_bytes
+   
zarr/tests/test_core.py::TestArrayWithFSStorePartialRead::test_object_arrays_vlen_bytes
+   
zarr/tests/test_core.py::TestArrayWithFSStoreNested::test_object_arrays_vlen_bytes
+   
zarr/tests/test_core.py::TestArrayWithFSStoreNestedPartialRead::test_object_arrays_vlen_bytes
 )
 
 distutils_enable_tests pytest

diff --git a/dev-python/zarr/zarr-2.11.3.ebuild 
b/dev-python/zarr/zarr-2.11.3.ebuild
index 50ec85404..1fa4e9af9 100644
--- a/dev-python/zarr/zarr-2.11.3.ebuild
+++ b/dev-python/zarr/zarr-2.11.3.ebuild
@@ -51,6 +51,11 @@ EPYTEST_DESELECT=(
zarr/tests/test_sync.py::TestArray::test_object_arrays_vlen_bytes

zarr/tests/test_sync.py::TestArrayWithThreadSynchronizer::test_object_arrays_vlen_bytes

zarr/tests/test_sync.py::TestArrayWithProcessSynchronizer::test_object_arrays_vlen_bytes
+   
zarr/tests/test_core.py::TestArrayWithFSStore::test_object_arrays_vlen_bytes
+   
zarr/tests/test_core.py::TestArrayWithFSStoreFromFilesystem::test_object_arrays_vlen_bytes
+   
zarr/tests/test_core.py::TestArrayWithFSStorePartialRead::test_object_arrays_vlen_bytes
+   
zarr/tests/test_core.py::TestArrayWithFSStoreNested::test_object_arrays_vlen_bytes
+   
zarr/tests/test_core.py::TestArrayWithFSStoreNestedPartialRead::test_object_arrays_vlen_bytes
 )
 
 distutils_enable_tests pytest



[gentoo-commits] repo/gentoo:master commit in: app-shells/fish/

2022-07-04 Thread Georgy Yakovlev
commit: b360952c80adbd55b84bb3aca972bec20a794293
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Mon Jul  4 21:06:02 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Mon Jul  4 21:07:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b360952c

app-shells/fish: add 3.5.0

Closes: https://bugs.gentoo.org/854987
Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-shells/fish/Manifest  |   1 +
 app-shells/fish/fish-3.5.0.ebuild | 108 ++
 2 files changed, 109 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 86348f3b4176..bb92772d4c31 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,2 +1,3 @@
 DIST fish-3.4.0.tar.xz 3292216 BLAKE2B 
3691e5387a8392d7d43b3b0f8b893e83e246c3532684e95a19c7b2eb4ebe80bcf04aaa1b965f5c4f6d782d0ae52269bb1cdafef76845b02f9f99d4c82ea77ce3
 SHA512 
463ee8d86815520c6de9777fd2b5975f06cc0842137c86cca7ae0331e95d74e755bf6f4b0bdea7e96c11371436ff9f97ce483ae026daa1e8d385f6cad8860ed4
 DIST fish-3.4.1.tar.xz 3293068 BLAKE2B 
5edcd59445e6d928fb2183deb68fb0a305f6f80c134fef48ea79d91b79af1da6b31a1e870a9df963bb27dfc5985f326d9b6d53d64b16c79f9c303aa8edfa4423
 SHA512 
20a2892ec0c413c4c3fcfe5fbf52fb2398de35a9172758728bd2ccdccc5fb6e0e18712a664d02db67543d47180a4d04f3998a6297d23088926b6d03baefdf981
+DIST fish-3.5.0.tar.xz 3326276 BLAKE2B 
ac8fa514a728af5bc02ea02f57344d92d3d897c5dda3a2a32b6dbaab81c795828da0cc6938f19bb6d538aa1e620b67de72225fa73b52405c94e1eecab2299faa
 SHA512 
ccec4abcdb425563688c6112f3c9c57add16aa3a05c121d2633b655d27185e1c96c263d51d6af7d83c068580d7d0723c072f1a4853fa8b6736291beeab64b859

diff --git a/app-shells/fish/fish-3.5.0.ebuild 
b/app-shells/fish/fish-3.5.0.ebuild
new file mode 100644
index ..d0328d498838
--- /dev/null
+++ b/app-shells/fish/fish-3.5.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="Friendly Interactive SHell"
+HOMEPAGE="http://fishshell.com/;
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git;
+else
+   
SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+doc nls test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   >=dev-libs/libpcre2-10.32:=[pcre32]
+   sys-apps/coreutils
+   sys-libs/ncurses:=[unicode(+)]
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+   nls? ( sys-devel/gettext )
+   test? (
+   ${PYTHON_DEPS}
+   dev-tcltk/expect
+   $(python_gen_any_dep '
+   dev-python/pexpect[${PYTHON_USEDEP}]
+   ')
+   )
+"
+# we don't need shpinx dep for release tarballs
+[[ ${PV} ==  ]] && DEPEND+=" doc? ( dev-python/sphinx )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+   use test || return 0
+   has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+   # workaround for https://github.com/fish-shell/fish-shell/issues/4883
+   sed -i 
's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
+   cmake/Tests.cmake || die
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
+   -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+   -DCURSES_NEED_NCURSES=ON
+   -DINSTALL_DOCS="$(usex doc)"
+   -DWITH_GETTEXT="$(usex nls)"
+   )
+   # release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
+   if [[ ${PV} ==  ]]; then
+   mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
+   else
+   mycmakeargs+=( -DBUILD_DOCS=OFF )
+   fi
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+   keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
+   readme.gentoo_create_doc
+}
+
+src_test() {
+   # some tests are fragile, sanitize environment
+   local -x COLUMNS=80
+   local -x LINES=24
+
+   # very fragile, depends on terminal, size, tmux, screen and timing
+   if [[ ${PV} !=  ]]; then
+   rm -v tests/pexpects/terminal.py || die
+   fi
+
+   # zfs completion test will fail with "Permission denied the ZFS 
utilities must be run as root."
+   mv "${S}"/share/completions/zfs.{fish,disabled} || die
+
+   cmake_build test
+
+   # now restore zfs completions
+   mv "${S}"/share/completions/zfs.{disabled,fish} || die
+}
+
+pkg_postinst() {
+   

[gentoo-commits] repo/gentoo:master commit in: app-shells/fish/

2022-07-04 Thread Georgy Yakovlev
commit: c9bb6b7a34d3a72208e9cbfa9e6e3b8120e365fa
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Mon Jul  4 21:06:48 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Mon Jul  4 21:07:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9bb6b7a

app-shells/fish: sync live ebuild

Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-shells/fish/fish-.ebuild | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-.ebuild b/app-shells/fish/fish-.ebuild
index de44bf1d4092..d0328d498838 100644
--- a/app-shells/fish/fish-.ebuild
+++ b/app-shells/fish/fish-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake python-any-r1 readme.gentoo-r1
 
@@ -94,7 +94,13 @@ src_test() {
rm -v tests/pexpects/terminal.py || die
fi
 
+   # zfs completion test will fail with "Permission denied the ZFS 
utilities must be run as root."
+   mv "${S}"/share/completions/zfs.{fish,disabled} || die
+
cmake_build test
+
+   # now restore zfs completions
+   mv "${S}"/share/completions/zfs.{disabled,fish} || die
 }
 
 pkg_postinst() {



[gentoo-commits] repo/gentoo:master commit in: games-emulation/zsnes/

2022-07-04 Thread Ionen Wolkens
commit: 91f0a8ff5222df5e4d3f77b382854e400c114afc
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jul  4 20:19:24 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jul  4 20:47:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f0a8ff

games-emulation/zsnes: add 2.0.10

Remember kids, don't use zsnes.

Signed-off-by: Ionen Wolkens  gentoo.org>

 games-emulation/zsnes/Manifest|  1 +
 games-emulation/zsnes/zsnes-2.0.10.ebuild | 65 +++
 2 files changed, 66 insertions(+)

diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index eeb8097cf656..80fd70941d9b 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -1 +1,2 @@
+DIST zsnes-2.0.10.tar.gz 926347 BLAKE2B 
b9ab4701290ae802cb35045e0a3d4ff5268f96f7dc84614f39e950a6273a8477d5e2dca0598e3448744486de31caf692d44d36fe284f6f20697a5b4e92c908f8
 SHA512 
513e350198a944af47accedc6d3c14405898c753bb8168871d323c11f8c1253d8d7e247759a13e40a3b5eda195824e4862bb1fc093a3db9a75c8bb2e0bef728e
 DIST zsnes-2.0.9.tar.gz 935183 BLAKE2B 
a9b72ed15b2ed6d9e4631b4f12b2291ddca76a7236da008eba0f8b3ee27c94b98f00ff16a4929929adf484bc16554474b942b9f8306f46ab713e8a40e1f64624
 SHA512 
ea9244e98a175db9bceddf14e8212b3474ddaba1f508d698d8cfc43270fa3dabf51dca43dd30255272aba3cd061bf450bef04e005ce8087d550400e66faea565

diff --git a/games-emulation/zsnes/zsnes-2.0.10.ebuild 
b/games-emulation/zsnes/zsnes-2.0.10.ebuild
new file mode 100644
index ..38c0c2f51af8
--- /dev/null
+++ b/games-emulation/zsnes/zsnes-2.0.10.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Fork of the classic Super Nintendo emulator"
+HOMEPAGE="https://github.com/xyproto/zsnes/ https://www.zsnes.com/;
+SRC_URI="https://github.com/xyproto/zsnes/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="custom-cflags"
+
+RDEPEND="
+   media-libs/libglvnd[X,abi_x86_32(-)]
+   media-libs/libpng:=[abi_x86_32(-)]
+   media-libs/libsdl[abi_x86_32(-),joystick,opengl,sound,video]
+   sys-libs/zlib:=[abi_x86_32(-)]
+   x11-libs/libX11[abi_x86_32(-)]"
+DEPEND="
+   ${RDEPEND}
+   x11-base/xorg-proto"
+BDEPEND="
+   dev-lang/nasm
+   sys-libs/zlib
+   virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.0.9-cc-quotes.patch
+   "${FILESDIR}"/${PN}-2.0.9-gentoo-zlib.patch
+)
+
+src_compile() {
+   # Makefile forces many CFLAGS that are questionable, but zsnes' ancient 
x86
+   # asm is fragile, not pic safe (bug #427104), broken by F_S=3 (formerly
+   # broken with =2 as well), and can be affected by -march=* and similar.
+   # Stick to upstream's choices, this is non-portable either way.
+   if use !custom-cflags; then
+   strip-flags
+   append-cppflags -U_FORTIFY_SOURCE # to disable =3, Makefile 
enables =2
+   fi
+
+   # used to build and run parsegen at build time (uses zlib wrt BDEPEND)
+   tc-export_build_env BUILD_CXX
+   local buildcxx="${BUILD_CXX} ${BUILD_CXXFLAGS} ${BUILD_CPPFLAGS} 
${BUILD_LDFLAGS}"
+
+   use amd64 && multilib_toolchain_setup x86
+   tc-export CC CXX
+   append-cflags "${CPPFLAGS}"
+   append-cxxflags "${CPPFLAGS}"
+
+   emake CXX_HOST="${buildcxx}"
+}
+
+src_install() {
+   emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+
+   dodoc README.md TODO.md
+
+   newicon icons/64x64x32.png ${PN}.png
+   make_desktop_entry ${PN} ${PN^^}
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/

2022-07-04 Thread Mike Gilbert
commit: c547cecbf6d46f399bb1ec5b360b8e4a0cde1b7c
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Jul  4 20:42:46 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Jul  4 20:44:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c547cecb

sys-apps/systemd-utils: do not install 70-power-switch.rules

In meson, this is gated behind enable_logind.

Closes: https://bugs.gentoo.org/856433
Signed-off-by: Mike Gilbert  gentoo.org>

 ...md-utils-251.2.ebuild => systemd-utils-251.2-r1.ebuild} | 14 ++
 1 file changed, 14 insertions(+)

diff --git a/sys-apps/systemd-utils/systemd-utils-251.2.ebuild 
b/sys-apps/systemd-utils/systemd-utils-251.2-r1.ebuild
similarity index 98%
rename from sys-apps/systemd-utils/systemd-utils-251.2.ebuild
rename to sys-apps/systemd-utils/systemd-utils-251.2-r1.ebuild
index 6d6a29224efa..357c32eb616c 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.2.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.2-r1.ebuild
@@ -419,14 +419,19 @@ multilib_src_install() {
into /
dobin udevadm systemd-hwdb
dosym ../../bin/udevadm /lib/systemd/systemd-udevd
+
exeinto /lib/udev
doexe 
src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
insinto /lib/udev/rules.d
doins rules.d/*.rules
+
insinto /lib/udev/hwdb.d
doins hwdb.d/*.hwdb
+
insinto /usr/share/pkgconfig
doins src/udev/udev.pc
+
doman 
man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
newman man/systemd-udevd.service.8 systemd-udevd.8
fi
@@ -457,17 +462,26 @@ multilib_src_install_all() {
fi
if use udev; then
doheader src/libudev/libudev.h
+
insinto /etc/udev
doins src/udev/udev.conf
keepdir /etc/udev/{hwdb.d,rules.d}
+
insinto /lib/systemd/network
doins network/99-default.link
+
+   # Remove to avoid conflict with elogind
+   # https://bugs.gentoo.org/856433
+   rm rules.d/70-power-switch.rules || die
insinto /lib/udev/rules.d
doins rules.d/*.rules
doins "${FILESDIR}"/40-gentoo.rules
+
insinto /lib/udev/hwdb.d
doins hwdb.d/*.hwdb
+
dobashcomp shell-completion/bash/udevadm
+
insinto /usr/share/zsh/site-functions
doins shell-completion/zsh/_udevadm
fi



[gentoo-commits] repo/gentoo:master commit in: dev-db/redis/

2022-07-04 Thread John Helmert III
commit: 0a16aa4ac35c28c32e25b440d4cc94f5b38f0bd7
Author: Petr Vaněk  atlas  cz>
AuthorDate: Mon Jul  4 10:56:45 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Mon Jul  4 20:07:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a16aa4a

dev-db/redis: drop 7.0.0, 7.0.0-r2

Removal due to a CVE-2022-33105.

Bug: https://bugs.gentoo.org/856040
Signed-off-by: Petr Vaněk  atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/26218
Signed-off-by: John Helmert III  gentoo.org>

 dev-db/redis/Manifest  |   1 -
 dev-db/redis/redis-7.0.0-r2.ebuild | 183 -
 dev-db/redis/redis-7.0.0.ebuild| 201 -
 3 files changed, 385 deletions(-)

diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 5a0a29325c64..2941f463918f 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -2,6 +2,5 @@ DIST redis-5.0.14.tar.gz 2000179 BLAKE2B 
77d3ed09a81450dbf806edd017785b82c50bb05
 DIST redis-6.0.16.tar.gz 2288647 BLAKE2B 
f3552cc0d27cbc5cf6556792da9a75d01ff70d372484c95d2af8b24ec902a8086b9c3f4e53513df982fe135963432bfb527334926dd494e50d2cc618ab813f39
 SHA512 
83bb72448f9943e3d015cb4d961eb2eae21602ef1f90ca52ca8ab7c6918b0ab979db9f61f3981df27b2286894f4864f4588c3a52fa988e30e9419b0967998845
 DIST redis-6.2.6.tar.gz 2476542 BLAKE2B 
d139479432171294911d99e7e8c2327dbbc6682ea49de761c4bb4089a2efd814926f2f8823dca1826b4a61dd9ccf79abb22878c9463ac92870481b43d8a7fff7
 SHA512 
9b947d26fd9e208627ed22d318ab3d0775ab0be46d98db1c1d158feac671b984e75ce33e647d196face9643f80768af47e678be1b4e1ddd3eb56dff467c46022
 DIST redis-6.2.7.tar.gz 2487287 BLAKE2B 
06f1b1e16cdf06c38b67c1f1d025da50cc3719688b8c2bf23077d77dd97ea546909043fb65e60478ac3661cc033fa6e8d7a38e361e69eb93ba3db07b7c66
 SHA512 
d113094b8e31754915db7f0317d9b7969e034af3a7bac2ae0cbfad6cc61ba3aae35e9709c435abc1024a96f914df7a760b3cd18d06c375b541cfa837d1c5b953
-DIST redis-7.0.0.tar.gz 2943054 BLAKE2B 
561cf591bacac51fddc375a1c725c385f9b0b4b4bb7fca7d889ee1b7760cf5ea986e26613a0f69fda9b6f8a02d02e055514d374be7913e26724e3857967fea22
 SHA512 
12ac925708c54b00b34c365dee39cb207fbe3cb3c99e8daad965e122b6e3a6543e3ca80e23e6a56f5dff6371d4f2b9c149ee51800ed540e1f1b9154a118ea07b
 DIST redis-7.0.1.tar.gz 2955839 BLAKE2B 
67ff36e5e78ab9a90d4404d0f0bddbe9b539166c826d8a1b314bb32cdece7d40caf5eff57302cd641548ed3b1e19aff1b657ed31a20233550636708b6386c2db
 SHA512 
e61d27695fd2d439f204612b97a3ea245ebf92d418949460f7144026191ade4fac1647717bbb48a2b3e238856f0392af08b4fdb4358d04f2ccd1088ff9d3dac4
 DIST redis-7.0.2.tar.gz 2956784 BLAKE2B 
418f6114662c9b9b67dc7f28f89f58fefee3eb5fec84a6193ca50034366c963986a56d1c96dadfdd88a88ea1ddd4542ed910b89c8a81c95b38aa4f7bdc5ae571
 SHA512 
bc8d679ecaad0220318b87be70476653f42b76815af61ff6f4e8885f5a5d17d41cea754fbf448f9e18e9a9f90227c5ac198fa9bc523370752f590ba01418a1b0

diff --git a/dev-db/redis/redis-7.0.0-r2.ebuild 
b/dev-db/redis/redis-7.0.0-r2.ebuild
deleted file mode 100644
index c8c1359e41d5..
--- a/dev-db/redis/redis-7.0.0-r2.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# N.B.: It is no clue in porting to Lua eclasses, as upstream have deviated
-# too far from vanilla Lua, adding their own APIs like lua_enablereadonlytable
-
-inherit autotools edo flag-o-matic multiprocessing systemd tmpfiles 
toolchain-funcs
-
-DESCRIPTION="A persistent caching system, key-value, and data structures 
database"
-HOMEPAGE="https://redis.io;
-SRC_URI="https://download.redis.io/releases/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 
~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+jemalloc ssl systemd tcmalloc test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-   jemalloc? ( >=dev-libs/jemalloc-5.1:= )
-   ssl? ( dev-libs/openssl:0= )
-   systemd? ( sys-apps/systemd:= )
-   tcmalloc? ( dev-util/google-perftools )
-"
-
-RDEPEND="
-   ${COMMON_DEPEND}
-   acct-group/redis
-   acct-user/redis
-"
-
-BDEPEND="
-   ${COMMON_DEPEND}
-   virtual/pkgconfig
-"
-
-# Tcl is only needed in the CHOST test env
-DEPEND="
-   ${COMMON_DEPEND}
-   test? (
-   dev-lang/tcl:0=
-   ssl? ( dev-tcltk/tls )
-   )"
-
-REQUIRED_USE="?? ( jemalloc tcmalloc )"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-6.2.1-config.patch
-   "${FILESDIR}"/${PN}-5.0-shared.patch
-   "${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch
-   "${FILESDIR}"/${PN}-sentinel-5.0-config.patch
-)
-
-src_prepare() {
-   default
-
-   # Append cflag for lua_cjson
-   # 
https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
-   append-cflags "-DENABLE_CJSON_GLOBAL"
-
-   # now we will rewrite present Makefiles
-   local makefiles="" MKF
-   for MKF in $(find -name 'Makefile' | cut -b 3-); do

[gentoo-commits] repo/gentoo:master commit in: dev-util/rizin/

2022-07-04 Thread John Helmert III
commit: fd3f25f53be1a5dc7d81cdf498a0128b52eaf2c2
Author: John Helmert III  gentoo  org>
AuthorDate: Mon Jul  4 20:00:06 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Mon Jul  4 20:01:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd3f25f5

dev-util/rizin: drop 0.3.4, 0.3.4-r1

Bug: https://bugs.gentoo.org/836002
Signed-off-by: John Helmert III  gentoo.org>

 dev-util/rizin/Manifest  |   2 -
 dev-util/rizin/rizin-0.3.4-r1.ebuild | 103 ---
 dev-util/rizin/rizin-0.3.4.ebuild| 103 ---
 3 files changed, 208 deletions(-)

diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
index 39d5687e41c8..4904a831c03e 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -1,4 +1,2 @@
-DIST rizin-src-v0.3.4.tar.xz 10411432 BLAKE2B 
99745f069e6bd72aec6a6f335f3aa0ccc46ebf186b1dc0aaf32b4f95d2be4bb49e8d3d976a72978c22fce82d896e70bf8403568e100b73898731045ef06a2ad5
 SHA512 
cda35afe8c031f3207c055ed31d7f76a46b7addd04cead0f5aadf0733b66f4dd953ca16f054b47da7921d4726d6ea1250436012954a9755c1cd524a8fd0d670c
 DIST rizin-src-v0.4.0.tar.xz 11432232 BLAKE2B 
095ca9d317296afca9514a70f208e9aa87fc426e6b7e41163f64d5a1192a4d9ccd8ece9c4f13a24fc973668dece625fa13ad75542695a66c542fe2f0d9e66733
 SHA512 
9d576bee48e5ceae46b4e309c53e01b82edf89a95046f576e1c38fefa73353d6d1f04e6d444332324387d4e115bc87659a358629f7277a41dfef44c82364547b
 DIST rizin-testbins-64a6f26369bf5893ecc20cb8984a5ad506ef8566.tar.gz 172591261 
BLAKE2B 
e78843fd95ac0406f66490b7253206e77787fc65780bc7c6a67d26aa9618a6f85803a88724ad424a7bdeeb20d95ebf9314e582029ac778d7d4de4f207ff54aad
 SHA512 
ada4a3faad94553f0f2802419ba604177bb66d332b1a351effd485d65bd8365abb36d736486bbd0bcbc0da584ad4a2edaa7aa3cb62fa12811282c2e0afecb950
-DIST rizin-testbins-aa6a88dcdfaad54335e3935c16ce21a124ff861d.tar.gz 127254454 
BLAKE2B 
e7a4536be7169abd197c2128e103b8d669fbb7532ce265b27da3ce347b1aa58c8a96c95d85cf7700f66a44c041a0575175de3a0e176a0d31c490f7ccfb2f6d6b
 SHA512 
20cf299e5324793f07f8a2fdcfa3d66c3a418f09bfc6a272e35ab31d4a64408bf91532ae431098dede1a2d0ad0b1c02433304c514816d98dc068f6c0528a4099

diff --git a/dev-util/rizin/rizin-0.3.4-r1.ebuild 
b/dev-util/rizin/rizin-0.3.4-r1.ebuild
deleted file mode 100644
index cc3e0fb5efbd..
--- a/dev-util/rizin/rizin-0.3.4-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-# This is the commit that the CI for the release commit used
-BINS_COMMIT="aa6a88dcdfaad54335e3935c16ce21a124ff861d"
-
-inherit meson python-any-r1
-
-DESCRIPTION="reverse engineering framework for binary analysis"
-HOMEPAGE="https://rizin.re/;
-
-SRC_URI="mirror+https://github.com/rizinorg/rizin/releases/download/v${PV}/rizin-src-v${PV}.tar.xz
-   test? ( 
https://github.com/rizinorg/rizin-testbins/archive/${BINS_COMMIT}.tar.gz -> 
rizin-testbins-${BINS_COMMIT}.tar.gz )"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-LICENSE="Apache-2.0 BSD LGPL-3 MIT"
-SLOT="0/${PV}"
-IUSE="test"
-
-# Need to audit licenses of the binaries used for testing
-RESTRICT="fetch !test? ( test )"
-
-RDEPEND="
-   sys-apps/file
-   app-arch/lz4:0=
-   =dev-libs/tree-sitter-0.19.0
-   dev-libs/xxhash
-   sys-libs/zlib:0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-0.3.0-typedb-prefix.patch"
-   "${FILESDIR}/${PN}-0.3.2-never-rebuild-parser.patch"
-)
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-src_prepare() {
-   default
-
-   local py_to_mangle=(
-   librz/core/cmd_descs/cmd_descs_generate.py
-   
subprojects/lz4-1.9.3/contrib/meson/meson/GetLz4LibraryVersion.py
-   subprojects/lz4-1.9.3/contrib/meson/meson/InstallSymlink.py
-   subprojects/lz4-1.9.3/tests/test-lz4-list.py
-   subprojects/lz4-1.9.3/tests/test-lz4-speed.py
-   subprojects/lz4-1.9.3/tests/test-lz4-versions.py
-   sys/clang-format.py
-   test/fuzz/scripts/fuzz_rz_asm.py
-   test/scripts/gdbserver.py
-   )
-
-   python_fix_shebang "${py_to_mangle[@]}"
-
-   if use test; then
-   cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" 
"${S}/test/bins" || die
-   cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}" || die
-   fi
-}
-
-src_configure() {
-   local emesonargs=(
-   -Dcli=enabled
-   -Duse_sys_capstone=enabled
-   -Duse_sys_magic=enabled
-   -Duse_sys_libzip=enabled
-   -Duse_sys_zlib=enabled
-   -Duse_sys_lz4=enabled
-   -Duse_sys_xxhash=enabled
-   -Duse_sys_openssl=enabled
-   -Duse_sys_tree_sitter=enabled
-
-   $(meson_use test enable_tests)
-   $(meson_use test enable_rz_test)
-   )
-   

[gentoo-commits] repo/gentoo:master commit in: dev-util/rizin/, dev-util/rizin/files/

2022-07-04 Thread John Helmert III
commit: de8b82fad57e57633c0d3e4c666e4c8b916501cc
Author: John Helmert III  gentoo  org>
AuthorDate: Mon Jul  4 19:08:01 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Mon Jul  4 20:01:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de8b82fa

dev-util/rizin: add 0.4.0, enable py3.11

Signed-off-by: John Helmert III  gentoo.org>

 dev-util/rizin/Manifest|  2 +
 .../files/rizin-0.4.0-never-rebuild-parser.patch   | 38 +
 dev-util/rizin/rizin-0.4.0.ebuild  | 94 ++
 3 files changed, 134 insertions(+)

diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
index c38b64e65193..39d5687e41c8 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -1,2 +1,4 @@
 DIST rizin-src-v0.3.4.tar.xz 10411432 BLAKE2B 
99745f069e6bd72aec6a6f335f3aa0ccc46ebf186b1dc0aaf32b4f95d2be4bb49e8d3d976a72978c22fce82d896e70bf8403568e100b73898731045ef06a2ad5
 SHA512 
cda35afe8c031f3207c055ed31d7f76a46b7addd04cead0f5aadf0733b66f4dd953ca16f054b47da7921d4726d6ea1250436012954a9755c1cd524a8fd0d670c
+DIST rizin-src-v0.4.0.tar.xz 11432232 BLAKE2B 
095ca9d317296afca9514a70f208e9aa87fc426e6b7e41163f64d5a1192a4d9ccd8ece9c4f13a24fc973668dece625fa13ad75542695a66c542fe2f0d9e66733
 SHA512 
9d576bee48e5ceae46b4e309c53e01b82edf89a95046f576e1c38fefa73353d6d1f04e6d444332324387d4e115bc87659a358629f7277a41dfef44c82364547b
+DIST rizin-testbins-64a6f26369bf5893ecc20cb8984a5ad506ef8566.tar.gz 172591261 
BLAKE2B 
e78843fd95ac0406f66490b7253206e77787fc65780bc7c6a67d26aa9618a6f85803a88724ad424a7bdeeb20d95ebf9314e582029ac778d7d4de4f207ff54aad
 SHA512 
ada4a3faad94553f0f2802419ba604177bb66d332b1a351effd485d65bd8365abb36d736486bbd0bcbc0da584ad4a2edaa7aa3cb62fa12811282c2e0afecb950
 DIST rizin-testbins-aa6a88dcdfaad54335e3935c16ce21a124ff861d.tar.gz 127254454 
BLAKE2B 
e7a4536be7169abd197c2128e103b8d669fbb7532ce265b27da3ce347b1aa58c8a96c95d85cf7700f66a44c041a0575175de3a0e176a0d31c490f7ccfb2f6d6b
 SHA512 
20cf299e5324793f07f8a2fdcfa3d66c3a418f09bfc6a272e35ab31d4a64408bf91532ae431098dede1a2d0ad0b1c02433304c514816d98dc068f6c0528a4099

diff --git a/dev-util/rizin/files/rizin-0.4.0-never-rebuild-parser.patch 
b/dev-util/rizin/files/rizin-0.4.0-never-rebuild-parser.patch
new file mode 100644
index ..0e6e95c09318
--- /dev/null
+++ b/dev-util/rizin/files/rizin-0.4.0-never-rebuild-parser.patch
@@ -0,0 +1,38 @@
+commit 7af437dbedaaa478b579d19133b6711923b037d8
+Author: John Helmert III 
+Date:   Mon Jul 4 12:44:43 2022 -0500
+
+subprojects/rizin-shell-parser/src: Never rebuild parser.c
+
+This requires dev-libs/tree-sitter[ts-cli] and net-libs/nodejs, both
+of which would be heavy new dependencies. However, these are only
+needed to rebuild the already-existing tree-sitter parser, which
+doesn't do much for us (if anything) since it already exists. In this
+case, it's better to just reduce fragility by unconditionally
+disabling this.
+
+Newly forward-ported from the 0.3.2 version.
+
+Bug: https://bugs.gentoo.org/830068
+Signed-off-by: John Helmert III 
+
+diff --git a/subprojects/rizin-shell-parser/src/meson.build 
b/subprojects/rizin-shell-parser/src/meson.build
+index ae31896a98..14324daba0 100644
+--- a/subprojects/rizin-shell-parser/src/meson.build
 b/subprojects/rizin-shell-parser/src/meson.build
+@@ -1,14 +1,4 @@
+-tree_sitter_bin = find_program('tree-sitter', required: false)
+-node_bin = find_program('node', required: false)
+-if tree_sitter_bin.found() and node_bin.found() and 
tree_sitter_dep.type_name() != 'internal'
+-  parser_c = custom_target('parser_src_c',
+-command: [tree_sitter_wrap_py, tree_sitter_bin, '@OUTDIR@/..', '@INPUT@'],
+-input: [grammar_js],
+-output: 'parser.c',
+-  )
+-else
+-  parser_c = files('parser.c')
+-endif
++parser_c = files('parser.c')
+ 
+ shell_parser_files = [files('scanner.c'), parser_c]
+ shell_parser_inc = [include_directories('tree_sitter')]

diff --git a/dev-util/rizin/rizin-0.4.0.ebuild 
b/dev-util/rizin/rizin-0.4.0.ebuild
new file mode 100644
index ..7602de44178a
--- /dev/null
+++ b/dev-util/rizin/rizin-0.4.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+# This is the commit that the CI for the release commit used
+BINS_COMMIT="64a6f26369bf5893ecc20cb8984a5ad506ef8566"
+
+inherit meson python-any-r1
+
+DESCRIPTION="reverse engineering framework for binary analysis"
+HOMEPAGE="https://rizin.re/;
+
+SRC_URI="mirror+https://github.com/rizinorg/rizin/releases/download/v${PV}/rizin-src-v${PV}.tar.xz
+   test? ( 
https://github.com/rizinorg/rizin-testbins/archive/${BINS_COMMIT}.tar.gz -> 
rizin-testbins-${BINS_COMMIT}.tar.gz )"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+LICENSE="Apache-2.0 BSD LGPL-3 MIT"
+SLOT="0/${PV}"
+IUSE="test"
+
+# Need to audit licenses of the 

[gentoo-commits] repo/gentoo:master commit in: dev-util/rizin/

2022-07-04 Thread John Helmert III
commit: da3042f37243689df0970cdad468e05387da141c
Author: John Helmert III  gentoo  org>
AuthorDate: Mon Jul  4 19:57:11 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Mon Jul  4 20:01:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da3042f3

dev-util/rizin: stabilize 0.4.0 for amd64

Bug: https://bugs.gentoo.org/836002
Signed-off-by: John Helmert III  gentoo.org>

 dev-util/rizin/rizin-0.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/rizin/rizin-0.4.0.ebuild 
b/dev-util/rizin/rizin-0.4.0.ebuild
index 7602de44178a..5f19fe3d4b47 100644
--- a/dev-util/rizin/rizin-0.4.0.ebuild
+++ b/dev-util/rizin/rizin-0.4.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://rizin.re/;
 
 
SRC_URI="mirror+https://github.com/rizinorg/rizin/releases/download/v${PV}/rizin-src-v${PV}.tar.xz
test? ( 
https://github.com/rizinorg/rizin-testbins/archive/${BINS_COMMIT}.tar.gz -> 
rizin-testbins-${BINS_COMMIT}.tar.gz )"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 LICENSE="Apache-2.0 BSD LGPL-3 MIT"
 SLOT="0/${PV}"



[gentoo-commits] repo/gentoo:master commit in: dev-util/cutter/

2022-07-04 Thread John Helmert III
commit: dc148391fe5ba99d2f85bd4e7bd4a3038df96949
Author: John Helmert III  gentoo  org>
AuthorDate: Mon Jul  4 19:58:48 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Mon Jul  4 20:01:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc148391

dev-util/cutter: drop 2.0.5

Signed-off-by: John Helmert III  gentoo.org>

 dev-util/cutter/Manifest|  2 --
 dev-util/cutter/cutter-2.0.5.ebuild | 63 -
 2 files changed, 65 deletions(-)

diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
index 63622325cb2b..c75be08b90cc 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -1,4 +1,2 @@
-DIST cutter-2.0.5.tar.gz 2724670 BLAKE2B 
67352247dd4f16c916a669f72b3fd432c9fd122df39be3af5b08d288fab1b83876dbc891df8cfcebe211a9815930855add0ede7cd86667636ebcba1a43065957
 SHA512 
96badcd2ea00c2b50417b7019933443831fec3a4769cf7ab66505e898d3f2c693f24bbe994ad70f66a456908e621f053a96b21a2999290dc47c4219b6c639bfd
 DIST cutter-2.1.0.tar.gz 2732264 BLAKE2B 
463e0f8968c61c7d3b7e3c7a570c9f7c625e4c024306c0284665d39de460bc6780eedd114f51ec722bec6ab7d43077362b676562d0a89665886fbabc3240def1
 SHA512 
444e27005b9348397097c0c2fd047a557dfd5e8d5d43df6a2ab345da48e26537025ce6f81b256fe765dc59bf5944952965637b84e96136b3025c3dc5bca3f2d6
-DIST cutter-translations-67f5c654523d22c7843811e5aa852a01742f6f12.tar.gz 
719126 BLAKE2B 
24c518c26a47e5eeb9d01ddbe835f9864588954e96820d562afb09f5da3352f807b7c3642d589a9ec81faaefd93fdbdf9c9f7cfc56cfd51ffe6aeaa920385913
 SHA512 
c2caa0e5d6cfa807cbe9117eb84b2931715e303a7d9902a6aaa58ec71b764d2ae9f0836981bd8eb9c91469b9776d93ab12b986ee068922559b5deaab28f54598
 DIST cutter-translations-974298653ba71b958e1b6c83f6011f5fefff6236.tar.gz 
595073 BLAKE2B 
4445c4c16c47a05c74816d88a68fda97037c45caf7508fc1162f4978a0b3cb194653e879b77f6fc5be2f264a929ac11c4fc2aee68ceed6a23447094d0b249cdd
 SHA512 
11450631602e7bd81132650b3edd028d56b2f6343a9561fe8bf3281427d8d22b0296651414756236b8544f719c8d4fc11be44a843532c8c32fe21dd7a82066d2

diff --git a/dev-util/cutter/cutter-2.0.5.ebuild 
b/dev-util/cutter/cutter-2.0.5.ebuild
deleted file mode 100644
index 34ad3bc1089c..
--- a/dev-util/cutter/cutter-2.0.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-TRANS_COMMIT="67f5c654523d22c7843811e5aa852a01742f6f12"
-
-inherit cmake toolchain-funcs xdg-utils python-single-r1
-
-DESCRIPTION="A Qt and C++ GUI for rizin reverse engineering framework"
-HOMEPAGE="https://cutter.re https://github.com/rizinorg/cutter/;
-SRC_URI="https://github.com/rizinorg/cutter/archive/v${PV}.tar.gz -> 
${P}.tar.gz
-   
https://github.com/rizinorg/cutter-translations/archive/${TRANS_COMMIT}.tar.gz 
-> cutter-translations-${TRANS_COMMIT}.tar.gz"
-
-LICENSE="CC-BY-SA-3.0 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="graphviz"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtsvg:5
-   dev-qt/qtwidgets:5
-   >=dev-util/rizin-0.3.1:=
-   graphviz? ( media-gfx/graphviz )"
-DEPEND="${COMMON_DEPEND}
-   dev-qt/linguist-tools:5"
-RDEPEND="${COMMON_DEPEND}"
-
-src_prepare() {
-   rmdir "${S}/src/translations" || die
-   mv "${WORKDIR}/cutter-translations-${TRANS_COMMIT}" \
-  "${S}/src/translations" || die
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_CXX_COMPILER="$(tc-getCXX)"
-   -DCMAKE_C_COMPILER="$(tc-getCC)"
-   -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-   -DCUTTER_ENABLE_GRAPHVIZ="$(usex graphviz)"
-   -DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=OFF
-   -DCUTTER_ENABLE_PYTHON=ON
-   -DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF
-   -DCUTTER_USE_BUNDLED_RIZIN=OFF
-   )
-
-   cmake_src_configure
-}
-
-pkg_postinst() {
-   xdg_icon_cache_update
-}
-
-pkg_postrm() {
-   xdg_icon_cache_update
-}



[gentoo-commits] repo/gentoo:master commit in: dev-util/cutter/

2022-07-04 Thread John Helmert III
commit: 6d7ac91e4c2fc168cfbeaa9413723ad46efacfba
Author: John Helmert III  gentoo  org>
AuthorDate: Mon Jul  4 19:50:52 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Mon Jul  4 20:01:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d7ac91e

dev-util/cutter: add 2.1.0

Signed-off-by: John Helmert III  gentoo.org>

 dev-util/cutter/Manifest|  2 ++
 dev-util/cutter/cutter-2.1.0.ebuild | 63 +
 2 files changed, 65 insertions(+)

diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
index 38164aff08f1..63622325cb2b 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -1,2 +1,4 @@
 DIST cutter-2.0.5.tar.gz 2724670 BLAKE2B 
67352247dd4f16c916a669f72b3fd432c9fd122df39be3af5b08d288fab1b83876dbc891df8cfcebe211a9815930855add0ede7cd86667636ebcba1a43065957
 SHA512 
96badcd2ea00c2b50417b7019933443831fec3a4769cf7ab66505e898d3f2c693f24bbe994ad70f66a456908e621f053a96b21a2999290dc47c4219b6c639bfd
+DIST cutter-2.1.0.tar.gz 2732264 BLAKE2B 
463e0f8968c61c7d3b7e3c7a570c9f7c625e4c024306c0284665d39de460bc6780eedd114f51ec722bec6ab7d43077362b676562d0a89665886fbabc3240def1
 SHA512 
444e27005b9348397097c0c2fd047a557dfd5e8d5d43df6a2ab345da48e26537025ce6f81b256fe765dc59bf5944952965637b84e96136b3025c3dc5bca3f2d6
 DIST cutter-translations-67f5c654523d22c7843811e5aa852a01742f6f12.tar.gz 
719126 BLAKE2B 
24c518c26a47e5eeb9d01ddbe835f9864588954e96820d562afb09f5da3352f807b7c3642d589a9ec81faaefd93fdbdf9c9f7cfc56cfd51ffe6aeaa920385913
 SHA512 
c2caa0e5d6cfa807cbe9117eb84b2931715e303a7d9902a6aaa58ec71b764d2ae9f0836981bd8eb9c91469b9776d93ab12b986ee068922559b5deaab28f54598
+DIST cutter-translations-974298653ba71b958e1b6c83f6011f5fefff6236.tar.gz 
595073 BLAKE2B 
4445c4c16c47a05c74816d88a68fda97037c45caf7508fc1162f4978a0b3cb194653e879b77f6fc5be2f264a929ac11c4fc2aee68ceed6a23447094d0b249cdd
 SHA512 
11450631602e7bd81132650b3edd028d56b2f6343a9561fe8bf3281427d8d22b0296651414756236b8544f719c8d4fc11be44a843532c8c32fe21dd7a82066d2

diff --git a/dev-util/cutter/cutter-2.1.0.ebuild 
b/dev-util/cutter/cutter-2.1.0.ebuild
new file mode 100644
index ..76227a0f622e
--- /dev/null
+++ b/dev-util/cutter/cutter-2.1.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+TRANS_COMMIT="974298653ba71b958e1b6c83f6011f5fefff6236"
+
+inherit cmake toolchain-funcs xdg-utils python-single-r1
+
+DESCRIPTION="A Qt and C++ GUI for rizin reverse engineering framework"
+HOMEPAGE="https://cutter.re https://github.com/rizinorg/cutter/;
+SRC_URI="https://github.com/rizinorg/cutter/archive/v${PV}.tar.gz -> 
${P}.tar.gz
+   
https://github.com/rizinorg/cutter-translations/archive/${TRANS_COMMIT}.tar.gz 
-> cutter-translations-${TRANS_COMMIT}.tar.gz"
+
+LICENSE="CC-BY-SA-3.0 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="graphviz"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwidgets:5
+   >=dev-util/rizin-0.4.0:=
+   graphviz? ( media-gfx/graphviz )"
+DEPEND="${COMMON_DEPEND}
+   dev-qt/linguist-tools:5"
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+   rmdir "${S}/src/translations" || die
+   mv "${WORKDIR}/cutter-translations-${TRANS_COMMIT}" \
+  "${S}/src/translations" || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_CXX_COMPILER="$(tc-getCXX)"
+   -DCMAKE_C_COMPILER="$(tc-getCC)"
+   -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+   -DCUTTER_ENABLE_GRAPHVIZ="$(usex graphviz)"
+   -DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=OFF
+   -DCUTTER_ENABLE_PYTHON=ON
+   -DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF
+   -DCUTTER_USE_BUNDLED_RIZIN=OFF
+   )
+
+   cmake_src_configure
+}
+
+pkg_postinst() {
+   xdg_icon_cache_update
+}
+
+pkg_postrm() {
+   xdg_icon_cache_update
+}



[gentoo-commits] repo/gentoo:master commit in: dev-util/cutter/

2022-07-04 Thread John Helmert III
commit: 057ed54b256c062401e01999aae84fbdf4dce485
Author: John Helmert III  gentoo  org>
AuthorDate: Mon Jul  4 19:57:52 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Mon Jul  4 20:01:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=057ed54b

dev-util/cutter: stabilize 2.1.0 for amd64

Signed-off-by: John Helmert III  gentoo.org>

 dev-util/cutter/cutter-2.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/cutter/cutter-2.1.0.ebuild 
b/dev-util/cutter/cutter-2.1.0.ebuild
index 76227a0f622e..4c7fdfec26b1 100644
--- a/dev-util/cutter/cutter-2.1.0.ebuild
+++ b/dev-util/cutter/cutter-2.1.0.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/rizinorg/cutter/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="CC-BY-SA-3.0 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="graphviz"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 



[gentoo-commits] repo/gentoo:master commit in: x11-libs/pango/files/, x11-libs/pango/

2022-07-04 Thread Matt Turner
commit: 32a88d9b998dbb1dc950a8e109bb621b96c5fb6b
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jul  4 19:44:37 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jul  4 19:55:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32a88d9b

x11-libs/pango: Version bump to 1.50.8

Bug: https://bugs.gentoo.org/836317
Signed-off-by: Matt Turner  gentoo.org>

 x11-libs/pango/Manifest  |  1 +
 x11-libs/pango/files/1.50.8-harfbuzz-4.patch | 47 ++
 x11-libs/pango/pango-1.50.8.ebuild   | 91 
 3 files changed, 139 insertions(+)

diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 9b1e65aa3742..63caf519d4f8 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,3 +1,4 @@
 DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B 
ec3f1a6a4de30e0864e7f0bf0950cb7a7b4bada8c3db496a8e5b1e770f221ae72b43167178445ea9cd0d6b88e51d2af49e7fdf27b2e792997fe7c37e55d429c1
 SHA512 
b7654c3493931e3c6d3cbd40ee49c5cbebaf403954bae75dea80e9f03e12dd5082548aff6a9e778821b8f935e227a7efaad4c1b980fa108e7258042221cadfc1
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 
7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26
 SHA512 
993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
 DIST pango-1.50.7.tar.xz 4294752 BLAKE2B 
049b7c09f2ec35ca229eadcd146513d2b292fac8c2296a1635f32c1e21a2ff14979c4ce4a88f966d2d85dad55e356f089c09e00062d06373f7d0760871333046
 SHA512 
4d754ed753fc34074c2a8751459406af7eb1eccb227c6158287f7e2921614d918cae47d078d4a2b4c098b641e40274e81bf1ec6b6a1b147efd550626665767d3
+DIST pango-1.50.8.tar.xz 4298760 BLAKE2B 
76531815c5b472823b62e0c7a44d4a6c8cf38d587527cceff46e9e7ad302c53abd5827ed4242db2f754761928632b986517ca2814a1ddb9501b2832bbadb3116
 SHA512 
81821e5837d5fb78a07ac8f8e360de9a9bf9b2418a3e0654f80ee3dce7f98325ea2483cc7c1d1db4a662886a1244530515d83480f4c3bc0510788a9bbbae2f91

diff --git a/x11-libs/pango/files/1.50.8-harfbuzz-4.patch 
b/x11-libs/pango/files/1.50.8-harfbuzz-4.patch
new file mode 100644
index ..0fa9c1fb7302
--- /dev/null
+++ b/x11-libs/pango/files/1.50.8-harfbuzz-4.patch
@@ -0,0 +1,47 @@
+This is a revert of upstream commit 0a576fc822a3 ("Try again to fix ci").
+
+Without the patch, the tests fail on my amd64 system with harfbuzz-4.3.0.
+
+diff --git b/tests/layouts/valid-20.layout a/tests/layouts/valid-20.layout
+index db692b73..5b2bcf15 100644
+--- b/tests/layouts/valid-20.layout
 a/tests/layouts/valid-20.layout
+@@ -40,7 +40,7 @@
+ "is-wrapped" : false,
+ "is-ellipsized" : false,
+ "unknown-glyphs" : 0,
+-"width" : 67584,
++"width" : 76800,
+ "height" : 25600,
+ "log-attrs" : [
+   {
+@@ -138,7 +138,7 @@
+ "glyphs" : [
+   {
+ "glyph" : 244,
+-"width" : 15360,
++"width" : 18432,
+ "x-offset" : 14764,
+ "y-offset" : 3845,
+ "is-cluster-start" : true,
+@@ -146,7 +146,7 @@
+   },
+   {
+ "glyph" : 272,
+-"width" : 15360,
++"width" : 18432,
+ "x-offset" : 14764,
+ "y-offset" : 4280,
+ "is-cluster-start" : true,
+@@ -154,7 +154,7 @@
+   },
+   {
+ "glyph" : 273,
+-"width" : 15360,
++"width" : 18432,
+ "x-offset" : 14764,
+ "y-offset" : 3507,
+ "is-cluster-start" : true,
+-- 
+2.35.1
+

diff --git a/x11-libs/pango/pango-1.50.8.ebuild 
b/x11-libs/pango/pango-1.50.8.ebuild
new file mode 100644
index ..e7b3a6a69198
--- /dev/null
+++ b/x11-libs/pango/pango-1.50.8.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic gnome2-utils meson-multilib xdg
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango;
+SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 
1-2)/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+
+IUSE="debug +introspection sysprof test X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   >=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
+   >=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}]
+   
>=media-libs/harfbuzz-2.6.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
+   >=media-libs/fontconfig-2.13.0:1.0=[${MULTILIB_USEDEP}]
+   >=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
+   >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+   introspection? ( >=dev-libs/gobject-introspection-0.9.5:= 

[gentoo-commits] repo/gentoo:master commit in: net-mail/public-inbox/

2022-07-04 Thread Alice Ferrazzi
commit: 678f2156572b0fc7c98b27f989c1a443f561ad87
Author: Alice Ferrazzi  gentoo  org>
AuthorDate: Mon Jul  4 18:33:22 2022 +
Commit: Alice Ferrazzi  gentoo  org>
CommitDate: Mon Jul  4 19:06:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=678f2156

net-mail/public-inbox: add 1.8.0

Signed-off-by: Alice Ferrazzi  gentoo.org>

 net-mail/public-inbox/Manifest  |  1 +
 net-mail/public-inbox/public-inbox-1.8.0.ebuild | 38 +
 2 files changed, 39 insertions(+)

diff --git a/net-mail/public-inbox/Manifest b/net-mail/public-inbox/Manifest
index 7bd7af9913ac..3d256ef2a4f1 100644
--- a/net-mail/public-inbox/Manifest
+++ b/net-mail/public-inbox/Manifest
@@ -1 +1,2 @@
 DIST public-inbox-1.7.0.tar.gz 805628 BLAKE2B 
4403cd11a2c4f793b136aff07ccc06ea60011c21484196e497921ca36599870eecdf7b93f550ef44e876bca814a3b03e1d8d4b484113506ee809098124cfd1b2
 SHA512 
cb03d2ec3e28f1fc75bdbff2b8ea5b417898ddb2895d27b105624cab35f0dcab99269d86bfc158bdf42faecb7b7a5734363a81d2202970e8d079bf05fa359250
+DIST public-inbox-1.8.0.tar.gz 808979 BLAKE2B 
1b68121429f9d9b56008951c0fef8eca4082a71969c907d0e2ba1db434774a451e4080e88c7d0fe80960dba906e0981e19bfcacd63042acfe3c6e16f36aba675
 SHA512 
878c60d6e6bfdcac3218d71b8aa5cab766c622ff1a81c8ebb04399a48da7ef1ab86cae67f8f05e8486f92451f90b9c068ab67ba35dfb74179163598fb5860229

diff --git a/net-mail/public-inbox/public-inbox-1.8.0.ebuild 
b/net-mail/public-inbox/public-inbox-1.8.0.ebuild
new file mode 100644
index ..6d7bfd810fcf
--- /dev/null
+++ b/net-mail/public-inbox/public-inbox-1.8.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit perl-module
+
+HOMEPAGE="https://public-inbox.org;
+SRC_URI="https://public-inbox.org/public-inbox.git/snapshot/${P}.tar.gz;
+DESCRIPTION="An archives-first approach to mailing lists"
+LICENSE="AGPL-3+"
+
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+# in order of mention in INSTALL.html, going more for feature completeness
+# than for minimal footprint
+RDEPEND="
+   dev-vcs/git
+   dev-perl/DBD-SQLite
+   virtual/mta
+   dev-perl/URI
+   dev-perl/Plack
+   dev-perl/TimeDate
+   dev-perl/Inline-C
+   dev-perl/Email-Address-XS
+   dev-perl/Search-Xapian
+   dev-perl/Parse-RecDescent
+   dev-perl/Mail-IMAPClient
+   dev-perl/BSD-Resource
+   net-misc/curl
+   dev-perl/Linux-Inotify2
+   dev-perl/Net-Server
+"
+BDEPEND="${RDEPEND}
+   virtual/perl-ExtUtils-MakeMaker
+"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/

2022-07-04 Thread Mike Gilbert
commit: b89e4d307ea8448e3cadada7d469dc57b2a3b732
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Jul  4 18:46:04 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Jul  4 18:47:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b89e4d30

sys-apps/systemd-utils: add 251.2

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/systemd-utils/Manifest   |   2 +
 sys-apps/systemd-utils/systemd-utils-251.2.ebuild | 497 ++
 2 files changed, 499 insertions(+)

diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 72e7b0b8e23e..0c70734cd8e9 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,3 +1,5 @@
 DIST systemd-musl-patches-250.4.tar.gz 28065 BLAKE2B 
b8366c4bb29705e3f41f07d0105c4d252d543aaac178e968663660eeb573da034813aa50a96c74ac78ae5efeea379e00df33c5a039ec828cf93450ed23786252
 SHA512 
66e41fab1873021913c32e3f43300ea7babd18a36e6543838ab7fab4c44f5590c6a7414dd50c7ee81e5513b0e5aa01cb6df4231e8e06c609d63011a32b524213
+DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 
4ac6a5220dab8409962a3954af2fb2484af718d0f282129957236ce241fbe8538a90d507a96c7c3d86f4f408ab784a6888b37486405d3276e7734a1bd5aa9680
 SHA512 
6e56b62234ac54929faea5a7cad699d0b932f869b48e3ba4e1f349a88653b7c787efec24a09b00290c3dc566614e3c1dc2f3c04f04e943f513108a91eca1be82
 DIST systemd-stable-250.6.tar.gz 11212534 BLAKE2B 
faf065dbe5c02d9d3311202f93b9ad8984c4c9d127d32c17f305b81046f9e29cfc731cdd4abbd073965f448f4e1dff81d80313896b346548d2640939ad509365
 SHA512 
b625d5fb419370d238cf72f2e59c8fa6782972d94746835bde3a64a7746edd1d5fad901bbb01311f858b7dbdff6d759518b615708bb835a81964c16878d5644e
 DIST systemd-stable-250.7.tar.gz 11214975 BLAKE2B 
5d94b4b1f8b0cd6e8284a89ac0d4bd373eccdad2c3d6e6c453df79c8df47ee0f9cfbde764b72b1f9d172d07e2d9f1f1f41c1ab254cf4abd0722469ebc3ad7cf8
 SHA512 
99bc6f0c9757b280cb694f3fb4d6fe04d5ce55583eb2bae5ddeb324bb5ee9930c1720fcc27293d90cddba188473653ec541a471ae8115710a5850c26d0ba215d
+DIST systemd-stable-251.2.tar.gz 11434645 BLAKE2B 
a7e118649a7d27b789206ea9f6f2d0314e44561367506ee763a9e98fb97579b3fc49c7a402c8da142945dc98444558f0e311557f52c50863cebc7532c17c651f
 SHA512 
0c4011b685a1e8d535af123cbaf79ab53d59ea665ca5350ab1077ad4e962b49c1fd5b1b5bb3f28c3e28145dfd02aa83023f78de5edec15afe84e3e06e742a67c

diff --git a/sys-apps/systemd-utils/systemd-utils-251.2.ebuild 
b/sys-apps/systemd-utils/systemd-utils-251.2.ebuild
new file mode 100644
index ..6d6a29224efa
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-251.2.ebuild
@@ -0,0 +1,497 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 
toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/;
+
+if [[ ${PV} == *.* ]]; then
+   MY_P="systemd-stable-${PV}"
+   S="${WORKDIR}/${MY_P}"
+   
SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz
 -> ${MY_P}.tar.gz"
+else
+   MY_P="systemd-${PV}"
+   S="${WORKDIR}/${MY_P}"
+   
SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> 
${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-251.2"
+SRC_URI+=" elibc_musl? ( 
https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+   elibc_musl? ( >=sys-libs/musl-1.2.3 )
+   selinux? ( sys-libs/libselinux:0= )
+   tmpfiles? (
+   acl? ( sys-apps/acl:0= )
+   )
+   udev? (
+   >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+   sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+   virtual/libcrypt:=[${MULTILIB_USEDEP}]
+   acl? ( sys-apps/acl:0= )
+   kmod? ( >=sys-apps/kmod-15:0= )
+   )
+   !udev? (
+   >=sys-apps/util-linux-2.30:0=
+   sys-libs/libcap:0=
+   virtual/libcrypt:=
+   )
+"
+DEPEND="${COMMON_DEPEND}
+   >=sys-kernel/linux-headers-3.11
+   boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+   boot? ( != -O2, so we need
+   # to unset F_S first, then explicitly set 2, to negate any default
+   # and anything set by the user if they're choosing 3 (or if they've
+   # modified GCC to set 3).
+   #
+   if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+   # We can't unconditionally do this b/c we fortify needs
+   # some level of optimisation.
+  

  1   2   3   4   >