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

[Ionen Wolkens]

commit: 05f5c4207352095d9d7eb7e7ab94498f16c52a38
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Oct 30 05:36:36 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Oct 30 05:37:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05f5c420

dev-python/PyQt5: depend on newer sip for 5.15.10

Missed that, like PyQt6, this depend on the newer ABI.
Results in build failure if older is used.

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

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

diff --git a/dev-python/PyQt5/PyQt5-5.15.10.ebuild 
b/dev-python/PyQt5/PyQt5-5.15.10.ebuild
index 660110a962d5..f9f7465eb5e1 100644
--- a/dev-python/PyQt5/PyQt5-5.15.10.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.15.10.ebuild
@@ -85,7 +85,7 @@ RDEPEND="
 "
 BDEPEND="
>=dev-python/PyQt-builder-1.14.1[${PYTHON_USEDEP}]
-   >=dev-python/sip-6.6.2[${PYTHON_USEDEP}]
+   >=dev-python/sip-6.7.12[${PYTHON_USEDEP}]
>=dev-qt/qtcore-${QT_PV}
dbus? ( virtual/pkgconfig )
 "

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

[Jonas Frei]

commit: 569b5986f399377a0e843208803ac5a188bee5e5
Author: Jonas Frei  pm  me>
AuthorDate: Mon Oct 30 05:16:29 2023 +
Commit: Jonas Frei  pm  me>
CommitDate: Mon Oct 30 05:16:29 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=569b5986

app-misc/pueue: add 3.3.1

Signed-off-by: Jonas Frei  pm.me>

 app-misc/pueue/Manifest   |   1 +
 app-misc/pueue/pueue-3.3.1.ebuild | 293 ++
 2 files changed, 294 insertions(+)

diff --git a/app-misc/pueue/Manifest b/app-misc/pueue/Manifest
index 9c11367722..505867dc9f 100644
--- a/app-misc/pueue/Manifest
+++ b/app-misc/pueue/Manifest
@@ -129,6 +129,7 @@ DIST pretty_assertions-1.4.0.crate 78846 BLAKE2B 
68583c49f81ab0cf5b90f6de10ef3aa
 DIST proc-macro2-1.0.69.crate 44271 BLAKE2B 
9d1531a0b123e6238363d574bee03ad050454b65710b9800c12597f3a9ae2f9bf50c617da0472b7ac0b549afaca19c546ccd6519e648598500efda9c0db2ef6d
 SHA512 
d197cbe9b6100c3193a01fd7dd6b4e49d440290012ababb5d9f139409f0afe816f213d67a03abeb1f3227228e0a1f2446d1dc0a2775363a15d1237c38b45d6a1
 DIST procfs-0.15.1.crate 128786 BLAKE2B 
c61d2d514eea64d4e6e55ded61eebaf63f391a77c2e6f36dee6730ebe3c5a6908507e514295c1562c722ec587e45550a2f8798167952689e80e1096f0bcb58fb
 SHA512 
8ccd80a027deb759798d055e21ae56f346e3cb869af40de23970f7237100f46087b3c3f1908900ce558b92bf5d341421a1b717cfacdcdd6d38b256255f15ac82
 DIST pueue-3.3.0.tar.gz 179268 BLAKE2B 
e81add6d5b115e7de974006fde47ef9208563063d97e96c0418a2c48b780da987478260f766fbe248d5bf2f200e1eff67630b5bc8a475b34c25f9b4ea7218c38
 SHA512 
283aedee22f38fb17670395e14551859200c296ce8d122748e35730bac5c8562f0c445e2d13263c547fff019d77ffe879bfd64430bb15e778544cbae0263c77f
+DIST pueue-3.3.1.tar.gz 179472 BLAKE2B 
07df0ccb0c9dd2521f13171fe35b6eb48d0349695967c0073edb1017cff9ae0a9a169004bb7cbe1af4d14e6ded28d9283ca8b65679701ac10ef1b1241ed13b2c
 SHA512 
e4caf5cc6b004f13c265dbdc445faac0d5f5a53f74877f0058476cf134245441db86793c8d3366a1930caa4106ef5c9cb431043ed59417d49d738f163262b201
 DIST quote-1.0.33.crate 28090 BLAKE2B 
77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848
 SHA512 
c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c
 DIST rand-0.8.5.crate 87113 BLAKE2B 
516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c
 SHA512 
8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 
645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3
 SHA512 
8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075

diff --git a/app-misc/pueue/pueue-3.3.1.ebuild 
b/app-misc/pueue/pueue-3.3.1.ebuild
new file mode 100644
index 00..1ecb6d0efb
--- /dev/null
+++ b/app-misc/pueue/pueue-3.3.1.ebuild
@@ -0,0 +1,293 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.10
+
+EAPI=8
+
+CRATES="
+   addr2line@0.21.0
+   adler@1.0.2
+   aho-corasick@1.1.2
+   android-tzdata@0.1.1
+   android_system_properties@0.1.5
+   anstream@0.6.4
+   anstyle-parse@0.2.2
+   anstyle-query@1.0.0
+   anstyle-wincon@3.0.1
+   anstyle@1.0.4
+   anyhow@1.0.75
+   assert_cmd@2.0.12
+   async-trait@0.1.74
+   autocfg@1.1.0
+   backtrace@0.3.69
+   base64@0.21.4
+   better-panic@0.3.0
+   bindgen@0.68.1
+   bitflags@1.3.2
+   bitflags@2.4.1
+   block-buffer@0.10.4
+   bstr@0.2.17
+   bstr@1.7.0
+   bumpalo@3.14.0
+   byteorder@1.5.0
+   bytes@1.5.0
+   cc@1.0.83
+   cexpr@0.6.0
+   cfg-if@1.0.0
+   chrono-english@0.1.7
+   chrono@0.4.31
+   clang-sys@1.6.1
+   clap@4.4.6
+   clap_builder@4.4.6
+   clap_complete@4.4.3
+   clap_derive@4.4.2
+   clap_lex@0.5.1
+   colorchoice@1.0.0
+   comfy-table@7.1.0
+   command-group@2.1.0
+   console@0.15.7
+   core-foundation-sys@0.8.4
+   cpufeatures@0.2.10
+   crossterm@0.27.0
+   crossterm_winapi@0.9.1
+   crypto-common@0.1.6
+   ctrlc@3.4.1
+   deranged@0.3.9
+   diff@0.1.13
+   difflib@0.4.0
+   digest@0.10.7
+   dirs-sys@0.4.1
+   dirs@5.0.1
+   doc-comment@0.3.3
+   either@1.9.0
+   encode_unicode@0.3.6
+   env_logger@0.10.0
+   equivalent@1.0.1
+   errno@0.3.5
+   fastrand@2.0.1
+   futures-channel@0.3.28
+   futures-core@0.3.28
+   futures-executor@0.3.28
+   futures-io@0.3.28
+   futures-macro@0.3.28
+   futures-sink@0.3.28
+   futures-task@0.3.28
+   futures-timer@3.0.2
+  

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

[Jonas Frei]

commit: 56c2b3c88ea3401e0a68650bd9bb58b6db78
Author: Jonas Frei  pm  me>
AuthorDate: Mon Oct 30 05:16:47 2023 +
Commit: Jonas Frei  pm  me>
CommitDate: Mon Oct 30 05:16:47 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=56c2

app-misc/pueue: drop 3.3.0

Signed-off-by: Jonas Frei  pm.me>

 app-misc/pueue/Manifest   |   1 -
 app-misc/pueue/pueue-3.3.0.ebuild | 293 --
 2 files changed, 294 deletions(-)

diff --git a/app-misc/pueue/Manifest b/app-misc/pueue/Manifest
index 505867dc9f..54e4c2f17c 100644
--- a/app-misc/pueue/Manifest
+++ b/app-misc/pueue/Manifest
@@ -128,7 +128,6 @@ DIST predicates-tree-1.0.9.crate 7960 BLAKE2B 
b758c52dcdd0ea237ce25f0a0922006047
 DIST pretty_assertions-1.4.0.crate 78846 BLAKE2B 
68583c49f81ab0cf5b90f6de10ef3aae9b525288fec25f9d006f2eed0877c0fa742dad5f878fc78233b54c0cd32dda7ac1f7161bfb475288d8858e8e40aa9e1f
 SHA512 
f76d38c787e91b3739272e3bebeb9763d312b85a43cda5e1311ba8d6b0e4da1ef25bd66208e772b1cf56a34553ee560482b5ad19c5290608b2aaf9c0d0f0e995
 DIST proc-macro2-1.0.69.crate 44271 BLAKE2B 
9d1531a0b123e6238363d574bee03ad050454b65710b9800c12597f3a9ae2f9bf50c617da0472b7ac0b549afaca19c546ccd6519e648598500efda9c0db2ef6d
 SHA512 
d197cbe9b6100c3193a01fd7dd6b4e49d440290012ababb5d9f139409f0afe816f213d67a03abeb1f3227228e0a1f2446d1dc0a2775363a15d1237c38b45d6a1
 DIST procfs-0.15.1.crate 128786 BLAKE2B 
c61d2d514eea64d4e6e55ded61eebaf63f391a77c2e6f36dee6730ebe3c5a6908507e514295c1562c722ec587e45550a2f8798167952689e80e1096f0bcb58fb
 SHA512 
8ccd80a027deb759798d055e21ae56f346e3cb869af40de23970f7237100f46087b3c3f1908900ce558b92bf5d341421a1b717cfacdcdd6d38b256255f15ac82
-DIST pueue-3.3.0.tar.gz 179268 BLAKE2B 
e81add6d5b115e7de974006fde47ef9208563063d97e96c0418a2c48b780da987478260f766fbe248d5bf2f200e1eff67630b5bc8a475b34c25f9b4ea7218c38
 SHA512 
283aedee22f38fb17670395e14551859200c296ce8d122748e35730bac5c8562f0c445e2d13263c547fff019d77ffe879bfd64430bb15e778544cbae0263c77f
 DIST pueue-3.3.1.tar.gz 179472 BLAKE2B 
07df0ccb0c9dd2521f13171fe35b6eb48d0349695967c0073edb1017cff9ae0a9a169004bb7cbe1af4d14e6ded28d9283ca8b65679701ac10ef1b1241ed13b2c
 SHA512 
e4caf5cc6b004f13c265dbdc445faac0d5f5a53f74877f0058476cf134245441db86793c8d3366a1930caa4106ef5c9cb431043ed59417d49d738f163262b201
 DIST quote-1.0.33.crate 28090 BLAKE2B 
77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848
 SHA512 
c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c
 DIST rand-0.8.5.crate 87113 BLAKE2B 
516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c
 SHA512 
8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2

diff --git a/app-misc/pueue/pueue-3.3.0.ebuild 
b/app-misc/pueue/pueue-3.3.0.ebuild
deleted file mode 100644
index 1ecb6d0efb..00
--- a/app-misc/pueue/pueue-3.3.0.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Autogenerated by pycargoebuild 0.10
-
-EAPI=8
-
-CRATES="
-   addr2line@0.21.0
-   adler@1.0.2
-   aho-corasick@1.1.2
-   android-tzdata@0.1.1
-   android_system_properties@0.1.5
-   anstream@0.6.4
-   anstyle-parse@0.2.2
-   anstyle-query@1.0.0
-   anstyle-wincon@3.0.1
-   anstyle@1.0.4
-   anyhow@1.0.75
-   assert_cmd@2.0.12
-   async-trait@0.1.74
-   autocfg@1.1.0
-   backtrace@0.3.69
-   base64@0.21.4
-   better-panic@0.3.0
-   bindgen@0.68.1
-   bitflags@1.3.2
-   bitflags@2.4.1
-   block-buffer@0.10.4
-   bstr@0.2.17
-   bstr@1.7.0
-   bumpalo@3.14.0
-   byteorder@1.5.0
-   bytes@1.5.0
-   cc@1.0.83
-   cexpr@0.6.0
-   cfg-if@1.0.0
-   chrono-english@0.1.7
-   chrono@0.4.31
-   clang-sys@1.6.1
-   clap@4.4.6
-   clap_builder@4.4.6
-   clap_complete@4.4.3
-   clap_derive@4.4.2
-   clap_lex@0.5.1
-   colorchoice@1.0.0
-   comfy-table@7.1.0
-   command-group@2.1.0
-   console@0.15.7
-   core-foundation-sys@0.8.4
-   cpufeatures@0.2.10
-   crossterm@0.27.0
-   crossterm_winapi@0.9.1
-   crypto-common@0.1.6
-   ctrlc@3.4.1
-   deranged@0.3.9
-   diff@0.1.13
-   difflib@0.4.0
-   digest@0.10.7
-   dirs-sys@0.4.1
-   dirs@5.0.1
-   doc-comment@0.3.3
-   either@1.9.0
-   encode_unicode@0.3.6
-   env_logger@0.10.0
-   equivalent@1.0.1
-   errno@0.3.5
-   fastrand@2.0.1
-   futures-channel@0.3.28
-   futures-core@0.3.28
-   futures-executor@0.3.28
-   futures-io@0.3.28
-   futures-macro@0.3.28
-   futures-sink@0.3.28
-   futures-task@0.3.28
-   

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

[Sam James]

commit: 6a7fd698885348dddc32c2b0527c1434ae6bbb4b
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 30 05:14:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 05:14:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a7fd698

media-sound/pulseaudio-daemon: add freedesktop-gitlab upstream metadata

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

 media-sound/pulseaudio-daemon/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media-sound/pulseaudio-daemon/metadata.xml 
b/media-sound/pulseaudio-daemon/metadata.xml
index e8d9b11581af..b623122bdb00 100644
--- a/media-sound/pulseaudio-daemon/metadata.xml
+++ b/media-sound/pulseaudio-daemon/metadata.xml
@@ -80,4 +80,7 @@
   LDAC over Bluetooth (primarily Sony headphones), requires 
media-plugins/gst-plugins-ldac.
 
   
+  
+pulseaudio/pulseaudio
+  
 

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

[Sam James]

commit: 706b979f22ab83e8880e050f9fe1e84f30082f68
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 30 05:14:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 05:14:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=706b979f

media-libs/libpulse: add freedesktop-gitlab upstream metadata

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

 media-libs/libpulse/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media-libs/libpulse/metadata.xml b/media-libs/libpulse/metadata.xml
index e1b0ba44ee04..fc9c7d5c17ad 100644
--- a/media-libs/libpulse/metadata.xml
+++ b/media-libs/libpulse/metadata.xml
@@ -22,4 +22,7 @@
 Use libasyncns for asynchronous name 
resolution.
 Build the doxygen-described API documentation.
   
+  
+pulseaudio/pulseaudio
+  
 

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

[Zac Medico]

commit: 6a7297abca88c5d86ac299e51a52547baac791f1
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Oct 30 04:43:42 2023 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Oct 30 04:47:55 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=6a7297ab

test_doebuild_fd_pipes.py: multiprocessing spawn compat

Use multiprocessing.Pipe for compatibility with the spawn
start method. Also pass QueryCommand._db to the child
process, like MergeProcess does.

Bug: https://bugs.gentoo.org/916247
Signed-off-by: Zac Medico  gentoo.org>

 lib/portage/tests/ebuild/test_doebuild_fd_pipes.py | 30 ++
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/lib/portage/tests/ebuild/test_doebuild_fd_pipes.py 
b/lib/portage/tests/ebuild/test_doebuild_fd_pipes.py
index 51ddc23908..678486ed16 100644
--- a/lib/portage/tests/ebuild/test_doebuild_fd_pipes.py
+++ b/lib/portage/tests/ebuild/test_doebuild_fd_pipes.py
@@ -1,6 +1,8 @@
 # Copyright 2013-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+import multiprocessing
+
 import portage
 from portage import os
 from portage.tests import TestCase
@@ -13,6 +15,8 @@ from _emerge.PipeReader import PipeReader
 
 
 class DoebuildFdPipesTestCase(TestCase):
+output_fd = 200
+
 def testDoebuild(self):
 """
 Invoke portage.doebuild() with the fd_pipes parameter, and
@@ -21,7 +25,7 @@ class DoebuildFdPipesTestCase(TestCase):
 supported for API consumers (see bug #475812).
 """
 
-output_fd = 200
+output_fd = self.output_fd
 ebuild_body = ["S=${WORKDIR}"]
 for phase_func in (
 "pkg_info",
@@ -117,21 +121,19 @@ class DoebuildFdPipesTestCase(TestCase):
 "clean",
 "merge",
 ):
-pr, pw = os.pipe()
+pr, pw = multiprocessing.Pipe(duplex=False)
 
 producer = ForkProcess(
-target=portage.doebuild,
-args=(ebuildpath, phase),
+target=self._doebuild,
+fd_pipes={
+1: dev_null.fileno(),
+},
+args=(QueryCommand._db, pw, ebuildpath, phase),
 kwargs={
 "settings": settings,
 "mydbapi": portdb,
 "tree": "porttree",
 "vartree": root_config.trees["vartree"],
-"fd_pipes": {
-1: dev_null.fileno(),
-2: dev_null.fileno(),
-output_fd: pw,
-},
 "prev_mtimes": {},
 },
 )
@@ -144,7 +146,7 @@ class DoebuildFdPipesTestCase(TestCase):
 task_scheduler.start()
 finally:
 # PipeReader closes pr
-os.close(pw)
+pw.close()
 
 task_scheduler.wait()
 output = 
portage._unicode_decode(consumer.getvalue()).rstrip("\n")
@@ -161,3 +163,11 @@ class DoebuildFdPipesTestCase(TestCase):
 dev_null.close()
 playground.cleanup()
 QueryCommand._db = None
+
+@staticmethod
+def _doebuild(db, pw, *args, **kwargs):
+QueryCommand._db = db
+kwargs["fd_pipes"] = {
+DoebuildFdPipesTestCase.output_fd: pw.fileno(),
+}
+return portage.doebuild(*args, **kwargs)

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

[Sam James]

commit: a48f695ca8e658c21a396af72018d44473dcda73
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 30 04:59:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 04:59:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a48f695c

sys-devel/kgcc64: add 13.2.1_p20231014

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

 sys-devel/kgcc64/Manifest   |  2 ++
 sys-devel/kgcc64/kgcc64-13.2.1_p20231014.ebuild | 45 +
 2 files changed, 47 insertions(+)

diff --git a/sys-devel/kgcc64/Manifest b/sys-devel/kgcc64/Manifest
index faf703beeebe..8c7ed0ec6c74 100644
--- a/sys-devel/kgcc64/Manifest
+++ b/sys-devel/kgcc64/Manifest
@@ -16,5 +16,7 @@ DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 
715574af9ad678f9dc8cfd19c866bf910c7edfd4
 DIST gcc-12.3.0-musl-patches-1.tar.xz 3572 BLAKE2B 
c7bf65f7c9ea8023ddaac821ee2b778622fa310ac72a72b2f7032494a8f304eac86217f9204622e6c21aaef9952bece0d09bc126facd4f42b602927909815ab5
 SHA512 
babc279fea2c1fd4c018815f2f5630214fd46015ce9f365c28af242681d51818eaca30ce298eddcab1eed5ac5f2759e2b47b2335afab9d722b4469a6d4fec326
 DIST gcc-12.3.0-patches-2.tar.xz 14236 BLAKE2B 
06c43662c9abb0fa3cf90d5e2273c69aecb9158e6cf6f23c04754ed5d686be2616e81e2502eb16f4298ddd50518ca7677e13249da9e9b091162d3931ff65e4fe
 SHA512 
b0d4b85dbf1a541997203b872e3106906b4ad49cde57e1428bc22b2f8e2d73b8cb10ae0d0b792aebaf664594da4d1dea04c44ddc34e59047410766db04d1
 DIST gcc-13-20230826.tar.xz 84285788 BLAKE2B 
c25be594e322dd7145245c42ae21b98aa9e3e6ae69f1fa313830e40bf2e8fcb8435762f1c9d3f1ca1dbf31653bdc76a658bec708b7850fe40a7c55504ac30618
 SHA512 
3d47632e90651bd50a881c727c1ef2aa3322b4fc3e082919ae430270901abf8a05a34fe93f8b678c10dc9a0758f93dc3b33ed5947c8743dab453d2b50c063722
+DIST gcc-13-20231014.tar.xz 84317080 BLAKE2B 
18c2326f203951d16904e4f2bf7fa0cd55da0460b19a9c9ce45de94b41fa71f8c1b8eb9d08700de427b3e02c2e61d3cbcc85cb6f27236717dca8359bfaf4c534
 SHA512 
406673a62deba759fc0532a801b3f57cabf894ea328587b23e62a707ba5767b0e3ae9b3f86bf3c6fcf13e8a3c30bc470e6598b625c8231efb629034211c162c2
 DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B 
c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb
 SHA512 
a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69
 DIST gcc-13.2.0-patches-7.tar.xz 37064 BLAKE2B 
4a8700a8d44bfaa84926f8bfd0da4c5b0c0377f47fc0679456e909f7c9029b9cf1b72c0ba0bc505d9035d5c38e27f7e5b029727eaf2bc7aca417a6be966b2f43
 SHA512 
f440c97e6782ecb8581d41608e31a648ac426e2d870bc1d171da7794cdeff2fd0546cae0c7214e72fd3a00ead8a5c66f3f633b670b74553a2f3a40378b51f20c
+DIST gcc-13.2.0-patches-9.tar.xz 45724 BLAKE2B 
5135f00ed2ac0db8b1e295f2ba9abb44fd4b5e26037083f012c5c104c301fd11c1b04179a7f777f1433d3e6e3e50e64d79a7f9ff263269cde52ded7ca5416448
 SHA512 
81158d7b260d2ca457553f2749333aea69b40b4896a156a2b81168124bf91469b8124c788e54b44cadc1215bbb69590d013385fbab2b4962ed5e36c697710165

diff --git a/sys-devel/kgcc64/kgcc64-13.2.1_p20231014.ebuild 
b/sys-devel/kgcc64/kgcc64-13.2.1_p20231014.ebuild
new file mode 100644
index ..18690faed9c1
--- /dev/null
+++ b/sys-devel/kgcc64/kgcc64-13.2.1_p20231014.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+case ${CHOST} in
+   hppa*)CTARGET=hppa64-${CHOST#*-};;
+   mips*)CTARGET=${CHOST/mips/mips64};;
+   powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
+   s390*)CTARGET=${CHOST/s390/s390x};;
+   sparc*)   CTARGET=${CHOST/sparc/sparc64};;
+   i?86*)CTARGET=x86_64-${CHOST#*-};;
+esac
+export CTARGET
+TOOLCHAIN_ALLOWED_LANGS="c"
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="9"
+PATCH_GCC_VER="13.2.0"
+MUSL_VER="2"
+MUSL_GCC_VER="13.2.0"
+GCC_TARGET_NO_MULTILIB=true
+inherit toolchain
+
+DESCRIPTION="64bit kernel compiler"
+
+# Works on hppa and mips; all other archs, refer to bug #228115
+KEYWORDS="~hppa"
+
+# unlike every other target, hppa has not unified the 32/64 bit
+# ports in binutils yet
+BDEPEND="hppa? ( sys-devel/binutils-hppa64 )"
+
+pkg_postinst() {
+   toolchain_pkg_postinst
+
+   cd "${ROOT}"/usr/bin
+   local x
+   for x in gcc cpp ; do
+   cat <<-EOF >${CTARGET%%-*}-linux-${x}
+   #!/bin/sh
+   exec ${CTARGET}-${x} "\$@"
+   EOF
+   chmod a+rx ${CTARGET%%-*}-linux-${x}
+   done
+}

[gentoo-commits] repo/gentoo:master commit in: games-strategy/war1gus/

[Michał Górny]

commit: 2b58001b7574b7bd228101ddd587ad4e3541903e
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Oct 30 04:33:32 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Oct 30 04:38:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b58001b

games-strategy/war1gus: Add BDEP on imagemagick-tools

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

 games-strategy/war1gus/war1gus-3.3.2.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/games-strategy/war1gus/war1gus-3.3.2.ebuild 
b/games-strategy/war1gus/war1gus-3.3.2.ebuild
index d61b049b1854..b33d840beabb 100644
--- a/games-strategy/war1gus/war1gus-3.3.2.ebuild
+++ b/games-strategy/war1gus/war1gus-3.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -30,6 +30,7 @@ RDEPEND="
${DEPEND}
 "
 BDEPEND="
+   virtual/imagemagick-tools[png]
virtual/pkgconfig
 "
 

[gentoo-commits] repo/gentoo:master commit in: www-client/microsoft-edge-dev/

[Sam James]

commit: 49fbda3bdfb52e0de6aab8a1ca4305dd1e321aaf
Author: Matt Jolly  footclan  ninja>
AuthorDate: Mon Oct 30 04:11:57 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 04:34:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49fbda3b

www-client/microsoft-edge-dev: automated bump (120.0.2172.1)

Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: Sam James  gentoo.org>

 www-client/microsoft-edge-dev/Manifest |   1 +
 .../microsoft-edge-dev-120.0.2172.1.ebuild | 127 +
 2 files changed, 128 insertions(+)

diff --git a/www-client/microsoft-edge-dev/Manifest 
b/www-client/microsoft-edge-dev/Manifest
index 638399adc6bc..a9e17ed1c5f6 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,3 +1,4 @@
 DIST microsoft-edge-dev_119.0.2132.0-1_amd64.deb 156550394 BLAKE2B 
968bd934f5de2b843bb5b862c03427a23662c73e0bbbcfc82a2ee2aee23a761bcb90396d15e18ef4ffac42cc6036294d7dcc22f494a9fe62a7c5bbeff17dacfd
 SHA512 
82d3895e8f947973484f5d872e0e9081d37f7855ab0bb4614e647df17abccb627f3f8c4c8e6a2e539f8d79adceefc46614d5279c351d64037d71250bdac57929
 DIST microsoft-edge-dev_119.0.2151.2-1_amd64.deb 158898010 BLAKE2B 
1187a463aad28a2dda61a48128da3868f0953c156774d19cb78e5c54beba1cf3495183b162e2ad1058a466d01c4b310255cb8de1bb50340685d5e076936dd6ae
 SHA512 
94599b65ad331b2ff14adb59e75554a6fb24afac9789a0496d9e371c1463e5c1fbee3b777f10346e9f57092d5acdf4367f8a1faaf66b80e4d9a44bc606b5c285
 DIST microsoft-edge-dev_120.0.2165.1-1_amd64.deb 165634914 BLAKE2B 
83cf0056efd2271a377cea2df938a5141e6641b64f91d440634459891e2fc55729265fcd9d830f55d6beeb3507c5d9335b4442a467886c50c1893083b1daa695
 SHA512 
19b795e28bb85f680cef2a1f408d163f51f5e31390c599120d900bd10a22971037a87dd666a95362c24e70d3e2f3698b0568127fee78fb6d451b59483c608d0f
+DIST microsoft-edge-dev_120.0.2172.1-1_amd64.deb 165819694 BLAKE2B 
329fe0a91f7ba032fa335142288a1ee7a444d7cf8e0ee3cbda5a2263ca006480e48fc9d880df62e4ad7ff4c9a02dc8900f4e389a9835d541f154fe774408262f
 SHA512 
a58317a76fba75f8c290339b8e740571accfe069051b75b007fb606e441f090f2d0d95d7c589be383996900b036642eaca1a35502d76fb3aaf509a18cc2a4467

diff --git 
a/www-client/microsoft-edge-dev/microsoft-edge-dev-120.0.2172.1.ebuild 
b/www-client/microsoft-edge-dev/microsoft-edge-dev-120.0.2172.1.ebuild
new file mode 100644
index ..ef74386492f2
--- /dev/null
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-120.0.2172.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2011-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit chromium-2 desktop pax-utils unpacker xdg
+
+DESCRIPTION="The web browser from Microsoft"
+HOMEPAGE="https://www.microsoft.com/en-us/edge;
+
+if [[ ${PN} == microsoft-edge ]]; then
+   MY_PN=${PN}-stable
+else
+   MY_PN=${PN}
+fi
+
+KEYWORDS="-* ~amd64"
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb;
+
+LICENSE="microsoft-edge"
+SLOT="0"
+RESTRICT="bindist mirror strip"
+IUSE="+mip qt5 qt6"
+
+RDEPEND="
+   >=app-accessibility/at-spi2-core-2.46.0:2
+   app-misc/ca-certificates
+   dev-libs/expat
+   dev-libs/glib:2
+   dev-libs/nspr
+   dev-libs/nss
+   media-fonts/liberation-fonts
+   media-libs/alsa-lib
+   media-libs/mesa[gbm(+)]
+   net-misc/curl[ssl]
+   net-print/cups
+   sys-apps/dbus
+   sys-apps/util-linux
+   sys-libs/glibc
+   x11-libs/cairo
+   x11-libs/gdk-pixbuf:2
+   x11-libs/gtk+:3[X]
+   x11-libs/libdrm
+   x11-libs/libX11
+   x11-libs/libXcomposite
+   x11-libs/libXdamage
+   x11-libs/libXext
+   x11-libs/libXfixes
+   x11-libs/libXrandr
+   x11-libs/libxcb
+   x11-libs/libxkbcommon
+   x11-libs/libxshmfence
+   x11-libs/pango
+   x11-misc/xdg-utils
+   mip? ( app-crypt/libsecret )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5[X]
+   dev-qt/qtwidgets:5
+   )
+   qt6? ( dev-qt/qtbase:6[gui,widgets] )
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
+S=${WORKDIR}
+EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
+
+pkg_nofetch() {
+   eerror "Please wait 24 hours and sync your tree before reporting a bug 
for microsoft-edge fetch failures."
+}
+
+pkg_pretend() {
+   # Protect against people using autounmask overzealously
+   use amd64 || die "microsoft-edge only works on amd64"
+}
+
+pkg_setup() {
+   chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+   :
+}
+
+src_install() {
+   dodir /
+   cd "${ED}" || die
+   unpacker
+
+   rm -f _gpgorigin || die
+
+   rm -r etc usr/share/menu || die
+   mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+   gzip -d usr/share/doc/${PF}/changelog.gz || die
+   gzip -d 

[gentoo-commits] repo/gentoo:master commit in: www-client/microsoft-edge-beta/

[Sam James]

commit: 15bf64c94821215ac5343166366c154969d276cc
Author: Matt Jolly  footclan  ninja>
AuthorDate: Mon Oct 30 04:09:06 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 04:34:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15bf64c9

www-client/microsoft-edge-beta: automated bump (119.0.2151.32)

Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: Sam James  gentoo.org>

 www-client/microsoft-edge-beta/Manifest|   1 +
 .../microsoft-edge-beta-119.0.2151.32.ebuild   | 127 +
 2 files changed, 128 insertions(+)

diff --git a/www-client/microsoft-edge-beta/Manifest 
b/www-client/microsoft-edge-beta/Manifest
index ff858c1392ed..cafbf8097415 100644
--- a/www-client/microsoft-edge-beta/Manifest
+++ b/www-client/microsoft-edge-beta/Manifest
@@ -1,3 +1,4 @@
 DIST microsoft-edge-beta_118.0.2088.46-1_amd64.deb 156523154 BLAKE2B 
0a109be71991535ebbe59c45df0c5ff6fdfa336a1239fe89c8a738cc3387b6d036aa1baa31bde344f8abcbe4025277bead080ae861b02d8c966b720b8a4936a9
 SHA512 
1a4067e488855a28d7d07ddc44adade9300953c551b0251612fa70621b9a71566b5b9190868a3312b99d14a320bdcb59219957ab0a090aa226e383b122013bf9
 DIST microsoft-edge-beta_119.0.2151.12-1_amd64.deb 164982622 BLAKE2B 
b4f4cfa3147f11ccc2886395b929bccb2bcf10e74d5a8f3cdc7b6a7a02741cb549a76ecdc1e4f0e092db48bb86f181d9a130a44e3969448d918e12df8e5188b6
 SHA512 
f48d032fa2fe2327c08c18743342e89b3118861888147d2480bc97da0845d00ebb4bbc70e143e3d85c9d38d0054f4900c87ae238669833c2d916545195eaba52
 DIST microsoft-edge-beta_119.0.2151.24-1_amd64.deb 165136830 BLAKE2B 
f08fa990ce79044cdc84eeadfb850584230c414640398b92cbfabf618e18f2d4308d794361ae480cfcf2b4c907bf769a1ff20e12adc515ebceb8ddceba0c8e8a
 SHA512 
a31dea373b5d491a71af5c907b4b406323e75a909c2d87bee2d996adaa454cb390be13b5b8c05a4117a3325d832f4bd6b119e41c1cd7ef04db8d5c4ea531ea2b
+DIST microsoft-edge-beta_119.0.2151.32-1_amd64.deb 165158246 BLAKE2B 
fd492414b4dccca16c07889b4466d35d92084ed25fe49f8fe8e500a451ae92f0d0836bbcd6653ba19bc080272a5efe51a55103a9e06969f3ff4ceb9cc12520d2
 SHA512 
9258e3c2e3d6eebea39890324f6219038c73463dd2b13f24c8d0cef6a5200b5b8522851ebe533ebd6e101bc4da2c9c32946383167a019dfbff3d6904a7dca45c

diff --git 
a/www-client/microsoft-edge-beta/microsoft-edge-beta-119.0.2151.32.ebuild 
b/www-client/microsoft-edge-beta/microsoft-edge-beta-119.0.2151.32.ebuild
new file mode 100644
index ..ef74386492f2
--- /dev/null
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-119.0.2151.32.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2011-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit chromium-2 desktop pax-utils unpacker xdg
+
+DESCRIPTION="The web browser from Microsoft"
+HOMEPAGE="https://www.microsoft.com/en-us/edge;
+
+if [[ ${PN} == microsoft-edge ]]; then
+   MY_PN=${PN}-stable
+else
+   MY_PN=${PN}
+fi
+
+KEYWORDS="-* ~amd64"
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb;
+
+LICENSE="microsoft-edge"
+SLOT="0"
+RESTRICT="bindist mirror strip"
+IUSE="+mip qt5 qt6"
+
+RDEPEND="
+   >=app-accessibility/at-spi2-core-2.46.0:2
+   app-misc/ca-certificates
+   dev-libs/expat
+   dev-libs/glib:2
+   dev-libs/nspr
+   dev-libs/nss
+   media-fonts/liberation-fonts
+   media-libs/alsa-lib
+   media-libs/mesa[gbm(+)]
+   net-misc/curl[ssl]
+   net-print/cups
+   sys-apps/dbus
+   sys-apps/util-linux
+   sys-libs/glibc
+   x11-libs/cairo
+   x11-libs/gdk-pixbuf:2
+   x11-libs/gtk+:3[X]
+   x11-libs/libdrm
+   x11-libs/libX11
+   x11-libs/libXcomposite
+   x11-libs/libXdamage
+   x11-libs/libXext
+   x11-libs/libXfixes
+   x11-libs/libXrandr
+   x11-libs/libxcb
+   x11-libs/libxkbcommon
+   x11-libs/libxshmfence
+   x11-libs/pango
+   x11-misc/xdg-utils
+   mip? ( app-crypt/libsecret )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5[X]
+   dev-qt/qtwidgets:5
+   )
+   qt6? ( dev-qt/qtbase:6[gui,widgets] )
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
+S=${WORKDIR}
+EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
+
+pkg_nofetch() {
+   eerror "Please wait 24 hours and sync your tree before reporting a bug 
for microsoft-edge fetch failures."
+}
+
+pkg_pretend() {
+   # Protect against people using autounmask overzealously
+   use amd64 || die "microsoft-edge only works on amd64"
+}
+
+pkg_setup() {
+   chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+   :
+}
+
+src_install() {
+   dodir /
+   cd "${ED}" || die
+   unpacker
+
+   rm -f _gpgorigin || die
+
+   rm -r etc usr/share/menu || die
+   mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+   gzip -d usr/share/doc/${PF}/changelog.gz || die
+   gzip -d 

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

[Sam James]

commit: 9a0f1cd0078526380df5a944197fe0f906c1af7f
Author: Matt Jolly  footclan  ninja>
AuthorDate: Mon Oct 30 04:05:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 04:34:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a0f1cd0

www-client/microsoft-edge: automated bump (118.0.2088.76)

Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: Sam James  gentoo.org>

 www-client/microsoft-edge/Manifest |   1 +
 .../microsoft-edge-118.0.2088.76.ebuild| 127 +
 2 files changed, 128 insertions(+)

diff --git a/www-client/microsoft-edge/Manifest 
b/www-client/microsoft-edge/Manifest
index 6ba8ee10b261..bc0dad1e74c8 100644
--- a/www-client/microsoft-edge/Manifest
+++ b/www-client/microsoft-edge/Manifest
@@ -1 +1,2 @@
 DIST microsoft-edge-stable_118.0.2088.69-1_amd64.deb 162648426 BLAKE2B 
194c1efc4c8a6dab694b6614a85bdfd7ed6eda99517910f9b92c7e3de5aa4cee2d38474d39798b36b8740031bd0f0dd44eac8718284044b3302c5e84106ca73f
 SHA512 
f46de63c31d41cf8da7fd2eeb27c5a4989cbbeba5ec7dd4bba4d767d176d306b7da1db3e064cc568a7ceb2eea8c60e7f9eed6fc0e281e32cfde131cfc498eeb9
+DIST microsoft-edge-stable_118.0.2088.76-1_amd64.deb 162623982 BLAKE2B 
85195234363e120527d809f684e54605b8a7e0443a0020505eebc7883c538b9f98ab28b5c2b46dec1610503db2c1c60a9b5fc9a1b7433b4a136e2157781cb220
 SHA512 
b7226c3c46dbff4d863057d9ff7692b592a8c4288ca18947e9d0cfe68b0ce35567db61099f7e4ae3fee49e75c72ca1cd5b31fa45a8d01a633bf3618afd5c02a2

diff --git a/www-client/microsoft-edge/microsoft-edge-118.0.2088.76.ebuild 
b/www-client/microsoft-edge/microsoft-edge-118.0.2088.76.ebuild
new file mode 100644
index ..ef74386492f2
--- /dev/null
+++ b/www-client/microsoft-edge/microsoft-edge-118.0.2088.76.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2011-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit chromium-2 desktop pax-utils unpacker xdg
+
+DESCRIPTION="The web browser from Microsoft"
+HOMEPAGE="https://www.microsoft.com/en-us/edge;
+
+if [[ ${PN} == microsoft-edge ]]; then
+   MY_PN=${PN}-stable
+else
+   MY_PN=${PN}
+fi
+
+KEYWORDS="-* ~amd64"
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb;
+
+LICENSE="microsoft-edge"
+SLOT="0"
+RESTRICT="bindist mirror strip"
+IUSE="+mip qt5 qt6"
+
+RDEPEND="
+   >=app-accessibility/at-spi2-core-2.46.0:2
+   app-misc/ca-certificates
+   dev-libs/expat
+   dev-libs/glib:2
+   dev-libs/nspr
+   dev-libs/nss
+   media-fonts/liberation-fonts
+   media-libs/alsa-lib
+   media-libs/mesa[gbm(+)]
+   net-misc/curl[ssl]
+   net-print/cups
+   sys-apps/dbus
+   sys-apps/util-linux
+   sys-libs/glibc
+   x11-libs/cairo
+   x11-libs/gdk-pixbuf:2
+   x11-libs/gtk+:3[X]
+   x11-libs/libdrm
+   x11-libs/libX11
+   x11-libs/libXcomposite
+   x11-libs/libXdamage
+   x11-libs/libXext
+   x11-libs/libXfixes
+   x11-libs/libXrandr
+   x11-libs/libxcb
+   x11-libs/libxkbcommon
+   x11-libs/libxshmfence
+   x11-libs/pango
+   x11-misc/xdg-utils
+   mip? ( app-crypt/libsecret )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5[X]
+   dev-qt/qtwidgets:5
+   )
+   qt6? ( dev-qt/qtbase:6[gui,widgets] )
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
+S=${WORKDIR}
+EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
+
+pkg_nofetch() {
+   eerror "Please wait 24 hours and sync your tree before reporting a bug 
for microsoft-edge fetch failures."
+}
+
+pkg_pretend() {
+   # Protect against people using autounmask overzealously
+   use amd64 || die "microsoft-edge only works on amd64"
+}
+
+pkg_setup() {
+   chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+   :
+}
+
+src_install() {
+   dodir /
+   cd "${ED}" || die
+   unpacker
+
+   rm -f _gpgorigin || die
+
+   rm -r etc usr/share/menu || die
+   mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+   gzip -d usr/share/doc/${PF}/changelog.gz || die
+   gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+   if [[ -L usr/share/man/man1/${PN}.1.gz ]]; then
+   rm usr/share/man/man1/${PN}.1.gz || die
+   dosym ${MY_PN}.1 usr/share/man/man1/${PN}.1
+   fi
+
+   local suffix=
+   [[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
+   [[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
+
+   local size
+   for size in 16 24 32 48 64 128 256 ; do
+   newicon -s ${size} 
"${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+   done
+
+   if ! use mip; then
+   rm "${EDGE_HOME}"/libmip_{core,protection_sdk}.so || die
+   fi
+
+   if ! use qt5; then
+   rm "${EDGE_HOME}/libqt5_shim.so" || die

[gentoo-commits] repo/gentoo:master commit in: www-client/google-chrome-unstable/

[Sam James]

commit: 5a27d8b9c3bd77d4b1a57da707f45dc7ee5be5c2
Author: Matt Jolly  footclan  ninja>
AuthorDate: Mon Oct 30 04:01:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 04:34:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a27d8b9

www-client/google-chrome-unstable: automated update (120.0.6090.0)

Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: Sam James  gentoo.org>

 www-client/google-chrome-unstable/Manifest  | 2 +-
 ...e-120.0.6073.0.ebuild => google-chrome-unstable-120.0.6090.0.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/google-chrome-unstable/Manifest 
b/www-client/google-chrome-unstable/Manifest
index 7786b67a7344..66c61f3d91d2 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1 +1 @@
-DIST google-chrome-unstable_120.0.6073.0-1_amd64.deb 104592576 BLAKE2B 
fc4de22c931a7697d5bdffbe9efa86c9006902fa85a30979a5b660f80d8fdaaa0f439a190ada0511b1aab327029a3a08e64201b8f98e4631cce3f95827c8f560
 SHA512 
0bdaeb6a77fdb6aa13b845908868215be38a6bc78451dd20c5d16016743e7b2500a2e180d3bb07faee10d6c38db857c6ab8fd57746d8145a92621361c87fb6f2
+DIST google-chrome-unstable_120.0.6090.0-1_amd64.deb 104940424 BLAKE2B 
77a6bb54602127ce89d037d2a83fdab828032ea6e8a076b2def9b0b4bb02a1144eee4d972b7af1206bf9fee58df5a5771179014806d5c565e4c58ad7f1d1cbba
 SHA512 
1a046f0e2f7c9b21a30af6727169b8c2ad95d384e0a2490beebb4fbf911a2f76d8b4f8681b474eb6b11a26ed9ba7f643f7decfb904692824999175aab543d9de

diff --git 
a/www-client/google-chrome-unstable/google-chrome-unstable-120.0.6073.0.ebuild 
b/www-client/google-chrome-unstable/google-chrome-unstable-120.0.6090.0.ebuild
similarity index 100%
rename from 
www-client/google-chrome-unstable/google-chrome-unstable-120.0.6073.0.ebuild
rename to 
www-client/google-chrome-unstable/google-chrome-unstable-120.0.6090.0.ebuild

[gentoo-commits] repo/gentoo:master commit in: www-client/microsoft-edge-beta/

[Sam James]

commit: cee742031183aabe5b991ff853d5a0163bf2b745
Author: Matt Jolly  footclan  ninja>
AuthorDate: Mon Oct 30 04:09:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 04:34:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cee74203

www-client/microsoft-edge-beta: remove old

Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: Sam James  gentoo.org>

 www-client/microsoft-edge-beta/Manifest|   1 -
 .../microsoft-edge-beta-118.0.2088.46.ebuild   | 127 -
 2 files changed, 128 deletions(-)

diff --git a/www-client/microsoft-edge-beta/Manifest 
b/www-client/microsoft-edge-beta/Manifest
index cafbf8097415..0dc0d41951c8 100644
--- a/www-client/microsoft-edge-beta/Manifest
+++ b/www-client/microsoft-edge-beta/Manifest
@@ -1,4 +1,3 @@
-DIST microsoft-edge-beta_118.0.2088.46-1_amd64.deb 156523154 BLAKE2B 
0a109be71991535ebbe59c45df0c5ff6fdfa336a1239fe89c8a738cc3387b6d036aa1baa31bde344f8abcbe4025277bead080ae861b02d8c966b720b8a4936a9
 SHA512 
1a4067e488855a28d7d07ddc44adade9300953c551b0251612fa70621b9a71566b5b9190868a3312b99d14a320bdcb59219957ab0a090aa226e383b122013bf9
 DIST microsoft-edge-beta_119.0.2151.12-1_amd64.deb 164982622 BLAKE2B 
b4f4cfa3147f11ccc2886395b929bccb2bcf10e74d5a8f3cdc7b6a7a02741cb549a76ecdc1e4f0e092db48bb86f181d9a130a44e3969448d918e12df8e5188b6
 SHA512 
f48d032fa2fe2327c08c18743342e89b3118861888147d2480bc97da0845d00ebb4bbc70e143e3d85c9d38d0054f4900c87ae238669833c2d916545195eaba52
 DIST microsoft-edge-beta_119.0.2151.24-1_amd64.deb 165136830 BLAKE2B 
f08fa990ce79044cdc84eeadfb850584230c414640398b92cbfabf618e18f2d4308d794361ae480cfcf2b4c907bf769a1ff20e12adc515ebceb8ddceba0c8e8a
 SHA512 
a31dea373b5d491a71af5c907b4b406323e75a909c2d87bee2d996adaa454cb390be13b5b8c05a4117a3325d832f4bd6b119e41c1cd7ef04db8d5c4ea531ea2b
 DIST microsoft-edge-beta_119.0.2151.32-1_amd64.deb 165158246 BLAKE2B 
fd492414b4dccca16c07889b4466d35d92084ed25fe49f8fe8e500a451ae92f0d0836bbcd6653ba19bc080272a5efe51a55103a9e06969f3ff4ceb9cc12520d2
 SHA512 
9258e3c2e3d6eebea39890324f6219038c73463dd2b13f24c8d0cef6a5200b5b8522851ebe533ebd6e101bc4da2c9c32946383167a019dfbff3d6904a7dca45c

diff --git 
a/www-client/microsoft-edge-beta/microsoft-edge-beta-118.0.2088.46.ebuild 
b/www-client/microsoft-edge-beta/microsoft-edge-beta-118.0.2088.46.ebuild
deleted file mode 100644
index ef74386492f2..
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-118.0.2088.46.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2011-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit chromium-2 desktop pax-utils unpacker xdg
-
-DESCRIPTION="The web browser from Microsoft"
-HOMEPAGE="https://www.microsoft.com/en-us/edge;
-
-if [[ ${PN} == microsoft-edge ]]; then
-   MY_PN=${PN}-stable
-else
-   MY_PN=${PN}
-fi
-
-KEYWORDS="-* ~amd64"
-
-MY_P="${MY_PN}_${PV}-1"
-
-SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb;
-
-LICENSE="microsoft-edge"
-SLOT="0"
-RESTRICT="bindist mirror strip"
-IUSE="+mip qt5 qt6"
-
-RDEPEND="
-   >=app-accessibility/at-spi2-core-2.46.0:2
-   app-misc/ca-certificates
-   dev-libs/expat
-   dev-libs/glib:2
-   dev-libs/nspr
-   dev-libs/nss
-   media-fonts/liberation-fonts
-   media-libs/alsa-lib
-   media-libs/mesa[gbm(+)]
-   net-misc/curl[ssl]
-   net-print/cups
-   sys-apps/dbus
-   sys-apps/util-linux
-   sys-libs/glibc
-   x11-libs/cairo
-   x11-libs/gdk-pixbuf:2
-   x11-libs/gtk+:3[X]
-   x11-libs/libdrm
-   x11-libs/libX11
-   x11-libs/libXcomposite
-   x11-libs/libXdamage
-   x11-libs/libXext
-   x11-libs/libXfixes
-   x11-libs/libXrandr
-   x11-libs/libxcb
-   x11-libs/libxkbcommon
-   x11-libs/libxshmfence
-   x11-libs/pango
-   x11-misc/xdg-utils
-   mip? ( app-crypt/libsecret )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5[X]
-   dev-qt/qtwidgets:5
-   )
-   qt6? ( dev-qt/qtbase:6[gui,widgets] )
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
-S=${WORKDIR}
-EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
-
-pkg_nofetch() {
-   eerror "Please wait 24 hours and sync your tree before reporting a bug 
for microsoft-edge fetch failures."
-}
-
-pkg_pretend() {
-   # Protect against people using autounmask overzealously
-   use amd64 || die "microsoft-edge only works on amd64"
-}
-
-pkg_setup() {
-   chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-   :
-}
-
-src_install() {
-   dodir /
-   cd "${ED}" || die
-   unpacker
-
-   rm -f _gpgorigin || die
-
-   rm -r etc usr/share/menu || die
-   mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-   gzip -d usr/share/doc/${PF}/changelog.gz || die
-   gzip -d 

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

[Sam James]

commit: 563d533e57cd08712c9122a7c1a702ddcb8f60b3
Author: Matt Jolly  footclan  ninja>
AuthorDate: Mon Oct 30 04:05:25 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 04:34:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=563d533e

www-client/microsoft-edge: remove old

Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: Sam James  gentoo.org>

 www-client/microsoft-edge/Manifest |   1 -
 .../microsoft-edge-118.0.2088.69.ebuild| 127 -
 2 files changed, 128 deletions(-)

diff --git a/www-client/microsoft-edge/Manifest 
b/www-client/microsoft-edge/Manifest
index bc0dad1e74c8..0a3786c3f920 100644
--- a/www-client/microsoft-edge/Manifest
+++ b/www-client/microsoft-edge/Manifest
@@ -1,2 +1 @@
-DIST microsoft-edge-stable_118.0.2088.69-1_amd64.deb 162648426 BLAKE2B 
194c1efc4c8a6dab694b6614a85bdfd7ed6eda99517910f9b92c7e3de5aa4cee2d38474d39798b36b8740031bd0f0dd44eac8718284044b3302c5e84106ca73f
 SHA512 
f46de63c31d41cf8da7fd2eeb27c5a4989cbbeba5ec7dd4bba4d767d176d306b7da1db3e064cc568a7ceb2eea8c60e7f9eed6fc0e281e32cfde131cfc498eeb9
 DIST microsoft-edge-stable_118.0.2088.76-1_amd64.deb 162623982 BLAKE2B 
85195234363e120527d809f684e54605b8a7e0443a0020505eebc7883c538b9f98ab28b5c2b46dec1610503db2c1c60a9b5fc9a1b7433b4a136e2157781cb220
 SHA512 
b7226c3c46dbff4d863057d9ff7692b592a8c4288ca18947e9d0cfe68b0ce35567db61099f7e4ae3fee49e75c72ca1cd5b31fa45a8d01a633bf3618afd5c02a2

diff --git a/www-client/microsoft-edge/microsoft-edge-118.0.2088.69.ebuild 
b/www-client/microsoft-edge/microsoft-edge-118.0.2088.69.ebuild
deleted file mode 100644
index 332a69d1f006..
--- a/www-client/microsoft-edge/microsoft-edge-118.0.2088.69.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2011-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit chromium-2 desktop pax-utils unpacker xdg
-
-DESCRIPTION="The web browser from Microsoft"
-HOMEPAGE="https://www.microsoft.com/en-us/edge;
-
-if [[ ${PN} == microsoft-edge ]]; then
-   MY_PN=${PN}-stable
-else
-   MY_PN=${PN}
-fi
-
-KEYWORDS="-* amd64"
-
-MY_P="${MY_PN}_${PV}-1"
-
-SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb;
-
-LICENSE="microsoft-edge"
-SLOT="0"
-RESTRICT="bindist mirror strip"
-IUSE="+mip qt5 qt6"
-
-RDEPEND="
-   >=app-accessibility/at-spi2-core-2.46.0:2
-   app-misc/ca-certificates
-   dev-libs/expat
-   dev-libs/glib:2
-   dev-libs/nspr
-   dev-libs/nss
-   media-fonts/liberation-fonts
-   media-libs/alsa-lib
-   media-libs/mesa[gbm(+)]
-   net-misc/curl[ssl]
-   net-print/cups
-   sys-apps/dbus
-   sys-apps/util-linux
-   sys-libs/glibc
-   x11-libs/cairo
-   x11-libs/gdk-pixbuf:2
-   x11-libs/gtk+:3[X]
-   x11-libs/libdrm
-   x11-libs/libX11
-   x11-libs/libXcomposite
-   x11-libs/libXdamage
-   x11-libs/libXext
-   x11-libs/libXfixes
-   x11-libs/libXrandr
-   x11-libs/libxcb
-   x11-libs/libxkbcommon
-   x11-libs/libxshmfence
-   x11-libs/pango
-   x11-misc/xdg-utils
-   mip? ( app-crypt/libsecret )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5[X]
-   dev-qt/qtwidgets:5
-   )
-   qt6? ( dev-qt/qtbase:6[gui,widgets] )
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
-S=${WORKDIR}
-EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
-
-pkg_nofetch() {
-   eerror "Please wait 24 hours and sync your tree before reporting a bug 
for microsoft-edge fetch failures."
-}
-
-pkg_pretend() {
-   # Protect against people using autounmask overzealously
-   use amd64 || die "microsoft-edge only works on amd64"
-}
-
-pkg_setup() {
-   chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-   :
-}
-
-src_install() {
-   dodir /
-   cd "${ED}" || die
-   unpacker
-
-   rm -f _gpgorigin || die
-
-   rm -r etc usr/share/menu || die
-   mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-   gzip -d usr/share/doc/${PF}/changelog.gz || die
-   gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
-   if [[ -L usr/share/man/man1/${PN}.1.gz ]]; then
-   rm usr/share/man/man1/${PN}.1.gz || die
-   dosym ${MY_PN}.1 usr/share/man/man1/${PN}.1
-   fi
-
-   local suffix=
-   [[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
-   [[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
-
-   local size
-   for size in 16 24 32 48 64 128 256 ; do
-   newicon -s ${size} 
"${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
-   done
-
-   if ! use mip; then
-   rm "${EDGE_HOME}"/libmip_{core,protection_sdk}.so || die
-   fi
-
-   if ! use qt5; then
-   rm "${EDGE_HOME}/libqt5_shim.so" || die
-   fi
-   

[gentoo-commits] repo/gentoo:master commit in: www-client/microsoft-edge-dev/

[Sam James]

commit: 28a2abaabdb279f728aaefe15bbd05d7be90ec88
Author: Matt Jolly  footclan  ninja>
AuthorDate: Mon Oct 30 04:12:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 04:34:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28a2abaa

www-client/microsoft-edge-dev: remove old

Signed-off-by: Matt Jolly  footclan.ninja>
Closes: https://github.com/gentoo/gentoo/pull/33585
Signed-off-by: Sam James  gentoo.org>

 www-client/microsoft-edge-dev/Manifest |   1 -
 .../microsoft-edge-dev-119.0.2132.0.ebuild | 127 -
 2 files changed, 128 deletions(-)

diff --git a/www-client/microsoft-edge-dev/Manifest 
b/www-client/microsoft-edge-dev/Manifest
index a9e17ed1c5f6..fbf5b52e756d 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,4 +1,3 @@
-DIST microsoft-edge-dev_119.0.2132.0-1_amd64.deb 156550394 BLAKE2B 
968bd934f5de2b843bb5b862c03427a23662c73e0bbbcfc82a2ee2aee23a761bcb90396d15e18ef4ffac42cc6036294d7dcc22f494a9fe62a7c5bbeff17dacfd
 SHA512 
82d3895e8f947973484f5d872e0e9081d37f7855ab0bb4614e647df17abccb627f3f8c4c8e6a2e539f8d79adceefc46614d5279c351d64037d71250bdac57929
 DIST microsoft-edge-dev_119.0.2151.2-1_amd64.deb 158898010 BLAKE2B 
1187a463aad28a2dda61a48128da3868f0953c156774d19cb78e5c54beba1cf3495183b162e2ad1058a466d01c4b310255cb8de1bb50340685d5e076936dd6ae
 SHA512 
94599b65ad331b2ff14adb59e75554a6fb24afac9789a0496d9e371c1463e5c1fbee3b777f10346e9f57092d5acdf4367f8a1faaf66b80e4d9a44bc606b5c285
 DIST microsoft-edge-dev_120.0.2165.1-1_amd64.deb 165634914 BLAKE2B 
83cf0056efd2271a377cea2df938a5141e6641b64f91d440634459891e2fc55729265fcd9d830f55d6beeb3507c5d9335b4442a467886c50c1893083b1daa695
 SHA512 
19b795e28bb85f680cef2a1f408d163f51f5e31390c599120d900bd10a22971037a87dd666a95362c24e70d3e2f3698b0568127fee78fb6d451b59483c608d0f
 DIST microsoft-edge-dev_120.0.2172.1-1_amd64.deb 165819694 BLAKE2B 
329fe0a91f7ba032fa335142288a1ee7a444d7cf8e0ee3cbda5a2263ca006480e48fc9d880df62e4ad7ff4c9a02dc8900f4e389a9835d541f154fe774408262f
 SHA512 
a58317a76fba75f8c290339b8e740571accfe069051b75b007fb606e441f090f2d0d95d7c589be383996900b036642eaca1a35502d76fb3aaf509a18cc2a4467

diff --git 
a/www-client/microsoft-edge-dev/microsoft-edge-dev-119.0.2132.0.ebuild 
b/www-client/microsoft-edge-dev/microsoft-edge-dev-119.0.2132.0.ebuild
deleted file mode 100644
index ef74386492f2..
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-119.0.2132.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2011-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit chromium-2 desktop pax-utils unpacker xdg
-
-DESCRIPTION="The web browser from Microsoft"
-HOMEPAGE="https://www.microsoft.com/en-us/edge;
-
-if [[ ${PN} == microsoft-edge ]]; then
-   MY_PN=${PN}-stable
-else
-   MY_PN=${PN}
-fi
-
-KEYWORDS="-* ~amd64"
-
-MY_P="${MY_PN}_${PV}-1"
-
-SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb;
-
-LICENSE="microsoft-edge"
-SLOT="0"
-RESTRICT="bindist mirror strip"
-IUSE="+mip qt5 qt6"
-
-RDEPEND="
-   >=app-accessibility/at-spi2-core-2.46.0:2
-   app-misc/ca-certificates
-   dev-libs/expat
-   dev-libs/glib:2
-   dev-libs/nspr
-   dev-libs/nss
-   media-fonts/liberation-fonts
-   media-libs/alsa-lib
-   media-libs/mesa[gbm(+)]
-   net-misc/curl[ssl]
-   net-print/cups
-   sys-apps/dbus
-   sys-apps/util-linux
-   sys-libs/glibc
-   x11-libs/cairo
-   x11-libs/gdk-pixbuf:2
-   x11-libs/gtk+:3[X]
-   x11-libs/libdrm
-   x11-libs/libX11
-   x11-libs/libXcomposite
-   x11-libs/libXdamage
-   x11-libs/libXext
-   x11-libs/libXfixes
-   x11-libs/libXrandr
-   x11-libs/libxcb
-   x11-libs/libxkbcommon
-   x11-libs/libxshmfence
-   x11-libs/pango
-   x11-misc/xdg-utils
-   mip? ( app-crypt/libsecret )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5[X]
-   dev-qt/qtwidgets:5
-   )
-   qt6? ( dev-qt/qtbase:6[gui,widgets] )
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
-S=${WORKDIR}
-EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
-
-pkg_nofetch() {
-   eerror "Please wait 24 hours and sync your tree before reporting a bug 
for microsoft-edge fetch failures."
-}
-
-pkg_pretend() {
-   # Protect against people using autounmask overzealously
-   use amd64 || die "microsoft-edge only works on amd64"
-}
-
-pkg_setup() {
-   chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-   :
-}
-
-src_install() {
-   dodir /
-   cd "${ED}" || die
-   unpacker
-
-   rm -f _gpgorigin || die
-
-   rm -r etc usr/share/menu || die
-   mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-   gzip -d usr/share/doc/${PF}/changelog.gz || die
-   

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

[Sam James]

commit: b9815c315baab964ccf412ae064f5df5abb0caa4
Author: Matt Jolly  footclan  ninja>
AuthorDate: Mon Oct 30 04:05:23 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 04:34:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9815c31

www-client/microsoft-edge: amd64 stable (118.0.2088.76)

Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: Sam James  gentoo.org>

 www-client/microsoft-edge/microsoft-edge-118.0.2088.76.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/microsoft-edge/microsoft-edge-118.0.2088.76.ebuild 
b/www-client/microsoft-edge/microsoft-edge-118.0.2088.76.ebuild
index ef74386492f2..332a69d1f006 100644
--- a/www-client/microsoft-edge/microsoft-edge-118.0.2088.76.ebuild
+++ b/www-client/microsoft-edge/microsoft-edge-118.0.2088.76.ebuild
@@ -14,7 +14,7 @@ else
MY_PN=${PN}
 fi
 
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 MY_P="${MY_PN}_${PV}-1"
 

[gentoo-commits] repo/gentoo:master commit in: www-plugins/chrome-binary-plugins/

[Sam James]

commit: 54fa2da3cac1709254a8878cd3e87b9aeee37d45
Author: Matt Jolly  footclan  ninja>
AuthorDate: Mon Oct 30 04:01:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 04:34:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54fa2da3

www-plugins/chrome-binary-plugins: automated update (119.0.6045.59_beta)

Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: Sam James  gentoo.org>

 www-plugins/chrome-binary-plugins/Manifest  | 2 +-
 ...5.33_beta.ebuild => chrome-binary-plugins-119.0.6045.59_beta.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-plugins/chrome-binary-plugins/Manifest 
b/www-plugins/chrome-binary-plugins/Manifest
index 1f7d7510a39a..85118832c17e 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_119.0.6045.33-1_amd64.deb 103904036 BLAKE2B 
0006254d5cacb2093da5ce23689ee65eab3540e56e74fdbb9b033ed123967b846b83e452c134d711c5623301b6f0677345bd493dd0a97998a8f38586e2d91a58
 SHA512 
3df347acb0b89c42ced63f14a9a4d20040235a1b3b63f83139218027533e9b77f1adaef6a66d5a12911de6e70e11ac4561bfe5d1741af2ddd7ec972aa674be06
+DIST google-chrome-beta_119.0.6045.59-1_amd64.deb 103862984 BLAKE2B 
8ef2e9517e7464a3688c7a79b31e633fd8abc7b54b45e4e7c444746b49de16ad7c3699f986a7b862c3c9624925638d7a9487da8ff2e28609e7c418a596b1adfd
 SHA512 
9bf1670ece4a3a6f135f333b7b36377de2979527bc226a8ebb67b1b07f5a19aa87c8ce5bc1211a5c57a31af8fe8bb19164da088680333729f1d8bf8116c155b0
 DIST google-chrome-stable_118.0.5993.117-1_amd64.deb 104057764 BLAKE2B 
6e6623e542695137de7667b1fffe75c901f7c4230bd43653d0b7a422f8af8ffbdef0e0edd336f65cba8525229b90f4ffcb64140788be5fb40083305b25e45b81
 SHA512 
028375ea49a04b04ff6c369b22b40a1a4545201277eef977ba8fa29123d664f29a01a56cabf2418b60d6c65fecd5d567f35e1504271490a8ba5b377df37ecec6
 DIST google-chrome-unstable_120.0.6073.0-1_amd64.deb 104592576 BLAKE2B 
fc4de22c931a7697d5bdffbe9efa86c9006902fa85a30979a5b660f80d8fdaaa0f439a190ada0511b1aab327029a3a08e64201b8f98e4631cce3f95827c8f560
 SHA512 
0bdaeb6a77fdb6aa13b845908868215be38a6bc78451dd20c5d16016743e7b2500a2e180d3bb07faee10d6c38db857c6ab8fd57746d8145a92621361c87fb6f2

diff --git 
a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-119.0.6045.33_beta.ebuild
 
b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-119.0.6045.59_beta.ebuild
similarity index 100%
rename from 
www-plugins/chrome-binary-plugins/chrome-binary-plugins-119.0.6045.33_beta.ebuild
rename to 
www-plugins/chrome-binary-plugins/chrome-binary-plugins-119.0.6045.59_beta.ebuild

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

[Sam James]

commit: 2167f931faf5c8582f776c2ba702f26bc57ee0f2
Author: Matt Jolly  footclan  ninja>
AuthorDate: Mon Oct 30 03:43:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 04:34:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2167f931

www-client/chromium: add 119.0.6045.59

Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: Sam James  gentoo.org>

 www-client/chromium/Manifest  |2 +
 www-client/chromium/chromium-119.0.6045.59.ebuild | 1254 +
 2 files changed, 1256 insertions(+)

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 2f27af2cbfa8..73a17fbee002 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,8 +1,10 @@
 DIST chromium-118.0.5993.117.tar.xz 3249866084 BLAKE2B 
1c832dcd3e4e42d9e19960fb4edd437467571caf1a482b90d47b68148fb91d4fba92e350756aa73549a3d3b93c76b465e4d8b205a0d26656ee7003b3092e3674
 SHA512 
b0d51198af2ecd47199dc06cd829587fcb371d3632623c492cee55de7b11ddf6afec61f016ba4291e379705ec5f2e10b01aa92e493a16ce0ed8dbcdab44ec383
 DIST chromium-118.0.5993.88.tar.xz 3245581816 BLAKE2B 
4e91ad5a5beaa5fd3a8e8b979f47626314fb43a7c1cc84c0b78fb656b7a7b10c4cbfad1767406c6d13ad38b8a91ba4be5aec9c085537bd597cad9f6a9a1005d5
 SHA512 
343700a61102a63c8095d813203a553cde1d0e3a5dca1f11d2ce9752ed5595d953c700e23ab91993626539cd8e831b11820b8b85fe2f51f16517254a43cd1360
 DIST chromium-119.0.6045.33.tar.xz 3287593288 BLAKE2B 
c07ab995f512004a0fab3a0db7188a291167ff6dd945d0422c4d35d34dd7bca3a43e64580c80c291ac5c8fff5a8e7ee9d102176e0f26a47dbd134bafe1a4f5fa
 SHA512 
72172602d072cd6a5a6dd89b1452afc6c94c0acb44790319a23482bfb54579e1e8684920f83abb28bb704f7e5551083dc507a38aa8982abca1f41cdb93bbb406
+DIST chromium-119.0.6045.59.tar.xz 3292462336 BLAKE2B 
28d4cd01ff314bbf99c2e74bb93667300ea30bb05954fec1bf1f24e2e21ca538760ed03ac419c919b41886ab3dc6d9ad508a3a796117c6b0534e75170ef6eac5
 SHA512 
0b66efb25bba35d1747ee256e926971545a72543f34256cd0bf6c690cef8da553884f897b28576a68ab92fa0ff47a5880bbbf243c07198fde4d2a7e5110d
 DIST chromium-patches-118-2.tar.bz2 12691 BLAKE2B 
0cd726527151107ff2b48a1adcc3591808373b4758626a41033a8b28f1819e85d5912381a2c46f6e56c26a3d4397b3c6d679c9b3769d74ecde904bc364ac254d
 SHA512 
4554871f799840e118cf2ceca1996eabe6219918023abe8bf8a2a8dc42ac3439403a9d8b4a2feab6db1ece9228e8f92eecbe531957c92b467c5e66a3b021a036
 DIST chromium-patches-119-2.tar.bz2 7651 BLAKE2B 
4735edac43ab6c0a7dd89511ca661ad7ce3b59f1bcb9c5b011a20e1fbe8a4281064932235be009616717b1e9539b3178daee3460f286ef1559678e4d640037a1
 SHA512 
7ab183f194fe070d3510cbe62c7b0d2f89aed13a6bdee73b7c62d05be59533773e804204633eda36efa85b7ce06c8785b03b266f0f08e200dd5198507ed67348
+DIST chromium-patches-119-3.tar.bz2 8345 BLAKE2B 
70b10a231a71ce8ffc5e4f52450113c46f921a9f08eb95d4adbea0738cfab33fba763c54997a7ef6f36e35df850409062a330eeb8535679b800672de5697ca21
 SHA512 
a1897ea92a9a686bdf93c4ec379ed1c4c5febe1bdaba908ddb2ec0169d8e08b076d2a6ea1e88dd2d0a22dc4972dbfcbab2d3166e95e55ed9c566235e301a6050
 DIST chromium-ppc64le-gentoo-patches-1.tar.xz 5636 BLAKE2B 
1d898939df023c59285b27bee552470483ea06375d1ee8d6947b89c5927c23cc7bfec6b49f3b376ece931d11a56f8e2a45791e0f92ad61974fc8c34c1082d89c
 SHA512 
8a71cb007e47cda8e5fe5d185729389e65c48bd322c8ee8b3986bee8571427b959628f2666bda646a3f89ae64197c0957d3626845ff03461dbd5dee4c964d07c
 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 
5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d
 SHA512 
9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
 DIST chromium_118.0.5993.70-1raptor0~deb11u1.debian.tar.xz 1677024 BLAKE2B 
82cdbb1c30ae333e0a821ca15fbdda902ea31c5072c3e70372dc6fbadf6837e8445c33e741f3820c0d174a91d90c3bd05e8d9aaad988c2605028a46e138e4279
 SHA512 
86da39eef033a51e9abb0fc096ea4688a4a956b675fee92d3ae0ca165d6ca406807320d6e03785e0f11cc98c49b860500387e75b6b4d4aa9a8d94c04c001ac39

diff --git a/www-client/chromium/chromium-119.0.6045.59.ebuild 
b/www-client/chromium/chromium-119.0.6045.59.ebuild
new file mode 100644
index ..e65c5be0eff1
--- /dev/null
+++ b/www-client/chromium/chromium-119.0.6045.59.ebuild
@@ -0,0 +1,1254 @@
+# Copyright 2009-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Can't do 12 yet: heavy use of imp, among other things (bug #915001, bug 
#915062)
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="xml(+)"
+
+# These variables let us easily bound supported compiler versions in one place.
+# The bundled Clang is updated by Google every ~two weeks, so we can't
+# just assume that anything other than the latest version in ::gentoo
+# will work (and even that will probably break occasionally)
+LLVM_MAX_SLOT=17
+LLVM_MIN_SLOT=16
+MIN_GCC_VER=12
+GN_MIN_VER=0.2122
+
+VIRTUALX_REQUIRED="pgo"
+
+CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es 

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

[Sam James]

commit: 04a064dd5ff085afbf8c02bd4e123fe7918e973f
Author: Matt Jolly  footclan  ninja>
AuthorDate: Mon Oct 30 03:59:03 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 04:34:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04a064dd

www-client/chromium: drop 119.0.6045.33

Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: Sam James  gentoo.org>

 www-client/chromium/Manifest  |2 -
 www-client/chromium/chromium-119.0.6045.33.ebuild | 1254 -
 2 files changed, 1256 deletions(-)

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 73a17fbee002..3d19b7e855e7 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,9 +1,7 @@
 DIST chromium-118.0.5993.117.tar.xz 3249866084 BLAKE2B 
1c832dcd3e4e42d9e19960fb4edd437467571caf1a482b90d47b68148fb91d4fba92e350756aa73549a3d3b93c76b465e4d8b205a0d26656ee7003b3092e3674
 SHA512 
b0d51198af2ecd47199dc06cd829587fcb371d3632623c492cee55de7b11ddf6afec61f016ba4291e379705ec5f2e10b01aa92e493a16ce0ed8dbcdab44ec383
 DIST chromium-118.0.5993.88.tar.xz 3245581816 BLAKE2B 
4e91ad5a5beaa5fd3a8e8b979f47626314fb43a7c1cc84c0b78fb656b7a7b10c4cbfad1767406c6d13ad38b8a91ba4be5aec9c085537bd597cad9f6a9a1005d5
 SHA512 
343700a61102a63c8095d813203a553cde1d0e3a5dca1f11d2ce9752ed5595d953c700e23ab91993626539cd8e831b11820b8b85fe2f51f16517254a43cd1360
-DIST chromium-119.0.6045.33.tar.xz 3287593288 BLAKE2B 
c07ab995f512004a0fab3a0db7188a291167ff6dd945d0422c4d35d34dd7bca3a43e64580c80c291ac5c8fff5a8e7ee9d102176e0f26a47dbd134bafe1a4f5fa
 SHA512 
72172602d072cd6a5a6dd89b1452afc6c94c0acb44790319a23482bfb54579e1e8684920f83abb28bb704f7e5551083dc507a38aa8982abca1f41cdb93bbb406
 DIST chromium-119.0.6045.59.tar.xz 3292462336 BLAKE2B 
28d4cd01ff314bbf99c2e74bb93667300ea30bb05954fec1bf1f24e2e21ca538760ed03ac419c919b41886ab3dc6d9ad508a3a796117c6b0534e75170ef6eac5
 SHA512 
0b66efb25bba35d1747ee256e926971545a72543f34256cd0bf6c690cef8da553884f897b28576a68ab92fa0ff47a5880bbbf243c07198fde4d2a7e5110d
 DIST chromium-patches-118-2.tar.bz2 12691 BLAKE2B 
0cd726527151107ff2b48a1adcc3591808373b4758626a41033a8b28f1819e85d5912381a2c46f6e56c26a3d4397b3c6d679c9b3769d74ecde904bc364ac254d
 SHA512 
4554871f799840e118cf2ceca1996eabe6219918023abe8bf8a2a8dc42ac3439403a9d8b4a2feab6db1ece9228e8f92eecbe531957c92b467c5e66a3b021a036
-DIST chromium-patches-119-2.tar.bz2 7651 BLAKE2B 
4735edac43ab6c0a7dd89511ca661ad7ce3b59f1bcb9c5b011a20e1fbe8a4281064932235be009616717b1e9539b3178daee3460f286ef1559678e4d640037a1
 SHA512 
7ab183f194fe070d3510cbe62c7b0d2f89aed13a6bdee73b7c62d05be59533773e804204633eda36efa85b7ce06c8785b03b266f0f08e200dd5198507ed67348
 DIST chromium-patches-119-3.tar.bz2 8345 BLAKE2B 
70b10a231a71ce8ffc5e4f52450113c46f921a9f08eb95d4adbea0738cfab33fba763c54997a7ef6f36e35df850409062a330eeb8535679b800672de5697ca21
 SHA512 
a1897ea92a9a686bdf93c4ec379ed1c4c5febe1bdaba908ddb2ec0169d8e08b076d2a6ea1e88dd2d0a22dc4972dbfcbab2d3166e95e55ed9c566235e301a6050
 DIST chromium-ppc64le-gentoo-patches-1.tar.xz 5636 BLAKE2B 
1d898939df023c59285b27bee552470483ea06375d1ee8d6947b89c5927c23cc7bfec6b49f3b376ece931d11a56f8e2a45791e0f92ad61974fc8c34c1082d89c
 SHA512 
8a71cb007e47cda8e5fe5d185729389e65c48bd322c8ee8b3986bee8571427b959628f2666bda646a3f89ae64197c0957d3626845ff03461dbd5dee4c964d07c
 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 
5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d
 SHA512 
9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c

diff --git a/www-client/chromium/chromium-119.0.6045.33.ebuild 
b/www-client/chromium/chromium-119.0.6045.33.ebuild
deleted file mode 100644
index aeab0b5fad59..
--- a/www-client/chromium/chromium-119.0.6045.33.ebuild
+++ /dev/null
@@ -1,1254 +0,0 @@
-# Copyright 2009-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Can't do 12 yet: heavy use of imp, among other things (bug #915001, bug 
#915062)
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="xml(+)"
-
-# These variables let us easily bound supported compiler versions in one place.
-# The bundled Clang is updated by Google every ~two weeks, so we can't
-# just assume that anything other than the latest version in ::gentoo
-# will work (and even that will probably break occasionally)
-LLVM_MAX_SLOT=17
-LLVM_MIN_SLOT=16
-MIN_GCC_VER=12
-GN_MIN_VER=0.2122
-
-VIRTUALX_REQUIRED="pgo"
-
-CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr 
gu he
-   hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl 
sr
-   sv sw ta te th tr uk ur vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils
-inherit python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx 
xdg-utils
-

[gentoo-commits] repo/gentoo:master commit in: www-plugins/chrome-binary-plugins/

[Sam James]

commit: 625c43ad2d021539bcf528ecdab1c59fe02c2932
Author: Matt Jolly  footclan  ninja>
AuthorDate: Mon Oct 30 04:01:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 04:34:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=625c43ad

www-plugins/chrome-binary-plugins: automated update (120.0.6090.0_alpha)

Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: Sam James  gentoo.org>

 www-plugins/chrome-binary-plugins/Manifest  | 2 +-
 ...3.0_alpha.ebuild => chrome-binary-plugins-120.0.6090.0_alpha.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-plugins/chrome-binary-plugins/Manifest 
b/www-plugins/chrome-binary-plugins/Manifest
index 85118832c17e..f263a84c56a8 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST google-chrome-beta_119.0.6045.59-1_amd64.deb 103862984 BLAKE2B 
8ef2e9517e7464a3688c7a79b31e633fd8abc7b54b45e4e7c444746b49de16ad7c3699f986a7b862c3c9624925638d7a9487da8ff2e28609e7c418a596b1adfd
 SHA512 
9bf1670ece4a3a6f135f333b7b36377de2979527bc226a8ebb67b1b07f5a19aa87c8ce5bc1211a5c57a31af8fe8bb19164da088680333729f1d8bf8116c155b0
 DIST google-chrome-stable_118.0.5993.117-1_amd64.deb 104057764 BLAKE2B 
6e6623e542695137de7667b1fffe75c901f7c4230bd43653d0b7a422f8af8ffbdef0e0edd336f65cba8525229b90f4ffcb64140788be5fb40083305b25e45b81
 SHA512 
028375ea49a04b04ff6c369b22b40a1a4545201277eef977ba8fa29123d664f29a01a56cabf2418b60d6c65fecd5d567f35e1504271490a8ba5b377df37ecec6
-DIST google-chrome-unstable_120.0.6073.0-1_amd64.deb 104592576 BLAKE2B 
fc4de22c931a7697d5bdffbe9efa86c9006902fa85a30979a5b660f80d8fdaaa0f439a190ada0511b1aab327029a3a08e64201b8f98e4631cce3f95827c8f560
 SHA512 
0bdaeb6a77fdb6aa13b845908868215be38a6bc78451dd20c5d16016743e7b2500a2e180d3bb07faee10d6c38db857c6ab8fd57746d8145a92621361c87fb6f2
+DIST google-chrome-unstable_120.0.6090.0-1_amd64.deb 104940424 BLAKE2B 
77a6bb54602127ce89d037d2a83fdab828032ea6e8a076b2def9b0b4bb02a1144eee4d972b7af1206bf9fee58df5a5771179014806d5c565e4c58ad7f1d1cbba
 SHA512 
1a046f0e2f7c9b21a30af6727169b8c2ad95d384e0a2490beebb4fbf911a2f76d8b4f8681b474eb6b11a26ed9ba7f643f7decfb904692824999175aab543d9de

diff --git 
a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-120.0.6073.0_alpha.ebuild
 
b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-120.0.6090.0_alpha.ebuild
similarity index 100%
rename from 
www-plugins/chrome-binary-plugins/chrome-binary-plugins-120.0.6073.0_alpha.ebuild
rename to 
www-plugins/chrome-binary-plugins/chrome-binary-plugins-120.0.6090.0_alpha.ebuild

[gentoo-commits] repo/gentoo:master commit in: www-client/google-chrome-beta/

[Sam James]

commit: 3a63d1980e8dc10e898bf1ac3d1f7470bf74adfb
Author: Matt Jolly  footclan  ninja>
AuthorDate: Mon Oct 30 04:01:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 04:34:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a63d198

www-client/google-chrome-beta: automated update (119.0.6045.59)

Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: Sam James  gentoo.org>

 www-client/google-chrome-beta/Manifest  | 2 +-
 ...eta-119.0.6045.33.ebuild => google-chrome-beta-119.0.6045.59.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/google-chrome-beta/Manifest 
b/www-client/google-chrome-beta/Manifest
index f2220a88a663..4aa06e9a0f16 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1 +1 @@
-DIST google-chrome-beta_119.0.6045.33-1_amd64.deb 103904036 BLAKE2B 
0006254d5cacb2093da5ce23689ee65eab3540e56e74fdbb9b033ed123967b846b83e452c134d711c5623301b6f0677345bd493dd0a97998a8f38586e2d91a58
 SHA512 
3df347acb0b89c42ced63f14a9a4d20040235a1b3b63f83139218027533e9b77f1adaef6a66d5a12911de6e70e11ac4561bfe5d1741af2ddd7ec972aa674be06
+DIST google-chrome-beta_119.0.6045.59-1_amd64.deb 103862984 BLAKE2B 
8ef2e9517e7464a3688c7a79b31e633fd8abc7b54b45e4e7c444746b49de16ad7c3699f986a7b862c3c9624925638d7a9487da8ff2e28609e7c418a596b1adfd
 SHA512 
9bf1670ece4a3a6f135f333b7b36377de2979527bc226a8ebb67b1b07f5a19aa87c8ce5bc1211a5c57a31af8fe8bb19164da088680333729f1d8bf8116c155b0

diff --git 
a/www-client/google-chrome-beta/google-chrome-beta-119.0.6045.33.ebuild 
b/www-client/google-chrome-beta/google-chrome-beta-119.0.6045.59.ebuild
similarity index 100%
rename from 
www-client/google-chrome-beta/google-chrome-beta-119.0.6045.33.ebuild
rename to www-client/google-chrome-beta/google-chrome-beta-119.0.6045.59.ebuild

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

[Sam James]

commit: a988f5ef2fc37b59733e065a835c8deb9d70dd10
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 30 04:29:51 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 04:29:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a988f5ef

x11-libs/libnotify: Stabilize 0.8.3 ppc64, #916506

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

 x11-libs/libnotify/libnotify-0.8.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/libnotify/libnotify-0.8.3.ebuild 
b/x11-libs/libnotify/libnotify-0.8.3.ebuild
index 9b976139dde2..0762bf095e88 100644
--- a/x11-libs/libnotify/libnotify-0.8.3.ebuild
+++ b/x11-libs/libnotify/libnotify-0.8.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libnotify;
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="gtk-doc +introspection test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="gtk-doc? ( introspection )"

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

[Sam James]

commit: 0c86f2321af1e55d774ff0c7b1dd278d516532bc
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 30 04:29:50 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 04:29:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c86f232

x11-libs/libnotify: Stabilize 0.8.3 arm, #916506

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

 x11-libs/libnotify/libnotify-0.8.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/libnotify/libnotify-0.8.3.ebuild 
b/x11-libs/libnotify/libnotify-0.8.3.ebuild
index d1ce63e85d45..9b976139dde2 100644
--- a/x11-libs/libnotify/libnotify-0.8.3.ebuild
+++ b/x11-libs/libnotify/libnotify-0.8.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libnotify;
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="gtk-doc +introspection test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="gtk-doc? ( introspection )"

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

[Sam James]

commit: 0e251d53b262d434136a5b8f84ad177fc6b16fb3
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 30 04:29:49 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 04:29:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e251d53

x11-libs/libnotify: Stabilize 0.8.3 arm64, #916506

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

 x11-libs/libnotify/libnotify-0.8.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/libnotify/libnotify-0.8.3.ebuild 
b/x11-libs/libnotify/libnotify-0.8.3.ebuild
index 03ef71a89a5d..d1ce63e85d45 100644
--- a/x11-libs/libnotify/libnotify-0.8.3.ebuild
+++ b/x11-libs/libnotify/libnotify-0.8.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libnotify;
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="gtk-doc +introspection test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="gtk-doc? ( introspection )"

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

[Sam James]

commit: 8fa355bbdea7526b29d659381e79128e8b9101e1
Author: David Palao  gmail  com>
AuthorDate: Fri Sep 15 15:36:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 03:14:24 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=8fa355bb

tests/emerge: test_simple.py, conftest.py: Refactor

Refactor.
Portage commands converted into fixtures. Now the commands are
simply tuples of strings. I pretend them to become instances of
a Command class that can encapsulate the context of each command
more cleanly.

Signed-off-by: David Palao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/tests/emerge/conftest.py | 291 +--
 1 file changed, 174 insertions(+), 117 deletions(-)

diff --git a/lib/portage/tests/emerge/conftest.py 
b/lib/portage/tests/emerge/conftest.py
index 07895501d4..ce339d3afc 100644
--- a/lib/portage/tests/emerge/conftest.py
+++ b/lib/portage/tests/emerge/conftest.py
@@ -278,6 +278,7 @@ _SIMPLE_COMMAND_SEQUENCE = [
 "portageq has_version {cross_eroot} dev-libs/B",
 ] + _SIMPLE_COMMAND_FETCHCOMMAND_SEQUENCE
 
+PORTAGE_PYTHON = portage._python_interpreter
 NOOP = lambda: ...
 
 
@@ -387,83 +388,139 @@ def binhost(playground, async_loop):
 
 
 @pytest.fixture()
-def _generate_all_simple_commands(playground, binhost):
-"""This fixture generates all the commands that
-``test_portage_baseline`` will use.
+def emerge():
+yield (PORTAGE_PYTHON, "-b", "-Wd", os.path.join(cnf_bindir, "emerge"))
 
-But, don't use this fixture directly, instead, use the
-``simple_command`` fixture. That improves performance a bit due to
-pytest caching.
 
-.. note::
-
-   To add a new command, define it in the local ``test_commands``
-   dict, if not yet defined, and add its key at the correct position
-   in the ``_SIMPLE_COMMAND_SEQUENCE`` list.
-"""
-settings = playground.settings
-eprefix = settings["EPREFIX"]
-eroot = settings["EROOT"]
-trees = playground.trees
-pkgdir = playground.pkgdir
-portdb = trees[eroot]["porttree"].dbapi
-test_repo_location = settings.repositories["test_repo"].location
-var_cache_edb = os.path.join(eprefix, "var", "cache", "edb")
-cachedir = os.path.join(var_cache_edb, "dep")
-cachedir_pregen = os.path.join(test_repo_location, "metadata", "md5-cache")
-
-portage_python = portage._python_interpreter
-dispatch_conf_cmd = (
-portage_python,
+@pytest.fixture()
+def dispatch_conf():
+yield (
+PORTAGE_PYTHON,
 "-b",
 "-Wd",
 os.path.join(cnf_sbindir, "dispatch-conf"),
 )
-ebuild_cmd = (portage_python, "-b", "-Wd", os.path.join(cnf_bindir, 
"ebuild"))
-egencache_cmd = (
-portage_python,
+
+
+@pytest.fixture()
+def ebuild():
+yield (PORTAGE_PYTHON, "-b", "-Wd", os.path.join(cnf_bindir, "ebuild"))
+
+
+@pytest.fixture()
+def egencache(playground):
+yield (
+PORTAGE_PYTHON,
 "-b",
 "-Wd",
 os.path.join(cnf_bindir, "egencache"),
 "--repo",
 "test_repo",
 "--repositories-configuration",
-settings.repositories.config_string(),
+playground.settings.repositories.config_string(),
 )
-emerge_cmd = (portage_python, "-b", "-Wd", os.path.join(cnf_bindir, 
"emerge"))
-emaint_cmd = (portage_python, "-b", "-Wd", os.path.join(cnf_sbindir, 
"emaint"))
-env_update_cmd = (
-portage_python,
+
+
+@pytest.fixture()
+def emaint():
+yield (PORTAGE_PYTHON, "-b", "-Wd", os.path.join(cnf_sbindir, "emaint"))
+
+
+@pytest.fixture()
+def env_update():
+yield (
+PORTAGE_PYTHON,
 "-b",
 "-Wd",
 os.path.join(cnf_sbindir, "env-update"),
 )
-etc_update_cmd = (BASH_BINARY, os.path.join(cnf_sbindir, "etc-update"))
-fixpackages_cmd = (
-portage_python,
+
+
+@pytest.fixture()
+def etc_update():
+yield (BASH_BINARY, os.path.join(cnf_sbindir, "etc-update"))
+
+
+@pytest.fixture()
+def fixpackages():
+yield (
+PORTAGE_PYTHON,
 "-b",
 "-Wd",
 os.path.join(cnf_sbindir, "fixpackages"),
 )
-portageq_cmd = (
-portage_python,
+
+
+@pytest.fixture()
+def portageq():
+yield (
+PORTAGE_PYTHON,
 "-b",
 "-Wd",
 os.path.join(cnf_bindir, "portageq"),
 )
-quickpkg_cmd = (
-portage_python,
+
+
+@pytest.fixture()
+def quickpkg():
+yield (
+PORTAGE_PYTHON,
 "-b",
 "-Wd",
 os.path.join(cnf_bindir, "quickpkg"),
 )
-regenworld_cmd = (
-portage_python,
+
+
+@pytest.fixture()
+def regenworld():
+yield (
+PORTAGE_PYTHON,
 "-b",
 "-Wd",
 os.path.join(cnf_sbindir, "regenworld"),
 )
 
+
+@pytest.fixture()
+def _generate_all_simple_commands(
+playground,
+binhost,
+emerge,
+env_update,
+portageq,
+etc_update,
+dispatch_conf,
+ebuild,

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

[Sam James]

commit: a807ee1838d44b704401c3b0ff4424ad817b0335
Author: David Palao  gmail  com>
AuthorDate: Thu Oct 26 14:15:27 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 03:14:25 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a807ee18

tests/emerge/meson.build: replace test_simple with test_baseline

...since the file had been renamed.

Signed-off-by: David Palao  gmail.com>
Closes: https://github.com/gentoo/portage/pull/1146
Signed-off-by: Sam James  gentoo.org>

 lib/portage/tests/emerge/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/portage/tests/emerge/meson.build 
b/lib/portage/tests/emerge/meson.build
index 3c45cd380b..b42945123c 100644
--- a/lib/portage/tests/emerge/meson.build
+++ b/lib/portage/tests/emerge/meson.build
@@ -5,7 +5,7 @@ py.install_sources(
 'test_emerge_blocker_file_collision.py',
 'test_emerge_slot_abi.py',
 'test_global_updates.py',
-'test_simple.py',
+'test_baseline.py',
 '__init__.py',
 '__test__.py',
 ],

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

[Sam James]

commit: 7580d33654113b7ac5cda2f381d790b427887836
Author: David Palao  gmail  com>
AuthorDate: Fri Jun  9 14:34:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 03:14:25 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=7580d336

tests/emerge/test_simple.py: port to pytest

port to pytest. BREAKING CHANGE: This is the first, rudimentary
version of ``test_simple.py`` that works exclusively with pytest.

Signed-off-by: David Palao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/tests/emerge/test_simple.py | 962 
 1 file changed, 470 insertions(+), 492 deletions(-)

diff --git a/lib/portage/tests/emerge/test_simple.py 
b/lib/portage/tests/emerge/test_simple.py
index 1cc6457ef1..288cac0f28 100644
--- a/lib/portage/tests/emerge/test_simple.py
+++ b/lib/portage/tests/emerge/test_simple.py
@@ -16,7 +16,7 @@ from portage.const import (
 )
 from portage.cache.mappings import Mapping
 from portage.process import find_binary
-from portage.tests import TestCase
+from portage.tests import cnf_bindir, cnf_sbindir, cnf_etc_path
 from portage.tests.resolver.ResolverPlayground import ResolverPlayground
 from portage.tests.util.test_socks5 import AsyncHTTPServer
 from portage.util import ensure_dirs, find_updated_config_files, shlex_split
@@ -142,13 +142,13 @@ call_has_and_best_version() {
 
 """
 
-ebuilds = {
+_AVAILABLE_EBUILDS = {
 "dev-libs/A-1": {
 "EAPI": "5",
 "IUSE": "+flag",
 "KEYWORDS": "x86",
 "LICENSE": "GPL-2",
-"MISC_CONTENT": install_something,
+"MISC_CONTENT": _INSTALL_SOMETHING,
 "RDEPEND": "flag? ( dev-libs/B[flag] )",
 },
 "dev-libs/B-1": {
@@ -156,19 +156,19 @@ call_has_and_best_version() {
 "IUSE": "+flag",
 "KEYWORDS": "x86",
 "LICENSE": "GPL-2",
-"MISC_CONTENT": install_something,
+"MISC_CONTENT": _INSTALL_SOMETHING,
 },
 "dev-libs/C-1": {
 "EAPI": "7",
 "KEYWORDS": "~x86",
 "RDEPEND": "dev-libs/D[flag]",
-"MISC_CONTENT": install_something,
+"MISC_CONTENT": _INSTALL_SOMETHING,
 },
 "dev-libs/D-1": {
 "EAPI": "7",
 "KEYWORDS": "~x86",
 "IUSE": "flag",
-"MISC_CONTENT": install_something,
+"MISC_CONTENT": _INSTALL_SOMETHING,
 },
 "virtual/foo-0": {
 "EAPI": "5",
@@ -224,473 +224,452 @@ call_has_and_best_version() {
 },
 ),
 )
+try:
+with open(local_path, "rb") as f:
+return f.read()
+except OSError:
+raise KeyError(request_path)
 
-for binpkg_format in SUPPORTED_GENTOO_BINPKG_FORMATS:
-with self.subTest(binpkg_format=binpkg_format):
-print(colorize("HILITE", binpkg_format), end=" ... ")
-sys.stdout.flush()
-playground = ResolverPlayground(
-ebuilds=ebuilds,
-installed=installed,
-debug=debug,
-user_config={
-"make.conf": (f'BINPKG_FORMAT="{binpkg_format}"',),
-},
-)
-
-loop = asyncio._wrap_loop()
-loop.run_until_complete(
-asyncio.ensure_future(
-self._async_test_simple(
-playground, metadata_xml_files, loop=loop
-),
-loop=loop,
-)
-)
 
-async def _async_test_simple(self, playground, metadata_xml_files, loop):
-debug = playground.debug
-settings = playground.settings
-eprefix = settings["EPREFIX"]
-eroot = settings["EROOT"]
-trees = playground.trees
-portdb = trees[eroot]["porttree"].dbapi
-test_repo_location = settings.repositories["test_repo"].location
-var_cache_edb = os.path.join(eprefix, "var", "cache", "edb")
-cachedir = os.path.join(var_cache_edb, "dep")
-cachedir_pregen = os.path.join(test_repo_location, "metadata", 
"md5-cache")
-
-portage_python = portage._python_interpreter
-dispatch_conf_cmd = (
-portage_python,
-"-b",
-"-Wd",
-os.path.join(str(self.sbindir), "dispatch-conf"),
-)
-ebuild_cmd = (
-portage_python,
-"-b",
-"-Wd",
-os.path.join(str(self.bindir), "ebuild"),
-)
-egencache_cmd = (
-portage_python,
-"-b",
-"-Wd",
-os.path.join(str(self.bindir), 

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

[Sam James]

commit: 10e6a558c4404d6a0fa8c92634747a1105db6997
Author: David Palao  gmail  com>
AuthorDate: Fri Oct 13 15:16:41 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 03:14:25 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=10e6a558

tests/emerge: test_simple.py, conftest.py: Refactor

Refactor. Removed comments and changed simple -> baseline.

Signed-off-by: David Palao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/tests/emerge/conftest.py   | 178 +
 .../emerge/{test_simple.py => test_baseline.py}|  15 +-
 2 files changed, 11 insertions(+), 182 deletions(-)

diff --git a/lib/portage/tests/emerge/conftest.py 
b/lib/portage/tests/emerge/conftest.py
index 693ae0e6a6..aaa603f731 100644
--- a/lib/portage/tests/emerge/conftest.py
+++ b/lib/portage/tests/emerge/conftest.py
@@ -182,8 +182,6 @@ _INSTALLED_EBUILDS = {
 _BASELINE_COMMAND_SEQUENCE = [
 "emerge -1 dev-libs/A -v dev-libs/B",
 "emerge with quickpkg direct",
-# "emerge --root --quickpkg-direct-root",
-# "emerge --quickpkg-direct-root",
 "env-update",
 "portageq envvar",
 "etc-update",
@@ -193,85 +191,8 @@ _BASELINE_COMMAND_SEQUENCE = [
 "emerge --info --verbose",
 "emerge --list-sets",
 "emerge --check-news",
-#
-# # "rm -rf {cachedir}",
-# # "rm -rf {cachedir_pregen}",
-# "emerge --regen",
-# # "rm -rf {cachedir}",
-# "FEATURES=metadata-transfer emerge --regen",
-# # "rm -rf {cachedir}",
-# "FEATURES=metadata-transfer emerge --regen",  # is this second test case 
needed?
-# # "rm -rf {cachedir}",
-# "egencache --update",
-# "FEATURES=metadata-transfer emerge --metadata",
-# # "rm -rf {cachedir}",
-# "FEATURES=metadata-transfer emerge --metadata (2)",
-# "emerge --metadata",
-# # "rm -rf {cachedir}",
-# "emerge --oneshot virtual/foo",
-# # "foo pkg missing",
-# "FEATURES=unmerge-backup emerge --unmerge virtual/foo",
-# # "foo pkg exists",
-# "emerge --pretend dev-libs/A",
-# Sequence:
 "emerge --regen/--metadata",
-#
-# "ebuild dev-libs/A-1 manifest clean package merge",
-# "emerge --pretend --tree --complete-graph dev-libs/A",
-# "emerge -p dev-libs/B",
-# "emerge -p --newrepo dev-libs/B",
-# "emerge -B dev-libs/B",
-# "emerge -1k dev-libs/B",
-# "ebuild dev-libs/A-1 unpack",
-# "emerge -1 dev-libs/A",
-# "emerge -n dev-libs/A",
-# "emerge --config dev-libs/A",
-# "emerge --info dev-libs/A dev-libs/B",
-# "emerge -pcv dev-libs/B",
-# "emerge -pc",
-# "emerge -c",
-# "quickpkg --include-config y dev-libs/A",
-# # "no protected files",
-# # "rm /etc/A-0",
-# "emerge -K dev-libs/A",
-# # "one protected file",
-# "emaint --check all",
-# "emaint --fix all",
-# "fixpackages",
-# "regenworld",
-# "portageq match {eroot} dev-libs/A",
-# "portageq best_visible {eroot} dev-libs/A",
-# "portageq best_visible {eroot} binary dev-libs/A",
-# "portageq contents {eroot} dev-libs/A-1",
-# "portageq metadata {eroot} ebuild dev-libs/A-1 EAPI IUSE RDEPEND",
-# "portageq metadata {eroot} binary dev-libs/A-1 EAPI USE RDEPEND",
-# "portageq metadata {eroot} installed dev-libs/A-1 EAPI USE RDEPEND",
-# "portageq owners {eroot} {eroot}usr",
-# "emerge -p {eroot}usr",
-# "emerge -pCq {eroot}usr",
-# "emerge -Cq dev-libs/A",
-# "emerge -Cq dev-libs/B",
 "misc package operations",
-# (
-# "EMERGE_DEFAULT_OPTS=--autounmask=n "
-# "emerge --autounmask --autounmask-continue dev-libs/C"
-# ),
-# "portageq match {eroot} dev-libs/D[flag]",
-# "EPREFIX={cross_prefix} emerge dev-libs/C",
-# "EPREFIX={cross_prefix} portageq has_version {cross_prefix} dev-libs/C",
-# "EPREFIX={cross_prefix} portageq has_version {cross_prefix} dev-libs/D",
-# "ROOT={cross_root} emerge dev-libs/D",
-# "portageq has_version {cross_eroot} dev-libs/D",
-# "EPREFIX={cross_prefix} emerge -K dev-libs/A",
-# "EPREFIX={cross_prefix} portageq has_version {cross_prefix} dev-libs/A",
-# "EPREFIX={cross_prefix} portageq has_version {cross_prefix} dev-libs/B",
-# "EPREFIX={cross_prefix} emerge -Cq dev-libs/B",
-# "EPREFIX={cross_prefix} emerge -Cq dev-libs/A",
-# "EPREFIX={cross_prefix} emerge dev-libs/A",
-# "EPREFIX={cross_prefix} portageq has_version {cross_prefix} dev-libs/A",
-# "EPREFIX={cross_prefix} portageq has_version {cross_prefix} dev-libs/B",
-# "ROOT={cross_root} emerge dev-libs/B",
-# "portageq has_version {cross_eroot} dev-libs/B",
 "binhost emerge",
 ]
 
@@ -572,7 +493,6 @@ def _generate_all_baseline_commands(playground, binhost):
 
 test_commands = {}
 
-###
 if hasattr(argparse.ArgumentParser, "parse_intermixed_args"):
 parse_intermixed_command = Emerge(
 "--oneshot",
@@ -583,10 +503,8 @@ def 

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

[Sam James]

commit: a9c81ffe93fdd24cf148e119de7d8ad14007b18b
Author: David Palao  gmail  com>
AuthorDate: Mon Oct 16 15:34:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 03:14:25 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a9c81ffe

tests/emerge/test_simple.py: remove it.

It has been renamed to test_baseline.py

Signed-off-by: David Palao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/tests/emerge/test_simple.py | 727 
 1 file changed, 727 deletions(-)

diff --git a/lib/portage/tests/emerge/test_simple.py 
b/lib/portage/tests/emerge/test_simple.py
deleted file mode 100644
index f452a84c6b..00
--- a/lib/portage/tests/emerge/test_simple.py
+++ /dev/null
@@ -1,727 +0,0 @@
-# Copyright 2011-2021, 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-import argparse
-import subprocess
-import sys
-
-import pytest
-
-import portage
-from portage import shutil, os
-from portage.const import (
-BASH_BINARY,
-BINREPOS_CONF_FILE,
-PORTAGE_PYM_PATH,
-USER_CONFIG_PATH,
-SUPPORTED_GENTOO_BINPKG_FORMATS,
-)
-from portage.cache.mappings import Mapping
-from portage.process import find_binary
-from portage.tests import cnf_bindir, cnf_sbindir, cnf_etc_path
-from portage.tests.resolver.ResolverPlayground import ResolverPlayground
-from portage.tests.util.test_socks5 import AsyncHTTPServer
-from portage.util import ensure_dirs, find_updated_config_files, shlex_split
-from portage.util.futures import asyncio
-from portage.output import colorize
-
-
-class BinhostContentMap(Mapping):
-def __init__(self, remote_path, local_path):
-self._remote_path = remote_path
-self._local_path = local_path
-
-
-@pytest.mark.ft
-def test_simple_emerge(async_loop, playground, binhost, simple_command):
-async_loop.run_until_complete(
-asyncio.ensure_future(
-_async_test_simple(
-playground,
-binhost,
-simple_command,
-_METADATA_XML_FILES,
-loop=async_loop,
-),
-loop=async_loop,
-)
-try:
-with open(local_path, "rb") as f:
-return f.read()
-except OSError:
-raise KeyError(request_path)
-
-
-class SimpleEmergeTestCase(TestCase):
-def _have_python_xml(self):
-try:
-__import__("xml.etree.ElementTree")
-__import__("xml.parsers.expat").parsers.expat.ExpatError
-except (AttributeError, ImportError):
-return False
-return True
-
-def testSimple(self):
-debug = False
-
-install_something = """
-S="${WORKDIR}"
-
-pkg_pretend() {
-   einfo "called pkg_pretend for $CATEGORY/$PF"
-}
-
-src_install() {
-   einfo "installing something..."
-   insinto /usr/lib/${P}
-   echo "blah blah blah" > "${T}"/regular-file
-   doins "${T}"/regular-file
-   dosym regular-file /usr/lib/${P}/symlink || die
-
-   # Test CONFIG_PROTECT
-   insinto /etc
-   newins "${T}"/regular-file ${PN}-${SLOT%/*}
-
-   # Test code for bug #381629, using a copyright symbol encoded with 
latin-1.
-   # We use $(printf "\\xa9") rather than $'\\xa9', since printf apparently
-   # works in any case, while $'\\xa9' transforms to \\xef\\xbf\\xbd under
-   # some conditions. TODO: Find out why it transforms to \\xef\\xbf\\xbd 
when
-   # running tests for Python 3.2 (even though it's bash that is ultimately
-   # responsible for performing the transformation).
-   local latin_1_dir=/usr/lib/${P}/latin-1-$(printf "\\xa9")-directory
-   insinto "${latin_1_dir}"
-   echo "blah blah blah" > "${T}"/latin-1-$(printf "\\xa9")-regular-file 
|| die
-   doins "${T}"/latin-1-$(printf "\\xa9")-regular-file
-   dosym latin-1-$(printf "\\xa9")-regular-file 
${latin_1_dir}/latin-1-$(printf "\\xa9")-symlink || die
-
-   call_has_and_best_version
-}
-
-pkg_config() {
-   einfo "called pkg_config for $CATEGORY/$PF"
-}
-
-pkg_info() {
-   einfo "called pkg_info for $CATEGORY/$PF"
-}
-
-pkg_preinst() {
-   if ! ___eapi_best_version_and_has_version_support_-b_-d_-r; then
-   # The BROOT variable is unset during pkg_* phases for EAPI 7,
-   # therefore best/has_version -b is expected to fail if we 
attempt
-   # to call it for EAPI 7 here.
-   call_has_and_best_version
-   fi
-}
-
-call_has_and_best_version() {
-   local root_arg
-   if ___eapi_best_version_and_has_version_support_-b_-d_-r; then
-   root_arg="-b"
-   else
-   root_arg="--host-root"
-   fi
-   einfo "called ${EBUILD_PHASE_FUNC} for $CATEGORY/$PF"
-   einfo "EPREFIX=${EPREFIX}"
-   einfo "PORTAGE_OVERRIDE_EPREFIX=${PORTAGE_OVERRIDE_EPREFIX}"
-   einfo "ROOT=${ROOT}"
-   einfo "EROOT=${EROOT}"

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

[Sam James]

commit: f8a5d65523e37043dac60b4572ad35dc6a96a0b6
Author: David Palao  gmail  com>
AuthorDate: Fri Oct 13 15:02:27 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 03:14:24 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=f8a5d655

tests/emerge/conftest.py: Split the test commands in monoliths.

Split the test commands in monoliths. Each monolith should be an
indivisible sequence of commands that test some complex
functionality of portage.

Run the tests with::

   pytest -m ft

if pytest-xdist is installed, it can be used to speed up::

   pytest -m ft -n 8

Signed-off-by: David Palao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/tests/emerge/conftest.py | 723 +++
 1 file changed, 384 insertions(+), 339 deletions(-)

diff --git a/lib/portage/tests/emerge/conftest.py 
b/lib/portage/tests/emerge/conftest.py
index 27cca5e077..693ae0e6a6 100644
--- a/lib/portage/tests/emerge/conftest.py
+++ b/lib/portage/tests/emerge/conftest.py
@@ -178,22 +178,12 @@ _INSTALLED_EBUILDS = {
 },
 }
 
-_BASELINE_COMMAND_FETCHCOMMAND_SEQUENCE = [
-# "mv {pkgdir} {binhost_dir}",
-"emerge -eG dev-libs/A",
-# "rm -R {pkgdir}",
-# "mv {binhost_dir} {pkgdir}",
-# "rm {binrepos_conf_file}",
-# "mv {pkgdir} {binhost_dir}",
-"PORTAGE_BINHOST={binhost_uri} emerge -feG dev-libs/A",
-# "rm -R {pkgdir}",
-# "mv {binhost_dir} {pkgdir}",
-]
 
 _BASELINE_COMMAND_SEQUENCE = [
 "emerge -1 dev-libs/A -v dev-libs/B",
-"emerge --root --quickpkg-direct-root",
-"emerge --quickpkg-direct-root",
+"emerge with quickpkg direct",
+# "emerge --root --quickpkg-direct-root",
+# "emerge --quickpkg-direct-root",
 "env-update",
 "portageq envvar",
 "etc-update",
@@ -222,65 +212,68 @@ _BASELINE_COMMAND_SEQUENCE = [
 # # "foo pkg missing",
 # "FEATURES=unmerge-backup emerge --unmerge virtual/foo",
 # # "foo pkg exists",
+# "emerge --pretend dev-libs/A",
+# Sequence:
 "emerge --regen/--metadata",
 #
-"emerge --pretend dev-libs/A",
-"ebuild dev-libs/A-1 manifest clean package merge",
-"emerge --pretend --tree --complete-graph dev-libs/A",
-"emerge -p dev-libs/B",
-"emerge -p --newrepo dev-libs/B",
-"emerge -B dev-libs/B",
-"emerge -1k dev-libs/B",
-"ebuild dev-libs/A-1 unpack",
-"emerge -1 dev-libs/A",
-"emerge -n dev-libs/A",
-"emerge --config dev-libs/A",
-"emerge --info dev-libs/A dev-libs/B",
-"emerge -pcv dev-libs/B",
-"emerge -pc",
-"emerge -c",
-"quickpkg --include-config y dev-libs/A",
-# "no protected files",
-# "rm /etc/A-0",
-"emerge -K dev-libs/A",
-# "one protected file",
-"emaint --check all",
-"emaint --fix all",
-"fixpackages",
-"regenworld",
-"portageq match {eroot} dev-libs/A",
-"portageq best_visible {eroot} dev-libs/A",
-"portageq best_visible {eroot} binary dev-libs/A",
-"portageq contents {eroot} dev-libs/A-1",
-"portageq metadata {eroot} ebuild dev-libs/A-1 EAPI IUSE RDEPEND",
-"portageq metadata {eroot} binary dev-libs/A-1 EAPI USE RDEPEND",
-"portageq metadata {eroot} installed dev-libs/A-1 EAPI USE RDEPEND",
-"portageq owners {eroot} {eroot}usr",
-"emerge -p {eroot}usr",
-"emerge -pCq {eroot}usr",
-"emerge -Cq dev-libs/A",
-"emerge -Cq dev-libs/B",
-(
-"EMERGE_DEFAULT_OPTS=--autounmask=n "
-"emerge --autounmask --autounmask-continue dev-libs/C"
-),
-"portageq match {eroot} dev-libs/D[flag]",
-"EPREFIX={cross_prefix} emerge dev-libs/C",
-"EPREFIX={cross_prefix} portageq has_version {cross_prefix} dev-libs/C",
-"EPREFIX={cross_prefix} portageq has_version {cross_prefix} dev-libs/D",
-"ROOT={cross_root} emerge dev-libs/D",
-"portageq has_version {cross_eroot} dev-libs/D",
-"EPREFIX={cross_prefix} emerge -K dev-libs/A",
-"EPREFIX={cross_prefix} portageq has_version {cross_prefix} dev-libs/A",
-"EPREFIX={cross_prefix} portageq has_version {cross_prefix} dev-libs/B",
-"EPREFIX={cross_prefix} emerge -Cq dev-libs/B",
-"EPREFIX={cross_prefix} emerge -Cq dev-libs/A",
-"EPREFIX={cross_prefix} emerge dev-libs/A",
-"EPREFIX={cross_prefix} portageq has_version {cross_prefix} dev-libs/A",
-"EPREFIX={cross_prefix} portageq has_version {cross_prefix} dev-libs/B",
-"ROOT={cross_root} emerge dev-libs/B",
-"portageq has_version {cross_eroot} dev-libs/B",
-] + _BASELINE_COMMAND_FETCHCOMMAND_SEQUENCE
+# "ebuild dev-libs/A-1 manifest clean package merge",
+# "emerge --pretend --tree --complete-graph dev-libs/A",
+# "emerge -p dev-libs/B",
+# "emerge -p --newrepo dev-libs/B",
+# "emerge -B dev-libs/B",
+# "emerge -1k dev-libs/B",
+# "ebuild dev-libs/A-1 unpack",
+# "emerge -1 dev-libs/A",
+# "emerge -n dev-libs/A",
+# "emerge --config dev-libs/A",
+# "emerge --info dev-libs/A 

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

[Sam James]

commit: e324f300247f4181362325d46a7232f0bbaf561e
Author: David Palao  gmail  com>
AuthorDate: Tue Oct 10 01:36:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 03:14:25 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e324f300

tests: Adapt to UTF-8 changes

Adapt to UTF-8 changes in 4f5f6f571e52af6d2703db760bad4e0ad7439d5a.

Signed-off-by: David Palao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/tests/emerge/conftest.py  |  22 +-
 lib/portage/tests/emerge/test_baseline.py |   4 +-
 lib/portage/tests/emerge/test_simple.py   | 740 ++
 3 files changed, 754 insertions(+), 12 deletions(-)

diff --git a/lib/portage/tests/emerge/conftest.py 
b/lib/portage/tests/emerge/conftest.py
index aaa603f731..c534f5e9d3 100644
--- a/lib/portage/tests/emerge/conftest.py
+++ b/lib/portage/tests/emerge/conftest.py
@@ -267,7 +267,7 @@ class PortageCommandSequence:
 
 class Emerge(PortageCommand):
 name = "emerge"
-command = (PORTAGE_PYTHON, "-b", "-Wd", os.path.join(cnf_bindir, name))
+command = (PORTAGE_PYTHON, "-b", "-Wd", os.path.join(str(cnf_bindir), 
name))
 
 
 class Noop(PortageCommand):
@@ -276,7 +276,7 @@ class Noop(PortageCommand):
 
 class EnvUpdate(PortageCommand):
 name = "env-update"
-command = (PORTAGE_PYTHON, "-b", "-Wd", os.path.join(cnf_sbindir, name))
+command = (PORTAGE_PYTHON, "-b", "-Wd", os.path.join(str(cnf_sbindir), 
name))
 
 
 class DispatchConf(PortageCommand):
@@ -285,13 +285,13 @@ class DispatchConf(PortageCommand):
 PORTAGE_PYTHON,
 "-b",
 "-Wd",
-os.path.join(cnf_sbindir, name),
+os.path.join(str(cnf_sbindir), name),
 )
 
 
 class Ebuild(PortageCommand):
 name = "ebuild"
-command = (PORTAGE_PYTHON, "-b", "-Wd", os.path.join(cnf_bindir, name))
+command = (PORTAGE_PYTHON, "-b", "-Wd", os.path.join(str(cnf_bindir), 
name))
 
 
 class Egencache(PortageCommand):
@@ -300,18 +300,18 @@ class Egencache(PortageCommand):
 PORTAGE_PYTHON,
 "-b",
 "-Wd",
-os.path.join(cnf_bindir, name),
+os.path.join(str(cnf_bindir), name),
 )
 
 
 class Emaint(PortageCommand):
 name = "emaint"
-command = (PORTAGE_PYTHON, "-b", "-Wd", os.path.join(cnf_sbindir, name))
+command = (PORTAGE_PYTHON, "-b", "-Wd", os.path.join(str(cnf_sbindir), 
name))
 
 
 class EtcUpdate(PortageCommand):
 name = "etc-update"
-command = (BASH_BINARY, os.path.join(cnf_sbindir, name))
+command = (BASH_BINARY, os.path.join(str(cnf_sbindir), name))
 
 
 class Fixpackages(PortageCommand):
@@ -320,7 +320,7 @@ class Fixpackages(PortageCommand):
 PORTAGE_PYTHON,
 "-b",
 "-Wd",
-os.path.join(cnf_sbindir, name),
+os.path.join(str(cnf_sbindir), name),
 )
 
 
@@ -330,7 +330,7 @@ class Portageq(PortageCommand):
 PORTAGE_PYTHON,
 "-b",
 "-Wd",
-os.path.join(cnf_bindir, name),
+os.path.join(str(cnf_bindir), name),
 )
 
 
@@ -340,7 +340,7 @@ class Quickpkg(PortageCommand):
 PORTAGE_PYTHON,
 "-b",
 "-Wd",
-os.path.join(cnf_bindir, name),
+os.path.join(str(cnf_bindir), name),
 )
 
 
@@ -350,7 +350,7 @@ class Regenworld(PortageCommand):
 PORTAGE_PYTHON,
 "-b",
 "-Wd",
-os.path.join(cnf_sbindir, name),
+os.path.join(str(cnf_sbindir), name),
 )
 
 

diff --git a/lib/portage/tests/emerge/test_baseline.py 
b/lib/portage/tests/emerge/test_baseline.py
index 55722d900e..8f44528949 100644
--- a/lib/portage/tests/emerge/test_baseline.py
+++ b/lib/portage/tests/emerge/test_baseline.py
@@ -173,7 +173,9 @@ async def _async_test_baseline(playground, binhost, 
commands):
 pass
 for x in etc_symlinks:
 try:
-os.symlink(os.path.join(cnf_etc_path, x), os.path.join(eprefix, 
"etc", x))
+os.symlink(
+os.path.join(str(cnf_etc_path), x), os.path.join(eprefix, 
"etc", x)
+)
 except FileExistsError:
 pass
 with open(os.path.join(var_cache_edb, "counter"), "wb") as f:

diff --git a/lib/portage/tests/emerge/test_simple.py 
b/lib/portage/tests/emerge/test_simple.py
new file mode 100644
index 00..1cc6457ef1
--- /dev/null
+++ b/lib/portage/tests/emerge/test_simple.py
@@ -0,0 +1,740 @@
+# Copyright 2011-2021, 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+import argparse
+import subprocess
+import sys
+
+import portage
+from portage import shutil, os
+from portage.const import (
+BASH_BINARY,
+BINREPOS_CONF_FILE,
+PORTAGE_PYM_PATH,
+USER_CONFIG_PATH,
+SUPPORTED_GENTOO_BINPKG_FORMATS,
+)
+from portage.cache.mappings import Mapping
+from portage.process import find_binary
+from portage.tests import TestCase
+from portage.tests.resolver.ResolverPlayground import ResolverPlayground
+from 

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

[Sam James]

commit: b6a5a31808f2f5548e3699184bd20d110ae77ee1
Author: David Palao  gmail  com>
AuthorDate: Fri Sep 29 15:26:46 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 03:14:24 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=b6a5a318

tests/emerge: test_simple.py, conftest.py: Refactor

Refactor.
Removed some dead code.

Signed-off-by: David Palao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/tests/emerge/conftest.py| 458 +---
 lib/portage/tests/emerge/test_simple.py | 139 +-
 2 files changed, 13 insertions(+), 584 deletions(-)

diff --git a/lib/portage/tests/emerge/conftest.py 
b/lib/portage/tests/emerge/conftest.py
index 5bf535cdcf..43fde441fd 100644
--- a/lib/portage/tests/emerge/conftest.py
+++ b/lib/portage/tests/emerge/conftest.py
@@ -178,7 +178,7 @@ _INSTALLED_EBUILDS = {
 },
 }
 
-_SIMPLE_COMMAND_FETCHCOMMAND_SEQUENCE = [
+_BASELINE_COMMAND_FETCHCOMMAND_SEQUENCE = [
 # "mv {pkgdir} {binhost_dir}",
 "emerge -eG dev-libs/A",
 # "rm -R {pkgdir}",
@@ -190,7 +190,7 @@ _SIMPLE_COMMAND_FETCHCOMMAND_SEQUENCE = [
 # "mv {binhost_dir} {pkgdir}",
 ]
 
-_SIMPLE_COMMAND_SEQUENCE = [
+_BASELINE_COMMAND_SEQUENCE = [
 "emerge -1 dev-libs/A -v dev-libs/B",
 "emerge --root --quickpkg-direct-root",
 "emerge --quickpkg-direct-root",
@@ -277,14 +277,14 @@ _SIMPLE_COMMAND_SEQUENCE = [
 "EPREFIX={cross_prefix} portageq has_version {cross_prefix} dev-libs/B",
 "ROOT={cross_root} emerge dev-libs/B",
 "portageq has_version {cross_eroot} dev-libs/B",
-] + _SIMPLE_COMMAND_FETCHCOMMAND_SEQUENCE
+] + _BASELINE_COMMAND_FETCHCOMMAND_SEQUENCE
 
 PORTAGE_PYTHON = portage._python_interpreter
 NOOP = lambda: ...
 
 
 class PortageCommand:
-"""A class that represents a simple test case command,
+"""A class that represents a baseline test case command,
 including handling of environment and one-use arguments.
 """
 
@@ -429,15 +429,10 @@ class Regenworld(PortageCommand):
 )
 
 
-class Rm(PortageCommand):
-name = "rm"
-command = (find_binary(name),)
-
-
 def pytest_generate_tests(metafunc):
 if "baseline_command" in metafunc.fixturenames:
 metafunc.parametrize(
-"baseline_command", _SIMPLE_COMMAND_SEQUENCE, indirect=True
+"baseline_command", _BASELINE_COMMAND_SEQUENCE, indirect=True
 )
 
 
@@ -523,414 +518,6 @@ def binhost(playground, async_loop):
 binhost_server.__exit__(None, None, None)
 
 
-@pytest.fixture()
-def _generate_all_simple_commands(
-playground,
-binhost,
-emerge,
-env_update,
-portageq,
-etc_update,
-dispatch_conf,
-ebuild,
-egencache,
-emaint,
-fixpackages,
-quickpkg,
-regenworld,
-):
-"""This fixture generates all the commands that
-``test_portage_baseline`` will use.
-
-But, don't use this fixture directly, instead, use the
-``simple_command`` fixture. That improves performance a bit due to
-pytest caching.
-
-.. note::
-
-   To add a new command, define it in the local ``test_commands``
-   dict, if not yet defined, and add its key at the correct position
-   in the ``_SIMPLE_COMMAND_SEQUENCE`` list.
-"""
-settings = playground.settings
-eprefix = settings["EPREFIX"]
-eroot = settings["EROOT"]
-trees = playground.trees
-pkgdir = playground.pkgdir
-portdb = trees[eroot]["porttree"].dbapi
-test_repo_location = settings.repositories["test_repo"].location
-var_cache_edb = os.path.join(eprefix, "var", "cache", "edb")
-cachedir = os.path.join(var_cache_edb, "dep")
-cachedir_pregen = os.path.join(test_repo_location, "metadata", "md5-cache")
-
-rm_binary = find_binary("rm")
-assert rm_binary is not None, "rm command not found"
-rm_cmd = (rm_binary,)
-
-egencache_extra_args = []
-if _have_python_xml():
-egencache_extra_args.append("--update-use-local-desc")
-
-test_ebuild = portdb.findname("dev-libs/A-1")
-assert test_ebuild is not None
-
-cross_prefix = os.path.join(eprefix, "cross_prefix")
-cross_root = os.path.join(eprefix, "cross_root")
-cross_eroot = os.path.join(cross_root, eprefix.lstrip(os.sep))
-
-binpkg_format = settings.get("BINPKG_FORMAT", 
SUPPORTED_GENTOO_BINPKG_FORMATS[0])
-assert binpkg_format in ("xpak", "gpkg")
-if binpkg_format == "xpak":
-foo_filename = "foo-0-1.xpak"
-elif binpkg_format == "gpkg":
-foo_filename = "foo-0-1.gpkg.tar"
-
-test_commands = {}
-
-if hasattr(argparse.ArgumentParser, "parse_intermixed_args"):
-parse_intermixed_command = emerge + (
-"--oneshot",
-"dev-libs/A",
-"-v",
-"dev-libs/A",
-)
-else:
-parse_intermixed_command = NOOP
-test_commands["emerge -1 dev-libs/A -v dev-libs/B"] = 
parse_intermixed_command
-
-test_commands["emerge --root 

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

[Sam James]

commit: f294d967ec63c62caaa9f4d68b9c26acd1b1c95e
Author: David Palao  gmail  com>
AuthorDate: Fri Jun  9 14:43:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 03:14:21 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=f294d967

tests/emerge/test_simple.py: pytest: introduce binpkg_format param

Signed-off-by: David Palao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/tests/emerge/test_simple.py | 38 -
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/lib/portage/tests/emerge/test_simple.py 
b/lib/portage/tests/emerge/test_simple.py
index ee95ef65e5..1c7d1bafbe 100644
--- a/lib/portage/tests/emerge/test_simple.py
+++ b/lib/portage/tests/emerge/test_simple.py
@@ -3,7 +3,8 @@
 
 import argparse
 import subprocess
-import sys
+
+import pytest
 
 import portage
 from portage import shutil, os
@@ -21,7 +22,6 @@ from portage.tests.resolver.ResolverPlayground import 
ResolverPlayground
 from portage.tests.util.test_socks5 import AsyncHTTPServer
 from portage.util import ensure_dirs, find_updated_config_files, shlex_split
 from portage.util.futures import asyncio
-from portage.output import colorize
 
 
 _INSTALL_SOMETHING = """
@@ -223,26 +223,24 @@ class BinhostContentMap(Mapping):
 raise KeyError(request_path)
 
 
-def test_simple_emerge():
-debug = False
-
-for binpkg_format in SUPPORTED_GENTOO_BINPKG_FORMATS:
-playground = ResolverPlayground(
-ebuilds=_AVAILABLE_EBUILDS,
-installed=_INSTALLED_EBUILDS,
-debug=debug,
-user_config={
-"make.conf": (f'BINPKG_FORMAT="{binpkg_format}"',),
-},
-)
+@pytest.mark.parametrize("binpkg_format", SUPPORTED_GENTOO_BINPKG_FORMATS)
+def test_simple_emerge(binpkg_format):
+playground = ResolverPlayground(
+ebuilds=_AVAILABLE_EBUILDS,
+installed=_INSTALLED_EBUILDS,
+debug=False,
+user_config={
+"make.conf": (f'BINPKG_FORMAT="{binpkg_format}"',),
+},
+)
 
-loop = asyncio._wrap_loop()
-loop.run_until_complete(
-asyncio.ensure_future(
-_async_test_simple(playground, _METADATA_XML_FILES, loop=loop),
-loop=loop,
-)
+loop = asyncio._wrap_loop()
+loop.run_until_complete(
+asyncio.ensure_future(
+_async_test_simple(playground, _METADATA_XML_FILES, loop=loop),
+loop=loop,
 )
+)
 
 
 async def _async_test_simple(playground, metadata_xml_files, loop):

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

[Sam James]

commit: f539a071895d51aab15f8ae359150d8c638de0f9
Author: David Palao  gmail  com>
AuthorDate: Fri Sep 29 15:58:15 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 03:14:24 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=f539a071

tests/emerge/conftest.py: Add PortageCommandSequence

Add PortageCommandSequence. Some commands must run in sequence
to test some functionality of portage. This class has been added
to chain commands within a test.

Signed-off-by: David Palao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/tests/emerge/conftest.py | 124 +--
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/lib/portage/tests/emerge/conftest.py 
b/lib/portage/tests/emerge/conftest.py
index 43fde441fd..27cca5e077 100644
--- a/lib/portage/tests/emerge/conftest.py
+++ b/lib/portage/tests/emerge/conftest.py
@@ -203,24 +203,27 @@ _BASELINE_COMMAND_SEQUENCE = [
 "emerge --info --verbose",
 "emerge --list-sets",
 "emerge --check-news",
-# "rm -rf {cachedir}",
-# "rm -rf {cachedir_pregen}",
-"emerge --regen",
-# "rm -rf {cachedir}",
-"FEATURES=metadata-transfer emerge --regen",
-# "rm -rf {cachedir}",
-"FEATURES=metadata-transfer emerge --regen",  # is this second test case 
needed?
-# "rm -rf {cachedir}",
-"egencache --update",
-"FEATURES=metadata-transfer emerge --metadata",
-# "rm -rf {cachedir}",
-"FEATURES=metadata-transfer emerge --metadata (2)",
-"emerge --metadata",
-# "rm -rf {cachedir}",
-"emerge --oneshot virtual/foo",
-# "foo pkg missing",
-"FEATURES=unmerge-backup emerge --unmerge virtual/foo",
-# "foo pkg exists",
+#
+# # "rm -rf {cachedir}",
+# # "rm -rf {cachedir_pregen}",
+# "emerge --regen",
+# # "rm -rf {cachedir}",
+# "FEATURES=metadata-transfer emerge --regen",
+# # "rm -rf {cachedir}",
+# "FEATURES=metadata-transfer emerge --regen",  # is this second test case 
needed?
+# # "rm -rf {cachedir}",
+# "egencache --update",
+# "FEATURES=metadata-transfer emerge --metadata",
+# # "rm -rf {cachedir}",
+# "FEATURES=metadata-transfer emerge --metadata (2)",
+# "emerge --metadata",
+# # "rm -rf {cachedir}",
+# "emerge --oneshot virtual/foo",
+# # "foo pkg missing",
+# "FEATURES=unmerge-backup emerge --unmerge virtual/foo",
+# # "foo pkg exists",
+"emerge --regen/--metadata",
+#
 "emerge --pretend dev-libs/A",
 "ebuild dev-libs/A-1 manifest clean package merge",
 "emerge --pretend --tree --complete-graph dev-libs/A",
@@ -340,6 +343,14 @@ class PortageCommand:
 self.post_command()
 
 
+class PortageCommandSequence:
+def __init__(self, *commands):
+self.commands = commands
+
+def __iter__(self):
+yield from self.commands
+
+
 class Emerge(PortageCommand):
 name = "emerge"
 command = (PORTAGE_PYTHON, "-b", "-Wd", os.path.join(cnf_bindir, name))
@@ -621,50 +632,39 @@ def _generate_all_baseline_commands(playground, binhost):
 _rm_cachedir()
 shutil.rmtree(cachedir_pregen)
 
-test_commands["emerge --regen"] = Emerge(
-"--regen", preparation=_rm_cachedir_and_pregen
-)
-
-test_commands["FEATURES=metadata-transfer emerge --regen"] = Emerge(
-"--regen", env_mod={"FEATURES": "metadata-transfer"}, 
preparation=_rm_cachedir
-)
-
-test_commands["egencache --update"] = Egencache(
-"--repo",
-"test_repo",
-"--repositories-configuration",
-playground.settings.repositories.config_string(),
-"--update",
-*egencache_extra_args,
-preparation=_rm_cachedir,
-)
-
-test_commands["FEATURES=metadata-transfer emerge --metadata"] = Emerge(
-"--metadata", env_mod={"FEATURES": "metadata-transfer"}
-)
-
-test_commands["FEATURES=metadata-transfer emerge --metadata (2)"] = Emerge(
-"--metadata",
-env_mod={"FEATURES": "metadata-transfer"},
-preparation=_rm_cachedir,
-)
-
-test_commands["emerge --metadata"] = Emerge("--metadata")
-
-test_commands["emerge --oneshot virtual/foo"] = Emerge(
-"--oneshot", "virtual/foo", preparation=_rm_cachedir
-)
-
-# test_commands["foo pkg missing"] = lambda: _check_foo_file(
-# pkgdir, foo_filename, must_exist=False
-# )
-
-test_commands["FEATURES=unmerge-backup emerge --unmerge virtual/foo"] = 
Emerge(
-"--unmerge",
-"virtual/foo",
-env_mod={"FEATURES": "unmerge-backup"},
-preparation=lambda: _check_foo_file(pkgdir, foo_filename, 
must_exist=False),
-)
+regen_seq = [
+Emerge("--regen", preparation=_rm_cachedir_and_pregen),
+Emerge(
+"--regen",
+env_mod={"FEATURES": "metadata-transfer"},
+preparation=_rm_cachedir,
+),
+Egencache(
+"--repo",
+

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

[Sam James]

commit: 7ba8f05b82c6d19c6bcfa1f6274050c5dfc40f7a
Author: David Palao  gmail  com>
AuthorDate: Fri Sep 29 14:37:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 03:14:24 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=7ba8f05b

tests/emerge: test_simple.py, conftest.py: Refactor

Refactor.
Introduced a PortageCommand class to be able to pack together a
sequence of operations that, as a whole, express expected behavior
in portage.
(This commit is a baseline: the refactor works out, but further
refactors must follow).

Signed-off-by: David Palao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/tests/emerge/conftest.py| 770 ++--
 lib/portage/tests/emerge/test_simple.py | 183 ++--
 2 files changed, 796 insertions(+), 157 deletions(-)

diff --git a/lib/portage/tests/emerge/conftest.py 
b/lib/portage/tests/emerge/conftest.py
index ce339d3afc..5bf535cdcf 100644
--- a/lib/portage/tests/emerge/conftest.py
+++ b/lib/portage/tests/emerge/conftest.py
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 import argparse
+from typing import Optional, Callable  # ,  Self
 
 from portage.const import (
 SUPPORTED_GENTOO_BINPKG_FORMATS,
@@ -178,15 +179,15 @@ _INSTALLED_EBUILDS = {
 }
 
 _SIMPLE_COMMAND_FETCHCOMMAND_SEQUENCE = [
-"mv {pkgdir} {binhost_dir}",
+# "mv {pkgdir} {binhost_dir}",
 "emerge -eG dev-libs/A",
-"rm -R {pkgdir}",
-"mv {binhost_dir} {pkgdir}",
-"rm {binrepos_conf_file}",
-"mv {pkgdir} {binhost_dir}",
+# "rm -R {pkgdir}",
+# "mv {binhost_dir} {pkgdir}",
+# "rm {binrepos_conf_file}",
+# "mv {pkgdir} {binhost_dir}",
 "PORTAGE_BINHOST={binhost_uri} emerge -feG dev-libs/A",
-"rm -R {pkgdir}",
-"mv {binhost_dir} {pkgdir}",
+# "rm -R {pkgdir}",
+# "mv {binhost_dir} {pkgdir}",
 ]
 
 _SIMPLE_COMMAND_SEQUENCE = [
@@ -202,24 +203,24 @@ _SIMPLE_COMMAND_SEQUENCE = [
 "emerge --info --verbose",
 "emerge --list-sets",
 "emerge --check-news",
-"rm -rf {cachedir}",
-"rm -rf {cachedir_pregen}",
+# "rm -rf {cachedir}",
+# "rm -rf {cachedir_pregen}",
 "emerge --regen",
-"rm -rf {cachedir}",
+# "rm -rf {cachedir}",
 "FEATURES=metadata-transfer emerge --regen",
-"rm -rf {cachedir}",
-"FEATURES=metadata-transfer emerge --regen",
-"rm -rf {cachedir}",
+# "rm -rf {cachedir}",
+"FEATURES=metadata-transfer emerge --regen",  # is this second test case 
needed?
+# "rm -rf {cachedir}",
 "egencache --update",
 "FEATURES=metadata-transfer emerge --metadata",
-"rm -rf {cachedir}",
-"FEATURES=metadata-transfer emerge --metadata",
+# "rm -rf {cachedir}",
+"FEATURES=metadata-transfer emerge --metadata (2)",
 "emerge --metadata",
-"rm -rf {cachedir}",
+# "rm -rf {cachedir}",
 "emerge --oneshot virtual/foo",
-"foo pkg missing",
+# "foo pkg missing",
 "FEATURES=unmerge-backup emerge --unmerge virtual/foo",
-"foo pkg exists",
+# "foo pkg exists",
 "emerge --pretend dev-libs/A",
 "ebuild dev-libs/A-1 manifest clean package merge",
 "emerge --pretend --tree --complete-graph dev-libs/A",
@@ -236,10 +237,10 @@ _SIMPLE_COMMAND_SEQUENCE = [
 "emerge -pc",
 "emerge -c",
 "quickpkg --include-config y dev-libs/A",
-"no protected files",
-"rm /etc/A-0",
+# "no protected files",
+# "rm /etc/A-0",
 "emerge -K dev-libs/A",
-"one protected file",
+# "one protected file",
 "emaint --check all",
 "emaint --fix all",
 "fixpackages",
@@ -282,27 +283,162 @@ PORTAGE_PYTHON = portage._python_interpreter
 NOOP = lambda: ...
 
 
-# class SimpleTestCommand:
-# """A class that represents a simple test case command,
-# including post checks, preparation and cleanup.
-# """
-# def __init__(self, command, *options, environment=None):
-# self._command = command
-# self._options = options
-# if environment is None:
-# environment = {}
-# self.environment = environment
+class PortageCommand:
+"""A class that represents a simple test case command,
+including handling of environment and one-use arguments.
+"""
+
+command = None
+name = None
+
+def __init__(
+self,
+*args: tuple[str],
+env_mod: Optional[dict[str, str]] = None,
+preparation: Optional[Callable[[], None]] = None,
+post_command: Optional[Callable[[], None]] = None,
+) -> None:
+self.args = args
+self.env_mod = env_mod
+self.preparation = preparation
+self.post_command = post_command
+
+def __iter__(self):
+"""To be able to call a function with ``*command`` as argument."""
+yield self
+
+@property
+def env(self) -> dict[str, str]:
+"""This property returns the environment intended to be used
+with the current test 

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

[Sam James]

commit: a9071c3a0f69bb4c886ddb324e890590e6872680
Author: David Palao  gmail  com>
AuthorDate: Fri Jul  7 14:58:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 03:14:25 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a9071c3a

pytest: Add some markers: ft, unit and stress

Add some markers: ft, unit and stress. And mark
test_simple.test_simple_emerge with ft, such that those tests can be
triggered with::

   pytest -m ft

Signed-off-by: David Palao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/tests/emerge/test_simple.py | 21 +++--
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/lib/portage/tests/emerge/test_simple.py 
b/lib/portage/tests/emerge/test_simple.py
index 288cac0f28..f452a84c6b 100644
--- a/lib/portage/tests/emerge/test_simple.py
+++ b/lib/portage/tests/emerge/test_simple.py
@@ -5,6 +5,8 @@ import argparse
 import subprocess
 import sys
 
+import pytest
+
 import portage
 from portage import shutil, os
 from portage.const import (
@@ -29,12 +31,19 @@ class BinhostContentMap(Mapping):
 self._remote_path = remote_path
 self._local_path = local_path
 
-def __getitem__(self, request_path):
-safe_path = os.path.normpath(request_path)
-if not safe_path.startswith(self._remote_path + "/"):
-raise KeyError(request_path)
-local_path = os.path.join(
-self._local_path, safe_path[len(self._remote_path) + 1 :]
+
+@pytest.mark.ft
+def test_simple_emerge(async_loop, playground, binhost, simple_command):
+async_loop.run_until_complete(
+asyncio.ensure_future(
+_async_test_simple(
+playground,
+binhost,
+simple_command,
+_METADATA_XML_FILES,
+loop=async_loop,
+),
+loop=async_loop,
 )
 try:
 with open(local_path, "rb") as f:

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

[Sam James]

commit: 33fd1883b4099965dd3f885ab8d8850b6ea6040c
Author: David Palao  gmail  com>
AuthorDate: Fri Jul  7 15:15:51 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 03:14:23 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=33fd1883

tests/emerge: test_simple.py, conftest.py: Refactor

Refactor:

- _TEST_COMMAND_*NAMES -> _SIMPLE_COMMAND_*SEQUENCE
- Added NOOP
- defined global constant

Signed-off-by: David Palao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/tests/emerge/conftest.py| 53 +
 lib/portage/tests/emerge/test_simple.py | 12 
 2 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/lib/portage/tests/emerge/conftest.py 
b/lib/portage/tests/emerge/conftest.py
index 7675d4c78c..9cb4691f56 100644
--- a/lib/portage/tests/emerge/conftest.py
+++ b/lib/portage/tests/emerge/conftest.py
@@ -177,26 +177,7 @@ _INSTALLED_EBUILDS = {
 },
 }
 
-
-# class SimpleTestCommand:
-# """A class that represents a simple test case command,
-# including post checks, preparation and cleanup.
-# """
-# def __init__(self, command, *options, environment=None):
-# self._command = command
-# self._options = options
-# if environment is None:
-# environment = {}
-# self.environment = environment
-
-# def prepare(self):
-# ...
-
-# def cleanup(self):
-# ...
-
-
-_TEST_COMMAND_NAMES_FETCHCOMMAND = [
+_SIMPLE_COMMAND_FETCHCOMMAND_SEQUENCE = [
 "mv {pkgdir} {binhost_dir}",
 "emerge -eG dev-libs/A",
 "rm -R {pkgdir}",
@@ -208,7 +189,7 @@ _TEST_COMMAND_NAMES_FETCHCOMMAND = [
 "mv {binhost_dir} {pkgdir}",
 ]
 
-_TEST_COMMAND_NAMES = [
+_SIMPLE_COMMAND_SEQUENCE = [
 "emerge -1 dev-libs/A -v dev-libs/B",
 "emerge --root --quickpkg-direct-root",
 "emerge --quickpkg-direct-root",
@@ -295,12 +276,32 @@ _TEST_COMMAND_NAMES = [
 "EPREFIX={cross_prefix} portageq has_version {cross_prefix} dev-libs/B",
 "ROOT={cross_root} emerge dev-libs/B",
 "portageq has_version {cross_eroot} dev-libs/B",
-] + _TEST_COMMAND_NAMES_FETCHCOMMAND
+] + _SIMPLE_COMMAND_FETCHCOMMAND_SEQUENCE
+
+NOOP = lambda: ...
+
+
+# class SimpleTestCommand:
+# """A class that represents a simple test case command,
+# including post checks, preparation and cleanup.
+# """
+# def __init__(self, command, *options, environment=None):
+# self._command = command
+# self._options = options
+# if environment is None:
+# environment = {}
+# self.environment = environment
+
+# def prepare(self):
+# ...
+
+# def cleanup(self):
+# ...
 
 
 def pytest_generate_tests(metafunc):
 if "simple_command" in metafunc.fixturenames:
-metafunc.parametrize("simple_command", _TEST_COMMAND_NAMES, 
indirect=True)
+metafunc.parametrize("simple_command", _SIMPLE_COMMAND_SEQUENCE, 
indirect=True)
 
 
 def _have_python_xml():
@@ -482,7 +483,7 @@ def simple_command(playground, binhost, request):
 "dev-libs/A",
 )
 else:
-parse_intermixed_command = lambda: ...
+parse_intermixed_command = NOOP
 test_commands["emerge -1 dev-libs/A -v dev-libs/B"] = 
parse_intermixed_command
 
 test_commands["emerge --root --quickpkg-direct-root"] = emerge_cmd + (
@@ -792,8 +793,8 @@ def simple_command(playground, binhost, request):
 fetchcommand = portage.util.shlex_split(settings["FETCHCOMMAND"])
 fetch_bin = portage.process.find_binary(fetchcommand[0])
 if fetch_bin is None:
-for command_name in _TEST_COMMAND_NAMES_FETCHCOMMAND:
-test_commands[command_name] = lambda: ...
+for command_name in _SIMPLE_COMMAND_FETCHCOMMAND_SEQUENCE:
+test_commands[command_name] = NOOP
 else:
 test_commands["mv {pkgdir} {binhost_dir}"] = lambda: os.rename(
 pkgdir, binhost_dir

diff --git a/lib/portage/tests/emerge/test_simple.py 
b/lib/portage/tests/emerge/test_simple.py
index 692c6a9cb4..12a16f2d93 100644
--- a/lib/portage/tests/emerge/test_simple.py
+++ b/lib/portage/tests/emerge/test_simple.py
@@ -32,6 +32,11 @@ _METADATA_XML_FILES = (
 ),
 )
 
+_1Q_2010_UPDATE = """
+slotmove =app-doc/pms-3 2 3
+move dev-util/git dev-vcs/git
+"""
+
 
 @pytest.mark.ft
 def test_simple_emerge(async_loop, playground, binhost, simple_command):
@@ -161,12 +166,7 @@ async def _async_test_simple(playground, binhost, command, 
metadata_xml_files, l
 with open(os.path.join(test_repo_location, cp, "metadata.xml"), "w") 
as f:
 f.write(playground.metadata_xml_template % xml_data)
 with open(os.path.join(updates_dir, "1Q-2010"), "w") as f:
-f.write(
-"""
-slotmove =app-doc/pms-3 2 3
-move dev-util/git dev-vcs/git
-"""
-)
+f.write(_1Q_2010_UPDATE)
 if debug:
 # The subprocess inherits both stdout and stderr, 

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

[Sam James]

commit: 0f0056a0193abc36be61b45184b6bbc2521d525f
Author: David Palao  gmail  com>
AuthorDate: Fri Sep 15 15:51:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 03:14:24 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0f0056a0

tests/emerge: test_simple.py: _async_test_simple: Refactor

Refactor.
Removed parameter from function since it's constant.
Signed-off-by: David Palao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/tests/emerge/test_simple.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/portage/tests/emerge/test_simple.py 
b/lib/portage/tests/emerge/test_simple.py
index b13add9122..c0731dabca 100644
--- a/lib/portage/tests/emerge/test_simple.py
+++ b/lib/portage/tests/emerge/test_simple.py
@@ -64,7 +64,6 @@ def test_portage_baseline(async_loop, playground, binhost, 
simple_command):
 playground,
 binhost,
 simple_command,
-_METADATA_XML_FILES,
 loop=async_loop,
 ),
 loop=async_loop,
@@ -72,7 +71,7 @@ def test_portage_baseline(async_loop, playground, binhost, 
simple_command):
 )
 
 
-async def _async_test_simple(playground, binhost, command, metadata_xml_files, 
loop):
+async def _async_test_simple(playground, binhost, command, loop):
 debug = playground.debug
 settings = playground.settings
 trees = playground.trees
@@ -180,7 +179,7 @@ async def _async_test_simple(playground, binhost, command, 
metadata_xml_files, l
 # non-empty system set keeps --depclean quiet
 with open(os.path.join(profile_path, "packages"), "w") as f:
 f.write("*dev-libs/token-system-pkg")
-for cp, xml_data in metadata_xml_files:
+for cp, xml_data in _METADATA_XML_FILES:
 with open(os.path.join(test_repo_location, cp, "metadata.xml"), "w") 
as f:
 f.write(playground.metadata_xml_template % xml_data)
 with open(os.path.join(updates_dir, "1Q-2010"), "w") as f:

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

[Sam James]

commit: a621e10e998eee127affb7bb2ba0da67aad751e7
Author: David Palao  gmail  com>
AuthorDate: Fri Jul  7 14:58:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 03:14:23 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a621e10e

pytest: Add some markers: ft, unit and stress

Add some markers: ft, unit and stress. And mark
test_simple.test_simple_emerge with ft, such that those tests can be
triggered with::

   pytest -m ft

Signed-off-by: David Palao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/tests/emerge/test_simple.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/portage/tests/emerge/test_simple.py 
b/lib/portage/tests/emerge/test_simple.py
index 700ddd9764..692c6a9cb4 100644
--- a/lib/portage/tests/emerge/test_simple.py
+++ b/lib/portage/tests/emerge/test_simple.py
@@ -3,6 +3,8 @@
 
 import subprocess
 
+import pytest
+
 import portage
 from portage import os
 from portage.const import (
@@ -31,6 +33,7 @@ _METADATA_XML_FILES = (
 )
 
 
+@pytest.mark.ft
 def test_simple_emerge(async_loop, playground, binhost, simple_command):
 async_loop.run_until_complete(
 asyncio.ensure_future(

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

[Sam James]

commit: 273644d1ee78da50473c7677850eee117ce0983e
Author: David Palao  gmail  com>
AuthorDate: Fri Jul  7 15:32:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 03:14:23 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=273644d1

tests/emerge: test_simple.py, conftest.py: Add docstrings

Add docstrings. They contain some brief documentation about the tests,
the fixture with the commands and how to select those tests with pytest.

Also the main test function was renamed:

test_simple_emerge -> test_portage_baseline

Signed-off-by: David Palao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/tests/emerge/conftest.py|  6 ++
 lib/portage/tests/emerge/test_simple.py | 20 +++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/lib/portage/tests/emerge/conftest.py 
b/lib/portage/tests/emerge/conftest.py
index 9cb4691f56..656ee85726 100644
--- a/lib/portage/tests/emerge/conftest.py
+++ b/lib/portage/tests/emerge/conftest.py
@@ -388,6 +388,12 @@ def binhost(playground, async_loop):
 
 @pytest.fixture()
 def simple_command(playground, binhost, request):
+"""A fixture that provides the commands to perform a baseline
+functional test of portage.
+
+To add a new command, define it in the local ``test_commands`` and
+add its key to the ``_SIMPLE_COMMAND_SEQUENCE``.
+"""
 settings = playground.settings
 eprefix = settings["EPREFIX"]
 eroot = settings["EROOT"]

diff --git a/lib/portage/tests/emerge/test_simple.py 
b/lib/portage/tests/emerge/test_simple.py
index 12a16f2d93..b13add9122 100644
--- a/lib/portage/tests/emerge/test_simple.py
+++ b/lib/portage/tests/emerge/test_simple.py
@@ -1,6 +1,24 @@
 # Copyright 2011-2021, 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+"""This module defines a baseline for portage's functionality.
+
+Multiple portage commands are executed in a sequence in a playground
+(see the ``simple_command`` fixture in ``conftest.py``).
+
+All the commands are triggered from the ``test_portage_baseline`` test.
+That test is marked with::
+
+  @pytest.mark.ft
+
+so that it can selected with that marker, i.e.::
+
+  pytest -m ft
+
+``ft`` stands for *functional test*, since that's what it is, a
+functional or end-to-end test.
+"""
+
 import subprocess
 
 import pytest
@@ -39,7 +57,7 @@ move dev-util/git dev-vcs/git
 
 
 @pytest.mark.ft
-def test_simple_emerge(async_loop, playground, binhost, simple_command):
+def test_portage_baseline(async_loop, playground, binhost, simple_command):
 async_loop.run_until_complete(
 asyncio.ensure_future(
 _async_test_simple(

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

[Sam James]

commit: 6dd1d051312c74785316975eb3861068ae7c241d
Author: David Palao  gmail  com>
AuthorDate: Fri Jul  7 14:30:51 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 03:14:22 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=6dd1d051

tests/emerge: conftest.py: Remove spurious definition of commands

Remove spurious definition of commands. The ``simple_command`` fixture
was repeating the definition of some commands. That's not needed.

Signed-off-by: David Palao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/tests/emerge/conftest.py | 61 +---
 1 file changed, 15 insertions(+), 46 deletions(-)

diff --git a/lib/portage/tests/emerge/conftest.py 
b/lib/portage/tests/emerge/conftest.py
index a637aa885b..cfaf18c5f9 100644
--- a/lib/portage/tests/emerge/conftest.py
+++ b/lib/portage/tests/emerge/conftest.py
@@ -199,13 +199,13 @@ _INSTALLED_EBUILDS = {
 _TEST_COMMAND_NAMES_FETCHCOMMAND = [
 "mv {pkgdir} {binhost_dir}",
 "emerge -eG dev-libs/A",
-"rm -R {pkgdir} (1)",
+"rm -R {pkgdir}",
 "mv {binhost_dir} {pkgdir}",
 "rm {binrepos_conf_file}",
-"mv {pkgdir} {binhost_dir} (2)",
+"mv {pkgdir} {binhost_dir}",
 "PORTAGE_BINHOST={binhost_uri} emerge -feG dev-libs/A",
-"rm -R {pkgdir} (2)",
-"mv {binhost_dir} {pkgdir} (2)",
+"rm -R {pkgdir}",
+"mv {binhost_dir} {pkgdir}",
 ]
 
 _TEST_COMMAND_NAMES = [
@@ -224,17 +224,17 @@ _TEST_COMMAND_NAMES = [
 "rm -rf {cachedir}",
 "rm -rf {cachedir_pregen}",
 "emerge --regen",
-"rm -rf {cachedir} (2)",
+"rm -rf {cachedir}",
+"FEATURES=metadata-transfer emerge --regen",
+"rm -rf {cachedir}",
 "FEATURES=metadata-transfer emerge --regen",
-"rm -rf {cachedir} (3)",
-"FEATURES=metadata-transfer emerge --regen (2)",
-"rm -rf {cachedir} (4)",
+"rm -rf {cachedir}",
 "egencache --update",
 "FEATURES=metadata-transfer emerge --metadata",
-"rm -rf {cachedir} (5)",
-"FEATURES=metadata-transfer emerge --metadata (2)",
+"rm -rf {cachedir}",
+"FEATURES=metadata-transfer emerge --metadata",
 "emerge --metadata",
-"rm -rf {cachedir} (6)",
+"rm -rf {cachedir}",
 "emerge --oneshot virtual/foo",
 "foo pkg missing",
 "FEATURES=unmerge-backup emerge --unmerge virtual/foo",
@@ -291,8 +291,8 @@ _TEST_COMMAND_NAMES = [
 "EPREFIX={cross_prefix} emerge -Cq dev-libs/B",
 "EPREFIX={cross_prefix} emerge -Cq dev-libs/A",
 "EPREFIX={cross_prefix} emerge dev-libs/A",
-"EPREFIX={cross_prefix} portageq has_version {cross_prefix} dev-libs/A 
(2)",
-"EPREFIX={cross_prefix} portageq has_version {cross_prefix} dev-libs/B 
(2)",
+"EPREFIX={cross_prefix} portageq has_version {cross_prefix} dev-libs/A",
+"EPREFIX={cross_prefix} portageq has_version {cross_prefix} dev-libs/B",
 "ROOT={cross_root} emerge dev-libs/B",
 "portageq has_version {cross_eroot} dev-libs/B",
 ] + _TEST_COMMAND_NAMES_FETCHCOMMAND
@@ -518,27 +518,16 @@ def simple_command(playground, binhost, request):
 test_commands["rm -rf {cachedir}"] = rm_cmd + ("-rf", cachedir)
 test_commands["rm -rf {cachedir_pregen}"] = rm_cmd + ("-rf", 
cachedir_pregen)
 test_commands["emerge --regen"] = emerge_cmd + ("--regen",)
-test_commands["rm -rf {cachedir} (2)"] = rm_cmd + ("-rf", cachedir)
 test_commands["FEATURES=metadata-transfer emerge --regen"] = (
 ({"FEATURES": "metadata-transfer"},) + emerge_cmd + ("--regen",)
 )
-test_commands["rm -rf {cachedir} (3)"] = rm_cmd + ("-rf", cachedir)
-test_commands["FEATURES=metadata-transfer emerge --regen (2)"] = (
-({"FEATURES": "metadata-transfer"},) + emerge_cmd + ("--regen",)
-)
-test_commands["rm -rf {cachedir} (4)"] = rm_cmd + ("-rf", cachedir)
 test_commands["egencache --update"] = (
 egencache_cmd + ("--update",) + tuple(egencache_extra_args)
 )
 test_commands["FEATURES=metadata-transfer emerge --metadata"] = (
 ({"FEATURES": "metadata-transfer"},) + emerge_cmd + ("--metadata",)
 )
-test_commands["rm -rf {cachedir} (5)"] = rm_cmd + ("-rf", cachedir)
-test_commands["FEATURES=metadata-transfer emerge --metadata (2)"] = (
-({"FEATURES": "metadata-transfer"},) + emerge_cmd + ("--metadata",)
-)
 test_commands["emerge --metadata"] = emerge_cmd + ("--metadata",)
-test_commands["rm -rf {cachedir} (6)"] = rm_cmd + ("-rf", cachedir)
 
 test_commands["emerge --oneshot virtual/foo"] = emerge_cmd + (
 "--oneshot",
@@ -779,20 +768,7 @@ def simple_command(playground, binhost, request):
 test_commands["EPREFIX={cross_prefix} emerge dev-libs/A"] = (
 ({"EPREFIX": cross_prefix},) + emerge_cmd + ("dev-libs/A",)
 )
-test_commands[
-"EPREFIX={cross_prefix} portageq has_version {cross_prefix} dev-libs/A 
(2)"
-] = (
-({"EPREFIX": cross_prefix},)
-+ portageq_cmd
-+ ("has_version", 

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

[Sam James]

commit: 25f666914fd7b7be845d4d1fb9fc276fad566779
Author: David Palao  gmail  com>
AuthorDate: Fri Jun 30 14:05:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 03:14:22 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=25f66691

tests/emerge: Add simple_command parametrized fixture.

Add simple_command parametrized fixture. This is work in progress:
in order to include post-checks to some tests, a different approach
is needed.

Signed-off-by: David Palao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/tests/emerge/conftest.py| 395 +++-
 lib/portage/tests/emerge/test_simple.py | 391 +++
 2 files changed, 428 insertions(+), 358 deletions(-)

diff --git a/lib/portage/tests/emerge/conftest.py 
b/lib/portage/tests/emerge/conftest.py
index 716bb6a85e..6f78f17935 100644
--- a/lib/portage/tests/emerge/conftest.py
+++ b/lib/portage/tests/emerge/conftest.py
@@ -1,12 +1,21 @@
 # Copyright 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-from portage.const import SUPPORTED_GENTOO_BINPKG_FORMATS
+import argparse
+
+from portage.const import (
+SUPPORTED_GENTOO_BINPKG_FORMATS,
+BASH_BINARY,
+BINREPOS_CONF_FILE,
+)
 from portage.tests.resolver.ResolverPlayground import ResolverPlayground
 from portage.cache.mappings import Mapping
 from portage.tests.util.test_socks5 import AsyncHTTPServer
 from portage import os
 from portage.util.futures import asyncio
+from portage.tests import cnf_bindir, cnf_sbindir
+from portage.process import find_binary
+import portage
 
 import pytest
 
@@ -167,6 +176,51 @@ _INSTALLED_EBUILDS = {
 }
 
 
+_TEST_COMMAND_NAMES = [
+"emerge_w_parse_intermixed_args",
+"emerge --root --quickpkg-direct-root",
+"emerge --quickpkg-direct-root",
+"env-update",
+"portageq envvar",
+"etc-update",
+"dispatch-conf",
+"emerge --version",
+"emerge --info",
+"emerge --info --verbose",
+"emerge --list-sets",
+"emerge --check-news",
+"rm -rf {cachedir}",
+"rm -rf {cachedir_pregen}",
+"emerge --regen",
+"rm -rf {cachedir} (2)",
+"FEATURES=metadata-transfer emerge --regen",
+"rm -rf {cachedir} (3)",
+"FEATURES=metadata-transfer emerge --regen (2)",
+"rm -rf {cachedir} (4)",
+"egencache --update",
+"FEATURES=metadata-transfer emerge --metadata",
+"rm -rf {cachedir} (5)",
+"FEATURES=metadata-transfer emerge --metadata (2)",
+"emerge --metadata",
+"rm -rf {cachedir} (6)",
+"emerge --oneshot virtual/foo",
+]
+
+
+def pytest_generate_tests(metafunc):
+if "simple_command" in metafunc.fixturenames:
+metafunc.parametrize("simple_command", _TEST_COMMAND_NAMES, 
indirect=True)
+
+
+def _have_python_xml():
+try:
+__import__("xml.etree.ElementTree")
+__import__("xml.parsers.expat").parsers.expat.ExpatError
+except (AttributeError, ImportError):
+return False
+return True
+
+
 class BinhostContentMap(Mapping):
 def __init__(self, remote_path, local_path):
 self._remote_path = remote_path
@@ -223,5 +277,342 @@ def binhost(playground, async_loop):
 port=binhost_server.server_port,
 path=binhost_remote_path,
 )
-yield {"server": binhost_server, "uri": binhost_uri}
+yield {"server": binhost_server, "uri": binhost_uri, "dir": binhost_dir}
 binhost_server.__exit__(None, None, None)
+
+
+@pytest.fixture()
+def simple_command(playground, binhost, request):
+settings = playground.settings
+eprefix = settings["EPREFIX"]
+eroot = settings["EROOT"]
+trees = playground.trees
+portdb = trees[eroot]["porttree"].dbapi
+test_repo_location = settings.repositories["test_repo"].location
+var_cache_edb = os.path.join(eprefix, "var", "cache", "edb")
+cachedir = os.path.join(var_cache_edb, "dep")
+cachedir_pregen = os.path.join(test_repo_location, "metadata", "md5-cache")
+
+portage_python = portage._python_interpreter
+dispatch_conf_cmd = (
+portage_python,
+"-b",
+"-Wd",
+os.path.join(cnf_sbindir, "dispatch-conf"),
+)
+ebuild_cmd = (portage_python, "-b", "-Wd", os.path.join(cnf_bindir, 
"ebuild"))
+egencache_cmd = (
+portage_python,
+"-b",
+"-Wd",
+os.path.join(cnf_bindir, "egencache"),
+"--repo",
+"test_repo",
+"--repositories-configuration",
+settings.repositories.config_string(),
+)
+emerge_cmd = (portage_python, "-b", "-Wd", os.path.join(cnf_bindir, 
"emerge"))
+emaint_cmd = (portage_python, "-b", "-Wd", os.path.join(cnf_sbindir, 
"emaint"))
+env_update_cmd = (
+portage_python,
+"-b",
+"-Wd",
+os.path.join(cnf_sbindir, "env-update"),
+)
+etc_update_cmd = (BASH_BINARY, os.path.join(cnf_sbindir, "etc-update"))
+fixpackages_cmd = (
+portage_python,
+ 

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

[Sam James]

commit: 2dde25d65a1131f8298265ead1028716a814f27d
Author: David Palao  gmail  com>
AuthorDate: Fri Jul  7 13:29:23 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 03:14:22 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2dde25d6

tests/emerge: test_simple.py: Complete pytest parametrization

Complete pytest parametrization. The test_simple_emerge is completely
parametrized in commands and in binary formats. This commit is the first
implementation. Further refactorings/improvements shall follow.

Signed-off-by: David Palao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/tests/emerge/conftest.py| 590 ++--
 lib/portage/tests/emerge/test_simple.py |  19 +-
 2 files changed, 419 insertions(+), 190 deletions(-)

diff --git a/lib/portage/tests/emerge/conftest.py 
b/lib/portage/tests/emerge/conftest.py
index 6f78f17935..a637aa885b 100644
--- a/lib/portage/tests/emerge/conftest.py
+++ b/lib/portage/tests/emerge/conftest.py
@@ -12,9 +12,11 @@ from portage.tests.resolver.ResolverPlayground import 
ResolverPlayground
 from portage.cache.mappings import Mapping
 from portage.tests.util.test_socks5 import AsyncHTTPServer
 from portage import os
+from portage import shutil
 from portage.util.futures import asyncio
 from portage.tests import cnf_bindir, cnf_sbindir
 from portage.process import find_binary
+from portage.util import find_updated_config_files, shlex_split
 import portage
 
 import pytest
@@ -176,6 +178,36 @@ _INSTALLED_EBUILDS = {
 }
 
 
+# class SimpleTestCommand:
+# """A class that represents a simple test case command,
+# including post checks, preparation and cleanup.
+# """
+# def __init__(self, command, *options, environment=None):
+# self._command = command
+# self._options = options
+# if environment is None:
+# environment = {}
+# self.environment = environment
+
+# def prepare(self):
+# ...
+
+# def cleanup(self):
+# ...
+
+
+_TEST_COMMAND_NAMES_FETCHCOMMAND = [
+"mv {pkgdir} {binhost_dir}",
+"emerge -eG dev-libs/A",
+"rm -R {pkgdir} (1)",
+"mv {binhost_dir} {pkgdir}",
+"rm {binrepos_conf_file}",
+"mv {pkgdir} {binhost_dir} (2)",
+"PORTAGE_BINHOST={binhost_uri} emerge -feG dev-libs/A",
+"rm -R {pkgdir} (2)",
+"mv {binhost_dir} {pkgdir} (2)",
+]
+
 _TEST_COMMAND_NAMES = [
 "emerge_w_parse_intermixed_args",
 "emerge --root --quickpkg-direct-root",
@@ -204,7 +236,66 @@ _TEST_COMMAND_NAMES = [
 "emerge --metadata",
 "rm -rf {cachedir} (6)",
 "emerge --oneshot virtual/foo",
-]
+"foo pkg missing",
+"FEATURES=unmerge-backup emerge --unmerge virtual/foo",
+"foo pkg exists",
+"emerge --pretend dev-libs/A",
+"ebuild dev-libs/A-1 manifest clean package merge",
+"emerge --pretend --tree --complete-graph dev-libs/A",
+"emerge -p dev-libs/B",
+"emerge -p --newrepo dev-libs/B",
+"emerge -B dev-libs/B",
+"emerge -1k dev-libs/B",
+"ebuild dev-libs/A-1 unpack",
+"emerge -1 dev-libs/A",
+"emerge -n dev-libs/A",
+"emerge --config dev-libs/A",
+"emerge --info dev-libs/A dev-libs/B",
+"emerge -pcv dev-libs/B",
+"emerge -pc",
+"emerge -c",
+"quickpkg --include-config y dev-libs/A",
+"no protected files",
+"rm /etc/A-0",
+"emerge -K dev-libs/A",
+"one protected file",
+"emaint --check all",
+"emaint --fix all",
+"fixpackages",
+"regenworld",
+"portageq match {eroot} dev-libs/A",
+"portageq best_visible {eroot} dev-libs/A",
+"portageq best_visible {eroot} binary dev-libs/A",
+"portageq contents {eroot} dev-libs/A-1",
+"portageq metadata {eroot} ebuild dev-libs/A-1 EAPI IUSE RDEPEND",
+"portageq metadata {eroot} binary dev-libs/A-1 EAPI USE RDEPEND",
+"portageq metadata {eroot} installed dev-libs/A-1 EAPI USE RDEPEND",
+"portageq owners {eroot} {eroot}usr",
+"emerge -p {eroot}usr",
+"emerge -pCq {eroot}usr",
+"emerge -Cq dev-libs/A",
+"emerge -Cq dev-libs/B",
+(
+"EMERGE_DEFAULT_OPTS=--autounmask=n "
+"emerge --autounmask --autounmask-continue dev-libs/C"
+),
+"portageq match {eroot} dev-libs/D[flag]",
+"EPREFIX={cross_prefix} emerge dev-libs/C",
+"EPREFIX={cross_prefix} portageq has_version {cross_prefix} dev-libs/C",
+"EPREFIX={cross_prefix} portageq has_version {cross_prefix} dev-libs/D",
+"ROOT={cross_root} emerge dev-libs/D",
+"portageq has_version {cross_eroot} dev-libs/D",
+"EPREFIX={cross_prefix} emerge -K dev-libs/A",
+"EPREFIX={cross_prefix} portageq has_version {cross_prefix} dev-libs/A",
+"EPREFIX={cross_prefix} portageq has_version {cross_prefix} dev-libs/B",
+"EPREFIX={cross_prefix} emerge -Cq dev-libs/B",
+"EPREFIX={cross_prefix} emerge -Cq dev-libs/A",
+"EPREFIX={cross_prefix} emerge dev-libs/A",
+"EPREFIX={cross_prefix} portageq 

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

[Sam James]

commit: ae5bb29328d709d1b5e5b9f8c8b3e4083a386716
Author: David Palao  gmail  com>
AuthorDate: Fri Jul  7 16:06:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 03:14:24 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=ae5bb293

tests/emerge/conftest.py: Add a new fixture.

Add a new fixture. It adds one more layer of indirection to the
``simple_command`` fixture. Quick benchmarks tell that it is
faster due to pytest caching.

Signed-off-by: David Palao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/tests/emerge/conftest.py | 30 --
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/lib/portage/tests/emerge/conftest.py 
b/lib/portage/tests/emerge/conftest.py
index 656ee85726..07895501d4 100644
--- a/lib/portage/tests/emerge/conftest.py
+++ b/lib/portage/tests/emerge/conftest.py
@@ -387,12 +387,19 @@ def binhost(playground, async_loop):
 
 
 @pytest.fixture()
-def simple_command(playground, binhost, request):
-"""A fixture that provides the commands to perform a baseline
-functional test of portage.
+def _generate_all_simple_commands(playground, binhost):
+"""This fixture generates all the commands that
+``test_portage_baseline`` will use.
+
+But, don't use this fixture directly, instead, use the
+``simple_command`` fixture. That improves performance a bit due to
+pytest caching.
 
-To add a new command, define it in the local ``test_commands`` and
-add its key to the ``_SIMPLE_COMMAND_SEQUENCE``.
+.. note::
+
+   To add a new command, define it in the local ``test_commands``
+   dict, if not yet defined, and add its key at the correct position
+   in the ``_SIMPLE_COMMAND_SEQUENCE`` list.
 """
 settings = playground.settings
 eprefix = settings["EPREFIX"]
@@ -822,4 +829,15 @@ def simple_command(playground, binhost, request):
 + ("-fe", "--getbinpkgonly", "dev-libs/A")
 )
 
-return test_commands[request.param]
+yield test_commands
+
+
+@pytest.fixture()
+def simple_command(request, _generate_all_simple_commands):
+"""A fixture that provides the commands to perform a baseline
+functional test of portage. It uses another fixture, namely
+``_generate_all_simple_commands``.
+Pytest caches the fixtures and there is a little performance
+improvement if the commands are generated only once..
+"""
+return _generate_all_simple_commands[request.param]

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

[Sam James]

commit: 70482a9ea15fe27eea0ce3095defa12d98fcce75
Author: David Palao  gmail  com>
AuthorDate: Wed Jun 21 09:00:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 03:14:21 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=70482a9e

tests/emerge: add initial conftest.py

Add initial conftest.py

It contains a basic ``playground`` fixture, which is parametrized
to yield a ``ResolverPlayground`` instance for each value of
``SUPPORTED_GENTOO_BINPKG_FORMATS``.

Signed-off-by: David Palao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/tests/emerge/conftest.py| 178 
 lib/portage/tests/emerge/test_simple.py | 168 +-
 2 files changed, 179 insertions(+), 167 deletions(-)

diff --git a/lib/portage/tests/emerge/conftest.py 
b/lib/portage/tests/emerge/conftest.py
new file mode 100644
index 00..18077de257
--- /dev/null
+++ b/lib/portage/tests/emerge/conftest.py
@@ -0,0 +1,178 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+from portage.const import SUPPORTED_GENTOO_BINPKG_FORMATS
+from portage.tests.resolver.ResolverPlayground import ResolverPlayground
+
+import pytest
+
+
+_INSTALL_SOMETHING = """
+S="${WORKDIR}"
+
+pkg_pretend() {
+   einfo "called pkg_pretend for $CATEGORY/$PF"
+}
+
+src_install() {
+   einfo "installing something..."
+   insinto /usr/lib/${P}
+   echo "blah blah blah" > "${T}"/regular-file
+   doins "${T}"/regular-file
+   dosym regular-file /usr/lib/${P}/symlink || die
+
+   # Test CONFIG_PROTECT
+   insinto /etc
+   newins "${T}"/regular-file ${PN}-${SLOT%/*}
+
+   # Test code for bug #381629, using a copyright symbol encoded with 
latin-1.
+   # We use $(printf "\\xa9") rather than $'\\xa9', since printf apparently
+   # works in any case, while $'\\xa9' transforms to \\xef\\xbf\\xbd under
+   # some conditions. TODO: Find out why it transforms to \\xef\\xbf\\xbd 
when
+   # running tests for Python 3.2 (even though it's bash that is ultimately
+   # responsible for performing the transformation).
+   local latin_1_dir=/usr/lib/${P}/latin-1-$(printf "\\xa9")-directory
+   insinto "${latin_1_dir}"
+   echo "blah blah blah" > "${T}"/latin-1-$(printf "\\xa9")-regular-file 
|| die
+   doins "${T}"/latin-1-$(printf "\\xa9")-regular-file
+   dosym latin-1-$(printf "\\xa9")-regular-file 
${latin_1_dir}/latin-1-$(printf "\\xa9")-symlink || die
+
+   call_has_and_best_version
+}
+
+pkg_config() {
+   einfo "called pkg_config for $CATEGORY/$PF"
+}
+
+pkg_info() {
+   einfo "called pkg_info for $CATEGORY/$PF"
+}
+
+pkg_preinst() {
+   if ! ___eapi_best_version_and_has_version_support_-b_-d_-r; then
+   # The BROOT variable is unset during pkg_* phases for EAPI 7,
+   # therefore best/has_version -b is expected to fail if we 
attempt
+   # to call it for EAPI 7 here.
+   call_has_and_best_version
+   fi
+}
+
+call_has_and_best_version() {
+   local root_arg
+   if ___eapi_best_version_and_has_version_support_-b_-d_-r; then
+   root_arg="-b"
+   else
+   root_arg="--host-root"
+   fi
+   einfo "called ${EBUILD_PHASE_FUNC} for $CATEGORY/$PF"
+   einfo "EPREFIX=${EPREFIX}"
+   einfo "PORTAGE_OVERRIDE_EPREFIX=${PORTAGE_OVERRIDE_EPREFIX}"
+   einfo "ROOT=${ROOT}"
+   einfo "EROOT=${EROOT}"
+   einfo "SYSROOT=${SYSROOT}"
+   einfo "ESYSROOT=${ESYSROOT}"
+   einfo "BROOT=${BROOT}"
+   # Test that has_version and best_version work correctly with
+   # prefix (involves internal ROOT -> EROOT calculation in order
+   # to support ROOT override via the environment with EAPIs 3
+   # and later which support prefix).
+   if has_version $CATEGORY/$PN:$SLOT ; then
+   einfo "has_version detects an installed instance of 
$CATEGORY/$PN:$SLOT"
+   einfo "best_version reports that the installed instance is 
$(best_version $CATEGORY/$PN:$SLOT)"
+   else
+   einfo "has_version does not detect an installed instance of 
$CATEGORY/$PN:$SLOT"
+   fi
+   if [[ ${EPREFIX} != ${PORTAGE_OVERRIDE_EPREFIX} ]] ; then
+   if has_version ${root_arg} $CATEGORY/$PN:$SLOT ; then
+   einfo "has_version ${root_arg} detects an installed 
instance of $CATEGORY/$PN:$SLOT"
+   einfo "best_version ${root_arg} reports that the 
installed instance is $(best_version ${root_arg} $CATEGORY/$PN:$SLOT)"
+   else
+   einfo "has_version ${root_arg} does not detect an 
installed instance of $CATEGORY/$PN:$SLOT"
+   fi
+   fi
+}
+
+"""
+
+_AVAILABLE_EBUILDS = {
+"dev-libs/A-1": {
+"EAPI": "5",
+"IUSE": "+flag",
+"KEYWORDS": "x86",
+"LICENSE": 

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

[Sam James]

commit: 1450a9c5ddf45656545cfcd92c0917173adc9c54
Author: David Palao  gmail  com>
AuthorDate: Wed Jun 21 10:55:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 03:14:22 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=1450a9c5

tests/emerge: Add async_loop and binhost fixtures

Add async_loop and binhost fixtures.
This is a refactor: some setup code is moved from conftest.py to
test_simple.py.

Signed-off-by: David Palao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/tests/emerge/conftest.py|  47 ++
 lib/portage/tests/emerge/test_simple.py | 151 +---
 2 files changed, 106 insertions(+), 92 deletions(-)

diff --git a/lib/portage/tests/emerge/conftest.py 
b/lib/portage/tests/emerge/conftest.py
index 8b62613fd6..716bb6a85e 100644
--- a/lib/portage/tests/emerge/conftest.py
+++ b/lib/portage/tests/emerge/conftest.py
@@ -3,6 +3,10 @@
 
 from portage.const import SUPPORTED_GENTOO_BINPKG_FORMATS
 from portage.tests.resolver.ResolverPlayground import ResolverPlayground
+from portage.cache.mappings import Mapping
+from portage.tests.util.test_socks5 import AsyncHTTPServer
+from portage import os
+from portage.util.futures import asyncio
 
 import pytest
 
@@ -163,6 +167,30 @@ _INSTALLED_EBUILDS = {
 }
 
 
+class BinhostContentMap(Mapping):
+def __init__(self, remote_path, local_path):
+self._remote_path = remote_path
+self._local_path = local_path
+
+def __getitem__(self, request_path):
+safe_path = os.path.normpath(request_path)
+if not safe_path.startswith(self._remote_path + "/"):
+raise KeyError(request_path)
+local_path = os.path.join(
+self._local_path, safe_path[len(self._remote_path) + 1 :]
+)
+try:
+with open(local_path, "rb") as f:
+return f.read()
+except OSError:
+raise KeyError(request_path)
+
+
+@pytest.fixture()
+def async_loop():
+yield asyncio._wrap_loop()
+
+
 @pytest.fixture(params=SUPPORTED_GENTOO_BINPKG_FORMATS)
 def playground(request):
 """Fixture that provides instances of ``ResolverPlayground``
@@ -178,3 +206,22 @@ def playground(request):
 )
 yield playground
 playground.cleanup()
+
+
+@pytest.fixture()
+def binhost(playground, async_loop):
+settings = playground.settings
+eprefix = settings["EPREFIX"]
+binhost_dir = os.path.join(eprefix, "binhost")
+binhost_address = "127.0.0.1"
+binhost_remote_path = "/binhost"
+binhost_server = AsyncHTTPServer(
+binhost_address, BinhostContentMap(binhost_remote_path, binhost_dir), 
async_loop
+).__enter__()
+binhost_uri = "http://{address}:{port}{path}".format(
+address=binhost_address,
+port=binhost_server.server_port,
+path=binhost_remote_path,
+)
+yield {"server": binhost_server, "uri": binhost_uri}
+binhost_server.__exit__(None, None, None)

diff --git a/lib/portage/tests/emerge/test_simple.py 
b/lib/portage/tests/emerge/test_simple.py
index 2aa9b1bfc0..0389961740 100644
--- a/lib/portage/tests/emerge/test_simple.py
+++ b/lib/portage/tests/emerge/test_simple.py
@@ -15,10 +15,8 @@ from portage.const import (
 USER_CONFIG_PATH,
 SUPPORTED_GENTOO_BINPKG_FORMATS,
 )
-from portage.cache.mappings import Mapping
 from portage.process import find_binary
 from portage.tests import cnf_bindir, cnf_sbindir, cnf_etc_path
-from portage.tests.util.test_socks5 import AsyncHTTPServer
 from portage.util import ensure_dirs, find_updated_config_files, shlex_split
 from portage.util.futures import asyncio
 
@@ -48,25 +46,6 @@ def _have_python_xml():
 return True
 
 
-class BinhostContentMap(Mapping):
-def __init__(self, remote_path, local_path):
-self._remote_path = remote_path
-self._local_path = local_path
-
-def __getitem__(self, request_path):
-safe_path = os.path.normpath(request_path)
-if not safe_path.startswith(self._remote_path + "/"):
-raise KeyError(request_path)
-local_path = os.path.join(
-self._local_path, safe_path[len(self._remote_path) + 1 :]
-)
-try:
-with open(local_path, "rb") as f:
-return f.read()
-except OSError:
-raise KeyError(request_path)
-
-
 def make_test_commands(settings, trees, binhost_uri):
 eprefix = settings["EPREFIX"]
 eroot = settings["EROOT"]
@@ -383,34 +362,24 @@ def make_test_commands(settings, trees, binhost_uri):
 return test_commands
 
 
-def test_simple_emerge(playground):
-loop = asyncio._wrap_loop()
-loop.run_until_complete(
+def test_simple_emerge(async_loop, playground, binhost):
+async_loop.run_until_complete(
 asyncio.ensure_future(
-_async_test_simple(playground, _METADATA_XML_FILES, loop=loop),
-loop=loop,
+_async_test_simple(
+playground, binhost, 

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

[Sam James]

commit: 51702de8fc2501c6d51157d9933c21295091e5f1
Author: David Palao  gmail  com>
AuthorDate: Fri Jul  7 14:45:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 03:14:23 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=51702de8

tests/emerge: conftest.py: Fix issue in simple_command fixture

Fix issue in simple_command fixture. It was bad-defined in case
the argument parser missed the ability to parse intermixed args.
Also that command was renamed to make it more descriptive.

Signed-off-by: David Palao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/tests/emerge/conftest.py | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/portage/tests/emerge/conftest.py 
b/lib/portage/tests/emerge/conftest.py
index cfaf18c5f9..7675d4c78c 100644
--- a/lib/portage/tests/emerge/conftest.py
+++ b/lib/portage/tests/emerge/conftest.py
@@ -209,7 +209,7 @@ _TEST_COMMAND_NAMES_FETCHCOMMAND = [
 ]
 
 _TEST_COMMAND_NAMES = [
-"emerge_w_parse_intermixed_args",
+"emerge -1 dev-libs/A -v dev-libs/B",
 "emerge --root --quickpkg-direct-root",
 "emerge --quickpkg-direct-root",
 "env-update",
@@ -475,12 +475,15 @@ def simple_command(playground, binhost, request):
 test_commands = {}
 
 if hasattr(argparse.ArgumentParser, "parse_intermixed_args"):
-test_commands["emerge_w_parse_intermixed_args"] = emerge_cmd + (
+parse_intermixed_command = emerge_cmd + (
 "--oneshot",
 "dev-libs/A",
 "-v",
 "dev-libs/A",
 )
+else:
+parse_intermixed_command = lambda: ...
+test_commands["emerge -1 dev-libs/A -v dev-libs/B"] = 
parse_intermixed_command
 
 test_commands["emerge --root --quickpkg-direct-root"] = emerge_cmd + (
 "--usepkgonly",

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

[Sam James]

commit: 95fb92aef6724394d65fa072c4109a4cc54ee3d3
Author: David Palao  gmail  com>
AuthorDate: Fri Jun  9 15:19:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 03:14:21 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=95fb92ae

tests/emerge/test_simple.py: refactor function to make test commands

Signed-off-by: David Palao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/tests/emerge/test_simple.py | 92 +++--
 1 file changed, 53 insertions(+), 39 deletions(-)

diff --git a/lib/portage/tests/emerge/test_simple.py 
b/lib/portage/tests/emerge/test_simple.py
index 1c7d1bafbe..35e221311e 100644
--- a/lib/portage/tests/emerge/test_simple.py
+++ b/lib/portage/tests/emerge/test_simple.py
@@ -223,32 +223,9 @@ class BinhostContentMap(Mapping):
 raise KeyError(request_path)
 
 
-@pytest.mark.parametrize("binpkg_format", SUPPORTED_GENTOO_BINPKG_FORMATS)
-def test_simple_emerge(binpkg_format):
-playground = ResolverPlayground(
-ebuilds=_AVAILABLE_EBUILDS,
-installed=_INSTALLED_EBUILDS,
-debug=False,
-user_config={
-"make.conf": (f'BINPKG_FORMAT="{binpkg_format}"',),
-},
-)
-
-loop = asyncio._wrap_loop()
-loop.run_until_complete(
-asyncio.ensure_future(
-_async_test_simple(playground, _METADATA_XML_FILES, loop=loop),
-loop=loop,
-)
-)
-
-
-async def _async_test_simple(playground, metadata_xml_files, loop):
-debug = playground.debug
-settings = playground.settings
+def make_test_commands(settings, trees, binhost_uri):
 eprefix = settings["EPREFIX"]
 eroot = settings["EROOT"]
-trees = playground.trees
 portdb = trees[eroot]["porttree"].dbapi
 test_repo_location = settings.repositories["test_repo"].location
 var_cache_edb = os.path.join(eprefix, "var", "cache", "edb")
@@ -322,18 +299,6 @@ async def _async_test_simple(playground, 
metadata_xml_files, loop):
 cross_root = os.path.join(eprefix, "cross_root")
 cross_eroot = os.path.join(cross_root, eprefix.lstrip(os.sep))
 
-binhost_dir = os.path.join(eprefix, "binhost")
-binhost_address = "127.0.0.1"
-binhost_remote_path = "/binhost"
-binhost_server = AsyncHTTPServer(
-binhost_address, BinhostContentMap(binhost_remote_path, binhost_dir), 
loop
-).__enter__()
-binhost_uri = "http://{address}:{port}{path}".format(
-address=binhost_address,
-port=binhost_server.server_port,
-path=binhost_remote_path,
-)
-
 binpkg_format = settings.get("BINPKG_FORMAT", 
SUPPORTED_GENTOO_BINPKG_FORMATS[0])
 assert binpkg_format in ("xpak", "gpkg")
 if binpkg_format == "xpak":
@@ -554,7 +519,7 @@ async def _async_test_simple(playground, 
metadata_xml_files, loop):
 with open(binrepos_conf_file, "w") as f:
 f.write("[test-binhost]\n")
 f.write(f"sync-uri = {binhost_uri}\n")
-fetchcommand = 
portage.util.shlex_split(playground.settings["FETCHCOMMAND"])
+fetchcommand = portage.util.shlex_split(settings["FETCHCOMMAND"])
 fetch_bin = portage.process.find_binary(fetchcommand[0])
 if fetch_bin is not None:
 test_commands = test_commands + (
@@ -571,6 +536,56 @@ async def _async_test_simple(playground, 
metadata_xml_files, loop):
 lambda: shutil.rmtree(pkgdir),
 lambda: os.rename(binhost_dir, pkgdir),
 )
+return test_commands
+
+
+@pytest.mark.parametrize("binpkg_format", SUPPORTED_GENTOO_BINPKG_FORMATS)
+def test_simple_emerge(binpkg_format):
+playground = ResolverPlayground(
+ebuilds=_AVAILABLE_EBUILDS,
+installed=_INSTALLED_EBUILDS,
+debug=False,
+user_config={
+"make.conf": (f'BINPKG_FORMAT="{binpkg_format}"',),
+},
+)
+
+loop = asyncio._wrap_loop()
+loop.run_until_complete(
+asyncio.ensure_future(
+_async_test_simple(playground, _METADATA_XML_FILES, loop=loop),
+loop=loop,
+)
+)
+
+
+async def _async_test_simple(playground, metadata_xml_files, loop):
+debug = playground.debug
+settings = playground.settings
+trees = playground.trees
+eprefix = settings["EPREFIX"]
+binhost_dir = os.path.join(eprefix, "binhost")
+binhost_address = "127.0.0.1"
+binhost_remote_path = "/binhost"
+binhost_server = AsyncHTTPServer(
+binhost_address, BinhostContentMap(binhost_remote_path, binhost_dir), 
loop
+).__enter__()
+binhost_uri = "http://{address}:{port}{path}".format(
+address=binhost_address,
+port=binhost_server.server_port,
+path=binhost_remote_path,
+)
+
+test_commands = make_test_commands(settings, trees, binhost_uri)
+
+test_repo_location = settings.repositories["test_repo"].location
+var_cache_edb = os.path.join(eprefix, "var", "cache", "edb")
+cachedir = os.path.join(var_cache_edb, "dep")
+

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

[Sam James]

commit: 4ce856328d23fffdd193b5fd1ceaab5e1bf414a8
Author: David Palao  gmail  com>
AuthorDate: Wed Jun 21 10:03:53 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 30 03:14:22 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4ce85632

tests/emerge/test_simple.py: move playground cleaunp to fixture

Signed-off-by: David Palao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 lib/portage/tests/emerge/conftest.py| 4 +++-
 lib/portage/tests/emerge/test_simple.py | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/portage/tests/emerge/conftest.py 
b/lib/portage/tests/emerge/conftest.py
index 18077de257..8b62613fd6 100644
--- a/lib/portage/tests/emerge/conftest.py
+++ b/lib/portage/tests/emerge/conftest.py
@@ -168,7 +168,7 @@ def playground(request):
 """Fixture that provides instances of ``ResolverPlayground``
 each one with one supported value for ``BINPKG_FORMAT``."""
 binpkg_format = request.param
-yield ResolverPlayground(
+playground = ResolverPlayground(
 ebuilds=_AVAILABLE_EBUILDS,
 installed=_INSTALLED_EBUILDS,
 debug=False,
@@ -176,3 +176,5 @@ def playground(request):
 "make.conf": (f'BINPKG_FORMAT="{binpkg_format}"',),
 },
 )
+yield playground
+playground.cleanup()

diff --git a/lib/portage/tests/emerge/test_simple.py 
b/lib/portage/tests/emerge/test_simple.py
index 0907c51b33..2aa9b1bfc0 100644
--- a/lib/portage/tests/emerge/test_simple.py
+++ b/lib/portage/tests/emerge/test_simple.py
@@ -553,4 +553,3 @@ move dev-util/git dev-vcs/git
 assert os.EX_OK == proc.returncode, f"emerge failed with args 
{args}"
 finally:
 binhost_server.__exit__(None, None, None)
-playground.cleanup()

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

[John Helmert III]

commit: 50ad24c08d86326adcff296e6beb26107e0ab028
Author: John Helmert III  gentoo  org>
AuthorDate: Mon Oct 30 02:57:34 2023 +
Commit: John Helmert III  gentoo  org>
CommitDate: Mon Oct 30 02:58:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50ad24c0

app-emulation/qemu: drop 7.2.0-r3, 7.2.3

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

 app-emulation/qemu/Manifest |   2 -
 app-emulation/qemu/qemu-7.2.0-r3.ebuild | 973 
 app-emulation/qemu/qemu-7.2.3.ebuild| 972 ---
 3 files changed, 1947 deletions(-)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index c7a9ac42888d..910dd2f70ad1 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -2,8 +2,6 @@ DIST 
berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037.tar.bz2 84094
 DIST berkeley-testfloat-3-40619cbb3bf32872df8c53cc457039229428a263.tar.bz2 
90086 BLAKE2B 
ab2070622453a7a0a1fbcf234df68cc7316474c04482b2ac13c700edbb5624968c5274f337dc84f06c4ab6c3e82698cd7b0b30fe206d004b0715f15a2cc7cfd1
 SHA512 
969892af9fdf16d45660753ed02bbd8d6159928e5e6ef2f87aed8a08d995bb19d2115fb6b559522074492b2595716d314c5c059bfa69c7fbb5aab9275582c22e
 DIST keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6.tar.bz2 27971 
BLAKE2B 
0ed69ad24c53bd459c8753565814bcc1cd858f20d3a046c38912a35bcb0ba6d388ef5d2b93157cd028959284b330caf5467d82071c3df56a405dd8e08fd177c7
 SHA512 
8f2cc14e8bd46cb045e3ebfe32e463793ab7472ebda9b57b8ea0b06fa107a1a99c3ebcacb9c4548e30698d8ec154c0e56f789385201182b680819b8068a103f2
 DIST qemu-7.2.0-docs.tar.xz 1984184 BLAKE2B 
103900fb7903ed8d75f7f012bf61fa2d6fce345b657c851d0437c3384f5735bd1cfd3129320683ea7846ea0b0940e5af5b2663c9320f12fee74b058523a8ea06
 SHA512 
a7edd448982865e07533c300d3e44a8b50cefbdde1982b73c24d0b2aa74315439252c59b634c75de312860874c7b06c75aa72629da681b5105f28ee936794585
-DIST qemu-7.2.0.tar.xz 122408576 BLAKE2B 
415ff621356c59f88b29cfe3ef5db1e282b26bbafbee3d535477c6125ccb060ec9762d9e3ab9f70ce5478804dca0a46a59bcf12c112a2462029a93e578e61530
 SHA512 
f3cfa00da739ba819a218d7e6e95c77fb79a8e0f487b024ddd281602e785249b81144595e3f8c746c32a4f5c4d1a88c6aebae3c162603edfbb50ae3722d7ed13
-DIST qemu-7.2.3.tar.xz 122395692 BLAKE2B 
4e65cac7505a56da85c1d98dc6029d516dd4f07f0211ea5213724d231d448d9b49cc91a3058a2a89908608078854d97da480e6f0bc7ce47d9555c2bb1177fbdc
 SHA512 
09523d456175da47d58d8d56fe9a95416ee3e6fd8aa7766383033396a1e5bd10f7758832f7f2b8662068ef94b21ab6a3a351c9158fb6bde0e1d7d5fb393bf6c7
 DIST qemu-7.2.4.tar.xz 121849100 BLAKE2B 
a9c5ffce9ff0fac4e2d1fa4be1a1dcee2f5d7f793ddf726871c5ae9a68c22f7ba03692a8a5096de3051030d3c2f34e46697d5af2d66c34984b8161ae3bb07b42
 SHA512 
fa765673833a1f2cbecdb9d47dc7dc29d7613be5a5c8fc63925ae70e1f5aafb4f9f02e45b212a329f17b689351b8a9cdf5f5235ab6adb71bb40e41868898d95b
 DIST qemu-7.2.6.tar.xz 121322888 BLAKE2B 
c3f51cc1647f5c75774513f624c2e1a1e4badd7275c9f9a64a175809daf17d0b3c58eab0c36fa98fc46834d4d79f8552d1c9f34e840ee21ddd049cc3adba480a
 SHA512 
534fffe2d751a707a7cf15db8d5b9eddc2468fd7fe875715e79ee879fb20d7370553588384d345b586eeaddf9284de36f2d0d69f747380ee55161cc6eb09bf30
 DIST qemu-8.0.0-docs.tar.xz 3218024 BLAKE2B 
b764a625024e78a39470048355471e12cfb57ab3c34e764dc4200fdf5c1aea635d26095ec961979bf46f177101c5bd38618bacf7e98e04bd64688ab5e29591aa
 SHA512 
d9dfe191372e105fe16fe8f66f41ed793ade4c89b5ab1d84b39459f3419a1ca61bd49422a83981965cc257c05eca7fd49054703f58f179f5c7b656e9473a1054

diff --git a/app-emulation/qemu/qemu-7.2.0-r3.ebuild 
b/app-emulation/qemu/qemu-7.2.0-r3.ebuild
deleted file mode 100644
index 74224d9d66ed..
--- a/app-emulation/qemu/qemu-7.2.0-r3.ebuild
+++ /dev/null
@@ -1,973 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
-QEMU_DOCS_PREBUILT_DEV=ajak
-QEMU_DOCS_VERSION="${PV}"
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# bug #830088
-QEMU_DOC_USEFLAG="+doc"
-
-PYTHON_COMPAT=( python3_{9,10,11} )
-PYTHON_REQ_USE="ncurses,readline"
-
-FIRMWARE_ABI_VERSION="7.2.0"
-
-inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
-   pax-utils xdg-utils
-
-if [[ ${PV} == ** ]]; then
-   QEMU_DOCS_PREBUILT=0
-
-   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
-   EGIT_SUBMODULES=(
-   tests/fp/berkeley-softfloat-3
-   tests/fp/berkeley-testfloat-3
-   ui/keycodemapdb
-   )
-   inherit git-r3
-   SRC_URI=""
-else
-   MY_P="${PN}-${PV/_rc/-rc}"
-   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
-
-   

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

[Yixun Lan]

commit: 1eb076e811ae14ceb83643e2345b0ebb7c252224
Author: Yixun Lan  gentoo  org>
AuthorDate: Mon Oct 30 02:12:33 2023 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Mon Oct 30 02:15:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eb076e8

package.mask: mask net-im/telegram-desktop-4.10.5

not work with qt6, mask it until has new release

Bug: https://bugs.gentoo.org/916449
Signed-off-by: Yixun Lan  gentoo.org>

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

diff --git a/profiles/package.mask b/profiles/package.mask
index acb93c234502..31dc8d7cf054 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Yixun Lan  (2023-10-30)
+# testing version, not work on qt6, Bug #916449
+=net-im/telegram-desktop-4.10.5
+
 # Michał Górny  (2023-10-29)
 # Backports from Python 3.6/3.7 to Python 3.5.  Finally the last revdep
 # is gone.

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

[Zac Medico]

commit: 81953afed71c9a17cb4134e8cb291504bc4dd982
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Oct 30 01:45:41 2023 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Oct 30 02:07:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81953afe

www-servers/caddy: Copy deps tarball to dev space

Signed-off-by: Zac Medico  gentoo.org>

 www-servers/caddy/caddy-2.7.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/caddy/caddy-2.7.5.ebuild 
b/www-servers/caddy/caddy-2.7.5.ebuild
index 4940f75d7169..a12ca413085a 100644
--- a/www-servers/caddy/caddy-2.7.5.ebuild
+++ b/www-servers/caddy/caddy-2.7.5.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == ** ]]; then
EGIT_REPO_URI="https://github.com/caddyserver/caddy.git;
 else
SRC_URI="https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   SRC_URI+=" 
https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz
 -> ${P}-deps.tar.xz"
+   SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz;
SRC_URI+=" 
https://github.com/caddyserver/dist/archive/refs/tags/v${PV}.tar.gz -> 
${P}-docs.tar.gz"
KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
 fi

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

[Zac Medico]

commit: dcf6809eba95a9070a2768f60e1ba5f5a448d994
Author: Rahil Bhimjiani  gmail  com>
AuthorDate: Thu Oct 12 06:10:49 2023 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Oct 30 02:07:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcf6809e

www-servers/caddy: add 2.7.5 & update live

1. split out LICENSE
2. Install Caddyfile as upstream intended.
3. show correct version on `caddy version`
4. misc improvements in initd & confd like validate config file, reload,
add variables for config file & logfile

Closes: https://bugs.gentoo.org/915687
Signed-off-by: Rahil Bhimjiani  gmail.com>
Signed-off-by: Zac Medico  gentoo.org>

 www-servers/caddy/Manifest |  3 ++
 .../{caddy-.ebuild => caddy-2.7.5.ebuild}  | 28 +++---
 www-servers/caddy/caddy-.ebuild| 28 +++---
 www-servers/caddy/files/confd-2.7.5|  5 ++
 www-servers/caddy/files/initd-2.7.5| 53 +++
 .../remove-binary-altering-commands-2.7.5.patch| 61 ++
 6 files changed, 162 insertions(+), 16 deletions(-)

diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index 306f0fd1dbad..25194e18138c 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -7,3 +7,6 @@ DIST caddy-2.6.4.tar.gz 568213 BLAKE2B 
4837c8511002538ed6d7ac92743a834e76bdba3a3
 DIST caddy-2.7.4-deps.tar.xz 146920768 BLAKE2B 
25d99c7d73f7c9a63868ab496f27571d15181cee298e16a83c02b652b8b89cab615969897d11faadfdc3e9ca389783c3b610e219a16b0a146748d0ea2e3309ca
 SHA512 
5cdb95bcf7435a76385d0fc9277bdaa317261698f1bf15b54e081b89bd971927c0f5ca9f42a693127fabca9c6a6eae81978c6b4978ff9962f67a83591d104e6a
 DIST caddy-2.7.4-docs.tar.gz 25264 BLAKE2B 
2282ac0ddd76b0837d33cf24d01f13ac9c0c8e0abf043cf5ade0ec3a51fda2d7c15589574b159df00e2c25733f10ccc6f4cf6b3a97f9f831aa276f3adee84fd9
 SHA512 
179a13b89b0da1771dcaf798e33000b60f202804e728d8aca85a23a68b055ee6d12e5f75eb30257a412621ffd105035bd371bd7e448f876eeb91544fd3092344
 DIST caddy-2.7.4.tar.gz 625647 BLAKE2B 
be4749a2298d2e00e2a24324ee31090847be9ec4de49f47715c86e65750d01698b5a4a21990430cc7622fecce5b375ae8e3fb2ef832515ce9dcca8f2d26a9911
 SHA512 
e988ec4fa526d16b91a86f28fc13c606ab159815d5be45a2ea65bf91b5579a25efc8ff415b0aa98699f72bd3106ed02d49e48303d9c80e7fe6805ade416e7dff
+DIST caddy-2.7.5-deps.tar.xz 161234532 BLAKE2B 
130e3fd75d7d2976ef27c2afe0cede8da957ad1c8db7b2140ef69a732cf25c6a04bde43c836832a0f7c14dbb4ab9cd48b496b8ea644da411181ba79b4116d892
 SHA512 
3dcc834e8cc9851f114d173a812de4b3a5256f8458f2d20ed0c66109d1ede1ee8e1d85053347a194818495cdfcaab2bf86d1b12f94fe2f917e22bf25b8d9c411
+DIST caddy-2.7.5-docs.tar.gz 24578 BLAKE2B 
e08bfa37b157d8d4300198384bfc4c19cb0f539cc293311eaedcddffd4469026605c92f4388202db68beeadb2353666860daf3845ff5d69bb11afdb29eefe02b
 SHA512 
635fdc1f2767cceacbddbbf56ba7207d558475c66ff9434a2b6edffd59d3711be0c6a4b4ffd2a6cf2eee53dcf22097c2b11eb44f0e9cc1d8455c1ea7c01bc498
+DIST caddy-2.7.5.tar.gz 611282 BLAKE2B 
86c28922f80f931452e81b0c3fa52ed0b86b2325eb2a1adf1de830a7a339772063955fd3cb5ee888cbf8c1c905b98bb6a292b592a2983012ad4fefe33c361e82
 SHA512 
45f6790b7c3683a8001445e932d5678fd27d204500f7301d92c4d8421f24574e113bf7c335bd277b16abe07eb3d24258358f87c68cee38905fa6d0e6bcc1c24c

diff --git a/www-servers/caddy/caddy-.ebuild 
b/www-servers/caddy/caddy-2.7.5.ebuild
similarity index 69%
copy from www-servers/caddy/caddy-.ebuild
copy to www-servers/caddy/caddy-2.7.5.ebuild
index e60c54e02eb3..4940f75d7169 100644
--- a/www-servers/caddy/caddy-.ebuild
+++ b/www-servers/caddy/caddy-2.7.5.ebuild
@@ -13,12 +13,13 @@ if [[ "${PV}" == ** ]]; then
EGIT_REPO_URI="https://github.com/caddyserver/caddy.git;
 else
SRC_URI="https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz;
+   SRC_URI+=" 
https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz
 -> ${P}-deps.tar.xz"
SRC_URI+=" 
https://github.com/caddyserver/dist/archive/refs/tags/v${PV}.tar.gz -> 
${P}-docs.tar.gz"
KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
 fi
 
-LICENSE="Apache-2.0 BSD ECL-2.0 MIT CC0-1.0"
+LICENSE="Apache-2.0"
+LICENSE+=" BSD ECL-2.0 MIT CC0-1.0"
 SLOT="0"
 RESTRICT="test"
 RDEPEND="
@@ -30,6 +31,10 @@ FILECAPS=(
-m 755 'cap_net_bind_service=+ep' usr/bin/"${PN}"
 )
 
+PATCHES=(
+   "${FILESDIR}"/remove-binary-altering-commands-2.7.5.patch
+)
+
 src_unpack() {
if [[ "${PV}" == ** ]]; then
# unpack code
@@ -48,12 +53,19 @@ src_unpack() {
 
 src_prepare(){
default
-   sed -i -e "s|User=caddy|User=http|g;" ../dist-"${PV}"/init/*service || 
die
-   sed -i -e "s|Group=caddy|Group=http|g;" ../dist-"${PV}"/init/*service 
|| die
+   sed -i -e "s|User=caddy|User=http|g;s|Group=caddy|Group=http|g;" 
../dist-"${PV}"/init/*service || die
 }
 
 src_compile() {
-   ego build 

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

[Zac Medico]

commit: e9b05d59265e6e5ee9d9116ace6ccee1af371b42
Author: Rahil Bhimjiani  gmail  com>
AuthorDate: Thu Oct 12 09:36:50 2023 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Oct 30 02:07:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9b05d59

www-servers/caddy: drop 2.5.2, 2.6.2 and 2.6.4

2.7.4 is stable so no need for them anymore

Signed-off-by: Rahil Bhimjiani  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33309
Signed-off-by: Zac Medico  gentoo.org>

 www-servers/caddy/Manifest   |  6 -
 www-servers/caddy/caddy-2.5.2.ebuild | 45 
 www-servers/caddy/caddy-2.6.2.ebuild | 45 
 www-servers/caddy/caddy-2.6.4.ebuild | 45 
 4 files changed, 141 deletions(-)

diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index 25194e18138c..2842321a2dc5 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -1,9 +1,3 @@
-DIST caddy-2.5.2-deps.tar.xz 121709464 BLAKE2B 
d15157536916aae8a63dcdcdd01bef7fa37c2f7174b8a43222d3a150b16efa153274b0158a6e86893f02310453b9b176529295021c51b85956de69e60653414f
 SHA512 
6600a30bf3b63ceeae98a60377be43f16723e6e0cbd65ed626c3777cb5c39eb3fea5769a6cc0f987da978df8efc917825e85f118810a23504d396a94f3e270ae
-DIST caddy-2.5.2.tar.gz 538564 BLAKE2B 
dcdaacc63ec0481a9add35ac79c4d02d0a262dc4a1b5215877843797817832cf07e2ecaa2c8f73173f5e0bf38d4d15f2f6c5909f0dc3c8a178db9b001af5206f
 SHA512 
98eb10075b6eacd93cfe893f7df6d8d8ce41649b6a6b78937c1ee7ba82ebdf483204d98c5e45501617abfe426d3b12a9a413e49304e1b62569ab3bad489e2c66
-DIST caddy-2.6.2-deps.tar.xz 157577068 BLAKE2B 
4ee60155de108ae1a0c897f3cd95549fff6add81b8c6b5cc1e4407d47eb8e81da825977ac9334fa884729759b88a8e23297a9c7b10a088d865ee6698cd444054
 SHA512 
ca7ab6522b6a3ba2741ad3c40044236196331fd0abcfdf480690a6dfd63127512e31cdc6219deff6b7ec9f6c7acaa672c161b738b87d22e655896bf1d5f70788
-DIST caddy-2.6.2.tar.gz 556197 BLAKE2B 
a3fd7e69a33ee045de7f4b8218d5bb41e1f740c744bf633554c93d298c06506f3b8f2f8ff739b423641958459fed84d6783a2ffe764ff175ee329eab9dc7dc19
 SHA512 
01761de707668d589af7eeecdd694c94e867d5710f0b72285b4d2e6fb26cf9e10baeed3920e9b9b292c75568c84ff79b400026e37d7dcc003cebb839469b6c1b
-DIST caddy-2.6.4-deps.tar.xz 126961712 BLAKE2B 
45448376fb368639913360c96074a21b6907a0d573de403d46f150f004b24a0e328c210e6192d6540444bef6b33d4dbff7f44ad129bbe6cdfc344fb108500bf0
 SHA512 
f8d73a888c6f0e1c1467878162e3c34da35dcfc2ab7232db4f5e7ac5b51b2f91f6a98a07d732a8f17d9523226a21a8a9b1075a474e9d2b5f3c7869ef0a9e892a
-DIST caddy-2.6.4.tar.gz 568213 BLAKE2B 
4837c8511002538ed6d7ac92743a834e76bdba3a35e92a3587ee29911c4a623d37948725a4c20967f3893abe7ce05a88aeb93af294045d722193a68ca7c69bff
 SHA512 
438869a24c0f68e8d742752d3573cf7894c566344f85d0e262ddf26d91c711dd27a0422396bfdd94823c8ee4c7fd24ce222938f3339f1c19e706e64207fc483f
 DIST caddy-2.7.4-deps.tar.xz 146920768 BLAKE2B 
25d99c7d73f7c9a63868ab496f27571d15181cee298e16a83c02b652b8b89cab615969897d11faadfdc3e9ca389783c3b610e219a16b0a146748d0ea2e3309ca
 SHA512 
5cdb95bcf7435a76385d0fc9277bdaa317261698f1bf15b54e081b89bd971927c0f5ca9f42a693127fabca9c6a6eae81978c6b4978ff9962f67a83591d104e6a
 DIST caddy-2.7.4-docs.tar.gz 25264 BLAKE2B 
2282ac0ddd76b0837d33cf24d01f13ac9c0c8e0abf043cf5ade0ec3a51fda2d7c15589574b159df00e2c25733f10ccc6f4cf6b3a97f9f831aa276f3adee84fd9
 SHA512 
179a13b89b0da1771dcaf798e33000b60f202804e728d8aca85a23a68b055ee6d12e5f75eb30257a412621ffd105035bd371bd7e448f876eeb91544fd3092344
 DIST caddy-2.7.4.tar.gz 625647 BLAKE2B 
be4749a2298d2e00e2a24324ee31090847be9ec4de49f47715c86e65750d01698b5a4a21990430cc7622fecce5b375ae8e3fb2ef832515ce9dcca8f2d26a9911
 SHA512 
e988ec4fa526d16b91a86f28fc13c606ab159815d5be45a2ea65bf91b5579a25efc8ff415b0aa98699f72bd3106ed02d49e48303d9c80e7fe6805ade416e7dff

diff --git a/www-servers/caddy/caddy-2.5.2.ebuild 
b/www-servers/caddy/caddy-2.5.2.ebuild
deleted file mode 100644
index c1adcb1cf8b0..
--- a/www-servers/caddy/caddy-2.5.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit fcaps go-module systemd
-
-DESCRIPTION="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
-HOMEPAGE="https://caddyserver.com;
-SRC_URI="https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz -> 
${P}.tar.gz
-   https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz;
-
-LICENSE="Apache-2.0 BSD ECL-2.0 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
-RDEPEND="
-   acct-user/http
-   acct-group/http"
-DEPEND="${RDEPEND}"
-
-RESTRICT+=" test"
-
-FILECAPS=(
-   -m 755 'cap_net_bind_service=+ep' usr/bin/${PN}
-)
-
-src_compile() {
-   ego build ./cmd/caddy
-}
-
-src_install() {
-   dobin caddy
-   dodoc README.md
-   keepdir /etc/caddy
-   insinto /etc/caddy
-   newins "${FILESDIR}"/caddy_config.json caddy_config.json.example
-   systemd_dounit 

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

[Stefan Strogin]

commit: a05fce8956ca8fe7af0f32582e9b23f7c1245d8d
Author: Stefan Strogin  gentoo  org>
AuthorDate: Mon Oct 30 01:11:15 2023 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Mon Oct 30 01:11:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a05fce89

net-im/telegram-desktop-bin: add 4.11.1, drop 4.10.3

Signed-off-by: Stefan Strogin  gentoo.org>

 net-im/telegram-desktop-bin/Manifest  | 4 ++--
 ...m-desktop-bin-4.10.3.ebuild => telegram-desktop-bin-4.11.1.ebuild} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-im/telegram-desktop-bin/Manifest 
b/net-im/telegram-desktop-bin/Manifest
index 82da74e3d935..0f5722af2ff9 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,2 +1,2 @@
-DIST tdesktop-4.10.3.tar.gz 18112345 BLAKE2B 
d64e9bd897295917ee9875565c571de954d7b57b40fd37c542e5d27b4799c4c55b1c9e7afe27bcadc3a7d2012188f9e95eed9a39073b758ee46b4f8b35de416c
 SHA512 
60d819208cb003f4b1716bbf279e3cb29c8925af9c21e149b611dbb66f06ed8638a4113db4cd603708c53afe67e6bf3649fa9044195885fbf46e34e306afce0e
-DIST tsetup.4.10.3.tar.xz 52239308 BLAKE2B 
8d028c964e5d60788dcf35c370d942a5bc4c5f1682b7edf9787ce6ca60b363d58267cc71d1916092d90d0a4b8baf8d4ac09cede8651db8b5786292a1f8060b66
 SHA512 
27260d01c5b1bf1ae7120b9d4f95168b4335c8f803b21637af967d534cb9e538484b7c6e2782e79fa0a50b209ce489143546fd648cbc6d209a144ab5bd3f2ca1
+DIST tdesktop-4.11.1.tar.gz 18247241 BLAKE2B 
a4107e4fb208913921c216c66f020302358e53ce24ea63727236388d7b0ec9720438f2cc6e9a28a5bdf20250659222c1af2bc743efbbc5b49acbb92cd14eb6ab
 SHA512 
656c3f0ada8ef9df342e1c6b984c6f47fc164b597697ff4a25f20e2607bbec7ef19f4b1f64003e0ddeae08130eadfb543823cda71bd58ac8c08ee1098c4b5842
+DIST tsetup.4.11.1.tar.xz 52937060 BLAKE2B 
60196278e2cd2a3c98f051a78193354c25effb01cb3b4d9a2e33955db029bd3a2da4fb07096ca65c899db77179a0dbd28970cbc9d535b3da3b6ae1fe874f1f26
 SHA512 
53891bb63348ed0d0fd9d9c39e21392394b1b27c94cb0d28b9f5d02494258300b4c262d66dac942b180391af8cf91fb8cdf9a8cb047e21b3072e5dd7a72ed3ff

diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.10.3.ebuild 
b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.11.1.ebuild
similarity index 100%
rename from net-im/telegram-desktop-bin/telegram-desktop-bin-4.10.3.ebuild
rename to net-im/telegram-desktop-bin/telegram-desktop-bin-4.11.1.ebuild

[gentoo-commits] repo/gentoo:master commit in: app-emulation/gallium-nine-standalone/

[James Le Cuirot]

commit: ecadd137d4240f6302589e70c0ae782e336e5e9b
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Oct 29 22:59:46 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Oct 29 23:00:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecadd137

app-emulation/gallium-nine-standalone: Use meson-format-array

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

 .../gallium-nine-standalone-0.9.ebuild| 11 +++
 .../gallium-nine-standalone-.ebuild   | 11 +++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git 
a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9.ebuild 
b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9.ebuild
index a2a9c3b6ce1b..3da718cb8610 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9.ebuild
@@ -32,9 +32,12 @@ RDEPEND="
 
 DEPEND="
${RDEPEND}
-   virtual/pkgconfig
virtual/wine[${MULTILIB_USEDEP}]
-   >=dev-util/meson-0.50.1
+"
+
+BDEPEND="
+   dev-util/meson-format-array
+   virtual/pkgconfig
 "
 
 PATCHES=(
@@ -65,8 +68,8 @@ src_prepare() {
 
sed \
-e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
-   -e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} 
'-DG9DLL=${g9dll}'")!" \
-   -e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
+   -e "s!@CFLAGS@!$(meson-format-array "${CFLAGS} 
'-DG9DLL=${g9dll}'")!" \
+   -e "s!@LDFLAGS@!$(meson-format-array "${LDFLAGS}")!" \
-e 
"s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!"
 \
${file}.in > ${file} || die
}

diff --git 
a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild 
b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild
index a2a9c3b6ce1b..3da718cb8610 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild
@@ -32,9 +32,12 @@ RDEPEND="
 
 DEPEND="
${RDEPEND}
-   virtual/pkgconfig
virtual/wine[${MULTILIB_USEDEP}]
-   >=dev-util/meson-0.50.1
+"
+
+BDEPEND="
+   dev-util/meson-format-array
+   virtual/pkgconfig
 "
 
 PATCHES=(
@@ -65,8 +68,8 @@ src_prepare() {
 
sed \
-e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
-   -e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} 
'-DG9DLL=${g9dll}'")!" \
-   -e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
+   -e "s!@CFLAGS@!$(meson-format-array "${CFLAGS} 
'-DG9DLL=${g9dll}'")!" \
+   -e "s!@LDFLAGS@!$(meson-format-array "${LDFLAGS}")!" \
-e 
"s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!"
 \
${file}.in > ${file} || die
}

[gentoo-commits] repo/gentoo:master commit in: app-emulation/gallium-nine-standalone/files/, ...

[James Le Cuirot]

commit: 9e04c01982bbb17dad492e5411ea5176ce3d3fa0
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Oct 29 22:45:16 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Oct 29 23:00:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e04c019

app-emulation/gallium-nine-standalone: Drop old 0.7-r1

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

 app-emulation/gallium-nine-standalone/Manifest |   1 -
 .../files/0.7-cross-files.patch|  34 ---
 .../files/0.7-no-libwine.patch |  34 ---
 .../gallium-nine-standalone-0.7-r1.ebuild  | 103 -
 4 files changed, 172 deletions(-)

diff --git a/app-emulation/gallium-nine-standalone/Manifest 
b/app-emulation/gallium-nine-standalone/Manifest
index 9d0095b1d5aa..8bf4e367ca22 100644
--- a/app-emulation/gallium-nine-standalone/Manifest
+++ b/app-emulation/gallium-nine-standalone/Manifest
@@ -1,2 +1 @@
-DIST gallium-nine-standalone-0.7.tar.gz 67699 BLAKE2B 
85520de46e0e821f63d89691e322c3001ae853a0058a5077b484da6a1596a7ed03d2e2b7dc2686661fd21d34b33e10f4549437ce5790f18e1e6cc77c894e9d1e
 SHA512 
9007564347bb6677f3d4eff83f744d39487c09b543489f02dcf7606917ecd9b72decf8176d9daecb6039b8998e97f737d9f7a71a5052f4d5c73f2e99e92af43c
 DIST gallium-nine-standalone-0.8.tar.gz 66656 BLAKE2B 
5eaebcc514570dbaff44c4c889025d19a26c0b54941d1ab99ec131216a6eb49c2c649f1a4df51534f608653dab8b5e55a35afc57ba04a0ab6f4dea0edabac55c
 SHA512 
3f339f909c6d65a2e5b5c912785aaa6f297e95549c868ab679dfb8e99d67db9906b6e75e3679a4e3e003f512a54ceb9953f941a4129f488973c16e1a3ac7267c

diff --git a/app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch 
b/app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch
deleted file mode 100644
index fed5c0403688..
--- a/app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/tools/cross-wine32.in b/tools/cross-wine32.in
-index bfbe410..0064cf8 100644
 a/tools/cross-wine32.in
-+++ b/tools/cross-wine32.in
-@@ -5,9 +5,10 @@ strip = 'strip'
- pkgconfig = '@PKG_CONFIG@'
- 
- [properties]
--c_args = ['-m32']
--c_link_args = ['-m32', '-mwindows']
-+c_args = @CFLAGS@ + ['-m32']
-+c_link_args = @LDFLAGS@ + ['-m32', '-mwindows']
- needs_exe_wrapper = true
-+pkg_config_libdir = '@PKG_CONFIG_LIBDIR@'
- 
- [host_machine]
- system = 'linux'
-diff --git a/tools/cross-wine64.in b/tools/cross-wine64.in
-index 5e19023..06b1f2a 100644
 a/tools/cross-wine64.in
-+++ b/tools/cross-wine64.in
-@@ -5,9 +5,10 @@ strip = 'strip'
- pkgconfig = '@PKG_CONFIG@'
- 
- [properties]
--c_args = ['-m64']
--c_link_args = ['-m64', '-mwindows']
-+c_args = @CFLAGS@ + ['-m64']
-+c_link_args = @LDFLAGS@ + ['-m64', '-mwindows']
- needs_exe_wrapper = true
-+pkg_config_libdir = '@PKG_CONFIG_LIBDIR@'
- 
- [host_machine]
- system = 'linux'

diff --git a/app-emulation/gallium-nine-standalone/files/0.7-no-libwine.patch 
b/app-emulation/gallium-nine-standalone/files/0.7-no-libwine.patch
deleted file mode 100644
index abcf7ad4ea3b..
--- a/app-emulation/gallium-nine-standalone/files/0.7-no-libwine.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From bddb53abdd1a77b1c019457f7eea4a6404a5e492 Mon Sep 17 00:00:00 2001
-From: Andre Heider 
-Date: Sun, 17 Jan 2021 11:42:57 +0100
-Subject: [PATCH] meson: stop checking for libwine
-
-From the WINE 6.0 release notes:
-The libwine library is no longer used, but it's still provided to
-support running Winelib modules built against older versions. It is
-deprecated however, and will be removed in a future Wine release.
-
-libwine wasn't used anymore anyway, this just ensures that this tree can
-be built against future WINE versions.

- meson.build | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 0969777..47ee51a 100644
 a/meson.build
-+++ b/meson.build
-@@ -35,12 +35,10 @@ code = '''#ifndef __WINE__
- #error 1
- #endif'''
- 
--if not cc.compiles(code, name: 'winelib check')
-+if not cc.compiles(code, name: 'winegcc check')
-   error('A WINE cross compiler is required')
- endif
- 
--dep_wine = cc.find_library('wine')
--
- if not cc.has_header_symbol('windows.h', 'wine_get_unix_file_name')
-   error('WINE headers not found')
- endif

diff --git 
a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7-r1.ebuild 
b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7-r1.ebuild
deleted file mode 100644
index 1529b6ac411d..
--- 
a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson-multilib toolchain-funcs
-
-MY_PN="wine-nine-standalone"
-DESCRIPTION="A standalone version of the WINE parts of Gallium Nine"
-HOMEPAGE="https://github.com/iXit/wine-nine-standalone;
-
-if [[ ${PV} = * ]]; 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/gallium-nine-standalone/, ...

[James Le Cuirot]

commit: 6514bf7c9f10aef7fa983b5afd1da0e6168e7693
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Oct 29 22:52:44 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Oct 29 23:00:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6514bf7c

app-emulation/gallium-nine-standalone: Version bump to 0.9, EAPI 8

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

 app-emulation/gallium-nine-standalone/Manifest   |  1 +
 .../gallium-nine-standalone/files/0.9-nine-dll-path.patch| 12 
 ...dalone-.ebuild => gallium-nine-standalone-0.9.ebuild} |  6 +++---
 .../gallium-nine-standalone-.ebuild  |  6 +++---
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/app-emulation/gallium-nine-standalone/Manifest 
b/app-emulation/gallium-nine-standalone/Manifest
index 8bf4e367ca22..90d5abcd33ea 100644
--- a/app-emulation/gallium-nine-standalone/Manifest
+++ b/app-emulation/gallium-nine-standalone/Manifest
@@ -1 +1,2 @@
 DIST gallium-nine-standalone-0.8.tar.gz 66656 BLAKE2B 
5eaebcc514570dbaff44c4c889025d19a26c0b54941d1ab99ec131216a6eb49c2c649f1a4df51534f608653dab8b5e55a35afc57ba04a0ab6f4dea0edabac55c
 SHA512 
3f339f909c6d65a2e5b5c912785aaa6f297e95549c868ab679dfb8e99d67db9906b6e75e3679a4e3e003f512a54ceb9953f941a4129f488973c16e1a3ac7267c
+DIST gallium-nine-standalone-0.9.tar.gz 67687 BLAKE2B 
24e4250cacde3306cdfa8d9b24fa2fa0eb7dee4e5722973baa59f25999a75e689acad4c24c8bbfbc34aaddc24bdfe1977ff2f85da08a81b4ce6b222d5d0bfae0
 SHA512 
1ed384563736ab5db4167ca28163c93e58e9ff7ee62656d4adea8bc937484aebce3ed06f4600a080ad61fcfedd12febb3db9430be6cc8dd97484982694fde3a7

diff --git 
a/app-emulation/gallium-nine-standalone/files/0.9-nine-dll-path.patch 
b/app-emulation/gallium-nine-standalone/files/0.9-nine-dll-path.patch
new file mode 100644
index ..14c2b30a741f
--- /dev/null
+++ b/app-emulation/gallium-nine-standalone/files/0.9-nine-dll-path.patch
@@ -0,0 +1,12 @@
+diff -Naur a/ninewinecfg/main.c b/ninewinecfg/main.c
+--- a/ninewinecfg/main.c   2023-03-10 08:32:25.0 +
 b/ninewinecfg/main.c   2023-10-29 22:49:15.919529033 +
+@@ -28,7 +28,7 @@
+ #include "../common/registry.h"
+ #include "resource.h"
+ 
+-static const char * const fn_nine_dll = "d3d9-nine.dll";
++static const char * const fn_nine_dll = G9DLL;
+ static const char * const fn_backup_dll = "d3d9-nine.bak";
+ static const char * const fn_d3d9_dll = "d3d9.dll";
+ static const char * const fn_nine_exe = "ninewinecfg.exe";

diff --git 
a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild 
b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9.ebuild
similarity index 96%
copy from 
app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild
copy to app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9.ebuild
index d9a079e97a24..a2a9c3b6ce1b 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson-multilib toolchain-funcs
 
@@ -39,7 +39,7 @@ DEPEND="
 
 PATCHES=(
"${FILESDIR}"/0.8-cross-files.patch
-   "${FILESDIR}"/0.3-nine-dll-path.patch
+   "${FILESDIR}"/0.9-nine-dll-path.patch
 )
 
 bits() {

diff --git 
a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild 
b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild
index d9a079e97a24..a2a9c3b6ce1b 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson-multilib toolchain-funcs
 
@@ -39,7 +39,7 @@ DEPEND="
 
 PATCHES=(
"${FILESDIR}"/0.8-cross-files.patch
-   "${FILESDIR}"/0.3-nine-dll-path.patch
+   "${FILESDIR}"/0.9-nine-dll-path.patch
 )
 
 bits() {

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

[Sam James]

commit: 073a656ddb052c6b020f1a6a42104b096397209a
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 29 22:50:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 29 22:53:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=073a656d

sys-devel/gcc: add 14.0.0_pre20231029

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

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

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 4b331a5c0d76..c771f3610fe4 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -29,6 +29,7 @@ DIST gcc-13.2.0-patches-7.tar.xz 37064 BLAKE2B 
4a8700a8d44bfaa84926f8bfd0da4c5b0
 DIST gcc-13.2.0-patches-9.tar.xz 45724 BLAKE2B 
5135f00ed2ac0db8b1e295f2ba9abb44fd4b5e26037083f012c5c104c301fd11c1b04179a7f777f1433d3e6e3e50e64d79a7f9ff263269cde52ded7ca5416448
 SHA512 
81158d7b260d2ca457553f2749333aea69b40b4896a156a2b81168124bf91469b8124c788e54b44cadc1215bbb69590d013385fbab2b4962ed5e36c697710165
 DIST gcc-14-20231015.tar.xz 86138880 BLAKE2B 
e6dece3d6c4337c5ac85fec3fcd31117baf06a7c510440d2433d7750d4559ce5ccfb36edf1ed7dd003d55322dccf42ca811f16a9d22b19e3c784f48f804f688d
 SHA512 
e0de6cd24278998138df8ac1e7e0ea2fe8f062f3bd4e1c88be5da3e468959dc3df41f076c1ce1ed6c919a4ddbd6cfff638cd101e6bd6a3a9ae0d67ded360a700
 DIST gcc-14-20231022.tar.xz 86217644 BLAKE2B 
e3248d78323370e3afa3082e89e507860d45d4eaebdf479edebca71deab1a85a6b27845057090fb155e5e53e5d3eb24647e2482ebf1f63645a73ad3561b26b94
 SHA512 
bbe013c7d226c64e4b4f95c12464f48177c8dd7acfdd1f6f8f2f650c48a4e11e70b724728accff9f135fc6d234fb7dc01ca20a414468ccf43c2b81d0ddc73e1f
+DIST gcc-14-20231029.tar.xz 86262312 BLAKE2B 
871b95efa775d4aa12a5224b9dffeb8ffa8fa168275890f651f5868ca7d9ad4a26cda625e69592618e933d8995307dba83aecc7fab82bb6bcc2d81177cbe3d20
 SHA512 
237533b45de45ff99d93ebba8aa2b410ba9a93d9aa61851a9451696d3cd5ab893361d55809cd41741e356f3f1ee48b6ade2a9fca136dd155b219d3f19ac2b5a1
 DIST gcc-14.0.0-musl-patches-1.tar.xz 3576 BLAKE2B 
692baee8a7709905d53aeb150d73a3721c4ba47ee5f397cfb1b5be905cf003ca02b60c94ee294d90ac39645cd5cdf186c7a3aa950c47d8cf680c128ed705b807
 SHA512 
0592ab98a7142e404623a6511c67dff61e9ade32c3fb2c0e75b456306e0af3799ad13252b50b3d2fdd31e5815d7f0b16b0ad63ab8386fe4d78729fc9c182d617
 DIST gcc-14.0.0-patches-4.tar.xz 24132 BLAKE2B 
95f382ff1232bc681f4fbd28134a5e781bbce0e472d36b9348f54153791ce2b942c9ca3ea0931df8ed5ef48fb0e71f5a5a941e90dfcbd7162f52a4a6a2df9133
 SHA512 
867c982ee4ce6e10bc76949d30749427e8d070261fd9253cd1ca6b21273f04303c317057176ad7a58ecde06104d295c3af7526151bab7339851f9b06214bba3d
 DIST gcc-14.0.0-patches-5.tar.xz 21180 BLAKE2B 
4ad48161bb35320141df60b99d2c7791df72f719931a649b45842df2acfb84428815efa11ecad6ff4f219a1fde77ffc5e4ed302e2f8f04e0911f514addb5cc7f
 SHA512 
b47a1bbd7218fe03d6cc4968cb51614c34d1548fa85781c6b85cfa901cd43130f9c503404502c92a629ac6b23559fe3bccf38e3bbcb257524941aaec46774cff

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

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

[Sam James]

commit: e5e7e0d1fe0a4406e69dc91454075a4737de69e1
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 29 22:53:31 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 29 22:53:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5e7e0d1

x11-libs/libnotify: Stabilize 0.8.3 x86, #916506

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

 x11-libs/libnotify/libnotify-0.8.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/libnotify/libnotify-0.8.3.ebuild 
b/x11-libs/libnotify/libnotify-0.8.3.ebuild
index 46c43571f49a..03ef71a89a5d 100644
--- a/x11-libs/libnotify/libnotify-0.8.3.ebuild
+++ b/x11-libs/libnotify/libnotify-0.8.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libnotify;
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="gtk-doc +introspection test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="gtk-doc? ( introspection )"

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

[Mart Raudsepp]

commit: 09e260adc0ae85eeb32751902067c56265b23ed9
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Oct 29 22:21:32 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 22:21:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09e260ad

media-video/pitivi: Explicitly depend on libpeas SLOT=0

Another libpeas SLOT is coming.

Signed-off-by: Mart Raudsepp  gentoo.org>

 .../pitivi/{pitivi-2023.03-r1.ebuild => pitivi-2023.03-r2.ebuild}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/pitivi/pitivi-2023.03-r1.ebuild 
b/media-video/pitivi/pitivi-2023.03-r2.ebuild
similarity index 97%
rename from media-video/pitivi/pitivi-2023.03-r1.ebuild
rename to media-video/pitivi/pitivi-2023.03-r2.ebuild
index 8b3d98b8e913..fdabc77d5fb2 100644
--- a/media-video/pitivi/pitivi-2023.03-r1.ebuild
+++ b/media-video/pitivi/pitivi-2023.03-r2.ebuild
@@ -35,7 +35,7 @@ RDEPEND="${COMMON_DEPEND}
 
>=dev-libs/gobject-introspection-1.34:=
 
-   dev-libs/libpeas[${PYTHON_SINGLE_USEDEP}]
+   dev-libs/libpeas:0[${PYTHON_SINGLE_USEDEP}]
 
$(python_gen_cond_dep '
dev-python/dbus-python[${PYTHON_USEDEP}]

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

[Mart Raudsepp]

commit: 3b93b39581e629bbf009fc12424aca158f426617
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Oct 29 22:22:10 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 22:22:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b93b395

media-video/totem: Explicitly depend on libpeas SLOT=0

Another libpeas SLOT is coming.

Signed-off-by: Mart Raudsepp  gentoo.org>

 media-video/totem/{totem-43.0.ebuild => totem-43.0-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/totem/totem-43.0.ebuild 
b/media-video/totem/totem-43.0-r1.ebuild
similarity index 96%
rename from media-video/totem/totem-43.0.ebuild
rename to media-video/totem/totem-43.0-r1.ebuild
index 94daa097609e..b5f233577b01 100644
--- a/media-video/totem/totem-43.0.ebuild
+++ b/media-video/totem/totem-43.0-r1.ebuild
@@ -29,7 +29,7 @@ COMMON_DEPEND="
>=media-libs/gst-plugins-base-1.6.0:1.0[pango]
>=media-libs/gst-plugins-good-1.6.0:1.0
>=media-libs/grilo-0.3.0:0.3[playlist]
-   >=dev-libs/libpeas-1.1.0[gtk]
+   >=dev-libs/libpeas-1.1.0:0[gtk]
>=dev-libs/totem-pl-parser-3.26.5:0=[introspection]
gnome-base/gnome-desktop:3=
gnome-base/gsettings-desktop-schemas
@@ -53,7 +53,7 @@ RDEPEND="${COMMON_DEPEND}
dev-libs/libportal:0=[gtk]
python? (
x11-libs/pango[introspection]
-   >=dev-libs/libpeas-1.1.0[python,${PYTHON_SINGLE_USEDEP}]
+   >=dev-libs/libpeas-1.1.0:0[python,${PYTHON_SINGLE_USEDEP}]
$(python_gen_cond_dep '
dev-python/dbus-python[${PYTHON_USEDEP}]
')

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

[Mart Raudsepp]

commit: e6824cd40537dafcb8099a35b3a0f7d5ebf4ed68
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Oct 29 22:12:56 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 22:12:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6824cd4

dev-vcs/gitg: drop 41-r1

Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-vcs/gitg/Manifest  |  1 -
 dev-vcs/gitg/gitg-41-r1.ebuild | 90 --
 2 files changed, 91 deletions(-)

diff --git a/dev-vcs/gitg/Manifest b/dev-vcs/gitg/Manifest
index f81d7d6c91c5..34cf5652a04a 100644
--- a/dev-vcs/gitg/Manifest
+++ b/dev-vcs/gitg/Manifest
@@ -1,2 +1 @@
-DIST gitg-41.tar.xz 10604696 BLAKE2B 
bc8a07565338f77a0a4706d6ff145ed09096acb0230fb160218a6374b87968ffde6615b6e2970ca9162ef542f877c3c8ab2023396c13e023cc47dd5bf466f22c
 SHA512 
4e8fe0b1ab5302f975f58277e5ae42300a96d20bb1c41426d8c0e058a53420fcca73f75566f593f5aa2882b3a0e1608cdd542bc4f68c731153ba9185972d6f51
 DIST gitg-44.tar.xz 10629352 BLAKE2B 
2c96b9e59ae04b8f9d760526007a564d7eda6bc2130b9e4970c55049da08e7a9f16c98bb8aa1a6d12e6baebc4b795a7947419cf9180b1f073cc79d9c54f83781
 SHA512 
3a5eadcd80aad42344adbe8783ba7e6d91dd5abe8343987e51db32db73205eb660d1c98bbfacbc6399a8c285fbd8ceb56ee87bc76569d45ca5c69bf1926e6bee

diff --git a/dev-vcs/gitg/gitg-41-r1.ebuild b/dev-vcs/gitg/gitg-41-r1.ebuild
deleted file mode 100644
index e5bec70ca729..
--- a/dev-vcs/gitg/gitg-41-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit gnome.org gnome2-utils meson python-r1 vala xdg
-
-DESCRIPTION="git repository viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gitg;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="glade +python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# test if unbundling of libgd is possible
-# Currently it seems not to be (unstable API/ABI)
-RDEPEND="
-   app-crypt/libsecret[vala]
-   >=app-text/gspell-1[vala]
-   >=dev-libs/glib-2.38:2[dbus]
-   >=dev-libs/gobject-introspection-0.10.1:=
-   dev-libs/json-glib
-   dev-libs/libdazzle[vala]
-   dev-libs/libgee:0.8[introspection]
-   dev-libs/libgit2:=[threads]
-   >=dev-libs/libgit2-glib-1.0.0[ssh]
-   >=dev-libs/libpeas-1.5.0[gtk]
-   >=dev-libs/libxml2-2.9.0:2
-   >=gnome-base/gsettings-desktop-schemas-0.1.1
-   >=x11-libs/gtk+-3.20.0:3
-   >=x11-libs/gtksourceview-4.0.3:4
-   x11-themes/adwaita-icon-theme
-   glade? ( >=dev-util/glade-3.2:3.10 )
-   python? (
-   ${PYTHON_DEPS}
-   dev-python/pygobject:3[${PYTHON_USEDEP}]
-   )
-"
-DEPEND="${RDEPEND}
-   >=dev-libs/libgit2-glib-1.0.0[vala]
-"
-BDEPEND="
-   >=sys-devel/gettext-0.19.7
-   virtual/pkgconfig
-   $(vala_depend)
-"
-
-PATCHES=( "${FILESDIR}"/${PV}-fix-build-with-meson-0.61.1.patch )
-
-src_prepare() {
-   default
-
-   # it doesn't do anything in DESTDIR mode, except for failing
-   # when python3 symlink is not present
-   echo "#!/bin/sh" > meson_post_install.py || die
-}
-
-src_configure() {
-   vala_setup
-
-   local emesonargs=(
-   $(meson_use glade glade_catalog)
-   # we install the module manually anyway
-   -Dpython=false
-   )
-
-   meson_src_configure
-}
-
-src_install() {
-   meson_src_install
-
-   if use python ; then
-   python_moduleinto gi.overrides
-   python_foreach_impl python_domodule libgitg-ext/GitgExt.py
-   fi
-}
-
-pkg_postinst() {
-   gnome2_schemas_update
-   xdg_pkg_postinst
-}
-
-pkg_postrm() {
-   gnome2_schemas_update
-   xdg_pkg_postrm
-}

[gentoo-commits] repo/gentoo:master commit in: app-editors/pluma-plugins/

[Mart Raudsepp]

commit: 3b62455fa2523aaa1ad6b98069a3d3140e008236
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Oct 29 22:00:42 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 22:00:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b62455f

app-editors/pluma-plugins: Explicitly depend on libpeas SLOT=0

Another libpeas SLOT is coming.

Signed-off-by: Mart Raudsepp  gentoo.org>

 .../{pluma-plugins-1.26.0.ebuild => pluma-plugins-1.26.0-r1.ebuild}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-editors/pluma-plugins/pluma-plugins-1.26.0.ebuild 
b/app-editors/pluma-plugins/pluma-plugins-1.26.0-r1.ebuild
similarity index 94%
rename from app-editors/pluma-plugins/pluma-plugins-1.26.0.ebuild
rename to app-editors/pluma-plugins/pluma-plugins-1.26.0-r1.ebuild
index 58a230691c8f..1969a87f5e98 100644
--- a/app-editors/pluma-plugins/pluma-plugins-1.26.0.ebuild
+++ b/app-editors/pluma-plugins/pluma-plugins-1.26.0-r1.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
"
 
 RDEPEND="
-   >=dev-libs/libpeas-1.14.1[gtk]
+   >=dev-libs/libpeas-1.14.1:0[gtk]
>=app-editors/gedit-40.0
 
>=dev-libs/glib-2.32:2
@@ -39,7 +39,7 @@ RDEPEND="
${PYTHON_DEPS}
$(python_gen_cond_dep '
app-editors/gedit[python,${PYTHON_SINGLE_USEDEP}]
-   dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
+   dev-libs/libpeas:0[python,${PYTHON_SINGLE_USEDEP}]
>=dev-python/dbus-python-0.82[${PYTHON_USEDEP}]
dev-python/pycairo[${PYTHON_USEDEP}]
dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: app-editors/pluma/

[Mart Raudsepp]

commit: 8e1a0f225c034c3980ab96c21bf4d6273040d009
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Oct 29 22:06:53 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 22:07:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e1a0f22

app-editors/pluma: Explicitly depend on libpeas SLOT=0

Another libpeas SLOT is coming.
Solve a NonexistentBlocker while here.

Signed-off-by: Mart Raudsepp  gentoo.org>

 app-editors/pluma/{pluma-1.26.0-r1.ebuild => pluma-1.26.0-r2.ebuild} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app-editors/pluma/pluma-1.26.0-r1.ebuild 
b/app-editors/pluma/pluma-1.26.0-r2.ebuild
similarity index 96%
rename from app-editors/pluma/pluma-1.26.0-r1.ebuild
rename to app-editors/pluma/pluma-1.26.0-r2.ebuild
index ebe1f380373f..32ee7333f94c 100644
--- a/app-editors/pluma/pluma-1.26.0-r1.ebuild
+++ b/app-editors/pluma/pluma-1.26.0-r2.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 COMMON_DEPEND="
dev-libs/atk
>=dev-libs/glib-2.50:2
-   >=dev-libs/libpeas-1.2.0[gtk]
+   >=dev-libs/libpeas-1.2.0:0[gtk]
>=dev-libs/libxml2-2.5:2
x11-libs/cairo
x11-libs/gdk-pixbuf:2
@@ -34,7 +34,6 @@ COMMON_DEPEND="
>=app-text/enchant-1.6:=
>=app-text/iso-codes-0.35
)
-   !!app-editors/mate-text-editor
 "
 RDEPEND="${COMMON_DEPEND}
${PYTHON_DEPS}

[gentoo-commits] repo/gentoo:master commit in: net-news/liferea/

[Mart Raudsepp]

commit: 71e85c65fae7452611436655475acbfa4df744a5
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Oct 29 22:22:53 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 22:22:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71e85c65

net-news/liferea: Explicitly depend on libpeas SLOT=0

Another libpeas SLOT is coming.

Signed-off-by: Mart Raudsepp  gentoo.org>

 net-news/liferea/{liferea-1.14.5.ebuild => liferea-1.14.5-r1.ebuild} | 2 +-
 net-news/liferea/{liferea-1.15.3.ebuild => liferea-1.15.3-r1.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-news/liferea/liferea-1.14.5.ebuild 
b/net-news/liferea/liferea-1.14.5-r1.ebuild
similarity index 96%
rename from net-news/liferea/liferea-1.14.5.ebuild
rename to net-news/liferea/liferea-1.14.5-r1.ebuild
index dc3721790ece..04015d323430 100644
--- a/net-news/liferea/liferea-1.14.5.ebuild
+++ b/net-news/liferea/liferea-1.14.5-r1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="${PYTHON_DEPS}
dev-libs/glib:2
dev-libs/gobject-introspection
dev-libs/json-glib
-   dev-libs/libpeas[gtk,python,${PYTHON_SINGLE_USEDEP}]
+   dev-libs/libpeas:0[gtk,python,${PYTHON_SINGLE_USEDEP}]
dev-libs/libxml2:2
dev-libs/libxslt
gnome-base/gsettings-desktop-schemas

diff --git a/net-news/liferea/liferea-1.15.3.ebuild 
b/net-news/liferea/liferea-1.15.3-r1.ebuild
similarity index 96%
rename from net-news/liferea/liferea-1.15.3.ebuild
rename to net-news/liferea/liferea-1.15.3-r1.ebuild
index 76a9aaf11f60..b6a338892ce8 100644
--- a/net-news/liferea/liferea-1.15.3.ebuild
+++ b/net-news/liferea/liferea-1.15.3-r1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="${PYTHON_DEPS}
dev-libs/glib:2
dev-libs/gobject-introspection
dev-libs/json-glib
-   dev-libs/libpeas[gtk,python,${PYTHON_SINGLE_USEDEP}]
+   dev-libs/libpeas:0[gtk,python,${PYTHON_SINGLE_USEDEP}]
dev-libs/libxml2:2
dev-libs/libxslt
gnome-base/gsettings-desktop-schemas

[gentoo-commits] repo/gentoo:master commit in: media-gfx/eom/

[Mart Raudsepp]

commit: 3aa06c9462ce7b66aa6e560385c0a388b953c0ab
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Oct 29 22:19:48 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 22:19:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aa06c94

media-gfx/eom: Explicitly depend on libpeas SLOT=0

Another libpeas SLOT is coming.

Signed-off-by: Mart Raudsepp  gentoo.org>

 media-gfx/eom/{eom-1.26.1.ebuild => eom-1.26.1-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/eom/eom-1.26.1.ebuild 
b/media-gfx/eom/eom-1.26.1-r1.ebuild
similarity index 97%
rename from media-gfx/eom/eom-1.26.1.ebuild
rename to media-gfx/eom/eom-1.26.1-r1.ebuild
index 2d8729c1a89c..688d923acc4f 100644
--- a/media-gfx/eom/eom-1.26.1.ebuild
+++ b/media-gfx/eom/eom-1.26.1-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="X debug exif imagemagick +introspection nls jpeg lcms 
svg tiff xmp"
 COMMON_DEPEND="
>=app-accessibility/at-spi2-core-2.46.0
>=dev-libs/glib-2.52:2
-   >=dev-libs/libpeas-1.8.0[gtk]
+   >=dev-libs/libpeas-1.8.0:0[gtk]
>=dev-libs/libxml2-2:2
gnome-base/dconf
>=mate-base/mate-desktop-1.17.0

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

[Mart Raudsepp]

commit: 5fe99ec59fa1ba1e3ca684a0af6a0fbe224b7306
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Oct 29 22:20:33 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 22:20:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fe99ec5

media-sound/rhythmbox: Explicitly depend on libpeas SLOT=0

Another libpeas SLOT is coming.

Signed-off-by: Mart Raudsepp  gentoo.org>

 .../{rhythmbox-3.4.7-r2.ebuild => rhythmbox-3.4.7-r3.ebuild}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/rhythmbox/rhythmbox-3.4.7-r2.ebuild 
b/media-sound/rhythmbox/rhythmbox-3.4.7-r3.ebuild
similarity index 97%
rename from media-sound/rhythmbox/rhythmbox-3.4.7-r2.ebuild
rename to media-sound/rhythmbox/rhythmbox-3.4.7-r3.ebuild
index bcefd7af45e3..07c99df3264f 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.7-r2.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.4.7-r3.ebuild
@@ -33,7 +33,7 @@ DEPEND="
>=media-libs/gst-plugins-base-1.4.0:1.0[introspection]
>=x11-libs/gtk+-3.20.0:3[introspection]
dev-libs/json-glib
-   >=dev-libs/libpeas-0.7.3[gtk]
+   >=dev-libs/libpeas-0.7.3:0[gtk]
>=net-libs/libsoup-3.0.7:3.0
>=dev-libs/libxml2-2.7.8:2
x11-libs/pango
@@ -70,7 +70,7 @@ RDEPEND="${DEPEND}
media-plugins/gst-plugins-taglib:1.0
x11-themes/adwaita-icon-theme
python? (
-   >=dev-libs/libpeas-0.7.3[python,${PYTHON_SINGLE_USEDEP}]
+   >=dev-libs/libpeas-0.7.3:0[python,${PYTHON_SINGLE_USEDEP}]
net-libs/libsoup:3.0[introspection]
x11-libs/gdk-pixbuf:2[introspection]
x11-libs/gtk+:3[introspection]

[gentoo-commits] repo/gentoo:master commit in: media-gfx/eom/

[Mart Raudsepp]

commit: 352193631b53d5ec415ca934573fb0a670d69828
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Oct 29 22:19:21 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 22:19:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35219363

media-gfx/eom: drop 1.26.0-r1

Signed-off-by: Mart Raudsepp  gentoo.org>

 media-gfx/eom/Manifest |  1 -
 media-gfx/eom/eom-1.26.0-r1.ebuild | 72 --
 2 files changed, 73 deletions(-)

diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index 8e03da78f3a5..cf092d162f01 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -1,2 +1 @@
-DIST eom-1.26.0.tar.xz 2493104 BLAKE2B 
3a2e018e90514a5ee7c05bd981d1a129900ae2ba5b1c513da85e6ede2b2f5b253133c14766787a44f0e372da99b13922f3aaa6e2447e6d4d901a604689c03cd8
 SHA512 
efc5a1ce5c21ad74108c63827fa60f2cd8517888d8e155d7c9934f5490e61b2cf73bae3b42f8d6b69ce1d5c4658d0c74f2ab19e90f40173d55354276bbe5d824
 DIST eom-1.26.1.tar.xz 2512024 BLAKE2B 
2aa50d144a4c703d61acee8e0078a8a7ce7e41ffc8e79a0064057b78119e81cc85da0481ee55064702981683e0b34a93dd7a9fce2a6c03fa7fa65e6653d9796d
 SHA512 
263eb6a843577f3ba399fa27b6a9087246053dffd963090933f6bb11b762e1049fdc7b0fd52a6987f40fb57be76d68f6964413a0c12437fb00b8766dc17b7648

diff --git a/media-gfx/eom/eom-1.26.0-r1.ebuild 
b/media-gfx/eom/eom-1.26.0-r1.ebuild
deleted file mode 100644
index 6fa8009c9ab0..
--- a/media-gfx/eom/eom-1.26.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit mate
-
-if [[ ${PV} !=  ]]; then
-   KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
-fi
-
-DESCRIPTION="The MATE image viewer"
-LICENSE="FDL-1.1+ GPL-2+ IJG LGPL-2+"
-SLOT="0"
-
-IUSE="X debug exif imagemagick +introspection nls jpeg lcms svg tiff xmp"
-
-COMMON_DEPEND="
-   dev-libs/atk
-   >=dev-libs/glib-2.52:2
-   >=dev-libs/libpeas-1.8.0[gtk]
-   >=dev-libs/libxml2-2:2
-   gnome-base/dconf
-   >=mate-base/mate-desktop-1.17.0
-   sys-libs/zlib
-   x11-libs/cairo
-   >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?,jpeg?,tiff?]
-   >=x11-libs/gtk+-3.22:3[introspection?]
-   x11-libs/libX11
-   >=x11-misc/shared-mime-info-0.20
-   exif? (
-   >=media-libs/libexif-0.6.22
-   media-libs/libjpeg-turbo:=
-   )
-   imagemagick? ( >=media-gfx/imagemagick-6.2.6 )
-   introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-   jpeg? ( media-libs/libjpeg-turbo:= )
-   lcms? ( media-libs/lcms:2 )
-   svg? ( >=gnome-base/librsvg-2.36.2:2 )
-   xmp? ( >=media-libs/exempi-1.99.5:2= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-   virtual/libintl
-   !!media-gfx/mate-image-viewer
-"
-
-BDEPEND="${COMMON_DEPEND}
-   app-text/yelp-tools
-   dev-util/glib-utils
-   dev-util/gtk-doc
-   dev-util/gtk-doc-am
-   >=sys-devel/gettext-0.19.8
-   virtual/pkgconfig
-"
-
-src_configure() {
-   mate_src_configure \
-   --enable-thumbnailer \
-   $(use_enable debug) \
-   $(use_enable introspection) \
-   $(use_with X x) \
-   $(use_with exif libexif) \
-   $(usex imagemagick \
-   --without-gdk-pixbuf-thumbnailer \
-   --with-gdk-pixbuf-thumbnailer \
-   ) \
-   $(use_with jpeg libjpeg) \
-   $(use_with lcms cms) \
-   $(use_with svg librsvg) \
-   $(use_with xmp)
-}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/eog-plugins/

[Mart Raudsepp]

commit: f1689f39c7bc6245f7f4fc8083d41bc82f4621d9
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Oct 29 22:17:11 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 22:17:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1689f39

media-gfx/eog-plugins: Explicitly depend on libpeas SLOT=0

Another libpeas SLOT is coming.

Signed-off-by: Mart Raudsepp  gentoo.org>

 .../{eog-plugins-44.0-r1.ebuild => eog-plugins-44.0-r2.ebuild}| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/eog-plugins/eog-plugins-44.0-r1.ebuild 
b/media-gfx/eog-plugins/eog-plugins-44.0-r2.ebuild
similarity index 95%
rename from media-gfx/eog-plugins/eog-plugins-44.0-r1.ebuild
rename to media-gfx/eog-plugins/eog-plugins-44.0-r2.ebuild
index c61393ae7774..a328d90eaa24 100644
--- a/media-gfx/eog-plugins/eog-plugins-44.0-r1.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-44.0-r2.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="
 
 RDEPEND="
>=dev-libs/glib-2.53.4:2
-   >=dev-libs/libpeas-1.14.1
+   >=dev-libs/libpeas-1.14.1:0
>=media-gfx/eog-41.0:1
exif? ( >=media-libs/libexif-0.6.16 )
map? (
@@ -33,7 +33,7 @@ RDEPEND="
python? (
${PYTHON_DEPS}
dev-libs/glib[dbus]
-   dev-libs/libpeas:=[gtk,python,${PYTHON_SINGLE_USEDEP}]
+   dev-libs/libpeas:0[gtk,python,${PYTHON_SINGLE_USEDEP}]
$(python_gen_cond_dep '
dev-python/pygobject:3[${PYTHON_USEDEP}]
')

[gentoo-commits] repo/gentoo:master commit in: media-gfx/eog/

[Mart Raudsepp]

commit: 93e30288b59e97643d50ed417de9117cc3fae747
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Oct 29 22:17:37 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 22:17:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93e30288

media-gfx/eog: drop 45.0

Signed-off-by: Mart Raudsepp  gentoo.org>

 media-gfx/eog/Manifest|  1 -
 media-gfx/eog/eog-45.0.ebuild | 77 ---
 2 files changed, 78 deletions(-)

diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 4eb7d34db1a0..c307e86e9fb3 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,3 +1,2 @@
 DIST eog-44.3.tar.xz 4654864 BLAKE2B 
1caaace6f2f654a3fdbe781723e178d91300f40f2f05ef978505329ed242b79093cef5bf48660948b62efeb4fb1b3d09da522d6cb8e39b61fcd377100f701ae1
 SHA512 
088d8d504e5ad5ca14a5da44ee559b30cb7749d752f7b5c1f3fa111c9d1ba7a97edaff3183e0c6d6ebf3b57b9e90fe37a42305d983ac72058804ab2599e8f0c2
-DIST eog-45.0.tar.xz 4656784 BLAKE2B 
cf5b5a03c153b3eedcb1839f068ab9984d1e8e493d39baa86b67691e254fbb5faa96c3aaca032c66218d0cead6a93c966bb014091041057799187210bbc6a09a
 SHA512 
5faa5115d8865a7f5311486f6999aece8d636ed66a4feca35ace85d33623fb406f9092fc915e84c3ec4013ba153876898d873a259fdf0ff0145c499f526ef52e
 DIST eog-45.1.tar.xz 4656776 BLAKE2B 
9b9bde1564735c06252a1eedb96b0ab0871726f7ce4891c57ff4a0ed6c52f13b85f1ffc8bca2c4d8a5cc6518a2d66dc4b883df5a53234a67c4374c56b03728ea
 SHA512 
68fb6889da7129189facbd3e624e76852a8dbe5e277848b768fb28624811d9486a1edc6a1d99d5948a68854ae73a5b5b33c5f5fa3a81860391bf1bf53bf15fa7

diff --git a/media-gfx/eog/eog-45.0.ebuild b/media-gfx/eog/eog-45.0.ebuild
deleted file mode 100644
index b967e79892ea..
--- a/media-gfx/eog/eog-45.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="The Eye of GNOME image viewer"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome 
https://gitlab.gnome.org/GNOME/eog;
-
-LICENSE="GPL-2+"
-SLOT="1"
-
-IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
-REQUIRED_USE="
-   exif? ( jpeg )
-   gtk-doc? ( introspection )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
-
-RDEPEND="
-   >=dev-libs/glib-2.73.2:2
-   >=dev-libs/libpeas-0.7.4[gtk]
-   >=gnome-base/gnome-desktop-2.91.2:3=
-   >=gnome-base/gsettings-desktop-schemas-42_beta
-   >=x11-misc/shared-mime-info-0.20
-   >=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
-   >=x11-libs/gtk+-3.24.15:3[introspection,X]
-   >=gui-libs/libhandy-1.5.0:1
-   sys-libs/zlib
-
-   exif? ( >=media-libs/libexif-0.6.14 )
-   lcms? ( media-libs/lcms:2 )
-   xmp? ( media-libs/exempi:2= )
-   jpeg? ( media-libs/libjpeg-turbo:= )
-   introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-   svg? ( >=gnome-base/librsvg-2.44.0:2 )
-
-   x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   gtk-doc? (
-   dev-util/gi-docgen
-   app-text/docbook-xml-dtd:4.1.2
-   )
-   dev-util/glib-utils
-   dev-util/itstool
-   >=sys-devel/gettext-0.19.8
-   virtual/pkgconfig
-"
-
-src_configure() {
-   local emesonargs=(
-   $(meson_use exif libexif)
-   $(meson_use lcms cms)
-   $(meson_use xmp)
-   $(meson_use jpeg libjpeg)
-   $(meson_use svg librsvg)
-   $(meson_use gtk-doc gtk_doc)
-   $(meson_use introspection)
-   -Dinstalled_tests=false
-   -Dlibportal=false # As of 40.3, all libportal usages are 
flatpak-specific
-   )
-   meson_src_configure
-}
-
-pkg_postinst() {
-   xdg_pkg_postinst
-   gnome2_schemas_update
-}
-
-pkg_postrm() {
-   xdg_pkg_postrm
-   gnome2_schemas_update
-}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/entangle/

[Mart Raudsepp]

commit: d5697b397c04819067eb77340636ab3536398a47
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Oct 29 22:16:02 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 22:16:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5697b39

media-gfx/entangle: Explicitly depend on libpeas SLOT=0

Another libpeas SLOT is coming.

Signed-off-by: Mart Raudsepp  gentoo.org>

 media-gfx/entangle/{entangle-3.0-r2.ebuild => entangle-3.0-r3.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/entangle/entangle-3.0-r2.ebuild 
b/media-gfx/entangle/entangle-3.0-r3.ebuild
similarity index 96%
rename from media-gfx/entangle/entangle-3.0-r2.ebuild
rename to media-gfx/entangle/entangle-3.0-r3.ebuild
index f9cac710c4b3..73c99698dd3a 100644
--- a/media-gfx/entangle/entangle-3.0-r2.ebuild
+++ b/media-gfx/entangle/entangle-3.0-r3.ebuild
@@ -21,7 +21,7 @@ DEPEND="
>=dev-libs/glib-2.36:2
>=dev-libs/gobject-introspection-1.54.0
dev-libs/libgudev:=
-   >=dev-libs/libpeas-1.2.0[gtk,${PYTHON_SINGLE_USEDEP}]
+   >=dev-libs/libpeas-1.2.0:0[gtk,${PYTHON_SINGLE_USEDEP}]
>=media-libs/gexiv2-0.10[introspection]
>=media-libs/libgphoto2-2.5.0:=
media-libs/gstreamer:1.0

[gentoo-commits] repo/gentoo:master commit in: mail-client/geary/

[Mart Raudsepp]

commit: c910d5913e316d0d12fc8de1768f8f93a65f4613
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Oct 29 22:14:34 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 22:14:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c910d591

mail-client/geary: Explicitly depend on libpeas SLOT=0

Another libpeas SLOT is coming.

Signed-off-by: Mart Raudsepp  gentoo.org>

 mail-client/geary/{geary-44.1.ebuild => geary-44.1-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/geary/geary-44.1.ebuild 
b/mail-client/geary/geary-44.1-r1.ebuild
similarity index 98%
rename from mail-client/geary/geary-44.1.ebuild
rename to mail-client/geary/geary-44.1-r1.ebuild
index 1dd1ed84eca1..da1bc23d4aa5 100644
--- a/mail-client/geary/geary-44.1.ebuild
+++ b/mail-client/geary/geary-44.1-r1.ebuild
@@ -34,7 +34,7 @@ DEPEND="
app-text/iso-codes
>=dev-libs/json-glib-1.0
>=gui-libs/libhandy-1.2.1:1=
-   >=dev-libs/libpeas-1.24.0
+   >=dev-libs/libpeas-1.24.0:0
>=app-crypt/libsecret-0.11
net-libs/libsoup:3.0
dev-libs/snowball-stemmer:=

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

[Mart Raudsepp]

commit: 6cdc27bc8680c849a7268520b9d7df5496b9812a
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Oct 29 22:13:22 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 22:13:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cdc27bc

dev-vcs/gitg: Explicitly depend on libpeas SLOT=0

Another libpeas SLOT is coming.

Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-vcs/gitg/{gitg-44.ebuild => gitg-44-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/gitg/gitg-44.ebuild b/dev-vcs/gitg/gitg-44-r1.ebuild
similarity index 98%
rename from dev-vcs/gitg/gitg-44.ebuild
rename to dev-vcs/gitg/gitg-44-r1.ebuild
index 4d574896d580..9b2aaa0dbc67 100644
--- a/dev-vcs/gitg/gitg-44.ebuild
+++ b/dev-vcs/gitg/gitg-44-r1.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
dev-libs/libgee:0.8[introspection]
>=dev-libs/libgit2-glib-1.2.0[ssh]
dev-libs/libgit2:=[threads]
-   >=dev-libs/libpeas-1.5.0[gtk]
+   >=dev-libs/libpeas-1.5.0:0[gtk]
>=dev-libs/libxml2-2.9.0:2
>=gnome-base/gsettings-desktop-schemas-0.1.1
>=gui-libs/libhandy-1.5.0

[gentoo-commits] repo/gentoo:master commit in: media-gfx/eog/

[Mart Raudsepp]

commit: 6e4ff11fe95b44c905d788bbff660bf99a42b915
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Oct 29 22:19:02 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 22:19:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e4ff11f

media-gfx/eog: Explicitly depend on libpeas SLOT=0

Another libpeas SLOT is coming.

Signed-off-by: Mart Raudsepp  gentoo.org>

 media-gfx/eog/{eog-44.3.ebuild => eog-44.3-r1.ebuild} | 2 +-
 media-gfx/eog/{eog-45.1.ebuild => eog-45.1-r1.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/eog/eog-44.3.ebuild b/media-gfx/eog/eog-44.3-r1.ebuild
similarity index 98%
rename from media-gfx/eog/eog-44.3.ebuild
rename to media-gfx/eog/eog-44.3-r1.ebuild
index 295a7cd8443b..558f73a89e73 100644
--- a/media-gfx/eog/eog-44.3.ebuild
+++ b/media-gfx/eog/eog-44.3-r1.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 
~riscv ~sparc x86"
 
 RDEPEND="
>=dev-libs/glib-2.73.2:2
-   >=dev-libs/libpeas-0.7.4[gtk]
+   >=dev-libs/libpeas-0.7.4:0[gtk]
>=gnome-base/gnome-desktop-2.91.2:3=
>=gnome-base/gsettings-desktop-schemas-42_beta
>=x11-misc/shared-mime-info-0.20

diff --git a/media-gfx/eog/eog-45.1.ebuild b/media-gfx/eog/eog-45.1-r1.ebuild
similarity index 98%
rename from media-gfx/eog/eog-45.1.ebuild
rename to media-gfx/eog/eog-45.1-r1.ebuild
index b967e79892ea..35ede5fbeaf1 100644
--- a/media-gfx/eog/eog-45.1.ebuild
+++ b/media-gfx/eog/eog-45.1-r1.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 
~riscv ~sparc ~x86"
 
 RDEPEND="
>=dev-libs/glib-2.73.2:2
-   >=dev-libs/libpeas-0.7.4[gtk]
+   >=dev-libs/libpeas-0.7.4:0[gtk]
>=gnome-base/gnome-desktop-2.91.2:3=
>=gnome-base/gsettings-desktop-schemas-42_beta
>=x11-misc/shared-mime-info-0.20

[gentoo-commits] repo/gentoo:master commit in: media-gfx/ahoviewer/

[Mart Raudsepp]

commit: 1e846234e6e89a0bcac50deb82dd8bdecae30f4d
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Oct 29 22:15:13 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 22:15:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e846234

media-gfx/ahoviewer: Explicitly depend on libpeas SLOT=0

Another libpeas SLOT is coming.

Signed-off-by: Mart Raudsepp  gentoo.org>

 ...r-2.0.0_pre20220827.ebuild => ahoviewer-2.0.0_pre20220827-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20220827.ebuild 
b/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20220827-r1.ebuild
similarity index 98%
rename from media-gfx/ahoviewer/ahoviewer-2.0.0_pre20220827.ebuild
rename to media-gfx/ahoviewer/ahoviewer-2.0.0_pre20220827-r1.ebuild
index 9d6a6c7fdd85..7f231de9122d 100644
--- a/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20220827.ebuild
+++ b/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20220827-r1.ebuild
@@ -35,7 +35,7 @@ COMMON_DEPEND="dev-cpp/atkmm:0
)
plugins? (
dev-libs/gobject-introspection
-   dev-libs/libpeas
+   dev-libs/libpeas:0
)
rar? ( app-arch/unrar:= )
ssl? (

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

[Mart Raudsepp]

commit: 7e14001b03434d4a8986599e95412d86a1036119
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Oct 29 22:11:44 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 22:11:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e14001b

dev-util/gnome-builder: Explicitly depend on libpeas SLOT=0

Another libpeas SLOT is coming.

Signed-off-by: Mart Raudsepp  gentoo.org>

 .../{gnome-builder-44.2.ebuild => gnome-builder-44.2-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/gnome-builder/gnome-builder-44.2.ebuild 
b/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild
similarity index 99%
rename from dev-util/gnome-builder/gnome-builder-44.2.ebuild
rename to dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild
index 3abe41188e53..db928e14dac0 100644
--- a/dev-util/gnome-builder/gnome-builder-44.2.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
>=dev-libs/json-glib-1.2.0
>=dev-libs/jsonrpc-glib-3.43.0:=
>=dev-libs/libdex-0.1.1:=
-   >=dev-libs/libpeas-1.34.0[python,${PYTHON_SINGLE_USEDEP}]
+   >=dev-libs/libpeas-1.34.0:0[python,${PYTHON_SINGLE_USEDEP}]
dev-libs/libportal:=[gtk,introspection]
>=dev-libs/template-glib-3.36.1:=[introspection]
>=gui-libs/vte-0.70.0:2.91-gtk4[introspection]

[gentoo-commits] repo/gentoo:master commit in: app-editors/pluma/

[Mart Raudsepp]

commit: bbd6de1c8764c13c228f23420d146ed7dd35294f
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Oct 29 22:01:15 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 22:01:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbd6de1c

app-editors/pluma: drop 1.26.0

Signed-off-by: Mart Raudsepp  gentoo.org>

 app-editors/pluma/pluma-1.26.0.ebuild | 79 ---
 1 file changed, 79 deletions(-)

diff --git a/app-editors/pluma/pluma-1.26.0.ebuild 
b/app-editors/pluma/pluma-1.26.0.ebuild
deleted file mode 100644
index 20295b319c24..
--- a/app-editors/pluma/pluma-1.26.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{9..11} )
-inherit mate python-single-r1 virtualx
-
-DESCRIPTION="Pluma text editor for the MATE desktop"
-
-LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
-IUSE="+introspection spell test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-   dev-libs/atk
-   >=dev-libs/glib-2.50:2
-   >=dev-libs/libpeas-1.2.0[gtk]
-   >=dev-libs/libxml2-2.5:2
-   x11-libs/cairo
-   x11-libs/gdk-pixbuf:2
-   >=x11-libs/gtk+-3.22:3[introspection?]
-   >=x11-libs/gtksourceview-4.0.2:4
-   x11-libs/libICE
-   x11-libs/libX11
-   >=x11-libs/libSM-1.0
-   x11-libs/pango
-   introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-   spell? (
-   >=app-text/enchant-1.6:=
-   >=app-text/iso-codes-0.35
-   )
-   !!app-editors/mate-text-editor
-"
-RDEPEND="${COMMON_DEPEND}
-   ${PYTHON_DEPS}
-   >=mate-base/mate-desktop-1.9[introspection?]
-   virtual/libintl
-"
-DEPEND="${COMMON_DEPEND}
-   ~app-text/docbook-xml-dtd-4.1.2
-   app-text/yelp-tools
-   dev-util/glib-utils
-   dev-util/gtk-doc
-   dev-util/gtk-doc-am
-   >=sys-devel/libtool-2.2.6:2
-   >=sys-devel/gettext-0.19.8
-   virtual/pkgconfig
-"
-
-MATE_FORCE_AUTORECONF=true
-
-src_prepare() {
-   # Test require gvfs sftp fs mounted and schema's installed. Skip this 
one.
-   # https://github.com/mate-desktop/mate-text-editor/issues/33
-   sed -e '/+= document-saver/d' -i tests/Makefile.am || die
-
-   mate_src_prepare
-}
-
-src_configure() {
-   mate_src_configure \
-   $(use_enable introspection) \
-   $(use_enable spell) \
-   $(use_enable test tests)
-}
-
-src_test() {
-   # FIXME: This should be handled at eclass level.
-   "${EPREFIX}/${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-   unset DBUS_SESSION_BUS_ADDRESS
-   local -x GSETTINGS_SCHEMA_DIR="${S}/data"
-   virtx emake check
-}

[gentoo-commits] repo/gentoo:master commit in: app-office/endeavour/

[Mart Raudsepp]

commit: 379bce6e2fcddb0f02f6a836b63fcade715c32c8
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Oct 29 22:09:29 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 22:11:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=379bce6e

app-office/endeavour: Explicitly depend on libpeas SLOT=0

Another libpeas SLOT is coming.

Signed-off-by: Mart Raudsepp  gentoo.org>

 .../endeavour/{endeavour-43.0.ebuild => endeavour-43.0-r1.ebuild} | 4 ++--
 app-office/endeavour/endeavour-.ebuild| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-office/endeavour/endeavour-43.0.ebuild 
b/app-office/endeavour/endeavour-43.0-r1.ebuild
similarity index 95%
rename from app-office/endeavour/endeavour-43.0.ebuild
rename to app-office/endeavour/endeavour-43.0-r1.ebuild
index e29cfc5e015d..1c31a8c34671 100644
--- a/app-office/endeavour/endeavour-43.0.ebuild
+++ b/app-office/endeavour/endeavour-43.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,7 +27,7 @@ RDEPEND="
>=gui-libs/gtk-3.92.0:4[introspection?]
>=gui-libs/libadwaita-1.2.0:1
>=net-libs/gnome-online-accounts-3.2.0:=
-   >=dev-libs/libpeas-1.17
+   >=dev-libs/libpeas-1.17:0
>=gnome-extra/evolution-data-server-3.33.2:=[gtk]
introspection? ( >=dev-libs/gobject-introspection-1.42:= )
 "

diff --git a/app-office/endeavour/endeavour-.ebuild 
b/app-office/endeavour/endeavour-.ebuild
index e29cfc5e015d..1c31a8c34671 100644
--- a/app-office/endeavour/endeavour-.ebuild
+++ b/app-office/endeavour/endeavour-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,7 +27,7 @@ RDEPEND="
>=gui-libs/gtk-3.92.0:4[introspection?]
>=gui-libs/libadwaita-1.2.0:1
>=net-libs/gnome-online-accounts-3.2.0:=
-   >=dev-libs/libpeas-1.17
+   >=dev-libs/libpeas-1.17:0
>=gnome-extra/evolution-data-server-3.33.2:=[gtk]
introspection? ( >=dev-libs/gobject-introspection-1.42:= )
 "

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

[Mart Raudsepp]

commit: ea3765ee967e6b04e89679dfc3a27c278f1db544
Author: Guillermo Joandet  gmail  com>
AuthorDate: Wed Oct 25 19:16:04 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 21:51:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea3765ee

dev-libs/glib: Version bump to 2.78.1

Signed-off-by: Guillermo Joandet  gmail.com>
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-libs/glib/Manifest   |   1 +
 dev-libs/glib/glib-2.78.1.ebuild | 312 +++
 2 files changed, 313 insertions(+)

diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 8838499ec5d0..f64e2b2aae89 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,2 +1,3 @@
 DIST glib-2.76.4.tar.xz 5274356 BLAKE2B 
c9ceb514ea81e1e6ab2d0efc82c48c0d8ae6c997fd0e3c56d47a5174b027f785b58266fff73b1d1132e272305126fbff22e3c65d47de46224cd12fa49796d5bc
 SHA512 
f76932dc5090a44880373228e2b162f338415d06f7c90f2950eab1a43bb191c56a1797da4d377594f6a999197fef4defb848039259cfa4105bb68288a928f5b7
 DIST glib-2.78.0.tar.xz 5327096 BLAKE2B 
3a494a16d12b17c7986bbe865d5e3b2727d40e7272fbb34897a90173c0fb780b0e7f024042f60ac6d1fcb9a2a4731948b6ac733c2bd6bd27c32b97281e20fc72
 SHA512 
3d06890002f4b13f831c83fbb70cfce529f9750e30888619e4d6277116be15d106379a03143412cf4b2a289c0cbdbbc299ecf17284fbffc06c791ecf7556c765
+DIST glib-2.78.1.tar.xz 5320740 BLAKE2B 
af8f2e83600dfb3ec84702399cb00a3aaedbc80087e35dc7cc2e2374d4fe5fdf82707ac8c911da1c53eb7b027c9da9ecfc1c0a8f56b39431fa4cf44cad5b10f7
 SHA512 
aa9ed9195951b00ac8221e958ea337fbda82621a862ef8f29dc2ea396a6253ce51c2a0a498dfa4e12642f1836f85f9564f09991979ae85c5ed4368355d857376

diff --git a/dev-libs/glib/glib-2.78.1.ebuild b/dev-libs/glib/glib-2.78.1.ebuild
new file mode 100644
index ..642ad1b40159
--- /dev/null
+++ b/dev-libs/glib/glib-2.78.1.ebuild
@@ -0,0 +1,312 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit gnome.org gnome2-utils linux-info meson-multilib multilib 
python-any-r1 toolchain-funcs xdg
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="https://www.gtk.org/;
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test 
utils xattr"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+
+# * elfutils (via libelf) does not build on Windows. gresources are not 
embedded
+# within ELF binaries on that platform anyway and inspecting ELF binaries from
+# other platforms is not that useful so exclude the dependency in this case.
+# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
+# these are used by GIO, which glib[static-libs] consumers don't really seem
+# to need at all, thus not imposing the deps for now and once some consumers
+# are actually found to static link libgio-2.0.a, we can revisit and either add
+# them or just put the (build) deps in that rare consumer instead of recursive
+# RDEPEND here (due to lack of recursive DEPEND).
+RDEPEND="
+   !=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+   >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?]
+   >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+   >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+   >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+   kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
+   selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+   xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] 
) )
+   elf? ( virtual/libelf:0= )
+   sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+# libxml2 used for optional tests that get automatically skipped
+BDEPEND="
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt
+   >=sys-devel/gettext-0.19.8
+   gtk-doc? ( >=dev-util/gtk-doc-1.33
+   app-text/docbook-xml-dtd:4.2
+   app-text/docbook-xml-dtd:4.5 )
+   systemtap? ( >=dev-util/systemtap-1.3 )
+   ${PYTHON_DEPS}
+   test? ( >=sys-apps/dbus-1.2.14 )
+   virtual/pkgconfig
+"
+# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify 
gio/tests/meson.build to use external gdbus-codegen
+
+PDEPEND="
+   dbus? ( gnome-base/dconf )
+   mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+
+MULTILIB_CHOST_TOOLS=(
+   /usr/bin/gio-querymodules$(get_exeext)
+)
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
+)
+
+pkg_setup() {
+   if use kernel_linux ; 

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

[Mart Raudsepp]

commit: 1afb105ec9b1b865142fdeead9604bfa5907923b
Author: Guillermo Joandet  gmail  com>
AuthorDate: Wed Oct 25 19:25:49 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 21:51:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1afb105e

dev-util/gdbus-codegen: Version bump to 2.78.1

Signed-off-by: Guillermo Joandet  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33515
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/gdbus-codegen/Manifest|  1 +
 dev-util/gdbus-codegen/gdbus-codegen-2.78.1.ebuild | 74 ++
 2 files changed, 75 insertions(+)

diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 8838499ec5d0..f64e2b2aae89 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,2 +1,3 @@
 DIST glib-2.76.4.tar.xz 5274356 BLAKE2B 
c9ceb514ea81e1e6ab2d0efc82c48c0d8ae6c997fd0e3c56d47a5174b027f785b58266fff73b1d1132e272305126fbff22e3c65d47de46224cd12fa49796d5bc
 SHA512 
f76932dc5090a44880373228e2b162f338415d06f7c90f2950eab1a43bb191c56a1797da4d377594f6a999197fef4defb848039259cfa4105bb68288a928f5b7
 DIST glib-2.78.0.tar.xz 5327096 BLAKE2B 
3a494a16d12b17c7986bbe865d5e3b2727d40e7272fbb34897a90173c0fb780b0e7f024042f60ac6d1fcb9a2a4731948b6ac733c2bd6bd27c32b97281e20fc72
 SHA512 
3d06890002f4b13f831c83fbb70cfce529f9750e30888619e4d6277116be15d106379a03143412cf4b2a289c0cbdbbc299ecf17284fbffc06c791ecf7556c765
+DIST glib-2.78.1.tar.xz 5320740 BLAKE2B 
af8f2e83600dfb3ec84702399cb00a3aaedbc80087e35dc7cc2e2374d4fe5fdf82707ac8c911da1c53eb7b027c9da9ecfc1c0a8f56b39431fa4cf44cad5b10f7
 SHA512 
aa9ed9195951b00ac8221e958ea337fbda82621a862ef8f29dc2ea396a6253ce51c2a0a498dfa4e12642f1836f85f9564f09991979ae85c5ed4368355d857376

diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.78.1.ebuild 
b/dev-util/gdbus-codegen/gdbus-codegen-2.78.1.ebuild
new file mode 100644
index ..3595e34fd897
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.78.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="xml(+)"
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="https://www.gtk.org/;
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   dev-libs/libxslt
+   app-text/docbook-xsl-stylesheets
+"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+   PATCHES=(
+   "${FILESDIR}/${PN}-2.56.1-sitedir.patch"
+   )
+   distutils-r1_python_prepare_all
+
+   local MAJOR_VERSION=$(ver_cut 1)
+   local MINOR_VERSION=$(ver_cut 2)
+   sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
+   sed -e "s:@VERSION@:${PV}:" \
+   -e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
+   -e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > 
config.py || die
+   cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+   sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+do_xsltproc_command() {
+   # Taken from meson.build for manual manpage building - keep in sync 
(also copied to dev-util/glib-utils)
+   xsltproc \
+   --nonet \
+   --stringparam man.output.quietly 1 \
+   --stringparam funcsynopsis.style ansi \
+   --stringparam man.th.extra1.suppress 1 \
+   --stringparam man.authors.section.enabled 0 \
+   --stringparam man.copyright.section.enabled 0 \
+   -o "${2}" \
+   
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+   "${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+   distutils-r1_src_compile
+   do_xsltproc_command \
+   "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" \
+   "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
+
+src_test() {
+   einfo "Skipping tests. This package is tested by dev-libs/glib"
+   einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+   distutils-r1_python_install_all # no-op, but prevents QA warning
+   doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}

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

[Mart Raudsepp]

commit: a7a2e766b49e0501edb6318d15ad9c87f4b73dea
Author: Guillermo Joandet  gmail  com>
AuthorDate: Wed Oct 25 19:17:56 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 21:51:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7a2e766

dev-util/glib-utils: Version bump to 2.78.1

Signed-off-by: Guillermo Joandet  gmail.com>
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/glib-utils/Manifest |  1 +
 dev-util/glib-utils/glib-utils-2.78.1.ebuild | 62 
 2 files changed, 63 insertions(+)

diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 8838499ec5d0..f64e2b2aae89 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,2 +1,3 @@
 DIST glib-2.76.4.tar.xz 5274356 BLAKE2B 
c9ceb514ea81e1e6ab2d0efc82c48c0d8ae6c997fd0e3c56d47a5174b027f785b58266fff73b1d1132e272305126fbff22e3c65d47de46224cd12fa49796d5bc
 SHA512 
f76932dc5090a44880373228e2b162f338415d06f7c90f2950eab1a43bb191c56a1797da4d377594f6a999197fef4defb848039259cfa4105bb68288a928f5b7
 DIST glib-2.78.0.tar.xz 5327096 BLAKE2B 
3a494a16d12b17c7986bbe865d5e3b2727d40e7272fbb34897a90173c0fb780b0e7f024042f60ac6d1fcb9a2a4731948b6ac733c2bd6bd27c32b97281e20fc72
 SHA512 
3d06890002f4b13f831c83fbb70cfce529f9750e30888619e4d6277116be15d106379a03143412cf4b2a289c0cbdbbc299ecf17284fbffc06c791ecf7556c765
+DIST glib-2.78.1.tar.xz 5320740 BLAKE2B 
af8f2e83600dfb3ec84702399cb00a3aaedbc80087e35dc7cc2e2374d4fe5fdf82707ac8c911da1c53eb7b027c9da9ecfc1c0a8f56b39431fa4cf44cad5b10f7
 SHA512 
aa9ed9195951b00ac8221e958ea337fbda82621a862ef8f29dc2ea396a6253ce51c2a0a498dfa4e12642f1836f85f9564f09991979ae85c5ed4368355d857376

diff --git a/dev-util/glib-utils/glib-utils-2.78.1.ebuild 
b/dev-util/glib-utils/glib-utils-2.78.1.ebuild
new file mode 100644
index ..6fb045244ae1
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.78.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+GNOME_ORG_MODULE="glib"
+
+inherit gnome.org python-single-r1
+
+DESCRIPTION="Build utilities for GLib using projects"
+HOMEPAGE="https://www.gtk.org/;
+
+LICENSE="LGPL-2.1+"
+SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   dev-libs/libxslt
+   app-text/docbook-xsl-stylesheets
+"
+
+src_configure() { :; }
+
+do_xsltproc_command() {
+   # Taken from meson.build for manual manpage building - keep in sync 
(also copied to dev-util/gdbus-codegen)
+   xsltproc \
+   --nonet \
+   --stringparam man.output.quietly 1 \
+   --stringparam funcsynopsis.style ansi \
+   --stringparam man.th.extra1.suppress 1 \
+   --stringparam man.authors.section.enabled 0 \
+   --stringparam man.copyright.section.enabled 0 \
+   -o "${2}" \
+   
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+   "${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+   sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" 
gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
+   sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" 
gobject/glib-mkenums.in > gobject/glib-mkenums || die
+   sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" 
glib/gtester-report.in > glib/gtester-report || die
+   do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml 
docs/reference/gobject/glib-genmarshal.1
+   do_xsltproc_command docs/reference/gobject/glib-mkenums.xml 
docs/reference/gobject/glib-mkenums.1
+   do_xsltproc_command docs/reference/glib/gtester-report.xml 
docs/reference/glib/gtester-report.1
+}
+
+src_install() {
+   python_fix_shebang gobject/glib-genmarshal
+   python_fix_shebang gobject/glib-mkenums
+   python_fix_shebang glib/gtester-report
+   exeinto /usr/bin
+   doexe gobject/glib-genmarshal
+   doexe gobject/glib-mkenums
+   doexe glib/gtester-report
+   doman docs/reference/gobject/glib-genmarshal.1
+   doman docs/reference/gobject/glib-mkenums.1
+   doman docs/reference/glib/gtester-report.1
+}

[gentoo-commits] repo/gentoo:master commit in: app-editors/gedit-plugins/

[Mart Raudsepp]

commit: 27d8cdce044a4e35d5d95db612340137d1077164
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Oct 29 21:48:23 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 21:48:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27d8cdce

app-editors/gedit-plugins: Explicitly depend on libpeas SLOT=0

Another libpeas SLOT is coming.

Signed-off-by: Mart Raudsepp  gentoo.org>

 .../{gedit-plugins-46.0.ebuild => gedit-plugins-46.0-r1.ebuild}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-editors/gedit-plugins/gedit-plugins-46.0.ebuild 
b/app-editors/gedit-plugins/gedit-plugins-46.0-r1.ebuild
similarity index 96%
rename from app-editors/gedit-plugins/gedit-plugins-46.0.ebuild
rename to app-editors/gedit-plugins/gedit-plugins-46.0-r1.ebuild
index 10f89cba16e8..e481f4437f5a 100644
--- a/app-editors/gedit-plugins/gedit-plugins-46.0.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-46.0-r1.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-   >=dev-libs/libpeas-1.14.1[gtk]
+   >=dev-libs/libpeas-1.14.1:0[gtk]
>=app-editors/gedit-46
>=dev-libs/glib-2.32:2
>=x11-libs/gtk+-3.9:3
@@ -32,7 +32,7 @@ RDEPEND="
${PYTHON_DEPS}
$(python_gen_cond_dep '
app-editors/gedit[python,${PYTHON_SINGLE_USEDEP}]
-   dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
+   dev-libs/libpeas:0[python,${PYTHON_SINGLE_USEDEP}]
>=dev-python/dbus-python-0.82[${PYTHON_USEDEP}]
dev-python/pycairo[${PYTHON_USEDEP}]
dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: app-editors/gedit/

[Mart Raudsepp]

commit: dd21bf2213ad0cf97fcd632b69407eb33666e88f
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Oct 29 21:46:33 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 21:46:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd21bf22

app-editors/gedit: Explicitly depend on libpeas SLOT=0

Another libpeas SLOT is coming.

Signed-off-by: Mart Raudsepp  gentoo.org>

 app-editors/gedit/{gedit-46.1.ebuild => gedit-46.1-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-editors/gedit/gedit-46.1.ebuild 
b/app-editors/gedit/gedit-46.1-r1.ebuild
similarity index 94%
rename from app-editors/gedit/gedit-46.1.ebuild
rename to app-editors/gedit/gedit-46.1-r1.ebuild
index c7811ced2043..c0f1ed0f1fc3 100644
--- a/app-editors/gedit/gedit-46.1.ebuild
+++ b/app-editors/gedit/gedit-46.1-r1.ebuild
@@ -21,7 +21,7 @@ DEPEND="
>=x11-libs/gtk+-3.22.0:3[introspection]
>=gui-libs/libgedit-amtk-5.6:=
>=gui-libs/tepl-6.8.0:=
-   >=dev-libs/libpeas-1.14.1[gtk]
+   >=dev-libs/libpeas-1.14.1:0[gtk]
>=dev-libs/gobject-introspection-1.54:=
>=app-text/gspell-0.2.5:0=
python? (
@@ -29,7 +29,7 @@ DEPEND="
$(python_gen_cond_dep '
dev-python/pycairo[${PYTHON_USEDEP}]
>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
-   dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
+   dev-libs/libpeas:0[python,${PYTHON_SINGLE_USEDEP}]
')
)
 

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

[Michał Górny]

commit: 9a9134c6ac735fd653f6e75d442e8daf4d8d36c3
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Oct 29 20:56:56 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Oct 29 20:59:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a9134c6

dev-python/liblarch: Bump to 3.2.0

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

 dev-python/liblarch/Manifest  |  1 +
 dev-python/liblarch/liblarch-3.2.0.ebuild | 37 +++
 2 files changed, 38 insertions(+)

diff --git a/dev-python/liblarch/Manifest b/dev-python/liblarch/Manifest
index 223e7d7688a4..641ffc51b3a2 100644
--- a/dev-python/liblarch/Manifest
+++ b/dev-python/liblarch/Manifest
@@ -1 +1,2 @@
 DIST liblarch-3.1.0.tar.gz 55727 BLAKE2B 
531602b43f7729f59f59394aa1dd6d3ee4ad653d4ef8802de2074c9a9746d43da1638941c1e8f2075d9092810ba680f2e01bee360c55b0826bb725d6515b31df
 SHA512 
042a763dd12612d6630c064b5af84011f1fb908626f17f866e103743cdaabb4983f922290287b0138938488a7c9bff33680ef8157f8bbcbc166e4f4f2d008951
+DIST liblarch-3.2.0.tar.gz 56733 BLAKE2B 
92bf0c51b2f16e84633c75f51ccf321c8756b154bfa76412db5ff7b1879e27f0a24f69e2be94db10c9409b0b326d5ac4477c88eaf8f1be80ef9f3390ea26f879
 SHA512 
d356535f2e60885249be009f7e671fcb1ee02b7d32b7abecc3805c5f6b6e231fc34be0d7a73cd9f9a68dfaae0b1cf0a5bdc54ed3075901a149d58ad6577d92ab

diff --git a/dev-python/liblarch/liblarch-3.2.0.ebuild 
b/dev-python/liblarch/liblarch-3.2.0.ebuild
new file mode 100644
index ..375932865f1c
--- /dev/null
+++ b/dev-python/liblarch/liblarch-3.2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library to handle directed acyclic graphs"
+HOMEPAGE="
+   https://wiki.gnome.org/Projects/liblarch
+   https://github.com/getting-things-gnome/liblarch/
+"
+SRC_URI="
+   https://github.com/getting-things-gnome/liblarch/archive/v${PV}.tar.gz
+   -> ${P}.tar.gz
+"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="
+   dev-python/pygobject:3[${PYTHON_USEDEP}]
+   x11-libs/gtk+:3[introspection]
+"
+RDEPEND="
+   ${DEPEND}
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+   virtx distutils-r1_src_test
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/mcomix/

[Sam James]

commit: eabb7c0903250d04d4dc293ca5085295de342fcd
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 29 20:52:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 29 20:52:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eabb7c09

media-gfx/mcomix: Stabilize 2.1.1-r1 x86, #916150

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

 media-gfx/mcomix/mcomix-2.1.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/mcomix/mcomix-2.1.1-r1.ebuild 
b/media-gfx/mcomix/mcomix-2.1.1-r1.ebuild
index 899761314205..defd13836523 100644
--- a/media-gfx/mcomix/mcomix-2.1.1-r1.ebuild
+++ b/media-gfx/mcomix/mcomix-2.1.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"

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

[Sam James]

commit: 260ed766f76f29d71baec07f0af7eea431f436f5
Author: Paul Zander  gmail  com>
AuthorDate: Sun Oct 29 12:46:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 29 20:52:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=260ed766

media-libs/opencolorio: fix USE="-doc"

`/usr/share/doc/OpenColorIO/html` only exists when `USE=doc` is set. So
make the move conditional.

Closes: https://bugs.gentoo.org/916474
Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33577
Signed-off-by: Sam James  gentoo.org>

 media-libs/opencolorio/opencolorio-2.2.1.ebuild | 8 +---
 media-libs/opencolorio/opencolorio-2.3.0.ebuild | 8 +---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/media-libs/opencolorio/opencolorio-2.2.1.ebuild 
b/media-libs/opencolorio/opencolorio-2.2.1.ebuild
index 638a4d840676..540fa6334bae 100644
--- a/media-libs/opencolorio/opencolorio-2.2.1.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.2.1.ebuild
@@ -129,9 +129,11 @@ src_configure() {
 src_install() {
cmake_src_install
 
-   # there are already files in ${ED}/usr/share/doc/${PF}
-   mv "${ED}/usr/share/doc/OpenColorIO/"* "${ED}/usr/share/doc/${PF}" || 
die
-   rmdir "${ED}/usr/share/doc/OpenColorIO" || die
+   if use doc; then
+   # there are already files in ${ED}/usr/share/doc/${PF}
+   mv "${ED}/usr/share/doc/OpenColorIO/"* 
"${ED}/usr/share/doc/${PF}" || die
+   rmdir "${ED}/usr/share/doc/OpenColorIO" || die
+   fi
 }
 
 src_test() {

diff --git a/media-libs/opencolorio/opencolorio-2.3.0.ebuild 
b/media-libs/opencolorio/opencolorio-2.3.0.ebuild
index 0ea5f92ccd4a..b73c81444be6 100644
--- a/media-libs/opencolorio/opencolorio-2.3.0.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.3.0.ebuild
@@ -158,9 +158,11 @@ src_configure() {
 src_install() {
cmake_src_install
 
-   # there are already files in ${ED}/usr/share/doc/${PF}
-   mv "${ED}/usr/share/doc/OpenColorIO/"* "${ED}/usr/share/doc/${PF}" || 
die
-   rmdir "${ED}/usr/share/doc/OpenColorIO" || die
+   if use doc; then
+   # there are already files in ${ED}/usr/share/doc/${PF}
+   mv "${ED}/usr/share/doc/OpenColorIO/"* 
"${ED}/usr/share/doc/${PF}" || die
+   rmdir "${ED}/usr/share/doc/OpenColorIO" || die
+   fi
 }
 
 src_test() {

[gentoo-commits] repo/gentoo:master commit in: media-gfx/mcomix/

[Sam James]

commit: ca648de487fa59ff6b6428ca17ad1ad90fb6cae3
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 29 20:52:40 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 29 20:52:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca648de4

media-gfx/mcomix: Stabilize 2.1.1-r1 amd64, #916150

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

 media-gfx/mcomix/mcomix-2.1.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/mcomix/mcomix-2.1.1-r1.ebuild 
b/media-gfx/mcomix/mcomix-2.1.1-r1.ebuild
index defd13836523..370dca505823 100644
--- a/media-gfx/mcomix/mcomix-2.1.1-r1.ebuild
+++ b/media-gfx/mcomix/mcomix-2.1.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"

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

[Alfredo Tupone]

commit: 891282ee23ea491f4212b9b4ccb95a807205af99
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Sun Oct 29 20:39:28 2023 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Sun Oct 29 20:39:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=891282ee

dev-util/breakpad: add 2023.01.27

Closes: https://bugs.gentoo.org/916215
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-util/breakpad/Manifest |   1 +
 dev-util/breakpad/breakpad-2023.01.27.ebuild   |  55 ++
 .../files/breakpad-2023.01.27-gentoo.patch | 119 +
 3 files changed, 175 insertions(+)

diff --git a/dev-util/breakpad/Manifest b/dev-util/breakpad/Manifest
index b17d5765b09e..71ea12e876ac 100644
--- a/dev-util/breakpad/Manifest
+++ b/dev-util/breakpad/Manifest
@@ -1 +1,2 @@
 DIST breakpad-2022.07.12.tar.gz 5373070 BLAKE2B 
3598bcebf249c73a13eb77743ee993fb96ebf9585a68e45169afcf34fb836a126ce3b8d71e78dedd3407b843297857619de39fc38661ff80545d572dde098ea1
 SHA512 
872fa74520709d6510b798c7adfb7fed34a84b1831e774087515c23a005b0ea76ef7758bb565f0ff9f2153206cf53958621463fba0e055c9d31dc68f687e2b8f
+DIST breakpad-2023.01.27.tar.gz 5455242 BLAKE2B 
650f9c2ff4ee5e50f9d51573706757cc56a4d64171a5aea7b825327c55b05b9122d375e718951eee26c2bde7aae69d385205fa777fa23e61e5c97683f3c76120
 SHA512 
c6802c55653289780232b20e2abc0458c49f3cdff108c3ddfd6e40a2f378da34adbc158548e9c88cbfdbba9526477da9b68c2c45e205231e2802fe533b6bd6a4

diff --git a/dev-util/breakpad/breakpad-2023.01.27.ebuild 
b/dev-util/breakpad/breakpad-2023.01.27.ebuild
new file mode 100644
index ..398f79e86f23
--- /dev/null
+++ b/dev-util/breakpad/breakpad-2023.01.27.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="implement a crash-reporting system."
+HOMEPAGE="https://chromium.googlesource.com/breakpad/breakpad/;
+SRC_URI="https://github.com/google/${PN}/archive/refs/tags/v${PV}.tar.gz
+   -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-4"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+   net-misc/curl
+"
+DEPEND="${RDEPEND}
+   dev-libs/linux-syscall-support
+   dev-embedded/libdisasm
+"
+BDEPEND="test? ( dev-cpp/gtest )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+   default
+   sed -i \
+   -e 's|"third_party/lss\(.*\)"||' \
+   $(find src -name '*.cc' -o -name '*.h') \
+   || die
+   sed -i \
+   -e '/includelss/d' \
+   -e '/third_party\/curl/d' \
+   Makefile.am \
+   || die
+   sed -i \
+   -e "/AC_INIT/s:0.1:${PVR}:" \
+   -e "/AS_VAR_APPEND/d" \
+   configure.ac \
+   || die
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --enable-system-test-libs \
+   || die
+}

diff --git a/dev-util/breakpad/files/breakpad-2023.01.27-gentoo.patch 
b/dev-util/breakpad/files/breakpad-2023.01.27-gentoo.patch
new file mode 100644
index ..83a4e824c970
--- /dev/null
+++ b/dev-util/breakpad/files/breakpad-2023.01.27-gentoo.patch
@@ -0,0 +1,119 @@
+--- a/src/common/linux/libcurl_wrapper.h   2022-06-07 21:55:00.387396660 
+0200
 b/src/common/linux/libcurl_wrapper.h   2022-06-07 21:55:18.450145751 
+0200
+@@ -36,7 +36,7 @@
+ #include 
+ 
+ #include "common/using_std_string.h"
+-#include "third_party/curl/curl.h"
++#include 
+ 
+ namespace google_breakpad {
+ 
+--- a/src/common/linux/http_upload.cc  2022-06-07 21:53:55.505298529 +0200
 b/src/common/linux/http_upload.cc  2022-06-07 21:54:17.944986506 +0200
+@@ -30,7 +30,7 @@
+ 
+ #include 
+ #include 
+-#include "third_party/curl/curl.h"
++#include 
+ 
+ namespace {
+ 
+--- a/src/processor/disassembler_x86.h 2022-06-08 08:41:45.569686249 +0200
 b/src/processor/disassembler_x86.h 2022-06-08 08:42:09.049377873 +0200
+@@ -42,7 +42,7 @@
+ #include "google_breakpad/common/breakpad_types.h"
+ 
+ namespace libdis {
+-#include "third_party/libdisasm/libdis.h"
++#include 
+ }
+ 
+ namespace google_breakpad {
+--- a/Makefile.am  2022-06-08 08:51:35.221948155 +0200
 b/Makefile.am  2022-06-08 08:53:21.679551745 +0200
+@@ -176,7 +176,6 @@
+ 
+ lib_LIBRARIES += src/libbreakpad.a
+ pkgconfig_DATA += breakpad.pc
+-noinst_LIBRARIES += src/third_party/libdisasm/libdisasm.a
+ 
+ ## Programs
+ bin_PROGRAMS += \
+@@ -944,7 +943,7 @@
+   src/processor/stackwalker_x86.o \
+   src/processor/symbolic_constants_win.o \
+   src/processor/tokenize.o \
+-  src/third_party/libdisasm/libdisasm.a \
++  -ldisasm \
+   $(TEST_LIBS) \
+   $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+ 
+@@ -967,7 +966,7 @@
+   $(AM_CPPFLAGS) $(TEST_CFLAGS)
+ src_processor_disassembler_x86_unittest_LDADD = \
+   src/processor/disassembler_x86.o \
+-  

[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/hyprland-plugins/

[Gonçalo Negrier Duarte]

commit: 783d909d70e27700f9fc1d79637f432cece2f681
Author: Gonçalo Duarte  gmail  com>
AuthorDate: Sun Oct 29 20:20:12 2023 +
Commit: Gonçalo Negrier Duarte  gmail  com>
CommitDate: Sun Oct 29 20:20:12 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=783d909d

gui-apps/hyprland-plugins: drop 0.29.1

Signed-off-by: Gonçalo Duarte  gmail.com>

 .../hyprland-plugins-0.29.1.ebuild | 102 -
 1 file changed, 102 deletions(-)

diff --git a/gui-apps/hyprland-plugins/hyprland-plugins-0.29.1.ebuild 
b/gui-apps/hyprland-plugins/hyprland-plugins-0.29.1.ebuild
deleted file mode 100644
index 759468262b..00
--- a/gui-apps/hyprland-plugins/hyprland-plugins-0.29.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-COMMIT=f9578d28d272fb61753417e175b0fcd5bedc1443
-SPLITCOMMIT=d8c97d60753f70d686588ad3b0a877e2ca67ff72
-DESCRIPTION="A blazing fast wayland wallpaper utility"
-HOMEPAGE="https://github.com/hyprwm/hyprland-plugins;
-SRC_URI="https://github.com/hyprwm/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.gh.tar.gz
-   
https://github.com/Duckonaut/split-monitor-workspaces/archive/${SPLITCOMMIT}.tar.gz
 \
-   -> ${P}-split-monitor-workspaces.gh.tar.gz
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+borders-plus-plus csgo-vulkan-fix +hyprbars split-monitor-workspaces"
-REQUIRED_USE="|| ( borders-plus-plus csgo-vulkan-fix hyprbars 
split-monitor-workspaces )"
-
-RDEPEND="gui-wm/hyprland"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   ~gui-wm/hyprland-${PV}
-   x11-libs/libdrm
-   x11-libs/pixman
-   x11-libs/xcb-util-wm
-"
-
-src_configure() {
-   if use borders-plus-plus; then
-   BUILD_DIR="${WORKDIR}/${P}-build/borders-plus-plus"
-   EMESON_SOURCE="${S}/borders-plus-plus"
-   meson_src_configure
-   fi
-
-   if use csgo-vulkan-fix; then
-   BUILD_DIR="${WORKDIR}/${P}-build/csgo-vulkan-fix"
-   EMESON_SOURCE="${S}/csgo-vulkan-fix"
-   meson_src_configure
-   fi
-
-   if use hyprbars; then
-   BUILD_DIR="${WORKDIR}/${P}-build/hyprbars"
-   EMESON_SOURCE="${S}/hyprbars"
-   meson_src_configure
-   fi
-}
-
-src_compile() {
-   if use borders-plus-plus; then
-   BUILD_DIR="${WORKDIR}/${P}-build/borders-plus-plus"
-   EMESON_SOURCE="${S}/borders-plus-plus"
-   meson_src_compile
-   fi
-
-   if use csgo-vulkan-fix; then
-   BUILD_DIR="${WORKDIR}/${P}-build/csgo-vulkan-fix"
-   EMESON_SOURCE="${S}/csgo-vulkan-fix"
-   meson_src_compile
-   fi
-
-   if use hyprbars; then
-   BUILD_DIR="${WORKDIR}/${P}-build/hyprbars"
-   EMESON_SOURCE="${S}/hyprbars"
-   meson_src_compile
-   fi
-
-   if use split-monitor-workspaces; then
-   emake -C "${WORKDIR}/split-monitor-workspaces-${SPLITCOMMIT}" 
split-monitor-workspaces.so
-   fi
-}
-
-src_install() {
-   insinto "/usr/share/hyprland/plugins"
-
-   if use borders-plus-plus; then
-   newins 
"${WORKDIR}/${P}-build/borders-plus-plus/libborders-plus-plus.so" 
"borders-plus-plus.so"
-   fi
-
-   if use csgo-vulkan-fix; then
-   newins 
"${WORKDIR}/${P}-build/csgo-vulkan-fix/libcsgo-vulkan-fix.so" 
"csgo-vulkan-fix.so"
-   fi
-
-   if use hyprbars; then
-   newins "${WORKDIR}/${P}-build/hyprbars/libhyprbars.so" 
"hyprbars.so"
-   fi
-
-   if use split-monitor-workspaces; then
-   doins 
"${WORKDIR}/split-monitor-workspaces-${SPLITCOMMIT}/split-monitor-workspaces.so"
-   fi
-}
-
-pkg_postinst() {
-   einfo "Plugins are installed in /usr/share/hyprland/plugins"
-   einfo "To load them, refer to the official documentation"
-   einfo "https://wiki.hyprland.org/Plugins/Using-Plugins/;
-}

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

[Gonçalo Negrier Duarte]

commit: b4f5fa00f2e84ae5de0b8168e6fbfb680c741d21
Author: Gonçalo Duarte  gmail  com>
AuthorDate: Sun Oct 29 20:21:31 2023 +
Commit: Gonçalo Negrier Duarte  gmail  com>
CommitDate: Sun Oct 29 20:21:31 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b4f5fa00

gui-apps/eww: drop 0.4.0-r1 and fix rust version on 0.4.0

Signed-off-by: Gonçalo Duarte  gmail.com>

 gui-apps/eww/eww-0.4.0-r1.ebuild | 285 ---
 gui-apps/eww/eww-0.4.0.ebuild|   5 +-
 2 files changed, 2 insertions(+), 288 deletions(-)

diff --git a/gui-apps/eww/eww-0.4.0-r1.ebuild b/gui-apps/eww/eww-0.4.0-r1.ebuild
deleted file mode 100644
index b206c950bb..00
--- a/gui-apps/eww/eww-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,285 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-   ahash-0.7.6
-   aho-corasick-0.7.19
-   ansi_term-0.12.1
-   anyhow-1.0.63
-   ascii-canvas-3.0.0
-   atk-0.15.1
-   atk-sys-0.15.1
-   atty-0.2.14
-   autocfg-1.1.0
-   base64-0.13.0
-   beef-0.5.2
-   bincode-1.3.3
-   bit-set-0.5.3
-   bit-vec-0.6.3
-   bitflags-1.3.2
-   bytes-1.2.1
-   cairo-rs-0.15.12
-   cairo-sys-rs-0.15.1
-   cfg-expr-0.10.3
-   cfg-if-1.0.0
-   clap-2.34.0
-   clap-3.2.20
-   clap_derive-3.2.18
-   clap_lex-0.2.4
-   codemap-0.1.3
-   codespan-reporting-0.11.1
-   console-0.15.1
-   convert_case-0.4.0
-   core-foundation-sys-0.8.3
-   crossbeam-channel-0.5.6
-   crossbeam-deque-0.8.2
-   crossbeam-epoch-0.9.10
-   crossbeam-utils-0.8.11
-   crunchy-0.2.2
-   ctor-0.1.23
-   derive_more-0.99.17
-   diff-0.1.13
-   dirs-next-2.0.0
-   dirs-sys-next-0.1.2
-   either-1.8.0
-   ena-0.14.0
-   encode_unicode-0.3.6
-   env_logger-0.7.1
-   extend-1.1.2
-   field-offset-0.3.4
-   filetime-0.2.17
-   fixedbitset-0.4.2
-   fsevent-sys-4.1.0
-   futures-channel-0.3.24
-   futures-core-0.3.24
-   futures-executor-0.3.24
-   futures-io-0.3.24
-   futures-macro-0.3.24
-   futures-sink-0.3.24
-   futures-task-0.3.24
-   futures-util-0.3.24
-   gdk-0.15.4
-   gdk-pixbuf-0.15.11
-   gdk-pixbuf-sys-0.15.10
-   gdk-sys-0.15.1
-   gdkx11-0.15.5
-   gdkx11-sys-0.15.1
-   gethostname-0.2.3
-   getrandom-0.2.7
-   gio-0.15.12
-   gio-sys-0.15.10
-   glib-0.15.12
-   glib-macros-0.15.11
-   glib-sys-0.15.10
-   gobject-sys-0.15.10
-   grass-0.11.2
-   gtk-0.15.5
-   gtk-layer-shell-0.4.1
-   gtk-layer-shell-sys-0.4.1
-   gtk-sys-0.15.3
-   gtk3-macros-0.15.4
-   hashbrown-0.11.2
-   hashbrown-0.12.3
-   heck-0.4.0
-   hermit-abi-0.1.19
-   humantime-1.3.0
-   indexmap-1.9.1
-   inotify-0.9.6
-   inotify-sys-0.1.5
-   insta-1.19.1
-   itertools-0.10.3
-   itoa-1.0.3
-   kqueue-1.0.6
-   kqueue-sys-1.0.3
-   lalrpop-0.19.8
-   lalrpop-util-0.19.8
-   lasso-0.5.1
-   lazy_static-1.4.0
-   levenshtein-1.0.5
-   libc-0.2.132
-   linked-hash-map-0.5.6
-   lock_api-0.4.8
-   log-0.4.17
-   maplit-1.0.2
-   memchr-2.5.0
-   memoffset-0.6.5
-   mio-0.8.4
-   new_debug_unreachable-1.0.4
-   nix-0.24.2
-   nix-0.25.0
-   notify-5.0.0
-   ntapi-0.3.7
-   num-bigint-0.4.3
-   num-integer-0.1.45
-   num-rational-0.4.1
-   num-traits-0.2.15
-   num_cpus-1.13.1
-   once_cell-1.14.0
-   os_str_bytes-6.3.0
-   output_vt100-0.1.3
-   pango-0.15.10
-   pango-sys-0.15.10
-   parking_lot-0.12.1
-   parking_lot_core-0.9.3
-   pest-2.3.0
-   petgraph-0.6.2
-   phf-0.9.0
-   phf_generator-0.9.1
-   phf_macros-0.9.0
-   phf_shared-0.9.0
-   phf_shared-0.10.0
-   pico-args-0.4.2
-   pin-project-lite-0.2.9
-   pin-utils-0.1.0
-   pkg-config-0.3.25
-   ppv-lite86-0.2.16
-   precomputed-hash-0.1.1
-   pretty_assertions-1.3.0
-   pretty_env_logger-0.4.0
-   proc-macro-crate-1.2.1
-   proc-macro-error-1.0.4
-   proc-macro-error-attr-1.0.4
-   proc-macro-hack-0.5.19
-   proc-macro2-1.0.43
-   quick-error-1.2.3
-   quote-1.0.21
-   rand-0.8.5
-   rand_chacha-0.3.1
-   rand_core-0.6.3
-   rayon-1.5.3
-   rayon-core-1.9.3
-   redox_syscall-0.2.16
-   redox_users-0.4.3
-   ref-cast-1.0.9
-   ref-cast-impl-1.0.9
-   regex-1.6.0
-   regex-syntax-0.6.27
-   ron-0.7.1
-   rustc_version-0.3.3
-   rustc_version-0.4.0
-   rustversion-1.0.9
-   ryu-1.0.11
-   same-file-1.0.6
-   scopeguard-1.1.0
-   semver-0.11.0
-   semver-1.0.13
-   semver-parser-0.10.2
-   serde-1.0.144
-   serde_derive-1.0.144
-   

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

[Gonçalo Negrier Duarte]

commit: 1bb4103d8383b7c1106f72bcfa1d2f4c30046897
Author: Gonçalo Duarte  gmail  com>
AuthorDate: Sun Oct 29 20:22:22 2023 +
Commit: Gonçalo Negrier Duarte  gmail  com>
CommitDate: Sun Oct 29 20:22:22 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1bb4103d

gui-apps/eww: fix rust version on live ebuild

Signed-off-by: Gonçalo Duarte  gmail.com>

 gui-apps/eww/eww-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui-apps/eww/eww-.ebuild b/gui-apps/eww/eww-.ebuild
index 650ef160a6..7ab77dd07a 100644
--- a/gui-apps/eww/eww-.ebuild
+++ b/gui-apps/eww/eww-.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 "
 BDEPEND="
$DEPEND
-   dev-lang/rust[nightly]
+   >=dev-lang/rust-1.73.0[nightly]
 "
 RDEPEND="
$DEPEND

[gentoo-commits] proj/devmanual:master commit in: general-concepts/mirrors/, general-concepts/manifest/

[Sam James]

commit: dbc3fda4b0ca7be794e0aeea1ca3c775313cf86f
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct 26 23:35:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 29 20:22:51 2023 +
URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=dbc3fda4

general-concepts: discuss concerns with regenerating existing distfile entries

In a discussion with Eli Schwartz, I realised the devmanual doesn't currently
explicitly state best practice.

In general-concepts/mirrors, link to the new Manifest regeneration section
and shift some text around into that new section too (and adjust the text 
slightly
while at it).

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

 general-concepts/manifest/text.xml | 36 
 general-concepts/mirrors/text.xml  |  9 ++---
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/general-concepts/manifest/text.xml 
b/general-concepts/manifest/text.xml
index 19ea5c3..bee1651 100644
--- a/general-concepts/manifest/text.xml
+++ b/general-concepts/manifest/text.xml
@@ -39,6 +39,42 @@ action from developers.
 
 
 
+
+
+Updating Manifest files
+
+
+
+Updating existing entries within a manifest must be done with care. Upstream
+changing the tarball in-place without a new filename could be an innocent
+respin of the tarball, or it could indicate either the previous or the new
+tarball is malicious.
+
+
+
+Developers should diff the old and new versions of the distfile, comparing
+the two, and note the differences in the commit message updating the
+Manifest to indicate both what happened (if any context is known) and
+also what differences between the two distfiles have been ascertained.
+
+
+
+Please note that if upstream made any changes affecting the built
+package or it had substantial differences, you need to also bump the ebuild's
+revision. Finally, remember to remove the ebuilds that are associated with the
+old distfile, or regenerate their checksums in Manifest, if there
+are any. This is necessary because these ebuilds will cause checksum
+mismatch errors as the checksum recorded in the manifest file no
+longer matches the computed checksum of the fetched distfile.
+
+
+
+Special care is also required with regard to
+
+mirrors.
+
+
+
 
 
 

diff --git a/general-concepts/mirrors/text.xml 
b/general-concepts/mirrors/text.xml
index 6b4993e..f1ce1bb 100644
--- a/general-concepts/mirrors/text.xml
+++ b/general-concepts/mirrors/text.xml
@@ -68,13 +68,8 @@ fetch and start distributing the new version.
 
 
 
-Please note that if upstream made any changes affecting the built
-package, you need to also bump the ebuild's revision. Finally,
-remember to remove the ebuilds that are associated with the old
-distfile, or regenerate their checksums in Manifest, if there
-are any. This is necessary because these ebuilds will cause checksum
-mismatch errors as the checksum recorded in the Manifest file no
-longer matches the computed checksum of the fetched distfile.
+Updating an existing distfile is generally cause for concern and must be done
+with care, see .
 
 
 

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

[Sam James]

commit: 2d8f17a8cb7edfa9a2061b41541870b499565d35
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 29 20:22:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 29 20:22:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d8f17a8

dev-python/structlog: Stabilize 23.2.0 arm, #916444

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

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

diff --git a/dev-python/structlog/structlog-23.2.0.ebuild 
b/dev-python/structlog/structlog-23.2.0.ebuild
index 8291578306f9..2d74ef785827 100644
--- a/dev-python/structlog/structlog-23.2.0.ebuild
+++ b/dev-python/structlog/structlog-23.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc64 ~riscv x86"
 
 BDEPEND="
dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]

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

[Sam James]

commit: d7bcae5fa50683c002e96cc0570da7ebfcb03dd6
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 29 20:21:28 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 29 20:21:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7bcae5f

Revert "dev-python/greenlet: add link to py3.12 bug"

This reverts commit 259bfe155795c51f00af0bc2e536038a1099b3c6.

I had this locally and hadn't pushed, and mgorny's done it in the meantime.

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

 dev-python/greenlet/greenlet-3.0.1.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-python/greenlet/greenlet-3.0.1.ebuild 
b/dev-python/greenlet/greenlet-3.0.1.ebuild
index 3b109b3cb302..2f57c793a5af 100644
--- a/dev-python/greenlet/greenlet-3.0.1.ebuild
+++ b/dev-python/greenlet/greenlet-3.0.1.ebuild
@@ -5,7 +5,6 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-# No py3.12 yet: https://github.com/python-greenlet/greenlet/issues/368
 # Note: greenlet is built-in in pypy
 # py3.12: https://github.com/python-greenlet/greenlet/issues/368
 PYTHON_COMPAT=( python3_{10..11} )

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

[Sam James]

commit: dca0674bdd11561b3982427af01dd01d26513853
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 29 20:21:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 29 20:21:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dca0674b

dev-python/structlog: Stabilize 23.2.0 arm64, #916444

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

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

diff --git a/dev-python/structlog/structlog-23.2.0.ebuild 
b/dev-python/structlog/structlog-23.2.0.ebuild
index 2d93655dae17..8291578306f9 100644
--- a/dev-python/structlog/structlog-23.2.0.ebuild
+++ b/dev-python/structlog/structlog-23.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc64 ~riscv x86"
 
 BDEPEND="
dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]

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

[Sam James]

commit: bfbec88eb439d338ffd3996914bebd035bff77b4
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 29 20:20:42 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 29 20:20:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfbec88e

dev-python/structlog: Stabilize 23.2.0 x86, #916444

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

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

diff --git a/dev-python/structlog/structlog-23.2.0.ebuild 
b/dev-python/structlog/structlog-23.2.0.ebuild
index fcc2edfe0226..2d93655dae17 100644
--- a/dev-python/structlog/structlog-23.2.0.ebuild
+++ b/dev-python/structlog/structlog-23.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc64 ~riscv x86"
 
 BDEPEND="
dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]

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

[Sam James]

commit: d169689f001f5d25afac3fff2207dfaa0c46f7a2
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 29 20:20:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 29 20:20:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d169689f

media-libs/libplacebo: Stabilize 6.338.1 x86, #916463

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

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

diff --git a/media-libs/libplacebo/libplacebo-6.338.1.ebuild 
b/media-libs/libplacebo/libplacebo-6.338.1.ebuild
index 8490b59f3d93..a2ca03639104 100644
--- a/media-libs/libplacebo/libplacebo-6.338.1.ebuild
+++ b/media-libs/libplacebo/libplacebo-6.338.1.ebuild
@@ -22,7 +22,7 @@ else
)
"
S="${WORKDIR}/${PN}-v${PV}"
-   KEYWORDS="amd64 ~arm ~arm64 ~loong ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~loong ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"

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

[Sam James]

commit: 8186777f6879969cfbe5f763743894107d9b2c35
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 29 20:20:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 29 20:20:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8186777f

dev-python/structlog: Stabilize 23.2.0 ppc64, #916444

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

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

diff --git a/dev-python/structlog/structlog-23.2.0.ebuild 
b/dev-python/structlog/structlog-23.2.0.ebuild
index c63e9ed46965..3f4eae7c3550 100644
--- a/dev-python/structlog/structlog-23.2.0.ebuild
+++ b/dev-python/structlog/structlog-23.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc64 ~riscv ~x86"
 
 BDEPEND="
dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]

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

[Sam James]

commit: d12a415c8a95d8f8cee88448c9102a1ecf341c6a
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 29 20:20:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 29 20:20:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d12a415c

media-libs/libplacebo: Stabilize 6.338.1 ppc64, #916463

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

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

diff --git a/media-libs/libplacebo/libplacebo-6.338.1.ebuild 
b/media-libs/libplacebo/libplacebo-6.338.1.ebuild
index b3f8a6b612bc..8490b59f3d93 100644
--- a/media-libs/libplacebo/libplacebo-6.338.1.ebuild
+++ b/media-libs/libplacebo/libplacebo-6.338.1.ebuild
@@ -22,7 +22,7 @@ else
)
"
S="${WORKDIR}/${PN}-v${PV}"
-   KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~loong ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"