diff options
| author |   Göktürk Yüksek <gokturk@gentoo.org> | 2016-08-04 01:06:05 -0400 |
|---|---|---|
| committer | Göktürk Yüksek <gokturk@gentoo.org> | 2016-08-04 01:07:03 -0400 |
| commit | 0c967b41cf3f8353a6addc7860cc795d06cea2f3 (patch) | |
| tree | 14ff3ce8dee1ef64dcbc6105ff88b19e7b83fb79 /net-nntp/nzbget | |
| parent | net-nntp/nzbget: remove old (diff) | |
| download | gentoo-0c967b41cf3f8353a6addc7860cc795d06cea2f3.tar.gz gentoo-0c967b41cf3f8353a6addc7860cc795d06cea2f3.tar.bz2 gentoo-0c967b41cf3f8353a6addc7860cc795d06cea2f3.zip | |
net-nntp/nzbget: fix tests with USE="-parcheck" for version 17.0
Package-Manager: portage-2.2.28
Diffstat (limited to 'net-nntp/nzbget')
| -rw-r--r-- | net-nntp/nzbget/files/nzbget-17.0_parcheck-tests-fix.patch | 39 | ||||
| -rw-r--r-- | net-nntp/nzbget/nzbget-17.0.ebuild | 8 |
2 files changed, 46 insertions, 1 deletions
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 000000000000..8200f2bd387b --- /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 4c54fbb56d1d..6b5702939d75 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 \ |