gentoo resync : 17.02.2020

4 files changed, 8 insertions, 147 deletions

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 8e85b79f94b0..b56bd9a4733e 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -2,10 +2,8 @@ AUX mixxx-2.0.0-docs.patch 435 BLAKE2B c2e9b09abb293e59b2af49527eccf07c9488ae5e3
 AUX mixxx-2.2.0-lilv_include_fix.patch 1006 BLAKE2B 1541ecc32cb20d02d71577615b96605938a2d38e40e04fc43e864c8a85722475b795c807ccda1df0ff86c6268d1d1425934e3b413fdedc2effcbd6a2ab584ad6 SHA512 e15980f9861a61bf965636182fe3f0d41d25d569d2d4b43e167e53e33fe7e8f533878e93db237e90551ac409811de497e3313e32fc62462bf963b7f1f29c4a11
 AUX mixxx-2.2.3-qt-5.14.patch 17550 BLAKE2B 3f5c16106bbda8e45f1180ef6f2323a3786ddb11f9a355fac57c545d71a1f5080ef39665011d41b4500643a4e33340851bb3d849d381874e4abf9ac42a18e85f SHA512 677d8e832aab28f21c2641b1a94fce6fa43d652ba76b580a8a7cb7911dc5e5fb788cdcf7825906e7894d90198433f96e421531af4e65bd7d16a8b16fcb68fb54
 DIST mixxx-2.1.8.tar.gz 34652727 BLAKE2B d996bb07a5914e5a3b8f276130e1f8fb46a9493e192e45a1b65cdb961b1a7ca0e98fed69d894ace8e61ee72231a1d8ba731921e46d3601ad0d41a79aa04a47ab SHA512 c1423bec9b3a9654ece5ae68c0f72975dcd2a9cee377520e56d4f35366a3bb23157c9c64f0f2b8a61d36e5d818216b64cb6aae53ca2b8e3dfa865b8911a7e1eb
-DIST mixxx-2.2.2.tar.gz 35050389 BLAKE2B 7d1f7fa3de7aa31bdc4e13110ceec4a07ae776aa995c191e467ece403b66dc930ab2632fb0705d204a416b3e64b87af13583f307b227626facb02a88f777c259 SHA512 3b9365bd9d9a7d387cd8791d7d9f6315116e04322370db103998d5e055a6de5e159a4605c7de96cbcf13e7d0653cbe53140dca18a8c3f1b688b227be2c4aeb6f
 DIST mixxx-2.2.3.tar.gz 35060366 BLAKE2B eb21f86f5330749add8a80328985d385a0a6f49f35f8be2a34e006e8c05f306aa1463be839208fe9c86396ea8b598002bd042fdb09ca93e2378e97c834a50d35 SHA512 dfa4f9ccb7d8aa486167a01e54ee5ebeb3655a4f63c7c163b66f0dd25a21f309eae3a213d253cc37ef501777961028932a9d4ac71f5befd54daca2bd2326b395
 EBUILD mixxx-2.1.8.ebuild 3001 BLAKE2B e1812e508163883035ad68d507c9b186646fd8d49801cef7948dbeb3b6c3b4312285ad71ec8dd85966ce875f2706d3ee31f6233689327600f23a13eaafbda37d SHA512 858f7b5f84d9a95f48541da198d89691dae24267a3efc4846ec950602d4106a4f46df9387ca97fc6305c85fdd8b492bad48a57029f267c22b6700ad6a8351d61
-EBUILD mixxx-2.2.2.ebuild 3159 BLAKE2B ab14ada19b18cf85144ac82b915ce3b16e2df4516587d7b11765f2f8c7d13db2c342d1a3e6d3f79b66a58a9a1dfddd1fcaf6b8a34f2f7d3179d61c73fced3f8b SHA512 8a124c7d2fa60b726707bf181f38193f36cf77ce6608343d13bc9ef9c78e32318837dccc8115233f44da637699327a9cd6aac2f8697c04d0fd466ded07ed9622
-EBUILD mixxx-2.2.3-r1.ebuild 3193 BLAKE2B f4aad33fd275705eb063253957024f4180da1100200ee072b20255e4edfb0445920c701a6181367ea1a5f033dbf298aea43c6327345724b4d98825254aace702 SHA512 4981ba8b73e138ab85719e782077b424639eda78ee99b34e24bcde45a8d2113b210fd38a7eec1780c1b49876bf11586b6ee4fdf9cd07dfbd8968130e363a49c7
-EBUILD mixxx-9999.ebuild 3156 BLAKE2B 9251127fa8cab40f36aa43f999478b2bda2a4e99ab7939f1f758efd59fd58716e938b4e0128820996bd9bad616e35cf209eee4c9134fe229a296910db45dfa28 SHA512 ae54684c8970ad8068fd97674e4972326c14006c1c1e48d4563ab3b574a215d140eaa3c88f2ee6fa4ad3ebe9479c3bc1ffe5e855016605106d8ea30ab71e5af1
+EBUILD mixxx-2.2.3-r2.ebuild 3203 BLAKE2B 7bc97937b988caf9ce95bb2208aa06529100d160c8cfd677436c9fa7d66a82cc6123baf10ad87e2d41cd9f0284709a418ca3b2667bb5ce2294e8a3a54458c692 SHA512 fa9711cababfd0861c47f07717a02455d0ebbbb9a1b30dcc4be288733c042efb863c6e201a570fa18aabc2647c0e9084a0989c2e002115ab2e8d370577821506
+EBUILD mixxx-9999.ebuild 3167 BLAKE2B a043a02cd144dd31758d1dfdbf81f4aff60b1ede13f1e28bb95dac7a392dd9e6307e120cd1924d78a2116996e95a2b03fe24f4fc539da2cd22e609dfc2528f1c SHA512 92daebabad0d42cf176244f2a863f4a32724d8f62b5c6cb8a17a6304231dee27db576dedff3b1f0cb8c0ac5f9d393bd7c61d75f83f052c70500c4202b32c4027
 MISC metadata.xml 632 BLAKE2B d6c7a595841941a39b97a16a74677a1baae1a97fb4af73bb019c4fc03a96aaebf5b369b1e89a398f92c6cad4a28083620b4016cb9e5cbc99823025b776d7813c SHA512 109ee347f6a011c55858a555a93bc0d67ed6dc8a86ec7e2bcce8ad949a8742a4dedd1da3487ccaf1f928e063c6ce5750e083cddb9807d8bd732db231e2e7904f
diff --git a/media-sound/mixxx/mixxx-2.2.2.ebuild b/media-sound/mixxx/mixxx-2.2.2.ebuild
deleted file mode 100644
index 87572640dcad..000000000000
--- a/media-sound/mixxx/mixxx-2.2.2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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/"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
-else
-	#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"
-	S="${WORKDIR}/${PN}-release-${PV}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="aac doc ffmpeg hid lv2 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/qtdbus: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/qtx11extras: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=
-	sys-power/upower
-	virtual/libusb:1
-	virtual/opengl
-	x11-libs/libX11
-	aac? (
-		media-libs/faad2
-		media-libs/libmp4v2:0
-	)
-	hid? ( dev-libs/hidapi )
-	lv2? ( >=media-libs/lilv-0.24.2-r3 )
-	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
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.0-docs.patch
-	"${FILESDIR}"/${PN}-2.2.0-lilv_include_fix.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
-		lilv="$(usex lv2 1 0)"
-		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.2.3-r1.ebuild b/media-sound/mixxx/mixxx-2.2.3-r2.ebuild
index d6c94204c6fd..62efd69ed3ab 100644
--- a/media-sound/mixxx/mixxx-2.2.3-r1.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.3-r2.ebuild
@@ -14,7 +14,7 @@ else
 	#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"
 	S="${WORKDIR}/${PN}-release-${PV}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 fi
 
 LICENSE="GPL-2"
@@ -53,6 +53,7 @@ RDEPEND="
 	media-libs/vamp-plugin-sdk
 	sci-libs/fftw:3.0=
 	sys-power/upower
+	virtual/glu
 	virtual/libusb:1
 	virtual/opengl
 	x11-libs/libX11
@@ -70,8 +71,7 @@ RDEPEND="
 	ffmpeg? ( media-video/ffmpeg:0= )
 "
 # media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	dev-qt/qttest:5
 	dev-qt/qtxmlpatterns:5
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index c3949aa84c2b..3c4c7d006b0d 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-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=6
@@ -53,6 +53,7 @@ RDEPEND="
 	media-libs/vamp-plugin-sdk
 	sci-libs/fftw:3.0=
 	sys-power/upower
+	virtual/glu
 	virtual/libusb:1
 	virtual/opengl
 	x11-libs/libX11
@@ -70,8 +71,7 @@ RDEPEND="
 	ffmpeg? ( media-video/ffmpeg:0= )
 "
 # media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	dev-qt/qttest:5
 	dev-qt/qtxmlpatterns:5