gentoo resync : 10.11.2017

4 files changed, 168 insertions, 57 deletions

diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 5240345796f2..0110ff013dc1 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,17 +1,19 @@
 AUX audacious-3.7.1-c++11-throw-in-dtors.patch 1214 SHA256 0133fa37f5f8e5588fe3fc268c202d7d453d6bf3686c683895cfb7d89532e4b3 SHA512 dcba1e73f17919634d4c6770029bdba2774c752d8296c29f5c78f69bc454f421bf55a6e5b059ab68ffb462995023f63d6eb855a3242f4e806a0a348571adc417 WHIRLPOOL 3128479beb07d6c86186a973294973d9d64f25fddfbe386e3354a95db08357c9f13680b8e21733b22cafd138b25ffff1eaf53d9f1626e5671e1a4cc96d73c0e9
-DIST audacious-3.4.1.tar.bz2 474755 SHA256 57ed4d8378b1e753e266a82424c3ae595b6c0e88fc3e32957720cd6cc14ac971 SHA512 2a9e203544861a0b902b720823202ef1038927932826847dc9b9a9c321dbecc19e2187afbdeb62a22ee8e6348c7df609ad671c8c63da2abc003a37556df20ac3 WHIRLPOOL 4b8facfb9fb3187286a59f5ddbba4ec784a3fd42e2fcadf322ee27cd8d1ae08ee3d5e23cb5c56875d3d3a879c1dd7ba21407cf19ef400693b8ab7a0adc176087
 DIST audacious-3.6.2-gtk3.tar.bz2 539937 SHA256 ed951e588a9f3cb6766301cc387138a3fe2abc81c243eba478e4261390cb51ed SHA512 6667f71de1951265d7c8bfbd83079d67942c2c97323ffc7214394ef3f81b1f58e0432117417281833611964e88c629ef855bd90562da46be1c5d350a51c0d997 WHIRLPOOL 4e218ca1c236b3e02b20e5ed5bb9d91fd95d8132273de8451963c84e2aabb869298cf4c58704ab07036ed7c1e5a6b1ea7855f733812aaed7685b13ce7a4ecd9d
 DIST audacious-3.6.2.tar.bz2 539843 SHA256 b2fdb9f3cafd65b2afc50efea6f17a7a329547f1d394f525870e42cb0483cb04 SHA512 b2fbf0b0628031ae5c883108cb1963232b50381b44882bf01faa7e11cd645e10a1d686d9ed078305a2cda66d238feaf7bdffd45c512830d20cef6770df327dde WHIRLPOOL f7b069b7e1f9538032d1bc290c7d476f16b075cf44a5d5d2b6f582a9e95ca3aa3e0a87d21ca00d4fc57a19983a9e74f3ded5e883acbd990df2064ac75e3da69a
 DIST audacious-3.7.1-gtk3.tar.bz2 571720 SHA256 30d63066916d0de32891c74b6b39e3c9e81fc2449274eba3d0a9b8c9f70d02eb SHA512 0ead2827c74b31e10c555fd1254deb3d11e5aebf8c15d455cf5d6ab258012b293324700693b2b9da48b2b4c25418c7149a1901e1dfe3f210ddf730c25a43a358 WHIRLPOOL 2ceaa0194378b12ad8905c86fcf15e696f6deefa6da793d24e4e6282f0619f0fc9f7d7b8a7db0c231ba3a4e17052b4e8cdbad32c2b5a886f9aedec520c29cc25
 DIST audacious-3.7.1.tar.bz2 571450 SHA256 c8366870aea21d5f4a5a282dee45fba99390e4e3d5164cd119e343f79e9ecbbf SHA512 4c74fcfa6e575375501828905f01ed1e769d88fa346a99162c6800da5bc6aa33ec5598c5de1201c4e24cadb31b8c36768ea390aa4884de6bdbf42b0bea5a31a8 WHIRLPOOL 19fb9e0bd4b606e09ef21a66b8684fbc5ccac4e97c0f26abe96b42851fc3a2c629d89b39ec3f9a5ec82a779a2d6a5ae56ab36ab0993a2e0c1ff48861e6c28518
 DIST audacious-3.8.2-gtk3.tar.bz2 591423 SHA256 4ec6bd82d812c5cdcb1c32f4b0912b219edc8f1ce2603b07f714e0c4f2ed08bc SHA512 fc2c69748c8f044aa8eae1848771b45088d85fbb67baf5dcd3ab2ff52e0848ba626e138d1a37756df98249f32cb3d6c54de29355b218602c6a47ff15c8ba0b96 WHIRLPOOL 7d9e2c295e89ec40ef91613f4a4c1f808446f156bbbc6e6be89511fa94a4b9cce5bef209187d1396edd008dd4474c127ad97a493cf9bf3deffd6064f07cdec8e
 DIST audacious-3.8.2.tar.bz2 591209 SHA256 bdf1471cce9becf9599c742c03bdf67a2b26d9101f7d865f900a74d57addbe93 SHA512 13914d837ab5f283c45297424033486d9a5158f78f17f5538ecce780125fa76585e9e45852d15f6ecf3ed974e7a2f6289ceaaeffa97b2ea79b2bef449d8c786b WHIRLPOOL 9027baf4fe10e69fd41417d46db2d9105701a6a8c8b80f5bfa3f0aa9615b07a0103b159585b601c01b3483f93872ed890ed81f921b512d295648bffc820267f0
+DIST audacious-3.9-gtk3.tar.bz2 600249 SHA256 f546c3cf95066a0390d41b27309f2c0a58e2f2f96a85cf12245250b1c1738735 SHA512 6ff98d027c13b30ea9600a9aba914ec993c69826199b8dc303cb60cebdf2af06a7e3dd4af1d34a86343be5485848a57c8a29e48d2a45a33945585550de4e5f9c WHIRLPOOL 3a649bca61a670afcd4498a8cc42b42eb17eeb8fec938b44cfbd62889a0eb5c7b24ba95149672719505fd2220455e5208bcc6379b27ff22e35d13ca9e901fe9f
+DIST audacious-3.9.tar.bz2 599488 SHA256 2d8044673ac786d71b08004f190bbca368258bf60e6602ffc0d9622835ccb05e SHA512 d8ef24c91c84bfa80831075cd9a12fc4bf02cec8bc96bcfa5a941254d194cccdc482482b1c015bc63e1142718c2221034c0f3a87e2cb6e4daf3b4cc428328aaa WHIRLPOOL a3e3d4f6b9fb0b3e2e90ea249101ae9cc0263d8dda0e49696e44ee00492218d9e19770669abcbcc4b8adfc4e53c263de1e8c9b5d5cdcc9a43d90e9b70d76e282
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05 WHIRLPOOL b7a4409629a860021477f34f8886c40c005ea2ec34373d80e6a696323866e54f361e38c76b1ac536775ae5912308f11416e613dec791f21473f01a2fad35bcfd
-EBUILD audacious-3.4.1.ebuild 1412 SHA256 b2e8fd64af6616d3d1c665b8aacd3ac700ecb7c4844acfd7dfac253ffbeb0cac SHA512 3216422c0426c0a63d9412899b4e8a721d3df5cf8233c3139b3687f7f686397bcd3653207e2b7163b0460ed54c4c53916946223f5f9bef2a191e1eb614710946 WHIRLPOOL 45f35ff6deb6a5c2c10ba952faf02bae9f6ef52d6a3ad874a4c605ff1157625bb6501357d4493612bedf571f6c1f166915045b0c531638fd05f1755699125cd4
 EBUILD audacious-3.6.2.ebuild 1737 SHA256 fb89f75637193dd0197aba3bccebe8e397b55e3d6b0851770a1f5d536015bd99 SHA512 621cfc40a2509302ec34de313427de8f0f5d792ac240396b5c3b508d1cfe287b0930bb834dceb6199622ef07f773294342ce095016e26e1806c987c318a37d80 WHIRLPOOL 2d6aadca2e5c99ca382f829c2a36e7c4abc11e8a64001e9fb6185ca3b71f07fb05da58b5785a8c52679d7c16192514751227c825dc7229bd47d6f60ea3398631
 EBUILD audacious-3.7.1-r1.ebuild 1981 SHA256 188814670ea2f656c5842c903f2921dce95d57d81b5e515af598e63756010e86 SHA512 f727ab57ec08543af48a383ebe2964a4a7aa7cad41ee20ca59452d0c73c61e233e82720bd64fb0eac06cde0d1b410cf89b1dc4b92fe403081aaf406688854682 WHIRLPOOL a8078114e225edfc50b0b1d6f0ccb25184834ace4a99f7af9a383a0416af96e94608a7aff33bd902af51e56540eaf35d8e150e29c4771b914558a5b8644b1667
 EBUILD audacious-3.7.1.ebuild 1902 SHA256 9decbb5f74d1ed979faad677f9333db7a81b6b657fbd4673575434904310a5ae SHA512 0e6f4d694c7ec951920ffa87bcfd5fc7bea7bac98c075891ca337a9d382cf280badaabbab38b7889b7a52ac6b1ae45df0d9ecac50459da5c3976eb5b08cf7f83 WHIRLPOOL 1052ddd9639a3b5f5c3b2ce2db38134c3d13c9e4b7879bbf848a03067a9c2cac09fd85bb349185bb92abe75bcb8911b084f61fb652d10fc1264f6647f04ced85
 EBUILD audacious-3.8.2.ebuild 1835 SHA256 0f5313f90f93e6d6990ce5f7824837e47b1bb08262ee89c2ff2a41c7713d991c SHA512 ca51ae6472f8b0bfce6cf355feee68f783a48f4ffc4e097c694b007bae87ff3a1c27432fc27a5a19149d1f09321a5834ce930e43130f2d11e03d920c4a6f15bf WHIRLPOOL 44d7f62d8157dcff03cc0fbbfe7f031044f251fd7f7d6ab3f0200098ba0eacc789fa548fc72472932ed7e6f8e0125dffa4f62b8847634a6bcc0d60c4fe1907ea
+EBUILD audacious-3.9.ebuild 1935 SHA256 646482e92890ebef9b60f590718a94c23c51577ac88acc6419ff91e556b03bcf SHA512 6b009f932c1bc34d9cd8720820d51836ab397bc4d23b82e186a982aa6a84cfc62389f763b77ee17cd994567dbb50a416c0a8d046210cf9472ab165800a0a55fd WHIRLPOOL 03dcfb67d3f77b8ce4c27cc97d705420a38152be9f1048e8b466aefd991f2d1cb711b722e8e27a2a837e0aadd03136823cab450d731d3c74d49f94704d09ef63
+EBUILD audacious-9999.ebuild 1935 SHA256 646482e92890ebef9b60f590718a94c23c51577ac88acc6419ff91e556b03bcf SHA512 6b009f932c1bc34d9cd8720820d51836ab397bc4d23b82e186a982aa6a84cfc62389f763b77ee17cd994567dbb50a416c0a8d046210cf9472ab165800a0a55fd WHIRLPOOL 03dcfb67d3f77b8ce4c27cc97d705420a38152be9f1048e8b466aefd991f2d1cb711b722e8e27a2a837e0aadd03136823cab450d731d3c74d49f94704d09ef63
 MISC ChangeLog 4820 SHA256 5e50343e1b021f674bdbee0fa169ee49750c8bd840f65ec36702c5eb930bab1f SHA512 52c8774df9ab2e45fc26a02722870253f017849208b31cac1b7af69a4db82076db64676f3699bc1bfe4b6452a321c47906cdad9afdfbbac76d4fa3953b314f2a WHIRLPOOL 964b256ddf881c6cc1147c10c73ff85f5b4e702dd23c02cecf0fd92aaa1ab354987fd240cfac6398045a3700ae0df00c1822f190abac2823c731b1c0d3336406
 MISC ChangeLog-2015 51371 SHA256 974d56f687f6397ceede515c6da7959194b330ef7a453cc72291e6b1b4f299fc SHA512 f384f858eeef58567bfa6248e16c03a65a2d681a21f239354765c964455a77ec4777f707a62b148f5fbec8eada09c8938bd2b289e2cf88a893c42c5f03143dc2 WHIRLPOOL 6a80047e08fc60b1f21f57d1eb0b57bae75736ef14f13fcef91f893f616a9b54c3e9886b97af7cfbfe1f53501fe799694945b3d2306b1033cc9f0fa577ad4fa6
 MISC metadata.xml 572 SHA256 0492486fc71fb35796bba00dda24ab02b92aa8681cd6d70b2fbd58e559287251 SHA512 f54961e5da4f17200ee622ddfe439fa826dd7a195f1548fc7a7c038a6dc0683ece5e4147b082172d3ea6ff9b2e1f1bc67c62aa4c68057913216e3eaef29d0d25 WHIRLPOOL 463570a30a9c537e719195f7905852cc8585049f3c9e6f0b881c129c0d7af9e63ca1005a0fa74dd04158cc9abf8a93d5e3b2f9b92cc3d2d6689263d7d5662a4f
diff --git a/media-sound/audacious/audacious-3.4.1.ebuild b/media-sound/audacious/audacious-3.4.1.ebuild
deleted file mode 100644
index 919d0e6cb270..000000000000
--- a/media-sound/audacious/audacious-3.4.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
-	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="chardet nls"
-
-RDEPEND=">=dev-libs/dbus-glib-0.60
-	>=dev-libs/glib-2.28
-	dev-libs/libxml2
-	>=x11-libs/cairo-1.2.6
-	>=x11-libs/pango-1.8.0
-	x11-libs/gtk+:3"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	chardet? ( >=app-i18n/libguess-1.1 )
-	nls? ( dev-util/intltool )"
-
-PDEPEND="~media-plugins/audacious-plugins-3.4.1"
-
-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
-	econf \
-		--enable-dbus \
-		$(use_enable chardet) \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-	dodoc AUTHORS
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins "${WORKDIR}"/gentoo_ice/*
-	docinto gentoo_ice
-	dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/audacious-3.9.ebuild b/media-sound/audacious/audacious-3.9.ebuild
new file mode 100644
index 000000000000..a8910bd0fe3e
--- /dev/null
+++ b/media-sound/audacious/audacious-3.9.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://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? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
+		gtk3? ( http://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"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="gtk gtk3 nls qt5"
+REQUIRED_USE="^^ ( gtk gtk3 qt5 )"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.28
+	>=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
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	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
+}
+
+src_prepare() {
+	default
+	[[ ${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
+	econf \
+		--disable-valgrind \
+		--enable-dbus \
+		$(use_enable $(usex gtk gtk gtk3) gtk) \
+		$(use_enable nls) \
+		$(use_enable qt5 qt)
+}
+
+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
new file mode 100644
index 000000000000..a8910bd0fe3e
--- /dev/null
+++ b/media-sound/audacious/audacious-9999.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://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? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
+		gtk3? ( http://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"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="gtk gtk3 nls qt5"
+REQUIRED_USE="^^ ( gtk gtk3 qt5 )"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.28
+	>=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
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	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
+}
+
+src_prepare() {
+	default
+	[[ ${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
+	econf \
+		--disable-valgrind \
+		--enable-dbus \
+		$(use_enable $(usex gtk gtk gtk3) gtk) \
+		$(use_enable nls) \
+		$(use_enable qt5 qt)
+}
+
+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
+}