gentoo resync : 28.04.2021

14 files changed, 160 insertions, 38 deletions

diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 3804f970cca8..d0f8c32566bc 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/newspost/Manifest b/net-nntp/newspost/Manifest
index 52933650a9d1..48b1563cbb45 100644
--- a/net-nntp/newspost/Manifest
+++ b/net-nntp/newspost/Manifest
@@ -1,6 +1,6 @@
-AUX CAN-2005-0101.patch 284 BLAKE2B 6b1173bc170fe23d4ad312a11abddb8673c0a3a6fc2b85b928f5e313820dd3926ad26316809d970de9122bcab664ac4fd75deb20a73e950a3d4e9707e7c9c956 SHA512 fca2c27d94310c786ffa6b3b376c5dc04752f9c41688ac335bbbf440e972dcc06f8495090fd52bdb4f33c34009fc0536bf411809f93310f474f703d28c199dc5
-AUX newspost-2.1.1-glibc-2.10.patch 2038 BLAKE2B c65a47609867bfc08369e31966c874028b5b74b96c626214014fbac9b024801b34b2db53ddb032f018440316ac1f8e4967e843e5a87549bcad2d31dfe0688535 SHA512 6e1c9a30d282dd2e3e133571bb747d5c7b133dab54f9f464e32e23655d8534e4e1cfb388291116c8c28ef3ad7515cde5c9d7ce053407928df38bdcf014f14a2f
-AUX newspost-2.1.1-nntp.patch 1845 BLAKE2B dd9c900da59f5c6e5eebfebfa9b5dbfdc092cd21282b99f447f9e15a92a5aaa4dcff5da449044be5a8a8f750224e9734343816c8f0bac08967f028fa325a6d0d SHA512 c636657d1e33ba6861c1625f5798e5b98e546719331a91b455156e3af45be71873feee357d72a778da81058457299476d39a1c3674a2572185fd355f96b4f77d
+AUX CAN-2005-0101.patch 226 BLAKE2B 6547caace477d9e2824c768f5a747e80eddc4f47fa9554e85d6715e709f97529cc32d1994300e6a346b9db9275b76075baf5e448b93688881e5862db38dcad9b SHA512 3bf8a304044f2873f0aa10fba01b08a75a6d6d7476b323dd9421285104aceadc9338fcbe3e1bbeb7e69cb8e5992b511cf72788de4defbea17f034e48788d1fb5
+AUX newspost-2.1.1-glibc-2.10.patch 1340 BLAKE2B 558501614425b8461efcceb3824526cd72eaf6b7eb1d728b95f9241ec5362aa17bcc8e69ea3654fe32899d2fe1e072c9899e4ab3fbe02bf0683577e320ef472b SHA512 7b28f90904db586d64b0e22a95588023204bb7a70e50d4af32ca657f52353359c33d536e071f4bbcd3b098b701567afd0c00ca8c75cddcd469bcf2c4ee8c359c
+AUX newspost-2.1.1-nntp.patch 1783 BLAKE2B 838f9716c30d655385038f041062df3b0732af7d4e7ee5ec695589b40d8f85ad023fb1564e3f108aff28f2fb1a00b7b9b38b30cc75292fd49ef211c0fbf97bff SHA512 1c955ee41ea532f3c04cef79a7bc6f61e8ee6a6cf60b91fca3a3bf3c09aadbcf218fafd9179fa30b2736ce6a19e4059a573145c3459591691518cc914a631039
 DIST newspost-2.1.1.tar.gz 61412 BLAKE2B f5dad9ff397ed8536961c7364b9ade1e325bda8fa2fbd2e874c4db022112d45accb1d7800fd0c52eed5a17cc7e9298600b9ec6a6e95eccb560090f0c42d5de57 SHA512 d7f5b583ef5619a65e87f2ce2edbad307d60da7f29e5c6bef8eaa7c757f97f82f08654409a75ea7b28e5575fd267af57cbc170f467f6737f701bfbd6bd4b2f66
-EBUILD newspost-2.1.1-r3.ebuild 805 BLAKE2B cd03a084a3c3991b4b59b8ac8ec0a3736629ee11bf2bdd72991e86f6191083f11acf3d3f260de579dd392420e4358dc39e321856548100c4269977d5536cffda SHA512 216891c207e189f31238853c89e48f4aea77c69311e856cd4063c34c3b84d2ca648b92635b3af27bad313c8952ad495d19cfb31fb51ecced5210467e5fc28b73
+EBUILD newspost-2.1.1-r3.ebuild 791 BLAKE2B 2c6262fe5f3cc343c7bf2e6c99809e85521f2cc47c1b8fd5a2ae7c20efa194c8ec677a8d51ab43d51c0f76b31eb44441baef194a0939d13da0d2a54ce6629f7e SHA512 c0f96b522599a35ec1a6912684f21dad08b4352c7c1fa1e9a80b4707ea472424f2fa17e266ff7e416efa190f169ad4acc1576fbed2e27a09b8179572e59a47bd
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-nntp/newspost/files/CAN-2005-0101.patch b/net-nntp/newspost/files/CAN-2005-0101.patch
index 2bfdfc2c190d..c81936be61ba 100644
--- a/net-nntp/newspost/files/CAN-2005-0101.patch
+++ b/net-nntp/newspost/files/CAN-2005-0101.patch
@@ -1,5 +1,5 @@
---- base/socket.c.orig  Tue Jan 18 11:08:02 2005
-+++ base/socket.c       Tue Jan 18 11:10:08 2005
+--- a/base/socket.c
++++ b/base/socket.c
 @@ -126,7 +126,7 @@
  
  	i = 0;
diff --git a/net-nntp/newspost/files/newspost-2.1.1-glibc-2.10.patch b/net-nntp/newspost/files/newspost-2.1.1-glibc-2.10.patch
index fdaa78cbefb7..8778ab41c253 100644
--- a/net-nntp/newspost/files/newspost-2.1.1-glibc-2.10.patch
+++ b/net-nntp/newspost/files/newspost-2.1.1-glibc-2.10.patch
@@ -1,6 +1,5 @@
-diff -ur newspost-2.1.1.orig/base/newspost.c newspost-2.1.1/base/newspost.c
---- newspost-2.1.1.orig/base/newspost.c	2003-04-23 18:33:23.000000000 +0300
-+++ newspost-2.1.1/base/newspost.c	2009-08-06 14:46:41.000000000 +0300
+--- a/base/newspost.c
++++ b/base/newspost.c
 @@ -342,7 +342,7 @@
  	file = fopen(filename, "r");
  	if (file != NULL) {
@@ -10,9 +9,8 @@ diff -ur newspost-2.1.1.orig/base/newspost.c newspost-2.1.1/base/newspost.c
  			if(line == NULL){
  				text_buffer = buff_add(text_buffer, "\r\n");
  				continue;
-diff -ur newspost-2.1.1.orig/base/utils.c newspost-2.1.1/base/utils.c
---- newspost-2.1.1.orig/base/utils.c	2009-08-06 14:44:35.000000000 +0300
-+++ newspost-2.1.1/base/utils.c	2009-08-06 14:45:20.000000000 +0300
+--- a/base/utils.c
++++ b/base/utils.c
 @@ -43,7 +43,7 @@
  	return NULL;
  }
@@ -22,9 +20,8 @@ diff -ur newspost-2.1.1.orig/base/utils.c newspost-2.1.1/base/utils.c
  	int c = fgetc(file);
  	buff = buff_free(buff);
  	while(TRUE){
-diff -ur newspost-2.1.1.orig/base/utils.h newspost-2.1.1/base/utils.h
---- newspost-2.1.1.orig/base/utils.h	2003-02-08 17:09:41.000000000 +0200
-+++ newspost-2.1.1/base/utils.h	2009-08-06 14:45:13.000000000 +0300
+--- a/base/utils.h
++++ b/base/utils.h
 @@ -26,7 +26,7 @@
  file_entry * file_entry_alloc();
  file_entry * file_entry_free(file_entry *fe);
@@ -34,9 +31,8 @@ diff -ur newspost-2.1.1.orig/base/utils.h newspost-2.1.1/base/utils.h
  Buff *buff_add(Buff *buff, char *data, ... );
  Buff * buff_free(Buff *buff);
  Buff *buff_create(Buff *buff, char *data, ... );
-diff -ur newspost-2.1.1.orig/ui/options.c newspost-2.1.1/ui/options.c
---- newspost-2.1.1.orig/ui/options.c	2003-04-23 18:33:33.000000000 +0300
-+++ newspost-2.1.1/ui/options.c	2009-08-06 14:46:31.000000000 +0300
+--- a/ui/options.c
++++ b/ui/options.c
 @@ -332,7 +332,7 @@
  		file = fopen(filename->data, "r");
  		if (file != NULL) {
diff --git a/net-nntp/newspost/files/newspost-2.1.1-nntp.patch b/net-nntp/newspost/files/newspost-2.1.1-nntp.patch
index 8779e8f36b47..7482d6203e0e 100644
--- a/net-nntp/newspost/files/newspost-2.1.1-nntp.patch
+++ b/net-nntp/newspost/files/newspost-2.1.1-nntp.patch
@@ -1,5 +1,5 @@
---- newspost-2.1.1.orig/base/nntp.c
-+++ newspost-2.1.1/base/nntp.c
+--- a/base/nntp.c
++++ b/base/nntp.c
 @@ -26,6 +26,10 @@
  *** Public Routines
  **/
@@ -56,8 +56,8 @@
  	}
  	
  	buff = buff_add(buff, "From: %s\r\n", data->from->data);
---- newspost-2.1.1.orig/base/utils.c
-+++ newspost-2.1.1/base/utils.c
+--- a/base/utils.c
++++ b/base/utils.c
 @@ -44,7 +44,7 @@
  }
  
diff --git a/net-nntp/newspost/newspost-2.1.1-r3.ebuild b/net-nntp/newspost/newspost-2.1.1-r3.ebuild
index 20161ec62506..b0633bc47a2a 100644
--- a/net-nntp/newspost/newspost-2.1.1-r3.ebuild
+++ b/net-nntp/newspost/newspost-2.1.1-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A usenet binary autoposter for unix"
 HOMEPAGE="http://newspost.unixcab.org/"
@@ -12,13 +12,16 @@ SRC_URI="http://newspost.unixcab.org/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
-src_prepare() {
+PATCHES=(
 	# Should fix some problems with unexpected server replies, cf. bug 185468
-	epatch "${FILESDIR}"/${P}-nntp.patch
-	epatch "${FILESDIR}"/CAN-2005-0101.patch
-	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+	"${FILESDIR}"/${P}-nntp.patch
+	"${FILESDIR}"/CAN-2005-0101.patch
+	"${FILESDIR}"/${P}-glibc-2.10.patch
+)
+
+src_prepare() {
+	default
 
 	sed -e "/-strip newspost/d" -i Makefile || die
 }
diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index 1b0c5b2d6fde..b4b36b603ce3 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -3,7 +3,7 @@ AUX nzbget.initd-r1 742 BLAKE2B eef074b7e25cd085b92850892ee8917772451b0f58a7f7c3
 AUX nzbget.service 466 BLAKE2B 928ff8fd5f48b9190324ccaa98f1215aa35e30eb9959278fe2b9d77f175ee97a28e0efe3ac034ceb2da023c9d7737aa3f803861489284578412559e257700003 SHA512 5a59562580596bc5524086dcb2b2550b242a5f62750fd42a5b2e9ecb786b40107a21fcab7496d0cd396434da7ed3ee5d1046059d94f5f2bcb76ad496862d19e1
 DIST nzbget-20.0.tar.gz 1925665 BLAKE2B 4c4e93bb0fa170b4b6433cbb7d27f3fa67ed033c462711b19e179f42c18dfed044c937e6a7ce4b08a620f4d7af7d3ec9245de16f15d4db8005d3d8dc4f8f46d4 SHA512 8b0fe8ea41b64be9a2f624ef0fa2a8b8987bee412db68a0e8f1b607ce6be7bfd03f60ecc5e49807f4c726e136bc5a355c44559b215fea2bd290c2eb62a0b5927
 DIST nzbget-21.0.tar.gz 1988902 BLAKE2B ee9204a978502562348dc4945e19b084d8d17f566099cfe7e95dac154ffac6d772084c9c070fba0d585cd2229d0a5760b3298ef29eba52d7c75edbc9fe43e310 SHA512 bbee5073a2788a17d78009b7ae0c41473aa4d8424301e7e62b2544dc8993e1e3b6e1026dd9f71af5627293d2113d8637a4a6138eee0a328554df298117dd6bb3
-EBUILD nzbget-20.0.ebuild 3050 BLAKE2B 3a65a3f46024ea97df02ee098a1abe2dacfe99fc55d88e56c58b35f6d608584a40cffd2f77276c4fb60c7c0cc5a731c9811bce5179e804967ba8d6a1d2af459d SHA512 92346d8dd0f906a29eb2a94c0acacec540b5c71d7d99aecc16100b728ab280f4ba957532e4edbc462c52bccbc8cd337f9553559d4be5a9eb183791b21d2e9fdc
-EBUILD nzbget-21.0-r1.ebuild 2443 BLAKE2B 41577d2ad616bbdb96feb72a225f198af670ce47cbebeb4235faa52f039c0c878cf5311b05424388064127093757479fc53c53dd7678065feb09098550d91a64 SHA512 8ad12962e018b3460d0bf3da96d05821912cad80887729178a11b01265e81eab92262375815514b84e586144cf0c212794eb034940d46adfe46d233f3160a98f
-EBUILD nzbget-21.0.ebuild 3108 BLAKE2B 7b1a3c7d03a8783fe9a42fc098f7fb11ea1ff21eec0c2f0789ea7a60b07adc1af9ea240fe9bb44c0c41c32487de2e9c0e08600d6b7b370343df4d44736bda987 SHA512 0bc378fb324da88e4d78475314725a210bdb1a0b6d72158ae5d271fca9200666c27aa875af03671873e6cd1314043ec7d2bcb3e0f82f8a9535fc73deaac40a7a
+EBUILD nzbget-20.0.ebuild 3043 BLAKE2B 9d449735a9e61dafb3a55f49ad80be261cdc2012b5380015bd7a62c7d95dcd866593882f3062f4e4a617f5fb28f945bd10d19af080f9c9c6a95167f78ab6dd21 SHA512 11345f3703c2525988ab68d83178b08b699b682a6310519859d6471ee5258ad8c3f22557c3cc77f418a65655e7968b9464b554e186ba3d4a70afafcda594c638
+EBUILD nzbget-21.0-r1.ebuild 2442 BLAKE2B 5685c301b2d5c60684ebd76b143facaa0670d7e83bd1746a0658cfe1d855c8faaddaae1bce3dbfbe79938ada213d337c26c4d98cec252541cebf27147451b156 SHA512 4bef2a5e68ac0ef634b3381e5a04e34e32efce24221494ba0d309430b3c120f05205abf15e81ecdec41e5b575a2fe5243fa561fee9caccfd25f1869c36b06292
+EBUILD nzbget-21.0.ebuild 3101 BLAKE2B 91d47f889ae37f05225f0f505d8e91f71a500865d15b6079a7e35dcff911b4a13176a0973d11004e89626e5e869db6027f563df238e31b184726f097df9b689c SHA512 aa949435cb74bfd30470fc843a25310cd81fee44b1bed95b94aeacd3d5b82e83bf0eeced72f8109ad563fe7aa5847f0cddc3b5554f5d65f2198a537afbab2855
 MISC metadata.xml 630 BLAKE2B 8e38136bb9cccea932e20e4ec13854a53791d6ffa06524ed4518989fac43acbf22f7c6a55129e43619a4191cf87520239f314e0dabbf0b388fc8a1d01774bd26 SHA512 43a2e999f0b7dc9c4aceb3371787ad715bad79e62c3af24a92e1413043c7860b3e3d671de465c74c73594eeff54d6b91f54925e201f3c23c1a0a82610144772b
diff --git a/net-nntp/nzbget/nzbget-20.0.ebuild b/net-nntp/nzbget/nzbget-20.0.ebuild
index 486e9d7783ec..487dcba041f5 100644
--- a/net-nntp/nzbget/nzbget-20.0.ebuild
+++ b/net-nntp/nzbget/nzbget-20.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools eutils flag-o-matic user
+inherit autotools flag-o-matic user
 
 MY_PV=${PV/_pre/-r}
 MY_P=${PN}-${PV/_pre/-testing-r}
diff --git a/net-nntp/nzbget/nzbget-21.0-r1.ebuild b/net-nntp/nzbget/nzbget-21.0-r1.ebuild
index 86315ed41dd0..62f7b5806f41 100644
--- a/net-nntp/nzbget/nzbget-21.0-r1.ebuild
+++ b/net-nntp/nzbget/nzbget-21.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}-src.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
+KEYWORDS="amd64 arm ppc x86"
 IUSE="debug gnutls ncurses +parcheck ssl test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/net-nntp/nzbget/nzbget-21.0.ebuild b/net-nntp/nzbget/nzbget-21.0.ebuild
index cf54fa0496d2..3b9a5af5466d 100644
--- a/net-nntp/nzbget/nzbget-21.0.ebuild
+++ b/net-nntp/nzbget/nzbget-21.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools eutils flag-o-matic user systemd
+inherit autotools flag-o-matic user systemd
 
 MY_PV=${PV/_pre/-r}
 MY_P=${PN}-${PV/_pre/-testing-r}
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index e930cf3471e3..dad956e30af9 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -4,6 +4,8 @@ AUX sabnzbd.confd 156 BLAKE2B 8cd006eedf4f6614fa00ad9bfee6411dbfb99e1e487c19c4b3
 AUX sabnzbd_at.service 185 BLAKE2B bedc84a8dec50c230bd2d4041d3e56dd33fdd7814488e3a6b53fbb8e0c7df2100ac13ee746e4b6cd45b384acfe6a9478df3a3d1f75bfc70dc41f51ac8f018916 SHA512 e5e6882c8520d26c21583fd2b9895248a777fa7519dc3588726dcccf689f81d604f2ef883681e54f6b212a51a8d8e690570ab60742d8b0232af73e98d61d6d34
 DIST SABnzbd-3.1.1-src.tar.gz 2735624 BLAKE2B 411963a49468cb0654be2f586790baaf1f0657491f7f1da848afe2d0fa89750cde8dc06c8a748fe6cb120d27a961881befb1100a234a28d7ec211b4435011576 SHA512 4e8debd2a0ef7379789df035f7d929e2b3dbf13d9394dfebb6075d8b877e610d4ef8953e98eeafd6048952738046bb6b9539e85516f8783c5e06bda1470b3c7e
 DIST SABnzbd-3.2.0-src.tar.gz 2774559 BLAKE2B 82e662355f79a9be54b482ac29d1fb7fe7232355df6784ce3c908d6ee3bfe3cf22db1144034319542df5274ddbb1ef563cf67c5a848062a3f6880a45b308d522 SHA512 98797695950ca35098b8b4103216fd9fcb3fa33112cf2e3918033c26ef094a1affd2a2f389aadcc3ef1666cff1b6de91a99a45032b51711870254568ff9f723a
+DIST SABnzbd-3.2.1-src.tar.gz 2777984 BLAKE2B 6e0ebe122a01f8cbd5b26eefe3728478dd348b3d11fb274c2a146b7567f306074ddd93b438463471e22fc77c6c2223e864c6019ba0d7ab464162451e9f9c8cb9 SHA512 ace29199eb6f03450d25fc3b79960d1afc336f0013771bcf698e7df5c5e5ed920ad783f542ba8f3dbcd451d279993a6d4299d78075184e43ad74411ac19c3f59
 EBUILD sabnzbd-3.1.1.ebuild 3128 BLAKE2B a4730858c14abc8c364e6260d586e50c08db5cdf4b0f7ee1a7acad788cf7912299eaf45677375664500e7eff5e810aa13fe234a27a0d29e44998dfbb02b27ff5 SHA512 68487e6b61cf13e639ae424604582ac3c621046634247f7cacec99f7151c5d1f5e38dad0954c29f05c0cf678247094c2abcb60f16b519412a0a55cc96255a9fa
 EBUILD sabnzbd-3.2.0.ebuild 3128 BLAKE2B 2d7ffde57ce1197a502330f4623c5a2113ab4ecad73f6e898e6ad8409c78ab99f362bf9d3896c9b0d73bbffb437cbbe899c75252093e116f70230467da9dd634 SHA512 5915a43ccfb1621004c8b2478d7d97349902872f51b6cb82b5ecd333614e97151899b141772429bad4edc01c417c90afc19006b1ee72d1e104e1cc3b42cc1731
+EBUILD sabnzbd-3.2.1.ebuild 3128 BLAKE2B 2d7ffde57ce1197a502330f4623c5a2113ab4ecad73f6e898e6ad8409c78ab99f362bf9d3896c9b0d73bbffb437cbbe899c75252093e116f70230467da9dd634 SHA512 5915a43ccfb1621004c8b2478d7d97349902872f51b6cb82b5ecd333614e97151899b141772429bad4edc01c417c90afc19006b1ee72d1e104e1cc3b42cc1731
 MISC metadata.xml 537 BLAKE2B 7e120368e0f02298c0b0760d0574156d970807b43e78b7faa85d84a69fa5c9d97f12929865c9446f8de5a2f50b3a034e57925f9420b48ee85cf48a949ec78328 SHA512 9006b64233c7bc73f34f3aaa70d9de7c7eda5375017ac892169d100d2b0f931695f723644235203b04fe4cd6da5dc74ca247c62f217307a4224b81bc005cb753
diff --git a/net-nntp/sabnzbd/sabnzbd-3.2.1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.2.1.ebuild
new file mode 100644
index 000000000000..e842f9ed1be0
--- /dev/null
+++ b/net-nntp/sabnzbd/sabnzbd-3.2.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+# Require python-2 with sqlite USE flag
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit 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"
+
+# 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: 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}]
+		dev-python/cheetah3[${PYTHON_MULTI_USEDEP}]
+		dev-python/cherrypy[${PYTHON_MULTI_USEDEP}]
+		dev-python/configobj[${PYTHON_MULTI_USEDEP}]
+		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/feedparser-6[${PYTHON_MULTI_USEDEP}]
+		dev-python/notify2[${PYTHON_MULTI_USEDEP}]
+		dev-python/portend[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sabyenc-4[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+DEPEND="${COMMON_DEPS}"
+
+RDEPEND="
+	${COMMON_DEPS}
+	>=app-arch/par2cmdline-0.4
+	net-misc/wget
+	7za? ( app-arch/p7zip )
+	rar? ( || ( app-arch/unrar app-arch/rar ) )
+	unzip? ( >=app-arch/unzip-5.5.2 )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	MY_HOMEDIR="/var/lib/${PN}"
+	python-single-r1_pkg_setup
+}
+
+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: ${MY_HOMEDIR}"
+		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."
+	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
+}
diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index 80d7b115de21..faffc250b657 100644
--- a/net-nntp/tin/Manifest
+++ b/net-nntp/tin/Manifest
@@ -1,3 +1,3 @@
 DIST tin-2.4.5.tar.xz 1559164 BLAKE2B 4efea88c7f76aef91a848c9ed5d82efac640360e41c515015d406e84ed5ce639bbcd17eff29939312ebf83adb8bb84bc7a4f04833cd7cc0781f92b377a0cb31f SHA512 4ec1c4990ce8d9a46204c0064f19c5c2b99848201c37562f8df76de5be84fdd2bcd35cbc3e9f20233f636522e086ac031a5a9cb65bd22a53eda619dcce86adbc
-EBUILD tin-2.4.5.ebuild 1782 BLAKE2B 489937c5763d4b5ee8c195db0fc1b5953facb1de97da69d9299b710a9ce2cb4af9f5771b4355c92f84d427336123a4a619fbbd40a456bee43945e6b1d3364e78 SHA512 79fca379c005a9daee81411b3ead748971642350c9dbfa47822e80771828d3d1bcaa22593fa4d73aa8a9382be9cc6a8028a734bdfdf38f6e504f159296e35fbc
+EBUILD tin-2.4.5.ebuild 1775 BLAKE2B 7aeea4f668ee3728f5f1be7f962d550c89a7d546011d53cc275521b196e1b01144af79f27035c49ca4447f04d803f005ccc86b548ea43f745800758405bd03fc SHA512 f0c31aa2b02f4f0b273c83daaaa79cc75628049cffa1e42ed6114723ee06b15f407d04f2aee062ebb7bbd921813d4d34a7006f9c7ab2f8c3a4904e96be8e8049
 MISC metadata.xml 456 BLAKE2B e606f48de760db9a54bc0d98453c04b71070d0eede202c65ab8ab64ad13557d794c24709c141837cb79468eb063ff6ecf17361385145c2294d90c43f585fe81a SHA512 c73827179e20f2487344e28828b999de4ccf1925a09dac5ae2fbdffbf398c3b147db96f6c69c14e8156bdc84c070dda5b7a24109efb57853ec7a8064a16c8bae
diff --git a/net-nntp/tin/tin-2.4.5.ebuild b/net-nntp/tin/tin-2.4.5.ebuild
index f1749213e8b6..3d038bb3b7f0 100644
--- a/net-nntp/tin/tin-2.4.5.ebuild
+++ b/net-nntp/tin/tin-2.4.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A threaded NNTP and spool based UseNet newsreader"
 HOMEPAGE="http://www.tin.org/"