gentoo resync : 01.12.2017

4 files changed, 54 insertions, 18 deletions

diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 139c7dee9d8f..8e760f816b58 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,8 +1,8 @@
-DIST qmmp-1.1.10.tar.bz2 1142444 SHA256 1e5781bf65b3a27dd5e21349ac007464e67861dda99f8a0206984687881e0b9a SHA512 f9945ea428265c900751dd692e25eb0618e162e621bda7ab5f0f77d504aee66fa06390edca0155d18ca041706f461dcb9bb20678eaf32250b766e0f593915356 WHIRLPOOL 1beaa2339fa8b86c79876774a3da12a8a5a62bf729e4fd6bd6896aa225bc573dc2272cc7438b257fe6567c8c85f38a301f2740eef788322e1d872404e5db6c0c
 DIST qmmp-1.1.12.tar.bz2 1147871 BLAKE2B e511b02c38cbc5fcb478585df14a50c9f67985da9ef5e1e11557f2acbbd454d1b1beb430c8e2e2725a7d9ceea63243746fd41ecf2970fd3c52bcf21857bc1228 SHA512 a45680dcee478a7f03a04dbc87525368ac227a9de7e803252470f517027639d3426bf27a3235996d94ad68212596c03e7a67b5ad00a642532f02a820bf4097ee
 DIST qmmp-1.1.7.tar.bz2 1135005 SHA256 464f79d9a54e6456c5abcb570d7f062e48d3eaa3d60ad2b09c58bc62af5b87a7 SHA512 058187d34b848c0917077a167bcb52c63e39b5150409295ea658484d99fcd5582f7871979d3d3eea40aa97f0d9bf2a2d72ae721b827bcc0366b1bbc652aa3a72 WHIRLPOOL 1c1f22a22329619f63a1a24590b41b352d398bb4653117c81918b2e940e887c6aaa06f178674a97893de7418673022bdc800a09643d3fb38096f6dc78b7774c3
-EBUILD qmmp-1.1.10.ebuild 3860 BLAKE2B 3ff315969c52877dfd02651bee97b01ba72ab00383a20f6183ad823e0242b3d4676bcc3d28c6a4c33c1c4a64810757f09d1add8b14d656354ddc81ae88ed19a3 SHA512 cb3b6e484f7f63f6659937362ad090a0534c759f4bcdffe9b8aa1161d1a3733bf3dc2b781bbe8650fdeba88d1b52a1f3db7fe0da0206c9137f161dc7bd99ff1f
+DIST qmmp-1.2.0.tar.bz2 1182024 BLAKE2B 0dc471b053a68ddd1f4e5e09d37776712a7c3f323f801920e34843df54a188c9bc5edfeade5791be67177bb9b7a9435ab41763b156d068522db654d9c5a51809 SHA512 63b3a499efa1886d2bb0da093ab5b495a147a0d9ad23780780fd85011ae571179d71dc4222efab39609fe59ec25b9b62d907c8d10decd7fddb73220d963dcf57
 EBUILD qmmp-1.1.12.ebuild 3860 BLAKE2B 3ff315969c52877dfd02651bee97b01ba72ab00383a20f6183ad823e0242b3d4676bcc3d28c6a4c33c1c4a64810757f09d1add8b14d656354ddc81ae88ed19a3 SHA512 cb3b6e484f7f63f6659937362ad090a0534c759f4bcdffe9b8aa1161d1a3733bf3dc2b781bbe8650fdeba88d1b52a1f3db7fe0da0206c9137f161dc7bd99ff1f
 EBUILD qmmp-1.1.7-r1.ebuild 3858 BLAKE2B 544e062718ea06fb28e0920ef7d4c1ee1fa8ad850248a956df78054f1f63b06538af04cd8b09fb5f059af5748ce2530f8fb72dc33f902b1c6b5cfab9c8d62c28 SHA512 88a97842bd3b8f43409c420d391421845a45ce597e9334a6218b13bd36ce18dcc510f82dbe67f175e88ed8da5c8bb28eb3a526c0499f828041fadc9b6c3ba22a
-EBUILD qmmp-9999.ebuild 3860 BLAKE2B 3ff315969c52877dfd02651bee97b01ba72ab00383a20f6183ad823e0242b3d4676bcc3d28c6a4c33c1c4a64810757f09d1add8b14d656354ddc81ae88ed19a3 SHA512 cb3b6e484f7f63f6659937362ad090a0534c759f4bcdffe9b8aa1161d1a3733bf3dc2b781bbe8650fdeba88d1b52a1f3db7fe0da0206c9137f161dc7bd99ff1f
-MISC metadata.xml 1709 BLAKE2B 968e69c85cc59af9c4565d69ebd223fc33bb20804c33763c52a6cfa0e1cd8d4f315c4f4729af61f3b49f3444b7adb38668bd4cb7120537c2da79a17a89a217d6 SHA512 256eb3be8f8a455a54a93c72975b5aec45700258913c9f92d3d4098ee64027bca2862ff9371649a5f429a42ae838f9955354836f4fc002606959ae18bfe65016
+EBUILD qmmp-1.2.0.ebuild 4174 BLAKE2B f89b2d24351b45622cd4f09b8883d549eb90f1b3d963c3dad4f9230e45fcbf720caa11a97acae7e881414dae61a2939da30a37dac3e24e9a09782fe303b9072f SHA512 7db78b91c76d766f8c5d0251ba3c1d5ee94a47427865b75bcf386f0d0d01969bb4ad169196b7acb8932dfd4d93b40eeb39c8b2e4e8cf4699ed5e92be1bd38b16
+EBUILD qmmp-9999.ebuild 4174 BLAKE2B f89b2d24351b45622cd4f09b8883d549eb90f1b3d963c3dad4f9230e45fcbf720caa11a97acae7e881414dae61a2939da30a37dac3e24e9a09782fe303b9072f SHA512 7db78b91c76d766f8c5d0251ba3c1d5ee94a47427865b75bcf386f0d0d01969bb4ad169196b7acb8932dfd4d93b40eeb39c8b2e4e8cf4699ed5e92be1bd38b16
+MISC metadata.xml 1888 BLAKE2B 32fdf16e8d12c830b72d46d887c9573f583c83c69a405ebb32bb9ac6b46f2100fd29b78241e0982df54fac2b2f7f9ee0e53f56d5f06e388f177514a427ad10ad SHA512 8d17a27caa187aca78e9fbbd64a6226a4055232a39f68e8b211ec8d4062343885e2c4efd47a551e157fbb1cb674cefb3be26c645223e68a57e0b75e4b3a40fe0
diff --git a/media-sound/qmmp/metadata.xml b/media-sound/qmmp/metadata.xml
index 472f2398ac72..3a54863df655 100644
--- a/media-sound/qmmp/metadata.xml
+++ b/media-sound/qmmp/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<use>
 		<flag name="analyzer">Enable visual analyzer</flag>
+		<flag name="archive">Enable archiving plugin via <pkg>app-arch/libarchive</pkg>.</flag>
 		<flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
 		<flag name="cover">Enable album cover support</flag>
 		<flag name="crossfade">Enable crossfade effect when switching tracks</flag>
@@ -27,6 +28,7 @@
 		<flag name="qsui">Enable QMMP simple UI</flag>
 		<flag name="qtmedia">Enable playback via <pkg>dev-qt/qtmultimedia</pkg></flag>
 		<flag name="scrobbler">Enable audioscrobbler/last.fm support</flag>
+		<flag name="shout">Enable shoutcast plug-in via <pkg>media-libs/libshout</pkg>.</flag>
 		<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
 		<flag name="soxr">Use the SoX resampling library</flag>
 		<flag name="stereo">Enable stereo effect</flag>
diff --git a/media-sound/qmmp/qmmp-1.1.10.ebuild b/media-sound/qmmp/qmmp-1.2.0.ebuild
index f3b0a524c058..f7eff28d1dbe 100644
--- a/media-sound/qmmp/qmmp-1.1.10.ebuild
+++ b/media-sound/qmmp/qmmp-1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils
+inherit cmake-utils xdg-utils
 [[ ${PV} = 9999 ]] && inherit subversion
 
 DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
@@ -12,18 +12,22 @@ if [[ ${PV} != 9999 ]]; then
 	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 else
-	QMMP_DEV_BRANCH="1.1"
+	QMMP_DEV_BRANCH="1.2"
 	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
-IUSE="aac +alsa analyzer bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome
-jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
-pulseaudio qsui qtmedia scrobbler sid sndfile soxr stereo tray udisks +vorbis wavpack"
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
+gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
 
-REQUIRED_USE="gnome? ( dbus ) udisks? ( dbus )"
+REQUIRED_USE="
+	gnome? ( dbus )
+	shout? ( soxr vorbis )
+	udisks? ( dbus )
+"
 
 RDEPEND="
 	dev-qt/qtcore:5
@@ -35,6 +39,7 @@ RDEPEND="
 	x11-libs/libX11
 	aac? ( media-libs/faad2 )
 	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
 	bs2b? ( media-libs/libbs2b )
 	cdda? (
 		dev-libs/libcdio:=
@@ -70,8 +75,9 @@ RDEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
 	qtmedia? ( dev-qt/qtmultimedia:5 )
 	scrobbler? ( net-misc/curl )
-	sndfile? ( media-libs/libsndfile )
+	shout? ( media-libs/libshout )
 	sid? ( >=media-libs/libsidplayfp-1.1.0 )
+	sndfile? ( media-libs/libsndfile )
 	soxr? ( media-libs/soxr )
 	udisks? ( sys-fs/udisks:2 )
 	vorbis? (
@@ -101,6 +107,7 @@ src_configure() {
 		-DUSE_AAC="$(usex aac)"
 		-DUSE_ALSA="$(usex alsa)"
 		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_ARCHIVE="$(usex archive)"
 		-DUSE_BS2B="$(usex bs2b)"
 		-DUSE_CDA="$(usex cdda)"
 		-DUSE_COVER="$(usex cover)"
@@ -111,6 +118,7 @@ src_configure() {
 		-DUSE_MPRIS="$(usex dbus)"
 		-DUSE_ENCA="$(usex enca)"
 		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FILEWRITER="$(usex vorbis)"
 		-DUSE_FLAC="$(usex flac)"
 		-DUSE_GME="$(usex game)"
 		-DUSE_GNOMEHOTKEY="$(usex gnome)"
@@ -132,6 +140,7 @@ src_configure() {
 		-DUSE_QSUI="$(usex qsui)"
 		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
 		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SHOUT="$(usex shout)"
 		-DUSE_SID="$(usex sid)"
 		-DUSE_SNDFILE="$(usex sndfile)"
 		-DUSE_SOXR="$(usex soxr)"
@@ -144,3 +153,11 @@ src_configure() {
 
 	cmake-utils_src_configure
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index f3b0a524c058..f7eff28d1dbe 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils
+inherit cmake-utils xdg-utils
 [[ ${PV} = 9999 ]] && inherit subversion
 
 DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
@@ -12,18 +12,22 @@ if [[ ${PV} != 9999 ]]; then
 	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 else
-	QMMP_DEV_BRANCH="1.1"
+	QMMP_DEV_BRANCH="1.2"
 	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
-IUSE="aac +alsa analyzer bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome
-jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
-pulseaudio qsui qtmedia scrobbler sid sndfile soxr stereo tray udisks +vorbis wavpack"
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
+gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
 
-REQUIRED_USE="gnome? ( dbus ) udisks? ( dbus )"
+REQUIRED_USE="
+	gnome? ( dbus )
+	shout? ( soxr vorbis )
+	udisks? ( dbus )
+"
 
 RDEPEND="
 	dev-qt/qtcore:5
@@ -35,6 +39,7 @@ RDEPEND="
 	x11-libs/libX11
 	aac? ( media-libs/faad2 )
 	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
 	bs2b? ( media-libs/libbs2b )
 	cdda? (
 		dev-libs/libcdio:=
@@ -70,8 +75,9 @@ RDEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
 	qtmedia? ( dev-qt/qtmultimedia:5 )
 	scrobbler? ( net-misc/curl )
-	sndfile? ( media-libs/libsndfile )
+	shout? ( media-libs/libshout )
 	sid? ( >=media-libs/libsidplayfp-1.1.0 )
+	sndfile? ( media-libs/libsndfile )
 	soxr? ( media-libs/soxr )
 	udisks? ( sys-fs/udisks:2 )
 	vorbis? (
@@ -101,6 +107,7 @@ src_configure() {
 		-DUSE_AAC="$(usex aac)"
 		-DUSE_ALSA="$(usex alsa)"
 		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_ARCHIVE="$(usex archive)"
 		-DUSE_BS2B="$(usex bs2b)"
 		-DUSE_CDA="$(usex cdda)"
 		-DUSE_COVER="$(usex cover)"
@@ -111,6 +118,7 @@ src_configure() {
 		-DUSE_MPRIS="$(usex dbus)"
 		-DUSE_ENCA="$(usex enca)"
 		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FILEWRITER="$(usex vorbis)"
 		-DUSE_FLAC="$(usex flac)"
 		-DUSE_GME="$(usex game)"
 		-DUSE_GNOMEHOTKEY="$(usex gnome)"
@@ -132,6 +140,7 @@ src_configure() {
 		-DUSE_QSUI="$(usex qsui)"
 		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
 		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SHOUT="$(usex shout)"
 		-DUSE_SID="$(usex sid)"
 		-DUSE_SNDFILE="$(usex sndfile)"
 		-DUSE_SOXR="$(usex soxr)"
@@ -144,3 +153,11 @@ src_configure() {
 
 	cmake-utils_src_configure
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}