<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2338fb30b7845c4fb2aae611d2a607fe0850f387">https://github.com/macports/macports-ports/commit/2338fb30b7845c4fb2aae611d2a607fe0850f387</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 2338fb30b78 osc: update to 1.5.1
</span>2338fb30b78 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 2338fb30b7845c4fb2aae611d2a607fe0850f387
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Wed Dec 20 17:00:28 2023 +0100

<span style='display:block; white-space:pre;color:#404040;'>    osc: update to 1.5.1
</span>---
 devel/osc/Portfile                       |  8 +++---
 devel/osc/files/patch-build-disable.diff |  4 +--
 devel/osc/files/patch-config.diff        | 48 ++++++++++++++++++++------------
 3 files changed, 36 insertions(+), 24 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/osc/Portfile b/devel/osc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 33ea5646349..0cb322638e8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/osc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/osc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem          1.0
</span> PortGroup           github 1.0
 PortGroup           python 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        openSUSE osc 1.3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        openSUSE osc 1.5.1
</span> categories          devel python
 platforms           {darwin any}
 supported_archs     noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +22,9 @@ long_description    osc is a subversion-like client written in Python. \
</span> 
 homepage            https://en.opensuse.org/openSUSE:OSC
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  01d94e68f3ef3e66d2745e0a5811d04184f84e90 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  3f2f89f2e17fd2edb80d9dec196426f24d7b257e70bdbcf01897ed21d00d543f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    343984
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  2689401ab4103c5b173dfb379f28b0f944d00505 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  7e9faa808e97e214a15af267883b08d7762e978bffc917b2e147ee95a8f9c5a8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    356879
</span> 
 patchfiles          patch-config.diff \
                     patch-build-disable.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/osc/files/patch-build-disable.diff b/devel/osc/files/patch-build-disable.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3e34592e3a7..921820dba95 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/osc/files/patch-build-disable.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/osc/files/patch-build-disable.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> diff --git osc/commandline.py osc/commandline.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index a88e30b3..489a3a06 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b7c19bc6..326e13a8 100644
</span> --- osc/commandline.py
 +++ osc/commandline.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7139,6 +7139,10 @@ Please submit there instead, or use --nodevelproject to force direct submission.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7236,6 +7236,10 @@ Please submit there instead, or use --nodevelproject to force direct submission.
</span>          # OSC_BUILD_ROOT overrides the setting of build-root.
          # OSC_PACKAGECACHEDIR overrides the setting of packagecachedir.
          """
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/osc/files/patch-config.diff b/devel/osc/files/patch-config.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 47f7bfade48..66a433f01bf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/osc/files/patch-config.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/osc/files/patch-config.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +1,36 @@
</span> diff --git osc/conf.py osc/conf.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index cb65bb37..f47eae89 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 07dfc0b9..b2ee13eb 100644
</span> --- osc/conf.py
 +++ osc/conf.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -196,18 +196,12 @@ DEFAULTS = {'apiurl': 'https://api.opensuse.org',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             'maintained_update_project_attribute': 'OBS:UpdateProject',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             'show_download_progress': '0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             # path to the vc script
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            'vc-cmd': '/usr/lib/build/vc',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            'vc-cmd': '@@PREFIX@@/libexec/obs-build/vc',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1250,10 +1250,7 @@ class Options(OscOptions):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     )  # type: ignore[assignment]
</span>  
<span style='display:block; white-space:pre;background:#ffe0e0;'>-             # heuristic to speedup Package.status
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             'status_mtime_heuristic': '0'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     build_cmd: str = Field(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        default=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            shutil.which("build", path="/usr/bin:/usr/lib/build:/usr/lib/obs-build")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            or shutil.which("obs-build", path="/usr/bin:/usr/lib/build:/usr/lib/obs-build")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            or "/usr/bin/build",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        default="@@PREFIX@@/libexec/obs-build/build",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         description=textwrap.dedent(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             """
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             Path to the 'build' tool.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1263,9 +1260,7 @@ class Options(OscOptions):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     )  # type: ignore[assignment]
</span>  
<span style='display:block; white-space:pre;background:#ffe0e0;'>--# some distros like Debian rename and move build to obs-build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if not os.path.isfile('/usr/bin/build') and os.path.isfile('/usr/bin/obs-build'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    DEFAULTS['build-cmd'] = '/usr/bin/obs-build'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if not os.path.isfile('/usr/lib/build/vc') and os.path.isfile('/usr/lib/obs-build/vc'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    DEFAULTS['vc-cmd'] = '/usr/lib/obs-build/vc'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- api_host_options = ['user', 'pass', 'passx', 'aliases', 'http_headers', 'realname', 'email', 'sslcertck', 'cafile', 'capath', 'trusted_prj',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     'downloadurl', 'sshkey', 'disable_hdrmd5_check']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     download_assets_cmd: str = Field(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        default=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            shutil.which("download_assets", path="/usr/lib/build:/usr/lib/obs-build")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            or "/usr/lib/build/download_assets",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        default="@@PREFIX@@/libexec/obs-build/download_assets",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         description=textwrap.dedent(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             """
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             Path to the 'download_assets' tool used for downloading assets in SCM/Git based builds.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1275,7 +1270,7 @@ class Options(OscOptions):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     )  # type: ignore[assignment]
</span>  
<span style='display:block; white-space:pre;background:#e0ffe0;'>+     vc_cmd: str = Field(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        default=shutil.which("vc", path="/usr/lib/build:/usr/lib/obs-build") or "/usr/lib/build/vc",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        default="@@PREFIX@@/libexec/obs-build/vc",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         description=textwrap.dedent(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             """
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             Path to the 'vc' tool.
</span></pre><pre style='margin:0'>

</pre>