[PR PATCH] python3-rsistent: remove

[PR PATCH] python3-rsistent: remove

[steinex]

[-- Attachment #1: Type: text/plain, Size: 1777 bytes --]

There is a new pull request by steinex against master on the void-packages repository

https://github.com/steinex/void-packages rsistent
https://github.com/void-linux/void-packages/pull/32192

python3-rsistent: remove
Recently python3-pyrsistent was added which is the same package and
installs the same files. Keep the more recent one, fix dependencies and
drop this.

Fixes installation of synapse.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32192.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rsistent-32192.patch --]
[-- Type: text/x-diff, Size: 3213 bytes --]

From a4081ba66304e97953785b6334b9241276f88e97 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 25 Jul 2021 15:34:36 +0200
Subject: [PATCH] python3-rsistent: remove

Recently python3-pyrsistent was added which is the same package and
installs the same files. Keep the more recent one, fix dependencies and
drop this.

Fixes installation of synapse.
---
 srcpkgs/python3-eliot/template      |  4 ++--
 srcpkgs/python3-pyrsistent/template |  8 +++++++-
 srcpkgs/python3-rsistent            |  1 +
 srcpkgs/python3-rsistent/template   | 19 -------------------
 4 files changed, 10 insertions(+), 22 deletions(-)
 create mode 120000 srcpkgs/python3-rsistent
 delete mode 100644 srcpkgs/python3-rsistent/template

diff --git a/srcpkgs/python3-eliot/template b/srcpkgs/python3-eliot/template
index 0cbb23eb4184..04251bcc3123 100644
--- a/srcpkgs/python3-eliot/template
+++ b/srcpkgs/python3-eliot/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-eliot'
 pkgname=python3-eliot
 version=1.12.0
-revision=2
+revision=3
 wrksrc="eliot-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-six python3-zope.interface python3-rsistent
+depends="python3-setuptools python3-six python3-zope.interface python3-pyrsistent
  python3-boltons"
 short_desc="Logging library that tells you why it happened"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index 9bb7e54de304..c278114af2c8 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
 version=0.17.3
-revision=1
+revision=2
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -17,3 +17,9 @@ checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
 post_install() {
 	vlicense LICENCE.mit LICENSE
 }
+
+python3-rsistent_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
diff --git a/srcpkgs/python3-rsistent b/srcpkgs/python3-rsistent
new file mode 120000
index 000000000000..5e610c2b86f9
--- /dev/null
+++ b/srcpkgs/python3-rsistent
@@ -0,0 +1 @@
+python3-pyrsistent
\ No newline at end of file
diff --git a/srcpkgs/python3-rsistent/template b/srcpkgs/python3-rsistent/template
deleted file mode 100644
index 05a8ef1fe38f..000000000000
--- a/srcpkgs/python3-rsistent/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-rsistent'
-pkgname=python3-rsistent
-version=0.15.7
-revision=2
-wrksrc="pyrsistent-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3-six"
-short_desc="Persistent/Functional/Immutable data structures"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/tobgu/pyrsistent/"
-distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=cdc7b5e3ed77bed61270a47d35434a30617b9becdf2478af76ad2c6ade307280
-
-post_intsall() {
-	vlicense LICENSE.mit
-}

Re: [PR PATCH] [Updated] python3-rsistent: remove

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1782 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/steinex/void-packages rsistent
https://github.com/void-linux/void-packages/pull/32192

python3-rsistent: remove
Recently python3-pyrsistent was added which is the same package and
installs the same files. Keep the more recent one, fix dependencies and
drop this.

Fixes installation of synapse.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32192.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rsistent-32192.patch --]
[-- Type: text/x-diff, Size: 3590 bytes --]

From b6d7a15b86dcc67e7588ab2407545baa71bd08d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 28 Jul 2021 01:19:10 -0300
Subject: [PATCH 1/2] python3-eliot: fix dependency.

python3-rsistent will be made into a subpackage of python3-pyrsistent.
---
 srcpkgs/python3-eliot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-eliot/template b/srcpkgs/python3-eliot/template
index 0cbb23eb4184..04251bcc3123 100644
--- a/srcpkgs/python3-eliot/template
+++ b/srcpkgs/python3-eliot/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-eliot'
 pkgname=python3-eliot
 version=1.12.0
-revision=2
+revision=3
 wrksrc="eliot-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-six python3-zope.interface python3-rsistent
+depends="python3-setuptools python3-six python3-zope.interface python3-pyrsistent
  python3-boltons"
 short_desc="Logging library that tells you why it happened"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 448d8a91074292bae658777d52fe04cbe4780a19 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 25 Jul 2021 15:34:36 +0200
Subject: [PATCH 2/2] python3-rsistent: move into python3-pyrsistent.

Recently (fc0abefe465), python3-pyrsistent was added, which is the same
package and installs the same files. Keep the more recent one and drop
this one.

This fixes installation of synapse.
---
 srcpkgs/python3-pyrsistent/template |  8 +++++++-
 srcpkgs/python3-rsistent            |  1 +
 srcpkgs/python3-rsistent/template   | 19 -------------------
 3 files changed, 8 insertions(+), 20 deletions(-)
 create mode 120000 srcpkgs/python3-rsistent
 delete mode 100644 srcpkgs/python3-rsistent/template

diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index 9bb7e54de304..c278114af2c8 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
 version=0.17.3
-revision=1
+revision=2
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -17,3 +17,9 @@ checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
 post_install() {
 	vlicense LICENCE.mit LICENSE
 }
+
+python3-rsistent_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
diff --git a/srcpkgs/python3-rsistent b/srcpkgs/python3-rsistent
new file mode 120000
index 000000000000..5e610c2b86f9
--- /dev/null
+++ b/srcpkgs/python3-rsistent
@@ -0,0 +1 @@
+python3-pyrsistent
\ No newline at end of file
diff --git a/srcpkgs/python3-rsistent/template b/srcpkgs/python3-rsistent/template
deleted file mode 100644
index 05a8ef1fe38f..000000000000
--- a/srcpkgs/python3-rsistent/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-rsistent'
-pkgname=python3-rsistent
-version=0.15.7
-revision=2
-wrksrc="pyrsistent-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3-six"
-short_desc="Persistent/Functional/Immutable data structures"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/tobgu/pyrsistent/"
-distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=cdc7b5e3ed77bed61270a47d35434a30617b9becdf2478af76ad2c6ade307280
-
-post_intsall() {
-	vlicense LICENSE.mit
-}

Re: python3-rsistent: remove

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 198 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32192#issuecomment-887997483

Comment:
I split the commits locally, will merge in a bit. Thanks!

Re: [PR PATCH] [Merged]: python3-rsistent: remove

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1625 bytes --]

There's a merged pull request on the void-packages repository

python3-rsistent: remove
https://github.com/void-linux/void-packages/pull/32192

Description:
Recently python3-pyrsistent was added which is the same package and
installs the same files. Keep the more recent one, fix dependencies and
drop this.

Fixes installation of synapse.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->