[gentoo-commits] repo/gentoo:master commit in: www-apps/rutorrent/

2023-06-15 Thread Viorel Munteanu
commit: 6a3737cb11eacbe6bfac858018b37de7b06402f5
Author: Henning Schild  hennsch  de>
AuthorDate: Thu Jun 15 17:31:10 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Fri Jun 16 05:46:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a3737cb

www-apps/rutorrent: bump version to 4.1.6

Signed-off-by: Henning Schild  hennsch.de>
Closes: https://github.com/gentoo/gentoo/pull/31460
Signed-off-by: Viorel Munteanu  gentoo.org>

 www-apps/rutorrent/Manifest   |  1 +
 www-apps/rutorrent/rutorrent-4.1.6.ebuild | 71 +++
 2 files changed, 72 insertions(+)

diff --git a/www-apps/rutorrent/Manifest b/www-apps/rutorrent/Manifest
index ac241e090e72..4ff74826b6d8 100644
--- a/www-apps/rutorrent/Manifest
+++ b/www-apps/rutorrent/Manifest
@@ -1,3 +1,4 @@
 DIST rutorrent-4.0.2.tar.gz 2221825 BLAKE2B 
96867dbd818949388dedbfeee80ae85d22c9f3b04636d66797a96fc7b1de7541128445a989f642d711bd93aaf0840b56fe4e7bb7f29a02d122d939039eeff835
 SHA512 
f1f3cf7712246c02c73753e5ec8c3b5c0af4797699adeabc59822c165d06d7291d50a2d065b2d729273f907e1ec288391b1f02bc733a2b40d3e818a2de983528
 DIST rutorrent-4.1.3.tar.gz 2248878 BLAKE2B 
08c5a4580fbc1873b64e211cce5d0f2a92daa90bfdbc7900c7a4cfb24e5d2202afb87f6809e36191f8cbc08fd7a037eb63a4609e7c3c07d301b19a5cb2c28dc7
 SHA512 
c9f941bddc9759de1b183bfb9bb9eb91e91477409fc475f4585cdd90d24aeefe5e56aefa6ae45ed84bee369b4cc51f5bca64b07f8624d48246b6bc82aaaee9fb
 DIST rutorrent-4.1.5.tar.gz 2248742 BLAKE2B 
c79b7402cb0d9ac6fd8a26ebc22565bca8236fcb06b11dae065907955c09a6958581f4775abec774f1e968f4df381166e6e4b63a109550967f8089529977f9d8
 SHA512 
a0ffe258bd05b1e778b95c0bad6f76750329cd61c3086f923204fd7e404cd2a5ca8e1e93c7e863be89f093a9a10dda5a4871880582f4c77996a373cd66ff29b6
+DIST rutorrent-4.1.6.tar.gz 2256263 BLAKE2B 
7767d4c79473239303cda844e95804e5ff02bae3a037e83caf619c02fb16172057226d426d1b8ba7155dc8dc8602d59a631f9336271979d463bf7478cfa529a1
 SHA512 
e6c38712c1cb2836fe5172212294382431832359dec9f60f2654d5ce934a7ff3164b86b846db5db0541737d1133e1bbc7c61e688e28f02eece3837cd1d201d1a

diff --git a/www-apps/rutorrent/rutorrent-4.1.6.ebuild 
b/www-apps/rutorrent/rutorrent-4.1.6.ebuild
new file mode 100644
index ..f7dbb6ae40d3
--- /dev/null
+++ b/www-apps/rutorrent/rutorrent-4.1.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit webapp optfeature
+
+DESCRIPTION="ruTorrent is a front-end for the popular Bittorrent client 
rTorrent"
+HOMEPAGE="https://github.com/Novik/ruTorrent;
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/Novik/ruTorrent.git;
+else
+   SRC_URI="https://github.com/Novik/ruTorrent/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+   S="${WORKDIR}/ruTorrent-${PV}"
+fi
+
+LICENSE="GPL-2+ MIT"
+
+RDEPEND="
+   dev-lang/php[xml,gd]
+   virtual/httpd-php
+"
+
+need_httpd_cgi
+
+pkg_setup() {
+   webapp_pkg_setup
+}
+
+src_install() {
+   webapp_src_preinst
+
+   rm -r .github || die
+   find . \( -name .gitignore -o -name .gitmodules \) -type f -delete || 
die
+   if [[ ${PV} ==  ]]; then
+   rm -r .git .gitattributes || die
+   fi
+
+   insinto "${MY_HTDOCSDIR}"
+   doins -r .
+
+   # can not use fperms beacuse of globbing
+   chmod +x "${ED}${MY_HTDOCSDIR}"/plugins/*/*.sh \
+   "${ED}${MY_HTDOCSDIR}"/php/test.sh || die "chmod failed"
+
+   keepdir "${MY_HTDOCSDIR}"/conf/users
+   keepdir "${MY_HTDOCSDIR}"/share/settings
+   keepdir "${MY_HTDOCSDIR}"/share/torrents
+   keepdir "${MY_HTDOCSDIR}"/share/users
+
+   webapp_serverowned -R "${MY_HTDOCSDIR}"/conf
+   webapp_serverowned -R "${MY_HTDOCSDIR}"/share
+
+   webapp_configfile "${MY_HTDOCSDIR}"/conf/.htaccess
+   webapp_configfile "${MY_HTDOCSDIR}"/conf/config.php
+   webapp_configfile "${MY_HTDOCSDIR}"/conf/access.ini
+   webapp_configfile "${MY_HTDOCSDIR}"/conf/plugins.ini
+   webapp_configfile "${MY_HTDOCSDIR}"/share/.htaccess
+
+   webapp_src_install
+}
+
+pkg_postinst() {
+   webapp_pkg_postinst
+
+   optfeature "Show audio file spectogram" media-sound/sox
+   optfeature "Display media file information" media-video/mediainfo
+   optfeature "Scrape Cloudflare based sites" dev-python/cloudscraper
+}



[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/, net-misc/olsrd/files/

2023-06-15 Thread Viorel Munteanu
commit: ab73df0b66d343f94f5c7815cbb04cb1b966b502
Author: Brahmajit Das  gmail  com>
AuthorDate: Tue Jun 13 15:21:22 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Fri Jun 16 05:43:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab73df0b

net-misc/olsrd: Fix incompatible pointer to integer conversion initializing int

Closes: https://bugs.gentoo.org/898090
Closes: https://bugs.gentoo.org/870748
Signed-off-by: Brahmajit Das  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31242
Signed-off-by: Viorel Munteanu  gentoo.org>

 .../olsrd/files/olsrd-0.9.8-clang16-buildfix.patch |  53 +
 net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild | 124 +
 2 files changed, 177 insertions(+)

diff --git a/net-misc/olsrd/files/olsrd-0.9.8-clang16-buildfix.patch 
b/net-misc/olsrd/files/olsrd-0.9.8-clang16-buildfix.patch
new file mode 100644
index ..0194b17362ba
--- /dev/null
+++ b/net-misc/olsrd/files/olsrd-0.9.8-clang16-buildfix.patch
@@ -0,0 +1,53 @@
+https://github.com/OLSR/olsrd/pull/124
+--- a/lib/filtergw/src/olsrd_filtergw.c
 b/lib/filtergw/src/olsrd_filtergw.c
+@@ -54,6 +54,7 @@
+ #include "log.h"
+ #include "routing_table.h"
+ #include "olsr_cfg.h"
++#include "parser.h"
+ 
+ #include 
+ #include 
+@@ -75,11 +76,19 @@ struct originator_list {
+ 
+ struct filter_group {
+   struct originator_list *  originator_list;
+-  struct hna_group *next;
++  struct filter_group *next;
+ };
+ 
+ static struct filter_group * filter_groups = NULL;
+ 
++/*
++ * Delcaring function prototype here, fixes build error with clang-16.
++ * Clang 16 enables -Wimplicit-function-declaration by default, hence the
++ * error.
++ * Refer: https://bugs.gentoo.org/898090
++ */
++int should_filter(union olsr_ip_addr * originator);
++
+ /* -
+  * Function   : add_to_originator_list
+  * Description: Add a new ip to originator list
+@@ -304,4 +313,4 @@ int should_filter(union olsr_ip_addr * originator)
+ }
+   }
+   return is_allowlist ? !found : found;
+-}
+\ No newline at end of file
++}
+--- a/src/linux/kernel_routes_nl.c
 b/src/linux/kernel_routes_nl.c
+@@ -161,7 +161,11 @@ static void rtnetlink_read(int sock, void *data 
__attribute__ ((unused)), unsign
+ sizeof(nladdr),
+ ,
+ 1,
++#ifndef __GLIBC__
++  0,
++#else
+ NULL,
++#endif
+ 0,
+ 0
+   };

diff --git a/net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild 
b/net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild
new file mode 100644
index ..1ba8d428f242
--- /dev/null
+++ b/net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+# Snapshot to fix build failure with >= bison 3.7
+# bug #735572
+MY_COMMIT="4973feb538b5b98b9d8ac2f8f474202f6d73de78"
+DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
+HOMEPAGE="http://www.olsr.org/;
+SRC_URI="https://github.com/OLSR/olsrd/archive/${MY_COMMIT}.tar.gz -> 
${P}.tar.gz"
+#SRC_URI="https://github.com/OLSR/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk pud"
+
+DEPEND="
+   gtk? (
+   dev-libs/glib:2
+   x11-libs/gdk-pixbuf:2
+   x11-libs/gtk+:2
+   )
+   pud? ( sci-geosciences/gpsd )
+"
+RDEPEND="
+   ${DEPEND}
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.9.0.2-gtk.patch
+   "${FILESDIR}"/${PN}-0.9.8-clang16-buildfix.patch
+)
+
+src_prepare() {
+   default
+
+   # fix parallel make
+   # respect AR
+   # verbose build
+   # fix default prefix, bug #453440
+   sed -i \
+   -e '/@echo "\[/d' \
+   -e 's|$(MAKECMD)|$(MAKE)|g' \
+   -e 's|@$(CC)|$(CC)|g' \
+   -e 's|@ar |$(AR) |g' \
+   -e '/^prefix/s:/usr/local:/usr:' \
+   $( find -name 'Makefile*' ) || die
+
+   # respect LDFLAGS
+   sed -i \
+   -e 's|$(CC)|& $(OLSRD_LDFLAGS)|g' \
+   lib/pud/nmealib/Makefile lib/pud/wireformat/Makefile || die
+}
+
+src_configure() {
+   if ! use pud; then
+   sed -i -e '/^SUBDIRS/ s|pud||g' Makefile || die
+   fi
+}
+
+src_compile() {
+   tc-export PKG_CONFIG
+
+   emake \
+   CC="$(tc-getCC)" \
+   LIBDIR="/usr/$(get_libdir)/${PN}" \
+   OLSRD_LDFLAGS="${LDFLAGS}" \
+   OS=linux \
+   VERBOSE=1 \
+   build_all
+
+   if use gtk; then
+   emake -C gui/linux-gtk LIBDIR="/usr/$(get_libdir)/${PN}" 
CC="$(tc-getCC)"
+   fi
+}
+
+src_install() {
+   # See bug #715392 re LDCONFIG
+   emake \
+   DESTDIR="${D}" \
+   

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

2023-06-15 Thread Hans de Graaff
commit: 50a07924c915d36785911695db9233d5d1252536
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Jun 16 05:37:49 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Jun 16 05:38:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50a07924

dev-util/cucumber: drop 7.1.0

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

 dev-util/cucumber/Manifest  |  1 -
 dev-util/cucumber/cucumber-7.1.0.ebuild | 85 -
 2 files changed, 86 deletions(-)

diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 981dded90d3b..59c074316c16 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,2 +1 @@
-DIST cucumber-7.1.0.tar.gz 410595 BLAKE2B 
ee1fbca606479f1f07d64a5434051d8466d7056a326424a0235a6e4f860ed3cdc7862495156874b38631e6a0a1b70bda40deb6f5310f7bd6bdafe72c5faa8f2b
 SHA512 
7c124110634259e83ba1986efacf85a73e9a6f36a7c262ba9842e85e73e359a50b5090489f656e5b503cac68e3db9905dd1834db1bfae9ee55e3a4d1b31a4adb
 DIST cucumber-8.0.0.tar.gz 412254 BLAKE2B 
8e86ca726a85afeb6d80799c3b2cf633e4949bacb9ad65b41d3baf37f642b9032d57b4e66cca15cbababcdbe5541ce2cd0d23b113897dedbd7cbfb5c85283a00
 SHA512 
33e9abeb33c7924c3eedfcf477019a782cd813a004e35dcdeb0878b6dea920ba870023b6c8a60c8de810ff231378fa67969208611ce8e9199ae2611d3f6f1f99

diff --git a/dev-util/cucumber/cucumber-7.1.0.ebuild 
b/dev-util/cucumber/cucumber-7.1.0.ebuild
deleted file mode 100644
index 6936a4bb77a1..
--- a/dev-util/cucumber/cucumber-7.1.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-# Documentation task depends on sdoc which we currently don't have.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP="cucumber"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://cucumber.io/;
-SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-RUBY_S="cucumber-ruby-${PV}"
-LICENSE="Ruby"
-
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-IUSE="examples test"
-
-ruby_add_bdepend "
-   test? (
-   dev-ruby/bundler
-   dev-ruby/rspec:3
-   >=dev-ruby/nokogiri-1.12.5
-   >=dev-ruby/syntax-1.0.0
-   dev-ruby/json
-   >=dev-util/cucumber-3
-   )"
-
-ruby_add_rdepend "
-   >=dev-ruby/builder-3.2.4:3.2
-   >=dev-util/cucumber-core-10.1.0:10
-   >=dev-util/cucumber-create-meta-6.0.1:6
-   >=dev-util/cucumber-cucumber-expressions-14.0.0:14
-   >=dev-util/cucumber-gherkin-22.0.0:22
-   >=dev-util/cucumber-html-formatter-17.0.0:17
-   >=dev-util/cucumber-messages-17.1.1:17
-   >=dev-util/cucumber-wire-6.2.0:6
-   >=dev-ruby/diff-lcs-1.4.4:0
-   >=dev-ruby/mime-types-3.3.1:3
-   >=dev-ruby/multi_test-0.1.2:0
-   >=dev-ruby/sys-uname-1.2.2:1
-"
-
-all_ruby_prepare() {
-   # Remove development dependencies from the gemspec that we don't
-   # need or can't satisfy.
-   sed -e 
'/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|rubyzip\)/d'
 \
-   -e "/json/ s/, '~> 1.8.6'//" \
-   -i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-   # Avoid dependency on unpackaged packages
-   sed -i -e '/\(cucumber-pro\|webrick\)/ s:^:#:' Gemfile || die
-
-   # Avoid specs failing due to differing deprecation message
-   rm -f spec/cucumber/deprecate_spec.rb || die
-
-   # Avoid failing features on new delegate and forwardable behavior in 
ruby
-#  rm -f features/docs/defining_steps/ambiguous_steps.feature 
features/docs/defining_steps/nested_steps.feature || die
-
-   sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
-
-   rm -f Gemfile.lock || die
-}
-
-each_ruby_test() {
-   RSPEC_VERSION=3 ruby-ng_rspec
-   CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} 
RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
-}
-
-all_ruby_install() {
-   all_fakegem_install
-
-   if use examples; then
-   cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed 
installing example files."
-   fi
-}



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

2023-06-15 Thread Sam James
commit: f8b713d3769785bfcd55a9a8f18b59dd7caa09d2
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 16 05:26:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 16 05:26:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8b713d3

sys-apps/portage: Stabilize 3.0.46 arm, #908561

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

 sys-apps/portage/portage-3.0.46.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.46.ebuild 
b/sys-apps/portage/portage-3.0.46.ebuild
index 375b1206ff35..2fbc25425a0b 100644
--- a/sys-apps/portage/portage-3.0.46.ebuild
+++ b/sys-apps/portage/portage-3.0.46.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
 SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
 RESTRICT="!test? ( test )"



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

2023-06-15 Thread Hans de Graaff
commit: 1e3af5eb6871e0a486c1252ca3ba39d08a681fa0
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Jun 16 05:21:56 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Jun 16 05:21:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e3af5eb

dev-ruby/maxitest: drop 3.7.0-r1

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

 dev-ruby/maxitest/Manifest |  1 -
 dev-ruby/maxitest/maxitest-3.7.0-r1.ebuild | 50 --
 2 files changed, 51 deletions(-)

diff --git a/dev-ruby/maxitest/Manifest b/dev-ruby/maxitest/Manifest
index b148e4d3afe6..e6a05948c1a1 100644
--- a/dev-ruby/maxitest/Manifest
+++ b/dev-ruby/maxitest/Manifest
@@ -1,2 +1 @@
-DIST maxitest-3.7.0.tar.gz 62716 BLAKE2B 
9919702c3b6c701edf6a5de8c1054547edaeeda518a7b7bae3f419cba9f92f535ec7870ece080fb472d7635243afec4aeed4a27fd839874aa40d63d6ce4ecab8
 SHA512 
4843f9d405a40177622e9892d1e5fffe297ae03cfef68b73ce3ee966cc3a36e126a9f5a5018b898465f5ad40f8d4fc1e6bf53f5c76b376efeff669b57dd1e8aa
 DIST maxitest-4.4.1.tar.gz 62757 BLAKE2B 
0023472200643dcc17aa7fc3720ebdaccb988628eedd55d69c47a0702b4700760dcc9178f1d63a29d8b0a461ceb7195f9d13579cf0393a3ca669515bcf77239a
 SHA512 
927c5619541f13b2af064f1adb01670ec43570252a62d32b98674b7d4dd72ebc02594c000f6dfae7b9de275086df23e418f13c4c21595d47f429b86d0941dbc2

diff --git a/dev-ruby/maxitest/maxitest-3.7.0-r1.ebuild 
b/dev-ruby/maxitest/maxitest-3.7.0-r1.ebuild
deleted file mode 100644
index bda0a5e7303a..
--- a/dev-ruby/maxitest/maxitest-3.7.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="Readme.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Minitest + all the features you always wanted"
-HOMEPAGE="https://github.com/grosser/maxitest;
-SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
-
-ruby_add_rdepend "

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

2023-06-15 Thread Hans de Graaff
commit: e424b821ead909b87a3c5943409b2c868c73676f
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Jun 16 05:16:56 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Jun 16 05:16:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e424b821

net-mail/mailshears: enable ruby31

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

 net-mail/mailshears/mailshears-0.0.5.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/net-mail/mailshears/mailshears-0.0.5.ebuild 
b/net-mail/mailshears/mailshears-0.0.5.ebuild
index 06a584f9a770..300eacaf2ecd 100644
--- a/net-mail/mailshears/mailshears-0.0.5.ebuild
+++ b/net-mail/mailshears/mailshears-0.0.5.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-# ruby31 is ok too
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 # The tests are dangerous and shouldn't be run by anyone!
 # They mess with your local postgres databases.



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

2023-06-15 Thread Hans de Graaff
commit: fe17a426a8abb4fedc73ff4de53b272b21a7fb34
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Jun 16 05:04:37 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Jun 16 05:04:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe17a426

dev-ruby/minitest: drop 5.14.4

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

 dev-ruby/minitest/Manifest   |  1 -
 dev-ruby/minitest/minitest-5.14.4.ebuild | 22 --
 2 files changed, 23 deletions(-)

diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index 8f2079b70c06..754ca48e31a3 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -1,4 +1,3 @@
-DIST minitest-5.14.4.gem 86016 BLAKE2B 
1f7b8c72b41e1f4e47852021dd99df411a427ac8bbe564a2b86edbb727a4976030176331442a3a44f734347cc42f80444f8d3937e561f0063ec6bb3132d4c402
 SHA512 
f967a11cfce82e167879905082859273b270e8d8e663a0c1c553964a345fb8564547627b8cf97418ac5bda544bb76c1385438ad74ec8e84dc2952d55c9e9
 DIST minitest-5.15.0.gem 87040 BLAKE2B 
71e7a7952c25fd37067a449867d74a2f18a8a42d1fbd72f24d6db226c54a18e9a21958654d4176176804bedd09ef9d1d3be68f79e29312c3f85d0930d3d68d7b
 SHA512 
5e97a7aa616966ffc60e10cdc0ba123a7e793f10283ec3b6bf36066177036788cb950ad566fbac49e613b93f08b9846534f463017cde966b4890c3a34a2286be
 DIST minitest-5.17.0.gem 93696 BLAKE2B 
c5979a0d82c4658e4a1584450c899b6a09d99fa145348127902f187e03c6bba73f798fe815186c9ab87a119baa6f3b18acdc1606aa99ec2cf4a1fe548684e93f
 SHA512 
00374b0d0c86d0ec2d285bc4053b6851e1a59e86f7a3ab3db8ccac1db56edb58514c666763047cec95cf099b1738765a3e9eec9aee3386b187e9fe0f59f9
 DIST minitest-5.18.0.gem 95232 BLAKE2B 
5b0f6fb2c304f0d96a6e98c5a4512acbff0a354290e1f2670773f8bdaa8d8b11b8504a15afd03a7bbe89ff1a9478599c2b0b4f0976bf5d52306655581c94ad4d
 SHA512 
309f899b5c5c2573aaf1e84a2225f446e009923b864af8a006eb518f95e758fb6425ec1e5f1790ba8026e041a8fc601551c2f447fa06528399041de119fa2d1a

diff --git a/dev-ruby/minitest/minitest-5.14.4.ebuild 
b/dev-ruby/minitest/minitest-5.14.4.ebuild
deleted file mode 100644
index 856fece5be98..
--- a/dev-ruby/minitest/minitest-5.14.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and 
slow test/unit"
-HOMEPAGE="https://github.com/seattlerb/minitest;
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc test"
-
-each_ruby_test() {
-   ${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || 
die "Tests failed"
-}



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

2023-06-15 Thread Hans de Graaff
commit: 77510be4912b62a8f600f92fd4c67d4cce68ad85
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Jun 16 04:48:21 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Jun 16 04:50:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77510be4

dev-util/jenkins-bin: add 2.410

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

 dev-util/jenkins-bin/Manifest |  1 +
 dev-util/jenkins-bin/jenkins-bin-2.410.ebuild | 45 +++
 2 files changed, 46 insertions(+)

diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index c14626f54296..95b44e6acb8d 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -3,3 +3,4 @@ DIST jenkins-bin-2.387.3.war 98358036 BLAKE2B 
bcce6fd8e9e291f97a43052b787e220654
 DIST jenkins-bin-2.394.war 98409457 BLAKE2B 
b118281ec50b0e4f92fa1996ab1c6d8dc8f98a2aafff9f430c5f359b53bd58081754ec72d982e432e783ba912923607306f9217de15a03de6875291cf0c1a1d8
 SHA512 
4f41e654eadb8459750bd69030e35186cd4677f2e24c0c422df9a5536b000f51e3c960b2b5396605c3e928e0909a719673d08b70424b314ad6ae9777d42df035
 DIST jenkins-bin-2.396.war 98338848 BLAKE2B 
5c51085f3a677a46d216c9f1acdef2a6b59145a9ce557b301878b610daf85c9395588376427c05427d1791cf356f3f96643d6c83298cdafe9dd7995ba563ff72
 SHA512 
70c8c61c6715f5f9b90775ea35ae51ae9bcfb2f9908ad99e1b04237e8a27c03bf97c4474fcbbb1ad660350c3524ff796ad44e64e56a7791a363e45bc30457b5e
 DIST jenkins-bin-2.401.1.war 98362423 BLAKE2B 
b1c3853b463a4003ff5d40dc5299ce2ea717fc018adf4b80a241ba6912b3642ebb334681a08b7cb8b7088d3abe37775ed1e3d51feefc5953ce68be15c4482648
 SHA512 
6150e9b871ba2b0b1366751e9ef3c67a50e129ec091fea3c336325cc1a5c15b1182a3c71ea3092de1ec85e035e0edb97de9c2801654c8e116501cc6f3f7eb077
+DIST jenkins-bin-2.410.war 93652415 BLAKE2B 
df4bf3939fd785e963b59e2cb6e434e2f89a78c3c3e36001189c9eb6f1a74c6c722a68835e189535f669977cd911f24819e9a015028c51bf6e94b7c6c55f0735
 SHA512 
61d69190b7fcc28fadbec678f3e0d815e6e5809f7dfdaf3ddff80573589a67d8b84b5487b35a5af16e444bf4876708d3f3e4d254b1432c2e1359ec8f76d2029c

diff --git a/dev-util/jenkins-bin/jenkins-bin-2.410.ebuild 
b/dev-util/jenkins-bin/jenkins-bin-2.410.ebuild
new file mode 100644
index ..45f6ff742f49
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.410.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/;
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+IUSE=""
+
+DEPEND="acct-group/jenkins
+   acct-user/jenkins"
+
+RDEPEND="acct-group/jenkins
+   acct-user/jenkins
+   media-fonts/dejavu
+   media-libs/freetype
+   !dev-util/jenkins-bin:lts
+   || ( virtual/jre:17 virtual/jre:11 )"
+
+S="${WORKDIR}"
+
+src_install() {
+   local JENKINS_DIR=/var/lib/jenkins
+
+   keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+   insinto /opt/jenkins
+   newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+   insinto /etc/logrotate.d
+   newins "${FILESDIR}"/${PN}-r3.logrotate ${PN/-bin/}
+
+   newinitd "${FILESDIR}"/${PN}-r3.init jenkins
+   newconfd "${FILESDIR}"/${PN}-r1.confd jenkins
+
+   systemd_newunit "${FILESDIR}"/${PN}-r4.service jenkins.service
+
+   fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} 
${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}



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

2023-06-15 Thread Hans de Graaff
commit: 2ca9b02ad7d8663f6d50cc702ac7e5e43ee3ea3a
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Jun 16 04:49:31 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Jun 16 04:50:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ca9b02a

dev-util/jenkins-bin: drop 2.387.2, 2.387.3, 2.394, 2.396

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

 dev-util/jenkins-bin/Manifest   |  4 ---
 dev-util/jenkins-bin/jenkins-bin-2.387.2.ebuild | 45 -
 dev-util/jenkins-bin/jenkins-bin-2.387.3.ebuild | 45 -
 dev-util/jenkins-bin/jenkins-bin-2.394.ebuild   | 45 -
 dev-util/jenkins-bin/jenkins-bin-2.396.ebuild   | 45 -
 5 files changed, 184 deletions(-)

diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 95b44e6acb8d..6dfeeb59dc7f 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,6 +1,2 @@
-DIST jenkins-bin-2.387.2.war 98354350 BLAKE2B 
2a1a3c1238e1f179855ee42863105583c886a36d57dbd18692b6708a36b7385bd141e840a66e9f1a795453885e14f9e855696a5bb0c44a3105529e4ac301cc67
 SHA512 
f20041013293fe5252ad8577481b395751fd8654152175b63588e891fda48a2b8d36a69d8c587e10233d45b557df81016b9e3457312ad1cdb20ad90abb090104
-DIST jenkins-bin-2.387.3.war 98358036 BLAKE2B 
bcce6fd8e9e291f97a43052b787e220654c355484e4109335dc1fde38113f01ea7fbe0d1ec86b27dd6dd1ef70b83a81ca19631f650fea52adade1569c2df
 SHA512 
c0eda7bb6303e62d2733b72cdfac7009aaecf17617b1e427540a7613f789600ca8414a9c97852e35a0521f81a297bf9f27c0bcfc2e2ed0ca0687496e80268908
-DIST jenkins-bin-2.394.war 98409457 BLAKE2B 
b118281ec50b0e4f92fa1996ab1c6d8dc8f98a2aafff9f430c5f359b53bd58081754ec72d982e432e783ba912923607306f9217de15a03de6875291cf0c1a1d8
 SHA512 
4f41e654eadb8459750bd69030e35186cd4677f2e24c0c422df9a5536b000f51e3c960b2b5396605c3e928e0909a719673d08b70424b314ad6ae9777d42df035
-DIST jenkins-bin-2.396.war 98338848 BLAKE2B 
5c51085f3a677a46d216c9f1acdef2a6b59145a9ce557b301878b610daf85c9395588376427c05427d1791cf356f3f96643d6c83298cdafe9dd7995ba563ff72
 SHA512 
70c8c61c6715f5f9b90775ea35ae51ae9bcfb2f9908ad99e1b04237e8a27c03bf97c4474fcbbb1ad660350c3524ff796ad44e64e56a7791a363e45bc30457b5e
 DIST jenkins-bin-2.401.1.war 98362423 BLAKE2B 
b1c3853b463a4003ff5d40dc5299ce2ea717fc018adf4b80a241ba6912b3642ebb334681a08b7cb8b7088d3abe37775ed1e3d51feefc5953ce68be15c4482648
 SHA512 
6150e9b871ba2b0b1366751e9ef3c67a50e129ec091fea3c336325cc1a5c15b1182a3c71ea3092de1ec85e035e0edb97de9c2801654c8e116501cc6f3f7eb077
 DIST jenkins-bin-2.410.war 93652415 BLAKE2B 
df4bf3939fd785e963b59e2cb6e434e2f89a78c3c3e36001189c9eb6f1a74c6c722a68835e189535f669977cd911f24819e9a015028c51bf6e94b7c6c55f0735
 SHA512 
61d69190b7fcc28fadbec678f3e0d815e6e5809f7dfdaf3ddff80573589a67d8b84b5487b35a5af16e444bf4876708d3f3e4d254b1432c2e1359ec8f76d2029c

diff --git a/dev-util/jenkins-bin/jenkins-bin-2.387.2.ebuild 
b/dev-util/jenkins-bin/jenkins-bin-2.387.2.ebuild
deleted file mode 100644
index a6cffe5d8277..
--- a/dev-util/jenkins-bin/jenkins-bin-2.387.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/;
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> 
${P}.war"
-SLOT="lts"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
-IUSE=""
-
-DEPEND="acct-group/jenkins
-   acct-user/jenkins"
-
-RDEPEND="acct-group/jenkins
-   acct-user/jenkins
-   media-fonts/dejavu
-   media-libs/freetype
-   !dev-util/jenkins-bin:0
-   || ( virtual/jre:17 virtual/jre:11 )"
-
-S="${WORKDIR}"
-
-src_install() {
-   local JENKINS_DIR=/var/lib/jenkins
-
-   keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-   insinto /opt/jenkins
-   newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-   insinto /etc/logrotate.d
-   newins "${FILESDIR}"/${PN}-r3.logrotate ${PN/-bin/}
-
-   newinitd "${FILESDIR}"/${PN}-r3.init jenkins
-   newconfd "${FILESDIR}"/${PN}-r1.confd jenkins
-
-   systemd_newunit "${FILESDIR}"/${PN}-r4.service jenkins.service
-
-   fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} 
${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}

diff --git a/dev-util/jenkins-bin/jenkins-bin-2.387.3.ebuild 
b/dev-util/jenkins-bin/jenkins-bin-2.387.3.ebuild
deleted file mode 100644
index a6cffe5d8277..
--- a/dev-util/jenkins-bin/jenkins-bin-2.387.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/;
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> 

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

2023-06-15 Thread Hans de Graaff
commit: 2862c1d8dc97904c47b3c3b3f5d2183c578a3c36
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Jun 16 04:50:27 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Jun 16 04:50:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2862c1d8

dev-ruby/capybara: add 3.39.2

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

 dev-ruby/capybara/Manifest   |  1 +
 dev-ruby/capybara/capybara-3.39.2.ebuild | 61 
 2 files changed, 62 insertions(+)

diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 9feb08fda2a6..9b03fb5cec14 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,2 +1,3 @@
 DIST capybara-3.38.0.gem 379392 BLAKE2B 
e1ba89daa08e43e5f97ed5c649a3ea82c27e2ee7a737844f83ba68f0379cc4ef2a0349bc2ae9af76a5cca3659c11f1ed0d1b7dcae7f7701305ca3644e40a4dee
 SHA512 
530db1102e8bc1bfa1ac55d28a725a26a7c6c98baf89655bb15436217e99c7131edb204638f51831c416e4898b9e7c653b83c74abf8aa644eb4da0ad8cddd44c
 DIST capybara-3.39.0.gem 381952 BLAKE2B 
2b70bfbf930258c2273bf0c6bddc70e455d1d717bd0ed79fc68459c6f40d47ef8149fec161dbaff08e6d8424aebbdf5160033169a6269408b368525218899e23
 SHA512 
0910ecef11a007d10e753887d9016bab4de74e2ddf2fa2c8b8fc32bfe7d71d64a8c0b72a0a606aa7b558922ab02b4368d1c42a0df78ecf3f68a5efc34edc8707
+DIST capybara-3.39.2.gem 381952 BLAKE2B 
ff73035a1942e4e418d50356b977c68ea878a27082b3684b940b69df77bd97c1a628e2346673f9e42bf0592386e470b376ce5b35d673f6fe4e74547023348be1
 SHA512 
498fb3880014d3cff1ec6ed68542f68eb03ebfc86e8c681623ad3549ecf8297a0313abe9dd8db0a104cc0db2a2eec8c66bac4f2e5c0d29e0785237ddfe718c59

diff --git a/dev-ruby/capybara/capybara-3.39.2.ebuild 
b/dev-ruby/capybara/capybara-3.39.2.ebuild
new file mode 100644
index ..5694a1e2c20b
--- /dev/null
+++ b/dev-ruby/capybara/capybara-3.39.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+# Rake tasks are not distributed in the gem.
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit virtualx ruby-fakegem
+
+DESCRIPTION="Capybara aims to simplify the process of integration testing Rack 
applications"
+HOMEPAGE="https://github.com/teamcapybara/capybara;
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+SLOT="3"
+IUSE="test"
+
+DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
+
+ruby_add_bdepend "test? (
+   dev-ruby/rspec:3
+   >=dev-ruby/launchy-2.4.0
+   dev-ruby/selenium-webdriver:4
+   || ( dev-ruby/sinatra:3 dev-ruby/sinatra:2 )
+   www-servers/puma
+)"
+
+ruby_add_rdepend "
+   dev-ruby/addressable
+   dev-ruby/matrix
+   >=dev-ruby/mini_mime-0.1.3
+   >=dev-ruby/nokogiri-1.8:0
+   >=dev-ruby/rack-1.6.0:*
+   >=dev-ruby/rack-test-0.6.3:*
+   dev-ruby/regexp_parser:2
+   >=dev-ruby/xpath-3.2:3"
+
+all_ruby_prepare() {
+   sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' -e 
'/statistics/Id' spec/spec_helper.rb || die
+
+   # Avoid window-manager specific tests (sizes are specific for fluxbox)
+   sed -i -e '/#maximize/,/^  end/ s:^:#:' 
lib/capybara/spec/session/window/window_spec.rb || die
+
+   # Avoid spec that requires unpackaged geckodriver
+   #sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' 
spec/capybara_spec.rb || die
+
+   # Avoid test dependency on puma server for now
+   sed -i -e '/should have :puma registered/,/^end/ s:^:#:' 
spec/capybara_spec.rb || die
+
+   # Update spec to catch the right error code. This seems to have
+   # changed recently across ruby versions.
+   sed -i -e '/raise_error/ s/EOFError/Net::ReadTimeout/' 
spec/server_spec.rb || die
+}
+
+each_ruby_test() {
+   virtx ${RUBY} -Ilib -S rspec-3 spec
+}



[gentoo-commits] repo/gentoo:master commit in: profiles/

2023-06-15 Thread Hans de Graaff
commit: 995e7a8587b9340ad6872601ef77a762a43bc9d0
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Jun 16 04:38:06 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Jun 16 04:50:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=995e7a85

profiles/package.mask: mask old websocket-driver slot

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

 profiles/package.mask | 5 +
 1 file changed, 5 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index 7f5c64cd9c0e..19eb9104bc6e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff  (2023-06-16)
+# Obsolete slot. Use the newer 0.7 slot instead.
+# Masked for removal on 2023-07-16.
+dev-ruby/websocket-driver:0
+
 # Tomáš Mózes  (2023-06-12)
 # Buggy version that causes ibdata1 to grow, please update.
 =dev-db/mariadb-10.5.20



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

2023-06-15 Thread Sam James
commit: be254bca03e84ece27473433718c303e3e9ab611
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 16 04:45:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 16 04:45:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be254bca

sys-apps/portage: Stabilize 3.0.46 arm64, #908561

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

 sys-apps/portage/portage-3.0.46.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.46.ebuild 
b/sys-apps/portage/portage-3.0.46.ebuild
index 77a95c1762c4..375b1206ff35 100644
--- a/sys-apps/portage/portage-3.0.46.ebuild
+++ b/sys-apps/portage/portage-3.0.46.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
 SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
 RESTRICT="!test? ( test )"



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

2023-06-15 Thread Hans de Graaff
commit: 5116156b850d80fab854b202a00cdc211b1bc7e9
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Jun 16 04:25:55 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Jun 16 04:25:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5116156b

dev-ruby/selenium-webdriver: add 4.10.0

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

 dev-ruby/selenium-webdriver/Manifest   |  1 +
 .../selenium-webdriver-4.10.0.ebuild   | 38 ++
 2 files changed, 39 insertions(+)

diff --git a/dev-ruby/selenium-webdriver/Manifest 
b/dev-ruby/selenium-webdriver/Manifest
index e60a1211a350..f5954bf715e5 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -1,2 +1,3 @@
 DIST selenium-webdriver-4.0.3.gem 152576 BLAKE2B 
671909863bbbe328bbaf30a9e3c9e459e9eb6b892f554729892327230c03dd03f7819d9e8beb901cea986cb0d97877ce49853de856e1f802369686a03e5e9086
 SHA512 
260ad111ef9c512835f410fc7283df90b245d42db12274028148575e0a89a8c71639f0132a621f326921317b3181564521d9e801f2a7f14e5f196cde2550773c
 DIST selenium-webdriver-4.1.0.gem 153088 BLAKE2B 
f437b5e6c19b9a2b7d0393646b11bcaa0808fb9981c847ca0d86bd55ef04fc109d439eb0f41fce543ea121fde096fe3e72c56d1db861b6554f673a3de07bdff8
 SHA512 
9760c6a96dbef25f558216986a9cedcb00fe19313273ea5c3a4866d5afae327fbe3895e3e2ee405714f8a9410c290b0e51352b68465cb0df9ff31b6d2749b174
+DIST selenium-webdriver-4.10.0.gem 5803008 BLAKE2B 
898e795bbad23aca1343fa49c059963a9c3b0d3ab27b3e9521381cb70259ef76fa81bf9063ad82f7348266f20fed05352be2450be4e4356515b4a05e015c21a7
 SHA512 
9217022b0af08d5d4b24d412bea4423afd327314e260de0449d723a9232c4f0895a36626da009ce51c304bedc933195b434a9dc620da8daffc736b5fc9842f33

diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-4.10.0.ebuild 
b/dev-ruby/selenium-webdriver/selenium-webdriver-4.10.0.ebuild
new file mode 100644
index ..e1f4dcd11683
--- /dev/null
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-4.10.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+# NOTE: this package contains precompiled code. It appears that all
+# source code can be found at https://code.google.com/p/selenium/ but the
+# repository is not organized in a way so that we can easily rebuild the
+# suited shared object. We'll just try our luck with the precompiled
+# objects for now.
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_GEMSPEC="selenium-webdriver.gemspec"
+
+RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
+QA_PREBUILT="*/x_ignore_nofocus.so"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem provides Ruby bindings for WebDriver"
+HOMEPAGE="https://github.com/seleniumhq/selenium;
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+   >=dev-ruby/rexml-3.2.5:3
+   >=dev-ruby/rubyzip-1.2.2:*
+   dev-ruby/websocket:0
+"



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

2023-06-15 Thread Sam James
commit: 7f9c03bacd0f367b416817e87d442081da8be111
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 16 04:06:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 16 04:06:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f9c03ba

sys-apps/portage: Stabilize 3.0.45.3-r2 x86, #907512

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

 sys-apps/portage/portage-3.0.45.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-3.0.45.3-r2.ebuild 
b/sys-apps/portage/portage-3.0.45.3-r2.ebuild
index 59a9f88a2f69..52cbf59c45f9 100644
--- a/sys-apps/portage/portage-3.0.45.3-r2.ebuild
+++ b/sys-apps/portage/portage-3.0.45.3-r2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
 SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2;
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/

2023-06-15 Thread Ionen Wolkens
commit: e0d6d46429303d11f291f470b52f9ddd59ec568f
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Jun 16 04:03:48 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Jun 16 04:06:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0d6d464

x11-drivers/nvidia-drivers: add 525.47.27:0/vulkan, drop 525.47.26

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

 x11-drivers/nvidia-drivers/Manifest   | 4 ++--
 ...ia-drivers-525.47.26-r2.ebuild => nvidia-drivers-525.47.27.ebuild} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-drivers/nvidia-drivers/Manifest 
b/x11-drivers/nvidia-drivers/Manifest
index 56f3a0f739f7..85a09b1e87f0 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -8,7 +8,7 @@ DIST NVIDIA-Linux-x86_64-390.157.run 85835541 BLAKE2B 
44b855cd11f3b2f231f9fb9049
 DIST NVIDIA-Linux-x86_64-470.182.03.run 271685302 BLAKE2B 
47acdc53dea1698558fea8e18f481341dd542b725153a83563f9da420844b59db41f69a8eb7ad7e16a22050a7a6cffc2265a9cb8832cb5a6439c6a5b0910bfce
 SHA512 
73619d65bd3267427acaf2deee07a2c98c490df937aa13e2c95d54cfd19ce2a82a91d3a5aa886dbe88f6230251f9cf54c38f5841cfacd77e53301e8d61fa3d7d
 DIST NVIDIA-Linux-x86_64-515.105.01.run 363738348 BLAKE2B 
b78b7e9dbc1450a7d01d9b3b75e0612ce0b71f8647dc5ee084660c9cb12a8ac4b2f278d49b195e0f4600d02f3297af796158cbca9cdaff0d27f78f56153bdefd
 SHA512 
9b9e820754254c70aeab2bcc1cfdae396d3b30fb948198e378f764a6f0d89ad6f6687afffa2d6f48072ab726c6d180dc3c83891eef61f273c0b11f7bc2c9bd67
 DIST NVIDIA-Linux-x86_64-525.116.04.run 413341618 BLAKE2B 
f769c72bb38c10e16f88bdf655ef77a480097c31b5856de00858494e1b1708bc243d8d562e37b15c7fc4641c7c4937472cf16f84fc1b3b3dc837ace35a3570de
 SHA512 
8e511e4965f11c849ae0bb3f399bc79eb004bb3a15612b35e6c7b9ec236a73085b58cc4e8cb37b5ffde7e7fe202928a08618b5dd3328235795bb942bde339195
-DIST NVIDIA-Linux-x86_64-525.47.26.run 414811422 BLAKE2B 
9dbb4ed5ce71b329f2c2fd12ae5697f299212916f9a0c357e4526863abd3d6123b9f6769dd44c0c1adbf43ca1f6f5e596ac6ec34cf06802428b652fa1ff494dd
 SHA512 
41d77f7200acff1cc8c3dd86e4809555ca5a0c84f405c864431a6b195826ee4263830eee182525d19ef96b8714dfec04a6416189c9ad9959e6e58147820ae94b
+DIST NVIDIA-Linux-x86_64-525.47.27.run 414752583 BLAKE2B 
e38c1e9015ea240e32f8c1e3c9e47124574c060e90172352ca1db28b1e548babae216f2e8c6391fdf2708304e49321b3dae86fee0d3a353cc576291583813791
 SHA512 
170291b58e37db1e1598b4703d86ffcd6a756a9b338f0394a77d790aea6c38d85d2806960d4fc8d125c1c6c7fb43d69500c3efe2f85cb0d00397935b8cd0af58
 DIST NVIDIA-Linux-x86_64-530.41.03.run 344312858 BLAKE2B 
bb5507afd23e6e063314532f37e5c7cc2530f96f359664d79ebac998c6a32ee238790b4aa66339a913e31114d22795e8e80aebced2260ff04b5d3589af472fc9
 SHA512 
90068122824322884ec8f3e4be2fe7f76bf07ee1163baf6da15d09ba3ff886e5c5ef72016509eef9f4af9d85f154ebbe051d5fb3af5e867f1f67f03af8068100
 DIST NVIDIA-Linux-x86_64-535.43.02.run 347044349 BLAKE2B 
0b5c924546c7aea92051fd6a3daef26afe0d9efc141a6653c83d286738fd7c4287230a5d84fd7fc402251a7b73f461334f39e241d16daad46c03c17921dcff7e
 SHA512 
6e477444997b88b127d2a18d1aa3bd0326a432c327f2ea3be5b50bb1813dc5dfb9099d02910989097a59a760b87710c24f27e5310df3b6da4894f212d37ff5b2
 DIST NVIDIA-Linux-x86_64-535.54.03.run 347109768 BLAKE2B 
6fce56e4e840b3719b835cc72a749ed807d604ae5cbec63cc42b6ee32fbfa273507029190ed1198ad1f54fd53096dfa0573d043aaa59ffd07cf1607ae6c7943b
 SHA512 
45b72b34272d3df14b56136bb61537d00145d55734b72d58390af4694d96f03b2b49433beb4a5bede4d978442b707b08e05f2f31b2fcfd9453091e7f0b945cff
@@ -52,4 +52,4 @@ DIST nvidia-xconfig-525.116.04.tar.bz2 110583 BLAKE2B 
7fa42ffddee83dd6df0f3d8625
 DIST nvidia-xconfig-530.41.03.tar.bz2 110920 BLAKE2B 
c7b90382b0e42f9f0d839c40c53c613243314399c715c303d9221c1d9558bed4d159bc1b76c2ab8ff4831d32fc93b661650b9833ef7397559847c3a14763cdfa
 SHA512 
72cb1b44ff2fd162fc76fa4993b24a2994545b2b5e8f23252729a55e2deb2d10cc9263dfbe6449a81e3e18beca0bd6506b295a7299696bb9fea628fd99dca555
 DIST nvidia-xconfig-535.43.02.tar.bz2 110594 BLAKE2B 
2a72f408b3fe4acc21d5c1c9f266db6c0e79aefd25acad8237936bcbd204eefa73182cc950ab3c491efee712540a7a9480a06f4941d407ee7db1db03984f3e16
 SHA512 
e2078cf80c0bce8f3718917da4da5a1ac534e51b19b49780bdb6d7dcc0a8fe08d38177602b2f3a35fab64ecef65f04ed0a62fcbdd224c305fde49f6a5cb9
 DIST nvidia-xconfig-535.54.03.tar.bz2 110606 BLAKE2B 
99af140f7742e23db430fdf392ce985c035c7669f619bff709987a4739e4872ff03991f2324ffbf40f53259906832464f02baf0ba485a16ecdea52af66ab958b
 SHA512 
5927ba6514d25cd0c4a05e42533ea082d5c91c0e05f8cdadedc6fbb5c0b6f0e424d057cee0dfd4dec937514a85f1d28e81c5ea7e2aa8ee374476ba376255d035
-DIST open-gpu-kernel-modules-525.47.26.tar.gz 10323511 BLAKE2B 
00d9dd7bef6cf8ce3aaa53bd8c5b756c40ad44bfc21d72118006e4ff1a91ec49e7cf784ad53a8e55b757c451c875d500527b15a904ddf590bca0cf357baf7737
 SHA512 
ac2ee2e8d32c8a37b000769742f4e242c40daba87e9fc5829e16acbba095e7cfcd05cae4127de6095a058c1b7c9b95ea64c012ef561cf165259db2cbc8b4c736
+DIST open-gpu-kernel-modules-525.47.27.tar.gz 10324085 BLAKE2B 

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

2023-06-15 Thread Michał Górny
commit: cd92b222506e214de38832bab75d1424080b521d
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jun 16 03:54:54 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jun 16 03:54:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd92b222

dev-python/jupyter-core: Bump to 5.3.1

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

 dev-python/jupyter-core/Manifest  |  1 +
 dev-python/jupyter-core/jupyter-core-5.3.1.ebuild | 38 +++
 2 files changed, 39 insertions(+)

diff --git a/dev-python/jupyter-core/Manifest b/dev-python/jupyter-core/Manifest
index f804a28de309..99f56ba4e0c6 100644
--- a/dev-python/jupyter-core/Manifest
+++ b/dev-python/jupyter-core/Manifest
@@ -1 +1,2 @@
 DIST jupyter_core-5.3.0.tar.gz 83909 BLAKE2B 
c0e5418770a4d3527e825bcd63cb9371855f544f19493b82f49db892fc92e91fd257b07b45d7cf20760f9ac9205346b3ec533491baf45f225764e6d310524bb8
 SHA512 
2c63f59a9618ee01d200e233cf85d586d88976c8d545235be224f9c64a54eb3a70e8b47220cc29b8ad3c102cc6c8754c8ccff2a771899986f322def5f539e072
+DIST jupyter_core-5.3.1.tar.gz 84448 BLAKE2B 
22adc8f7a0b39fa4ffd087a7c7305fa29d05d45200b69a3af6827083183292e58b3b5854b60545eb065808dffec2ae9252feb573b9450bd3014d493cb1784ed3
 SHA512 
752ce40c0aa71432177100f34596ad98d9907f8e2d26fcabc0bce7b4f5efb9207f1979d2db180f00d2160a84034656952640cde757186e538f7038bb0f626c7b

diff --git a/dev-python/jupyter-core/jupyter-core-5.3.1.ebuild 
b/dev-python/jupyter-core/jupyter-core-5.3.1.ebuild
new file mode 100644
index ..f2aa50355f98
--- /dev/null
+++ b/dev-python/jupyter-core/jupyter-core-5.3.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Core common functionality of Jupyter projects"
+HOMEPAGE="
+   https://jupyter.org/
+   https://github.com/jupyter/jupyter_core/
+   https://pypi.org/project/jupyter-core/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+
+RDEPEND="
+   >=dev-python/platformdirs-2.5[${PYTHON_USEDEP}]
+   >=dev-python/traitlets-5.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   test? (
+   >=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
+   )
+"
+
+distutils_enable_sphinx docs \
+   dev-python/myst-parser \
+   dev-python/sphinx-autodoc-typehints \
+   dev-python/sphinxcontrib-github-alt \
+   dev-python/sphinxcontrib-spelling \
+   dev-python/traitlets
+distutils_enable_tests pytest



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

2023-06-15 Thread Michał Górny
commit: 544c7553bc8ad9fa4216af466c125b599bf757c6
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jun 16 03:39:52 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jun 16 03:39:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=544c7553

dev-python/croniter: Bump to 1.4.1

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

 dev-python/croniter/Manifest  |  1 +
 dev-python/croniter/croniter-1.4.1.ebuild | 30 ++
 2 files changed, 31 insertions(+)

diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index f7f5927e1dcf..d024a53a3271 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,2 +1,3 @@
 DIST croniter-1.3.14.tar.gz 40026 BLAKE2B 
1b6cf2b0128a9d5f9ed0fe2ec64b114e3c903c0b18014793632dcf662c0277a909fc0b1cce74f7de35a2a585382237a4e687ca2bed6381e862e677170b70039d
 SHA512 
f958ef0b05a99653343c7c0f2838602f5a21b8bc1c043519264513cc91ac04edb574fcf4de606d9eb1ccff2562f0b03d233b45db93ca0fd72f62f375519c0fb6
 DIST croniter-1.3.15.tar.gz 41391 BLAKE2B 
285af568eba62efcd8cd95051806fa3433144b99c6ab63deef8e663266fe76eeb0e3e38eb42e35679a27f3fa41ed7bc59a4351b6aeeeca39fafcc7a0d88856ff
 SHA512 
2b6f6a2cf6575a347249df6d3b00cc5b932604d55045c77e271b2981aa6804547c4e9a48114ed4607e41088abd33aef70b47d69ec915e303b9041e708e5ffe59
+DIST croniter-1.4.1.tar.gz 42301 BLAKE2B 
b650dab7074e45e6d53c37c177e0672cd165ada3c53d4f940c04c562d7279974d5f3bcca897b5b498335a54556efe11959b51dd8a30391bcb00a7df0df4e3559
 SHA512 
36d914d6a27ef6823d1eaeeb1b5f2ce8543caaa55d3e85457f042ef7b20aa8a68b46f61e23fb44d67ed7ba9a956c9082f19b83746fe543c221c8127e88dbdb82

diff --git a/dev-python/croniter/croniter-1.4.1.ebuild 
b/dev-python/croniter/croniter-1.4.1.ebuild
new file mode 100644
index ..73477ec515ab
--- /dev/null
+++ b/dev-python/croniter/croniter-1.4.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python module to provide iteration for datetime object"
+HOMEPAGE="
+   https://github.com/kiorky/croniter/
+   https://pypi.org/project/croniter/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+   dev-python/python-dateutil[${PYTHON_USEDEP}]"
+BDEPEND="
+   test? (
+   dev-python/pytz[${PYTHON_USEDEP}]
+   dev-python/tzlocal[${PYTHON_USEDEP}]
+   )
+"
+
+distutils_enable_tests pytest



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

2023-06-15 Thread Michał Górny
commit: da730618522fb9dcefa95f06923cf5489cf2006d
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jun 16 04:02:22 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jun 16 04:02:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da730618

dev-python/backrefs: Enable py3.12

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

 dev-python/backrefs/backrefs-5.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/backrefs/backrefs-5.5.ebuild 
b/dev-python/backrefs/backrefs-5.5.ebuild
index ce61ff14c7c9..c388a3ef35bc 100644
--- a/dev-python/backrefs/backrefs-5.5.ebuild
+++ b/dev-python/backrefs/backrefs-5.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 



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

2023-06-15 Thread Michał Górny
commit: 7c0ab94a9dbfa2ddd330cffb415ffe739f94cccf
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jun 16 03:52:55 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jun 16 03:52:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c0ab94a

dev-python/openapi-core: Bump to 0.17.2

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

 dev-python/openapi-core/Manifest   |  1 +
 dev-python/openapi-core/openapi-core-0.17.2.ebuild | 71 ++
 2 files changed, 72 insertions(+)

diff --git a/dev-python/openapi-core/Manifest b/dev-python/openapi-core/Manifest
index 504d2642adc0..58ca8f91edaa 100644
--- a/dev-python/openapi-core/Manifest
+++ b/dev-python/openapi-core/Manifest
@@ -1,2 +1,3 @@
 DIST openapi-core-0.16.6.gh.tar.gz 104008 BLAKE2B 
bb1bdac98dfc5aef0961624488074363568f53a6c44cb0730be0d103d891d24bed86659f640e0d07da4072edc233c904c0ddcfd9e8b3960ace1af078c0d745e5
 SHA512 
556636a4698dcd7db6c656333849077abacdac1a440fe58210ad8f02c1f0220e46dea29962346dfb3f89d164ebc986ec750c184840be9a34a5e1dd98fbf8ef98
 DIST openapi_core-0.17.1.tar.gz 85686 BLAKE2B 
f18b42fc496eaf4d6b82c15f66dd9c2eb9240402590b5a8e1f0e7b1e804c90aeef2db96d19683e9fea5846e776e95981ac52a38c47e2b56e6b5fd63d072b61f7
 SHA512 
0e2c673dbbfcce87ae7fbca6ec6c283d94c36376b1e17191d0bfa6c7001c62913381169b4614b5cd6131eaa67b729365036be3f1eb7641f634c0f3228de54897
+DIST openapi_core-0.17.2.tar.gz 88262 BLAKE2B 
4d9a1be1eff4118bc1c687e57af0ff3738f984ceb6e564c643d26cb795bbcd3e703dd22c3b45d574f498d290f8da225819c9df618da5a1b8e40758304f2ebd07
 SHA512 
73cd2b62149549bd56781adb44922bca4a0519fbae8b6539d0225799ba1cfa1ab584428fd572ee42af4731b5437f08b8c4ad8f8895444aef315e4c6909fd4e5a

diff --git a/dev-python/openapi-core/openapi-core-0.17.2.ebuild 
b/dev-python/openapi-core/openapi-core-0.17.2.ebuild
new file mode 100644
index ..a9480b6e0bf6
--- /dev/null
+++ b/dev-python/openapi-core/openapi-core-0.17.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Client-side and server-side support for the OpenAPI Specification 
v3"
+HOMEPAGE="
+   https://github.com/python-openapi/openapi-core/
+   https://pypi.org/project/openapi-core/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+   =dev-python/asgiref-3.6.0[${PYTHON_USEDEP}]
+   dev-python/isodate[${PYTHON_USEDEP}]
+   =dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}]
+   =dev-python/jsonschema-spec-0.1.6[${PYTHON_USEDEP}]
+   =dev-python/lazy-object-proxy-1.7.1[${PYTHON_USEDEP}]
+   dev-python/more-itertools[${PYTHON_USEDEP}]
+   dev-python/parse[${PYTHON_USEDEP}]
+   =dev-python/openapi-schema-validator-0.4.2[${PYTHON_USEDEP}]
+   =dev-python/openapi-spec-validator-0.5[${PYTHON_USEDEP}]
+   dev-python/werkzeug[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+   test? (
+   >=dev-python/aiohttp-3.8.4[${PYTHON_USEDEP}]
+   dev-python/flask[${PYTHON_USEDEP}]
+   >=dev-python/httpx-0.24.0[${PYTHON_USEDEP}]
+   >=dev-python/pytest-aiohttp-1.0.4[${PYTHON_USEDEP}]
+   dev-python/responses[${PYTHON_USEDEP}]
+   >=dev-python/starlette-0.26.1[${PYTHON_USEDEP}]
+   dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+   dev-python/webob[${PYTHON_USEDEP}]
+   )
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+   # falcon is not packaged
+   tests/integration/contrib/falcon
+
+   # TODO: these tests fail to collect
+   tests/integration/validation/test_security_override.py
+   tests/integration/validation/test_read_only_write_only.py
+
+   # unhappy about modern django
+   tests/integration/contrib/django/test_django_project.py
+   tests/unit/contrib/django/test_django.py
+)
+
+src_prepare() {
+   sed -i -e '/--cov/d' pyproject.toml || die
+   distutils-r1_src_prepare
+}



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

2023-06-15 Thread Michał Górny
commit: f9ed75aed2d3d43f2a45e0371ccf94dba3066829
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jun 16 03:43:00 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jun 16 03:43:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9ed75ae

dev-python/kombu: Bump to 5.3.1

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

 dev-python/kombu/Manifest   |  1 +
 dev-python/kombu/kombu-5.3.1.ebuild | 82 +
 2 files changed, 83 insertions(+)

diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index f604b95479e1..32668a15fc92 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,2 +1,3 @@
 DIST kombu-5.3.0.tar.gz 434097 BLAKE2B 
ef378014e4e52d83dc917f9dc6245111e94eddb70d9852da1add1b532ee733578db83c9ca5b4aa82771c443ecbd00e87384b7a373102e78aebcc6724ab1bf6b2
 SHA512 
688782cab692f0e18444289654e43f53b9a54627d5495933e9717b9676d689ddeb6de368081ea796df26727d4dfd5239ed7554736c13bfce7236e8d73f62b4a9
 DIST kombu-5.3.0b3.tar.gz 436058 BLAKE2B 
d8470eea43a1d5f862d93e3b3608a3240b25cad6ccb342318a7bebda17e6ce818dce2889cb7af22fd77d2f6e69d1fdfa6926c77ba715c76dd40e973f3d9920dc
 SHA512 
c330e1dd334810ed5fdeea234c49606aa8e43f84006703ff26d900f40ec7ce4920418bef3fd43abc8c792fb750499031191394475c45bfac50f7d29a6e30f5f8
+DIST kombu-5.3.1.tar.gz 434284 BLAKE2B 
8df6d441d1229fe188584a34cab6d40250dc119a189215ab8ae8ec6660dc25e85166f48786b6b4c2abd56b4eb9e6fdc15a92372078d6f412b728ce45be0a81e5
 SHA512 
608e70cc66dc19915fd2b40c3b908f3147f60a7c971be1d8bf04f3a18f78999a7a140073ecc9f38ec9aec49c1ef0a6f01fb5f2d27d68fc68bd64aade1924edfa

diff --git a/dev-python/kombu/kombu-5.3.1.ebuild 
b/dev-python/kombu/kombu-5.3.1.ebuild
new file mode 100644
index ..53ba0b0d0998
--- /dev/null
+++ b/dev-python/kombu/kombu-5.3.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="AMQP Messaging Framework for Python"
+HOMEPAGE="
+   https://github.com/celery/kombu/
+   https://pypi.org/project/kombu/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+   >=dev-python/py-amqp-5.1.1[${PYTHON_USEDEP}]
+   

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

2023-06-15 Thread Michał Górny
commit: 1de88384650108a4b21af368fd7466648de71670
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jun 16 03:53:56 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jun 16 03:53:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1de88384

dev-python/jsonschema-spec: Bump to 0.2.2

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

 dev-python/jsonschema-spec/Manifest|  1 +
 .../jsonschema-spec/jsonschema-spec-0.2.2.ebuild   | 44 ++
 2 files changed, 45 insertions(+)

diff --git a/dev-python/jsonschema-spec/Manifest 
b/dev-python/jsonschema-spec/Manifest
index 8e1b82cadff4..8114994cbf52 100644
--- a/dev-python/jsonschema-spec/Manifest
+++ b/dev-python/jsonschema-spec/Manifest
@@ -3,3 +3,4 @@ DIST jsonschema-spec-0.1.5.gh.tar.gz 36035 BLAKE2B 
4e6019fb1c7f5e85a03488e00ef08
 DIST jsonschema-spec-0.1.6.gh.tar.gz 36043 BLAKE2B 
e85cad336d6b5ed11d6a51c8fab2c28826f6a9836ad50d2423b23bef047c338307d3e9430f1d151dbaf7a92574c9899dbfd016c570456996250e8d7634373313
 SHA512 
78ea06a78fd25006d270e2c5033645133ee79b0f45cbfc54e250d4225a36beac59cf9aa92f15fd51bd101fac20fee990d693ab91d8343cd6a298d71735c80884
 DIST jsonschema-spec-0.2.0.gh.tar.gz 37210 BLAKE2B 
44892638371f8ed9074c997e0590594a55a4a00bb0f88bbe535021726f1de6b961825a710c7f1ed63081c5ee7d252bc4f5bcc2cb462ded71ecb492625876c811
 SHA512 
6bc9f50f9132a72243df1a20d16d049ca1413904fba5403fb780663c0819ae3be8dfd51efada84118e34e157e95475e375df9c6ce1e1930c72c6d45dc71d4d04
 DIST jsonschema-spec-0.2.1.gh.tar.gz 37242 BLAKE2B 
8e1b2c4e44052fba0e78cefdf0a60a1e14adbe9f0027464d87e635bac7bb2ce1aefe65c92a1224877128ee23505402f199aca119cd48769d9149d57b5f9ec7ea
 SHA512 
1d1769e301f60c2b2a1e7b413e5d1081f3e069bf29ad12d5e3c4b0c91094c8e78f44b01642a9a58f229e5efe69db14276cf067d9dad37d53c8a35368bd62d6d6
+DIST jsonschema-spec-0.2.2.gh.tar.gz 37188 BLAKE2B 
05f740f36bf93da99e88167b054883c39cea05cc5271722cd25ab345da5c6a63aa3dcea0af370686e227af3eabe39e01ec196ae90452c4d2814828d7acb35400
 SHA512 
25bd6cd2a7ab8f40e05a78ec4b69601cee7cb9c22c43eaeb66777b991249f4314eb27038ee6ec1f8b7e15c782385ef604e4454179ef6a2307c1a73731f72a021

diff --git a/dev-python/jsonschema-spec/jsonschema-spec-0.2.2.ebuild 
b/dev-python/jsonschema-spec/jsonschema-spec-0.2.2.ebuild
new file mode 100644
index ..0c82e0a19efb
--- /dev/null
+++ b/dev-python/jsonschema-spec/jsonschema-spec-0.2.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="JSONSchema Spec with object-oriented paths"
+HOMEPAGE="
+   https://pypi.org/project/jsonschema-spec/
+   https://github.com/p1c2u/jsonschema-spec/
+"
+SRC_URI="
+   https://github.com/p1c2u/jsonschema-spec/archive/${PV}.tar.gz
+   -> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+   >=dev-python/pathable-0.4.1[${PYTHON_USEDEP}]
+   >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+   >=dev-python/referencing-0.28.1[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+   test? (
+   dev-python/responses[${PYTHON_USEDEP}]
+   )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+   sed -i -e '/--cov/d' pyproject.toml || die
+   # remove random pins due to caret operator
+   sed -i -e 's:\^:>=:' -e 's:,<[0-9.]*::' pyproject.toml || die
+   distutils-r1_src_prepare
+}



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

2023-06-15 Thread Michał Górny
commit: a2711b8050c267083c5e2aa803c621e298af12d9
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jun 16 03:54:44 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jun 16 03:54:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2711b80

dev-python/kombu: Remove old

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

 dev-python/kombu/Manifest |  1 -
 dev-python/kombu/kombu-5.3.0_beta3.ebuild | 93 ---
 2 files changed, 94 deletions(-)

diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 32668a15fc92..bcce6daf53ab 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,3 +1,2 @@
 DIST kombu-5.3.0.tar.gz 434097 BLAKE2B 
ef378014e4e52d83dc917f9dc6245111e94eddb70d9852da1add1b532ee733578db83c9ca5b4aa82771c443ecbd00e87384b7a373102e78aebcc6724ab1bf6b2
 SHA512 
688782cab692f0e18444289654e43f53b9a54627d5495933e9717b9676d689ddeb6de368081ea796df26727d4dfd5239ed7554736c13bfce7236e8d73f62b4a9
-DIST kombu-5.3.0b3.tar.gz 436058 BLAKE2B 
d8470eea43a1d5f862d93e3b3608a3240b25cad6ccb342318a7bebda17e6ce818dce2889cb7af22fd77d2f6e69d1fdfa6926c77ba715c76dd40e973f3d9920dc
 SHA512 
c330e1dd334810ed5fdeea234c49606aa8e43f84006703ff26d900f40ec7ce4920418bef3fd43abc8c792fb750499031191394475c45bfac50f7d29a6e30f5f8
 DIST kombu-5.3.1.tar.gz 434284 BLAKE2B 
8df6d441d1229fe188584a34cab6d40250dc119a189215ab8ae8ec6660dc25e85166f48786b6b4c2abd56b4eb9e6fdc15a92372078d6f412b728ce45be0a81e5
 SHA512 
608e70cc66dc19915fd2b40c3b908f3147f60a7c971be1d8bf04f3a18f78999a7a140073ecc9f38ec9aec49c1ef0a6f01fb5f2d27d68fc68bd64aade1924edfa

diff --git a/dev-python/kombu/kombu-5.3.0_beta3.ebuild 
b/dev-python/kombu/kombu-5.3.0_beta3.ebuild
deleted file mode 100644
index a7b2c056eea8..
--- a/dev-python/kombu/kombu-5.3.0_beta3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="AMQP Messaging Framework for Python"
-HOMEPAGE="
-   https://github.com/celery/kombu/
-   https://pypi.org/project/kombu/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="examples"
-
-RDEPEND="
-   >=dev-python/py-amqp-5.1.1[${PYTHON_USEDEP}]
-   

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

2023-06-15 Thread Michał Górny
commit: f97e50bd3de321329d38ef334e78addd98296d6a
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jun 16 03:40:29 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jun 16 03:40:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f97e50bd

dev-python/emoji: Bump to 2.5.1

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

 dev-python/emoji/Manifest   |  1 +
 dev-python/emoji/emoji-2.5.1.ebuild | 25 +
 2 files changed, 26 insertions(+)

diff --git a/dev-python/emoji/Manifest b/dev-python/emoji/Manifest
index 8a66aee842ee..ea1b20f03354 100644
--- a/dev-python/emoji/Manifest
+++ b/dev-python/emoji/Manifest
@@ -1,3 +1,4 @@
 DIST emoji-2.2.0.gh.tar.gz 293134 BLAKE2B 
4f6d8cf297c36a688b7f5e2f4afceb7e55102b23507fcac95799b6a6ab82521c55fcec884dcb2270e8290516942b7ef923de99b4e8da9241ce5828256b991653
 SHA512 
51150605c7b20fdb9a62746df098995814fb3b5b6c6b79dc65fb35dd8036c95b150b63c6af37f1baaf5dfab521c41ff7d0360864ffa77f696ba2465c50e1da79
 DIST emoji-2.4.0.gh.tar.gz 408557 BLAKE2B 
9011ea74aad358a7e6b60771684538587ea34db601dac745663f1229db8b97b790092b2a3e6d83f274c7c3227504c8c3588701fe2c63d9c8147adc34979ee611
 SHA512 
5d52b4f70b4b10c2ac48e8170eff81e7e90ab8483bd76b38ba1a66f5ab33bbe8434ee30cace0e6251522a235384c9a5c4fdb9bc289c4a0a17d9a4f1331968e69
 DIST emoji-2.5.0.gh.tar.gz 416588 BLAKE2B 
555d16433d658b508d82d8ba8b8df1ea78ffcb64c01624be9fa1f72530e694efe32d1aaaf4b15bd1e5bd7b14ab6234ecc7ed74b6b62f7badfa3d8fb2d37e4f03
 SHA512 
a557e3c9f6833c0dc83bccb113d5a7f5edc5215bd92408c535a5acbe5bb47edd3796ac2b3174be7d02254314f460ecf5c54201b5d61bb1405655157091170349
+DIST emoji-2.5.1.gh.tar.gz 417256 BLAKE2B 
7964ad740de19654ed36fc1d6c333c7724883b17e8b28f0da9ff79d5d676202175071549a3d73cd2b807f8e0372a466af608f8e2d02ac58f815ccb4be56c99d0
 SHA512 
19310e49ea37ff396edd97008779cdf4456659265251d5ec6ce023c71e1fc3f8d1d5bab016c654454b4561841af69f370f38b4a009c71668d1e8518dbba42bbc

diff --git a/dev-python/emoji/emoji-2.5.1.ebuild 
b/dev-python/emoji/emoji-2.5.1.ebuild
new file mode 100644
index ..9cf0bc5fde70
--- /dev/null
+++ b/dev-python/emoji/emoji-2.5.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Emoji for Python"
+HOMEPAGE="
+   https://github.com/carpedm20/emoji/
+   https://pypi.org/project/emoji/
+"
+SRC_URI="
+   https://github.com/carpedm20/emoji/archive/v${PV}.tar.gz
+   -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+distutils_enable_tests pytest



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

2023-06-15 Thread Michał Górny
commit: 18cbb15777425c42b4e4bffbd4816794a23c902f
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jun 16 03:41:06 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jun 16 03:41:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18cbb157

dev-python/trimesh: Bump to 3.22.1

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

 dev-python/trimesh/Manifest  |  1 +
 dev-python/trimesh/trimesh-3.22.1.ebuild | 65 
 2 files changed, 66 insertions(+)

diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 831926d2e88d..49cdc45c391d 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,3 +1,4 @@
 DIST trimesh-3.21.6.gh.tar.gz 12691963 BLAKE2B 
518d8d73268ed40f03fba48fb1e07f5ccf8801bc779dbe99261670e61f291de5f549a078de5de392da2754b08735eb7bcfe9716f541bde94296e6f48edf2e44e
 SHA512 
65b348d334f7770f74e48bbed15f613b71fc0ba101c51a868bcd6becd315aa4a13f76722b2de84f6624b37b4d617dcc418f92ab19acb5e7f1992834bc0a5b96c
 DIST trimesh-3.21.7.gh.tar.gz 12692942 BLAKE2B 
3b4b7919b8c0abc6b8fc744d09f1e15ce31f50d3654f35b88444b49d6fe38f862e36cfe62ff4e31df5aacff07e8045c5ed0b3c656304648d06cebbc8b6e5
 SHA512 
671af8927617239a5a4412e68051bfc7336d3006ece827d376b3e5add48eb4fcd28cd51f5bc41e92f9c6b94616e80566197165f406cdf8ca5e7d02679c0c1bfd
 DIST trimesh-3.22.0.gh.tar.gz 12693485 BLAKE2B 
86d66288dd390163c9bc585df668cd85ff16afadee3c4f308500b917dc3a445212e7ae53895376c33836f4ccdf18ed39ce2c74ac7466b9194b3969801908866b
 SHA512 
8d9327f27615344d3752c534f0d628201b1c7a9dbf85ab5408da73005283dd9a7ef0beb325cb6b383b20a0ab140376ad0669926e00c7577b31e6ca479701a93c
+DIST trimesh-3.22.1.gh.tar.gz 12713271 BLAKE2B 
2c70087aff546682cc82d5f99f981153ab0dfb3d180f13071f87d79b70ec8e97ca936af0053e865717771e1abb8469fb4a57b81f5aed860fbce35ac609470cab
 SHA512 
27952e0d29ccd110d4087b4144e0923706bed3cd0734e7a17d7f55738c6322849c5dad04ab4ecfe0638bc16d65d1e647d08905a396dd6ebd1f78c833a8b95636

diff --git a/dev-python/trimesh/trimesh-3.22.1.ebuild 
b/dev-python/trimesh/trimesh-3.22.1.ebuild
new file mode 100644
index ..c3382a6092c5
--- /dev/null
+++ b/dev-python/trimesh/trimesh-3.22.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="Python library for loading and using triangular meshes"
+HOMEPAGE="
+   https://trimsh.org/
+   https://github.com/mikedh/trimesh/
+   https://pypi.org/project/trimesh/
+"
+SRC_URI="
+   https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
+   -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+   dev-python/chardet[${PYTHON_USEDEP}]
+   dev-python/colorlog[${PYTHON_USEDEP}]
+   dev-python/jsonschema[${PYTHON_USEDEP}]
+   dev-python/lxml[${PYTHON_USEDEP}]
+   dev-python/networkx[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/pillow[${PYTHON_USEDEP}]
+   dev-python/pycollada[${PYTHON_USEDEP}]
+   dev-python/pyglet[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   dev-python/scipy[${PYTHON_USEDEP}]
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   >=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
+   dev-python/svg-path[${PYTHON_USEDEP}]
+   dev-python/sympy[${PYTHON_USEDEP}]
+   dev-python/xxhash[${PYTHON_USEDEP}]
+   sci-libs/rtree[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   test? (
+   dev-python/pytest-xdist[${PYTHON_USEDEP}]
+   dev-python/mapbox_earcut[${PYTHON_USEDEP}]
+   )
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+   epytest -n "$(makeopts_jobs)"
+}
+
+pkg_postinst() {
+   optfeature_header "${PN} functionality can be extended by installing 
the following packages:"
+   optfeature "making GUI applications with 3D stuff" dev-python/glooey
+   optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
+   optfeature "loading a number of additional mesh formats" 
dev-python/meshio
+   optfeature "figuring out how much memory we have" dev-python/psutil
+   optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
+}



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

2023-06-15 Thread Michał Górny
commit: 15580d3ea3d9744f4532607ae8d5e98d39a8d54c
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jun 16 03:41:42 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jun 16 03:41:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15580d3e

dev-python/mkdocs-material: Bump to 9.1.16

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

 dev-python/mkdocs-material/Manifest|  1 +
 .../mkdocs-material/mkdocs-material-9.1.16.ebuild  | 61 ++
 2 files changed, 62 insertions(+)

diff --git a/dev-python/mkdocs-material/Manifest 
b/dev-python/mkdocs-material/Manifest
index 14d7ae9dd511..d79fe76cd5a7 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1 +1,2 @@
 DIST mkdocs-material-9.1.15.gh.tar.gz 14217712 BLAKE2B 
316d19f8e3c8f8edd57481c692b7b1cb136c3b914a5fd12fcbf68b9a11d268b0965874c3657b1f9bc766713426e2873597ca387942f610d98f2e8ce88b1bf52a
 SHA512 
29ee4d859a54fcfa627eebc3e88f2269c2f1cb6dbea6180a02216bf9c64bccc628ca45f6136725d1af41a532cc5d209dca4f862f62f79a89f2026b24a1e55b7d
+DIST mkdocs-material-9.1.16.gh.tar.gz 14243340 BLAKE2B 
73d89f310150a6f411b173497a33349e98e6cf0930781747a26321bec9834cbf1e3482e9a002d9db35ef69257ee2d125b43d776a6b05d91517ff22174ecfea86
 SHA512 
d4979ba567eadb26071e4a49bebaad196e80f292a870b3dc94484c9b59a7b061c9cf40a5c258725cb0a7cd7ca3f5d1a8de657518c4e806926fc059c40f37af9b

diff --git a/dev-python/mkdocs-material/mkdocs-material-9.1.16.ebuild 
b/dev-python/mkdocs-material/mkdocs-material-9.1.16.ebuild
new file mode 100644
index ..c6eb88bef19a
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-9.1.16.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+   dev-python/mkdocs-material-extensions
+   dev-python/mkdocs-minify-plugin
+   dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+   https://github.com/squidfunk/mkdocs-material/
+   https://pypi.org/project/mkdocs-material/
+"
+SRC_URI="
+   https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
+   -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="social"
+
+RDEPEND="
+   >=dev-python/colorama-0.4[${PYTHON_USEDEP}]
+   >=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+   >=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+   >=dev-python/mkdocs-1.4.2[${PYTHON_USEDEP}]
+   >=dev-python/pygments-2.14[${PYTHON_USEDEP}]
+   >=dev-python/pymdown-extensions-9.9.1[${PYTHON_USEDEP}]
+   >=dev-python/regex-2022.4.24[${PYTHON_USEDEP}]
+   >=dev-python/requests-2.26[${PYTHON_USEDEP}]
+   social? (
+   >=dev-python/pillow-9.0[${PYTHON_USEDEP}]
+   >=media-gfx/cairosvg-2.5[${PYTHON_USEDEP}]
+   )
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND="
+   >=dev-python/mkdocs-material-extensions-1.1.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+   # simplify pyproject to remove extra deps for metadata
+   "${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
+)
+
+src_prepare() {
+   echo "__version__ = '${PV}'" > gentoo_version.py || die
+   distutils-r1_src_prepare
+}



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

2023-06-15 Thread Michał Górny
commit: 4796f8dd4bbc5d06daa529ed57feb39fc3708521
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jun 16 03:37:43 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jun 16 03:37:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4796f8dd

dev-python/backrefs: Bump to 5.5

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

 dev-python/backrefs/Manifest|  1 +
 dev-python/backrefs/backrefs-5.5.ebuild | 33 +
 2 files changed, 34 insertions(+)

diff --git a/dev-python/backrefs/Manifest b/dev-python/backrefs/Manifest
index 509227cd54f7..76240d75b98c 100644
--- a/dev-python/backrefs/Manifest
+++ b/dev-python/backrefs/Manifest
@@ -1 +1,2 @@
 DIST backrefs-5.4.gh.tar.gz 4292341 BLAKE2B 
9cbc443b82d2c7339dda30c6790f99d2da38a7e8db78df19e2dc2670c5cc12b1c303870fc63aad16f326b0dfd5d3d1e7c1a85bcde6cb698cd3602488b7e58ef3
 SHA512 
2949c40bfa60b37eccfd380eb05e5a7f425cad243d6bb332e6f329a1b9747760ca530d4af69daa25441bc9b0d2bd6291699aebf36bd52d055d4e84959ab45100
+DIST backrefs-5.5.gh.tar.gz 5401839 BLAKE2B 
e8674de4b1f9a068bf7439e56fd14de8afed0635b0f6fe3c99c64b678890939186c7aa2d660bee73d51e01cc982186bddeaf2e4bea5754c1a234992d518f8004
 SHA512 
00074d30a96da6bd0aedcd3cec02f533a264514832d91ff466a50937fae28566fe95db7fbedc7ffd185300b9529adf7f89bd4366e09f2bd864fa4f0f13963475

diff --git a/dev-python/backrefs/backrefs-5.5.ebuild 
b/dev-python/backrefs/backrefs-5.5.ebuild
new file mode 100644
index ..ce61ff14c7c9
--- /dev/null
+++ b/dev-python/backrefs/backrefs-5.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Wrapper around re or regex that adds additional back references"
+HOMEPAGE="
+   https://github.com/facelessuser/backrefs/
+   https://pypi.org/project/backrefs/
+"
+SRC_URI="
+   https://github.com/facelessuser/backrefs/archive/${PV}.tar.gz
+   -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+BDEPEND="
+   test? (
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/regex[${PYTHON_USEDEP}]
+   dev-vcs/git
+   )
+"
+
+distutils_enable_tests pytest



[gentoo-commits] repo/gentoo:master commit in: dev-python/aws-sam-translator/

2023-06-15 Thread Michał Górny
commit: 8188d52a0724dd3abbfc15682f577cf0f8379ecb
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jun 16 03:39:15 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jun 16 03:39:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8188d52a

dev-python/aws-sam-translator: Bump to 1.69.0

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

 dev-python/aws-sam-translator/Manifest |  1 +
 .../aws-sam-translator-1.69.0.ebuild   | 60 ++
 2 files changed, 61 insertions(+)

diff --git a/dev-python/aws-sam-translator/Manifest 
b/dev-python/aws-sam-translator/Manifest
index 30a6fb59eb9e..b3be19267a40 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,3 +1,4 @@
 DIST serverless-application-model-1.66.0.gh.tar.gz 5779523 BLAKE2B 
7ec6eb68a74686cc7f1acb160582065b7ca50d56f400c7111a2b47733e6e238e010ba912236c60207b7dba65005333507e2babd8022244cea1bea0691300b947
 SHA512 
fbcc799bc0935c17fa5f9ae655d8e722e659c78c0f4ea6325f2f0a89f6bbad3b8f43951a60e950de1effe699cc858b696a95fbfceb3d7b79eb35cd4d2c618846
 DIST serverless-application-model-1.67.0.gh.tar.gz 5786955 BLAKE2B 
d80e24e5e371daa0ad189ef01ca16a2a2be76902d38c2b77b7e1b7e832e1c776f58dc079b140a328a7f33f211cd9af1eab3d40490c74db342949321a1745fc81
 SHA512 
0828b9e5e3284dd1787bd168303f32118f8597dd2bf57361b05e86a1337ae2fcb5866a5cb59bb5afc830f44f101dd833e56198198693c154d307ecb841704182
 DIST serverless-application-model-1.68.0.gh.tar.gz 5807706 BLAKE2B 
82d596bf9c93ca9f45cf7d9f6bbfbe46c0e845eb618f7619377f74a6e9e3971c60ba1ac6a73e5247f292553e1efaff723bbb66503bec74731eac97661a325950
 SHA512 
40a6961556e6e162d45d521f31fd086da77ce2e4e93d081d7be41f47779673513e09f8d48953b53410d59800942c9514eacb765d55534a3df4e2cddc09d658c7
+DIST serverless-application-model-1.69.0.gh.tar.gz 5925860 BLAKE2B 
0182aad62920c911551dfcd5378f8d61a2c7f50eda6f222591128ebc513a7cb2f738875ceb24edf6136a964f56e5f39929f8734e5cf5e09d36331f0f988ac4f4
 SHA512 
4fa7941188af8ef0f0aef688617b8c5b02152fc565433af740bd7243b9b9d9b41035d4cf76c31ae5da764b4143d6ae5c1eda1345daf3b7265b48aaf2e1624284

diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.69.0.ebuild 
b/dev-python/aws-sam-translator/aws-sam-translator-1.69.0.ebuild
new file mode 100644
index ..5a83e871d7a8
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.69.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+MY_P=serverless-application-model-${PV}
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation 
templates"
+HOMEPAGE="
+   https://github.com/aws/serverless-application-model/
+   https://pypi.org/project/aws-sam-translator/
+"
+SRC_URI="
+   
https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
+   -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+   =dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
+   >=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
+   =dev-python/pydantic-1.8[${PYTHON_USEDEP}]
+   =dev-python/typing-extensions-4.4[${PYTHON_USEDEP}]
+   dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   test? (
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/parameterized[${PYTHON_USEDEP}]
+   )
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+   # so much noise...
+   sed -i -e '/log_cli/d' pytest.ini || die
+
+   # deps are installed by ebuild, don't try to reinstall them via pip
+   truncate --size=0 requirements/*.txt || die
+
+   distutils-r1_python_prepare_all
+}
+
+python_test() {
+   local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+   local -x AWS_DEFAULT_REGION=us-east-1
+   epytest -o addopts=
+}



[gentoo-commits] repo/gentoo:master commit in: dev-python/sphinx-autodoc-typehints/

2023-06-15 Thread Michał Górny
commit: f10dd533fc52b1c9233203f3836de02ecb178cac
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jun 16 03:38:14 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jun 16 03:38:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f10dd533

dev-python/sphinx-autodoc-typehints: Bump to 1.23.1

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

 dev-python/sphinx-autodoc-typehints/Manifest   |  1 +
 .../sphinx-autodoc-typehints-1.23.1.ebuild | 38 ++
 2 files changed, 39 insertions(+)

diff --git a/dev-python/sphinx-autodoc-typehints/Manifest 
b/dev-python/sphinx-autodoc-typehints/Manifest
index e8e0c7bbcbe6..438303ce5929 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -1,2 +1,3 @@
 DIST sphinx-autodoc-typehints-1.22.gh.tar.gz 35429 BLAKE2B 
d871de3d3a37b2632e6b43dcb4ce58fbf61bdfdb225650486fdffbbfff4148770f40096815d3e6807f4d3f789c0f7f7fdfef841a3d087f0b12e65671597207e3
 SHA512 
9fed312b5b63dcbf0b39e226486abd687e68c26eeb7303ee3049251c7007d7c364ceb196672ac16101b1a76493e0a0a4e1d9532e54eec250720a37f0c8f77fda
 DIST sphinx_autodoc_typehints-1.23.0.tar.gz 35945 BLAKE2B 
4af9ddd722a1fc59d52009ef46ad7af828d826cce61e0bce260b68045d4abe3b184ffc0368b29f60eba210def8d8b3b37a5455442c156b326d4b9956c6afc32c
 SHA512 
990db1f042913088fddf56cbc9ad5f401f7d886164c348aaf19fd1541fa1566a2d58d1c182e52d839d1dd32606ca3da1191b7062a6ed9c8f04dc6a47efaf5488
+DIST sphinx_autodoc_typehints-1.23.1.tar.gz 36243 BLAKE2B 
e53dc42a31e358ca1e3fbbe41a3002abd4e1f470ed259d5b0b6f8def81de91653d1cb609e44dc10409340775ca877ea394e4fba1a5f2c3a38c10ce33996e12c8
 SHA512 
fe10d0ae4d23a979125868fd6743b37d2f65e1297620142c13cb59b83ba242e4b45098cc580c18232be1b535f5927ba6dd401f7cd4d3a39c2aab3611a2a751ed

diff --git 
a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.23.1.ebuild 
b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.23.1.ebuild
new file mode 100644
index ..c12ff85ed759
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.23.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Type hints support for the Sphinx autodoc extension"
+HOMEPAGE="
+   https://github.com/tox-dev/sphinx-autodoc-typehints/
+   https://pypi.org/project/sphinx-autodoc-typehints/
+"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+   >=dev-python/sphinx-5.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   dev-python/hatch-vcs[${PYTHON_USEDEP}]
+   test? (
+   >=dev-python/nptyping-2.5[${PYTHON_USEDEP}]
+   >=dev-python/sphobjinv-2.3.1[${PYTHON_USEDEP}]
+   >=dev-python/typing-extensions-4.5[${PYTHON_USEDEP}]
+   )
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+   # this package is addicted to Internet
+   tests/test_sphinx_autodoc_typehints.py::test_format_annotation
+)



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

2023-06-15 Thread Michał Górny
commit: 96635a95bbbf5daa24dc08cef74fb1220f5fafe5
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jun 16 02:52:40 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jun 16 03:34:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96635a95

dev-python/pyproject-fmt: Bump to 0.12.0

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

 dev-python/pyproject-fmt/Manifest  |  1 +
 .../pyproject-fmt/pyproject-fmt-0.12.0.ebuild  | 33 ++
 2 files changed, 34 insertions(+)

diff --git a/dev-python/pyproject-fmt/Manifest 
b/dev-python/pyproject-fmt/Manifest
index f9acc1fd26c6..da8bb780e538 100644
--- a/dev-python/pyproject-fmt/Manifest
+++ b/dev-python/pyproject-fmt/Manifest
@@ -1 +1,2 @@
 DIST pyproject_fmt-0.11.2.tar.gz 12134 BLAKE2B 
bff72bd12d41f9d9fa7cae82938f6cc921a079e966587a6432f07d17702835863f20e460003cc9321a8465c2e660b7474e0c9f54987b7ee7deaae99dd0e76b56
 SHA512 
2600212e4afcf238636c7b41a60e9a235a742a923fdcafcb174e08799845797d1813fc61ca56db9ada35def0deb94192180fe4ff15bb6cfa7208e1c1d3b339d0
+DIST pyproject_fmt-0.12.0.tar.gz 13006 BLAKE2B 
77581a51f4cf3885ce0e13ba91170406e9f757cf09bad251b5dfe38d209f9efcdaa9909d2d52b21106d5db021bce3e498e67bcf95011155955b821337e9f6e36
 SHA512 
98c6c8f95032d53f188a2cf85f477aaafdb94b59e3619aab155751f328ff309b959ffb1f1de9b613486486c98abd850396c891c04d5548c93931ead41d742503

diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.12.0.ebuild 
b/dev-python/pyproject-fmt/pyproject-fmt-0.12.0.ebuild
new file mode 100644
index ..0770ee3966cf
--- /dev/null
+++ b/dev-python/pyproject-fmt/pyproject-fmt-0.12.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Format your pyproject.toml file"
+HOMEPAGE="
+   https://github.com/tox-dev/pyproject-fmt/
+   https://pypi.org/project/pyproject-fmt/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+   >=dev-python/natsort-8.3.1[${PYTHON_USEDEP}]
+   >=dev-python/packaging-23.1[${PYTHON_USEDEP}]
+   >=dev-python/tomlkit-0.11.8[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   dev-python/hatch-vcs[${PYTHON_USEDEP}]
+   test? (
+   >=dev-python/pytest-mock-3.10[${PYTHON_USEDEP}]
+   )
+"
+
+distutils_enable_tests pytest



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

2023-06-15 Thread Michał Górny
commit: 97dee8e31f168e33a2a065a9dfc06ad576bda4f3
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jun 16 02:33:02 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jun 16 03:34:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97dee8e3

dev-python/botocore: Bump to 1.29.154

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

 dev-python/botocore/Manifest |  1 +
 dev-python/botocore/botocore-1.29.154.ebuild | 79 
 2 files changed, 80 insertions(+)

diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 378dd84b3ab9..b6f44746748c 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,3 +3,4 @@ DIST botocore-1.29.146.gh.tar.gz 11553866 BLAKE2B 
7b5b060480de459af9045be8724272
 DIST botocore-1.29.151.gh.tar.gz 11618833 BLAKE2B 
cac8007e6177c029b97e288c244668657da6b20d3ea1b4e5b1b93e65bf7dec1206c5bccdc70094e14b02a3937a10f12868a3ea9b85cf6fbcb6e7a6c71155170a
 SHA512 
960a5a62e467a3057e89f1f7d2700b67a1aff442b85a7b89b7da6a403deb2d706e9d6297392ef74a5569d90cd3123fa0474d40f378f0756012d88665c0214aa4
 DIST botocore-1.29.152.gh.tar.gz 11624895 BLAKE2B 
f6b8596548ab8ff5cbf401d98ebf90cd0425f0363f9be1b71f58649a98dd6c69a859deb80467621bcdc5c15ebe151df7960880ebc013d5834d5310e80a89e948
 SHA512 
f51f8e00e61ed51d39ec9e51a08cf0f57d29f5e1d4e77460cf28ed296f062cf9df2b5761a30d8a78b6bc4ca8a971032150929cb84147d099e45f8e0112a717e5
 DIST botocore-1.29.153.gh.tar.gz 11665559 BLAKE2B 
82a51ba87753e4f241776652f846db39e5d3748997c635af960dfa389786f3abe3b622f2415abba1aaef81d12aee8b7197f1dea9e71a34e6fc18e1712a79eed5
 SHA512 
84f774eae433b8efecbc4ccf4990435cfa2f9a5fa1a6d29d94bbc57a75b6f3fd4c0b8392672a7d06a00ad7b5f0f4c3fcf66aa893ad655e3a1409083d8731df78
+DIST botocore-1.29.154.gh.tar.gz 11667747 BLAKE2B 
0f5ad1bd37b977fcbf938bde18ddec0aab0ce71180e64b5f7318647843082cedead62215a99099a7b4f795228afa1093f22364fbe84b3ecd6c1d177a00f5ee8f
 SHA512 
f66819a5b70ceb30b42bf448c9069d2ebfe68d25f33d4b489e1836b65a2233a3a62bd50d723c4b25531fa13fd49a4ba50cad9e67b6315954aa113428d8a87d4e

diff --git a/dev-python/botocore/botocore-1.29.154.ebuild 
b/dev-python/botocore/botocore-1.29.154.ebuild
new file mode 100644
index ..3ced99abe4ff
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.154.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+   https://github.com/boto/botocore/
+   https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "" ]]; then
+   EGIT_REPO_URI="https://github.com/boto/botocore;
+   inherit git-r3
+else
+   SRC_URI="
+   https://github.com/boto/botocore/archive/${PV}.tar.gz
+   -> ${P}.gh.tar.gz
+   "
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 
~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+   dev-python/six[${PYTHON_USEDEP}]
+   =dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   test? (
+   dev-python/jsonschema[${PYTHON_USEDEP}]
+   dev-python/pytest-xdist[${PYTHON_USEDEP}]
+   )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+   # unpin deps
+   sed -i -e "s:>=.*':':" setup.py || die
+
+   # unbundle deps
+   rm -r botocore/vendored || die
+   find -name '*.py' -exec sed -i \
+   -e 's:from botocore[.]vendored import:import:' \
+   -e 's:from botocore[.]vendored[.]:from :' \
+   {} + || die
+
+   distutils-r1_src_prepare
+}
+
+python_test() {
+   local EPYTEST_DESELECT=(
+   # rely on bundled six
+   tests/functional/test_six_imports.py::test_no_bare_six_imports
+   tests/functional/test_six_threading.py::test_six_thread_safety
+   # fails on unrelated warnings
+   
tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+   
tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+   # TODO
+   
tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+   # urllib3-2 compatibility, mock relies on implementation details
+   
tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_no_response_from_server
+   
tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_returned
+   
tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_sends_307
+   
tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_sends_connection_header
+   

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

2023-06-15 Thread Michał Górny
commit: 644d54ea1e9dbc4a06feaaa54d0febc2d51a3714
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jun 16 02:33:24 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jun 16 03:34:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=644d54ea

app-admin/awscli: Bump to 1.27.154

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

 app-admin/awscli/Manifest   |  1 +
 app-admin/awscli/awscli-1.27.154.ebuild | 80 +
 2 files changed, 81 insertions(+)

diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 08bb4867e97c..eb3e841e1693 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -3,3 +3,4 @@ DIST aws-cli-1.27.146.gh.tar.gz 2430455 BLAKE2B 
5e59ad0a5e97b4f218c694a6c9df3fb8
 DIST aws-cli-1.27.151.gh.tar.gz 2433265 BLAKE2B 
a26710e9af6cca92db87394c15415ade9aa1228d270386e96540d617b71b1531c15f3a0c5c65e9bd1ceca6ee7c49477b07e8fe7cdedee080c6c163e7aac9794c
 SHA512 
80af195a72112e660db1ff958d4fc61f57a2781a007eb7ba945d6eb6d44589c1f505c9cc30d350d56e8cf376aa30de1d3a220efe0672941ed9ee57375b405502
 DIST aws-cli-1.27.152.gh.tar.gz 2434279 BLAKE2B 
4c7ff9c0df3aee2eb8d195941f0d443a0904f7becbf6d9484425d940ca2f686520a28e9ab196a634663f6b1662905352ad7548ec4ba2bbde770af74970a5bf99
 SHA512 
8039ff55f967091649e74f4a827044ebddeff7beb28cc4bc47ed817941c64cd6f6e274c705fbeb49ce58331514b4bc4b6622689f1740a6ef676983cf0224e942
 DIST aws-cli-1.27.153.gh.tar.gz 2436062 BLAKE2B 
e9351f70b36ffb15fcab233ba2c6845675749b34a16ddb6baac25acb712f7ce42fa531683684fa7deb4bde38c896eca6f5e47d6637f10e45c56d7e20eb99145e
 SHA512 
6e48dfed4c7d09acc1d567952e921a926ac2a63cbf4c0ab27856a17336cb517157ff5e7a3685b9f6c7d2f2edc2aad7dd52079ac3b5cbb13ad0da65a772dc3099
+DIST aws-cli-1.27.154.gh.tar.gz 2436624 BLAKE2B 
79f55cc001ba3286a125002304c350dbecc6582b0e52b1ab1c1460b15406a82b397907ab11c7fd92c0db4e952856cf6f7b2c7a0022ff4f836b5f49a86461
 SHA512 
366ddc5274631c70e2e5735ead4d54cecfdc7b115d8168aff6fff25b3f842731a2938cd66da1c6897833fae7ac534945c848551ca5a07c7a52fe7d6f9f2b55f7

diff --git a/app-admin/awscli/awscli-1.27.154.ebuild 
b/app-admin/awscli/awscli-1.27.154.ebuild
new file mode 100644
index ..62c19f3a63fb
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.154.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+   https://github.com/aws/aws-cli/
+   https://pypi.org/project/awscli/
+"
+SRC_URI="
+   https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+   -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+   >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+   dev-python/colorama[${PYTHON_USEDEP}]
+   dev-python/docutils[${PYTHON_USEDEP}]
+   dev-python/rsa[${PYTHON_USEDEP}]
+   >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+   dev-python/pyyaml[${PYTHON_USEDEP}]
+   !app-admin/awscli-bin
+"
+BDEPEND="
+   test? (
+   dev-python/pytest-forked[${PYTHON_USEDEP}]
+   dev-python/pytest-xdist[${PYTHON_USEDEP}]
+   )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+   # do not rely on bundled deps in botocore (sic!)
+   find -name '*.py' -exec sed -i \
+   -e 's:from botocore[.]vendored import:import:' \
+   -e 's:from botocore[.]vendored[.]:from :' \
+   {} + || die
+   # strip overzealous upper bounds on requirements
+   sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+   distutils-r1_src_prepare
+}
+
+python_test() {
+   local EPYTEST_DESELECT=(
+   # TODO
+   
tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+   
tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+   
tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+   
tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+   )
+
+   # integration tests require AWS credentials and Internet access
+   epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+   newbashcomp bin/aws_bash_completer aws
+
+   insinto /usr/share/zsh/site-functions
+   newins bin/aws_zsh_completer.sh _aws
+
+   distutils-r1_python_install_all
+
+   rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || 
die
+}



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

2023-06-15 Thread Michał Górny
commit: fe72e86c1bcb757f273b13bd78d674f968c106d3
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jun 16 02:33:13 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jun 16 03:34:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe72e86c

dev-python/boto3: Bump to 1.26.154

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

 dev-python/boto3/Manifest  |  1 +
 dev-python/boto3/boto3-1.26.154.ebuild | 66 ++
 2 files changed, 67 insertions(+)

diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 1408e78fe672..21f3d23c315f 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,3 +3,4 @@ DIST boto3-1.26.146.gh.tar.gz 658035 BLAKE2B 
29104a4ebd16ca8b2a0631bb747ed8b5af9
 DIST boto3-1.26.151.gh.tar.gz 661732 BLAKE2B 
8adc42757d828414dd4bde9f460bc9fd6781131de5c8a5648fd1b6888ad4ff656db4075aeb2855493823290c5239ea6364aedd531197206c540b126bd466c379
 SHA512 
51359a351ed023de6b7c84e6d3e2bd5fc28f1ddc39e71af61bc6880002ed9478150e87e4237032d0ff9110792fcfbc09a62ee23f89d7d417730a88abccda0517
 DIST boto3-1.26.152.gh.tar.gz 662874 BLAKE2B 
31866c0c3244cdb868fadaf985410e5577d8d75f37387ee44f6ce879ae06c282a4e85e262da4bab3e588918b126110c10b5a64bf7764f076baf495a4382cd225
 SHA512 
3d496da055172bbc840a3a6f8bd7df6f24bbb1f2f5dbacbbc0e337d4bd15d1355b9fd2e5dbb9e611aa1e415d11dc32bd0b61428a0d0ce7e2d55bb143a0cf1491
 DIST boto3-1.26.153.gh.tar.gz 663859 BLAKE2B 
6c5a04fcaa6dde09a09552c2687a2ad1a780ce703cc60eda84c2fa6ad9061dd5f0a4aa0c8f7a7d15f73da2abd9f28d12f8f3d4f859a552cc355bde16f9b306aa
 SHA512 
70117de2475d82f4bb94be2033b7ba18447290f767334d3ea11c60807619d76846003868439f1d025b396df12b91e126f4935f7438d649ca2ee7d629f0a499f4
+DIST boto3-1.26.154.gh.tar.gz 664248 BLAKE2B 
d36363c3a1561392fe9217c694f263ed34d10fee42141efffbe9d0899e5472d765af717a148deb9b3ef2abe654dcbb5840557d24644763a43ebda61fb39d7b5a
 SHA512 
3aa8b243f9a39921c48d7d63ffb0be64f3bf8dbb824df03e7aafea072a218973660deb52b80ec23367f2a94f8bb9b2ee284a5b4d41d0edd81a1ea063cf94f453

diff --git a/dev-python/boto3/boto3-1.26.154.ebuild 
b/dev-python/boto3/boto3-1.26.154.ebuild
new file mode 100644
index ..2a4a7643203e
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.154.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+   https://github.com/boto/boto3/
+   https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "" ]]; then
+   EGIT_REPO_URI="https://github.com/boto/boto3;
+   inherit git-r3
+   BOTOCORE_PV=${PV}
+else
+   SRC_URI="
+   https://github.com/boto/boto3/archive/${PV}.tar.gz
+   -> ${P}.gh.tar.gz
+   "
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 
~amd64-linux ~x86-linux"
+
+   # botocore is x.(y+3).z
+   BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+   >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+   >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+   >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   test? (
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/pytest-xdist[${PYTHON_USEDEP}]
+   )
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+   # don't lock versions to narrow ranges
+   sed -e '/botocore/ d' \
+   -e '/jmespath/ d' \
+   -e '/s3transfer/ d' \
+   -i setup.py || die
+
+   # do not rely on bundled deps in botocore (sic!)
+   find -name '*.py' -exec sed -i \
+   -e 's:from botocore[.]vendored import:import:' \
+   -e 's:from botocore[.]vendored[.]:from :' \
+   {} + || die
+
+   distutils-r1_python_prepare_all
+}
+
+python_test() {
+   epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}



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

2023-06-15 Thread Michał Górny
commit: 806857ea8869d20a8e0714ee772cda7393241465
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jun 16 02:51:43 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jun 16 03:34:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=806857ea

dev-python/tox: Bump to 4.6.1

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

 dev-python/tox/Manifest |  1 +
 dev-python/tox/tox-4.6.1.ebuild | 80 +
 2 files changed, 81 insertions(+)

diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index e8de7bee94d5..d227f90ac110 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -2,3 +2,4 @@ DIST tox-3.28.0.gh.tar.gz 309472 BLAKE2B 
9896411426f6aebb3efa468c01696ecc5f17ec3
 DIST tox-4.5.1.tar.gz 170137 BLAKE2B 
38ab00eb577e66211db0ecf8931087a8c5a14f8219eb7ebecb7be9938221d1c680edc09a38a5c72b9ec63825d4cbb2d4fd9157a52aed8cdb0d22a1c1bbb70cba
 SHA512 
75d495d6dba134c3fe537fc190c1f428ff188ee67c346911c02ee151a8369425b22956eea52be5d434735e1590edce57b3487d5f4b277022bf8cfe8bf4660cf8
 DIST tox-4.5.2.tar.gz 170336 BLAKE2B 
1dcd2bbd7d153dbf0ac7bb48cdd1826d5fb915b7ef6d30a943138e06bb5d82d67db551f8c6d0342a5a81d91ddfd7da6ad8272fc016eaea27bcd4d69f6be9c605
 SHA512 
44a6c9821975205258402eaaa2010a0acde98190c77db0361da6c67d793de90871786fe2d78c6c9ee83100d7399e1eac857e2edaf94c64c81fb535ff871a363c
 DIST tox-4.6.0.tar.gz 170401 BLAKE2B 
ae9decd66677fc4e0422687dcd166a27df2f5617c4dbad1d99762542e0d7e1cbcb27892fce74217f85d3e93176475fa39a22a6dd99ccf141a12832862b436a02
 SHA512 
465db889630d1aa36329b41cf91537e7ca27fe0901b77b8b24d180ab854f2b7c062ae62bdcc931a33235b617e7c709d9290f0769b133b5cd40e398aea9a8d918
+DIST tox-4.6.1.tar.gz 172090 BLAKE2B 
ee86b8972ee273f07ab0197ab2f0b6ce4505206eebc412f6ec68007e1cf5ac270662e4cb61aa6eb5b08df07a5b20a28c498f9e730fe08fd04339ba918a7712e5
 SHA512 
b6571790275ee6d7f33dfd72c587b70476fc4ea0798a5331831bea69087cacd21eed546197bfb4a32cb4fe182b63b759977f194e19b56fb346ed251a00be9d6b

diff --git a/dev-python/tox/tox-4.6.1.ebuild b/dev-python/tox/tox-4.6.1.ebuild
new file mode 100644
index ..400626a421cd
--- /dev/null
+++ b/dev-python/tox/tox-4.6.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="
+   https://tox.readthedocs.io/
+   https://github.com/tox-dev/tox/
+   https://pypi.org/project/tox/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc 
~x86"
+
+RDEPEND="
+   >=dev-python/cachetools-5.3.1[${PYTHON_USEDEP}]
+   >=dev-python/chardet-5.1[${PYTHON_USEDEP}]
+   >=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
+   >=dev-python/filelock-3.12.2[${PYTHON_USEDEP}]
+   >=dev-python/packaging-23.1[${PYTHON_USEDEP}]
+   >=dev-python/platformdirs-3.5.3[${PYTHON_USEDEP}]
+   >=dev-python/pluggy-1[${PYTHON_USEDEP}]
+   >=dev-python/pyproject-api-1.5.1[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '
+   >=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+   ' 3.{9..10})
+   >=dev-python/virtualenv-20.23[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   >=dev-python/hatch-vcs-0.3[${PYTHON_USEDEP}]
+   test? (
+   >=dev-python/build-0.10[${PYTHON_USEDEP}]
+   >=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
+   >=dev-python/flaky-3.7[${PYTHON_USEDEP}]
+   >=dev-python/psutil-5.9.5[${PYTHON_USEDEP}]
+   dev-python/pytest-mock[${PYTHON_USEDEP}]
+   >=dev-python/pytest-xdist-3.3.1[${PYTHON_USEDEP}]
+   >=dev-python/re-assert-1.1[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '
+   >=dev-python/time-machine-2.9[${PYTHON_USEDEP}]
+   ' 'python*')
+   )
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+   # devpi_process is not packaged, and has lots of dependencies
+   cat > "${T}"/devpi_process.py <<-EOF || die
+   def IndexServer(*args, **kwargs): raise NotImplementedError()
+   EOF
+
+   local -x PYTHONPATH=${T}:${PYTHONPATH}
+   local EPYTEST_DESELECT=(
+   # Internet
+   
tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
+   )
+   local EPYTEST_IGNORE=(
+   # requires devpi*
+   tests/test_provision.py
+   )
+
+   [[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+   
'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit-True-True]'
+   
'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements-True-True]'
+   

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

2023-06-15 Thread Michał Górny
commit: a1875827cbe581fa0aa6a9fd6344c81b8adb2d4e
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jun 16 02:53:49 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jun 16 03:34:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1875827

dev-python/hypothesis: Bump to 6.78.3

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

 dev-python/hypothesis/Manifest |   1 +
 dev-python/hypothesis/hypothesis-6.78.3.ebuild | 104 +
 2 files changed, 105 insertions(+)

diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 5a67d92dd0a4..c5c51c729788 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -7,3 +7,4 @@ DIST hypothesis-6.76.0.gh.tar.gz 9373576 BLAKE2B 
ed580296f163f9808597aa3a7b2ceaf
 DIST hypothesis-6.77.0.gh.tar.gz 9376438 BLAKE2B 
2c80427a43481fbc837042c8481e56f1186fa9026c15902f489b1d26cda216f33df6da2025e37d8b37676047d7a8be1f0aea686ec0d2d18178d14e5e8f08f24c
 SHA512 
17c1a0d1b00c0bd9a4373c5cafa7f58f4f6c85a85a107f4afff7064b52280a21210502c555291a580c81c1085f7c5fdd9db91391b29b2af6e476c83f4838fe1a
 DIST hypothesis-6.78.1.gh.tar.gz 9376599 BLAKE2B 
c0998212067e947af71f17aa5f76609ed71cf57cf4d71418329ec92ca663b202bc3c8d09936e147304744d81d01f9ba0ae5f5cf369fe04cbcb95c351a3a6cd06
 SHA512 
5491dfce1a8a25288aca345a6a6f8b88557b3dc2a08773ee2aa10d133d9b44b9bddb4d7584ac99046a006f3d9fb85713b6b38f5cc635ddc437c8fb4bbe58a866
 DIST hypothesis-6.78.2.gh.tar.gz 9376858 BLAKE2B 
8bbc6e373a9dd67b47922c4ba9f938f90d154a945f7142d07304db11b5b4e4d53b21605e4f7be24fb413153a2edf9c54bec01409a72abfb8fb31b43c87836ede
 SHA512 
65ea4396365a3f4f1740d61cbcdf0eb380f99c133d582b56ee3e557bcc4da0d329ac832b38dad64c5e5fb7afcace55a17cc22fbb15ea1751508488983a1d7cef
+DIST hypothesis-6.78.3.gh.tar.gz 9377028 BLAKE2B 
857d748262384fdf42f26e2656daa73e162c4058b136e2c0d1dff9e45fa42151512217653467cf81e514cb17cfc5aecfc6b1dbdbad7a62068489a79c13f3eb65
 SHA512 
1f15bd6ea2bb6822b3cf0cb1b679d976312a5c960e54741abab1e111ff0b9c6471c00752566bd937e86e7ef847b6bd80e53825964d6bc9fecf1b992499bf29f3

diff --git a/dev-python/hypothesis/hypothesis-6.78.3.ebuild 
b/dev-python/hypothesis/hypothesis-6.78.3.ebuild
new file mode 100644
index ..e338c8f52ddf
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.78.3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_12 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+   https://github.com/HypothesisWorks/hypothesis/
+   https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+   https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+   -> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+   >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+   >=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '
+   >=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+   ' 3.9 3.10)
+   cli? (
+   $(python_gen_cond_dep '
+   dev-python/black[${PYTHON_USEDEP}]
+   dev-python/click[${PYTHON_USEDEP}]
+   ' "${CLI_COMPAT[@]}")
+   )
+"
+BDEPEND="
+   test? (
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/pexpect[${PYTHON_USEDEP}]
+   dev-python/pytest-xdist[${PYTHON_USEDEP}]
+   !!https://github.com/HypothesisWorks/hypothesis/issues/3671
+   
hypothesis-python/tests/cover/test_lookup.py::test_resolving_mutually_recursive_types
+   
hypothesis-python/tests/cover/test_lookup.py::test_resolving_mutually_recursive_types_with_defaults
+   )
+   case ${EPYTHON} in
+   pypy3)
+   EPYTEST_DESELECT+=(
+   # failing due to warnings from numpy/cython
+   
hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
+   )
+   ;;
+   python3.12)
+   EPYTEST_DESELECT+=(
+   hypothesis-python/tests/cover/test_lookup.py
+   
hypothesis-python/tests/cover/test_type_lookup.py
+   
hypothesis-python/tests/cover/test_type_lookup_forward_ref.py
+   )
+   ;;
+   esac
+
+   epytest -o filterwarnings= -n "$(makeopts_jobs)" \
+  

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

2023-06-15 Thread Michał Górny
commit: e876b1bc875f9b772f35346f0b4c4fd73d527c9f
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jun 16 02:49:58 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jun 16 03:34:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e876b1bc

dev-python/pytest-mock: Bump to 3.11.1

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

 dev-python/pytest-mock/Manifest  |  1 +
 dev-python/pytest-mock/pytest-mock-3.11.1.ebuild | 54 
 2 files changed, 55 insertions(+)

diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 3840a93144a0..10602264b9d9 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1 +1,2 @@
 DIST pytest-mock-3.10.0.tar.gz 28384 BLAKE2B 
2f51f8be34094054b8f7864eb083dde00800adb73af668444d21c95d8f159594bed0f68694e7ffb0e24da402a4865f37c07d85622ad00f130ccdb4e3d189bf9a
 SHA512 
2ad6866d581a2999899e399ef5516d478a6172f52923f03703e3e3708229fb3b1178c91225b5cc90734c96abcb48fea517b11e0fc193da6fb592295395c14cd3
+DIST pytest-mock-3.11.1.tar.gz 31251 BLAKE2B 
26655487947d614483f082f17c9f3a9fc2688c016d07c6d4c4e34c369f87f3d914cf82d966a655e1eee501088d27d711f1b65f0c777678254dcfffa5c8c7585f
 SHA512 
f52147498657d35f4616ea788b500a68ffcf1c2c066047fb973308b54e11bd7fe5a3961115bab99ae6858000ebb68b35cc489e81221a0bd26afae8426092ff6b

diff --git a/dev-python/pytest-mock/pytest-mock-3.11.1.ebuild 
b/dev-python/pytest-mock/pytest-mock-3.11.1.ebuild
new file mode 100644
index ..fffc7a4e5350
--- /dev/null
+++ b/dev-python/pytest-mock/pytest-mock-3.11.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_TESTED=( python3_{10..12} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
+HOMEPAGE="
+   https://github.com/pytest-dev/pytest-mock/
+   https://pypi.org/project/pytest-mock/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+   >=dev-python/pytest-6[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   dev-python/setuptools-scm[${PYTHON_USEDEP}]
+   test? (
+   $(python_gen_cond_dep '
+   dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+   ' "${PYTHON_TESTED[@]}")
+   )
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+   if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then
+   einfo "Skipping tests on ${EPYTHON}"
+   return
+   fi
+
+   local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+   local -x PYTEST_PLUGINS=pytest_mock,pytest_asyncio.plugin
+   local EPYTEST_DESELECT=()
+
+   if has_version dev-python/mock; then
+   EPYTEST_DESELECT+=(
+   tests/test_pytest_mock.py::test_standalone_mock
+   )
+   fi
+
+   epytest --assert=plain
+}



[gentoo-commits] proj/portage:master commit in: lib/portage/tests/resolver/

2023-06-15 Thread Sam James
commit: 2af4bc17d1b4ea1581bb191dfa7f34ec64ab140b
Author: YiFei Zhu  gmail  com>
AuthorDate: Mon Jun 12 02:07:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 16 03:34:46 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2af4bc17

tests: resolver: Test the (bad) behavior of bug #622270

Without fixing the bug. This is so we have a baseline behavior to
compare against.

Bug: https://bugs.gentoo.org/439688
Bug: https://bugs.gentoo.org/622270
Signed-off-by: YiFei Zhu  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../resolver/test_slot_conflict_blocked_prune.py   | 78 ++
 1 file changed, 78 insertions(+)

diff --git a/lib/portage/tests/resolver/test_slot_conflict_blocked_prune.py 
b/lib/portage/tests/resolver/test_slot_conflict_blocked_prune.py
new file mode 100644
index 0..14e98cd00
--- /dev/null
+++ b/lib/portage/tests/resolver/test_slot_conflict_blocked_prune.py
@@ -0,0 +1,78 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+from portage.tests import TestCase
+from portage.tests.resolver.ResolverPlayground import (
+ResolverPlayground,
+ResolverPlaygroundTestCase,
+)
+
+
+class SlotConflictBlockedPruneTestCase(TestCase):
+def testSlotConflictBlockedPrune(self):
+"""
+Bug 622270
+Downgrading package (as openssl here) due to un-accepting unstable.
+Dependent package (as rustup here) cannot be rebuilt due to missing
+keyword, so dependee downgrade is cancelled, but other dependents
+(such as xwayland here) are rebuilt nevertheless. This should not
+happen and the rebuilds should be pruned.
+"""
+ebuilds = {
+"x11-base/xwayland-23.1.1": {
+"EAPI": "5",
+"RDEPEND": "dev-libs/openssl:=",
+},
+"dev-util/rustup-1.25.2": {
+"EAPI": "5",
+"RDEPEND": "dev-libs/openssl:0=",
+"KEYWORDS": "~x86",
+},
+"dev-libs/openssl-1.1.1u": {
+"EAPI": "5",
+"SLOT": "0/1.1",
+},
+"dev-libs/openssl-3.1.1": {
+"EAPI": "5",
+"SLOT": "0/3",
+"KEYWORDS": "~x86",
+},
+}
+
+installed = {
+"x11-base/xwayland-23.1.1": {
+"EAPI": "5",
+"RDEPEND": "dev-libs/openssl:0/3=",
+},
+"dev-util/rustup-1.25.2": {
+"EAPI": "5",
+"RDEPEND": "dev-libs/openssl:0/3=",
+"KEYWORDS": "~x86",
+},
+"dev-libs/openssl-3.1.1": {
+"EAPI": "5",
+"SLOT": "0/3",
+"KEYWORDS": "~x86",
+},
+}
+
+world = ["x11-base/xwayland", "dev-util/rustup"]
+
+test_cases = (
+ResolverPlaygroundTestCase(
+["@world"],
+options={"--deep": True, "--update": True, "--verbose": True},
+success=True,
+mergelist=["x11-base/xwayland-23.1.1"],
+),
+)
+
+playground = ResolverPlayground(
+ebuilds=ebuilds, installed=installed, world=world
+)
+try:
+for test_case in test_cases:
+playground.run_TestCase(test_case)
+self.assertEqual(test_case.test_success, True, 
test_case.fail_msg)
+finally:
+playground.cleanup()



[gentoo-commits] proj/portage:master commit in: lib/portage/tests/resolver/

2023-06-15 Thread Sam James
commit: ff457f742b513a65e6609054e5310f8beee488ec
Author: YiFei Zhu  gmail  com>
AuthorDate: Tue Jun 13 08:08:51 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 16 03:34:46 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=ff457f74

tests: resolver: Test the broken behavior of Perl rebuild bug

Bug: https://bugs.gentoo.org/463976
Bug: https://bugs.gentoo.org/592880
Bug: https://bugs.gentoo.org/596664
Bug: https://bugs.gentoo.org/631490
Bug: https://bugs.gentoo.org/764365
Bug: https://bugs.gentoo.org/793992
Signed-off-by: YiFei Zhu  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../tests/resolver/test_perl_rebuild_bug.py| 121 +
 1 file changed, 121 insertions(+)

diff --git a/lib/portage/tests/resolver/test_perl_rebuild_bug.py 
b/lib/portage/tests/resolver/test_perl_rebuild_bug.py
new file mode 100644
index 0..928fd47d7
--- /dev/null
+++ b/lib/portage/tests/resolver/test_perl_rebuild_bug.py
@@ -0,0 +1,121 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+from portage.tests import TestCase
+from portage.tests.resolver.ResolverPlayground import (
+ResolverPlayground,
+ResolverPlaygroundTestCase,
+)
+
+
+class PerlRebuildBugTestCase(TestCase):
+def __init__(self, *args, **kwargs):
+super().__init__(*args, **kwargs)
+
+def testPerlRebuildBug(self):
+"""
+The infamous Perl rebuild bug.
+
+A non-slotted build-time dependency cycle is created by:
+dev-lang/perl -> sys-libs/zlib -> sys-devel/automake -> dev-lang/perl
+Everything else depends on this cycle.
+
+Bug in solving for smallest cycle causes slot in RDEPEND of
+dev-perl/Locale-gettext to be ignored, so all dependencies other than
+perl's >=sys-libs/zlib-1.2.12 are satisfied by already-installed
+packages. dev-perl/Locale-gettext and sys-devel/automake become leaves
+of the depgraph after satisfied packages are ignored. They become
+emerged first. This causes an issue because dev-perl/Locale-gettext is
+now built before the slot upgrade of dev-lang/perl.
+"""
+ebuilds = {
+"dev-lang/perl-5.36.0-r2": {
+"EAPI": "5",
+"DEPEND": ">=sys-libs/zlib-1.2.12",
+"RDEPEND": ">=sys-libs/zlib-1.2.12",
+"SLOT": "0/5.36",
+},
+"dev-perl/Locale-gettext-1.70.0-r1": {
+"EAPI": "5",
+"DEPEND": "dev-lang/perl",
+"RDEPEND": "dev-lang/perl:=",
+},
+"sys-apps/help2man-1.49.3": {
+"EAPI": "5",
+"DEPEND": "dev-lang/perl dev-perl/Locale-gettext",
+"RDEPEND": "dev-lang/perl dev-perl/Locale-gettext",
+},
+"sys-devel/automake-1.16.5": {
+"EAPI": "5",
+"DEPEND": "dev-lang/perl",
+"RDEPEND": "dev-lang/perl",
+},
+"sys-libs/zlib-1.2.13-r1": {
+"EAPI": "5",
+"DEPEND": "sys-devel/automake",
+},
+}
+
+installed = {
+"dev-lang/perl-5.34.0-r3": {
+"EAPI": "5",
+"DEPEND": "sys-libs/zlib",
+"RDEPEND": "sys-libs/zlib",
+"SLOT": "0/5.34",
+},
+"dev-perl/Locale-gettext-1.70.0-r1": {
+"EAPI": "5",
+"DEPEND": "dev-lang/perl",
+"RDEPEND": "dev-lang/perl:0/5.34=",
+},
+"sys-apps/help2man-1.48.5": {
+"EAPI": "5",
+"DEPEND": "dev-lang/perl dev-perl/Locale-gettext",
+"RDEPEND": "dev-lang/perl dev-perl/Locale-gettext",
+},
+"sys-devel/automake-1.16.4": {
+"EAPI": "5",
+"DEPEND": "dev-lang/perl",
+"RDEPEND": "dev-lang/perl",
+},
+"sys-libs/zlib-1.2.11-r4": {
+"EAPI": "5",
+"DEPEND": "sys-devel/automake",
+},
+}
+
+world = ["sys-apps/help2man"]
+
+test_cases = (
+ResolverPlaygroundTestCase(
+["@world"],
+options={"--deep": True, "--update": True, "--verbose": True},
+success=True,
+ambiguous_merge_order=True,
+merge_order_assertions=(
+(
+"dev-perl/Locale-gettext-1.70.0-r1",
+"dev-lang/perl-5.36.0-r2",
+),
+),
+mergelist=[
+"dev-perl/Locale-gettext-1.70.0-r1",
+"sys-devel/automake-1.16.5",
+"sys-libs/zlib-1.2.13-r1",
+"dev-lang/perl-5.36.0-r2",
+"sys-apps/help2man-1.49.3",
+  

[gentoo-commits] proj/portage:master commit in: lib/_emerge/, lib/portage/tests/resolver/

2023-06-15 Thread Sam James
commit: 224207c7d1988a354d004507bb7ecfb90b4ef097
Author: YiFei Zhu  gmail  com>
AuthorDate: Tue Jun 13 00:47:52 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 16 03:34:46 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=224207c7

depgraph: Do not allow slotted deps to be satisfied by wrong slots

This may be part of what caused the "perl rebuild bug". The
"priority" of perl, when seen by perl modules, may have "satisfied"
set to an installed perl of a wrong slot. Compounding this factor
with bug #756199 where find_smallest_cycle would select a single
node, in this case because the dependency of perl is satisfied and
the priority then gets ignored, the "cycle" becomes a perl module
alone and gets rebuilt early.

I also updated the test from the previous patch to account for
this change. No other tests seems affected.

For a larger scale test, I reproduced this initially with a stage3
chroot from a Jan 1 2022 stage3 snapshot, and testing in an
equivalent dockerfile would work too:

  FROM gentoo/stage3:amd64-openrc-20220101
  RUN emerge-webrsync
  COPY . /portage

Before this patch (USE flags omitted):

  # cd /portage && bin/emerge -puDN @world 2>&1 | grep -i perl
  [ebuild U  ] app-admin/perl-cleaner-2.30-r1 [2.30]
  [ebuild  rR] virtual/perl-File-Temp-0.231.100
  [ebuild  rR] dev-perl/Locale-gettext-1.70.0-r1
  [ebuild  rR] dev-perl/MIME-Charset-1.12.2-r1
  [ebuild  rR] dev-perl/Module-Build-0.423.100
  [ebuild  rR] dev-perl/Text-CharWidth-0.40.0-r2
  [ebuild U  ] dev-lang/perl-5.36.0-r2 [5.34.0-r3]
  [ebuild  N ] virtual/perl-CPAN-2.330.0
  [ebuild U  ] virtual/perl-ExtUtils-MakeMaker-7.640.0 [7.620.0]
  [ebuild U  ] virtual/perl-File-Spec-3.840.0 [3.800.0]
  [...]

After this patch:

  # cd /portage && bin/emerge -puDN @world 2>&1 | grep -i perl
  [ebuild U  ] app-admin/perl-cleaner-2.30-r1 [2.30]
  [ebuild U  ] dev-lang/perl-5.36.0-r2:0/5.36 [5.34.0-r3:0/5.34]
  [ebuild  N ] virtual/perl-CPAN-2.330.0
  [ebuild U  ] virtual/perl-ExtUtils-MakeMaker-7.640.0 [7.620.0]
  [ebuild U  ] virtual/perl-Data-Dumper-2.184.0 [2.179.0]
  [ebuild U  ] virtual/perl-File-Spec-3.840.0 [3.800.0]
  [ebuild U  ] virtual/perl-Test-Harness-3.440.0-r1 [3.430.0]
  [ebuild  rR] dev-perl/Pod-Parser-1.630.0-r1
  [ebuild  rR] dev-perl/Text-CharWidth-0.40.0-r2
  [ebuild  rR] dev-perl/Text-WrapI18N-0.60.0-r2
  [...]

Bug: https://bugs.gentoo.org/463976
Bug: https://bugs.gentoo.org/592880
Bug: https://bugs.gentoo.org/596664
Bug: https://bugs.gentoo.org/631490
Bug: https://bugs.gentoo.org/764365
Bug: https://bugs.gentoo.org/793992
Signed-off-by: YiFei Zhu  gmail.com>
Closes: https://github.com/gentoo/portage/pull/1055
Signed-off-by: Sam James  gentoo.org>

 lib/_emerge/depgraph.py | 18 ++
 lib/portage/tests/resolver/test_perl_rebuild_bug.py |  4 ++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
index 60e57b226..28acfed9d 100644
--- a/lib/_emerge/depgraph.py
+++ b/lib/_emerge/depgraph.py
@@ -4042,6 +4042,16 @@ class depgraph:
 inst_pkg, modified_use=self._pkg_use_enabled(inst_pkg)
 )
 ]
+# Do not allow slotted deps to be satisfied by wrong slots.
+# Otherwise, slot-operator-dependent packages may rebuild
+# before the slotted package they are dependent on.
+if child and atom.slot_operator == "=":
+inst_pkgs = [
+inst_pkg
+for inst_pkg in inst_pkgs
+if inst_pkg.slot == child.slot
+and inst_pkg.sub_slot == child.sub_slot
+]
 if inst_pkgs:
 for inst_pkg in inst_pkgs:
 if self._pkg_visibility_check(inst_pkg):
@@ -4161,6 +4171,14 @@ class depgraph:
 inst_pkg, 
modified_use=self._pkg_use_enabled(inst_pkg)
 )
 ]
+# Do not allow slotted deps to be satisfied by wrong slots.
+if child and atom.slot_operator == "=":
+inst_pkgs = [
+inst_pkg
+for inst_pkg in inst_pkgs
+if inst_pkg.slot == child.slot
+and inst_pkg.sub_slot == child.sub_slot
+]
 if inst_pkgs:
 for inst_pkg in inst_pkgs:
 if self._pkg_visibility_check(inst_pkg):

diff --git a/lib/portage/tests/resolver/test_perl_rebuild_bug.py 
b/lib/portage/tests/resolver/test_perl_rebuild_bug.py
index 928fd47d7..7e376f396 100644
--- a/lib/portage/tests/resolver/test_perl_rebuild_bug.py
+++ 

[gentoo-commits] proj/portage:master commit in: lib/_emerge/, lib/portage/tests/resolver/

2023-06-15 Thread Sam James
commit: 44afa8445dc46464200fe46c1e09e0c7475067bf
Author: YiFei Zhu  gmail  com>
AuthorDate: Mon Jun 12 02:23:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 16 03:34:46 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=44afa844

depgraph: Don't ignore downgrades as missed_updates

Missed updates can also come in the form of package downgrades,
when, for example, there are keyword changes. They can cause
rebuilds, and these rebuilds may be not possible due to reasons such
as keywords or masks. In this case, prior to this patch, portage
would cancel the downgrade, but the rebuilds would be requested
endlessly, because bug 439688's backtrack code does not trigger.

To reproduce, on an ACCEPT_KEYWORDS=~amd64 machine, emerge
=dev-libs/openssl=3.0.9, dev-util/rustup, and something else that
depends on openssl. Then un-accept ~amd64 for openssl and rustup.
Prior to this patch, a @world upgrade would cause:

  These are the packages that would be merged, in order:

  Calculating dependencies... done!

  [ebuild  rR] dev-libs/libevent-2.1.12-r1:0/2.1-7::gentoo
  [ebuild  rR] net-misc/rsync-3.2.7-r2::gentoo
  [...]

  Total: 71 packages (71 reinstalls), Size of downloads: 0 KiB

There are no packages marked "R", only "rR". There are no section
labeled "The following packages are causing rebuilds:" either.

After this patch, we have:

  These are the packages that would be merged, in order:

  Calculating dependencies... done!

  Total: 0 packages, Size of downloads: 0 KiB

  WARNING: One or more updates/rebuilds have been skipped due to a dependency 
conflict:

  dev-libs/openssl:0

(dev-libs/openssl-1.1.1u:0/1.1::gentoo, ebuild scheduled for merge)
  dev-libs/openssl:0/3= required by (dev-util/rustup-1.25.2:0/0::gentoo, 
installed)

I also updated the test from the previous patch to account for
this change. No other tests seems affected.

Bug: https://bugs.gentoo.org/439688
Bug: https://bugs.gentoo.org/622270
Signed-off-by: YiFei Zhu  gmail.com>
Closes: https://github.com/gentoo/portage/pull/1053
Signed-off-by: Sam James  gentoo.org>

 lib/_emerge/depgraph.py| 4 +---
 lib/portage/tests/resolver/test_slot_conflict_blocked_prune.py | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
index 77133e99c..60e57b226 100644
--- a/lib/_emerge/depgraph.py
+++ b/lib/_emerge/depgraph.py
@@ -1287,9 +1287,7 @@ class depgraph:
 pkg.root, pkg.slot_atom
 ):
 any_selected = True
-if chosen_pkg > pkg or (
-not chosen_pkg.installed and chosen_pkg.version == 
pkg.version
-):
+if not chosen_pkg.installed and chosen_pkg.version == 
pkg.version:
 missed_update = False
 break
 if any_selected and missed_update:

diff --git a/lib/portage/tests/resolver/test_slot_conflict_blocked_prune.py 
b/lib/portage/tests/resolver/test_slot_conflict_blocked_prune.py
index 14e98cd00..b23126d5f 100644
--- a/lib/portage/tests/resolver/test_slot_conflict_blocked_prune.py
+++ b/lib/portage/tests/resolver/test_slot_conflict_blocked_prune.py
@@ -63,7 +63,7 @@ class SlotConflictBlockedPruneTestCase(TestCase):
 ["@world"],
 options={"--deep": True, "--update": True, "--verbose": True},
 success=True,
-mergelist=["x11-base/xwayland-23.1.1"],
+mergelist=[],
 ),
 )
 



[gentoo-commits] proj/portage:master commit in: /

2023-06-15 Thread Sam James
commit: c5fe39fa9bae5f77e50b8130fbf66b9865e9d1b0
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 16 03:15:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 16 03:34:46 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c5fe39fa

NEWS: update

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

 NEWS | 17 ++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index f3afbc366..cb68579f4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,23 @@
+portage-3.0.49 (UNRELEASED)
+--
+
 Bug fixes:
+* Adjust write tests for DISTDIR and PORTAGE_TMPDIR to work with automount
+  directories (bug #485100, bug #890812).
+
+* depgraph: Don't ignore downgrades as missed_updates (bug #622270).
+
+* depgraph: Do not allow slotted deps to be satisfied by wrong slots
+  (bug #463976, bug #592880, bug #596664, bug #631490, bug #764365, bug 
#793992).
+
+  This is the notorious "Perl rebuild" bug where Perl modules would get rebuilt
+  _before_ a new dev-lang/perl and therefore be broken at runtime.
+
 * dosym: Prevent globbing of argument in dosym_canonicalize().
 
 * emerge-webrsync: Give a nicer error message if the requested key isn't
   on the filesystem (bug #905868).
 
-* Adjust write tests for DISTDIR and PORTAGE_TMPDIR to work with automount
-  directories (bug #485100, bug #890812).
-
 * glsa-check: appropriately handle more error cases with invalid GLSAs
   (bug #905660)
 



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

2023-06-15 Thread Ionen Wolkens
commit: 5007039d4fdb1eccc6375531a2478974558d38c3
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Jun 16 03:06:28 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Jun 16 03:08:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5007039d

app-emulation/wine-staging: update live

Closes: https://bugs.gentoo.org/908559
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 767e89f5480c..7fe254ee3ba8 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -194,7 +194,6 @@ src_prepare() {
local patchinstallargs=(
--all
--no-autoconf
-   -W winemenubuilder-Desktop_Icon_Path #652176
${MY_WINE_STAGING_CONF}
)
 



[gentoo-commits] repo/gentoo:master commit in: sys-block/parted/files/, sys-block/parted/

2023-06-15 Thread Sam James
commit: 8489bdccc712eb390d43de5f3b0918bb839e8361
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 16 02:56:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 16 02:56:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8489bdcc

sys-block/parted: fix test portability issues

Closes: https://bugs.gentoo.org/753677
Closes: https://bugs.gentoo.org/890869
Thanks-to: Kerin Millar  plushkava.net>
Signed-off-by: Sam James  gentoo.org>

 .../parted/files/parted-3.6-tests-non-bash.patch   | 86 ++
 .../parted/files/parted-3.6-tests-unicode.patch| 59 +++
 sys-block/parted/parted-3.6.ebuild |  6 +-
 3 files changed, 150 insertions(+), 1 deletion(-)

diff --git a/sys-block/parted/files/parted-3.6-tests-non-bash.patch 
b/sys-block/parted/files/parted-3.6-tests-non-bash.patch
new file mode 100644
index ..02c44f68998a
--- /dev/null
+++ b/sys-block/parted/files/parted-3.6-tests-non-bash.patch
@@ -0,0 +1,86 @@
+https://debbugs.gnu.org/61128
+
+From c7b5c04083b8fc21c3e0d044375631d559e122e3 Mon Sep 17 00:00:00 2001
+From: Kerin Millar 
+Date: Wed, 25 Jan 2023 15:26:46 +
+Subject: [PATCH] Use complementation correctly in shell globs
+
+Negation should be performed by using the  character.
+Attempting to use the  shall result in undefined behaviour.
+
+Dash used to tolerate this violation of the spec but the following
+commit put a stop to it.
+
+https://git.kernel.org/pub/scm/utils/dash/dash.git/commit/?id=8f9cca0
+
+Signed-off-by: Kerin Millar 
+Link: 
https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_13
+Bug: https://bugs.gentoo.org/890869
+--- a/m4/o-direct.m4
 b/m4/o-direct.m4
+@@ -47,14 +47,14 @@ frobnozzle
+ /dev/shm) ;;
+ /*) case $pe_dir in
+ # Accept $HOME or $TMP only if the value is nice and boring.
+-*[^/a-zA-Z0-9_.-]*) ;;
++*[!/a-zA-Z0-9_.-]*) ;;
+ *) pe_cand_dirs="$pe_cand_dirs $pe_dir";;
+ esac
+ esac
+ done
+ 
+ case $PARTED_TMPDIR in
+-*[^/a-zA-Z0-9_.-]*) ;;
++*[!/a-zA-Z0-9_.-]*) ;;
+ *) pe_cand_dirs="$PARTED_TMPDIR $pe_cand_dirs";;
+ esac
+ 
+--- a/tests/t-local.sh
 b/tests/t-local.sh
+@@ -138,7 +138,7 @@ require_512_byte_sector_size_()
+ peek_()
+ {
+   case $# in 2) ;; *) echo "usage: peek_ FILE 0_BASED_OFFSET" >&2; exit 1;; 
esac
+-  case $2 in *[^0-9]*) echo "peek_: invalid offset: $2" >&2; exit 1 ;; esac
++  case $2 in *[!0-9]*) echo "peek_: invalid offset: $2" >&2; exit 1 ;; esac
+   dd if="$1" bs=1 skip="$2" count=1
+ }
+ 
+@@ -146,7 +146,7 @@ poke_()
+ {
+   case $# in 3) ;; *) echo "usage: poke_ FILE 0_BASED_OFFSET BYTE" >&2; exit 
1;;
+ esac
+-  case $2 in *[^0-9]*) echo "poke_: invalid offset: $2" >&2; exit 1 ;; esac
++  case $2 in *[!0-9]*) echo "poke_: invalid offset: $2" >&2; exit 1 ;; esac
+   case $3 in ?) ;; *) echo "poke_: invalid byte: '$3'" >&2; exit 1 ;; esac
+   printf %s "$3" | dd of="$1" bs=1 seek="$2" count=1 conv=notrunc
+ }
+@@ -155,7 +155,7 @@ poke_()
+ gpt1_pte_name_offset_()
+ {
+   local ss=$1
+-  case $ss in *[^0-9]*) echo "$0: invalid sector size: $ss">&2; return 1;; 
esac
++  case $ss in *[!0-9]*) echo "$0: invalid sector size: $ss">&2; return 1;; 
esac
+   expr $ss \* 2 + 56
+   return 0
+ }
+@@ -167,7 +167,7 @@ gpt_corrupt_primary_table_()
+   case $# in 2) ;; *) echo "$0: expected 2 args, got $#" >&2; return 1;; esac
+   local dev=$1
+   local ss=$2
+-  case $ss in *[^0-9]*) echo "$0: invalid sector size: $ss">&2; return 1;; 
esac
++  case $ss in *[!0-9]*) echo "$0: invalid sector size: $ss">&2; return 1;; 
esac
+ 
+   # get the first byte of the name
+   local orig_pte_name_byte
+@@ -188,7 +188,7 @@ gpt_restore_primary_table_()
+   case $# in 3) ;; *) echo "$0: expected 2 args, got $#" >&2; return 1;; esac
+   local dev=$1
+   local ss=$2
+-  case $ss in *[^0-9]*) echo "$0: invalid sector size: $ss">&2; return 1;; 
esac
++  case $ss in *[!0-9]*) echo "$0: invalid sector size: $ss">&2; return 1;; 
esac
+   local orig_byte=$3
+   poke_ $dev $(gpt1_pte_name_offset_ $ss) "$orig_byte" || return 1
+ }
+-- 
+2.39.1

diff --git a/sys-block/parted/files/parted-3.6-tests-unicode.patch 
b/sys-block/parted/files/parted-3.6-tests-unicode.patch
new file mode 100644
index ..316c184f460d
--- /dev/null
+++ b/sys-block/parted/files/parted-3.6-tests-unicode.patch
@@ -0,0 +1,59 @@
+https://debbugs.gnu.org/61129
+
+From af8ed66e00bfac4a189ea32c62199bffaa3eb836 Mon Sep 17 00:00:00 2001
+From: Kerin Millar 
+Date: Sun, 29 Jan 2023 00:34:27 +
+Subject: [PATCH] Use any available UTF-8 locale in t0251; skip if none found
+
+The "t0251-gpt-unicode.sh" test presently suffers from several issues
+which are addressed herewith.
+
+Do not begin by trying to match the "en_US.utf8" locale specifically.
+The only requirement for the test to be 

[gentoo-commits] proj/portage:master commit in: /, lib/portage/

2023-06-15 Thread John Helmert III
commit: 63691996a5c2bcebf93c27ee8548c7520f9517d7
Author: John Helmert III  gentoo  org>
AuthorDate: Fri Jun 16 02:26:50 2023 +
Commit: John Helmert III  gentoo  org>
CommitDate: Fri Jun 16 02:26:50 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=63691996

lib/portage/glsa: raise GlsaFormatException on invalid range types

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

 NEWS|  3 +++
 lib/portage/glsa.py | 14 --
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 6982e1d5f..f3afbc366 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,9 @@ Bug fixes:
 * Adjust write tests for DISTDIR and PORTAGE_TMPDIR to work with automount
   directories (bug #485100, bug #890812).
 
+* glsa-check: appropriately handle more error cases with invalid GLSAs
+  (bug #905660)
+
 portage-3.0.48.1 (2023-06-06)
 
 

diff --git a/lib/portage/glsa.py b/lib/portage/glsa.py
index 3b82c0de1..648159ad8 100644
--- a/lib/portage/glsa.py
+++ b/lib/portage/glsa.py
@@ -268,7 +268,13 @@ def makeAtom(pkgname, versionNode):
 @rtype:String
 @return:   the portage atom
 """
-op = opMapping[versionNode.getAttribute("range")]
+rangetype = versionNode.getAttribute("range")
+if rangetype in opMapping:
+op = opMapping[rangetype]
+else:
+raise GlsaFormatException(
+_(f"Invalid range found for '{pkgname}': {rangetype}")
+)
 version = getText(versionNode, format="strip")
 rValue = f"{op}{pkgname}-{version}"
 try:
@@ -292,7 +298,11 @@ def makeVersion(versionNode):
 @rtype:String
 @return:   the version string
 """
-op = opMapping[versionNode.getAttribute("range")]
+rangetype = versionNode.getAttribute("range")
+if rangetype in opMapping:
+op = opMapping[rangetype]
+else:
+raise GlsaFormatException(_(f"Invalid range found: {rangetype}"))
 version = getText(versionNode, format="strip")
 rValue = f"{op}{version}"
 try:



[gentoo-commits] proj/portage:master commit in: lib/portage/tests/glsa/

2023-06-15 Thread John Helmert III
commit: 924c9655c71622315fb8f9fbb5167e4a2e5650b8
Author: John Helmert III  gentoo  org>
AuthorDate: Fri Jun 16 02:26:53 2023 +
Commit: John Helmert III  gentoo  org>
CommitDate: Fri Jun 16 02:26:54 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=924c9655

tests/glsa/test_security_set: support manipulation of glsa range attributes

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

 lib/portage/tests/glsa/test_security_set.py | 22 --
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/lib/portage/tests/glsa/test_security_set.py 
b/lib/portage/tests/glsa/test_security_set.py
index 968e2bf2b..35f7aa5ab 100644
--- a/lib/portage/tests/glsa/test_security_set.py
+++ b/lib/portage/tests/glsa/test_security_set.py
@@ -30,8 +30,8 @@ class SecuritySetTestCase(TestCase):
   remote
   
 
-  %(unaffected_version)s
-  %(unaffected_version)s
+  %(unaffected_version)s
+  %(affected_version)s
 
   
   
@@ -96,21 +96,30 @@ class SecuritySetTestCase(TestCase):
 "glsa_id": "201301-01",
 "pkgname": "A-vulnerable",
 "cp": "cat/A-vulnerable",
+"unaffected_range": "ge",
+"affected_range": "lt",
 "unaffected_version": "2.2",
+"affected_version": "2.2",
 "arch": "*",
 },
 {
 "glsa_id": "201301-02",
 "pkgname": "B-not-vulnerable",
 "cp": "cat/B-not-vulnerable",
+"unaffected_range": "ge",
+"affected_range": "lt",
 "unaffected_version": "4.4",
+"affected_version": "4.4",
 "arch": "*",
 },
 {
 "glsa_id": "201301-03",
 "pkgname": "NotInstalled",
 "cp": "cat/NotInstalled",
+"unaffected_range": "ge",
+"affected_range": "lt",
 "unaffected_version": "3.5",
+"affected_version": "3.5",
 "arch": "*",
 },
 )
@@ -171,7 +180,10 @@ class SecuritySetTestCase(TestCase):
 "glsa_id": "201301-04",
 "pkgname": "A-vulnerable",
 "cp": "cat/A-vulnerable",
+"unaffected_range": "ge",
+"affected_range": "lt",
 "unaffected_version": "2.2",
+"affected_version": "2.2",
 # Use an invalid delimiter (comma)
 "arch": "amd64,sparc",
 },
@@ -179,7 +191,10 @@ class SecuritySetTestCase(TestCase):
 "glsa_id": "201301-05",
 "pkgname": "A-vulnerable",
 "cp": "cat/A-vulnerable",
+"unaffected_range": "ge",
+"affected_range": "lt",
 "unaffected_version": "2.2",
+"affected_version": "2.2",
 # Use an invalid arch (~arch)
 "arch": "~amd64",
 },
@@ -187,7 +202,10 @@ class SecuritySetTestCase(TestCase):
 "glsa_id": "201301-06",
 "pkgname": "A-vulnerable",
 "cp": "cat/A-vulnerable",
+"unaffected_range": "ge",
+"affected_range": "lt",
 "unaffected_version": "2.2",
+"affected_version": "2.2",
 # Two valid arches followed by an invalid one
 "arch": "amd64 sparc ",
 },



[gentoo-commits] proj/portage:master commit in: lib/portage/tests/glsa/

2023-06-15 Thread John Helmert III
commit: bc9342d07f5a46f9ef5a220144decb9553342669
Author: John Helmert III  gentoo  org>
AuthorDate: Fri Jun 16 02:26:57 2023 +
Commit: John Helmert III  gentoo  org>
CommitDate: Fri Jun 16 02:26:57 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=bc9342d0

tests/glsa/test_security_set: test glsa with invalid range attribute

Bug: https://bugs.gentoo.org/905660
Closes: https://github.com/gentoo/portage/pull/1056
Signed-off-by: John Helmert III  gentoo.org>

 lib/portage/tests/glsa/test_security_set.py | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/lib/portage/tests/glsa/test_security_set.py 
b/lib/portage/tests/glsa/test_security_set.py
index 35f7aa5ab..867a7cd4f 100644
--- a/lib/portage/tests/glsa/test_security_set.py
+++ b/lib/portage/tests/glsa/test_security_set.py
@@ -209,6 +209,16 @@ class SecuritySetTestCase(TestCase):
 # Two valid arches followed by an invalid one
 "arch": "amd64 sparc ",
 },
+{
+"glsa_id": "201301-07",
+"pkgname": "A-vulnerable",
+"cp": "cat/A-vulnerable",
+"unaffected_range": "None",
+"affected_range": "lt",
+"unaffected_version": "2.2",
+"affected_version": "2.2",
+"arch": "*",
+},
 )
 
 world = ["cat/A"]



[gentoo-commits] repo/gentoo:master commit in: sys-libs/minizip-ng/, sys-libs/minizip-ng/files/

2023-06-15 Thread Sam James
commit: 2ef0a75304631a8a70c71cf24c24fa2158f2c687
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 16 01:41:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 16 01:41:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ef0a753

sys-libs/minizip-ng: drop 3.0.8, 3.0.9

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

 sys-libs/minizip-ng/Manifest   |  2 -
 .../minizip-ng/files/minizip-3.0.9-strdup.patch| 37 -
 sys-libs/minizip-ng/minizip-ng-3.0.8.ebuild| 93 -
 sys-libs/minizip-ng/minizip-ng-3.0.9.ebuild| 97 --
 4 files changed, 229 deletions(-)

diff --git a/sys-libs/minizip-ng/Manifest b/sys-libs/minizip-ng/Manifest
index b07993f44640..fb816333dd65 100644
--- a/sys-libs/minizip-ng/Manifest
+++ b/sys-libs/minizip-ng/Manifest
@@ -1,4 +1,2 @@
 DIST minizip-ng-3.0.10.tar.gz 771145 BLAKE2B 
6bab59f830b8be929b6293c9408dd70165ffe094a71bcff82eab71f9d077f4d5360f6081e0ca631090810dfc58a81b03926c797e5c156d0f1437df78292a1f09
 SHA512 
38021137bebb8805279e729e0801ee15133e6379bdd1862d0dea60f13fb1d63402477f3ea9a6c22fc8c85eb13dd9b38d9536680806850060a44a5a9f015fa829
-DIST minizip-ng-3.0.8.tar.gz 643788 BLAKE2B 
aa937fe8d0e776c8a00754c7a5eae7769b096d044a1b65b124adc0531b757579d8e0e0f5a4784669d9d94a7ea512625160b8b02f908a29e027f31911adf0f524
 SHA512 
f9742c5fc54ac08d78d7e942e90a7e7f1bc40a2812e770bd152ed441dbc5a004b79d2edf32d3fbda64db493cd1a0512d16deb84c0791d3fc86718e9ad0b1
-DIST minizip-ng-3.0.9.tar.gz 646390 BLAKE2B 
ba823e371dd65788404c8628d1e3de74d28bb86a378eb19b2f9636d96b402e43831238a5296d22febe46c58f2e340d8439ad4117db513b949c9cd99a32fa5df6
 SHA512 
a52c43d0e208eb6acf56f80804fe99c265baec2a60f6cd80fc9ba160ca3c076e6c118be9108db84728310b14640cab0e0d301d4c763713c90bd344990a43f5fd
 DIST minizip-ng-4.0.0.tar.gz 766989 BLAKE2B 
c46bccb277ee5c712710aae41a7b46af4d60fb8fecad7489b97fc4475059f5f8cfbb1aa2d3693d25ada90f3089535e0d060c7a918df1d0fd635d57cbc93a317d
 SHA512 
be3a9e9580847d595abbd200ec89a97e38086cab5b34d3a4db1507247ed04f9209290945989b200225ea412ee0e37fb9f1947404d1631d2dfeb5c6dc55ce3d05

diff --git a/sys-libs/minizip-ng/files/minizip-3.0.9-strdup.patch 
b/sys-libs/minizip-ng/files/minizip-3.0.9-strdup.patch
deleted file mode 100644
index 9cb1dd991b17..
--- a/sys-libs/minizip-ng/files/minizip-3.0.9-strdup.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://github.com/zlib-ng/minizip-ng/pull/682
-
-From 5aaa8bf0c348a27d9a7a0d82d4af26748278828c Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Thu, 16 Mar 2023 23:35:34 +
-Subject: [PATCH] CMake: set newer POSIX_C_SOURCE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Enable POSIX 2008 as it's needed for strdup(), otherwise we get:
-```
-/var/tmp/portage/sys-libs/minizip-ng-3.0.9/work/minizip-ng-3.0.9/mz_os.c: In 
function ‘mz_dir_make’:
-/var/tmp/portage/sys-libs/minizip-ng-3.0.9/work/minizip-ng-3.0.9/mz_os.c:286:19:
 error: implicit declaration of function ‘strdup’ 
[-Werror=implicit-function-declaration]
-  286 | current_dir = strdup(path);
-  |   ^~
-```
-
-The man page for strdup says:
-```
-strdup():
-   _XOPEN_SOURCE >= 500
-   || /* Since glibc 2.12: */ _POSIX_C_SOURCE >= 200809L
-   || /* glibc <= 2.19: */ _BSD_SOURCE || _SVID_SOURCE
-```
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -455,7 +455,7 @@ endif()
- 
- # Unix specific
- if(UNIX)
--list(APPEND STDLIB_DEF -D_POSIX_C_SOURCE=200112L)
-+list(APPEND STDLIB_DEF -D_POSIX_C_SOURCE=200809L)
- list(APPEND MINIZIP_SRC mz_os_posix.c mz_strm_os_posix.c)
- 
- if(MZ_PKCRYPT OR MZ_WZAES OR MZ_SIGNING)
-

diff --git a/sys-libs/minizip-ng/minizip-ng-3.0.8.ebuild 
b/sys-libs/minizip-ng/minizip-ng-3.0.8.ebuild
deleted file mode 100644
index 35459128380a..
--- a/sys-libs/minizip-ng/minizip-ng-3.0.8.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Worth keeping an eye on 'develop' branch upstream for possible backports,
-# as they copied this practice from sys-libs/zlib upstream.
-
-inherit cmake
-
-DESCRIPTION="Fork of the popular zip manipulation library found in the zlib 
distribution"
-HOMEPAGE="https://github.com/zlib-ng/minizip-ng;
-SRC_URI="https://github.com/zlib-ng/minizip-ng/archive/refs/tags/${PV}.tar.gz 
-> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="compat openssl test zstd"
-RESTRICT="!test? ( test )"
-
-# Automagically prefers sys-libs/zlib-ng if installed, so let's
-# just depend on it as presumably it's better tested anyway.
-RDEPEND="
-   app-arch/bzip2
-   app-arch/xz-utils
-   sys-libs/zlib-ng
-   virtual/libiconv
-   compat? ( !sys-libs/zlib[minizip] )
-   openssl? ( dev-libs/openssl:= )
-   zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-   ${RDEPEND}
-   test? ( 

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

2023-06-15 Thread Sam James
commit: 2bbaee3e53fe2eeec15711de211ce1aeb649c009
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 16 01:41:23 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 16 01:41:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bbaee3e

sys-libs/minizip-ng: add multilib

If this is ever going to be a thing with compat, we obviously need this.

We could conditionalise stuff on USE=compat but I don't really see the value
in that; still possible we could want this for newly built 32-bit stuff anyway.

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

 ...-ng-4.0.0.ebuild => minizip-ng-4.0.0-r1.ebuild} | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/sys-libs/minizip-ng/minizip-ng-4.0.0.ebuild 
b/sys-libs/minizip-ng/minizip-ng-4.0.0-r1.ebuild
similarity index 87%
rename from sys-libs/minizip-ng/minizip-ng-4.0.0.ebuild
rename to sys-libs/minizip-ng/minizip-ng-4.0.0-r1.ebuild
index fd2a6d9b2507..a0229283ac8f 100644
--- a/sys-libs/minizip-ng/minizip-ng-4.0.0.ebuild
+++ b/sys-libs/minizip-ng/minizip-ng-4.0.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # Worth keeping an eye on 'develop' branch upstream for possible backports,
 # as they copied this practice from sys-libs/zlib upstream.
 
-inherit cmake
+inherit cmake-multilib
 
 DESCRIPTION="Fork of the popular zip manipulation library found in the zlib 
distribution"
 HOMEPAGE="https://github.com/zlib-ng/minizip-ng;
@@ -21,20 +21,20 @@ RESTRICT="!test? ( test )"
 # Automagically prefers sys-libs/zlib-ng if installed, so let's
 # just depend on it as presumably it's better tested anyway.
 RDEPEND="
-   app-arch/bzip2
+   app-arch/bzip2[${MULTILIB_USEDEP}]
app-arch/xz-utils
-   sys-libs/zlib-ng
+   sys-libs/zlib-ng[${MULTILIB_USEDEP}]
virtual/libiconv
compat? ( !sys-libs/zlib[minizip] )
-   openssl? ( dev-libs/openssl:= )
-   zstd? ( app-arch/zstd:= )
+   openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+   zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
 "
 DEPEND="
${RDEPEND}
test? ( dev-cpp/gtest )
 "
 
-src_configure() {
+multilib_src_configure() {
local mycmakeargs=(
-DMZ_COMPAT=$(usex compat)
 
@@ -64,7 +64,7 @@ src_configure() {
cmake_src_configure
 }
 
-src_test() {
+multilib_src_test() {
local myctestargs=(
# TODO: investigate
-E 
"(raw-unzip-pkcrypt|raw-append-unzip-pkcrypt|raw-erase-unzip-pkcrypt|deflate-unzip-pkcrypt|deflate-append-unzip-pkcrypt|deflate-erase-unzip-pkcrypt|bzip2-unzip-pkcrypt|bzip2-append-unzip-pkcrypt|bzip2-erase-unzip-pkcrypt|lzma-unzip-pkcrypt|lzma-append-unzip-pkcrypt|lzma-erase-unzip-pkcrypt|xz-unzip-pkcrypt|xz-append-unzip-pkcrypt|xz-erase-unzip-pkcrypt|zstd-unzip-pkcrypt|zstd-append-unzip-pkcrypt|zstd-erase-unzip-pkcrypt)"
@@ -76,15 +76,15 @@ src_test() {
cmake_src_test -j1
 }
 
-src_install() {
-   cmake_src_install
-
-   if use test ; then
+multilib_src_install_all() {
+   if ! use compat && use test ; then
# Test binaries, bug #874591
rm "${ED}"/usr/bin/minigzip || die
rm "${ED}"/usr/bin/minizip-ng || die
fi
+}
 
+pkg_postinst() {
if use compat ; then
ewarn "minizip-ng is experimental and replacing the system 
zlib[minizip] is dangerous"
ewarn "Please be careful!"



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

2023-06-15 Thread Sam James
commit: dc3acbe1cfc97a45f986c5ff46273f91dd75738a
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 16 01:35:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 16 01:36:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc3acbe1

sys-libs/zlib-ng: add multilib

If this is ever going to be a thing with compat, we obviously need this.

We could conditionalise stuff on USE=compat but I don't really see the value
in that; still possible we could want this for newly built 32-bit stuff anyway.

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

 .../zlib-ng/{zlib-ng-2.1.2.ebuild => zlib-ng-2.1.2-r1.ebuild} | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/sys-libs/zlib-ng/zlib-ng-2.1.2.ebuild 
b/sys-libs/zlib-ng/zlib-ng-2.1.2-r1.ebuild
similarity index 97%
rename from sys-libs/zlib-ng/zlib-ng-2.1.2.ebuild
rename to sys-libs/zlib-ng/zlib-ng-2.1.2-r1.ebuild
index 718d4ab949b5..f96bd980dbf9 100644
--- a/sys-libs/zlib-ng/zlib-ng-2.1.2.ebuild
+++ b/sys-libs/zlib-ng/zlib-ng-2.1.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # Worth keeping an eye on 'develop' branch upstream for possible backports,
 # as they copied this practice from sys-libs/zlib upstream.
 
-inherit cmake
+inherit cmake-multilib
 
 DESCRIPTION="Fork of the zlib data compression library"
 HOMEPAGE="https://github.com/zlib-ng/zlib-ng;
@@ -31,7 +31,7 @@ PATCHES=(
"${FILESDIR}"/zlib-ng-2.1.2-cmake.patch
 )
 
-src_configure() {
+multilib_src_configure() {
local mycmakeargs=(
-DZLIB_COMPAT=$(usex compat)
-DZLIB_ENABLE_TESTS=$(usex test)
@@ -78,9 +78,7 @@ src_configure() {
cmake_src_configure
 }
 
-src_install() {
-   cmake_src_install
-
+pkg_postinst() {
if use compat ; then
ewarn "zlib-ng is experimental and replacing the system zlib is 
dangerous"
ewarn "Please be careful!"



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

2023-06-15 Thread Sam James
commit: 2e77e64d93d14f05e370d8c516c78ba932d3c1b5
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 16 01:25:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 16 01:26:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e77e64d

sys-libs/zlib-ng: tweak comment

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

 sys-libs/zlib-ng/zlib-ng-2.1.2.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sys-libs/zlib-ng/zlib-ng-2.1.2.ebuild 
b/sys-libs/zlib-ng/zlib-ng-2.1.2.ebuild
index f32b71569755..718d4ab949b5 100644
--- a/sys-libs/zlib-ng/zlib-ng-2.1.2.ebuild
+++ b/sys-libs/zlib-ng/zlib-ng-2.1.2.ebuild
@@ -44,6 +44,7 @@ src_configure() {
 
# The intrinsics options are all defined conditionally, so we need
# to enable them on/off per-arch here for now.
+   # TODO: There's no s390x USE_EXPAND yet
if use amd64 || use x86 ; then
mycmakeargs+=(
-DWITH_AVX2=$(usex cpu_flags_x86_avx2)
@@ -74,8 +75,6 @@ src_configure() {
)
fi
 
-   # TODO: There's no s390x USE_EXPAND yet
-
cmake_src_configure
 }
 



[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib-ng/files/, sys-libs/zlib-ng/

2023-06-15 Thread Sam James
commit: 88caec6a38285facc6c7682acd456452cc799333
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 16 01:11:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 16 01:11:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88caec6a

sys-libs/zlib-ng: add 2.1.2

No VNNI or VPCLMULQDQ yet, see linked bug.

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

 sys-libs/zlib-ng/Manifest|  1 +
 sys-libs/zlib-ng/files/zlib-ng-2.1.2-cmake.patch | 35 +
 sys-libs/zlib-ng/zlib-ng-2.1.2.ebuild| 92 
 3 files changed, 128 insertions(+)

diff --git a/sys-libs/zlib-ng/Manifest b/sys-libs/zlib-ng/Manifest
index cdd93f9171bb..6a7c819fb8e0 100644
--- a/sys-libs/zlib-ng/Manifest
+++ b/sys-libs/zlib-ng/Manifest
@@ -1 +1,2 @@
 DIST zlib-ng-2.0.7.tar.gz 853381 BLAKE2B 
89672bd35ee54df72ff995c1b4ed188538011be4cd077e464f21a088b0b70b3f95b4259dc546a65e8d4900dc5bd5bb98041875e361000898b34518f7e008b99b
 SHA512 
1c19a62bb00727ac49049c299fb70060da95b5fafa448144ae4133372ec8c3da15cef6c1303485290f269b23c580696554ca0383dba3e1f9609f65c332981988
+DIST zlib-ng-2.1.2.tar.gz 2404176 BLAKE2B 
bc0b65520562827b10216110e2020a3341ee0dd853874c19ddb6f9df776fc74a542c1239f77dc3ec2ccb3f92e75f1de7ef104edfecfe37312149b1bc29ae7403
 SHA512 
2b3073df4eb13d8318f8fa2b7674e4729642488f65dad49d3080ccd830f29e9e3f32a673b42634443ddf9e9ef85cfff4f2f3e182506f950b9ee0a208a92c0465

diff --git a/sys-libs/zlib-ng/files/zlib-ng-2.1.2-cmake.patch 
b/sys-libs/zlib-ng/files/zlib-ng-2.1.2-cmake.patch
new file mode 100644
index ..8deb07a60515
--- /dev/null
+++ b/sys-libs/zlib-ng/files/zlib-ng-2.1.2-cmake.patch
@@ -0,0 +1,35 @@
+https://github.com/zlib-ng/zlib-ng/issues/1515
+https://github.com/zlib-ng/zlib-ng/pull/1519
+https://github.com/zlib-ng/zlib-ng/commit/39136c20716a94188c1d041b9656315371d35a47
+
+From 39136c20716a94188c1d041b9656315371d35a47 Mon Sep 17 00:00:00 2001
+From: "Mika T. Lindqvist" 
+Date: Sun, 11 Jun 2023 18:38:12 +0300
+Subject: [PATCH] Try to find system copy of googletest before trying to
+ download it. * Don't use system copy if memory sanitizer is enabled
+
+--- a/test/CMakeLists.txt
 b/test/CMakeLists.txt
+@@ -111,8 +111,6 @@ if(WITH_BENCHMARKS)
+ endif()
+ 
+ if(WITH_GTEST)
+-include(FetchContent)
+-
+ # Google test requires at least C++11
+ set(CMAKE_CXX_STANDARD 11)
+ 
+@@ -125,9 +123,13 @@ if(WITH_GTEST)
+ # Must set include and compile options before fetching googletest
+ include_directories($ENV{LLVM_BUILD_DIR}/include 
$ENV{LLVM_BUILD_DIR}/include/c++/v1)
+ add_compile_options(-stdlib=libc++ -g)
++elseif(NOT TARGET GTest::GTest)
++find_package(GTest)
+ endif()
+ 
+ if(NOT TARGET GTest::GTest)
++include(FetchContent)
++
+ # Prevent overriding the parent project's compiler/linker settings 
for Windows
+ set(gtest_force_shared_crt ON CACHE BOOL
+ "Use shared (DLL) run-time lib even when Google Test is built as 
static lib." FORCE)

diff --git a/sys-libs/zlib-ng/zlib-ng-2.1.2.ebuild 
b/sys-libs/zlib-ng/zlib-ng-2.1.2.ebuild
new file mode 100644
index ..f32b71569755
--- /dev/null
+++ b/sys-libs/zlib-ng/zlib-ng-2.1.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Worth keeping an eye on 'develop' branch upstream for possible backports,
+# as they copied this practice from sys-libs/zlib upstream.
+
+inherit cmake
+
+DESCRIPTION="Fork of the zlib data compression library"
+HOMEPAGE="https://github.com/zlib-ng/zlib-ng;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+CPU_USE=(
+   x86_{avx2,avx512f,sse2,ssse3,sse4_2,pclmul}
+   arm_{crc32,neon}
+   ppc_{altivec,vsx2,vsx3}
+)
+IUSE="compat ${CPU_USE[@]/#/cpu_flags_} test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="compat? ( !sys-libs/zlib )"
+
+PATCHES=(
+   "${FILESDIR}"/zlib-ng-2.1.2-cmake.patch
+)
+
+src_configure() {
+   local mycmakeargs=(
+   -DZLIB_COMPAT=$(usex compat)
+   -DZLIB_ENABLE_TESTS=$(usex test)
+
+   # Unaligned access is controversial and undefined behaviour
+   # Let's keep it off for now
+   # https://github.com/gentoo/gentoo/pull/17167
+   -DWITH_UNALIGNED=OFF
+   )
+
+   # The intrinsics options are all defined conditionally, so we need
+   # to enable them on/off per-arch here for now.
+   if use amd64 || use x86 ; then
+   mycmakeargs+=(
+   -DWITH_AVX2=$(usex cpu_flags_x86_avx2)
+   -DWITH_AVX512=$(usex cpu_flags_x86_avx512f)
+   -DWITH_AVX512VNNI=OFF # TODO, see bug #908556
+   -DWITH_SSE2=$(usex cpu_flags_x86_sse2)
+   

[gentoo-commits] repo/gentoo:master commit in: sys-process/procs/

2023-06-15 Thread Sam James
commit: 8da3175374fcae0eae525689ab64e4554ed44572
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 16 00:18:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 16 00:18:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8da31753

sys-process/procs: install completions

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

 .../{procs-0.14.0.ebuild => procs-0.14.0-r1.ebuild} | 17 -
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/sys-process/procs/procs-0.14.0.ebuild 
b/sys-process/procs/procs-0.14.0-r1.ebuild
similarity index 91%
rename from sys-process/procs/procs-0.14.0.ebuild
rename to sys-process/procs/procs-0.14.0-r1.ebuild
index ca275a7bff1c..32619a312107 100644
--- a/sys-process/procs/procs-0.14.0.ebuild
+++ b/sys-process/procs/procs-0.14.0-r1.ebuild
@@ -236,7 +236,7 @@ CRATES="
xattr-0.2.3
 "
 
-inherit cargo
+inherit bash-completion-r1 cargo
 
 DESCRIPTION="A modern replacement for ps"
 HOMEPAGE="https://github.com/dalance/procs;
@@ -252,3 +252,18 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 QA_FLAGS_IGNORED="usr/bin/procs"
+
+src_install() {
+   cargo_src_install
+
+   target/$(usex debug debug release)/procs --gen-completion bash || die
+   newbashcomp procs.bash procs
+
+   target/$(usex debug debug release)/procs --gen-completion zsh || die
+   insinto /usr/share/zsh/site-functions
+   doins _procs
+
+   target/$(usex debug debug release)/procs --gen-completion fish || die
+   insinto /usr/share/fish/vendor_completions.d
+   doins procs.fish
+}



[gentoo-commits] repo/gentoo:master commit in: sys-process/procs/

2023-06-15 Thread Sam James
commit: 062a595b43a0ba1045b95a15a7de6f982d674b49
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 16 00:03:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 16 00:03:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=062a595b

sys-process/procs: new package, add 0.14.0

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

 sys-process/procs/Manifest| 229 ++
 sys-process/procs/metadata.xml|  25 
 sys-process/procs/procs-0.14.0.ebuild | 254 ++
 3 files changed, 508 insertions(+)

diff --git a/sys-process/procs/Manifest b/sys-process/procs/Manifest
new file mode 100644
index ..d505c20deb30
--- /dev/null
+++ b/sys-process/procs/Manifest
@@ -0,0 +1,229 @@
+DIST adler-1.0.2.crate 12778 BLAKE2B 
a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd
 SHA512 
7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
+DIST aho-corasick-0.7.20.crate 111440 BLAKE2B 
3f5d54fea2793ce1c2c4d5b3049b910f45a5721e7538cb2557df63dc3069ab3f6b66aceb5e9a48f21c43ae29778fd045428ea103b2a6de81659e605e30e64ca6
 SHA512 
ad31f3d1b3fe41e593d4ca7e721bbad62936f2e6a17fd1e0997353edb6fc906d1bef2b79f0ac7c7676abe637bbabb23ff22059947be379a2441011f8178983c5
+DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 
86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e
 SHA512 
b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
+DIST anyhow-1.0.69.crate 43576 BLAKE2B 
deb44b3110aee1314dd599b730df8c2f03b7d13c0d945d4ef00a0e30ca74257269e43107be19868adfea331a8c730e0aec2dff3abea704e56bc6a35b9581fe14
 SHA512 
d65e5c9404a70b1e0af90dd66af157f8c31ad0858f703765d5fc6c828f1fc8db690b17451c4108e3a52a7da2d6c2366e745d7b4bd7d19e6dba3485f7c3a43071
+DIST async-channel-1.7.1.crate 12855 BLAKE2B 
f7762c5d3fa880da7e31f176fc28d9997fcb734c8cb850f8f369315af317c6c0a0b8b834b23474b8320cacfa5fda7464f60cf28f284b68b45d9abb728201bd89
 SHA512 
26c2fcc2b0f0bd1fb58826f7a0ef1bdd3069c02c00b7e59c2c7001f39d347df8c9882eee8682629ff8d94e88973186b20fcf2ee6885332024d181d3525866cd9
+DIST async-executor-1.4.1.crate 15490 BLAKE2B 
2d85825f9deec4a89eae4be6c2899d22bd96f095413598abe2a58ca07e6b8745ee02a6e1db6a3be034159c7844e55009d6da9845116647c0b021dca115acf6be
 SHA512 
24f8403f7cf7639a9477c0a4ee6fba8ebf73fc64b5c896ff07b5b9ea787ca65fa2e642e46a0ba3796e76774d46373e6ea6a20309feaf1f801281aea20cf82578
+DIST async-global-executor-2.3.0.crate 11784 BLAKE2B 
08481034b204a9b1016043ba240aae1f2c1a0228a4d268ba4fc5f68b71fdf92badc91830a97b1033fe632a72c79f7456a4fea02d33cd605379be68e13693f91c
 SHA512 
4b5436c058c73e116dbde346b72658f53541cbda2f89b81ffce90f7132234ef71bd2067b39aa157236255191e460258c7acaa609196395a2c7c99ee73a0f38b9
+DIST async-io-1.9.0.crate 36394 BLAKE2B 
521496ae3e9dd4cc8e2da47fe3bf51b440d3aab49d371abe23aecb972d89aad7c9139ef68538752ea3a62679f540ead647c43f52c0815fb545be3a24988dddcf
 SHA512 
57eaa62b5cff44efcec1160097f6f47b0235b861560dbf1d19f965e2a3a083870dd96aa3a34b9a48cab60cc2ecd64ac09b20fc3ae8042386ade26b9422a17da9
+DIST async-lock-2.5.0.crate 15656 BLAKE2B 
ba9bdebf220cb53638d8d000b5eb49ff9871c2cc35fa9117280b6ce4aee8c0c296975f315487b5f1fbdf42057e12cc90a72e9f5acd7aa90d3bc3bac580e0be17
 SHA512 
4b0a834b9f1b841421cf9af0d0f6826a7fcf91b5be208e3f3b923839475d866d9113b37011a9abe0daa5762f5b684b37db062360baf094810a219103fffbe62c
+DIST async-std-1.12.0.crate 215080 BLAKE2B 
1d9c56e03971f742b6e78a7a8ae097a6b1b622f64ebe378fa54511187e7c9c7ed5840ed6282633ac6636d3130d0ed4cc7985eb1a5c32718f07b57bc7172f3eaa
 SHA512 
aaeef7f474fc700bba7beb6725d4eb778a9a05ebccfecdd81789b5d039c49508860d953f231c7b8fbce4c5b237d063a43eb03b83410490fc14eca572884f57e2
+DIST async-task-4.3.0.crate 29544 BLAKE2B 
ed27a637b0c7196f9dbc13b597cd97afbf4bdcd78d5f46e20862a39f41ea3b2dd9335795dbb8fc22e2c4ba75e4678156fb062f91211e1caf2475546ca99ba327
 SHA512 
55f4fa697d1e00946e3e518e35117552e66a28a4c52e72f66af4c1b9a31e932d1fd32f31a4097fea707789575a9aec0db2ce9eb51643909480a41c52d3558d22
+DIST atomic-waker-1.0.0.crate 11771 BLAKE2B 
4e94bf07e1df3b605bd0f8e8f8750323a5fa7a4d9c703b2183323aea8293021ac3028c6b03482941330c598db78aca0af4df06d346dbf581f617c2c333a997cd
 SHA512 
cbc3e12c10f20e1b6d9a03097159a098c5e3a50a941b742891bd39bf0f7310986bda3e1e4c2ea0dfc82a70d9d57342889c46c11fe0d328372a6b3abecf7fa9a6
+DIST atty-0.2.14.crate 5470 BLAKE2B 
2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab
 SHA512 
d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
+DIST autocfg-1.1.0.crate 13272 BLAKE2B 

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

2023-06-15 Thread Sam James
commit: 19b82f87d352cd13932ec5b4892e65baecb4abca
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 15 23:47:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 23:47:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19b82f87

net-libs/glib-networking: fix tests w/ >-libproxy-0.5.0

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

 .../glib-networking-2.76.0-libproxy-0.5.patch  | 65 ++
 .../glib-networking/glib-networking-2.76.0.ebuild  |  4 ++
 2 files changed, 69 insertions(+)

diff --git 
a/net-libs/glib-networking/files/glib-networking-2.76.0-libproxy-0.5.patch 
b/net-libs/glib-networking/files/glib-networking-2.76.0-libproxy-0.5.patch
new file mode 100644
index ..e59fe9a07416
--- /dev/null
+++ b/net-libs/glib-networking/files/glib-networking-2.76.0-libproxy-0.5.patch
@@ -0,0 +1,65 @@
+https://bugs.gentoo.org/907303
+https://gitlab.gnome.org/GNOME/glib-networking/-/commit/a7db10e8862050f19af5c2eebcd1d590a04d5ced
+
+From a7db10e8862050f19af5c2eebcd1d590a04d5ced Mon Sep 17 00:00:00 2001
+From: Jan-Michael Brummer 
+Date: Tue, 13 Jun 2023 17:10:11 +0200
+Subject: [PATCH] Fix tests using libproxy 0.5
+
+New libproxy 0.5 now behaves just like glib, additional checks aren't
+needed.
+
+Fixes: https://gitlab.gnome.org/GNOME/glib-networking/-/issues/212
+--- a/proxy/tests/common.c
 b/proxy/tests/common.c
+@@ -172,13 +172,15 @@ static void
+ test_proxy_ignore_common (void)
+ {
+   GProxyResolver *resolver;
+-  gboolean is_libproxy;
+   GError *error = NULL;
+   char **proxies;
+   int i;
+ 
++#ifndef LIBPROXY_0_5
++  gboolean is_libproxy = g_strcmp0 (g_getenv ("GIO_PROXY_TEST_NAME"), 
"libproxy") == 0;
++#endif
++
+   resolver = g_proxy_resolver_get_default ();
+-  is_libproxy = g_strcmp0 (g_getenv ("GIO_PROXY_TEST_NAME"), "libproxy") == 0;
+ 
+   for (i = 0; i < n_ignore_tests; i++)
+ {
+@@ -186,9 +188,11 @@ test_proxy_ignore_common (void)
+  NULL, );
+   g_assert_no_error (error);
+ 
++#ifndef LIBPROXY_0_5
+   if (is_libproxy && ignore_tests[i].libproxy_fails)
+ g_assert_cmpstr (proxies[0], ==, "http://localhost:8080;);
+   else
++#endif
+ g_assert_cmpstr (proxies[0], ==, ignore_tests[i].proxy);
+ 
+   g_strfreev (proxies);
+--- a/proxy/tests/meson.build
 b/proxy/tests/meson.build
+@@ -18,9 +18,16 @@ foreach program: proxy_test_programs
+ )
+   endif
+ 
++  c_flags = []
++
++  if libproxy_dep.version() >= '0.5.0'
++c_flags += '-DLIBPROXY_0_5'
++  endif
++
+   exe = executable(
+ test_name,
+ program[0] + '.c',
++c_args : c_flags,
+ include_directories: top_inc,
+ dependencies: program[2],
+ install: enable_installed_tests,
+-- 
+GitLab

diff --git a/net-libs/glib-networking/glib-networking-2.76.0.ebuild 
b/net-libs/glib-networking/glib-networking-2.76.0.ebuild
index 63096b664380..349108fee1a8 100644
--- a/net-libs/glib-networking/glib-networking-2.76.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.76.0.ebuild
@@ -30,6 +30,10 @@ BDEPEND="
test? ( sys-apps/dbus )
 "
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.76.0-libproxy-0.5.patch
+)
+
 src_prepare() {
default
xdg_environment_reset



[gentoo-commits] repo/gentoo:master commit in: sys-firmware/intel-microcode/

2023-06-15 Thread Sam James
commit: 6c9f7fbbca0f76a1459ceb28d3b6fe1c55dde7c4
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 15 23:41:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 23:41:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c9f7fbb

sys-firmware/intel-microcode: add 20230613_p20230520

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

 sys-firmware/intel-microcode/Manifest  |   2 +
 .../intel-microcode-20230613_p20230520.ebuild  | 287 +
 2 files changed, 289 insertions(+)

diff --git a/sys-firmware/intel-microcode/Manifest 
b/sys-firmware/intel-microcode/Manifest
index e4f6bc2bfd0b..b20ca738140c 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -1,7 +1,9 @@
 DIST intel-microcode-collection-20221102.tar.xz 11125112 BLAKE2B 
6054a3278b694ee4b1d1a92ad586ce37cbbfbead1fc7100541f7b71fb0b9e0eb9fd9560a459f8ba861eb95595a89b79e8dbb8ef2e70ef6513245e206fecd3667
 SHA512 
76426f6f491a17302bc312cfd1d58849d42ffa8d454c05ab086f493de20cd24d328a7b05689493e1fa70c025097c61fd09fd765bc02485ba6efe81d0fac014cd
 DIST intel-microcode-collection-20230212.tar.xz 13213352 BLAKE2B 
b2548908632cc65e997186e7af60a35ba4a44edb88263f5018c1cc9619299816c6184352653076413b95fb914f799b765e4fa6a5c46513d1425bde353e4dcde2
 SHA512 
27f2aacbf409acb005f83f0f486b59128ebac4c8d6b1b329cff7e33b237a8d47e579c6afb064d7a9ff634ad652ae0c2b9bc9302e6269007e12bd4aa391075430
 DIST intel-microcode-collection-20230512.tar.xz 12924124 BLAKE2B 
3593d9dd9d46281471e1ef335bb8e3fccee99cf484256b9f3b1f2fd0af1d1266c0237bf7cf97314e229f0e3ae622de68bdbe2cf3d9ed4b74ca9189f2aa7bf226
 SHA512 
9d65406898a8e82e66ab9ff684166eaf61a2b42c765d6f55603985176cdf7600b1f95626da0f1fc25d781212ce2c80ac108d0174371390e0e2c2ab7dd48c7b0d
+DIST intel-microcode-collection-20230520.tar.xz 12720520 BLAKE2B 
804579eb05c5b8835565dec3560d059f909d13da853d37c79ddbaa049b94f96e811a2240ab043dfdbf59074e683383f5c17e76ceb0e7f6cccffdaad330bf7de1
 SHA512 
6302866edf5a5209f8dfc80817fe306fc11376ac7d70450f32e38483902c428365fb553c57e989a6ca6e1cf07573352c9b500764250a815c4aff6b9f6b6d47fb
 DIST intel-ucode-sig_0x406e3-rev_0xd6.bin 101376 BLAKE2B 
66d55867954d69dda1425febd93bb8c89f7aa836d504f8b5fee127f8505bcf2246f4fcc55cc245bc5e532528d60cca2eee278de7ab5174dc2862db7982a2b36f
 SHA512 
248066b521bf512b5d8e4a8c7e921464ce52169c954d6e4ca580d8c172cd789519e22b4cf56c212e452b4191741f0202019f7061d322c9433b5af9ce5413b567
 DIST microcode-20221108.tar.gz 6436305 BLAKE2B 
e149e001656f45e8da9a83817a6f83fc6663edbfc8a98b27ab4f9d326f021aea03f1ea3628d35978ad5534e017f2d394d1d00d0c992aee54a539a582abf2
 SHA512 
d86bee1269d31d3028f0d2b7d4886795b96d8f1f9d5dbd5149c2dd4cec3b0319fd869f8138f283e2135ecb0bb6387cfd3c2ef1f597b4194a250ac4f2df7f15a4
 DIST microcode-20230214.tar.gz 12088391 BLAKE2B 
d98d054a8cfd66e3d0549d1e8f4a4745cad342d45f36a82d2f2f51fedc29635125fdad95ee4970069e134facc1ab3092b97837c6f8744ffedf220a5d3d022dd5
 SHA512 
6456cd6719923eeacb1f9d6d7372efd2bcd0de9e04350c722543ff41e45c7715ba52a2d330ad5818fbf44ea9df6b2ac482d6f8bd420b191427881dcfe3bd81e2
 DIST microcode-20230512.tar.gz 12654272 BLAKE2B 
302aedf0b57719d1009be0dea513da7290b41842117951a0081f866024d5380c65850638ee3d2e87c8d9efcac4da58650463b0c31373d661fe74b8a3a380e099
 SHA512 
e21c82846f7f5e2c8d9559931e90389a7d21f8a59fbdec4c5b11fe43f010a21d3e9f27d67be12fe98b3dbdf26558a8ed74dc149bedd93f4b7728795dc6e86d48
+DIST microcode-20230613.tar.gz 12338446 BLAKE2B 
56bffb26687fd3a20b79b4540ae10c98b2875e3edb84583b679ddc75e339193db4bddece25c7e5cb26b79f5e6ce2d10fcc318c55e13c05d8611198e4c571354b
 SHA512 
460e46d20f71df1247affa2ca397b961ce3d77e3456144c6b7358e48c3239e9c077ff4c512b0c4b7d9a86f33fed094db8b3ac65b1a4047bb853212848d929639

diff --git 
a/sys-firmware/intel-microcode/intel-microcode-20230613_p20230520.ebuild 
b/sys-firmware/intel-microcode/intel-microcode-20230613_p20230520.ebuild
new file mode 100644
index ..8f5ab874339b
--- /dev/null
+++ b/sys-firmware/intel-microcode/intel-microcode-20230613_p20230520.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info mount-boot
+
+# Find updates by searching and clicking the first link (hopefully it's the 
one):
+# 
https://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
+#
+#
+# Package Maintenance instructions:
+# 1. The ebuild is in the form of 
intel-microcode-_p.ebuild
+# 2. The INTEL_SNAPSHOT upstream is located at: 
https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files
+# 3. The COLLECTION_SNAPSHOT is created manually using the following steps:
+#   a. Clone the repository https://github.com/platomav/CPUMicrocodes
+#   b. Rename the Intel directory to intel-microcode-collection-
+#   c. From the CPUMicrocodes directory tar and xz compress the contents of 
intel-microcode-collection-:
+#  tar -cJf intel-microcode-collection-.tar.xz 
intel-microcode-collection-/

[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/

2023-06-15 Thread Sam James
commit: f12f57a14e209a41ce0b074c91e6a74ea63c8e70
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 15 23:33:55 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 23:33:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f12f57a1

sys-fs/btrfs-progs: add 6.3.2

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

 sys-fs/btrfs-progs/Manifest   |  1 +
 .../{btrfs-progs-.ebuild => btrfs-progs-6.3.2.ebuild} | 11 +--
 sys-fs/btrfs-progs/btrfs-progs-.ebuild| 11 +--
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index db95b40ce354..63fc0f1ca006 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,3 +1,4 @@
 DIST btrfs-progs-v6.2.1.tar.xz 2415064 BLAKE2B 
8ea7d9815e34c569dd82e53dc1f982c820265521708c7c41dc587646362b300edf938e940b52508e301874269ea5ebb96605f4a1046d096678257463ced53b03
 SHA512 
2a485d8c8b3091af27e91751cabe61306388526de3c1c5154370ddee1bb26ebfe70c3b4cd6686b173d313c98c30168fee18723dadc7b4c00e10c502da169
 DIST btrfs-progs-v6.2.2.tar.xz 2437300 BLAKE2B 
b3d0de668baf771ff08c59d20407525be841b06747b771efc013b0c2d1d24ed03caf472b7c9b03499f60140f6f84e2edbcb690cba503a7eb8037af038de79d52
 SHA512 
967e1c1a6b956a4e11a794aad090d1cf370fd98e4186525ccfbbbc9ae3f2bb66ace1d684730f93c558403b7ac1c991aec3d04d07548b19ee1516352a069431db
 DIST btrfs-progs-v6.3.1.tar.xz 3155540 BLAKE2B 
5f8ec51f11d705bb4ada2e000143933484bae2f3a5dedb5c1abac37950de44fa0fa762cc09012ca6702b96591264027b28c17392303db414a5651657cb086c7c
 SHA512 
a567a02f565a44dd06f54b3fd03187d259235eedf8033457368add217c87b2304e8c80ca5e2a35bdffc14e43b6889361183c6dcd5e2f4ad6fe7bfc5eb4127e65
+DIST btrfs-progs-v6.3.2.tar.xz 3160148 BLAKE2B 
e6815eeb90c1dbf9a6c4a5aa72262c18b2031a9305efc9024b1fe7b770a256e1d4cb3b01646a0a523f0e26af2d499382bf42420385c56593ace515a6c225f54d
 SHA512 
d8580250994b3e399babec4478515686f1e3cc2e4fc01ccbc7b00a51b6131452d209cb7f43dbbac5375286546d182fcdf7884bbc1a8ad6889c3f15d85ba8f8d5

diff --git a/sys-fs/btrfs-progs/btrfs-progs-.ebuild 
b/sys-fs/btrfs-progs/btrfs-progs-6.3.2.ebuild
similarity index 93%
copy from sys-fs/btrfs-progs/btrfs-progs-.ebuild
copy to sys-fs/btrfs-progs/btrfs-progs-6.3.2.ebuild
index c1f11dd5dd51..3c55b2f472d6 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.3.2.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
-
+PYTHON_COMPAT=( python3_{10..11} )
 inherit bash-completion-r1 python-single-r1 udev
 
 libbtrfs_soname=0
@@ -26,7 +25,7 @@ else
 fi
 
 DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org 
https://btrfs.readthedocs.io/en/latest/;
+HOMEPAGE="https://btrfs.readthedocs.io/en/latest/;
 
 LICENSE="GPL-2"
 SLOT="0/${libbtrfs_soname}"
@@ -138,14 +137,14 @@ src_test() {
cd libbtrfsutil/python || die
 
local -x 
LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}"
-   ${EPYTHON} -m unittest tests/test_*.py || die
+   ${EPYTHON} -m unittest tests/test_*.py || die "Tests failed 
with ${EPYTHON}"
fi
 }
 
 src_install() {
local makeargs=(
-   $(usex python install_python '')
-   $(usex static install-static '')
+   $(usev python install_python)
+   $(usev static install-static)
)
 
emake V=1 DESTDIR="${D}" install "${makeargs[@]}"

diff --git a/sys-fs/btrfs-progs/btrfs-progs-.ebuild 
b/sys-fs/btrfs-progs/btrfs-progs-.ebuild
index c1f11dd5dd51..3c55b2f472d6 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
-
+PYTHON_COMPAT=( python3_{10..11} )
 inherit bash-completion-r1 python-single-r1 udev
 
 libbtrfs_soname=0
@@ -26,7 +25,7 @@ else
 fi
 
 DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org 
https://btrfs.readthedocs.io/en/latest/;
+HOMEPAGE="https://btrfs.readthedocs.io/en/latest/;
 
 LICENSE="GPL-2"
 SLOT="0/${libbtrfs_soname}"
@@ -138,14 +137,14 @@ src_test() {
cd libbtrfsutil/python || die
 
local -x 
LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}"
-   ${EPYTHON} -m unittest tests/test_*.py || die
+   ${EPYTHON} -m unittest tests/test_*.py || die "Tests failed 
with ${EPYTHON}"
fi
 }
 
 src_install() {
local makeargs=(
-   $(usex python install_python '')
-   $(usex static install-static '')
+   $(usev python install_python)
+   $(usev static install-static)
)
 
emake V=1 DESTDIR="${D}" install "${makeargs[@]}"



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

2023-06-15 Thread Sam James
commit: 63f3e79ec19d28d79d2c2d36e214b2ecc4a90f73
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 15 23:15:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 23:15:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63f3e79e

sys-apps/goawk: drop 1.23.1

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

 sys-apps/goawk/Manifest|  1 -
 sys-apps/goawk/goawk-1.23.1.ebuild | 28 
 2 files changed, 29 deletions(-)

diff --git a/sys-apps/goawk/Manifest b/sys-apps/goawk/Manifest
index 2a37ef963f8b..f111ee9ba3ff 100644
--- a/sys-apps/goawk/Manifest
+++ b/sys-apps/goawk/Manifest
@@ -1,3 +1,2 @@
-DIST goawk-1.23.1.tar.gz 1678471 BLAKE2B 
f87037cdb5f256d5c3848f7fb0e64d81672abfa03c15d9b778fac14804c252ea140b3b436a09ab2189364b180bd1b638ecd66e767dd72532cc0f051ca2255097
 SHA512 
64f56f5ffa512929aa83d4df0360894ef231fdffe1879a72ed723606db77bf001ee744b646221a6042ef2cd3cb79fc8c80e33cec992b0b8c61da9f41ba78650b
 DIST goawk-1.23.2.tar.gz 1682245 BLAKE2B 
6f7c87717ae3539272688c600705ca9757f38671dd2d73688ff4b3e345d66e2cf7b16f7bc6d0dd97340cf84b8a09bb116207ec5dfb361ff5721ffe99c048c118
 SHA512 
b448b99cb880b23de72fc77948217291b9da6733ad8538d7978e3dbd83e233ac6c558a39bc7d995002bb6b67c6b6ed5ac3a4131b90f43443bdd7c639b793f5ee
 DIST goawk-1.23.3.tar.gz 1682899 BLAKE2B 
e0ca6001b5adc78186549cbf11bc016294a996e8a1337227a1915e30b5f04786cf443c19c8daaae5e4e0604945783bc89a4a173f1f878685f7330f4f3933690e
 SHA512 
06955b9cf53ac7a4a414ea18b4886fa71f1ec3ca1338a6648f9650f28ba5f52d672eddb7b5f8462fb404966b716f9a1ac8b6e075ab74883e6d1ad1a16314f4f8

diff --git a/sys-apps/goawk/goawk-1.23.1.ebuild 
b/sys-apps/goawk/goawk-1.23.1.ebuild
deleted file mode 100644
index e138a7adbd3d..
--- a/sys-apps/goawk/goawk-1.23.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="POSIX-compliant AWK interpreter written in Go, with CSV support"
-HOMEPAGE="https://github.com/benhoyt/goawk;
-SRC_URI="https://github.com/benhoyt/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-src_compile() {
-   ego build
-}
-
-src_test() {
-   ego test
-}
-
-src_install() {
-   einstalldocs
-
-   dobin goawk
-}



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

2023-06-15 Thread Sam James
commit: d7c9016f4914aff3b07f239e76bd74cc603288dc
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 15 23:14:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 23:14:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7c9016f

sys-apps/goawk: add 1.23.3

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

 sys-apps/goawk/Manifest|  1 +
 sys-apps/goawk/goawk-1.23.3.ebuild | 28 
 2 files changed, 29 insertions(+)

diff --git a/sys-apps/goawk/Manifest b/sys-apps/goawk/Manifest
index 3738f8c276aa..2a37ef963f8b 100644
--- a/sys-apps/goawk/Manifest
+++ b/sys-apps/goawk/Manifest
@@ -1,2 +1,3 @@
 DIST goawk-1.23.1.tar.gz 1678471 BLAKE2B 
f87037cdb5f256d5c3848f7fb0e64d81672abfa03c15d9b778fac14804c252ea140b3b436a09ab2189364b180bd1b638ecd66e767dd72532cc0f051ca2255097
 SHA512 
64f56f5ffa512929aa83d4df0360894ef231fdffe1879a72ed723606db77bf001ee744b646221a6042ef2cd3cb79fc8c80e33cec992b0b8c61da9f41ba78650b
 DIST goawk-1.23.2.tar.gz 1682245 BLAKE2B 
6f7c87717ae3539272688c600705ca9757f38671dd2d73688ff4b3e345d66e2cf7b16f7bc6d0dd97340cf84b8a09bb116207ec5dfb361ff5721ffe99c048c118
 SHA512 
b448b99cb880b23de72fc77948217291b9da6733ad8538d7978e3dbd83e233ac6c558a39bc7d995002bb6b67c6b6ed5ac3a4131b90f43443bdd7c639b793f5ee
+DIST goawk-1.23.3.tar.gz 1682899 BLAKE2B 
e0ca6001b5adc78186549cbf11bc016294a996e8a1337227a1915e30b5f04786cf443c19c8daaae5e4e0604945783bc89a4a173f1f878685f7330f4f3933690e
 SHA512 
06955b9cf53ac7a4a414ea18b4886fa71f1ec3ca1338a6648f9650f28ba5f52d672eddb7b5f8462fb404966b716f9a1ac8b6e075ab74883e6d1ad1a16314f4f8

diff --git a/sys-apps/goawk/goawk-1.23.3.ebuild 
b/sys-apps/goawk/goawk-1.23.3.ebuild
new file mode 100644
index ..e138a7adbd3d
--- /dev/null
+++ b/sys-apps/goawk/goawk-1.23.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="POSIX-compliant AWK interpreter written in Go, with CSV support"
+HOMEPAGE="https://github.com/benhoyt/goawk;
+SRC_URI="https://github.com/benhoyt/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+src_compile() {
+   ego build
+}
+
+src_test() {
+   ego test
+}
+
+src_install() {
+   einstalldocs
+
+   dobin goawk
+}



[gentoo-commits] repo/gentoo:master commit in: eclass/

2023-06-15 Thread Sam James
commit: b26f3f99faabc3574cd3510bc1f57b90bdf585e9
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 15 23:05:45 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 23:05:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b26f3f99

toolchain.eclass: support --enable-host-pie for GCC 14

See also 
https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=f9de5c24b9a6172d48786289035eed8f947c04c1.

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

 eclass/toolchain.eclass | 4 
 1 file changed, 4 insertions(+)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 952ad85fcde0..3578ac7f44ec 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1284,6 +1284,10 @@ toolchain_src_configure() {
 
if in_iuse pie ; then
confgcc+=( $(use_enable pie default-pie) )
+
+   if tc_version_is_at_least 14.0.0_pre20230612 ${PV} ; then
+   confgcc+=( --enable-host-pie )
+   fi
fi
 
if in_iuse ssp ; then



[gentoo-commits] proj/gcc-patches:master commit in: 14.0.0/gentoo/

2023-06-15 Thread Sam James
commit: f9de5c24b9a6172d48786289035eed8f947c04c1
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 15 23:03:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 23:03:27 2023 +
URL:https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=f9de5c24

14.0.0: drop 09_all_nopie-all-flags.patch

Conflicts with 
https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b6cb10af12cf869c1ae348c0e5cb2d364ef0abce
 upstream
and upon review, I don't think we need this anymore at all.

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

 14.0.0/gentoo/09_all_nopie-all-flags.patch | 18 --
 14.0.0/gentoo/README.history   |  3 +++
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/14.0.0/gentoo/09_all_nopie-all-flags.patch 
b/14.0.0/gentoo/09_all_nopie-all-flags.patch
deleted file mode 100644
index fe1cd80..000
--- a/14.0.0/gentoo/09_all_nopie-all-flags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-We need to pass NO_PIE_CFLAGS to ALL_* so gcc don't fail when
-we compile it with older gcc and pie.
-
 a/gcc/Makefile.in
-+++ b/gcc/Makefile.in
-@@ -1054,10 +1054,10 @@ ALL_CXXFLAGS = $(T_CFLAGS) $(CFLAGS-$@)
- ALL_CPPFLAGS = $(INCLUDES) $(CPPFLAGS)
- 
- # This is the variable to use when using $(COMPILER).
--ALL_COMPILERFLAGS = $(ALL_CXXFLAGS)
-+ALL_COMPILERFLAGS = $(NO_PIE_CFLAGS) $(ALL_CXXFLAGS)
- 
- # This is the variable to use when using $(LINKER).
--ALL_LINKERFLAGS = $(ALL_CXXFLAGS)
-+ALL_LINKERFLAGS = $(NO_PIE_CFLAGS) $(ALL_CXXFLAGS)
- 
- # Build and host support libraries.
- 

diff --git a/14.0.0/gentoo/README.history b/14.0.0/gentoo/README.history
index 6204a28..54617a7 100644
--- a/14.0.0/gentoo/README.history
+++ b/14.0.0/gentoo/README.history
@@ -1,3 +1,6 @@
+2  ??
+- 09_all_nopie-all-flags.patch
+
 1  23 April 2023
 
+ 01_all_default-fortify-source.patch



[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc/

2023-06-15 Thread Sam James
commit: b2902359b4b354974e704bee85984cde53282b76
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 15 23:01:49 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 23:01:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2902359

sys-devel/gcc: add 11.4.1_p20230615

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

 sys-devel/gcc/Manifest|  1 +
 sys-devel/gcc/gcc-11.4.1_p20230615.ebuild | 64 +++
 2 files changed, 65 insertions(+)

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 55867d71e06f..3227f9be12fb 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -6,6 +6,7 @@ DIST gcc-10.5.0-musl-patches-2.tar.xz 3452 BLAKE2B 
5387e516d07d81477b3f39b8b3bd9
 DIST gcc-10.5.0-patches-6.tar.xz 18208 BLAKE2B 
4cac3340108fb378c76ad62b728429f3c97f348d178744e7536575f3576ca8aa682b878b7df3b1c162dccae64a3cb56c66d8d60eae323e1ece2de4278084fdbd
 SHA512 
9d6c84325fbc118cee01347468ce729c278e5b026b16da945fe54050726e26f86a46ee7b71a01a47cf927b70bfcce459c49a6bc4fb93dcfaa047c76d4c5bc5bc
 DIST gcc-11-20230427.tar.xz 76165128 BLAKE2B 
dd896b418c1fce35a61005d5b5c90cfd1246d37d23c2a8fc08bacd7d7ca84c353f3ccf5de2370ae5e5ca95c7ae3deab3565b3f65eb78b611dbe5ad4a256516f0
 SHA512 
fada917a832be5d2e15ee32f24e19fc87b851dc8e6fc75d1be6d25d3510dba408ae3ef3b245ff239c51aa3d243c95f12269695611e5c8965ba55f5aa4730778d
 DIST gcc-11-20230608.tar.xz 76200104 BLAKE2B 
d500e7ea0b31b8afb1ab8fb0a9681554cc49a05e82b91f27e1e23ab81a356ca7daa301c4e0fa5d58551a399da8d536e4cf2510f6a4aa769aa4a97997092a1c3a
 SHA512 
c53d720952faad5c70c6376b62cd729dc51e900719f097a3f2d6216eac8d87fc334be7de525a62a582e308e0523fc07cf6c03e4f617b1bbc6702ef857f58eeda
+DIST gcc-11-20230615.tar.xz 76188804 BLAKE2B 
84860fc2404c1bfe1e17e9a8ef8e98172af998cb21b80f7715b36669dcd2d5bea0095b685bb25dfc37914dbe85d5ca02300354aa8e56ae2546c8f5f5f34af938
 SHA512 
f99365d092e8c38fe9b6e45afe21170a9808589ee3fa16ebbe43e02ea2657cbda6b734a6f27b892dfc2be4b4ada9802d18f2422193cc14e3688b779747d611d9
 DIST gcc-11.4.0-musl-patches-2.tar.xz 4308 BLAKE2B 
a2335e155fc57816fed822a648e0eaefafcba9d04e1ad0fd7baeea5a694ab6f5e3c1678cb406f2a1bd17bab25cb01699d032713a1ccf337948dfda2093844607
 SHA512 
17b84f907cb1bd763873655e6f35fd3ed55a40b602b70a626f04f83b4cc89c6261db1661de78d4d969187a8c56e9f6305b742515a3836b962248a21df0df5d0c
 DIST gcc-11.4.0-patches-10.tar.xz 13852 BLAKE2B 
54937d13e30e2a5303c7e197fae09eeed35ca0b9783625e02578fcee829b5503fb22d664366322b304df7d01ae807d00af7c93db3e3ceebe4851e15647724f87
 SHA512 
31b4d7a2e7cc589e92e12c3583d13d41c523cafbd309bc0532df9b68ea2473c89daef4c0edd3ce2917b5823d81a7792f145b9449f16277d0d64c22ceff50bbb9
 DIST gcc-11.4.0-patches-9.tar.xz 14704 BLAKE2B 
9aa2ecbac493d3040694e9930738e57d59a764b90ab92b91709c319b883f28ad108767e5d11e8b62af40bf1e583d5ff83a03e8c895f904bc6f41315ce9ab4f0a
 SHA512 
ac8b7c6c382ffacc4e9d08299440fc237fa366ec36fb8eb7a8d426b64a4186384a262e6380dc83ed7f7240125ce26a8435c8a4e0e13976ef2652067a7129bd17

diff --git a/sys-devel/gcc/gcc-11.4.1_p20230615.ebuild 
b/sys-devel/gcc/gcc-11.4.1_p20230615.ebuild
new file mode 100644
index ..02c58f02f0a6
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.4.1_p20230615.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="11.4.0"
+PATCH_VER="10"
+MUSL_VER="2"
+MUSL_GCC_VER="11.4.0"
+
+if [[ ${PV} == *. ]] ; then
+   MY_PV_2=$(ver_cut 2)
+   MY_PV_3=1
+   if [[ ${MY_PV_2} == 0 ]] ; then
+   MY_PV_2=0
+   MY_PV_3=0
+   else
+   MY_PV_2=$((${MY_PV_2} - 1))
+   fi
+
+   # e.g. 12.2. -> 12.1.1
+   TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+   # Cheesy hack for RCs
+   MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 
1)))-RC-$(ver_cut 5)
+   MY_P=${PN}-${MY_PV}
+   GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+   TOOLCHAIN_SET_S=no
+   S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+   # Needs to be after inherit (for now?), bug #830908
+   EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+   # Don't keyword live ebuilds
+   #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   :;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+   # Technically only if USE=hardened *too* right now, but no point in 
complicating it further.
+   # If GCC is enabling CET by default, we need glibc to be built with 
support for it.
+   # bug #830454
+   RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+   DEPEND="${RDEPEND}"
+   BDEPEND=">=${CATEG

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/net-snmp/

2023-06-15 Thread Sam James
commit: 11cf0b7c0639c01860db7587d408f30e23dc0d22
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 15 22:57:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 22:57:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11cf0b7c

net-analyzer/net-snmp: fix automagic libpcre dep

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

 net-analyzer/net-snmp/metadata.xml|  1 +
 .../{net-snmp-5.9.3-r2.ebuild => net-snmp-5.9.3-r3.ebuild}|  4 +++-
 net-analyzer/net-snmp/net-snmp-.ebuild| 11 +--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/net-snmp/metadata.xml 
b/net-analyzer/net-snmp/metadata.xml
index 0cc021693ba5..86b7e8fce4f5 100644
--- a/net-analyzer/net-snmp/metadata.xml
+++ b/net-analyzer/net-snmp/metadata.xml
@@ -12,6 +12,7 @@
Use dev-libs/libnl to fetch TCP 
statistics instead of using /proc/net/tcp (Linux only).
Install snmppcap which reads from PCAP files 
and writes to the SNMP transport
Use libpci (from sys-apps/pciutils) 
to look up network interface description. This feature is only available on 
Linux.
+   Add support for Perl Compatible Regular 
Expressions in process table filtering.
Enable monitoring of app-arch/rpm. 
This flag requires the bzip2 and zlib flags to be enabled as well.
Enable support for the legacy smux protocol 
(superseded by agentx)
Build UCD compatibility library. 
Increases significantly the install size.

diff --git a/net-analyzer/net-snmp/net-snmp-5.9.3-r2.ebuild 
b/net-analyzer/net-snmp/net-snmp-5.9.3-r3.ebuild
similarity index 97%
rename from net-analyzer/net-snmp/net-snmp-5.9.3-r2.ebuild
rename to net-analyzer/net-snmp/net-snmp-5.9.3-r3.ebuild
index 445393a852b7..e722811f3ceb 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9.3-r2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9.3-r3.ebuild
@@ -30,7 +30,7 @@ LICENSE="HPND BSD GPL-2"
 SLOT="0/40"
 IUSE="
X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql
-   netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat 
valgrind zlib
+   netlink pcap pci pcre perl python rpm selinux smux ssl tcpd ucd-compat 
valgrind zlib
 "
 REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
@@ -47,6 +47,7 @@ COMMON_DEPEND="
netlink? ( dev-libs/libnl:3 )
pcap? ( net-libs/libpcap )
pci? ( sys-apps/pciutils )
+   pcre? ( dev-libs/libpcre )
perl? ( dev-lang/perl:= )
python? (
$(python_gen_cond_dep '
@@ -147,6 +148,7 @@ src_configure() {
$(use_with netlink nl) \
$(use_with pcap) \
$(use_with pci) \
+   $(use_with pcre) \
$(use_with perl perl-modules INSTALLDIRS=vendor) \
$(use_with python python-modules) \
$(use_with rpm) \

diff --git a/net-analyzer/net-snmp/net-snmp-.ebuild 
b/net-analyzer/net-snmp/net-snmp-.ebuild
index 8d46910e24ac..c7a25ac6302a 100644
--- a/net-analyzer/net-snmp/net-snmp-.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-.ebuild
@@ -30,7 +30,7 @@ LICENSE="HPND BSD GPL-2"
 SLOT="0/40"
 IUSE="
X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql
-   netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
+   netlink pcap pci pcre perl python rpm selinux smux ssl tcpd ucd-compat 
valgrind zlib
 "
 REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
@@ -47,6 +47,7 @@ COMMON_DEPEND="
netlink? ( dev-libs/libnl:3 )
pcap? ( net-libs/libpcap )
pci? ( sys-apps/pciutils )
+   pcre? ( dev-libs/libpcre )
perl? ( dev-lang/perl:= )
python? (
$(python_gen_cond_dep '
@@ -65,7 +66,10 @@ COMMON_DEPEND="
zlib? ( >=sys-libs/zlib-1.1.4 )
 "
 BDEPEND="doc? ( app-doc/doxygen )"
-DEPEND="${COMMON_DEPEND}"
+DEPEND="
+   ${COMMON_DEPEND}
+   valgrind? ( dev-util/valgrind )
+"
 RDEPEND="
${COMMON_DEPEND}
perl? (
@@ -129,6 +133,8 @@ src_configure() {
# Assume /etc/mtab is not present with a recent baselayout/openrc (bug 
#565136)
use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
 
+   export ac_cv_header_valgrind_{valgrind,memcheck}_h=$(usex valgrind)
+
econf \
$(use_enable !ssl internal-md5) \
$(use_enable ipv6) \
@@ -142,6 +148,7 @@ src_configure() {
$(use_with netlink nl) \
$(use_with pcap) \
$(use_with pci) \
+   $(use_with pcre) \
$(use_with perl perl-modules INSTALLDIRS=vendor) \
$(use_with python python-modules) \
$(use_with rpm) \



[gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/

2023-06-15 Thread Sam James
commit: 0b0aaf271bcba0c6bf19bc9d56986d72d45979ff
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 15 22:06:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 22:06:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b0aaf27

net-firewall/firewalld: add 1.3.3

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

 net-firewall/firewalld/Manifest   |   1 +
 net-firewall/firewalld/firewalld-1.3.3.ebuild | 223 ++
 2 files changed, 224 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 5243b7f7c53f..304796dd0b2e 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1 +1,2 @@
 DIST firewalld-1.3.2.tar.bz2 1225416 BLAKE2B 
108302dab4a1a156bc12df4ec82a2f6fc7ad3e17ca56f68ac9cbd4f85db4cd06abc1a39275ec6d11fc41e820d9fc01f3cd59a73f44332cd3b9662d50d2eeb22a
 SHA512 
06658d279c5ec8eadfb14f9f7053882fc2872a4e27055e9c3aac81cf93167773d592fc29bd749cb6447116419c663fac79d6df725422394409b9a2e1c4708695
+DIST firewalld-1.3.3.tar.bz2 1218890 BLAKE2B 
79ececc0c547e4e06edced53909e9e68c6a5781c15af1d722e2247c28206e19a92349e33be31cbdec5281de6052be2718da09ab18065cfa4e94acafb0338
 SHA512 
b6bbec0dd9810a48c397bc6cfcf1339e0fff5a80df893917eddee266e48f70ae0af31a9c474d5c78fe2990433c8f84d70fd46f227ac29e4f5b7c209ca73b9e3c

diff --git a/net-firewall/firewalld/firewalld-1.3.3.ebuild 
b/net-firewall/firewalld/firewalld-1.3.3.ebuild
new file mode 100644
index ..9cdc72532067
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-1.3.3.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit bash-completion-r1 gnome2-utils linux-info optfeature
+inherit plocale python-single-r1 systemd xdg-utils
+
+DESCRIPTION="A firewall daemon with D-Bus interface providing a dynamic 
firewall"
+HOMEPAGE="https://firewalld.org/;
+SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.tar.bz2;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="gui +nftables +iptables test"
+# Tests are too unreliable in sandbox environment
+RESTRICT="!test? ( test ) test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
+   $(python_gen_cond_dep '
+   dev-python/dbus-python[${PYTHON_USEDEP}]
+   dev-python/pygobject:3[${PYTHON_USEDEP}]
+   gui? (
+   x11-libs/gtk+:3
+   dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+   )
+   nftables? ( >=net-firewall/nftables-0.9.4[python,json] )
+   ')
+   iptables? (
+   net-firewall/iptables[ipv6(+)]
+   net-firewall/ebtables
+   net-firewall/ipset
+   nftables? ( net-firewall/nftables[xtables(+)] )
+   )
+"
+DEPEND="
+   ${RDEPEND}
+   dev-libs/glib:2
+"
+BDEPEND="
+   app-text/docbook-xml-dtd
+   >=dev-util/intltool-0.35
+   sys-devel/gettext
+"
+
+# Testsuite's Makefile.am calls missing(!)
+# ... but this seems to be consistent with the autoconf docs?
+# Needs more investigation: 
https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html
+QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
+
+PLOCALES="ar as ast bg bn_IN ca cs da de el en_GB en_US es et eu fa fi fr gl 
gu hi hr hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru si sk sq sr 
sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+   # See bug #830132 for the huge list
+   # We can probably narrow it down a bit but it's rather fragile
+   local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
+   ~NETFILTER
+   ~NETFILTER_ADVANCED
+   ~NETFILTER_INGRESS
+   ~NF_NAT_MASQUERADE
+   ~NF_NAT_REDIRECT
+   ~NF_TABLES_INET
+   ~NF_TABLES_IPV4
+   ~NF_TABLES_IPV6
+   ~NF_CONNTRACK
+   ~NF_CONNTRACK_BROADCAST
+   ~NF_CONNTRACK_NETBIOS_NS
+   ~NF_CONNTRACK_TFTP
+   ~NF_CT_NETLINK
+   ~NF_CT_NETLINK_HELPER
+   ~NF_DEFRAG_IPV4
+   ~NF_DEFRAG_IPV6
+   ~NF_NAT
+   ~NF_NAT_TFTP
+   ~NF_REJECT_IPV4
+   ~NF_REJECT_IPV6
+   ~NF_SOCKET_IPV4
+   ~NF_SOCKET_IPV6
+   ~NF_TABLES
+   ~NF_TPROXY_IPV4
+   ~NF_TPROXY_IPV6
+   ~IP_NF_FILTER
+   ~IP_NF_IPTABLES
+   ~IP_NF_MANGLE
+   ~IP_NF_NAT
+   ~IP_NF_RAW
+   ~IP_NF_SECURITY
+   ~IP_NF_TARGET_MASQUERADE
+   ~IP_NF_TARGET_REJECT
+   ~IP6_NF_FILTER
+   ~IP6_NF_IPTABLES
+   ~IP6_NF_MANGLE
+   ~IP6_NF_NAT
+   ~IP6_NF_RAW
+   ~IP6_NF_SECURITY
+   ~IP6_NF_TARGET_MASQUERADE
+   ~IP6_NF_TARGET_REJECT
+   ~IP_SET
+   ~NETFILTER_CONNCOUNT
+   ~NETFILTER_NETLINK
+   

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

2023-06-15 Thread Sam James
commit: c2e4c74198fef3a1119e731d144ca98d6d34de24
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 15 21:51:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:51:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2e4c741

app-shells/fzf: add 0.42.0

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

 app-shells/fzf/Manifest  |  2 ++
 app-shells/fzf/fzf-0.42.0.ebuild | 72 
 2 files changed, 74 insertions(+)

diff --git a/app-shells/fzf/Manifest b/app-shells/fzf/Manifest
index 97ef86c459d2..6d4893d952d0 100644
--- a/app-shells/fzf/Manifest
+++ b/app-shells/fzf/Manifest
@@ -4,3 +4,5 @@ DIST fzf-0.40.0-deps.tar.xz 16914048 BLAKE2B 
c095faee297e2226d595f961bd1362c41e1
 DIST fzf-0.40.0.tar.gz 236930 BLAKE2B 
bbdf8d62c5b9f2e1a85c54e55e42d7a93366ff7f25104d1eb3b28dc49933c10bbe9a8bda68a80597f2734ed6888da744000db5b359a9523b40007f04ede06252
 SHA512 
03a9aae215b06cd2d0c318e7fb13c6e39012091e9773f00cba702323c5fe3b2b0161f48fe552188689be307e2d308c47afed53e1046a7a767bcd49c98c1dbf60
 DIST fzf-0.41.1-deps.tar.xz 16902176 BLAKE2B 
96f888a2b00d8156b3423b9074915934b8034183be652cfe0f251cd93b5a44358360a55012c85b07325b193b51dcb266ecb1ec03f966385dfb2d474c7b2065a7
 SHA512 
0049d82220db6e9fd20d885b3706d6a13dd341d6d6953a7e403d035360612fc594dcc147a01d875302cffeacb977461f385d31ca3020a45cbcb7033f1b661020
 DIST fzf-0.41.1.tar.gz 238333 BLAKE2B 
3716cfa9d4001902e0901b837a7389c14a8ebb50c602f07cc6be1f345e085fa5a4bf5a6688cb1d15e927881b2eaa5565a49f700ee72d1abb96204e030c7c43e5
 SHA512 
2c9bf4f0e9b2772f2f911f5d2cb88715ce63b6029ad1a1eb066bdc670c05cf46a387ff8c019065b043858e82fb0234cce071b01f003f0c3f3f1c7720f1c6aa89
+DIST fzf-0.42.0-deps.tar.xz 16860372 BLAKE2B 
e2ba9a7deca036587e0f4ff40eabb849f834ca5429261ea365efa87b83eb4c8b62e4c24e27a35d29941c09cf7165fa6f408769132d9583527278fc7029e473c5
 SHA512 
43b09726e5c5d7d987e6bb905f077dfd2e355b7bbb65eb13f86dc1c586711c1331396ae3c8437990a6facab72aad0ba4aff99fe3f2b293554bbb6942799440d8
+DIST fzf-0.42.0.tar.gz 239469 BLAKE2B 
cdeb40d08345edaecc20082e5c9d487791260ae18dc824e585f522fdcb004dc645a9a59f8d26c01ffaacee6ea9b7030b5e3a79d22098b3fad55e7ff2f9e7
 SHA512 
9587b8c9d37abcf1ae85b12d5cf3a1179f57241e3932db6801dee9bb952f83621b780d713c1793ccb4c5c36921b9078e156fe989b3e13664201ed729ea03d414

diff --git a/app-shells/fzf/fzf-0.42.0.ebuild b/app-shells/fzf/fzf-0.42.0.ebuild
new file mode 100644
index ..16ac631ed2f2
--- /dev/null
+++ b/app-shells/fzf/fzf-0.42.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="General-purpose command-line fuzzy finder, written in Golang"
+HOMEPAGE="https://github.com/junegunn/fzf;
+
+# For fancy versioning only. Bump on the next release!
+# MY_GIT_REV is the first 7 characters of release commit, we truncate it
+# after to make it easier to copy/paste.
+MY_GIT_REV=d471067e3f46f64e6401d1c5717424535fe4c96c
+MY_GIT_REV=${MY_GIT_REV:0:7}
+
+SRC_URI="https://github.com/junegunn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz;
+
+LICENSE="MIT BSD-with-disclosure"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+src_prepare() {
+   default
+   sed -i 's/-s -w //' Makefile || die # bug #795225
+}
+
+src_compile() {
+   emake PREFIX="${EPREFIX}"/usr VERSION=${PV} REVISION=${MY_GIT_REV} 
bin/${PN}
+}
+
+src_install() {
+   dobin bin/${PN}
+   doman man/man1/${PN}.1
+
+   dobin bin/${PN}-tmux
+   doman man/man1/${PN}-tmux.1
+
+   insinto /usr/share/vim/vimfiles/plugin
+   doins plugin/${PN}.vim
+
+   insinto /usr/share/nvim/runtime/plugin
+   doins plugin/${PN}.vim
+
+   newbashcomp shell/completion.bash ${PN}
+
+   insinto /usr/share/zsh/site-functions
+   newins shell/completion.zsh _${PN}
+
+   insinto /usr/share/fzf
+   doins shell/key-bindings.bash
+   doins shell/key-bindings.fish
+   doins shell/key-bindings.zsh
+}
+
+pkg_postinst() {
+   if [[ -z ${REPLACING_VERSIONS} ]]; then
+   elog "To add fzf support to your shell, make sure to use the 
right file"
+   elog "from ${EROOT}/usr/share/fzf."
+   elog
+   elog "For bash, add the following line to ~/.bashrc:"
+   elog
+   elog "  # source 
${EROOT}/usr/share/bash-completion/completions/fzf"
+   elog "  # source ${EROOT}/usr/share/fzf/key-bindings.bash"
+   elog
+   elog "Plugins for Vim and Neovim are installed to respective 
directories"
+   elog "and will work out of the box."
+   elog
+   elog "For fzf support in tmux see fzf-tmux(1)."
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2023-06-15 Thread Sam James
commit: 91b6ebb8f564a04a9c2181d7de7c707e17d7a72c
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 15 22:02:23 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 22:02:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91b6ebb8

sys-block/open-iscsi: add 2.1.9

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

 sys-block/open-iscsi/Manifest|   1 +
 sys-block/open-iscsi/open-iscsi-2.1.9.ebuild | 119 +++
 2 files changed, 120 insertions(+)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 59917d9ecd72..5d97349b8462 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1 +1,2 @@
 DIST open-iscsi-2.1.8.tar.gz 638346 BLAKE2B 
1e85b6bd75ac31e5aaa65ea8869c2e6e13190786e28e473ab8bd1ea3edb0ef835624194e2ba53718fb2a49c25af53bff9035f5109e1a569155244f03a7dccdc0
 SHA512 
168ce68dc495cc8b2f217ad0373851d681f9274036b8ec562ece513de493adfdbba55f2038518f246f5244f6405102b2e096a9cce15e73fce9654f06790002c1
+DIST open-iscsi-2.1.9.tar.gz 641974 BLAKE2B 
87570329dd5902bf96f1c11786c7a814892c851eabb63148f35b85494242f7379db1770a93549dcb871bafa148d37b320b389a98eed2ac46b7252ed22187ecd1
 SHA512 
25c28da5918b775ca54d3e55591eca0b4f7b5be33d803cad28fce1e9b2334b43cee1423a4e1819497b322e0f420dcd8d74226f442ca432233d1753565b11a5bb

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.9.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.9.ebuild
new file mode 100644
index ..2a2d0b3a0842
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.1.9.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info meson systemd udev
+
+DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
+HOMEPAGE="https://www.open-iscsi.com/;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+ GPL-2+"
+SLOT="0/0.2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug infiniband +tcp rdma systemd"
+REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
+# Tries to write to /run/lock/iscsi etc
+RESTRICT="test"
+
+DEPEND="
+   dev-libs/openssl:=
+   sys-apps/kmod
+   sys-block/open-isns:=
+   sys-kernel/linux-headers
+   infiniband? ( sys-cluster/rdma-core )
+   systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="
+   ${DEPEND}
+   sys-fs/lsscsi
+   sys-apps/util-linux
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.1.7-fix_bitwise.patch
+)
+
+pkg_setup() {
+   linux-info_pkg_setup
+
+   if kernel_is -lt 2 6 16; then
+   die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
+   fi
+
+   # Needs to be done, as iscsid currently only starts, when having the 
iSCSI
+   # support loaded as module. Kernel builtin options don't work. See this 
for
+   # more information:
+   # 
https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
+   # If there's a new release, check whether this is still valid!
+   TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
+   RDMA_MODULES="INFINIBAND_ISER"
+   INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD 
INFINIBAND_USER_ACCESS"
+   CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) 
infiniband? ( ${INFINIBAND_MODULES} )"
+   if linux_config_exists; then
+   if use tcp; then
+   for module in ${TCP_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+   done
+   fi
+   if use infiniband; then
+   for module in ${INFINIBAND_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+   done
+   fi
+   if use rdma; then
+   for module in ${RDMA_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"$
+   done
+   fi
+   fi
+}
+
+src_configure() {
+   use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
+
+   # TODO: Make sys-block/open-isns optional if useful? There's an upstream
+   # build system option for this already as of 2.1.9.
+   local emesonargs=(
+   -Dsystemddir="$(systemd_get_utildir)"
+   -Drulesdir="$(get_udevdir)"/rules.d
+   $(meson_use !systemd no_systemd)
+   )
+
+   meson_src_configure
+}
+
+src_install() {
+   meson_src_install
+
+   # Upstream make is not deterministic, per bug #601514
+   rm -f "${ED}"/etc/initiatorname.iscsi
+
+   docinto 

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/

2023-06-15 Thread Sam James
commit: 0b839c19faa464dd707a569175485ae0e1ff8326
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 15 21:55:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:55:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b839c19

sys-cluster/drbd-utils: add 9.24.0

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

 sys-cluster/drbd-utils/Manifest |   1 +
 sys-cluster/drbd-utils/drbd-utils-9.24.0.ebuild | 129 
 2 files changed, 130 insertions(+)

diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest
index 86c5b2f714f3..5ccb9584d266 100644
--- a/sys-cluster/drbd-utils/Manifest
+++ b/sys-cluster/drbd-utils/Manifest
@@ -1,3 +1,4 @@
 DIST drbd-utils-9.15.1.tar.gz 1229196 BLAKE2B 
c73cb624e4c35f2c5c001b4545c2ad806d3f13471aa25b0941d923020fe01a73405d1ed7c2ab2efe3afee0e59b8e9d401072edb788c57dc338fe3ddb4eebebf3
 SHA512 
bf9c46335500c0dd7afdc160221acaf8fd053afc453cb26cd76ef085c41580be5a62021ef1f1a57eac9df70d1158a008f489d1a8bb5c3329c5a187f79e4942de
 DIST drbd-utils-9.19.1.tar.gz 1265184 BLAKE2B 
b26fd9abd6408df4ccaa46c4713ece1743386bb4727ad8206498c30189d6c119ced57ec2d528c0575c5192cf366998b5f7db99aaecf1a2ba6af028b87c4ae082
 SHA512 
65d8f5802c541781895c59a5f631b222746b21615049e53f77d6c36a7255c51fe5d062984174ab8578d64af104fe9d66df5ae185ba50a8c38813c12a69fceb22
 DIST drbd-utils-9.23.1.tar.gz 1279916 BLAKE2B 
f631473d7ff2d569e2e5dc61940085f4d575baaa1e02eaba50f37b15e9b381afb9089d4e50fbd511dc7c73350a9e5552b16a1e80742151801e5068c12830a469
 SHA512 
8befaa20f4217fb83b127bad332a96be61ffd0cefca78b298dbede4c7f33424e8f27aeb251bb022bb4e1ade11307448cdf39d5750924fcf2711141a29e7a81f0
+DIST drbd-utils-9.24.0.tar.gz 1296591 BLAKE2B 
ece4773bc2e63739ae656987166423303ad32a50e27983d4e8b173d997221e5c45389aa6306b3219d5a648d2d3401720b73e9a67880225c46b9e2f28d5605b62
 SHA512 
20f85f3dcdb0a1a1dcf5029e4737799081bcb0c69a60e8fe077016899ef37efb5ee585a92cf30a0475970a12c1da90aaebc0fd9e33452690838a56bc75b49ec4

diff --git a/sys-cluster/drbd-utils/drbd-utils-9.24.0.ebuild 
b/sys-cluster/drbd-utils/drbd-utils-9.24.0.ebuild
new file mode 100644
index ..1ca0cd8e56f3
--- /dev/null
+++ b/sys-cluster/drbd-utils/drbd-utils-9.24.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1 linux-info tmpfiles udev
+
+DESCRIPTION="mirror/replicate block-devices across a network-connection"
+HOMEPAGE="https://www.linbit.com/drbd;
+SRC_URI="https://pkg.linbit.com/downloads/drbd/utils/${P}.tar.gz;
+S="${WORKDIR}/${P/_/}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pacemaker split-usr +udev xen"
+
+DEPEND="
+   pacemaker? ( sys-cluster/pacemaker )
+   udev? ( virtual/udev )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/flex"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-9.15.1-run-lock.patch
+   "${FILESDIR}"/${PN}-9.23.1-respect-flags.patch
+)
+
+pkg_setup() {
+   # verify that CONFIG_BLK_DEV_DRBD is enabled in the kernel or
+   # warn otherwise
+   linux-info_pkg_setup
+   elog "Checking for suitable kernel configuration options..."
+   if linux_config_exists; then
+   if ! linux_chkconfig_present BLK_DEV_DRBD; then
+   ewarn "CONFIG_BLK_DEV_DRBD: is not set when it should 
be."
+   elog "Please check to make sure these options are set 
correctly."
+   fi
+   else
+   ewarn "Could not check if CONFIG_BLK_DEV_DRBD is enabled in 
your kernel."
+   elog "Please check to make sure these options are set 
correctly."
+   fi
+}
+
+src_prepare() {
+   # Respect LDFLAGS, bug #453442
+   sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \
+   -e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \
+   -i user/*/Makefile.in || die
+
+   # Respect multilib, bug #698304
+   sed -i -e "s:/lib/:/$(get_libdir)/:g" \
+   Makefile.in 
scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
+   sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
+   -e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
+   -i user/*/Makefile.in || die
+   sed -i -e "s/lib/$(get_libdir)/" scripts/drbd.service || die
+
+   # Correct install paths (really correct this time)
+   sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \
+   scripts/Makefile.in || die
+
+   # Don't participate in user survey, bug #360483
+   sed -i -e '/usage-count/ s/yes/no/' scripts/global_common.conf || die
+   sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in 
|| die
+
+   default
+   eautoreconf
+}
+
+src_configure() {
+   local myeconfargs=(
+   --localstatedir="${EPREFIX}"/var
+   --with-bashcompletion
+   --with-distro=gentoo
+   --with-prebuiltman
+

[gentoo-commits] repo/gentoo:master commit in: eclass/

2023-06-15 Thread Sam James
commit: 8e9c05ddfcd74be3b53c7c4c2fbc799a9ab7fa61
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 14 00:39:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:47:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e9c05dd

llvm.eclass: export LLVM_CONFIG if not cross-compiling

Set LLVM_CONFIG to help Meson (bug #907965) but only do it for empty ESYSROOT
(as a proxy for "are we cross-compiling?").

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

 eclass/llvm.eclass | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/eclass/llvm.eclass b/eclass/llvm.eclass
index 022820d012d5..223e2a15baf4 100644
--- a/eclass/llvm.eclass
+++ b/eclass/llvm.eclass
@@ -250,6 +250,12 @@ llvm_pkg_setup() {
llvm_fix_tool_path ADDR2LINE AR AS LD NM OBJCOPY OBJDUMP RANLIB
llvm_fix_tool_path READELF STRINGS STRIP
 
+   # Set LLVM_CONFIG to help Meson (bug #907965) but only do it
+   # for empty ESYSROOT (as a proxy for "are we cross-compiling?").
+   if [[ -z ${ESYSROOT} ]] ; then
+   llvm_fix_tool_path LLVM_CONFIG
+   fi
+
local prefix=${ESYSROOT}
local llvm_path=${prefix}/usr/lib/llvm/${LLVM_SLOT}/bin
local IFS=:



[gentoo-commits] repo/gentoo:master commit in: net-im/signal-desktop-bin/

2023-06-15 Thread Sam James
commit: 96ad5f9fa051aeba68cb1c8eff947652c654374a
Author: Robert Siebeck  r123  de>
AuthorDate: Thu Jun 15 07:49:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:41:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96ad5f9f

net-im/signal-desktop-bin: add new version 6.21.0

Signed-off-by: Robert Siebeck  r123.de>
Signed-off-by: Sam James  gentoo.org>

 net-im/signal-desktop-bin/Manifest |  1 +
 .../signal-desktop-bin-6.21.0.ebuild   | 95 ++
 2 files changed, 96 insertions(+)

diff --git a/net-im/signal-desktop-bin/Manifest 
b/net-im/signal-desktop-bin/Manifest
index 0441565f7744..03f0698b915b 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1 +1,2 @@
 DIST signal-desktop_6.20.2_amd64.deb 112225178 BLAKE2B 
71b4c7170d81e2fbd1c170fc516b8139619ae455b67ea565c635fb1f027667deab6caf2ed747cf2172a263049f6e594777668042915779ceede4287b54edcccf
 SHA512 
e5bc297c584b2fb483da23a683f03cde7d93dbc4351e9f72e4069f5972e4f7a29772d78ebb75b62a26eee7546c3cb7cb56a69db19de760b7f8da3cf3de9dd269
+DIST signal-desktop_6.21.0_amd64.deb 112199148 BLAKE2B 
a976305edf697a6bb7e131e63479e425352728a1a4ec9dbc515da8b7f87496e286e23e97e657e2706f1ae71b21cc9ba140404b8e65c7b43ef88d1798d1afd0a9
 SHA512 
b5b3099506a2bcd0a9e64425f76cdffb3388046955f7289e45497332e10a3ffaf50a009a1f2dc59a1a85377e10b3ca1d39377f84a75ee7dd54e6a030bc3b5280

diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-6.21.0.ebuild 
b/net-im/signal-desktop-bin/signal-desktop-bin-6.21.0.ebuild
new file mode 100644
index ..9368120568ad
--- /dev/null
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-6.21.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="${PN/-bin/}"
+
+inherit pax-utils unpacker xdg
+
+DESCRIPTION="Allows you to send and receive messages of Signal Messenger on 
your computer"
+HOMEPAGE="https://signal.org/
+   https://github.com/signalapp/Signal-Desktop;
+SRC_URI="https://updates.signal.org/desktop/apt/pool/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb;
+S="${WORKDIR}"
+
+LICENSE="GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl 
ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="-* amd64"
+IUSE="+sound"
+RESTRICT="splitdebug"
+
+RDEPEND="
+   >=app-accessibility/at-spi2-core-2.46.0:2
+   dev-libs/expat
+   dev-libs/glib:2
+   dev-libs/nspr
+   dev-libs/nss
+   media-libs/alsa-lib
+   media-libs/mesa[X(+)]
+   net-print/cups
+   sys-apps/dbus[X]
+   x11-libs/cairo
+   x11-libs/gtk+:3[X]
+   x11-libs/libdrm
+   x11-libs/libX11
+   x11-libs/libxcb
+   x11-libs/libxkbcommon
+   x11-libs/libXcomposite
+   x11-libs/libXdamage
+   x11-libs/libXext
+   x11-libs/libXfixes
+   x11-libs/libXrandr
+   x11-libs/pango
+   sound? (
+   || (
+   media-sound/pulseaudio
+   media-sound/apulse
+   )
+   )
+"
+
+QA_PREBUILT="
+   opt/Signal/chrome_crashpad_handler
+   opt/Signal/chrome-sandbox
+   opt/Signal/libEGL.so
+   opt/Signal/libGLESv2.so
+   opt/Signal/libffmpeg.so
+   opt/Signal/libvk_swiftshader.so
+   opt/Signal/libvulkan.so.1
+   opt/Signal/resources/app.asar.unpacked/node_modules/*
+   opt/Signal/signal-desktop
+   opt/Signal/swiftshader/libEGL.so
+   opt/Signal/swiftshader/libGLESv2.so"
+
+src_prepare() {
+   default
+   sed -e 's| --no-sandbox||g' \
+   -i usr/share/applications/signal-desktop.desktop || die
+   unpack usr/share/doc/signal-desktop/changelog.gz
+}
+
+src_install() {
+   insinto /
+   dodoc changelog
+   doins -r opt
+   insinto /usr/share
+
+   if has_version media-sound/apulse[-sdk] && ! has_version 
media-sound/pulseaudio; then
+   sed -i 's/Exec=/Exec=apulse /g' 
usr/share/applications/signal-desktop.desktop || die
+   fi
+
+   doins -r usr/share/applications
+   doins -r usr/share/icons
+   fperms +x /opt/Signal/signal-desktop /opt/Signal/chrome-sandbox
+   fperms u+s /opt/Signal/chrome-sandbox
+   pax-mark m opt/Signal/signal-desktop opt/Signal/chrome-sandbox
+
+   dosym -r /opt/Signal/${MY_PN} /usr/bin/${MY_PN}
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+   elog "For using the tray icon on compatible desktop environments, start 
Signal with"
+   elog " '--start-in-tray' or '--use-tray-icon'."
+}



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

2023-06-15 Thread Sam James
commit: e1ed0a10fa79ca7c05124f0f19ae630a857b8b89
Author: Tomáš Mózes  gmail  com>
AuthorDate: Thu Jun 15 07:43:15 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:42:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ed0a10

dev-db/percona-toolkit: add 3.5.3

Signed-off-by: Tomáš Mózes  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 dev-db/percona-toolkit/Manifest|  1 +
 .../percona-toolkit/percona-toolkit-3.5.3.ebuild   | 51 ++
 2 files changed, 52 insertions(+)

diff --git a/dev-db/percona-toolkit/Manifest b/dev-db/percona-toolkit/Manifest
index e76b6dd154af..51b4f5157750 100644
--- a/dev-db/percona-toolkit/Manifest
+++ b/dev-db/percona-toolkit/Manifest
@@ -1,2 +1,3 @@
 DIST percona-toolkit-3.3.1.tar.gz 15348084 BLAKE2B 
1bae3bc96144d23d51afca624b4ff4c7d5e118db857b5bf7721b8fa3fbc43e0ed87c52113e694e5defa0c70643a018ce1a7d2e437f097bac407344456f70ca1f
 SHA512 
ee82613e15746820739042d34cf7cac0ba7e9f2825234ba39d7bfb8e0a52ab9b8d23ca47cb6a6afe2525c01f69fc81130a3be67b8a191c98d0d43e960a736cb0
 DIST percona-toolkit-3.5.1.tar.gz 14700246 BLAKE2B 
58e1ae76a2fce32dd16fde3a9caae2a470882e737893cc22f67cf810533ceafa95c5b26ec390cc58b2b9f0db3a2323fe78c00a631da107e6dbbbef73e65c1bb4
 SHA512 
33ec22c2fc1c3cc855caead7ac7ca153328e280500f56e24e074cca6a2ba95572430369908cb557eedfcadfb7246fbb5670c943673aa41d5210dc38603aeb492
+DIST percona-toolkit-3.5.3.tar.gz 14673470 BLAKE2B 
f0eeaaf20924a75ff68eb623d4027fd8402169bbd8479e91ec174638f20109cee33a3e93b19dd88cd860a3f572db7e0a645fb1bd96e63f52c5d261167ad5eae8
 SHA512 
80abe6fe1d690d8faff01d72918c5b5da188819389d0fafe8f88f23489b609aa9730b0c7c2b284eb057e0cc3ae8ccb5b83849b31ff61291d8ab75d58abcdf85f

diff --git a/dev-db/percona-toolkit/percona-toolkit-3.5.3.ebuild 
b/dev-db/percona-toolkit/percona-toolkit-3.5.3.ebuild
new file mode 100644
index ..cac56554aef2
--- /dev/null
+++ b/dev-db/percona-toolkit/percona-toolkit-3.5.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit perl-module
+
+DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and 
system tasks"
+HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit;
+SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.gz;
+
+LICENSE="|| ( GPL-2 Artistic )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+# Package warrants IUSE doc
+IUSE=""
+
+COMMON_DEPEND="dev-perl/DBI
+   dev-perl/DBD-mysql
+   virtual/perl-Time-HiRes"
+RDEPEND="${COMMON_DEPEND}
+   dev-perl/JSON
+   dev-perl/libwww-perl
+   dev-perl/Role-Tiny
+   virtual/perl-File-Path
+   virtual/perl-Getopt-Long
+   virtual/perl-Time-Local
+   virtual/perl-Digest-MD5
+   virtual/perl-IO-Compress
+   virtual/perl-File-Temp
+   virtual/perl-File-Spec
+   virtual/perl-Scalar-List-Utils
+   dev-perl/TermReadKey"
+DEPEND="${COMMON_DEPEND}
+   virtual/perl-ExtUtils-MakeMaker"
+
+# Bug #501904 - CVE-2014-2029
+# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' 
bin/*
+# ^ is *-no-versioncheck.patch
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.0.7-no-versioncheck.patch
+   "${FILESDIR}"/${PN}-3.0.10-slave-delay-fix.patch
+)
+
+src_prepare() {
+   default
+
+   sed -i \
+   -e "s/=> 'percona-toolkit',/=> 'Percona::Toolkit',/g" \
+   Makefile.PL || die
+}



[gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/

2023-06-15 Thread Sam James
commit: 1130888969220c0a6640b44e1eef54090b99e829
Author: Philippe Chaintreuil  parallaxshift  com>
AuthorDate: Thu Jun 15 00:57:57 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:42:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11308889

mail-filter/spamassassin: remove 4.0.0 (cleanup)

All arches masked and newer rev is stable.

Signed-off-by: Philippe Chaintreuil  parallaxshift.com>
Closes: https://github.com/gentoo/gentoo/pull/31443
Signed-off-by: Sam James  gentoo.org>

 mail-filter/spamassassin/spamassassin-4.0.0.ebuild | 331 -
 1 file changed, 331 deletions(-)

diff --git a/mail-filter/spamassassin/spamassassin-4.0.0.ebuild 
b/mail-filter/spamassassin/spamassassin-4.0.0.ebuild
deleted file mode 100644
index b9bd6b38a88d..
--- a/mail-filter/spamassassin/spamassassin-4.0.0.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit perl-functions systemd toolchain-funcs verify-sig
-
-MY_P="Mail-SpamAssassin-${PV//_/-}"
-DESCRIPTION="An extensible mail filter which can identify and tag spam"
-HOMEPAGE="https://spamassassin.apache.org/;
-SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2
-   verify-sig? (
-   
https://downloads.apache.org/spamassassin/source/${MY_P}.tar.bz2.asc
-   )
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux 
~x86-linux"
-IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test"
-RESTRICT="!test? ( test )"
-
-# The Makefile.PL script checks for dependencies, but only fails if a
-# required (i.e. not optional) dependency is missing. We therefore
-# require most of the optional modules only at runtime.
-REQDEPEND="acct-user/spamd
-   acct-group/spamd
-   dev-lang/perl:=
-   dev-perl/HTML-Parser
-   dev-perl/Net-DNS
-   dev-perl/NetAddr-IP
-   virtual/perl-Digest-SHA
-   ssl? (
-   dev-libs/openssl:0=
-   )"
-
-# SpamAssassin doesn't use libwww-perl except as a fallback for when
-# curl/wget are missing, so we depend on one of those instead. Some
-# mirrors use https, so we need those utilities to support SSL.
-#
-# re2c is needed to compile the rules (sa-compile).
-#
-# We still need the old Digest-SHA1 because razor2 has not been ported
-# to Digest-SHA.
-OPTDEPEND="app-crypt/gnupg
-   dev-perl/Archive-Zip
-   dev-perl/BSD-Resource
-   dev-perl/Digest-SHA1
-   dev-perl/Email-Address-XS
-   dev-perl/Encode-Detect
-   || ( dev-perl/GeoIP2 dev-perl/Geo-IP )
-   dev-perl/IO-String
-   dev-perl/Mail-DKIM
-   dev-perl/Mail-DMARC
-   dev-perl/Mail-SPF
-   dev-perl/Net-Patricia
-   dev-perl/Net-LibIDN2
-   dev-util/re2c
-   || ( net-misc/wget[ssl] net-misc/curl[ssl] )
-   virtual/perl-MIME-Base64
-   dev-perl/Pod-Parser
-   berkdb? ( virtual/perl-DB_File )
-   ipv6? ( dev-perl/IO-Socket-INET6 )
-   ldap? ( dev-perl/perl-ldap )
-   mysql? (
-   dev-perl/DBI
-   dev-perl/DBD-mysql
-   )
-   postgres? (
-   dev-perl/DBI
-   dev-perl/DBD-Pg
-   )
-   sqlite? (
-   dev-perl/DBI
-   dev-perl/DBD-SQLite
-   )
-   ssl? ( dev-perl/IO-Socket-SSL )"
-
-DEPEND="${REQDEPEND}
-   test? (
-   ${OPTDEPEND}
-   virtual/perl-Test-Harness
-   )"
-RDEPEND="${REQDEPEND} ${OPTDEPEND}"
-BDEPEND="${RDEPEND}
-   verify-sig? ( sec-keys/openpgp-keys-spamassassin )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/spamassassin.apache.org.asc
-
-PATCHES=(
-   "${FILESDIR}/mention-geoip.cf-in-init.pre.patch"
-   "${FILESDIR}/4.0.0-tests-dnsbl_subtests.t.patch"
-   "${FILESDIR}/4.0.0-tests-strip2.t.patch"
-)
-
-# There are a few renames and use-dependent ones in src_install as well.
-DOCS=(
-   NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes
-   sql/README.awl procmailrc.example sample-nonspam.txt
-   sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail
-   spamd-apache2/README.apache
-)
-
-src_prepare() {
-   default
-
-   # The sa_compile test does some weird stuff like hopping around in
-   # the directory tree and calling "make" to create a dist tarball
-   # from ${S}. It fails, and is more trouble than it's worth...
-   perl_rm_files t/sa_compile.t
-
-   # The spamc tests (which need the networked spamd daemon) fail for
-   # irrelevant reasons. It's too hard to disable them (unlike the
-   # spamd tests themselves -- see src_test), so use a crude
-   # workaround.
-   perl_rm_files t/spamc_*.t
-
-   # Some tests need extra dependencies
-   # e.g. t/sql_based_whitelist.t needs DBD
-   # This is kinder than REQUIRED_USE for tests 

[gentoo-commits] repo/gentoo:master commit in: profiles/features/musl/

2023-06-15 Thread Sam James
commit: 461947b666e49dc1cd3867779693b8c335621ac7
Author: Brahmajit Das  gmail  com>
AuthorDate: Wed Jun 14 06:01:41 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:45:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=461947b6

profiles: mask sys-auth/polkit-pkla-compat on musl profile

Closes: https://bugs.gentoo.org/898556
Signed-off-by: Brahmajit Das  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31413
Signed-off-by: Sam James  gentoo.org>

 profiles/features/musl/package.mask | 5 +
 1 file changed, 5 insertions(+)

diff --git a/profiles/features/musl/package.mask 
b/profiles/features/musl/package.mask
index 3b525be68812..076047969379 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Brahmajit Das  (2023-06-15)
+# The package uses innetgr which is not available in musl, bug 898556
+# The package is only for long-obsolete polkit policies anyway.
+sys-auth/polkit-pkla-compat
+
 # Mike Gilbert  (2023-06-15)
 # Reverse entry from base profile.
 -sys-apps/musl-locales



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

2023-06-15 Thread Sam James
commit: 676a42456bf55cec13769083f2c9ef790c553f5c
Author: Tomáš Mózes  gmail  com>
AuthorDate: Thu Jun 15 07:44:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:42:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=676a4245

dev-db/percona-toolkit: drop old

Signed-off-by: Tomáš Mózes  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31446
Signed-off-by: Sam James  gentoo.org>

 dev-db/percona-toolkit/Manifest|  1 -
 .../percona-toolkit/percona-toolkit-3.3.1.ebuild   | 51 --
 2 files changed, 52 deletions(-)

diff --git a/dev-db/percona-toolkit/Manifest b/dev-db/percona-toolkit/Manifest
index 51b4f5157750..e2c1db1c4641 100644
--- a/dev-db/percona-toolkit/Manifest
+++ b/dev-db/percona-toolkit/Manifest
@@ -1,3 +1,2 @@
-DIST percona-toolkit-3.3.1.tar.gz 15348084 BLAKE2B 
1bae3bc96144d23d51afca624b4ff4c7d5e118db857b5bf7721b8fa3fbc43e0ed87c52113e694e5defa0c70643a018ce1a7d2e437f097bac407344456f70ca1f
 SHA512 
ee82613e15746820739042d34cf7cac0ba7e9f2825234ba39d7bfb8e0a52ab9b8d23ca47cb6a6afe2525c01f69fc81130a3be67b8a191c98d0d43e960a736cb0
 DIST percona-toolkit-3.5.1.tar.gz 14700246 BLAKE2B 
58e1ae76a2fce32dd16fde3a9caae2a470882e737893cc22f67cf810533ceafa95c5b26ec390cc58b2b9f0db3a2323fe78c00a631da107e6dbbbef73e65c1bb4
 SHA512 
33ec22c2fc1c3cc855caead7ac7ca153328e280500f56e24e074cca6a2ba95572430369908cb557eedfcadfb7246fbb5670c943673aa41d5210dc38603aeb492
 DIST percona-toolkit-3.5.3.tar.gz 14673470 BLAKE2B 
f0eeaaf20924a75ff68eb623d4027fd8402169bbd8479e91ec174638f20109cee33a3e93b19dd88cd860a3f572db7e0a645fb1bd96e63f52c5d261167ad5eae8
 SHA512 
80abe6fe1d690d8faff01d72918c5b5da188819389d0fafe8f88f23489b609aa9730b0c7c2b284eb057e0cc3ae8ccb5b83849b31ff61291d8ab75d58abcdf85f

diff --git a/dev-db/percona-toolkit/percona-toolkit-3.3.1.ebuild 
b/dev-db/percona-toolkit/percona-toolkit-3.3.1.ebuild
deleted file mode 100644
index fb56ea929b99..
--- a/dev-db/percona-toolkit/percona-toolkit-3.3.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit perl-module
-
-DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and 
system tasks"
-HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit;
-SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.gz;
-
-LICENSE="|| ( GPL-2 Artistic )"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-# Package warrants IUSE doc
-IUSE=""
-
-COMMON_DEPEND="dev-perl/DBI
-   dev-perl/DBD-mysql
-   virtual/perl-Time-HiRes"
-RDEPEND="${COMMON_DEPEND}
-   dev-perl/JSON
-   dev-perl/libwww-perl
-   dev-perl/Role-Tiny
-   virtual/perl-File-Path
-   virtual/perl-Getopt-Long
-   virtual/perl-Time-Local
-   virtual/perl-Digest-MD5
-   virtual/perl-IO-Compress
-   virtual/perl-File-Temp
-   virtual/perl-File-Spec
-   virtual/perl-Scalar-List-Utils
-   dev-perl/TermReadKey"
-DEPEND="${COMMON_DEPEND}
-   virtual/perl-ExtUtils-MakeMaker"
-
-# Bug #501904 - CVE-2014-2029
-# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' 
bin/*
-# ^ is *-no-versioncheck.patch
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.0.7-no-versioncheck.patch
-   "${FILESDIR}"/${PN}-3.0.10-slave-delay-fix.patch
-)
-
-src_prepare() {
-   default
-
-   sed -i \
-   -e "s/=> 'percona-toolkit',/=> 'Percona::Toolkit',/g" \
-   Makefile.PL || die
-}



[gentoo-commits] repo/gentoo:master commit in: net-im/signal-desktop-bin/

2023-06-15 Thread Sam James
commit: 973dee75dcc46601ebf7390e3344ce1c6b18eb3a
Author: Robert Siebeck  r123  de>
AuthorDate: Thu Jun 15 07:49:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:41:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=973dee75

net-im/signal-desktop-bin: remove old version

Signed-off-by: Robert Siebeck  r123.de>
Closes: https://github.com/gentoo/gentoo/pull/31447
Signed-off-by: Sam James  gentoo.org>

 net-im/signal-desktop-bin/Manifest |  1 -
 .../signal-desktop-bin-6.20.2.ebuild   | 95 --
 2 files changed, 96 deletions(-)

diff --git a/net-im/signal-desktop-bin/Manifest 
b/net-im/signal-desktop-bin/Manifest
index 03f0698b915b..8c19c31b20b2 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,2 +1 @@
-DIST signal-desktop_6.20.2_amd64.deb 112225178 BLAKE2B 
71b4c7170d81e2fbd1c170fc516b8139619ae455b67ea565c635fb1f027667deab6caf2ed747cf2172a263049f6e594777668042915779ceede4287b54edcccf
 SHA512 
e5bc297c584b2fb483da23a683f03cde7d93dbc4351e9f72e4069f5972e4f7a29772d78ebb75b62a26eee7546c3cb7cb56a69db19de760b7f8da3cf3de9dd269
 DIST signal-desktop_6.21.0_amd64.deb 112199148 BLAKE2B 
a976305edf697a6bb7e131e63479e425352728a1a4ec9dbc515da8b7f87496e286e23e97e657e2706f1ae71b21cc9ba140404b8e65c7b43ef88d1798d1afd0a9
 SHA512 
b5b3099506a2bcd0a9e64425f76cdffb3388046955f7289e45497332e10a3ffaf50a009a1f2dc59a1a85377e10b3ca1d39377f84a75ee7dd54e6a030bc3b5280

diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-6.20.2.ebuild 
b/net-im/signal-desktop-bin/signal-desktop-bin-6.20.2.ebuild
deleted file mode 100644
index 9368120568ad..
--- a/net-im/signal-desktop-bin/signal-desktop-bin-6.20.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="${PN/-bin/}"
-
-inherit pax-utils unpacker xdg
-
-DESCRIPTION="Allows you to send and receive messages of Signal Messenger on 
your computer"
-HOMEPAGE="https://signal.org/
-   https://github.com/signalapp/Signal-Desktop;
-SRC_URI="https://updates.signal.org/desktop/apt/pool/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb;
-S="${WORKDIR}"
-
-LICENSE="GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl 
ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE="+sound"
-RESTRICT="splitdebug"
-
-RDEPEND="
-   >=app-accessibility/at-spi2-core-2.46.0:2
-   dev-libs/expat
-   dev-libs/glib:2
-   dev-libs/nspr
-   dev-libs/nss
-   media-libs/alsa-lib
-   media-libs/mesa[X(+)]
-   net-print/cups
-   sys-apps/dbus[X]
-   x11-libs/cairo
-   x11-libs/gtk+:3[X]
-   x11-libs/libdrm
-   x11-libs/libX11
-   x11-libs/libxcb
-   x11-libs/libxkbcommon
-   x11-libs/libXcomposite
-   x11-libs/libXdamage
-   x11-libs/libXext
-   x11-libs/libXfixes
-   x11-libs/libXrandr
-   x11-libs/pango
-   sound? (
-   || (
-   media-sound/pulseaudio
-   media-sound/apulse
-   )
-   )
-"
-
-QA_PREBUILT="
-   opt/Signal/chrome_crashpad_handler
-   opt/Signal/chrome-sandbox
-   opt/Signal/libEGL.so
-   opt/Signal/libGLESv2.so
-   opt/Signal/libffmpeg.so
-   opt/Signal/libvk_swiftshader.so
-   opt/Signal/libvulkan.so.1
-   opt/Signal/resources/app.asar.unpacked/node_modules/*
-   opt/Signal/signal-desktop
-   opt/Signal/swiftshader/libEGL.so
-   opt/Signal/swiftshader/libGLESv2.so"
-
-src_prepare() {
-   default
-   sed -e 's| --no-sandbox||g' \
-   -i usr/share/applications/signal-desktop.desktop || die
-   unpack usr/share/doc/signal-desktop/changelog.gz
-}
-
-src_install() {
-   insinto /
-   dodoc changelog
-   doins -r opt
-   insinto /usr/share
-
-   if has_version media-sound/apulse[-sdk] && ! has_version 
media-sound/pulseaudio; then
-   sed -i 's/Exec=/Exec=apulse /g' 
usr/share/applications/signal-desktop.desktop || die
-   fi
-
-   doins -r usr/share/applications
-   doins -r usr/share/icons
-   fperms +x /opt/Signal/signal-desktop /opt/Signal/chrome-sandbox
-   fperms u+s /opt/Signal/chrome-sandbox
-   pax-mark m opt/Signal/signal-desktop opt/Signal/chrome-sandbox
-
-   dosym -r /opt/Signal/${MY_PN} /usr/bin/${MY_PN}
-}
-
-pkg_postinst() {
-   xdg_pkg_postinst
-   elog "For using the tray icon on compatible desktop environments, start 
Signal with"
-   elog " '--start-in-tray' or '--use-tray-icon'."
-}



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

2023-06-15 Thread Sam James
commit: b91abcb66ded2ef226820c29cace5a589e55f1f9
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Jun 15 19:24:27 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:41:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b91abcb6

media-libs/waffle: remove AD website

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Sam James  gentoo.org>

 media-libs/waffle/waffle-1.7.2.ebuild | 2 +-
 media-libs/waffle/waffle-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/waffle/waffle-1.7.2.ebuild 
b/media-libs/waffle/waffle-1.7.2.ebuild
index d43cfc4f5302..05018931d784 100644
--- a/media-libs/waffle/waffle-1.7.2.ebuild
+++ b/media-libs/waffle/waffle-1.7.2.ebuild
@@ -14,7 +14,7 @@ fi
 inherit meson-multilib multilib ${GIT_ECLASS}
 
 DESCRIPTION="Library that allows selection of GL API and of window system at 
runtime"
-HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle;
+HOMEPAGE="https://gitlab.freedesktop.org/mesa/waffle;
 
 LICENSE="BSD-2"
 SLOT="0"

diff --git a/media-libs/waffle/waffle-.ebuild 
b/media-libs/waffle/waffle-.ebuild
index 9dd3bad563e3..70895cc711f7 100644
--- a/media-libs/waffle/waffle-.ebuild
+++ b/media-libs/waffle/waffle-.ebuild
@@ -14,7 +14,7 @@ fi
 inherit meson-multilib multilib ${GIT_ECLASS}
 
 DESCRIPTION="Library that allows selection of GL API and of window system at 
runtime"
-HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle;
+HOMEPAGE="https://gitlab.freedesktop.org/mesa/waffle;
 
 LICENSE="BSD-2"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: x11-libs/libGLw/

2023-06-15 Thread Sam James
commit: 642424aae152396fe05197e9cb6583efbf48dc6c
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Jun 15 19:27:40 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:41:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=642424aa

x11-libs/libGLw: use HTTPS

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31466
Signed-off-by: Sam James  gentoo.org>

 x11-libs/libGLw/libGLw-8.0.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/libGLw/libGLw-8.0.0-r1.ebuild 
b/x11-libs/libGLw/libGLw-8.0.0-r1.ebuild
index 6be3bab29d6b..578224c74202 100644
--- a/x11-libs/libGLw/libGLw-8.0.0-r1.ebuild
+++ b/x11-libs/libGLw/libGLw-8.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 MY_P=glw-"${PV}"
 
 DESCRIPTION="Mesa GLw library"
-HOMEPAGE="http://mesa3d.sourceforge.net/;
+HOMEPAGE="https://mesa3d.sourceforge.net/;
 SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/glw/${MY_P}.tar.bz2;
 
 LICENSE="MIT"



[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop-bin/

2023-06-15 Thread Sam James
commit: a94faf18dcc3f23c914a122292f57349f1ff913f
Author: Henning Schild  hennsch  de>
AuthorDate: Thu Jun 15 17:12:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:41:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a94faf18

net-im/telegram-desktop-bin: add 4.8.4

Signed-off-by: Henning Schild  hennsch.de>
Closes: https://github.com/gentoo/gentoo/pull/31459
Signed-off-by: Sam James  gentoo.org>

 net-im/telegram-desktop-bin/Manifest   |  2 +
 .../telegram-desktop-bin-4.8.4.ebuild  | 53 ++
 2 files changed, 55 insertions(+)

diff --git a/net-im/telegram-desktop-bin/Manifest 
b/net-im/telegram-desktop-bin/Manifest
index dedb9ba108fd..b9aea9505ac6 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,2 +1,4 @@
 DIST tdesktop-4.8.3.tar.gz 17647574 BLAKE2B 
e3884fc4c3f73200b34aafae2fca84abeb1d36afe19f73e924d6dd4c91754d411ae3e8cbcff8e2b842c3b7a808a77bff9c2e0ea08923c382e90ba88b36aa
 SHA512 
4e42e30d69c02af35481cd1c9431bad159b47d56acdb25a7b20ad36cc7d4cad9fef3214dc2a512002fed8cf20f1c462f9e553fb3177bc324defb4da5a1d2af69
+DIST tdesktop-4.8.4.tar.gz 17647686 BLAKE2B 
73ae16a588574671c20ff0f5469040136caee1ea726dd6bd239f56f8a1a12618263febdefd7c036de7bfae90163d1a37563d1f419b396848b6accabf71a25440
 SHA512 
971de6b8a5991d60aa35d7e082d9069291730f1e730a2e57fdb2c12456fa7e820b7750f6546bf643ce9c8b156f8c151ee28f1dabad389cbe0b37876fc10d058c
 DIST tsetup.4.8.3.tar.xz 51381144 BLAKE2B 
a1e6754873ce89f878522625f86fac846eb118d3e2574a4239c7d46d016a646c0f47c21a891c06b42d8fd3de4fe0dd23fcfdd5d031b16f7fb236c49abecfbb17
 SHA512 
8d690d8bd05b04ee2fc1261494f164671a884c5edab93c68ed1bdfbb30fa41679942c72005c7df57d8c669df37ad001b1866dc00f0d8fb672e2e6ffb61414b56
+DIST tsetup.4.8.4.tar.xz 51480560 BLAKE2B 
5d32921986e0c241d62442235679285a60ff241b6a3729ea0f9dca407c8794cc463d4ed0d0a8f472294f8ac781483ff0a12b03fa2e86b26e8c8aad90c5131259
 SHA512 
698a31a81f535428d1e672c1d2b6f8dcdf3ed145f413ada404af00caea762df4935005c5a2ea5a5469949b49c9cd40ab0670049f0618b4f273d70349147df5c8

diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.8.4.ebuild 
b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.8.4.ebuild
new file mode 100644
index ..9b65f32181e0
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.8.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature xdg
+
+DESCRIPTION="Official desktop client for Telegram (binary package)"
+HOMEPAGE="https://desktop.telegram.org;
+SRC_URI="
+   https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> 
tdesktop-${PV}.tar.gz
+   amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
+"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+QA_PREBUILT="usr/bin/telegram-desktop"
+
+RDEPEND="
+   !net-im/telegram-desktop
+   sys-libs/glibc
+   dev-libs/glib:2
+   >=media-libs/fontconfig-2.13
+   media-libs/freetype:2
+   virtual/opengl
+   x11-libs/libX11
+   >=x11-libs/libxcb-1.10
+"
+
+S="${WORKDIR}/Telegram"
+
+src_install() {
+   newbin Telegram telegram-desktop
+
+   insinto /etc/tdesktop
+   newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop"
+
+   local icon_size
+   for icon_size in 16 32 48 64 128 256 512; do
+   newicon -s "${icon_size}" \
+   
"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
+   telegram.png
+   done
+
+   domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.desktop
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+   optfeature "spell checker support" app-text/enchant
+}



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

2023-06-15 Thread Sam James
commit: 82f174dcd6fc29343a6708049af362f8f8362eba
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Jun 15 19:22:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:41:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82f174dc

media-libs/freeglut: use HTTPS

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Sam James  gentoo.org>

 media-libs/freeglut/freeglut-3.4.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/freeglut/freeglut-3.4.0.ebuild 
b/media-libs/freeglut/freeglut-3.4.0.ebuild
index 14a5266ed9d7..cb8bb61808c9 100644
--- a/media-libs/freeglut/freeglut-3.4.0.ebuild
+++ b/media-libs/freeglut/freeglut-3.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 inherit cmake-multilib
 
 DESCRIPTION="A free OpenGL utility toolkit, the open-sourced alternative to 
the GLUT library"
-HOMEPAGE="http://freeglut.sourceforge.net/;
+HOMEPAGE="https://freeglut.sourceforge.net/;
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"



[gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-nouveau/

2023-06-15 Thread Sam James
commit: 864a17891fa407a248055f413ebac68a29b87543
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Jun 15 19:27:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:41:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=864a1789

x11-drivers/xf86-video-nouveau: update HOMEPAGE

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Sam James  gentoo.org>

 x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild 
b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild
index dfb80c52c72f..2a5c7ace4cc1 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ fi
 
 DESCRIPTION="Accelerated Open Source driver for nVidia cards"
 HOMEPAGE="
-   https://nouveau.freedesktop.org/wiki/
+   https://nouveau.freedesktop.org/
https://cgit.freedesktop.org/nouveau/xf86-video-nouveau;
 
 KEYWORDS="amd64 ~arm64 ~loong ppc ppc64 ~riscv x86"



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/keepalived/

2023-06-15 Thread Sam James
commit: d121dc032b666f9602fd6b1b59c897aac91f6ffc
Author: Tomáš Mózes  gmail  com>
AuthorDate: Thu Jun 15 07:49:53 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:39:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d121dc03

sys-cluster/keepalived: add 2.2.8

Signed-off-by: Tomáš Mózes  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 sys-cluster/keepalived/Manifest|  1 +
 sys-cluster/keepalived/keepalived-2.2.8.ebuild | 80 ++
 2 files changed, 81 insertions(+)

diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 85b7125c82d9..8a884c8cbe84 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -1,2 +1,3 @@
 DIST keepalived-2.2.7.tar.gz 1180180 BLAKE2B 
62c4534eb1eebeac596b628a1fa5fb4069498d532fdeff0dc51afbc71e90125bff7fcffb897da3fd34765c64f43d7b04dcf184169b1bc2cf33413e109f9f5cdc
 SHA512 
9869437fe6f0c10590b13088002b53474a51102da9838a6575d835d006c4871b61324ab80e0e81e0a23d0124e6f033cfc7114749e87b8f736408f3f0bedb3968
 DIST keepalived-2.2.7_p20221209.tar.gz 959087 BLAKE2B 
2c8a46874ddac414a6d6f7bc1646d90dd9afc813ffcdd5990d1a220171e77c1e17a97c0549c2223eb2401b60870b7d98139106345079033c2f2875d158024b2a
 SHA512 
519837fd463e69bc2eb8415fa8d5e5bd92cda1d0e3e80a0725a38285901b59fa8ba9e0d6852dbbdddf4bb72398286b4fa2779a6c341245b6322c4bef8dce37d6
+DIST keepalived-2.2.8.tar.gz 1202602 BLAKE2B 
3d8d738a0c4e6f00ea8dc3603813d21e52e259d301872f2db16c3373c3a034bedcf3f02e19d1b50855d90bbfece863e710d75a67e2d6dd057dfe451608a73fcb
 SHA512 
dc0ab5b0ef8911a7859422eccc2771a40e942236c855a628158ed748eb5f7dc4b6f4850e9c3057e81fd9d2daa640ab51fb1d7af12748a613280a217b333eb06b

diff --git a/sys-cluster/keepalived/keepalived-2.2.8.ebuild 
b/sys-cluster/keepalived/keepalived-2.2.8.ebuild
new file mode 100644
index ..ca5547748e72
--- /dev/null
+++ b/sys-cluster/keepalived/keepalived-2.2.8.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server 
project"
+HOMEPAGE="https://www.keepalived.org/;
+SRC_URI="https://www.keepalived.org/software/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+bfd dbus json regex snmp systemd"
+
+RDEPEND="
+   dev-libs/libnl:=
+   dev-libs/openssl:=
+   dev-libs/popt
+   net-libs/libnfnetlink
+   sys-apps/iproute2
+   regex? ( >=dev-libs/libpcre2-8:= )
+   dbus? (
+   sys-apps/dbus
+   dev-libs/glib:2
+   )
+   json? ( dev-libs/json-c:= )
+   snmp? ( net-analyzer/net-snmp:= )
+   systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}
+   >=sys-kernel/linux-headers-4.4"
+
+DOCS=(
+   README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO
+   doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt
+)
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   # keepalived has support to dynamically use some libraries instead of
+   # linking them:
+   #--enable-dynamic-linking \
+   #--enable-libiptc-dynamic \
+   #--enable-libnl-dynamic \
+   #--enable-libxtables-dynamic \
+   econf \
+   --with-init="$(usex systemd systemd custom)" \
+   --with-kernel-dir="${ESYSROOT}"/usr \
+   --enable-vrrp \
+   $(use_enable bfd) \
+   $(use_enable dbus) \
+   $(use_enable json) \
+   $(use_enable regex) \
+   $(use_enable snmp) \
+   $(use_enable snmp snmp-rfc) \
+   $(use_enable systemd)
+}
+
+src_install() {
+   default
+
+   newinitd "${FILESDIR}"/keepalived.init-r1 keepalived
+   newconfd "${FILESDIR}"/keepalived.confd-r1 keepalived
+
+   systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+   systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+
+   use snmp && dodoc doc/*MIB.txt
+
+   # This was badly named by upstream, it's more HOWTO than anything else.
+   newdoc INSTALL INSTALL+HOWTO
+
+   # Clean up sysvinit files
+   rm -rv "${ED}"/etc/sysconfig || die
+}



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

2023-06-15 Thread Sam James
commit: a372943bfe2bc3ac069cd2700a431c523d9eda5d
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Jun 15 19:21:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:41:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a372943b

dev-util/spirv-headers: update HOMEPAGE

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Sam James  gentoo.org>

 dev-util/spirv-headers/spirv-headers-1.3.243.ebuild  | 2 +-
 dev-util/spirv-headers/spirv-headers-1.3.246.ebuild  | 2 +-
 dev-util/spirv-headers/spirv-headers-1.3.250.ebuild  | 2 +-
 dev-util/spirv-headers/spirv-headers-.ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-util/spirv-headers/spirv-headers-1.3.243.ebuild 
b/dev-util/spirv-headers/spirv-headers-1.3.243.ebuild
index b074631e4c45..975ef2c6c683 100644
--- a/dev-util/spirv-headers/spirv-headers-1.3.243.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.3.243.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit cmake
 
 DESCRIPTION="Machine-readable files for the SPIR-V Registry"
-HOMEPAGE="https://www.khronos.org/registry/spir-v/;
+HOMEPAGE="https://registry.khronos.org/SPIR-V/;
 EGIT_COMMIT="sdk-${PV}"
 
SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz
 -> ${P}.tar.gz"
 S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"

diff --git a/dev-util/spirv-headers/spirv-headers-1.3.246.ebuild 
b/dev-util/spirv-headers/spirv-headers-1.3.246.ebuild
index d01ba8ef9a93..d1dc2b83875d 100644
--- a/dev-util/spirv-headers/spirv-headers-1.3.246.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.3.246.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit cmake
 
 DESCRIPTION="Machine-readable files for the SPIR-V Registry"
-HOMEPAGE="https://www.khronos.org/registry/spir-v/;
+HOMEPAGE="https://registry.khronos.org/SPIR-V/;
 EGIT_COMMIT="sdk-${PV}"
 
SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz
 -> ${P}.tar.gz"
 S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"

diff --git a/dev-util/spirv-headers/spirv-headers-1.3.250.ebuild 
b/dev-util/spirv-headers/spirv-headers-1.3.250.ebuild
index d01ba8ef9a93..d1dc2b83875d 100644
--- a/dev-util/spirv-headers/spirv-headers-1.3.250.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.3.250.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit cmake
 
 DESCRIPTION="Machine-readable files for the SPIR-V Registry"
-HOMEPAGE="https://www.khronos.org/registry/spir-v/;
+HOMEPAGE="https://registry.khronos.org/SPIR-V/;
 EGIT_COMMIT="sdk-${PV}"
 
SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz
 -> ${P}.tar.gz"
 S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"

diff --git a/dev-util/spirv-headers/spirv-headers-.ebuild 
b/dev-util/spirv-headers/spirv-headers-.ebuild
index 2c1a44510675..a925c90e78ad 100644
--- a/dev-util/spirv-headers/spirv-headers-.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-.ebuild
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Machine-readable files for the SPIR-V Registry"
-HOMEPAGE="https://www.khronos.org/registry/spir-v/ 
https://github.com/KhronosGroup/SPIRV-Headers;
+HOMEPAGE="https://registry.khronos.org/SPIR-V/ 
https://github.com/KhronosGroup/SPIRV-Headers;
 
 LICENSE="MIT"
 SLOT="0"



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

2023-06-15 Thread Sam James
commit: 4175b9715b1d881307c536bb5980001f0aa11e3f
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 15 21:39:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:39:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4175b971

app-admin/calamares: fix systemd-boot dep deux

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

 .../{calamares-3.2.60-r3.ebuild => calamares-3.2.60-r4.ebuild} | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app-admin/calamares/calamares-3.2.60-r3.ebuild 
b/app-admin/calamares/calamares-3.2.60-r4.ebuild
similarity index 95%
rename from app-admin/calamares/calamares-3.2.60-r3.ebuild
rename to app-admin/calamares/calamares-3.2.60-r4.ebuild
index 516017469b80..370b7cfa23d3 100644
--- a/app-admin/calamares/calamares-3.2.60-r3.ebuild
+++ b/app-admin/calamares/calamares-3.2.60-r4.ebuild
@@ -55,7 +55,12 @@ RDEPEND="${COMMON_DEPEND}
app-admin/sudo
dev-libs/libatasmart
net-misc/rsync
-   || ( sys-boot/grub:2 sys-apps/systemd sys-apps/systemd-utils[boot] )
+   || (
+   sys-boot/grub:2
+   sys-apps/systemd[gnuefi(-)]
+   sys-apps/systemd[boot(-)]
+   sys-apps/systemd-utils[boot]
+   )
sys-boot/os-prober
sys-fs/squashfs-tools
sys-libs/timezone-data



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

2023-06-15 Thread Sam James
commit: ce05c193d27a65c1727189166ae39cbbb34c5be9
Author: Egor Martynov  yandex  ru>
AuthorDate: Thu Jun 15 07:15:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:37:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce05c193

x11-wm/qtile: bump `xcffib` and `cairocffi` versions

https://github.com/qtile/qtile/commit/0dc8941896ec020c3982adf58e4e119a9863ca3b

Signed-off-by: Egor Martynov  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/31445
Signed-off-by: Sam James  gentoo.org>

 x11-wm/qtile/qtile-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/qtile/qtile-.ebuild b/x11-wm/qtile/qtile-.ebuild
index 0cf5d4db8098..03829958fd7f 100644
--- a/x11-wm/qtile/qtile-.ebuild
+++ b/x11-wm/qtile/qtile-.ebuild
@@ -26,12 +26,12 @@ IUSE="pulseaudio wayland"
 # See bug #895722 and https://github.com/qtile/qtile/pull/3985 regarding
 # pywlroots-0.15 dep.
 RDEPEND="
-   >=dev-python/cairocffi-0.9.0[${PYTHON_USEDEP}]
+   >=dev-python/cairocffi-1.6.0[${PYTHON_USEDEP}]
>=dev-python/cffi-1.1.0[${PYTHON_USEDEP}]
dev-python/dbus-next[${PYTHON_USEDEP}]
dev-python/pygobject[${PYTHON_USEDEP}]
>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-   >=dev-python/xcffib-0.10.1[${PYTHON_USEDEP}]
+   >=dev-python/xcffib-1.4.0[${PYTHON_USEDEP}]
x11-libs/cairo[X,xcb(+)]
x11-libs/libnotify[introspection]
x11-libs/pango



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/keepalived/

2023-06-15 Thread Sam James
commit: b3e584a3154d75970b33cdc433409608f2a8d284
Author: Tomáš Mózes  gmail  com>
AuthorDate: Thu Jun 15 07:50:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:39:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3e584a3

sys-cluster/keepalived: drop snapshot

Signed-off-by: Tomáš Mózes  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31448
Signed-off-by: Sam James  gentoo.org>

 sys-cluster/keepalived/Manifest|  1 -
 .../keepalived/keepalived-2.2.7_p20221209.ebuild   | 82 --
 2 files changed, 83 deletions(-)

diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 8a884c8cbe84..4001c63bf854 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -1,3 +1,2 @@
 DIST keepalived-2.2.7.tar.gz 1180180 BLAKE2B 
62c4534eb1eebeac596b628a1fa5fb4069498d532fdeff0dc51afbc71e90125bff7fcffb897da3fd34765c64f43d7b04dcf184169b1bc2cf33413e109f9f5cdc
 SHA512 
9869437fe6f0c10590b13088002b53474a51102da9838a6575d835d006c4871b61324ab80e0e81e0a23d0124e6f033cfc7114749e87b8f736408f3f0bedb3968
-DIST keepalived-2.2.7_p20221209.tar.gz 959087 BLAKE2B 
2c8a46874ddac414a6d6f7bc1646d90dd9afc813ffcdd5990d1a220171e77c1e17a97c0549c2223eb2401b60870b7d98139106345079033c2f2875d158024b2a
 SHA512 
519837fd463e69bc2eb8415fa8d5e5bd92cda1d0e3e80a0725a38285901b59fa8ba9e0d6852dbbdddf4bb72398286b4fa2779a6c341245b6322c4bef8dce37d6
 DIST keepalived-2.2.8.tar.gz 1202602 BLAKE2B 
3d8d738a0c4e6f00ea8dc3603813d21e52e259d301872f2db16c3373c3a034bedcf3f02e19d1b50855d90bbfece863e710d75a67e2d6dd057dfe451608a73fcb
 SHA512 
dc0ab5b0ef8911a7859422eccc2771a40e942236c855a628158ed748eb5f7dc4b6f4850e9c3057e81fd9d2daa640ab51fb1d7af12748a613280a217b333eb06b

diff --git a/sys-cluster/keepalived/keepalived-2.2.7_p20221209.ebuild 
b/sys-cluster/keepalived/keepalived-2.2.7_p20221209.ebuild
deleted file mode 100644
index 8a0b7135a533..
--- a/sys-cluster/keepalived/keepalived-2.2.7_p20221209.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools systemd
-GIT_COMMIT="fbd699fac85d768c3ddab048a8f9d3dfaec7eaad"
-
-DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server 
project"
-HOMEPAGE="https://www.keepalived.org/;
-SRC_URI="https://github.com/acassen/keepalived/archive/${GIT_COMMIT}.tar.gz -> 
${P}.tar.gz"
-S="${WORKDIR}/keepalived-${GIT_COMMIT}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="+bfd dbus json regex snmp systemd"
-
-RDEPEND="
-   dev-libs/libnl:=
-   dev-libs/openssl:=
-   dev-libs/popt
-   net-libs/libnfnetlink
-   sys-apps/iproute2
-   regex? ( >=dev-libs/libpcre2-8:= )
-   dbus? (
-   sys-apps/dbus
-   dev-libs/glib:2
-   )
-   json? ( dev-libs/json-c:= )
-   snmp? ( net-analyzer/net-snmp:= )
-   systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
-   >=sys-kernel/linux-headers-4.4"
-
-DOCS=(
-   README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO
-   doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt
-)
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   # keepalived has support to dynamically use some libraries instead of
-   # linking them:
-   #--enable-dynamic-linking \
-   #--enable-libiptc-dynamic \
-   #--enable-libnl-dynamic \
-   #--enable-libxtables-dynamic \
-   econf \
-   --with-init="$(usex systemd systemd custom)" \
-   --with-kernel-dir="${ESYSROOT}"/usr \
-   --enable-vrrp \
-   $(use_enable bfd) \
-   $(use_enable dbus) \
-   $(use_enable json) \
-   $(use_enable regex) \
-   $(use_enable snmp) \
-   $(use_enable snmp snmp-rfc) \
-   $(use_enable systemd)
-}
-
-src_install() {
-   default
-
-   newinitd "${FILESDIR}"/keepalived.init-r1 keepalived
-   newconfd "${FILESDIR}"/keepalived.confd-r1 keepalived
-
-   systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
-   systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
-
-   use snmp && dodoc doc/*MIB.txt
-
-   # This was badly named by upstream, it's more HOWTO than anything else.
-   newdoc INSTALL INSTALL+HOWTO
-
-   # Clean up sysvinit files
-   rm -rv "${ED}"/etc/sysconfig || die
-}



[gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/, net-wireless/gnuradio/files/

2023-06-15 Thread Sam James
commit: 3eeb1d9a9121ddc0d03565f5cef46b0decee7f8c
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Thu Jun 15 21:18:16 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:32:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eeb1d9a

net-wireless/gnuradio: fixes build with GCC-13

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/31472
Signed-off-by: Sam James  gentoo.org>

 .../files/gnuradio-3.10.6.0-fix-stdint.patch | 20 
 net-wireless/gnuradio/gnuradio-3.10.4.0-r1.ebuild|  1 +
 net-wireless/gnuradio/gnuradio-3.10.5.1.ebuild   |  1 +
 net-wireless/gnuradio/gnuradio-3.10.6.0.ebuild   |  1 +
 4 files changed, 23 insertions(+)

diff --git a/net-wireless/gnuradio/files/gnuradio-3.10.6.0-fix-stdint.patch 
b/net-wireless/gnuradio/files/gnuradio-3.10.6.0-fix-stdint.patch
new file mode 100644
index ..6252d96fd8b5
--- /dev/null
+++ b/net-wireless/gnuradio/files/gnuradio-3.10.6.0-fix-stdint.patch
@@ -0,0 +1,20 @@
+Author: Christian Inci 
+Date:   Mon May 15 21:26:05 2023 +0200
+Upstream: https://github.com/gnuradio/gnuradio/pull/6667
+
+Include cstdint in gr-fec's alist.h
+
+GCC 13 will error out otherwise.
+
+Signed-off-by: Christian Inci 
+
+--- a/gr-fec/include/gnuradio/fec/alist.h
 b/gr-fec/include/gnuradio/fec/alist.h
+@@ -23,6 +23,7 @@
+ #define ALIST_H
+ 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 

diff --git a/net-wireless/gnuradio/gnuradio-3.10.4.0-r1.ebuild 
b/net-wireless/gnuradio/gnuradio-3.10.4.0-r1.ebuild
index cb4db21dfed5..32e79d5f8f58 100644
--- a/net-wireless/gnuradio/gnuradio-3.10.4.0-r1.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.10.4.0-r1.ebuild
@@ -134,6 +134,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
"${FILESDIR}/${PN}-3.10.3.0-fix-fmt-v9.patch" #858659
"${FILESDIR}/${PN}-3.10.4.0-fix-blockinterleaving.patch"
+   "${FILESDIR}/${PN}-3.10.6.0-fix-stdint.patch"
 )
 
 src_prepare() {

diff --git a/net-wireless/gnuradio/gnuradio-3.10.5.1.ebuild 
b/net-wireless/gnuradio/gnuradio-3.10.5.1.ebuild
index b9ce9c0ab979..6a703292b5ab 100644
--- a/net-wireless/gnuradio/gnuradio-3.10.5.1.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.10.5.1.ebuild
@@ -133,6 +133,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}/${PN}-3.10.3.0-fix-fmt-v9.patch" #858659
+   "${FILESDIR}/${PN}-3.10.6.0-fix-stdint.patch"
 )
 
 src_prepare() {

diff --git a/net-wireless/gnuradio/gnuradio-3.10.6.0.ebuild 
b/net-wireless/gnuradio/gnuradio-3.10.6.0.ebuild
index b9ce9c0ab979..6a703292b5ab 100644
--- a/net-wireless/gnuradio/gnuradio-3.10.6.0.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.10.6.0.ebuild
@@ -133,6 +133,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}/${PN}-3.10.3.0-fix-fmt-v9.patch" #858659
+   "${FILESDIR}/${PN}-3.10.6.0-fix-stdint.patch"
 )
 
 src_prepare() {



[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/RetroArch/

2023-06-15 Thread Rafael Rondão
commit: 459f4d16f858c2c4a2691d9a35ceb859bc908c39
Author: Rafael Rondão  gmail  com>
AuthorDate: Thu Jun 15 21:35:44 2023 +
Commit: Rafael Rondão  gmail  com>
CommitDate: Thu Jun 15 21:35:44 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=459f4d16

games-emulation/RetroArch: change dep from pulseaudio to libpulse

The former is deprecated.

Signed-off-by: Rafael Rondão  gmail.com>

 games-emulation/RetroArch/RetroArch-1.15.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/RetroArch/RetroArch-1.15.0.ebuild 
b/games-emulation/RetroArch/RetroArch-1.15.0.ebuild
index 9b75acf87..204a0fda4 100644
--- a/games-emulation/RetroArch/RetroArch-1.15.0.ebuild
+++ b/games-emulation/RetroArch/RetroArch-1.15.0.ebuild
@@ -54,7 +54,7 @@ RDEPEND="
openal? ( media-libs/openal:0= )
opengl? ( media-libs/mesa:0=[gles2?] )
osmesa? ( media-libs/mesa:0=[osmesa?] )
-   pulseaudio? ( media-sound/pulseaudio:0= )
+   pulseaudio? ( media-libs/libpulse:0= )
sdl? ( >=media-libs/libsdl-1.2.10:0=[joystick] )
sdl2? ( media-libs/libsdl2:0=[joystick] )
truetype? ( media-libs/freetype:2= )



[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/RetroArch/

2023-06-15 Thread Rafael Rondão
commit: c6dcb876de18c2177e5027c34c748f451b035855
Author: Rafael Rondão  gmail  com>
AuthorDate: Thu Jun 15 21:30:47 2023 +
Commit: Rafael Rondão  gmail  com>
CommitDate: Thu Jun 15 21:31:45 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c6dcb876

games-emulation/RetroArch: add myself as a maintainer

Signed-off-by: Rafael Rondão  gmail.com>

 games-emulation/RetroArch/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/games-emulation/RetroArch/metadata.xml 
b/games-emulation/RetroArch/metadata.xml
index ca1afbfb2..b1549cca8 100644
--- a/games-emulation/RetroArch/metadata.xml
+++ b/games-emulation/RetroArch/metadata.xml
@@ -1,6 +1,10 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
+   
+   Rafael Rondão
+   rafael.ron...@gmail.com
+   

Compile in 7z support
ALSA support



[gentoo-commits] repo/gentoo:master commit in: eclass/

2023-06-15 Thread Sam James
commit: 8478835a7fc4226bcbf6c79475e1ba6d41d42298
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 14 20:47:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:13:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8478835a

ruby-ng.eclass: use shopt directly, not via estack.eclass

ulm points out that estack.eclass is particularly inefficient (although
it'll get slightly better once https://github.com/gentoo/gentoo/pull/31437
is fixed).

Let's just manually roll it like llvm.eclass does.

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

 eclass/ruby-ng.eclass | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index 14f4414337d6..2f14c22ace37 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -75,7 +75,7 @@ if [[ -z ${_RUBY_NG_ECLASS} ]]; then
 _RUBY_NG_ECLASS=1
 
 [[ ${EAPI} == 6 ]] && inherit eqawarn toolchain-funcs
-inherit estack multilib ruby-utils
+inherit multilib ruby-utils
 
 # S is no longer automatically assigned when it doesn't exist.
 S="${WORKDIR}"
@@ -163,7 +163,8 @@ _RUBY_ATOMS_SAMELIB_RESULT=""
 _ruby_atoms_samelib() {
_RUBY_ATOMS_SAMELIB_RESULT=""
 
-   eshopts_push -o noglob
+   local shopt_save=$(shopt -p -o noglob)
+   set -f
local token
local atoms=" RUBYTARGET? ("
for token in $*; do
@@ -177,7 +178,7 @@ _ruby_atoms_samelib() {
esac
done
atoms+=" ) "
-   eshopts_pop
+   ${shopt_save}
 
_ruby_set_globals_invalidate_if_stale
local _ruby_implementation



[gentoo-commits] repo/gentoo:master commit in: eclass/

2023-06-15 Thread Sam James
commit: 778555f772abf82743b1ee48ffc90df2eb96de66
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 13 22:15:40 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:12:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=778555f7

ruby-ng.eclass: use bash tests

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

 eclass/ruby-ng.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index b20c3b462915..f10c987ac44a 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -392,7 +392,7 @@ fi
 
 _ruby_invoke_environment() {
old_S=${S}
-   if [ -z "${RUBY_S}" ]; then
+   if [[ -z ${RUBY_S} ]]; then
sub_S=${P}
else
sub_S=${RUBY_S}
@@ -728,7 +728,7 @@ ruby-ng_rspec() {
 
# Explicitly pass the expected spec directory since the versioned
# rspec wrappers don't handle this automatically.
-   if [ ${#@} -eq 0 ]; then
+   if [[ $# -eq 0 ]]; then
files="spec"
fi
 



[gentoo-commits] repo/gentoo:master commit in: eclass/

2023-06-15 Thread Sam James
commit: 52885a31b20f6af327ccefaa62ce74877b9b687d
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 14 00:11:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:12:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52885a31

ruby-ng.eclass: cater to USE_RUBY conditional calls

Packages may try to restrict their test dependencies to ease 
bootstrapping/porting
if they're not yet available for a newer Ruby implementation by setting
USE_RUBY="" ruby_add_bdepend ...

For example, dev-ruby/parallel does:
```
 # Rails isn't yet ruby32-ready in Gentoo
 USE_RUBY="ruby27 ruby30 ruby31" ruby_add_bdepend "
 test? ( dev-ruby/activerecord[sqlite] )
```

This isn't ideal, but we don't have a ruby_gen_cond_dep right now, so
cater to this usecase by invalidating the caches we've previously added
if we've detected USE_RUBY changed.

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

 eclass/ruby-ng.eclass | 40 
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index 3269ed52cafe..14f4414337d6 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -102,8 +102,9 @@ ruby_implementation_depend() {
 # @DESCRIPTION:
 # Return a list of valid implementations in USE_RUBY, skipping the old
 # implementations that are no longer supported.
-_RUBY_GET_ALL_IMPLS=()
 _ruby_get_all_impls() {
+   _RUBY_GET_ALL_IMPLS=()
+
local i found_valid_impl
for i in ${USE_RUBY}; do
case ${i} in
@@ -132,6 +133,8 @@ _ruby_get_all_impls() {
 ruby_samelib() {
debug-print-function ${FUNCNAME} "${@}"
 
+   _ruby_set_globals_invalidate_if_stale
+
local res=
for _ruby_implementation in "${_RUBY_GET_ALL_IMPLS[@]}"; do
has -${_ruby_implementation} $@ || \
@@ -176,6 +179,7 @@ _ruby_atoms_samelib() {
atoms+=" ) "
eshopts_pop
 
+   _ruby_set_globals_invalidate_if_stale
local _ruby_implementation
for _ruby_implementation in "${_RUBY_GET_ALL_IMPLS[@]}"; do

_RUBY_ATOMS_SAMELIB_RESULT+="${atoms//RUBYTARGET/ruby_targets_${_ruby_implementation}}"
@@ -227,6 +231,7 @@ ruby_add_rdepend() {
;;
esac
 
+   _ruby_set_globals_invalidate_if_stale
_ruby_atoms_samelib "$1"
 
RDEPEND+=" ${_RUBY_ATOMS_SAMELIB_RESULT}"
@@ -274,6 +279,7 @@ ruby_add_bdepend() {
;;
esac
 
+   _ruby_set_globals_invalidate_if_stale
_ruby_atoms_samelib "$1"
 
case ${EAPI} in
@@ -300,6 +306,7 @@ ruby_add_depend() {
*) die "bad number of arguments to $0" ;;
esac
 
+   _ruby_set_globals_invalidate_if_stale
_ruby_atoms_samelib "$1"
 
DEPEND+=" ${_RUBY_ATOMS_SAMELIB_RESULT}"
@@ -311,6 +318,8 @@ ruby_add_depend() {
 ruby_get_use_implementations() {
debug-print-function ${FUNCNAME} "${@}"
 
+   _ruby_set_globals_invalidate_if_stale
+
local i implementation
for implementation in "${_RUBY_GET_ALL_IMPLS[@]}"; do
use ruby_targets_${implementation} && i+=" ${implementation}"
@@ -324,6 +333,7 @@ ruby_get_use_implementations() {
 ruby_get_use_targets() {
debug-print-function ${FUNCNAME} "${@}"
 
+   _ruby_set_globals_invalidate_if_stale
_ruby_get_use_targets
echo "${_RUBY_GET_USE_TARGETS}"
 }
@@ -336,6 +346,8 @@ _RUBY_GET_USE_TARGETS=""
 _ruby_get_use_targets() {
debug-print-function ${FUNCNAME} "${@}"
 
+   _ruby_set_globals_invalidate_if_stale
+
local impls="${_RUBY_GET_ALL_IMPLS[@]}"
_RUBY_GET_USE_TARGETS="${impls//ruby/ruby_targets_ruby}"
 }
@@ -360,11 +372,14 @@ _RUBY_IMPLEMENTATIONS_DEPEND=""
 ruby_implementations_depend() {
debug-print-function ${FUNCNAME} "${@}"
 
+   _ruby_set_globals_invalidate_if_stale
_ruby_implementations_depend
echo "${_RUBY_IMPLEMENTATIONS_DEPEND}"
 }
 
 _ruby_implementations_depend() {
+   _ruby_set_globals_invalidate_if_stale
+
local depend _ruby_implementation
for _ruby_implementation in "${_RUBY_GET_ALL_IMPLS[@]}"; do
depend="${depend}${depend+ 
}ruby_targets_${_ruby_implementation}? ( $(ruby_implementation_depend 
$_ruby_implementation) )"
@@ -372,9 +387,24 @@ _ruby_implementations_depend() {
_RUBY_IMPLEMENTATIONS_DEPEND="${depend}"
 }
 
-_ruby_get_all_impls
-_ruby_get_use_targets
-_ruby_implementations_depend
+_ruby_set_globals() {
+   _RUBY_SET_GLOBALS_USE_RUBY="${USE_RUBY}"
+   _ruby_get_all_impls
+   _ruby_get_use_targets
+   _ruby_implementations_depend
+}
+
+_ruby_set_globals_invalidate_if_stale() {
+   # Packages may try to restrict their test dependencies to ease 
bootstrapping/porting
+   # if they're not yet available for a newer Ruby implementation by 
setting
+   # USE_RUBY="" ruby_add_bdepend ...
+   if [[ 

[gentoo-commits] repo/gentoo:master commit in: eclass/

2023-06-15 Thread Sam James
commit: 5f7ad4a0e3ddd944c094ebc9719fdd5982ea76f6
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 14 21:38:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:13:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f7ad4a0

ruby-ng.eclass: add _ruby_get_use_targets comment

I don't see us adding a non-ruby* target any time soon so this should be fine.

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

 eclass/ruby-ng.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index 2f14c22ace37..5cea44101593 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -105,6 +105,8 @@ ruby_implementation_depend() {
 _ruby_get_all_impls() {
_RUBY_GET_ALL_IMPLS=()
 
+   # XXX: Please update _ruby_get_use_targets if adding a non-'ruby*'
+   # target.
local i found_valid_impl
for i in ${USE_RUBY}; do
case ${i} in
@@ -350,6 +352,7 @@ _ruby_get_use_targets() {
_ruby_set_globals_invalidate_if_stale
 
local impls="${_RUBY_GET_ALL_IMPLS[@]}"
+   # XXX: This assumes all targets begin with 'ruby'.
_RUBY_GET_USE_TARGETS="${impls//ruby/ruby_targets_ruby}"
 }
 



[gentoo-commits] repo/gentoo:master commit in: eclass/

2023-06-15 Thread Sam James
commit: f740ce9defe9cebbbebb9958f740219da15afa54
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 13 22:17:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:12:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f740ce9d

ruby-ng.eclass: drop no-op RDEPEND assignment

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

 eclass/ruby-ng.eclass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index f10c987ac44a..3269ed52cafe 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -280,7 +280,6 @@ ruby_add_bdepend() {
6) DEPEND+=" ${_RUBY_ATOMS_SAMELIB_RESULT}" ;;
*) BDEPEND+=" ${_RUBY_ATOMS_SAMELIB_RESULT}" ;;
esac
-   RDEPEND="${RDEPEND}"
 }
 
 # @FUNCTION: ruby_add_depend



[gentoo-commits] repo/gentoo:master commit in: eclass/

2023-06-15 Thread Sam James
commit: acf925859631ce5a5867d27244665c623fa1ad99
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 13 22:15:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:12:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acf92585

ruby-ng.eclass: use bash +=

Easier to read.

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

 eclass/ruby-ng.eclass | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index 6c5666ddeabb..b20c3b462915 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -229,13 +229,13 @@ ruby_add_rdepend() {
 
_ruby_atoms_samelib "$1"
 
-   RDEPEND="${RDEPEND} ${_RUBY_ATOMS_SAMELIB_RESULT}"
+   RDEPEND+=" ${_RUBY_ATOMS_SAMELIB_RESULT}"
 
# Add the dependency as a test-dependency since we're going to
# execute the code during test phase.
case ${EAPI} in
-   6) DEPEND="${DEPEND} test? ( ${_RUBY_ATOMS_SAMELIB_RESULT} )" ;;
-   *) BDEPEND="${BDEPEND} test? ( ${_RUBY_ATOMS_SAMELIB_RESULT} )" 
;;
+   6) DEPEND+=" test? ( ${_RUBY_ATOMS_SAMELIB_RESULT} )" ;;
+   *) BDEPEND+=" test? ( ${_RUBY_ATOMS_SAMELIB_RESULT} )" ;;
esac
if ! has test "$IUSE"; then
IUSE+=" test"
@@ -277,8 +277,8 @@ ruby_add_bdepend() {
_ruby_atoms_samelib "$1"
 
case ${EAPI} in
-   6) DEPEND="${DEPEND} ${_RUBY_ATOMS_SAMELIB_RESULT}" ;;
-   *) BDEPEND="${BDEPEND} ${_RUBY_ATOMS_SAMELIB_RESULT}" ;;
+   6) DEPEND+=" ${_RUBY_ATOMS_SAMELIB_RESULT}" ;;
+   *) BDEPEND+=" ${_RUBY_ATOMS_SAMELIB_RESULT}" ;;
esac
RDEPEND="${RDEPEND}"
 }
@@ -303,7 +303,7 @@ ruby_add_depend() {
 
_ruby_atoms_samelib "$1"
 
-   DEPEND="${DEPEND} ${_RUBY_ATOMS_SAMELIB_RESULT}"
+   DEPEND+=" ${_RUBY_ATOMS_SAMELIB_RESULT}"
 }
 
 # @FUNCTION: ruby_get_use_implementations
@@ -381,12 +381,12 @@ IUSE+=" ${_RUBY_GET_USE_TARGETS}"
 # If you specify RUBY_OPTIONAL you also need to take care of
 # ruby useflag and dependency.
 if [[ ${RUBY_OPTIONAL} != yes ]]; then
-   DEPEND="${DEPEND} ${_RUBY_IMPLEMENTATIONS_DEPEND}"
-   RDEPEND="${RDEPEND} ${_RUBY_IMPLEMENTATIONS_DEPEND}"
+   DEPEND+=" ${_RUBY_IMPLEMENTATIONS_DEPEND}"
+   RDEPEND+=" ${_RUBY_IMPLEMENTATIONS_DEPEND}"
REQUIRED_USE+=" || ( ${_RUBY_GET_USE_TARGETS} )"
case ${EAPI} in
6) ;;
-   *) BDEPEND="${BDEPEND} ${_RUBY_IMPLEMENTATIONS_DEPEND}" ;;
+   *) BDEPEND+=" ${_RUBY_IMPLEMENTATIONS_DEPEND}" ;;
esac
 fi
 



[gentoo-commits] repo/gentoo:master commit in: eclass/

2023-06-15 Thread Sam James
commit: 0bb6c7f95645b618832dea16ef2d1ecdfb5ad0ed
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 13 21:49:57 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:12:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bb6c7f9

ruby-ng.eclass: optimize: use pattern for old ruby impls

Not much improvement on a grand scale, but for dev-ruby/sinatra at least, we 
get:
```
$ pk pkg source $(pkg) --repo ~/g/ --bench 5s # before
dev-ruby/sinatra-3.0.5::/home/sam/g/: mean: 76.25ms, min: 59.23ms, max: 
83.674ms, σ = 4.247ms, N = 66
dev-ruby/sinatra-3.0.5-r1::/home/sam/g/: mean: 77.465ms, min: 61.782ms, max: 
85.127ms, σ = 3.592ms, N = 65
dev-ruby/sinatra-3.0.6::/home/sam/g/: mean: 80.192ms, min: 60.922ms, max: 
84.951ms, σ = 3.899ms, N = 63
dev-ruby/sinatra-2.2.3::/home/sam/g/: mean: 80.389ms, min: 56.818ms, max: 
86.915ms, σ = 4.508ms, N = 63

$ pk pkg source $(pkg) --repo ~/g/ --bench 5s # after
dev-ruby/sinatra-3.0.6::/home/sam/g/: mean: 72.761ms, min: 58.627ms, max: 
76.161ms, σ = 3.276ms, N = 69
dev-ruby/sinatra-3.0.5-r1::/home/sam/g/: mean: 72.967ms, min: 60.127ms, max: 
76.75ms, σ = 3.176ms, N = 69
dev-ruby/sinatra-3.0.5::/home/sam/g/: mean: 69.004ms, min: 58.344ms, max: 
73.661ms, σ = 3.3ms, N = 73
dev-ruby/sinatra-2.2.3::/home/sam/g/: mean: 71.061ms, min: 55.144ms, max: 
74.563ms, σ = 3.848ms, N = 71
```

A tiny, but seemingly consistent improvement.

Thanks to mgorny for the idea.

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

 eclass/ruby-ng.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index 8befa086ef02..5a6edb1bf608 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -107,7 +107,7 @@ _ruby_get_all_impls() {
for i in ${USE_RUBY}; do
case ${i} in
# removed implementations
-   
ruby19|ruby20|ruby21|ruby22|ruby23|ruby24|ruby25|ruby26|ruby27|jruby)
+   ruby19|ruby2[0-7]|jruby)
;;
*)
found_valid_impl=1



[gentoo-commits] repo/gentoo:master commit in: eclass/

2023-06-15 Thread Sam James
commit: 390ad2effe1c83a7cb25a892ad988937b53c07fe
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 13 21:57:53 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:12:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=390ad2ef

ruby-ng.eclass: optimize: avoid subshell for ruby_get_all_impls

We go from ~4s -> ~3.5s for sourcing dev-ruby/*.

For sinatra:

```
$ pk pkg source $(pkg) --repo ~/g/ --bench 5s # before
dev-ruby/sinatra-2.2.3::/home/sam/g/: mean: 66.68ms, min: 56.938ms, max: 
74.248ms, σ = 4.832ms, N = 75
dev-ruby/sinatra-3.0.6::/home/sam/g/: mean: 73.618ms, min: 60.153ms, max: 
77.978ms, σ = 3.195ms, N = 68
dev-ruby/sinatra-3.0.5::/home/sam/g/: mean: 72.069ms, min: 58.736ms, max: 
78.223ms, σ = 3.277ms, N = 70
dev-ruby/sinatra-3.0.5-r1::/home/sam/g/: mean: 73.265ms, min: 60.738ms, max: 
81.06ms, σ = 3.227ms, N = 69

$ pk pkg source $(pkg) --repo ~/g/ --bench 5s # after
dev-ruby/sinatra-3.0.5-r1::/home/sam/g/: mean: 59.677ms, min: 49.141ms, max: 
63.282ms, σ = 2.511ms, N = 84
dev-ruby/sinatra-3.0.6::/home/sam/g/: mean: 59.693ms, min: 48.637ms, max: 
62.862ms, σ = 2.628ms, N = 84
dev-ruby/sinatra-3.0.5::/home/sam/g/: mean: 56.697ms, min: 46.782ms, max: 
60.367ms, σ = 2.822ms, N = 89
dev-ruby/sinatra-2.2.3::/home/sam/g/: mean: 54.915ms, min: 45.832ms, max: 
59.513ms, σ = 3.52ms, N = 92
```

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

 eclass/ruby-ng.eclass | 23 +--
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index 2bf1885d3803..ee2e6b89edb4 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -102,6 +102,7 @@ ruby_implementation_depend() {
 # @DESCRIPTION:
 # Return a list of valid implementations in USE_RUBY, skipping the old
 # implementations that are no longer supported.
+_RUBY_GET_ALL_IMPLS=()
 _ruby_get_all_impls() {
local i found_valid_impl
for i in ${USE_RUBY}; do
@@ -111,7 +112,8 @@ _ruby_get_all_impls() {
;;
*)
found_valid_impl=1
-   echo ${i};;
+   _RUBY_GET_ALL_IMPLS+=( ${i} )
+   ;;
esac
done
 
@@ -131,7 +133,7 @@ ruby_samelib() {
debug-print-function ${FUNCNAME} "${@}"
 
local res=
-   for _ruby_implementation in $(_ruby_get_all_impls); do
+   for _ruby_implementation in "${_RUBY_GET_ALL_IMPLS[@]}"; do
has -${_ruby_implementation} $@ || \
res="${res}ruby_targets_${_ruby_implementation}(-)?,"
done
@@ -174,7 +176,7 @@ ruby_implementation_command() {
 _ruby_atoms_samelib() {
local atoms=$(_ruby_atoms_samelib_generic "$*")
 
-   for _ruby_implementation in $(_ruby_get_all_impls); do
+   for _ruby_implementation in "${_RUBY_GET_ALL_IMPLS[@]}"; do
echo "${atoms//RUBYTARGET/ruby_targets_${_ruby_implementation}}"
done
 }
@@ -310,7 +312,7 @@ ruby_get_use_implementations() {
debug-print-function ${FUNCNAME} "${@}"
 
local i implementation
-   for implementation in $(_ruby_get_all_impls); do
+   for implementation in "${_RUBY_GET_ALL_IMPLS[@]}"; do
use ruby_targets_${implementation} && i+=" ${implementation}"
done
echo $i
@@ -322,8 +324,8 @@ ruby_get_use_implementations() {
 ruby_get_use_targets() {
debug-print-function ${FUNCNAME} "${@}"
 
-
-   local impls="$(_ruby_get_all_impls)"
+   _ruby_get_all_impls
+   local impls="${_RUBY_GET_ALL_IMPLS[@]}"
echo "${impls//ruby/ruby_targets_ruby}"
 }
 
@@ -346,13 +348,14 @@ ruby_get_use_targets() {
 ruby_implementations_depend() {
debug-print-function ${FUNCNAME} "${@}"
 
-   local depend
-   for _ruby_implementation in $(_ruby_get_all_impls); do
+   for _ruby_implementation in "${_RUBY_GET_ALL_IMPLS[@]}"; do
depend="${depend}${depend+ 
}ruby_targets_${_ruby_implementation}? ( $(ruby_implementation_depend 
$_ruby_implementation) )"
done
echo "${depend}"
 }
 
+_ruby_get_all_impls
+
 IUSE+=" $(ruby_get_use_targets)"
 # If you specify RUBY_OPTIONAL you also need to take care of
 # ruby useflag and dependency.
@@ -412,7 +415,7 @@ _ruby_invoke_environment() {
 
 _ruby_each_implementation() {
local invoked=no
-   for _ruby_implementation in $(_ruby_get_all_impls); do
+   for _ruby_implementation in "${_RUBY_GET_ALL_IMPLS[@]}"; do
# only proceed if it's requested
use ruby_targets_${_ruby_implementation} || continue
 
@@ -435,7 +438,7 @@ _ruby_each_implementation() {
 
if [[ ${invoked} == "no" ]]; then
eerror "You need to select at least one compatible Ruby 
installation target via RUBY_TARGETS in make.conf."
-   eerror "Compatible targets for 

[gentoo-commits] repo/gentoo:master commit in: eclass/

2023-06-15 Thread Sam James
commit: 676e6dc3f4a921d4fcb1e320e7d0562e2ef08856
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 13 21:59:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:12:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=676e6dc3

ruby-ng.eclass: optimize: avoid subshells for _ruby_atoms_samelib*

- Inline ruby_atoms_samelib (only used by one caller)
- Avoid repeated (subshell) calls to _ruby_atoms_samelib_generic by using a 
result
  variable instead.

We go from 3.5s -> 2.5s to source dev-ruby/*.

Thanks to mgorny for the ideas here.

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

 eclass/ruby-ng.eclass | 57 ++-
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index ee2e6b89edb4..cf66fcec2f05 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -141,23 +141,6 @@ ruby_samelib() {
echo "[${res%,}]"
 }
 
-_ruby_atoms_samelib_generic() {
-   eshopts_push -o noglob
-   echo "RUBYTARGET? ("
-   for token in $*; do
-   case "$token" in
-   "||" | "(" | ")" | *"?")
-   echo "${token}" ;;
-   *])
-   echo "${token%[*}[RUBYTARGET(-),${token/*[}" ;;
-   *)
-   echo "${token}[RUBYTARGET(-)]" ;;
-   esac
-   done
-   echo ")"
-   eshopts_pop
-}
-
 # @FUNCTION: ruby_implementation_command
 # @RETURN: the path to the given ruby implementation
 # @DESCRIPTION:
@@ -173,11 +156,29 @@ ruby_implementation_command() {
echo $(type -p ${_ruby_name} 2>/dev/null)
 }
 
+_RUBY_ATOMS_SAMELIB_RESULT=""
 _ruby_atoms_samelib() {
-   local atoms=$(_ruby_atoms_samelib_generic "$*")
+   _RUBY_ATOMS_SAMELIB_RESULT=""
+
+   eshopts_push -o noglob
+   local token
+   local atoms=" RUBYTARGET? ("
+   for token in $*; do
+   case "${token}" in
+   "||" | "(" | ")" | *"?")
+   atoms+=" ${token}" ;;
+   *])
+   atoms+=" ${token%[*}[RUBYTARGET(-),${token/*[}" 
;;
+   *)
+   atoms+=" ${token}[RUBYTARGET(-)]" ;;
+   esac
+   done
+   atoms+=" ) "
+   eshopts_pop
 
+   local _ruby_implementation
for _ruby_implementation in "${_RUBY_GET_ALL_IMPLS[@]}"; do
-   echo "${atoms//RUBYTARGET/ruby_targets_${_ruby_implementation}}"
+   
_RUBY_ATOMS_SAMELIB_RESULT+="${atoms//RUBYTARGET/ruby_targets_${_ruby_implementation}}"
done
 }
 
@@ -226,15 +227,15 @@ ruby_add_rdepend() {
;;
esac
 
-   local dependency=$(_ruby_atoms_samelib "$1")
+   _ruby_atoms_samelib "$1"
 
-   RDEPEND="${RDEPEND} $dependency"
+   RDEPEND="${RDEPEND} ${_RUBY_ATOMS_SAMELIB_RESULT}"
 
# Add the dependency as a test-dependency since we're going to
# execute the code during test phase.
case ${EAPI} in
-   6) DEPEND="${DEPEND} test? ( ${dependency} )" ;;
-   *) BDEPEND="${BDEPEND} test? ( ${dependency} )" ;;
+   6) DEPEND="${DEPEND} test? ( ${_RUBY_ATOMS_SAMELIB_RESULT} )" ;;
+   *) BDEPEND="${BDEPEND} test? ( ${_RUBY_ATOMS_SAMELIB_RESULT} )" 
;;
esac
if ! has test "$IUSE"; then
IUSE+=" test"
@@ -273,11 +274,11 @@ ruby_add_bdepend() {
;;
esac
 
-   local dependency=$(_ruby_atoms_samelib "$1")
+   _ruby_atoms_samelib "$1"
 
case ${EAPI} in
-   6) DEPEND="${DEPEND} $dependency" ;;
-   *) BDEPEND="${BDEPEND} $dependency" ;;
+   6) DEPEND="${DEPEND} ${_RUBY_ATOMS_SAMELIB_RESULT}" ;;
+   *) BDEPEND="${BDEPEND} ${_RUBY_ATOMS_SAMELIB_RESULT}" ;;
esac
RDEPEND="${RDEPEND}"
 }
@@ -300,9 +301,9 @@ ruby_add_depend() {
*) die "bad number of arguments to $0" ;;
esac
 
-   local dependency=$(_ruby_atoms_samelib "$1")
+   _ruby_atoms_samelib "$1"
 
-   DEPEND="${DEPEND} $dependency"
+   DEPEND="${DEPEND} ${_RUBY_ATOMS_SAMELIB_RESULT}"
 }
 
 # @FUNCTION: ruby_get_use_implementations



[gentoo-commits] repo/gentoo:master commit in: eclass/

2023-06-15 Thread Sam James
commit: 48a0a44098b5cdfbceaf37305b7e9eac65748cd0
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 13 22:01:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:12:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48a0a440

ruby-ng.eclass: optimize: avoid subshells for ruby_implementations_depend, 
ruby_get_use_targets

We go from 2.5s -> 1.9s to source dev-ruby/*.

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

 eclass/ruby-ng.eclass | 36 
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index cf66fcec2f05..6c5666ddeabb 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -325,9 +325,20 @@ ruby_get_use_implementations() {
 ruby_get_use_targets() {
debug-print-function ${FUNCNAME} "${@}"
 
-   _ruby_get_all_impls
+   _ruby_get_use_targets
+   echo "${_RUBY_GET_USE_TARGETS}"
+}
+
+# @FUNCTION: _ruby_get_use_targets
+# @INTERNAL
+# @DESCRIPTION:
+# Gets an array of ruby use targets that the ebuild sets
+_RUBY_GET_USE_TARGETS=""
+_ruby_get_use_targets() {
+   debug-print-function ${FUNCNAME} "${@}"
+
local impls="${_RUBY_GET_ALL_IMPLS[@]}"
-   echo "${impls//ruby/ruby_targets_ruby}"
+   _RUBY_GET_USE_TARGETS="${impls//ruby/ruby_targets_ruby}"
 }
 
 # @FUNCTION: ruby_implementations_depend
@@ -346,27 +357,36 @@ ruby_get_use_targets() {
 # ...
 # DEPEND="ruby? ( $(ruby_implementations_depend) )"
 # RDEPEND="${DEPEND}"
+_RUBY_IMPLEMENTATIONS_DEPEND=""
 ruby_implementations_depend() {
debug-print-function ${FUNCNAME} "${@}"
 
+   _ruby_implementations_depend
+   echo "${_RUBY_IMPLEMENTATIONS_DEPEND}"
+}
+
+_ruby_implementations_depend() {
+   local depend _ruby_implementation
for _ruby_implementation in "${_RUBY_GET_ALL_IMPLS[@]}"; do
depend="${depend}${depend+ 
}ruby_targets_${_ruby_implementation}? ( $(ruby_implementation_depend 
$_ruby_implementation) )"
done
-   echo "${depend}"
+   _RUBY_IMPLEMENTATIONS_DEPEND="${depend}"
 }
 
 _ruby_get_all_impls
+_ruby_get_use_targets
+_ruby_implementations_depend
 
-IUSE+=" $(ruby_get_use_targets)"
+IUSE+=" ${_RUBY_GET_USE_TARGETS}"
 # If you specify RUBY_OPTIONAL you also need to take care of
 # ruby useflag and dependency.
 if [[ ${RUBY_OPTIONAL} != yes ]]; then
-   DEPEND="${DEPEND} $(ruby_implementations_depend)"
-   RDEPEND="${RDEPEND} $(ruby_implementations_depend)"
-   REQUIRED_USE+=" || ( $(ruby_get_use_targets) )"
+   DEPEND="${DEPEND} ${_RUBY_IMPLEMENTATIONS_DEPEND}"
+   RDEPEND="${RDEPEND} ${_RUBY_IMPLEMENTATIONS_DEPEND}"
+   REQUIRED_USE+=" || ( ${_RUBY_GET_USE_TARGETS} )"
case ${EAPI} in
6) ;;
-   *) BDEPEND="${BDEPEND} $(ruby_implementations_depend)" ;;
+   *) BDEPEND="${BDEPEND} ${_RUBY_IMPLEMENTATIONS_DEPEND}" ;;
esac
 fi
 



[gentoo-commits] repo/gentoo:master commit in: eclass/

2023-06-15 Thread Sam James
commit: 89925fc4e6d343ce6f7ca36bc288ba7b62d1193e
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 13 21:52:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:12:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89925fc4

ruby-ng.eclass: optimize: use pattern substitution

We can save a little bit (consistently a few ms) by using patsubs in some
obvious cases.

Not really any difference globally, but for sinatra:
```
$ pk pkg source $(pkg) --repo ~/g/ --bench 5s # before
dev-ruby/sinatra-3.0.5::/home/sam/g/: mean: 76.25ms, min: 59.23ms, max: 
83.674ms, σ = 4.247ms, N = 66
dev-ruby/sinatra-3.0.5-r1::/home/sam/g/: mean: 77.465ms, min: 61.782ms, max: 
85.127ms, σ = 3.592ms, N = 65
dev-ruby/sinatra-3.0.6::/home/sam/g/: mean: 80.192ms, min: 60.922ms, max: 
84.951ms, σ = 3.899ms, N = 63
dev-ruby/sinatra-2.2.3::/home/sam/g/: mean: 80.389ms, min: 56.818ms, max: 
86.915ms, σ = 4.508ms, N = 63

$ pk pkg source $(pkg) --repo ~/g/ --bench 5s # after
dev-ruby/sinatra-2.2.3::/home/sam/g/: mean: 66.68ms, min: 56.938ms, max: 
74.248ms, σ = 4.832ms, N = 75
dev-ruby/sinatra-3.0.6::/home/sam/g/: mean: 73.618ms, min: 60.153ms, max: 
77.978ms, σ = 3.195ms, N = 68
dev-ruby/sinatra-3.0.5::/home/sam/g/: mean: 72.069ms, min: 58.736ms, max: 
78.223ms, σ = 3.277ms, N = 70
dev-ruby/sinatra-3.0.5-r1::/home/sam/g/: mean: 73.265ms, min: 60.738ms, max: 
81.06ms, σ = 3.227ms, N = 69
```

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

 eclass/ruby-ng.eclass | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index 5a6edb1bf608..2bf1885d3803 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -183,11 +183,11 @@ _ruby_wrap_conditions() {
local conditions="$1"
local atoms="$2"
 
-   for condition in $conditions; do
+   for condition in ${conditions}; do
atoms="${condition}? ( ${atoms} )"
done
 
-   echo "$atoms"
+   echo "${atoms}"
 }
 
 # @FUNCTION: ruby_add_rdepend
@@ -322,11 +322,9 @@ ruby_get_use_implementations() {
 ruby_get_use_targets() {
debug-print-function ${FUNCNAME} "${@}"
 
-   local t implementation
-   for implementation in $(_ruby_get_all_impls); do
-   t+=" ruby_targets_${implementation}"
-   done
-   echo $t
+
+   local impls="$(_ruby_get_all_impls)"
+   echo "${impls//ruby/ruby_targets_ruby}"
 }
 
 # @FUNCTION: ruby_implementations_depend



[gentoo-commits] repo/gentoo:master commit in: profiles/features/musl/, profiles/base/

2023-06-15 Thread Mike Gilbert
commit: caaf43dd027f223daced92fbb6be723e688cd71c
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Jun 15 20:43:33 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Jun 15 20:43:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caaf43dd

profiles: add masks for sys-apps/musl-locales

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

 profiles/base/package.mask  | 4 
 profiles/features/musl/package.mask | 4 
 2 files changed, 8 insertions(+)

diff --git a/profiles/base/package.mask b/profiles/base/package.mask
index 13ebbc9bd1e6..f09a97d08bf5 100644
--- a/profiles/base/package.mask
+++ b/profiles/base/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mike Gilbert  (2023-06-15)
+# Conflicts with glibc.
+sys-apps/musl-locales
+
 # Sam James  (2023-06-06)
 # Only available on Linux.
 dev-libs/libaio

diff --git a/profiles/features/musl/package.mask 
b/profiles/features/musl/package.mask
index 94bf8b9e00bc..3b525be68812 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mike Gilbert  (2023-06-15)
+# Reverse entry from base profile.
+-sys-apps/musl-locales
+
 # Maciej Barć  (2023-04-03)
 # Mask until execinfo.h use can be properly patched, bug #877721 and #903689.
 dev-scheme/guile-ssh



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

2023-06-15 Thread Mike Gilbert
commit: c01c0df19e85e458c18827797b6beac0792b7ad8
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Jun 15 20:38:17 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Jun 15 20:38:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c01c0df1

sys-apps/musl-locales: add blocker on glibc

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

 sys-apps/musl-locales/musl-locales-0.1.0.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys-apps/musl-locales/musl-locales-0.1.0.ebuild 
b/sys-apps/musl-locales/musl-locales-0.1.0.ebuild
index c50b7a93e29b..d59081b1ed0d 100644
--- a/sys-apps/musl-locales/musl-locales-0.1.0.ebuild
+++ b/sys-apps/musl-locales/musl-locales-0.1.0.ebuild
@@ -13,6 +13,8 @@ LICENSE="LGPL-3 MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
+RDEPEND="!sys-libs/glibc"
+
 src_configure() {
local mycmakeargs=(
-DLOCALE_PROFILE=OFF



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

2023-06-15 Thread Mike Gilbert
commit: 34d3f70685487b608f1b5485284d86dc2ceb250b
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Jun 15 20:05:09 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Jun 15 20:29:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34d3f706

sys-apps/musl-locales: new package, add 0.1.0

Bug: https://bugs.gentoo.org/864963
Bug: https://bugs.gentoo.org/865867
Bug: https://bugs.gentoo.org/874636
Bug: https://bugs.gentoo.org/898528
Bug: https://bugs.gentoo.org/906015
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/musl-locales/Manifest  |  1 +
 sys-apps/musl-locales/metadata.xml  |  7 +++
 sys-apps/musl-locales/musl-locales-0.1.0.ebuild | 21 +
 3 files changed, 29 insertions(+)

diff --git a/sys-apps/musl-locales/Manifest b/sys-apps/musl-locales/Manifest
new file mode 100644
index ..a3e2f4919b40
--- /dev/null
+++ b/sys-apps/musl-locales/Manifest
@@ -0,0 +1 @@
+DIST musl-locales-0.1.0.tar.xz 26744 BLAKE2B 
9ad696e7006a124f2e633e3f5476b68806659ddeac2e7cbd0ce485087870463256f3dcc11c3d37074cfc863ce8afed1b31bdf7c80435cce182fce95e81bf16b0
 SHA512 
bc1e581676ef21aa22b85932186189ba5fd0b1701feef4906f42baa296a90fc6886101d02a46a9560b883aad42aa4808ed46c5dddc09d97d1a0f75943a0d456a

diff --git a/sys-apps/musl-locales/metadata.xml 
b/sys-apps/musl-locales/metadata.xml
new file mode 100644
index ..6b00211d29ea
--- /dev/null
+++ b/sys-apps/musl-locales/metadata.xml
@@ -0,0 +1,7 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   m...@gentoo.org
+   
+

diff --git a/sys-apps/musl-locales/musl-locales-0.1.0.ebuild 
b/sys-apps/musl-locales/musl-locales-0.1.0.ebuild
new file mode 100644
index ..c50b7a93e29b
--- /dev/null
+++ b/sys-apps/musl-locales/musl-locales-0.1.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Locale program for musl libc"
+HOMEPAGE="https://git.adelielinux.org/adelie/musl-locales;
+SRC_URI="https://git.adelielinux.org/adelie/musl-locales/uploads/7e855b894b18ca4bf4ecb11b5bcbc4c1/${P}.tar.xz;
+
+LICENSE="LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_configure() {
+   local mycmakeargs=(
+   -DLOCALE_PROFILE=OFF
+   )
+   cmake_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: www-client/vivaldi/

2023-06-15 Thread James Le Cuirot
commit: 6cf6a9b04f5af2689675f33d3d50a8692ea8f56f
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Jun 15 20:23:13 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Jun 15 20:27:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cf6a9b0

www-client/vivaldi: Add version 6.1.3035.84

Signed-off-by: James Le Cuirot  gentoo.org>

 www-client/vivaldi/Manifest   |   3 +
 www-client/vivaldi/vivaldi-6.1.3035.84.ebuild | 218 ++
 2 files changed, 221 insertions(+)

diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 40b65a222802..3fbeeb778b80 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -7,3 +7,6 @@ DIST vivaldi-stable_6.1.3035.51-1_armhf.deb 93646512 BLAKE2B 
79a09180fb6639ce488
 DIST vivaldi-stable_6.1.3035.75-1_amd64.deb 97880224 BLAKE2B 
045b1ba88f6195ed0fccd26d0eb20aafb4fadf43afdc7f3d8c1cfef9a3b2d216b37e7233d8f5b255ed8d633edc023aea9b380ce04d16129df7edad1799b818c9
 SHA512 
2500cb3b4effc178802e4e8088e04b9db7e3680fa366573c4b27c05bdbf6ec0cafaf1968471ce58fc033c28425bd58c2539a60e880e27f37502eb0ba1c0dec7a
 DIST vivaldi-stable_6.1.3035.75-1_arm64.deb 93526284 BLAKE2B 
cb9d13305da4f0ecb2c9e181c440b63a34f4a8dd839653bfbc1995c1e25cda0fa767fb91d1a87d5741448785946b2f1c757472c9bd01f4b52f8f345f50211ac0
 SHA512 
623a15457b42a6d95f415f4029bb2e89b092394f11c7e2fb181eeb89b74cef88bb489f81f944a1279f65c41e725dab6d6c55d1dbb297f8a4c5ec2d69d761e52a
 DIST vivaldi-stable_6.1.3035.75-1_armhf.deb 93649516 BLAKE2B 
fae9435d309264680592f4d3032a2feb69c2e2e080a2320c54a2ceab5eddd0b4326010bd13c8fde553ffe9de4e06a0c8aebce09e452a6b9b85f688e0bc3b8fb1
 SHA512 
3330e7e6feb4a50209855b601106d5da2cdc7a22ab76a713f84354a30320dc8f9a1db13d854e20707c8715c30061d88563a1d78c0c4b02341621e7e2c053cc44
+DIST vivaldi-stable_6.1.3035.84-1_amd64.deb 97891984 BLAKE2B 
44aee55879e514d4055881a062c8768d7494acf6d445d0700b836933fbeddf2a3b6ca891f81b320d62effedb43b3677ab9d5153fda3bfb5383cd21cc6fd515c4
 SHA512 
a8cc54903f662c0c40bae35ffbffd3c9e290127eba1a2e782794b92dd5d152573592aaf29b9878f47b57bc76d2f9cb32af2f02dfac96e678e3a63ff5350e6cde
+DIST vivaldi-stable_6.1.3035.84-1_arm64.deb 93488764 BLAKE2B 
d740fe5809cabf2b4e3508d582deae3337ac7ca4bf7e91239c683b3a9aa90052e149e320f716cab66b7d3b161a458ef284e4f5b61c40100db31e263876badbcc
 SHA512 
bcd6eb7daba74eda941882f0b8d1daec4e2894045e0281017a52d2759e2907ddfadd37912b864e4e6a9b561b1cd0e6872711e7075277fc4ae320c523300afb1a
+DIST vivaldi-stable_6.1.3035.84-1_armhf.deb 93665740 BLAKE2B 
ee41cb5842db67c9da9bf133cbc407898bc3c2e52cf24373166ea98d6119d0d13e038e3bf65202ce2d8f534115d4c83e7618b087651040aac8f296600131
 SHA512 
e36959743cab60f759aba861fbf0a8cb0bc2aa9ca8ecb7e72a029c62c98de5cd4e1344bf88a929f8d261e2dd470ae9f9e9e2d103e0f5a1c31387529b0107831a

diff --git a/www-client/vivaldi/vivaldi-6.1.3035.84.ebuild 
b/www-client/vivaldi/vivaldi-6.1.3035.84.ebuild
new file mode 100644
index ..0411bd537ae5
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-6.1.3035.84.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_VERSION="114"
+CHROMIUM_LANGS="
+   af
+   am
+   ar
+   az
+   be
+   bg
+   bn
+   ca
+   ca-valencia
+   cs
+   da
+   de
+   de-CH
+   el
+   en-GB
+   en-US
+   eo
+   es
+   es-419
+   es-PE
+   et
+   eu
+   fa
+   fi
+   fil
+   fr
+   fy
+   gd
+   gl
+   gu
+   he
+   hi
+   hr
+   hu
+   hy
+   id
+   io
+   is
+   it
+   ja
+   jbo
+   ka
+   kab
+   kn
+   ko
+   ku
+   lt
+   lv
+   mk
+   ml
+   mr
+   ms
+   nb
+   nl
+   nn
+   pa
+   pl
+   pt-BR
+   pt-PT
+   ro
+   ru
+   sc
+   sk
+   sl
+   sq
+   sr
+   sr-Latn
+   sv
+   sw
+   ta
+   te
+   th
+   tr
+   uk
+   ur
+   vi
+   zh-CN
+   zh-TW
+"
+
+inherit chromium-2 desktop linux-info unpacker xdg
+
+VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/;
+
+if [[ ${PV} = *_p* ]]; then
+   DEB_REV="${PV#*_p}"
+else
+   DEB_REV=1
+fi
+
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_;
+
+RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( 
${VIVALDI_BASE_URI}amd64.deb )"
+RE="\barm\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm? ( 
${VIVALDI_BASE_URI}armhf.deb )"
+RE="\barm64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm64? ( 
${VIVALDI_BASE_URI}arm64.deb )"
+RE="\bx86\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" x86? ( 
${VIVALDI_BASE_URI}i386.deb )"
+
+LICENSE="Vivaldi"
+SLOT="0"
+IUSE="gtk 

  1   2   3   >