* [gentoo-commits] repo/gentoo:master commit in: net-nntp/sabnzbd/, net-nntp/sabnzbd/files/
@ 2016-11-19 16:34 Justin Bronder
0 siblings, 0 replies; 5+ messages in thread
From: Justin Bronder @ 2016-11-19 16:34 UTC (permalink / raw
To: gentoo-commits
commit: 23150df6ad2364e1d4de4438f8ef1379c20257c9
Author: Michał Kępień <github <AT> kempniu <DOT> pl>
AuthorDate: Fri Nov 18 20:02:05 2016 +0000
Commit: Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 16:33:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23150df6
Drop custom wrapper script
net-nntp/sabnzbd/files/sabnzbd | 14 --------------
net-nntp/sabnzbd/files/sabnzbd.initd | 2 +-
net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild | 10 ++++------
3 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/net-nntp/sabnzbd/files/sabnzbd b/net-nntp/sabnzbd/files/sabnzbd
deleted file mode 100644
index ccc1a67..00000000
--- a/net-nntp/sabnzbd/files/sabnzbd
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-pyexe=python2.7
-
-if [ ! -x /usr/bin/${pyexe} ]; then
- pyexe=python2.6
-fi
-
-if [ ! -x /usr/bin/${pyexe} ]; then
- echo "No suitable python executable found in /usr/sbin (python2.6 || python2.7)"
- exit 1
-fi
-
-cd /usr/share/sabnzbd && /usr/bin/${pyexe} SABnzbd.py $*
diff --git a/net-nntp/sabnzbd/files/sabnzbd.initd b/net-nntp/sabnzbd/files/sabnzbd.initd
index ad11573..a2a8407 100755
--- a/net-nntp/sabnzbd/files/sabnzbd.initd
+++ b/net-nntp/sabnzbd/files/sabnzbd.initd
@@ -24,7 +24,7 @@ start() {
--group ${SABNZBD_GROUP} \
--pidfile "${PIDFILE}" \
--wait 1000 \
- --exec /usr/bin/sabnzbd \
+ --exec /usr/share/sabnzbd/SABnzbd.py \
-- \
--config-file "${SABNZBD_CONFIGFILE}" \
--logging "${SABNZBD_LOGGING}" \
diff --git a/net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild b/net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild
index 120ac64..d013e87 100644
--- a/net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild
@@ -79,17 +79,15 @@ src_prepare() {
src_install() {
local d
- dodir /usr/share/${PN}/sabnzbd
- insinto /usr/share/${PN}/
- doins SABnzbd.py
- fperms +x /usr/share/${PN}/SABnzbd.py
- dobin "${FILESDIR}"/sabnzbd
-
for d in cherrypy email icons interfaces locale po sabnzbd tools util; do
insinto /usr/share/${PN}/${d}
doins -r ${d}/*
done
+ insinto /usr/share/${PN}
+ insopts -m 0755
+ doins SABnzbd.py
+
python_optimize "${D}usr/share/${PN}"
newinitd "${FILESDIR}/${PN}.initd" "${PN}"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-nntp/sabnzbd/, net-nntp/sabnzbd/files/
@ 2017-04-26 13:13 Justin Bronder
0 siblings, 0 replies; 5+ messages in thread
From: Justin Bronder @ 2017-04-26 13:13 UTC (permalink / raw
To: gentoo-commits
commit: 3ef07c37e46f0ed7edbbdcf25b49e2f52e4b1e29
Author: Michał Kępień <github <AT> kempniu <DOT> pl>
AuthorDate: Wed Apr 26 11:03:30 2017 +0000
Commit: Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Wed Apr 26 13:13:39 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ef07c37
net-nntp/sabnzbd: Disable wget logging in init script
net-nntp/sabnzbd/files/sabnzbd.initd | 2 +-
net-nntp/sabnzbd/{sabnzbd-1.2.3.ebuild => sabnzbd-1.2.3-r1.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-nntp/sabnzbd/files/sabnzbd.initd b/net-nntp/sabnzbd/files/sabnzbd.initd
index 5a693586bbe..b3dca979756 100755
--- a/net-nntp/sabnzbd/files/sabnzbd.initd
+++ b/net-nntp/sabnzbd/files/sabnzbd.initd
@@ -58,7 +58,7 @@ stop() {
ebegin "Stopping SABnzbd"
- if [ "$(wget -q -t 1 -O - -T 10 "${url}")" = "ok" ]; then
+ if [ "$(wget -o /dev/null -t 1 -O - -T 10 "${url}")" = "ok" ]; then
signals="NULL/5/${signals}"
fi
diff --git a/net-nntp/sabnzbd/sabnzbd-1.2.3.ebuild b/net-nntp/sabnzbd/sabnzbd-1.2.3-r1.ebuild
similarity index 100%
rename from net-nntp/sabnzbd/sabnzbd-1.2.3.ebuild
rename to net-nntp/sabnzbd/sabnzbd-1.2.3-r1.ebuild
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-nntp/sabnzbd/, net-nntp/sabnzbd/files/
@ 2020-06-28 12:59 Thomas Deutschmann
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Deutschmann @ 2020-06-28 12:59 UTC (permalink / raw
To: gentoo-commits
commit: 0f0e394cc4589571a6ed678fb9712c1aabcce5ea
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 28 12:34:45 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jun 28 12:59:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f0e394c
net-nntp/sabnzbd: bump to v3.0.0 RC1
Bug: https://bugs.gentoo.org/708958
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
net-nntp/sabnzbd/files/sabnzbd-r1.ini | 12 ++++
net-nntp/sabnzbd/files/sabnzbd-r1.initd | 71 ++++++++++++++++++++++
....0_rc1_pre0.ebuild => sabnzbd-3.0.0_rc1.ebuild} | 45 +++++++-------
3 files changed, 104 insertions(+), 24 deletions(-)
diff --git a/net-nntp/sabnzbd/files/sabnzbd-r1.ini b/net-nntp/sabnzbd/files/sabnzbd-r1.ini
new file mode 100644
index 00000000000..5ccd7e19ca3
--- /dev/null
+++ b/net-nntp/sabnzbd/files/sabnzbd-r1.ini
@@ -0,0 +1,12 @@
+__version__ = 19
+[misc]
+log_dir = /var/log/sabnzbd
+admin_dir = /var/lib/sabnzbd/admin
+cache_dir = /var/lib/sabnzbd/cache
+complete_dir = /var/lib/sabnzbd/complete
+download_dir = /var/lib/sabnzbd/download
+dirscan_dir = /var/lib/sabnzbd/dirscan
+nzb_backup_dir = /var/lib/sabnzbd/backup
+auto_browser = 0
+host = ::
+port = 8080
diff --git a/net-nntp/sabnzbd/files/sabnzbd-r1.initd b/net-nntp/sabnzbd/files/sabnzbd-r1.initd
new file mode 100644
index 00000000000..eff3352a90b
--- /dev/null
+++ b/net-nntp/sabnzbd/files/sabnzbd-r1.initd
@@ -0,0 +1,71 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+PIDFILE="/run/sabnzbd/sabnzbd.pid"
+
+depend() {
+ use dns
+}
+
+get_var() {
+ grep -P -o -m 1 "(?<=^${1} = ).*" "${SABNZBD_CONFIGFILE}" || echo 0
+}
+
+start() {
+ ebegin "Starting SABnzbd"
+
+ checkpath -q -d -o ${SABNZBD_USER}:${SABNZBD_GROUP} -m 0770 "$(dirname "${PIDFILE}")"
+
+ start-stop-daemon \
+ --quiet \
+ --start \
+ --user ${SABNZBD_USER} \
+ --group ${SABNZBD_GROUP} \
+ --pidfile "${PIDFILE}" \
+ --wait 1000 \
+ --exec /usr/share/sabnzbd/SABnzbd.py \
+ -- \
+ --config-file "${SABNZBD_CONFIGFILE}" \
+ --logging "${SABNZBD_LOGGING}" \
+ --daemon \
+ --pidfile "${PIDFILE}"
+
+ eend $?
+}
+
+stop() {
+ local protocol="http"
+ local host="$(get_var "host")"
+ local port="$(get_var "port")"
+
+ if [ $(get_var "enable_https") -eq 1 ]; then
+ protocol="https"
+ port="$(get_var "https_port")"
+ fi
+
+ case "${host}" in
+ *:*) host="[${host}]" ;;
+ esac
+
+ local url="${protocol}://${host}:${port}/sabnzbd/api?mode=shutdown"
+
+ if [ $(get_var "disable_api_key") -eq 0 ]; then
+ url="${url}&apikey=$(get_var "api_key")"
+ fi
+
+ local signals="TERM/1/KILL/1"
+
+ ebegin "Stopping SABnzbd"
+
+ if [ "$(wget -o /dev/null -t 1 -O - -T 10 "${url}")" = "ok" ]; then
+ signals="NULL/5/${signals}"
+ fi
+
+ start-stop-daemon \
+ --stop \
+ --pidfile "${PIDFILE}" \
+ --retry "${signals}"
+
+ eend $?
+}
diff --git a/net-nntp/sabnzbd/sabnzbd-3.0.0_rc1_pre0.ebuild b/net-nntp/sabnzbd/sabnzbd-3.0.0_rc1.ebuild
similarity index 75%
rename from net-nntp/sabnzbd/sabnzbd-3.0.0_rc1_pre0.ebuild
rename to net-nntp/sabnzbd/sabnzbd-3.0.0_rc1.ebuild
index 2a8fb3992d6..afa365fd3af 100644
--- a/net-nntp/sabnzbd/sabnzbd-3.0.0_rc1_pre0.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-3.0.0_rc1.ebuild
@@ -7,7 +7,7 @@ EAPI="7"
PYTHON_COMPAT=( python3_{6..8} )
PYTHON_REQ_USE="sqlite"
-inherit python-single-r1 user systemd
+inherit python-single-r1 systemd
MY_PV="${PV/_rc/RC}"
MY_PV="${MY_PV//_pre*}"
@@ -21,13 +21,15 @@ SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${MY_PV}/${MY_P}-s
# Sabnzbd is GPL-2 but bundles software with the following licenses.
LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64"
IUSE="+7za +rar unzip"
# Sabnzbd is installed to /usr/share/ as upstream makes it clear they should not
# be in python's sitedir. See: https://sabnzbd.org/wiki/advanced/unix-packaging
COMMON_DEPS="
+ acct-user/sabnzbd
+ acct-group/sabnzbd
${PYTHON_DEPS}
$(python_gen_cond_dep '
dev-python/chardet[${PYTHON_MULTI_USEDEP}]
@@ -60,11 +62,6 @@ S="${WORKDIR}/${MY_P}"
pkg_setup() {
MY_HOMEDIR="/var/lib/${PN}"
python-single-r1_pkg_setup
-
- # Create sabnzbd group
- enewgroup "${PN}"
- # Create sabnzbd user, put in sabnzbd group
- enewuser "${PN}" -1 -1 "${MY_HOMEDIR}" "${PN}"
}
src_install() {
@@ -81,7 +78,7 @@ src_install() {
python_fix_shebang "${ED}/usr/share/${PN}"
python_optimize "${ED}/usr/share/${PN}"
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newinitd "${FILESDIR}/${PN}-r1.initd" "${PN}"
newconfd "${FILESDIR}/${PN}.confd" "${PN}"
diropts -o "${PN}" -g "${PN}"
@@ -90,7 +87,7 @@ src_install() {
insinto "/etc/${PN}"
insopts -m 0600 -o "${PN}" -g "${PN}"
- doins "${FILESDIR}/${PN}.ini"
+ newins "${FILESDIR}"/${PN}-r1.ini ${PN}.ini
dodoc {ABOUT,ISSUES}.txt README.mkd licenses/*
@@ -104,21 +101,21 @@ pkg_postinst() {
einfo
einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
einfo
- einfo " gpasswd -a <user> sabnzbd"
+ einfo " usermod -a -G sabnzbd <user>"
einfo
- einfo "By default, SABnzbd+ will listen on TCP port 8080."
+ einfo "By default, SABnzbd will listen on TCP port 8080."
+ else
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if ver_test "${v}" -lt 3; then
+ ewarn
+ ewarn "Due to changes in this release, the queue will be converted when ${PN}"
+ ewarn "is started for the first time. Job order, settings and data will be"
+ ewarn "preserved, but all jobs will be unpaused and URLs that did not finish"
+ ewarn "fetching before the upgrade will be lost!"
+ ewarn
+ break
+ fi
+ done
fi
-
- local v
- for v in ${REPLACING_VERSIONS}; do
- if ver_test "${v}" -lt 3; then
- ewarn
- ewarn "Due to changes in this release, the queue will be converted when ${PN}"
- ewarn "is started for the first time. Job order, settings and data will be"
- ewarn "preserved, but all jobs will be unpaused and URLs that did not finish"
- ewarn "fetching before the upgrade will be lost!"
- ewarn
- break
- fi
- done
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-nntp/sabnzbd/, net-nntp/sabnzbd/files/
@ 2023-02-20 18:05 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2023-02-20 18:05 UTC (permalink / raw
To: gentoo-commits
commit: ebcf62dea4d75d4907166cd5151a6daa7cc748ac
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 20 18:01:08 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Feb 20 18:05:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebcf62de
net-nntp/sabnzbd: Reenable functional API tests against tavern-2
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../sabnzbd/files/sabnzbd-3.7.2-tavern-2.patch | 128 +++++++++++++++++++++
net-nntp/sabnzbd/sabnzbd-3.7.2.ebuild | 10 +-
2 files changed, 136 insertions(+), 2 deletions(-)
diff --git a/net-nntp/sabnzbd/files/sabnzbd-3.7.2-tavern-2.patch b/net-nntp/sabnzbd/files/sabnzbd-3.7.2-tavern-2.patch
new file mode 100644
index 000000000000..60945d596d41
--- /dev/null
+++ b/net-nntp/sabnzbd/files/sabnzbd-3.7.2-tavern-2.patch
@@ -0,0 +1,128 @@
+From c8125e93bfb0963876992cb50c2442220c0ec300 Mon Sep 17 00:00:00 2001
+From: jcfp <jcfp@debian.org>
+Date: Mon, 20 Feb 2023 16:29:34 +0100
+Subject: [PATCH] convert tests to tavern 2.0.0+
+
+---
+ tests/data/tavern/api_get_files_format.yaml | 2 +-
+ tests/data/tavern/api_history_empty.yaml | 2 +-
+ tests/data/tavern/api_history_format.yaml | 2 +-
+ tests/data/tavern/api_queue_empty.yaml | 2 +-
+ tests/data/tavern/api_queue_format.yaml | 2 +-
+ tests/data/tavern/api_server_stats.yaml | 2 +-
+ tests/data/tavern/api_version.yaml | 4 ++--
+ tests/requirements.txt | 2 +-
+ 8 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/tests/data/tavern/api_get_files_format.yaml b/tests/data/tavern/api_get_files_format.yaml
+index e46823085b..9315fc27f8 100755
+--- a/tests/data/tavern/api_get_files_format.yaml
++++ b/tests/data/tavern/api_get_files_format.yaml
+@@ -56,7 +56,7 @@ stages:
+ pragma: "no-cache"
+ access-control-allow-origin: "*"
+ verify_response_with:
+- function: tavern.testutils.helpers:validate_regex
++ function: tavern.helpers:validate_regex
+ extra_kwargs:
+ # Verify response parameters with a regex using positive
+ # looksaheads, so parameters match regardless of their order
+diff --git a/tests/data/tavern/api_history_empty.yaml b/tests/data/tavern/api_history_empty.yaml
+index 0d15faabd5..22fa4e4511 100755
+--- a/tests/data/tavern/api_history_empty.yaml
++++ b/tests/data/tavern/api_history_empty.yaml
+@@ -54,7 +54,7 @@ stages:
+ access-control-allow-origin: "*"
+ content-length: !re_match "[0-9]+"
+ verify_response_with:
+- function: tavern.testutils.helpers:validate_regex
++ function: tavern.helpers:validate_regex
+ extra_kwargs:
+ # Verify response with a regex using positive looksaheads so
+ # parameters match regardless of their order of appearance
+diff --git a/tests/data/tavern/api_history_format.yaml b/tests/data/tavern/api_history_format.yaml
+index 99c64098e1..45de020706 100755
+--- a/tests/data/tavern/api_history_format.yaml
++++ b/tests/data/tavern/api_history_format.yaml
+@@ -87,7 +87,7 @@ stages:
+ access-control-allow-origin: "*"
+ content-length: !re_match "[0-9]+"
+ verify_response_with:
+- function: tavern.testutils.helpers:validate_regex
++ function: tavern.helpers:validate_regex
+ extra_kwargs:
+ # Verify response parameters with a regex using positive looksaheads,
+ # so parameters match regardless of their order of appearance. Note
+diff --git a/tests/data/tavern/api_queue_empty.yaml b/tests/data/tavern/api_queue_empty.yaml
+index d80d026e0e..5a3f45e2ea 100755
+--- a/tests/data/tavern/api_queue_empty.yaml
++++ b/tests/data/tavern/api_queue_empty.yaml
+@@ -78,7 +78,7 @@ stages:
+ access-control-allow-origin: "*"
+ content-length: !re_match "[0-9]+"
+ verify_response_with:
+- function: tavern.testutils.helpers:validate_regex
++ function: tavern.helpers:validate_regex
+ extra_kwargs:
+ # Verify only a bunch of key response parameters with a regex using
+ # positive looksaheads, so parameters match regardless of their order
+diff --git a/tests/data/tavern/api_queue_format.yaml b/tests/data/tavern/api_queue_format.yaml
+index 8411f4a272..fcbe708785 100755
+--- a/tests/data/tavern/api_queue_format.yaml
++++ b/tests/data/tavern/api_queue_format.yaml
+@@ -98,7 +98,7 @@ stages:
+ access-control-allow-origin: "*"
+ content-length: !re_match "[0-9]+"
+ verify_response_with:
+- function: tavern.testutils.helpers:validate_regex
++ function: tavern.helpers:validate_regex
+ extra_kwargs:
+ # Verify only a bunch of key response parameters with a regex using
+ # positive looksaheads, so parameters match regardless of their order
+diff --git a/tests/data/tavern/api_server_stats.yaml b/tests/data/tavern/api_server_stats.yaml
+index b42a1f2a38..a94a3b7823 100755
+--- a/tests/data/tavern/api_server_stats.yaml
++++ b/tests/data/tavern/api_server_stats.yaml
+@@ -47,7 +47,7 @@ stages:
+ content-length: !re_match "[0-9]+"
+ status_code: 200
+ verify_response_with:
+- function: tavern.testutils.helpers:validate_regex
++ function: tavern.helpers:validate_regex
+ extra_kwargs:
+ expression: "{{(?=.*'total': [0-9]+)(?=.*'month': [0-9]+)(?=.*'week': [0-9]+)(?=.*'day': [0-9]+)(?=.*'servers': .*).*}}"
+
+diff --git a/tests/data/tavern/api_version.yaml b/tests/data/tavern/api_version.yaml
+index ca11906cc9..8e81493353 100755
+--- a/tests/data/tavern/api_version.yaml
++++ b/tests/data/tavern/api_version.yaml
+@@ -35,7 +35,7 @@ stages:
+ content-type: !re_match "text/plain"
+ content-type: !re_search "charset=(UTF|utf)-8"
+ verify_response_with:
+- function: tavern.testutils.helpers:validate_regex
++ function: tavern.helpers:validate_regex
+ extra_kwargs:
+ expression: "{SAB_VERSION}"
+
+@@ -53,6 +53,6 @@ stages:
+ content-type: !re_match "text/xml"
+ content-type: !re_search "charset=(UTF|utf)-8"
+ verify_response_with:
+- function: tavern.testutils.helpers:validate_regex
++ function: tavern.helpers:validate_regex
+ extra_kwargs:
+ expression: '<\?xml version="1.0" encoding="UTF-8" \?>\r?\n?<version>{SAB_VERSION}</version>'
+diff --git a/tests/requirements.txt b/tests/requirements.txt
+index ea2fe6c403..60c160fe40 100644
+--- a/tests/requirements.txt
++++ b/tests/requirements.txt
+@@ -9,7 +9,7 @@ pytest-httpbin
+ pytest-httpserver
+ flaky
+ xmltodict
+-tavern<2.0.0 # tavalidate does not support tavern 2.0.0+
++tavern>=2.0.0
+ tavalidate
+ importlib_metadata
+ lxml
diff --git a/net-nntp/sabnzbd/sabnzbd-3.7.2.ebuild b/net-nntp/sabnzbd/sabnzbd-3.7.2.ebuild
index b12e490fa79a..f9a876c654e3 100644
--- a/net-nntp/sabnzbd/sabnzbd-3.7.2.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-3.7.2.ebuild
@@ -42,6 +42,8 @@ DEPEND="
dev-python/portend[${PYTHON_USEDEP}]
dev-python/puremagic[${PYTHON_USEDEP}]
~dev-python/sabyenc-5.4.4[${PYTHON_USEDEP}]
+ dev-python/tavalidate[${PYTHON_USEDEP}]
+ >=dev-python/tavern-2[${PYTHON_USEDEP}]
')
"
RDEPEND="
@@ -71,6 +73,10 @@ BDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}"/${P}-tavern-2.patch
+)
+
src_test() {
local EPYTEST_IGNORE=(
# network sandbox
@@ -79,8 +85,6 @@ src_test() {
tests/test_urlgrabber.py
tests/test_utils/test_happyeyeballs.py
tests/test_utils/test_internetspeed.py
- # requires tavern
- tests/test_functional_api.py
)
local EPYTEST_DESELECT=(
# network sandbox
@@ -106,6 +110,8 @@ src_test() {
'tests/test_functional_misc.py::TestDaemonizing::test_daemonizing'
)
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+ local -x PYTEST_PLUGINS=tavern._core.pytest
epytest -s
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-nntp/sabnzbd/, net-nntp/sabnzbd/files/
@ 2023-07-24 15:05 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2023-07-24 15:05 UTC (permalink / raw
To: gentoo-commits
commit: a4da50d833572190c43afca51ff8369166f9a43a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 15:04:36 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 15:05:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4da50d8
net-nntp/sabnzbd: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
net-nntp/sabnzbd/Manifest | 3 -
.../sabnzbd/files/sabnzbd-3.7.2-tavern-2.patch | 128 ----------------
net-nntp/sabnzbd/sabnzbd-3.7.1.ebuild | 156 -------------------
net-nntp/sabnzbd/sabnzbd-3.7.2-r1.ebuild | 166 --------------------
net-nntp/sabnzbd/sabnzbd-4.0.1.ebuild | 168 ---------------------
5 files changed, 621 deletions(-)
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index 9bf40591a345..e4326d820519 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -1,4 +1 @@
-DIST SABnzbd-3.7.1-src.tar.gz 5108463 BLAKE2B 5858fc5ece3948696132c64c1f4a7459319bbc604074dc78339e54e7e77353dbd141b4aad0c0cd027ac6ea1499aee0100ed7f4a1b20d0786728503eb6ffad055 SHA512 c76f74e20943196467206b5c0427421d7fe4e614855c477a045d06854c5247c13056ce9055d82b5f0c6391a046dc3c65c577e50fc30646c8f2290df4bada4fb9
-DIST SABnzbd-3.7.2-src.tar.gz 5108729 BLAKE2B 8c279663f5395b613e7122e349971994f98b3ef22d23f18083b64864bc6e27653ca525a59226d2af5dc10a8cfd7509014c60e5b322137239e6eec03239746768 SHA512 d5fa9dc1a3114bd0806e580a170552fb8821e375790c2b95c7add4b25a4ceabad24111c4d6a9c12bcc9447dc0a5cbf6a8595e0142a74ee9d161849a9e55609e9
-DIST SABnzbd-4.0.1-src.tar.gz 5079799 BLAKE2B 5020b0f906bdb87b5eb287fee321fc765ad959754f3293395275930deab7baf8533f575993ff5c02cfbc646745eefee1ca4aa8cbeaba94d15c43a4dc8d5c78e6 SHA512 98958e9c6b35118781fec28853f1b9a0405bd262aba734af22c0bb64d5d25899c49bcb3aac4f449baccc629da6739ab1c4a33f5947c61646b35788d9e971e9cb
DIST SABnzbd-4.0.2-src.tar.gz 5081392 BLAKE2B 1740aad2a5b248b22dda42cb22b740c54d792e726bec27c832ffc8919d863f1cec26aaff4e789e0dd8ae3647332f9aa9b26ca5422ce7baf955f8c37ac8c22142 SHA512 2f0d2297449ecbf8ddbb7a571f6dfa6717c5b118389a67e46072f25daca16d2983827e8f17e1cf016fbf2985fa5594dbafc62cf13601607dc2b4d9849098982b
diff --git a/net-nntp/sabnzbd/files/sabnzbd-3.7.2-tavern-2.patch b/net-nntp/sabnzbd/files/sabnzbd-3.7.2-tavern-2.patch
deleted file mode 100644
index 60945d596d41..000000000000
--- a/net-nntp/sabnzbd/files/sabnzbd-3.7.2-tavern-2.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From c8125e93bfb0963876992cb50c2442220c0ec300 Mon Sep 17 00:00:00 2001
-From: jcfp <jcfp@debian.org>
-Date: Mon, 20 Feb 2023 16:29:34 +0100
-Subject: [PATCH] convert tests to tavern 2.0.0+
-
----
- tests/data/tavern/api_get_files_format.yaml | 2 +-
- tests/data/tavern/api_history_empty.yaml | 2 +-
- tests/data/tavern/api_history_format.yaml | 2 +-
- tests/data/tavern/api_queue_empty.yaml | 2 +-
- tests/data/tavern/api_queue_format.yaml | 2 +-
- tests/data/tavern/api_server_stats.yaml | 2 +-
- tests/data/tavern/api_version.yaml | 4 ++--
- tests/requirements.txt | 2 +-
- 8 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/tests/data/tavern/api_get_files_format.yaml b/tests/data/tavern/api_get_files_format.yaml
-index e46823085b..9315fc27f8 100755
---- a/tests/data/tavern/api_get_files_format.yaml
-+++ b/tests/data/tavern/api_get_files_format.yaml
-@@ -56,7 +56,7 @@ stages:
- pragma: "no-cache"
- access-control-allow-origin: "*"
- verify_response_with:
-- function: tavern.testutils.helpers:validate_regex
-+ function: tavern.helpers:validate_regex
- extra_kwargs:
- # Verify response parameters with a regex using positive
- # looksaheads, so parameters match regardless of their order
-diff --git a/tests/data/tavern/api_history_empty.yaml b/tests/data/tavern/api_history_empty.yaml
-index 0d15faabd5..22fa4e4511 100755
---- a/tests/data/tavern/api_history_empty.yaml
-+++ b/tests/data/tavern/api_history_empty.yaml
-@@ -54,7 +54,7 @@ stages:
- access-control-allow-origin: "*"
- content-length: !re_match "[0-9]+"
- verify_response_with:
-- function: tavern.testutils.helpers:validate_regex
-+ function: tavern.helpers:validate_regex
- extra_kwargs:
- # Verify response with a regex using positive looksaheads so
- # parameters match regardless of their order of appearance
-diff --git a/tests/data/tavern/api_history_format.yaml b/tests/data/tavern/api_history_format.yaml
-index 99c64098e1..45de020706 100755
---- a/tests/data/tavern/api_history_format.yaml
-+++ b/tests/data/tavern/api_history_format.yaml
-@@ -87,7 +87,7 @@ stages:
- access-control-allow-origin: "*"
- content-length: !re_match "[0-9]+"
- verify_response_with:
-- function: tavern.testutils.helpers:validate_regex
-+ function: tavern.helpers:validate_regex
- extra_kwargs:
- # Verify response parameters with a regex using positive looksaheads,
- # so parameters match regardless of their order of appearance. Note
-diff --git a/tests/data/tavern/api_queue_empty.yaml b/tests/data/tavern/api_queue_empty.yaml
-index d80d026e0e..5a3f45e2ea 100755
---- a/tests/data/tavern/api_queue_empty.yaml
-+++ b/tests/data/tavern/api_queue_empty.yaml
-@@ -78,7 +78,7 @@ stages:
- access-control-allow-origin: "*"
- content-length: !re_match "[0-9]+"
- verify_response_with:
-- function: tavern.testutils.helpers:validate_regex
-+ function: tavern.helpers:validate_regex
- extra_kwargs:
- # Verify only a bunch of key response parameters with a regex using
- # positive looksaheads, so parameters match regardless of their order
-diff --git a/tests/data/tavern/api_queue_format.yaml b/tests/data/tavern/api_queue_format.yaml
-index 8411f4a272..fcbe708785 100755
---- a/tests/data/tavern/api_queue_format.yaml
-+++ b/tests/data/tavern/api_queue_format.yaml
-@@ -98,7 +98,7 @@ stages:
- access-control-allow-origin: "*"
- content-length: !re_match "[0-9]+"
- verify_response_with:
-- function: tavern.testutils.helpers:validate_regex
-+ function: tavern.helpers:validate_regex
- extra_kwargs:
- # Verify only a bunch of key response parameters with a regex using
- # positive looksaheads, so parameters match regardless of their order
-diff --git a/tests/data/tavern/api_server_stats.yaml b/tests/data/tavern/api_server_stats.yaml
-index b42a1f2a38..a94a3b7823 100755
---- a/tests/data/tavern/api_server_stats.yaml
-+++ b/tests/data/tavern/api_server_stats.yaml
-@@ -47,7 +47,7 @@ stages:
- content-length: !re_match "[0-9]+"
- status_code: 200
- verify_response_with:
-- function: tavern.testutils.helpers:validate_regex
-+ function: tavern.helpers:validate_regex
- extra_kwargs:
- expression: "{{(?=.*'total': [0-9]+)(?=.*'month': [0-9]+)(?=.*'week': [0-9]+)(?=.*'day': [0-9]+)(?=.*'servers': .*).*}}"
-
-diff --git a/tests/data/tavern/api_version.yaml b/tests/data/tavern/api_version.yaml
-index ca11906cc9..8e81493353 100755
---- a/tests/data/tavern/api_version.yaml
-+++ b/tests/data/tavern/api_version.yaml
-@@ -35,7 +35,7 @@ stages:
- content-type: !re_match "text/plain"
- content-type: !re_search "charset=(UTF|utf)-8"
- verify_response_with:
-- function: tavern.testutils.helpers:validate_regex
-+ function: tavern.helpers:validate_regex
- extra_kwargs:
- expression: "{SAB_VERSION}"
-
-@@ -53,6 +53,6 @@ stages:
- content-type: !re_match "text/xml"
- content-type: !re_search "charset=(UTF|utf)-8"
- verify_response_with:
-- function: tavern.testutils.helpers:validate_regex
-+ function: tavern.helpers:validate_regex
- extra_kwargs:
- expression: '<\?xml version="1.0" encoding="UTF-8" \?>\r?\n?<version>{SAB_VERSION}</version>'
-diff --git a/tests/requirements.txt b/tests/requirements.txt
-index ea2fe6c403..60c160fe40 100644
---- a/tests/requirements.txt
-+++ b/tests/requirements.txt
-@@ -9,7 +9,7 @@ pytest-httpbin
- pytest-httpserver
- flaky
- xmltodict
--tavern<2.0.0 # tavalidate does not support tavern 2.0.0+
-+tavern>=2.0.0
- tavalidate
- importlib_metadata
- lxml
diff --git a/net-nntp/sabnzbd/sabnzbd-3.7.1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.7.1.ebuild
deleted file mode 100644
index 01d022e53ae2..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-3.7.1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-inherit optfeature python-single-r1 systemd
-
-MY_PV="${PV/_rc/RC}"
-MY_PV="${MY_PV//_pre*}"
-
-MY_P="${PN/sab/SAB}-${MY_PV}"
-
-DESCRIPTION="Binary newsgrabber with web-interface"
-HOMEPAGE="https://sabnzbd.org/"
-SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${MY_PV}/${MY_P}-src.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-# Sabnzbd is GPL-2 but bundles software with the following licenses.
-LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
- acct-user/sabnzbd
- acct-group/sabnzbd
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/chardet[${PYTHON_USEDEP}]
- dev-python/cheetah3[${PYTHON_USEDEP}]
- dev-python/cherrypy[${PYTHON_USEDEP}]
- dev-python/configobj[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- >=dev-python/feedparser-6.0.10[${PYTHON_USEDEP}]
- >=dev-python/guessit-3.1.0[${PYTHON_USEDEP}]
- dev-python/notify2[${PYTHON_USEDEP}]
- dev-python/portend[${PYTHON_USEDEP}]
- dev-python/puremagic[${PYTHON_USEDEP}]
- ~dev-python/sabyenc-5.4.4[${PYTHON_USEDEP}]
- ')
-"
-RDEPEND="
- ${DEPEND}
- >=app-arch/par2cmdline-0.4
- net-misc/wget
-"
-BDEPEND="
- test? (
- $(python_gen_cond_dep '
- dev-python/flaky[${PYTHON_USEDEP}]
- >=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
- dev-python/pkginfo[${PYTHON_USEDEP}]
- dev-python/pyfakefs[${PYTHON_USEDEP}]
- dev-python/pytest-httpbin[${PYTHON_USEDEP}]
- dev-python/pytest-httpserver[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/selenium[${PYTHON_USEDEP}]
- dev-python/werkzeug[${PYTHON_USEDEP}]
- dev-python/xmltodict[${PYTHON_USEDEP}]
- ')
- app-arch/p7zip
- app-arch/unrar
- app-arch/unzip
- www-apps/chromedriver-bin
- )
-"
-
-src_test() {
- local EPYTEST_IGNORE=(
- # network sandbox
- tests/test_getipaddress.py
- tests/test_rss.py
- tests/test_urlgrabber.py
- tests/test_utils/test_happyeyeballs.py
- tests/test_utils/test_internetspeed.py
- # requires tavern
- tests/test_functional_api.py
- )
- local EPYTEST_DESELECT=(
- # network sandbox
- 'tests/test_cfg.py::TestValidators::test_validate_host'
- 'tests/test_consistency.py::TestWiki'
- # Just plain fails
- 'tests/test_newsunpack.py::TestPar2Repair::test_basic'
- # Chromedriver tests don't want to behave in portage
- 'tests/test_functional_config.py::TestBasicPages::test_base_pages'
- 'tests/test_functional_config.py::TestBasicPages::test_base_submit_pages'
- 'tests/test_functional_config.py::TestConfigLogin::test_login'
- 'tests/test_functional_config.py::TestConfigCategories::test_page'
- 'tests/test_functional_config.py::TestConfigRSS::test_rss_basic_flow'
- 'tests/test_functional_config.py::TestConfigServers::test_add_and_remove_server'
- 'tests/test_functional_downloads.py::TestDownloadFlow::test_download_basic_rar5'
- 'tests/test_functional_downloads.py::TestDownloadFlow::test_download_zip'
- 'tests/test_functional_downloads.py::TestDownloadFlow::test_download_7zip'
- 'tests/test_functional_downloads.py::TestDownloadFlow::test_download_passworded'
- 'tests/test_functional_downloads.py::TestDownloadFlow::test_download_fully_obfuscated'
- 'tests/test_functional_downloads.py::TestDownloadFlow::test_download_unicode_rar'
- 'tests/test_functional_misc.py::TestShowLogging::test_showlog'
- 'tests/test_functional_misc.py::TestQueueRepair::test_queue_repair'
- 'tests/test_functional_misc.py::TestDaemonizing::test_daemonizing'
- )
-
- epytest -s
-}
-
-src_install() {
- local d
- for d in email icons interfaces locale po sabnzbd scripts tools; do
- insinto /usr/share/${PN}/${d}
- doins -r ${d}/*
- done
-
- exeinto /usr/share/${PN}
- doexe SABnzbd.py
-
- python_fix_shebang "${ED}"/usr/share/${PN}
- python_optimize "${ED}"/usr/share/${PN}
-
- newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
- diropts -o ${PN} -g ${PN}
- dodir /etc/${PN}
- keepdir /var/log/${PN}
-
- insinto "/etc/${PN}"
- insopts -m 0600 -o "${PN}" -g "${PN}"
- newins "${FILESDIR}"/${PN}-r1.ini ${PN}.ini
-
- dodoc ISSUES.txt README.mkd
-
- systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
- einfo "Default directory: /var/lib/${PN}"
- einfo
- einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
- einfo
- einfo " usermod -a -G sabnzbd <user>"
- einfo
- einfo "By default, SABnzbd will listen on TCP port 8080."
- fi
-
- optfeature "7z archive support" app-arch/p7zip
- optfeature "rar archive support" app-arch/unrar app-arch/rar
- optfeature "zip archive support" app-arch/unzip
-}
diff --git a/net-nntp/sabnzbd/sabnzbd-3.7.2-r1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.7.2-r1.ebuild
deleted file mode 100644
index 53c0115cfa85..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-3.7.2-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-inherit optfeature python-single-r1 systemd
-
-MY_PV="${PV/_rc/RC}"
-MY_PV="${MY_PV//_pre*}"
-
-MY_P="${PN/sab/SAB}-${MY_PV}"
-
-DESCRIPTION="Binary newsgrabber with web-interface"
-HOMEPAGE="https://sabnzbd.org/"
-SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${MY_PV}/${MY_P}-src.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-# Sabnzbd is GPL-2 but bundles software with the following licenses.
-LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
- acct-user/sabnzbd
- acct-group/sabnzbd
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/chardet[${PYTHON_USEDEP}]
- dev-python/cheetah3[${PYTHON_USEDEP}]
- dev-python/cherrypy[${PYTHON_USEDEP}]
- dev-python/configobj[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- >=dev-python/feedparser-6.0.10[${PYTHON_USEDEP}]
- >=dev-python/guessit-3.1.0[${PYTHON_USEDEP}]
- dev-python/notify2[${PYTHON_USEDEP}]
- dev-python/portend[${PYTHON_USEDEP}]
- dev-python/puremagic[${PYTHON_USEDEP}]
- ~dev-python/sabyenc-5.4.4[${PYTHON_USEDEP}]
- ')
- test? (
- $(python_gen_cond_dep '
- dev-python/tavalidate[${PYTHON_USEDEP}]
- >=dev-python/tavern-2[${PYTHON_USEDEP}]
- ')
- )
-"
-RDEPEND="
- ${DEPEND}
- >=app-arch/par2cmdline-0.4
- net-misc/wget
-"
-BDEPEND="
- test? (
- $(python_gen_cond_dep '
- dev-python/flaky[${PYTHON_USEDEP}]
- >=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
- dev-python/pkginfo[${PYTHON_USEDEP}]
- dev-python/pyfakefs[${PYTHON_USEDEP}]
- dev-python/pytest-httpbin[${PYTHON_USEDEP}]
- dev-python/pytest-httpserver[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/selenium[${PYTHON_USEDEP}]
- dev-python/werkzeug[${PYTHON_USEDEP}]
- dev-python/xmltodict[${PYTHON_USEDEP}]
- ')
- app-arch/p7zip
- app-arch/unrar
- app-arch/unzip
- www-apps/chromedriver-bin
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-tavern-2.patch
-)
-
-src_test() {
- local EPYTEST_IGNORE=(
- # network sandbox
- tests/test_getipaddress.py
- tests/test_rss.py
- tests/test_urlgrabber.py
- tests/test_utils/test_happyeyeballs.py
- tests/test_utils/test_internetspeed.py
- )
- local EPYTEST_DESELECT=(
- # network sandbox
- 'tests/test_cfg.py::TestValidators::test_validate_host'
- 'tests/test_consistency.py::TestWiki'
- # Just plain fails
- 'tests/test_newsunpack.py::TestPar2Repair::test_basic'
- # Chromedriver tests don't want to behave in portage
- 'tests/test_functional_config.py::TestBasicPages::test_base_pages'
- 'tests/test_functional_config.py::TestBasicPages::test_base_submit_pages'
- 'tests/test_functional_config.py::TestConfigLogin::test_login'
- 'tests/test_functional_config.py::TestConfigCategories::test_page'
- 'tests/test_functional_config.py::TestConfigRSS::test_rss_basic_flow'
- 'tests/test_functional_config.py::TestConfigServers::test_add_and_remove_server'
- 'tests/test_functional_downloads.py::TestDownloadFlow::test_download_basic_rar5'
- 'tests/test_functional_downloads.py::TestDownloadFlow::test_download_zip'
- 'tests/test_functional_downloads.py::TestDownloadFlow::test_download_7zip'
- 'tests/test_functional_downloads.py::TestDownloadFlow::test_download_passworded'
- 'tests/test_functional_downloads.py::TestDownloadFlow::test_download_fully_obfuscated'
- 'tests/test_functional_downloads.py::TestDownloadFlow::test_download_unicode_rar'
- 'tests/test_functional_misc.py::TestShowLogging::test_showlog'
- 'tests/test_functional_misc.py::TestQueueRepair::test_queue_repair'
- 'tests/test_functional_misc.py::TestDaemonizing::test_daemonizing'
- )
-
- local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
- local -x PYTEST_PLUGINS=tavern._core.pytest
- epytest -s
-}
-
-src_install() {
- local d
- for d in email icons interfaces locale po sabnzbd scripts tools; do
- insinto /usr/share/${PN}/${d}
- doins -r ${d}/*
- done
-
- exeinto /usr/share/${PN}
- doexe SABnzbd.py
-
- python_fix_shebang "${ED}"/usr/share/${PN}
- python_optimize "${ED}"/usr/share/${PN}
-
- newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
- diropts -o ${PN} -g ${PN}
- dodir /etc/${PN}
- keepdir /var/log/${PN}
-
- insinto "/etc/${PN}"
- insopts -m 0600 -o "${PN}" -g "${PN}"
- newins "${FILESDIR}"/${PN}-r1.ini ${PN}.ini
-
- dodoc ISSUES.txt README.mkd
-
- systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
- einfo "Default directory: /var/lib/${PN}"
- einfo
- einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
- einfo
- einfo " usermod -a -G sabnzbd <user>"
- einfo
- einfo "By default, SABnzbd will listen on TCP port 8080."
- fi
-
- optfeature "7z archive support" app-arch/p7zip
- optfeature "rar archive support" app-arch/unrar app-arch/rar
- optfeature "zip archive support" app-arch/unzip
-}
diff --git a/net-nntp/sabnzbd/sabnzbd-4.0.1.ebuild b/net-nntp/sabnzbd/sabnzbd-4.0.1.ebuild
deleted file mode 100644
index 2165b8fa339e..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-4.0.1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-inherit optfeature python-single-r1 systemd
-
-MY_PV="${PV/_alpha/Alpha}"
-MY_PV="${MY_PV/_beta/Beta}"
-MY_PV="${MY_PV/_rc/RC}"
-
-MY_P="${PN/sab/SAB}-${MY_PV}"
-
-DESCRIPTION="Binary newsgrabber with web-interface"
-HOMEPAGE="https://sabnzbd.org/"
-SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${MY_PV}/${MY_P}-src.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-# Sabnzbd is GPL-2 but bundles software with the following licenses.
-LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
- acct-user/sabnzbd
- acct-group/sabnzbd
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/chardet[${PYTHON_USEDEP}]
- dev-python/cheetah3[${PYTHON_USEDEP}]
- dev-python/cherrypy[${PYTHON_USEDEP}]
- dev-python/configobj[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- >=dev-python/feedparser-6.0.10[${PYTHON_USEDEP}]
- >=dev-python/guessit-3.7.1[${PYTHON_USEDEP}]
- dev-python/notify2[${PYTHON_USEDEP}]
- dev-python/portend[${PYTHON_USEDEP}]
- dev-python/puremagic[${PYTHON_USEDEP}]
- ~dev-python/sabyenc-7.0.2[${PYTHON_USEDEP}]
- ')
- test? ( $(python_gen_cond_dep '
- dev-python/tavalidate[${PYTHON_USEDEP}]
- >=dev-python/tavern-2[${PYTHON_USEDEP}]
- ')
- )
-"
-RDEPEND="
- ${DEPEND}
- >=app-arch/par2cmdline-0.8
- net-misc/wget
-"
-BDEPEND="
- test? (
- $(python_gen_cond_dep '
- dev-python/flaky[${PYTHON_USEDEP}]
- >=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
- dev-python/pkginfo[${PYTHON_USEDEP}]
- dev-python/pyfakefs[${PYTHON_USEDEP}]
- dev-python/pytest-httpbin[${PYTHON_USEDEP}]
- dev-python/pytest-httpserver[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/selenium[${PYTHON_USEDEP}]
- dev-python/werkzeug[${PYTHON_USEDEP}]
- dev-python/xmltodict[${PYTHON_USEDEP}]
- ')
- app-arch/p7zip
- app-arch/unrar
- app-arch/unzip
- www-apps/chromedriver-bin
- )
-"
-
-src_test() {
- local EPYTEST_IGNORE=(
- # network sandbox
- tests/test_getipaddress.py
- tests/test_rss.py
- tests/test_urlgrabber.py
- tests/test_utils/test_happyeyeballs.py
- tests/test_utils/test_internetspeed.py
- )
- local EPYTEST_DESELECT=(
- # network sandbox
- 'tests/test_cfg.py::TestValidators::test_validate_host'
- 'tests/test_consistency.py::TestWiki'
- 'tests/test_newswrapper.py::TestNewsWrapper'
- # Doesn't work, complains mocker missing even when pytest-mock installed
- 'tests/test_dirscanner.py::TestDirScanner'
- # Just plain fails
- 'tests/test_newsunpack.py::TestPar2Repair::test_basic'
- # Chromedriver tests don't want to behave in portage
- 'tests/test_functional_config.py::TestBasicPages::test_base_pages'
- 'tests/test_functional_config.py::TestBasicPages::test_base_submit_pages'
- 'tests/test_functional_config.py::TestConfigLogin::test_login'
- 'tests/test_functional_config.py::TestConfigCategories::test_page'
- 'tests/test_functional_config.py::TestConfigRSS::test_rss_basic_flow'
- 'tests/test_functional_config.py::TestConfigServers::test_add_and_remove_server'
- 'tests/test_functional_downloads.py::TestDownloadFlow::test_download_basic_rar5'
- 'tests/test_functional_downloads.py::TestDownloadFlow::test_download_zip'
- 'tests/test_functional_downloads.py::TestDownloadFlow::test_download_7zip'
- 'tests/test_functional_downloads.py::TestDownloadFlow::test_download_passworded'
- 'tests/test_functional_downloads.py::TestDownloadFlow::test_download_fully_obfuscated'
- 'tests/test_functional_downloads.py::TestDownloadFlow::test_download_unicode_rar'
- 'tests/test_functional_misc.py::TestShowLogging::test_showlog'
- 'tests/test_functional_misc.py::TestQueueRepair::test_queue_repair'
- 'tests/test_functional_misc.py::TestDaemonizing::test_daemonizing'
- 'tests/test_functional_sorting.py::TestDownloadSorting'
- )
-
- local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
- local -x PYTEST_PLUGINS=tavern._core.pytest
- epytest -s
-}
-
-src_install() {
- local d
- for d in email icons interfaces locale po sabnzbd scripts tools; do
- insinto /usr/share/${PN}/${d}
- doins -r ${d}/*
- done
-
- exeinto /usr/share/${PN}
- doexe SABnzbd.py
-
- python_fix_shebang "${ED}"/usr/share/${PN}
- python_optimize "${ED}"/usr/share/${PN}
-
- newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
- diropts -o ${PN} -g ${PN}
- dodir /etc/${PN}
- keepdir /var/log/${PN}
-
- insinto "/etc/${PN}"
- insopts -m 0600 -o "${PN}" -g "${PN}"
- newins "${FILESDIR}"/${PN}-r1.ini ${PN}.ini
-
- dodoc ISSUES.txt README.mkd
-
- systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
- einfo "Default directory: /var/lib/${PN}"
- einfo
- einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
- einfo
- einfo " usermod -a -G sabnzbd <user>"
- einfo
- einfo "By default, SABnzbd will listen on TCP port 8080."
- fi
-
- optfeature "7z archive support" app-arch/p7zip
- optfeature "rar archive support" app-arch/unrar app-arch/rar
- optfeature "zip archive support" app-arch/unzip
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-07-24 15:06 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-19 16:34 [gentoo-commits] repo/gentoo:master commit in: net-nntp/sabnzbd/, net-nntp/sabnzbd/files/ Justin Bronder
-- strict thread matches above, loose matches on Subject: below --
2017-04-26 13:13 Justin Bronder
2020-06-28 12:59 Thomas Deutschmann
2023-02-20 18:05 Michał Górny
2023-07-24 15:05 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox