gentoo resync : 18.11.2019

5 files changed, 100 insertions, 14 deletions

diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index b48648b51a98..a227996d3659 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,7 +1,9 @@
 DIST audacious-3.10.1.tar.bz2 564481 BLAKE2B d1f76f34f0f6fbbe5ba92a95015fa0f3ef6399cc05f69f58474523761b00a4de7b8471660d9cb640487110cc3998df59f21108ff0b4ea72014ad75cd32ad864b SHA512 e88891caaa3897f9b4abf39136e20834aedf1287d0d5eefea392fda89050db8db00c6f363976a68fe250ddbae4e27590f7615916a76370a44ca9235f1fa60b43
 DIST audacious-3.9-gtk3.tar.bz2 600249 BLAKE2B 08559eafc85236e8e881d0cbe6f08e29c82baf0fc46b9209f1d3eee290460260bfa99e6e8f26940f8c6854f3782da24061226ebdb416b6249d10914093e16276 SHA512 6ff98d027c13b30ea9600a9aba914ec993c69826199b8dc303cb60cebdf2af06a7e3dd4af1d34a86343be5485848a57c8a29e48d2a45a33945585550de4e5f9c
+DIST audacious-4.0-beta1.tar.bz2 571077 BLAKE2B 5e47791e59b1f0abc149dfbc3f2727b2e7868e09a4f1a72720a5a07de3ef137030c69b77e3b8348d1db95ee4d7f986989e32903fe66c296fe99468688a8ceb64 SHA512 6696a18a29132eff6e0546883b76bd76af82931e43bff13786bc57e9e3ac36ea5c83b89155812c2c89b754779263e2528eb3423c34ba676790fcba3408a9240e
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
-EBUILD audacious-3.10.1.ebuild 1797 BLAKE2B 2731c0990b1ea3e822b9e4a9823182f176c856a8f10618c75a9bab1737e71ce9ab66ca555b695d5e9e1aae31461afb77310a0e822c7ce6794bce7516b8971f3b SHA512 be0ce92c1d90f81cd7f9e35e30d133978c4eac8edbb67d932d5dc9020d78e6561730a1dcd862839de668ddb1d48c158a1f55600098e1c038e753d438c5df469c
+EBUILD audacious-3.10.1.ebuild 1795 BLAKE2B bcea95295deb3f1b069c44441c7aa27e2a4136084acaa5b821909f48d43fd669cfecd28034d5d94f57d757075f4f8c24e637e919a2fdff29a5bfa76a67abd752 SHA512 6b4b29e2d61adf73eb9e610cf68ac6581ae0434e34a4aab71d3e56e3dc85a77857b3f68b3a8f66f674b62c4588983dc9166fbff6e70050e9aa851f0713b0556d
 EBUILD audacious-3.9-r1.ebuild 1585 BLAKE2B 5b3acabf06f46c95cb4fcce6ecc58768ca55fe7b71195efda2e96d8563218f3b40e3e940a53e9b32bea873bc349769d971e40415d2b58882654df8e0a620c90f SHA512 ae3133d291ce0b855f7308b9c050a6bc4c6c189afd5f4d975d1c531d0217ccb6ddb82693b433556401eea30540f791986a8b5340edd8d239987747e80f4d90fa
-EBUILD audacious-9999.ebuild 1797 BLAKE2B 2731c0990b1ea3e822b9e4a9823182f176c856a8f10618c75a9bab1737e71ce9ab66ca555b695d5e9e1aae31461afb77310a0e822c7ce6794bce7516b8971f3b SHA512 be0ce92c1d90f81cd7f9e35e30d133978c4eac8edbb67d932d5dc9020d78e6561730a1dcd862839de668ddb1d48c158a1f55600098e1c038e753d438c5df469c
-MISC metadata.xml 443 BLAKE2B aa56800edc8a8f1724c41e949081a2198776ac0e8d946e5a8190ec8934f4714fc98c1895d96be35343ed9ce668792c16eb8e329946d323eb3c50129a7ddf7ba0 SHA512 67fc7af1979f3e6377bf96ab610f14dd69d27ec416f98987ead762fa811edbbc977fc9b92fcf6ab722402326956807b51723bd0ebe21531fb1776dfddb486f68
+EBUILD audacious-4.0_beta1.ebuild 1768 BLAKE2B 19fe627632cd73686ee0314b21e7175571b0dc70cf43746d7fb4d401ad3e15e8cf0ee0a06eab8af0830235751ad43435b041aef1d30a3b73a6b208a84f184335 SHA512 4baad23c469aef2475963c8e21f119289db5b6c5e6e6d38a6a072024c94040d00fca10e6deeb3b1743ca477bd14bfcf1e60f0c64422ebb68f5f916dc12cef6fd
+EBUILD audacious-9999.ebuild 1831 BLAKE2B 0686555744115d856c466cc1177b200e5e66f54c39b1ebd76ed9ce86ac29f0bde9cdf51f14cf4b968cb7d607107b836bbfcdebf279776b5694073e0ede6aec50 SHA512 4b3ae117d67cffc3464cbe5f533abed8d1d3ad2e94165c2422ec0450411ab7c40cb81073f223a387c3a2e2c1316cd1496a3f4ef77737ecd6e84ce7ffc462cf72
+MISC metadata.xml 511 BLAKE2B 2013e88b3dc8ef7aedffbada7c4342fdb1d51f39e56f4523204a62aa2e31054c9c5cb6414dcfdb9abde09a9d8619b112cbe7862d9090f8702360c73a2af0f479 SHA512 11ec4fc4cb255dd7d71449b711a66e39f433fdf04b39d57d2d02e87914870aea39156c01586a2ceb8eb42c1819eeefd5ed535cb233fd27d982dd8e316ae4727f
diff --git a/media-sound/audacious/audacious-3.10.1.ebuild b/media-sound/audacious/audacious-3.10.1.ebuild
index 12769bfaa102..63d1ae32edcd 100644
--- a/media-sound/audacious/audacious-3.10.1.ebuild
+++ b/media-sound/audacious/audacious-3.10.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git"
 else
 	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 inherit xdg
 
diff --git a/media-sound/audacious/audacious-4.0_beta1.ebuild b/media-sound/audacious/audacious-4.0_beta1.ebuild
new file mode 100644
index 000000000000..2a75308519c1
--- /dev/null
+++ b/media-sound/audacious/audacious-4.0_beta1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${P/_/-}"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git"
+else
+	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+inherit xdg
+
+DESCRIPTION="Lightweight and versatile audio player"
+HOMEPAGE="https://audacious-media-player.org/"
+SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="nls"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )
+"
+DEPEND="
+	>=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.28
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	virtual/freedesktop-icon-theme
+"
+RDEPEND="${DEPEND}"
+PDEPEND="~media-plugins/audacious-plugins-${PV}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	default
+	[[ ${PV} == *9999 ]] && git-r3_src_unpack
+}
+
+src_prepare() {
+	default
+	if ! use nls; then
+		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
+	fi
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	local myeconfargs=(
+		--disable-valgrind
+		--disable-gtk
+		--enable-dbus
+		--enable-qt
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins -r "${WORKDIR}"/gentoo_ice/.
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/audacious/audacious-9999.ebuild b/media-sound/audacious/audacious-9999.ebuild
index 12769bfaa102..edf35f502de2 100644
--- a/media-sound/audacious/audacious-9999.ebuild
+++ b/media-sound/audacious/audacious-9999.ebuild
@@ -20,7 +20,7 @@ SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="nls qt5"
+IUSE="gtk nls"
 
 BDEPEND="
 	virtual/pkgconfig
@@ -32,8 +32,8 @@ DEPEND="
 	>=x11-libs/cairo-1.2.6
 	>=x11-libs/pango-1.8.0
 	virtual/freedesktop-icon-theme
-	!qt5? ( x11-libs/gtk+:2 )
-	qt5? (
+	gtk? ( x11-libs/gtk+:2 )
+	!gtk? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
@@ -63,12 +63,14 @@ src_configure() {
 	# Building without D-Bus is *unsupported* and a USE-flag
 	# will not be added due to the bug reports that will result.
 	# Bugs #197894, #199069, #207330, #208606
-	econf \
-		--disable-valgrind \
-		--enable-dbus \
-		$(use_enable nls) \
-		$(use_enable !qt5 gtk) \
-		$(use_enable qt5 qt)
+	local myeconfargs=(
+		--disable-valgrind
+		--enable-dbus
+		$(use_enable gtk gtk)
+		$(use_enable !gtk qt)
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/media-sound/audacious/metadata.xml b/media-sound/audacious/metadata.xml
index 56e2b754081b..c563fb869343 100644
--- a/media-sound/audacious/metadata.xml
+++ b/media-sound/audacious/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<use>
-		<flag name="qt5">Build with Qt5 interface instead Gtk+</flag>
+		<flag name="gtk">Build with GTK interface instead of Qt5</flag>
+		<flag name="qt5">Build with Qt5 interface instead of GTK</flag>
 	</use>
 </pkgmetadata>