gentoo resync : 24.12.2018

5 files changed, 67 insertions, 77 deletions

diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 06d4afa53330..9a356c94d318 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -4,9 +4,8 @@ AUX audacious-3.10-use-after-free.patch 1301 BLAKE2B 6b36392901f75cfbb118a8ec7dc
 AUX audacious-3.10-volume-slider-boundaries.patch 896 BLAKE2B 222a1b45f3dfdb4f97f232a290a804d3c78ceeb634fd4db7a0d64f4f86eaf2d14d2806c91695eb99f943ca743fb1521f402c58473b24eeb1d2832f6ec20d9348 SHA512 c565f3dc776e4093acb7d19a3e000b5575fb93b6f275d12f0d23e77802522fb7944a18056cadd0fff3b23262892a2b9feea93e6fcba5c9ae7ce969095730d4d3
 DIST audacious-3.10.tar.bz2 563531 BLAKE2B cde59bd5aff8e0530f76f3bdde20b48f829592a0a67cc03e8b7c08a8892259e99e9de2b1608698ff28819b7a6d0341d5237491f7591c4380566512076a0889b9 SHA512 513d5f9608c1ebeae9cf9bb95128244e990e66c74bf49aff6570ec557d537809f3ebf93c400f5df2708ff61cf04ecc95da183b111f5a757735cef5a68dd9907f
 DIST audacious-3.9-gtk3.tar.bz2 600249 BLAKE2B 08559eafc85236e8e881d0cbe6f08e29c82baf0fc46b9209f1d3eee290460260bfa99e6e8f26940f8c6854f3782da24061226ebdb416b6249d10914093e16276 SHA512 6ff98d027c13b30ea9600a9aba914ec993c69826199b8dc303cb60cebdf2af06a7e3dd4af1d34a86343be5485848a57c8a29e48d2a45a33945585550de4e5f9c
-DIST audacious-3.9.tar.bz2 599488 BLAKE2B 2288fe6919c1770cd283af809629fda72186cc0b87a42821f5fb9b7a20c8e7cd5bc00611d10677a82877c5ebc8a1b5ad728626027b95cc875b66dda732b8747f SHA512 d8ef24c91c84bfa80831075cd9a12fc4bf02cec8bc96bcfa5a941254d194cccdc482482b1c015bc63e1142718c2221034c0f3a87e2cb6e4daf3b4cc428328aaa
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
-EBUILD audacious-3.10.ebuild 1850 BLAKE2B 8ec899c2b73a5c747f270ed9e51926817611c1c79b050a42f859bd3c4f6631895fc114aa0e1090f99b9d4b65e146fad244a8feeadb05bb30ef548cd1d91b575c SHA512 2c903bb9aacc3e68ca1278efa914aae7cf44cd02978f8928c50a23febd8f461019ce88acd2420444f6aff24d45d4a0c268c2f65460c80e93332df9d746bc3e8b
-EBUILD audacious-3.9.ebuild 2118 BLAKE2B a56f92b3c6b166cfbb8a32f8819ac54b055a9bdf193049e20b450f4ce7f7e149db255876b9ae826abf5083afaabdcec4c6c757117691f50dd587721c106cb226 SHA512 6f65840eb3b70d0f9cc0aae6617754c5563e014db904a572b159cd5746c21baae0ad71d575e5b8756d869edb743f8da25410522c0d4d3e1c7e9da798dec0fbdc
-EBUILD audacious-9999.ebuild 2102 BLAKE2B ce1cfbe19b142f4e4273fc040e5e1ba60f65805fb6b29bb00c2a96236c7ad9b87283bf59c28684fa6605e920e4b7a1ad784913f7fbf38bca9d12574b65055dfb SHA512 408ebe7cfe721e90e6fc35d628fd61657049f8ab4920c3c7e94a35c97bac947ccd2963c84ccf451c9f4f83730bd6760a4b7bdf3caafe3f5a4742d037a90f6143
-MISC metadata.xml 486 BLAKE2B 982e0b5a578375d9d67369cf92edcef934c8227e6469aca89417634aca805dea8eba386033a575458d55cce34aceb6adf1de8fdcf3fb3a255c853d6c3be7629d SHA512 365b810cf7b096c86804a87d06a522b5a151559035a1ff5694153081426f5565d6465000bc9618acefc403bda9f675a048aea4dbd3af7dfc25200dd16a1c1dec
+EBUILD audacious-3.10-r1.ebuild 2132 BLAKE2B cf5784125886dd7ccc73b7f60e9d158caeaeda4e10b8381dc458a274ef4bde8129889f28454bdd23c00a10432afabd1ded250263571ed81f9894098369543171 SHA512 6c6ab6ebccfb2942e29ea1dbc6151fab0a9531f05779c1444156f73238d563b29b5e0793d16ae100412434a26da735d55cf1b3337b1eb31220473fa9e3dcdd10
+EBUILD audacious-3.9-r1.ebuild 1585 BLAKE2B 5b3acabf06f46c95cb4fcce6ecc58768ca55fe7b71195efda2e96d8563218f3b40e3e940a53e9b32bea873bc349769d971e40415d2b58882654df8e0a620c90f SHA512 ae3133d291ce0b855f7308b9c050a6bc4c6c189afd5f4d975d1c531d0217ccb6ddb82693b433556401eea30540f791986a8b5340edd8d239987747e80f4d90fa
+EBUILD audacious-9999.ebuild 1954 BLAKE2B 169cf845913b32a57bcb0fd720a096ad873056926c56aa24142568afb3c89ae5afd97f34db43da3962feed1be421b4aaed238a490f7622156336de509bd43f87 SHA512 2214d35e85b1c43e8ae2fe063e79d4d98735885aaf1081c6f489601cafe340350d02ec9e3e2540cdd3a1d321e5bb85d757f7b2f63043aedf63d5dcee43551e9c
+MISC metadata.xml 443 BLAKE2B aa56800edc8a8f1724c41e949081a2198776ac0e8d946e5a8190ec8934f4714fc98c1895d96be35343ed9ce668792c16eb8e329946d323eb3c50129a7ddf7ba0 SHA512 67fc7af1979f3e6377bf96ab610f14dd69d27ec416f98987ead762fa811edbbc977fc9b92fcf6ab722402326956807b51723bd0ebe21531fb1776dfddb486f68
diff --git a/media-sound/audacious/audacious-3.10.ebuild b/media-sound/audacious/audacious-3.10-r1.ebuild
index 926f5853cae9..624ecd083faa 100644
--- a/media-sound/audacious/audacious-3.10.ebuild
+++ b/media-sound/audacious/audacious-3.10-r1.ebuild
@@ -3,13 +3,7 @@
 
 EAPI=6
 
-inherit gnome2-utils xdg-utils
-
 MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
@@ -18,22 +12,28 @@ else
 	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 fi
+inherit gnome2-utils xdg-utils
 
+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"
+IUSE="nls qt5"
 
 RDEPEND="
 	>=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
+	!qt5? ( x11-libs/gtk+:2 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -48,6 +48,21 @@ PATCHES=(
 	"${FILESDIR}/${P}-volume-slider-boundaries.patch"
 )
 
+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.
@@ -57,9 +72,9 @@ src_configure() {
 	econf \
 		--disable-valgrind \
 		--enable-dbus \
-		--enable-qt \
-		--disable-gtk \
-		$(use_enable nls)
+		$(use_enable nls) \
+		$(use_enable !qt5 gtk) \
+		$(use_enable qt5 qt)
 }
 
 src_install() {
diff --git a/media-sound/audacious/audacious-3.9.ebuild b/media-sound/audacious/audacious-3.9-r1.ebuild
index dea37f7b001f..593acf1e62be 100644
--- a/media-sound/audacious/audacious-3.9.ebuild
+++ b/media-sound/audacious/audacious-3.9-r1.ebuild
@@ -1,32 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+MY_P="${P/_/-}-gtk3"
 inherit gnome2-utils xdg-utils
 
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+DESCRIPTION="Lightweight and versatile audio player"
 HOMEPAGE="https://audacious-media-player.org/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git"
-else
-	SRC_URI="
-		!gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
-		gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
+	mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="gtk gtk3 nls qt5"
-REQUIRED_USE="^^ ( gtk gtk3 qt5 )"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
 
 RDEPEND="
 	>=dev-libs/dbus-glib-0.60
@@ -34,29 +22,21 @@ RDEPEND="
 	>=x11-libs/cairo-1.2.6
 	>=x11-libs/pango-1.8.0
 	virtual/freedesktop-icon-theme
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)"
+	x11-libs/gtk+:3
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	nls? ( dev-util/intltool )"
+	nls? ( dev-util/intltool )
+"
 PDEPEND="~media-plugins/audacious-plugins-${PV}"
 
-src_unpack() {
-	default
-	if use gtk3; then
-		mv "${MY_P}"{-gtk3,} || die
-	fi
-	[[ ${PV} == *9999 ]] && git-r3_src_unpack
-}
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	default
-	[[ ${PV} == *9999 ]] && eautoreconf
+	if ! use nls; then
+		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
+	fi
 }
 
 src_configure() {
@@ -68,9 +48,8 @@ src_configure() {
 	econf \
 		--disable-valgrind \
 		--enable-dbus \
-		$(use_enable $(usex gtk gtk gtk3) gtk) \
-		$(use_enable nls) \
-		$(use_enable qt5 qt)
+		--enable-gtk \
+		$(use_enable nls)
 }
 
 src_install() {
diff --git a/media-sound/audacious/audacious-9999.ebuild b/media-sound/audacious/audacious-9999.ebuild
index 47a2fb255287..282261cbea55 100644
--- a/media-sound/audacious/audacious-9999.ebuild
+++ b/media-sound/audacious/audacious-9999.ebuild
@@ -1,32 +1,26 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit gnome2-utils xdg-utils
-
 MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git"
 else
-	SRC_URI="
-		!gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
-		gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )"
+	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 fi
+inherit gnome2-utils xdg-utils
 
+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="gtk gtk3 nls qt5"
-REQUIRED_USE="^^ ( gtk gtk3 qt5 )"
+IUSE="nls qt5"
 
 RDEPEND="
 	>=dev-libs/dbus-glib-0.60
@@ -34,28 +28,31 @@ RDEPEND="
 	>=x11-libs/cairo-1.2.6
 	>=x11-libs/pango-1.8.0
 	virtual/freedesktop-icon-theme
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
+	!qt5? ( x11-libs/gtk+:2 )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
-	)"
+	)
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	nls? ( dev-util/intltool )"
+	nls? ( dev-util/intltool )
+"
 PDEPEND="~media-plugins/audacious-plugins-${PV}"
 
+S="${WORKDIR}/${MY_P}"
+
 src_unpack() {
 	default
-	if use gtk3; then
-		mv "${MY_P}"{-gtk3,} || die
-	fi
 	[[ ${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
 }
 
@@ -68,8 +65,8 @@ src_configure() {
 	econf \
 		--disable-valgrind \
 		--enable-dbus \
-		$(use_enable $(usex gtk gtk gtk3) gtk) \
 		$(use_enable nls) \
+		$(use_enable !qt5 gtk) \
 		$(use_enable qt5 qt)
 }
 
diff --git a/media-sound/audacious/metadata.xml b/media-sound/audacious/metadata.xml
index 5eeba2c5c268..56e2b754081b 100644
--- a/media-sound/audacious/metadata.xml
+++ b/media-sound/audacious/metadata.xml
@@ -10,6 +10,6 @@
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<use>
-		<flag name="gtk3">Link against version 3 of the GIMP Toolkit instead of version 2 (x11-libs/gtk+)</flag>
+		<flag name="qt5">Build with Qt5 interface instead Gtk+</flag>
 	</use>
 </pkgmetadata>