Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Drop sickbeard, python-cheetah, python-Markdown and remove unnecessary alternatives
@ 2020-10-16 16:32 ahesford
  2020-10-19 15:49 ` [PR PATCH] [Closed]: " ahesford
  0 siblings, 1 reply; 2+ messages in thread
From: ahesford @ 2020-10-16 16:32 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ahesford/void-packages sickbeard
https://github.com/void-linux/void-packages/pull/25660

Drop sickbeard, python-cheetah, python-Markdown and remove unnecessary alternatives
Sickbeard is long dead. There is a fork, SickGear, that seems to be active; people can package that alternative if there is demand. This allows the removal of python-{cheetah,Markdown} and the removal of alternatives (in favor of conflicts) with the python3 equivalents.

While I was at it, I bumped python3-cheetah3.

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

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

From 518cdcc5e339384ae4a78694a4ce8d81058c8578 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 16 Oct 2020 11:51:03 -0400
Subject: [PATCH 1/5] sickbeard: drop package

The last upstream release was in 2014, and the last commit was in 2016.
There seems to be a newer fork, SickGear, that somebody can pull in if
there is demand.
---
 srcpkgs/sickbeard/files/sickbeard/run |  2 --
 srcpkgs/sickbeard/template            | 35 ---------------------------
 srcpkgs/sickbeard/update              |  1 -
 3 files changed, 38 deletions(-)
 delete mode 100644 srcpkgs/sickbeard/files/sickbeard/run
 delete mode 100644 srcpkgs/sickbeard/template
 delete mode 100644 srcpkgs/sickbeard/update

diff --git a/srcpkgs/sickbeard/files/sickbeard/run b/srcpkgs/sickbeard/files/sickbeard/run
deleted file mode 100644
index da923fbe8c9..00000000000
--- a/srcpkgs/sickbeard/files/sickbeard/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec chpst -usickbeard:sickbeard python2 /usr/share/sickbeard/SickBeard.py --datadir=/var/lib/sickbeard --quiet --nolaunch
diff --git a/srcpkgs/sickbeard/template b/srcpkgs/sickbeard/template
deleted file mode 100644
index a056d33f0b9..00000000000
--- a/srcpkgs/sickbeard/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'sickbeard'
-pkgname=sickbeard
-version=507
-revision=3
-archs=noarch
-wrksrc="Sick-Beard-build-${version}"
-pycompile_dirs="/usr/share/${pkgname}"
-depends="python-cheetah"
-short_desc="Usenet personal video recorder"
-maintainer="Ananteris <ananteris@mailinator.com>"
-license="GPL-3"
-homepage="http://sickbeard.com"
-distfiles="https://github.com/midgetspy/Sick-Beard/archive/build-${version}.tar.gz"
-checksum=eaf95ac78e065f6dd8128098158b38674479b721d95d937fe7adb892932e9101
-python_version=2 #unverified
-
-system_accounts="sickbeard"
-sickbeard_homedir="/var/lib/sickbeard"
-
-make_dirs="/var/lib/sickbeard 0755 sickbeard sickbeard"
-
-do_build() {
-	sed -i "1s/build Nonea/${version}/" ${wrksrc}/sickbeard/version.py
-}
-
-do_install() {
-	vmkdir usr/share/sickbeard
-	mv * ${DESTDIR}/usr/share/sickbeard
-	vsv sickbeard
-	rm -f ${DESTDIR}/usr/share/sickbeard/init.fedora
-	rm -f ${DESTDIR}/usr/share/sickbeard/init.freebsd
-	rm -f ${DESTDIR}/usr/share/sickbeard/init.solaris11
-	rm -f ${DESTDIR}/usr/share/sickbeard/init.systemd
-	rm -f ${DESTDIR}/usr/share/sickbeard/init.ubuntu
-}
diff --git a/srcpkgs/sickbeard/update b/srcpkgs/sickbeard/update
deleted file mode 100644
index 1afdc6c5448..00000000000
--- a/srcpkgs/sickbeard/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="build"

From 9f235821945ee3cab63dbdcbdde99a4e9712c97e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 16 Oct 2020 11:52:18 -0400
Subject: [PATCH 2/5] python-cheetah: drop package

Nothing else requires this package
---
 srcpkgs/python-cheetah/template | 26 --------------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 srcpkgs/python-cheetah/template

diff --git a/srcpkgs/python-cheetah/template b/srcpkgs/python-cheetah/template
deleted file mode 100644
index d44d0e88892..00000000000
--- a/srcpkgs/python-cheetah/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-cheetah'
-pkgname=python-cheetah
-version=2.4.4
-revision=5
-wrksrc="Cheetah-${version}"
-build_style=python2-module
-pycompile_module="Cheetah"
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-depends="python-Markdown"
-short_desc="Python-powered template engine and code generator"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="http://www.cheetahtemplate.org/"
-distfiles="${PYPI_SITE}/C/Cheetah/Cheetah-${version}.tar.gz"
-checksum=be308229f0c1e5e5af4f27d7ee06d90bb19e6af3059794e5fd536a6f29a9b550
-alternatives="python-cheetah:cheetah:/usr/bin/cheetah2
- python-cheetah:cheetah-analyze:/usr/bin/cheetah-analyze2
- python-cheetah:cheetah-compile:/usr/bin/cheetah-compile2"
-
-post_install() {
-	mv ${DESTDIR}/usr/bin/cheetah{,2}
-	mv ${DESTDIR}/usr/bin/cheetah-analyze{,2}
-	mv ${DESTDIR}/usr/bin/cheetah-compile{,2}
-	vlicense LICENSE
-}

From b6fa1de5c54c4da8e619f6bd66f0599269f6f0d5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 16 Oct 2020 11:54:20 -0400
Subject: [PATCH 3/5] python-Markdown: drop package

Nothing else requires this package
---
 srcpkgs/python-Markdown/template | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 srcpkgs/python-Markdown/template

diff --git a/srcpkgs/python-Markdown/template b/srcpkgs/python-Markdown/template
deleted file mode 100644
index 164fa3c4611..00000000000
--- a/srcpkgs/python-Markdown/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'python-Markdown'
-pkgname=python-Markdown
-version=3.1.1
-revision=4
-wrksrc="Markdown-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-setuptools"
-short_desc="Python2 implementation of John Gruber's Markdown"
-maintainer="Peter Bui <pbui@github.bx612.space>"
-license="BSD-3-Clause"
-homepage="https://github.com/waylan/Python-Markdown"
-distfiles="${PYPI_SITE}/M/Markdown/Markdown-${version}.tar.gz"
-checksum=2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a
-alternatives="markdown:markdown_py:/usr/bin/markdown_py2"
-
-post_install() {
-	vlicense LICENSE.md LICENSE
-	mv ${DESTDIR}/usr/bin/markdown_py ${DESTDIR}/usr/bin/markdown_py2
-}

From fdc464faba7cbd3aacf416a47102bc7eb15a2983 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 16 Oct 2020 11:55:13 -0400
Subject: [PATCH 4/5] python3-cheetah3: update to 3.2.6, remove unneeded
 alternatives

---
 .../python3-cheetah3/patches/tox-py39.patch   | 47 +++++++++++++++++++
 srcpkgs/python3-cheetah3/template             | 15 ++----
 2 files changed, 52 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/python3-cheetah3/patches/tox-py39.patch

diff --git a/srcpkgs/python3-cheetah3/patches/tox-py39.patch b/srcpkgs/python3-cheetah3/patches/tox-py39.patch
new file mode 100644
index 00000000000..00f65a7e192
--- /dev/null
+++ b/srcpkgs/python3-cheetah3/patches/tox-py39.patch
@@ -0,0 +1,47 @@
+Tox checks run just fine with Python 3.9, but the tox configuration doesn't
+define the environment. Define it here until upstream does.
+
+--- tox.ini.bak	2020-10-16 12:21:22.109040944 -0400
++++ tox.ini	2020-10-16 12:21:56.390042112 -0400
+@@ -5,7 +5,7 @@
+ 
+ [tox]
+ minversion = 2.0
+-envlist = py27,py3{4,5,6,7,8},py{27,38}-flake8,pypy
++envlist = py27,py3{4,5,6,7,8,9},py{27,38,39}-flake8,pypy
+ 
+ [testenv]
+ basepython =
+@@ -15,6 +15,7 @@
+     py36: {env:TOXPYTHON:python3.6}
+     py37: {env:TOXPYTHON:python3.7}
+     py38: {env:TOXPYTHON:python3.8}
++    py39: {env:TOXPYTHON:python3.9}
+     pypy: {env:TOXPYTHON:pypy}
+ commands =
+     {envpython} --version
+@@ -63,6 +64,10 @@
+ commands =
+     {[tests]commands}
+ 
++[testenv:py39]
++commands =
++    {[tests]commands}
++
+ [testenv:py27-flake8]
+ deps =
+     flake8
+@@ -74,6 +79,13 @@
+ deps =
+     flake8
+ commands =
++    {[testenv]commands}
++    flake8 .
++
++[testenv:py39-flake8]
++deps =
++    flake8
++commands =
+     {[testenv]commands}
+     flake8 .
+ 
diff --git a/srcpkgs/python3-cheetah3/template b/srcpkgs/python3-cheetah3/template
index 2dd6d8c8cc2..b7494ec418d 100644
--- a/srcpkgs/python3-cheetah3/template
+++ b/srcpkgs/python3-cheetah3/template
@@ -1,30 +1,25 @@
 # Template file for 'python3-cheetah3'
 pkgname=python3-cheetah3
-version=3.2.5
-revision=2
+version=3.2.6
+revision=1
 wrksrc="Cheetah3-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
-checkdepends="tox"
+checkdepends="tox python3-setuptools python3-Markdown python3-Pygments"
 short_desc="Python-powered template engine and code generator"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="http://www.cheetahtemplate.org/"
 distfiles="${PYPI_SITE}/C/Cheetah3/Cheetah3-${version}.tar.gz"
-checksum=ececc9ca7c58b9a86ce71eb95594c4619949e2a058d2a1af74c7ae8222515eb1
-alternatives="python-cheetah:cheetah:/usr/bin/cheetah3
- python-cheetah:cheetah-analyze:/usr/bin/cheetah-analyze3
- python-cheetah:cheetah-compile:/usr/bin/cheetah-compile3"
+checksum=f1c2b693cdcac2ded2823d363f8459ae785261e61c128d68464c8781dba0466b
+conflicts="python-cheetah>=0"
 
 do_check() {
 	tox -e py${py3_ver/./}
 }
 
 post_install() {
-	mv ${DESTDIR}/usr/bin/cheetah{,3}
-	mv ${DESTDIR}/usr/bin/cheetah-analyze{,3}
-	mv ${DESTDIR}/usr/bin/cheetah-compile{,3}
 	vlicense LICENSE
 }

From b0d254601162685390c800f8735f7af2b1cc24ab Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 16 Oct 2020 12:02:17 -0400
Subject: [PATCH 5/5] python3-Markdown: remove unneeded alternatives

---
 srcpkgs/python3-Markdown/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-Markdown/template b/srcpkgs/python3-Markdown/template
index be2efb5fadd..764b6d37657 100644
--- a/srcpkgs/python3-Markdown/template
+++ b/srcpkgs/python3-Markdown/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Markdown'
 pkgname=python3-Markdown
 version=3.3.1
-revision=1
+revision=2
 wrksrc="Markdown-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,9 +13,8 @@ license="BSD-3-Clause"
 homepage="https://github.com/Python-Markdown/markdown"
 distfiles="${PYPI_SITE}/M/Markdown/Markdown-${version}.tar.gz"
 checksum=c3ce9ebb035c078cac0f2036068d054e7dc34354eeecc49c173c33c96b124af6
-alternatives="markdown:markdown_py:/usr/bin/markdown_py3"
+conflicts="python-Markdown>=0"
 
 post_install() {
 	vlicense LICENSE.md LICENSE
-	mv ${DESTDIR}/usr/bin/markdown_py ${DESTDIR}/usr/bin/markdown_py3
 }

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Closed]: Drop sickbeard, python-cheetah, python-Markdown and remove unnecessary alternatives
  2020-10-16 16:32 [PR PATCH] Drop sickbeard, python-cheetah, python-Markdown and remove unnecessary alternatives ahesford
@ 2020-10-19 15:49 ` ahesford
  0 siblings, 0 replies; 2+ messages in thread
From: ahesford @ 2020-10-19 15:49 UTC (permalink / raw)
  To: ml

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

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

Drop sickbeard, python-cheetah, python-Markdown and remove unnecessary alternatives
https://github.com/void-linux/void-packages/pull/25660

Description:
Sickbeard is long dead. There is a fork, SickGear, that seems to be active; people can package that alternative if there is demand. This allows the removal of python-{cheetah,Markdown} and the removal of alternatives (in favor of conflicts) with the python3 equivalents.

While I was at it, I bumped python3-cheetah3.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-10-19 15:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-16 16:32 [PR PATCH] Drop sickbeard, python-cheetah, python-Markdown and remove unnecessary alternatives ahesford
2020-10-19 15:49 ` [PR PATCH] [Closed]: " ahesford

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ http://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git