<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/02586f62ace4a062fccde4ed2e15d10863cb1f0e">https://github.com/macports/macports-ports/commit/02586f62ace4a062fccde4ed2e15d10863cb1f0e</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 02586f62ace py-{anytree,bottlenose}: resolve conflict
</span>02586f62ace is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 02586f62ace4a062fccde4ed2e15d10863cb1f0e
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Fri Nov 5 15:02:59 2021 +0100

<span style='display:block; white-space:pre;color:#404040;'>    py-{anytree,bottlenose}: resolve conflict
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Both ports are installed `${python.prefix}/LICENSE`.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/63803
</span>---
 python/py-anytree/Portfile                     |  6 ++++--
 python/py-anytree/files/patch-setup.py.diff    | 12 ++++++++++++
 python/py-bottlenose/Portfile                  | 11 ++++++++++-
 python/py-bottlenose/files/patch-setup.py.diff | 12 ++++++++++++
 4 files changed, 38 insertions(+), 3 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-anytree/Portfile b/python/py-anytree/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 54502d09e2c..e56c8a13d8c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-anytree/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-anytree/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,13 +5,13 @@ PortGroup           python 1.0
</span> 
 name                py-anytree
 version             2.8.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> 
 categories-append   devel
 platforms           darwin
 supported_archs     noarch
 license             Apache-2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers         nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers         {@catap korins.ky:kirill} openmaintainer
</span> 
 description         Python tree data library
 long_description    ${description}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,6 +31,8 @@ if {${name} ne ${subport}} {
</span>     depends_lib-append \
                     port:py${python.version}-six
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles      patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     post-destroot {
         set docdir ${prefix}/share/doc/${subport}
         xinstall -d ${destroot}${docdir}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-anytree/files/patch-setup.py.diff b/python/py-anytree/files/patch-setup.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2f56d01ac0b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-anytree/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git setup.py setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d92a271..d22a097 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,7 +49,6 @@ config['extras_require'] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config['tests_require'] = ['nose']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config['test_suite'] = 'nose.collector'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-config['data_files'] = [('', ['LICENSE'])]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Get the long description from the README file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ here = path.abspath(path.dirname(__file__))
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-bottlenose/Portfile b/python/py-bottlenose/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f074eb810c4..45d366e3919 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-bottlenose/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-bottlenose/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup           python 1.0
</span> 
 github.setup        lionheart bottlenose 1.1.10
 name                py-bottlenose
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> 
 categories-append   devel
 platforms           darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,5 +30,14 @@ if {${name} ne ${subport}} {
</span>     depends_build-append \
                     port:py${python.version}-setuptools
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles      patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set docdir ${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        xinstall -d ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        xinstall -m 0644 -W ${worksrcpath} README.md \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            LICENSE ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     livecheck.type  none
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-bottlenose/files/patch-setup.py.diff b/python/py-bottlenose/files/patch-setup.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..88a2e92212c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-bottlenose/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git setup.py setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5b20c24..d7a7658 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,7 +62,6 @@ setup(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     author_email=metadata['__email__'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     url='https://github.com/lionheart/bottlenose',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     packages=["bottlenose"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    data_files=[("", ["LICENSE", "README.md"])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     license=metadata['__license__'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     install_requires=install_requires,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span></pre><pre style='margin:0'>

</pre>