gentoo resync : 14.05.2020

4 files changed, 42 insertions, 13 deletions

diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index a23cf9e453be..3202ebe25c1f 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,6 +1,7 @@
+AUX ncmpcpp-0.8.2-gcc10.patch 717 BLAKE2B 3edd29e89df2665b44e5b065aeca18c610c6ec1f4c7bd3d0f5f70af51103d40e1f42302277a6bc8013e0c26b17d1d7aa4fc868f9f96a3163cd7affd29aa4c634 SHA512 99298d813391c03fc70ab16ffe8dd57c6151b87f4cd84f25a1747691d8f9f41e5f647b59c0d2ca25808acb995c7df6c99f386a4cc1f3f133b722731ef99a8a3b
 DIST ncmpcpp-0.7.7.tar.bz2 443801 BLAKE2B b0bf1f6264f94fc1d0dce5b7ec8d85607427e5bf8955914fddffd8dec94850e6dd20dd83a966a25353d6ec23a61e92751d83fddec8202d9a843e0ed9e3b32077 SHA512 a0bbe85f154c40513d41e85810de86ed21109b72fb0f2bdb0b78dcbddb3770aff5422b5bb7fbac2b76634c5b9aaf843bed5fc16fc672fcd71bbae911f65c0034
 DIST ncmpcpp-0.8.2.tar.bz2 465713 BLAKE2B 0d07477b3473e1ac7362175cef4bfb085ebdb4c8b1e77f7bb68d8bf4c645fdcccd067d12e2080a740ade18c57dd055f270d2e50096f0ad3afaa40175e19259cf SHA512 9384edd162f40af23e4f26f437356520f117e4e2ab513ed3de132d2f11e597082d1cb7f0dd3696660d0c9bb85ad03e31fb921c97a11c7b28b32c5907fdbb8e8f
-EBUILD ncmpcpp-0.7.7.ebuild 1446 BLAKE2B 64c094cc6dd32e8a3f3891930167b6350a128ef90ed84bae6aa74eabb160406f76022f8461c6d9f40489da7deb786eb175ce444016dbd55daf12779b8630e231 SHA512 75ba9a04434ac5fa5f477d6d7f905e9350f48cc1aa9543a6085677200dec0b319d078896e18407a8e76c9af1f92db7a81cb760391a76470a5781b0ed285aec56
-EBUILD ncmpcpp-0.8.2-r1.ebuild 1374 BLAKE2B d9dd250d0b1e9cd0fbdabb08a483b6a429e8415d0e46a567109f35745715a33e2ba1b614a5a67f8128d25e825a03f48e4538c9d0ff54300b6f865f0f6baebc37 SHA512 66cec70e2d9a8e8868f6f1d02cf31afa76e4b983b13c3a7a604dbc27e8d8f1e4006a941ea7c849e982c5c8eea5e52e2a866ebb75175c2655b1453faf3b195870
+EBUILD ncmpcpp-0.7.7.ebuild 1551 BLAKE2B 3c260345afbed013eeaa72410ef8aedc9c6723668a9c819ef013002d5c71dfeffa09f9449a32875b9c3fb167d6ed61fc589c3a40fbc5488167a6ea8f54957f1a SHA512 6f476a29df5e9930e355ff59590213d030ae51f67ed71da3d12061e355e3b1b41bd9c9fb8e0baa7f765bf76547a068544cf9d107f16bc6240c79219dd66a57cc
+EBUILD ncmpcpp-0.8.2-r1.ebuild 1471 BLAKE2B 6d58c5e6902c7ff4a8bbcc7c1a29e411b4cdca1dbc46beec56c00e90b1ec2c7b27acb3e62a8212f9703021895ae605176212b0eb4b89d1624763a301f5d1ec63 SHA512 89e4e9140d8103bbe26910202714d34f9dce1a0053b52c7f58a709589b63bc2ab739a2396169feb9e2b71cbf776f5ef0bfcb6f5c2e618bce668118c2fb2cc7f3
 EBUILD ncmpcpp-9999.ebuild 1357 BLAKE2B 3215c3e2f2dee61ffbfd6c8ef01f534593f2701b50b4d2beec557532626923b5cf9d68ea7205afede9fca1e51d445919510845b3d66d8b7ff2ffb47e970e9bba SHA512 d388f8371a7e4afdfb2130ff5f6405c86896391a609545b76d6dcbe0a9006aeced45a6c15012aab49efe1f8e4150d99aed85e43977e704f282e1364c03f20f00
 MISC metadata.xml 1175 BLAKE2B 2a7f404c5db97a726429add8dc33d3ec1d0032e1a57291bebe3c79d76d9cfaca2eeb1e6e3b83b6ce8ffcdf94442cd32fe5079f2f19d70a05cc12da66caf96316 SHA512 9584bdbc4c3def081acc02f78bb64d28fb795db2b7766bb842709613124f5548c0c4b0ed02865d459e1ce45158d59137220a341e29f51db31c6cdf1c91bc776d
diff --git a/media-sound/ncmpcpp/files/ncmpcpp-0.8.2-gcc10.patch b/media-sound/ncmpcpp/files/ncmpcpp-0.8.2-gcc10.patch
new file mode 100644
index 000000000000..466abceecfe8
--- /dev/null
+++ b/media-sound/ncmpcpp/files/ncmpcpp-0.8.2-gcc10.patch
@@ -0,0 +1,26 @@
+From 399e0f47008b487df3505476c959b4f42d8bc1b1 Mon Sep 17 00:00:00 2001
+From: Louis Sautier <sautier.louis@gmail.com>
+Date: Sat, 9 May 2020 14:31:52 +0200
+Subject: [PATCH] Fix build with GCC 10 by adding missing include
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes the following error:
+./mpdpp.h:438:15: error: ‘runtime_error’ is not a member of ‘std’
+---
+ src/mpdpp.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mpdpp.h b/src/mpdpp.h
+index a2bb79eb..abd3666c 100644
+--- a/src/mpdpp.h
++++ b/src/mpdpp.h
+@@ -25,6 +25,7 @@
+ #include <exception>
+ #include <random>
+ #include <set>
++#include <stdexcept>
+ #include <vector>
+ 
+ #include <mpd/client.h>
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
index 6ca6ada7832f..1593220f2047 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
 HOMEPAGE="https://rybczak.net/ncmpcpp/"
@@ -24,10 +24,11 @@ RDEPEND="
 	taglib? ( media-libs/taglib )
 	visualizer? ( sci-libs/fftw:3.0= )
 "
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# https://github.com/ncmpcpp/ncmpcpp/pull/385
+PATCHES=( "${FILESDIR}/${PN}-0.8.2-gcc10.patch" )
 
 src_prepare() {
 	default
@@ -56,7 +57,7 @@ src_install() {
 pkg_postinst() {
 	echo
 	elog "Example configuration files have been installed at"
-	elog "${ROOT}usr/share/doc/${PF}"
+	elog "${EROOT}/usr/share/doc/${PF}"
 	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
 	elog "as user configuration files."
 	echo
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
index 55b91f7c614f..5b38962ff92b 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
@@ -23,10 +23,11 @@ RDEPEND="
 	taglib? ( media-libs/taglib )
 	visualizer? ( sci-libs/fftw:3.0= )
 "
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# https://github.com/ncmpcpp/ncmpcpp/pull/385
+PATCHES=( "${FILESDIR}/${P}-gcc10.patch" )
 
 src_prepare() {
 	default
@@ -53,7 +54,7 @@ src_install() {
 pkg_postinst() {
 	echo
 	elog "Example configuration files have been installed at"
-	elog "${ROOT}/usr/share/doc/${PF}"
+	elog "${EROOT}/usr/share/doc/${PF}"
 	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
 	elog "as user configuration files."
 	echo