gentoo resync : 26.11.2017

2 files changed, 20 insertions, 17 deletions

diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index 316311093e72..39e344b3766f 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -1,15 +1,13 @@
-AUX nzbget-14.0_pre1145-tinfo.patch 469 SHA256 76740e82b987fe9206fb44035aa69af41345089d2f8d33cfe1019b7940e4faae SHA512 b431fa3a620988fe69ff40f05f5c3ade970f2bf895cf0c6d3b8ac58b722627ee772e62a48270cab8243e043dcdac9ac2d2923579c73e24049db67fcdbbe65669 WHIRLPOOL 5f2ec9d9166edb6171d7c711801a29f9c3f61c13f6cf26e3b238ffb21a91a0cf86e8486bff04bc533c49389d7c25d6e8565da1124b6848df7168f835aeea2f47
-AUX nzbget.confd 337 SHA256 a2a305dc1ef482d82041c5261dba235f6faae229d894785f528d87c9c0e452b8 SHA512 0f9a0d62ac6ea35703ebd64ec68057596d63fd5957afa2d3bcd18b4e8db4b24e78d060dc36cf90dbd2f604b4c6f107fb8e59ff779b6865cd362e71a0666d6c56 WHIRLPOOL 220c7638c0f62f4cf4314e40b022c34c41a7124d6bf41bdf455948e2e862715413d62cc4750db63967b24f3cbf1b5d13cd3bcea4c016ee5611f5226a9f1bd750
-AUX nzbget.initd 764 SHA256 3788a716112ed8929feec56e7ee4116afca4e3edfbb961316d43d43c5dbbbf5e SHA512 731e3b2fe4bb9da9927dd15ce8f2358e391746917f3825009b58026a41beda0bb1827e6fb22a3637b7e7e3bee16ea470fef3b3d7f027d48631307f4f818006fc WHIRLPOOL 4f7bb1ff0121e3d1967a654e7e24187c32a817c93f47519a1339c70d168c20ccd9938c7885be05404b2b9ceebabaea3d979c52c9312ea88253bec248bc1d6322
-AUX nzbget.initd-r1 742 SHA256 8243c4b44d18a56d8158d8339d6a1069371c2b427ee39600e7de5ac5fc1156cf SHA512 df4965d25a221c033586da85596584a712bc5c5d9c2e0950850f96fa872f29a04571649e7add504d9fe8be3639654e5653a766a6accf4dea344ca771088b432a WHIRLPOOL f7130278050f957dbbffa3048b50d3d6cf55958f777967530dddfc304ea5ae110dc3c104f072a0cc94eaf92f0c69002da01957787a735709835d0aadf73a4047
+AUX nzbget-14.0_pre1145-tinfo.patch 469 BLAKE2B a12d1e29c7b47f824fcbf6c5cbdd9224a99e1ef604862f730219691a9d0e21e415f1841b86cd13c7370cc1891b21096735bd5641f83850d7c96c11f4d749cd5f SHA512 b431fa3a620988fe69ff40f05f5c3ade970f2bf895cf0c6d3b8ac58b722627ee772e62a48270cab8243e043dcdac9ac2d2923579c73e24049db67fcdbbe65669
+AUX nzbget.confd 337 BLAKE2B 4986f3c00019f8f2d0c3d71f9d623186823748722dc4c8aea82ef39b57cebc079247ce5aaa14f1fd844a3c94931f53c1af7ce015e2b4ba68973367c6b708e0e3 SHA512 0f9a0d62ac6ea35703ebd64ec68057596d63fd5957afa2d3bcd18b4e8db4b24e78d060dc36cf90dbd2f604b4c6f107fb8e59ff779b6865cd362e71a0666d6c56
+AUX nzbget.initd 764 BLAKE2B dfa76fd2040bd226ae0b27839941f377bff91330d41fe27b7e44f26effc42693ead35361a6d0ae293220477c4132dd2ebe44f97390b77772630ce86d981c5a1e SHA512 731e3b2fe4bb9da9927dd15ce8f2358e391746917f3825009b58026a41beda0bb1827e6fb22a3637b7e7e3bee16ea470fef3b3d7f027d48631307f4f818006fc
+AUX nzbget.initd-r1 742 BLAKE2B eef074b7e25cd085b92850892ee8917772451b0f58a7f7c3b96c55bcdb115cc99d12e0569f59cc546f9655460230e5f29a82c4d749a654e2019e7c06651c165a SHA512 df4965d25a221c033586da85596584a712bc5c5d9c2e0950850f96fa872f29a04571649e7add504d9fe8be3639654e5653a766a6accf4dea344ca771088b432a
 DIST nzbget-14.1.tar.gz 1332334 SHA256 a16b816b61f7035cc373e9b77094ca474d5b7b7f7ceff5fa8818249181db4b18 SHA512 fae938529bb3968c0161f63ec3af07f844a8128b61abf6298457a4878ac0d47541d76730c8a068509fa091b102de07c9d28dcd668a8192fcfac60980f69be56d WHIRLPOOL 9e9636b67d0af7780d2cc8f897465f5a2e23cd8695b3bd982e3e9f78d68adb34f84faf59253044c7b2f95db737cf59207b35cf312d1f1825fe4b9ecce2e4014f
 DIST nzbget-19.1.tar.gz 1809849 SHA256 06df42356ac2d63bbc9f7861abe9c3216df56fa06802e09e8a50b05f4ad95ce6 SHA512 3ba7cd7f7fec28e29129be0a1ca5879a0593bc54be49e3776e84eeb7804377eec47106aa2371b31dec7d9152301d68b199ce9e66db714195defc8e15ef636532 WHIRLPOOL 157168fde3152a02d4f1d8b257998851b05b6c1dcb0a839868f0d85859ae9539ef6281035c44ccdbc981ec6f093f28f8333cc40c4871e4d7f415658a5599f5aa
-DIST nzbget-20.0_pre2075.tar.gz 1817105 SHA256 0fcb83077c878db13e13590690a873d14c5ef62df777bb80ac9f105034388750 SHA512 d386b61dee32e3f30d580eba484f1431fb29ced31e63adc6135f88e603993502e3d93f2d36a3ce654492a014a51c07451361c1954c62e7ccc439d2a3fc48554f WHIRLPOOL e37b53aa596b094e3b2e783b365e4bc421d0a8b35bb8aaea5de201da55d3fd0b9c3c25122476313900ff02fa982b8a56261af0cd467a385bae7791c437ed5172
 DIST nzbget-20.0_pre2108.tar.gz 1820172 SHA256 6889079774f847334dbecf0c4e700eaab51bb61025df06c3a372947e85e0aee1 SHA512 4abdab3d45829eb5574d2cb6b532372ba0a9c62a701acdebe498b71466f7ac8c7b47aa85ed80c1132c10e86b829c48dd6df4826d20f542a7a935aaa958ba0222 WHIRLPOOL 723e3da5d6d16002539f792f3a4a78b8e3ba821839093b667470c2ae94e6b3c7ee62994a5ee8630eb7362825a04d4d16ae3100f149b8ba182cf6928fc214109c
-EBUILD nzbget-14.1.ebuild 2575 SHA256 508be9c30d98e788e319108eb5c19a0cdaf92292244c07e2b0c984e11ecb4929 SHA512 a263b13e0884c4848a762d4bb739da5e8eae5b7dfac96feb5812fc4f81928d4e600d3cdb9dbf35c407dc81ed1dfa0ce1341bb595f488c4ece75c5feb967660d4 WHIRLPOOL f6601ba182c4774dde2094df62ae44cfa94adca58a7425107d37dee534963334d4e12713c737d2a0c19d41e25dacec8361001cba9fd9f968ed66880487127dd2
-EBUILD nzbget-19.1.ebuild 2992 SHA256 35fd39fcd7e1742d85360a298b6f796a5558d63c5e989fc9449cbf6d61c76bad SHA512 a8ad9f64f7520f2e2174124676cd6764ebfa063408e2c45861dbcf49919b5b1b028df4d9db2601a0399cf315637a0b297cac24f54befb878c7a78691e4f658a1 WHIRLPOOL b604ca5481b151e036a2effbe5e45773afe9f90d12445da80ef165d2c9ec81adb4d61bbeaeb15c59a5ab1891d4c81f896d163584c67f68ddcc405e6f84986830
-EBUILD nzbget-20.0_pre2075.ebuild 2992 SHA256 35fd39fcd7e1742d85360a298b6f796a5558d63c5e989fc9449cbf6d61c76bad SHA512 a8ad9f64f7520f2e2174124676cd6764ebfa063408e2c45861dbcf49919b5b1b028df4d9db2601a0399cf315637a0b297cac24f54befb878c7a78691e4f658a1 WHIRLPOOL b604ca5481b151e036a2effbe5e45773afe9f90d12445da80ef165d2c9ec81adb4d61bbeaeb15c59a5ab1891d4c81f896d163584c67f68ddcc405e6f84986830
-EBUILD nzbget-20.0_pre2108-r1.ebuild 2948 SHA256 f6786241db0de04ebbdffd898d03d84cdd160e09363be26bc5a524563dd67e37 SHA512 0c84923653f454416ebedc8a33ff367076ab4f2a26c1c6d2f3a6eeebfcfeff6459e134b3d2fc2d233cc88e4d410c75360a41fb6c2e9beb2296e6d25e633a6696 WHIRLPOOL db5f798015396f9765d748ebc9323ce5525ece5b3c1f345f9cb4e21f426d94f27f658fd9d3f5d594a781dba88b53443ab083b89bfd84b54b7b0a99d0ee5b4d03
-MISC ChangeLog 8446 SHA256 f62b61b41d42de0b4def3400945521f82f8fa9b0541e584054bf2f555e0303c6 SHA512 5d024a50de0f9bd590b0cadeb418d8cf5aa9bca80e61d67e1a527580cd4597a9c120d568265742723fb0f69430b76460937c99fe7e364970b17fcade3d294a21 WHIRLPOOL 28cd2da9f67d690c7c2aa2013556910cda3164391a54a9ffe37e1650849e3646a601994d1be7aedd19e65ec50842346eb2f16a7b3064c267e90b6f92c124dfbf
-MISC ChangeLog-2015 14706 SHA256 15d07db9cc64825833ed79c7ba89033625004e7085af3572ea61697c4514ae31 SHA512 8ec273509759582f56d0adaa0c2ba046ecc50c11658e56a05afc8d63cb0eba30e2573435c245c67c901b52376107a632c7e508b9eaebc94e22cadc5575aa1caf WHIRLPOOL aae0c6bc74b61fa6415912c6828c2ac7bb4a84abef53dc2ad2928c36befb3442b19ede802fb9291cf3d5470398ec5d410e386d5caf512436d1db089ac69f38b1
-MISC metadata.xml 853 SHA256 f2eea21f51150e93ffaea82958e32bd2d20586a347457305a65795cfd52cc1a4 SHA512 c35eaebbf56d6809e91f62440fb3b4f09911d10a2798741647b063074c77aed9079a6a6d2355d229571d82eb5be9f65f21ce449547e7ea05183d583e9bcf1ae2 WHIRLPOOL a74a60f5d3b3549ace1619e0ff6503376d76716913a64014cf7c6a06d396f29d180d76c6cfcf64fd93edb0a7954c0dee097772efff032cf8390325ce7c4d313b
+DIST nzbget-20.0_pre2159.tar.gz 1840392 SHA256 b7d465a99df7f4be89a952cbc58e2f18148ff260430ff518c1e81fb93dd1d00d SHA512 31799b2164db748389b7a2895d8571543aaf2e4324017b1adcb4eb44ad2046a0b488fb29a2c77b1d4963b858f7ec614d78eb541090b0889bef634d6d0461a50c WHIRLPOOL 4cff2f6204cd1634994fdc9a65f8c47350a8e7b30fc38767103ffac8255565d87b73e9eaef4de8bb0f78eb1f60bbd2b8aa436f7b796e97890dc999bf84f366a9
+EBUILD nzbget-14.1.ebuild 2575 BLAKE2B 2ca47cd82c33c026b36065f40ac656f4483fc234ef7821f20b9612a97f0a6f23c700891494b3659b13e231997f5fa46e18a1e1f0fd729923434d52e695d10db0 SHA512 a263b13e0884c4848a762d4bb739da5e8eae5b7dfac96feb5812fc4f81928d4e600d3cdb9dbf35c407dc81ed1dfa0ce1341bb595f488c4ece75c5feb967660d4
+EBUILD nzbget-19.1.ebuild 2992 BLAKE2B 5359ddbae9897ebc1c657f0a760af6583f15e63ab3599834783975253bafd854255f6ecffbf6d59171ff35b144b5f704df3ae4ee0f4ae2cc87b66292d7755d61 SHA512 a8ad9f64f7520f2e2174124676cd6764ebfa063408e2c45861dbcf49919b5b1b028df4d9db2601a0399cf315637a0b297cac24f54befb878c7a78691e4f658a1
+EBUILD nzbget-20.0_pre2108-r1.ebuild 2948 BLAKE2B 067edb97b257a62482d08d67238dbbeab5fd89b77a56b9309f1256b737aa29f3e880db70d291203b9e751ece1d2335be22322c2ea7c748bf0d9b8726353e63cc SHA512 0c84923653f454416ebedc8a33ff367076ab4f2a26c1c6d2f3a6eeebfcfeff6459e134b3d2fc2d233cc88e4d410c75360a41fb6c2e9beb2296e6d25e633a6696
+EBUILD nzbget-20.0_pre2159.ebuild 3017 BLAKE2B 868c9f71a34f613d8e46f68c587305b41772c234cd98c4fa8b55dd3ad97f650e548dc0cbe15093c8a122f4aaf290741e3ca63a7e7e26bb1ee3c8d36826f0ac50 SHA512 57d03321f83d016ab82274de423f27ac05dbc1b4f2866faf8bcd8b710e725f1a63b6dc736a5441f073ff36d49134547a33a88d3f735cac45ebf02610a69b9235
+MISC metadata.xml 853 BLAKE2B 9f9def21115f81a99bf61c68fb198efec9f480bf370b0e3b8f36d31129b935a895f16790480c7b6ee4d8615bdb41f21d46988bcac4c546080d471c9c8c26535d SHA512 c35eaebbf56d6809e91f62440fb3b4f09911d10a2798741647b063074c77aed9079a6a6d2355d229571d82eb5be9f65f21ce449547e7ea05183d583e9bcf1ae2
diff --git a/net-nntp/nzbget/nzbget-20.0_pre2075.ebuild b/net-nntp/nzbget/nzbget-20.0_pre2159.ebuild
index c6d86f04383d..826808ecc035 100644
--- a/net-nntp/nzbget/nzbget-20.0_pre2075.ebuild
+++ b/net-nntp/nzbget/nzbget-20.0_pre2159.ebuild
@@ -17,17 +17,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="debug gnutls ncurses parcheck ssl test zlib"
 
-RDEPEND="dev-libs/libxml2
+RDEPEND="dev-libs/libxml2:=
 	ncurses? ( sys-libs/ncurses:0= )
 	ssl? (
 		gnutls? (
 			net-libs/gnutls:=
 			dev-libs/nettle:=
 		)
-		!gnutls? ( dev-libs/openssl:0= )
+		!gnutls? ( dev-libs/openssl:0=[-bindist] )
 	)
-	zlib? ( sys-libs/zlib )"
+	zlib? ( sys-libs/zlib:= )"
 DEPEND="${RDEPEND}
+	test? (
+		|| (
+			=app-arch/rar-5*
+			=app-arch/unrar-5*
+		)
+	)
 	virtual/pkgconfig"
 DOCS=( ChangeLog README nzbget.conf )
 
@@ -58,7 +64,6 @@ src_prepare() {
 
 	sed \
 		-e 's:^MainDir=.*:MainDir=/var/lib/nzbget:' \
-		-e 's:^LockFile=.*:LockFile=/run/nzbget/nzbget.pid:' \
 		-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:' \
@@ -91,7 +96,7 @@ src_install() {
 	keepdir /var/lib/nzbget/{dst,nzb,queue,tmp}
 	keepdir /var/log/nzbget
 
-	newinitd "${FILESDIR}"/nzbget.initd nzbget
+	newinitd "${FILESDIR}"/nzbget.initd-r1 nzbget
 	newconfd "${FILESDIR}"/nzbget.confd nzbget
 }