[gentoo-commits] repo/gentoo:master commit in: games-kids/gmult/, games-kids/gmult/files/

[Ionen Wolkens]

commit: c8bc7034409f8a1adb184dff243d84a77766a37a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Mar 28 05:47:35 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Mar 28 05:49:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8bc7034

Revert "games-kids/gmult: fix build with meson-0.61.4"

This reverts commit 19102942b5d6049be39126e08436fd9e49dbc8e1.

This workaround won't be necessary, turns out cache updates are
skipped when DESTDIR is used and the failing dependency check was
due to a typo in meson-0.61.4 (fixed in -r1, thanks sam).

Bug: https://bugs.gentoo.org/836294
Signed-off-by: Ionen Wolkens  gentoo.org>

 games-kids/gmult/files/gmult-10.0-no-icon-cache.patch | 8 
 games-kids/gmult/gmult-10.0.ebuild| 4 
 2 files changed, 12 deletions(-)

diff --git a/games-kids/gmult/files/gmult-10.0-no-icon-cache.patch 
b/games-kids/gmult/files/gmult-10.0-no-icon-cache.patch
deleted file mode 100644
index 2a355c17e228..
--- a/games-kids/gmult/files/gmult-10.0-no-icon-cache.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-https://bugs.gentoo.org/836294
 a/data/meson.build
-+++ b/data/meson.build
-@@ -56,3 +56,3 @@
- gnome.post_install(
--gtk_update_icon_cache: true,
-+gtk_update_icon_cache: false,
- )

diff --git a/games-kids/gmult/gmult-10.0.ebuild 
b/games-kids/gmult/gmult-10.0.ebuild
index b0c8fcd25418..6df28b33de33 100644
--- a/games-kids/gmult/gmult-10.0.ebuild
+++ b/games-kids/gmult/gmult-10.0.ebuild
@@ -26,10 +26,6 @@ BDEPEND="
$(vala_depend)
sys-devel/gettext"
 
-PATCHES=(
-   "${FILESDIR}"/${PN}-10.0-no-icon-cache.patch
-)
-
 DOCS=( NEWS.md README.md )
 
 src_configure() {

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

[Hans de Graaff]

commit: 1c2007b3af8edad16b40aef45b4ede9e26adda38
Author: Hans de Graaff  gentoo  org>
AuthorDate: Mon Mar 28 05:49:11 2022 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Mon Mar 28 05:49:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c2007b3

dev-ruby/slop: add 4.9.2

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

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

diff --git a/dev-ruby/slop/Manifest b/dev-ruby/slop/Manifest
index 2fac4c8e76e1..39ddb4f0416f 100644
--- a/dev-ruby/slop/Manifest
+++ b/dev-ruby/slop/Manifest
@@ -1 +1,2 @@
 DIST slop-4.9.1.tgz 16455 BLAKE2B 
5d66e1a03b69ac9bbc272c20adbe0daa1a086abf8651838a59c74bde6ff4e136c6b1e10c2266a96508ed333a0f752ace98f95a223464efef2ecea7eeededb024
 SHA512 
3211b876b910b76413d9109ea7ab400429fb350089a3d89a56b85894a556d0c278daea258551c355a96d9ec592bc7426d9461b7a3fed935c9917e9c18069e89f
+DIST slop-4.9.2.tgz 16633 BLAKE2B 
8907314016066569279dbab6b52f50cee58044b46c1a88c7cfab3a31e1bd7e702f63da170a42f113c5611080d5d212b9701e3aeb2bc8e86d5ea577b9f163
 SHA512 
dbecbc5edaf257131edf54fb5577531a962a6ed64f9414342b5060bee479cf7e4c9cfb891af3553644fbe7817a2067de3c83b379651a62da5983f0c42cd68fd6

diff --git a/dev-ruby/slop/slop-4.9.2.ebuild b/dev-ruby/slop/slop-4.9.2.ebuild
new file mode 100644
index ..adc818e81c51
--- /dev/null
+++ b/dev-ruby/slop/slop-4.9.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="slop.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple option parser with an easy to remember syntax and 
friendly API"
+HOMEPAGE="https://github.com/injekt/slop;
+SRC_URI="https://github.com/injekt/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+   sed -i -e '/git ls-files/d' slop.gemspec || die
+}

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

[Hans de Graaff]

commit: 769b0b0e24055ac500f89a389e62c7d9361d9cdc
Author: Hans de Graaff  gentoo  org>
AuthorDate: Mon Mar 28 05:47:39 2022 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Mon Mar 28 05:47:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=769b0b0e

dev-ruby/slop: drop 4.8.1, 4.8.2

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

 dev-ruby/slop/Manifest  |  2 --
 dev-ruby/slop/slop-4.8.1.ebuild | 28 
 dev-ruby/slop/slop-4.8.2.ebuild | 28 
 3 files changed, 58 deletions(-)

diff --git a/dev-ruby/slop/Manifest b/dev-ruby/slop/Manifest
index 5223e756fbd2..2fac4c8e76e1 100644
--- a/dev-ruby/slop/Manifest
+++ b/dev-ruby/slop/Manifest
@@ -1,3 +1 @@
-DIST slop-4.8.1.tgz 16805 BLAKE2B 
875b9a1895d99147f6d597b976831fcb406170d6172ad4c888f53cb18e35439f9fc6bcf785864a3209de5169166b2760d196e1f2f102308db3aec07950fe5e88
 SHA512 
4edace1693081ab7f9d1efaeb9c894f34c0012ae827ee13bd1c8014c222e88db20b082be3d6b0a97e664135b2ba09bec9e7ecb0d20c22b32a859ac574fd2b71e
-DIST slop-4.8.2.tgz 16102 BLAKE2B 
c43af7350346961db1b19db2fbded24dc8a5483cf487f6dd6f6c486f9539984048f43eef7c3152da42b4c833eb9ec75d7ebfd89c7e759e5e5279bd5f69992f6a
 SHA512 
1747981d5723b935f4d2a89787cf090645e43793b7430d43687dde6dc7e0bc8b52c30497f656e360e0cb95d62f3abb19d9dc4aebb617da57de1211104217bdc4
 DIST slop-4.9.1.tgz 16455 BLAKE2B 
5d66e1a03b69ac9bbc272c20adbe0daa1a086abf8651838a59c74bde6ff4e136c6b1e10c2266a96508ed333a0f752ace98f95a223464efef2ecea7eeededb024
 SHA512 
3211b876b910b76413d9109ea7ab400429fb350089a3d89a56b85894a556d0c278daea258551c355a96d9ec592bc7426d9461b7a3fed935c9917e9c18069e89f

diff --git a/dev-ruby/slop/slop-4.8.1.ebuild b/dev-ruby/slop/slop-4.8.1.ebuild
deleted file mode 100644
index aefdfb5d23c7..
--- a/dev-ruby/slop/slop-4.8.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="slop.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple option parser with an easy to remember syntax and 
friendly API"
-HOMEPAGE="https://github.com/injekt/slop;
-SRC_URI="https://github.com/injekt/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-   sed -i -e '/git ls-files/d' slop.gemspec || die
-}

diff --git a/dev-ruby/slop/slop-4.8.2.ebuild b/dev-ruby/slop/slop-4.8.2.ebuild
deleted file mode 100644
index 6618224d5852..
--- a/dev-ruby/slop/slop-4.8.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="slop.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple option parser with an easy to remember syntax and 
friendly API"
-HOMEPAGE="https://github.com/injekt/slop;
-SRC_URI="https://github.com/injekt/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-   sed -i -e '/git ls-files/d' slop.gemspec || die
-}

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

[Sam James]

commit: f97a560be2de84ac8d5f911eb77e68e3036744e3
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 28 05:43:52 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 28 05:44:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f97a560b

dev-util/meson: fix gtk-update-icon-cache check

Was checking for gtk4* twice.

Bug: https://bugs.gentoo.org/836294
Closes: https://bugs.gentoo.org/836293
Closes: https://bugs.gentoo.org/836281
Signed-off-by: Sam James  gentoo.org>

 ...on-0.61.4-fix-gtk-update-icon-cache-check.patch | 29 ++
 ...{meson-0.61.4.ebuild => meson-0.61.4-r1.ebuild} |  4 +++
 2 files changed, 33 insertions(+)

diff --git 
a/dev-util/meson/files/meson-0.61.4-fix-gtk-update-icon-cache-check.patch 
b/dev-util/meson/files/meson-0.61.4-fix-gtk-update-icon-cache-check.patch
new file mode 100644
index ..7be12b7a98ac
--- /dev/null
+++ b/dev-util/meson/files/meson-0.61.4-fix-gtk-update-icon-cache-check.patch
@@ -0,0 +1,29 @@
+https://github.com/mesonbuild/meson/commit/dac212e1bba707b9ac67b48902d761ee7ca8fa04
+
+From dac212e1bba707b9ac67b48902d761ee7ca8fa04 Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot 
+Date: Wed, 23 Mar 2022 22:15:11 +0100
+Subject: [PATCH] gnome module: properly fallback to gtk-update-icon-cache
+
+Commit a0cade8f introduced a typo and wrongly check for
+gtk4-update-icon-cache twice.
+If gtk4-update-icon-cache (gtk4) is not found, look for
+gtk-update-icon-cache (gtk3) instead.
+---
+ mesonbuild/modules/gnome.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
+index 673a781a41d..501be9ae4da 100644
+--- a/mesonbuild/modules/gnome.py
 b/mesonbuild/modules/gnome.py
+@@ -371,7 +371,7 @@ def post_install(self, state: 'ModuleState', args: 
T.List['TYPE_var'], kwargs: '
+ prog = state.find_program('gtk4-update-icon-cache', 
required=False)
+ found = isinstance(prog, build.Executable) or prog.found()
+ if not found:
+-prog = state.find_program('gtk4-update-icon-cache')
++prog = state.find_program('gtk-update-icon-cache')
+ icondir = os.path.join(datadir_abs, 'icons', 'hicolor')
+ script = state.backend.get_executable_serialisation([prog, '-q', 
'-t', '-f', icondir])
+ script.skip_if_destdir = True
+

diff --git a/dev-util/meson/meson-0.61.4.ebuild 
b/dev-util/meson/meson-0.61.4-r1.ebuild
similarity index 97%
rename from dev-util/meson/meson-0.61.4.ebuild
rename to dev-util/meson/meson-0.61.4-r1.ebuild
index 52bbb982abcc..bbc8938fb7ed 100644
--- a/dev-util/meson/meson-0.61.4.ebuild
+++ b/dev-util/meson/meson-0.61.4-r1.ebuild
@@ -35,6 +35,10 @@ DEPEND="
)
 "
 
+PATCHES=(
+   "${FILESDIR}"/${P}-fix-gtk-update-icon-cache-check.patch
+)
+
 python_prepare_all() {
local disable_unittests=(
# ASAN and sandbox both want control over LD_PRELOAD

[gentoo-commits] repo/gentoo:master commit in: app-containers/containerd/

[William Hubbs]

commit: b0c789e55fe279952eff475ff60cc1574ea5f917
Author: William Hubbs  gentoo  org>
AuthorDate: Mon Mar 28 05:34:56 2022 +
Commit: William Hubbs  gentoo  org>
CommitDate: Mon Mar 28 05:34:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0c789e5

app-containers/containerd: add 1.5.11

Closes: https://bugs.gentoo.org/835367
Bug: https://bugs.gentoo.org/835917
Signed-off-by: William Hubbs  gentoo.org>

 app-containers/containerd/Manifest |  1 +
 app-containers/containerd/containerd-1.5.11.ebuild | 84 ++
 2 files changed, 85 insertions(+)

diff --git a/app-containers/containerd/Manifest 
b/app-containers/containerd/Manifest
index 7681b38a8cb9..ec595c999b3f 100644
--- a/app-containers/containerd/Manifest
+++ b/app-containers/containerd/Manifest
@@ -1,3 +1,4 @@
 DIST containerd-1.4.11.tar.gz 6406769 BLAKE2B 
a4882223e2f71944a4d46fb0500a95248cfa33735447952f94c7d7350c2cb62b4911adc77f96559116cca462be02b7270185a0a3dfed5ce4c530465cca7e2078
 SHA512 
16aa6ae4209939754e122545b454d8b25027a3621464a4b4e0379480b35adf0efb318271f82cf2b959a62fffe531979c9bdfee9ac7d47d4b33269a6bafe2d070
 DIST containerd-1.4.12.tar.gz 6408402 BLAKE2B 
559164a9d8680edea52040690da8e9b45777a39e471b1a7cc56ff4cf207cee7c83dc73969a8868db5d531f6e4e27cc7a975f073ffcf7f9c2768858b1a4001ddf
 SHA512 
52dc4b0344eb4c6a6f1cc5690ff0c70ee052ef05c02300ed4a806458c40bb1970c26b374b0733b2c30a05c04a731d62a7c4206b1d768075d51c202912efd32b1
+DIST containerd-1.5.11.tar.gz 7494477 BLAKE2B 
2415e85694e5f4410c8cee7be08d1d304adfcdb95c4078f7a92c710a5a11a29ae011daa70fcfa72c2fabf5b48b7cac962b39121f18bb027931ef77214e86b1aa
 SHA512 
6348f4ae7f9b473aac7d5e7325ca4539345d09f01b95383cec28f09d5e5b0b831e25fe305c3a15050f1e1959948ee8dcad788a1d6dd4780cf3077132d5617ef8
 DIST containerd-1.5.9.tar.gz 7695248 BLAKE2B 
1bbd755cadee9022671e6340a194c7190b7249001b56128cb6a94982d83c01dc9292e08ab591728fa223523d7488bed63d055ce0b552196cf4d1c7dfb41928b5
 SHA512 
13d5b8bcfd811b1abf67008d1c664962f315cd45d885adaa88847bcc4f1c5d743dccd62bc34fe77348ca18a4f8841ce7a8a022cccb275b19b59017b3fbf1054b

diff --git a/app-containers/containerd/containerd-1.5.11.ebuild 
b/app-containers/containerd/containerd-1.5.11.ebuild
new file mode 100644
index ..2d706c67b79c
--- /dev/null
+++ b/app-containers/containerd/containerd-1.5.11.ebuild
@@ -0,0 +1,84 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GIT_REVISION=3df54a852345ae127d1fa3092b95168e4a88e2f8
+inherit go-module systemd
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/;
+SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
+
+DEPEND="
+   btrfs? ( sys-fs/btrfs-progs )
+   seccomp? ( sys-libs/libseccomp )
+"
+
+# recommended version of runc is found in script/setup/runc-version
+RDEPEND="
+   ${DEPEND}
+   ~app-containers/runc-1.0.3
+"
+
+BDEPEND="
+   dev-go/go-md2man
+   virtual/pkgconfig
+"
+
+# tests require root or docker
+# upstream does not recommend stripping binary
+RESTRICT+=" strip test"
+
+src_prepare() {
+   default
+   sed -i \
+   -e "s/-s -w//" \
+   Makefile || die
+   sed -i \
+   -e "s:/usr/local:/usr:" \
+   containerd.service || die
+}
+
+src_compile() {
+   local options=(
+   $(usev apparmor)
+   $(usex btrfs "" "no_btrfs")
+   $(usex cri "" "no_cri")
+   $(usex device-mapper "" "no_devmapper")
+   $(usev seccomp)
+   $(usev selinux)
+   )
+
+   myemakeargs=(
+   BUILDTAGS="${options[*]}"
+   LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
+   REVISION="${GIT_REVISION}"
+   VERSION=v${PV}
+   )
+
+   # race condition in man target https://bugs.gentoo.org/765100
+   # we need to explicitly specify GOFLAGS for "go run" to use vendor 
source
+   emake "${myemakeargs[@]}" man -j1 #nowarn
+   emake "${myemakeargs[@]}" all
+
+}
+
+src_install() {
+   dobin bin/*
+   doman man/*
+   newinitd "${FILESDIR}"/${PN}.initd "${PN}"
+   systemd_dounit containerd.service
+   keepdir /var/lib/containerd
+
+   # we already installed manpages, remove markdown source
+   # before installing docs directory
+   rm -r docs/man || die
+
+   local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md 
docs/. )
+   einstalldocs
+}

[gentoo-commits] repo/gentoo:master commit in: app-containers/containerd/

[William Hubbs]

commit: 2d76a6aa658803749fb6fdd3430b4a9d4239e19d
Author: William Hubbs  gentoo  org>
AuthorDate: Mon Mar 28 05:34:57 2022 +
Commit: William Hubbs  gentoo  org>
CommitDate: Mon Mar 28 05:34:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d76a6aa

app-containers/containerd: drop 1.5.9

Signed-off-by: William Hubbs  gentoo.org>

 app-containers/containerd/Manifest|  1 -
 app-containers/containerd/containerd-1.5.9.ebuild | 84 ---
 2 files changed, 85 deletions(-)

diff --git a/app-containers/containerd/Manifest 
b/app-containers/containerd/Manifest
index ec595c999b3f..34f3c8060fd0 100644
--- a/app-containers/containerd/Manifest
+++ b/app-containers/containerd/Manifest
@@ -1,4 +1,3 @@
 DIST containerd-1.4.11.tar.gz 6406769 BLAKE2B 
a4882223e2f71944a4d46fb0500a95248cfa33735447952f94c7d7350c2cb62b4911adc77f96559116cca462be02b7270185a0a3dfed5ce4c530465cca7e2078
 SHA512 
16aa6ae4209939754e122545b454d8b25027a3621464a4b4e0379480b35adf0efb318271f82cf2b959a62fffe531979c9bdfee9ac7d47d4b33269a6bafe2d070
 DIST containerd-1.4.12.tar.gz 6408402 BLAKE2B 
559164a9d8680edea52040690da8e9b45777a39e471b1a7cc56ff4cf207cee7c83dc73969a8868db5d531f6e4e27cc7a975f073ffcf7f9c2768858b1a4001ddf
 SHA512 
52dc4b0344eb4c6a6f1cc5690ff0c70ee052ef05c02300ed4a806458c40bb1970c26b374b0733b2c30a05c04a731d62a7c4206b1d768075d51c202912efd32b1
 DIST containerd-1.5.11.tar.gz 7494477 BLAKE2B 
2415e85694e5f4410c8cee7be08d1d304adfcdb95c4078f7a92c710a5a11a29ae011daa70fcfa72c2fabf5b48b7cac962b39121f18bb027931ef77214e86b1aa
 SHA512 
6348f4ae7f9b473aac7d5e7325ca4539345d09f01b95383cec28f09d5e5b0b831e25fe305c3a15050f1e1959948ee8dcad788a1d6dd4780cf3077132d5617ef8
-DIST containerd-1.5.9.tar.gz 7695248 BLAKE2B 
1bbd755cadee9022671e6340a194c7190b7249001b56128cb6a94982d83c01dc9292e08ab591728fa223523d7488bed63d055ce0b552196cf4d1c7dfb41928b5
 SHA512 
13d5b8bcfd811b1abf67008d1c664962f315cd45d885adaa88847bcc4f1c5d743dccd62bc34fe77348ca18a4f8841ce7a8a022cccb275b19b59017b3fbf1054b

diff --git a/app-containers/containerd/containerd-1.5.9.ebuild 
b/app-containers/containerd/containerd-1.5.9.ebuild
deleted file mode 100644
index 8c3ca72bdc9c..
--- a/app-containers/containerd/containerd-1.5.9.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GIT_REVISION=1407cab509ff0d96baa4f0eb6ff9980270e6e620
-inherit go-module systemd
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/;
-SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-DEPEND="
-   btrfs? ( sys-fs/btrfs-progs )
-   seccomp? ( sys-libs/libseccomp )
-"
-
-# recommended version of runc is found in script/setup/runc-version
-RDEPEND="
-   ${DEPEND}
-   ~app-containers/runc-1.0.3
-"
-
-BDEPEND="
-   dev-go/go-md2man
-   virtual/pkgconfig
-"
-
-# tests require root or docker
-# upstream does not recommend stripping binary
-RESTRICT+=" strip test"
-
-src_prepare() {
-   default
-   sed -i \
-   -e "s/-s -w//" \
-   Makefile || die
-   sed -i \
-   -e "s:/usr/local:/usr:" \
-   containerd.service || die
-}
-
-src_compile() {
-   local options=(
-   $(usev apparmor)
-   $(usex btrfs "" "no_btrfs")
-   $(usex cri "" "no_cri")
-   $(usex device-mapper "" "no_devmapper")
-   $(usev seccomp)
-   $(usev selinux)
-   )
-
-   myemakeargs=(
-   BUILDTAGS="${options[*]}"
-   LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-   REVISION="${GIT_REVISION}"
-   VERSION=v${PV}
-   )
-
-   # race condition in man target https://bugs.gentoo.org/765100
-   # we need to explicitly specify GOFLAGS for "go run" to use vendor 
source
-   emake "${myemakeargs[@]}" man -j1 #nowarn
-   emake "${myemakeargs[@]}" all
-
-}
-
-src_install() {
-   dobin bin/*
-   doman man/*
-   newinitd "${FILESDIR}"/${PN}.initd "${PN}"
-   systemd_dounit containerd.service
-   keepdir /var/lib/containerd
-
-   # we already installed manpages, remove markdown source
-   # before installing docs directory
-   rm -r docs/man || die
-
-   local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md 
docs/. )
-   einstalldocs
-}

[gentoo-commits] repo/gentoo:master commit in: app-containers/containerd/

[William Hubbs]

commit: 08561219d3263a52bc263a73334003cd8f06eabe
Author: William Hubbs  gentoo  org>
AuthorDate: Mon Mar 28 05:34:56 2022 +
Commit: William Hubbs  gentoo  org>
CommitDate: Mon Mar 28 05:34:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08561219

app-containers/containerd: revert BDEPEND on https://bugs.gentoo.org/835367
Signed-off-by: William Hubbs  gentoo.org>

 app-containers/containerd/containerd-1.4.11.ebuild | 4 +---
 app-containers/containerd/containerd-1.4.12.ebuild | 2 --
 app-containers/containerd/containerd-1.5.9.ebuild  | 2 --
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/app-containers/containerd/containerd-1.4.11.ebuild 
b/app-containers/containerd/containerd-1.4.11.ebuild
index 30fae7be30c6..44e419c33326 100644
--- a/app-containers/containerd/containerd-1.4.11.ebuild
+++ b/app-containers/containerd/containerd-1.4.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,9 +27,7 @@ RDEPEND="
~app-containers/runc-1.0.2
 "
 
-# bug #835367 for Go < 1.18 dep
 BDEPEND="
-   

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

[Matt Turner]

commit: f21b713cbfc31123a8fb3f74338e69feb5b4fb0d
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Mar 28 05:00:33 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Mar 28 05:00:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f21b713c

media-sound/pulseaudio: Fix multilib build

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

 media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild 
b/media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild
index 21060b033fd1..df8a1deea80e 100644
--- a/media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild
@@ -211,7 +211,7 @@ multilib_src_configure() {
$(meson_feature asyncns)
$(meson_native_use_feature zeroconf avahi)
$(meson_native_use_feature bluetooth bluez5)
-   $(meson_feature gstreamer bluez5-gstreamer)
+   $(meson_native_use_feature gstreamer bluez5-gstreamer)
$(meson_native_use_bool native-headset bluez5-native-headset)
$(meson_native_use_bool ofono-headset bluez5-ofono-headset)
$(meson_feature dbus)

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

[Matt Turner]

commit: 807f4bfb110cce1960540262ab3488d06bf0b47e
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Mar 28 03:54:38 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Mar 28 04:21:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=807f4bfb

x11-libs/vte: Version bump to 0.68.0

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

 x11-libs/vte/Manifest  |  2 +
 x11-libs/vte/vte-0.68.0.ebuild | 90 ++
 2 files changed, 92 insertions(+)

diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 6d7024880831..d895cc2221c9 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,3 +1,5 @@
 DIST vte-0.28.2.tar.xz 962340 BLAKE2B 
1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9
 SHA512 
d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6
 DIST vte-0.66.2-command-notify.patch.xz 9672 BLAKE2B 
8153a250f571f491845041627029065029bd32ab63c127aacc0852f42abee0834c716d63248120a49011857901d775b75fc0c31a513cfb113563e8ffb599e478
 SHA512 
d491f8332fbd21e8dfe225636ca035339ab1da3bd7dc74436cdd2f3de3c5f24f609f9825c4eb0b816c9f60862da62b97f36381c5cc5af0203b3698d56fc77d3e
 DIST vte-0.66.2.tar.bz2 503503 BLAKE2B 
174a0d9bfdaf2318255e62041ed94aa53f8fc110ed55f3e7b24baa70dd01a4851306ac47cc3f1d6699341c9ab41f85aee57c460b9f96bfd14618f0f40e4bd657
 SHA512 
6e9e2cc03b72c2d04aa3d7633dcf86649dcef39fdfecbe7a0c4b063eaccdb2ea83207f592edf348fad5a36f091d9261cc46fd0a4e9e5db6006fcecb0d01a6ccc
+DIST vte-0.68.0-command-notify.patch.xz 9748 BLAKE2B 
de2d4c9b7f2c2b21518984f818d0052c0084398f5f4ee30d766a6adb9c4536fdec5027c753d3d710fb7432e67472b7f8ca44f1dd5f51aaef48d9124708975d24
 SHA512 
89be91cdba36749f97bac872f0f2196be7d36a58beaf94fa24a3ae9c266bdfbf4f4fbf1d10f43a276540653fff7062eb844107016e7f014437f2903d251dc1d7
+DIST vte-0.68.0.tar.bz2 507598 BLAKE2B 
10274d9e804f00bf071b7848633ca8de2953f4e91dc2967e33b7d6698bb304baac4f0e0431debae5a972c2c56c65efd1c5b92455a17db08cf254ddec56d3276e
 SHA512 
785df7261b5075f166e59de7d3535b381564715ce65efd4837a130e153528691b610fc6160c00f0f17008f5f4ee94c23350d9a477b4b1d58da6ace083e5caae1

diff --git a/x11-libs/vte/vte-0.68.0.ebuild b/x11-libs/vte/vte-0.68.0.ebuild
new file mode 100644
index ..161fb49fb97e
--- /dev/null
+++ b/x11-libs/vte/vte-0.68.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+VALA_MIN_API_VERSION="0.48"
+
+inherit gnome.org meson python-any-r1 vala xdg
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE 
https://gitlab.gnome.org/GNOME/vte;
+
+# Once SIXEL support ships (0.66 or later), might need xterm license (but code 
might be considered upgraded to LGPL-3+)
+LICENSE="LGPL-3+ GPL-3+"
+SLOT="2.91"
+IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+REQUIRED_USE="vala? ( introspection )"
+
+# Upstream is hostile and refuses to upload tarballs.
+SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2;
+SRC_URI="${SRC_URI} !vanilla? ( 
https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.68.0-command-notify.patch.xz 
)"
+
+RDEPEND="
+   >=x11-libs/gtk+-3.24.22:3[introspection?]
+   >=dev-libs/fribidi-1.0.0
+   >=dev-libs/glib-2.52:2
+   crypt?  ( >=net-libs/gnutls-3.2.7:0= )
+   icu? ( dev-libs/icu:= )
+   >=x11-libs/pango-1.22.0
+   >=dev-libs/libpcre2-10.21
+   systemd? ( >=sys-apps/systemd-220:= )
+   sys-libs/zlib
+   introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+   x11-libs/pango[introspection?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   ${PYTHON_DEPS}
+   dev-libs/libxml2:2
+   dev-util/glib-utils
+   gtk-doc? ( >=dev-util/gtk-doc-1.13
+   app-text/docbook-xml-dtd:4.1.2 )
+   >=sys-devel/gettext-0.19.8
+   virtual/pkgconfig
+
+   vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+   
"${FILESDIR}"/${PN}-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch
+)
+
+src_prepare() {
+   default
+   use vala && vala_setup
+   xdg_environment_reset
+
+   if ! use vanilla; then
+   # Part of 
https://src.fedoraproject.org/rpms/vte291/raw/f31/f/vte291-cntnr-precmd-preexec-scroll.patch
+   # Adds OSC 777 support for desktop notifications in 
gnome-terminal or elsewhere
+   eapply "${WORKDIR}"/${PN}-0.68.0-command-notify.patch
+   fi
+
+   # -Ddebugg option enables various debug support via VTE_DEBUG, but also 
ggdb3; strip the latter
+   sed -e '/ggdb3/d' -i meson.build || die
+}
+
+src_configure() {
+   local 

[gentoo-commits] repo/gentoo:master commit in: x11-terms/gnome-terminal/

[Matt Turner]

commit: 6a9c98bc41d447d4ec6c5cf33775281826efda51
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Mar 28 04:08:12 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Mar 28 04:21:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a9c98bc

x11-terms/gnome-terminal: Version bump to 3.44.0

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

 x11-terms/gnome-terminal/Manifest  |  2 +
 .../gnome-terminal/gnome-terminal-3.44.0.ebuild| 93 ++
 2 files changed, 95 insertions(+)

diff --git a/x11-terms/gnome-terminal/Manifest 
b/x11-terms/gnome-terminal/Manifest
index d5162e387b45..b6035cd5058b 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,2 +1,4 @@
 DIST gnome-terminal-3.42.2-cntr-ntfy-autottl-ts.patch.xz 33980 BLAKE2B 
e0400f960064907c84a059b2210a9299e353b280e4bbe2fb98a887f9806fc2eb5f7de9d3e6dee243f6297275479ec546d47292bb30ea02e8f4a887fafbe04e71
 SHA512 
4afab38bff15963e88bc756914b5c379634c68d59f0be1189d969ea0a8b7f3f6c0a077199455cc4c2eca96e5c3df06bddebdc32b786aaba3a885e21cb710f210
 DIST gnome-terminal-3.42.2.tar.xz 1806388 BLAKE2B 
9e3068d9731689dd5dc012405384073a6ea07d59370340bcccdc3383e24f5a5424a14b5e903a01b4cca3925758f9b2f5cd7861b30658324297f817807fefbb66
 SHA512 
001504539adbcdac609f22ee8120455d2a2db8f4208ca2715c6bb271b5488bfdbe78deca3c997cd4d2293f2e7e51db66746af56f5ba46792542654972dbc739e
+DIST gnome-terminal-3.44.0-cntr-ntfy-autottl-ts.patch.xz 37248 BLAKE2B 
b3599386e7272fc5b742c11663f09bbfafa84cc855bd13fd602d679601fbb4126f36cdb157db37db335bf9edfe7d2b85e534baf837c5817984ec17baa4cdbb6c
 SHA512 
6422a774abfee18b2681115344f508b72ead1bb9f27b5b1596b419a9ce5a137d41e2d749b6d784170225e7f21f15c109f7eb74cc3164371d53dee7790bf99187
+DIST gnome-terminal-3.44.0.tar.xz 1810124 BLAKE2B 
041aa7400cbf0f075c37f6276d06dbffb0b87da13d8bcb9d13e62b13a1e16ae612970d1ec6462c7c257f7bcf2da222b48df1d8d28ce24b216ae3d11c76f05341
 SHA512 
0cf039c0aa364a9ac63d9f24d466506a919cf733f2ee8dc1c6f42459e6c742bad678f7ad7cec3721e9512b8f414dc4c4c1f29057c73e5e4a870a04d6bcd98ed6

diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.44.0.ebuild 
b/x11-terms/gnome-terminal/gnome-terminal-3.44.0.ebuild
new file mode 100644
index ..a5297be2d0ec
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.44.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
+
+DESCRIPTION="A terminal emulator for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/ 
https://gitlab.gnome.org/GNOME/gnome-terminal;
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="debug +gnome-shell +nautilus vanilla"
+SRC_URI+=" !vanilla? ( 
https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.44.0-cntr-ntfy-autottl-ts.patch.xz
 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 
~amd64-linux ~x86-linux"
+
+# FIXME: automagic dependency on gtk+[X], just transitive but needs proper 
control, bug 624960
+RDEPEND="
+   >=dev-libs/glib-2.52:2
+   >=x11-libs/gtk+-3.22.27:3
+   >=x11-libs/vte-0.68.0:2.91[!vanilla?]
+   >=dev-libs/libpcre2-10
+   >=gnome-base/dconf-0.14
+   >=gnome-base/gsettings-desktop-schemas-0.1.0
+   sys-apps/util-linux
+   gnome-shell? ( gnome-base/gnome-shell )
+   nautilus? ( >=gnome-base/nautilus-3.28.0 )
+"
+DEPEND="${RDEPEND}"
+# itstool required for help/* with non-en LINGUAS, see bug #549358
+# xmllint required for glib-compile-resources, see bug #549304
+BDEPEND="
+   ${PYTHON_DEPS}
+   dev-libs/libxml2:2
+   dev-libs/libxslt
+   dev-util/gdbus-codegen
+   dev-util/glib-utils
+   dev-util/itstool
+   >=sys-devel/gettext-0.19.8
+   virtual/pkgconfig
+"
+
+DOC_CONTENTS="To get previous working directory inherited in new opened tab, or
+   notifications of long-running commands finishing, you will need
+   to add the following line to your ~/.bashrc:\n
+   . /etc/profile.d/vte-2.91.sh"
+
+src_prepare() {
+   if ! use vanilla; then
+   # https://bugzilla.gnome.org/show_bug.cgi?id=695371
+   # Fedora patches:
+   # Restore transparency support (with compositing WMs only)
+   # OSC 777 desktop notification support (notifications on tabs 
for long-running commands completing)
+   # Restore "Set title" support
+   # Automatic title updating based on currently running 
foreground process
+   # 
https://src.fedoraproject.org/rpms/gnome-terminal/raw/f31/f/gnome-terminal-cntr-ntfy-autottl-ts.patch
+   # Depends on vte[-vanilla] for OSC 777 and the 
preexec/precmd/etc patches in VTE
+   eapply "${WORKDIR}"/${PN}-3.44.0-cntr-ntfy-autottl-ts.patch
+   fi
+   default
+}
+
+src_configure() {
+ 

[gentoo-commits] repo/gentoo:master commit in: games-kids/gmult/, games-kids/gmult/files/

[Ionen Wolkens]

commit: 19102942b5d6049be39126e08436fd9e49dbc8e1
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Mar 28 04:15:03 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Mar 28 04:20:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19102942

games-kids/gmult: fix build with meson-0.61.4

meson-0.61.4's gnome module now checks that gtk4-update-icon-cache is
available if updating cache is requested (was ignored with <=0.61.3),
simply skip given this should be handled by xdg.eclass either way.

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

 games-kids/gmult/files/gmult-10.0-no-icon-cache.patch | 8 
 games-kids/gmult/gmult-10.0.ebuild| 4 
 2 files changed, 12 insertions(+)

diff --git a/games-kids/gmult/files/gmult-10.0-no-icon-cache.patch 
b/games-kids/gmult/files/gmult-10.0-no-icon-cache.patch
new file mode 100644
index ..2a355c17e228
--- /dev/null
+++ b/games-kids/gmult/files/gmult-10.0-no-icon-cache.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/836294
+--- a/data/meson.build
 b/data/meson.build
+@@ -56,3 +56,3 @@
+ gnome.post_install(
+-gtk_update_icon_cache: true,
++gtk_update_icon_cache: false,
+ )

diff --git a/games-kids/gmult/gmult-10.0.ebuild 
b/games-kids/gmult/gmult-10.0.ebuild
index 6df28b33de33..b0c8fcd25418 100644
--- a/games-kids/gmult/gmult-10.0.ebuild
+++ b/games-kids/gmult/gmult-10.0.ebuild
@@ -26,6 +26,10 @@ BDEPEND="
$(vala_depend)
sys-devel/gettext"
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-10.0-no-icon-cache.patch
+)
+
 DOCS=( NEWS.md README.md )
 
 src_configure() {

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

[Sam James]

commit: dbd6fab6da23dc0647ae43031dfeaa7002aa0453
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 28 04:00:10 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 28 04:00:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbd6fab6

profiles: mask dev-python/reportlab-3.6.9 (hangs in compile)

Hangs b/c of /usr/include/node/src -> /usr/include/node symlink
installed by net-libs/nodejs.

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

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

diff --git a/profiles/package.mask b/profiles/package.mask
index ca933b566b3f..c8c8023fb8e8 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,13 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James  (2022-03-28)
+# Hangs in src_compile when net-libs/nodejs is installed
+# Masked pending either a workaround in reportlab or
+# adaptations to nodejs.
+# bug #836301
+=dev-python/reportlab-3.6.9
+
 # Matt Turner  (2022-03-27)
 # Dead package. No reverse dependencies.
 # Removal on 2022-04-27

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

[Sam James]

commit: bf70fc6f858192032083797585be058d5091bf2f
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 28 01:20:26 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 28 01:20:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf70fc6f

dev-util/ccls: fix CMake configure error

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

 dev-util/ccls/ccls-0.20210330.ebuild |  6 +-
 dev-util/ccls/files/ccls-0.20210330-llvm-cmake.patch | 18 ++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/dev-util/ccls/ccls-0.20210330.ebuild 
b/dev-util/ccls/ccls-0.20210330.ebuild
index 377cc36c8068..9b48ac669633 100644
--- a/dev-util/ccls/ccls-0.20210330.ebuild
+++ b/dev-util/ccls/ccls-0.20210330.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,6 +32,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+   "${FILESDIR}"/${P}-llvm-cmake.patch
+)
+
 src_configure() {
local mycmakeargs=(
-DCCLS_VERSION=${PV}

diff --git a/dev-util/ccls/files/ccls-0.20210330-llvm-cmake.patch 
b/dev-util/ccls/files/ccls-0.20210330-llvm-cmake.patch
new file mode 100644
index ..8d8db4483db5
--- /dev/null
+++ b/dev-util/ccls/files/ccls-0.20210330-llvm-cmake.patch
@@ -0,0 +1,18 @@
+https://github.com/MaskRay/ccls/commit/dce86b1362acbabb8f997869fdaa27adc67f9a55.patch
+https://bugs.gentoo.org/835916
+
+From: Fangrui Song 
+Date: Wed, 15 Dec 2021 10:13:29 -0800
+Subject: [PATCH] cmake: Add LANGUAGE C to fix find_package(Clang REQUIRED)
+ error
+
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ cmake_minimum_required(VERSION 3.8)
+-project(ccls LANGUAGES CXX)
++project(ccls LANGUAGES CXX C)
+ 
+ option(USE_SYSTEM_RAPIDJSON "Use system RapidJSON instead of the git 
submodule if exists" ON)
+ 
+

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

[Sam James]

commit: 649e483cce1e297b115e2267540e12e978413098
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 28 01:29:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 28 01:29:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=649e483c

dev-util/ccls: add LLVM 14 patches; use llvm.eclass

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

 ...{ccls-.ebuild => ccls-0.20210330-r1.ebuild} |  17 ++-
 dev-util/ccls/ccls-.ebuild |  17 ++-
 dev-util/ccls/files/ccls-0.20210330-llvm14.patch   | 139 +
 3 files changed, 165 insertions(+), 8 deletions(-)

diff --git a/dev-util/ccls/ccls-.ebuild 
b/dev-util/ccls/ccls-0.20210330-r1.ebuild
similarity index 65%
copy from dev-util/ccls/ccls-.ebuild
copy to dev-util/ccls/ccls-0.20210330-r1.ebuild
index 377cc36c8068..f2069853b3f4 100644
--- a/dev-util/ccls/ccls-.ebuild
+++ b/dev-util/ccls/ccls-0.20210330-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,9 +7,12 @@ EGIT_REPO_URI="https://github.com/MaskRay/${PN};
 
 if [[ ${PV} = * ]]; then
GIT_ECLASS="git-r3"
+   LLVM_MAX_SLOT=
+else
+   LLVM_MAX_SLOT=14
 fi
 
-inherit cmake ${GIT_ECLASS}
+inherit cmake llvm ${GIT_ECLASS}
 
 DESCRIPTION="C/C++/ObjC language server"
 HOMEPAGE="https://github.com/MaskRay/ccls;
@@ -25,13 +28,19 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 
+# We only depend on Clang because of a quirk in how dependencies work
+# See comment in llvm.eclass docs
 DEPEND="
dev-libs/rapidjson
-   sys-devel/clang:=
-   sys-devel/llvm:=
+   https://github.com/MaskRay/${PN};
 
 if [[ ${PV} = * ]]; then
GIT_ECLASS="git-r3"
+   LLVM_MAX_SLOT=
+else
+   LLVM_MAX_SLOT=14
 fi
 
-inherit cmake ${GIT_ECLASS}
+inherit cmake llvm ${GIT_ECLASS}
 
 DESCRIPTION="C/C++/ObjC language server"
 HOMEPAGE="https://github.com/MaskRay/ccls;
@@ -25,13 +28,19 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 
+# We only depend on Clang because of a quirk in how dependencies work
+# See comment in llvm.eclass docs
 DEPEND="
dev-libs/rapidjson
-   sys-devel/clang:=
-   sys-devel/llvm:=
+   https://github.com/MaskRay/ccls/commit/3ce756e39ae48204f016a58684652ad62b4dd9f9.patch
+https://github.com/MaskRay/ccls/commit/8422f0a522b6fbcb4412a8ec73d80b4acbc7e00f.patch
+https://github.com/MaskRay/ccls/commit/790daca4b2d9d5873623fee86283cd61212df674.patch
+
+From: Fangrui Song 
+Date: Thu, 23 Sep 2021 13:36:01 -0700
+Subject: [PATCH] Adaopt llvmorg-14-init-3863-g601102d282d5: refactor
+ clang::isIdentifierBody
+
+---
+ src/clang_tu.hh  | 4 
+ src/indexer.cc   | 6 +++---
+ src/working_files.cc | 9 ++---
+ 3 files changed, 13 insertions(+), 6 deletions(-)
+
+diff --git a/src/clang_tu.hh b/src/clang_tu.hh
+index b37950926..7dbfc4a88 100644
+--- a/src/clang_tu.hh
 b/src/clang_tu.hh
+@@ -17,6 +17,10 @@ namespace vfs = clang::vfs;
+ }
+ #endif
+ 
++#if LLVM_VERSION_MAJOR < 14 // llvmorg-14-init-3863-g601102d282d5
++#define isAsciiIdentifierContinue isIdentifierBody
++#endif
++
+ namespace ccls {
+ std::string pathFromFileEntry(const clang::FileEntry );
+ 
+diff --git a/src/indexer.cc b/src/indexer.cc
+index 89d78959e..644c0ccbb 100644
+--- a/src/indexer.cc
 b/src/indexer.cc
+@@ -527,8 +527,8 @@ class IndexDataConsumer : public index::IndexDataConsumer {
+ auto i = name.find(short_name);
+ if (short_name.size())
+   while (i != std::string::npos &&
+- ((i && isIdentifierBody(name[i - 1])) ||
+-  isIdentifierBody(name[i + short_name.size()])))
++ ((i && isAsciiIdentifierContinue(name[i - 1])) ||
++  isAsciiIdentifierContinue(name[i + short_name.size()])))
+ i = name.find(short_name, i + short_name.size());
+ if (i == std::string::npos) {
+   // e.g. operator type-parameter-1
+@@ -552,7 +552,7 @@ class IndexDataConsumer : public index::IndexDataConsumer {
+ paren++;
+   else if (name[i - 1] == '(')
+ paren--;
+-  else if (!(paren > 0 || isIdentifierBody(name[i - 1]) ||
++  else if (!(paren > 0 || isAsciiIdentifierContinue(name[i - 1]) ||
+  name[i - 1] == ':'))
+ break;
+ }
+diff --git a/src/working_files.cc b/src/working_files.cc
+index f80f21053..4904388be 100644
+--- a/src/working_files.cc
 b/src/working_files.cc
+@@ -342,7 +342,10 @@ std::optional 
WorkingFile::getIndexPosFromBufferPos(int line, int *column,
+ Position WorkingFile::getCompletionPosition(Position pos, std::string 
*filter) const {
+   int start = getOffsetForPosition(pos, buffer_content);
+   int i = start;
+-  while (i > 0 && isIdentifierBody(buffer_content[i - 1]))
++#if LLVM_VERSION_MAJOR < 14 // llvmorg-14-init-3863-g601102d282d5
++#define isAsciiIdentifierContinue isIdentifierBody
++#endif
++  while (i > 0 && 

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

[Sam James]

commit: 0ad7157bcadf54bf39f28b0157355950b4c04f59
Author: Kenneth Raplee  kennethraplee  com>
AuthorDate: Mon Mar 28 00:59:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 28 01:10:19 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0ad7157b

Revert Portage settings refactor

This partially reverts 18e5a8170c69aecd10f162918de571d85055ae81.

Bug: https://bugs.gentoo.org/836298
Bug: https://bugs.gentoo.org/836299
Closes: https://bugs.gentoo.org/836297
Signed-off-by: Kenneth Raplee  kennethraplee.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/data.py | 18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib/portage/data.py b/lib/portage/data.py
index c783d76d0..1ef8d4aef 100644
--- a/lib/portage/data.py
+++ b/lib/portage/data.py
@@ -332,15 +332,17 @@ def _init(settings):
 # from grp.getgrnam() with PyPy
 native_string = platform.python_implementation() == "PyPy"
 
+v = settings.get("PORTAGE_GRPNAME", "portage")
 if native_string:
-grpname = settings.get("PORTAGE_GRPNAME", "portage")
-grpname = portage._native_string(grpname)
-globals()["_portage_grpname"] = grpname
-_initialized_globals.add("_portage_grpname")
-username = settings.get("PORTAGE_USERNAME", "portage")
-username = portage._native_string(username)
-globals()["_portage_username"] = username
-_initialized_globals.add("_portage_username")
+v = portage._native_string(v)
+globals()["_portage_grpname"] = v
+_initialized_globals.add("_portage_grpname")
+
+v = settings.get("PORTAGE_USERNAME", "portage")
+if native_string:
+v = portage._native_string(v)
+globals()["_portage_username"] = v
+_initialized_globals.add("_portage_username")
 
 if "secpass" not in _initialized_globals:
 v = 0

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/

[Sam James]

commit: 8d1add318898a654c944e427d34c15d809ddb3f9
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 28 00:18:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 28 00:18:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d1add31

dev-vcs/git: Stabilize 2.35.1 amd64, #836296

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

 dev-vcs/git/git-2.35.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git/git-2.35.1.ebuild b/dev-vcs/git/git-2.35.1.ebuild
index 075208f7ce0d..f692cbc82ee7 100644
--- a/dev-vcs/git/git-2.35.1.ebuild
+++ b/dev-vcs/git/git-2.35.1.ebuild
@@ -46,7 +46,7 @@ if [[ ${PV} != * ]]; then

${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
)"
[[ "${PV}" == *_rc* ]] || \
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

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

[Yixun Lan]

commit: 538105d1b80b58122d6ce2b6a44c01ecbfb57d9e
Author: Yixun Lan  gentoo  org>
AuthorDate: Sun Mar 27 23:56:32 2022 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sun Mar 27 23:58:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=538105d1

media-libs/libjxl: Keyword 0.7.0_pre20220311 riscv, #836013

Signed-off-by: Yixun Lan  gentoo.org>

 media-libs/libjxl/libjxl-0.7.0_pre20220311.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libjxl/libjxl-0.7.0_pre20220311.ebuild 
b/media-libs/libjxl/libjxl-0.7.0_pre20220311.ebuild
index f16373af5651..ed687e3fccc7 100644
--- a/media-libs/libjxl/libjxl-0.7.0_pre20220311.ebuild
+++ b/media-libs/libjxl/libjxl-0.7.0_pre20220311.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="JPEG XL image format reference implementation"
 HOMEPAGE="https://github.com/libjxl/libjxl;
 
 
SRC_URI="https://api.github.com/repos/libjxl/libjxl/tarball/3f8e77fcfabe8ca8ddee6be4e662de525667c570
 -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 LICENSE="BSD"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/highway/

[Yixun Lan]

commit: d2c6bfeef8de47221ffef042e072acf2fb85adcc
Author: Yixun Lan  gentoo  org>
AuthorDate: Sun Mar 27 23:54:58 2022 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sun Mar 27 23:58:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2c6bfee

dev-cpp/highway: Keyword 0.16.0 riscv, #836013

Signed-off-by: Yixun Lan  gentoo.org>

 dev-cpp/highway/highway-0.16.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-cpp/highway/highway-0.16.0.ebuild 
b/dev-cpp/highway/highway-0.16.0.ebuild
index 4371d5e0bc03..2c36b3475aba 100644
--- a/dev-cpp/highway/highway-0.16.0.ebuild
+++ b/dev-cpp/highway/highway-0.16.0.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == ** ]]; then
EGIT_REPO_URI="https://github.com/google/highway.git;
 else

SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
 LICENSE="Apache-2.0"

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/highway/

[Yixun Lan]

commit: 5e1c4b67f2f97e6d4494928948db7597cfdd5af9
Author: Yixun Lan  gentoo  org>
AuthorDate: Sun Mar 27 23:56:03 2022 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sun Mar 27 23:58:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e1c4b67

dev-cpp/highway: forward keywords to live ebuild

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

 dev-cpp/highway/highway-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-cpp/highway/highway-.ebuild 
b/dev-cpp/highway/highway-.ebuild
index 4371d5e0bc03..2c36b3475aba 100644
--- a/dev-cpp/highway/highway-.ebuild
+++ b/dev-cpp/highway/highway-.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == ** ]]; then
EGIT_REPO_URI="https://github.com/google/highway.git;
 else

SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
 LICENSE="Apache-2.0"

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

[Sam James]

commit: 4b743d908450b26e94ab4f9da8c46a7051aa3c84
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 27 23:46:01 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 23:46:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b743d90

sys-apps/systemd: Stabilize 249.11 amd64, #836243

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

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

diff --git a/sys-apps/systemd/systemd-249.11.ebuild 
b/sys-apps/systemd/systemd-249.11.ebuild
index 58ec6237eb87..79c41b24c83c 100644
--- a/sys-apps/systemd/systemd-249.11.ebuild
+++ b/sys-apps/systemd/systemd-249.11.ebuild
@@ -20,7 +20,7 @@ else
MY_P=${MY_PN}-${MY_PV}
S=${WORKDIR}/${MY_P}

SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
 fi
 
 inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd 
toolchain-funcs udev usr-ldscript

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

[Sam James]

commit: 8c649b8fc2db8abb268098ce1e139bc4b86e9ecc
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 27 23:25:28 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 23:25:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c649b8f

sys-libs/glibc: add bug references to "restart processes" warning

Bug: https://bugs.gentoo.org/660556
Bug: https://bugs.gentoo.org/741116
Bug: https://bugs.gentoo.org/823756
See: https://forums.gentoo.org/viewtopic-t-1147884.html
Signed-off-by: Sam James  gentoo.org>

 sys-libs/glibc/glibc-2.34-r10.ebuild | 1 +
 sys-libs/glibc/glibc-2.35-r1.ebuild  | 1 +
 sys-libs/glibc/glibc-.ebuild | 1 +
 3 files changed, 3 insertions(+)

diff --git a/sys-libs/glibc/glibc-2.34-r10.ebuild 
b/sys-libs/glibc/glibc-2.34-r10.ebuild
index 8150f4574f2a..ac93d898cf4d 100644
--- a/sys-libs/glibc/glibc-2.34-r10.ebuild
+++ b/sys-libs/glibc/glibc-2.34-r10.ebuild
@@ -805,6 +805,7 @@ upgrade_warning() {
ewarn "After upgrading glibc, please restart 
all running processes."
ewarn "Be sure to include init (telinit u) or 
systemd (systemctl daemon-reexec)."
ewarn "Alternatively, reboot your system."
+   ewarn "(See bug #660556, bug #741116, bug 
#823756, etc)"
break
fi
done

diff --git a/sys-libs/glibc/glibc-2.35-r1.ebuild 
b/sys-libs/glibc/glibc-2.35-r1.ebuild
index 0edba3776234..891974bc21c4 100644
--- a/sys-libs/glibc/glibc-2.35-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.35-r1.ebuild
@@ -794,6 +794,7 @@ upgrade_warning() {
ewarn "After upgrading glibc, please restart 
all running processes."
ewarn "Be sure to include init (telinit u) or 
systemd (systemctl daemon-reexec)."
ewarn "Alternatively, reboot your system."
+   ewarn "(See bug #660556, bug #741116, bug 
#823756, etc)"
break
fi
done

diff --git a/sys-libs/glibc/glibc-.ebuild b/sys-libs/glibc/glibc-.ebuild
index 29d4afe1ab2b..2483aefe5d6a 100644
--- a/sys-libs/glibc/glibc-.ebuild
+++ b/sys-libs/glibc/glibc-.ebuild
@@ -795,6 +795,7 @@ upgrade_warning() {
ewarn "After upgrading glibc, please restart 
all running processes."
ewarn "Be sure to include init (telinit u) or 
systemd (systemctl daemon-reexec)."
ewarn "Alternatively, reboot your system."
+   ewarn "(See bug #660556, bug #741116, bug 
#823756, etc)"
break
fi
done

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

[Piotr Karbowski]

commit: 782805df8a47012a233c84f00140e3f342741c53
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Sun Mar 27 23:18:10 2022 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Sun Mar 27 23:18:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=782805df

sys-fs/mergerfs: 2.33.4 version bump.

Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/Manifest   |  1 +
 sys-fs/mergerfs/mergerfs-2.33.4.ebuild | 52 ++
 2 files changed, 53 insertions(+)

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index 7ffaefe742b6..cdff0268f586 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -1,3 +1,4 @@
 DIST mergerfs-2.32.3.tar.gz 314280 BLAKE2B 
f7c5ab92f1241627bd91255b35bdd81782f153f9144242a52241f9e812e4096c23d73401251a8ace43781f39a4644814dc724a8a31066f77cfd78ad6c27d54dd
 SHA512 
f3f8f320f98ef2a345a0229eca661c6c8c75fdd23613ae0d45f13062b18f6f052474a009c77a6602df77762100f45b3eb76692812e81d12555763ead5c83b87d
 DIST mergerfs-2.33.1.tar.gz 382421 BLAKE2B 
0985a0ad53a12fe5283fd0e953cd74a835efd3e83f65ba4e96bc42814ce151d03f95c032eeebcc9821c7c15ae59d14b9e40055438b4482a337c5b7bc9503d27e
 SHA512 
1178fbd4ad99c6c693e2c21551c7522107701b0d5c608a7c18be29825cf97f2a2b2d6a50094e800a749a3902c374f8b57e84a76c0640aa8e387aa095d300
 DIST mergerfs-2.33.3.tar.gz 382386 BLAKE2B 
49a2b75a2a39fbec178460f94696a918a0f872a7c904355c84180f8be07d9abdf68e342e7acca5093a621b85110d0a0fdb5650de68e04aa176250199eaa5bdb7
 SHA512 
aca5884a9d5dc03d7095e73461dee843d69463db72dfc033f76611d5417dab63ff29eb2b473f39f0390299c3aa882e6197a7038e82b58ab85799d39cc44b84d0
+DIST mergerfs-2.33.4.tar.gz 382872 BLAKE2B 
fe369f377f731a6323566cf4d5076e9ba7dca302aae1125635433ab93927d3aad5ca57a95e0791742cdf80c7fa69cacdd16a6519593bad9e933e529974bd5d2a
 SHA512 
e8bd0a502c045d6f93d34bce833108deaf1071a3e5c56eb61a59416067230d6e8f19f9b0f8c8aa9fe84060a886afae7509231c97fc6d9537d3ad3390ce342239

diff --git a/sys-fs/mergerfs/mergerfs-2.33.4.ebuild 
b/sys-fs/mergerfs/mergerfs-2.33.4.ebuild
new file mode 100644
index ..fb2d3b62a41b
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.33.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A featureful union filesystem"
+HOMEPAGE="https://github.com/trapexit/mergerfs;
+
+SRC_URI="https://github.com/trapexit/mergerfs/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+# Vendorized libfuse that's bundled is under LGPL-2.1.
+LICENSE="ISC LGPL-2.1"
+SLOT="0"
+IUSE="+xattr"
+
+DEPEND="
+   xattr? ( sys-apps/attr )
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="sys-devel/gettext"
+
+src_prepare() {
+   default
+
+   # Hand made build system at it's finest.
+   echo -e "#!/bin/sh\ntrue" >tools/update-version || die
+   echo "#pragma once" >src/version.hpp || die
+   echo "static const char MERGERFS_VERSION[] = \"${PV}\";" 
>>src/version.hpp || die
+
+   if ! use xattr; then
+   sed 's%USE_XATTR = 1%USE_XATTR = 0%g' -i Makefile || die
+   fi
+}
+
+src_compile() {
+   # https://bugs.gentoo.org/725978
+   tc-export AR CC CXX
+
+   default
+}
+
+src_install() {
+   dobin build/mergerfs
+   dosym mergerfs /usr/bin/mount.mergerfs
+   dodoc README.md
+   doman man/mergerfs.1
+}

[gentoo-commits] repo/gentoo:master commit in: app-text/zathura/

[Piotr Karbowski]

commit: 54759854a6a79e63768eeccb1e4b100e07e5c001
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Sun Mar 27 23:20:12 2022 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Sun Mar 27 23:20:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54759854

app-text/zathura: 0.4.9 version bump.

Closes: https://bugs.gentoo.org/836127
Signed-off-by: Piotr Karbowski  gentoo.org>

 app-text/zathura/Manifest |  1 +
 app-text/zathura/zathura-0.4.9.ebuild | 57 +++
 2 files changed, 58 insertions(+)

diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index ae606ede97b0..3a6a59ca1536 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,2 +1,3 @@
 DIST zathura-0.4.7.tar.gz 199857 BLAKE2B 
c4fd99049ed81c7965cc474f0c543ebd1aef55ff63312c21a33ce9161afb78da1c9f0a13ff86d5d69b2ce6b17965632de282a9c8bd60b0a8297d96528b5f2c5f
 SHA512 
adfe69cbef6088a6fa7d49686194a0a3dc13757535974476742c733076dc5bb5ad95ed447d50cd1efdfb23fe2fb1f64452d5d8aeb27a80c3101f2ab5c68f9b60
 DIST zathura-0.4.8.tar.gz 202264 BLAKE2B 
70916ac23624b8e55b39bc2b9329fc5d992d3e2e3989b17bebf0f8b1bcb26ed943c15866c0b37e0a4a29fee7c264d6309bf1d036d770817e13a14a13af7499d7
 SHA512 
00d7b735154ff0e857f8a0a21c24b3fbbff8c166d93a34bee725072ee00f2870adecb956e9445334be2a84827778bd874cc1d4bda7f8b32e4468ea3784834b86
+DIST zathura-0.4.9.tar.gz 206194 BLAKE2B 
0dd4b153cf7f8e3ddd4ede5514389b2c5e4aa88e2c416646acc38f7e19419e11165c2a5b51548a05d69a1b947e661b885f7c9d8c100179d0d23d8754cb441d97
 SHA512 
fbab65cba7ac37e4021233a4ae0356a85f4a88d2c1a2d8337cd627eae389856b6b4e69290422d2fa14ad0300e8c52732059a75314a0ef147a02ca9f8db10

diff --git a/app-text/zathura/zathura-0.4.9.ebuild 
b/app-text/zathura/zathura-0.4.9.ebuild
new file mode 100644
index ..c368be85b53a
--- /dev/null
+++ b/app-text/zathura/zathura-0.4.9.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson virtualx xdg
+
+DESCRIPTION="A highly customizable and functional document viewer"
+HOMEPAGE="https://pwmt.org/projects/zathura/;
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git;
+   EGIT_BRANCH="develop"
+else
+   SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="doc +magic seccomp sqlite synctex test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=dev-libs/girara-0.3.7
+   >=dev-libs/glib-2.50:2
+   >=sys-devel/gettext-0.19.8
+   x11-libs/cairo
+   >=x11-libs/gtk+-3.22:3
+   magic? ( sys-apps/file )
+   seccomp? ( sys-libs/libseccomp )
+   sqlite? ( >=dev-db/sqlite-3.5.9:3 )
+   synctex? ( app-text/texlive-core )"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="doc? ( dev-python/sphinx )
+   test? ( dev-libs/appstream-glib
+   dev-libs/check )
+   virtual/pkgconfig"
+
+src_configure() {
+   local emesonargs=(
+   -Dconvert-icon=disabled
+   -Dmagic=$(usex magic enabled disabled)
+   -Dmanpages=$(usex doc enabled disabled)
+   -Dseccomp=$(usex seccomp enabled disabled)
+   -Dsqlite=$(usex sqlite enabled disabled)
+   -Dsynctex=$(usex synctex enabled disabled)
+   )
+   meson_src_configure
+}
+
+src_test() {
+   virtx meson_src_test
+}

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

[Piotr Karbowski]

commit: c1a28f52848d845ae545de3c93913990c469f36a
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Sun Mar 27 23:18:32 2022 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Sun Mar 27 23:18:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1a28f52

dev-libs/girara: 0.3.7 version bump; takeover.

Signed-off-by: Piotr Karbowski  gentoo.org>

 dev-libs/girara/Manifest|  1 +
 dev-libs/girara/girara-0.3.7.ebuild | 46 +
 dev-libs/girara/metadata.xml|  5 +++-
 3 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index 3173af0776fa..3f0c4007f041 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,2 +1,3 @@
 DIST girara-0.3.5.tar.xz 60488 BLAKE2B 
2d0f2f0635e8e8906810b1425191f5d70b7f9af0985c461bd90654e83d87ad698da225d70064438fed4473295aca8dbd26c4ce1efd96f8a7399e7145b1f8c111
 SHA512 
e7c5bf887b29767878502224ad45d62e43b3da91bd8e754603256550d4f0126f1493f0fb7473a4ebb8cc5909306564249c6a60e99eba2b0b417b98c728fcdc84
 DIST girara-0.3.6.tar.xz 60056 BLAKE2B 
4a9f651e2127c7924cd3e55c7f955b3f80b90849b5ee06f2785388ae3adbb8910bb90e59f934f426fdb6d8e7d797ac82a52bc7b05becff56e1aff610e5e56081
 SHA512 
e9496b1bb629d59377ed1fee8a2fab2c7e5d60845e6777ed9bb796e1843fea20abda32d7de885f01e892654ea996490403c442021528b6b4f2aa50cf54d74c42
+DIST girara-0.3.7.tar.xz 60352 BLAKE2B 
59515baf53d3ef46d98d5720437c253c82637df8380abe04a1649d4a2636124d6d0dfb001c9363d8a33a1bc496511e90b8c5365db34a29d489802fc780575d2a
 SHA512 
9b91ef7e5047b3250327eab9280372f38615e9948884c108c3d1c5d3e81794f786adc827692b112d2bfdc2660e22206a143fafd5a814408df8ffd4c858148717

diff --git a/dev-libs/girara/girara-0.3.7.ebuild 
b/dev-libs/girara/girara-0.3.7.ebuild
new file mode 100644
index ..4369250666d4
--- /dev/null
+++ b/dev-libs/girara/girara-0.3.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson virtualx
+
+DESCRIPTION="UI library that focuses on simplicity and minimalism"
+HOMEPAGE="https://pwmt.org/projects/girara/;
+
+if [[ ${PV} == *999 ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git;
+   EGIT_BRANCH="develop"
+else
+   SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz;
+   KEYWORDS="~amd64 ~arm ~riscv ~x86"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="doc libnotify test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/glib:2
+   dev-libs/json-c:=
+   >=x11-libs/gtk+-3.20:3
+   libnotify? ( x11-libs/libnotify )"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )
+   test? ( dev-libs/check )
+   virtual/pkgconfig"
+
+src_configure() {
+   local emesonargs=(
+   -Djson=enabled
+   -Ddocs=$(usex doc enabled disabled)
+   -Dnotify=$(usex libnotify enabled disabled)
+   )
+   meson_src_configure
+}
+
+src_test() {
+   virtx meson_src_test
+}

diff --git a/dev-libs/girara/metadata.xml b/dev-libs/girara/metadata.xml
index 71bb9e0c6245..4311c033d558 100644
--- a/dev-libs/girara/metadata.xml
+++ b/dev-libs/girara/metadata.xml
@@ -1,7 +1,10 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-   
+   
+   slashbe...@gentoo.org
+   Piotr Karbowski
+   


m...@pwmt.org

[gentoo-commits] repo/gentoo:master commit in: app-text/zathura/

[Piotr Karbowski]

commit: a04d9bf2dcdba7b0f2607a61504e238683f34ec6
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Sun Mar 27 22:35:40 2022 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Sun Mar 27 23:11:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a04d9bf2

app-text/zathura: drop old.

Signed-off-by: Piotr Karbowski  gentoo.org>

 app-text/zathura/Manifest |  3 --
 app-text/zathura/zathura-0.4.3.ebuild | 57 ---
 app-text/zathura/zathura-0.4.4.ebuild | 57 ---
 app-text/zathura/zathura-0.4.5.ebuild | 57 ---
 4 files changed, 174 deletions(-)

diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index d6cadf260b54..ae606ede97b0 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,5 +1,2 @@
-DIST zathura-0.4.3.tar.xz 145796 BLAKE2B 
fe360d6ea2a11138324784beec8e8ebe0eaa83e4e682785a50265bbd0a77be0dcab4cd523923462398faaf918a4d304de148d64972dc9b6cb96578476e0ae6eb
 SHA512 
427948025c20b2badb00921d03ec83e26806fd90d0d50cdcf0f3bcf645cd7206695faa3b5a7698d3d70b9bd60e8e68c920cf1e7f29855dd11a1a8ce6a7f8160b
-DIST zathura-0.4.4.tar.gz 194105 BLAKE2B 
dc99005c6e967a46af0db0001193d1b1551e9adb78acc88343096407ed4a61b889be600acaf83b45bd603e3b7c4b93402f619e06e7146089d4990309d3301d5f
 SHA512 
8d1e5969cc2f9502d7d966d3341c8f7437422f2dcf952bc2567a5061e611c6fe90c2bc6670963d81b608aa621d70f77ec513d6ab9f03304894bd9ac648aaa6e7
-DIST zathura-0.4.5.tar.gz 195275 BLAKE2B 
c50793fac6e473c7ccc4cccf15674dd8f33c504675e95501d05dc396dc4803f327e0144c72e6182671118ec1234cbd5a75ad8b6ea129bc7d471e683ff90ad392
 SHA512 
9ce6c7745d83d7e21fcbbc6a7c799a4223cf77afbe1c933b710c1c7920c98ae1edcf683ae42433f448a091eb317f2b71b3bde9d1b27c8089d1adbc9aa0ab4e78
 DIST zathura-0.4.7.tar.gz 199857 BLAKE2B 
c4fd99049ed81c7965cc474f0c543ebd1aef55ff63312c21a33ce9161afb78da1c9f0a13ff86d5d69b2ce6b17965632de282a9c8bd60b0a8297d96528b5f2c5f
 SHA512 
adfe69cbef6088a6fa7d49686194a0a3dc13757535974476742c733076dc5bb5ad95ed447d50cd1efdfb23fe2fb1f64452d5d8aeb27a80c3101f2ab5c68f9b60
 DIST zathura-0.4.8.tar.gz 202264 BLAKE2B 
70916ac23624b8e55b39bc2b9329fc5d992d3e2e3989b17bebf0f8b1bcb26ed943c15866c0b37e0a4a29fee7c264d6309bf1d036d770817e13a14a13af7499d7
 SHA512 
00d7b735154ff0e857f8a0a21c24b3fbbff8c166d93a34bee725072ee00f2870adecb956e9445334be2a84827778bd874cc1d4bda7f8b32e4468ea3784834b86

diff --git a/app-text/zathura/zathura-0.4.3.ebuild 
b/app-text/zathura/zathura-0.4.3.ebuild
deleted file mode 100644
index b73544c83c5c..
--- a/app-text/zathura/zathura-0.4.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson virtualx
-
-DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="https://pwmt.org/projects/zathura/;
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git;
-   EGIT_BRANCH="develop"
-else
-   SRC_URI="https://pwmt.org/projects/zathura/download/${P}.tar.xz;
-   KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="doc +magic seccomp sqlite synctex test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=dev-libs/girara-0.3.2
-   >=dev-libs/glib-2.50:2
-   >=sys-devel/gettext-0.19.8
-   x11-libs/cairo[X]
-   >=x11-libs/gtk+-3.22:3
-   magic? ( sys-apps/file )
-   seccomp? ( sys-libs/libseccomp )
-   sqlite? ( >=dev-db/sqlite-3.5.9:3 )
-   synctex? ( app-text/texlive-core )"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="doc? ( dev-python/sphinx )
-   test? ( dev-libs/appstream-glib
-   dev-libs/check )
-   virtual/pkgconfig"
-
-src_configure() {
-   local emesonargs=(
-   -Dconvert-icon=disabled
-   -Dmagic=$(usex magic enabled disabled)
-   -Dmanpages=$(usex doc enabled disabled)
-   -Dseccomp=$(usex seccomp enabled disabled)
-   -Dsqlite=$(usex sqlite enabled disabled)
-   -Dsynctex=$(usex synctex enabled disabled)
-   )
-   meson_src_configure
-}
-
-src_test() {
-   virtx meson_src_test
-}

diff --git a/app-text/zathura/zathura-0.4.4.ebuild 
b/app-text/zathura/zathura-0.4.4.ebuild
deleted file mode 100644
index 28f4066c..
--- a/app-text/zathura/zathura-0.4.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson virtualx
-
-DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="https://pwmt.org/projects/zathura/;
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git;
-   EGIT_BRANCH="develop"
-else
-   SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   

[gentoo-commits] repo/gentoo:master commit in: sys-apps/dbus/files/, sys-apps/dbus/

[Sam James]

commit: 74020795b5786fd4963fdd1823c2aa302273a3c5
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 27 22:38:49 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 22:40:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74020795

sys-apps/dbus: add 1.14.0

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

 sys-apps/dbus/Manifest |   1 +
 sys-apps/dbus/dbus-1.14.0.ebuild   | 287 +
 .../dbus/files/dbus-1.14.0-x-autoconf-fixes.patch  | 147 +++
 3 files changed, 435 insertions(+)

diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index e530cbf7268b..19ec71675e81 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,2 +1,3 @@
 DIST dbus-1.12.20.tar.gz 2095511 BLAKE2B 
b467526e7e0281db7b8c7c178469fe006dab29ccb1ea197c02495bd297e8de766230b68ed86c4a7e05dbe09ca30ce941a15e0bf8030fe0df66c04febf0534b3b
 SHA512 
0964683bc6859374cc94e42e1ec0cdb542cca67971c205fcba4352500b6c0891665b0718e7d85eb060c81cb82e3346c313892bc02384da300ddd306c7eef0056
 DIST dbus-1.12.22.tar.gz 2108231 BLAKE2B 
40c30ad9e48d8ac6b5f1c67726015eb17cb3501372ef2c8ffcd8ad73e4a2f186b80a7bbba094460d4093d1d0a3f1bbb8d83a27724397a8f5312bb8542237e6b7
 SHA512 
0a716022f9d693fcaf871b6dfb5f242b49a8dd05d3316ec3e530f5129f1d81a2fa9caec795fa62cfdcba6ed21549fdd2f896f9bf1cc9a96e2a7d04f2c7ec7be6
+DIST dbus-1.14.0.tar.xz 1360228 BLAKE2B 
ae0ebc2779e840e2d83f633029f81fba0e35969648dddce0280640dd9bee3f9508aa7fb6aef696d1c4c56d40f91b754941f847525afaee5cc3170ad23a7eddbf
 SHA512 
9bf17a3ebb3cf44722c6fbf24ee56e9dc14d6882fc312f26c7f07459d969424bc2fb63a229139e011804ecc479a8f0eb1a0c83286f8d5a664c5979d12634179f

diff --git a/sys-apps/dbus/dbus-1.14.0.ebuild b/sys-apps/dbus/dbus-1.14.0.ebuild
new file mode 100644
index ..03e772f142c6
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.14.0.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+TMPFILES_OPTIONAL=1
+
+# At least at the moment, while a CMake port exists, it's not recommended
+# for distributions.
+# https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/CONTRIBUTING.md#L189
+inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 
systemd tmpfiles virtualx multilib-minimal
+
+DESCRIPTION="A message bus system, a simple way for applications to talk to 
each other"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/dbus/;
+SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.xz;
+
+LICENSE="|| ( AFL-2.1 GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc elogind selinux static-libs systemd test X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+BDEPEND="
+   acct-user/messagebus
+   app-text/xmlto
+   app-text/docbook-xml-dtd:4.4
+   sys-devel/autoconf-archive
+   virtual/pkgconfig
+   doc? ( app-doc/doxygen )
+"
+COMMON_DEPEND="
+   >=dev-libs/expat-2.1.0
+   elogind? ( sys-auth/elogind )
+   selinux? ( sys-libs/libselinux )
+   systemd? ( sys-apps/systemd:0= )
+   X? (
+   x11-libs/libX11
+   x11-libs/libXt
+   )
+"
+DEPEND="${COMMON_DEPEND}
+   dev-libs/expat
+   test? (
+   ${PYTHON_DEPS}
+   >=dev-libs/glib-2.40:2
+   )
+"
+RDEPEND="${COMMON_DEPEND}
+   acct-user/messagebus
+   selinux? ( sec-policy/selinux-dbus )
+   systemd? ( virtual/tmpfiles )
+"
+
+DOC_CONTENTS="
+   Some applications require a session bus in addition to the system
+   bus. Please see \`man dbus-launch\` for more information.
+"
+
+# out of sources build dir for make check
+TBD="${WORKDIR}/${P}-tests-build"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-enable-elogind.patch"
+   "${FILESDIR}/${PN}-daemon-optional.patch" # bug #653136
+
+   "${FILESDIR}/${P}-x-autoconf-fixes.patch"
+)
+
+pkg_setup() {
+   use test && python-any-r1_pkg_setup
+
+   if use kernel_linux; then
+   CONFIG_CHECK="~EPOLL"
+   linux-info_pkg_setup
+   fi
+}
+
+src_prepare() {
+   default
+
+   if [[ ${CHOST} == *-solaris* ]]; then
+   # fix standards conflict, due to gcc being c99 by default 
nowadays
+   sed -i \
+   -e 's/_XOPEN_SOURCE=500/_XOPEN_SOURCE=600/' \
+   configure.ac || die
+   fi
+
+   # required for bug #263909, cross-compile so don't remove eautoreconf
+   eautoreconf
+}
+
+src_configure() {
+   local rundir=$(usex kernel_linux /run /var/run)
+
+   sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in \
+   > "${T}"/dbus.initd || die
+
+   multilib-minimal_src_configure
+}
+

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

[Sam James]

commit: 7c8875c38b187fbd2e0fa5fc39bbb38c1588d0fb
Author: Kenneth Raplee  kennethraplee  com>
AuthorDate: Tue Mar 22 07:01:05 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 23:06:35 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=7c8875c3

Begin modernizing the string usage

These files are updated to use the newer f-string feature (String
Interpolation) that has been added since Python 3.6.

The benefits to using String Interpolation are:
* Avoids incurring bugs from using Old Style formatting.
* Makes it easier to understand how the string is being formatted.
* Using embedded expressions into strings removes the need for string
concatenation and will execute much faster for the same effect.

Also, a few global string constants with Old Style formatting had their
literals inlined to their respective function arguments while
transitioning them be f-strings. When Python searches for variables, it
looks them up in the local namespace first, which is the namespace
specific a function or class method. If not found, then it searches in
the global namespace. Removing the need for global strings will also
improve performance a bit along the way.

The Portage codebase as a whole still needs this kind of work.

Signed-off-by: Kenneth Raplee  kennethraplee.com>
Signed-off-by: Sam James  gentoo.org>

 lib/_emerge/main.py|  38 +--
 lib/portage/__init__.py|  35 +-
 lib/portage/_global_updates.py |   4 +-
 lib/portage/checksum.py|  15 ++--
 lib/portage/const.py   |  42 ++--
 lib/portage/data.py|   2 +-
 lib/portage/dispatch_conf.py   |  81 ++
 lib/portage/eclass_cache.py|   4 +-
 lib/portage/exception.py   |   6 +-
 lib/portage/getbinpkg.py   |  89 +++-
 lib/portage/glsa.py| 151 +++--
 lib/portage/gpg.py |   4 +-
 lib/portage/gpkg.py|  18 +++--
 lib/portage/localization.py|   8 +--
 lib/portage/mail.py|  12 ++--
 15 files changed, 230 insertions(+), 279 deletions(-)

diff --git a/lib/_emerge/main.py b/lib/_emerge/main.py
index 8928f268d..f3ff02404 100644
--- a/lib/_emerge/main.py
+++ b/lib/_emerge/main.py
@@ -81,7 +81,7 @@ shortmapping = {
 
 COWSAY_MOO = r"""
 
-  Larry loves Gentoo (%s)
+  Larry loves Gentoo ({})
 
  ___
 < Have you mooed today? >
@@ -97,7 +97,7 @@ COWSAY_MOO = r"""
 
 def multiple_actions(action1, action2):
 sys.stderr.write("\n!!! Multiple actions requested... Please choose one 
only.\n")
-sys.stderr.write("!!! '%s' or '%s'\n\n" % (action1, action2))
+sys.stderr.write(f"!!! '{action1}' or '{action2}'\n\n")
 sys.exit(1)
 
 
@@ -745,7 +745,7 @@ def parse_opts(tmpcmdline, silent=False):
 
 for action_opt in actions:
 parser.add_argument(
-"--" + action_opt,
+f"--{action_opt}",
 action="store_true",
 dest=action_opt.replace("-", "_"),
 default=False,
@@ -759,7 +759,7 @@ def parse_opts(tmpcmdline, silent=False):
 )
 for shortopt, longopt in shortmapping.items():
 parser.add_argument(
-"-" + shortopt,
+f"-{shortopt}",
 action="store_true",
 dest=longopt.lstrip("--").replace("-", "_"),
 default=False,
@@ -832,9 +832,9 @@ def parse_opts(tmpcmdline, silent=False):
 if myoptions.buildpkg_exclude:
 bad_atoms = _find_bad_atoms(myoptions.buildpkg_exclude, 
less_strict=True)
 if bad_atoms and not silent:
+invalid_atoms = ",".join(bad_atoms)
 parser.error(
-"Invalid Atom(s) in --buildpkg-exclude parameter: '%s'\n"
-% (",".join(bad_atoms),)
+f"Invalid Atom(s) in --buildpkg-exclude parameter: 
'{invalid_atoms}'\n"
 )
 
 if myoptions.changed_deps is not None:
@@ -1014,7 +1014,7 @@ def parse_opts(tmpcmdline, silent=False):
 backtrack = None
 if not silent:
 parser.error(
-"Invalid --backtrack parameter: '%s'\n" % 
(myoptions.backtrack,)
+f"Invalid --backtrack parameter: '{myoptions.backtrack}'\n"
 )
 
 myoptions.backtrack = backtrack
@@ -1032,7 +1032,7 @@ def parse_opts(tmpcmdline, silent=False):
 if deep is not True and deep < 0:
 deep = None
 if not silent:
-parser.error("Invalid --deep parameter: '%s'\n" % 
(myoptions.deep,))
+parser.error(f"Invalid --deep parameter: '{myoptions.deep}'\n")
 
 myoptions.deep = deep
 
@@ -1049,7 +1049,7 @@ def parse_opts(tmpcmdline, silent=False):
 if jobs is not True and jobs < 1:
 jobs = None
 if not silent:
-parser.error("Invalid --jobs parameter: '%s'\n" % 
(myoptions.jobs,))
+

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

[Sam James]

commit: 18e5a8170c69aecd10f162918de571d85055ae81
Author: Kenneth Raplee  kennethraplee  com>
AuthorDate: Fri Mar 25 22:06:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 23:06:48 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=18e5a817

Miscellaneous refactors and cleanups

Signed-off-by: Kenneth Raplee  kennethraplee.com>
Closes: https://github.com/gentoo/portage/pull/796
Signed-off-by: Sam James  gentoo.org>

 lib/_emerge/main.py|  10 ++--
 lib/portage/__init__.py|  14 ++---
 lib/portage/_global_updates.py |  36 ++---
 lib/portage/checksum.py|  17 ++
 lib/portage/data.py|  34 +---
 lib/portage/dispatch_conf.py   |   2 +-
 lib/portage/getbinpkg.py   | 115 ++---
 lib/portage/glsa.py|   4 +-
 8 files changed, 91 insertions(+), 141 deletions(-)

diff --git a/lib/_emerge/main.py b/lib/_emerge/main.py
index 01dc1b419..d22da1926 100644
--- a/lib/_emerge/main.py
+++ b/lib/_emerge/main.py
@@ -1235,12 +1235,10 @@ def emerge_main(args=None):
 1: dev_null.fileno(),
 2: dev_null.fileno(),
 }
-if (
-portage.process.spawn_bash(
-"[[ $(< <(echo foo) ) == foo ]]", fd_pipes=fd_pipes
-)
-!= 0
-):
+exit_code = portage.process.spawn_bash(
+"[[ $(< <(echo foo) ) == foo ]]", fd_pipes=fd_pipes
+)
+if exit_code != 0:
 writemsg_level(
 "Failed to validate a sane '/dev'.\n"
 "bash process substitution doesn't work; this may be an "

diff --git a/lib/portage/__init__.py b/lib/portage/__init__.py
index e6dff28ee..3f1f29f08 100644
--- a/lib/portage/__init__.py
+++ b/lib/portage/__init__.py
@@ -260,7 +260,6 @@ class _unicode_func_wrapper:
 self._encoding = encoding
 
 def _process_args(self, args, kwargs):
-
 encoding = self._encoding
 wrapped_args = [
 _unicode_encode(x, encoding=encoding, errors="strict") for x in 
args
@@ -276,7 +275,6 @@ class _unicode_func_wrapper:
 return (wrapped_args, wrapped_kwargs)
 
 def __call__(self, *args, **kwargs):
-
 encoding = self._encoding
 wrapped_args, wrapped_kwargs = self._process_args(args, kwargs)
 
@@ -360,7 +358,6 @@ class _eintr_func_wrapper:
 self._func = func
 
 def __call__(self, *args, **kwargs):
-
 while True:
 try:
 rval = self._func(*args, **kwargs)
@@ -383,10 +380,7 @@ _os_overrides = {
 }
 
 
-try:
-_os_overrides[id(_os.mkfifo)] = _os.mkfifo
-except AttributeError:
-pass  # Jython
+_os_overrides[id(_os.mkfifo)] = _os.mkfifo
 
 if hasattr(_os, "statvfs"):
 _os_overrides[id(_os.statvfs)] = _os.statvfs
@@ -498,9 +492,9 @@ if platform.system() in ("FreeBSD",):
 
 
 def load_mod(name):
-modname = ".".join(name.split(".")[:-1])
-mod = __import__(modname)
 components = name.split(".")
+modname = ".".join(components[:-1])
+mod = __import__(modname)
 for comp in components[1:]:
 mod = getattr(mod, comp)
 return mod
@@ -573,7 +567,6 @@ def _eapi_is_deprecated(eapi):
 
 def eapi_is_supported(eapi):
 eapi = str(eapi).strip()
-
 return eapi in _supported_eapis
 
 
@@ -794,7 +787,6 @@ _legacy_global_var_names = (
 
 
 def _reset_legacy_globals():
-
 global _legacy_globals_constructed
 _legacy_globals_constructed = set()
 for k in _legacy_global_var_names:

diff --git a/lib/portage/_global_updates.py b/lib/portage/_global_updates.py
index d7117d36b..59e0b263e 100644
--- a/lib/portage/_global_updates.py
+++ b/lib/portage/_global_updates.py
@@ -89,7 +89,7 @@ def _do_global_updates(trees, prev_mtimes, quiet=False, 
if_mtime_changed=True):
 if not update_notice_printed:
 update_notice_printed = True
 writemsg_stdout("\n")
-writemsg_stdout(colorize("GOOD", _("Performing Global 
Updates\n")))
+writemsg_stdout(colorize("GOOD", "Performing Global 
Updates\n"))
 writemsg_stdout(
 _(
 "(Could take a couple of minutes if you have a lot 
of binary packages.)\n"
@@ -236,38 +236,32 @@ def _do_global_updates(trees, prev_mtimes, quiet=False, 
if_mtime_changed=True):
 # until after _all_ of the above updates have
 # been processed because the mtimedb will
 # automatically commit when killed by ctrl C.
-for mykey, mtime in timestamps.items():
-prev_mtimes[mykey] = mtime
+prev_mtimes.update(timestamps)
 
-do_upgrade_packagesmessage = False
 # We gotta do the brute force updates for these now.
-if True:
+def onUpdate(_maxval, curval):
+if curval > 0:
+writemsg_stdout("#")
 
-

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

[Sam James]

commit: 6e316a87828069f19906c5dace6f5215154b52b4
Author: Kenneth Raplee  kennethraplee  com>
AuthorDate: Tue Mar 22 07:56:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 23:06:44 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=6e316a87

Use str.join() instead of string concatenation

Joining strings is also faster.

Signed-off-by: Kenneth Raplee  kennethraplee.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/_global_updates.py | 27 ---
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/lib/portage/_global_updates.py b/lib/portage/_global_updates.py
index a17ee861d..d7117d36b 100644
--- a/lib/portage/_global_updates.py
+++ b/lib/portage/_global_updates.py
@@ -97,21 +97,18 @@ def _do_global_updates(trees, prev_mtimes, quiet=False, 
if_mtime_changed=True):
 )
 if not quiet:
 writemsg_stdout(
-_(
-"  %s='update pass'  %s='binary update'  "
-"%s='/var/db update'  %s='/var/db move'\n"
-"  %s='/var/db SLOT move'  %s='binary move'  "
-"%s='binary SLOT move'\n  %s='update 
/etc/portage/package.*'\n"
-)
-% (
-bold("."),
-bold("*"),
-bold("#"),
-bold("@"),
-bold("s"),
-bold("%"),
-bold("S"),
-bold("p"),
+"  ".join(
+(
+"",
+f"{bold('.')}='update pass'",
+f"{bold('*')}='binary update'",
+f"{bold('#')}='/var/db update'",
+f"{bold('@')}='/var/db move'\n",
+f"{bold('s')}='/var/db SLOT move'",
+f"{bold('%')}='binary move'"
+f"{bold('S')}='binary SLOT move'\n",
+f"{bold('p')}='update 
/etc/portage/package.*'\n",
+)
 )
 )
 valid_updates, errors = parse_updates(mycontent)

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

[Sam James]

commit: 13740f43bcc38e787153d9efeabc4f5d878e7af0
Author: Kenneth Raplee  kennethraplee  com>
AuthorDate: Tue Mar 22 07:22:42 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 23:06:37 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=13740f43

Prefer generator expressions over list comprehensions

List comprehensions do improve the performance compared to using for
loops to build the same lists in Python. However, they are eagerly
evaluated and will create a sequence ahead of time.

The problem is, a fair amount of code would only use these lists as
iterators which does not require them to be sequences. Unless there is a
need to know a list's length, access its items, or alter its size, it's
better to use generators which are lazily evaluated and can be iterated
when necessary. Avoiding the eagerness of list comprehensions will
improve the runtime performance.

Signed-off-by: Kenneth Raplee  kennethraplee.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/__init__.py  | 22 +-
 lib/portage/data.py  | 25 ++---
 lib/portage/dispatch_conf.py |  2 +-
 lib/portage/eclass_cache.py  |  2 +-
 lib/portage/getbinpkg.py | 15 ---
 lib/portage/glsa.py  | 14 ++
 6 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/lib/portage/__init__.py b/lib/portage/__init__.py
index 82e47d0ff..e6dff28ee 100644
--- a/lib/portage/__init__.py
+++ b/lib/portage/__init__.py
@@ -555,10 +555,15 @@ _deprecated_eapis = frozenset(
 "7_pre1",
 ]
 )
+
+from itertools import chain
+
 _supported_eapis = frozenset(
-[str(x) for x in range(portage.const.EAPI + 1)]
-+ list(_testing_eapis)
-+ list(_deprecated_eapis)
+chain(
+(str(x) for x in range(portage.const.EAPI + 1)),
+_testing_eapis,
+_deprecated_eapis,
+)
 )
 
 
@@ -672,8 +677,7 @@ def create_trees(
 # When ROOT != "/" we only want overrides from the calling
 # environment to apply to the config that's associated
 # with ROOT != "/", so pass a nearly empty dict for the env parameter.
-clean_env = {}
-for k in (
+env_sequence = (
 "PATH",
 "PORTAGE_GRPNAME",
 "PORTAGE_REPOSITORIES",
@@ -687,10 +691,10 @@ def create_trees(
 "https_proxy",
 "no_proxy",
 "__PORTAGE_TEST_HARDLINK_LOCKS",
-):
-v = settings.get(k)
-if v is not None:
-clean_env[k] = v
+)
+env = ((k, settings.get(k)) for k in env_sequence)
+clean_env = {k: v for k, v in env if v is not None}
+
 if depcachedir is not None:
 clean_env["PORTAGE_DEPCACHEDIR"] = depcachedir
 settings = config(

diff --git a/lib/portage/data.py b/lib/portage/data.py
index e1457c566..8c58ad0fc 100644
--- a/lib/portage/data.py
+++ b/lib/portage/data.py
@@ -229,27 +229,30 @@ def _get_global(k):
 # Get a list of group IDs for the portage user. Do not use
 # grp.getgrall() since it is known to trigger spurious
 # SIGPIPE problems with nss_ldap.
-cmd = ["id", "-G", _portage_username]
-
 encoding = portage._encodings["content"]
-cmd = [
+cmd = (
 portage._unicode_encode(x, encoding=encoding, errors="strict")
-for x in cmd
-]
+for x in ("id", "-G", _portage_username)
+)
 proc = subprocess.Popen(
 cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT
 )
 myoutput = proc.communicate()[0]
 status = proc.wait()
 if os.WIFEXITED(status) and os.WEXITSTATUS(status) == os.EX_OK:
-for x in portage._unicode_decode(
-myoutput, encoding=encoding, errors="strict"
-).split():
+
+def check(x):
 try:
-v.append(int(x))
+return int(x)
 except ValueError:
-pass
-v = sorted(set(v))
+return None
+
+unicode_decode = portage._unicode_decode(
+myoutput, encoding=encoding, errors="strict"
+)
+checked_v = (check(x) for x in unicode_decode.split())
+filtered_v = (x for x in checked_v if x)
+v = sorted(set(filtered_v))
 
 # Avoid instantiating portage.settings when the desired
 # variable is set in os.environ.

diff --git a/lib/portage/dispatch_conf.py b/lib/portage/dispatch_conf.py
index 6c6036c4e..c89caf087 100644
--- a/lib/portage/dispatch_conf.py
+++ b/lib/portage/dispatch_conf.py
@@ -37,7 +37,7 @@ def diffstatusoutput(cmd, file1, file2):
 # raise a UnicodeDecodeError which makes the output inaccessible.
 

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

[Sam James]

commit: 9b843f5c9d0a5bdd4a57efb5bd5f41c4736d4dcf
Author: Kenneth Raplee  kennethraplee  com>
AuthorDate: Tue Mar 22 07:46:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 23:06:41 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=9b843f5c

Consolidate nested conditional branches

Depending how a conditional is wrote, its nested conditional can be
consolidated into its own expression by using the `and` or `or` boolean
operators for the same effect. These kinds of refactors give processors
better chances at branch prediction and would make these conditionals
less expensive than they might have been.

Signed-off-by: Kenneth Raplee  kennethraplee.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/checksum.py  |  5 ++---
 lib/portage/data.py  |  9 ++---
 lib/portage/dispatch_conf.py | 18 +++---
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/lib/portage/checksum.py b/lib/portage/checksum.py
index 3b5a10d24..d7e800c47 100644
--- a/lib/portage/checksum.py
+++ b/lib/portage/checksum.py
@@ -427,9 +427,8 @@ class _hash_filter:
 for token in self._tokens:
 if token in matches:
 return True
-if token[:1] == "-":
-if token[1:] in matches:
-return False
+if token[:1] == "-" and token[1:] in matches:
+return False
 return False
 
 

diff --git a/lib/portage/data.py b/lib/portage/data.py
index de7d88e5e..b73fa8882 100644
--- a/lib/portage/data.py
+++ b/lib/portage/data.py
@@ -158,15 +158,12 @@ def _get_global(k):
 unprivileged = _unprivileged_mode(eroot_or_parent, eroot_st)
 
 v = 0
-if uid == 0:
-v = 2
-elif unprivileged:
+if uid == 0 or unprivileged:
 v = 2
 elif _get_global("portage_gid") in os.getgroups():
 v = 1
 
 elif k in ("portage_gid", "portage_uid"):
-
 # Discover the uid and gid of the portage user/group
 keyerror = False
 try:
@@ -357,9 +354,7 @@ def _init(settings):
 
 if "secpass" not in _initialized_globals:
 v = 0
-if uid == 0:
-v = 2
-elif "unprivileged" in settings.features:
+if uid == 0 or "unprivileged" in settings.features:
 v = 2
 elif portage_gid in os.getgroups():
 v = 1

diff --git a/lib/portage/dispatch_conf.py b/lib/portage/dispatch_conf.py
index c89caf087..d682a9ad0 100644
--- a/lib/portage/dispatch_conf.py
+++ b/lib/portage/dispatch_conf.py
@@ -238,13 +238,17 @@ def rcs_archive(archive, curconf, newconf, mrgconf):
 
 _archive_copy(mystat, newconf, archive)
 
-if has_branch:
-if mrgconf and os.path.isfile(archive) and os.path.isfile(mrgconf):
-# This puts the results of the merge into mrgconf.
-ret = os.system(f"rcsmerge -p -r{RCS_BRANCH} '{archive}' > 
'{mrgconf}'")
-os.chmod(mrgconf, mystat.st_mode)
-os.chown(mrgconf, mystat.st_uid, mystat.st_gid)
-os.rename(archive, archive + ".dist.new")
+if (
+has_branch
+and mrgconf
+and os.path.isfile(archive)
+and os.path.isfile(mrgconf)
+):
+# This puts the results of the merge into mrgconf.
+ret = os.system(f"rcsmerge -p -r{RCS_BRANCH} '{archive}' > 
'{mrgconf}'")
+os.chmod(mrgconf, mystat.st_mode)
+os.chown(mrgconf, mystat.st_uid, mystat.st_gid)
+os.rename(archive, f"{archive}.dist.new")
 
 return ret
 

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

[Sam James]

commit: 195b8029ddd510188e8a2510dad5cbce67c44ecc
Author: Kenneth Raplee  kennethraplee  com>
AuthorDate: Fri Mar 25 12:41:54 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 23:06:46 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=195b8029

Consolidate checks for options with bad atoms

Signed-off-by: Kenneth Raplee  kennethraplee.com>
Signed-off-by: Sam James  gentoo.org>

 lib/_emerge/main.py | 57 +
 1 file changed, 14 insertions(+), 43 deletions(-)

diff --git a/lib/_emerge/main.py b/lib/_emerge/main.py
index f3ff02404..01dc1b419 100644
--- a/lib/_emerge/main.py
+++ b/lib/_emerge/main.py
@@ -876,52 +876,23 @@ def parse_opts(tmpcmdline, silent=False):
 if myoptions.depclean_lib_check in true_y:
 myoptions.depclean_lib_check = True
 
-if myoptions.exclude:
-bad_atoms = _find_bad_atoms(myoptions.exclude)
-if bad_atoms and not silent:
-parser.error(
-"Invalid Atom(s) in --exclude parameter: '%s' (only package 
names and slot atoms (with wildcards) allowed)\n"
-% (",".join(bad_atoms),)
-)
-
-if myoptions.reinstall_atoms:
-bad_atoms = _find_bad_atoms(myoptions.reinstall_atoms)
-if bad_atoms and not silent:
-parser.error(
-"Invalid Atom(s) in --reinstall-atoms parameter: '%s' (only 
package names and slot atoms (with wildcards) allowed)\n"
-% (",".join(bad_atoms),)
-)
-
-if myoptions.rebuild_exclude:
-bad_atoms = _find_bad_atoms(myoptions.rebuild_exclude)
-if bad_atoms and not silent:
-parser.error(
-"Invalid Atom(s) in --rebuild-exclude parameter: '%s' (only 
package names and slot atoms (with wildcards) allowed)\n"
-% (",".join(bad_atoms),)
-)
-
-if myoptions.rebuild_ignore:
-bad_atoms = _find_bad_atoms(myoptions.rebuild_ignore)
-if bad_atoms and not silent:
-parser.error(
-"Invalid Atom(s) in --rebuild-ignore parameter: '%s' (only 
package names and slot atoms (with wildcards) allowed)\n"
-% (",".join(bad_atoms),)
-)
-
-if myoptions.usepkg_exclude:
-bad_atoms = _find_bad_atoms(myoptions.usepkg_exclude)
-if bad_atoms and not silent:
-parser.error(
-"Invalid Atom(s) in --usepkg-exclude parameter: '%s' (only 
package names and slot atoms (with wildcards) allowed)\n"
-% (",".join(bad_atoms),)
-)
+candidate_bad_options = (
+(myoptions.exclude, "exclude"),
+(myoptions.reinstall_atoms, "reinstall-atoms"),
+(myoptions.rebuild_exclude, "rebuild-exclude"),
+(myoptions.rebuild_ignore, "rebuild-ignore"),
+(myoptions.usepkg_exclude, "usepkg-exclude"),
+(myoptions.useoldpkg_atoms, "useoldpkg-atoms"),
+)
+bad_options = (
+(_find_bad_atoms(atoms), flag) for atoms, flag in 
candidate_bad_options if atoms
+)
 
-if myoptions.useoldpkg_atoms:
-bad_atoms = _find_bad_atoms(myoptions.useoldpkg_atoms)
+for bad_atoms, flag in bad_options:
 if bad_atoms and not silent:
+invalid_atoms = ",".join(bad_atoms)
 parser.error(
-"Invalid Atom(s) in --useoldpkg-atoms parameter: '%s' (only 
package names and slot atoms (with wildcards) allowed)\n"
-% (",".join(bad_atoms),)
+f"Invalid Atom(s) in --{flag} parameter: '{invalid_atoms}' 
(only package names and slot atoms (with wildcards) allowed)\n"
 )
 
 if myoptions.fail_clean in true_y:

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

[Sam James]

commit: 6fb8ee74b3f334a7e2d82ce674a4b98e49f78b06
Author: Kenneth Raplee  kennethraplee  com>
AuthorDate: Tue Mar 22 07:54:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 23:06:43 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=6fb8ee74

Use dict expressions instead of looping or dict()

Signed-off-by: Kenneth Raplee  kennethraplee.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/checksum.py | 10 --
 lib/portage/eclass_cache.py |  5 +
 lib/portage/getbinpkg.py| 22 +-
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/lib/portage/checksum.py b/lib/portage/checksum.py
index d7e800c47..72d20525a 100644
--- a/lib/portage/checksum.py
+++ b/lib/portage/checksum.py
@@ -367,9 +367,7 @@ def _perform_md5_merge(x, **kwargs):
 
 
 def perform_all(x, calc_prelink=0):
-mydict = {}
-for k in hashfunc_keys:
-mydict[k] = perform_checksum(x, k, calc_prelink)[0]
+mydict = {k: perform_checksum(x, k, calc_prelink)[0] for k in 
hashfunc_keys}
 return mydict
 
 
@@ -458,11 +456,11 @@ def _apply_hash_filter(digests, hash_filter):
 break
 
 if modified:
-digests = dict(
-(k, v)
+digests = {
+k: v
 for (k, v) in digests.items()
 if k == "size" or k in verifiable_hash_types
-)
+}
 
 return digests
 

diff --git a/lib/portage/eclass_cache.py b/lib/portage/eclass_cache.py
index 2545ed9b2..c4c783168 100644
--- a/lib/portage/eclass_cache.py
+++ b/lib/portage/eclass_cache.py
@@ -169,10 +169,7 @@ class cache:
 return d
 
 def get_eclass_data(self, inherits):
-ec_dict = {}
-for x in inherits:
-ec_dict[x] = self.eclasses[x]
-
+ec_dict = {x: self.eclasses[x] for x in inherits}
 return ec_dict
 
 @property

diff --git a/lib/portage/getbinpkg.py b/lib/portage/getbinpkg.py
index bf99fd2be..f357a91df 100644
--- a/lib/portage/getbinpkg.py
+++ b/lib/portage/getbinpkg.py
@@ -55,20 +55,24 @@ def make_metadata_dict(data):
 )
 
 myid, _myglob = data
-
-mydict = {}
-for k_bytes in portage.xpak.getindex_mem(myid):
-k = _unicode_decode(
-k_bytes, encoding=_encodings["repo.content"], errors="replace"
+metadata = (
+(
+k_bytes,
+_unicode_decode(
+k_bytes, encoding=_encodings["repo.content"], errors="replace"
+),
 )
-if k not in _all_metadata_keys and k != "CATEGORY":
-continue
-v = _unicode_decode(
+for k_bytes in portage.xpak.getindex_mem(myid)
+)
+mydict = {
+k: _unicode_decode(
 portage.xpak.getitem(data, k_bytes),
 encoding=_encodings["repo.content"],
 errors="replace",
 )
-mydict[k] = v
+for k_bytes, k in metadata
+if k in _all_metadata_keys or k == "CATEGORY"
+}
 
 return mydict
 

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

[Sam James]

commit: 7c8d5742d76d65ff3eb203ff269f65817b8b87fc
Author: Kenneth Raplee  kennethraplee  com>
AuthorDate: Tue Mar 22 07:32:42 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 23:06:39 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=7c8d5742

Prefer tuples over explicit lists

Tuples offer better memory usage compared to lists due to Python's
ability to optimize with immutability. While these small amount of
changes won't shave off much, the plan is to find more of these which
will arithmetically have significance to the codebase.

Signed-off-by: Kenneth Raplee  kennethraplee.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/const.py | 10 +-
 lib/portage/data.py  |  4 ++--
 lib/portage/glsa.py  |  8 
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/portage/const.py b/lib/portage/const.py
index 98eb7e4f2..f0f57067a 100644
--- a/lib/portage/const.py
+++ b/lib/portage/const.py
@@ -125,7 +125,7 @@ EBUILD_PHASES = (
 "other",
 )
 SUPPORTED_FEATURES = frozenset(
-[
+(
 "assume-digests",
 "binpkg-docompress",
 "binpkg-dostrip",
@@ -217,14 +217,14 @@ SUPPORTED_FEATURES = frozenset(
 "usersync",
 "webrsync-gpg",
 "xattr",
-]
+)
 )
 
 EAPI = 8
 
 HASHING_BLOCKSIZE = 32768
 
-MANIFEST2_HASH_DEFAULTS = frozenset(["BLAKE2B", "SHA512"])
+MANIFEST2_HASH_DEFAULTS = frozenset(("BLAKE2B", "SHA512"))
 MANIFEST2_HASH_DEFAULT = "BLAKE2B"
 
 MANIFEST2_IDENTIFIERS = ("AUX", "MISC", "DIST", "EBUILD")
@@ -248,7 +248,7 @@ VCS_DIRS = ("CVS", "RCS", "SCCS", ".bzr", ".git", ".hg", 
".svn")
 
 # List of known live eclasses. Keep it in sync with cnf/sets/portage.conf
 LIVE_ECLASSES = frozenset(
-[
+(
 "bzr",
 "cvs",
 "darcs",
@@ -257,7 +257,7 @@ LIVE_ECLASSES = frozenset(
 "golang-vcs",
 "mercurial",
 "subversion",
-]
+)
 )
 
 SUPPORTED_BINPKG_FORMATS = ("tar", "rpm")

diff --git a/lib/portage/data.py b/lib/portage/data.py
index 8c58ad0fc..de7d88e5e 100644
--- a/lib/portage/data.py
+++ b/lib/portage/data.py
@@ -83,12 +83,12 @@ def _target_root():
 
 def portage_group_warning():
 warn_prefix = colorize("BAD", "*** WARNING ***  ")
-mylines = [
+mylines = (
 "For security reasons, only system administrators should be",
 "allowed in the portage group.  Untrusted users or processes",
 "can potentially exploit the portage group for attacks such as",
 "local privilege escalation.",
-]
+)
 for x in mylines:
 writemsg(warn_prefix, noiselevel=-1)
 writemsg(x, noiselevel=-1)

diff --git a/lib/portage/glsa.py b/lib/portage/glsa.py
index 4b92d52e0..1b68bc0e9 100644
--- a/lib/portage/glsa.py
+++ b/lib/portage/glsa.py
@@ -152,7 +152,7 @@ def getListElements(listnode):
 @rtype:List of Strings
 @return:   a list that contains the value of the  elements
 """
-if not listnode.nodeName in ["ul", "ol"]:
+if not listnode.nodeName in ("ul", "ol"):
 raise GlsaFormatException("Invalid function call: listnode is not  
or ")
 rValue = [
 getText(li, format="strip")
@@ -191,8 +191,8 @@ def getText(node, format, textfd=None):  # pylint: 
disable=redefined-builtin
 returnNone = False
 else:
 returnNone = True
-if format in ["strip", "keep"]:
-if node.nodeName in ["uri", "mail"]:
+if format in ("strip", "keep"):
+if node.nodeName in ("uri", "mail"):
 
textfd.write(f"{node.childNodes[0].data}:{node.getAttribute('link')}")
 else:
 for subnode in node.childNodes:
@@ -206,7 +206,7 @@ def getText(node, format, textfd=None):  # pylint: 
disable=redefined-builtin
 for p_subnode in subnode.childNodes:
 if p_subnode.nodeName == "#text":
 textfd.write(p_subnode.data.strip())
-elif p_subnode.nodeName in ["uri", "mail"]:
+elif p_subnode.nodeName in ("uri", "mail"):
 textfd.write(p_subnode.childNodes[0].data)
 textfd.write(" ( " + p_subnode.getAttribute("link") + 
" )")
 textfd.write(NEWLINE_ESCAPE)

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

[Sam James]

commit: 2f7278309bcc13e7fe8b9303124b743e3434871e
Author: Philipp Rösner  protonmail  com>
AuthorDate: Sun Mar 27 20:46:04 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 23:06:33 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2f727830

lib/_emerge/resolver: fix typos

Fix typos in comments and class/function descriptions in the
lib/_emerge/resolver scripts

Signed-off-by: Philipp Rösner  protonmail.com>
Closes: https://github.com/gentoo/portage/pull/797
Signed-off-by: Sam James  gentoo.org>

 lib/_emerge/resolver/output.py  |  2 +-
 lib/_emerge/resolver/package_tracker.py |  8 
 lib/_emerge/resolver/slot_collision.py  | 24 
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/_emerge/resolver/output.py b/lib/_emerge/resolver/output.py
index 7b5602a78..6e569ea48 100644
--- a/lib/_emerge/resolver/output.py
+++ b/lib/_emerge/resolver/output.py
@@ -46,7 +46,7 @@ from _emerge.show_invalid_depstring_notice import 
show_invalid_depstring_notice
 
 
 class Display:
-"""Formats and outputs the depgrah supplied it for merge/re-merge, etc.
+"""Formats and outputs the depgraph supplied it for merge/re-merge, etc.
 
 __call__()
 @param depgraph: list

diff --git a/lib/_emerge/resolver/package_tracker.py 
b/lib/_emerge/resolver/package_tracker.py
index 7f7f2ca36..8631b78d6 100644
--- a/lib/_emerge/resolver/package_tracker.py
+++ b/lib/_emerge/resolver/package_tracker.py
@@ -75,7 +75,7 @@ class PackageTracker:
 and there is already a to-be-installed package added that has the same 
root, catpkg and slot. These cannot co-exist.
 
 A cpv conflict is a situation where a to-be-installed package is added to 
the package tracker via ``add_pkg()``, and
-there is already a to-be-installed package add that has the same root, 
catpkg, and version+revision. These cannot
+there is already a to-be-installed package added that has the same root, 
catpkg, and version+revision. These cannot
 co-exist.
 
 The package tracker does not prevent slot and cpv conflicts from 
occurring. Instead, it allows them to be recorded
@@ -225,7 +225,7 @@ class PackageTracker:
 def discard_pkg(self, pkg):
 """
 Removes the package from the tracker.
-Does not raises KeyError if it is not present.
+Does not raise KeyError if it is not present.
 """
 try:
 self.remove_pkg(pkg)
@@ -263,7 +263,7 @@ class PackageTracker:
 
 def conflicts(self):
 """
-Iterates over the curently existing conflicts.
+Iterates over the currently existing conflicts.
 """
 if self._conflicts_cache is None:
 self._conflicts_cache = []
@@ -369,7 +369,7 @@ class PackageTracker:
 
 class PackageTrackerDbapiWrapper:
 """
-A wrpper class that provides parts of the legacy
+A wrapper class that provides parts of the legacy
 dbapi interface. Remove it once all consumers have
 died.
 """

diff --git a/lib/_emerge/resolver/slot_collision.py 
b/lib/_emerge/resolver/slot_collision.py
index 0b063b5f3..4f30cb675 100644
--- a/lib/_emerge/resolver/slot_collision.py
+++ b/lib/_emerge/resolver/slot_collision.py
@@ -22,7 +22,7 @@ class slot_conflict_handler:
 go away. This class focuses on cases where this can be achieved
 with a change in USE settings.
 
-1) Find out if what causes a given slot conflict. There are
+1) Find out what causes a given slot conflict. There are
 three possibilities:
 
 a) One parent needs foo-1:0 and another one needs foo-2:0,
@@ -36,7 +36,7 @@ class slot_conflict_handler:
 enabled, this case is treated in the same way as c).
 
 c) Neither a 'version based conflict' nor an 'unspecific
-conflict'. Ignoring use deps would result result in an
+conflict'. Ignoring use deps would result in an
 'unspecific conflict'. This is called a 'specific conflict'.
 This is the only conflict we try to find suggestions for.
 
@@ -63,7 +63,7 @@ class slot_conflict_handler:
 * The parent package is 'installed'.
 * The conflict package is 'installed'.
 
-USE of 'installed' packages can't be changed. This always requires an
+USE of 'installed' packages can't be changed. This always requires a
 non-installed package.
 
 During this procedure, contradictions may occur. In this case the
@@ -126,10 +126,10 @@ class slot_conflict_handler:
 
 self._prepare_conflict_msg_and_check_for_specificity()
 
-# a list of dicts that hold the needed USE values to solve all 
conflicts
+# a list of dicts that holds the needed USE values to solve all 
conflicts
 self.solutions = []
 
-# a list of dicts that hold the needed USE changes to solve all 
conflicts
+# a list of dicts that holds the needed USE changes to solve all 

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

[Sam James]

commit: 94f2ae3e7bef411dbfc517fc24a1a1fe880d2ab8
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 27 22:20:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 22:36:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94f2ae3e

dev-util/strace: add 5.17

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

 dev-util/strace/Manifest   |   1 +
 dev-util/strace/strace-5.17.ebuild | 108 +
 2 files changed, 109 insertions(+)

diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 6c34dba08db6..fd62d64d49c1 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -2,3 +2,4 @@ DIST strace-5.12.tar.xz 2009060 BLAKE2B 
9a7a07e5d2d38c8b456f54d0e1d7c776066b2032
 DIST strace-5.14.tar.xz 2067020 BLAKE2B 
479ecf5e66e26e722d108c905130f482c411857db234ac013bf3568905c0f7b896f001ba6da2cabccd0a987c7802aebec9c6298decb691de125e8154c28e1c6f
 SHA512 
3e147521773d900167809db9feeb148e8ba116f90dd634311941ea335eb7bd8b73ab9e641bd2dcfe899ab41c19a841e203dc771ec3000ae01452d22ecdc43c5a
 DIST strace-5.15.tar.xz 2248664 BLAKE2B 
fff08e49552ad1208b658f91e37c540cc7315ac255aba2e69db5bfeb942114b865f1114a45663481f1ab967db45d187bdbcf70ffe80449169df0c37ff82a1a94
 SHA512 
67251792ad0fb7f44013c3ae5e5b757106223c9d123d349e31de7565e0f2bfdc6bbd46a9c269e58508bd288ee70f104f8e2185f2203bd91431c5c776db0d9384
 DIST strace-5.16.tar.xz 2265944 BLAKE2B 
0c0fb133e8642c30a8c706ba23c2d0976ff4e6662a1d07c6cd3cb70aaa980020d54220fe0baddcb70e3c3eb24bc2a8733e4b52ef4e99da5c11ed852c192a5c21
 SHA512 
db5993ece5600d928a42dedd2d5c8efec5b9195becb5fe6913f58f4e2f486d80f1700d63d1e67b591d4e6b13d19c4fcc0c52a4d0fa57c5a5a2ea73c4edd0f817
+DIST strace-5.17.tar.xz 2281220 BLAKE2B 
27e7dc19302c58144b0a7d8de41f717760b8e3cde4ab56892045727597bbfc894bf8f137aee476548c2d16d1e9c8005f931f31a5d2f8bfc4ce5565c2aa01f1ec
 SHA512 
1b63cf7e6e339333b9d24fa20232409192abc815f2ebe2e336ef4acc039cd06c976b3c12e9ce993491a0e6b86c26b90ceba962f580e894b1ff5ab9863bdfcc44

diff --git a/dev-util/strace/strace-5.17.ebuild 
b/dev-util/strace/strace-5.17.ebuild
new file mode 100644
index ..a0531b88dede
--- /dev/null
+++ b/dev-util/strace/strace-5.17.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://github.com/strace/strace.git;
+   inherit git-r3
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="https://strace.io/;
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="aio perl selinux static unwind elfutils"
+REQUIRED_USE="?? ( unwind elfutils )"
+
+BDEPEND="virtual/pkgconfig"
+LIB_DEPEND="
+   unwind? ( sys-libs/libunwind[static-libs(+)] )
+   elfutils? ( dev-libs/elfutils[static-libs(+)] )
+   selinux? ( sys-libs/libselinux[static-libs(+)] )
+"
+# strace only uses the header from libaio to decode structs
+DEPEND="
+   static? ( ${LIB_DEPEND} )
+   aio? ( >=dev-libs/libaio-0.3.106 )
+   sys-kernel/linux-headers
+"
+RDEPEND="
+   !static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+   perl? ( dev-lang/perl )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-5.11-static.patch"
+)
+
+src_prepare() {
+   default
+
+   eautoreconf
+
+   if [[ ! -e configure ]] ; then
+   # git generation
+   sed /autoreconf/d -i bootstrap || die
+   ./bootstrap || die
+   eautoreconf
+   [[ ! -e CREDITS ]] && cp CREDITS{.in,}
+   fi
+
+   # Stub out the -k test since it's known to be flaky. bug #545812
+   sed -i '1iexit 77' tests*/strace-k.test || die
+}
+
+src_configure() {
+   # Set up the default build settings, and then use the names strace 
expects.
+   tc-export_build_env BUILD_{CC,CPP}
+   local v bv
+   for v in CC CPP {C,CPP,LD}FLAGS ; do
+   bv="BUILD_${v}"
+   export "${v}_FOR_BUILD=${!bv}"
+   done
+
+   filter-lfs-flags # configure handles this sanely
+
+   export ac_cv_header_libaio_h=$(usex aio)
+   use elibc_musl && export ac_cv_header_stdc=no
+
+   local myeconfargs=(
+   --disable-gcc-Werror
+
+   # Don't require mpers support on non-multilib systems. #649560
+   --enable-mpers=check
+
+   $(use_enable static)
+   $(use_with unwind libunwind)
+   $(use_with elfutils libdw)
+   $(use_with selinux libselinux)
+   )
+   econf "${myeconfargs[@]}"
+}
+
+src_test() {
+   if has usersandbox ${FEATURES} ; then
+   # bug #643044
+   ewarn "Test suite is known to fail with 

[gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/

[Sam James]

commit: 22c341e089df6b2cfa3c51f69c2cb69381175460
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 27 22:35:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 22:36:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22c341e0

net-print/cups-filters: drop 1.28.3-r1, 1.28.8-r1, 1.28.9-r1, 1.28.10-r2

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

 net-print/cups-filters/Manifest|   3 -
 .../cups-filters/cups-filters-1.28.10-r2.ebuild| 149 -
 .../cups-filters/cups-filters-1.28.3-r1.ebuild | 148 
 .../cups-filters/cups-filters-1.28.8-r1.ebuild | 148 
 .../cups-filters/cups-filters-1.28.9-r1.ebuild | 149 -
 5 files changed, 597 deletions(-)

diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 8b06d3133f61..6b50091e48bd 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,7 +1,4 @@
 DIST cups-filters-1.28.10.tar.xz 1503924 BLAKE2B 
b745ad9d35e375411d43acc8936a7be3197deda26d64c3fcdf792abf751452a83ab4e77b25336509a4d15a7db3dd142c94f3fd108f514d4956ac62f00310b263
 SHA512 
d6079633e10c3cfdc744491df03adc73d98dab0d9c0c6d3bc426b751545ae3434ea875e0841cec9358c19336347903f2832b5f801700b371cc1959e031bfa659
 DIST cups-filters-1.28.12.tar.xz 1505868 BLAKE2B 
a30f4772f89822dd110312ad2b2fb40ffcd093cee119df0660191938b374f4f99178c8e8801c8ff41bf01822a7e9c0e8aebd1d2f96159d377a40f7047da3177a
 SHA512 
430e31815fe3b40b2d12c8db0a9e38060398d9ba3306af5562bc887dd99b06971765b98ba7227a0478d9f6616dd825149f138a2367b442ea0593708eb34140f6
 DIST cups-filters-1.28.13.tar.xz 1510932 BLAKE2B 
20c3d07c59d37ddb7960967fd88ba6be5363dcf4cac6cbde03311507063c3da230ed2026ceedf35c731d6582ad845c4963455e5dad9233295785b4cde80f2278
 SHA512 
52d0f37cf80d9de09d73337e2e32dd4d23eb47f3f8470770e164dabe78220316a4d4b2aea5b466f21d1f504df73cf9eed21a518128ca3ce8048a40deedd9a765
-DIST cups-filters-1.28.3.tar.xz 1501824 BLAKE2B 
b4f493681ac2a701648b3b9b071f4ebfb432dd4660b610579ff2ed6cba4f6cd4351d5a1f28f5c096b3ba20d9c45dc87837bf127b9bc98680a98dec58dd0a68ea
 SHA512 
ac139ae7452342bd46e464bff3438d437f1c9a2e719a7b32b7abc22c2667acaa93dfb976decb277a02572e688ecd86289e01fca817bef93018dff2076fb2a30c
 DIST cups-filters-1.28.7.tar.xz 1503052 BLAKE2B 
b9d3280871faa79a7c277731bf6eb1eef161537829d4bc07ec36075ebc12a3617dce66994ed708991757ce7d78fc5ab010925a1d3d9811fd11cf1172f4786442
 SHA512 
fa94f51ca1c208dcacb1814d8b812c9a72dd09475b7cf836b02c72cb5e3290318f37e475ee3ae8d45351715c3a2ccc0df5ac51ae6fc11462f5acdfa303a04727
-DIST cups-filters-1.28.8.tar.xz 1502456 BLAKE2B 
21dad6dc9a1d2f967f3938f2fc5e35eebadb67da8b526a9ea61599272bd3f87e8efff376661adc02b62b539798cbe46e0f7c5c25ba262da0561b53bbb3d08d5d
 SHA512 
77b39ce2a30ad44d50aa58964b389fa5dd75b2b4307ccb25996050fd176e1e794ad0a66ddd4de76e95a671683c3bf448a4f471272c97a752f25ff6234f7d8511
-DIST cups-filters-1.28.9.tar.xz 1502888 BLAKE2B 
ddfed7c0815673d8a372af96cd879fb159a10d5cdaf07839a0157b94c43cead9d32c62a204513274f2a90b48a09e07d20049b93370b24604f14efe0e782116af
 SHA512 
fbdf01b0a3acd70e3bf036ca4944a8b85ab4ab95d945458e924692008a8a37bb0b1fb097c4d4b3cf6f5ad68ae06e8358659cdfc24974ee629be37b54f5c3dca1

diff --git a/net-print/cups-filters/cups-filters-1.28.10-r2.ebuild 
b/net-print/cups-filters/cups-filters-1.28.10-r2.ebuild
deleted file mode 100644
index 60bffc0de893..
--- a/net-print/cups-filters/cups-filters-1.28.10-r2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit autotools perl-module systemd flag-o-matic
-
-if [[ "${PV}" == "" ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git;
-else
-   SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
-fi
-DESCRIPTION="Cups filters"
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters;
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript test tiff 
zeroconf"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
-   >=app-text/qpdf-8.3.0:=
-   dev-libs/glib:2
-   media-libs/fontconfig
-   media-libs/freetype:2
-   media-libs/lcms:2
-   >=net-print/cups-1.7.3
-   !<=net-print/cups-1.5.
-   sys-devel/bc
-   sys-libs/zlib
-   dbus? ( sys-apps/dbus )
-   foomatic? ( !net-print/foomatic-filters )
-   jpeg? ( virtual/jpeg:0 )
-   ldap? ( net-nds/openldap:= )
-   pdf? ( app-text/mupdf )
-   perl? ( dev-lang/perl:= )
-   png? ( media-libs/libpng:0= )
-   postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
-   tiff? ( media-libs/tiff:0 )
-   zeroconf? ( 

[gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/

[Sam James]

commit: da2f3b60110605ee8ec93f6efa26578757dc9ef4
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 27 22:35:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 22:36:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da2f3b60

net-print/cups-filters: add 1.28.13

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

 net-print/cups-filters/Manifest|   1 +
 net-print/cups-filters/cups-filters-1.28.13.ebuild | 129 +
 2 files changed, 130 insertions(+)

diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 8d5b9b8515b1..8b06d3133f61 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,5 +1,6 @@
 DIST cups-filters-1.28.10.tar.xz 1503924 BLAKE2B 
b745ad9d35e375411d43acc8936a7be3197deda26d64c3fcdf792abf751452a83ab4e77b25336509a4d15a7db3dd142c94f3fd108f514d4956ac62f00310b263
 SHA512 
d6079633e10c3cfdc744491df03adc73d98dab0d9c0c6d3bc426b751545ae3434ea875e0841cec9358c19336347903f2832b5f801700b371cc1959e031bfa659
 DIST cups-filters-1.28.12.tar.xz 1505868 BLAKE2B 
a30f4772f89822dd110312ad2b2fb40ffcd093cee119df0660191938b374f4f99178c8e8801c8ff41bf01822a7e9c0e8aebd1d2f96159d377a40f7047da3177a
 SHA512 
430e31815fe3b40b2d12c8db0a9e38060398d9ba3306af5562bc887dd99b06971765b98ba7227a0478d9f6616dd825149f138a2367b442ea0593708eb34140f6
+DIST cups-filters-1.28.13.tar.xz 1510932 BLAKE2B 
20c3d07c59d37ddb7960967fd88ba6be5363dcf4cac6cbde03311507063c3da230ed2026ceedf35c731d6582ad845c4963455e5dad9233295785b4cde80f2278
 SHA512 
52d0f37cf80d9de09d73337e2e32dd4d23eb47f3f8470770e164dabe78220316a4d4b2aea5b466f21d1f504df73cf9eed21a518128ca3ce8048a40deedd9a765
 DIST cups-filters-1.28.3.tar.xz 1501824 BLAKE2B 
b4f493681ac2a701648b3b9b071f4ebfb432dd4660b610579ff2ed6cba4f6cd4351d5a1f28f5c096b3ba20d9c45dc87837bf127b9bc98680a98dec58dd0a68ea
 SHA512 
ac139ae7452342bd46e464bff3438d437f1c9a2e719a7b32b7abc22c2667acaa93dfb976decb277a02572e688ecd86289e01fca817bef93018dff2076fb2a30c
 DIST cups-filters-1.28.7.tar.xz 1503052 BLAKE2B 
b9d3280871faa79a7c277731bf6eb1eef161537829d4bc07ec36075ebc12a3617dce66994ed708991757ce7d78fc5ab010925a1d3d9811fd11cf1172f4786442
 SHA512 
fa94f51ca1c208dcacb1814d8b812c9a72dd09475b7cf836b02c72cb5e3290318f37e475ee3ae8d45351715c3a2ccc0df5ac51ae6fc11462f5acdfa303a04727
 DIST cups-filters-1.28.8.tar.xz 1502456 BLAKE2B 
21dad6dc9a1d2f967f3938f2fc5e35eebadb67da8b526a9ea61599272bd3f87e8efff376661adc02b62b539798cbe46e0f7c5c25ba262da0561b53bbb3d08d5d
 SHA512 
77b39ce2a30ad44d50aa58964b389fa5dd75b2b4307ccb25996050fd176e1e794ad0a66ddd4de76e95a671683c3bf448a4f471272c97a752f25ff6234f7d8511

diff --git a/net-print/cups-filters/cups-filters-1.28.13.ebuild 
b/net-print/cups-filters/cups-filters-1.28.13.ebuild
new file mode 100644
index ..23c8bbe49a7f
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.28.13.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit perl-module systemd flag-o-matic
+
+DESCRIPTION="Cups filters"
+HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters;
+SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz;
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript test tiff 
zeroconf"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   >=app-text/poppler-0.32[cxx,jpeg?,lcms,tiff?,utils]
+   >=app-text/qpdf-8.3.0:=
+   dev-libs/glib:2
+   media-libs/fontconfig
+   media-libs/freetype:2
+   media-libs/lcms:2
+   >=net-print/cups-1.7.3
+   !<=net-print/cups-1.5.
+   sys-devel/bc
+   sys-libs/zlib
+   dbus? ( sys-apps/dbus )
+   foomatic? ( !net-print/foomatic-filters )
+   jpeg? ( virtual/jpeg:0 )
+   ldap? ( net-nds/openldap:= )
+   pdf? ( app-text/mupdf )
+   perl? ( dev-lang/perl:= )
+   png? ( media-libs/libpng:0= )
+   postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
+   tiff? ( media-libs/tiff:0 )
+   zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   dev-util/gdbus-codegen
+   >=sys-devel/gettext-0.18.3
+   virtual/pkgconfig
+   test? ( media-fonts/dejavu )
+"
+
+src_configure() {
+   # Bug #626800
+   append-cxxflags -std=c++11
+
+   local myeconfargs=(
+   --enable-imagefilters
+   --localstatedir="${EPREFIX}"/var
+   --with-browseremoteprotocols=DNSSD,CUPS
+   --with-cups-rundir="${EPREFIX}"/run/cups
+   --with-fontdir="fonts/conf.avail"
+   --with-pdftops=pdftops
+   --with-rcdir=no
+   --without-php
+   --disable-static
+   $(use_enable dbus)
+   $(use_enable foomatic)
+   $(use_enable 

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

[Matt Turner]

commit: d1b1061cf1fca7e27b719c1d40b5d785661387a3
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Mar 27 22:26:53 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Mar 27 22:34:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1b1061c

profiles: Mark a bunch of GNOME2/GTK-2 packages deprecated

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

 profiles/package.deprecated | 35 +++
 1 file changed, 35 insertions(+)

diff --git a/profiles/package.deprecated b/profiles/package.deprecated
index d1841b1142da..8c4fc7132fba 100644
--- a/profiles/package.deprecated
+++ b/profiles/package.deprecated
@@ -17,6 +17,41 @@
 
 #--- END OF EXAMPLES ---
 
+# Matt Turner  (2022-03-27)
+# Deprecated GNOME 2 era packages
+app-misc/tracker:0
+app-misc/tracker-miners:0
+app-text/enchant:0
+app-text/gnome-doc-utils
+app-text/gtkspell:2
+app-text/rarian
+app-text/scrollkeeper-dtd
+dev-cpp/gconfmm
+dev-cpp/gtkmm:2.4
+dev-cpp/libglademm
+dev-cpp/libgnomecanvasmm
+dev-libs/libcroco
+gnome-base/gconf
+gnome-base/libgnomecanvas
+gnome-extra/gconf-editor
+gnome-extra/gtkhtml
+x11-libs/gtk+extra
+x11-libs/gtksourceview:2.0
+x11-libs/libwnck:1
+x11-themes/gnome-icon-theme-extras
+x11-themes/gnome-icon-theme-symbolic
+x11-themes/gtk-chtheme
+x11-themes/gtk-engines
+x11-themes/gtk-engines-adwaita
+x11-themes/gtk-engines-candido
+x11-themes/gtk-engines-experience
+x11-themes/gtk-engines-murrine
+x11-themes/gtk-engines-nodoka
+x11-themes/gtk-engines-qtpixmap
+x11-themes/gtk-engines-quartz
+x11-themes/gtk-engines-rezlooks
+x11-themes/gtk-engines-ubuntulooks
+
 # Andreas K. Hüttel  (2021-06-30)
 # Deprecated upstream, see HOMEPAGE
 dev-perl/Mail-Sender

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

[Matt Turner]

commit: efff20b170b7d1cefbc983ba5c2287649553fa0b
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Mar 27 22:22:03 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Mar 27 22:34:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efff20b1

profiles: Mask dev-util/appdata-tools for removal

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

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

diff --git a/profiles/package.mask b/profiles/package.mask
index 2ac720069704..26b4147f8405 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Matt Turner  (2022-03-27)
+# Dead package. See 
https://blogs.gnome.org/hughsie/2014/10/30/appdata-tools-is-dead/
+# Bug #680552
+# Removal on 2022-04-27
+dev-util/appdata-tools
+
 # Matt Turner  (2022-03-27)
 # GNOME 2 era packages. No reverse dependencies.
 # Removal on 2022-04-27

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

[Matt Turner]

commit: df06c9b58a9871612f060a6b3e5a3d11d141a4f5
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Mar 27 22:20:19 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Mar 27 22:34:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df06c9b5

profiles: Mask dev-perl/ Gtk2/gnome2 packages for removal

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

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

diff --git a/profiles/package.mask b/profiles/package.mask
index 69d91efb75f1..2ac720069704 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,15 @@
 
 #--- END OF EXAMPLES ---
 
+# Matt Turner  (2022-03-27)
+# GNOME 2 era packages. No reverse dependencies.
+# Removal on 2022-04-27
+dev-perl/gnome2-canvas
+dev-perl/Gtk2-Ex-PodViewer
+dev-perl/Gtk2-Ex-PrintDialog
+dev-perl/Gtk2-Ex-Simple-List
+dev-perl/Gtk2-ImageView
+
 # Conrad Kostecki  (2022-03-27)
 # Long abandoned upstream, multiple bugs open,
 # no other major distro carries this anymore and

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

[Matt Turner]

commit: 20bb6d634a96f1674a4bdcce02e948835c6e879a
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Mar 27 22:10:48 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Mar 27 22:34:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20bb6d63

profiles: Mark dev-perl/ Gtk2/gnome2 packages deprecated

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

 profiles/package.deprecated | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/profiles/package.deprecated b/profiles/package.deprecated
index f57b032ea72e..d1841b1142da 100644
--- a/profiles/package.deprecated
+++ b/profiles/package.deprecated
@@ -23,8 +23,11 @@ dev-perl/Mail-Sender
 
 # Andreas K. Hüttel  (2021-06-11)
 # gtk2. Nuff said. See HOMEPAGE, too.
+dev-perl/Gtk2
+dev-perl/Gtk2-Notify
 dev-perl/Gtk2-SourceView2
 dev-perl/Gtk2-Unique
+dev-perl/gnome2-wnck
 
 # Mart Raudsepp  (2020-07-04)
 # Port to gtk+:3 using wxGTK:3.0-gtk3 SLOT

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

[Matt Turner]

commit: 719e4d3290cbf5f0e26f2b30da646852df3081d6
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Mar 27 22:23:26 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Mar 27 22:34:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=719e4d32

profiles: Mask dev-libs/gtx for removal

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

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

diff --git a/profiles/package.mask b/profiles/package.mask
index 26b4147f8405..7a80362536e5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Matt Turner  (2022-03-27)
+# Dead package. No reverse dependencies since 2017.
+# Removal on 2022-04-27
+dev-libs/gtx
+
 # Matt Turner  (2022-03-27)
 # Dead package. See 
https://blogs.gnome.org/hughsie/2014/10/30/appdata-tools-is-dead/
 # Bug #680552

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

[Matt Turner]

commit: d21d3b87fec5144eb04558467886f3b8feeae2eb
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Mar 27 22:26:25 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Mar 27 22:34:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d21d3b87

profiles: Mask dev-util/fix-la-relink-command for removal

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

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

diff --git a/profiles/package.mask b/profiles/package.mask
index 7a80362536e5..ca933b566b3f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Matt Turner  (2022-03-27)
+# Dead package. No reverse dependencies.
+# Removal on 2022-04-27
+dev-util/fix-la-relink-command
+
 # Matt Turner  (2022-03-27)
 # Dead package. No reverse dependencies since 2017.
 # Removal on 2022-04-27

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

[Conrad Kostecki]

commit: 409a2187f2463d5bb7b7982c8a8760f5ba2f8fab
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Mar 27 14:47:42 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Mar 27 22:21:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=409a2187

profiles/package.mask: drop mask for dev-libs/intel-compute-runtime

Signed-off-by: Conrad Kostecki  gentoo.org>

 profiles/package.mask | 7 ---
 1 file changed, 7 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index c9a937520327..69d91efb75f1 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -479,13 +479,6 @@ app-misc/emelfm2
 # Masked for testing
 ~sci-libs/vtk-9.1.0
 
-# Conrad Kostecki  (2021-12-04)
-# Masking newer versions for both packages,
-# as they cannot be compiled due upstream change.
-# See bug #827651 for more information.
->=dev-libs/intel-compute-runtime-21.47.21710
->=dev-util/intel-graphics-compiler-1.0.9389
-
 # Sam James  (2021-12-01)
 # OSL 12 is a development release (for now).
 # Doesn't work with LLVM 13 yet; mask to help

[gentoo-commits] repo/gentoo:master commit in: dev-libs/intel-vc-intrinsics/

[Conrad Kostecki]

commit: eb24a2c5b95914a7b15cff712cb46dc2b3d2
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Mar 27 01:19:19 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Mar 27 22:21:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb24a2c5

dev-libs/intel-vc-intrinsics: initial import

Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-libs/intel-vc-intrinsics/Manifest  |  1 +
 .../intel-vc-intrinsics-0.1.0.ebuild   | 37 ++
 dev-libs/intel-vc-intrinsics/metadata.xml  | 24 ++
 3 files changed, 62 insertions(+)

diff --git a/dev-libs/intel-vc-intrinsics/Manifest 
b/dev-libs/intel-vc-intrinsics/Manifest
new file mode 100644
index ..51d94a688c1c
--- /dev/null
+++ b/dev-libs/intel-vc-intrinsics/Manifest
@@ -0,0 +1 @@
+DIST intel-vc-intrinsics-0.1.0.tar.gz 135780 BLAKE2B 
cb7c84c14a1fb9655e59ad559e24b3d1072f88390bc2b29ea614217049225dc371395849a7af81607a098a42228a249bdfa09fa72874eee4e20a78a0c4371087
 SHA512 
683c012900acfe331f29c4e88c0a0b0a4e5d84b146faed56757a70d5f9a94678a03c18bd46e269606761e0da4cad5b31f12cb50101d5f810044615971d2b5b9f

diff --git a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.1.0.ebuild 
b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.1.0.ebuild
new file mode 100644
index ..365759d0b864
--- /dev/null
+++ b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_MAX_SLOT="13"
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake llvm python-any-r1
+
+DESCRIPTION="A set of new intrinsics on top of core LLVM IR instructions"
+HOMEPAGE="https://github.com/intel/vc-intrinsics;
+SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> 
${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+   dev-libs/libxml2:2=
+   sys-devel/llvm:${LLVM_MAX_SLOT}
+   sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+src_configure() {
+   local mycmakeargs=(
+   -DLLVM_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+   )
+
+   cmake_src_configure
+}

diff --git a/dev-libs/intel-vc-intrinsics/metadata.xml 
b/dev-libs/intel-vc-intrinsics/metadata.xml
new file mode 100644
index ..923708506038
--- /dev/null
+++ b/dev-libs/intel-vc-intrinsics/metadata.xml
@@ -0,0 +1,24 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   gen...@taujhe.de
+   Jan Henke
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   conik...@gentoo.org
+   Conrad Kostecki
+   
+   
+   VC Intrinsics project contains a set of new intrinsics on
+   top of core LLVM IR instructions that represent SIMD semantics
+   of a program targeting GPU.
+   
+   
+   intel/vc-intrinsics
+   
+

[gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/, dev-util/intel-graphics-compiler/files/

[Conrad Kostecki]

commit: eb7a87df42143a54309e6c16ec23dccaa430cfc9
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Mar 27 01:17:54 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Mar 27 22:21:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb7a87df

dev-util/intel-graphics-compiler: add 1.0.10713

Bug: https://bugs.gentoo.org/817146
Closes: https://bugs.gentoo.org/822438
Closes: https://github.com/gentoo/gentoo/pull/24731
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-util/intel-graphics-compiler/Manifest  |  1 +
 ...713-allow-external-spirv-tools-fix-static.patch | 23 ++
 ...10713-allow-external-spirv-tools-last-fix.patch | 40 ++
 .../intel-graphics-compiler-1.0.10713.ebuild   | 87 ++
 4 files changed, 151 insertions(+)

diff --git a/dev-util/intel-graphics-compiler/Manifest 
b/dev-util/intel-graphics-compiler/Manifest
index a656665cd26a..a84e31babec5 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,2 +1,3 @@
+DIST intel-graphics-compiler-1.0.10713.tar.gz 8489446 BLAKE2B 
063b938ae6d32f3a64decf943215c54ea45eafdb828fdec467941f9e4288977332a3e5e0703193c95412c287f20944b5c2951310c6eb678233cd16dfdd3377b0
 SHA512 
a6c568d339c0316400f88e318a290a92f842eeb2ab92abd0c23ff155e6b90e2d8e012ac8714a9695a66a509ffef66574919d92bc03ff06b773a79896546fe1a6
 DIST intel-graphics-compiler-1.0.8744.tar.gz 7586378 BLAKE2B 
0f20f99a2659f733521af35c1dd63c2b1398bf4fc5745a217b96ad62cfa53f105d4c9a34eba09651d0f0679d6957820011446f5657170f5ad07d110372b8b1f3
 SHA512 
dbbe6c08f32b80be305add570187df883aacefbf90b252c70b5705ecc7732f25873732a85558f0aed2ee8db5bcd1a59aec4d7ba110774922dbb19d4d3522a539
 DIST intel-graphics-compiler-1.0.9441.tar.gz 7893557 BLAKE2B 
f050df0eddf63f880757fb04dded4ddc133c11fd7a7c8ceab152ac233ba9953b7efbe948433056654b2b43db2254a1edc15e5aada24fd3873face6f43d1307f9
 SHA512 
eaccec4213ea7af7deeaf8772784065839bb2f1dc98fb88b49acfcfc2b299f7e6ecb48c5df854448fa7db79f738654db722fcf684e9bbc94051d3bcfe449e20f

diff --git 
a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.10713-allow-external-spirv-tools-fix-static.patch
 
b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.10713-allow-external-spirv-tools-fix-static.patch
new file mode 100644
index ..6abfdfe60d53
--- /dev/null
+++ 
b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.10713-allow-external-spirv-tools-fix-static.patch
@@ -0,0 +1,23 @@
+From 7e6b78d1ccf5afb4080795aa87029e55b9e5499c Mon Sep 17 00:00:00 2001
+From: Andrey Agrachev 
+Date: Thu, 10 Mar 2022 12:51:37 +
+Subject: [PATCH]  Remove 'static' suffix
+
+Remove 'static' suffix to enable shared lib usage
+---
+ external/SPIRV-Tools/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/external/SPIRV-Tools/CMakeLists.txt 
b/external/SPIRV-Tools/CMakeLists.txt
+index f46a6988683..f40605c4b36 100644
+--- a/external/SPIRV-Tools/CMakeLists.txt
 b/external/SPIRV-Tools/CMakeLists.txt
+@@ -34,7 +34,7 @@ if(IGC_OPTION__SPIRV_TOOLS_MODE STREQUAL PREBUILDS_MODE_NAME)
+ 
+  set(INCLUDE_DIRS_LIST "${SPIRV-Tools_ROOT_DIR}/include" 
"${SPIRV-Headers_INCLUDE_DIR}")
+  set_target_properties(SPIRV-Tools-static PROPERTIES INCLUDE_DIRECTORIES 
"${INCLUDE_DIRS_LIST}")
+- set(IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools-static)
++ set(IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools)
+ 
+ else() #By default use build from sources
+  message(STATUS "[SPIRV-Tools] : IGC_OPTION__SPIRV_TOOLS_MODE set to Source")

diff --git 
a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.10713-allow-external-spirv-tools-last-fix.patch
 
b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.10713-allow-external-spirv-tools-last-fix.patch
new file mode 100644
index ..5959a514004c
--- /dev/null
+++ 
b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.10713-allow-external-spirv-tools-last-fix.patch
@@ -0,0 +1,40 @@
+From acfa99b5aefbebf037e4c939f5a8e592dfaed04e Mon Sep 17 00:00:00 2001
+From: Andrey Agrachev 
+Date: Tue, 22 Mar 2022 09:15:54 +
+Subject: [PATCH]  Fix missprints
+
+Fix misspints in Spirv-Tools CMakeList
+---
+ external/SPIRV-Tools/CMakeLists.txt | 8 
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/external/SPIRV-Tools/CMakeLists.txt 
b/external/SPIRV-Tools/CMakeLists.txt
+index f40605c4b36..076079f7c86 100644
+--- a/external/SPIRV-Tools/CMakeLists.txt
 b/external/SPIRV-Tools/CMakeLists.txt
+@@ -16,7 +16,7 @@ if(IGC_OPTION__SPIRV_TOOLS_MODE STREQUAL PREBUILDS_MODE_NAME)
+  OPTION(IGC__OPTION_USE_PREINSTALLED_SPRIV_HEADERS OFF)
+ 
+  if(IGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS)
+-  message(STATUS "[SPIRV-Tools] : IGC__OPTION_USE_PREINSTALLED_SPRIV_HEADERS 
set to OFF, using preinstalled SPIRV-Headers")
++  message(STATUS "[SPIRV-Tools] : IGC__OPTION_USE_PREINSTALLED_SPRIV_HEADERS 
set to ON, using 

[gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/

[Conrad Kostecki]

commit: 69d75711d4911030679e244d4f6bf94073a3ec2f
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Mar 27 14:46:38 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Mar 27 22:21:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69d75711

dev-util/intel-graphics-compiler: drop 1.0.9441

Closes: https://github.com/gentoo/gentoo/pull/23595
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-util/intel-graphics-compiler/Manifest  |  1 -
 .../intel-graphics-compiler-1.0.10713.ebuild   |  4 +-
 .../intel-graphics-compiler-1.0.9441.ebuild| 79 --
 3 files changed, 2 insertions(+), 82 deletions(-)

diff --git a/dev-util/intel-graphics-compiler/Manifest 
b/dev-util/intel-graphics-compiler/Manifest
index a84e31babec5..cf2a02dfa4c1 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,3 +1,2 @@
 DIST intel-graphics-compiler-1.0.10713.tar.gz 8489446 BLAKE2B 
063b938ae6d32f3a64decf943215c54ea45eafdb828fdec467941f9e4288977332a3e5e0703193c95412c287f20944b5c2951310c6eb678233cd16dfdd3377b0
 SHA512 
a6c568d339c0316400f88e318a290a92f842eeb2ab92abd0c23ff155e6b90e2d8e012ac8714a9695a66a509ffef66574919d92bc03ff06b773a79896546fe1a6
 DIST intel-graphics-compiler-1.0.8744.tar.gz 7586378 BLAKE2B 
0f20f99a2659f733521af35c1dd63c2b1398bf4fc5745a217b96ad62cfa53f105d4c9a34eba09651d0f0679d6957820011446f5657170f5ad07d110372b8b1f3
 SHA512 
dbbe6c08f32b80be305add570187df883aacefbf90b252c70b5705ecc7732f25873732a85558f0aed2ee8db5bcd1a59aec4d7ba110774922dbb19d4d3522a539
-DIST intel-graphics-compiler-1.0.9441.tar.gz 7893557 BLAKE2B 
f050df0eddf63f880757fb04dded4ddc133c11fd7a7c8ceab152ac233ba9953b7efbe948433056654b2b43db2254a1edc15e5aada24fd3873face6f43d1307f9
 SHA512 
eaccec4213ea7af7deeaf8772784065839bb2f1dc98fb88b49acfcfc2b299f7e6ecb48c5df854448fa7db79f738654db722fcf684e9bbc94051d3bcfe449e20f

diff --git 
a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713.ebuild 
b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713.ebuild
index 906d7de597c5..d0d4c3c1272a 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713.ebuild
@@ -73,8 +73,8 @@ src_configure() {
-DINSTALL_GENX_IR="ON"

-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
 
-   # VectorCompiler needs work, as at the moment upstream
-   # only supports building vc-intrinsics in place.
+   # Compilation with VectorCompiler causes currently a segfault.
+   # See 
https://github.com/intel/intel-graphics-compiler/issues/236
-DIGC_BUILD__VC_ENABLED="OFF"
# -DIGC_OPTION__VC_INTRINSICS_MODE="Prebuilds"
 

diff --git 
a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9441.ebuild 
b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9441.ebuild
deleted file mode 100644
index 0e7e9889129e..
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9441.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE="Release"
-LLVM_MAX_SLOT="11"
-MY_PN="igc"
-MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake flag-o-matic llvm python-any-r1
-
-DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen 
graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler;
-SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-DEPEND="
-   dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
-   sys-devel/llvm:${LLVM_MAX_SLOT}=
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-   ${PYTHON_DEPS}
-   >=sys-devel/lld-${LLVM_MAX_SLOT}
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
-   "${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
-   "${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
-   "${FILESDIR}/${PN}-1.0.8365-cmake-project.patch"
-)
-
-pkg_setup() {
-   llvm_pkg_setup
-   python-any-r1_pkg_setup
-}
-
-src_configure() {
-   # Since late March 2020 cmake.eclass does not set -DNDEBUG any more,
-   # and the way IGC uses this definition causes problems for some users.
-   # See bug #718824 for more information.
-   ! use debug && append-cppflags -DNDEBUG
-
-   # Get LLVM version
-   local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
-
-   local mycmakeargs=(
-   # Those options are ensuring, that we are using
-   # the system LLVM with the correct slot.
-   -DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
-   

[gentoo-commits] repo/gentoo:master commit in: dev-libs/intel-compute-runtime/

[Conrad Kostecki]

commit: 05bf2abb72e2c508ebefd17dda0acfa26442d8dc
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Mar 27 14:47:03 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Mar 27 22:21:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05bf2abb

dev-libs/intel-compute-runtime: drop 21.50.21939

Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-libs/intel-compute-runtime/Manifest|  1 -
 .../intel-compute-runtime-21.50.21939.ebuild   | 61 --
 2 files changed, 62 deletions(-)

diff --git a/dev-libs/intel-compute-runtime/Manifest 
b/dev-libs/intel-compute-runtime/Manifest
index ada3d0bc4175..c21ef1ba4fbf 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -1,3 +1,2 @@
 DIST intel-compute-runtime-21.46.21636.tar.gz 4878855 BLAKE2B 
0ada296b36567038b2abeba50c2dae6604981f00cdfc0d5d9d197c793534c887fa1d321ced34b37cf6760bdc9e2b8769cdc24fe3884036b78b983660c90b1ee7
 SHA512 
a63436d049737b955f0e23bbfc78684f665f3d1a668120e803165839792144154f3f42a52c6533611711592ba6e41408d81196a61e318746b1dae1392d1d29ac
-DIST intel-compute-runtime-21.50.21939.tar.gz 5106368 BLAKE2B 
3a8613c7178975bf930f0ccbed06d31952f05c8316e7735db759a7bcc8b81b5bd3040af62bae6e63fc9781ce2e6e8f035751cd6696b4c7cfbb6025f3d4fcfd8b
 SHA512 
cabcb0fb9816ca8e6b93fa069c73926ccdaf3803c073b11f62477f80d38af49a7b4e814765a40e3daae50a6159560872c5b5123f64e68a570556c80d47a120c9
 DIST intel-compute-runtime-22.11.22682.tar.gz 5220769 BLAKE2B 
c5cacdb0140fe9247353b9922a2e401a866d73ea9d4fa6a4312c984d4ba0751ff60d58f15b49003020d88bef13808113ba8ca84239c140fa7c26edcd401c0d9c
 SHA512 
0e4007b152a20e85d40e71d68144a8dab1be536800650fbd1c3f5e23a0731c733d7dfa943d7ea4e1f19548313b12474bd5b9426ef7f2057a9b106a0fc9a1762a

diff --git 
a/dev-libs/intel-compute-runtime/intel-compute-runtime-21.50.21939.ebuild 
b/dev-libs/intel-compute-runtime/intel-compute-runtime-21.50.21939.ebuild
deleted file mode 100644
index 211c859a70c9..
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-21.50.21939.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PN="${PN/intel-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL 
Driver"
-HOMEPAGE="https://github.com/intel/compute-runtime;
-SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+l0 +vaapi"
-
-RDEPEND="
-   dev-libs/libnl:3
-   dev-libs/libxml2:2
-   >=dev-util/intel-graphics-compiler-1.0.9389
-   >=dev-util/intel-graphics-system-controller-0.2.4
-   >=media-libs/gmmlib-21.2.1:=
-   >=virtual/opencl-3
-   l0? ( >=dev-libs/level-zero-1.6.2 )
-   vaapi? (
-   x11-libs/libdrm[video_cards_intel]
-   x11-libs/libva
-   )
-"
-
-# for Khronos OpenGL headers
-DEPEND="
-   ${RDEPEND}
-   media-libs/mesa
-"
-
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( "README.md" "FAQ.md" )
-
-PATCHES=( "${FILESDIR}/${PN}-21.31.20514-no_Werror.patch" )
-
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_WITH_L0="$(usex l0)"
-   -DDISABLE_LIBVA="$(usex !vaapi)"
-   -DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
-   -DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
-
-   # If enabled, tests are automatically run during
-   # the compile phase and we cannot run them because
-   # they require permissions to access the hardware.
-   -DSKIP_UNIT_TESTS="ON"
-   )
-
-   cmake_src_configure
-}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/intel-metrics-library/

[Conrad Kostecki]

commit: 57cb61e866fd9dfe530a487c0a7f1ae5132be43a
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Mar 27 01:21:10 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Mar 27 22:21:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57cb61e8

dev-libs/intel-metrics-library: initial import

Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-libs/intel-metrics-library/Manifest|  1 +
 .../intel-metrics-library-0_pre20211123.ebuild | 23 ++
 dev-libs/intel-metrics-library/metadata.xml| 28 ++
 3 files changed, 52 insertions(+)

diff --git a/dev-libs/intel-metrics-library/Manifest 
b/dev-libs/intel-metrics-library/Manifest
new file mode 100644
index ..3bec3aa806a7
--- /dev/null
+++ b/dev-libs/intel-metrics-library/Manifest
@@ -0,0 +1 @@
+DIST intel-metrics-library-0_pre20211123.tar.gz 227022 BLAKE2B 
c718c5972ae1cb8d36c65f541832a36c7107af1299c2cd4101df1180325a97fca5ca2066574ee0bbc31eaac35286c27a00b2c292058453b5fcf41d745585a0ad
 SHA512 
e54d68c5b31c59258086f89d56ea819ed4a680901d65862361dd17e172be7806cf21bed907a0f59fe8c3295cab541402dc0f7c41a944f4aee1481356c2a9

diff --git 
a/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20211123.ebuild 
b/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20211123.ebuild
new file mode 100644
index ..e06f9566edbb
--- /dev/null
+++ b/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20211123.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+EGIT_COMMIT="3fd6eb0544fadcec2ac762aedee7c2d5d6479feb"
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake
+
+DESCRIPTION="A user mode driver helper library that provides access to GPU 
performance counters"
+HOMEPAGE="https://github.com/intel/metrics-library;
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> 
${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${EGIT_COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="x11-libs/libdrm"
+RDEPEND="${RDEPEND}"

diff --git a/dev-libs/intel-metrics-library/metadata.xml 
b/dev-libs/intel-metrics-library/metadata.xml
new file mode 100644
index ..f431a6dd5217
--- /dev/null
+++ b/dev-libs/intel-metrics-library/metadata.xml
@@ -0,0 +1,28 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   gen...@taujhe.de
+   Jan Henke
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   conik...@gentoo.org
+   Conrad Kostecki
+   
+   
+   This software is a user mode driver helper library
+   that provides access to GPU performance counters.
+
+   Supported Platforms are:
+   * Intel Processors with Gen9 graphics devices
+   * Intel Processors with Gen11 graphics devices
+   * Intel Processors with Gen12 graphics devices
+   
+   
+   intel/metrics-library
+   
+

[gentoo-commits] repo/gentoo:master commit in: dev-libs/intel-compute-runtime/

[Conrad Kostecki]

commit: 80d011f408fa50ac5733fc2f629dc55c2abb19ee
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Mar 27 01:22:08 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Mar 27 22:21:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80d011f4

dev-libs/intel-compute-runtime: add 22.11.22682

Closes: https://bugs.gentoo.org/817146
Closes: https://github.com/gentoo/gentoo/pull/23595
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-libs/intel-compute-runtime/Manifest|  1 +
 .../intel-compute-runtime-22.11.22682.ebuild   | 71 ++
 2 files changed, 72 insertions(+)

diff --git a/dev-libs/intel-compute-runtime/Manifest 
b/dev-libs/intel-compute-runtime/Manifest
index 6dafd299d6dc..ada3d0bc4175 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -1,2 +1,3 @@
 DIST intel-compute-runtime-21.46.21636.tar.gz 4878855 BLAKE2B 
0ada296b36567038b2abeba50c2dae6604981f00cdfc0d5d9d197c793534c887fa1d321ced34b37cf6760bdc9e2b8769cdc24fe3884036b78b983660c90b1ee7
 SHA512 
a63436d049737b955f0e23bbfc78684f665f3d1a668120e803165839792144154f3f42a52c6533611711592ba6e41408d81196a61e318746b1dae1392d1d29ac
 DIST intel-compute-runtime-21.50.21939.tar.gz 5106368 BLAKE2B 
3a8613c7178975bf930f0ccbed06d31952f05c8316e7735db759a7bcc8b81b5bd3040af62bae6e63fc9781ce2e6e8f035751cd6696b4c7cfbb6025f3d4fcfd8b
 SHA512 
cabcb0fb9816ca8e6b93fa069c73926ccdaf3803c073b11f62477f80d38af49a7b4e814765a40e3daae50a6159560872c5b5123f64e68a570556c80d47a120c9
+DIST intel-compute-runtime-22.11.22682.tar.gz 5220769 BLAKE2B 
c5cacdb0140fe9247353b9922a2e401a866d73ea9d4fa6a4312c984d4ba0751ff60d58f15b49003020d88bef13808113ba8ca84239c140fa7c26edcd401c0d9c
 SHA512 
0e4007b152a20e85d40e71d68144a8dab1be536800650fbd1c3f5e23a0731c733d7dfa943d7ea4e1f19548313b12474bd5b9426ef7f2057a9b106a0fc9a1762a

diff --git 
a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.11.22682.ebuild 
b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.11.22682.ebuild
new file mode 100644
index ..1d868e365abd
--- /dev/null
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.11.22682.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake
+
+DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL 
Driver"
+HOMEPAGE="https://github.com/intel/compute-runtime;
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+l0 +vaapi"
+
+RDEPEND="
+   dev-libs/libnl:3
+   dev-libs/libxml2:2
+   >=dev-util/intel-graphics-compiler-1.0.10409
+   >=dev-util/intel-graphics-system-controller-0.2.4
+   >=media-libs/gmmlib-22.0.2:=
+   >=virtual/opencl-3
+   l0? ( >=dev-libs/level-zero-1.7.9 )
+   vaapi? (
+   x11-libs/libdrm[video_cards_intel]
+   x11-libs/libva
+   )
+"
+
+# for Khronos OpenGL headers
+DEPEND="
+   ${RDEPEND}
+   media-libs/mesa
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "README.md" "FAQ.md" )
+
+PATCHES=( "${FILESDIR}/${PN}-22.11.22682-metrics.patch" )
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+   -DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
+   -DBUILD_WITH_L0="$(usex l0)"
+   -DDISABLE_LIBVA="$(usex !vaapi)"
+   # -DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include"
+   -DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
+   -DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
+   -DSUPPORT_DG1="ON"
+
+   # See 
https://github.com/intel/intel-graphics-compiler/issues/204
+   -DNEO_DISABLE_BUILTINS_COMPILATION="ON"
+
+   # If enabled, tests are automatically run during
+   # the compile phase and we cannot run them because
+   # they require permissions to access the hardware.
+   -DSKIP_UNIT_TESTS="1"
+
+   -Wno-dev
+   )
+
+   cmake_src_configure
+}

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

[William Hubbs]

commit: 1245d3fb758b18e5799e502e97cad3282a9f7bb6
Author: William Hubbs  gentoo  org>
AuthorDate: Sun Mar 27 22:13:38 2022 +
Commit: William Hubbs  gentoo  org>
CommitDate: Sun Mar 27 22:14:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1245d3fb

dev-util/gitlab-runner: initial import

Signed-off-by: William Hubbs  gentoo.org>

 dev-util/gitlab-runner/Manifest|  2 +
 dev-util/gitlab-runner/files/gitlab-runner.confd   | 19 +++
 dev-util/gitlab-runner/files/gitlab-runner.initd   | 35 +
 dev-util/gitlab-runner/files/gitlab-runner.service | 18 +++
 dev-util/gitlab-runner/files/gitlab-runner.tmpfile |  1 +
 dev-util/gitlab-runner/gitlab-runner-14.9.1.ebuild | 60 ++
 dev-util/gitlab-runner/metadata.xml| 12 +
 7 files changed, 147 insertions(+)

diff --git a/dev-util/gitlab-runner/Manifest b/dev-util/gitlab-runner/Manifest
new file mode 100644
index ..a6b0f0003131
--- /dev/null
+++ b/dev-util/gitlab-runner/Manifest
@@ -0,0 +1,2 @@
+DIST gitlab-runner-14.9.1-deps.tar.xz 142907928 BLAKE2B 
fb61c7b03d3dd63196bb4de0042a3c65035a3fc132435d7844635bb968a6bfe43e05fca053bfa96ba22cc9fd601d533857bffdf8bd734e90e86fefce8091da34
 SHA512 
d077cc1220ad33196655e578937c910c7b368eef57bb96d385eac0957e5f8902bb3720b1614f3179753929f25589a8d1d543bcb61d4cf5972bf4ada96a4056d8
+DIST gitlab-runner-14.9.1.tar.gz 1259997 BLAKE2B 
a4694198630fb2cc47ad4e9fe36b366ae695d8a4618e755b9ff12b608d5d8266614cc649b0e63bca125919ebe8dd40859fc7804cd8bb40ed391a54d6ae65a325
 SHA512 
ec804f3a4982414d52a4f3b5ff1560c5342a3650f1bb3edefa211a3810b17e202263abc67bfcd4423fe88b5acd501da1d23f3980a078800ab25932625ff75bc5

diff --git a/dev-util/gitlab-runner/files/gitlab-runner.confd 
b/dev-util/gitlab-runner/files/gitlab-runner.confd
new file mode 100644
index ..513b2f9cef18
--- /dev/null
+++ b/dev-util/gitlab-runner/files/gitlab-runner.confd
@@ -0,0 +1,19 @@
+# config file for /etc/init.d/gitlab-runner
+# The convention is that the defaults are shown here, commented out.
+# Do not override these unless you know exactly what you are doing.
+
+# runner_config="/etc/gitlab-runner/config.toml"
+# runner_datadir="/var/lib/gitlab-runner"
+# runner_service="${RC_SVCNAME}"
+# runner_user="gitlab-runner"
+
+# Additional options
+# run /usr/bin/gitlab-runner -h to see available options
+# --config, --user, --service and --working-directory are set by the
+# above variables, so do not add them here.
+# RUNNER_OPTS=""
+
+# Logging
+# runner_logdir="/var/log/gitlab-runner"
+# output_log="${runner_logdir}/gitlab-runner.log"
+# error_log="${runner_logdir}/error.log"

diff --git a/dev-util/gitlab-runner/files/gitlab-runner.initd 
b/dev-util/gitlab-runner/files/gitlab-runner.initd
new file mode 100644
index ..8ae45b510fd0
--- /dev/null
+++ b/dev-util/gitlab-runner/files/gitlab-runner.initd
@@ -0,0 +1,35 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/gitlab-runner"
+command_args="run
+   --config ${runner_config:-/etc/gitlab-runner/config.toml}
+   --service ${runner_service:-${RC_SVCNAME}}
+   --user ${runner_user:-gitlab-runner}
+   --working-directory ${runner_datadir:-/var/lib/gitlab-runner}
+   ${RUNNER_OPTS}"
+command_background=true
+extra_started_commands="reload"
+name="${name:-GitLab Runner}"
+pidfile="/run/${RC_SVCNAME}.pid"
+output_log="${output_log:-${runner_logdir}/gitlab-runner.log"
+error_log="${error_log:-${runner_logdir}/gitlab-runner.err"
+retry="QUIT/60/TERM/60"
+required_files="${runner_config}"
+
+depend() {
+   need localmount
+   after net.lo loopback
+}
+
+start_pre() {
+   checkpath -d -m 0700 -o "${runner_user}" "${runner_datadir}"
+   checkpath -d -m 0750 -o "${runner_user}" "${runner_logdir}"
+}
+
+reload() {
+   ebegin "Reloading ${name} configuration"
+   start-stop-daemon --signal HUP --pidfile "${pidfile}"
+   eend $? "Failed to reload ${name}"
+}

diff --git a/dev-util/gitlab-runner/files/gitlab-runner.service 
b/dev-util/gitlab-runner/files/gitlab-runner.service
new file mode 100644
index ..047de5cc7363
--- /dev/null
+++ b/dev-util/gitlab-runner/files/gitlab-runner.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=GitLab Runner service
+After=syslog.target network.target
+ConditionFileIsExecutable=/usr/bin/gitlab-runner
+
+[Service]
+StartLimitInterval=5
+StartLimitBurst=10
+ExecStart=/usr/bin/gitlab-runner run -c /etc/gitlab-runner/config.toml -u 
gitlab-runner -d /var/lib/gitlab-runner --syslog
+Restart=always
+RestartSec=120
+StandardOutput=syslog
+StandardError=syslog
+SyslogIdentifier=gitlab-runner
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target

diff --git a/dev-util/gitlab-runner/files/gitlab-runner.tmpfile 
b/dev-util/gitlab-runner/files/gitlab-runner.tmpfile
new file mode 100644
index 

[gentoo-commits] repo/gentoo:master commit in: net-vpn/libreswan/files/

[Conrad Kostecki]

commit: 1c1ef22b1f75f875063e408b54439633f682f804
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Mar 13 10:06:41 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Mar 27 22:07:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c1ef22b

net-vpn/libreswan: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/24527
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-vpn/libreswan/files/libreswan-3.30-ip-path.patch | 13 -
 1 file changed, 13 deletions(-)

diff --git a/net-vpn/libreswan/files/libreswan-3.30-ip-path.patch 
b/net-vpn/libreswan/files/libreswan-3.30-ip-path.patch
deleted file mode 100644
index ac45270beaf7..
--- a/net-vpn/libreswan/files/libreswan-3.30-ip-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
 a/initsystems/systemd/ipsec.service.in.orig2020-02-14 
08:11:29.883638349 +0100
-+++ b/initsystems/systemd/ipsec.service.in 2020-02-14 08:11:40.555430565 
+0100
-@@ -29,8 +29,8 @@
- # Enable for portexcludes support
- # ExecStartPost=@FINALLIBEXECDIR@/portexcludes
- ExecStop=@FINALLIBEXECDIR@/whack --shutdown
--ExecStopPost=/sbin/ip xfrm policy flush
--ExecStopPost=/sbin/ip xfrm state flush
-+ExecStopPost=/bin/ip xfrm policy flush
-+ExecStopPost=/bin/ip xfrm state flush
- ExecStopPost=@FINALSBINDIR@/ipsec --stopnflog
- ExecReload=@FINALLIBEXECDIR@/whack --listen
- 

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

[Conrad Kostecki]

commit: e8d1cbb9ab718517c1d541663bf004522395e6f1
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Mar 13 10:03:37 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Mar 27 22:07:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8d1cbb9

dev-libs/protobuf: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/24529
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../protobuf-3.18.0-disable_no-warning-test.patch  |  36 -
 .../files/protobuf-3.18.0-system_libraries.patch   | 146 -
 2 files changed, 182 deletions(-)

diff --git 
a/dev-libs/protobuf/files/protobuf-3.18.0-disable_no-warning-test.patch 
b/dev-libs/protobuf/files/protobuf-3.18.0-disable_no-warning-test.patch
deleted file mode 100644
index 9abf5deca295..
--- a/dev-libs/protobuf/files/protobuf-3.18.0-disable_no-warning-test.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 290073d7d4ddaa6d39ad12c90245e795c5482432 Mon Sep 17 00:00:00 2001
-From: Arfrever Frehtes Taifersar Arahesis 
-Date: Sat, 29 Jan 2022 22:43:50 +0800
-Subject: [PATCH] protobuf-3.18.0: disable no-warning test
-
-Disable no-warning-test which is compiled with -Werror option
-and whose only purpose is checking if compilation results in any warnings.
-
-Signed-off-by: Arfrever Frehtes Taifersar Arahesis 
-Signed-off-by: Yixun Lan 

- src/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index e6b4d0f..1cfd885 100644
 a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -726,7 +726,7 @@ 
GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest
- GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
- check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
-  protobuf-lite-test test_plugin protobuf-lite-arena-test \
-- no-warning-test $(GZCHECKPROGRAMS)
-+ $(GZCHECKPROGRAMS)
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
-   $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
-   $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
-@@ -915,4 +915,4 @@ nodist_no_warning_test_SOURCES = no_warning_test.cc 
$(protoc_outputs)
- 
- TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
- google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS) \
--protobuf-lite-arena-test no-warning-test
-+protobuf-lite-arena-test
--- 
-2.34.1
-

diff --git a/dev-libs/protobuf/files/protobuf-3.18.0-system_libraries.patch 
b/dev-libs/protobuf/files/protobuf-3.18.0-system_libraries.patch
deleted file mode 100644
index 0e417c51bdab..
--- a/dev-libs/protobuf/files/protobuf-3.18.0-system_libraries.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 10b2d5bb5a4d1b7529cb781e5513940ad6db4ada Mon Sep 17 00:00:00 2001
-From: Arfrever Frehtes Taifersar Arahesis 
-Date: Sat, 29 Jan 2022 22:46:38 +0800
-Subject: [PATCH] protobuf-3.18.0: system_libraries
-
-Use system version of GoogleTest,
-which will unbundle gtest, gmock libraries
-
-Signed-off-by: Arfrever Frehtes Taifersar Arahesis 
-Signed-off-by: Yixun Lan 

- Makefile.am | 20 +---
- configure.ac|  7 ---
- src/Makefile.am | 33 ++---
- 3 files changed, 7 insertions(+), 53 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 7ce954e..c1493e0 100644
 a/Makefile.am
-+++ b/Makefile.am
-@@ -11,28 +11,10 @@ SUBDIRS = . src
- # Always include third_party directories in distributions.
- DIST_SUBDIRS = src conformance benchmarks third_party/googletest
- 
--# Build gmock before we build protobuf tests.  We don't add gmock to SUBDIRS
--# because then "make check" would also build and run all of gmock's own tests,
--# which takes a lot of time and is generally not useful to us.  Also, we don't
--# want "make install" to recurse into gmock since we don't want to overwrite
--# the installed version of gmock if there is one.
- check-local:
--  @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock"
--  @cd third_party/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) 
lib/libgtest.la lib/libgtest_main.la
--  @cd third_party/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) 
lib/libgmock.la lib/libgmock_main.la
- 
--# We would like to clean gmock when "make clean" is invoked.  But we have to
--# be careful because clean-local is also invoked during "make distclean", but
--# "make distclean" already recurses into gmock because it's listed among the
--# DIST_SUBDIRS.  distclean will delete gmock/Makefile, so if we then try to
--# cd to the directory again and "make clean" it will fail.  So, check that the
--# Makefile exists before recursing.
- clean-local:
--  @if test -e third_party/googletest/Makefile; then \
--echo 

[gentoo-commits] repo/gentoo:master commit in: media-libs/gst-plugins-good/files/

[Conrad Kostecki]

commit: eeeda2ee3785c457be61b74887e6dd84ccbe07c2
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Fri Mar 18 06:21:00 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Mar 27 22:07:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeeda2ee

media-libs/gst-plugins-good: remove unused patch(es)

Closes: https://github.com/gentoo/gentoo/pull/24633
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 ...t-plugins-good-1.20.0-lame-feature-option.patch |  23 ---
 .../gst-plugins-good-1.20.0-ldac-rtp-header.patch  | 163 -
 2 files changed, 186 deletions(-)

diff --git 
a/media-libs/gst-plugins-good/files/gst-plugins-good-1.20.0-lame-feature-option.patch
 
b/media-libs/gst-plugins-good/files/gst-plugins-good-1.20.0-lame-feature-option.patch
deleted file mode 100644
index c431b1fb6bd7..
--- 
a/media-libs/gst-plugins-good/files/gst-plugins-good-1.20.0-lame-feature-option.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit d03971dac7b32a6ffcbf161853e017f65ae7c22f
-Author: Heiko Becker 
-Date:   Fri Feb 11 21:35:54 2022 +0100
-
-meson: Don't build lame plugin with -Dlame=disabled
-
-Part-of: 

-
-diff --git a/ext/lame/meson.build b/ext/lame/meson.build
-index 2169fde6f4..3290f17e1e 100644
 a/ext/lame/meson.build
-+++ b/ext/lame/meson.build
-@@ -1,5 +1,10 @@
-+lame_dep = dependency('', required: false)
- lame_option = get_option('lame')
- 
-+if lame_option.disabled()
-+  subdir_done()
-+endif
-+
- lame_extra_c_args = []
- lame_dep = cc.find_library('mp3lame', required: false)
- have_lame = cc.has_header_symbol('lame/lame.h', 'lame_init')

diff --git 
a/media-libs/gst-plugins-good/files/gst-plugins-good-1.20.0-ldac-rtp-header.patch
 
b/media-libs/gst-plugins-good/files/gst-plugins-good-1.20.0-ldac-rtp-header.patch
deleted file mode 100644
index f1fc4601a23a..
--- 
a/media-libs/gst-plugins-good/files/gst-plugins-good-1.20.0-ldac-rtp-header.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From cc3419daf60159394cd310c2405a78775b3f84db Mon Sep 17 00:00:00 2001
-From: Sanchayan Maity 
-Date: Thu, 24 Feb 2022 20:28:23 +0530
-Subject: [PATCH] rtp: ldac: Set frame count information in payload
-
-The RTP payload seems to be required as it carries the frame count
-information. Also, gst_rtp_base_payload_allocate_output_buffer had
-the second argument incorrect.
-
-Strangely some devices like Shanling MP4 and Sony XM3 would still
-work without this while some like the Sony XM4 do not.
-
-Part-of: 


- .../docs/gst_plugins_cache.json   |  2 +-
- .../gst-plugins-good/gst/rtp/gstrtpldacpay.c  | 63 ++-
- .../gst-plugins-good/gst/rtp/gstrtpldacpay.h  |  1 +
- 3 files changed, 62 insertions(+), 4 deletions(-)
-
-diff --git a/docs/gst_plugins_cache.json b/docs/gst_plugins_cache.json
-index 88bff47243..003546d59d 100644
 a/docs/gst_plugins_cache.json
-+++ b/docs/gst_plugins_cache.json
-@@ -14678,7 +14678,7 @@
- "long-name": "RTP packet payloader",
- "pad-templates": {
- "sink": {
--"caps": "audio/x-ldac:\n   channels: [ 1, 2 ]\n   
rate: { (int)44100, (int)48000, (int)88200, (int)96000 }\n",
-+"caps": "audio/x-ldac:\n   channels: [ 1, 2 ]\n   
   eqmid: { (int)0, (int)1, (int)2 }\n   rate: { (int)44100, 
(int)48000, (int)88200, (int)96000 }\n",
- "direction": "sink",
- "presence": "always"
- },
-diff --git a/gst/rtp/gstrtpldacpay.c b/gst/rtp/gstrtpldacpay.c
-index 2b14b746fe..aa30673e7e 100644
 a/gst/rtp/gstrtpldacpay.c
-+++ b/gst/rtp/gstrtpldacpay.c
-@@ -48,7 +48,7 @@
- #include "gstrtpldacpay.h"
- #include "gstrtputils.h"
- 
--#define GST_RTP_HEADER_LENGTH12
-+#define GST_RTP_LDAC_PAYLOAD_HEADER_SIZE 1
- /* MTU size required for LDAC A2DP streaming */
- #define GST_LDAC_MTU_REQUIRED679
- 
-@@ -64,6 +64,7 @@ static GstStaticPadTemplate gst_rtp_ldac_pay_sink_factory =
- GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
- GST_STATIC_CAPS ("audio/x-ldac, "
- "channels = (int) [ 1, 2 ], "
-+"eqmid = (int) { 0, 1, 2 }, "
- "rate = (int) { 44100, 48000, 88200, 96000 }")
- );
- 
-@@ -81,6 +82,38 @@ static gboolean gst_rtp_ldac_pay_set_caps 
(GstRTPBasePayload * payload,
- static GstFlowReturn gst_rtp_ldac_pay_handle_buffer (GstRTPBasePayload *
- payload, GstBuffer * buffer);
- 
-+/**
-+ * gst_rtp_ldac_pay_get_num_frames
-+ * @eqmid: Encode Quality Mode Index
-+ * @channels: Number of channels
-+ *
-+ * Returns: Number of LDAC frames per packet.
-+ */
-+static guint8
-+gst_rtp_ldac_pay_get_num_frames (gint 

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

[Conrad Kostecki]

commit: 7b2cb158ffe6906b5951a886260801a8d0976318
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Mar 13 10:08:39 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Mar 27 22:07:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b2cb158

sys-devel/icecream: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/24533
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../icecream/files/icecream-1.0.0-libcap-ng.patch  |  8 
 sys-devel/icecream/files/icecream-r2   | 44 --
 2 files changed, 52 deletions(-)

diff --git a/sys-devel/icecream/files/icecream-1.0.0-libcap-ng.patch 
b/sys-devel/icecream/files/icecream-1.0.0-libcap-ng.patch
deleted file mode 100644
index 3dc0e3713b0a..
--- a/sys-devel/icecream/files/icecream-1.0.0-libcap-ng.patch
+++ /dev/null
@@ -1,8 +0,0 @@
 a/services/icecc.pc.in
-+++ b/services/icecc.pc.in
-@@ -11,4 +11,5 @@ Version: @VERSION@
- Requires:
- Conflicts:
- Libs: -L${libdir} -licecc
-+Libs.private: @CAPNG_LDADD@
- Cflags: -I${includedir}

diff --git a/sys-devel/icecream/files/icecream-r2 
b/sys-devel/icecream/files/icecream-r2
deleted file mode 100644
index 21cfddeda8c3..
--- a/sys-devel/icecream/files/icecream-r2
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-need net
-}
-
-start() {
-   local basedir=${ICECREAM_BASEDIR:-"/var/cache/icecream"}
-   local netname=${ICECREAM_NETNAME:+"-n ${ICECREAM_NETNAME}"}
-   local logfile=${ICECREAM_LOG_FILE:+"-l ${ICECREAM_LOG_FILE}"}
-   local nice=${ICECREAM_NICE_LEVEL:+"--nice ${ICECREAM_NICE_LEVEL}"}
-   local scheduler=${ICECREAM_SCHEDULER_HOST:+"-s 
${ICECREAM_SCHEDULER_HOST}"}
-   local maxjobs=${ICECREAM_MAX_JOBS:+"-m ${ICECREAM_MAX_JOBS}"}
-   local verbosity=${ICECREAM_VERBOSITY:-"-v"}
-
-   [[ ! -d /var/log/icecream/ ]] && mkdir -p /var/log/icecream/ && chown 
icecream:icecream /var/log/icecream/
-   if [[ "${ICECREAM_RUN_SCHEDULER}" == "yes" ]]; then
-   local 
slogfile=${ICECREAM_SCHEDULER_LOG_FILE:-"/var/log/icecc_scheduler"}
-   touch ${slogfile} && chown icecream:icecream ${slogfile}
-   slogfile=${slogfile:+"-l ${slogfile}"}
-   ebegin "Starting Distributed Compiler Scheduler"
-   start-stop-daemon -u icecream --start --quiet --exec 
/usr/sbin/icecc-scheduler -- -d ${slogfile} ${netname} ${verbosity}
-   eend ${?}
-   fi
-
-   [[ ! -d ${basedir} ]] && mkdir -p ${basedir} && chown icecream:icecream 
${basedir}
-   ebegin "Starting Distributed Compiler Daemon"
-   start-stop-daemon --start --quiet --exec /usr/sbin/iceccd -- -d 
${logfile} ${nice} ${scheduler} ${netname} -u icecream -b "${basedir}" 
${maxjobs} ${verbosity}
-   eend ${?}
-}
-
-stop() {
-   ebegin "Stopping Distributed Compiler Daemon"
-   start-stop-daemon --stop --quiet --name iceccd
-   eend ${?}
-
-   if [[ "${ICECREAM_RUN_SCHEDULER}" == "yes" ]]; then
-   ebegin "Stopping Distributed Compiler Scheduler"
-   start-stop-daemon --stop --quiet --name icecc-scheduler
-   eend ${?}
-   fi
-}

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

[Conrad Kostecki]

commit: 6aecaf3e657fbc7bc7746786060cb0b7e0866db0
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Mar 27 11:45:24 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Mar 27 22:07:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aecaf3e

net-wireless/bluez: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/24775
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../files/bluez-5.63-use-queue_push_tail.patch | 27 --
 1 file changed, 27 deletions(-)

diff --git a/net-wireless/bluez/files/bluez-5.63-use-queue_push_tail.patch 
b/net-wireless/bluez/files/bluez-5.63-use-queue_push_tail.patch
deleted file mode 100644
index 6644e250cc48..
--- a/net-wireless/bluez/files/bluez-5.63-use-queue_push_tail.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7b41f0c38ab34c9a5eec1a70669d183535e86287 Mon Sep 17 00:00:00 2001
-From: Florian Schmaus 
-Date: Fri, 17 Dec 2021 14:05:50 +0100
-Subject: [PATCH] DRAFT shared/att: Use queue_push_tail for
- BT_ATT_OP_READ_BLOB_REQ
-
-As repoorted by Christopher Schramm [1], this is supposed to fix #220.
-
-1: https://github.com/bluez/bluez/issues/220#issuecomment-996669412
-
-Suggested-by: Christopher Schramm 

- src/shared/att.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/shared/att.c b/src/shared/att.c
-index 169f726e4..5ce735a07 100644
 a/src/shared/att.c
-+++ b/src/shared/att.c
-@@ -1653,7 +1653,6 @@ int bt_att_resend(struct bt_att *att, unsigned int id, 
uint8_t opcode,
- 
-   switch (opcode) {
-   /* Only prepend requests that could be a continuation */
--  case BT_ATT_OP_READ_BLOB_REQ:
-   case BT_ATT_OP_PREP_WRITE_REQ:
-   case BT_ATT_OP_EXEC_WRITE_REQ:
-   result = queue_push_head(att->req_queue, op);

[gentoo-commits] repo/gentoo:master commit in: net-fs/samba/files/

[Conrad Kostecki]

commit: ae7006fec245841587c69fd4c153322ed8a24324
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Mar 13 10:05:47 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Mar 27 22:07:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae7006fe

net-fs/samba: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/24528
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../samba-4.14.10-winbindd_regression_fix.patch| 42 --
 .../samba-4.15.2-winbindd_regression_fix.patch | 42 --
 2 files changed, 84 deletions(-)

diff --git a/net-fs/samba/files/samba-4.14.10-winbindd_regression_fix.patch 
b/net-fs/samba/files/samba-4.14.10-winbindd_regression_fix.patch
deleted file mode 100644
index 23411dad6bec..
--- a/net-fs/samba/files/samba-4.14.10-winbindd_regression_fix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From bc07c3b70702100975f8921e56cf9b733ec3b826 Mon Sep 17 00:00:00 2001
-From: Stefan Metzmacher 
-Date: Tue, 9 Nov 2021 20:50:20 +0100
-Subject: [PATCH] s3:winbindd: fix "allow trusted domains = no" regression
-
-add_trusted_domain() should only reject domains
-based on is_allowed_domain(), which now also
-checks "allow trusted domains = no", if we don't
-have an explicit trust to the domain (SEC_CHAN_NULL).
-
-We use at least SEC_CHAN_LOCAL for local domains like
-BUILTIN.
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=14899
-
-Signed-off-by: Stefan Metzmacher 
-Reviewed-by: Andreas Schneider 
-
-Autobuild-User(master): Stefan Metzmacher 
-Autobuild-Date(master): Wed Nov 10 11:21:31 UTC 2021 on sn-devel-184
-
-(cherry picked from commit a7f6c60cb037b4bc9eee276236539b8282213935)

- source3/winbindd/winbindd_util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source3/winbindd/winbindd_util.c 
b/source3/winbindd/winbindd_util.c
-index 42ddbfd2f44e..9d54e462c425 100644
 a/source3/winbindd/winbindd_util.c
-+++ b/source3/winbindd/winbindd_util.c
-@@ -134,7 +134,7 @@ static NTSTATUS add_trusted_domain(const char *domain_name,
-   return NT_STATUS_INVALID_PARAMETER;
-   }
- 
--  if (!is_allowed_domain(domain_name)) {
-+  if (secure_channel_type == SEC_CHAN_NULL && 
!is_allowed_domain(domain_name)) {
-   return NT_STATUS_NO_SUCH_DOMAIN;
-   }
- 
--- 
-2.25.1
-

diff --git a/net-fs/samba/files/samba-4.15.2-winbindd_regression_fix.patch 
b/net-fs/samba/files/samba-4.15.2-winbindd_regression_fix.patch
deleted file mode 100644
index 457bad16a6e2..
--- a/net-fs/samba/files/samba-4.15.2-winbindd_regression_fix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9f73f8a784f2de9211601f92729a47aaa3e51a1a Mon Sep 17 00:00:00 2001
-From: Stefan Metzmacher 
-Date: Tue, 9 Nov 2021 20:50:20 +0100
-Subject: [PATCH] s3:winbindd: fix "allow trusted domains = no" regression
-
-add_trusted_domain() should only reject domains
-based on is_allowed_domain(), which now also
-checks "allow trusted domains = no", if we don't
-have an explicit trust to the domain (SEC_CHAN_NULL).
-
-We use at least SEC_CHAN_LOCAL for local domains like
-BUILTIN.
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=14899
-
-Signed-off-by: Stefan Metzmacher 
-Reviewed-by: Andreas Schneider 
-
-Autobuild-User(master): Stefan Metzmacher 
-Autobuild-Date(master): Wed Nov 10 11:21:31 UTC 2021 on sn-devel-184
-
-(cherry picked from commit a7f6c60cb037b4bc9eee276236539b8282213935)

- source3/winbindd/winbindd_util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source3/winbindd/winbindd_util.c 
b/source3/winbindd/winbindd_util.c
-index fe68adec534a..a8c510fafc67 100644
 a/source3/winbindd/winbindd_util.c
-+++ b/source3/winbindd/winbindd_util.c
-@@ -135,7 +135,7 @@ static NTSTATUS add_trusted_domain(const char *domain_name,
-   return NT_STATUS_INVALID_PARAMETER;
-   }
- 
--  if (!is_allowed_domain(domain_name)) {
-+  if (secure_channel_type == SEC_CHAN_NULL && 
!is_allowed_domain(domain_name)) {
-   return NT_STATUS_NO_SUCH_DOMAIN;
-   }
- 
--- 
-2.25.1
-

[gentoo-commits] repo/gentoo:master commit in: media-sound/snapcast/files/

[Conrad Kostecki]

commit: 8459f4f4c67544b6741ea8f6d8752b232a9a62f0
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Mar 27 11:43:12 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Mar 27 22:07:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8459f4f4

media-sound/snapcast: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/24771
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../snapcast/files/snapcast-0.20.0-gcc-11.patch| 11 -
 .../snapcast/files/snapcast-0.25.0-cxx17.patch | 27 --
 2 files changed, 38 deletions(-)

diff --git a/media-sound/snapcast/files/snapcast-0.20.0-gcc-11.patch 
b/media-sound/snapcast/files/snapcast-0.20.0-gcc-11.patch
deleted file mode 100644
index 7ae562aaef05..
--- a/media-sound/snapcast/files/snapcast-0.20.0-gcc-11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/786303
 a/common/message/message.hpp
-+++ b/common/message/message.hpp
-@@ -29,6 +29,7 @@
- #include 
- #endif
- #include 
-+#include 
- 
- /*
- template >

diff --git a/media-sound/snapcast/files/snapcast-0.25.0-cxx17.patch 
b/media-sound/snapcast/files/snapcast-0.25.0-cxx17.patch
deleted file mode 100644
index f6797a62f85f..
--- a/media-sound/snapcast/files/snapcast-0.25.0-cxx17.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://gitlab.exherbo.org/exherbo/media/-/blob/master/packages/net-apps/snapcast/files/snapcast-Set-CMAKE_CXX_STANDARD-to-17.patch
-
-From 9858c60109c5d4aa09c26d1cb44be5c056849a36 Mon Sep 17 00:00:00 2001
-From: Heiko Becker 
-Date: Fri, 15 Oct 2021 23:55:39 +0200
-Subject: [PATCH] Set CMAKE_CXX_STANDARD to 17
-
-Fixes the build with boost[>=1.77.0] and we shouldn't have compilers
-which don't support it.

- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4381a71c..5373f658 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -127,7 +127,7 @@ if(NOT ANDROID)
- endif()
- 
- # Configure compiler options
--set(CMAKE_CXX_STANDARD 14)
-+set(CMAKE_CXX_STANDARD 17)
- 
- # Get arch
- include(${CMAKE_SOURCE_DIR}/cmake/TargetArch.cmake)
-

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-c/files/

[Conrad Kostecki]

commit: c5ed321f4c7f04090f8f6f2ceb3b85cdc1520355
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Mar 13 10:01:22 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Mar 27 22:07:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5ed321f

dev-db/mariadb-connector-c: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/24531
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 ...adb-connector-c-3.1.11-fix-flow-control-statement.patch | 14 --
 1 file changed, 14 deletions(-)

diff --git 
a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.1.11-fix-flow-control-statement.patch
 
b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.1.11-fix-flow-control-statement.patch
deleted file mode 100644
index 0b5a2d44cec5..
--- 
a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.1.11-fix-flow-control-statement.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://github.com/mariadb-corporation/mariadb-connector-c/pull/158
-
 a/cmake/ConnectorName.cmake
-+++ b/cmake/ConnectorName.cmake
-@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
- SET(MACHINE_NAME "x64")
-   ELSE()
- SET(MACHINE_NAME "32")
--  END()
-+  ENDIF()
- ENDIF()
- 
- SET(product_name 
"mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
- 

[gentoo-commits] repo/gentoo:master commit in: app-metrics/mysqld_exporter/files/

[Conrad Kostecki]

commit: 30a3709dda1a9ef7a0d68bd744f889601e768209
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Wed Mar 16 06:41:31 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Mar 27 22:07:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30a3709d

app-metrics/mysqld_exporter: remove unused file

Closes: https://github.com/gentoo/gentoo/pull/24599
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../mysqld_exporter/files/mysqld_exporter.confd| 26 --
 1 file changed, 26 deletions(-)

diff --git a/app-metrics/mysqld_exporter/files/mysqld_exporter.confd 
b/app-metrics/mysqld_exporter/files/mysqld_exporter.confd
deleted file mode 100644
index 249ed7ea4aa4..
--- a/app-metrics/mysqld_exporter/files/mysqld_exporter.confd
+++ /dev/null
@@ -1,26 +0,0 @@
-# /etc/conf.d/mysqld_exporter
-
-# PID file
-#EXPORTER_PIDFILE="/run/${RC_SVCNAME}.pid"
-
-# The termination timeout (start-stop-daemon parameter "retry") ensures
-# that the service will be terminated within a given time (60 + 5 seconds
-# per default) when you are stopping the service.
-#EXPORTER_TERMTIMEOUT="TERM/60/KILL/5"
-
-# User to run exporter as
-#EXPORTER_USER="mysqld_exporter"
-
-# User group to run exporter as
-#EXPORTER_GROUP="mysqld_exporter"
-
-# You can use this configuration option to pass additional options to the
-# start-stop-daemon, see start-stop-daemon(8) for more details.
-# Per default we wait 1000ms after we have started the service to ensure
-# that the daemon is really up and running.
-#EXPORTER_SSDARGS="--wait 1000"
-
-# Exporter flags
-# See `mysqld_exporter --help` for more details
-EXPORTER_FLAGS="-log.level=info"
-#EXPORTER_FLAGS="${EXPORTER_FLAGS} -yourAdditionalFlag"

[gentoo-commits] repo/gentoo:master commit in: www-servers/apache/files/

[Conrad Kostecki]

commit: 49b84e124ee3e7ef349e79dd0fa233fb5f6e305e
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Mar 27 11:47:02 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Mar 27 22:07:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49b84e12

www-servers/apache: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/24776
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../apache/files/apache-2.4.51-mpm-itk.patch   | 34 --
 1 file changed, 34 deletions(-)

diff --git a/www-servers/apache/files/apache-2.4.51-mpm-itk.patch 
b/www-servers/apache/files/apache-2.4.51-mpm-itk.patch
deleted file mode 100644
index 4d36fe03dffb..
--- a/www-servers/apache/files/apache-2.4.51-mpm-itk.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Backport of upstream r1894171 to fix segfaults with mpm-itk.
-
-https://bugs.gentoo.org/816258
-https://bz.apache.org/bugzilla/show_bug.cgi?id=65627
-
 a/server/connection.c  2021/09/21 20:03:52 1893497
-+++ b/server/connection.c  2021/10/12 16:48:18 1894171
-@@ -145,9 +145,7 @@
- {
- apr_socket_t *csd = ap_get_conn_socket(c);
- 
--if (!csd) {
--return 1;
--}
-+ap_assert(csd != NULL);
- 
- if (ap_prep_lingering_close(c)) {
- return 1;
-@@ -178,6 +176,15 @@
- apr_time_t now, timeup = 0;
- apr_socket_t *csd = ap_get_conn_socket(c);
- 
-+if (!csd) {
-+/* Be safe with third-party modules that:
-+ *   ap_set_core_module_config(c->conn_config, NULL)
-+ * to no-op ap_lingering_close().
-+ */
-+c->aborted = 1;
-+return;
-+}
-+
- if (ap_start_lingering_close(c)) {
- apr_socket_close(csd);
- return;

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

[Conrad Kostecki]

commit: acd1f7991da0e8b76864f1e597010cadf3330d37
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Mar 27 11:44:09 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Mar 27 22:07:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acd1f799

media-video/dvdrip: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/24770
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../files/dvdrip-0.98.11-fix_parallel_make.patch   | 28 --
 1 file changed, 28 deletions(-)

diff --git a/media-video/dvdrip/files/dvdrip-0.98.11-fix_parallel_make.patch 
b/media-video/dvdrip/files/dvdrip-0.98.11-fix_parallel_make.patch
deleted file mode 100644
index df766c07cbcc..
--- a/media-video/dvdrip/files/dvdrip-0.98.11-fix_parallel_make.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-http://bugs.gentoo.org/266739
-
 src/Makefile
-+++ src/Makefile
-@@ -3,10 +3,10 @@
- all:  ../bin/dvdrip-splitpipe ../bin/dvdrip-progress
- 
- ../bin/dvdrip-splitpipe:  dvdrip-splitpipe.c
--  $(CC) $(OTHERLDFLAGS) $(CFLAGS) -o dvdrip-splitpipe dvdrip-splitpipe.c 
&& mv dvdrip-splitpipe ../bin
-+  $(CC) $(OTHERLDFLAGS) $(CFLAGS) -o ../bin/dvdrip-splitpipe 
dvdrip-splitpipe.c
- 
- ../bin/dvdrip-progress:   dvdrip-progress.c
--  $(CC) $(OTHERLDFLAGS) $(CFLAGS) -o dvdrip-progress dvdrip-progress.c && 
mv dvdrip-progress ../bin
-+  $(CC) $(OTHERLDFLAGS) $(CFLAGS) -o ../bin/dvdrip-progress 
dvdrip-progress.c
- 
- clean:
-   rm -f dvdrip-splitpipe ../bin/dvdrip-splitpipe dvdrip-progress 
../bin/dvdrip-progress
 Makefile.PL
-+++ Makefile.PL
-@@ -52,7 +52,7 @@
- sub MY::postamble {
- '
- bin/dvdrip-splitpipe bin/dvdrip-progress: src/Makefile
--  cd src && make
-+  cd src && ( $(MAKE) CC=$(CC) )
- ';
- }
- 

[gentoo-commits] repo/proj/guru:dev commit in: dev-python/rstr/

[Alessandro Barbieri]

commit: 6e2a082ddadff942856207f067195a06d7109689
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun Mar 27 21:50:26 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sun Mar 27 21:50:26 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6e2a082d

dev-python/rstr: drop 3.0.0

Signed-off-by: Alessandro Barbieri  gmail.com>

 dev-python/rstr/Manifest  |  1 -
 dev-python/rstr/rstr-3.0.0.ebuild | 28 
 2 files changed, 29 deletions(-)

diff --git a/dev-python/rstr/Manifest b/dev-python/rstr/Manifest
index 040a1aa8a..3b57c5b99 100644
--- a/dev-python/rstr/Manifest
+++ b/dev-python/rstr/Manifest
@@ -1,2 +1 @@
-DIST rstr-3.0.0.tar.gz 11389 BLAKE2B 
8e5283ed2fd478189a1ddb0663069ca4a50b52a928290af171d8e79b6e59659530f45eac282cffe52be150c8d4a75adca35fdc2e5afb5c0025da31ada02fc3c7
 SHA512 
8b9909057f44ffdbfa5a037f9eaf50e506204d846143b54c23c6c83a8589ea5dc7236fa7f987e20b127ef139bef6f47b22239fd961da1f5c5b45606f511cadd8
 DIST rstr-3.1.0.tar.gz 12044 BLAKE2B 
8b79b777d0b60f60c5e86be9521c5a08af72d5988e3b1ef871d29925a9b341e48668963e71972113655ea1ed2bc14060e09ec8068fbb30b7e7d27f1215810908
 SHA512 
3b5c8ed0039aa8e47ab777f273fdcc4158b6197646831908da66d2e5e6b313c6d12cfdb9832f131a79d47496ac200a8ba1ebb7cdfa03074c290d3c8442437216

diff --git a/dev-python/rstr/rstr-3.0.0.ebuild 
b/dev-python/rstr/rstr-3.0.0.ebuild
deleted file mode 100644
index c6519bfff..0
--- a/dev-python/rstr/rstr-3.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Easily generate random strings of various types"
-HOMEPAGE="https://pypi.org/project/rstr;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT=0
-KEYWORDS="~amd64"
-
-distutils_enable_tests unittest
-
-python_test() {
-   "${PYTHON}" -m unittest discover -v rstr/tests || die "tests failed 
with ${EPYTHON}"
-}
-
-python_install_all() {
-   distutils-r1_python_install_all
-   find "${ED}" -type d -name "tests" -exec rm -rv {} + || die "tests 
removing failed"
-}

[gentoo-commits] repo/proj/guru:dev commit in: dev-python/rstr/

[Alessandro Barbieri]

commit: 1841cd2699bb99e1a76315ee096c5b8af2e3fa1f
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun Mar 27 21:49:42 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sun Mar 27 21:49:42 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1841cd26

dev-python/rstr: disable pypy3

Closes: https://bugs.gentoo.org/835474
Signed-off-by: Alessandro Barbieri  gmail.com>

 dev-python/rstr/rstr-3.1.0.ebuild | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/dev-python/rstr/rstr-3.1.0.ebuild 
b/dev-python/rstr/rstr-3.1.0.ebuild
index 843c74e97..8d112dacb 100644
--- a/dev-python/rstr/rstr-3.1.0.ebuild
+++ b/dev-python/rstr/rstr-3.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} ) # pypy3 https://bugs.gentoo.org/835474
 
 inherit distutils-r1
 
@@ -21,10 +21,6 @@ KEYWORDS="~amd64"
 
 distutils_enable_tests unittest
 
-python_test() {
-   "${PYTHON}" -m unittest discover -v rstr/tests || die "tests failed 
with ${EPYTHON}"
-}
-
 python_install_all() {
distutils-r1_python_install_all
find "${ED}" -type d -name "tests" -exec rm -rv {} + || die "tests 
removing failed"

[gentoo-commits] repo/proj/guru:dev commit in: dev-R/crayon/

[Alessandro Barbieri]

commit: 3030c1bf1c3eda46fdb0b04ed431429d1b4e2db4
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun Mar 27 14:22:44 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sun Mar 27 21:28:23 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3030c1bf

dev-R/crayon: add 1.5.1, drop 1.5.0

Signed-off-by: Alessandro Barbieri  gmail.com>

 dev-R/crayon/Manifest | 2 +-
 dev-R/crayon/{crayon-1.5.0.ebuild => crayon-1.5.1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-R/crayon/Manifest b/dev-R/crayon/Manifest
index 196e79d7e..3f65a0191 100644
--- a/dev-R/crayon/Manifest
+++ b/dev-R/crayon/Manifest
@@ -1 +1 @@
-DIST crayon_1.5.0.tar.gz 40099 BLAKE2B 
789a3152f55e62f37ac54ee00059b8bd30a521a42157fc1619c8c06385c6121a1783c03fbe4869bf4d907da24a8be7b91bd44ab31b7e73f5d3f5654fa5238b4f
 SHA512 
a7842878681b11bd2cd4bcc7f0f47f71934ed485cfc55caa7a9a42e174039c64527eb64d528fc4ae404ab83b31045c628f9b958e493cb2a9a2e1a4a8de079527
+DIST crayon_1.5.1.tar.gz 40178 BLAKE2B 
a778ead30f21a701811b15e1640a50762f96474e97b5cc8c7bfb7589666392ab4e3a2b36d12985d2d5267fcffdd5050a50b6538da5c80f5e291f5f7d08e1ea4a
 SHA512 
b0a200e27572a9690aa7038b57ef93494cb1ec10cb285b4cd76bc2cd19e0af87ee31a179daa617e107c55dde77a602238ec3445d3e918d413b6674d02fc03096

diff --git a/dev-R/crayon/crayon-1.5.0.ebuild b/dev-R/crayon/crayon-1.5.1.ebuild
similarity index 100%
rename from dev-R/crayon/crayon-1.5.0.ebuild
rename to dev-R/crayon/crayon-1.5.1.ebuild

[gentoo-commits] repo/proj/guru:dev commit in: sci-libs/dart/, sci-libs/dart/files/

[Alessandro Barbieri]

commit: ef1f64452bc61dc3139696482eef10e875e331b9
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun Mar 27 20:26:32 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sun Mar 27 21:28:24 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ef1f6445

sci-libs/dart: add 6.12.1

Signed-off-by: Alessandro Barbieri  gmail.com>

 sci-libs/dart/Manifest |   1 +
 sci-libs/dart/dart-6.12.1.ebuild   | 162 +
 .../dart/files/dart-6.12.1-respect-cflags.patch|  11 ++
 .../dart/files/dart-6.12.1-use-system-gtest.patch  |  31 
 .../dart-6.12.1-use-system-lodepng-imgui.patch | 149 +++
 sci-libs/dart/metadata.xml |   1 +
 6 files changed, 355 insertions(+)

diff --git a/sci-libs/dart/Manifest b/sci-libs/dart/Manifest
index 461c20c15..46b234018 100644
--- a/sci-libs/dart/Manifest
+++ b/sci-libs/dart/Manifest
@@ -1 +1,2 @@
 DIST dart-6.10.1.tar.gz 15867405 BLAKE2B 
64c42ce1d808a88df53f4292df30c0bc58b52f864342ac0b353ad0496d41bd4986ad231cb08869058a16591350acf0fc0c12ae15d574d919c1c27f102028f608
 SHA512 
8abbf883628442ed5166e436349de8caaaf72a0ecfa88e75b986a550d617bd9b5df8ff32e32395e941ba12b7ad359be15b2ab2f566d99aa6c603bd0ebade1df0
+DIST dart-6.12.1.tar.gz 15990308 BLAKE2B 
d361dfad70745aa3747ea09f9f80a0b52051cb3e5d9a961995d469ab33086bf8d4068f95dbd4af8d0e2b23d5fbb0fa49dc63d823ffa52bbe750745093a6b54eb
 SHA512 
f386f646f13989dad66efbe126691553b280bf6441edad1c03059d6ae650384652da538edd3d27f3404ba76b9d6f9348e5b1c0998d7673e856cc488b91a677ff

diff --git a/sci-libs/dart/dart-6.12.1.ebuild b/sci-libs/dart/dart-6.12.1.ebuild
new file mode 100644
index 0..aac4ae640
--- /dev/null
+++ b/sci-libs/dart/dart-6.12.1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Dynamic Animation and Robotics Toolkit"
+HOMEPAGE="
+   https://dartsim.github.io
+   https://github.com/dartsim/dart
+"
+SRC_URI="https://github.com/dartsim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="bullet doc examples extras glut gui +ipopt +nlopt ode python test tests 
tutorials urdfdom
+cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 
cpu_flags_x86_sse3
+cpu_flags_x86_ssse3 cpu_flags_x86_sse4a cpu_flags_x86_sse4_1 
cpu_flags_x86_sse4_2 cpu_flags_x86_avx
+cpu_flags_x86_avx2 cpu_flags_x86_avx512dq cpu_flags_x86_avx512f 
cpu_flags_x86_avx512vl
+cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_vsx 
cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3
+cpu_flags_ppc_altivec cpu_flags_arm_neon cpu_flags_arm_iwmmxt 
cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon"
+#TODO: pagmo
+
+RDEPEND="
+   app-arch/lz4
+   >=dev-cpp/eigen-3.0.5
+   dev-libs/boost
+   dev-libs/tinyxml2
+   >=sci-libs/libccd-2.0
+   >=media-libs/assimp-3.0.0
+   >=sci-libs/fcl-0.2.9
+   sci-libs/flann
+   sci-libs/octomap
+
+   bullet? ( sci-physics/bullet )
+   examples? (
+   dev-cpp/tiny-dnn
+   dev-libs/urdfdom
+   )
+   extras? ( dev-libs/urdfdom )
+   glut? ( media-libs/freeglut )
+   gui? (
+   dev-games/openscenegraph
+   media-libs/imgui:=[opengl(-)]
+   media-libs/lodepng:=
+   virtual/opengl
+   x11-libs/libXi
+   x11-libs/libXmu
+   )
+   ipopt? ( sci-libs/ipopt )
+   nlopt? ( >=sci-libs/nlopt-2.4.1 )
+   ode? ( dev-games/ode )
+   python? (
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
+   )
+   urdfdom? ( dev-libs/urdfdom )
+"
+DEPEND="
+   ${RDEPEND}
+   examples? ( dev-libs/urdfdom_headers )
+   extras? ( dev-libs/urdfdom_headers )
+   test? (
+   dev-cpp/gtest
+   python? ( $(python_gen_cond_dep 
'dev-python/pytest[${PYTHON_USEDEP}]') )
+   )
+   urdfdom? ( dev-libs/urdfdom_headers )
+"
+BDEPEND="
+   app-text/dos2unix
+   doc? ( app-doc/doxygen )
+   test? ( python? ( $(python_gen_cond_dep 
'dev-python/pytest[${PYTHON_USEDEP}]') ) )
+"
+
+RESTRICT="!test? ( test )"
+PATCHES=(
+   "${FILESDIR}/${PN}-respect-ldflags.patch"
+   "${FILESDIR}/${P}-respect-cflags.patch"
+   "${FILESDIR}/${P}-use-system-gtest.patch"
+   "${FILESDIR}/${P}-use-system-lodepng-imgui.patch"
+)
+REQUIRED_USE="
+   examples? ( gui )
+   python? (
+   ${PYTHON_REQUIRED_USE}
+   gui
+   )
+
+   || ( ipopt nlopt )
+"
+
+pkg_setup() {
+   use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   # delete bundled gtest
+   rm -r unittests/gtest || die
+   rm -r dart/external/{imgui,lodepng} || die
+   dos2unix 

[gentoo-commits] repo/proj/guru:dev commit in: dev-python/python_jwt/

[Alessandro Barbieri]

commit: 87ca18267cb66699e5011ebd8d25b1e9d1a23d9c
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun Mar 27 20:10:30 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sun Mar 27 21:28:24 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=87ca1826

dev-python/python_jwt: add coverage test dep

Bug: https://bugs.gentoo.org/836253
Signed-off-by: Alessandro Barbieri  gmail.com>

 dev-python/python_jwt/python_jwt-3.3.2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-python/python_jwt/python_jwt-3.3.2.ebuild 
b/dev-python/python_jwt/python_jwt-3.3.2.ebuild
index cb4ecb79a..128e71476 100644
--- a/dev-python/python_jwt/python_jwt-3.3.2.ebuild
+++ b/dev-python/python_jwt/python_jwt-3.3.2.ebuild
@@ -26,6 +26,7 @@ RDEPEND=">=dev-python/jwcrypto-1.0.0[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 BDEPEND="
test? (
+   >=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
>=dev-python/gevent-1.2.2[${PYTHON_USEDEP}]
>=dev-python/pyVows-3.0.0[${PYTHON_USEDEP}]
>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]

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

[Alessandro Barbieri]

commit: 6c28da2457f3af8adcfa34c76a9c311fe98fc0ff
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun Mar 27 20:26:54 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sun Mar 27 21:28:24 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6c28da24

TODO.md: fix pagmo website

Signed-off-by: Alessandro Barbieri  gmail.com>

 TODO.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TODO.md b/TODO.md
index 73eff0ed5..85ff9e48b 100644
--- a/TODO.md
+++ b/TODO.md
@@ -76,7 +76,7 @@ Name | Buildsystem | Category | User | RFH
 [fmi-library](https://github.com/modelon-community/fmi-library) | cmake | 
science | Alessandro-Barbieri | no
 [aerodyn](https://github.com/OpenFAST/openfast/tree/main/modules/aerodyn) | 
cmake | science | Alessandro-Barbieri | no
 [llvm-ompss2](https://github.com/bsc-pm/llvm) | cmake | cluster | 
Alessandro-Barbieri | yes
-[pagmo](https://github.com/bsc-pm/llvm) | cmake | science | 
Alessandro-Barbieri | no
+[pagmo](https://esa.github.io/pagmo2/) | cmake | science | Alessandro-Barbieri 
| no
 [enarx](https://enarx.dev/) | cargo | util | Alessandro-Barbieri | no
 [airshipper](https://gitlab.com/veloren/airshipper) | cargo | game | 
NicolaSmaniotto | 
 [ruplacer](https://github.com/dmerejkowsky/ruplacer) | cargo | sys | 
Alessandro-Barbieri | no

[gentoo-commits] repo/proj/guru:dev commit in: media-libs/imgui/

[Alessandro Barbieri]

commit: ab60e471e906e5ac8b529cf7e964c1e875b0dccd
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun Mar 27 18:22:04 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sun Mar 27 21:28:24 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ab60e471

media-libs/imgui: add 1.87

Signed-off-by: Alessandro Barbieri  gmail.com>

 media-libs/imgui/Manifest  |   1 +
 media-libs/imgui/imgui-1.87.ebuild | 157 +
 media-libs/imgui/metadata.xml  |   9 +++
 3 files changed, 167 insertions(+)

diff --git a/media-libs/imgui/Manifest b/media-libs/imgui/Manifest
index 6b3f46883..9bbf158f0 100644
--- a/media-libs/imgui/Manifest
+++ b/media-libs/imgui/Manifest
@@ -1 +1,2 @@
 DIST imgui-1.83.tar.gz 1448389 BLAKE2B 
648306bd69181ad8315f12fc5b2c319b23005d6b3fc790ad64caaf1f80304e81b33af5d6f435fa97151fcf1e77eb15455838a09570b7a9c7dd9c56a61510b5a1
 SHA512 
2150e7101f384b1c749b2e89876b2085a7ff43435f04e88602d0e5e00db7a41c1ace5176bdb0963326845d1c8303b5092a7ca1c9c8e70c522ba96f899ed5bb9c
+DIST imgui-1.87.tar.gz 1460834 BLAKE2B 
f73b71400311e7c5f82248e242a932add5090670c78077ca2239f349730bab88a00bfe4deca4e854772ef7f6a2cff1fc0f38f7174a026995f93c9e7b55eb2a1d
 SHA512 
3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2

diff --git a/media-libs/imgui/imgui-1.87.ebuild 
b/media-libs/imgui/imgui-1.87.ebuild
new file mode 100644
index 0..0b811f029
--- /dev/null
+++ b/media-libs/imgui/imgui-1.87.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Bloat-free graphical user interface library for C++"
+HOMEPAGE="https://github.com/ocornut/imgui;
+SRC_URI="https://github.com/ocornut/imgui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="allegro examples freetype glfw glut opengl sdl vulkan"
+
+RDEPEND="
+   allegro? ( media-libs/allegro:5 )
+   freetype? ( media-libs/freetype )
+   glfw? ( media-libs/glfw:0 )
+   glut? ( media-libs/freeglut )
+   opengl? ( virtual/opengl )
+   sdl? ( media-libs/libsdl2 )
+   vulkan? ( media-libs/vulkan-loader )
+"
+DEPEND="
+   ${RDEPEND}
+   vulkan? ( dev-util/vulkan-headers )
+"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="
+   || (
+   allegro
+   || ( glfw glut sdl )
+   || ( opengl vulkan )
+   )
+   examples? (
+   allegro
+   glfw
+   glut
+   opengl
+   sdl
+   vulkan
+   )
+"
+
+src_prepare() {
+   rm -r examples/libs || die
+   rm -r misc/*/*.ttf || die
+   rm -r misc/single_file || die
+   default
+}
+
+src_configure() {
+   tc-export CXX
+   append-cppflags "-DIMGUI_USE_WCHAR32"
+   append-cxxflags "-I${S} -I${S}/backends -I${S}/misc/freetype -fPIC 
-fpermissive"
+   local PKGCONF="$(tc-getPKG_CONFIG)" || die
+
+   use allegro && append-libs "-lallegro -lallegro_main 
-lallegro_primitives"
+   if use freetype; then
+   append-cppflags "-DIMGUI_ENABLE_FREETYPE 
-DIMGUI_ENABLE_STB_TRUETYPE"
+   append-cxxflags "$(${PKGCONF} --cflags freetype2)" || die
+   append-libs "$(${PKGCONF} --libs freetype2)" || die
+   fi
+   if use glfw; then
+   append-libs "$(${PKGCONF} --libs glfw3)" || die
+   append-cxxflags "$(${PKGCONF} --cflags glfw3)" || die
+   fi
+   if use glut; then
+   append-libs "$(${PKGCONF} --libs freeglut)" || die
+   append-cxxflags "$(${PKGCONF} --cflags freeglut)" || die
+   fi
+   use opengl && append-libs "-lGL"
+   if use sdl; then
+   append-libs "-ldl $(sdl2-config --libs)" || die
+   append-cxxflags "$(sdl2-config --cflags)" || die
+   fi
+   if use vulkan; then
+   append-libs "$(${PKGCONF} --libs vulkan)" || die
+   append-cxxflags "$(${PKGCONF} --cflags vulkan)" || die
+   append-cppflags "-DImTextureID=ImU64" || die
+   fi
+}
+
+src_compile() {
+   set -x || die
+
+   for i in imgui{,_draw,_demo,_tables,_widgets}; do
+   ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c ${i}.cpp -o ${i}.o || die
+   done
+
+   if use freetype; then
+   pushd misc/freetype || die
+   ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c imgui_freetype.cpp -o 
imgui_freetype.o || die
+   popd || die
+   pushd misc/fonts || die
+   ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} -fPIE 
binary_to_compressed_c.cpp -o binary_to_compressed_c || die
+   popd || die
+   fi
+
+   pushd backends || die
+   if use allegro; then
+   ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c 

[gentoo-commits] proj/baselayout: Branch deleted: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:19:29 2022 +

Branch deleted: test-mirroring-trigger

[gentoo-commits] proj/baselayout: New branch: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:17:01 2022 +

New branch: test-mirroring-trigger

[gentoo-commits] proj/eselect-iptables: Branch deleted: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:16:11 2022 +

Branch deleted: test-mirroring-trigger

[gentoo-commits] proj/eselect-iptables: New branch: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:16:08 2022 +

New branch: test-mirroring-trigger

[gentoo-commits] proj/baselayout: Branch deleted: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:16:05 2022 +

Branch deleted: test-mirroring-trigger

[gentoo-commits] proj/baselayout: New branch: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:16:01 2022 +

New branch: test-mirroring-trigger

[gentoo-commits] proj/zsh-completion: Branch deleted: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:15:58 2022 +

Branch deleted: test-mirroring-trigger

[gentoo-commits] proj/zsh-completion: New branch: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:15:54 2022 +

New branch: test-mirroring-trigger

[gentoo-commits] proj/python-gentoo-patches: Branch deleted: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:15:47 2022 +

Branch deleted: test-mirroring-trigger

[gentoo-commits] proj/python-gentoo-patches: New branch: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:15:43 2022 +

New branch: test-mirroring-trigger

[gentoo-commits] proj/pms: Branch deleted: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:15:40 2022 +

Branch deleted: test-mirroring-trigger

[gentoo-commits] proj/build-docbook-catalog: Branch deleted: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:15:32 2022 +

Branch deleted: test-mirroring-trigger

[gentoo-commits] proj/pms: New branch: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:15:35 2022 +

New branch: test-mirroring-trigger

[gentoo-commits] proj/build-docbook-catalog: New branch: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:15:28 2022 +

New branch: test-mirroring-trigger

[gentoo-commits] proj/locale-gen: Branch deleted: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:15:26 2022 +

Branch deleted: test-mirroring-trigger

[gentoo-commits] proj/locale-gen: New branch: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:15:22 2022 +

New branch: test-mirroring-trigger

[gentoo-commits] proj/python-gentoo-patches: Branch deleted: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:10:13 2022 +

Branch deleted: test-mirroring-trigger

[gentoo-commits] proj/python-gentoo-patches: New branch: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:10:12 2022 +

New branch: test-mirroring-trigger

[gentoo-commits] proj/build-docbook-catalog: Branch deleted: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:10:08 2022 +

Branch deleted: test-mirroring-trigger

[gentoo-commits] proj/locale-gen: New branch: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:10:02 2022 +

New branch: test-mirroring-trigger

[gentoo-commits] proj/build-docbook-catalog: New branch: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:10:06 2022 +

New branch: test-mirroring-trigger

[gentoo-commits] proj/locale-gen: Branch deleted: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:10:04 2022 +

Branch deleted: test-mirroring-trigger

[gentoo-commits] proj/eselect-iptables: New branch: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:08:47 2022 +

New branch: test-mirroring-trigger

[gentoo-commits] proj/eselect-iptables: Branch deleted: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:08:49 2022 +

Branch deleted: test-mirroring-trigger

[gentoo-commits] proj/baselayout: Branch deleted: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:08:45 2022 +

Branch deleted: test-mirroring-trigger

[gentoo-commits] proj/baselayout: New branch: test-mirroring-trigger

[Sam James]

commit: 
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 21:08:42 2022 +

New branch: test-mirroring-trigger

[gentoo-commits] repo/proj/guru:dev commit in: media-gfx/qview/

[Daniel Novomesky]

commit: 57107068e14874a08c63d53589e0c4ac56ca7e4f
Author: Daniel Novomesky  gmail  com>
AuthorDate: Sun Mar 27 20:56:57 2022 +
Commit: Daniel Novomesky  gmail  com>
CommitDate: Sun Mar 27 20:57:30 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=57107068

media-gfx/qview: move dependency to BDEPEND

Bug: https://bugs.gentoo.org/834751
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Daniel Novomesky  gmail.com>

 media-gfx/qview/qview-5.0.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-gfx/qview/qview-5.0.ebuild b/media-gfx/qview/qview-5.0.ebuild
index 12e5324df..72842e673 100644
--- a/media-gfx/qview/qview-5.0.ebuild
+++ b/media-gfx/qview/qview-5.0.ebuild
@@ -25,10 +25,13 @@ RDEPEND="
 "
 
 DEPEND="${RDEPEND}
-   dev-qt/linguist-tools:5
test? ( dev-qt/qttest:5 )
 "
 
+BDEPEND="
+   dev-qt/linguist-tools:5
+"
+
 src_configure() {
# https://github.com/jurplel/qView/issues/395
if tc-is-clang && has_version 
"sys-devel/clang:$(clang-major-version)[default-libcxx]" || is-flagq 
-stdlib=libc++; then

[gentoo-commits] repo/proj/guru:dev commit in: gnome-extra/extension-manager/

[Yuan Liao]

commit: fcb1069fe15e913d9449fdde723135f1e74e9d08
Author: Yuan Liao  gmail  com>
AuthorDate: Sun Mar 27 20:10:18 2022 +
Commit: Yuan Liao  gmail  com>
CommitDate: Sun Mar 27 20:10:38 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fcb1069f

gnome-extra/extension-manager: Add 0.3.0

Signed-off-by: Yuan Liao  gmail.com>

 gnome-extra/extension-manager/Manifest |  1 +
 .../extension-manager-0.3.0.ebuild | 77 ++
 2 files changed, 78 insertions(+)

diff --git a/gnome-extra/extension-manager/Manifest 
b/gnome-extra/extension-manager/Manifest
index bfb1562de..142564b18 100644
--- a/gnome-extra/extension-manager/Manifest
+++ b/gnome-extra/extension-manager/Manifest
@@ -1 +1,2 @@
 DIST extension-manager-0.2.3.tar.gz 1384925 BLAKE2B 
3bd98f67f419c646a4a7b9d1dee656de305eff5e35124f3765d5d9c82aff7d9e7bbeea912f24c0766c95e0c497b070831ee9922747f200bbcd57470a6adcec7e
 SHA512 
9bb078f3d00cdfe1e84a757f7cce32f5a3fdf4f60f3952523ac48779becab9c00da78974551f224c194806217eddf3116a29eb33f1e9982ff8caa5e06218
+DIST extension-manager-0.3.0.tar.gz 1431028 BLAKE2B 
059d46118b57f204b1258a5d9c55587407130db3048b87be13294e6f426b5d8515475e6b7622cca3ed5951c3f2ed238d22a09ab4f4d1bf78196618b8fe580f29
 SHA512 
34642d81be67978ac039a17e0762fa1f44ea41720d066a5aeb7fa1e35f2f6ac25a7924b5daf3073ddf4caa3013e1e70b24c5df4c998920ebe1c8e0a875dbec0c

diff --git a/gnome-extra/extension-manager/extension-manager-0.3.0.ebuild 
b/gnome-extra/extension-manager/extension-manager-0.3.0.ebuild
new file mode 100644
index 0..7949012b7
--- /dev/null
+++ b/gnome-extra/extension-manager/extension-manager-0.3.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson xdg
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/mjakeman/extension-manager.git;
+else
+   
SRC_URI="https://github.com/mjakeman/extension-manager/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="A native tool for browsing and installing GNOME Shell Extensions"
+HOMEPAGE="https://github.com/mjakeman/extension-manager;
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+BDEPEND="
+   dev-libs/glib:2
+   dev-util/blueprint-compiler
+   virtual/pkgconfig
+"
+
+RDEPEND="
+   dev-libs/glib:2
+   dev-libs/json-glib
+   gui-libs/gtk:4[introspection]
+   gui-libs/libadwaita:1[introspection]
+   gui-libs/text-engine
+   net-libs/libsoup:3.0
+"
+
+DEPEND="
+   ${RDEPEND}
+"
+
+src_configure() {
+   local emesonargs=()
+   if has live ${PROPERTIES}; then
+   # Produce a development build for live ebuild
+   emesonargs+=( -Ddevelopment=true )
+   fi
+   meson_src_configure
+}
+
+# Tests are skipped because as of version 0.2.3, the tests only validate
+# resource files and do not verify any functionality of the program.  Those
+# validations are either already handled by QA checks or not relevant on
+# Gentoo.  For more information about the rationale, please refer to:
+# 
https://github.com/gentoo/guru/commit/f896bee213fbb62c70e818c1bf503fee2a41919a#comments
+#
+# If tests are to be executed in the future because the upstream adds
+# functionality tests or for other reasons, and should there be no convenient
+# way to skip the validations, the following variable values need to be set:
+#
+# IUSE="test"
+# # 'Validate appstream file' test case requires Internet connection
+# PROPERTIES="test_network"
+# RESTRICT="test"
+# BDEPEND="test? ( dev-libs/appstream-glib dev-util/desktop-file-utils )"
+src_test() {
+   :
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+   gnome2_schemas_update
+}
+
+pkg_postrm() {
+   xdg_pkg_postrm
+   gnome2_schemas_update
+}

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

[Andreas K. Hüttel]

commit: 0190858f5462cb08962bcfb0520ebe8e029ad378
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Mar 27 20:30:05 2022 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sun Mar 27 20:30:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0190858f

sys-libs/glibc: Rekeyword 2.35-r1

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 sys-libs/glibc/glibc-2.35-r1.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sys-libs/glibc/glibc-2.35-r1.ebuild 
b/sys-libs/glibc/glibc-2.35-r1.ebuild
index 9d9a70b14c3b..0edba3776234 100644
--- a/sys-libs/glibc/glibc-2.35-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.35-r1.ebuild
@@ -26,8 +26,7 @@ PATCH_DEV=dilfridge
 if [[ ${PV} == * ]]; then
inherit git-r3
 else
-   #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
-   KEYWORDS=""
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
SRC_URI+=" 
https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz;
 fi

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

[James Le Cuirot]

commit: 2a8b5a4d1d39073e877d1ed80f4f8d1befa5681f
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Mar 27 20:21:54 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Mar 27 20:21:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a8b5a4d

profiles: The dev-python/jsonschema tests can be run on m68k now

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

 profiles/arch/m68k/package.use.mask | 1 -
 1 file changed, 1 deletion(-)

diff --git a/profiles/arch/m68k/package.use.mask 
b/profiles/arch/m68k/package.use.mask
index 4944ff27f139..ae3c861fb8e5 100644
--- a/profiles/arch/m68k/package.use.mask
+++ b/profiles/arch/m68k/package.use.mask
@@ -60,7 +60,6 @@ dev-python/argcomplete test
 dev-python/distlib test
 dev-python/fonttools test
 dev-python/isort test
-dev-python/jsonschema test
 dev-python/nose test
 dev-python/numpydoc test
 dev-python/pytest-regressions test