From f1bc537f089cc8477a9a18db597cb349e1b00e91 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 16 Jun 2018 05:02:38 +0100
Subject: gentoo resync : 16.06.2018

---
 net-nntp/Manifest.gz                       | Bin 2689 -> 2691 bytes
 net-nntp/nzbget/Manifest                   |   4 +-
 net-nntp/nzbget/nzbget-20.0.ebuild         | 128 +++++++++++++++++++++++++
 net-nntp/nzbget/nzbget-20.0_pre2171.ebuild | 126 -------------------------
 net-nntp/sabnzbd/Manifest                  |   4 +-
 net-nntp/sabnzbd/sabnzbd-2.3.3.ebuild      | 146 -----------------------------
 net-nntp/sabnzbd/sabnzbd-2.3.4.ebuild      | 146 +++++++++++++++++++++++++++++
 7 files changed, 278 insertions(+), 276 deletions(-)
 create mode 100644 net-nntp/nzbget/nzbget-20.0.ebuild
 delete mode 100644 net-nntp/nzbget/nzbget-20.0_pre2171.ebuild
 delete mode 100644 net-nntp/sabnzbd/sabnzbd-2.3.3.ebuild
 create mode 100644 net-nntp/sabnzbd/sabnzbd-2.3.4.ebuild

(limited to 'net-nntp')

diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 9860dcb69645..f328b47bfa67 100644
Binary files a/net-nntp/Manifest.gz and b/net-nntp/Manifest.gz differ
diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index 2ea5f1919165..3e268ac0b188 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -4,10 +4,10 @@ AUX nzbget.initd 764 BLAKE2B dfa76fd2040bd226ae0b27839941f377bff91330d41fe27b7e4
 AUX nzbget.initd-r1 742 BLAKE2B eef074b7e25cd085b92850892ee8917772451b0f58a7f7c3b96c55bcdb115cc99d12e0569f59cc546f9655460230e5f29a82c4d749a654e2019e7c06651c165a SHA512 df4965d25a221c033586da85596584a712bc5c5d9c2e0950850f96fa872f29a04571649e7add504d9fe8be3639654e5653a766a6accf4dea344ca771088b432a
 DIST nzbget-14.1.tar.gz 1332334 BLAKE2B cbb633993ffd4c7a9cf6556ef833838296bb4d6471e1ef30959244c1373d879176d638874e9892d1ede237ce26e3fe8d0f91f86e3e983f566f2f06a6f8bb9b8c SHA512 fae938529bb3968c0161f63ec3af07f844a8128b61abf6298457a4878ac0d47541d76730c8a068509fa091b102de07c9d28dcd668a8192fcfac60980f69be56d
 DIST nzbget-19.1.tar.gz 1809849 BLAKE2B 30740c22e06f9b794485bb5c0c28cd95f9953863203a9055bf453a9adfe1e58adcf69dcddc3640c13aefb90bb26cd444070af2d9f0f6fadee676af453cdb23c2 SHA512 3ba7cd7f7fec28e29129be0a1ca5879a0593bc54be49e3776e84eeb7804377eec47106aa2371b31dec7d9152301d68b199ce9e66db714195defc8e15ef636532
-DIST nzbget-20.0_pre2171.tar.gz 1942642 BLAKE2B 7df73755fa6a6571bdce22830f3e18c9b7b41b1c4c75f139e390719e92b6afef065e18fab8222d5a08d88c6240e8a96448d7df1db025d97b7c2a4f17f1098f60 SHA512 3a2506148607e59dc73eafeeab6847868761c4a6c26504fe9a0b3043716f8fb542bb6b5f06696ec49d9d7a04df0b73005e12d71588a54b82d8dca19c04944dd5
+DIST nzbget-20.0.tar.gz 1925665 BLAKE2B 4c4e93bb0fa170b4b6433cbb7d27f3fa67ed033c462711b19e179f42c18dfed044c937e6a7ce4b08a620f4d7af7d3ec9245de16f15d4db8005d3d8dc4f8f46d4 SHA512 8b0fe8ea41b64be9a2f624ef0fa2a8b8987bee412db68a0e8f1b607ce6be7bfd03f60ecc5e49807f4c726e136bc5a355c44559b215fea2bd290c2eb62a0b5927
 DIST nzbget-20.0_pre2176.tar.gz 1923841 BLAKE2B ba6ba301013b160f4dcaf21257dc2c1ceac3c64c645bde556ed45e8dca5011b8d9b9ce76fbaf42b78f6400b530c4c0baa94ad34fe09daa86619506dd76333ca2 SHA512 7be68999cc284a53100c0892f7558e3e1d2ac7d83019c933ae0596de56a8c9bec78571aaf34983103a30563dcdd6387987f7a13404e0ffac48007e0d44efa525
 EBUILD nzbget-14.1.ebuild 2575 BLAKE2B 2ca47cd82c33c026b36065f40ac656f4483fc234ef7821f20b9612a97f0a6f23c700891494b3659b13e231997f5fa46e18a1e1f0fd729923434d52e695d10db0 SHA512 a263b13e0884c4848a762d4bb739da5e8eae5b7dfac96feb5812fc4f81928d4e600d3cdb9dbf35c407dc81ed1dfa0ce1341bb595f488c4ece75c5feb967660d4
 EBUILD nzbget-19.1.ebuild 2992 BLAKE2B 5359ddbae9897ebc1c657f0a760af6583f15e63ab3599834783975253bafd854255f6ecffbf6d59171ff35b144b5f704df3ae4ee0f4ae2cc87b66292d7755d61 SHA512 a8ad9f64f7520f2e2174124676cd6764ebfa063408e2c45861dbcf49919b5b1b028df4d9db2601a0399cf315637a0b297cac24f54befb878c7a78691e4f658a1
-EBUILD nzbget-20.0_pre2171.ebuild 3018 BLAKE2B 001272514d21c6e152e2ca363ca5dccc9c8af5c61df266399fedf44a1d91dff48b20466e2c0ca4a16ece3f5f2a7433e33cf945849278913f96f49b266a0cbc93 SHA512 538917bfdf9a27af39496e4046c98d1523ebc93e7b3b8e704c0db9408183e5f8768598b9530c2a35fa2d729c5b5684aab407c3579e8d6da2e73d038741b64d8f
+EBUILD nzbget-20.0.ebuild 3038 BLAKE2B ec711a4ba5770e810932c8f5a25110d01f4401d2e7a9ccf70a369728d135092ddab24bbf468b1b577aaddd8e8eae3a3a89f48b13ea7507505ab90c265115db81 SHA512 7d5df5d0cc8b92f166889b2c3d0b4f19a9dd19934d9d55b75d1c6334a5b94811e2967e589a2261074d4c87d2215b03be7596ce25a8e1f348b6f1ec930b68d011
 EBUILD nzbget-20.0_pre2176.ebuild 3018 BLAKE2B 001272514d21c6e152e2ca363ca5dccc9c8af5c61df266399fedf44a1d91dff48b20466e2c0ca4a16ece3f5f2a7433e33cf945849278913f96f49b266a0cbc93 SHA512 538917bfdf9a27af39496e4046c98d1523ebc93e7b3b8e704c0db9408183e5f8768598b9530c2a35fa2d729c5b5684aab407c3579e8d6da2e73d038741b64d8f
 MISC metadata.xml 853 BLAKE2B 9f9def21115f81a99bf61c68fb198efec9f480bf370b0e3b8f36d31129b935a895f16790480c7b6ee4d8615bdb41f21d46988bcac4c546080d471c9c8c26535d SHA512 c35eaebbf56d6809e91f62440fb3b4f09911d10a2798741647b063074c77aed9079a6a6d2355d229571d82eb5be9f65f21ce449547e7ea05183d583e9bcf1ae2
diff --git a/net-nntp/nzbget/nzbget-20.0.ebuild b/net-nntp/nzbget/nzbget-20.0.ebuild
new file mode 100644
index 000000000000..d52bc80e3681
--- /dev/null
+++ b/net-nntp/nzbget/nzbget-20.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils flag-o-matic user
+
+MY_PV=${PV/_pre/-r}
+MY_P=${PN}-${PV/_pre/-testing-r}
+
+DESCRIPTION="A command-line based binary newsgrabber supporting .nzb files"
+HOMEPAGE="https://nzbget.net/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="debug gnutls ncurses +parcheck ssl test zlib"
+
+RDEPEND="dev-libs/libxml2:=
+	ncurses? ( sys-libs/ncurses:0= )
+	ssl? (
+		gnutls? (
+			net-libs/gnutls:=
+			dev-libs/nettle:=
+		)
+		!gnutls? ( dev-libs/openssl:0=[-bindist] )
+	)
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	test? (
+		|| (
+			=app-arch/rar-5*
+			=app-arch/unrar-5*
+		)
+	)
+	virtual/pkgconfig"
+DOCS=( ChangeLog README nzbget.conf )
+
+S=${WORKDIR}/${PN}-${PV/_pre*/-testing}
+
+check_compiler() {
+	if [[ ${MERGE_TYPE} != binary ]] && ! test-flag-CXX -std=c++14; then
+		eerror "${P} requires a C++14-capable compiler. Your current compiler"
+		eerror "does not seem to support the -std=c++14 option. Please"
+		eerror "upgrade to gcc-4.9 or an equivalent version supporting C++14."
+		die "The currently active compiler does not support -std=c++14"
+	fi
+}
+
+pkg_pretend() {
+	check_compiler
+}
+
+pkg_setup() {
+	check_compiler
+}
+
+src_prepare() {
+	default
+	eautoreconf
+
+	sed -i 's:^ScriptDir=.*:ScriptDir=/usr/share/nzbget/ppscripts:' nzbget.conf || die
+
+	sed \
+		-e 's:^MainDir=.*:MainDir=/var/lib/nzbget:' \
+		-e 's:^LogFile=.*:LogFile=/var/log/nzbget/nzbget.log:' \
+		-e 's:^WebDir=.*:WebDir=/usr/share/nzbget/webui:' \
+		-e 's:^ConfigTemplate=.*:ConfigTemplate=/usr/share/nzbget/nzbget.conf:' \
+		-e 's:^DaemonUsername=.*:DaemonUsername=nzbget:' \
+		nzbget.conf > nzbgetd.conf || die
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug)
+		$(use_enable ncurses curses)
+		$(use_enable parcheck)
+		$(use_enable ssl tls)
+		$(use_enable zlib gzip)
+		$(use_enable test tests)
+		--with-tlslib=$(usex gnutls GnuTLS OpenSSL)
+	)
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	./nzbget --tests || die "Tests failed"
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	doins nzbget.conf
+	doins nzbgetd.conf
+
+	keepdir /var/lib/nzbget/{dst,nzb,queue,tmp}
+	keepdir /var/log/nzbget
+
+	newinitd "${FILESDIR}"/nzbget.initd-r1 nzbget
+	newconfd "${FILESDIR}"/nzbget.confd nzbget
+}
+
+pkg_preinst() {
+	enewgroup nzbget
+	enewuser nzbget -1 -1 /var/lib/nzbget nzbget
+
+	fowners nzbget:nzbget /var/lib/nzbget/{dst,nzb,queue,tmp}
+	fperms 750 /var/lib/nzbget/{queue,tmp}
+	fperms 770 /var/lib/nzbget/{dst,nzb}
+
+	fowners nzbget:nzbget /var/log/nzbget
+	fperms 750 /var/log/nzbget
+
+	fowners nzbget:nzbget /etc/nzbgetd.conf
+	fperms 640 /etc/nzbgetd.conf
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog
+		elog "Please add users that you want to be able to use the system-wide"
+		elog "nzbget daemon to the nzbget group. To access the daemon run nzbget"
+		elog "with the --configfile /etc/nzbgetd.conf option."
+		elog
+	fi
+}
diff --git a/net-nntp/nzbget/nzbget-20.0_pre2171.ebuild b/net-nntp/nzbget/nzbget-20.0_pre2171.ebuild
deleted file mode 100644
index 604c8daa06db..000000000000
--- a/net-nntp/nzbget/nzbget-20.0_pre2171.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic user
-
-MY_PV=${PV/_pre/-r}
-MY_P=${PN}-${PV/_pre/-testing-r}
-
-DESCRIPTION="A command-line based binary newsgrabber supporting .nzb files"
-HOMEPAGE="https://nzbget.net/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}-src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="debug gnutls ncurses +parcheck ssl test zlib"
-
-RDEPEND="dev-libs/libxml2:=
-	ncurses? ( sys-libs/ncurses:0= )
-	ssl? (
-		gnutls? (
-			net-libs/gnutls:=
-			dev-libs/nettle:=
-		)
-		!gnutls? ( dev-libs/openssl:0=[-bindist] )
-	)
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			=app-arch/rar-5*
-			=app-arch/unrar-5*
-		)
-	)
-	virtual/pkgconfig"
-DOCS=( ChangeLog README nzbget.conf )
-
-S=${WORKDIR}/${PN}-${PV/_pre*/-testing}
-
-check_compiler() {
-	if [[ ${MERGE_TYPE} != binary ]] && ! test-flag-CXX -std=c++14; then
-		eerror "${P} requires a C++14-capable compiler. Your current compiler"
-		eerror "does not seem to support the -std=c++14 option. Please"
-		eerror "upgrade to gcc-4.9 or an equivalent version supporting C++14."
-		die "The currently active compiler does not support -std=c++14"
-	fi
-}
-
-pkg_pretend() {
-	check_compiler
-}
-
-pkg_setup() {
-	check_compiler
-}
-
-src_prepare() {
-	default
-	eautoreconf
-
-	sed -i 's:^ScriptDir=.*:ScriptDir=/usr/share/nzbget/ppscripts:' nzbget.conf || die
-
-	sed \
-		-e 's:^MainDir=.*:MainDir=/var/lib/nzbget:' \
-		-e 's:^LogFile=.*:LogFile=/var/log/nzbget/nzbget.log:' \
-		-e 's:^WebDir=.*:WebDir=/usr/share/nzbget/webui:' \
-		-e 's:^ConfigTemplate=.*:ConfigTemplate=/usr/share/nzbget/nzbget.conf:' \
-		-e 's:^DaemonUsername=.*:DaemonUsername=nzbget:' \
-		nzbget.conf > nzbgetd.conf || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable ncurses curses) \
-		$(use_enable parcheck) \
-		$(use_enable ssl tls) \
-		$(use_enable zlib gzip) \
-		$(use_enable test tests) \
-		--with-tlslib=$(usex gnutls GnuTLS OpenSSL)
-}
-
-src_test() {
-	./nzbget --tests || die "Tests failed"
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins nzbget.conf
-	doins nzbgetd.conf
-
-	keepdir /var/lib/nzbget/{dst,nzb,queue,tmp}
-	keepdir /var/log/nzbget
-
-	newinitd "${FILESDIR}"/nzbget.initd-r1 nzbget
-	newconfd "${FILESDIR}"/nzbget.confd nzbget
-}
-
-pkg_preinst() {
-	enewgroup nzbget
-	enewuser nzbget -1 -1 /var/lib/nzbget nzbget
-
-	fowners nzbget:nzbget /var/lib/nzbget/{dst,nzb,queue,tmp}
-	fperms 750 /var/lib/nzbget/{queue,tmp}
-	fperms 770 /var/lib/nzbget/{dst,nzb}
-
-	fowners nzbget:nzbget /var/log/nzbget
-	fperms 750 /var/log/nzbget
-
-	fowners nzbget:nzbget /etc/nzbgetd.conf
-	fperms 640 /etc/nzbgetd.conf
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "Please add users that you want to be able to use the system-wide"
-		elog "nzbget daemon to the nzbget group. To access the daemon run nzbget"
-		elog "with the --configfile /etc/nzbgetd.conf option."
-		elog
-	fi
-}
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index 962131fcefe7..de0397442428 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -5,6 +5,6 @@ AUX sabnzbd.confd 156 BLAKE2B 8cd006eedf4f6614fa00ad9bfee6411dbfb99e1e487c19c4b3
 AUX sabnzbd.ini 347 BLAKE2B b3e247bb75d3d3cead9db3bb1f4d7301542619bfadd66619e3c3d0bc815f4841e95dd11b0b14ec6e02d14e4510aed06abd0c9b66e8b0e2a02fde30a6b5678659 SHA512 14df57a0594a671a275e6e5b4f6a704ce2be01507c518f46162d096870da7b04fb636c4e8aedfdb07d3290934941707eda94180e290bdf7eef561b5641497df4
 AUX sabnzbd.initd 1395 BLAKE2B d8663fefa21e3d371c32ecebd1a3958704d39738ce4496c8f977cc411d6c5235aad6c0147f626089a9964c472b15ed4bd2ede0fb35b08260a705190b877ea65a SHA512 0510dc7386ae57493bf614d9b74614f0c2b160981c0f7e5f784a9a336167de7918112ff1a173e3535edd654567ca806b156ee6db819e139dcfea3990bc8252d8
 AUX sabnzbd_at.service 185 BLAKE2B bedc84a8dec50c230bd2d4041d3e56dd33fdd7814488e3a6b53fbb8e0c7df2100ac13ee746e4b6cd45b384acfe6a9478df3a3d1f75bfc70dc41f51ac8f018916 SHA512 e5e6882c8520d26c21583fd2b9895248a777fa7519dc3588726dcccf689f81d604f2ef883681e54f6b212a51a8d8e690570ab60742d8b0232af73e98d61d6d34
-DIST SABnzbd-2.3.3-src.tar.gz 2750031 BLAKE2B 1551ed04b65cbc3c59488801ecb4dc9181d57cfeb67de9574daeeaa2fa0dd63921d5f15319634570147bf71457b00487f6974d4f3582dca680fb8135be4dc3c2 SHA512 c5509ab35b4dbbd127fad583aa3aed89f6eba5582bed61b735fa2fada6f8b5e528baca1a55fd9c52c66a473512af3a81153ab7d9defd90a9b4084f115bb5d9ee
-EBUILD sabnzbd-2.3.3.ebuild 4185 BLAKE2B 91d735f2b9a747bebc4ed87bdcfbd9a51c3eb124f98fe1029ba83e58169632bef6fe928bb334264fa813d674b4c1cfc0473a85bf3f36e4addc965815998bf0fb SHA512 500f7b9bf57b93346d36489efa24c9907a6acd6c5299279063bb7e73187317d80ae651a23bd104d0b6e2decab5e1d7cdc8b9514a032b8795091f149377fcda62
+DIST SABnzbd-2.3.4-src.tar.gz 2749503 BLAKE2B a105922f2b597e6f9ffc10993dd70260d9caa60b3b90571b2162ffab03ad859a6c89c4be92b7847da63b2a88be59c3f379c541f56248beabd1015c2c1bf91cab SHA512 43a787671b5e8979abf045be7877939ed0594dfcc0dcff1fd432c3f2403cfc5254b953fa6507d253ad8a270ede7ce871f18a3ac7a0f5a6e2e27339bdbadbcc71
+EBUILD sabnzbd-2.3.4.ebuild 4185 BLAKE2B 91d735f2b9a747bebc4ed87bdcfbd9a51c3eb124f98fe1029ba83e58169632bef6fe928bb334264fa813d674b4c1cfc0473a85bf3f36e4addc965815998bf0fb SHA512 500f7b9bf57b93346d36489efa24c9907a6acd6c5299279063bb7e73187317d80ae651a23bd104d0b6e2decab5e1d7cdc8b9514a032b8795091f149377fcda62
 MISC metadata.xml 506 BLAKE2B ae36d43db0df97454127c4e195c5039b745ea2cbc5883bd9747f049ea63340e16090c671bbe7229895630b078a0d025729353dd457b3581f4a72672bf085ee2e SHA512 13c60fc2a77328dd1d8ae3d2036a84b72dc98a88093aad9a326fd904b41c795dcce84aec5dc528bc81daabba0341f10a7dda2d01788f70310bbaf801da831f53
diff --git a/net-nntp/sabnzbd/sabnzbd-2.3.3.ebuild b/net-nntp/sabnzbd/sabnzbd-2.3.3.ebuild
deleted file mode 100644
index 884817f2d682..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-2.3.3.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2018 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="+7za +rar unzip"
-
-# 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
-#
-# dev-python/rarfile is bundled as of 2.0.1 because sabnzbd is modifying it
-# https://github.com/sabnzbd/sabnzbd/commit/de6d642b0dc6eaed63199a99d9a1a8b2e3d0018b
-#
-# 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[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/gntp[${PYTHON_USEDEP}]
-	dev-python/pythonutils[${PYTHON_USEDEP}]
-	>=dev-python/sabyenc-3.3.1[${PYTHON_USEDEP}]
-	net-misc/wget
-	7za? ( app-arch/p7zip )
-	rar? ( || ( app-arch/unrar app-arch/rar ) )
-	unzip? ( >=app-arch/unzip-5.5.2 )
-"
-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}.py || die
-	rm -r gntp || die
-	rm licenses/License-{feedparser,configobj,gntp}.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 <user> 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
-	local major
-	local minor
-	for replacing in ${REPLACING_VERSIONS}; do
-		major=$(get_major_version ${replacing})
-		minor=$(get_version_component_range 2 ${replacing})
-
-		if [ "${major}" == "1" ]; then
-			ewarn
-			ewarn "Upgrading to ${PN}-2.x.y converts schedule items to a format"
-			ewarn "that is not compatible with earlier ${PN}-1.x.y releases."
-			ewarn
-			break
-		elif [ "${major}" == "2" ] && [ ${minor} -lt 2 ]; 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
-}
diff --git a/net-nntp/sabnzbd/sabnzbd-2.3.4.ebuild b/net-nntp/sabnzbd/sabnzbd-2.3.4.ebuild
new file mode 100644
index 000000000000..884817f2d682
--- /dev/null
+++ b/net-nntp/sabnzbd/sabnzbd-2.3.4.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2018 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="+7za +rar unzip"
+
+# 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
+#
+# dev-python/rarfile is bundled as of 2.0.1 because sabnzbd is modifying it
+# https://github.com/sabnzbd/sabnzbd/commit/de6d642b0dc6eaed63199a99d9a1a8b2e3d0018b
+#
+# 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[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/gntp[${PYTHON_USEDEP}]
+	dev-python/pythonutils[${PYTHON_USEDEP}]
+	>=dev-python/sabyenc-3.3.1[${PYTHON_USEDEP}]
+	net-misc/wget
+	7za? ( app-arch/p7zip )
+	rar? ( || ( app-arch/unrar app-arch/rar ) )
+	unzip? ( >=app-arch/unzip-5.5.2 )
+"
+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}.py || die
+	rm -r gntp || die
+	rm licenses/License-{feedparser,configobj,gntp}.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 <user> 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
+	local major
+	local minor
+	for replacing in ${REPLACING_VERSIONS}; do
+		major=$(get_major_version ${replacing})
+		minor=$(get_version_component_range 2 ${replacing})
+
+		if [ "${major}" == "1" ]; then
+			ewarn
+			ewarn "Upgrading to ${PN}-2.x.y converts schedule items to a format"
+			ewarn "that is not compatible with earlier ${PN}-1.x.y releases."
+			ewarn
+			break
+		elif [ "${major}" == "2" ] && [ ${minor} -lt 2 ]; 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
+}
-- 
cgit v1.2.3