gentoo resync : 30.05.2020

3 files changed, 61 insertions, 9 deletions

diff --git a/media-sound/pianobar/Manifest b/media-sound/pianobar/Manifest
index d7e7d3e7f150..2077990009c5 100644
--- a/media-sound/pianobar/Manifest
+++ b/media-sound/pianobar/Manifest
@@ -1,6 +1,8 @@
 DIST pianobar-2019.01.25.tar.bz2 48340 BLAKE2B 09078b0fdf43baab99c343a86d5f1c1e0ee7ab39e2af20e7cdde6c21320a74d82ed9bc02e821b02ab045329944aa7d273d637c80bcb0ce96692281dc2e1a0568 SHA512 bfcec235ff01e40a2f650166a29020276b43b241008fd5eb8b84944744b1ce6262cf3be140354404c9410b88d6910e4bcf77b4de787742a7898bbc8511fef0f6
 DIST pianobar-2019.02.14.tar.bz2 48396 BLAKE2B 3b25cdbd086efdb4c5f3239b9c47af6c6f647929573dd8fda93a569252dcace34654fc9460bc0cc9925057bb56a10912788a9aedaba8f217dfc2f9eae9718275 SHA512 00491118ed46df4871e8d019e7139d0779d07d03ab4c8a2312f024613a8b849430bb7c23339a021604023f2c5234015fdbd5d7078caf8cf6d690d03e7c648755
+DIST pianobar-2020.04.05.tar.bz2 48823 BLAKE2B 91e9b96f0a635995ab08bd189b7b6b353f553b6c6cd405be2e95f9c0401b075158df4aa28633854747eced4ac60777724dd265dae62744c773d5f4b4c12aa90e SHA512 40d717693f128da3718c0e1be9c90c269712becf9ac2ffe0669a91ea9417d0fdb0476949df29c1da908e2d78678f26955149dbb8c5a0167161f95835ce76084e
 EBUILD pianobar-2019.01.25.ebuild 1015 BLAKE2B 63d7be43743ef0758239c939c03ccb4ac4b3adcec06515bd34e55e62f0372a4de8d6090685b32130fd7d2a454a5380fa8c69b5ac33eb8c5eb1b809972dba79a7 SHA512 02705089829c265c0da59411f8490fcd5ba9a263173c28df2f7947d9111ed49484d551a28b160ddcd7ba7d5fbc9f23d6771453bc5a19236726c0b081f0da92f0
 EBUILD pianobar-2019.02.14.ebuild 1017 BLAKE2B 7441a958a2593150d5e456582dfe96afec1ec542d7311e671bdaf0911fa5798ece36f8fa77552f5fd07cdff384f9c29348ccbeee2cbc05d2f1293501f47b43fd SHA512 298018f09620bbbe022371f41cbd5d47056efbee0583b65c8dc3391543270ef7934cd43be18d3af14c5407465fcb777c8ce9e755cc9d37cde7d5496188884033
-EBUILD pianobar-9999.ebuild 1017 BLAKE2B 7441a958a2593150d5e456582dfe96afec1ec542d7311e671bdaf0911fa5798ece36f8fa77552f5fd07cdff384f9c29348ccbeee2cbc05d2f1293501f47b43fd SHA512 298018f09620bbbe022371f41cbd5d47056efbee0583b65c8dc3391543270ef7934cd43be18d3af14c5407465fcb777c8ce9e755cc9d37cde7d5496188884033
+EBUILD pianobar-2020.04.05.ebuild 994 BLAKE2B 7400dfe4d9fbfee279444fd1e15fe7d3b6bbad645a1f4e7f4e7d2784933e0716e7b1122f661d85faf5758ef4695aaaaa0e0f79b5cefd6fe670f8ae25be0e80fa SHA512 dd60983120ee159d536caa06c1e1019b81220e05f616925e43ef6e3e5154b12eb2df85881be47583f7677a26f04f22888ecdeca0e48a019dd2790286b3f610f0
+EBUILD pianobar-9999.ebuild 994 BLAKE2B 7400dfe4d9fbfee279444fd1e15fe7d3b6bbad645a1f4e7f4e7d2784933e0716e7b1122f661d85faf5758ef4695aaaaa0e0f79b5cefd6fe670f8ae25be0e80fa SHA512 dd60983120ee159d536caa06c1e1019b81220e05f616925e43ef6e3e5154b12eb2df85881be47583f7677a26f04f22888ecdeca0e48a019dd2790286b3f610f0
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/pianobar/pianobar-2020.04.05.ebuild b/media-sound/pianobar/pianobar-2020.04.05.ebuild
new file mode 100644
index 000000000000..a13e7069ac50
--- /dev/null
+++ b/media-sound/pianobar/pianobar-2020.04.05.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PromyLOPh/pianobar.git"
+else
+	SRC_URI="https://6xq.net/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A console-based replacement for Pandora's flash player"
+HOMEPAGE="https://6xq.net/pianobar/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	dev-libs/json-c:=
+	dev-libs/libgcrypt:0=
+	media-libs/libao
+	>=media-video/ffmpeg-3.3:0=
+	net-misc/curl
+"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	append-cflags -std=c99
+	tc-export AR CC
+	emake V=1 DYNLINK=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) DYNLINK=1 install
+	dodoc ChangeLog README.md
+
+	rm "${D}"/usr/lib*/*.a || die
+
+	docinto contrib
+	dodoc -r contrib/{config-example,*.sh,eventcmd-examples}
+	docompress -x /usr/share/doc/${PF}/contrib
+}
diff --git a/media-sound/pianobar/pianobar-9999.ebuild b/media-sound/pianobar/pianobar-9999.ebuild
index 5a3320ef9da6..a13e7069ac50 100644
--- a/media-sound/pianobar/pianobar-9999.ebuild
+++ b/media-sound/pianobar/pianobar-9999.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit toolchain-funcs flag-o-matic
 
 if [[ ${PV} == 9999 ]]; then
@@ -17,16 +18,17 @@ HOMEPAGE="https://6xq.net/pianobar/"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="static-libs"
+IUSE=""
 
-RDEPEND="media-libs/libao
-	net-misc/curl
-	dev-libs/libgcrypt:0=
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
 	dev-libs/json-c:=
-	>=media-video/ffmpeg-3.1:0=
+	dev-libs/libgcrypt:0=
+	media-libs/libao
+	>=media-video/ffmpeg-3.3:0=
+	net-misc/curl
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 src_compile() {
 	append-cflags -std=c99
@@ -38,7 +40,7 @@ src_install() {
 	emake DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) DYNLINK=1 install
 	dodoc ChangeLog README.md
 
-	use static-libs || { rm "${D}"/usr/lib*/*.a || die; }
+	rm "${D}"/usr/lib*/*.a || die
 
 	docinto contrib
 	dodoc -r contrib/{config-example,*.sh,eventcmd-examples}