gentoo resync : 25.08.2018

7 files changed, 4 insertions, 197 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index c20491e3cb2d..d927907bd113 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 7ab6f2fce4b4..4728e66c285a 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -11,12 +11,10 @@ AUX mixxx-2.0.0-sqlite3.patch 345 BLAKE2B 2c06cea5358df63d0c5e690fb700766b8a3631
 DIST mixxx-2.0.0-ffmpeg30.patch 714 BLAKE2B 00c5cdc233262e64fa52abcc97fc15d1347a391d411b5a0e2650bc3d06f1ef994b28c1f5bd942026201850925f6959fa0b3896c5dff48fbad1c28df8bcd8067b SHA512 60788ecab1fa92b825815fff5dfdfefe02fb097e46f7f55f318bb8a8677da42e4601cce51eaaec51988990eebb72d59346d1ec45ed76cac3c8a7f9a9d1e8cf54
 DIST mixxx-2.0.0-ffmpeg31.patch 2844 BLAKE2B ee44c1da8af553cff478d12bc4fb05ae50bd788340ba5e414b6a535873a3c1868363762697ab21580bfa8f4006c0314acdc2c778f80a910c316a49d91c3e0205 SHA512 7207ad72d0ea851b1425ff7472aafe5f828ca70aad0821a1ef1eb54845527532489ac7913f6584e3af5fb53bf3459abc173fbf482f83be8a22358d28b1b5cf74
 DIST mixxx-2.0.0-src.tar.gz 25300881 BLAKE2B a0dbc03350bf6d6a8ce5abd06df50bf58cf3d75fcc3f8614873c807ad8a77d1afb12a8715944ebba80da5750e4c6d6570ea60a5afb83b87f8cc54c7c4d0ccb00 SHA512 8878c0f785e4c5f67724deeca61154d2587969a81d28aef8fa9d526aec8419a218ce2a7ef88d6fcf468d30fa13d31ac9a56ca9082431a35b7e4e040a7ccfbb1a
-DIST mixxx-2.1.0.tar.gz 34835250 BLAKE2B 7a90c3794a146001fd0df6bb7c9c6231c0d26814eafc5c83da666d511d7af0e193b75da9b8728ad399dbef208cf2437881df2c87818e503945b02591bc300567 SHA512 d9f4fab92c2896ec455e2041aa6033f9a9091d2915a185a99427b9c35afe7c99565350ce477bf0487c6276c9585875f0be61f310779ae90195917d2e995bbf90
 DIST mixxx-2.1.1.tar.gz 34458368 BLAKE2B cf718cfea64fe71e2ccd5f299454fc9d396266052cc2516fa4494216a9d8ae9cea62858bf02e026d5072705df780d6243616d1d1705e3f251bc2392b4dc3d166 SHA512 c0047a238bf39e464f2bc25646ba03138d0b8d27cde667ca7b12bfba5f40d339ce4b426853e048d695b2c59c847e88322e27b91bead467899d7bf1cb43358f20
 DIST mixxx-2.1.3.tar.gz 34471372 BLAKE2B 88b634003a6014ebe746cf0f5f2b3d3de6775c6b2a5298898e70c55feb1ae5a54a692f9428103419943e829438b2ac2fdbfa93c45d4624a7aede59f8ecbe98ae SHA512 3aaf207963cb7380d98c9458f9c1d85c2c72bc0bc2197758a47af50ea38a80158c1abacc70ef50398ccd89a4bd4c30d93c65d70112332e529f3a3aed31509324
 EBUILD mixxx-2.0.0-r5.ebuild 3717 BLAKE2B 3e838a7dff793c2ef3bb4c99803746e3dd85fc19e837f4022d15189b8527eb6c775627c8e95c8dda42c875e33e1e89737791469f0df17784c2f15f318adfde6d SHA512 429289d7d632a723bc3919740f9f8fcde60707923e1c4b384ce4dbeea843a110b954c95519b3e91bff5fa7084179982736008e5ae207a4b018af2a087a32be21
-EBUILD mixxx-2.1.0.ebuild 2873 BLAKE2B af6a8c6f07aede897cc7e43c57aaaa5bd6f82837f4a4429f5e52b57af65e5ea58544f5fae705d5efd668ddf6999058206057bf699f51977d106282b38f2d974e SHA512 72000f7ff37fcf0955a342744b7bb4a88cab8021fc8d7c24d3b9805924b97cbe762b079bb79d3618b752ad5103406ab6bc54b3d2b80d3a13a1b94961cb2812b3
-EBUILD mixxx-2.1.1.ebuild 2988 BLAKE2B 8f665c044591f488492882f4b353b82af0276833567ac1812253201d93097a26d9694a806e5bff4b8af6736356a2fb11067d4bd3476d83da4b658e92ef8ca672 SHA512 6089de35a5e2045558ab9a1524081c655bd4dffbd12369e9aa8078c52b6999e57517f261b4b696a346e50a5019ecbc5c165a08d60b3e60740c57d831814959d5
+EBUILD mixxx-2.1.1-r1.ebuild 3006 BLAKE2B 0c393607bc1db7e23d986a55c4b72c966ea00d317884a24cea3550414e5fb04963a0a5085a717a0f9a3e3ed7564909162e7fa699f43d38256afe6862ceb34b3a SHA512 1df37aec5a1d8c5bce3b2bb352328b9da488235baaf2121704ed17fa1cfb82b9ff5d813e5c44c94b9618438c4cdfba52f933ecbf4827d2165d27ee19358fdc36
 EBUILD mixxx-2.1.3.ebuild 3006 BLAKE2B 0c393607bc1db7e23d986a55c4b72c966ea00d317884a24cea3550414e5fb04963a0a5085a717a0f9a3e3ed7564909162e7fa699f43d38256afe6862ceb34b3a SHA512 1df37aec5a1d8c5bce3b2bb352328b9da488235baaf2121704ed17fa1cfb82b9ff5d813e5c44c94b9618438c4cdfba52f933ecbf4827d2165d27ee19358fdc36
-EBUILD mixxx-9999.ebuild 2988 BLAKE2B 8f665c044591f488492882f4b353b82af0276833567ac1812253201d93097a26d9694a806e5bff4b8af6736356a2fb11067d4bd3476d83da4b658e92ef8ca672 SHA512 6089de35a5e2045558ab9a1524081c655bd4dffbd12369e9aa8078c52b6999e57517f261b4b696a346e50a5019ecbc5c165a08d60b3e60740c57d831814959d5
+EBUILD mixxx-9999.ebuild 3006 BLAKE2B 0c393607bc1db7e23d986a55c4b72c966ea00d317884a24cea3550414e5fb04963a0a5085a717a0f9a3e3ed7564909162e7fa699f43d38256afe6862ceb34b3a SHA512 1df37aec5a1d8c5bce3b2bb352328b9da488235baaf2121704ed17fa1cfb82b9ff5d813e5c44c94b9618438c4cdfba52f933ecbf4827d2165d27ee19358fdc36
 MISC metadata.xml 642 BLAKE2B 125facf06db489fe7e3f4663b1664a4e0c4288cad028b9d0e73db345c8e6a8004383b4efb70e7b5315028fba769fb790cb2b39949980b5adc6f3de2178c0f7c9 SHA512 e336e472a4ee405e18a2521cbd296917a1c555c444eb3794eea602a36ec30f5eab99e9dcad36a08c9852c228253721311d957ef632ae0d14c96391a95ad4dd5e
diff --git a/media-sound/mixxx/mixxx-2.1.0.ebuild b/media-sound/mixxx/mixxx-2.1.0.ebuild
deleted file mode 100644
index ff679b823489..000000000000
--- a/media-sound/mixxx/mixxx-2.1.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic scons-utils toolchain-funcs
-
-DESCRIPTION="Advanced Digital DJ tool based on Qt"
-HOMEPAGE="https://www.mixxx.org/"
-#SRC_URI="https://downloads.mixxx.org/${P}/${P}-src.tar.gz"
-SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aac doc ffmpeg hid mp3 mp4 opus shout wavpack"
-
-# fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
-# got fixed
-RDEPEND="
-	dev-db/sqlite
-	dev-libs/glib:2
-	dev-libs/protobuf:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtscript:5[scripttools]
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/chromaprint
-	media-libs/flac
-	media-libs/libid3tag
-	media-libs/libogg
-	media-libs/libsndfile
-	>=media-libs/libsoundtouch-1.5
-	media-libs/libvorbis
-	>=media-libs/portaudio-19_pre
-	media-libs/portmidi
-	media-libs/rubberband
-	media-libs/taglib
-	media-libs/vamp-plugin-sdk
-	sci-libs/fftw:3.0=
-	virtual/libusb:1
-	virtual/opengl
-	x11-libs/libX11
-	aac? (
-		media-libs/faad2
-		media-libs/libmp4v2:0
-	)
-	hid? ( dev-libs/hidapi )
-	mp3? ( media-libs/libmad )
-	mp4? ( media-libs/libmp4v2:= )
-	opus? (	media-libs/opusfile )
-	shout? ( media-libs/libshout )
-	wavpack? ( media-sound/wavpack )
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-# media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	dev-qt/qttest:5
-	dev-qt/qtxmlpatterns:5
-"
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.0-docs.patch
-)
-
-src_prepare() {
-	# use multilib compatible directory for plugins
-	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
-
-	default
-}
-
-src_configure() {
-	local myoptimize=0
-
-	# Required for >=qt-5.7.0 (bug #590690)
-	append-cxxflags -std=c++11
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #591968
-	for i in $(get-flag mcpu) $(get-flag march) ; do
-		if [[ ${i} = native ]] ; then
-			myoptimize="native"
-			break
-		fi
-	done
-
-	myesconsargs=(
-		prefix="${EPREFIX}/usr"
-		qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
-		faad="$(usex aac 1 0)"
-		ffmpeg="$(usex ffmpeg 1 0)"
-		hid="$(usex hid 1 0)"
-		hifieq=1
-		m4a="$(usex mp4 1 0)"
-		mad="$(usex mp3 1 0)"
-		optimize="${myoptimize}"
-		opus="$(usex opus 1 0)"
-		qt5=1
-		shoutcast="$(usex shout 1 0)"
-		vinylcontrol=1
-		wv="$(usex wavpack 1 0)"
-	)
-}
-
-src_compile() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]}
-}
-
-src_install() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \
-		install_root="${ED}"/usr install
-
-	dodoc README Mixxx-Manual.pdf
-}
diff --git a/media-sound/mixxx/mixxx-2.1.1.ebuild b/media-sound/mixxx/mixxx-2.1.1-r1.ebuild
index 89b59a96ab64..465a2c26cdea 100644
--- a/media-sound/mixxx/mixxx-2.1.1.ebuild
+++ b/media-sound/mixxx/mixxx-2.1.1-r1.ebuild
@@ -50,6 +50,7 @@ RDEPEND="
 	media-libs/taglib
 	media-libs/vamp-plugin-sdk
 	sci-libs/fftw:3.0=
+	sys-power/upower
 	virtual/libusb:1
 	virtual/opengl
 	x11-libs/libX11
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index 89b59a96ab64..465a2c26cdea 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -50,6 +50,7 @@ RDEPEND="
 	media-libs/taglib
 	media-libs/vamp-plugin-sdk
 	sci-libs/fftw:3.0=
+	sys-power/upower
 	virtual/libusb:1
 	virtual/opengl
 	x11-libs/libX11
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 51a196469ba8..61959b9e0ceb 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,6 +1,4 @@
 AUX qtractor-0.9.1-qt-5.11.patch 961 BLAKE2B 392220acdf078d0011a91c77a3e2f15ea395f41d8f206a28cd8d4632752943ad1d7b6ae6f14f2c8457e4548045ba3de5ecb3706ab7fdd0534ecec19e2113e0ed SHA512 b7dd5a429693d5a4944a9b4a7ba252e7bcb5879e95ffab3caa828d3934cb3ecac30f29fb627241073fe2b40f2de523de638c2d9aa7c686dd30b53ef870c6af07
-DIST qtractor-0.8.5.tar.gz 1766017 BLAKE2B eaa75f6efd7ebcfdb1e21c717960d22eb9790c4a3f15ae8bcc364c9b6a5eed6137e4f9d47bd914abdb3679de2cbc30e9c72e32f07fc1ca06959140c5c96dc29b SHA512 9f916e46460403fcb4b1e2dadd048dd52c0d74425a2220cc4d40456141ff7bf5a9cb2fda0f394dac38079af67c322720468d9b7825181442875945899b699329
 DIST qtractor-0.9.1.tar.gz 1763699 BLAKE2B a1d03361266a91abc6c0425d71ee2fa53fd5ec6299a23f15ba1599e480d43c30180334defaa50fcc73a02b7ddafd694bfaf6a00fa14fbdd767276c05b7ec56b8 SHA512 c40a7535740bc8315ffc640f791b640a12a4ba135070502682681c3022923f1edb62738127cae0c523a6410cb163b4cac2828544ae629b42fc93946f3d4d8a59
-EBUILD qtractor-0.8.5.ebuild 1500 BLAKE2B 08ae14793c7c906a98aa8b107198c1cda598c6f1c31d804fa11151bcf5eac10546e1927c16b8b14d04d22f671813e691a0b40339bf5602c483dd69e9a0039cc4 SHA512 fa3ab5724e7b23d90e2e476e2dc0238e82d69af5b863361ef7bd1b72de9e7bc902aa3130225eadf5c04ca7be2bc8a43ca28123d3eb07065b914c7470c84f8842
 EBUILD qtractor-0.9.1.ebuild 1504 BLAKE2B 2f6c75da0d150666fe377dd46244df3bf98a6d40caeb61868e5ae20fa8e2503fd4b4d729186e8d211c070a16ed15c73ac5464734b49375acce2f587156703404 SHA512 cad2ef21a1577b9df0ba76d93a0f3d60a3da16702ce8919eea29c25f6204eecd8b3dd5149914dfc21cd81a9ab07166afcd6f39d4c5da1b662143446dbc899f02
 MISC metadata.xml 542 BLAKE2B bc7330f8b5f775ebbab52dcf034130ee6016eada843baca1529e58d3c72ac19ce7fcd13b3483e4bf15b3620e8ee4c379520730146a39ec72d6ea1aaba094d93b SHA512 002d353914af0071fae342598619aef3b0dfe099d500da0bc98f40c209689f123dbbd93ca80a89a53c6257a54ee808798a858987d80a0443e2cc723dbfdedb7b
diff --git a/media-sound/qtractor/qtractor-0.8.5.ebuild b/media-sound/qtractor/qtractor-0.8.5.ebuild
deleted file mode 100644
index 4796180c1501..000000000000
--- a/media-sound/qtractor/qtractor-0.8.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic qmake-utils
-
-DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
-HOMEPAGE="https://qtractor.sourceforge.io"
-SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	media-libs/ladspa-sdk
-	media-libs/libsndfile
-	>=media-libs/lilv-0.16.0
-	media-libs/lv2
-	media-libs/suil
-	virtual/jack
-	dssi? ( media-libs/dssi )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	osc? ( media-libs/liblo )
-	rubberband? ( media-libs/rubberband )
-	vorbis? ( media-libs/libvorbis )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-DOCS=( README ChangeLog TODO AUTHORS )
-
-src_configure() {
-	append-cxxflags '-std=c++11'
-	econf \
-		$(use_enable mad libmad) \
-		$(use_enable libsamplerate) \
-		$(use_enable vorbis libvorbis) \
-		$(use_enable osc liblo) \
-		--enable-ladspa \
-		$(use_enable dssi) \
-		--enable-lilv \
-		--disable-qt4 \
-		--with-qt5=$(qt5_get_libdir)/qt5 \
-		$(use_enable rubberband librubberband) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable zlib libz) \
-		$(use_enable debug)
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}