gentoo resync : 19.03.2019

3 files changed, 126 insertions, 12 deletions

diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index 2eba4972c078..39249b10ebb0 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1,5 +1,7 @@
 AUX lmms-1.2.0_rc4-qt-5.11.patch 855 BLAKE2B 755c3ca48e1b8ab90105764e534f01efcbd52dc2eb6d0e9d47e23409b3b8682f891920a06c0be1b4c161d0f40613956225dfde9c6143021d84f11a75ac012577 SHA512 6505f27e6113a623669ec80be6eea0071097b718c56c4f2cf8432363e8b74bdfe480b7160fe72956bbc8e854032d57e400b39cbb1ea58f100897639f4fe7c0f7
 DIST lmms-1.2.0_rc4.tar.gz 16596115 BLAKE2B ec8a132f900417749899b084915d31348e267aebcded218d919559f195ce4826091bc3576932d2fa9115c2e040ba73b84db05eeaca3fbcf33b930791241de990 SHA512 8f102f2a4f157da1b8477d4f73bd5b86e7d11453491f6764deed1c61654c0836e612e19d1dac33d154ed9d1b0a0c65084a0537be832c94e72b904264269b6a96
+DIST lmms-1.2.0_rc8.tar.xz 14318692 BLAKE2B 972404ab6ce517c748aad21528d5891af5d12c47d38a18f802fb3a5dfc5d6f3ee91cce14a6ff267341c06c9607328b018e1b612f7f0f550372a35038749a7bb3 SHA512 b8fb9c505d9f5e7854767bcd223c8578d4977e59d7bf64993fe0b57e00d1de87f8e77366c3195d8ea429eb3dd44c641e3dbecf27e64609e892a4453ab17d7343
 EBUILD lmms-1.2.0_rc4.ebuild 2239 BLAKE2B 63acb53d7d68b73631efb1be036106f7bd4b0ac8d6e20e470f90312570a6ddfbb04aaa48b2656d8615912c7235392d14ddfdbf7998fd09a6052093a3c018899d SHA512 21c51bb41fe5c85c5a6d9e5f6f3552ff890ac1161041676b718a795fe7690bf45bc85b2f4c0cd3af4143a2f59532c5d7a98c17cb66b9fa343971eea66b94f1fe
-EBUILD lmms-9999.ebuild 2256 BLAKE2B c48c85ee481f7ed320d2e1b4106a0cca8f9ea68589d54d9f078e0203ba7d34673da0fabd2e36f8ea1e86874c34ea2e45b7fd793993c34899ae25617d7c15daa8 SHA512 60a7a9f3db22e4f6f1e5c2e7bdb4a308ea7aaf45fccf22ab63a1340c4a42083f3b704e443bf5d9b4357dca2d1fd31ec489bf864ceba609d2d5e72c6ecf3694e1
+EBUILD lmms-1.2.0_rc8.ebuild 2405 BLAKE2B 0cb97dcf05570649b51705d618334f58eaeccb382a7c88e9fa7f7931585595effba13c92f5d18b61fbd5ca45919bb43db2aabca9f56321b426afe20af4450739 SHA512 245a43d4c2fd4bacc99e3226c97a4b1298ebe52c34a8b62c248d89e0f5d4a273134a68a9348217372d48d075d260d2730e933f554ec3cbd4c6108090599226da
+EBUILD lmms-9999.ebuild 2313 BLAKE2B 58c0b08d3fa447b6f24abaf71bbd56db669200e3ca0dcae426014b3fdd4f0ad982d32ef95b09ffe41df62d46e919a0aff69793fc26475d4c6a410dbef68435b2 SHA512 56be7987ad80263ea4f5f5d52c53b6fe724d5205b92036b60c96126c9e9ee2876d11564a40eafc5f4c0bdd1b8f8a16ea0a466b762a8317742c211e0f1b878915
 MISC metadata.xml 956 BLAKE2B 0146d8de32c1f9aaa1b111f10e48de20bde5e3634527b4da37ec14d2a148e6eb974bf6665e4fe6254732dff28ec24e3ca7fd1d7b860928453a223bd183895715 SHA512 d96540b061f24e031f1cbb381c05f4eb368e207f8300e8b68e57a36deb2bfb6108453e8428e2534e895927a738d74d8692fc918d8456e0f01b5ec971d4400acc
diff --git a/media-sound/lmms/lmms-1.2.0_rc8.ebuild b/media-sound/lmms/lmms-1.2.0_rc8.ebuild
new file mode 100644
index 000000000000..b0055f08f80d
--- /dev/null
+++ b/media-sound/lmms/lmms-1.2.0_rc8.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# The order is important here! Both, cmake-utils and xdg define src_prepare.
+# We need the one from cmake-utils
+inherit xdg cmake-utils
+
+DESCRIPTION="Cross-platform music production software"
+HOMEPAGE="https://lmms.io"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/LMMS/lmms.git"
+	inherit git-r3
+else
+	# Upstream again fsckd-up their release process
+	SRC_URI="https://github.com/LMMS/lmms/releases/download/v${PV/_/-}/${PN}_${PV/_*}.rc7.1.tar.xz -> ${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+	#S="${WORKDIR}/${P/_/-}"
+	S="${WORKDIR}/${P/_*}~rc7.1"
+fi
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+
+IUSE="alsa debug fluidsynth jack libgig mp3 ogg portaudio pulseaudio sdl soundio stk vst"
+
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	>=media-libs/libsamplerate-0.1.8
+	>=media-libs/libsndfile-1.0.11
+	sci-libs/fftw:3.0
+	sys-libs/zlib
+	>=x11-libs/fltk-1.3.0_rc3:1
+	alsa? ( media-libs/alsa-lib )
+	fluidsynth? ( media-sound/fluidsynth )
+	jack? ( virtual/jack )
+	libgig? ( media-libs/libgig )
+	mp3? ( media-sound/lame )
+	ogg? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	portaudio? ( >=media-libs/portaudio-19_pre )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? (
+		media-libs/libsdl
+		>=media-libs/sdl-sound-1.0.1
+	)
+	soundio? ( media-libs/libsoundio )
+	stk? ( media-libs/stk )
+	vst? ( virtual/wine )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/ladspa-cmt
+	media-plugins/calf
+	media-plugins/caps-plugins
+	media-plugins/swh-plugins
+	media-plugins/tap-plugins
+"
+
+DOCS=( README.md doc/AUTHORS )
+
+src_configure() {
+	local mycmakeargs+=(
+		-DUSE_WERROR=FALSE
+		-DWANT_SYSTEM_SR=TRUE
+		-DWANT_CAPS=FALSE
+		-DWANT_TAP=FALSE
+		-DWANT_SWH=FALSE
+		-DWANT_CMT=FALSE
+		-DWANT_CALF=FALSE
+		-DWANT_QT5=TRUE
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_JACK=$(usex jack)
+		-DWANT_GIG=$(usex libgig)
+		-DWANT_MP3LAME=$(usex mp3)
+		-DWANT_OGGVORBIS=$(usex ogg)
+		-DWANT_PORTAUDIO=$(usex portaudio)
+		-DWANT_PULSEAUDIO=$(usex pulseaudio)
+		-DWANT_SDL=$(usex sdl)
+		-DWANT_SOUNDIO=$(usex soundio)
+		-DWANT_STK=$(usex stk)
+		-DWANT_VST=$(usex vst)
+		-DWANT_SF2=$(usex fluidsynth)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-9999.ebuild
index 85c5734ae478..44670637ff58 100644
--- a/media-sound/lmms/lmms-9999.ebuild
+++ b/media-sound/lmms/lmms-9999.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils xdg-utils
+# The order is important here! Both, cmake-utils and xdg define src_prepare.
+# We need the one from cmake-utils
+inherit xdg cmake-utils
 
 DESCRIPTION="Cross-platform music production software"
 HOMEPAGE="https://lmms.io"
@@ -11,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/LMMS/lmms.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/LMMS/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/LMMS/lmms/releases/download/v${PV/_/-}/${P/_/-}.tar.xz -> ${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${P/_/-}"
 fi
@@ -24,6 +26,8 @@ IUSE="alsa debug fluidsynth jack libgig mp3 ogg portaudio pulseaudio sdl soundio
 COMMON_DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 	>=media-libs/libsamplerate-0.1.8
 	>=media-libs/libsndfile-1.0.11
 	sci-libs/fftw:3.0
@@ -48,9 +52,9 @@ COMMON_DEPEND="
 	stk? ( media-libs/stk )
 	vst? ( virtual/wine )
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
 	dev-qt/linguist-tools:5
-	>=dev-util/cmake-2.4.5
 "
 RDEPEND="${COMMON_DEPEND}
 	media-libs/ladspa-cmt
@@ -72,7 +76,6 @@ src_configure() {
 		-DWANT_CMT=FALSE
 		-DWANT_CALF=FALSE
 		-DWANT_QT5=TRUE
-		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
 		-DWANT_ALSA=$(usex alsa)
 		-DWANT_JACK=$(usex jack)
 		-DWANT_GIG=$(usex libgig)
@@ -89,12 +92,14 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
 pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
+	xdg_pkg_postrm
 }