[gentoo-commits] repo/gentoo:master commit in: net-nntp/nzbget/, net-nntp/nzbget/files/

[Patrice Clement]

commit:     6cfc87de9b2a7f68bde9813f38ca8d87d7bc0619
Author:     Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Sun Jun 25 20:10:01 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Jun 30 13:16:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cfc87de

net-nntp/nzbget: remove old.

Package-Manager: Portage-2.3.6, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4987

 net-nntp/nzbget/Manifest                           |   1 -
 .../nzbget-19.0_pre2021-fix-no-parcheck.patch      |  46 --------
 net-nntp/nzbget/nzbget-19.0_pre2021.ebuild         | 123 ---------------------
 3 files changed, 170 deletions(-)

diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index 33cba5881d4..79402c4507c 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -2,4 +2,3 @@ DIST nzbget-14.1.tar.gz 1332334 SHA256 a16b816b61f7035cc373e9b77094ca474d5b7b7f7
 DIST nzbget-17.1.tar.gz 1609931 SHA256 4b3cf500d9bb6e9ab65b2c8451358e6c93af0368176f193eebafca17d7209c39 SHA512 5fde874b68423bb6d4cf63fc68aee0087b4d801a73a05124c1b3d0e883877cd585400001191e58386e115b2664906f16e67f5f7d5a0ece93bf51f55ec1e7309b WHIRLPOOL bcae41e87e8cb6ce429dd065fe7904cc04b36da4435de43c3424afd1a37f3e5da55769d2684df368687fb8ee6d6f72ff80452c54a07ffa09fbe9918c7d40c167
 DIST nzbget-18.1.tar.gz 1784894 SHA256 ddf7f9eda1cc4d6f01cd28a5ee4362ef7a399085cda45a82ffdf250d56393819 SHA512 ef7749a024eee9639e2dbd50ab9d57996e7a95a81dd4b9b29b9fdc98a717b053ce43902e638b119d43a8826a83218ccfbd7a6bbd4ea50f3cbf4425ef06df141d WHIRLPOOL 29e96393945d039e8572de4e1be50ab3cb2259d905db934923eb27ccfe1e30b88448e505243689d5e10b8a05f8bd159605fca464352315d6761eeffa4157e76d
 DIST nzbget-19.0.tar.gz 1809405 SHA256 2648e0eeb6f38bda3870e994caacd182f6e49a1f8c7404fbbe0112583f896f22 SHA512 3d692e44c0f5c6049676e23977d34bbb4b34b48885ea22fe80139e6a3b92e2b3937286cebaed477830b0fbe50cf4fd6e92a1d130e3176d9d10edc70955c82a61 WHIRLPOOL 998c32169750f538a7bd980bdc8ac98300ccf7bc5fb2db3536c16d0e01bcbc622d2ffdd43a4ac0aaca1ed585a7f9fe5aa8473e298763111c012996828d2b2053
-DIST nzbget-19.0_pre2021.tar.gz 1808479 SHA256 8c4392e8582a12fa980f217b31183032e12010f4ca7ff324599839771e4f2582 SHA512 a3c1a164267400fff55255fbda353648aa35fa9ebea2b909864706f3680f5767f8b35d80a176c7fbdde6a73f80d2645bb8a8a551742689a484a64c8337af8abf WHIRLPOOL 1ee382145996867746449bf3c5d49502c81801d9d5d873bea8b2a6285ae4855fd028dff61212ff90d44f26c517e248178ce7337cf8b13607129317bdc759e919

diff --git a/net-nntp/nzbget/files/nzbget-19.0_pre2021-fix-no-parcheck.patch b/net-nntp/nzbget/files/nzbget-19.0_pre2021-fix-no-parcheck.patch
deleted file mode 100644
index e87fb7ced1a..00000000000
--- a/net-nntp/nzbget/files/nzbget-19.0_pre2021-fix-no-parcheck.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 928e0a60061d33252de0b490c80477e77dde0627 Mon Sep 17 00:00:00 2001
-From: Andrey Prygunkov <hugbug@×××××××××××××××××.net>
-Date: Fri, 23 Jun 2017 23:22:49 +0200
-Subject: [PATCH] fixed #399: error when compiling without par-check
-
----
- daemon/queue/DirectRenamer.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/daemon/queue/DirectRenamer.cpp b/daemon/queue/DirectRenamer.cpp
-index 585ce941..2dd0f95b 100644
---- a/daemon/queue/DirectRenamer.cpp
-+++ b/daemon/queue/DirectRenamer.cpp
-@@ -51,6 +51,7 @@ class RenameContentAnalyzer : public ArticleContentAnalyzer
- 	bool m_parFile = false;
- };
- 
-+#ifndef DISABLE_PARCHECK
- class DirectParRepairer : public Par2::Par2Repairer
- {
- public:
-@@ -161,7 +162,7 @@ void DirectParLoader::LoadParFile(const char* parFile)
- 		m_parHashes.emplace_back(filename.c_str(), hash.c_str());
- 	}
- }
--
-+#endif
- 
- std::unique_ptr<ArticleContentAnalyzer> DirectRenamer::MakeArticleContentAnalyzer()
- {
-@@ -219,6 +220,7 @@ void DirectRenamer::FileDownloaded(DownloadQueue* downloadQueue, FileInfo* fileI
- 
- void DirectRenamer::CheckState(DownloadQueue* downloadQueue, NzbInfo* nzbInfo)
- {
-+#ifndef DISABLE_PARCHECK
- 	if (nzbInfo->GetDirectRenameStatus() > NzbInfo::tsRunning)
- 	{
- 		return;
-@@ -270,6 +272,7 @@ void DirectRenamer::CheckState(DownloadQueue* downloadQueue, NzbInfo* nzbInfo)
- 			return;
- 		}
- 	}
-+#endif
- }
- 
- // Unpause smallest par-files from each par-set

diff --git a/net-nntp/nzbget/nzbget-19.0_pre2021.ebuild b/net-nntp/nzbget/nzbget-19.0_pre2021.ebuild
deleted file mode 100644
index 6abcc452e54..00000000000
--- a/net-nntp/nzbget/nzbget-19.0_pre2021.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2017 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= )
-	)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-DOCS=( ChangeLog README nzbget.conf )
-
-S=${WORKDIR}/${PN}-${PV/_pre*/-testing}
-
-PATCHES=( "${FILESDIR}/${P}-fix-no-parcheck.patch" )
-
-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:^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:' \
-		-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 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
-}