[gentoo-commits] repo/user/Drauthius:master commit in: dev-games/aseprite/files/, dev-games/aseprite-skia/, dev-games/aseprite/

2022-08-01 Thread Albert Diserholt
commit: df4065d9ca033d33d78d49bbbdd159f5b2d9bde4
Author: Albert Diserholt  diserholt  com>
AuthorDate: Tue Aug  2 05:40:23 2022 +
Commit: Albert Diserholt  diserholt  com>
CommitDate: Tue Aug  2 05:41:05 2022 +
URL:
https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=df4065d9

Remove old aseprite ebuilds

They are now shipped in the official repository.

Signed-off-by: Albert Diserholt  diserholt.com>

 dev-games/aseprite-skia/Manifest   |   2 -
 .../aseprite-skia/aseprite-skia--r102.ebuild   |  89 ---
 .../aseprite-skia/aseprite-skia--r96.ebuild|  89 ---
 dev-games/aseprite/Manifest|  22 
 dev-games/aseprite/aseprite-1.1.13.ebuild  | 109 ---
 dev-games/aseprite/aseprite-1.2.21.ebuild  | 100 -
 dev-games/aseprite/aseprite-1.2.30.ebuild  | 120 -
 dev-games/aseprite/aseprite-1.2.34.1.ebuild| 112 ---
 dev-games/aseprite/aseprite-1.2.35.ebuild  | 112 ---
 .../files/aseprite-1.2.21-system_libarchive.patch  |  84 ---
 .../files/aseprite-1.2.21-system_libwebp.patch |  41 ---
 .../files/aseprite-1.2.30-system_libarchive.patch  |  90 
 .../files/aseprite-1.2.30-system_libwebp.patch |  41 ---
 .../files/aseprite-1.2.34.1-system_harfbuzz.patch  |  23 
 .../aseprite-1.2.34.1-system_libarchive.patch  |  93 
 .../files/aseprite-1.2.34.1-system_libwebp.patch   |  44 
 .../files/aseprite-1.2.35-system_harfbuzz.patch|  23 
 .../files/aseprite-1.2.35-system_libarchive.patch  |  97 -
 .../files/aseprite-1.2.35-system_libwebp.patch |  44 
 19 files changed, 1335 deletions(-)

diff --git a/dev-games/aseprite-skia/Manifest b/dev-games/aseprite-skia/Manifest
deleted file mode 100644
index 06b7869..000
--- a/dev-games/aseprite-skia/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD aseprite-skia--r102.ebuild 2147 BLAKE2B 
933fbcf7185e0f8cc4da4ec727c11e901dbc999806c0ff6b36b10f1eaffb15b23e8b13ef94d27c8cad95f17c50fd8387ee27b8ff2fb5c5a435176a32fb0fd188
 SHA512 
0dabaa53975d6b857837a1072e7a057088d6b327fc789b2421f6b2b305d13740193ae9dff708239577b708600789c5d73fd2bd68c00edc2b3301e05ee0e2ef06
-EBUILD aseprite-skia--r96.ebuild 2147 BLAKE2B 
933fbcf7185e0f8cc4da4ec727c11e901dbc999806c0ff6b36b10f1eaffb15b23e8b13ef94d27c8cad95f17c50fd8387ee27b8ff2fb5c5a435176a32fb0fd188
 SHA512 
0dabaa53975d6b857837a1072e7a057088d6b327fc789b2421f6b2b305d13740193ae9dff708239577b708600789c5d73fd2bd68c00edc2b3301e05ee0e2ef06

diff --git a/dev-games/aseprite-skia/aseprite-skia--r102.ebuild 
b/dev-games/aseprite-skia/aseprite-skia--r102.ebuild
deleted file mode 100644
index a55cc11..000
--- a/dev-games/aseprite-skia/aseprite-skia--r102.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9,10} )
-
-inherit python-any-r1 git-r3 ninja-utils
-
-DESCRIPTION="Skia library for Aseprite"
-HOMEPAGE="https://skia.org;
-
-EGIT_REPO_URI="https://github.com/aseprite/skia;
-EGIT_BRANCH="aseprite-m${PR/r/}"
-
-DEPOT_TOOLS_URI="https://chromium.googlesource.com/chromium/tools/depot_tools.git;
-DEPOT_TOOLS_COMMIT="main"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug"
-
-RDEPEND="
-   dev-libs/expat
-   media-libs/harfbuzz
-   media-libs/libjpeg-turbo
-   media-libs/libpng
-   media-libs/libwebp
-   media-libs/freetype:2
-   sys-libs/zlib"
-BDEPEND="
-   ${PYTHON_DEPS}
-   dev-util/ninja"
-
-src_unpack() {
-   git-r3_src_unpack
-
-   sed -ri 
'/third_party\/externals\/(expat|icu|libjpeg|libpng|libwebp|zlib|harfbuzz|freetype)/d'
 "${S}/DEPS"
-
-   cd "${S}"
-   ./tools/git-sync-deps || die "Failed to sync dependencies"
-
-   EGIT_BRANCH="$DEPOT_TOOLS_COMMIT"
-   git-r3_fetch "$DEPOT_TOOLS_URI"
-   git-r3_checkout "$DEPOT_TOOLS_URI" depot_tools
-}
-
-src_configure() {
-   local myskiaargs=(
-   is_debug=$(usex debug true false)
-   is_official_build=true
-   skia_use_system_expat=true
-   skia_use_system_icu=true
-   skia_use_system_libjpeg_turbo=true
-   skia_use_system_libpng=true
-   skia_use_system_libwebp=true
-   skia_use_system_zlib=true
-   skia_use_sfntly=false
-   skia_use_freetype=true
-   skia_use_harfbuzz=true
-   skia_pdf_subset_harfbuzz=true
-   skia_use_system_freetype2=true
-   skia_use_system_harfbuzz=true
-   )
-
-   cd "${S}"
-   export PATH="$PATH:${S}/depot_tools"
-   gn gen out/$(usex debug Debug Release) --args="${myskiaargs[*]}" || die 
"Failed to configure skia"
-}
-
-src_compile() {
-   eninja -C 

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

2022-08-01 Thread Joonas Niilola
commit: c60327f95a35659157057fe92ddcff2c55ddf953
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug  2 05:39:30 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  2 05:39:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c60327f9

sys-apps/s6-portable-utils: Stabilize 2.2.5.0 x86, #862636

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild 
b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild
index 9bee521a4f7e..4be32a57f249 100644
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND=">=dev-libs/skalibs-2.12.0.0:="
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

2022-08-01 Thread Joonas Niilola
commit: 537840c44e45599c9f6c2e56b8c6d1e9b30e2acc
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug  2 05:39:28 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  2 05:39:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=537840c4

sys-apps/s6-linux-init: Stabilize 1.0.8.0 x86, #862636

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild 
b/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild
index d08b744a8e76..87f093daa8b6 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+sysv-utils"
 
 RDEPEND="dev-lang/execline:=



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

2022-08-01 Thread Joonas Niilola
commit: 2272fa0b0f6348622bbdf2a0f0eec1e1f9b2ceea
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug  2 05:39:26 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  2 05:39:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2272fa0b

dev-libs/skalibs: Stabilize 2.12.0.1 x86, #862636

Signed-off-by: Joonas Niilola  gentoo.org>

 dev-libs/skalibs/skalibs-2.12.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/skalibs/skalibs-2.12.0.1.ebuild 
b/dev-libs/skalibs/skalibs-2.12.0.1.ebuild
index 34a200de5749..78c6578f5760 100644
--- a/dev-libs/skalibs/skalibs-2.12.0.1.ebuild
+++ b/dev-libs/skalibs/skalibs-2.12.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="doc ipv6"
 
 HTML_DOCS=( doc/. )



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

2022-08-01 Thread Joonas Niilola
commit: 677371c45e59d24463e8dfcb25dfcac3b455b530
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug  2 05:39:30 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  2 05:39:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=677371c4

sys-apps/s6-rc: Stabilize 0.5.3.2 x86, #862636

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
index dabdfd41b480..696da70f68b8 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND="dev-lang/execline:=
dev-libs/skalibs:=



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

2022-08-01 Thread Joonas Niilola
commit: 688712fd526756c22ccc2b3c34d987a393ec
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug  2 05:39:29 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  2 05:39:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=688712fd

sys-apps/s6-linux-utils: Stabilize 2.6.0.0 x86, #862636

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild 
b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild
index e798bfc5fe62..3bcde778e48a 100644
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND=">=dev-libs/skalibs-2.12.0.0:="
 DEPEND="${RDEPEND}"



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

2022-08-01 Thread Joonas Niilola
commit: 8661dee25368a37e0d68d028eab8d3df8f906a85
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug  2 05:39:28 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  2 05:39:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8661dee2

sys-apps/s6: Stabilize 2.11.1.2 x86, #862636

Signed-off-by: Joonas Niilola  gentoo.org>

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

diff --git a/sys-apps/s6/s6-2.11.1.2.ebuild b/sys-apps/s6/s6-2.11.1.2.ebuild
index b4997e3253f8..271cb78aeb44 100644
--- a/sys-apps/s6/s6-2.11.1.2.ebuild
+++ b/sys-apps/s6/s6-2.11.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+execline"
 
 RDEPEND="dev-libs/skalibs:=



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

2022-08-01 Thread Joonas Niilola
commit: f1521bbffc512b59270891de8c6300a7160f16e1
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug  2 05:38:33 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  2 05:38:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1521bbf

dev-libs/skalibs: Stabilize 2.12.0.1 amd64, #862636

Signed-off-by: Joonas Niilola  gentoo.org>

 dev-libs/skalibs/skalibs-2.12.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/skalibs/skalibs-2.12.0.1.ebuild 
b/dev-libs/skalibs/skalibs-2.12.0.1.ebuild
index 748bda1854a2..34a200de5749 100644
--- a/dev-libs/skalibs/skalibs-2.12.0.1.ebuild
+++ b/dev-libs/skalibs/skalibs-2.12.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="doc ipv6"
 
 HTML_DOCS=( doc/. )



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

2022-08-01 Thread Joonas Niilola
commit: 6ed0d1c8dce95075ba7bff24f5d9f3c9925584ac
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug  2 05:38:35 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  2 05:38:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ed0d1c8

sys-apps/s6-portable-utils: Stabilize 2.2.5.0 amd64, #862636

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild 
b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild
index 34e4528aaa94..9bee521a4f7e 100644
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 
 RDEPEND=">=dev-libs/skalibs-2.12.0.0:="
 DEPEND="${RDEPEND}"



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

2022-08-01 Thread Joonas Niilola
commit: df40a9827666069e70ddc2fb6263ae3d477ecd5d
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug  2 05:38:36 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  2 05:38:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df40a982

sys-apps/s6-rc: Stabilize 0.5.3.2 amd64, #862636

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
index 9304b3decb02..dabdfd41b480 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 
 RDEPEND="dev-lang/execline:=
dev-libs/skalibs:=



[gentoo-commits] repo/gentoo:master commit in: dev-lang/execline/

2022-08-01 Thread Joonas Niilola
commit: 9449c2493da0cbcfcd7459e4516cca1c149bbcdf
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug  2 05:39:27 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  2 05:39:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9449c249

dev-lang/execline: Stabilize 2.9.0.1 x86, #862636

Signed-off-by: Joonas Niilola  gentoo.org>

 dev-lang/execline/execline-2.9.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/execline/execline-2.9.0.1.ebuild 
b/dev-lang/execline/execline-2.9.0.1.ebuild
index cc212e451664..c149b316c7ed 100644
--- a/dev-lang/execline/execline-2.9.0.1.ebuild
+++ b/dev-lang/execline/execline-2.9.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND=">=dev-libs/skalibs-2.12.0.0:="
 DEPEND="${RDEPEND}"



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

2022-08-01 Thread Joonas Niilola
commit: 3d9ee92d92956c6ab0e6267ea24dc2d473e082e1
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug  2 05:38:35 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  2 05:38:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d9ee92d

sys-apps/s6-linux-utils: Stabilize 2.6.0.0 amd64, #862636

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild 
b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild
index 36d949ef12f9..e798bfc5fe62 100644
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 RDEPEND=">=dev-libs/skalibs-2.12.0.0:="
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

2022-08-01 Thread Joonas Niilola
commit: 76d3b8199f6fb39944e31e38f4644b6d1f1fe2c2
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug  2 05:38:34 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  2 05:38:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76d3b819

sys-apps/s6-linux-init: Stabilize 1.0.8.0 amd64, #862636

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild 
b/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild
index 134f021dac5e..d08b744a8e76 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="+sysv-utils"
 
 RDEPEND="dev-lang/execline:=



[gentoo-commits] repo/gentoo:master commit in: dev-lang/execline/

2022-08-01 Thread Joonas Niilola
commit: 6b108e84e25dc68f91367b40b0a4f5eac6600235
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug  2 05:38:33 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  2 05:38:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b108e84

dev-lang/execline: Stabilize 2.9.0.1 amd64, #862636

Signed-off-by: Joonas Niilola  gentoo.org>

 dev-lang/execline/execline-2.9.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/execline/execline-2.9.0.1.ebuild 
b/dev-lang/execline/execline-2.9.0.1.ebuild
index 7881d1093e25..cc212e451664 100644
--- a/dev-lang/execline/execline-2.9.0.1.ebuild
+++ b/dev-lang/execline/execline-2.9.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 
 RDEPEND=">=dev-libs/skalibs-2.12.0.0:="
 DEPEND="${RDEPEND}"



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

2022-08-01 Thread Joonas Niilola
commit: 549d100b22e0544196dd74499f4655686e9d0804
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug  2 05:38:34 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  2 05:38:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=549d100b

sys-apps/s6: Stabilize 2.11.1.2 amd64, #862636

Signed-off-by: Joonas Niilola  gentoo.org>

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

diff --git a/sys-apps/s6/s6-2.11.1.2.ebuild b/sys-apps/s6/s6-2.11.1.2.ebuild
index dcdeeef35af5..b4997e3253f8 100644
--- a/sys-apps/s6/s6-2.11.1.2.ebuild
+++ b/sys-apps/s6/s6-2.11.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="+execline"
 
 RDEPEND="dev-libs/skalibs:=



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

2022-08-01 Thread Joonas Niilola
commit: 519f220b47ad9fb4886e7c4c62fd6cdef08f3be7
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug  2 05:35:25 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  2 05:35:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=519f220b

sys-fs/lxcfs: drop 5.0.1

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-fs/lxcfs/lxcfs-5.0.1.ebuild | 77 -
 1 file changed, 77 deletions(-)

diff --git a/sys-fs/lxcfs/lxcfs-5.0.1.ebuild b/sys-fs/lxcfs/lxcfs-5.0.1.ebuild
deleted file mode 100644
index 9af4475e9807..
--- a/sys-fs/lxcfs/lxcfs-5.0.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake meson python-any-r1 systemd verify-sig
-
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ 
https://github.com/lxc/lxcfs/;
-SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz
-   verify-sig? ( 
https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz.asc )"
-
-LICENSE="Apache-2.0 LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="doc test"
-
-DEPEND="sys-fs/fuse:3"
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}
-   $(python_gen_any_dep '
-   dev-python/jinja[${PYTHON_USEDEP}]
-   ')
-   doc? ( sys-apps/help2man )
-   verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-# Needs some black magic to work inside container/chroot.
-RESTRICT="test"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-python_check_deps() {
-   python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-   python-any-r1_pkg_setup
-}
-
-src_prepare() {
-   default
-
-   # Fix python shebangs for python-exec[-native-symlinks], #851480
-   local shebangs=($(grep -rl "#!/usr/bin/env python3" || die))
-   python_fix_shebang -q ${shebangs[*]}
-}
-
-src_configure() {
-   local emesonargs=(
-   $(meson_use doc docs)
-   $(meson_use test tests)
-
-   -Dfuse-version=3
-   -Dinit-script=""
-   -Dwith-init-script=""
-   )
-
-   meson_src_configure
-}
-
-src_test() {
-   cd "${BUILD_DIR}"/tests || die "failed to change into tests/ directory."
-   ./main.sh || die
-}
-
-src_install() {
-   meson_src_install
-
-   newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs
-   newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs
-
-   # Provide our own service file (copy of upstream) due to paths being 
different from upstream,
-   # #728470
-   systemd_newunit "${FILESDIR}"/lxcfs-4.0.0.service lxcfs.service
-}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/files/, sys-fs/lxcfs/

2022-08-01 Thread Joonas Niilola
commit: a1b35f5980098c9b168d4e02a59acf30bb22da64
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug  2 05:34:32 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  2 05:35:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1b35f59

sys-fs/lxcfs: add a patch to fix an issue with fuse3 on 5.0.1

Closes: https://bugs.gentoo.org/862342
Signed-off-by: Joonas Niilola  gentoo.org>

 ...cfs-5.0.1-fix-reinitialization-with-fuse3.patch | 71 +++
 sys-fs/lxcfs/lxcfs-5.0.1-r1.ebuild | 79 ++
 2 files changed, 150 insertions(+)

diff --git 
a/sys-fs/lxcfs/files/lxcfs-5.0.1-fix-reinitialization-with-fuse3.patch 
b/sys-fs/lxcfs/files/lxcfs-5.0.1-fix-reinitialization-with-fuse3.patch
new file mode 100644
index ..45450504804a
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-5.0.1-fix-reinitialization-with-fuse3.patch
@@ -0,0 +1,71 @@
+From 5976d0349c1900e2649b7d2904d98ba6a7278e6b Mon Sep 17 00:00:00 2001
+From: Wolfgang Bumiller 
+Date: Fri, 29 Jul 2022 09:30:10 +0200
+Subject: [PATCH] fix reinitialization with fuse3
+
+With fuse3 `fuse_get_context` returns NULL before fuse was
+fully initialized, so we must not access it.
+
+Futher, we call 'do_reload' for normal initialization as
+well, so let's prevent that from re-initializing the
+bindings initially and only do this on actual reloads,
+otherwise we do it twice on startup.
+
+Signed-off-by: Wolfgang Bumiller 
+Fixes #549
+---
+ src/bindings.c | 2 +-
+ src/lxcfs.c| 8 
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/bindings.c b/src/bindings.c
+index 422a6229..fee7ede0 100644
+--- a/src/bindings.c
 b/src/bindings.c
+@@ -943,5 +943,5 @@ void *lxcfs_fuse_init(struct fuse_conn_info *conn, void 
*data)
+   can_use_sys_cpu = true;
+ #endif
+   has_versioned_opts = true;
+-  return fc->private_data;
++  return fc ? fc->private_data : NULL;
+ }
+diff --git a/src/lxcfs.c b/src/lxcfs.c
+index d1a3d805..fed896c9 100644
+--- a/src/lxcfs.c
 b/src/lxcfs.c
+@@ -123,7 +123,7 @@ static int lxcfs_init_library(void)
+ 
+ /* do_reload - reload the dynamic library.  Done under
+  * lock and when we know the user_count was 0 */
+-static void do_reload(void)
++static void do_reload(bool reinit)
+ {
+   int ret;
+   char lxcfs_lib_path[PATH_MAX];
+@@ -164,7 +164,7 @@ static void do_reload(void)
+ 
+ good:
+   /* initialize the library */
+-  if (lxcfs_init_library() < 0) {
++  if (reinit && lxcfs_init_library() < 0) {
+   log_exit("Failed to initialize liblxcfs.so");
+   }
+ 
+@@ -180,7 +180,7 @@ static void up_users(void)
+ {
+   users_lock();
+   if (users_count == 0 && need_reload)
+-  do_reload();
++  do_reload(true);
+   users_count++;
+   users_unlock();
+ }
+@@ -1362,7 +1362,7 @@ int main(int argc, char *argv[])
+   fuse_argv[fuse_argc++] = new_argv[0];
+   fuse_argv[fuse_argc] = NULL;
+ 
+-  do_reload();
++  do_reload(false);
+   if (install_signal_handler(SIGUSR1, sigusr1_reload)) {
+   lxcfs_error("%s - Failed to install SIGUSR1 signal handler", 
strerror(errno));
+   goto out;

diff --git a/sys-fs/lxcfs/lxcfs-5.0.1-r1.ebuild 
b/sys-fs/lxcfs/lxcfs-5.0.1-r1.ebuild
new file mode 100644
index ..1a0187e1c338
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-5.0.1-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake meson python-any-r1 systemd verify-sig
+
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ 
https://github.com/lxc/lxcfs/;
+SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz
+   verify-sig? ( 
https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz.asc )"
+
+LICENSE="Apache-2.0 LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc test"
+
+DEPEND="sys-fs/fuse:3"
+RDEPEND="${DEPEND}"
+BDEPEND="${PYTHON_DEPS}
+   $(python_gen_any_dep '
+   dev-python/jinja[${PYTHON_USEDEP}]
+   ')
+   doc? ( sys-apps/help2man )
+   verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+# Needs some black magic to work inside container/chroot.
+RESTRICT="test"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+PATCHES=( "${FILESDIR}"/lxcfs-5.0.1-fix-reinitialization-with-fuse3.patch )
+
+python_check_deps() {
+   python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+   python-any-r1_pkg_setup
+}
+
+src_prepare() {
+   default
+
+   # Fix python shebangs for python-exec[-native-symlinks], #851480
+   local shebangs=($(grep -rl "#!/usr/bin/env python3" || die))
+   python_fix_shebang -q ${shebangs[*]}
+}
+
+src_configure() {
+   local emesonargs=(
+   

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

2022-08-01 Thread Hans de Graaff
commit: 258c736c584ce2d90f114f5c18214a2357adf083
Author: Hans de Graaff  gentoo  org>
AuthorDate: Tue Aug  2 05:35:21 2022 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Tue Aug  2 05:35:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=258c736c

dev-ruby/faraday_middleware: enable ruby30

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

 dev-ruby/faraday_middleware/faraday_middleware-1.2.0.ebuild | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-ruby/faraday_middleware/faraday_middleware-1.2.0.ebuild 
b/dev-ruby/faraday_middleware/faraday_middleware-1.2.0.ebuild
index b08b6146db7d..ed5fc68e6050 100644
--- a/dev-ruby/faraday_middleware/faraday_middleware-1.2.0.ebuild
+++ b/dev-ruby/faraday_middleware/faraday_middleware-1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -46,17 +46,21 @@ ruby_add_bdepend "test? (
 
 all_ruby_prepare() {
sed -i -e '/\(cane\|parallel\|rubocop\|simplecov\)/ s:^:#:' \
-   -e '/rspec/ s/>=/~>/' \
-e "/addressable/ s/, '< 2.4'//" \
-e "/rack/ s/< 2/< 2.3/" \
-e "/rack-cache/ s/, '< 1.3'//" \
-e "/simple_oauth/ s/, '< 0.3'//" \
+   -e "/safe_yaml/ s:^:#:" \
-e "/webmock/ s/2.3/3.0/" Gemfile || die
 
# Avoid unneeded dependency on git
sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
 
sed -i -e '1irequire "fileutils"' spec/spec_helper.rb || die
+
+   # Avoid safe_yaml specs since they are broken with newer ruby versions
+   # and safe_yaml is not mandatory for using faraday_middleware.
+   rm -f spec/unit/parse_yaml_spec.rb || die
 }
 
 each_ruby_test() {



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

2022-08-01 Thread Hans de Graaff
commit: c8f2bbe848a1ad81f23db9f8fba1e2d65f433b46
Author: Hans de Graaff  gentoo  org>
AuthorDate: Tue Aug  2 05:33:14 2022 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Tue Aug  2 05:35:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8f2bbe8

dev-ruby/crack: add rexml dep to gemspec file

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

 dev-ruby/crack/crack-0.4.4-r3.ebuild | 45 
 1 file changed, 45 insertions(+)

diff --git a/dev-ruby/crack/crack-0.4.4-r3.ebuild 
b/dev-ruby/crack/crack-0.4.4-r3.ebuild
new file mode 100644
index ..7f44edcffee6
--- /dev/null
+++ b/dev-ruby/crack/crack-0.4.4-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_EXTRADOC="README.md History"
+
+RUBY_FAKEGEM_GEMSPEC="crack.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Really simple JSON and XML parsing, ripped from Merb and Rails"
+HOMEPAGE="https://github.com/jnunemaker/crack;
+SRC_URI="https://github.com/jnunemaker/crack/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-psych4.patch" )
+
+ruby_add_rdepend "dev-ruby/rexml"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+   sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+   # Also list rexml in the gemspec. This is fixed upstream in 0.4.5 but 
that version is not tagged.
+   sed -i -e '17igem.add_runtime_dependency("rexml")' 
${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_prepare() {
+   # Remove tests which fail when run by portage but pass when run by hand
+   sed -i -e '/{"regex": \/foo.*\/}/d' test/json_test.rb || die
+   sed -i -e '/{"regex": \/foo.*\/i}/d' test/json_test.rb || die
+   sed -i -e '/{"regex": \/foo.*\/mix}/d' test/json_test.rb || die
+}
+
+each_ruby_test() {
+   ${RUBY} -Itest -Ilib -e 'Dir["test/*_test.rb"].each { |f| load f }' || 
die
+}



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

2022-08-01 Thread Miroslav Šulc
commit: 7fe7ca8083002888061d63e94dc5af97108ad235
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Aug  2 04:51:56 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Aug  2 04:51:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fe7ca80

media-sound/abcmidi: bump to 2022.07.31

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/abcmidi/Manifest  |  1 +
 media-sound/abcmidi/abcmidi-2022.07.31.ebuild | 35 +++
 2 files changed, 36 insertions(+)

diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index d4a04467d8f3..d5955a819905 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1 +1,2 @@
 DIST abcMIDI-2022.06.14.zip 612729 BLAKE2B 
f9644ea59bb43d50a39f60f31f440e9d4e425701c71877fb812adeaa0757da37d2aabab5c2b3593f38a5a135adc0925545337860452317e558cbfb037c95d4af
 SHA512 
4e8a9a770925e166dabdbf459227b26373c33ed0ec356d093d8f4de457cc9034cd9237d445f31883e7c3974c3fd4b69a6f6fb156b26e03483bcd70793e7457ec
+DIST abcMIDI-2022.07.31.zip 612957 BLAKE2B 
e795cfaf0fae0ed4f41ff2a5be613fb690f6d0d92443f3938896fa460bece293e638c4fd930ba39d6bacdf07d741362ec8f11ae371f89fe9a5cbcd8b4e86a766
 SHA512 
dea7347219d0a7df6eef04c2998e286583d5f06d977c5900c4c4bba6e327c8debc3bfa8f327a67c4f6da88f57d1074a75a6c0c0b6096b575fa38508b76ac615f

diff --git a/media-sound/abcmidi/abcmidi-2022.07.31.ebuild 
b/media-sound/abcmidi/abcmidi-2022.07.31.ebuild
new file mode 100644
index ..11f547f4cb8e
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2022.07.31.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_P="abcMIDI-${PV}"
+DESCRIPTION="Programs for processing ABC music notation files"
+HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html;
+SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip;
+S="${WORKDIR}"/${PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+BDEPEND="app-arch/unzip"
+
+src_prepare() {
+   default
+   sed -i "s:-O2::" configure.ac || die
+   sed -i "s:@datarootdir@/doc/abcmidi:@docdir@:" Makefile.in || die
+   eautoreconf
+}
+
+src_install() {
+   default
+
+   if use examples ; then
+   docinto examples
+   dodoc samples/*.abc
+   fi
+}



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

2022-08-01 Thread Miroslav Šulc
commit: 5c087f22eead06e2bdb512e8fd5fa087df754f4a
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Aug  2 04:45:27 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Aug  2 04:45:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c087f22

media-libs/libnjb: dropped obsolete 2.2.7

Bug: https://bugs.gentoo.org/862627
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-libs/libnjb/libnjb-2.2.7.ebuild | 50 ---
 1 file changed, 50 deletions(-)

diff --git a/media-libs/libnjb/libnjb-2.2.7.ebuild 
b/media-libs/libnjb/libnjb-2.2.7.ebuild
deleted file mode 100644
index 4149c8448297..
--- a/media-libs/libnjb/libnjb-2.2.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool udev
-
-DESCRIPTION="Library for communicating with the Creative Nomad JukeBox digital 
audio player"
-HOMEPAGE="http://libnjb.sourceforge.net;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="doc static-libs"
-
-RDEPEND="virtual/libusb:0"
-DEPEND="${RDEPEND}
-   doc? ( app-doc/doxygen )"
-
-PATCHES=( "${FILESDIR}"/${P}-exclude-samples.patch )
-
-src_prepare() {
-   default
-   elibtoolize
-}
-
-src_configure() {
-   use doc || export ac_cv_prog_HAVE_DOXYGEN=false
-
-   econf \
-   $(use_enable static-libs static)
-}
-
-src_install() {
-   default
-
-   udev_newrules "${FILESDIR}"/${PN}.rules 80-${PN}.rules
-
-   # package provides .pc files
-   find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-   udev_reload
-}
-
-pkg_postrm() {
-   udev_reload
-}



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

2022-08-01 Thread Miroslav Šulc
commit: f0cfc3dffae8c995c38f6f2f7e915cb8b714b178
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Aug  2 04:44:16 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Aug  2 04:44:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0cfc3df

media-libs/libmtp: dropped obsolete 1.1.19

Bug: https://bugs.gentoo.org/862624
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-libs/libmtp/libmtp-1.1.19.ebuild | 80 --
 1 file changed, 80 deletions(-)

diff --git a/media-libs/libmtp/libmtp-1.1.19.ebuild 
b/media-libs/libmtp/libmtp-1.1.19.ebuild
deleted file mode 100644
index cb54789a908f..
--- a/media-libs/libmtp/libmtp-1.1.19.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit udev
-
-if [[ ${PV} == * ]]; then
-   EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code;
-   inherit autotools git-r3
-else
-   SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-   KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
-HOMEPAGE="http://libmtp.sourceforge.net/;
-
-LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ?
-SLOT="0/9" # Based on SONAME of libmtp shared library
-IUSE="+crypt doc examples static-libs"
-
-RDEPEND="
-   acct-group/plugdev
-   virtual/libiconv
-   virtual/libusb:1
-   crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   >sys-devel/gettext-0.18.3
-   virtual/pkgconfig
-   doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS README TODO )
-
-src_prepare() {
-   default
-
-   # ChangeLog says "RETIRING THIS FILE ..pause..  GIT" (Last entry from 
start of 2011)
-   rm ChangeLog || die
-
-   if [[ ${PV} == * ]]; then
-   if [[ -e /usr/share/gettext/config.rpath ]]; then
-   cp /usr/share/gettext/config.rpath . || die
-   else
-   touch config.rpath || die # This is from upstream 
autogen.sh
-   fi
-   eautoreconf
-   fi
-}
-
-src_configure() {
-   local myeconfargs=(
-   $(use_enable crypt mtpz)
-   $(use_enable doc doxygen)
-   $(use_enable static-libs static)
-   --with-udev="$(get_udevdir)"
-   --with-udev-group=plugdev
-   --with-udev-mode=0660
-   )
-   econf "${myeconfargs[@]}"
-}
-
-src_install() {
-   default
-   find "${ED}" -name "*.la" -delete || die
-
-   if use examples; then
-   docinto examples
-   dodoc examples/*.{c,h,sh}
-   fi
-}
-
-pkg_postinst() {
-   udev_reload
-}
-
-pkg_postrm() {
-   udev_reload
-}



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

2022-08-01 Thread Miroslav Šulc
commit: 7ea135058f1d871399ffb88e0b7b287cd928f42f
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Aug  2 04:42:08 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Aug  2 04:42:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ea13505

media-libs/liblscp: dropped obsolete 6.9.4

Bug: https://bugs.gentoo.org/862621
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-libs/liblscp/Manifest |  1 -
 media-libs/liblscp/liblscp-0.9.4.ebuild | 28 
 2 files changed, 29 deletions(-)

diff --git a/media-libs/liblscp/Manifest b/media-libs/liblscp/Manifest
index d12d04f5f7e9..878ae1fec504 100644
--- a/media-libs/liblscp/Manifest
+++ b/media-libs/liblscp/Manifest
@@ -1,2 +1 @@
-DIST liblscp-0.9.4.tar.gz 697219 BLAKE2B 
f1824c75237e47ffcd95c15b72e4746cbc8997924f70cced966baddb68877526cbbcd56ff419fa1eb5f1ca6a1537ce5db368ba41cac39e51813921720e9b
 SHA512 
6aa9b15d538925edf3327ca05023bac8285611902703fec20572416dde5cd7300ed429a7db464d92b9f6c1d524b89066888f8cbd0d56283ff3c78074605f396a
 DIST liblscp-0.9.6.tar.gz 100811 BLAKE2B 
a86a5e9e6d52dfd2449274e1c800e40887094dcea3e39d257670dded8b3805f2cdf575b41f640b0df95cd008656d3e7c8ca93d5bc5360c8727b80d6d2695ed83
 SHA512 
51c3b0b3dfe3947ac5d7cfec18fec597a4282aacc489cdda5a30d5853c3a43778e207ddf2f211c28ba04386fd6f30a09eed62dc2a33177e5aeccd7f77b4ef520

diff --git a/media-libs/liblscp/liblscp-0.9.4.ebuild 
b/media-libs/liblscp/liblscp-0.9.4.ebuild
deleted file mode 100644
index 515fa9bdea37..
--- a/media-libs/liblscp/liblscp-0.9.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="C++ library for the Linux Sampler control protocol"
-HOMEPAGE="https://www.linuxsampler.org;
-SRC_URI="https://www.rncbc.org/archive/${P}.tar.gz
-https://download.linuxsampler.org/packages/${P}.tar.gz;
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS ChangeLog TODO NEWS README )
-
-src_configure() {
-   econf --disable-static
-}
-
-src_install() {
-   use doc && local HTML_DOCS=( doc/html/. )
-   default
-   find "${D}" -name '*.la' -type f -delete || die
-}



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

2022-08-01 Thread Hans de Graaff
commit: e2859c3577723dc7e118539e59a7465b84cc984b
Author: Hans de Graaff  gentoo  org>
AuthorDate: Tue Aug  2 04:40:30 2022 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Tue Aug  2 04:41:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2859c35

dev-ruby/webmock: add 3.15.0

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

 dev-ruby/webmock/Manifest  |  1 +
 dev-ruby/webmock/webmock-3.15.0.ebuild | 63 ++
 2 files changed, 64 insertions(+)

diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index 11009279069d..bf745f871ca9 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1 +1,2 @@
 DIST webmock-3.14.0.gem 126976 BLAKE2B 
20dd463c8b784869d4379aeabf892a6b4602091a4cc01a4002161d88f24781bb2bae1e50bd0ce8077c40aab73a2243835d99551bd04d808ffdf019df071c2b01
 SHA512 
0c9ea5b29446de7619c45d0fb72ab305bf68150c9d657ddc223d0d258a400dc730e3fe401b46c994a5c8eb450db5ee8f7021fe8d2d6c85bc4723c657799c5ccc
+DIST webmock-3.15.0.gem 128000 BLAKE2B 
10587fd127fe61076d34a36f71e6e61f43d6019a01d1906e1fa501697791deeb89a8a2cdc5fa92dee1b001cdd22055db913ae20414342faf0ae11cc301bf0e6e
 SHA512 
9f2e6404b617cc1aa67dcaef941046f82e4602eaeef77084714a451be513fdbd6e6c54c090842c5519009d2ca0533b30ad17d225d3738cde526d037d3fe3335b

diff --git a/dev-ruby/webmock/webmock-3.15.0.ebuild 
b/dev-ruby/webmock/webmock-3.15.0.ebuild
new file mode 100644
index ..ff18bc5ed6e0
--- /dev/null
+++ b/dev-ruby/webmock/webmock-3.15.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP 
requests"
+HOMEPAGE="https://github.com/bblimke/webmock;
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+   >=dev-ruby/addressable-2.8.0
+   >=dev-ruby/crack-0.3.2
+   >=dev-ruby/hashdiff-0.4.0:0
+"
+
+ruby_add_bdepend "test? (
+   dev-ruby/minitest:5
+   dev-ruby/rspec:3
+   >=dev-ruby/test-unit-3.0.0
+   dev-ruby/rack
+)"
+
+all_ruby_prepare() {
+   # Remove bundler support
+   rm Gemfile || die
+   sed -i -e '/[Bb]undler/d' Rakefile || die
+   sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+   sed -i -e '1igem "test-unit"' test/test_helper.rb || die
+
+   # There is now optional support for curb and typhoeus which we don't
+   # have in Gentoo yet. em_http_request is available in Gentoo but its
+   # version is too old. patron's latest version is not compatible.
+   # httpclient is no longer maintained and has various test failures.
+   sed -i -e '/\(curb\|typhoeus\|em-http\|patron\|httpclient\)/ s:^:#:' 
spec/spec_helper.rb || die
+   rm -f 
spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client,httpclient}/*
 || die
+
+   # Drop tests for dev-ruby/http for now since this package only works 
with ruby26
+   sed -i -e '/http_rb/ s:^:#:' spec/spec_helper.rb || die
+   rm -f spec/acceptance/http_rb/* || die
+
+   # Avoid specs that require network access
+   sed -i -e '/when request is not stubbed/,/^  end/ s:^:#:' 
spec/acceptance/shared/callbacks.rb
+}
+
+each_ruby_test() {
+   ${RUBY} -S rake test NO_CONNECTION=true || die
+   ${RUBY} -S rspec-3 spec || die
+
+   einfo "Delay to allow the test server to stop"
+   sleep 10
+}



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

2022-08-01 Thread Miroslav Šulc
commit: 19d844a950eb0e03065dd04fa5052730032c2629
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Aug  2 04:40:31 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Aug  2 04:40:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19d844a9

media-sound/csound: dropped obsolete 6.16.2

Bug: https://bugs.gentoo.org/862618
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/Manifest   |   3 -
 media-sound/csound/csound-6.16.2.ebuild   | 262 --
 media-sound/csound/files/csound-6.15.0-lame.patch |  26 ---
 media-sound/csound/metadata.xml   |   6 -
 4 files changed, 297 deletions(-)

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 8b3eb36dbfbb..9eb23bde8e3e 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,6 +1,3 @@
-DIST Csound6.16.0_manual_html.zip 24765630 BLAKE2B 
3bf6e2202a42dfa826d39ef41282e1942f26cc3f6a3358e0de3a006f102b686342b4e1824a1c3a48ac37ffed31d9353e6946d948751dcc059819da649d63d9cb
 SHA512 
e550a832e365ab186533045d110259699039d08a85ec2f53d4fe36aa31004725b1dc6732f71d9895fa19b3df5f4ec720af1b4f80856a14b0ffbd844c4ab2dbe3
-DIST Csound6.16.0_manual_pdf.zip 9640644 BLAKE2B 
7bb35f806568a80abbd84a4f4988217bea09f3174881d802f6d61505f044c8a26b59036dcb61ead5315e756a4512eb1fb56b2824f27f09899a8fe1664a386754
 SHA512 
18347ce7080ca7997e98f8addffcc492c7ec5d8e037e71a33bb46fdbc5b58ec26ee42f370689fc228d4150bd9dedc31c7824ec4c19f3243d512977f4380f9490
 DIST Csound6.17.0_manual_html.zip 25897263 BLAKE2B 
3148a60a398d49d6932864d84b2ee37ddf86d5389b91c99443b2c64f7c3b270d040b83ac88b80ebc772c198223682452da1618391fcc8963fe63151b7837037e
 SHA512 
ff2098828e51e78aa80b10736ea162d90c0b1bef3265e469951a5df63250d283e852490cb2a6599dcb1b8a5c185cf4f0b9534f501e4cb755b9da67ecfb1f4ba6
 DIST Csound6.17.0_manual_pdf.zip 9930889 BLAKE2B 
c0210f2fb97a6707ae6cd0a0cf38cd374f4d4c973b188ee8d418a7efd5c98dc1d4e61867de021ed2859bd8264cc0876b46deb565c358b6efea42f471d39671a9
 SHA512 
bf664bab1dec073b48853ccf7519086c55ad74af33db86ac7f95746231c18fb10d46a485047788050094e412d27bbd0df65e238d31b01b435989f2fd734189a6
-DIST csound-6.16.2-distributable.tar.xz 25169396 BLAKE2B 
f51c27606f53571d998a62667c55c60a831c076ced993c4eaa8fa24a7e0a8d4872055dc59455b70124f51e2c419018345e2d0e9a33b95d4362f8c6bdecb8310d
 SHA512 
b72c89b2935d92840f5cb7f6d5696e74a3528f5d37858218691f0f6331a69f63b261937a8a8d346d6e182cf8f4a40af85167a4e42fd005cfcf5b4c9daa822f75
 DIST csound-6.17.0-distributable.tar.xz 25231984 BLAKE2B 
9767aae3368f33340d80abb84c573e6ceb91bb16448e961f62c679742377e62f611b36341ce7dfb32a2daafc9440c3dff84fe031c9d52b7d86491c383cf79d61
 SHA512 
b7c5b2f70e82d9dc37074cb217bc146d66293cfea2d69ffd3b0eab9aca302e431eb82b906c8d6494969374988edd6a9c7d04d7676efd085a2dce235988400caa

diff --git a/media-sound/csound/csound-6.16.2.ebuild 
b/media-sound/csound/csound-6.16.2.ebuild
deleted file mode 100644
index 6f59d02107af..
--- a/media-sound/csound/csound-6.16.2.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# As upstream (and we aswell) are not allowed to redistribute scansyn,
-# we have to repackage the tarball. For that purpose use `bash 
files/repackage.sh version`
-# Reference: https://github.com/csound/csound/issues/1148
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit cmake lua-single python-single-r1 toolchain-funcs
-
-if [[ ${PV} == "" ]]; then
-   EGIT_REPO_URI="https://github.com/csound/csound.git;
-   inherit git-r3
-else
-   DOC_P="Csound$(ver_cut 1-2).0"
-   
SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
-   doc? (
-   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
-   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
-   )"
-   KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Sound design and signal processing system for composition and 
performance"
-HOMEPAGE="https://csound.github.io/;
-
-LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
-SLOT="0"
-IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 jack java keyboard linear lua mp3 nls osc portaudio
-portaudio portmidi pulseaudio python samples static-libs stk test +threads 
+utils
-vim-syntax websocket"
-
-REQUIRED_USE="
-   alsa? ( threads )
-   java? ( cxx )
-   linear? ( double-precision )
-   lua? ( ${LUA_REQUIRED_USE} cxx )
-   python? ( ${PYTHON_REQUIRED_USE} cxx )
-"
-
-BDEPEND="
-   sys-devel/flex
-   virtual/yacc
-   chua? ( dev-libs/boost )
-   lua? ( dev-lang/swig )
-   python? ( dev-lang/swig )
-   nls? ( sys-devel/gettext )
-   test? (
-   dev-util/cunit
-   ${PYTHON_DEPS}
-   )
-"
-# linear 

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

2022-08-01 Thread Michał Górny
commit: 56b2e99542512e4fa17c5531d5b6432cc9080e74
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jul 28 08:22:09 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug  2 04:07:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56b2e995

python-utils-r1.eclass: Sterilize pytest-sugar plugin

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

 eclass/python-utils-r1.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index b793a1f13e0f..89013591c31b 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -1331,6 +1331,9 @@ epytest() {
# sterilize pytest-markdown as it runs code snippets from all
# *.md files found without any warning
-p no:markdown
+   # pytest-sugar undoes everything that's good about pytest output
+   # and makes it hard to read logs
+   -p no:sugar
)
local x
for x in "${EPYTEST_DESELECT[@]}"; do



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

2022-08-01 Thread Michał Górny
commit: cf8733d2fcb656b7a9242812874bc061a9341961
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jul 27 08:18:07 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug  2 04:04:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf8733d2

dev-python/installer: Call python_optimize explicitly

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

 dev-python/installer/installer-0.5.1-r1.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/dev-python/installer/installer-0.5.1-r1.ebuild 
b/dev-python/installer/installer-0.5.1-r1.ebuild
index a29b236242ca..39b7336c9b89 100644
--- a/dev-python/installer/installer-0.5.1-r1.ebuild
+++ b/dev-python/installer/installer-0.5.1-r1.ebuild
@@ -35,3 +35,8 @@ distutils_enable_tests pytest
 python_compile() {
python_domodule src/installer "${WORKDIR}"/*.dist-info
 }
+
+python_install() {
+   distutils-r1_python_install
+   python_optimize
+}



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

2022-08-01 Thread Michał Górny
commit: 1746fd5774b828411e4feacf80b9bf8029d7fb43
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jul 27 07:52:22 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug  2 04:04:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1746fd57

distutils-r1.eclass: Let gpep517 compile bytecode when 9+ is used

Use the new --optimize option of gpep517 >= 9 when it is installed,
and remove the python_optimize call then.  This conditional logic is
meant to give some additional testing while gpep517-9 is still in ~arch.

Note that this also removes python_optimize call for "no" mode.
However, this mode is used only by a handful of ebuilds, so if any of
them needs an explicit python_optimize call, we can quickly fix them.

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

 eclass/distutils-r1.eclass | 36 ++--
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 495eead1d5fd..60f81473c0a6 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -1270,13 +1270,25 @@ distutils_wheel_install() {
local wheel=${2}
 
einfo "  Installing ${wheel##*/} to ${root}"
-   local cmd=(
-   gpep517 install-wheel
-   --destdir="${root}"
-   --interpreter="${PYTHON}"
-   --prefix="${EPREFIX}/usr"
-   "${wheel}"
-   )
+   if has_version -b ">=dev-python/gpep517-9"; then
+   # TODO: inline when we dep on >=9
+   local cmd=(
+   gpep517 install-wheel
+   --destdir="${root}"
+   --interpreter="${PYTHON}"
+   --prefix="${EPREFIX}/usr"
+   --optimize=all
+   "${wheel}"
+   )
+   else
+   local cmd=(
+   gpep517 install-wheel
+   --destdir="${root}"
+   --interpreter="${PYTHON}"
+   --prefix="${EPREFIX}/usr"
+   "${wheel}"
+   )
+   fi
printf '%s\n' "${cmd[*]}"
"${cmd[@]}" || die "Wheel install failed"
 
@@ -1994,9 +2006,13 @@ _distutils-r1_post_python_install() {
done
 
if [[ ${DISTUTILS_USE_PEP517} ]]; then
-   # we need to recompile everything here in order to embed
-   # the correct paths
-   python_optimize "${sitedir}"
+   if ! has_version -b ">=dev-python/gpep517-9"
+   then
+   # TODO: remove when we dep on >=9
+   # we need to recompile everything here in order 
to embed
+   # the correct paths
+   python_optimize "${sitedir}"
+   fi
fi
fi
 }



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

2022-08-01 Thread Michał Górny
commit: 694d9d319c313b160fbb3fea155f9c7d5bd706ea
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jul 27 08:32:26 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug  2 04:07:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=694d9d31

net-wireless/blueman: Invoke eautomake to fix py-compile script

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

 net-wireless/blueman/blueman-2.3.1.ebuild |  2 +-
 net-wireless/blueman/blueman-2.3.2.ebuild | 11 ---
 net-wireless/blueman/blueman-.ebuild  | 11 ---
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/net-wireless/blueman/blueman-2.3.1.ebuild 
b/net-wireless/blueman/blueman-2.3.1.ebuild
index dbedcfc7eae6..997963609ec2 100644
--- a/net-wireless/blueman/blueman-2.3.1.ebuild
+++ b/net-wireless/blueman/blueman-2.3.1.ebuild
@@ -97,7 +97,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-   [[ ${PV} ==  ]] && eautoreconf
+   [[ ${PV} ==  ]] && eautoreconf || eautomake
distutils-r1_src_prepare
 }
 

diff --git a/net-wireless/blueman/blueman-2.3.2.ebuild 
b/net-wireless/blueman/blueman-2.3.2.ebuild
index 453fb6b604da..c34ce0ed1161 100644
--- a/net-wireless/blueman/blueman-2.3.2.ebuild
+++ b/net-wireless/blueman/blueman-2.3.2.ebuild
@@ -7,13 +7,13 @@ DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=no
 PYTHON_COMPAT=( python3_{8..11} )
 
-inherit distutils-r1 gnome2-utils linux-info systemd xdg-utils
+inherit autotools distutils-r1 gnome2-utils linux-info systemd xdg-utils
 
 DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
 HOMEPAGE="https://github.com/blueman-project/blueman/;
 
 if [[ ${PV} == "" ]] ; then
-   inherit autotools git-r3
+   inherit git-r3
EGIT_REPO_URI="https://github.com/blueman-project/blueman.git;
 else
SRC_URI="
@@ -97,7 +97,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-   [[ ${PV} ==  ]] && eautoreconf
+   if [[ ${PV} ==  ]]; then
+   eautoreconf
+   else
+   # remove this when upstream switches to automake with .pyc fix
+   eautomake
+   fi
distutils-r1_src_prepare
 }
 

diff --git a/net-wireless/blueman/blueman-.ebuild 
b/net-wireless/blueman/blueman-.ebuild
index 453fb6b604da..c34ce0ed1161 100644
--- a/net-wireless/blueman/blueman-.ebuild
+++ b/net-wireless/blueman/blueman-.ebuild
@@ -7,13 +7,13 @@ DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=no
 PYTHON_COMPAT=( python3_{8..11} )
 
-inherit distutils-r1 gnome2-utils linux-info systemd xdg-utils
+inherit autotools distutils-r1 gnome2-utils linux-info systemd xdg-utils
 
 DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
 HOMEPAGE="https://github.com/blueman-project/blueman/;
 
 if [[ ${PV} == "" ]] ; then
-   inherit autotools git-r3
+   inherit git-r3
EGIT_REPO_URI="https://github.com/blueman-project/blueman.git;
 else
SRC_URI="
@@ -97,7 +97,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-   [[ ${PV} ==  ]] && eautoreconf
+   if [[ ${PV} ==  ]]; then
+   eautoreconf
+   else
+   # remove this when upstream switches to automake with .pyc fix
+   eautomake
+   fi
distutils-r1_src_prepare
 }
 



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

2022-08-01 Thread Michał Górny
commit: 11a473895fa5886d6ce5897f14091149b577546f
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jul 27 08:48:39 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug  2 04:07:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11a47389

dev-python/pygobject: Call python_optimize explicitly

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

 dev-python/pygobject/pygobject-3.42.2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-python/pygobject/pygobject-3.42.2.ebuild 
b/dev-python/pygobject/pygobject-3.42.2.ebuild
index 217ae21f2c4a..d411290d7520 100644
--- a/dev-python/pygobject/pygobject-3.42.2.ebuild
+++ b/dev-python/pygobject/pygobject-3.42.2.ebuild
@@ -65,6 +65,7 @@ python_test() {
 
 python_install() {
meson_src_install
+   python_optimize
 }
 
 python_install_all() {



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

2022-08-01 Thread Michał Górny
commit: 60441e61cfeb7d5e0fa85d4ee594753594efd2a5
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jul 27 08:19:09 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug  2 04:04:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60441e61

dev-python/tomli: Call python_optimize explicitly

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

 dev-python/tomli/tomli-2.0.1-r1.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/dev-python/tomli/tomli-2.0.1-r1.ebuild 
b/dev-python/tomli/tomli-2.0.1-r1.ebuild
index f24193c0c9fe..4a4c0bc1ea17 100644
--- a/dev-python/tomli/tomli-2.0.1-r1.ebuild
+++ b/dev-python/tomli/tomli-2.0.1-r1.ebuild
@@ -34,3 +34,8 @@ distutils_enable_tests unittest
 python_compile() {
python_domodule src/tomli "${WORKDIR}"/*.dist-info
 }
+
+python_install() {
+   distutils-r1_python_install
+   python_optimize
+}



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

2022-08-01 Thread Michał Górny
commit: 29688d65fff70633e97759018d52993d59ee8e16
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jul 27 07:44:52 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug  2 04:04:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29688d65

distutils-r1.eclass: Pass EPREFIX to addpredict

Pointed out by Arfrever.

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

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index e4ef1919bc7d..495eead1d5fd 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -1647,8 +1647,8 @@ distutils-r1_python_install() {
# python likes to compile any module it sees, which triggers 
sandbox
# failures if some packages haven't compiled their modules yet.
addpredict "${EPREFIX}/usr/lib/${EPYTHON}"
-   addpredict /usr/lib/pypy3.9
-   addpredict /usr/local # bug 498232
+   addpredict "${EPREFIX}/usr/lib/pypy3.9"
+   addpredict "${EPREFIX}/usr/local" # bug 498232
 
if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
merge_root=1



[gentoo-commits] repo/gentoo:master commit in: metadata/install-qa-check.d/

2022-08-01 Thread Michał Górny
commit: a09934ce1b026924c173d535d06e55a3126add04
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Jul 18 08:52:40 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug  2 04:04:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a09934ce

install-qa-check.d: Rewrite 60python-pyc to use gpep517

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

 metadata/install-qa-check.d/60python-pyc | 168 ++-
 1 file changed, 96 insertions(+), 72 deletions(-)

diff --git a/metadata/install-qa-check.d/60python-pyc 
b/metadata/install-qa-check.d/60python-pyc
index 47e9a3eea908..fd9434994f2f 100644
--- a/metadata/install-qa-check.d/60python-pyc
+++ b/metadata/install-qa-check.d/60python-pyc
@@ -4,86 +4,110 @@
 # QA check: ensure that Python modules are compiled after installing
 # Maintainer: Python project 
 
-# EAPI guard to prevent errors from trying to import python-utils-r1
-# in unsupported EAPIs.  Please keep the list in sync with the eclass!
-if [[ ${EAPI} == [6-8] ]]; then
-   inherit python-utils-r1
+python_pyc_check() {
+   local save=$(shopt -p nullglob)
+   shopt -s nullglob
+   local progs=( "${EPREFIX}"/usr/lib/python-exec/*/gpep517 )
+   ${save}
 
-   python_pyc_check() {
-   local impl missing=() outdated=()
-   for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
-   _python_export "${impl}" EPYTHON PYTHON
-   [[ -x ${PYTHON} ]] || continue
-   local sitedir=$(python_get_sitedir "${impl}")
+   local invalid=()
+   local mismatched_timestamp=()
+   local mismatched_data=()
+   local missing=()
+   local stray=()
 
-   if [[ -d ${D}${sitedir} ]]; then
-   local suffixes=() subdir=
-   case ${EPYTHON} in
-   python2*)
-   suffixes=( .py{c,o} )
-   ;;
-   pypy)
-   suffixes=( .pyc )
-   ;;
-   python3*|pypy3*)
-   local tag=$("${PYTHON}" -c 
'import sys; print(sys.implementation.cache_tag)')
-   suffixes=( 
".${tag}"{,.opt-{1,2}}.pyc )
-   subdir=__pycache__/
-   ;;
-   *)
-   # skip testing unknown impl
-   continue
-   ;;
-   esac
+   for prog in "${progs[@]}"; do
+   local impl=${prog%/*}
+   impl=${impl##*/}
+   einfo "Verifying compiled files for ${impl}"
+   local kind pyc py
+   while IFS=: read -r kind pyc py extra; do
+   case ${kind} in
+   invalid)
+   invalid+=( "${pyc}" )
+   ;;
+   mismatched)
+   case ${extra} in
+   timestamp)
+   mismatched_timestamp+=( 
"${pyc}" )
+   ;;
+   *)
+   mismatched_data+=( 
"${pyc}" )
+   ;;
+   esac
+   ;;
+   missing)
+   missing+=( "${pyc}" )
+   ;;
+   older)
+   # older warnings were produced by 
earlier version
+   # of gpep517 but the check was 
incorrect, so we just
+   # ignore them
+   ;;
+   stray)
+   stray+=( "${pyc}" )
+   ;;
+   esac
+   done < <("${prog}" verify-pyc --destdir "${D}" --prefix 
"${EPREFIX}"/usr)
+   done
 
-   einfo "Verifying compiled files in ${sitedir}"
-   local f s
-   while read -d $'\0' -r f; do
-   local dir=${f%/*}
-   local basename=${f##*/}
-   

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

2022-08-01 Thread Michał Górny
commit: 7e2791da8da69126ad759103967ae99d16b093ec
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Jul 18 06:15:14 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug  2 04:04:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e2791da

distutils-r1.eclass: Update pyproject.toml advice for PEP517 mode

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

 eclass/distutils-r1.eclass | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index e64eedec5fd3..9909ba70178c 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -884,10 +884,10 @@ _distutils-r1_handle_pyproject_toml() {
 
if [[ ! -f setup.py && -f pyproject.toml ]]; then
if [[ ${DISTUTILS_USE_SETUPTOOLS} != pyproject.toml ]]; then
-   eerror "No setup.py found but pyproject.toml is 
present.  In order to enable"
-   eerror "pyproject.toml support in distutils-r1, set:"
-   eerror "  DISTUTILS_USE_SETUPTOOLS=pyproject.toml"
-   die "No setup.py found and 
DISTUTILS_USE_SETUPTOOLS!=pyproject.toml"
+   eerror "No setup.py found but pyproject.toml is 
present.  Please migrate"
+   eerror "the package to use DISTUTILS_USE_PEP517. See:"
+   eerror "  
https://projects.gentoo.org/python/guide/distutils.html;
+   die "No setup.py found and PEP517 mode not enabled"
fi
fi
 }



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

2022-08-01 Thread Michał Górny
commit: a0bcdd294d0d6a420c391986c20c16c23c82e4ef
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jul 27 07:20:57 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug  2 04:04:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0bcdd29

distutils-r1.eclass: Bump dev-python/sip dependency

Bug: https://bugs.gentoo.org/851840
Signed-off-by: Michał Górny  gentoo.org>

 eclass/distutils-r1.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 85a5c8496d49..e4ef1919bc7d 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -265,7 +265,7 @@ _distutils_set_globals() {
;;
sip)
bdep+='
-   >=dev-python/sip-6.6.1[${PYTHON_USEDEP}]
+   >=dev-python/sip-6.6.2[${PYTHON_USEDEP}]
'
;;
standalone)



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

2022-08-01 Thread Michał Górny
commit: 77de20b0d60b530525bfa85aa0aeec4faa468653
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jul 27 07:20:21 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug  2 04:04:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77de20b0

distutils-r1.eclass: Require gpep517 >= 8

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

 eclass/distutils-r1.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 9909ba70178c..85a5c8496d49 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -205,7 +205,7 @@ _distutils_set_globals() {
fi
 
bdep='
-   >=dev-python/gpep517-6[${PYTHON_USEDEP}]
+   >=dev-python/gpep517-8[${PYTHON_USEDEP}]
'
case ${DISTUTILS_USE_PEP517} in
flit)



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

2022-08-01 Thread Michał Górny
commit: 4e2ffcee0451b9295e1bf358e8d33e2a33f09796
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jul  8 06:40:30 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug  2 04:03:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e2ffcee

virtualx.eclass: Remove unused XHOST

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

 eclass/virtualx.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index d7b82e12cdd5..05b89e814a42 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -108,10 +108,9 @@ virtx() {
local i=0
local retval=0
local OLD_SANDBOX_ON="${SANDBOX_ON}"
-   local XVFB XHOST XDISPLAY
+   local XVFB XDISPLAY
local xvfbargs=( -screen 0 1280x1024x24 +extension RANDR )
XVFB=$(type -p Xvfb) || die
-   XHOST=$(type -p xhost) || die
 
debug-print "${FUNCNAME}: running Xvfb hack"
export XAUTHORITY=



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

2022-08-01 Thread Michał Górny
commit: 10811b0ace57ad1f1b725903a5164a1e733758a9
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jul  8 07:08:48 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug  2 04:03:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10811b0a

virtualx.eclass: Let Xvfb figure out the free DISPLAY

Replace the antiquated search mechanism for a free DISPLAY with Xvfb's
-displayfd option that makes Xvfb choose one itself and print it to
given fd.

Bug: https://bugs.gentoo.org/494244
Signed-off-by: Michał Górny  gentoo.org>

 eclass/virtualx.eclass | 62 --
 1 file changed, 20 insertions(+), 42 deletions(-)

diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index d1c05e20b246..c0af095e89a5 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -108,65 +108,43 @@ virtx() {
local i=0
local retval=0
local OLD_SANDBOX_ON="${SANDBOX_ON}"
-   local XDISPLAY
local xvfbargs=( -screen 0 1280x1024x24 +extension RANDR )
 
debug-print "${FUNCNAME}: running Xvfb hack"
export XAUTHORITY=
-   # The following is derived from Mandrake's hack to allow
-   # compiling without the X display
-
-   einfo "Scanning for an open DISPLAY to start Xvfb ..."
-   # If we are in a chrooted environment, and there is already a
-   # X server started outside of the chroot, Xvfb will fail to start
-   # on the same display (most cases this is :0 ), so make sure
-   # Xvfb is started, else bump the display number
-   #
-   # Azarah - 5 May 2002
-   # GNOME GDM may have started X on DISPLAY :0 with a
-   # lock file /tmp/.X1024-lock, therefore start the search at 1.
-   # Else a leftover /tmp/.X1-lock will prevent finding an available 
display.
-   XDISPLAY=$(i=1; while [[ -f /tmp/.X${i}-lock ]] ; do ((i++));done; echo 
${i})
-   debug-print "${FUNCNAME}: XDISPLAY=${XDISPLAY}"
+
+   einfo "Starting Xvfb ..."
 
# We really do not want SANDBOX enabled here
export SANDBOX_ON="0"
 
-   debug-print "${FUNCNAME}: Xvfb :${XDISPLAY} ${xvfbargs[*]}"
-   Xvfb :${XDISPLAY} "${xvfbargs[@]}" &>/dev/null &
-   sleep 2
-
-   local start=${XDISPLAY}
-   while [[ ! -f /tmp/.X${XDISPLAY}-lock ]]; do
-   # Stop trying after 15 tries
-   if ((XDISPLAY - start > 15)) ; then
-   eerror "'Xvfb :${XDISPLAY} ${xvfbargs[*]}' returns:"
-   echo
-   Xvfb :${XDISPLAY} "${xvfbargs[@]}"
-   echo
-   eerror "If possible, correct the above error and try 
your emerge again."
-   die "Unable to start Xvfb"
-   fi
-   ((XDISPLAY++))
-   debug-print "${FUNCNAME}: Xvfb :${XDISPLAY} ${xvfbargs[*]}"
-   Xvfb :${XDISPLAY} "${xvfbargs[@]}" &>/dev/null &
-   sleep 2
-   done
+   debug-print "${FUNCNAME}: Xvfb -displayfd 1 ${xvfbargs[*]}"
+   local logfile=${T}/Xvfb.log
+   local pidfile=${T}/Xvfb.pid
+   # NB: bash command substitution blocks until Xvfb prints fd to stdout
+   # and then closes the fd; only then it backgrounds properly
+   export DISPLAY=:$(
+   Xvfb -displayfd 1 "${xvfbargs[@]}" 2>"${logfile}" &
+   echo "$!" > "${pidfile}"
+   )
+
+   if [[ ${DISPLAY} == : ]]; then
+   eerror "Xvfb failed to start, reprinting error log"
+   cat "${logfile}"
+   die "Xvfb failed to start"
+   fi
 
# Now enable SANDBOX again if needed.
export SANDBOX_ON="${OLD_SANDBOX_ON}"
 
-   einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..."
-
-   export DISPLAY=:${XDISPLAY}
-   # Do not break on error, but setup $retval, as we need
-   # to kill Xvfb
+   # Do not break on error, but setup $retval, as we need to kill Xvfb
+   einfo "Xvfb started on DISPLAY=${DISPLAY}"
debug-print "${FUNCNAME}: $@"
nonfatal "$@"
retval=$?
 
# Now kill Xvfb
-   kill $(cat /tmp/.X${XDISPLAY}-lock)
+   kill "$(<"${pidfile}")"
 
# die if our command failed
[[ ${retval} -ne 0 ]] && die "Failed to run '$@'"



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

2022-08-01 Thread Michał Górny
commit: aa75351b53dbd55153b224bc97ea1fec141dc7c6
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jul  8 06:26:50 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug  2 04:03:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa75351b

virtualx.eclass: Pass xvfbargs as an array

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

 eclass/virtualx.eclass | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index 5c4b39164cff..d7b82e12cdd5 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -109,7 +109,7 @@ virtx() {
local retval=0
local OLD_SANDBOX_ON="${SANDBOX_ON}"
local XVFB XHOST XDISPLAY
-   local xvfbargs="-screen 0 1280x1024x24 +extension RANDR"
+   local xvfbargs=( -screen 0 1280x1024x24 +extension RANDR )
XVFB=$(type -p Xvfb) || die
XHOST=$(type -p xhost) || die
 
@@ -134,24 +134,24 @@ virtx() {
# We really do not want SANDBOX enabled here
export SANDBOX_ON="0"
 
-   debug-print "${FUNCNAME}: ${XVFB} :${XDISPLAY} ${xvfbargs}"
-   ${XVFB} :${XDISPLAY} ${xvfbargs} &>/dev/null &
+   debug-print "${FUNCNAME}: ${XVFB} :${XDISPLAY} ${xvfbargs[*]}"
+   ${XVFB} :${XDISPLAY} "${xvfbargs[@]}" &>/dev/null &
sleep 2
 
local start=${XDISPLAY}
while [[ ! -f /tmp/.X${XDISPLAY}-lock ]]; do
# Stop trying after 15 tries
if ((XDISPLAY - start > 15)) ; then
-   eerror "'${XVFB} :${XDISPLAY} ${xvfbargs}' returns:"
+   eerror "'${XVFB} :${XDISPLAY} ${xvfbargs[*]}' returns:"
echo
-   ${XVFB} :${XDISPLAY} ${xvfbargs}
+   ${XVFB} :${XDISPLAY} "${xvfbargs[@]}"
echo
eerror "If possible, correct the above error and try 
your emerge again."
die "Unable to start Xvfb"
fi
((XDISPLAY++))
-   debug-print "${FUNCNAME}: ${XVFB} :${XDISPLAY} ${xvfbargs}"
-   ${XVFB} :${XDISPLAY} ${xvfbargs} &>/dev/null &
+   debug-print "${FUNCNAME}: ${XVFB} :${XDISPLAY} ${xvfbargs[*]}"
+   ${XVFB} :${XDISPLAY} "${xvfbargs[@]}" &>/dev/null &
sleep 2
done
 



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

2022-08-01 Thread Michał Górny
commit: 3020036e18b7408ea7f01ecac4eb09972466aa3a
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jul  8 06:41:58 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug  2 04:03:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3020036e

virtualx.eclass: Inline XVFB

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

 eclass/virtualx.eclass | 15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index 05b89e814a42..d1c05e20b246 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -108,9 +108,8 @@ virtx() {
local i=0
local retval=0
local OLD_SANDBOX_ON="${SANDBOX_ON}"
-   local XVFB XDISPLAY
+   local XDISPLAY
local xvfbargs=( -screen 0 1280x1024x24 +extension RANDR )
-   XVFB=$(type -p Xvfb) || die
 
debug-print "${FUNCNAME}: running Xvfb hack"
export XAUTHORITY=
@@ -133,24 +132,24 @@ virtx() {
# We really do not want SANDBOX enabled here
export SANDBOX_ON="0"
 
-   debug-print "${FUNCNAME}: ${XVFB} :${XDISPLAY} ${xvfbargs[*]}"
-   ${XVFB} :${XDISPLAY} "${xvfbargs[@]}" &>/dev/null &
+   debug-print "${FUNCNAME}: Xvfb :${XDISPLAY} ${xvfbargs[*]}"
+   Xvfb :${XDISPLAY} "${xvfbargs[@]}" &>/dev/null &
sleep 2
 
local start=${XDISPLAY}
while [[ ! -f /tmp/.X${XDISPLAY}-lock ]]; do
# Stop trying after 15 tries
if ((XDISPLAY - start > 15)) ; then
-   eerror "'${XVFB} :${XDISPLAY} ${xvfbargs[*]}' returns:"
+   eerror "'Xvfb :${XDISPLAY} ${xvfbargs[*]}' returns:"
echo
-   ${XVFB} :${XDISPLAY} "${xvfbargs[@]}"
+   Xvfb :${XDISPLAY} "${xvfbargs[@]}"
echo
eerror "If possible, correct the above error and try 
your emerge again."
die "Unable to start Xvfb"
fi
((XDISPLAY++))
-   debug-print "${FUNCNAME}: ${XVFB} :${XDISPLAY} ${xvfbargs[*]}"
-   ${XVFB} :${XDISPLAY} "${xvfbargs[@]}" &>/dev/null &
+   debug-print "${FUNCNAME}: Xvfb :${XDISPLAY} ${xvfbargs[*]}"
+   Xvfb :${XDISPLAY} "${xvfbargs[@]}" &>/dev/null &
sleep 2
done
 



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

2022-08-01 Thread Michał Górny
commit: aa7fdc965621b413d85624ea30e9452a4130aced
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jul 27 07:10:41 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug  2 04:03:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa7fdc96

virtualx.eclass: Do not disable sandbox

The code responsible for disabling sandbox dates back to 2002 and does
not include any explanation.  Let's try if we still need it.

Bug: https://bugs.gentoo.org/107479
Signed-off-by: Michał Górny  gentoo.org>

 eclass/virtualx.eclass | 7 ---
 1 file changed, 7 deletions(-)

diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index c0af095e89a5..e04834d39bd1 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -107,7 +107,6 @@ virtx() {
 
local i=0
local retval=0
-   local OLD_SANDBOX_ON="${SANDBOX_ON}"
local xvfbargs=( -screen 0 1280x1024x24 +extension RANDR )
 
debug-print "${FUNCNAME}: running Xvfb hack"
@@ -115,9 +114,6 @@ virtx() {
 
einfo "Starting Xvfb ..."
 
-   # We really do not want SANDBOX enabled here
-   export SANDBOX_ON="0"
-
debug-print "${FUNCNAME}: Xvfb -displayfd 1 ${xvfbargs[*]}"
local logfile=${T}/Xvfb.log
local pidfile=${T}/Xvfb.pid
@@ -134,9 +130,6 @@ virtx() {
die "Xvfb failed to start"
fi
 
-   # Now enable SANDBOX again if needed.
-   export SANDBOX_ON="${OLD_SANDBOX_ON}"
-
# Do not break on error, but setup $retval, as we need to kill Xvfb
einfo "Xvfb started on DISPLAY=${DISPLAY}"
debug-print "${FUNCNAME}: $@"



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

2022-08-01 Thread Michał Górny
commit: 7d3a9e65df75b6a2567c668ce27f9082f36fa1c5
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jul  8 06:22:13 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug  2 04:03:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d3a9e65

virtualx.eclass: Add quoting to workaround vim syntax hl bug

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

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

diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index b7a25c897b4a..5c4b39164cff 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -53,7 +53,7 @@ case ${VIRTUALX_REQUIRED} in
*)
BDEPEND="${VIRTUALX_REQUIRED}? ( ${VIRTUALX_DEPEND} )"
IUSE="${VIRTUALX_REQUIRED}"
-   [[ ${VIRTUALX_REQUIRED} == test ]] &&
+   [[ ${VIRTUALX_REQUIRED} == "test" ]] &&
RESTRICT+=" !test? ( test )"
;;
 esac



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

2022-08-01 Thread Sam James
commit: a7e7e2e1e67ce3374bafba51b9cdd271f29b48d2
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug  2 03:38:32 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug  2 03:38:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7e7e2e1

profiles: mask broken ghostscript-gpl-9.56.1

We should've done this earlier, even.

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

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

diff --git a/profiles/package.mask b/profiles/package.mask
index 6219228674c5..184dc5e98572 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James  (2022-08-02)
+# Multiple rendering/font issues reported: bug #844115, bug #851141.
+=app-text/ghostscript-gpl-9.56.1
+
 # Marek Szuba  (2022-08-01)
 # Suricata-5 has reached end of life upstream. Please switch to major version 
6.
 # Removal in 30 days (Bug #)



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

2022-08-01 Thread Yixun Lan
commit: fba543ebf96db2dcc7cbebc16d50e42004a8edfb
Author: Yixun Lan  gentoo  org>
AuthorDate: Tue Aug  2 01:56:38 2022 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Tue Aug  2 03:05:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fba543eb

dev-python/jsonschema: Keyword 4.9.0 riscv, #862825

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

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

diff --git a/dev-python/jsonschema/jsonschema-4.9.0.ebuild 
b/dev-python/jsonschema/jsonschema-4.9.0.ebuild
index 9ff615cc2bee..b0cbff91ab2d 100644
--- a/dev-python/jsonschema/jsonschema-4.9.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.9.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]



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

2022-08-01 Thread Yixun Lan
commit: afa43cb73f23bd621a56b48c883c3cdfdd710efb
Author: Yixun Lan  gentoo  org>
AuthorDate: Tue Aug  2 01:56:34 2022 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Tue Aug  2 03:05:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afa43cb7

dev-python/pkgutil_resolve_name: Keyword 1.3.10 riscv, #862825

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

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

diff --git a/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild 
b/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild
index c94ff7941c23..06d967ba0a18 100644
--- a/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild
+++ b/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild
@@ -18,4 +18,4 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"



[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/

2022-08-01 Thread Sam James
commit: 85155265903a3db773bb84edabf4a427836eb34a
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug  2 02:56:24 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug  2 02:56:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85155265

net-misc/rsync: add 3.2.5_pre1 (unkeyworded)

Note that upstream are particularly interested in feedback
on the new security hardening and whether it breaks
any options, so please report any issues upstream
if you hit them.

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

 net-misc/rsync/Manifest|   2 +
 net-misc/rsync/rsync-3.2.5_pre1.ebuild | 164 +
 2 files changed, 166 insertions(+)

diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index dd8526885384..36341f1776a5 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,2 +1,4 @@
 DIST rsync-3.2.4.tar.gz 1114853 BLAKE2B 
a67fcb9619874f1c5346a876138e59f4bf508a90736f830fb2b4eaf180ab11f15a0a7db9b3b28c3b990b77c2b0973d8e668bf509e4134f464159ed3172f53d80
 SHA512 
96318e2754fbddf84d16df671c721e577766969dfa415925c4dc1be2e4e60a51246623747a8aec0c6e9c0824e6aa7335235ccd07f3d6fd901f8cf28e2d6e91b6
 DIST rsync-3.2.4.tar.gz.asc 195 BLAKE2B 
9bc2fbd59e5396a91de82f27a461367ad2a129820e2d1926c3b1e26dacf93c676a7231f186c341b6dec9c764a9619b504bc9b5f95925982e78de4607eddf6c65
 SHA512 
7e1bbebc777d5710345fdec1efd4c2ef1079d6c0ec90272a1a4a51a59ae3cb619b9d1c0ae2f337ecdd06827bb3536b969b6f21f9108f8d21114713aa1750012b
+DIST rsync-3.2.5pre1.tar.gz 1126641 BLAKE2B 
14ffa62305d3e842a89992d9d47e79a8efec5744b297a16dbe6d3440c26b10ac200927ca0f4b6fd1d83e705b56fb6ee9cdedc048dd7e8d6ccf92932e462e9159
 SHA512 
fe3126ba617b1e4dfb0de845dc1438be8aff07d51d70c0b232e6f0d1efba808d0fb42a30ed39fdb3303c489ef85e0761e188d4ed5fa9d6145cb749c7d11b3fb5
+DIST rsync-3.2.5pre1.tar.gz.asc 195 BLAKE2B 
714eed7026f17131a8cbc13fa3f79e0fba52087b23ef84dbe45a5d84a23610d365ac9cd1e7494287a863b7c1bf8ee296fb80b4d4d592ec79d2237cc005e4
 SHA512 
9ddfa092155f6c07e9617000ba55c36a2521cc9a9f30f376e89dde2de7bc25270fa348c0622a2a27c68f69bbdae20c75d99d8a75ce446ff490acb236bf5f9b58

diff --git a/net-misc/rsync/rsync-3.2.5_pre1.ebuild 
b/net-misc/rsync/rsync-3.2.5_pre1.ebuild
new file mode 100644
index ..f5a0cad3ef74
--- /dev/null
+++ b/net-misc/rsync/rsync-3.2.5_pre1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit flag-o-matic prefix python-single-r1 systemd
+
+DESCRIPTION="File transfer program to keep remote files into sync"
+HOMEPAGE="https://rsync.samba.org/;
+if [[ ${PV} == * ]] ; then
+   EGIT_REPO_URI="https://github.com/WayneD/rsync.git;
+   inherit autotools git-r3
+
+   REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+else
+   
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/waynedavison.asc
+   inherit verify-sig
+
+   if [[ ${PV} == *_pre* ]] ; then
+   SRC_DIR="src-previews"
+   else
+   SRC_DIR="src"
+   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
+
+   SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
+   verify-sig? ( 
https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )"
+   S="${WORKDIR}"/${P/_/}
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl examples iconv ipv6 lz4 ssl stunnel system-zlib xattr xxhash zstd"
+REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="acl? ( virtual/acl )
+   examples? (
+   ${PYTHON_DEPS}
+   dev-lang/perl
+   )
+   lz4? ( app-arch/lz4 )
+   ssl? ( dev-libs/openssl:0= )
+   system-zlib? ( sys-libs/zlib )
+   xattr? ( kernel_linux? ( sys-apps/attr ) )
+   xxhash? ( dev-libs/xxhash )
+   zstd? ( >=app-arch/zstd-1.4 )
+   >=dev-libs/popt-1.5
+   iconv? ( virtual/libiconv )"
+DEPEND="${RDEPEND}"
+BDEPEND="examples? ( ${PYTHON_DEPS} )"
+
+if [[ ${PV} == * ]] ; then
+   BDEPEND+=" ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/commonmark[${PYTHON_USEDEP}]
+   ')"
+else
+   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )"
+fi
+
+pkg_setup() {
+   # - USE=examples needs Python itself at runtime, but nothing else
+   # -  needs commonmark at build time
+   if [[ ${PV} == * ]] || use examples ; then
+   python-single-r1_pkg_setup
+   fi
+}
+
+src_prepare() {
+   default
+
+   if [[ ${PV} == * ]] ; then
+   eaclocal -I m4
+   eautoconf -o configure.sh
+   eautoheader && touch config.h.in
+   fi
+}
+
+src_configure() {
+   # 

[gentoo-commits] repo/gentoo:master commit in: x11-libs/libva-intel-media-driver/

2022-08-01 Thread Matt Turner
commit: 2072a81c8a2bdc4e68ef603a9e65f62c36e8726a
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Aug  2 01:36:52 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Aug  2 01:56:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2072a81c

x11-libs/libva-intel-media-driver: Version bump to 22.5.1

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

 x11-libs/libva-intel-media-driver/Manifest |  1 +
 .../libva-intel-media-driver-22.5.1.ebuild | 55 ++
 2 files changed, 56 insertions(+)

diff --git a/x11-libs/libva-intel-media-driver/Manifest 
b/x11-libs/libva-intel-media-driver/Manifest
index 67c96d667e8d..9ae233485f66 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -1,2 +1,3 @@
 DIST intel-media-22.4.3.tar.gz 27415572 BLAKE2B 
d4298d6195cfd160c3bbc0789e2bbdbfe4ffac2fe592b697d52320e60c62a542902d8610c1a1a41ce7f79bf80bce7ee386cfe8b8e4b10509066dff8e6b52deee
 SHA512 
9acf38fc0ffc65a7ef39570a31e9403600b1c6fe532a741ccdb26588e056a4bb0e5a53290942a026f4813b86db95d7d1eb3166682a889e482ac1645c6ce8aba4
 DIST intel-media-22.4.4.tar.gz 27437439 BLAKE2B 
63bee317ff12c34e7a2da9f5dce51ebb21708f8b5b3f3a58618f487e72f7826f0d4afa486bac08c2db8582d8a4774de716b5bb9a3dff93ff4fc266e56d434519
 SHA512 
e6ed669476e42396df7714732c628aa67d90fc8040c006605b754d70bdb7ecf476c5eb5c849a8647646dd3858c5fd469ba05f5c6b02b36d2211dc4f4cc7fa77f
+DIST intel-media-22.5.1.tar.gz 27432609 BLAKE2B 
37513b70097f73e717125637b149c923c2a51acd209c1e26f3d8f2e871f11f8dc4c85aeece473b9736ec56cf9cfd879dbbfe793d7ab689d5f13d54081cb1d890
 SHA512 
068c9e71b58087bb833444df1d79d41a8185e90170815c519ffe8cab8bd307893d7f79e3c287bab809dab3bd0bd0e54ecd215becf80ababa1df9f3b3ee2718c2

diff --git 
a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.5.1.ebuild 
b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.5.1.ebuild
new file mode 100644
index ..50a4289d1592
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.5.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == * ]] ; then
+   : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
+   if [[ ${PV%} != "" ]] ; then
+   : ${EGIT_BRANCH:="release/${PV%.}"}
+   fi
+   inherit git-r3
+else
+   MY_PV="${PV%_pre}"
+   
SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz;
+   S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
+   if [[ ${PV} != *_pre* ]] ; then
+   KEYWORDS="~amd64"
+   fi
+fi
+
+DESCRIPTION="Intel Media Driver for VA-API (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver;
+
+LICENSE="MIT BSD redistributable? ( no-source-code )"
+SLOT="0"
+IUSE="+redistributable test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-22.0.0:=
+   >=x11-libs/libva-2.14.0[X?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
+   "${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
+   "${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
+)
+
+src_configure() {
+   local mycmakeargs=(
+   -DMEDIA_BUILD_FATAL_WARNINGS=OFF
+   -DMEDIA_RUN_TEST_SUITE=$(usex test)
+   -DBUILD_TYPE=Release
+   -DPLATFORM=linux
+   -DUSE_X11=$(usex X)
+   -DENABLE_NONFREE_KERNELS=$(usex redistributable)
+   -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+   )
+   local CMAKE_BUILD_TYPE="Release"
+   cmake_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: app-misc/countrycodes/, app-misc/countrycodes/files/

2022-08-01 Thread Matt Turner
commit: d5b66c5fc3651bebeb0925789789e855f651852f
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Aug  2 01:26:28 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Aug  2 01:56:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5b66c5f

app-misc/countrycodes: Version bump to 1.0.6

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

 app-misc/countrycodes/Manifest   |  1 +
 app-misc/countrycodes/countrycodes-1.0.6.ebuild  | 29 
 app-misc/countrycodes/files/1.0.6-Makefile.patch | 35 
 3 files changed, 65 insertions(+)

diff --git a/app-misc/countrycodes/Manifest b/app-misc/countrycodes/Manifest
index aeb223a8e905..6820a770e307 100644
--- a/app-misc/countrycodes/Manifest
+++ b/app-misc/countrycodes/Manifest
@@ -1 +1,2 @@
 DIST countrycodes-1.0.5.tar.gz 18621 BLAKE2B 
1f2e1fb0f96d1388687929895c310e1e93c320f4d3f3f4cfe19c50d2ab850bafcefb5e13cfdaed546237ae5873eb95ae574ac47c0048bc2fa37c96158b5082fe
 SHA512 
d62beaaccdbc8f7e14f3edf0044aeeef6375a3deffc0e4246a49fb8209ed7256208c878f811950c5c3bfda729988a46c173aecec72ee66e8843932d97064f035
+DIST countrycodes-1.0.6.tar.gz 18834 BLAKE2B 
b5e0806618da0dd740a890b9c4d369cf2c44182515ec91aaa08a5e19da447635fb8536611a278ffcc419b506efa07df7e71bf5d520895a059c4aaa6e0cbc9b48
 SHA512 
be069593f60f785ef4d2e107340b941902a9c45d81ed04f8518a78f2be610ffdd1675da3da1d07271fc7ab736aabdd9f92f060d132e7b7b41310f1b653c53244

diff --git a/app-misc/countrycodes/countrycodes-1.0.6.ebuild 
b/app-misc/countrycodes/countrycodes-1.0.6.ebuild
new file mode 100644
index ..01499421f229
--- /dev/null
+++ b/app-misc/countrycodes/countrycodes-1.0.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="An ISO 3166 country code finder"
+HOMEPAGE="https://sourceforge.net/projects/countrycodes/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+PATCHES=( "${FILESDIR}"/${PV}-Makefile.patch )
+
+src_configure() {
+   tc-export CC
+}
+
+src_install() {
+   emake \
+   prefix="${ED}"/usr \
+   mandir="${ED}"/usr/share/man install
+   dosym iso3166 /usr/bin/countrycodes
+   dosym iso3166.1 /usr/share/man/man1/countrycodes
+   dodoc README
+}

diff --git a/app-misc/countrycodes/files/1.0.6-Makefile.patch 
b/app-misc/countrycodes/files/1.0.6-Makefile.patch
new file mode 100644
index ..051c02946230
--- /dev/null
+++ b/app-misc/countrycodes/files/1.0.6-Makefile.patch
@@ -0,0 +1,35 @@
+diff --git a/Makefile b/Makefile
+index b6e1323..b11a453 100644
+--- a/Makefile
 b/Makefile
+@@ -23,10 +23,9 @@ BINMODE=755
+ LOGDIRMODE=700
+ 
+ # Compiler to use
+-CC=gcc
+ 
+ # Compiler warnings
+-WARNINGS= -pedantic -Wall
++CFLAGS += -pedantic -Wall
+ 
+ # Compiler flags
+ CCOPTS = -O2 -fomit-frame-pointer
+@@ -58,7 +57,7 @@ PROGRAM = iso3166
+ all: $(PROGRAM)
+ 
+ $(PROGRAM): $(ISO3166OBJ)
+-  $(CC) $(CCOPTS) $(ISO3166OBJ) -o $@
++  $(CC) $(CFLAGS) $(LDFLAGS) $(ISO3166OBJ) -o $@
+ 
+ clean:
+   $(RM) $(ISO3166OBJ) core defines.h $(PROGRAM)
+@@ -79,9 +78,6 @@ uninstall:
+   $(RM) ${bindir}/$(PROGRAM)
+   $(RM) ${mandir}/iso3166.1
+ 
+-.c.o:
+-  $(CC) $(CCOPTS) $(WARNINGS) -c $<
+-
+ $(ISO3166OBJ): common.h defines.h protos.h tables.h
+ 
+ defines.h:



[gentoo-commits] repo/proj/guru:dev commit in: sci-misc/boinc-wrapper/, sci-misc/boinc-wrapper/files/

2022-08-01 Thread Yuan Liao
commit: 5e6b63452d4dba09353a0181b4d4df7c0fda2657
Author: Yuan Liao  gmail  com>
AuthorDate: Tue Aug  2 00:59:39 2022 +
Commit: Yuan Liao  gmail  com>
CommitDate: Tue Aug  2 01:00:37 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5e6b6345

sci-misc/boinc-wrapper: Add 7.20.2, drop 7.18.1

Following version bump of dependency sci-misc/boinc to 7.20.2, its old
7.18.1 version was dropped immediately, forcing this package to follow
suit at once.

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

 sci-misc/boinc-wrapper/Manifest   | 2 +-
 .../{boinc-wrapper-7.18.1.ebuild => boinc-wrapper-7.20.2.ebuild}  | 0
 ...-wrapper-7.18-makefile.patch => boinc-wrapper-7.20-makefile.patch} | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-misc/boinc-wrapper/Manifest b/sci-misc/boinc-wrapper/Manifest
index b9de5fbda..e3725d106 100644
--- a/sci-misc/boinc-wrapper/Manifest
+++ b/sci-misc/boinc-wrapper/Manifest
@@ -1 +1 @@
-DIST boinc-7.18.1.tar.gz 50851883 BLAKE2B 
64d321c8c56d7c34a08646dc16de5ddbb9b8e4be57b673fa77515845d967e28b5cf1fda677293e2fc8cf36a18ac0b7e7feebfbd8e434ebed41b8280c7395950d
 SHA512 
200587a0896aec6a7e7247132811141909aa333cb2bb9350c5ba016ffdf056413b1c5346361b311c087634b2d29cdbb204486385d8561a299b68739244c5a532
+DIST boinc-7.20.2.tar.gz 46555666 BLAKE2B 
4d11217739d341c5b61d86afa02eebdad80809f42caa3f6dea1d86ed53d79004d60fa362fd04d53060060472e108e0ee0aa0428e4799eb70f2e98f07dc1f39cd
 SHA512 
0309d5585ece96a5d9021058870dce9a96c89ece269650961a9b22d5219529e242a55dc1e466f5364535033198ca5c36496ca23125a9cda0c308bfdb4372abbb

diff --git a/sci-misc/boinc-wrapper/boinc-wrapper-7.18.1.ebuild 
b/sci-misc/boinc-wrapper/boinc-wrapper-7.20.2.ebuild
similarity index 100%
rename from sci-misc/boinc-wrapper/boinc-wrapper-7.18.1.ebuild
rename to sci-misc/boinc-wrapper/boinc-wrapper-7.20.2.ebuild

diff --git a/sci-misc/boinc-wrapper/files/boinc-wrapper-7.18-makefile.patch 
b/sci-misc/boinc-wrapper/files/boinc-wrapper-7.20-makefile.patch
similarity index 60%
rename from sci-misc/boinc-wrapper/files/boinc-wrapper-7.18-makefile.patch
rename to sci-misc/boinc-wrapper/files/boinc-wrapper-7.20-makefile.patch
index 58a9e766e..b0f84f18f 100644
--- a/sci-misc/boinc-wrapper/files/boinc-wrapper-7.18-makefile.patch
+++ b/sci-misc/boinc-wrapper/files/boinc-wrapper-7.20-makefile.patch
@@ -15,6 +15,6 @@
regexp_report.o
  
 -wrapper: wrapper.o $(MAKEFILE_STDLIB) $(BOINC_LIB_DIR)/libboinc.a 
$(BOINC_API_DIR)/libboinc_api.a $(REGEXP_OBJS)
--  $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o wrapper wrapper.o 
$(REGEXP_OBJS) $(MAKEFILE_LDFLAGS) -lboinc_api -lboinc -lboinc_zip $(STDCPPTC)
+-  $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(MINGW_WRAPPER_FLAGS) -o 
wrapper wrapper.o $(REGEXP_OBJS) $(MAKEFILE_LDFLAGS) $(MINGW_ZIP_FIX) 
-lboinc_api -lboinc -lboinc_zip $(MINGW_LIBS) $(STDCPPTC)
 +wrapper: wrapper.o $(REGEXP_OBJS)
-+  $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o wrapper wrapper.o 
$(REGEXP_OBJS) -lboinc_api -lboinc -lboinc_zip $(STDCPPTC)
++  $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(MINGW_WRAPPER_FLAGS) -o 
wrapper wrapper.o $(REGEXP_OBJS) $(MINGW_ZIP_FIX) -lboinc_api -lboinc 
-lboinc_zip $(MINGW_LIBS) $(STDCPPTC)



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

2022-08-01 Thread Craig Andrews
commit: 7fbd3026335b74eafc75dc4baa0157d08eb66a46
Author: Craig Andrews  gentoo  org>
AuthorDate: Tue Aug  2 00:47:48 2022 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Tue Aug  2 00:49:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fbd3026

www-apps/jellyfin: add 10.8.3

Signed-off-by: Craig Andrews  gentoo.org>

 www-apps/jellyfin/Manifest   |  2 ++
 www-apps/jellyfin/jellyfin-10.8.3.ebuild | 57 
 2 files changed, 59 insertions(+)

diff --git a/www-apps/jellyfin/Manifest b/www-apps/jellyfin/Manifest
index 6a6ad79f795f..cc3807d0cb67 100644
--- a/www-apps/jellyfin/Manifest
+++ b/www-apps/jellyfin/Manifest
@@ -1,2 +1,4 @@
 DIST jellyfin_10.8.1_amd64.tar.gz 99055788 BLAKE2B 
1e4be154cfa4982e4f2a9f33b17e23dae3ed888b49c993a0f9dded2267904e41195c0dd0d9b2a47ac8bc10d7d4f45a52141d922e8a1b3348e29cba7e60a9d64c
 SHA512 
ac755137c1859b7b322ff2369d92ebe98757a53c58fa49b9fd178a0b703d829d6c254f4e94a27a7b36b44b92e8b003d86a97cf55e620cd58008f89775f7e4cb4
 DIST jellyfin_10.8.1_arm64.tar.gz 95977557 BLAKE2B 
ecaee96df0e8f01cb31b08b7e3c55d4d906e9dbdada28353ea6653d1f365fa41d68ccc87e26b528d6b25c60b9ae3fc1a31823f7b6f661d12609c7e01bac8eff7
 SHA512 
4ed2748d5efd9fc18a2a4a0c4da24c24e33eb7962441c2864117d31ac1a952639dcc7968f3ff492015f7f1d9d054e93716f745527ca48778f6fdf91cef79e95f
+DIST jellyfin_10.8.3_amd64.tar.gz 99057856 BLAKE2B 
5ec1a2ddeedeb7ef0f6c275501ff17e5e11e2c22b66b6a5fc6c07c3ed5d59ef9c9f43e5b6b235a2ec3185bc6c6a31d2378d34c309705c27125088079fdf82486
 SHA512 
c09cc8ccce37bea3795243f7481f3cd4585285137c7cc170cf44e5ab1a9b6481115e43dbd5db839236ff02265c35c79fff7a0ea5580039e75a7f6b5f8c5aa921
+DIST jellyfin_10.8.3_arm64.tar.gz 62111744 BLAKE2B 
b5affe419caf8ce5bce6939926296d9c5d06c45a8e8bacf6a6315adc2549ba921659a8b1c11c0bb3d0b034db97d8b4d943c0690489ce6b28d41debe92a13d1d8
 SHA512 
3923829902363fb48a056b451ac143e5380b1ae5c74a88e3b40a430e019e299bab1f9fb9e86ae9eb5a72f8deb9d0c7c6f4d16610b249ef66c501b02fc3c16416

diff --git a/www-apps/jellyfin/jellyfin-10.8.3.ebuild 
b/www-apps/jellyfin/jellyfin-10.8.3.ebuild
new file mode 100644
index ..dd242eb3b144
--- /dev/null
+++ b/www-apps/jellyfin/jellyfin-10.8.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="Jellyfin puts you in control of managing and streaming your media"
+HOMEPAGE="https://jellyfin.readthedocs.io/en/latest/;
+
+SRC_URI="
+   arm64? (
+   
https://repo.jellyfin.org/releases/server/linux/versions/stable/combined/${PV}/${PN}_${PV}_arm64.tar.gz
+   
https://repo.jellyfin.org/archive/linux/stable/${PV}/combined/${PN}_${PV}_arm64.tar.gz
+   )
+   amd64? (
+   
https://repo.jellyfin.org/releases/server/linux/versions/stable/combined/${PV}/${PN}_${PV}_amd64.tar.gz
+   
https://repo.jellyfin.org/archive/linux/stable/${PV}/combined/${PN}_${PV}_amd64.tar.gz
+   )"
+
+RESTRICT="mirror test"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+DEPEND="acct-user/jellyfin"
+RDEPEND="${DEPEND}
+   media-video/ffmpeg[vpx,x264]"
+BDEPEND="acct-user/jellyfin"
+INST_DIR="/opt/${PN}"
+QA_PREBUILT="${INST_DIR#/}/*.so ${INST_DIR#/}/jellyfin 
${INST_DIR#/}/createdump"
+
+src_unpack() {
+   unpack ${A}
+   mv ${PN}_${PV} ${P} || die
+}
+
+src_prepare() {
+   default
+
+   # https://github.com/jellyfin/jellyfin/issues/7471
+   # https://github.com/dotnet/runtime/issues/57784
+   rm libcoreclrtraceptprovider.so || die
+}
+
+src_install() {
+   keepdir /var/log/jellyfin
+   fowners jellyfin:jellyfin /var/log/jellyfin
+   keepdir /etc/jellyfin
+   fowners jellyfin:jellyfin /etc/jellyfin
+   insinto ${INST_DIR}
+   dodir ${INST_DIR}
+   doins -r "${S}"/*
+   chmod 755 "${D}${INST_DIR}/jellyfin"
+   newinitd "${FILESDIR}/${PN}.init-r1" "${PN}"
+   newconfd "${FILESDIR}"/${PN}.confd "${PN}"
+   systemd_dounit "${FILESDIR}/${PN}.service"
+}



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

2022-08-01 Thread Yuan Liao
commit: 0f26b8047cb13c66bd6b0562e4bd4e0b6f34111c
Author: Yuan Liao  gmail  com>
AuthorDate: Tue Aug  2 00:30:19 2022 +
Commit: Yuan Liao  gmail  com>
CommitDate: Tue Aug  2 00:30:23 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0f26b804

app-admin/customrescuecd-x86_64: Restore removed Manifest for 0.12.7

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

 app-admin/customrescuecd-x86_64/Manifest | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-admin/customrescuecd-x86_64/Manifest 
b/app-admin/customrescuecd-x86_64/Manifest
index 990e5520c..3fb03bbb2 100644
--- a/app-admin/customrescuecd-x86_64/Manifest
+++ b/app-admin/customrescuecd-x86_64/Manifest
@@ -1 +1,2 @@
+DIST CUSTOMRESCUECD-x86_64-0.12.7.iso 1656078336 BLAKE2B 
d3d23f3cd3beae62c5e9053533372426dcaed7b3a655fced37c21fd14127445f49679f6bc9db706d403a37b86331a78c6ccddcf55199985600f0f90b50498682
 SHA512 
03f397c21979e488cce4a75f33eca5acb7ae4231887744ba9c0826d8f0340b84d908a343181ca3412c74ae7750f4b510d42f5ff198d44240a8dc302e924f0a26
 DIST CUSTOMRESCUECD-x86_64-0.12.8.iso 1682915328 BLAKE2B 
712c2d54fc785576f34c5c4051ef0662010b576fc32365ca56c2aee12ba27b7419b80e8713f1b84726dfa3104593e39c86950936eaecebe5168d4862776665fc
 SHA512 
d709600cd5300a10a6a8fee99aebfa6e82e387747c3e105a12b849003eccd5bac0a9d9a0f51d45b2a9f3f203a9a36915d2beb60ff51a4cae3d230d29007f43d8



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

2022-08-01 Thread Yuan Liao
commit: fb061079aed4b1b1405c38f3ec3cd47b22b8fd8c
Author: Yuan Liao  gmail  com>
AuthorDate: Tue Aug  2 00:07:25 2022 +
Commit: Yuan Liao  gmail  com>
CommitDate: Tue Aug  2 00:17:46 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fb061079

games-emulation/dosbox-x: Add 2022.08.0

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

 games-emulation/dosbox-x/Manifest  |   1 +
 games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild | 205 +
 2 files changed, 206 insertions(+)

diff --git a/games-emulation/dosbox-x/Manifest 
b/games-emulation/dosbox-x/Manifest
index b6ecb3b67..8727cde70 100644
--- a/games-emulation/dosbox-x/Manifest
+++ b/games-emulation/dosbox-x/Manifest
@@ -1 +1,2 @@
 DIST dosbox-x-v0.84.1.tar.gz 67617800 BLAKE2B 
b7a93ac662d987f99884078fa8a2b566c8aef691861cd8b8270698470cef70e352616970e46439664eedb37b11f673a3cf7d253e45ed756e28740dd06080fffc
 SHA512 
2104352f5756fa394c6a38f6b82694e4b17878b87d64cb67aeeb8ef9f9cf12cadfc8cd23b4626bbb59b8f0657ae6747633ac80016df511b7d9612245b32d21ca
+DIST dosbox-x-windows-v2022.08.0.tar.gz 67809452 BLAKE2B 
d0d8c6b6b328b363ea939de93e920ce33b260f4f986be50028c4a2e188c292be38c256bed7b0d6e052bf2b74600ece662f05b16943e90fbd44e48e2c6b4bc3cc
 SHA512 
d11b907ff99e8599b454dc5979055dd85a64215913cb905c66d534930ce31afaab14d04169450eef5cb286c65933159f44be6cecad6adf6c7adad1a249758d7b

diff --git a/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild 
b/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild
new file mode 100644
index 0..8605437e9
--- /dev/null
+++ b/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild
@@ -0,0 +1,205 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs xdg
+
+if [[ "${PV}" ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/joncampbell123/dosbox-x.git;
+else
+   
SRC_URI="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-windows-v${PV}.tar.gz;
+   S="${WORKDIR}/${PN}-${PN}-windows-v${PV}"
+   KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Complete, accurate DOS emulator forked from DOSBox"
+HOMEPAGE="https://dosbox-x.com/;
+
+# Stay consistent with games-emulation/dosbox::gentoo even though source file
+# headers specify the GPL version to be "either version 2 of the License, or
+# (at your option) any later version."  The same header is used in both the
+# DOSBox source tree and the DOSBox-X source tree.
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="X debug ffmpeg fluidsynth freetype opengl png slirp"
+
+BDEPEND="
+   dev-lang/nasm
+   sys-libs/libcap
+"
+
+# Unconditionally pulling in automagically-enabled optional dependencies:
+# - media-libs/alsa-lib
+# - media-libs/sdl2-net
+# - net-libs/libpcap
+#
+# With media-libs/libsdl2[-X,wayland], this package does work on a Wayland
+# desktop, but (at least on GNOME) the program does not launch in a movable
+# and resizable window; whereas with media-libs/libsdl2[X], it does.  Thus,
+# unconditionally require media-libs/libsdl2[X] for better user experience.
+RDEPEND="
+   media-libs/alsa-lib
+   media-libs/libsdl2[X,opengl?,sound,threads,video]
+   media-libs/sdl2-net
+   net-libs/libpcap
+   sys-libs/zlib
+   X? (
+   x11-libs/libX11
+   x11-libs/libXrandr
+   x11-libs/libxkbfile
+   )
+   debug? ( sys-libs/ncurses:= )
+   ffmpeg? ( media-video/ffmpeg:= )
+   fluidsynth? ( media-sound/fluidsynth:= )
+   freetype? ( media-libs/freetype )
+   opengl? ( media-libs/libglvnd[X] )
+   png? ( media-libs/libpng:= )
+   slirp? ( net-libs/libslirp )
+"
+
+DEPEND="
+   ${RDEPEND}
+"
+
+pkg_pretend() {
+   if use ffmpeg && use !png; then
+   ewarn "Setting the 'ffmpeg' USE flag when the 'png' USE flag is"
+   ewarn "unset does not have any effect.  Unsetting the 'png' USE"
+   ewarn "flag disables the video capture feature, so additional"
+   ewarn "video capture formats enabled by the 'ffmpeg' USE flag"
+   ewarn "will end up being unused."
+   fi
+}
+
+src_prepare() {
+   default
+
+   # Patch command lines like the following in Makefile.am:
+   #   -test -x /usr/sbin/setcap && setcap cap_net_raw=ep 
$(DESTDIR)$(bindir)/dosbox-x
+   #
+   # The purpose of these commands is, if the 'setcap' program exists and 
is
+   # executable, then invoke it to set capabilities required by the PCAP
+   # networking back-end for better out-of-box user experience; otherwise,
+   # ignore unsatisfied preconditions or 'setcap' errors since they are not
+   # critical, which is achieved by having a '-' in front of each line.
+   #
+   # Unfortunately, 'test -x /usr/sbin/setcap' does not always work as
+   # expected on Gentoo because it ignores the fact that some 
distributions,
+   # including Gentoo, may still 

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

2022-08-01 Thread Yuan Liao
commit: 2cc33e23ef455f21d01b9627d058a027e414d99f
Author: Yuan Liao  gmail  com>
AuthorDate: Tue Aug  2 00:23:30 2022 +
Commit: Yuan Liao  gmail  com>
CommitDate: Tue Aug  2 00:23:30 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2cc33e23

gnome-extra/extension-manager: Drop 0.2.3, 0.3.0

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

 gnome-extra/extension-manager/Manifest |  2 -
 .../extension-manager-0.2.3.ebuild | 67 ---
 .../extension-manager-0.3.0.ebuild | 75 --
 3 files changed, 144 deletions(-)

diff --git a/gnome-extra/extension-manager/Manifest 
b/gnome-extra/extension-manager/Manifest
index 578ee4c64..763090315 100644
--- a/gnome-extra/extension-manager/Manifest
+++ b/gnome-extra/extension-manager/Manifest
@@ -1,3 +1 @@
-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
 DIST extension-manager-0.3.1.tar.gz 1441120 BLAKE2B 
bd1f6ac1a30521d7ff209c556bcc4ce0103666b9740aa982f0e1a7727b40106df482b693ece920a7449a634955984fa363e217a6b7d14fa0861effe27490824c
 SHA512 
fd434baf0889fcf20a41be71d8bbe6d82aed0baff989747d4da3e8c0ae04a90b6b0b8ad54eede28f266250ca94db8711f35f6a6aa90ceb23195d3460bbd8f1ca

diff --git a/gnome-extra/extension-manager/extension-manager-0.2.3.ebuild 
b/gnome-extra/extension-manager/extension-manager-0.2.3.ebuild
deleted file mode 100644
index 561186b6b..0
--- a/gnome-extra/extension-manager/extension-manager-0.2.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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]
-   net-libs/libsoup:3.0
-"
-
-DEPEND="
-   ${RDEPEND}
-"
-
-# 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
-}

diff --git a/gnome-extra/extension-manager/extension-manager-0.3.0.ebuild 
b/gnome-extra/extension-manager/extension-manager-0.3.0.ebuild
deleted file mode 100644
index a2705683e..0
--- a/gnome-extra/extension-manager/extension-manager-0.3.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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
-"
-

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

2022-08-01 Thread Yuan Liao
commit: dc6f7122c02df39b7ddeb4483cc61ee5ab3f629f
Author: Yuan Liao  gmail  com>
AuthorDate: Tue Aug  2 00:22:54 2022 +
Commit: Yuan Liao  gmail  com>
CommitDate: Tue Aug  2 00:22:54 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dc6f7122

games-emulation/dosbox-x: Sync live ebuild

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

 games-emulation/dosbox-x/dosbox-x-.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/games-emulation/dosbox-x/dosbox-x-.ebuild 
b/games-emulation/dosbox-x/dosbox-x-.ebuild
index 052e563f5..8605437e9 100644
--- a/games-emulation/dosbox-x/dosbox-x-.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-.ebuild
@@ -9,8 +9,8 @@ if [[ "${PV}" ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/joncampbell123/dosbox-x.git;
 else
-   
SRC_URI="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-v${PV}.tar.gz;
-   S="${WORKDIR}/${PN}-${PN}-v${PV}"
+   
SRC_URI="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-windows-v${PV}.tar.gz;
+   S="${WORKDIR}/${PN}-${PN}-windows-v${PV}"
KEYWORDS="~amd64"
 fi
 
@@ -106,7 +106,7 @@ src_prepare() {
 src_configure() {
local myconf=(
# --disable-core-inline could cause compiler errors
-   # as of v0.84.1, so enable it unconditionally
+   # as of v2022.08.0, so enable it unconditionally
--enable-core-inline
 
# Always use SDL 2, even though the package provides the option 
to
@@ -118,7 +118,7 @@ src_configure() {
--enable-sdl2
 
# Explicitly enable ALSA MIDI support, same as default.  As of
-   # v0.84.1, even when it is disabled, media-libs/alsa-lib will
+   # v2022.08.0, even when it is disabled, media-libs/alsa-lib will
# still be automagically linked if it is present in the build
# environment (presumably for other components of this package),
# so the dependency cannot be made optional by disabling this



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

2022-08-01 Thread Sam James
commit: 0693a3b58cd9a217b11f6a3f09fd635f88e661c5
Author: orbea  riseup  net>
AuthorDate: Sun Jul 10 22:22:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug  2 00:21:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0693a3b5

sys-kernel/genkernel: Fix utils build with slibtool

Bug: https://bugs.gentoo.org/836012
Upstream-PR: https://github.com/gentoo/genkernel/pull/33
Closes: https://github.com/gentoo/gentoo/pull/26333
Signed-off-by: Sam James  gentoo.org>

 .../genkernel/files/genkernel-4.2.6-slibtool.patch | 106 +++
 sys-kernel/genkernel/genkernel-4.2.6-r7.ebuild | 327 +
 2 files changed, 433 insertions(+)

diff --git a/sys-kernel/genkernel/files/genkernel-4.2.6-slibtool.patch 
b/sys-kernel/genkernel/files/genkernel-4.2.6-slibtool.patch
new file mode 100644
index ..0f0bd2619ae2
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.2.6-slibtool.patch
@@ -0,0 +1,106 @@
+Bug: https://bugs.gentoo.org/836012
+Upstream-PR: https://github.com/gentoo/genkernel/pull/33
+
+From 1bb3cc10d51026ad500bc9cec883f1f2f0c445ec Mon Sep 17 00:00:00 2001
+From: orbea 
+Date: Sun, 15 May 2022 15:49:21 -0700
+Subject: [PATCH 1/3] gen_funcs: Add an install_exe function
+
+This helps when the build uses slibtool where the compiled binary output
+path differs from GNU libtool.
+
+Signed-off-by: orbea 
+---
+ gen_funcs.sh | 23 +++
+ 1 file changed, 23 insertions(+)
+
+diff --git a/gen_funcs.sh b/gen_funcs.sh
+index 500caf2d..a4dc0e44 100755
+--- a/gen_funcs.sh
 b/gen_funcs.sh
+@@ -1974,6 +1974,29 @@ check_distfiles() {
+   fi
+ }
+ 
++# @FUNCTION: install_exe
++# @USAGE:  
++# @DESCRIPTION:
++# Finds an executable binary file and installs it in cases where there may be
++# similarly named shell wrapper scripts. This happens when GNU libtool creates
++# an executable named 'foo' while slibtool creates '.libs/foo' and 'foo' is a
++# shell script that should not be installed.
++install_exe() {
++  local file="${1##*/}"
++  local dest="${2}"
++
++  local dir
++  [[ "${1%/*}" == "${file}" ]] || dir="${1%/*}/"
++
++  [[ -f "${dir}${file}" ]] || gen_die "File '${dir}${file}' does not 
exist!"
++
++  # Ensure only the binaries are installed and not a similarly named 
wrapper script
++  find "${S}/${dir}" -type f -name "${file}" -print0 |
++  xargs -0 file | grep executable | grep ELF | cut -f 1 -d : |
++  xargs -I '{}' cp -a '{}' "${dest}" ||
++  gen_die "Failed to copy '${S}/${dir}${file}' to '${dest}'!"
++}
++
+ # @FUNCTION: expand_file
+ # @USAGE: 
+ # @DESCRIPTION:
+
+From cfc9ff455e2473e4322bd18c5fa21370d9c0702e Mon Sep 17 00:00:00 2001
+From: orbea 
+Date: Thu, 24 Mar 2022 11:43:40 -0700
+Subject: [PATCH 2/3] gkbuild/util-linux: Install the correct binaries with
+ slibtool
+
+Signed-off-by: orbea 
+---
+ gkbuilds/util-linux.gkbuild | 7 ++-
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/gkbuilds/util-linux.gkbuild b/gkbuilds/util-linux.gkbuild
+index 40ea1fbb..5addbb1d 100644
+--- a/gkbuilds/util-linux.gkbuild
 b/gkbuilds/util-linux.gkbuild
+@@ -47,11 +47,8 @@ src_install() {
+ 
+   mkdir "${D}"/sbin || die "Failed to create '${D}/sbin'!"
+ 
+-  cp -a blkid.static "${D}"/sbin/blkid \
+-  || die "Failed to copy '${S}/blkid.static' to 
'${D}/sbin/blkid'!"
+-
+-  cp -a switch_root "${D}"/sbin/switch_root \
+-  || die "Failed to copy '${S}/switch_root' to 
'${D}/sbin/switch_root'!"
++  install_exe 'blkid.static' "${D}"/sbin/blkid
++  install_exe 'switch_root' "${D}"/sbin/switch_root
+ 
+   local sbin
+   for sbin in \
+
+From 2d2e91f288679e272f731917feb58f3768ea586d Mon Sep 17 00:00:00 2001
+From: orbea 
+Date: Thu, 24 Mar 2022 13:17:07 -0700
+Subject: [PATCH 3/3] gkbuild/cryptsetup: Install the correct binaries with
+ slibtool
+
+Signed-off-by: orbea 
+---
+ gkbuilds/cryptsetup.gkbuild | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/gkbuilds/cryptsetup.gkbuild b/gkbuilds/cryptsetup.gkbuild
+index 007874d1..816df609 100644
+--- a/gkbuilds/cryptsetup.gkbuild
 b/gkbuilds/cryptsetup.gkbuild
+@@ -34,8 +34,7 @@ src_install() {
+   "${D}"/sbin/* \
+   "${D}"/usr/share/
+ 
+-  cp -a cryptsetup.static "${D}"/sbin/cryptsetup \
+-  || die "Failed to copy '${S}/cryptsetup.static' to 
'${D}/sbin/cryptsetup'!"
++  install_exe 'cryptsetup.static' "${D}"/sbin/cryptsetup
+ 
+   "${STRIP}" --strip-all "${D}"/sbin/cryptsetup \
+   || die "Failed to strip '${D}/sbin/cryptsetup'!"

diff --git a/sys-kernel/genkernel/genkernel-4.2.6-r7.ebuild 
b/sys-kernel/genkernel/genkernel-4.2.6-r7.ebuild
new file mode 100644
index ..ac31e20d2652
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-4.2.6-r7.ebuild
@@ -0,0 +1,327 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the 

[gentoo-commits] repo/gentoo:master commit in: app-antivirus/lkrg/files/, app-antivirus/lkrg/

2022-08-01 Thread John Helmert III
commit: 9aeb2ca2681cbcd0d833258db3136a4bb78d03f3
Author: John Helmert III  gentoo  org>
AuthorDate: Mon Aug  1 23:43:52 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Mon Aug  1 23:43:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9aeb2ca2

app-antivirus/lkrg: drop 0.9.2, 0.9.3

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

 app-antivirus/lkrg/Manifest|  4 ---
 ...lkrg-0.9.2-systemd-coredump-umh-whitelist.patch | 23 -
 app-antivirus/lkrg/lkrg-0.9.2.ebuild   | 40 --
 app-antivirus/lkrg/lkrg-0.9.3.ebuild   | 38 
 4 files changed, 105 deletions(-)

diff --git a/app-antivirus/lkrg/Manifest b/app-antivirus/lkrg/Manifest
index 8ae90d4fcc3f..36e4ce6cc08f 100644
--- a/app-antivirus/lkrg/Manifest
+++ b/app-antivirus/lkrg/Manifest
@@ -1,7 +1,3 @@
-DIST lkrg-0.9.2.tar.gz 125976 BLAKE2B 
c3da2d4599c9dd5b7d6fbec426fd93d802715f6c8566471f82c8f1c7d31621ebb4a2cc4c285d076aad6a6ee6b1bb790debbb365cfc6220192df049ac1d3c67a9
 SHA512 
5fec807618817bcb516e1a6779def6979badbdac6fe9b38fcce8425a0c7ebe3fb55c05d3080d8cac2d67cac6e8b7d2d77b3a1be450227299e2a02a311e223331
-DIST lkrg-0.9.2.tar.gz.sign 801 BLAKE2B 
0cd8b18c8a0fbcca61ffa868b406d048461ddf9189fb08f15faa45e01b8731906a6b14105dfcf92bb5124373860f6695594063ee8d138c94c70adf471bc15e0a
 SHA512 
18b547ca84a7fd2957484857e17983408e92fd005d58b77b399c5156ecb09fc5e9e6c910337654a2655883d103098c1769b1993017eec753bd21e63d6491ad04
-DIST lkrg-0.9.3.tar.gz 127986 BLAKE2B 
5d059247c9a8a5abe4795d22b3806544dbb4c332947012ec33ceace27747663375acf68a4e859fae293eead5f7d9540b4261d3fef149d1e5c6ee8714a2df28d6
 SHA512 
9b441b93ff28b733afc513643a5d843c1707ac5a05adb359a3142b9ca7cba6a4790ebca4f9e6ca88a6ddf61f2b06aa242e02f288e9295e74999ed534794fb45d
-DIST lkrg-0.9.3.tar.gz.sign 801 BLAKE2B 
c054522f281d09a008821f92c7b43b5384241100c68ef0b0ea7171b8c492772a5d668b425089e1aac990bf6a675215dd5861f3f2598995e31a8db82a8b2ec7e9
 SHA512 
87c2bfe8d342b85f3c6c8226be5b698527a507369603a03eefead89ea8635b5ba95f3cbbe1d84cd77ac42bb8a773a7133917e0c87132b4851ff4017f77bc683a
 DIST lkrg-0.9.4.tar.gz 127462 BLAKE2B 
4085d517e0a6360739a031e8afe4540354d35a8a59d33c96900c2def0c80bf81bef76b84322bb4beca649917693fd6a121ce81ba8caf652adbe406757729083d
 SHA512 
7dd88a3071bbc7a1e6ca725a339f8a93544bf97f1b73e6a4b424895810a4f094d056b644120ad6df14650cd7e5678a356063b1e40113d770e059a7ca4d3e461c
 DIST lkrg-0.9.4.tar.gz.sign 801 BLAKE2B 
eb7c6f1aa925f73bbec7cad5da9f6676b3b6b2691151455ff240f8c6af844f61478df7050b73d3144877b2ad64bf9a25e13e8ea9fcbaf85988c02438b82893ab
 SHA512 
6bec0699b15ba42dc7a7afc18a91d77668b3404b9e069db69634ff1e1af33b96eb4ffa5e25ce46cd012acdfdce7535d3cd2eb05ac55ae3bb4134f27f45712ce8
 DIST lkrg-0.9.5.tar.gz 128061 BLAKE2B 
2b8a462033123e310761f84e1ab9e6c914c34a437957566f9a054a625aca2e90aea8c00673b67e178b98b27078f71870f16a7308b38a8e5506cc421af3065648
 SHA512 
ae735f14bcb92e964a2a1d4cf11f44d8589ebf7b09634799ce38f2b27e9df9eb53e6dc00818df743a20de947ea402dcdcd8bee274b0954addf742547333d939a

diff --git 
a/app-antivirus/lkrg/files/lkrg-0.9.2-systemd-coredump-umh-whitelist.patch 
b/app-antivirus/lkrg/files/lkrg-0.9.2-systemd-coredump-umh-whitelist.patch
deleted file mode 100644
index 438784aff16e..
--- a/app-antivirus/lkrg/files/lkrg-0.9.2-systemd-coredump-umh-whitelist.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 7939aa03e00e7e48781d405743e2f2d31fca113b
-Author: John Helmert III 
-Date:   Fri Jan 7 01:46:35 2022 -0600
-
-Add non-usr-merged systemd-coredump to UMH whitelist
-
-Some distributions haven't merged /usr yet, so add the alternative
-path for systemd-coredump.
-
-Signed-off-by: John Helmert III 
-
-diff --git 
a/src/modules/exploit_detection/syscalls/p_call_usermodehelper/p_call_usermodehelper.c
 
b/src/modules/exploit_detection/syscalls/p_call_usermodehelper/p_call_usermodehelper.c
-index ac2a737..7387135 100644
 
a/src/modules/exploit_detection/syscalls/p_call_usermodehelper/p_call_usermodehelper.c
-+++ 
b/src/modules/exploit_detection/syscalls/p_call_usermodehelper/p_call_usermodehelper.c
-@@ -45,6 +45,7 @@ static const char * const p_umh_global[] = {
-"/etc/acpi/events/RadioPower.sh",
-"/etc/acpi/wireless-rtl-ac-dc-power.sh",
-"/lib/systemd/systemd-cgroups-agent",
-+   "/lib/systemd/systemd-coredump",
-"/sbin/bridge-stp",
-"/sbin/critical_overtemp",
-"/sbin/drbdadm",

diff --git a/app-antivirus/lkrg/lkrg-0.9.2.ebuild 
b/app-antivirus/lkrg/lkrg-0.9.2.ebuild
deleted file mode 100644
index 17e26904008f..
--- a/app-antivirus/lkrg/lkrg-0.9.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod linux-info verify-sig
-
-DESCRIPTION="Linux Kernel Runtime Guard"
-HOMEPAGE="https://lkrg.org;
-SRC_URI="https://lkrg.org/download/${P}.tar.gz
-   verify-sig? ( 

[gentoo-commits] repo/gentoo:master commit in: app-antivirus/lkrg/

2022-08-01 Thread John Helmert III
commit: dea96286e16828d3200ecb3f42881f441e6eb8a4
Author: John Helmert III  gentoo  org>
AuthorDate: Mon Aug  1 23:42:19 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Mon Aug  1 23:42:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dea96286

app-antivirus/lkrg: add 0.9.5

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

 app-antivirus/lkrg/Manifest  |  2 ++
 app-antivirus/lkrg/lkrg-0.9.5.ebuild | 50 
 2 files changed, 52 insertions(+)

diff --git a/app-antivirus/lkrg/Manifest b/app-antivirus/lkrg/Manifest
index 442417aab4b3..8ae90d4fcc3f 100644
--- a/app-antivirus/lkrg/Manifest
+++ b/app-antivirus/lkrg/Manifest
@@ -4,3 +4,5 @@ DIST lkrg-0.9.3.tar.gz 127986 BLAKE2B 
5d059247c9a8a5abe4795d22b3806544dbb4c33294
 DIST lkrg-0.9.3.tar.gz.sign 801 BLAKE2B 
c054522f281d09a008821f92c7b43b5384241100c68ef0b0ea7171b8c492772a5d668b425089e1aac990bf6a675215dd5861f3f2598995e31a8db82a8b2ec7e9
 SHA512 
87c2bfe8d342b85f3c6c8226be5b698527a507369603a03eefead89ea8635b5ba95f3cbbe1d84cd77ac42bb8a773a7133917e0c87132b4851ff4017f77bc683a
 DIST lkrg-0.9.4.tar.gz 127462 BLAKE2B 
4085d517e0a6360739a031e8afe4540354d35a8a59d33c96900c2def0c80bf81bef76b84322bb4beca649917693fd6a121ce81ba8caf652adbe406757729083d
 SHA512 
7dd88a3071bbc7a1e6ca725a339f8a93544bf97f1b73e6a4b424895810a4f094d056b644120ad6df14650cd7e5678a356063b1e40113d770e059a7ca4d3e461c
 DIST lkrg-0.9.4.tar.gz.sign 801 BLAKE2B 
eb7c6f1aa925f73bbec7cad5da9f6676b3b6b2691151455ff240f8c6af844f61478df7050b73d3144877b2ad64bf9a25e13e8ea9fcbaf85988c02438b82893ab
 SHA512 
6bec0699b15ba42dc7a7afc18a91d77668b3404b9e069db69634ff1e1af33b96eb4ffa5e25ce46cd012acdfdce7535d3cd2eb05ac55ae3bb4134f27f45712ce8
+DIST lkrg-0.9.5.tar.gz 128061 BLAKE2B 
2b8a462033123e310761f84e1ab9e6c914c34a437957566f9a054a625aca2e90aea8c00673b67e178b98b27078f71870f16a7308b38a8e5506cc421af3065648
 SHA512 
ae735f14bcb92e964a2a1d4cf11f44d8589ebf7b09634799ce38f2b27e9df9eb53e6dc00818df743a20de947ea402dcdcd8bee274b0954addf742547333d939a
+DIST lkrg-0.9.5.tar.gz.sign 801 BLAKE2B 
126796abbfe30914910634a31699bc1a2f3889c3569e79610a802a6a6312fda0e388552932bcdc58f9366f790a14c139bafe4443de4ad3dfd66003c3d75f4c71
 SHA512 
b1ef470962ce45f01d8f26d057ba8fff794c72cbf93cd1559af138a4fa82ebd80c127536c1d50a96365c433246c832f18f2924584bf533f8dcd247d1d38090a8

diff --git a/app-antivirus/lkrg/lkrg-0.9.5.ebuild 
b/app-antivirus/lkrg/lkrg-0.9.5.ebuild
new file mode 100644
index ..121872fefc44
--- /dev/null
+++ b/app-antivirus/lkrg/lkrg-0.9.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-mod linux-info systemd verify-sig
+
+DESCRIPTION="Linux Kernel Runtime Guard"
+HOMEPAGE="https://lkrg.org;
+SRC_URI="https://lkrg.org/download/${P}.tar.gz
+   verify-sig? ( https://lkrg.org/download/${P}.tar.gz.sign )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-openwall )"
+
+MODULE_NAMES="lkrg(misc:${S}:${S})"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/openwall.asc"
+
+PATCHES=( "${FILESDIR}/${PN}-0.9.4-gentoo-paths.patch" )
+
+pkg_setup() {
+   CONFIG_CHECK="HAVE_KRETPROBES KALLSYMS_ALL KPROBES JUMP_LABEL"
+   CONFIG_CHECK+=" MODULE_UNLOAD !PREEMPT_RT ~STACKTRACE"
+   linux-mod_pkg_setup
+
+   # compile against selected (not running) target
+   BUILD_PARAMS="P_KVER=${KV_FULL} P_KERNEL=${KERNEL_DIR}"
+   BUILD_TARGETS="all"
+}
+
+src_unpack() {
+   if use verify-sig; then
+   verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.sign}
+   fi
+
+   default
+}
+
+src_install() {
+   linux-mod_src_install
+
+   systemd_dounit scripts/bootup/systemd/lkrg.service
+   newinitd scripts/bootup/openrc/lkrg lkrg.initd
+
+   insinto /lib/sysctl.d
+   newins scripts/bootup/lkrg.conf 01-lkrg.conf
+}



[gentoo-commits] repo/gentoo:master commit in: dev-lang/go/

2022-08-01 Thread William Hubbs
commit: 63e7f2d9f00b58e5ed4346a0d9f9411d42a4429c
Author: William Hubbs  gentoo  org>
AuthorDate: Mon Aug  1 22:54:59 2022 +
Commit: William Hubbs  gentoo  org>
CommitDate: Mon Aug  1 22:54:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63e7f2d9

dev-lang/go: drop 1.17.11, 1.18.3

Bug: https://bugs.gentoo.org/857822
Signed-off-by: William Hubbs  gentoo.org>

 dev-lang/go/Manifest  |   2 -
 dev-lang/go/go-1.17.11.ebuild | 196 --
 dev-lang/go/go-1.18.3.ebuild  | 196 --
 3 files changed, 394 deletions(-)

diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 01e6db79a195..81bcfad03a59 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,6 +1,4 @@
-DIST go1.17.11.src.tar.gz 22197784 BLAKE2B 
d235137e18c3c05ba59540c66e40bab1e9ecd5dc9ac062c66207a117762404c511ccdaf131c2826f3ba7c4ebc25336132b83fb8192ce77844c9bc34734713c49
 SHA512 
cd08062e3357e8e73ad05572ac575b9d8b15599bdb3ea0ca743b04936fa5cca438886e6a06d6453334b8bb5fbe1ab3512657d11651f9199d2254736a6554e71d
 DIST go1.17.12.src.tar.gz 22205674 BLAKE2B 
0770f1979ba9c14779e078638b2d5f9b6af1a62939f863abadc3c84418ce639715e61ed4763674e2e2d0d95219636e59e53a0db658ae02f17e713205789fcc5a
 SHA512 
d2bcea2a33723af5c2ae871f5c44694c69d37c74c62e81eddeaf4bfedf124feea2752997d3a359990071bf01f88942fc66b21cb092385946ad4ae9410854c8b9
 DIST go1.17.13.src.tar.gz 22206518 BLAKE2B 
b227e5197c6466e7dc4594646a6b5f7e2f5e8bc0d44b8ab45b488f5249eb64ff736fccf0e0070d6685a08361e1b3dd1a2ee7050df6395bec519a7ae7dca78630
 SHA512 
2820bdd679fdb5e37d4c601b26c246bab23d4e8e1b226ac37c38e90a68b693e877bff944275eb25e3296ee772e7b40ef7d71dd49cca524df4cb8e721bfb50c33
-DIST go1.18.3.src.tar.gz 22838104 BLAKE2B 
031c34b1b7d45e6b0e357049581972c9f5fc6cabcac6162f27beae1140e03585d85df9d80509a3a64d8d13d691b8ca62f165b0dc782483a9504d46a137300b4e
 SHA512 
bacbc74ab8fa4c8de46847cadbd245124491f960c087d6892e2231a73f689d597b9a992c2948c54c0ab4b6476d86d3a6a9a64e1714cb7b2cdfd0a7bcfcd7b5fe
 DIST go1.18.4.src.tar.gz 22845866 BLAKE2B 
9997100ab5ae8a8ffdf4d2515d45d0bf29decf6d117d8f0079f0ec3fe63b3c5a32181e17c13de2ea656a5e8c87c1ed3f0e00945f717a306d23542bc0425d1d26
 SHA512 
4872956e31fa5d681021db12e876bc60a1815cf45203e75db83d6c54e9b7138766ae44bf1659db5333eba0b6097aea1990519795fffd2f124e7a78b78df1339b
 DIST go1.18.5.src.tar.gz 22847094 BLAKE2B 
8edf133aa5b1fa4076db72bd7c63240db6cbd6b9b4725c2a71384ff302bee77e193bcfad6b55bfd31ee58f08fc59d9bbee5750d9227598fe402d6293863595ff
 SHA512 
4ba69ad49b5c17963fdc39ae7f5360fa38950db39ec1fb9b52744d6a209abf177dab6bd587e7457c83a4fd265589907ec241d8b09d0eac76cf984243a14500ef

diff --git a/dev-lang/go/go-1.17.11.ebuild b/dev-lang/go/go-1.17.11.ebuild
deleted file mode 100644
index 7f1ce9304e51..
--- a/dev-lang/go/go-1.17.11.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-**)
-   EGIT_REPO_URI="https://github.com/golang/go.git;
-   inherit git-r3
-   ;;
-*)
-   SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-   S="${WORKDIR}"/go
-   case ${PV} in
-   *_beta*|*_rc*) ;;
-   *)
-   KEYWORDS="-* amd64 arm arm64 ppc64 ~riscv ~s390 x86 
~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-   ;;
-   esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://go.dev;
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="cpu_flags_x86_sse2"
-
-BDEPEND="|| (
-   dev-lang/go
-   dev-lang/go-bootstrap )"
-
-# the *.syso files have writable/executable stacks
-QA_EXECSTACK='*.syso'
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# This package triggers "unrecognized elf file(s)" notices on riscv.
-# https://bugs.gentoo.org/794046
-QA_PREBUILT='.*'
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch() {
-   # By chance most portage arch names match Go
-   local portage_arch=$(tc-arch $@)
-   case "${portage_arch}" in
-   x86)echo 386;;
-   x64-*)  echo amd64;;
-   ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo 
ppc64le ;;
-   riscv) echo riscv64 ;;
-   s390) echo s390x ;;
-   *)  echo "${portage_arch}";;
-   esac
-}
-
-go_arm() {
-   case "${1:-${CHOST}}" in
-   armv5*) echo 5;;
-   armv6*) echo 6;;
-   armv7*) echo 

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

2022-08-01 Thread Sam James
commit: 3136cda1d133e6debb49d892b5270accd4f01256
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug  1 22:46:48 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug  1 22:47:08 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=3136cda1

NEWS: update

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

 NEWS | 22 ++
 1 file changed, 22 insertions(+)

diff --git a/NEWS b/NEWS
index a9cc9669c..748a51084 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,28 @@ Bug fixes:
   consumer (gentoolkit, and only as of its most recent releases), so
   impact is not severe.
 
+* logging: don't clutter with a global logger and instead scope to
+  each module. Allows further logging refactoring in future.
+
+* estrip: fix double slash for older EAPIs (bug 862600).
+
+* install-qa-check.d: 60-pkgconfig: fix --validate check by adding
+  ${ED}/usr/{lib*,share} to search path.
+
+* install-qa-check.d: 60-pkgconfig: only check defined variables for
+  ${EPREFIX} compliance (bug 860825).
+
+* install-qa-checks.d: 90gcc-warnings: add arm64, aarch64 (used by Apple),
+  loongarch64, riscv64, s390x to list of 64-bit arches which affects the
+  severity of some warnings (like pointer truncation).
+
+* portage: output: update obsolete /etc/init.d/functions.sh path.
+
+* bin: style tweaks to conform to Gentoo style (mostly variable bracing).
+
+* isolated-functions.sh: sync __makeopts_jobs implementation with
+  multiprocessing.eclass.
+
 * ebuild(1): improve descriptions of various phase functions.
 
 portage-3.0.34 (2022-07-20)



[gentoo-commits] repo/gentoo:master commit in: dev-lang/go/

2022-08-01 Thread William Hubbs
commit: f195e9ec7b78b80641434a96114feee8adfe0f08
Author: William Hubbs  gentoo  org>
AuthorDate: Mon Aug  1 22:43:48 2022 +
Commit: William Hubbs  gentoo  org>
CommitDate: Mon Aug  1 22:45:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f195e9ec

dev-lang/go: add 1.17.13, 1.18.5

Bug: https://bugs.gentoo.org/862822
Signed-off-by: William Hubbs  gentoo.org>

 dev-lang/go/Manifest  |   2 +
 dev-lang/go/go-1.17.13.ebuild | 196 ++
 dev-lang/go/go-1.18.5.ebuild  | 196 ++
 3 files changed, 394 insertions(+)

diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index b805d66592c4..01e6db79a195 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,4 +1,6 @@
 DIST go1.17.11.src.tar.gz 22197784 BLAKE2B 
d235137e18c3c05ba59540c66e40bab1e9ecd5dc9ac062c66207a117762404c511ccdaf131c2826f3ba7c4ebc25336132b83fb8192ce77844c9bc34734713c49
 SHA512 
cd08062e3357e8e73ad05572ac575b9d8b15599bdb3ea0ca743b04936fa5cca438886e6a06d6453334b8bb5fbe1ab3512657d11651f9199d2254736a6554e71d
 DIST go1.17.12.src.tar.gz 22205674 BLAKE2B 
0770f1979ba9c14779e078638b2d5f9b6af1a62939f863abadc3c84418ce639715e61ed4763674e2e2d0d95219636e59e53a0db658ae02f17e713205789fcc5a
 SHA512 
d2bcea2a33723af5c2ae871f5c44694c69d37c74c62e81eddeaf4bfedf124feea2752997d3a359990071bf01f88942fc66b21cb092385946ad4ae9410854c8b9
+DIST go1.17.13.src.tar.gz 22206518 BLAKE2B 
b227e5197c6466e7dc4594646a6b5f7e2f5e8bc0d44b8ab45b488f5249eb64ff736fccf0e0070d6685a08361e1b3dd1a2ee7050df6395bec519a7ae7dca78630
 SHA512 
2820bdd679fdb5e37d4c601b26c246bab23d4e8e1b226ac37c38e90a68b693e877bff944275eb25e3296ee772e7b40ef7d71dd49cca524df4cb8e721bfb50c33
 DIST go1.18.3.src.tar.gz 22838104 BLAKE2B 
031c34b1b7d45e6b0e357049581972c9f5fc6cabcac6162f27beae1140e03585d85df9d80509a3a64d8d13d691b8ca62f165b0dc782483a9504d46a137300b4e
 SHA512 
bacbc74ab8fa4c8de46847cadbd245124491f960c087d6892e2231a73f689d597b9a992c2948c54c0ab4b6476d86d3a6a9a64e1714cb7b2cdfd0a7bcfcd7b5fe
 DIST go1.18.4.src.tar.gz 22845866 BLAKE2B 
9997100ab5ae8a8ffdf4d2515d45d0bf29decf6d117d8f0079f0ec3fe63b3c5a32181e17c13de2ea656a5e8c87c1ed3f0e00945f717a306d23542bc0425d1d26
 SHA512 
4872956e31fa5d681021db12e876bc60a1815cf45203e75db83d6c54e9b7138766ae44bf1659db5333eba0b6097aea1990519795fffd2f124e7a78b78df1339b
+DIST go1.18.5.src.tar.gz 22847094 BLAKE2B 
8edf133aa5b1fa4076db72bd7c63240db6cbd6b9b4725c2a71384ff302bee77e193bcfad6b55bfd31ee58f08fc59d9bbee5750d9227598fe402d6293863595ff
 SHA512 
4ba69ad49b5c17963fdc39ae7f5360fa38950db39ec1fb9b52744d6a209abf177dab6bd587e7457c83a4fd265589907ec241d8b09d0eac76cf984243a14500ef

diff --git a/dev-lang/go/go-1.17.13.ebuild b/dev-lang/go/go-1.17.13.ebuild
new file mode 100644
index ..217891046702
--- /dev/null
+++ b/dev-lang/go/go-1.17.13.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+case ${PV}  in
+**)
+   EGIT_REPO_URI="https://github.com/golang/go.git;
+   inherit git-r3
+   ;;
+*)
+   SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+   S="${WORKDIR}"/go
+   case ${PV} in
+   *_beta*|*_rc*) ;;
+   *)
+   KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 ~x86 
~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+   ;;
+   esac
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://go.dev;
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="cpu_flags_x86_sse2"
+
+BDEPEND="|| (
+   dev-lang/go
+   dev-lang/go-bootstrap )"
+
+# the *.syso files have writable/executable stacks
+QA_EXECSTACK='*.syso'
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# This package triggers "unrecognized elf file(s)" notices on riscv.
+# https://bugs.gentoo.org/794046
+QA_PREBUILT='.*'
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch() {
+   # By chance most portage arch names match Go
+   local portage_arch=$(tc-arch $@)
+   case "${portage_arch}" in
+   x86)echo 386;;
+   x64-*)  echo amd64;;
+   ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo 
ppc64le ;;
+   riscv) echo riscv64 ;;
+   s390) echo s390x ;;
+   *)  echo "${portage_arch}";;
+   esac
+}
+
+go_arm() {
+   case "${1:-${CHOST}}" in
+   armv5*) echo 5;;
+   armv6*) echo 6;;
+   armv7*) 

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

2022-08-01 Thread Sam James
commit: 1bb1f5dc09f870558703fedbbb7d282830bf4251
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 28 01:19:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug  1 22:38:11 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=1bb1f5dc

isolated-functions.sh: sync ___makeopts_jobs with multiprocessing.eclass

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

 bin/isolated-functions.sh | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 4542c6715..0efcd5a7d 100644
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -470,10 +470,11 @@ if [[ -z ${XARGS} ]] ; then
 fi
 
 ___makeopts_jobs() {
-   # Copied from eutils.eclass:makeopts_jobs()
-   local jobs
-   jobs=$(echo " ${MAKEOPTS} " | \
-   sed -r -n 
's:.*[[:space:]](-j|--jobs[=[:space:]])[[:space:]]*([0-9]+).*:\2:p') || die
+   # Copied from multiprocessing.eclass:makeopts_jobs
+   # This assumes the first .* will be more greedy than the second .*
+   # since POSIX doesn't specify a non-greedy match (i.e. ".*?").
+   local jobs=$(echo " ${MAKEOPTS} " | sed -r -n \
+   -e 
's:.*[[:space:]](-[a-z]*j|--jobs[=[:space:]])[[:space:]]*([0-9]+).*:\2:p' || 
die)
echo ${jobs:-1}
 }
 



[gentoo-commits] proj/portage:master commit in: bin/ebuild-helpers/xattr/, bin/ebuild-helpers/, bin/postinst-qa-check.d/, bin/, ...

2022-08-01 Thread Sam James
commit: cb8eda531dad92bec9293c89f93db9b581245fd3
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 28 01:25:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug  1 22:38:11 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=cb8eda53

bin: style tweaks

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

 bin/bashrc-functions.sh |  18 +-
 bin/binhost-snapshot|   2 +-
 bin/chpathtool.py   |   8 +-
 bin/doins.py|   8 +-
 bin/ebuild  |   2 +-
 bin/ebuild-helpers/bsd/sed  |   3 +-
 bin/ebuild-helpers/dobin|   6 +-
 bin/ebuild-helpers/dodir|   4 +-
 bin/ebuild-helpers/dodoc|   4 +-
 bin/ebuild-helpers/doexe|  17 +-
 bin/ebuild-helpers/dohard   |   4 +-
 bin/ebuild-helpers/dohtml   |  10 +-
 bin/ebuild-helpers/doinfo   |   6 +-
 bin/ebuild-helpers/doins|   4 +-
 bin/ebuild-helpers/dolib|  10 +-
 bin/ebuild-helpers/doman|  10 +-
 bin/ebuild-helpers/domo |   8 +-
 bin/ebuild-helpers/dosbin   |   4 +-
 bin/ebuild-helpers/dosed|   8 +-
 bin/ebuild-helpers/dosym|  14 +-
 bin/ebuild-helpers/fowners  |   6 +-
 bin/ebuild-helpers/fperms   |   6 +-
 bin/ebuild-helpers/newins   |  14 +-
 bin/ebuild-helpers/portageq |   1 +
 bin/ebuild-helpers/prepallstrip |   2 +-
 bin/ebuild-helpers/prepinfo |   3 +-
 bin/ebuild-helpers/prepstrip|   2 +-
 bin/ebuild-helpers/unprivileged/chown   |   3 +-
 bin/ebuild-helpers/xattr/install|   2 +-
 bin/ebuild.sh   | 178 
 bin/ecompress   |  13 +-
 bin/ecompress-file  |  15 +-
 bin/egencache   |   8 +-
 bin/emerge-webrsync |  31 ++-
 bin/estrip  |  41 ++--
 bin/etc-update  |  27 ++-
 bin/install-qa-check.d/05prefix |   8 +-
 bin/install-qa-check.d/10executable-issues  |   2 +-
 bin/install-qa-check.d/20deprecated-directories |   6 +-
 bin/install-qa-check.d/60udev   |   5 +-
 bin/install-qa-check.d/80libraries  |   2 +-
 bin/install-qa-check.d/90bad-bin-owner  |   2 +-
 bin/install-qa-check.d/90gcc-warnings   |  10 +-
 bin/install-qa-check.d/90world-writable |  10 +-
 bin/isolated-functions.sh   |  51 ++---
 bin/misc-functions.sh   |  99 +
 bin/phase-functions.sh  | 267 +---
 bin/phase-helpers.sh| 160 --
 bin/portageq|   4 +-
 bin/postinst-qa-check.d/50xdg-utils |  21 +-
 bin/save-ebuild-env.sh  |   8 +-
 51 files changed, 635 insertions(+), 522 deletions(-)

diff --git a/bin/bashrc-functions.sh b/bin/bashrc-functions.sh
index a45587b28..7d6aab544 100644
--- a/bin/bashrc-functions.sh
+++ b/bin/bashrc-functions.sh
@@ -5,22 +5,22 @@
 register_die_hook() {
local x
for x in $* ; do
-   has $x $EBUILD_DEATH_HOOKS || \
-   export EBUILD_DEATH_HOOKS="$EBUILD_DEATH_HOOKS $x"
+   has ${x} ${EBUILD_DEATH_HOOKS} || \
+   export EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} ${x}"
done
 }
 
 register_success_hook() {
local x
for x in $* ; do
-   has $x $EBUILD_SUCCESS_HOOKS || \
-   export EBUILD_SUCCESS_HOOKS="$EBUILD_SUCCESS_HOOKS $x"
+   has ${x} ${EBUILD_SUCCESS_HOOKS} || \
+   export EBUILD_SUCCESS_HOOKS="${EBUILD_SUCCESS_HOOKS} 
${x}"
done
 }
 
 __strip_duplicate_slashes() {
-   if [[ -n $1 ]] ; then
-   local removed=$1
+   if [[ -n ${1} ]] ; then
+   local removed=${1}
while [[ ${removed} == *//* ]] ; do
removed=${removed//\/\///}
done
@@ -29,14 +29,14 @@ __strip_duplicate_slashes() {
 }
 
 KV_major() {
-   [[ -z $1 ]] && return 1
+   [[ -z ${1} ]] && return 1
 
local KV=$@
echo "${KV%%.*}"
 }
 
 KV_minor() {
-   [[ -z $1 ]] && return 1
+   [[ -z ${1} ]] && return 1
 
local KV=$@
KV=${KV#*.}
@@ -44,7 +44,7 @@ KV_minor() {
 }
 
 KV_micro() {
-   [[ -z $1 ]] && return 1
+   [[ -z ${1} ]] && return 1
 
   

[gentoo-commits] proj/portage:master commit in: bin/install-qa-check.d/

2022-08-01 Thread Sam James
commit: 4f7f71fe7fca2744954d0092c3095221905f7e04
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug  1 02:47:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug  1 22:37:51 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4f7f71fe

install-qa-check.d: 60pkgconfig: add ${ED}/usr/{lib*,share}/pkgconfig to search 
path

Needed for --validate to not barf sometimes.

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

 bin/install-qa-check.d/60pkgconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/install-qa-check.d/60pkgconfig 
b/bin/install-qa-check.d/60pkgconfig
index 6f1d6b8b1..54122fe61 100644
--- a/bin/install-qa-check.d/60pkgconfig
+++ b/bin/install-qa-check.d/60pkgconfig
@@ -27,7 +27,7 @@ pkgconfig_check() {
# seems like f.d.o, OpenBSD, and of course pkgconf do though.
# Need --maximum-traverse-depth=1 to avoid checking deps and giving
# unrelated warnings/errors.
-   if ! pkg-config --maximum-traverse-depth=1 --validate "${files[@]}" ; 
then
+   if ! pkg-config --maximum-traverse-depth=1 
--with-path="${ED}"/usr/{lib*,share}/pkgconfig --validate "${files[@]}" ; then
eqawarn "QA Notice: pkg-config files which fail validation 
found!"
eqawarn "Run 'pkg-config --validate ...' for more information"
fi



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

2022-08-01 Thread Sam James
commit: b9ef74a27bb847e8afe9fec5e6689d7934aeb16b
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 28 01:23:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug  1 22:38:11 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=b9ef74a2

portage: output: update functions.sh path

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

 lib/portage/output.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/portage/output.py b/lib/portage/output.py
index c7922038e..439cc4fac 100644
--- a/lib/portage/output.py
+++ b/lib/portage/output.py
@@ -134,7 +134,7 @@ codes["0x00"] = codes["brown"]
 codes["darkyellow"] = codes["0x00"]
 
 
-# Colors from /etc/init.d/functions.sh
+# Colors from /lib/gentoo/functions.sh
 _styles["BAD"] = ("red",)
 _styles["BRACKET"] = ("blue",)
 _styles["ERR"] = ("red",)



[gentoo-commits] proj/portage:master commit in: bin/install-qa-check.d/

2022-08-01 Thread Sam James
commit: cf16daf828e73ba5c37cd87086bfdc43eea23dd2
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 28 02:56:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug  1 22:38:11 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=cf16daf8

install-qa-checks.d: fix 90gcc-warnings for other 64-bit arches

We were missing:
- aarch64*
- arm64* (Apple uses this for arm64)
- loongarch64*
- riscv64*
- s390x*

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

 bin/install-qa-check.d/90gcc-warnings | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/bin/install-qa-check.d/90gcc-warnings 
b/bin/install-qa-check.d/90gcc-warnings
index 041e39c8b..52124427d 100644
--- a/bin/install-qa-check.d/90gcc-warnings
+++ b/bin/install-qa-check.d/90gcc-warnings
@@ -113,25 +113,26 @@ gcc_warn_check() {
fi
 
local cat_cmd=cat
-   [[ $PORTAGE_LOG_FILE = *.gz ]] && cat_cmd=zcat
-   [[ $reset_debug = 1 ]] && set -x
+   [[ ${PORTAGE_LOG_FILE} = *.gz ]] && cat_cmd=zcat
+   [[ ${reset_debug} = 1 ]] && set -x
+
# Use safe cwd, avoiding unsafe import for bug #469338.
-   f=$(cd "${PORTAGE_PYM_PATH}" ; $cat_cmd "${PORTAGE_LOG_FILE}" | 
\
-   "${PORTAGE_PYTHON:-/usr/bin/python}" 
"$PORTAGE_BIN_PATH"/check-implicit-pointer-usage.py || die 
"check-implicit-pointer-usage.py failed")
-   if [[ -n ${f} ]] ; then
+   f=$(cd "${PORTAGE_PYM_PATH}" ; ${cat_cmd} "${PORTAGE_LOG_FILE}" 
| \
+   "${PORTAGE_PYTHON:-/usr/bin/python}" 
"${PORTAGE_BIN_PATH}"/check-implicit-pointer-usage.py || die 
"check-implicit-pointer-usage.py failed")
 
+   if [[ -n ${f} ]] ; then
# In the future this will be a forced "die". In 
preparation,
# increase the log level from "qa" to "eerror" so that 
people
-   # are aware this is a problem that must be fixed asap.
+   # are aware this is a problem that must be fixed ASAP.
 
-   # just warn on 32bit hosts but bail on 64bit hosts
+   # Just warn on 32bit hosts but bail on 64bit hosts
case ${CHOST} in
-   
alpha*|hppa64*|ia64*|powerpc64*|mips64*|sparc64*|sparcv9*|x86_64*) 
gentoo_bug=yes ;;
+   
alpha*|aarch64*|arm64*|hppa64*|ia64*|powerpc64*|loongarch64*|mips64*|riscv64*|sparc64*|sparcv9*|s390x*|x86_64*)
 gentoo_bug=yes ;;
esac
 
abort=yes
 
-   if [[ $gentoo_bug = yes ]] ; then
+   if [[ ${gentoo_bug} = yes ]] ; then
eerror
eerror "QA Notice: Package triggers severe 
warnings which indicate that it"
eerror "   will almost certainly crash 
on 64bit architectures."



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

2022-08-01 Thread Sam James
commit: 5bd96892a2a260b14808027f6c62d625464cec3f
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug  1 22:38:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug  1 22:38:59 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=5bd96892

.git-blame-ignore-revs: add "bin: style tweaks"

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

 .git-blame-ignore-revs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 321d9aa7c..b612f6b32 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -6,3 +6,5 @@ a5092f11f31b6a9d54a34423088a7bb8e70bc1c6
 baf79da44e543cc0fd12f64a2c99b49b66727f39
 # Blacken previously missed Python files
 9fe091668c8a1d988c02c849ac1bece6eb764d0b
+# bin: style tweaks
+cb8eda531dad92bec9293c89f93db9b581245fd3



[gentoo-commits] proj/portage:master commit in: bin/install-qa-check.d/

2022-08-01 Thread Sam James
commit: 06af67ad303d2f0d8a82c4d6cd4c594d7694689b
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug  1 02:41:09 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug  1 22:37:51 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=06af67ad

install-qa-check.d: 60pkgconfig: only verify defined variables in EPREFIX check

e.g. 'exec_prefix' might not even appear in the pkg-config file.

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

 bin/install-qa-check.d/60pkgconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/install-qa-check.d/60pkgconfig 
b/bin/install-qa-check.d/60pkgconfig
index d4ba42f5b..6f1d6b8b1 100644
--- a/bin/install-qa-check.d/60pkgconfig
+++ b/bin/install-qa-check.d/60pkgconfig
@@ -38,6 +38,9 @@ pkgconfig_check() {
for f in "${files[@]}" ; do
local key
for key in prefix exec_prefix libdir includedir ; do
+   # Check if the variable is even in there (bug 
#860825)
+   grep -E -q "^${key}" "${f}" || continue
+
local value=$(pkg-config --variable="${key}" 
"${f}")
 
if [[ ${value} != "${EPREFIX}"* ]] ; then



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

2022-08-01 Thread Sam James
commit: 94efc4b28e06f10da19f03fe566b8987219ccdea
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug  1 22:10:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug  1 22:10:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94efc4b2

media-libs/libmtp: Stabilize 1.1.19-r2 x86, #862624

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

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

diff --git a/media-libs/libmtp/libmtp-1.1.19-r2.ebuild 
b/media-libs/libmtp/libmtp-1.1.19-r2.ebuild
index 3daa860ef5ef..37ef02006caf 100644
--- a/media-libs/libmtp/libmtp-1.1.19-r2.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.19-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == * ]]; then
inherit autotools git-r3
 else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-   KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"



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

2022-08-01 Thread Sam James
commit: 1031fc15c0ee1327958610fca9df3c9ddc33edc2
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug  1 22:10:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug  1 22:10:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1031fc15

media-libs/libnjb: Stabilize 2.2.7-r2 x86, #862627

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

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

diff --git a/media-libs/libnjb/libnjb-2.2.7-r2.ebuild 
b/media-libs/libnjb/libnjb-2.2.7-r2.ebuild
index 56d8228e195f..c09267b64f99 100644
--- a/media-libs/libnjb/libnjb-2.2.7-r2.ebuild
+++ b/media-libs/libnjb/libnjb-2.2.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="doc static-libs"
 
 RDEPEND="virtual/libusb:0"



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

2022-08-01 Thread Sam James
commit: 38654a18a63fe7182a700388a1531f32c903e000
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug  1 22:10:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug  1 22:10:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38654a18

media-libs/liblscp: Stabilize 0.9.6 x86, #862621

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

 media-libs/liblscp/liblscp-0.9.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/liblscp/liblscp-0.9.6.ebuild 
b/media-libs/liblscp/liblscp-0.9.6.ebuild
index cf2d9a96da83..a68cc47b641b 100644
--- a/media-libs/liblscp/liblscp-0.9.6.ebuild
+++ b/media-libs/liblscp/liblscp-0.9.6.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "" ]] ; then
 else
SRC_URI="https://www.rncbc.org/archive/${P}.tar.gz
https://download.linuxsampler.org/packages/${P}.tar.gz;
-   KEYWORDS="amd64 ~ppc ~x86"
+   KEYWORDS="amd64 ~ppc x86"
 fi
 
 LICENSE="LGPL-2.1"



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

2022-08-01 Thread Sam James
commit: 14002c49182f5527e1e24a17306bcc40b5ce7da4
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug  1 22:10:33 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug  1 22:10:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14002c49

media-sound/csound: Stabilize 6.17.0 x86, #862618

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

 media-sound/csound/csound-6.17.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/csound/csound-6.17.0.ebuild 
b/media-sound/csound/csound-6.17.0.ebuild
index ff2a0f274e57..cc3c316eca91 100644
--- a/media-sound/csound/csound-6.17.0.ebuild
+++ b/media-sound/csound/csound-6.17.0.ebuild
@@ -22,7 +22,7 @@ else

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
)"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and 
performance"



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

2022-08-01 Thread Sam James
commit: 9b014e793af83734542ff47e16bfdc5bead3bbd9
Author: Maciej Barć  gentoo  org>
AuthorDate: Mon Aug  1 19:50:50 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug  1 20:39:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b014e79

dev-util/pkgcheck: emacs support for live version

Bug: https://github.com/pkgcore/pkgcheck/pull/420
Signed-off-by: Maciej Barć  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/26700
Signed-off-by: Sam James  gentoo.org>

 dev-util/pkgcheck/files/50pkgcheck-gentoo.el |  4 
 dev-util/pkgcheck/pkgcheck-.ebuild   | 32 +++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/dev-util/pkgcheck/files/50pkgcheck-gentoo.el 
b/dev-util/pkgcheck/files/50pkgcheck-gentoo.el
new file mode 100644
index ..7808713be94a
--- /dev/null
+++ b/dev-util/pkgcheck/files/50pkgcheck-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'flycheck-pkgcheck-setup "flycheck-pkgcheck"
+  "Flycheck pkgcheck setup." t)
+(add-hook 'ebuild-mode-hook 'flycheck-pkgcheck-setup)

diff --git a/dev-util/pkgcheck/pkgcheck-.ebuild 
b/dev-util/pkgcheck/pkgcheck-.ebuild
index 44a8666a2eac..80366db8e2e5 100644
--- a/dev-util/pkgcheck/pkgcheck-.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
+inherit elisp-common distutils-r1 optfeature
 
 if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git;
@@ -20,6 +20,7 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck;
 
 LICENSE="BSD MIT"
 SLOT="0"
+IUSE="emacs"
 
 if [[ ${PV} == * ]]; then
RDEPEND="
@@ -38,8 +39,14 @@ RDEPEND+="
dev-python/lxml[${PYTHON_USEDEP}]
dev-python/pathspec[${PYTHON_USEDEP}]
>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
+   emacs? (
+   >=app-editors/emacs-24.1:*
+   app-emacs/ebuild-mode
+   app-emacs/flycheck
+   )
 "
 BDEPEND="
+   ${RDEPEND}
test? (
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
@@ -47,10 +54,22 @@ BDEPEND="
)
 "
 
+SITEFILE="50${PN}-gentoo.el"
+
 distutils_enable_tests setup.py
 
 export USE_SYSTEM_TREE_SITTER_BASH=1
 
+src_compile() {
+   distutils-r1_src_compile
+
+   if use emacs ; then
+  pushd "${S}"/contrib/emacs >/dev/null || die
+  elisp-compile *.el
+  popd >/dev/null || die
+   fi
+}
+
 src_test() {
local -x PYTHONDONTWRITEBYTECODE=
distutils-r1_src_test
@@ -60,9 +79,20 @@ python_install_all() {
local DOCS=( NEWS.rst )
[[ ${PV} == * ]] || doman man/*
distutils-r1_python_install_all
+
+   if use emacs ; then
+   elisp-install ${PN} "${S}"/contrib/emacs/*.el{,c}
+   elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+   fi
 }
 
 pkg_postinst() {
+   use emacs && elisp-site-regen
+
optfeature "Network check support" dev-python/requests
optfeature "Perl module version check support" 
dev-perl/Gentoo-PerlMod-Version
 }
+
+pkg_postrm() {
+   use emacs && elisp-site-regen
+}



[gentoo-commits] repo/gentoo:master commit in: app-emacs/epl/

2022-08-01 Thread Maciej Barć
commit: 4c034f91caed438b361c0db217f99e3c00e4c735
Author: Maciej Barć  gentoo  org>
AuthorDate: Mon Aug  1 20:27:08 2022 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Mon Aug  1 20:28:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c034f91

app-emacs/epl: remove ert-runner dependency

to make our lives easier ;^)

Bug: https://bugs.gentoo.org/862858
Signed-off-by: Maciej Barć  gentoo.org>

 app-emacs/epl/{epl-0.9-r1.ebuild => epl-0.9-r2.ebuild} | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app-emacs/epl/epl-0.9-r1.ebuild b/app-emacs/epl/epl-0.9-r2.ebuild
similarity index 77%
rename from app-emacs/epl/epl-0.9-r1.ebuild
rename to app-emacs/epl/epl-0.9-r2.ebuild
index c81cc69e6cb7..377b6330fda9 100644
--- a/app-emacs/epl/epl-0.9-r1.ebuild
+++ b/app-emacs/epl/epl-0.9-r2.ebuild
@@ -17,11 +17,12 @@ KEYWORDS="~amd64 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="test? ( app-emacs/ert-runner )"
+BDEPEND="test? ( app-emacs/f )"
 
 DOCS=( README.md )
 SITEFILE="50epl-gentoo.el"
 
 src_test() {
-   ert-runner --reporter ert+duration --script || die
+   ${EMACS} ${EMACSFLAGS} -L . -L test -l epl.el -l test/epl-test.el \
+   -f ert-run-tests-batch-and-exit || die
 }



[gentoo-commits] repo/gentoo:master commit in: dev-java/assertj-core/

2022-08-01 Thread Arthur Zamarin
commit: b1b6b136763e9aa12b271d355d24e3933e5606bb
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Aug  1 20:20:11 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Aug  1 20:20:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1b6b136

dev-java/assertj-core: Keyword 3.10.0 arm64, #860156

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/assertj-core/assertj-core-3.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/assertj-core/assertj-core-3.10.0.ebuild 
b/dev-java/assertj-core/assertj-core-3.10.0.ebuild
index 14c55741e7f7..9bd45c393c06 100644
--- a/dev-java/assertj-core/assertj-core-3.10.0.ebuild
+++ b/dev-java/assertj-core/assertj-core-3.10.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/assertj/${PN}/archive/${P}.tar.gz;
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 
 CP_DEPEND="
>=dev-java/byte-buddy-1.12.12:0



[gentoo-commits] repo/gentoo:master commit in: dev-java/assertj-core/

2022-08-01 Thread Arthur Zamarin
commit: a91ce417f708b26faa9f0a7468de4330c3c28a40
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Aug  1 20:20:06 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Aug  1 20:20:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a91ce417

dev-java/assertj-core: Keyword 3.10.0 arm, #860156

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/assertj-core/assertj-core-3.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/assertj-core/assertj-core-3.10.0.ebuild 
b/dev-java/assertj-core/assertj-core-3.10.0.ebuild
index 16dd0ff3e9ff..14c55741e7f7 100644
--- a/dev-java/assertj-core/assertj-core-3.10.0.ebuild
+++ b/dev-java/assertj-core/assertj-core-3.10.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/assertj/${PN}/archive/${P}.tar.gz;
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc64"
 
 CP_DEPEND="
>=dev-java/byte-buddy-1.12.12:0



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakarta-annotations-api/

2022-08-01 Thread Arthur Zamarin
commit: 1ea1e67d1e8533e3b04cc9239a95b935267b9f68
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Aug  1 20:20:14 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Aug  1 20:20:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ea1e67d

dev-java/jakarta-annotations-api: Keyword 2.1.1 x86, #860156

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild 
b/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild
index 7c5b13685b33..afe6dfd9962b 100644
--- a/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild
+++ b/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/eclipse-ee4j/${PN/jakarta/common}/archive/${PV}.tar.
 
 LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 DEPEND="
>=virtual/jdk-11:*



[gentoo-commits] repo/gentoo:master commit in: dev-java/junit-dataprovider/

2022-08-01 Thread Arthur Zamarin
commit: c1db35fc3ca8534857060367fb290a5ec59e098a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Aug  1 20:20:11 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Aug  1 20:20:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1db35fc

dev-java/junit-dataprovider: Keyword 2.9 arm64, #860156

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild 
b/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild
index 232cd2d4fb3b..e0d2661a5a2b 100644
--- a/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild
+++ b/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/TNG/${PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 
 CP_DEPEND="dev-java/findbugs-annotations:0"
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakarta-annotations-api/

2022-08-01 Thread Arthur Zamarin
commit: 91d26ccda2f49d89c1c360ae09cb55795341ea40
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Aug  1 20:20:10 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Aug  1 20:20:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91d26ccd

dev-java/jakarta-annotations-api: Keyword 2.1.1 arm64, #860156

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild 
b/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild
index 3c484abd0a0a..7c5b13685b33 100644
--- a/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild
+++ b/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/eclipse-ee4j/${PN/jakarta/common}/archive/${PV}.tar.
 
 LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 
 DEPEND="
>=virtual/jdk-11:*



[gentoo-commits] repo/gentoo:master commit in: dev-java/memoryfilesystem/

2022-08-01 Thread Arthur Zamarin
commit: a5053ea19a5887634bb1c6903ee627e650bee5dd
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Aug  1 20:20:15 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Aug  1 20:20:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5053ea1

dev-java/memoryfilesystem: Keyword 2.3.0 x86, #860156

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild 
b/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild
index 101cfe1dcdbb..bb7eb852ea77 100644
--- a/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild
+++ b/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/marschall/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 CP_DEPEND="
dev-java/jakarta-annotations-api:0



[gentoo-commits] repo/gentoo:master commit in: dev-java/assertj-core/

2022-08-01 Thread Arthur Zamarin
commit: a897f3bf9c197e13665f501d472faaff45c394ca
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Aug  1 20:20:15 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Aug  1 20:20:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a897f3bf

dev-java/assertj-core: Keyword 3.10.0 x86, #860156

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/assertj-core/assertj-core-3.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/assertj-core/assertj-core-3.10.0.ebuild 
b/dev-java/assertj-core/assertj-core-3.10.0.ebuild
index 9bd45c393c06..aac98e5265bc 100644
--- a/dev-java/assertj-core/assertj-core-3.10.0.ebuild
+++ b/dev-java/assertj-core/assertj-core-3.10.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/assertj/${PN}/archive/${P}.tar.gz;
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 CP_DEPEND="
>=dev-java/byte-buddy-1.12.12:0



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakarta-annotations-api/

2022-08-01 Thread Arthur Zamarin
commit: a3e768d578441a1348478a6aa794cd9d538b8b20
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Aug  1 20:20:05 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Aug  1 20:20:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3e768d5

dev-java/jakarta-annotations-api: Keyword 2.1.1 arm, #860156

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild 
b/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild
index c7c7bd8d407a..3c484abd0a0a 100644
--- a/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild
+++ b/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/eclipse-ee4j/${PN/jakarta/common}/archive/${PV}.tar.
 
 LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc64"
 
 DEPEND="
>=virtual/jdk-11:*



[gentoo-commits] repo/gentoo:master commit in: dev-java/junit-dataprovider/

2022-08-01 Thread Arthur Zamarin
commit: 91238006ddb42c0d580f7aba2e3a2ba308f11aa4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Aug  1 20:20:16 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Aug  1 20:20:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91238006

dev-java/junit-dataprovider: Keyword 2.9 x86, #860156

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild 
b/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild
index e0d2661a5a2b..a4ededc832a5 100644
--- a/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild
+++ b/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/TNG/${PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 CP_DEPEND="dev-java/findbugs-annotations:0"
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/memoryfilesystem/

2022-08-01 Thread Arthur Zamarin
commit: 9c585048e1c02efedac723c53d6aae9b4b8923c3
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Aug  1 20:20:10 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Aug  1 20:20:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c585048

dev-java/memoryfilesystem: Keyword 2.3.0 arm64, #860156

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild 
b/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild
index d7df72204712..101cfe1dcdbb 100644
--- a/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild
+++ b/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/marschall/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 
 CP_DEPEND="
dev-java/jakarta-annotations-api:0



[gentoo-commits] repo/gentoo:master commit in: dev-java/junit-dataprovider/

2022-08-01 Thread Arthur Zamarin
commit: 8cd3fb3b2e17df99129d3ef780b7b5451a225f49
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Aug  1 20:20:07 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Aug  1 20:20:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cd3fb3b

dev-java/junit-dataprovider: Keyword 2.9 arm, #860156

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild 
b/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild
index e6f316f8c324..232cd2d4fb3b 100644
--- a/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild
+++ b/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/TNG/${PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc64"
 
 CP_DEPEND="dev-java/findbugs-annotations:0"
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/memoryfilesystem/

2022-08-01 Thread Arthur Zamarin
commit: 8c755e8d839b75554500380f565f7cf3d4093722
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Aug  1 20:20:06 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Aug  1 20:20:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c755e8d

dev-java/memoryfilesystem: Keyword 2.3.0 arm, #860156

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild 
b/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild
index 551207d52233..d7df72204712 100644
--- a/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild
+++ b/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/marschall/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc64"
 
 CP_DEPEND="
dev-java/jakarta-annotations-api:0



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

2022-08-01 Thread Jakov Smolić
commit: d623487d60ebf43146e1bed06cce4e6ac1b0f48e
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Aug  1 20:19:27 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Aug  1 20:20:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d623487d

dev-db/sqlite: drop 3.38.2, 3.38.5

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-db/sqlite/Manifest |   4 -
 dev-db/sqlite/sqlite-3.38.2.ebuild | 436 -
 dev-db/sqlite/sqlite-3.38.5.ebuild | 436 -
 3 files changed, 876 deletions(-)

diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 62a2bce1aa2e..26d53697bbcc 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,6 +1,2 @@
-DIST sqlite-doc-3380200.zip 10620764 BLAKE2B 
81f7e7b9aef37bdae133c4d7dc517d2040d8202a7e0cdf00180d3abe3fb677c80dbc1987e437f0d0f34f47c61f09a7c9d664ba42af976ecfb2490bb22087
 SHA512 
b54372ff788aa42b2138c6de91c42c4f6a6440623de3679f08b0519c5c20d9d865c60fa63223c60f4374ff5badb800d6f209e75abb280b9815902757424faf0b
-DIST sqlite-doc-3380500.zip 10640188 BLAKE2B 
d831b672879a07e700c4d19bb97435cfc3aabc2371fd1b7f9e2257d1d53edaba72d974816d509fa60dbc7feaddf4b4f64c6bc061da4945aecab7be463951cb0c
 SHA512 
1f8520e8b06cac97a3cd532d105be847b864d4d51ff2d8ab92c62b369e2e662aa477808e566e334a9103e31b84c119050b92ab6f0ef6d5d68db4d49bf2dd8182
 DIST sqlite-doc-3390200.zip 10683207 BLAKE2B 
745aedf0c71da6c0d802aed2b64b6e10ef57f4a72210b12276a3019ccc5408bef537ad93c64eb972a7f24117df5780e35f75246d2ba9cd74c4537588eb6cba3c
 SHA512 
54b9e632244b95ebf35fcaa5ce9c02381601eb442eec2ec2a809a7fe24d2cfed751581bb82fd243aaede2c935864da39fd1f1685e762826dd76fc754c7f79c0b
-DIST sqlite-src-3380200.zip 13242285 BLAKE2B 
a07f895f57c355e2ec1c96fc857b63d774ff52f7e49c22b1c936b260e6e7787ec656059c02cc6d38845c4368507067d86dac493559541fbb914a3da9cbc67cce
 SHA512 
fd457602db4577b31bc6053fd3cceb220337275e3fd26976f4270fb8a7da4fa047ca23dd18e2795cdfd894d05bad4c53954a81391d71507d359fb224995e420a
-DIST sqlite-src-3380500.zip 13245057 BLAKE2B 
d2deefbc918ab593146950c21047dbd94168d09150ffe00da20e4ee6b02f69516b496b14e1925b00ace8a4148b87bfb263a97d75ab48990e29e12796387fee5f
 SHA512 
d91f060165354ff4b32a72627c16b6d2310d478768794a49eef57229d7199d83f951444fdc0725acf8d2565ef61a9c7921e9c965f429b018b6fd23d129b6e630
 DIST sqlite-src-3390200.zip 13403722 BLAKE2B 
24ab8cfe5fda267c7a90939875e87bc9f9914f2690f195c21ff2b774ba83a7d6914f57648cf618fd79b37e54ad85121f86310a733a87e6c76bf729716a937d02
 SHA512 
a838386a48654391590ea0e1cb355d29f6f93033c3e582df7c63139adaf5119dd5a1550e913dbad0d3eafb0bfa03c4fc6dc48a334d9c45ffb8a7205a528b38f1

diff --git a/dev-db/sqlite/sqlite-3.38.2.ebuild 
b/dev-db/sqlite/sqlite-3.38.2.ebuild
deleted file mode 100644
index a2eb7c1e987f..
--- a/dev-db/sqlite/sqlite-3.38.2.ebuild
+++ /dev/null
@@ -1,436 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" != "" ]]; then
-   SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
-   DOC_PV="${SRC_PV}"
-   # DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
-fi
-
-DESCRIPTION="SQL database engine"
-HOMEPAGE="https://sqlite.org/;
-
-# On version updates, make sure to read the forum 
(https://sqlite.org/forum/forum)
-# for hints regarding test failures, backports, etc.
-if [[ "${PV}" == "" ]]; then
-   SRC_URI=""
-else
-   SRC_URI="https://sqlite.org/2022/${PN}-src-${SRC_PV}.zip
-   doc? ( https://sqlite.org/2022/${PN}-doc-${DOC_PV}.zip )"
-fi
-
-LICENSE="public-domain"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
-if [[ "${PV}" == "" ]]; then
-   PROPERTIES="live"
-fi
-RESTRICT="!test? ( test )"
-
-if [[ "${PV}" == "" ]]; then
-   BDEPEND=">=dev-lang/tcl-8.6:0
-   dev-vcs/fossil"
-else
-   BDEPEND="app-arch/unzip
-   >=dev-lang/tcl-8.6:0"
-fi
-RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-   icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
-   readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-   tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
-   tools? ( dev-lang/tcl:0= )"
-DEPEND="${RDEPEND}
-   test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
-
-if [[ "${PV}" == "" ]]; then
-   S="${WORKDIR}/${PN}"
-else
-   S="${WORKDIR}/${PN}-src-${SRC_PV}"
-fi
-
-_fossil_fetch() {
-   local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
-   local repo_id="${1}"
-   local repo_uri="${2}"
-
-   local -x FOSSIL_HOME="${HOME}"
-
-   mkdir -p "${T}/fossil/${repo_id}" || die
-   pushd 

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

2022-08-01 Thread Sam James
commit: 3e744f5adb5c46eb013d3f1228f607b094ac212a
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug  1 20:17:14 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug  1 20:17:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e744f5a

cmake-utils.eclass: drop last-rited eclass

Use cmake.eclass instead.

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

 eclass/cmake-utils.eclass | 851 --
 1 file changed, 851 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
deleted file mode 100644
index a6dd902b5f33..
--- a/eclass/cmake-utils.eclass
+++ /dev/null
@@ -1,851 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# @ECLASS: cmake-utils.eclass
-# @MAINTAINER:
-# k...@gentoo.org
-# @AUTHOR:
-# Tomáš Chvátal 
-# Maciej Mrozowski 
-# (undisclosed contributors)
-# Original author: Zephyrus (zephy...@mirach.it)
-# @SUPPORTED_EAPIS: 5 6 7
-# @PROVIDES: ninja-utils
-# @BLURB: common ebuild functions for cmake-based packages
-# @DEPRECATED: cmake.eclass
-# @DESCRIPTION:
-# DEPRECATED: This no longer receives any changes. Everyone must port to 
cmake.eclass.
-# The cmake-utils eclass makes creating ebuilds for cmake-based packages much 
easier.
-# It provides all inherited features (DOCS, HTML_DOCS, PATCHES) along with 
out-of-source
-# builds (default), in-source builds and an implementation of the well-known 
use_enable
-# and use_with functions for CMake.
-
-if [[ -z ${_CMAKE_UTILS_ECLASS} ]]; then
-_CMAKE_UTILS_ECLASS=1
-
-# @ECLASS_VARIABLE: BUILD_DIR
-# @DESCRIPTION:
-# Build directory where all cmake processed files should be generated.
-# For in-source build it's fixed to ${CMAKE_USE_DIR}.
-# For out-of-source build it can be overridden, by default it uses
-# ${WORKDIR}/${P}_build.
-#
-# This variable has been called CMAKE_BUILD_DIR formerly.
-# It is set under that name for compatibility.
-
-# @ECLASS_VARIABLE: CMAKE_BINARY
-# @DESCRIPTION:
-# Eclass can use different cmake binary than the one provided in by system.
-: ${CMAKE_BINARY:=cmake}
-
-# @ECLASS_VARIABLE: CMAKE_BUILD_TYPE
-# @DESCRIPTION:
-# Set to override default CMAKE_BUILD_TYPE. Only useful for packages
-# known to make use of "if (CMAKE_BUILD_TYPE MATCHES xxx)".
-# If about to be set - needs to be set before invoking 
cmake-utils_src_configure.
-# You usualy do *NOT* want nor need to set it as it pulls CMake default 
build-type
-# specific compiler flags overriding make.conf.
-: ${CMAKE_BUILD_TYPE:=Gentoo}
-
-# @ECLASS_VARIABLE: CMAKE_IN_SOURCE_BUILD
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Set to enable in-source build.
-
-# @ECLASS_VARIABLE: CMAKE_MAKEFILE_GENERATOR
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Specify a makefile generator to be used by cmake.
-# At this point only "emake" and "ninja" are supported.
-# In EAPI 7 and above, the default is set to "ninja",
-# whereas in EAPIs below 7, it is set to "emake".
-
-# @ECLASS_VARIABLE: CMAKE_MIN_VERSION
-# @DESCRIPTION:
-# Specify the minimum required CMake version.
-: ${CMAKE_MIN_VERSION:=3.9.6}
-
-# @ECLASS_VARIABLE: CMAKE_REMOVE_MODULES
-# @DESCRIPTION:
-# Do we want to remove anything? yes or whatever else for no
-: ${CMAKE_REMOVE_MODULES:=yes}
-
-# @ECLASS_VARIABLE: CMAKE_REMOVE_MODULES_LIST
-# @DESCRIPTION:
-# Space-separated list of CMake modules that will be removed in $S during 
src_prepare,
-# in order to force packages to use the system version.
-: ${CMAKE_REMOVE_MODULES_LIST:=FindBLAS FindLAPACK}
-
-# @ECLASS_VARIABLE: CMAKE_USE_DIR
-# @DESCRIPTION:
-# Sets the directory where we are working with cmake.
-# For example when application uses autotools and only one
-# plugin needs to be done by cmake.
-# By default it uses ${S}.
-
-# @ECLASS_VARIABLE: CMAKE_VERBOSE
-# @DESCRIPTION:
-# Set to OFF to disable verbose messages during compilation
-: ${CMAKE_VERBOSE:=ON}
-
-# @ECLASS_VARIABLE: CMAKE_WARN_UNUSED_CLI
-# @DESCRIPTION:
-# Warn about variables that are declared on the command line
-# but not used. Might give false-positives.
-# "no" to disable (default) or anything else to enable.
-
-# @ECLASS_VARIABLE: CMAKE_EXTRA_CACHE_FILE
-# @USER_VARIABLE
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Specifies an extra cache file to pass to cmake. This is the analog of 
EXTRA_ECONF
-# for econf and is needed to pass TRY_RUN results when cross-compiling.
-# Should be set by user in a per-package basis in /etc/portage/package.env.
-
-# @ECLASS_VARIABLE: CMAKE_UTILS_QA_SRC_DIR_READONLY
-# @USER_VARIABLE
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# After running cmake-utils_src_prepare, sets ${S} to read-only. This is
-# a user flag and should under _no circumstances_ be set in the ebuild.
-# Helps in improving QA of build systems that write to source tree.
-
-case ${EAPI} in
-   5) : ${CMAKE_WARN_UNUSED_CLI:=no} ;;
-   6|7) : ${CMAKE_WARN_UNUSED_CLI:=yes} ;;
-   *) 

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

2022-08-01 Thread Andreas Sturmlechner
commit: 743c3a11f723b2a842a9792b1577661f4347a83f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Aug  1 19:53:04 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Aug  1 19:53:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=743c3a11

dev-libs/libzip: drop 1.8.0-r1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-libs/libzip/Manifest   |   1 -
 dev-libs/libzip/libzip-1.8.0-r1.ebuild | 116 -
 2 files changed, 117 deletions(-)

diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 73d3a2adfe6b..01ddc1b30655 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,2 +1 @@
-DIST libzip-1.8.0.tar.xz 760604 BLAKE2B 
7aadbd4df909806ff728f9315f91c2f4b4e884464ef36acd668b23739fa57e4f65987b368cae0d728dd6cc1468718e40086cf0dc21f437a5c2cad91b455c0bb1
 SHA512 
fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e
 DIST libzip-1.9.2.tar.xz 763980 BLAKE2B 
ceeca4dccbe7552f7f545b00ea44b342398d18eb996e39045b9d6efafe50f8890333ddf220c86b59f5ab2849420eb76761c42b16de8b174629f53e327f9e83e7
 SHA512 
82cb2533c25b5b540aa73856c958750d32eeceb192cce257eded15b396a24652041c8531f20366ac4c2dc6b7c0310c558d19c12b611576eccb07cfbaf98120b5

diff --git a/dev-libs/libzip/libzip-1.8.0-r1.ebuild 
b/dev-libs/libzip/libzip-1.8.0-r1.ebuild
deleted file mode 100644
index 2da9c9ac1ee2..
--- a/dev-libs/libzip/libzip-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multibuild flag-o-matic
-
-DESCRIPTION="Library for manipulating zip archives"
-HOMEPAGE="https://nih.at/libzip/;
-SRC_URI="https://www.nih.at/libzip/${P}.tar.xz;
-
-LICENSE="BSD"
-SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools zstd"
-REQUIRED_USE="test? ( tools )"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
-   sys-libs/zlib
-   bzip2? ( app-arch/bzip2:= )
-   lzma? ( app-arch/xz-utils )
-   ssl? (
-   gnutls? (
-   dev-libs/nettle:0=
-   >=net-libs/gnutls-3.6.5:=
-   )
-   !gnutls? (
-   mbedtls? ( net-libs/mbedtls:= )
-   !mbedtls? ( dev-libs/openssl:0= )
-   )
-   )
-   zstd? ( app-arch/zstd )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-   # Upstream doesn't support building dynamic & static
-   # simultaneously: https://github.com/nih-at/libzip/issues/76
-   MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
-}
-
-src_configure() {
-   append-lfs-flags
-   myconfigure() {
-   local mycmakeargs=(
-   -DBUILD_EXAMPLES=OFF # nothing is installed
-   -DENABLE_COMMONCRYPTO=OFF # not in tree
-   -DENABLE_BZIP2=$(usex bzip2)
-   -DENABLE_LZMA=$(usex lzma)
-   -DENABLE_ZSTD=$(usex zstd)
-   )
-   if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
-   mycmakeargs+=(
-   -DBUILD_DOC=OFF
-   -DBUILD_EXAMPLES=OFF
-   -DBUILD_SHARED_LIBS=OFF
-   -DBUILD_TOOLS=OFF
-   )
-   else
-   mycmakeargs+=(
-   -DBUILD_DOC=ON
-   -DBUILD_REGRESS=$(usex test)
-   -DBUILD_TOOLS=$(usex tools)
-   )
-   fi
-
-   if use ssl; then
-   if use gnutls; then
-   mycmakeargs+=(
-   -DENABLE_GNUTLS=$(usex gnutls)
-   -DENABLE_MBEDTLS=OFF
-   -DENABLE_OPENSSL=OFF
-   )
-   elif use mbedtls; then
-   mycmakeargs+=(
-   -DENABLE_GNUTLS=OFF
-   -DENABLE_MBEDTLS=$(usex mbedtls)
-   -DENABLE_OPENSSL=OFF
-   )
-   else
-   mycmakeargs+=(
-   -DENABLE_GNUTLS=OFF
-   -DENABLE_MBEDTLS=OFF
-   -DENABLE_OPENSSL=ON
-   )
-   fi
-   else
-   mycmakeargs+=(
-   -DENABLE_GNUTLS=OFF
-  

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

2022-08-01 Thread Patrick McLean
commit: 8e3c95e355fa72c7172d6180952b318074d3b8e6
Author: Patrick McLean  gentoo  org>
AuthorDate: Mon Aug  1 19:27:37 2022 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Mon Aug  1 19:27:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e3c95e3

app-misc/tmuxp: add 1.12.0

Signed-off-by: Patrick McLean  gentoo.org>

 app-misc/tmuxp/Manifest|  1 +
 app-misc/tmuxp/tmuxp-1.12.0.ebuild | 43 ++
 2 files changed, 44 insertions(+)

diff --git a/app-misc/tmuxp/Manifest b/app-misc/tmuxp/Manifest
index f06e01b7a427..f39378b48fdf 100644
--- a/app-misc/tmuxp/Manifest
+++ b/app-misc/tmuxp/Manifest
@@ -1,2 +1,3 @@
 DIST tmuxp-1.11.1.tar.gz 830701 BLAKE2B 
37f23abf16ef78b27f04e6af9c95990d39173e62fb4ab2c898fb45075242ee2761e0c69b8f391cb59d4fd2ccee8d157650718450814ebd06716c54afd0e59338
 SHA512 
23cf70cffa86e8478f39661951ca468b09a8caa3e7c8a9114011a5a5440fa817c3425b38cbf00b9b7966ac1449094d101f74a450e77c153e9a1d9ca73c49e856
+DIST tmuxp-1.12.0.tar.gz 839506 BLAKE2B 
83111ee0c24611f762ddd1c22f81f164c29fd89d9e581483a6cc826f65e943228af5aea6779b3f715ea911631ccfe0ef8027a2e9a4db658fd2c66bdcc46195ee
 SHA512 
e6c24ae0be116a627902628ea08efc3c4e33436ecc86007fa3906f4e3eb22fa3b7cc275eeec0ca336ad0d6a18d897a1a1a6f962b8219ee58faad57b63601335b
 DIST tmuxp-1.9.4.tar.gz 821650 BLAKE2B 
34454919e811bc4901dcb570046b45d481934ab36f9b8f50753972fe6545ca9e487b2f04ee818c4b54eea01181c62efb1f5262ab033f2fc92c3cee3828d16bf4
 SHA512 
ecf113011231a03998b3be2d146f7e6c6cc2ccfc36af59b88d51e09726259c92dc4360bde569fba13ca8d81eb9639f85b45cd5f4b50d70d347e3237e396ea446

diff --git a/app-misc/tmuxp/tmuxp-1.12.0.ebuild 
b/app-misc/tmuxp/tmuxp-1.12.0.ebuild
new file mode 100644
index ..e4488877fe08
--- /dev/null
+++ b/app-misc/tmuxp/tmuxp-1.12.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+DISTUTILS_USE_PEP517=poetry
+inherit distutils-r1
+
+DESCRIPTION="tmux session manager. built on libtmux"
+HOMEPAGE="https://tmuxp.git-pull.com;
+SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+   >=app-misc/tmux-3.0a
+   >=dev-python/kaptan-0.5.10[${PYTHON_USEDEP}]
+   ~dev-python/libtmux-0.12.0[${PYTHON_USEDEP}]
+   >=dev-python/click-8.0[${PYTHON_USEDEP}]
+   >=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
+   dev-python/pathspec[${PYTHON_USEDEP}]
+   >=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   test? (
+   >=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
+   !dev-python/flaky
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}/tmuxp-1.7.2-tests.patch"
+   "${FILESDIR}/tmuxp-1.9.2-tests.patch"
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+   SHELL="/bin/bash" epytest
+}



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

2022-08-01 Thread Arthur Zamarin
commit: 6c50dbeca5929f60a8b9660f8571c7bb7ddb323c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Aug  1 19:20:59 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Aug  1 19:20:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c50dbec

dev-python/pkgutil_resolve_name: Keyword 1.3.10 x86, #862825

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild 
b/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild
index fc9c2d1f69e5..c94ff7941c23 100644
--- a/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild
+++ b/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild
@@ -18,4 +18,4 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"



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

2022-08-01 Thread Arthur Zamarin
commit: 23d3600d3508399e63df050e7521c3166b7e8c83
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Aug  1 19:20:59 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Aug  1 19:20:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23d3600d

dev-python/jsonschema: Keyword 4.9.0 x86, #862825

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-python/jsonschema/jsonschema-4.9.0.ebuild 
b/dev-python/jsonschema/jsonschema-4.9.0.ebuild
index abdff516721e..9ff615cc2bee 100644
--- a/dev-python/jsonschema/jsonschema-4.9.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.9.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND="
>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]



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

2022-08-01 Thread Arthur Zamarin
commit: ec90358bc37bdb90a759dcc36050c8949926bc0a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Aug  1 19:20:56 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Aug  1 19:20:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec90358b

dev-python/jsonschema: Keyword 4.9.0 s390, #862825

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-python/jsonschema/jsonschema-4.9.0.ebuild 
b/dev-python/jsonschema/jsonschema-4.9.0.ebuild
index a1b660e22be4..abdff516721e 100644
--- a/dev-python/jsonschema/jsonschema-4.9.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.9.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc"
 
 RDEPEND="
>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]



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

2022-08-01 Thread Arthur Zamarin
commit: a51c5ec95a12b65750a240042d303b28e3dda963
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Aug  1 19:20:55 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Aug  1 19:20:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a51c5ec9

dev-python/pkgutil_resolve_name: Keyword 1.3.10 s390, #862825

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild 
b/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild
index 3e65cc4448ab..fc9c2d1f69e5 100644
--- a/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild
+++ b/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild
@@ -18,4 +18,4 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc"



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

2022-08-01 Thread Arthur Zamarin
commit: deedf11b1d134e793fca326cca73e749efdd22e3
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Aug  1 19:18:31 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Aug  1 19:18:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deedf11b

dev-python/pkgutil_resolve_name: Keyword 1.3.10 ia64, #862825

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild 
b/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild
index 76569c83e98b..3e65cc4448ab 100644
--- a/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild
+++ b/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild
@@ -18,4 +18,4 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc"



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

2022-08-01 Thread Arthur Zamarin
commit: fa13248206a3309b20294c1c9e26bc4c35b16b06
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Aug  1 19:18:28 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Aug  1 19:18:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa132482

dev-python/pkgutil_resolve_name: Keyword 1.3.10 sparc, #862825

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild 
b/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild
index d383bbdb53a9..76569c83e98b 100644
--- a/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild
+++ b/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild
@@ -18,4 +18,4 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc"



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

2022-08-01 Thread Arthur Zamarin
commit: 9271ff7333805db2abea92b91993d14678f0382c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Aug  1 19:18:25 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Aug  1 19:18:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9271ff73

dev-python/jsonschema: Keyword 4.9.0 ppc, #862825

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-python/jsonschema/jsonschema-4.9.0.ebuild 
b/dev-python/jsonschema/jsonschema-4.9.0.ebuild
index 3aca1c311919..9ea4e072fe39 100644
--- a/dev-python/jsonschema/jsonschema-4.9.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.9.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64"
 
 RDEPEND="
>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]



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

2022-08-01 Thread Arthur Zamarin
commit: 127ee5189164131b96ceff9447868719f2237045
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Aug  1 19:18:28 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Aug  1 19:18:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=127ee518

dev-python/jsonschema: Keyword 4.9.0 sparc, #862825

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-python/jsonschema/jsonschema-4.9.0.ebuild 
b/dev-python/jsonschema/jsonschema-4.9.0.ebuild
index 9ea4e072fe39..75d8da0a68f5 100644
--- a/dev-python/jsonschema/jsonschema-4.9.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.9.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc"
 
 RDEPEND="
>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]



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

2022-08-01 Thread Arthur Zamarin
commit: a18bad089fc27abc4ea4d6ae73672c209cac067f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Aug  1 19:18:32 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Aug  1 19:18:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18bad08

dev-python/jsonschema: Keyword 4.9.0 ia64, #862825

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-python/jsonschema/jsonschema-4.9.0.ebuild 
b/dev-python/jsonschema/jsonschema-4.9.0.ebuild
index 75d8da0a68f5..a1b660e22be4 100644
--- a/dev-python/jsonschema/jsonschema-4.9.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.9.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc"
 
 RDEPEND="
>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]



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

2022-08-01 Thread Arthur Zamarin
commit: ab530fc6d9dcd62d2e190b27c16b6ac52551c0df
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Aug  1 19:18:18 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Aug  1 19:18:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab530fc6

dev-python/jsonschema: Keyword 4.9.0 arm, #862825

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-python/jsonschema/jsonschema-4.9.0.ebuild 
b/dev-python/jsonschema/jsonschema-4.9.0.ebuild
index 99e7e15f9a54..00601ce05c4e 100644
--- a/dev-python/jsonschema/jsonschema-4.9.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.9.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa"
 
 RDEPEND="
>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]



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

2022-08-01 Thread Arthur Zamarin
commit: 138611658327aa9d696d64f20bd3e38630b7abd4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Aug  1 19:18:14 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Aug  1 19:18:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13861165

dev-python/pkgutil_resolve_name: Keyword 1.3.10 arm64, #862825

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild 
b/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild
index 7afd4658dde6..bc5c9ec65978 100644
--- a/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild
+++ b/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild
@@ -18,4 +18,4 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa"
+KEYWORDS="~amd64 ~arm64 ~hppa"



  1   2   3   >