gentoo resync : 22.05.2021

7 files changed, 18 insertions, 166 deletions

diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index f645f905a378..50db1101582b 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,9 +1,4 @@
-AUX ncmpcpp-0.8.2-gcc10.patch 717 BLAKE2B 3edd29e89df2665b44e5b065aeca18c610c6ec1f4c7bd3d0f5f70af51103d40e1f42302277a6bc8013e0c26b17d1d7aa4fc868f9f96a3163cd7affd29aa4c634 SHA512 99298d813391c03fc70ab16ffe8dd57c6151b87f4cd84f25a1747691d8f9f41e5f647b59c0d2ca25808acb995c7df6c99f386a4cc1f3f133b722731ef99a8a3b
-DIST ncmpcpp-0.8.2.tar.bz2 465713 BLAKE2B 0d07477b3473e1ac7362175cef4bfb085ebdb4c8b1e77f7bb68d8bf4c645fdcccd067d12e2080a740ade18c57dd055f270d2e50096f0ad3afaa40175e19259cf SHA512 9384edd162f40af23e4f26f437356520f117e4e2ab513ed3de132d2f11e597082d1cb7f0dd3696660d0c9bb85ad03e31fb921c97a11c7b28b32c5907fdbb8e8f
-DIST ncmpcpp-0.9.1.tar.bz2 474436 BLAKE2B 89f6a6d68baf54b0a0eca6d3df96dcd5bcd1346e6f93d0a580f2fbbe4b4246218b62e5332f3db2567c9a91ee30ceb367039a328fa7f491c2a756c2c03fed76c3 SHA512 8fa9f512ac09c144eab4e4721a9c54f3f411593fe13c26db12fbaa3ccf6b08d7cd54923e1e4148b2db45dc69431280611b2be2d153513c0d38eaf92af8ceb9fb
 DIST ncmpcpp-0.9.2.tar.bz2 486266 BLAKE2B 160597493b93bac790b8619881e8a1fcf0efce4a538e35f54f31b06f3ed66691f02b37198cca46b475b7296aebbc864cb62a4398c60bd1e43907f9907a9bc118 SHA512 bbcb3b50233e363412af3c1cf1c0118122733dc376759cd35dee79950f42e098a0402ff670684df91847b990b26022630c9a71192e462bd46e70628e31489742
-EBUILD ncmpcpp-0.8.2-r1.ebuild 1460 BLAKE2B c8b146f78c34b24fc9daf1f236c9dbbe2f9c02c2da1f758dee18cdf010c7af7c8482d52516af87c843a809ede79dc4395becc57669d31be6c402c2b0430f32f2 SHA512 c781f50146bc50994010e116a9697ddd47efd13afd5ecc5c772530fce3f7308f14a3cfeb53979ba4fe5905109c6fa591422320873b54b8a5dfeded7c826c3d77
-EBUILD ncmpcpp-0.9.1.ebuild 1418 BLAKE2B 9088316711d5675c2e95d4f8755ca832a3a3487ccf84c40e7fdf219c51eb70fdcbf1cee7758f13f9163895e4ddbbfc4c8b4bb581e1fa306388ff6655b6e9cb2b SHA512 785451382a490c876f25bf5351fb5bbd1a0b62519522d491d7cf85cb3e887bc57e4a79f6100d09eb03a9e53ebff1885822c9d0f01b4cd51340c60f09289df815
-EBUILD ncmpcpp-0.9.2.ebuild 1418 BLAKE2B fca54614cb0895f83ee09ebda22e8ba7252e25663931141959b3c8791292c681a70247de0b6545ff2df65e6c4e282801c4b5350888ebffe3a3bf96d2aeb94914 SHA512 85e014a82123ce1f97484622313472d04073401298770889707aff6b0446472223c88fcdffde79e7f54623baebc7bce8cee0e41407ddd1b44293b378ae31c4f9
-EBUILD ncmpcpp-9999.ebuild 1396 BLAKE2B 02aa9bc5abdba9b6464e55f95fafee07937954523c0ecd8c39a03c1fbef6c371c477e6a4d0c0d5b3d71bc51e38d5d141973733de796721f219484a01422cd072 SHA512 bd3d7d50ff46bce31d075372002f9de5a2f977c25d4e68c06c8c1a4110fd9db8d0543542133f90eb279d20e7c36f461aab982cc4ad4e4238cf512b245a8af352
-MISC metadata.xml 1094 BLAKE2B 03f876dd9fec08222052e01b13575058faea3ed2a0295e6fa09a3975d0490b205b4f7ef11444d236a37ad05dac2ed13956417379fa553f699865a583fda8457f SHA512 7736907dab3e73de891816987b8254d41013ec44641ac0f206cee5c3d12d7312d94a32dab44ca072c0fa1a770a702c29ed535eecadb39cdd1b34c5ba4802bec7
+EBUILD ncmpcpp-0.9.2.ebuild 1486 BLAKE2B 9c28655e8aeef191a76d4aeafebd69c99f73fbd485c7a1692d09118bca32a10c402509cebb458301d228c8029e2da438c2e3fbb4406d10a3b8f1aa8e151c6180 SHA512 4af98cbc005c50a3a4a2abe39a2eb2aa62afe690e5dfccaf93e829cffa79a020e42b017ba6a9ae7945f5a3df1c7032213b3ded15f967e2c26da9ec5135e5b9bd
+EBUILD ncmpcpp-9999.ebuild 1458 BLAKE2B 65b2fe74ea1aa8dee94d8fe2c24cdbc94e0aeec663b527800004a6b74449db49a7c633ff97020d91412defff271e39e3173ebd66254d85c234e5c3b84811d221 SHA512 4f82b7b9027876fa4c569be40c272dea2f8b5e9e2006ae2291eafa850467ce1eb5f3d40cffc5ae1bdfd45d05186a3c50c5f11e7330e6658c6cdd7685d7190e3a
+MISC metadata.xml 1154 BLAKE2B 9ff9271cd1c5345641c83009c7db03a381c9653f3bfcecd4b7018029d9f89795297cf1138ce0e04632f9adeb68eb01281e04d5559cf0780b3b416330b2551cc2 SHA512 7021e28e39780017c7b4bf58a4ddd94f7142120a68c36ff7e1656698a0f4135204a50a43e108601a51d86c4eed22fdde5a9498884dcd89ffe2547090a7581c9b
diff --git a/media-sound/ncmpcpp/files/ncmpcpp-0.8.2-gcc10.patch b/media-sound/ncmpcpp/files/ncmpcpp-0.8.2-gcc10.patch
deleted file mode 100644
index 466abceecfe8..000000000000
--- a/media-sound/ncmpcpp/files/ncmpcpp-0.8.2-gcc10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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/metadata.xml b/media-sound/ncmpcpp/metadata.xml
index 9730a091cab3..c43c71b33657 100644
--- a/media-sound/ncmpcpp/metadata.xml
+++ b/media-sound/ncmpcpp/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="clock">Enable clock screen</flag>
+		<flag name="lto">Build with link-time optimisation</flag>
 		<flag name="outputs">Enable outputs screen</flag>
 		<flag name="visualizer">Enable visualizer screen with sound wave/frequency spectrum modes</flag>
 	</use>
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
deleted file mode 100644
index ae5b5d47d37e..000000000000
--- a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
-HOMEPAGE="https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp"
-SRC_URI="https://rybczak.net/ncmpcpp/stable/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-IUSE="clock outputs taglib visualizer"
-
-RDEPEND="
-	!dev-libs/boost:0/1.57.0
-	>=media-libs/libmpdclient-2.1
-	dev-libs/boost:=[icu,nls,threads]
-	dev-libs/icu:=
-	net-misc/curl
-	sys-libs/ncurses:=[unicode]
-	sys-libs/readline:*
-	taglib? ( media-libs/taglib )
-	visualizer? ( sci-libs/fftw:3.0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc10.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
-	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable clock) \
-		$(use_enable outputs) \
-		$(use_enable visualizer) \
-		$(use_with taglib) \
-		$(use_with visualizer fftw)
-}
-
-src_install() {
-	default
-
-	dodoc doc/{bindings,config}
-}
-
-pkg_postinst() {
-	echo
-	elog "Example configuration files have been installed at"
-	elog "${EROOT}/usr/share/doc/${PF}"
-	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
-	elog "as user configuration files."
-	echo
-	if use visualizer; then
-	elog "If you want to use the visualizer, you need mpd with fifo enabled."
-	echo
-	fi
-}
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.9.1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.9.1.ebuild
deleted file mode 100644
index b5189ed27301..000000000000
--- a/media-sound/ncmpcpp/ncmpcpp-0.9.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
-HOMEPAGE="https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp"
-SRC_URI="https://rybczak.net/ncmpcpp/stable/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="clock outputs taglib visualizer"
-
-RDEPEND="
-	!dev-libs/boost:0/1.57.0
-	>=media-libs/libmpdclient-2.1
-	dev-libs/boost:=[icu,nls,threads]
-	dev-libs/icu:=
-	net-misc/curl
-	sys-libs/ncurses:=[unicode]
-	sys-libs/readline:*
-	taglib? ( media-libs/taglib )
-	visualizer? ( sci-libs/fftw:3.0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
-	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable clock) \
-		$(use_enable outputs) \
-		$(use_enable visualizer) \
-		$(use_with taglib) \
-		$(use_with visualizer fftw)
-}
-
-src_install() {
-	default
-
-	dodoc doc/{bindings,config}
-}
-
-pkg_postinst() {
-	echo
-	elog "Example configuration files have been installed at"
-	elog "${EROOT}/usr/share/doc/${PF}"
-	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
-	elog "as user configuration files."
-	echo
-	if use visualizer; then
-	elog "If you want to use the visualizer, you need mpd with fifo enabled."
-	echo
-	fi
-}
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.9.2.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.9.2.ebuild
index 9f375cc8a75e..1dbf262713ee 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.9.2.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.9.2.ebuild
@@ -3,14 +3,16 @@
 
 EAPI=7
 
+inherit flag-o-matic
+
 DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
 HOMEPAGE="https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp"
 SRC_URI="https://rybczak.net/ncmpcpp/stable/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="clock outputs taglib visualizer"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
+IUSE="clock lto outputs taglib visualizer"
 
 RDEPEND="
 	!dev-libs/boost:0/1.57.0
@@ -34,10 +36,13 @@ src_prepare() {
 }
 
 src_configure() {
+	filter-flags '-flto*'
+
 	econf \
 		$(use_enable clock) \
 		$(use_enable outputs) \
 		$(use_enable visualizer) \
+		$(use_with lto) \
 		$(use_with taglib) \
 		$(use_with visualizer fftw)
 }
diff --git a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
index 74f29afe4abf..8ecc1ec6cb42 100644
--- a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools git-r3
+
+inherit autotools flag-o-matic git-r3
 
 DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
 HOMEPAGE="https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp"
@@ -11,7 +12,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS=""
-IUSE="clock outputs taglib visualizer"
+IUSE="clock lto outputs taglib visualizer"
 
 RDEPEND="
 	!dev-libs/boost:0/1.57.0
@@ -39,10 +40,13 @@ src_prepare() {
 }
 
 src_configure() {
+	filter-flags '-flto*'
+
 	econf \
 		$(use_enable clock) \
 		$(use_enable outputs) \
 		$(use_enable visualizer) \
+		$(use_with lto) \
 		$(use_with taglib) \
 		$(use_with visualizer fftw)
 }