Re: [PR PATCH] [Updated] sk1: remove package

Re: [PR PATCH] [Updated] sk1: remove package

[paper42]

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

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

https://github.com/paper42/void-packages remove-sk1
https://github.com/void-linux/void-packages/pull/35890

sk1: remove package
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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/35890.patch is attached

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

From f8c295444c99680cd1148ebc439966b8e872a7c8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 24 Feb 2022 15:05:12 +0100
Subject: [PATCH 1/2] sk1: remove package

* python2
---
 srcpkgs/removed-packages/template |  1 +
 srcpkgs/sk1/template              | 22 ----------------------
 srcpkgs/sk1/update                |  2 --
 3 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 srcpkgs/sk1/template
 delete mode 100644 srcpkgs/sk1/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 81b43de4f622..be9d890e53de 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -331,6 +331,7 @@ replaces="
  seriespl<=2.3.5_2
  simple-obfs<=0.0.5_2
  sitecopy<=0.16.6_11
+ sk1<=2.0rc5_1
  skypetab-ng<=20150201_3
  slmenu<=0.1_1
  soulseekqt<=20160117_2
diff --git a/srcpkgs/sk1/template b/srcpkgs/sk1/template
deleted file mode 100644
index 06f02c449210..000000000000
--- a/srcpkgs/sk1/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'sk1'
-pkgname=sk1
-version=2.0rc5
-revision=1
-build_style=python2-module
-pycompile_dirs="/usr/lib/sk1-wx-${version}"
-hostmakedepends="pkg-config python"
-makedepends="libmagick-devel pango-devel python-cairo-devel wxPython-devel"
-depends="desktop-file-utils hicolor-icon-theme python-cairo python-Pillow
- python-reportlab wxPython"
-short_desc="Open source multiplatform vector graphics editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://sk1project.net"
-distfiles="https://downloads.sk1project.net/sk1/sk1-${version}.tar.gz"
-checksum=1f70dd490a62aad97118454bd18f13c3459dcbd910823835404d6b639f7ef637
-python_version=2
-
-do_install() {
-	# must supply either prefix/exec-prefix/home or install-base/install-platbase -- not both
-	python2 setup.py install --root=${DESTDIR}
-}
diff --git a/srcpkgs/sk1/update b/srcpkgs/sk1/update
deleted file mode 100644
index 0545d0dbcecd..000000000000
--- a/srcpkgs/sk1/update
+++ /dev/null
@@ -1,2 +0,0 @@
-ignore="*pkgbuild*"
-vdsuffix=rc.

From ddb0604e0a20d0371dc675295116a088f1391173 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 24 Feb 2022 15:04:59 +0100
Subject: [PATCH 2/2] python3-reportlab: update to 3.6.7.

* remove python-reportlab
---
 srcpkgs/python-reportlab/template  | 32 ------------------------------
 srcpkgs/python3-reportlab          |  1 -
 srcpkgs/python3-reportlab/template | 19 ++++++++++++++++++
 srcpkgs/removed-packages/template  |  1 +
 4 files changed, 20 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/python-reportlab/template
 delete mode 120000 srcpkgs/python3-reportlab
 create mode 100644 srcpkgs/python3-reportlab/template

diff --git a/srcpkgs/python-reportlab/template b/srcpkgs/python-reportlab/template
deleted file mode 100644
index 019923f4d680..000000000000
--- a/srcpkgs/python-reportlab/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-reportlab'
-pkgname=python-reportlab
-version=3.5.42
-revision=3
-wrksrc="reportlab-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools freetype-devel"
-makedepends="python-devel python3-devel freetype-devel libart-devel"
-depends="python-Pillow"
-short_desc="Python2 library for generating PDFs and graphics"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://www.reportlab.com/"
-distfiles="${PYPI_SITE}/r/reportlab/reportlab-${version}.tar.gz"
-checksum=9c21f202697a6cea57b9d716288fc919d99cbabeb30222eebfc7ff77eac32744
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" ${makedepends}"
-fi
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-python3-reportlab_package() {
-	depends="python3-Pillow"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt
-	}
-}
diff --git a/srcpkgs/python3-reportlab b/srcpkgs/python3-reportlab
deleted file mode 120000
index 3bc20b391afd..000000000000
--- a/srcpkgs/python3-reportlab
+++ /dev/null
@@ -1 +0,0 @@
-python-reportlab
\ No newline at end of file
diff --git a/srcpkgs/python3-reportlab/template b/srcpkgs/python3-reportlab/template
new file mode 100644
index 000000000000..173fe1f73eef
--- /dev/null
+++ b/srcpkgs/python3-reportlab/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-reportlab'
+pkgname=python3-reportlab
+version=3.6.7
+revision=1
+wrksrc="reportlab-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel freetype-devel libart-devel"
+depends="python3-Pillow"
+short_desc="Python3 library for generating PDFs and graphics"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.reportlab.com/"
+distfiles="${PYPI_SITE}/r/reportlab/reportlab-${version}.tar.gz"
+checksum=d035054724278129aba2a55c3edd6111b07e625ad1ff845e3ba2a5e4e203bbc8
+
+post_install() {
+	vlicense LICENSE.txt
+}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index be9d890e53de..3c7a24da0ff5 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -280,6 +280,7 @@ replaces="
  python-pyenet<=1.3.13.post7_2
  python-pyside<=1.2.2_7
  python-pytest-relaxed<=1.1.2_2
+ python-reportlab<=3.5.42_3
  python-requests<=2.26.0_2
  python-sqlite<=2.8.3_1
  python-unicorn>=0