public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-nntp/nzbget/, net-nntp/nzbget/files/
@ 2024-08-09 13:19 Louis Sautier
  0 siblings, 0 replies; 7+ messages in thread
From: Louis Sautier @ 2024-08-09 13:19 UTC (permalink / raw
  To: gentoo-commits

commit:     5c661f0ee0a47feb9da8e16ab5c0eda9f54cd7d0
Author:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  7 23:36:52 2024 +0000
Commit:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Fri Aug  9 13:19:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c661f0e

net-nntp/nzbget: add 24.2

* Add ${EPREFIX} to paths.
* Update paths for the Web UI and configuration template file in
  nzbget.conf (in addition to nzbgetd.conf where it was already done).
* Fix example nzbget.conf file installation (the build system no longer
  installs it by default, we need to do it manually).
* Drop unnecessary sed, the build system no longer attempts to install a
  config file to /usr/etc.

Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>

 net-nntp/nzbget/Manifest                           |   1 +
 ...bget-24.2-fix-getrealpath-buffer-overflow.patch | 174 +++++++++++++++++++++
 net-nntp/nzbget/nzbget-24.2.ebuild                 | 117 ++++++++++++++
 3 files changed, 292 insertions(+)

diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index 059d1d38d04c..a14970625b51 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -1,2 +1,3 @@
 DIST nzbget-21.1.tar.gz 1988916 BLAKE2B 74298c5c7f3986831f36832a8ffe596543196b5b46500925de478bf11cab8e66fb36dee9458533a4194d82123765b29e37914463d72fd206e218b4875861001a SHA512 d8dc1ad324f675c5505e623049a14c022475267aa03dcd5d8fd6cf9ed3b776cc2776077b61d035e252937ea4b6bf8f90bd33e715cfd842d2e012615df3ffeafb
 DIST nzbget-24.1.tar.gz 5365282 BLAKE2B 4fe260c361888d99eaf457a520b39560320b86d181cd12891b35962c9d4c6d773aeb389bf2254029fc58643bb5b04eb24917db9319f1a1068014feed08521dde SHA512 eb4a60cb3a529e2fb8242615e57758ceed615a573fabbe7170490e7af8c228edc90a096860ab7cf49ee85fc834cb8db30aa866c4f149679396139e54c166cf5c
+DIST nzbget-24.2.tar.gz 5512752 BLAKE2B ef4c6e562976030b790a93747d11d6b7059be7cb8bc9076068c037a0e8d25f09054ff280417b52f534af50aec0f11cd21959f995ae8252a21ea274aa7efdfc84 SHA512 ad280315f9a60bf206a134e3703337af2e2dfb8282dd5efc55af071f82f5f7e7857f819dd843f6ae70cd7fcea2c84de4db535d7658fb5255a380ffcf685a680f

diff --git a/net-nntp/nzbget/files/nzbget-24.2-fix-getrealpath-buffer-overflow.patch b/net-nntp/nzbget/files/nzbget-24.2-fix-getrealpath-buffer-overflow.patch
new file mode 100644
index 000000000000..fcaeb9a5c2d6
--- /dev/null
+++ b/net-nntp/nzbget/files/nzbget-24.2-fix-getrealpath-buffer-overflow.patch
@@ -0,0 +1,174 @@
+https://github.com/nzbgetcom/nzbget/commit/f89978f7479cbb0ff2f96c8632d9d2f31834e6c8
+
+From f89978f7479cbb0ff2f96c8632d9d2f31834e6c8 Mon Sep 17 00:00:00 2001
+From: Denis <146707790+dnzbk@users.noreply.github.com>
+Date: Wed, 7 Aug 2024 11:54:33 -0700
+Subject: [PATCH] Fixed: buffer overflow using getrealpath function (#346)
+
+- use a safer approach of using `getrealpath` according to the [doc](https://man7.org/linux/man-pages/man3/realpath.3.html)
+- using `std::string_view` instead of `std::string&` for better performance
+- improved `SystemInfoTest` to make it more flexible
+--- a/daemon/util/FileSystem.cpp
++++ b/daemon/util/FileSystem.cpp
+@@ -56,20 +56,21 @@ void FileSystem::NormalizePathSeparators(char* path)
+ 	}
+ }
+ 
+-std::optional<std::string> FileSystem::GetFileRealPath(const std::string& path)
++std::optional<std::string> FileSystem::GetFileRealPath(std::string_view path)
+ {
+-	char buffer[256];
+-
+ #ifdef WIN32
+-	DWORD len = GetFullPathName(path.c_str(), 256, buffer, nullptr);
++	char buffer[MAX_PATH];
++	DWORD len = GetFullPathName(path.data(), MAX_PATH, buffer, nullptr);
+ 	if (len != 0)
+ 	{
+-		return std::optional<std::string>{ buffer };
++		return std::optional{ buffer };
+ 	}
+ #else
+-	if (realpath(path.c_str(), buffer) != nullptr)
++	if (char* realPath = realpath(path.data(), nullptr))
+ 	{
+-		return std::optional<std::string>{ buffer };
++		std::string res = realPath;
++		free(realPath);
++		return std::optional(std::move(res));
+ 	}
+ #endif
+ 
+--- a/daemon/util/FileSystem.h
++++ b/daemon/util/FileSystem.h
+@@ -40,7 +40,7 @@ class FileSystem
+ 	static char* BaseFileName(const char* filename);
+ 	static bool SameFilename(const char* filename1, const char* filename2);
+ 	static void NormalizePathSeparators(char* path);
+-	static std::optional<std::string> GetFileRealPath(const std::string& path);
++	static std::optional<std::string> GetFileRealPath(std::string_view path);
+ 	static bool LoadFileIntoBuffer(const char* filename, CharBuffer& buffer, bool addTrailingNull);
+ 	static bool SaveBufferIntoFile(const char* filename, const char* buffer, int bufLen);
+ 	static bool AllocateFile(const char* filename, int64 size, bool sparse, CString& errmsg);
+--- a/tests/system/SystemInfoTest.cpp
++++ b/tests/system/SystemInfoTest.cpp
+@@ -28,22 +28,22 @@
+ #include "Log.h"
+ #include "DiskState.h"
+ 
+-Log* g_Log = new Log();
++Log* g_Log;
+ Options* g_Options;
+ DiskState* g_DiskState;
+ 
+-std::string GetToolsJsonStr(const std::vector<System::Tool> tools)
++std::string GetToolsJsonStr(const std::vector<System::Tool>& tools)
+ {
+ 	std::string json = "\"Tools\":[";
+ 
+ 	for (size_t i = 0; i < tools.size(); ++i)
+ 	{
+ 		std::string path = tools[i].path;
+-		for (size_t i = 0; i < path.length(); ++i) {
+-			if (path[i] == '\\')
++		for (size_t j = 0; j < path.length(); ++j) {
++			if (path[j] == '\\')
+ 			{
+-				path.insert(i, "\\");
+-				++i;
++				path.insert(j, "\\");
++				++j;
+ 			}
+ 		}
+ 
+@@ -62,7 +62,7 @@ std::string GetToolsJsonStr(const std::vector<System::Tool> tools)
+ 	return json;
+ }
+ 
+-std::string GetLibrariesJsonStr(const std::vector<System::Library> libs)
++std::string GetLibrariesJsonStr(const std::vector<System::Library>& libs)
+ {
+ 	std::string json = "\"Libraries\":[";
+ 
+@@ -82,7 +82,7 @@ std::string GetLibrariesJsonStr(const std::vector<System::Library> libs)
+ 	return json;
+ }
+ 
+-std::string GetToolsXmlStr(const std::vector<System::Tool> tools)
++std::string GetToolsXmlStr(const std::vector<System::Tool>& tools)
+ {
+ 	std::string xml = "<Tools>";
+ 
+@@ -110,7 +110,7 @@ std::string GetToolsXmlStr(const std::vector<System::Tool> tools)
+ 	return xml;
+ }
+ 
+-std::string GetLibrariesXmlStr(const std::vector<System::Library> libs)
++std::string GetLibrariesXmlStr(const std::vector<System::Library>& libs)
+ {
+ 	std::string xml = "<Libraries>";
+ 
+@@ -126,13 +126,32 @@ std::string GetLibrariesXmlStr(const std::vector<System::Library> libs)
+ 	return xml;
+ }
+ 
++std::string GetNetworkXmlStr(const System::Network& network)
++{
++	std::string res = "<Network>";
++	res += network.publicIP.empty()
++		? "<member><name>PublicIP</name><value><string/></value></member>"
++		: "<member><name>PublicIP</name><value><string>" + network.publicIP + "</string></value></member>";
++		
++	res += network.privateIP.empty()
++		? "<member><name>PrivateIP</name><value><string/></value></member>"
++		: "<member><name>PrivateIP</name><value><string>" + network.privateIP + "</string></value></member>";
++
++	res += "</Network>";
++	return res;
++}
++
+ BOOST_AUTO_TEST_CASE(SystemInfoTest)
+ {
+-	BOOST_CHECK(0 == 0);
++	Log log;
++	DiskState ds;
+ 	Options::CmdOptList cmdOpts;
+ 	cmdOpts.push_back("SevenZipCmd=7z");
+ 	cmdOpts.push_back("UnrarCmd=unrar");
+ 	Options options(&cmdOpts, nullptr);
++
++	g_Log = &log;
++	g_DiskState = &ds;
+ 	g_Options = &options;
+ 
+ 	auto sysInfo = std::make_unique<System::SystemInfo>();
+@@ -157,14 +176,25 @@ BOOST_AUTO_TEST_CASE(SystemInfoTest)
+ 		"</string></value></member>" +
+ 		"<member><name>Arch</name><value><string>" + sysInfo->GetCPUInfo().GetArch() +
+ 		"</string></value></member></CPU>" +
+-		"<Network><member><name>PublicIP</name><value><string>" + sysInfo->GetNetworkInfo().publicIP +
+-		"</string></value></member>"
+-		"<member><name>PrivateIP</name><value><string>" + sysInfo->GetNetworkInfo().privateIP +
+-		"</string></value></member></Network>" +
++		GetNetworkXmlStr(sysInfo->GetNetworkInfo()) +
+ 		GetToolsXmlStr(sysInfo->GetTools()) +
+ 		GetLibrariesXmlStr(sysInfo->GetLibraries()) +
+ 		"</struct></value>";
+ 
++	BOOST_TEST_MESSAGE("EXPECTED JSON STR: ");
++	BOOST_TEST_MESSAGE(jsonStrExpected);
++
++	BOOST_TEST_MESSAGE("RESULT JSON STR: ");
++	BOOST_TEST_MESSAGE(jsonStrResult);
++
++	BOOST_TEST_MESSAGE("EXPECTED XML STR: ");
++	BOOST_TEST_MESSAGE(xmlStrExpected);
++
++	BOOST_TEST_MESSAGE("RESULT XML STR: ");
++	BOOST_TEST_MESSAGE(xmlStrResult);
++
+ 	BOOST_CHECK(jsonStrResult == jsonStrExpected);
+ 	BOOST_CHECK(xmlStrResult == xmlStrExpected);
++
++	xmlCleanupParser();
+ }

diff --git a/net-nntp/nzbget/nzbget-24.2.ebuild b/net-nntp/nzbget/nzbget-24.2.ebuild
new file mode 100644
index 000000000000..61ab9a26e4e2
--- /dev/null
+++ b/net-nntp/nzbget/nzbget-24.2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd
+
+DESCRIPTION="A command-line based binary newsgrabber supporting .nzb files"
+HOMEPAGE="https://nzbget.com/"
+SRC_URI="https://github.com/nzbgetcom/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="gnutls ncurses +parcheck ssl test zlib"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/boost:=
+	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:= )"
+RDEPEND="
+	${DEPEND}
+	acct-user/nzbget
+	acct-group/nzbget
+"
+BDEPEND="
+	test? (
+		|| (
+			app-arch/rar
+			app-arch/unrar
+		)
+	)
+	virtual/pkgconfig
+"
+
+DOCS=( ChangeLog.md README.md nzbget.conf )
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-getrealpath-buffer-overflow.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Update the main configuration file with the correct paths
+	sed -i nzbget.conf \
+		-e "s:^WebDir=.*:WebDir=${EPREFIX}/usr/share/nzbget/webui:" \
+		-e "s:^ConfigTemplate=.*:ConfigTemplate=${EPREFIX}/usr/share/nzbget/nzbget.conf:" \
+		|| die
+	# Update the daemon-specific configuration file (used by the OpenRC and
+	# systemd services)
+	sed nzbget.conf > nzbgetd.conf \
+		-e "s:^MainDir=.*:MainDir=${EPREFIX}/var/lib/nzbget:" \
+		-e "s:^LogFile=.*:LogFile=${EPREFIX}/var/log/nzbget/nzbget.log:" \
+		-e 's:^DaemonUsername=.*:DaemonUsername=nzbget:' \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_CURSES=$(usex !ncurses)
+		-DDISABLE_PARCHECK=$(usex !parcheck)
+		-DDISABLE_TLS=$(usex !ssl)
+		-DDISABLE_GZIP=$(usex !zlib)
+		-DUSE_OPENSSL=$(usex !gnutls)
+		-DUSE_GNUTLS=$(usex gnutls)
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /etc
+	doins nzbget.conf
+	doins nzbgetd.conf
+
+	# The configuration file's "ConfigTemplate" option points to this, we must
+	# make sure it exists as the Web UI reads it. It is not installed by
+	# default, see the "install-conf" target in cmake/install.cmake.
+	insinto /usr/share/nzbget
+	doins nzbget.conf
+
+	keepdir /var/log/nzbget
+
+	newinitd "${FILESDIR}"/nzbget.initd-r1 nzbget
+	newconfd "${FILESDIR}"/nzbget.confd nzbget
+	systemd_dounit "${FILESDIR}"/nzbget.service
+}
+
+pkg_preinst() {
+	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
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-nntp/nzbget/, net-nntp/nzbget/files/
@ 2024-12-25 14:56 Louis Sautier
  0 siblings, 0 replies; 7+ messages in thread
From: Louis Sautier @ 2024-12-25 14:56 UTC (permalink / raw
  To: gentoo-commits

commit:     6a55be6fdf547412b2fcfe4567e1734fa2be8881
Author:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 25 14:49:06 2024 +0000
Commit:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Wed Dec 25 14:52:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a55be6f

net-nntp/nzbget: add 24.5

Closes: https://bugs.gentoo.org/946687
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>

 net-nntp/nzbget/Manifest                           |   2 +
 ...nzbget-24.5-build-with-par2-turbo-offline.patch |  17 +++
 net-nntp/nzbget/nzbget-24.5.ebuild                 | 136 +++++++++++++++++++++
 3 files changed, 155 insertions(+)

diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index fdff7e7c6693..e2624db7a300 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -1,3 +1,5 @@
 DIST nzbget-21.1.tar.gz 1988916 BLAKE2B 74298c5c7f3986831f36832a8ffe596543196b5b46500925de478bf11cab8e66fb36dee9458533a4194d82123765b29e37914463d72fd206e218b4875861001a SHA512 d8dc1ad324f675c5505e623049a14c022475267aa03dcd5d8fd6cf9ed3b776cc2776077b61d035e252937ea4b6bf8f90bd33e715cfd842d2e012615df3ffeafb
 DIST nzbget-24.2.tar.gz 5512752 BLAKE2B ef4c6e562976030b790a93747d11d6b7059be7cb8bc9076068c037a0e8d25f09054ff280417b52f534af50aec0f11cd21959f995ae8252a21ea274aa7efdfc84 SHA512 ad280315f9a60bf206a134e3703337af2e2dfb8282dd5efc55af071f82f5f7e7857f819dd843f6ae70cd7fcea2c84de4db535d7658fb5255a380ffcf685a680f
 DIST nzbget-24.3.tar.gz 5533518 BLAKE2B 67614aecebb28b2664ab629beddeea6c492e1f32ba71854d1812c7c4e5b41219c1773c33d5952f6e2805bf5804d3fb1e410f9c6cdc0850a4d3036d4253f9c0ba SHA512 6a79f7fcc58c494af19179b6a98d5235423fc8d3a45c6ba969cf687948da25faaf9bcec074b7c9b8ccf2d3621e6bc2dc9c2ae67e877e89fa9a00b8f3ff4ca85a
+DIST nzbget-24.5.tar.gz 7283271 BLAKE2B eb03ac8136efe3650dfd3f5e53cf2b8e3d5ffdc783d81fb53b0afd530936ffe5e7053445ed1419f1b7d21f0d496a3bca6033f63a239180f7c0978435f991de92 SHA512 d077533b14934e36d0c0cdf6cead77f631754f381b3f11f5327eb42c6954f0979d18666bb7ee36733bc0f9f6350ec9a2751d367532ca13cf02060ea30e9f3848
+DIST nzbgetcom-par2turbo-1.1.1-nzbget-20241128.tar.gz 3960077 BLAKE2B 461409c5f305029d5cd495441844de251a19e8c4b3eab184e765edef4ecbc723aa570d8daf0b282281da8577a2ab75876f3d90a02e92696e5b4fbf3768a2648a SHA512 9eea769b8d861afd30573d213d4341cb2bc201abcd2e3f68803d016d1b39b1edc92953169ceed5d626ee8ad7d655d02a0ebed92810e67bc538ceccef694599bf

diff --git a/net-nntp/nzbget/files/nzbget-24.5-build-with-par2-turbo-offline.patch b/net-nntp/nzbget/files/nzbget-24.5-build-with-par2-turbo-offline.patch
new file mode 100644
index 000000000000..2d34c583c4bf
--- /dev/null
+++ b/net-nntp/nzbget/files/nzbget-24.5-build-with-par2-turbo-offline.patch
@@ -0,0 +1,17 @@
+Patch the build system to support par2-turbo downloaded into the source
+directory.
+--- a/cmake/par2-turbo.cmake
++++ b/cmake/par2-turbo.cmake
+@@ -27,11 +27,7 @@ endif()
+ ExternalProject_add(
+ 	par2-turbo
+ 	PREFIX			par2-turbo
+-	GIT_REPOSITORY	https://github.com/nzbgetcom/par2cmdline-turbo.git
+-	GIT_TAG			v1.1.1-nzbget-20241128
+-	TLS_VERIFY		TRUE
+-	GIT_SHALLOW		TRUE
+-	GIT_PROGRESS	TRUE
++	URL par2-turbo
+ 	DOWNLOAD_EXTRACT_TIMESTAMP	TRUE
+ 	CMAKE_ARGS		${CMAKE_ARGS}
+ 	INSTALL_COMMAND	""

diff --git a/net-nntp/nzbget/nzbget-24.5.ebuild b/net-nntp/nzbget/nzbget-24.5.ebuild
new file mode 100644
index 000000000000..52304569d7ff
--- /dev/null
+++ b/net-nntp/nzbget/nzbget-24.5.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Otherwise ExternalProject_add fails, see https://github.com/nzbgetcom/nzbget/issues/460
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake systemd
+
+PAR2_TURBO_VER="1.1.1-nzbget-20241128"
+DESCRIPTION="A command-line based binary newsgrabber supporting .nzb files"
+HOMEPAGE="https://nzbget.com/"
+SRC_URI="
+	parcheck? (
+		https://github.com/nzbgetcom/par2cmdline-turbo/archive/v${PAR2_TURBO_VER}.tar.gz
+			-> nzbgetcom-par2turbo-${PAR2_TURBO_VER}.tar.gz
+	)
+	https://github.com/nzbgetcom/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="gnutls ncurses +parcheck ssl test zlib"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/boost:=
+	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:= )"
+RDEPEND="
+	${DEPEND}
+	acct-user/nzbget
+	acct-group/nzbget
+"
+BDEPEND="
+	test? (
+		|| (
+			app-arch/rar
+			app-arch/unrar
+		)
+	)
+	virtual/pkgconfig
+"
+
+DOCS=( ChangeLog.md README.md nzbget.conf )
+
+PATCHES=(
+	"${FILESDIR}/${P}-build-with-par2-turbo-offline.patch"
+)
+
+src_prepare() {
+	if use parcheck; then
+		mv "${WORKDIR}/par2cmdline-turbo-${PAR2_TURBO_VER}" par2-turbo || die
+	else
+		# See https://github.com/nzbgetcom/nzbget/issues/480
+		rm tests/postprocess/ParCheckerTest.cpp \
+			tests/postprocess/ParRenamerTest.cpp || die
+		sed -Ei '/(ParCheckerTest|ParRenamerTest)\.cpp/d' \
+			tests/postprocess/CMakeLists.txt || die
+	fi
+	cmake_src_prepare
+
+	# Update the main configuration file with the correct paths
+	sed -i nzbget.conf \
+		-e "s:^WebDir=.*:WebDir=${EPREFIX}/usr/share/nzbget/webui:" \
+		-e "s:^ConfigTemplate=.*:ConfigTemplate=${EPREFIX}/usr/share/nzbget/nzbget.conf:" \
+		|| die
+	# Update the daemon-specific configuration file (used by the OpenRC and
+	# systemd services)
+	sed nzbget.conf > nzbgetd.conf \
+		-e "s:^MainDir=.*:MainDir=${EPREFIX}/var/lib/nzbget:" \
+		-e "s:^LogFile=.*:LogFile=${EPREFIX}/var/log/nzbget/nzbget.log:" \
+		-e 's:^DaemonUsername=.*:DaemonUsername=nzbget:' \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_CURSES=$(usex !ncurses)
+		-DDISABLE_PARCHECK=$(usex !parcheck)
+		-DDISABLE_TLS=$(usex !ssl)
+		-DDISABLE_GZIP=$(usex !zlib)
+		-DUSE_OPENSSL=$(usex !gnutls)
+		-DUSE_GNUTLS=$(usex gnutls)
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /etc
+	doins nzbget.conf
+	doins nzbgetd.conf
+
+	# The configuration file's "ConfigTemplate" option points to this, we must
+	# make sure it exists as the Web UI reads it. It is not installed by
+	# default, see the "install-conf" target in cmake/install.cmake.
+	insinto /usr/share/nzbget
+	doins nzbget.conf
+
+	keepdir /var/log/nzbget
+
+	newinitd "${FILESDIR}"/nzbget.initd-r1 nzbget
+	newconfd "${FILESDIR}"/nzbget.confd nzbget
+	systemd_dounit "${FILESDIR}"/nzbget.service
+}
+
+pkg_preinst() {
+	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
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-nntp/nzbget/, net-nntp/nzbget/files/
@ 2018-10-29 22:21 Louis Sautier
  0 siblings, 0 replies; 7+ messages in thread
From: Louis Sautier @ 2018-10-29 22:21 UTC (permalink / raw
  To: gentoo-commits

commit:     895aef81080868046d66517df146ee6fb4cd034d
Author:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 29 21:49:32 2018 +0000
Commit:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Mon Oct 29 22:21:22 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=895aef81

net-nntp/nzbget: bump to 21.0_pre2220, add systemd unit

Closes: https://bugs.gentoo.org/662648
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-nntp/nzbget/Manifest                   |   1 +
 net-nntp/nzbget/files/nzbget.service       |  18 ++++
 net-nntp/nzbget/nzbget-21.0_pre2220.ebuild | 129 +++++++++++++++++++++++++++++
 3 files changed, 148 insertions(+)

diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index 28f8b04a14d..e8c20f8b3ee 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -2,3 +2,4 @@ DIST nzbget-14.1.tar.gz 1332334 BLAKE2B cbb633993ffd4c7a9cf6556ef833838296bb4d64
 DIST nzbget-19.1.tar.gz 1809849 BLAKE2B 30740c22e06f9b794485bb5c0c28cd95f9953863203a9055bf453a9adfe1e58adcf69dcddc3640c13aefb90bb26cd444070af2d9f0f6fadee676af453cdb23c2 SHA512 3ba7cd7f7fec28e29129be0a1ca5879a0593bc54be49e3776e84eeb7804377eec47106aa2371b31dec7d9152301d68b199ce9e66db714195defc8e15ef636532
 DIST nzbget-20.0.tar.gz 1925665 BLAKE2B 4c4e93bb0fa170b4b6433cbb7d27f3fa67ed033c462711b19e179f42c18dfed044c937e6a7ce4b08a620f4d7af7d3ec9245de16f15d4db8005d3d8dc4f8f46d4 SHA512 8b0fe8ea41b64be9a2f624ef0fa2a8b8987bee412db68a0e8f1b607ce6be7bfd03f60ecc5e49807f4c726e136bc5a355c44559b215fea2bd290c2eb62a0b5927
 DIST nzbget-20.0_pre2176.tar.gz 1923841 BLAKE2B ba6ba301013b160f4dcaf21257dc2c1ceac3c64c645bde556ed45e8dca5011b8d9b9ce76fbaf42b78f6400b530c4c0baa94ad34fe09daa86619506dd76333ca2 SHA512 7be68999cc284a53100c0892f7558e3e1d2ac7d83019c933ae0596de56a8c9bec78571aaf34983103a30563dcdd6387987f7a13404e0ffac48007e0d44efa525
+DIST nzbget-21.0_pre2220.tar.gz 1985190 BLAKE2B e19e1c997615f61895a26ca24ff1eb66e6caf99cecf3f3b0eccc2c0f67ebc61c20cdd24d869d8c2a1d2f0d5c53f5222cc3b151720e3a6d1398507fd252586cf5 SHA512 73cd24628ab224d62b4619ca6b9014edb08ac14f02850def3123db640c785fd8836ba4ee4be40a0cf918ba6c25bf19683e67d05aaa0f96c71ad23b6a30284fa0

diff --git a/net-nntp/nzbget/files/nzbget.service b/net-nntp/nzbget/files/nzbget.service
new file mode 100644
index 00000000000..031307e3efa
--- /dev/null
+++ b/net-nntp/nzbget/files/nzbget.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=NZBGet binary newsgrabber
+Documentation=https://nzbget.net/Documentation
+After=network.target
+
+[Service]
+User=nzbget
+Group=nzbget
+Type=forking
+PIDFile=/run/nzbget/nzbget.pid
+RuntimeDirectory=nzbget
+RuntimeDirectoryMode=0755
+ExecStart=/usr/bin/nzbget -c /etc/nzbgetd.conf -o LockFile=/run/nzbget/nzbget.pid -D
+ExecStop=/usr/bin/nzbget -c /etc/nzbgetd.conf -Q
+ExecReload=/usr/bin/nzbget -c /etc/nzbgetd.conf -O
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-nntp/nzbget/nzbget-21.0_pre2220.ebuild b/net-nntp/nzbget/nzbget-21.0_pre2220.ebuild
new file mode 100644
index 00000000000..59e359e545b
--- /dev/null
+++ b/net-nntp/nzbget/nzbget-21.0_pre2220.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils flag-o-matic user systemd
+
+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
+	systemd_dounit "${FILESDIR}"/nzbget.service
+}
+
+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
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-nntp/nzbget/, net-nntp/nzbget/files/
@ 2017-06-30 13:16 Patrice Clement
  0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2017-06-30 13:16 UTC (permalink / raw
  To: gentoo-commits

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@users.sourceforge.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
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-nntp/nzbget/, net-nntp/nzbget/files/
@ 2016-08-04  5:12 Göktürk Yüksek
  0 siblings, 0 replies; 7+ messages in thread
From: Göktürk Yüksek @ 2016-08-04  5:12 UTC (permalink / raw
  To: gentoo-commits

commit:     0c967b41cf3f8353a6addc7860cc795d06cea2f3
Author:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  4 05:06:05 2016 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Thu Aug  4 05:07:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c967b41

net-nntp/nzbget: fix tests with USE="-parcheck" for version 17.0

Package-Manager: portage-2.2.28

 .../files/nzbget-17.0_parcheck-tests-fix.patch     | 39 ++++++++++++++++++++++
 net-nntp/nzbget/nzbget-17.0.ebuild                 |  8 ++++-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/net-nntp/nzbget/files/nzbget-17.0_parcheck-tests-fix.patch b/net-nntp/nzbget/files/nzbget-17.0_parcheck-tests-fix.patch
new file mode 100644
index 0000000..8200f2b
--- /dev/null
+++ b/net-nntp/nzbget/files/nzbget-17.0_parcheck-tests-fix.patch
@@ -0,0 +1,39 @@
+From f2dcef1e5cba52bb6d06b189ec77398116bd204a Mon Sep 17 00:00:00 2001
+From: Gokturk Yuksek <gokturk@gentoo.org>
+Date: Thu, 4 Aug 2016 00:52:14 -0400
+Subject: [PATCH] Do not compile ParCheckerTest and ParRenamerTest if parcheck
+ is disabled
+
+---
+ Makefile.am | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index b2c830b..0e01087 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -217,8 +217,6 @@ nzbget_SOURCES += \
+ 	tests/main/CommandLineParserTest.cpp \
+ 	tests/main/OptionsTest.cpp \
+ 	tests/feed/FeedFilterTest.cpp \
+-	tests/postprocess/ParCheckerTest.cpp \
+-	tests/postprocess/ParRenamerTest.cpp \
+ 	tests/postprocess/DupeMatcherTest.cpp \
+ 	tests/queue/NzbFileTest.cpp \
+ 	tests/nntp/ServerPoolTest.cpp \
+@@ -226,6 +224,12 @@ nzbget_SOURCES += \
+ 	tests/util/NStringTest.cpp \
+ 	tests/util/UtilTest.cpp
+ 
++if WITH_PAR2
++nzbget_SOURCES += \
++	tests/postprocess/ParCheckerTest.cpp \
++	tests/postprocess/ParRenamerTest.cpp
++endif
++
+ AM_CPPFLAGS += \
+ 	-I$(srcdir)/lib/catch \
+ 	-I$(srcdir)/tests/suite
+-- 
+2.7.3
+

diff --git a/net-nntp/nzbget/nzbget-17.0.ebuild b/net-nntp/nzbget/nzbget-17.0.ebuild
index 4c54fbb..6b57029 100644
--- a/net-nntp/nzbget/nzbget-17.0.ebuild
+++ b/net-nntp/nzbget/nzbget-17.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-inherit eutils flag-o-matic user
+inherit autotools eutils flag-o-matic user
 
 MY_PV=${PV/_pre/-r}
 MY_P=${PN}-${PV/_pre/-testing-r}
@@ -29,6 +29,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 DOCS=( ChangeLog README nzbget.conf )
 
+PATCHES=(
+	"${FILESDIR}"/${P}_parcheck-tests-fix.patch
+)
+
 S=${WORKDIR}/${PN}-${PV/_pre*/-testing}
 
 pkg_pretend() {
@@ -42,6 +46,8 @@ pkg_pretend() {
 
 src_prepare() {
 	default
+	eautoreconf
+
 	sed -i 's:^ScriptDir=.*:ScriptDir=/usr/share/nzbget/ppscripts:' nzbget.conf || die
 
 	sed \


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-nntp/nzbget/, net-nntp/nzbget/files/
@ 2016-04-11 20:21 Patrice Clement
  0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2016-04-11 20:21 UTC (permalink / raw
  To: gentoo-commits

commit:     ae1f4b64300e37b26ec1d3a49db6a3b2380b7e86
Author:     Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Mon Apr 11 12:14:20 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 20:04:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae1f4b64

net-nntp/nzbget: bump to 17.0_pre1686

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1234

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-nntp/nzbget/Manifest                           |   2 +-
 .../nzbget/files/nzbget-14.0_pre1145-tinfo.patch   |  18 -
 .../nzbget-17.0_pre1660-add-missing-macro.patch    | 583 ---------------------
 ...0_pre1660.ebuild => nzbget-17.0_pre1686.ebuild} |  19 +-
 4 files changed, 2 insertions(+), 620 deletions(-)

diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index 8c584ac..cdb0ac9 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -2,4 +2,4 @@ DIST nzbget-14.1.tar.gz 1332334 SHA256 a16b816b61f7035cc373e9b77094ca474d5b7b7f7
 DIST nzbget-14.2.tar.gz 1332612 SHA256 bb24afb47dc01766c5e5c02d7565190082c6e13ffed565969a2ec52e21104677 SHA512 0e1e9c1307927f6ac4772d9138901893a9782fad137756ca40617ea7e8dd7946f2927f3f5303d676d09920de0a005cb1313292fda0c5d0288d73fc8e0f949516 WHIRLPOOL 7fb9c5c44515e1ed4a02213af6f8a13e41452a85a710ba9e59483c8c95b9d9bc1f2c475f81d0a75ab982292fccd5ce797f2396fe09ec7339d31ea551f3c36a4e
 DIST nzbget-15.0.tar.gz 1466814 SHA256 3ef13f3e5917e4cda19c4fc0cd37e79967a19b4e3448c239ff24e37712a6cc0a SHA512 7233bea56f99e541155eac3e1d31f2603a407aee7055492c2bf20efc9b40a58e9e5f3b7ee7dada9278cb4bdc8b30a0e62f377235e12ac43c88f9111864d3a706 WHIRLPOOL f8d53ef7637a09f1e98fe5866693bc99c96212f460b00072d5ac8164c59c9053ab8805262d97e136eccc14f6af9be220541b2ea22d01bd2ed191114cbfdcfac0
 DIST nzbget-16.4-src.tar.gz 1585908 SHA256 8e9e3ee75d2d08a8e438b2809f504a627a9334ed239579a540b75fa97bff4d0f SHA512 12ebde277abac5f719f374861013fa391f4698d850ac57c55787609fec54490fb09437c6a803fc0ca935c482ed5ccd16c525e17ba40a514f7a54316dc04ee874 WHIRLPOOL 2d1c21d45a74eaea7dcb1c99c9b409f506547189c832b432331ae2b64ee67050245acb8ff1cd522bd64460d9d7ac806b344fd0f3bbc21de4bfca12dcc815692d
-DIST nzbget-17.0_pre1660.tar.gz 1596763 SHA256 3f54ccf915572b7a1db5f5bd0188ef4eb631fe03a41efeec8b29572bbada7c5d SHA512 bd385713207166f3847ed3f50d250d809ca53ac4a267f22859c8bdb0b9be0235c94401db13fe721a16ff011b51bfaaee9b177078877b5faf8b8563633a40bd15 WHIRLPOOL bb7bddc8a7f597da01e33de8075d21bf3008cc9d08d02393e9e1719cded8ab903575997942bab389f71a4d95ccdc4602a1d099cb013d76c8c22bc8ef510835e2
+DIST nzbget-17.0_pre1686.tar.gz 1600950 SHA256 3c3ade8ad0cd6a3013e541c7cdc771fcf186f12cc30866db8e6bccc658846042 SHA512 4c7e64e44534e3a4df816ba359ccff59e409d6641fc6eb87d66a743572728ab6f62cfab5135b83de52f41fff737ef4519160a8929bab826e97230ab63e196669 WHIRLPOOL 92f205faeb027ab1467296c6d44ad5df8afc0009541006df0f50bdefe8b9ee987ac5fcf62432a43b028aed705dbb9730eba7d1faf58e666fc14e8879f79686ce

diff --git a/net-nntp/nzbget/files/nzbget-14.0_pre1145-tinfo.patch b/net-nntp/nzbget/files/nzbget-14.0_pre1145-tinfo.patch
deleted file mode 100644
index e6cd13f..0000000
--- a/net-nntp/nzbget/files/nzbget-14.0_pre1145-tinfo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -46,6 +46,7 @@
- AC_PATH_PROG(MAKE, make, $FALSE)
- AC_PROG_INSTALL
- 
-+PKG_PROG_PKG_CONFIG()
- 
- dnl
- dnl Do all tests with c++ compiler.
-@@ -291,6 +292,7 @@
- 	if test "$FOUND" = "no"; then
- 		AC_MSG_ERROR([Couldn't find curses headers (ncurses.h or curses.h)])
- 	fi
-+	PKG_CHECK_MODULES(ncurses,ncurses,LIBS="$LIBS $ncurses_LIBS",)
- 	AC_SEARCH_LIBS([refresh], [ncurses curses],, 
- 		AC_ERROR([Couldn't find curses library]))
- else

diff --git a/net-nntp/nzbget/files/nzbget-17.0_pre1660-add-missing-macro.patch b/net-nntp/nzbget/files/nzbget-17.0_pre1660-add-missing-macro.patch
deleted file mode 100644
index 6b99fc1..0000000
--- a/net-nntp/nzbget/files/nzbget-17.0_pre1660-add-missing-macro.patch
+++ /dev/null
@@ -1,583 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 96cb50b..aa15148 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -29,6 +29,7 @@ AC_CONFIG_SRCDIR([daemon/main/nzbget.cpp])
- AC_CONFIG_HEADERS([config.h])
- AM_MAINTAINER_MODE
- 
-+m4_include([posix/ax_cxx_compile_stdcxx.m4])
- 
- dnl
- dnl Set default library path, if not specified in environment variable "LIBPREF".
-diff --git a/posix/ax_cxx_compile_stdcxx.m4 b/posix/ax_cxx_compile_stdcxx.m4
-new file mode 100644
-index 0000000..f387b87
---- /dev/null
-+++ b/posix/ax_cxx_compile_stdcxx.m4
-@@ -0,0 +1,565 @@
-+# ===========================================================================
-+#   http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+#   AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional])
-+#
-+# DESCRIPTION
-+#
-+#   Check for baseline language coverage in the compiler for the specified
-+#   version of the C++ standard.  If necessary, add switches to CXXFLAGS to
-+#   enable support.  VERSION may be '11' (for the C++11 standard) or '14'
-+#   (for the C++14 standard).
-+#
-+#   The second argument, if specified, indicates whether you insist on an
-+#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
-+#   -std=c++11).  If neither is specified, you get whatever works, with
-+#   preference for an extended mode.
-+#
-+#   The third argument, if specified 'mandatory' or if left unspecified,
-+#   indicates that baseline support for the specified C++ standard is
-+#   required and that the macro should error out if no mode with that
-+#   support is found.  If specified 'optional', then configuration proceeds
-+#   regardless, after defining HAVE_CXX${VERSION} if and only if a
-+#   supporting mode is found.
-+#
-+# LICENSE
-+#
-+#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-+#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
-+#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
-+#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
-+#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
-+#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
-+#
-+#   Copying and distribution of this file, with or without modification, are
-+#   permitted in any medium without royalty provided the copyright notice
-+#   and this notice are preserved.  This file is offered as-is, without any
-+#   warranty.
-+
-+#serial 1
-+
-+dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
-+dnl  (serial version number 13).
-+
-+AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
-+  m4_if([$1], [11], [],
-+        [$1], [14], [],
-+        [$1], [17], [m4_fatal([support for C++17 not yet implemented in AX_CXX_COMPILE_STDCXX])],
-+        [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
-+  m4_if([$2], [], [],
-+        [$2], [ext], [],
-+        [$2], [noext], [],
-+        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl
-+  m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true],
-+        [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true],
-+        [$3], [optional], [ax_cxx_compile_cxx$1_required=false],
-+        [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
-+  AC_LANG_PUSH([C++])dnl
-+  ac_success=no
-+  AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
-+  ax_cv_cxx_compile_cxx$1,
-+  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-+    [ax_cv_cxx_compile_cxx$1=yes],
-+    [ax_cv_cxx_compile_cxx$1=no])])
-+  if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
-+    ac_success=yes
-+  fi
-+
-+  m4_if([$2], [ext], [], [dnl
-+  if test x$ac_success = xno; then
-+    dnl HP's aCC needs +std=c++11 according to:
-+    dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
-+    dnl Cray's crayCC needs "-h std=c++11"
-+    for switch in -std=c++$1 -std=c++0x +std=c++$1 "-h std=c++$1"; do
-+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-+      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-+                     $cachevar,
-+        [ac_save_CXXFLAGS="$CXXFLAGS"
-+         CXXFLAGS="$CXXFLAGS $switch"
-+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-+          [eval $cachevar=yes],
-+          [eval $cachevar=no])
-+         CXXFLAGS="$ac_save_CXXFLAGS"])
-+      if eval test x\$$cachevar = xyes; then
-+        CXXFLAGS="$CXXFLAGS $switch"
-+        ac_success=yes
-+        break
-+      fi
-+    done
-+  fi])
-+
-+  m4_if([$2], [noext], [], [dnl
-+  if test x$ac_success = xno; then
-+    for switch in -std=gnu++$1 -std=gnu++0x; do
-+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-+      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-+                     $cachevar,
-+        [ac_save_CXXFLAGS="$CXXFLAGS"
-+         CXXFLAGS="$CXXFLAGS $switch"
-+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-+          [eval $cachevar=yes],
-+          [eval $cachevar=no])
-+         CXXFLAGS="$ac_save_CXXFLAGS"])
-+      if eval test x\$$cachevar = xyes; then
-+        CXXFLAGS="$CXXFLAGS $switch"
-+        ac_success=yes
-+        break
-+      fi
-+    done
-+  fi])
-+
-+  AC_LANG_POP([C++])
-+  if test x$ax_cxx_compile_cxx$1_required = xtrue; then
-+    if test x$ac_success = xno; then
-+      AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.])
-+    fi
-+  else
-+    if test x$ac_success = xno; then
-+      HAVE_CXX$1=0
-+      AC_MSG_NOTICE([No compiler with C++$1 support was found])
-+    else
-+      HAVE_CXX$1=1
-+      AC_DEFINE(HAVE_CXX$1,1,
-+                [define if the compiler supports basic C++$1 syntax])
-+    fi
-+
-+    AC_SUBST(HAVE_CXX$1)
-+  fi
-+])
-+
-+
-+dnl  Test body for checking C++11 support
-+
-+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11],
-+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-+)
-+
-+
-+dnl  Test body for checking C++14 support
-+
-+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
-+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-+)
-+
-+
-+dnl  Tests for new features in C++11
-+
-+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
-+
-+// If the compiler admits that it is not ready for C++11, why torture it?
-+// Hopefully, this will speed up the test.
-+
-+#ifndef __cplusplus
-+
-+#error "This is not a C++ compiler"
-+
-+#elif __cplusplus < 201103L
-+
-+#error "This is not a C++11 compiler"
-+
-+#else
-+
-+namespace cxx11
-+{
-+
-+  namespace test_static_assert
-+  {
-+
-+    template <typename T>
-+    struct check
-+    {
-+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-+    };
-+
-+  }
-+
-+  namespace test_final_override
-+  {
-+
-+    struct Base
-+    {
-+      virtual void f() {}
-+    };
-+
-+    struct Derived : public Base
-+    {
-+      virtual void f() override {}
-+    };
-+
-+  }
-+
-+  namespace test_double_right_angle_brackets
-+  {
-+
-+    template < typename T >
-+    struct check {};
-+
-+    typedef check<void> single_type;
-+    typedef check<check<void>> double_type;
-+    typedef check<check<check<void>>> triple_type;
-+    typedef check<check<check<check<void>>>> quadruple_type;
-+
-+  }
-+
-+  namespace test_decltype
-+  {
-+
-+    int
-+    f()
-+    {
-+      int a = 1;
-+      decltype(a) b = 2;
-+      return a + b;
-+    }
-+
-+  }
-+
-+  namespace test_type_deduction
-+  {
-+
-+    template < typename T1, typename T2 >
-+    struct is_same
-+    {
-+      static const bool value = false;
-+    };
-+
-+    template < typename T >
-+    struct is_same<T, T>
-+    {
-+      static const bool value = true;
-+    };
-+
-+    template < typename T1, typename T2 >
-+    auto
-+    add(T1 a1, T2 a2) -> decltype(a1 + a2)
-+    {
-+      return a1 + a2;
-+    }
-+
-+    int
-+    test(const int c, volatile int v)
-+    {
-+      static_assert(is_same<int, decltype(0)>::value == true, "");
-+      static_assert(is_same<int, decltype(c)>::value == false, "");
-+      static_assert(is_same<int, decltype(v)>::value == false, "");
-+      auto ac = c;
-+      auto av = v;
-+      auto sumi = ac + av + 'x';
-+      auto sumf = ac + av + 1.0;
-+      static_assert(is_same<int, decltype(ac)>::value == true, "");
-+      static_assert(is_same<int, decltype(av)>::value == true, "");
-+      static_assert(is_same<int, decltype(sumi)>::value == true, "");
-+      static_assert(is_same<int, decltype(sumf)>::value == false, "");
-+      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
-+      return (sumf > 0.0) ? sumi : add(c, v);
-+    }
-+
-+  }
-+
-+  namespace test_noexcept
-+  {
-+
-+    int f() { return 0; }
-+    int g() noexcept { return 0; }
-+
-+    static_assert(noexcept(f()) == false, "");
-+    static_assert(noexcept(g()) == true, "");
-+
-+  }
-+
-+  namespace test_constexpr
-+  {
-+
-+    template < typename CharT >
-+    unsigned long constexpr
-+    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
-+    {
-+      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
-+    }
-+
-+    template < typename CharT >
-+    unsigned long constexpr
-+    strlen_c(const CharT *const s) noexcept
-+    {
-+      return strlen_c_r(s, 0UL);
-+    }
-+
-+    static_assert(strlen_c("") == 0UL, "");
-+    static_assert(strlen_c("1") == 1UL, "");
-+    static_assert(strlen_c("example") == 7UL, "");
-+    static_assert(strlen_c("another\0example") == 7UL, "");
-+
-+  }
-+
-+  namespace test_rvalue_references
-+  {
-+
-+    template < int N >
-+    struct answer
-+    {
-+      static constexpr int value = N;
-+    };
-+
-+    answer<1> f(int&)       { return answer<1>(); }
-+    answer<2> f(const int&) { return answer<2>(); }
-+    answer<3> f(int&&)      { return answer<3>(); }
-+
-+    void
-+    test()
-+    {
-+      int i = 0;
-+      const int c = 0;
-+      static_assert(decltype(f(i))::value == 1, "");
-+      static_assert(decltype(f(c))::value == 2, "");
-+      static_assert(decltype(f(0))::value == 3, "");
-+    }
-+
-+  }
-+
-+  namespace test_uniform_initialization
-+  {
-+
-+    struct test
-+    {
-+      static const int zero {};
-+      static const int one {1};
-+    };
-+
-+    static_assert(test::zero == 0, "");
-+    static_assert(test::one == 1, "");
-+
-+  }
-+
-+  namespace test_lambdas
-+  {
-+
-+    void
-+    test1()
-+    {
-+      auto lambda1 = [](){};
-+      auto lambda2 = lambda1;
-+      lambda1();
-+      lambda2();
-+    }
-+
-+    int
-+    test2()
-+    {
-+      auto a = [](int i, int j){ return i + j; }(1, 2);
-+      auto b = []() -> int { return '0'; }();
-+      auto c = [=](){ return a + b; }();
-+      auto d = [&](){ return c; }();
-+      auto e = [a, &b](int x) mutable {
-+        const auto identity = [](int y){ return y; };
-+        for (auto i = 0; i < a; ++i)
-+          a += b--;
-+        return x + identity(a + b);
-+      }(0);
-+      return a + b + c + d + e;
-+    }
-+
-+    int
-+    test3()
-+    {
-+      const auto nullary = [](){ return 0; };
-+      const auto unary = [](int x){ return x; };
-+      using nullary_t = decltype(nullary);
-+      using unary_t = decltype(unary);
-+      const auto higher1st = [](nullary_t f){ return f(); };
-+      const auto higher2nd = [unary](nullary_t f1){
-+        return [unary, f1](unary_t f2){ return f2(unary(f1())); };
-+      };
-+      return higher1st(nullary) + higher2nd(nullary)(unary);
-+    }
-+
-+  }
-+
-+  namespace test_variadic_templates
-+  {
-+
-+    template <int...>
-+    struct sum;
-+
-+    template <int N0, int... N1toN>
-+    struct sum<N0, N1toN...>
-+    {
-+      static constexpr auto value = N0 + sum<N1toN...>::value;
-+    };
-+
-+    template <>
-+    struct sum<>
-+    {
-+      static constexpr auto value = 0;
-+    };
-+
-+    static_assert(sum<>::value == 0, "");
-+    static_assert(sum<1>::value == 1, "");
-+    static_assert(sum<23>::value == 23, "");
-+    static_assert(sum<1, 2>::value == 3, "");
-+    static_assert(sum<5, 5, 11>::value == 21, "");
-+    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
-+
-+  }
-+
-+  // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
-+  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
-+  // because of this.
-+  namespace test_template_alias_sfinae
-+  {
-+
-+    struct foo {};
-+
-+    template<typename T>
-+    using member = typename T::member_type;
-+
-+    template<typename T>
-+    void func(...) {}
-+
-+    template<typename T>
-+    void func(member<T>*) {}
-+
-+    void test();
-+
-+    void test() { func<foo>(0); }
-+
-+  }
-+
-+}  // namespace cxx11
-+
-+#endif  // __cplusplus >= 201103L
-+
-+]])
-+
-+
-+dnl  Tests for new features in C++14
-+
-+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[
-+
-+// If the compiler admits that it is not ready for C++14, why torture it?
-+// Hopefully, this will speed up the test.
-+
-+#ifndef __cplusplus
-+
-+#error "This is not a C++ compiler"
-+
-+//check for full C++14 support (disabed)
-+//#elif __cplusplus < 201402L
-+
-+// check for partial C++14 support (accept gcc 4.9)
-+#elif __cplusplus < 201300L
-+
-+#error "This is not a C++14 compiler"
-+
-+#else
-+
-+namespace cxx14
-+{
-+
-+  namespace test_polymorphic_lambdas
-+  {
-+
-+    int
-+    test()
-+    {
-+      const auto lambda = [](auto&&... args){
-+        const auto istiny = [](auto x){
-+          return (sizeof(x) == 1UL) ? 1 : 0;
-+        };
-+        const int aretiny[] = { istiny(args)... };
-+        return aretiny[0];
-+      };
-+      return lambda(1, 1L, 1.0f, '1');
-+    }
-+
-+  }
-+
-+  namespace test_binary_literals
-+  {
-+
-+    constexpr auto ivii = 0b0000000000101010;
-+    static_assert(ivii == 42, "wrong value");
-+
-+  }
-+
-+/*
-+  namespace test_generalized_constexpr
-+  {
-+
-+    template < typename CharT >
-+    constexpr unsigned long
-+    strlen_c(const CharT *const s) noexcept
-+    {
-+      auto length = 0UL;
-+      for (auto p = s; *p; ++p)
-+        ++length;
-+      return length;
-+    }
-+
-+    static_assert(strlen_c("") == 0UL, "");
-+    static_assert(strlen_c("x") == 1UL, "");
-+    static_assert(strlen_c("test") == 4UL, "");
-+    static_assert(strlen_c("another\0test") == 7UL, "");
-+
-+  }
-+*/
-+
-+  namespace test_lambda_init_capture
-+  {
-+
-+    int
-+    test()
-+    {
-+      auto x = 0;
-+      const auto lambda1 = [a = x](int b){ return a + b; };
-+      const auto lambda2 = [a = lambda1(x)](){ return a; };
-+      return lambda2();
-+    }
-+
-+  }
-+
-+  namespace test_digit_seperators
-+  {
-+
-+    constexpr auto ten_million = 100'000'000;
-+    static_assert(ten_million == 100000000, "");
-+
-+  }
-+
-+  namespace test_return_type_deduction
-+  {
-+
-+    auto f(int& x) { return x; }
-+    decltype(auto) g(int& x) { return x; }
-+
-+    template < typename T1, typename T2 >
-+    struct is_same
-+    {
-+      static constexpr auto value = false;
-+    };
-+
-+    template < typename T >
-+    struct is_same<T, T>
-+    {
-+      static constexpr auto value = true;
-+    };
-+
-+    int
-+    test()
-+    {
-+      auto x = 0;
-+      static_assert(is_same<int, decltype(f(x))>::value, "");
-+      static_assert(is_same<int&, decltype(g(x))>::value, "");
-+      return x;
-+    }
-+
-+  }
-+
-+}  // namespace cxx14
-+
-+#endif  // __cplusplus >= 201402L
-+
-+]])

diff --git a/net-nntp/nzbget/nzbget-17.0_pre1660.ebuild b/net-nntp/nzbget/nzbget-17.0_pre1686.ebuild
similarity index 84%
rename from net-nntp/nzbget/nzbget-17.0_pre1660.ebuild
rename to net-nntp/nzbget/nzbget-17.0_pre1686.ebuild
index 55dbe80..9177f7a 100644
--- a/net-nntp/nzbget/nzbget-17.0_pre1660.ebuild
+++ b/net-nntp/nzbget/nzbget-17.0_pre1686.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-inherit autotools eutils flag-o-matic user
+inherit eutils flag-o-matic user
 
 MY_PV=${PV/_pre/-r}
 MY_P=${PN}-${PV/_pre/-testing-r}
@@ -31,17 +31,6 @@ DOCS=( ChangeLog README nzbget.conf )
 
 S=${WORKDIR}/${PN}-${PV/_pre*/-testing}
 
-# Fix linking for ncurses[tinfo]
-# https://github.com/nzbget/nzbget/issues/188
-# https://bugs.gentoo.org/527262
-
-# Add a missing autoconf macro
-# https://github.com/nzbget/nzbget/pull/189
-PATCHES=(
-	"${FILESDIR}/${PN}-14.0_pre1145-tinfo.patch"
-	"${FILESDIR}/${PN}-17.0_pre1660-add-missing-macro.patch"
-)
-
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]] && ! test-flag-CXX -std=c++14; then
 		eerror "${P} requires a C++14-capable compiler. Your current compiler"
@@ -63,12 +52,6 @@ src_prepare() {
 		-e 's:^ConfigTemplate=.*:ConfigTemplate=/usr/share/nzbget/nzbget.conf:' \
 		-e 's:^DaemonUsername=.*:DaemonUsername=nzbget:' \
 		nzbget.conf > nzbgetd.conf || die
-
-	# Don't install a duplicate README which causes make install to fail
-	# https://github.com/nzbget/nzbget/issues/135
-	sed -i "\|^\tlib/par2/README|d" Makefile.am || die
-
-	eautoreconf
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-nntp/nzbget/, net-nntp/nzbget/files/
@ 2015-08-28  6:58 Tim Harder
  0 siblings, 0 replies; 7+ messages in thread
From: Tim Harder @ 2015-08-28  6:58 UTC (permalink / raw
  To: gentoo-commits

commit:     d0b14557188ff42ecb2cf870c7b8c64eacf0d1fc
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 06:57:08 2015 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 06:57:08 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0b14557

net-nntp/nzbget: remove old

 net-nntp/nzbget/Manifest                           |   5 -
 net-nntp/nzbget/files/nzbget-11.0-header.patch     |  10 --
 .../files/nzbget-13.0_pre1042-gzip-endif.patch     |  18 ----
 .../files/nzbget-9.0_pre477-buffer-overflows.patch |  42 --------
 net-nntp/nzbget/nzbget-10.2.ebuild                 | 110 ---------------------
 net-nntp/nzbget/nzbget-11.0.ebuild                 | 108 --------------------
 net-nntp/nzbget/nzbget-12.0-r1.ebuild              | 106 --------------------
 net-nntp/nzbget/nzbget-13.0.ebuild                 | 108 --------------------
 net-nntp/nzbget/nzbget-14.0.ebuild                 | 107 --------------------
 9 files changed, 614 deletions(-)

diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index 43534e4..aa2c14f 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -1,7 +1,2 @@
-DIST nzbget-10.2.tar.gz 671808 SHA256 c9b878744c162e7721ffc8b048a2e4550a8ed8da6e706ee4cbd026ed2d612ec2 SHA512 be37d8a3a1a7899885a4186dba3bf5cee46ef325c60a0e09e9102a38f5b7694bf6e02d0794cb68a226111f4813c4d61354790710340b446edca5216f3c441b01 WHIRLPOOL 14e82696dc410caedba4b56f4c0dbab11533b981b2e5d98440de47467982d14817cb697893c0eedef4095b0dffb821bf5a878db86928b1df2afb6b88065a1990
-DIST nzbget-11.0.tar.gz 694197 SHA256 27abacf6c604969dc987b7e50689caef22a65dbb1690b020b0c6d147ae123b3d SHA512 ea3d16abb1cb0b31691c9ce5493276c6e5432f72c52ad05a7fc8ed72aafd251a725d4c87454430243cea6d79d1bd19fdfad8699727a7bd44917ad1d7bf75e323 WHIRLPOOL 5fec598b9c4441873b8d220454fb911c99e0a52a3ab45220583bced347918175cdc7a348fbddd85b2514798d4aa711941932d2fcb0df3cb9f59355070ecc5be7
-DIST nzbget-12.0.tar.gz 1114126 SHA256 023c4e3b9c7e920d9ea72b60135b438ce13543454f79984c06fd15365b9a882e SHA512 2b6be81ea60108fdb609738eb719e98af97ffcab706a5c38b6b668ff85d42609f5a3eb85f0e2dc97547bf88ef249fa9060ef4583c0b57ac7fb39e139fa897294 WHIRLPOOL 62fcdb1d9bf9a39f52aef1087ecfcc5158089a73955e357288ab6bb387c7fd0987a8178ece2424634e28478af29fdf086b622730b93771970d7f297bfe11a5be
-DIST nzbget-13.0.tar.gz 1229936 SHA256 666f5244f31f10333a18450e7a6c1ac729ac68594042236711ba99dd32e78f8e SHA512 f7b38002551a7580267f47f0fa902744c27ed497b4f2a53c34c1ac463e3d54e25c9f6b9e59ac1b8861a3f7f933fcb5d0badd3819be15cc52d615f086c6297377 WHIRLPOOL eae4a4281ff06f8d3d816f913a43f4d07331a948aae7181f9e7e365a8132ee39765626a5a11926b1078db69655146620c7690952101ab128999e0e98046bf50e
-DIST nzbget-14.0.tar.gz 1333744 SHA256 41d243617f3523dcba86676ff1193fa361562aecdfa100ebc01bf57bc26d38e5 SHA512 98433a5bb6ca3b06bbd3d67fbd12c96a84140fb1ae64b9001dec17b55d2ac1cb25e7e1bd0849e0b7bdbdc03243b4b9e7b2fb7b3ecade67bd98376504e3822225 WHIRLPOOL 02e07e18a81f215ec9df540f91a6487a45220d7e72d73f490754ffc1b98ae40bd11ab174e3b5044de1e9faadc67c396791183d27d4614d9933eecf3766ef065a
 DIST nzbget-14.1.tar.gz 1332334 SHA256 a16b816b61f7035cc373e9b77094ca474d5b7b7f7ceff5fa8818249181db4b18 SHA512 fae938529bb3968c0161f63ec3af07f844a8128b61abf6298457a4878ac0d47541d76730c8a068509fa091b102de07c9d28dcd668a8192fcfac60980f69be56d WHIRLPOOL 9e9636b67d0af7780d2cc8f897465f5a2e23cd8695b3bd982e3e9f78d68adb34f84faf59253044c7b2f95db737cf59207b35cf312d1f1825fe4b9ecce2e4014f
 DIST nzbget-14.2.tar.gz 1332612 SHA256 bb24afb47dc01766c5e5c02d7565190082c6e13ffed565969a2ec52e21104677 SHA512 0e1e9c1307927f6ac4772d9138901893a9782fad137756ca40617ea7e8dd7946f2927f3f5303d676d09920de0a005cb1313292fda0c5d0288d73fc8e0f949516 WHIRLPOOL 7fb9c5c44515e1ed4a02213af6f8a13e41452a85a710ba9e59483c8c95b9d9bc1f2c475f81d0a75ab982292fccd5ce797f2396fe09ec7339d31ea551f3c36a4e

diff --git a/net-nntp/nzbget/files/nzbget-11.0-header.patch b/net-nntp/nzbget/files/nzbget-11.0-header.patch
deleted file mode 100644
index ad65208..0000000
--- a/net-nntp/nzbget/files/nzbget-11.0-header.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- nzbget-11.0/ParCoordinator.cpp
-+++ nzbget-11.0/ParCoordinator.cpp
-@@ -35,6 +35,7 @@
- #include <string.h>
- #include <stdio.h>
- #include <stdarg.h>
-+#include <ctype.h>
- #ifdef WIN32
- #include <direct.h>
- #else

diff --git a/net-nntp/nzbget/files/nzbget-13.0_pre1042-gzip-endif.patch b/net-nntp/nzbget/files/nzbget-13.0_pre1042-gzip-endif.patch
deleted file mode 100644
index be09a1e..0000000
--- a/net-nntp/nzbget/files/nzbget-13.0_pre1042-gzip-endif.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: daemon/util/Util.cpp
-===================================================================
---- daemon/util/Util.cpp	(revision 1046)
-+++ daemon/util/Util.cpp	(working copy)
-@@ -2368,6 +2368,7 @@
- 
- 	return zlError;
- }
-+#endif
- 
- Tokenizer::Tokenizer(const char* szDataString, const char* szSeparators)
- {
-@@ -2423,5 +2424,3 @@
- 	}
- 	return szToken;
- }
--
--#endif

diff --git a/net-nntp/nzbget/files/nzbget-9.0_pre477-buffer-overflows.patch b/net-nntp/nzbget/files/nzbget-9.0_pre477-buffer-overflows.patch
deleted file mode 100644
index ca26fc1..0000000
--- a/net-nntp/nzbget/files/nzbget-9.0_pre477-buffer-overflows.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- nzbget-9.0-testing/RemoteClient.cpp
-+++ nzbget-9.0-testing/RemoteClient.cpp
-@@ -541,20 +541,20 @@
- 				{
- 					if (szParameters[0] == '\0')
- 					{
--						strncat(szParameters, " (", 1024);
-+						strncat(szParameters, " (", sizeof(szParameters) - strlen(szParameters) - 1);
- 					}
- 					else
- 					{
--						strncat(szParameters, ", ", 1024);
-+						strncat(szParameters, ", ", sizeof(szParameters) - strlen(szParameters) - 1);
- 					}
- 					NZBParameter* pNZBParameter = *it;
--					strncat(szParameters, pNZBParameter->GetName(), 1024);
--					strncat(szParameters, "=", 1024);
--					strncat(szParameters, pNZBParameter->GetValue(), 1024);
-+					strncat(szParameters, pNZBParameter->GetName(), sizeof(szParameters) - strlen(szParameters) - 1);
-+					strncat(szParameters, "=", sizeof(szParameters) - strlen(szParameters) - 1);
-+					strncat(szParameters, pNZBParameter->GetValue(), sizeof(szParameters) - strlen(szParameters) - 1);
- 				}
- 				if (szParameters[0] != '\0')
- 				{
--					strncat(szParameters, ")", 1024);
-+					strncat(szParameters, ")", sizeof(szParameters) - strlen(szParameters) - 1);
- 				}
- 
- 				if (!szPattern || ((MatchedNZBInfo*)pGroupInfo->GetNZBInfo())->m_bMatch)
-@@ -672,10 +672,10 @@
- 
- 	if (ntohl(ListResponse.m_iPostJobCount) > 0 || ntohl(ListResponse.m_bPostPaused))
- 	{
--		strncat(szServerState, strlen(szServerState) > 0 ? ", Post-Processing" : "Post-Processing", sizeof(szServerState));
-+		strncat(szServerState, strlen(szServerState) > 0 ? ", Post-Processing" : "Post-Processing", sizeof(szServerState) - strlen(szServerState) - 1);
- 		if (ntohl(ListResponse.m_bPostPaused))
- 		{
--			strncat(szServerState, " paused", sizeof(szServerState));
-+			strncat(szServerState, " paused", sizeof(szServerState) - strlen(szServerState) - 1);
- 		}
- 	}
- 

diff --git a/net-nntp/nzbget/nzbget-10.2.ebuild b/net-nntp/nzbget/nzbget-10.2.ebuild
deleted file mode 100644
index ac4d3cd..0000000
--- a/net-nntp/nzbget/nzbget-10.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools user
-
-MY_P=${P/_pre/-testing-r}
-
-DESCRIPTION="A command-line based binary newsgrapper supporting .nzb files"
-HOMEPAGE="http://nzbget.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug gnutls ncurses parcheck ssl zlib "
-
-RDEPEND="dev-libs/libxml2
-	ncurses? ( sys-libs/ncurses )
-	parcheck? (
-		app-arch/libpar2
-		dev-libs/libsigc++:2
-	)
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( dev-libs/openssl )
-	)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README nzbget.conf )
-
-S=${WORKDIR}/${P/_pre*/-testing}
-
-src_prepare() {
-	sed -i 's:^PostProcess=.*:#PostProcess=/usr/share/nzbget/nzbget-postprocess.sh:' \
-		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:' \
-		"${S}"/nzbget.conf > "${S}"/nzbgetd.conf || die
-
-	sed -i "/^dist_doc_DATA/d" Makefile.am || die
-
-	epatch "${FILESDIR}"/${PN}-9.0_pre477-buffer-overflows.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable ncurses curses) \
-		$(use_enable parcheck) \
-		--disable-libpar2-bugfixes-check \
-		$(use_enable ssl tls) \
-		$(use_enable zlib gzip) \
-		--with-tlslib=$(usex gnutls GnuTLS OpenSSL)
-}
-
-src_install() {
-	default
-
-	# remove unneeded service script
-	rm "${D}"/usr/sbin/nzbgetd || die
-
-	insinto /etc
-	doins nzbget.conf
-	doins nzbgetd.conf
-
-	exeinto /usr/share/nzbget
-	doexe nzbget-postprocess.sh
-
-	# remove duplicate script/config
-	rm "${D}"/usr/share/nzbget/nzbget.conf
-	rm "${D}"/usr/bin/nzbget-postprocess.sh
-
-	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 root:nzbget /etc/nzbgetd.conf
-	fperms 640 /etc/nzbgetd.conf
-}
-
-pkg_postinst() {
-	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
-}

diff --git a/net-nntp/nzbget/nzbget-11.0.ebuild b/net-nntp/nzbget/nzbget-11.0.ebuild
deleted file mode 100644
index ed47010..0000000
--- a/net-nntp/nzbget/nzbget-11.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools user
-
-MY_P=${P/_pre/-testing-r}
-
-DESCRIPTION="A command-line based binary newsgrapper supporting .nzb files"
-HOMEPAGE="http://nzbget.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug gnutls ncurses parcheck ssl zlib "
-
-RDEPEND="dev-libs/libxml2
-	ncurses? ( sys-libs/ncurses )
-	parcheck? (
-		app-arch/libpar2
-		dev-libs/libsigc++:2
-	)
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( dev-libs/openssl )
-	)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README nzbget.conf )
-
-S=${WORKDIR}/${P/_pre*/-testing}
-
-src_prepare() {
-	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:' \
-		"${S}"/nzbget.conf > "${S}"/nzbgetd.conf || die
-
-	sed -i "/^dist_doc_DATA/d" Makefile.am || die
-
-	epatch "${FILESDIR}"/${PN}-9.0_pre477-buffer-overflows.patch
-	epatch "${FILESDIR}"/${P}-header.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable ncurses curses) \
-		$(use_enable parcheck) \
-		--disable-libpar2-bugfixes-check \
-		$(use_enable ssl tls) \
-		$(use_enable zlib gzip) \
-		--with-tlslib=$(usex gnutls GnuTLS OpenSSL)
-}
-
-src_install() {
-	default
-
-	# remove unneeded service script
-	rm "${D}"/usr/sbin/nzbgetd || die
-
-	insinto /etc
-	doins nzbget.conf
-	doins nzbgetd.conf
-
-	# remove duplicate script/config
-	rm "${D}"/usr/share/nzbget/nzbget.conf || die
-
-	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 root: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-12.0-r1.ebuild b/net-nntp/nzbget/nzbget-12.0-r1.ebuild
deleted file mode 100644
index a64db31..0000000
--- a/net-nntp/nzbget/nzbget-12.0-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools user
-
-MY_P=${P/_pre/-testing-r}
-
-DESCRIPTION="A command-line based binary newsgrapper supporting .nzb files"
-HOMEPAGE="http://nzbget.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug gnutls ncurses parcheck ssl zlib"
-
-RDEPEND="dev-libs/libxml2
-	ncurses? ( sys-libs/ncurses )
-	parcheck? (
-		app-arch/libpar2
-		dev-libs/libsigc++:2
-	)
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( dev-libs/openssl )
-	)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README nzbget.conf )
-
-S=${WORKDIR}/${P/_pre*/-testing}
-
-src_prepare() {
-	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:' \
-		"${S}"/nzbget.conf > "${S}"/nzbgetd.conf || die
-
-	sed -i "/^dist_doc_DATA/d" Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable ncurses curses) \
-		$(use_enable parcheck) \
-		--disable-libpar2-bugfixes-check \
-		$(use_enable ssl tls) \
-		$(use_enable zlib gzip) \
-		--with-tlslib=$(usex gnutls GnuTLS OpenSSL)
-}
-
-src_install() {
-	default
-
-	# remove unneeded service script
-	rm "${D}"/usr/sbin/nzbgetd || die
-
-	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
-}

diff --git a/net-nntp/nzbget/nzbget-13.0.ebuild b/net-nntp/nzbget/nzbget-13.0.ebuild
deleted file mode 100644
index 74faece..0000000
--- a/net-nntp/nzbget/nzbget-13.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools user eutils
-
-MY_P=${P/_pre/-testing-r}
-
-DESCRIPTION="A command-line based binary newsgrapper supporting .nzb files"
-HOMEPAGE="http://nzbget.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug gnutls ncurses parcheck ssl zlib"
-
-RDEPEND="dev-libs/libxml2
-	ncurses? ( sys-libs/ncurses )
-	parcheck? (
-		app-arch/libpar2
-		dev-libs/libsigc++:2
-	)
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( dev-libs/openssl )
-	)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README nzbget.conf )
-
-S=${WORKDIR}/${P/_pre*/-testing}
-
-src_prepare() {
-	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:' \
-		"${S}"/nzbget.conf > "${S}"/nzbgetd.conf || die
-
-	sed -i "/^dist_doc_DATA/d" Makefile.am || die
-
-	epatch "${FILESDIR}"/${PN}-13.0_pre1042-gzip-endif.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable ncurses curses) \
-		$(use_enable parcheck) \
-		--disable-libpar2-bugfixes-check \
-		$(use_enable ssl tls) \
-		$(use_enable zlib gzip) \
-		--with-tlslib=$(usex gnutls GnuTLS OpenSSL)
-}
-
-src_install() {
-	default
-
-	# remove unneeded service script
-	rm "${D}"/usr/sbin/nzbgetd || die
-
-	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
-}

diff --git a/net-nntp/nzbget/nzbget-14.0.ebuild b/net-nntp/nzbget/nzbget-14.0.ebuild
deleted file mode 100644
index e4ca456..0000000
--- a/net-nntp/nzbget/nzbget-14.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils user
-
-MY_P=${P/_pre/-testing-r}
-
-DESCRIPTION="A command-line based binary newsgrapper supporting .nzb files"
-HOMEPAGE="http://nzbget.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug gnutls ncurses parcheck ssl zlib"
-
-RDEPEND="dev-libs/libxml2
-	ncurses? ( sys-libs/ncurses )
-	parcheck? (
-		app-arch/libpar2
-		dev-libs/libsigc++:2
-	)
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( dev-libs/openssl )
-	)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README nzbget.conf )
-
-S=${WORKDIR}/${P/_pre*/-testing}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-14.0_pre1145-tinfo.patch
-
-	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:' \
-		"${S}"/nzbget.conf > "${S}"/nzbgetd.conf || die
-
-	sed -i "/^dist_doc_DATA/d" Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable ncurses curses) \
-		$(use_enable parcheck) \
-		$(use_enable ssl tls) \
-		$(use_enable zlib gzip) \
-		--with-tlslib=$(usex gnutls GnuTLS OpenSSL)
-}
-
-src_install() {
-	default
-
-	# remove unneeded service script
-	rm "${D}"/usr/sbin/nzbgetd || die
-
-	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
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-12-25 14:56 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-09 13:19 [gentoo-commits] repo/gentoo:master commit in: net-nntp/nzbget/, net-nntp/nzbget/files/ Louis Sautier
  -- strict thread matches above, loose matches on Subject: below --
2024-12-25 14:56 Louis Sautier
2018-10-29 22:21 Louis Sautier
2017-06-30 13:16 Patrice Clement
2016-08-04  5:12 Göktürk Yüksek
2016-04-11 20:21 Patrice Clement
2015-08-28  6:58 Tim Harder

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox