gentoo resync : 18.05.2019

6 files changed, 83 insertions, 148 deletions

diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index eedf60147ca9..fa84d07fd42e 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,6 +1,4 @@
-AUX yoshimi-1.5.10-cxxflags.patch 2471 BLAKE2B 0e3d614e4cb9ccb1eb7a25665794fb22db89ca877d613fe4806afebd3692fafa422c2bcba7c9d28080e37a0e7004fcbefeedd0532c5541220e77e4149f8551f6 SHA512 cd15dd79b324ae27c80745c84720bf6b04d7d78c3bed3f2541ab84f82e60928865a49ded6f7fb383cdb5fdc61a05fb8d9fc02869d4846f734eab332f040fa7d0
-DIST yoshimi-1.5.10.tar.bz2 9406870 BLAKE2B e665f6a30094e8396fcadb2e423ccb74e07226d02a51811466fa4a04ee266364d6d9fa9f6bdef6712d24616888b9042bd7c818d21e41fde1d2f41b1eaad47c01 SHA512 1d6371f1d82438dc8b65fdb21b0460d998616c4a27bcee4f3e450542eb346eeb87e59a9448ef210fa45a119efdfc3d6dd7a6acd20ef3ad5a29d982f218704d48
-DIST yoshimi-1.5.8.2.tar.bz2 7537329 BLAKE2B d26619742f351a48f0457468c5c3f2a85cb04c479a8fe5b88616e4738092875df6e5d27be91d2fca42693e2e32d6c6f4b76308b93d99496dc5fff7d16da1712d SHA512 398fb57c171ee72d160b680cbb3de9db226cd281972a1a518cb52fdae617ba89e72b7d5fd1c6666e4bcd2df2d17789daf46aff2299c103429f07db0c83160d84
-EBUILD yoshimi-1.5.10.ebuild 1224 BLAKE2B cc6bfae99aa65e76e3b7b4037832d3b7fae68e5ccbfdc40c3ddb0b8013474ea8a44fed1de95f51bf278f6a8796c74e84c18907ce913e968cff0034be5f8de9ea SHA512 55de53bd5189d84d1832fae1ae8eb2048e84eff2e61305862e5f14e01769d11acb16a1e573b1d57dedd6d7bea7cb8dd45a01a5f69aa068f5922a0888f192d99b
-EBUILD yoshimi-1.5.8.2.ebuild 1032 BLAKE2B 3d2293725a28d677eee7846e86370f7b4b48f2a45bb5c7f37be2df15eeca6fdd76b8b99a1d1e4c7444967346b3aa9d02b6189f29150a81512545057374246496 SHA512 68c13d8841deb26933ae05c9dcf6cd7212d0a8768989062209361539f123dd268b68035b4954848652cafeaa223569fc137ba989217ab3ba546f0e56d173c7c6
-MISC metadata.xml 397 BLAKE2B 2c4e07b154aa3dc9c5cfac332fe039e9dc6251673aaf29e256aae8ddb146851174bde3d16e892ecfcda54d53d544514cc36f8f46373764c907e98d2f0cf5ed5a SHA512 1fbabe7286878f7ae5877cf95384b7574a8cd7656c6dc8296608af2bb2bd0004379b6f7fe920005baa00d00687b56511f90b79709ff71145384cb748bd45f231
+AUX yoshimi-1.5.10.2-cxxflags.patch 2592 BLAKE2B 383784742913ad2a2d711a1999269438eea525da3ed54fdd24fbad46932e05e781b18b2cbad1bd1e5bbe3ef160762f865517bbcda9ea6f5c4df4eb413af8b278 SHA512 78c3e2a84f44e9220b2f3fcc1cbac1b243a4fd19036d32f0ded794c90f83e5797ff3cddcb57ae3612656be27954b1db69b92d4b2107d8c18ffbdbd984abb87bd
+DIST yoshimi-1.5.10.2.tar.gz 9668476 BLAKE2B 1b443a51e952123abaf54b992902113533461064f2fc99032ac89f28a25ba4687176a97013ea118283e8ca2b7d92f44c105380e3d6cecb66560db7a0a8ef6532 SHA512 a39ba123f304e43d70833648ce224733794cb43c160fd2e6cf29bb4a782bea355c4bbfa1c33bf20c98a8c1f5d049788154aaf906a3daa56f288719a0b019139c
+EBUILD yoshimi-1.5.10.2.ebuild 1031 BLAKE2B e85d3901df224cab2e75e96fd4a948560248a6e2de09968db84ba2d1143a905f123cb6f39b86a93a7cd9955a5bf285455eabaf23864a2c5839746c389cddebcc SHA512 dd071adf610f54381324379f0a52fb7c63b4479cbeb709590ef40df5ace03fb74415f9533c9947a5ffd4b21dc95a776e2a7c036d71827198cda52cbb9f16be7b
+MISC metadata.xml 400 BLAKE2B b3d1fcfb88b7ec80023ff3ed78ddf0f31845cb4524402d7ebb24bd294857e4459f18b7f526687a163c6a2c08609325e60f85c17cd1055e32214fd415ab9968a6 SHA512 ba28fba7667eb3ef9f1e9b611c79b89e552f19cea6deefacd7bc7dc0bcc916c2d738adfa453e873ac7872d6a2d2a04aacba5a54c443d3009021940f944996dac
diff --git a/media-sound/yoshimi/files/yoshimi-1.5.10-cxxflags.patch b/media-sound/yoshimi/files/yoshimi-1.5.10-cxxflags.patch
deleted file mode 100644
index 7e64e1fdc729..000000000000
--- a/media-sound/yoshimi/files/yoshimi-1.5.10-cxxflags.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Respect user CXXFLAGS setting.
-
---- yoshimi-1.5.10/src/CMakeLists.txt
-+++ yoshimi-1.5.10/src/CMakeLists.txt
-@@ -302,27 +302,27 @@
- set (YOSHI_INCLUDES ${FLTK_INCLUDE_DIR})
- 
- # set platform specific compiler flags
--if (BuildFor0ld_X86)
--    set (CMAKE_CXX_FLAGS ${BuildOptions_X86})
--else (BuildFor0ld_X86)
--    if (BuildForAMD_X86_64)
--        set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64AMD})
--    else (BuildForAMD_X86_64)
--        if (BuildForCore2_X86_64)
--            set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64Core2})
--        else (BuildForCore2_X86_64)
--            if (BuildForNEON)
--                set (CMAKE_CXX_FLAGS ${BuildOptions_NEON})
--            else (BuildForNEON)
--                if (BuildForThisCPU)
--                    set (CMAKE_CXX_FLAGS ${BuildOptionsThisCPU})
--                else (BuildForThisCPU)
--                    set (CMAKE_CXX_FLAGS ${BuildOptionsBasic})
--                endif (BuildForThisCPU)
--            endif (BuildForNEON)
--        endif (BuildForCore2_X86_64)
--    endif (BuildForAMD_X86_64)
--endif (BuildFor0ld_X86)
-+#if (BuildFor0ld_X86)
-+    #set (CMAKE_CXX_FLAGS ${BuildOptions_X86})
-+#else (BuildFor0ld_X86)
-+    #if (BuildForAMD_X86_64)
-+        #set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64AMD})
-+    #else (BuildForAMD_X86_64)
-+        #if (BuildForCore2_X86_64)
-+            #set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64Core2})
-+        #else (BuildForCore2_X86_64)
-+            #if (BuildForNEON)
-+                #set (CMAKE_CXX_FLAGS ${BuildOptions_NEON})
-+            #else (BuildForNEON)
-+                #if (BuildForThisCPU)
-+                    #set (CMAKE_CXX_FLAGS ${BuildOptionsThisCPU})
-+                #else (BuildForThisCPU)
-+                    #set (CMAKE_CXX_FLAGS ${BuildOptionsBasic})
-+                #endif (BuildForThisCPU)
-+            #endif (BuildForNEON)
-+        #endif (BuildForCore2_X86_64)
-+    #endif (BuildForAMD_X86_64)
-+#endif (BuildFor0ld_X86)
- 
- if (BuildForDebug)
-     set (CMAKE_BUILD_TYPE "Debug")
-@@ -330,8 +330,8 @@
-     message (STATUS "DEBUG Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")
- else (BuildForDebug)
-     set (CMAKE_BUILD_TYPE "Release")
--    set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease})
--    message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}")
-+    #set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease})
-+    message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS}")
- endif (BuildForDebug)
- 
- configure_file(
diff --git a/media-sound/yoshimi/files/yoshimi-1.5.10.2-cxxflags.patch b/media-sound/yoshimi/files/yoshimi-1.5.10.2-cxxflags.patch
new file mode 100644
index 000000000000..dc5544339b54
--- /dev/null
+++ b/media-sound/yoshimi/files/yoshimi-1.5.10.2-cxxflags.patch
@@ -0,0 +1,66 @@
+Respect user CXXFLAGS setting.
+
+--- a/src/CMakeLists.txt	2019-05-06 15:09:19.010755505 +0200
++++ b/src/CMakeLists.txt	2019-05-06 15:14:11.668510627 +0200
+@@ -307,28 +307,28 @@
+ endif(READLINE_FOUND)
+ 
+ # set platform specific compiler flags
+-if (BuildFor0ld_X86)
+-    set (OurCxxFlags ${BuildOptions_X86})
+-else (BuildFor0ld_X86)
+-    if (BuildForAMD_X86_64)
+-        set (OurCxxFlags ${BuildOptions_X86_64AMD})
+-    else (BuildForAMD_X86_64)
+-        if (BuildForCore2_X86_64)
+-            set (OurCxxFlags ${BuildOptions_X86_64Core2})
+-        else (BuildForCore2_X86_64)
+-            if (BuildForNEON)
+-                set (OurCxxFlags ${BuildOptions_NEON})
+-            else (BuildForNEON)
+-                if (BuildForThisCPU)
+-                    set (OurCxxFlags ${BuildOptionsThisCPU})
+-                else (BuildForThisCPU)
+-                    set (OurCxxFlags ${BuildOptionsBasic})
+-                endif (BuildForThisCPU)
+-            endif (BuildForNEON)
+-        endif (BuildForCore2_X86_64)
+-    endif (BuildForAMD_X86_64)
+-endif (BuildFor0ld_X86)
+-set (CMAKE_CXX_FLAGS "${OurCxxFlags} ${CMAKE_CXX_FLAGS}")
++# if (BuildFor0ld_X86)
++#     set (OurCxxFlags ${BuildOptions_X86})
++# else (BuildFor0ld_X86)
++#     if (BuildForAMD_X86_64)
++#         set (OurCxxFlags ${BuildOptions_X86_64AMD})
++#     else (BuildForAMD_X86_64)
++#         if (BuildForCore2_X86_64)
++#             set (OurCxxFlags ${BuildOptions_X86_64Core2})
++#         else (BuildForCore2_X86_64)
++#             if (BuildForNEON)
++#                 set (OurCxxFlags ${BuildOptions_NEON})
++#             else (BuildForNEON)
++#                 if (BuildForThisCPU)
++#                     set (OurCxxFlags ${BuildOptionsThisCPU})
++#                 else (BuildForThisCPU)
++#                     set (OurCxxFlags ${BuildOptionsBasic})
++#                 endif (BuildForThisCPU)
++#             endif (BuildForNEON)
++#         endif (BuildForCore2_X86_64)
++#     endif (BuildForAMD_X86_64)
++# endif (BuildFor0ld_X86)
++# set (CMAKE_CXX_FLAGS "${OurCxxFlags} ${CMAKE_CXX_FLAGS}")
+ 
+ if (BuildForDebug)
+     set (CMAKE_BUILD_TYPE "Debug")
+@@ -330,8 +330,8 @@
+     message (STATUS "DEBUG Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")
+ else (BuildForDebug)
+     set (CMAKE_BUILD_TYPE "Release")
+-    set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease})
+-    message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}")
++    # set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease})
++    message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS}")
+ endif (BuildForDebug)
+ 
+ configure_file(
diff --git a/media-sound/yoshimi/metadata.xml b/media-sound/yoshimi/metadata.xml
index cda9c5467dbb..1b622256a8da 100644
--- a/media-sound/yoshimi/metadata.xml
+++ b/media-sound/yoshimi/metadata.xml
@@ -9,6 +9,6 @@
 		<flag name="lv2">Add support for Ladspa V2</flag>
 	</use>
 	<upstream>
-		<remote-id type="sourceforge">yoshimi</remote-id>
+		<remote-id type="github">Yoshimi/yoshimi</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/yoshimi/yoshimi-1.5.10.ebuild b/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild
index e7de48192156..4acbf0c9ea5c 100644
--- a/media-sound/yoshimi/yoshimi-1.5.10.ebuild
+++ b/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild
@@ -1,48 +1,46 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils gnome2-utils xdg-utils
+inherit cmake-utils xdg
 
-DESCRIPTION="A software synthesizer based on ZynAddSubFX"
-HOMEPAGE="http://yoshimi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+DESCRIPTION="Software synthesizer based on ZynAddSubFX"
+HOMEPAGE="https://yoshimi.github.io/"
+SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+lv2"
 
-RDEPEND="
+BDEPEND="virtual/pkgconfig"
+DEPEND="
 	>=dev-libs/mxml-2.5
 	>=media-libs/alsa-lib-1.0.17
 	media-libs/fontconfig
 	media-libs/libsndfile
-	>=media-sound/jack-audio-connection-kit-0.115.6
 	sci-libs/fftw:3.0=
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
-	sys-libs/zlib:0=
+	sys-libs/zlib
+	virtual/jack
 	x11-libs/cairo[X]
 	x11-libs/fltk:1[opengl]
 	lv2? ( media-libs/lv2 )
 "
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
 
 CMAKE_USE_DIR="${WORKDIR}/${P}/src"
+
 PATCHES=( "${FILESDIR}"/${P}-cxxflags.patch )
 
 DOCS=( Changelog README.txt )
 
 src_prepare() {
+	cmake-utils_src_prepare
 	# respect doc dir
 	sed -e "s#/doc/yoshimi#/doc/${PF}#" -i src/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
 }
 
 src_configure() {
@@ -51,13 +49,3 @@ src_configure() {
 	)
 	cmake-utils_src_configure
 }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/yoshimi/yoshimi-1.5.8.2.ebuild b/media-sound/yoshimi/yoshimi-1.5.8.2.ebuild
deleted file mode 100644
index c5fd3cc38be7..000000000000
--- a/media-sound/yoshimi/yoshimi-1.5.8.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A software synthesizer based on ZynAddSubFX"
-HOMEPAGE="http://yoshimi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+lv2"
-
-RDEPEND="
-	>=dev-libs/mxml-2.5
-	>=media-libs/alsa-lib-1.0.17
-	media-libs/fontconfig
-	media-libs/libsndfile
-	>=media-sound/jack-audio-connection-kit-0.115.6
-	sci-libs/fftw:3.0
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	x11-libs/cairo[X]
-	x11-libs/fltk:1[opengl]
-	lv2? ( media-libs/lv2 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-"
-
-CMAKE_USE_DIR="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	mv Change{l,L}og || die
-	sed -i \
-		-e '/set (CMAKE_CXX_FLAGS_RELEASE/d' \
-		-e "s:lib/lv2:$(get_libdir)/lv2:" \
-		src/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLV2Plugin=$(usex lv2)
-	)
-	cmake-utils_src_configure
-}