gentoo resync : 13.06.2020

4 files changed, 92 insertions, 15 deletions

diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 510b98efcde0..cd4fabb9933f 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-4.0.3.tar.bz2 577512 BLAKE2B 55d660398330a4b15c9074f7ac4c4b4ed50e550d7b7481f0e21d02fa9e1a73da175ded8ab65b0e112aee8bc62a8c817f6c5a8e75ef16c88a9f4193d94e2d8a18 SHA512 e09ae26f43d7a6b610df9ece90f77b912b98c5e4e9a3b5168df26e177ffac3f66a74bff503f398c271228198467c7b3b6797d1671979559c4e1cfb13b12549cd
+DIST audacious-4.0.4.tar.bz2 577440 BLAKE2B a51766ea61e91244eda39f77710f5489641d7e8a12332eb2e5b254b2dbc5360196beba040fa453fbb992d8815cd002604fd542d88f53dec3651645cc5e697dcc SHA512 76bafb2cece861b58650e52cc8c338a0645387e43b7d3548b23528024195605c11789479d8fb2ae25d5986cd5ccb03182eb2427c9ba394d4fd6611f06359f94d
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
 EBUILD audacious-3.10.1-r1.ebuild 1696 BLAKE2B 09463aa9d83d1d610ea48321f81783dc2127d3be5b8d4574cc96d7edaebbbe8b88cf025aa4a8606cb2c6a4ce6745a59bc0f787203c66f07735dfd5732152aa5a SHA512 f31880f63020fb113020bf60a59f187117d1f60e545102da755615419affbd5599ce97c856e80541b1db67346855081ee0ec220584effa252d5f534534fe98aa
 EBUILD audacious-4.0.3.ebuild 1766 BLAKE2B 4977dcdedca220fd9de9760af086e9195aa4fdd9bb7fc3547b529cdb569b73fc5c9fc5b0ffaccfd4d3e725f82d602f4e161d85c41996ba1103272cad2771714d SHA512 1f983f029630e6da151a176ee69968983e5abd6c9cb7164c783c1296353c7d633aab4f09410751a9dc7d3276128606c06b57f7198693039b9cdfe217aaa424e4
-EBUILD audacious-9999.ebuild 1831 BLAKE2B 0686555744115d856c466cc1177b200e5e66f54c39b1ebd76ed9ce86ac29f0bde9cdf51f14cf4b968cb7d607107b836bbfcdebf279776b5694073e0ede6aec50 SHA512 4b3ae117d67cffc3464cbe5f533abed8d1d3ad2e94165c2422ec0450411ab7c40cb81073f223a387c3a2e2c1316cd1496a3f4ef77737ecd6e84ce7ffc462cf72
-MISC metadata.xml 448 BLAKE2B e90c79db8c6985ab2da4be826285a87e8835d25227bf36e912a9d28c230336a09b7fb10f9421f5a465ad22e1c60b4efa011d8917ee8024e60ff256a85534c7d9 SHA512 6e66d8e10bfa07d68a7ca02a6064959f77c7d698473b27eff114b9646e470810a5c115da3fbda71589fcd355db579edc77ae594c4f89f89267c18e7461d03401
+EBUILD audacious-4.0.4.ebuild 1768 BLAKE2B 05d92d11c5b4b4fab175c6ff7a07996d86a9939f5303e23a046133d04308b9d90ff7391e866f0bf458ee72a16674c1f6e128343b172e3825c3928ccab53d383b SHA512 df4cd28d09993ccc387eba815757984ebad77bdb2070258fe0f1be8e1d2321135ff6a25fdabae66441a8ddc92d4d104e06b754841163d0ece945cf2ac603cca6
+EBUILD audacious-9999.ebuild 1768 BLAKE2B 05d92d11c5b4b4fab175c6ff7a07996d86a9939f5303e23a046133d04308b9d90ff7391e866f0bf458ee72a16674c1f6e128343b172e3825c3928ccab53d383b SHA512 df4cd28d09993ccc387eba815757984ebad77bdb2070258fe0f1be8e1d2321135ff6a25fdabae66441a8ddc92d4d104e06b754841163d0ece945cf2ac603cca6
+MISC metadata.xml 367 BLAKE2B 3178261eacb8e350e8930e69bc03206952775a7cf98bc2da66d6b28413940bb00c2c485302637a70fdd4591ee0cc324d0c92934f403b844928bc2a5c17e98da8 SHA512 557d6cef39796075cf75208ef91e02ed32e6906929fa4f4408798e4a56ced6e472069aedcdda7c2276d89c2732d7c2832b79f514bd77b7147b25487e3f217b87
diff --git a/media-sound/audacious/audacious-4.0.4.ebuild b/media-sound/audacious/audacious-4.0.4.ebuild
new file mode 100644
index 000000000000..13924b39fcb0
--- /dev/null
+++ b/media-sound/audacious/audacious-4.0.4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 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 edf35f502de2..13924b39fcb0 100644
--- a/media-sound/audacious/audacious-9999.ebuild
+++ b/media-sound/audacious/audacious-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="gtk nls"
+IUSE="nls"
 
 BDEPEND="
 	virtual/pkgconfig
@@ -29,15 +29,12 @@ BDEPEND="
 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
-	gtk? ( x11-libs/gtk+:2 )
-	!gtk? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
 "
 RDEPEND="${DEPEND}"
 PDEPEND="~media-plugins/audacious-plugins-${PV}"
@@ -65,9 +62,9 @@ src_configure() {
 	# Bugs #197894, #199069, #207330, #208606
 	local myeconfargs=(
 		--disable-valgrind
+		--disable-gtk
 		--enable-dbus
-		$(use_enable gtk gtk)
-		$(use_enable !gtk qt)
+		--enable-qt
 		$(use_enable nls)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/media-sound/audacious/metadata.xml b/media-sound/audacious/metadata.xml
index 42ef143d3440..30869dd2bbde 100644
--- a/media-sound/audacious/metadata.xml
+++ b/media-sound/audacious/metadata.xml
@@ -9,7 +9,4 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
-	<use>
-		<flag name="gtk">Build with GTK interface instead of Qt5</flag>
-	</use>
 </pkgmetadata>