gentoo resync : 31.05.2021

4 files changed, 2 insertions, 476 deletions

diff --git a/media-libs/portmidi/Manifest b/media-libs/portmidi/Manifest
index 2ba4030d35d3..ead350074e31 100644
--- a/media-libs/portmidi/Manifest
+++ b/media-libs/portmidi/Manifest
@@ -1,8 +1,5 @@
-AUX portmidi-217-cmake.patch 13905 BLAKE2B faa559f25b1acec63f17a6b6dcbd228eff2cb50447ba72ea4108c86f36b8142fac54c90e5480d74278e0fa0b28bad68f4f1bfac192434840893dc9039243284f SHA512 b60da799041d6dc4a1bf82981d904cf9bbbaed021397cd2235dc25b18b7c830576ecce8fa0c6992249e03ab84579eff795ae33a8e0d091dcda8ee856491420d4
 AUX portmidi-217-r4-python.patch 1540 BLAKE2B a5fe8c48e8d312cead822fc8893f8a610bf5cf280dd2445da04ab42ed13a5a121174afa2e8874dcf3f7a7b89cd60894a819404438c6d5cb2b99a8e2ae6f3aba8 SHA512 d7ded737346f9756450ff3eaf35daf33da941a109d7db07598ea57593ef3272213b889a9ab33bed71bead4583cb080439813bf7fc4a6d1a6cbb84ed4cd25b51f
 AUX portmidi-234-cmake.patch 13979 BLAKE2B cc6b4193e9008899c89545e2e416c75779d08a6ef100e7a37c21a7c745ac3416c31b044664ba439368c8bb0f3a7fde119343a86d31efe3482c4a88718affdd6d SHA512 b07cd643699084f8e02ffc53d3721a53dd17b421d8ff5b2889a14ab99ff709c14f68b30adc2e7db818cbe7884f93cab8290ff9466ac8616d0db58b3e7aab1f75
 DIST portmedia-code-r234.zip 1342298 BLAKE2B 3c3686b79ca0c8cbfaa6c44ae8c4f294630e1c5940576709ff1ca5854bfcfba1af7b067471656f2b39ae28cecea9b6c4403f72d5a2552355760c795eff123243 SHA512 cbc332d89bc465450b38245a83cc300dfd2e1e6de7c62284edf754ff4d8a9aa3dc49a395dcee535ed9688befb019186fa87fd6d8a3698898c2acbf3e6b7a0794
-DIST portmidi-src-217.zip 1030830 BLAKE2B ab197c7f9a5c2b4d2740d56841459fbac97d510e4d12e5d0cd7cecc0ba6035929b6596140d42c575a9513862a66127d19253dbee1d3a7b7b84b69c88fec7fcae SHA512 d08d4d57429d26d292b5fe6868b7c7a32f2f1d2428f6695cd403a697e2d91629bd4380242ab2720e8f21c895bb75cb56b709fb663a20e8e623120e50bfc5d90b
-EBUILD portmidi-217-r3.ebuild 3211 BLAKE2B a1db7a1a0fd4c8c5a49f205ee4cd2c6b5689bbf65c1538817c2440663140ca57c6e462b324832392efaadf6d852bdd55b0c8930716bf09302cb2de9d1d828f82 SHA512 d65ec75185e97a7d040eaa6e1d99ec4a03155b9667d893d6b47cf9c2d2cb2bfd928aed484075b49d7f4740c28b3391ae16f212dd2a1cc9dbc05407579656c29e
-EBUILD portmidi-234.ebuild 3318 BLAKE2B 9bf2367d177564a0fdbbea027860a57019f9090540a1bc94e323a357d6cc0f154913edfd10f9521acb9b88d14674b9241d2ca4e37fa7b75fe3cb668e34ec53f5 SHA512 6384c0fecb52db5c6922a3205e3e2a37f64cae7be5794542ea2377bee42bcebd564494d839ed349c127f14eac598b4a068a82ee0baa0b32c2af24d072760f302
+EBUILD portmidi-234.ebuild 3311 BLAKE2B 7eed7609f74534778b2b6418e68036c902dd33f50d21aaa7229f8056f6c5f64e630769eae71651ee8d53709a308a433b5b3f32275dd466c76649c57ae597d98b SHA512 df5b8eba368e02c8791e1eb0ae0e71def202dbb315888b87c7d3be6f2670649a856fb90114a014ab477e4d70ba723c6ec257539ae1ec241cc4814dbf67b1e5f2
 MISC metadata.xml 436 BLAKE2B abc47a4c2597048c3e2037006db7811d99cb1ce5c35d83dec30fc415f6d419344bf283d580c153309bb7934b6a12fae878cd480f6c12be76deb52bd5494e2c5c SHA512 a7f6997ff7647e20526181189d5d38ebd944648a508a90ab42ada4dfec84f5165a25b07f5738880a9dcbf424e2b74ac7c3224f6b8d47d9c8a7f3fa7c02c02cbc
diff --git a/media-libs/portmidi/files/portmidi-217-cmake.patch b/media-libs/portmidi/files/portmidi-217-cmake.patch
deleted file mode 100644
index 7618ee5af952..000000000000
--- a/media-libs/portmidi/files/portmidi-217-cmake.patch
+++ /dev/null
@@ -1,332 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4919b78..9dc6e58 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -9,12 +9,11 @@ if(UNIX)
-   set(CMAKE_BUILD_TYPE Release CACHE STRING 
-       "Semicolon-separate list of supported configuration types")
-   # set default directories but don't override cached values...
--  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE}
-+  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-       CACHE STRING "libraries go here")
--  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE}
-+  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-       CACHE STRING "libraries go here")
--  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY 
--      ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE}
-+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-       CACHE STRING "executables go here")
- 
- else(UNIX)
-@@ -68,10 +67,20 @@ endif(UNIX)
- include_directories(pm_common porttime)
- add_subdirectory(pm_common)
- 
--add_subdirectory(pm_test)
-+option(PORTMIDI_ENABLE_JAVA "Enable Java bindings support" ON)
-+option(PORTMIDI_ENABLE_STATIC "Build and install static libraries" OFF)
-+option(PORTMIDI_ENABLE_TEST "Build test programs" ON)
-+
-+if(PORTMIDI_ENABLE_TEST)
-+  add_subdirectory(pm_test)
-+endif(PORTMIDI_ENABLE_TEST)
- 
- add_subdirectory(pm_dylib)
- 
- # Cannot figure out how to make an xcode Java application with CMake
--add_subdirectory(pm_java)
-+if(PORTMIDI_ENABLE_JAVA)
-+  set(JAR_INSTALL_DIR share/java
-+      CACHE STRING "Define directory name for jar installation")
-+  add_subdirectory(pm_java)
-+endif(PORTMIDI_ENABLE_JAVA)
- 
-diff --git a/pm_common/CMakeLists.txt b/pm_common/CMakeLists.txt
-index e171047..d23442d 100644
---- a/pm_common/CMakeLists.txt
-+++ b/pm_common/CMakeLists.txt
-@@ -44,9 +44,6 @@ set(CMAKE_C_FLAGS_RELEASE "${DEFAULT_RELEASE_FLAGS} ${LINUX_FLAGS}"
- 
- # first include the appropriate system-dependent file:
- if(UNIX)
--  # add the -g switch for Linux and Mac OS X (not used in Win32)
--  set (CMAKE_C_FLAGS_DEBUG "-g ${CMAKE_C_FLAGS_DEBUG}" 
--       CACHE STRING "enable extra checks for debugging" FORCE)
-   if(APPLE)
-     set(MACSRC pmmacosxcm pmmac readbinaryplist finddefault)
-     prepend_path(LIBSRC ../pm_mac/ ${MACSRC})
-@@ -62,19 +59,23 @@ if(UNIX)
-                              ${COREMIDI_LIB} ${CORESERVICES_LIB}
-         CACHE INTERNAL "")
- 
--    set(JAVAVM_LIB "${FRAMEWORK_PATH}/JavaVM.framework")
--    set(JAVA_INCLUDE_PATHS ${JAVAVM_LIB}/Headers)
-+    if(PORTMIDI_ENABLE_JAVA)
-+      set(JAVAVM_LIB "${FRAMEWORK_PATH}/JavaVM.framework")
-+      set(JAVA_INCLUDE_PATHS ${JAVAVM_LIB}/Headers)
-+    endif(PORTMIDI_ENABLE_JAVA)
-     message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
-   else(APPLE)
-     # LINUX settings...
--    include(FindJNI)
--    message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
--    message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
--    message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2})
--    message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY})
--    set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
--    # libjvm.so is found relative to JAVA_INCLUDE_PATH:
--    set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so)
-+    if(PORTMIDI_ENABLE_JAVA)
-+      include(FindJNI)
-+      message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
-+      message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
-+      message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2})
-+      message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY})
-+      set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
-+      # libjvm.so is found relative to JAVA_INCLUDE_PATH:
-+      set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so)
-+    endif(PORTMIDI_ENABLE_JAVA)
- 
-     set(LINUXSRC pmlinuxalsa pmlinux finddefault)
-     prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})
-@@ -88,10 +89,12 @@ else(UNIX)
-     # /MD is multithread DLL, /MT is multithread. Change to static:
-     include(../pm_win/static.cmake)
-     
--    include(FindJNI)
-+    if(PORTMIDI_ENABLE_JAVA)
-+      include(FindJNI)
- 
--    set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
--    # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS})
-+      set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
-+      # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS})
-+    endif(PORTMIDI_ENABLE_JAVA)
- 
-     set(WINSRC pmwin pmwinmm)
-     prepend_path(LIBSRC ../pm_win/ ${WINSRC})
-@@ -99,29 +102,43 @@ else(UNIX)
-     set(PM_NEEDED_LIBS winmm.lib)
-   endif(WIN32)
- endif(UNIX)
--set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY})
-+
-+if(PORTMIDI_ENABLE_JAVA)
-+  set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY})
-+endif(PORTMIDI_ENABLE_JAVA)
- 
- # this completes the list of library sources by adding shared code
- list(APPEND LIBSRC pmutil portmidi)
- 
- # now add the shared files to make the complete list of library sources
--add_library(portmidi-static ${LIBSRC})
--set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi_s")
--target_link_libraries(portmidi-static ${PM_NEEDED_LIBS})
--
--# define the jni library
--include_directories(${JAVA_INCLUDE_PATHS})
--
--set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c)
--add_library(pmjni SHARED ${JNISRC})
--target_link_libraries(pmjni ${JNI_EXTRA_LIBS})
--set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib")
-+if(PORTMIDI_ENABLE_STATIC)
-+  add_library(portmidi-static ${LIBSRC})
-+  set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi")
-+  target_link_libraries(portmidi-static ${PM_NEEDED_LIBS})
-+endif(PORTMIDI_ENABLE_STATIC)
-+
-+if(PORTMIDI_ENABLE_JAVA)
-+  # define the jni library
-+  include_directories(${JAVA_INCLUDE_PATHS})
-+
-+  set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c)
-+  add_library(pmjni SHARED ${JNISRC})
-+  target_link_libraries(pmjni ${JNI_EXTRA_LIBS})
-+  set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib")
-+endif(PORTMIDI_ENABLE_JAVA)
- 
- # install the libraries (Linux and Mac OS X command line)
- if(UNIX)
--  INSTALL(TARGETS portmidi-static pmjni
--    LIBRARY DESTINATION /usr/local/lib
--    ARCHIVE DESTINATION /usr/local/lib)
-+  if(PORTMIDI_ENABLE_STATIC)
-+    INSTALL(TARGETS portmidi-static
-+      LIBRARY DESTINATION lib${LIB_SUFFIX}
-+      ARCHIVE DESTINATION lib${LIB_SUFFIX})
-+  endif(PORTMIDI_ENABLE_STATIC)
-+  if(PORTMIDI_ENABLE_JAVA)
-+    INSTALL(TARGETS pmjni
-+      LIBRARY DESTINATION lib${LIB_SUFFIX}
-+      ARCHIVE DESTINATION lib${LIB_SUFFIX})
-+  endif(PORTMIDI_ENABLE_JAVA)
- # .h files installed by pm_dylib/CMakeLists.txt, so don't need them here
- #  INSTALL(FILES portmidi.h ../porttime/porttime.h
- #    DESTINATION /usr/local/include)
-diff --git a/pm_dylib/CMakeLists.txt b/pm_dylib/CMakeLists.txt
-index f693dd6..c0e1449 100644
---- a/pm_dylib/CMakeLists.txt
-+++ b/pm_dylib/CMakeLists.txt
-@@ -39,9 +39,6 @@ set(CMAKE_C_FLAGS_RELEASE "${DEFAULT_RELEASE_FLAGS} ${LINUX_FLAGS}"
- 
- # first include the appropriate system-dependent file:
- if(UNIX)
--  # add the -g switch for Linux and Mac OS X (not used in Win32)
--  set (CMAKE_C_FLAGS_DEBUG "-g ${CMAKE_C_FLAGS_DEBUG}" 
--       CACHE STRING "enable extra checks for debugging" FORCE)
-   if(APPLE)
-     set(MACSRC pmmacosxcm pmmac readbinaryplist finddefault)
-     prepend_path(LIBSRC ../pm_mac/ ${MACSRC})
-@@ -63,7 +60,8 @@ if(UNIX)
-     message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
-   else(APPLE)
-     # LINUX settings...
--    include(FindJNI)
-+    if(PORTMIDI_ENABLE_JAVA)
-+      include(FindJNI)
-     # message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
-     # message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
-     # note: should use JAVA_JVM_LIB_PATH, but it is not set properly
-@@ -75,11 +73,8 @@ if(UNIX)
-     # JAVA_INCLUDE_PATH2; if no, then we need to make both JAVA_INCLUDE_PATH
-     # and JAVA_INCLUDE_PATH2 set by user (will need clear documentation
-     # because JAVA_INCLUDE_PATH2 is pretty obscure)
--    set(JAVA_INCLUDE_PATH  ${JAVA_INCLUDE_PATH-UNKNOWN}
--        CACHE STRING "where to find Java SDK include directory")
--    set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH}/linux)
--    # libjvm.so is found relative to JAVA_INCLUDE_PATH:
--    set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../jre/lib/i386/client/libjvm.so)
-+      set(JAVAVM_LIB ${JAVA_JVM_LIBRARY})
-+    endif(PORTMIDI_ENABLE_JAVA)
- 
-     set(LINUXSRC pmlinuxalsa pmlinux finddefault)
-     prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})
-@@ -91,13 +86,15 @@ else(UNIX)
-   if(WIN32)
-     # /MDd is multithread debug DLL, /MTd is multithread debug
-     # /MD is multithread DLL, /MT is multithread 
--    
--    include(FindJNI)
--    # note: should use JAVA_JVM_LIB_PATH, but it is not set properly
--    set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../lib/jvm.lib)
- 
--    set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
--    # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS})
-+    if(PORTMIDI_ENABLE_JAVA)
-+      include(FindJNI)
-+      # note: should use JAVA_JVM_LIB_PATH, but it is not set properly
-+      set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../lib/jvm.lib)
-+
-+      set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
-+      # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS})
-+    endif(PORTMIDI_ENABLE_JAVA)
- 
-     set(WINSRC pmwin pmwinmm)
-     prepend_path(LIBSRC ../pm_win/ ${WINSRC})
-@@ -106,7 +103,10 @@ else(UNIX)
-     # message(STATUS "JAVAVM_LIB: " ${JAVAVM_LIB})
-   endif(WIN32)
- endif(UNIX)
-+
-+if(PORTMIDI_ENABLE_JAVA)
- set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVAVM_LIB})
-+endif(PORTMIDI_ENABLE_JAVA)
- 
- # this completes the list of library sources by adding shared code
- set(SHARED_FILES pmutil portmidi)
-@@ -120,8 +120,8 @@ target_link_libraries(portmidi-dynamic ${PM_NEEDED_LIBS})
- # install the libraries (Linux and Mac OS X command line)
- if(UNIX)
-   INSTALL(TARGETS portmidi-dynamic
--    LIBRARY DESTINATION /usr/local/lib
--    ARCHIVE DESTINATION /usr/local/lib)
-+    LIBRARY DESTINATION lib${LIB_SUFFIX}
-+    ARCHIVE DESTINATION lib${LIB_SUFFIX})
-   INSTALL(FILES ../pm_common/portmidi.h ../porttime/porttime.h
--    DESTINATION /usr/local/include)
-+    DESTINATION include)
- endif(UNIX)
-diff --git a/pm_java/CMakeLists.txt b/pm_java/CMakeLists.txt
-index a350620..9cbee1c 100644
---- a/pm_java/CMakeLists.txt
-+++ b/pm_java/CMakeLists.txt
-@@ -5,43 +5,24 @@ if(UNIX)
-     # java not dealt with in CMake -- see pm_mac/pm_mac.xcodeproj
-   else(APPLE)
-     # linux
--    set(JPORTMIDICLASS JPortMidi.class JPortMidiException.class
--    		       JPortMidiApi.class)
--    set(PMDEFAULTSCLASS PmDefaultsFrame.class PmDefaults.class)
--    prepend_path(JPORTMIDICLASS2 jportmidi/ ${JPORTMIDICLASS})
--    prepend_path(PMDEFAULTSCLASS2 pmdefaults/ ${PMDEFAULTSCLASS})
--    set(PMDEFAULTS_ALL_CLASSES ${JPORTMIDICLASS2} ${PMDEFAULTSCLASS2})
--    # message(STATUS "PMDEFAULTS_ALL_CLASSES is " ${PMDEFAULTS_ALL_CLASSES})
--    add_custom_command(OUTPUT pmdefaults/PmDefaultsFrame.class
--        COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java
--	MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java
--	DEPENDS pmdefaults/PmDefaults.java
--	WORKING_DIRECTORY pm_java)
--    add_custom_command(OUTPUT pmdefaults/PmDefaults.class
--        COMMAND javac -classpath . pmdefaults/PmDefaults.java
--	MAIN_DEPENDENCY pmdefaults/PmDefaults.java
--	DEPENDS pmdefaults/PmDefaultsFrame.java
--	WORKING_DIRECTORY pm_java)
--    add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar
--        COMMAND	cp pmdefaults/portmusic_logo.png .
--        COMMAND	jar cmf pmdefaults/manifest.txt pmdefaults.jar
--		pmdefaults/*.class portmusic_logo.png jportmidi/*.class
--  	COMMAND chmod +x pmdefaults/pmdefaults
--	COMMAND cp pmdefaults/pmdefaults ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
--	COMMAND mv pmdefaults.jar ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
--	COMMAND rm portmusic_logo.png
--	MAIN_DEPENDENCY pmdefaults/PmDefaults.class
--	DEPENDS ${PMDEFAULTS_ALL_CLASSES}
--	WORKING_DIRECTORY pm_java)
--    add_custom_target(pmdefaults_target ALL 
--        DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar)
--    # message(STATUS "add_custom_target: pmdefaults.jar")
-+	set(JAVA_CLASSES jportmidi pmdefaults)
-+	add_custom_command(OUTPUT ${JAVA_CLASSES}
-+		COMMAND javac -d ${CMAKE_CURRENT_BINARY_DIR} jportmidi/*.java pmdefaults/*.java
-+		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-+	add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar
-+		DEPENDS ${JAVA_CLASSES}
-+		COMMAND jar cmf pmdefaults/manifest.txt ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar
-+		-C pmdefaults portmusic_logo.png -C ${CMAKE_CURRENT_BINARY_DIR} jportmidi
-+		-C ${CMAKE_CURRENT_BINARY_DIR} pmdefaults
-+		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-+	add_custom_target(pmdefaults.jar ALL
-+		DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar)
- 
-     # install the libraries (Linux only)
--    INSTALL(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar
--      DESTINATION /usr/share/java)
--    INSTALL(PROGRAMS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults
--      DESTINATION /usr/local/bin)
-+    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar
-+      DESTINATION ${JAR_INSTALL_DIR})
-+    INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/pmdefaults/pmdefaults
-+      DESTINATION bin)
-   endif(APPLE)
- endif(UNIX)
- # In windows, use pm_java/make.bat
-diff --git a/pm_test/CMakeLists.txt b/pm_test/CMakeLists.txt
-index b89074b..236ff49 100644
---- a/pm_test/CMakeLists.txt
-+++ b/pm_test/CMakeLists.txt
-@@ -10,10 +10,12 @@ if(WIN32)
- include(../pm_win/static.cmake)
- endif(WIN32)
- 
-+set(CMAKE_SKIP_BUILD_RPATH TRUE)
-+
- macro(make_a_test name)
-   add_executable(${name} ${name}.c)
--  target_link_libraries(${name} portmidi-static ${PM_NEEDED_LIBS})
--  add_dependencies(${name} portmidi-static)
-+  target_link_libraries(${name} portmidi-dynamic ${PM_NEEDED_LIBS})
-+  add_dependencies(${name} portmidi-dynamic)
- endmacro(make_a_test)
- 
- make_a_test(test)
diff --git a/media-libs/portmidi/portmidi-217-r3.ebuild b/media-libs/portmidi/portmidi-217-r3.ebuild
deleted file mode 100644
index 403557873b8c..000000000000
--- a/media-libs/portmidi/portmidi-217-r3.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_OPTIONAL=1
-# ninja: error: build.ninja:521: multiple rules generate pm_java/pmdefaults.jar [-w dupbuild=err]
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake desktop xdg distutils-r1 java-pkg-opt-2 flag-o-matic
-
-DESCRIPTION="Library for real time MIDI input and output"
-HOMEPAGE="http://portmedia.sourceforge.net/"
-SRC_URI="mirror://sourceforge/portmedia/${PN}-src-${PV}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="debug doc java python static-libs test-programs"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
-	app-arch/unzip
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	python? ( >=dev-python/cython-0.12.1[${PYTHON_USEDEP}] )
-"
-CDEPEND="
-	media-libs/alsa-lib
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.8 )
-"
-DEPEND="
-	${CDEPEND}
-	java? ( >=virtual/jdk-1.8 )
-"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
-	# fix parallel make failures, fix java support, and allow optional
-	# components like test programs and static libs to be skipped
-	"${FILESDIR}"/${P}-cmake.patch
-
-	# add include directories and remove references to missing files
-	"${FILESDIR}"/${P}-r4-python.patch
-)
-
-pkg_setup() {
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# install wrapper for pmdefaults
-	if use java ; then
-		cat > pm_java/pmdefaults/pmdefaults <<-EOF
-			#!/bin/sh
-			java -Djava.library.path="${EPREFIX}/usr/$(get_libdir)/" \\
-				-jar "${EPREFIX}/usr/share/${PN}/lib/pmdefaults.jar"
-		EOF
-		[[ $? -ne 0 ]] && die "cat pmdefaults failed"
-	fi
-}
-
-src_configure() {
-	if use debug ; then
-		CMAKE_BUILD_TYPE=Debug
-	else
-		CMAKE_BUILD_TYPE=Release
-	fi
-
-	local mycmakeargs=(
-		-DPORTMIDI_ENABLE_JAVA=$(usex java)
-		-DPORTMIDI_ENABLE_STATIC=$(usex static-libs)
-		-DPORTMIDI_ENABLE_TEST=$(usex test-programs)
-	)
-
-	if use java ; then
-		mycmakeargs+=(-DJAR_INSTALL_DIR="${EPREFIX}/usr/share/${PN}/lib")
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use python ; then
-		sed -i -e "/library_dirs=.*linux/s#./linux#${CMAKE_BUILD_DIR}#" pm_python/setup.py || die
-		pushd pm_python > /dev/null
-		append-ldflags -L"${BUILD_DIR}"
-		distutils-r1_src_compile
-		popd > /dev/null
-	fi
-
-	if use doc ; then
-		doxygen || die "doxygen failed"
-		pushd latex > /dev/null
-		VARTEXFONTS="${T}"/fonts emake
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	dodoc CHANGELOG.txt README.txt pm_linux/README_LINUX.txt
-
-	use doc && dodoc latex/refman.pdf
-
-	if use python ; then
-		pushd pm_python > /dev/null
-		distutils-r1_src_install
-		popd > /dev/null
-	fi
-
-	if use java ; then
-		newdoc pm_java/README.txt README_JAVA.txt
-		newicon pm_java/pmdefaults/pmdefaults-icon.png pmdefaults.png
-		make_desktop_entry pmdefaults Pmdefaults pmdefaults "AudioVideo;Audio;Midi;"
-	fi
-
-	if use test-programs ; then
-		exeinto /usr/$(get_libdir)/${PN}
-		local app
-		for app in latency midiclock midithread midithru mm qtest sysex test ; do
-			doexe "${BUILD_DIR}"/${app}
-		done
-	fi
-}
diff --git a/media-libs/portmidi/portmidi-234.ebuild b/media-libs/portmidi/portmidi-234.ebuild
index 6713a99ef2f6..c8634feae893 100644
--- a/media-libs/portmidi/portmidi-234.ebuild
+++ b/media-libs/portmidi/portmidi-234.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/project/portmedia/${MY_P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="debug doc java python static-libs test-programs"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"