From 3ef07c37e46f0ed7edbbdcf25b49e2f52e4b1e29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Wed, 26 Apr 2017 13:03:30 +0200 Subject: net-nntp/sabnzbd: Disable wget logging in init script --- net-nntp/sabnzbd/files/sabnzbd.initd | 2 +- net-nntp/sabnzbd/sabnzbd-1.2.3-r1.ebuild | 130 +++++++++++++++++++++++++++++++ net-nntp/sabnzbd/sabnzbd-1.2.3.ebuild | 130 ------------------------------- 3 files changed, 131 insertions(+), 131 deletions(-) create mode 100644 net-nntp/sabnzbd/sabnzbd-1.2.3-r1.ebuild delete mode 100644 net-nntp/sabnzbd/sabnzbd-1.2.3.ebuild (limited to 'net-nntp') diff --git a/net-nntp/sabnzbd/files/sabnzbd.initd b/net-nntp/sabnzbd/files/sabnzbd.initd index 5a693586bbe5..b3dca9797562 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-r1.ebuild b/net-nntp/sabnzbd/sabnzbd-1.2.3-r1.ebuild new file mode 100644 index 000000000000..d51ad295cec2 --- /dev/null +++ b/net-nntp/sabnzbd/sabnzbd-1.2.3-r1.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +# Require python-2 with sqlite USE flag +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite" + +inherit python-single-r1 user systemd versionator + +MY_P="${P/sab/SAB}" + +DESCRIPTION="Binary newsgrabber with web-interface" +HOMEPAGE="https://sabnzbd.org/" +SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${PV}/${MY_P}-src.tar.gz" + +# 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="+rar unzip +yenc" + +# Sabnzbd is installed to /usr/share/ as upstream makes it clear they should not +# be in python's sitedir. See: http://wiki.sabnzbd.org/unix-packaging + +# TODO: still bundled but not in portage: +# kronos, rsslib, ssmtplib, listquote, json-py, msgfmt, happyeyeballs +# pynewsleecher +# +# Also note that cherrypy is still bundled. It's near impossible to find +# out where the bundled and heavily patched version came from (pulled from +# cherrypy subversion, patched somewhere, then imported to sabnzbd and patched +# further. Upstream is planning on making this easier with 0.8.0. +# https://github.com/sabnzbd/sabnzbd/issues/47 + +RDEPEND=" + ${PYTHON_DEPS} + >=app-arch/par2cmdline-0.4 + >=dev-python/cheetah-2.0.1 + dev-python/configobj + dev-python/feedparser + dev-python/gntp + dev-python/pythonutils + dev-python/rarfile + net-misc/wget + rar? ( || ( app-arch/unrar app-arch/rar ) ) + unzip? ( >=app-arch/unzip-5.5.2 ) + yenc? ( dev-python/yenc ) +" +DEPEND="${PYTHON_DEPS}" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + 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 "${HOMEDIR}" "${PN}" +} + +src_prepare() { + eapply "${FILESDIR}"/patches + + # remove bundled modules + rm -r sabnzbd/utils/{feedparser,configobj,rarfile}.py || die + rm -r gntp || die + rm licenses/License-{feedparser,configobj,gntp,rarfile}.txt || die + + eapply_user +} + +src_install() { + local d + + for d in cherrypy email icons interfaces locale po sabnzbd tools util; 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}.initd" "${PN}" + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + + diropts -o "${PN}" -g "${PN}" + dodir "/etc/${PN}" + dodir "/var/log/${PN}" + + insinto "/etc/${PN}" + insopts -m 0600 -o "${PN}" -g "${PN}" + doins "${FILESDIR}/${PN}.ini" + + dodoc {ABOUT,ISSUES,README}.txt licenses/* + + systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service' +} + +pkg_postinst() { + einfo "Default directory: ${HOMEDIR}" + einfo + einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:" + einfo + einfo " gpasswd -a sabnzbd" + einfo + einfo "By default, SABnzbd+ will listen on TCP port 8080." + einfo + einfo "As Growl is not the default notification system on Gentoo, we disable it." + + local replacing + for replacing in ${REPLACING_VERSIONS}; do + if [ "$(get_major_version ${replacing})" == "0" ]; then + ewarn + ewarn "Upgrading from ${PN}-0.x.y to ${PN}-1.x.y introduces incompatible changes, see:" + ewarn + ewarn " https://sabnzbd.org/wiki/introducing-1-0-0" + ewarn + ewarn "In particular, you need to let your queue complete before restarting SABnzbd+." + break + fi + done +} diff --git a/net-nntp/sabnzbd/sabnzbd-1.2.3.ebuild b/net-nntp/sabnzbd/sabnzbd-1.2.3.ebuild deleted file mode 100644 index d51ad295cec2..000000000000 --- a/net-nntp/sabnzbd/sabnzbd-1.2.3.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -# Require python-2 with sqlite USE flag -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" - -inherit python-single-r1 user systemd versionator - -MY_P="${P/sab/SAB}" - -DESCRIPTION="Binary newsgrabber with web-interface" -HOMEPAGE="https://sabnzbd.org/" -SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${PV}/${MY_P}-src.tar.gz" - -# 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="+rar unzip +yenc" - -# Sabnzbd is installed to /usr/share/ as upstream makes it clear they should not -# be in python's sitedir. See: http://wiki.sabnzbd.org/unix-packaging - -# TODO: still bundled but not in portage: -# kronos, rsslib, ssmtplib, listquote, json-py, msgfmt, happyeyeballs -# pynewsleecher -# -# Also note that cherrypy is still bundled. It's near impossible to find -# out where the bundled and heavily patched version came from (pulled from -# cherrypy subversion, patched somewhere, then imported to sabnzbd and patched -# further. Upstream is planning on making this easier with 0.8.0. -# https://github.com/sabnzbd/sabnzbd/issues/47 - -RDEPEND=" - ${PYTHON_DEPS} - >=app-arch/par2cmdline-0.4 - >=dev-python/cheetah-2.0.1 - dev-python/configobj - dev-python/feedparser - dev-python/gntp - dev-python/pythonutils - dev-python/rarfile - net-misc/wget - rar? ( || ( app-arch/unrar app-arch/rar ) ) - unzip? ( >=app-arch/unzip-5.5.2 ) - yenc? ( dev-python/yenc ) -" -DEPEND="${PYTHON_DEPS}" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - 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 "${HOMEDIR}" "${PN}" -} - -src_prepare() { - eapply "${FILESDIR}"/patches - - # remove bundled modules - rm -r sabnzbd/utils/{feedparser,configobj,rarfile}.py || die - rm -r gntp || die - rm licenses/License-{feedparser,configobj,gntp,rarfile}.txt || die - - eapply_user -} - -src_install() { - local d - - for d in cherrypy email icons interfaces locale po sabnzbd tools util; 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}.initd" "${PN}" - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - - diropts -o "${PN}" -g "${PN}" - dodir "/etc/${PN}" - dodir "/var/log/${PN}" - - insinto "/etc/${PN}" - insopts -m 0600 -o "${PN}" -g "${PN}" - doins "${FILESDIR}/${PN}.ini" - - dodoc {ABOUT,ISSUES,README}.txt licenses/* - - systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service' -} - -pkg_postinst() { - einfo "Default directory: ${HOMEDIR}" - einfo - einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:" - einfo - einfo " gpasswd -a sabnzbd" - einfo - einfo "By default, SABnzbd+ will listen on TCP port 8080." - einfo - einfo "As Growl is not the default notification system on Gentoo, we disable it." - - local replacing - for replacing in ${REPLACING_VERSIONS}; do - if [ "$(get_major_version ${replacing})" == "0" ]; then - ewarn - ewarn "Upgrading from ${PN}-0.x.y to ${PN}-1.x.y introduces incompatible changes, see:" - ewarn - ewarn " https://sabnzbd.org/wiki/introducing-1-0-0" - ewarn - ewarn "In particular, you need to let your queue complete before restarting SABnzbd+." - break - fi - done -} -- cgit v1.2.3