gentoo resync : 08.06.2019

4 files changed, 2 insertions, 88 deletions

diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index f639635fd46c..0c240dfbcefd 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,6 +1,3 @@
-AUX rosegarden-17.04-cmake-3.9.1.patch 934 BLAKE2B a59bb497c2fa23f5161ff2953b2338c69d49bd5a5c8d73eefe542dc74c657079ca96d45a2f4db830206d5b71cce66667cf1257a9914da04658136993ce72d8ed SHA512 f3f285597be964aeb9625be9df2443c98ca902f7fe3f7db82ea84f96f0ab461be4762912a6cad30e2c085125394ba37cb0048fca3f8543e1ff41d7776eb671a8
-DIST rosegarden-17.04.tar.bz2 6454603 BLAKE2B cc028a4108f4c51c9f3559bb454a8344d03f31280db6fd51e98a0b39bdc10e29add97272e7dace848dc4b4ac384ba787ade6664d991aed14fa3101b4fdce2743 SHA512 23240522cba8cc3b5d0e3b29ee5b871c911c7634d74f65d04b353f59747bdf6a1bfd9985f16ab331ea2399a797e66b2ebd110e192bb52ba4df453d42d7b8f73b
 DIST rosegarden-17.12.1.tar.bz2 6692715 BLAKE2B 698ecfb58754ee292e589e0fb3618e2076a6e59dde1f06d15ed3bad43313cc79ed03307364350f5cd2323350173119ccc71b42c839d8498d360461a19801a96a SHA512 8bd4a464bbf2825d6c2fb8d36123e68d94de7f4e997c6ed8efc5670e87799781eb8251995890979c9d107d4fc58c636fe73e699c859c8e95aa567c4289958495
-EBUILD rosegarden-17.04.ebuild 1236 BLAKE2B 57352999fe5e4779206b9c9b562ff651fb38a8f102718c8aaa9d583084b908101816c560171dc50335e6032172254b92e6ff4525b4f6b06a1dd1a649c5f0963a SHA512 6fe801a1b33637361a583047d7c1b3a1335efac616699137f1a8dd4d00f2a206e66e9386ec8332265c980ab757b85c652aa530dd66aa737e9680a7e7618daf04
-EBUILD rosegarden-17.12.1.ebuild 998 BLAKE2B 49ee99784594c188f2a896f186ff9d8cbceea7b459737ffe2bdb88a9d387ac7f282c1ec312b3d81f78e9dea21f90a0e8771affc439009d5c8e474985aa9b31c8 SHA512 cf4cad1a1146c4dca6c1190e8d05e1f4704e04fba3f9b998ab2d8159c20e52c211626873a161ef601043fcac543065e01bb2fd7c562c61f67f426e39e1812a30
+EBUILD rosegarden-17.12.1.ebuild 996 BLAKE2B 955ae5c825df0b675211d7fae021280f7ea8896bd3dde778fb847d02cae59291e8ed6f382d87e1bf39f125564626e5b72aa68fbe477bbd7e5bd745f1a0627a39 SHA512 52527e0803bc198cc7f6167091aad55317e6dfcda6d2322e90932b4ef8d66713455bc57117c6fd83212955243fe52c98aeb5faf7993c2c87bbddb5b76e962952
 MISC metadata.xml 349 BLAKE2B 0f31b6c7f0aef5e0b487ddcdf963c1701cc3429870464de30409dd788422964adbf05172089315a6543ac858f4d5ae64773c52728f24da4dc06dfe9b1dcabf9e SHA512 1790ba05a4f13f358de6890c908b2f1eb0581143063b7237220dd05aba31d16d68f2cf6c4712a08894909b7de5306d592807e9f3171b66b72fd867bd339a0cee
diff --git a/media-sound/rosegarden/files/rosegarden-17.04-cmake-3.9.1.patch b/media-sound/rosegarden/files/rosegarden-17.04-cmake-3.9.1.patch
deleted file mode 100644
index bc587a729773..000000000000
--- a/media-sound/rosegarden/files/rosegarden-17.04-cmake-3.9.1.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: fix svnversion.h dependency to permit parallel building
- With CMake 3.9.1 and parallel building enabled, the incorrect specification
- of the output filename when creating svnversion.h can lead to a race condition
- such that the package fails to build.
-Author: Stuart Prescott <stuart@debian.org>
-Bug: https://sourceforge.net/p/rosegarden/bugs/1552/
-Bug-Debian: https://bugs.debian.org/871213
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -810,7 +810,7 @@
- add_custom_target(svnheader ALL DEPENDS svn_header) # svn_header never gets created, it's just a unique string
- 
- # creates svnheader.h using cmake script
--add_custom_command(OUTPUT svn_header ${CMAKE_CURRENT_BINARY_DIR}/svnheader.h
-+add_custom_command(OUTPUT svn_header ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h
-     COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
-                          -P ${CMAKE_CURRENT_SOURCE_DIR}/buildkey.cmake)
- 
diff --git a/media-sound/rosegarden/rosegarden-17.04.ebuild b/media-sound/rosegarden/rosegarden-17.04.ebuild
deleted file mode 100644
index 53c373ddd12c..000000000000
--- a/media-sound/rosegarden/rosegarden-17.04.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="MIDI and audio sequencer and notation editor"
-HOMEPAGE="https://www.rosegardenmusic.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="lirc"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/alsa-lib:=
-	>=media-libs/dssi-1.0.0:=
-	media-libs/ladspa-sdk:=
-	media-libs/liblo:=
-	media-libs/liblrdf:=
-	media-libs/libsamplerate:=
-	media-libs/libsndfile:=
-	sci-libs/fftw:3.0
-	sys-libs/zlib:=
-	virtual/jack
-	x11-libs/libSM:=
-	lirc? ( app-misc/lirc:= )
-"
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${P}-cmake-3.9.1.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		"-DDISABLE_LIRC=$(usex lirc OFF ON)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-sound/rosegarden/rosegarden-17.12.1.ebuild b/media-sound/rosegarden/rosegarden-17.12.1.ebuild
index a62b21c7fa70..34f80417db54 100644
--- a/media-sound/rosegarden/rosegarden-17.12.1.ebuild
+++ b/media-sound/rosegarden/rosegarden-17.12.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="lirc"
 
 BDEPEND="