gentoo Easter resync : 12.04.2020

5 files changed, 14 insertions, 173 deletions

diff --git a/media-libs/portmidi/Manifest b/media-libs/portmidi/Manifest
index 7d663fdd7154..545c227259ed 100644
--- a/media-libs/portmidi/Manifest
+++ b/media-libs/portmidi/Manifest
@@ -1,7 +1,5 @@
 AUX portmidi-217-cmake.patch 13905 BLAKE2B faa559f25b1acec63f17a6b6dcbd228eff2cb50447ba72ea4108c86f36b8142fac54c90e5480d74278e0fa0b28bad68f4f1bfac192434840893dc9039243284f SHA512 b60da799041d6dc4a1bf82981d904cf9bbbaed021397cd2235dc25b18b7c830576ecce8fa0c6992249e03ab84579eff795ae33a8e0d091dcda8ee856491420d4
-AUX portmidi-217-python.patch 764 BLAKE2B bcf569bab2c105f99b7a3b10c0124fa22b7fb0d9d494024c17c01f3bb6641441f1942b4dae76725835e880c4ed90c03e151f218b4eec78b29fdefc343cc00b30 SHA512 5f5e582d1769c995038d1b073eb603e313f1a49b5d7cb832de9f2aef003dfcf34bcd848337dc180ee23bf87ad631887584d339474c45e57b6a78d179c929ec43
-AUX portmidi-217-r3-python.patch 1630 BLAKE2B df68b3d216004f6f94fcf9b321deebc76f2891499ba58cf60376695fd02f7de33933274836ca8357996c0fd07006ee545ef7208ac58caaf83e74188327a4362c SHA512 eae1cfd3e3b9d98f5575f93f33f2d88d0b7f674ec059548bd972e58127715bf76131fdc24a9cb9fb4bbd446ef32b1b3ed79d3923332b967e2599446c636ba36c
+AUX portmidi-217-r4-python.patch 1540 BLAKE2B a5fe8c48e8d312cead822fc8893f8a610bf5cf280dd2445da04ab42ed13a5a121174afa2e8874dcf3f7a7b89cd60894a819404438c6d5cb2b99a8e2ae6f3aba8 SHA512 d7ded737346f9756450ff3eaf35daf33da941a109d7db07598ea57593ef3272213b889a9ab33bed71bead4583cb080439813bf7fc4a6d1a6cbb84ed4cd25b51f
 DIST portmidi-src-217.zip 1030830 BLAKE2B ab197c7f9a5c2b4d2740d56841459fbac97d510e4d12e5d0cd7cecc0ba6035929b6596140d42c575a9513862a66127d19253dbee1d3a7b7b84b69c88fec7fcae SHA512 d08d4d57429d26d292b5fe6868b7c7a32f2f1d2428f6695cd403a697e2d91629bd4380242ab2720e8f21c895bb75cb56b709fb663a20e8e623120e50bfc5d90b
-EBUILD portmidi-217-r2.ebuild 3050 BLAKE2B ea034c6366908edeab906b8cd5ee58f1bf75aa1f2a29d7766db7ae94d3576c587a409a96d54704cd8b84e34d4430b0c1e557e2f93be5607bec40803d40afe1eb SHA512 a69e6ca91231cbce5efa1cff3c305ff34ec029c1a113fcf1090dd3ea232f2050dc0e8dd60bae225e20e5c93d1aefd2c568dab897a020485f92b61b0c0ab5dabe
-EBUILD portmidi-217-r3.ebuild 3157 BLAKE2B b61c1d362aacaea932666f97e9cea5554db4c67fc81395eafb6b6ed8c03834a5b9f9bdc3b913c6448a12fbc21d29b4939c4aa559239920659226f1cf2378a968 SHA512 517a5528d1fe9f8451b4d9e60664d7f3414d0d0f1febc838cd1bc3dd9229cfe8c4cc0cb0052a10c78bd8f057e1bc7e0d61e7b737dd2dbbb45fcd797124b3c105
+EBUILD portmidi-217-r3.ebuild 3210 BLAKE2B 5a95b69b73ed43c49a841a40ca8319eafac2b8241c7fd858c93525bc94b1f483bce633fd8bf38135b077efee65659b82522e65779a5945eca9147135a4739a12 SHA512 5ea5e876cb170c8e429195fe8b665822d3eb812e23078432b3686c0d67a69b2f71f25e15a041475a2d2dc7eac770df01a82a1a538343704825ca895055160977
 MISC metadata.xml 436 BLAKE2B abc47a4c2597048c3e2037006db7811d99cb1ce5c35d83dec30fc415f6d419344bf283d580c153309bb7934b6a12fae878cd480f6c12be76deb52bd5494e2c5c SHA512 a7f6997ff7647e20526181189d5d38ebd944648a508a90ab42ada4dfec84f5165a25b07f5738880a9dcbf424e2b74ac7c3224f6b8d47d9c8a7f3fa7c02c02cbc
diff --git a/media-libs/portmidi/files/portmidi-217-python.patch b/media-libs/portmidi/files/portmidi-217-python.patch
deleted file mode 100644
index 5682c3344358..000000000000
--- a/media-libs/portmidi/files/portmidi-217-python.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- portmidi/pm_python/setup.py
-+++ portmidi/pm_python/setup.py
-@@ -15,12 +15,10 @@
- 
- 
- DESCRIPTION = open('README_PYTHON.txt').read()
--CHANGES = open('CHANGES.txt').read()
--TODO = open('TODO.txt').read()
- 
- EXTRAS = {}
- 
--long_description = DESCRIPTION + CHANGES + TODO
-+long_description = DESCRIPTION
- #import sys
- #if "checkdocs" in sys.argv:
- #    print long_description
-@@ -173,7 +171,8 @@
-     EXTENSION = dict(
-         ext_modules=[ 
-             Extension("pyportmidi._pyportmidi", [os.path.join("pyportmidi", "_pyportmidi.pyx")],
-                       library_dirs=["./linux"],
-+                      include_dirs=["../pm_common", "../porttime"],
-                       libraries = ["portmidi", "asound", "pthread"]
-                       )
-         ]
diff --git a/media-libs/portmidi/files/portmidi-217-r3-python.patch b/media-libs/portmidi/files/portmidi-217-r4-python.patch
index d4024710fa39..23ef6c3add1e 100644
--- a/media-libs/portmidi/files/portmidi-217-r3-python.patch
+++ b/media-libs/portmidi/files/portmidi-217-r4-python.patch
@@ -1,8 +1,7 @@
-diff --git a/pm_python/setup.py b/pm_python/setup.py
-index 14ab1c7..5b1e7c0 100644
---- a/pm_python/setup.py
-+++ b/pm_python/setup.py
-@@ -15,12 +15,10 @@ except ImportError:
+diff -Naur portmidi-a/pm_python/setup.py portmidi-b/pm_python/setup.py
+--- portmidi-a/pm_python/setup.py	2010-09-26 15:32:44.000000000 -0400
++++ portmidi-b/pm_python/setup.py	2020-03-19 12:34:34.398365103 -0400
+@@ -15,12 +15,10 @@
  
  
  DESCRIPTION = open('README_PYTHON.txt').read()
@@ -16,7 +15,7 @@ index 14ab1c7..5b1e7c0 100644
  #import sys
  #if "checkdocs" in sys.argv:
  #    print long_description
-@@ -142,7 +140,7 @@ PACKAGEDATA.update(EXTRAS)
+@@ -142,7 +140,7 @@
  
  
  if sys.platform == 'win32':
@@ -25,7 +24,7 @@ index 14ab1c7..5b1e7c0 100644
      EXTENSION = dict(
          ext_modules=[ 
              Extension("pyportmidi._pyportmidi", [os.path.join("pyportmidi", "_pyportmidi.pyx")],
-@@ -154,7 +152,7 @@ if sys.platform == 'win32':
+@@ -154,7 +152,7 @@
          ]
      )
  elif sys.platform == 'darwin':
@@ -34,7 +33,7 @@ index 14ab1c7..5b1e7c0 100644
      library_dirs = ["/usr/local/lib"]
      include_dirs = ["/usr/local/include"]
      EXTENSION = dict(
-@@ -169,11 +167,12 @@ elif sys.platform == 'darwin':
+@@ -169,11 +167,11 @@
          ]
      )
  else:
@@ -44,7 +43,6 @@ index 14ab1c7..5b1e7c0 100644
          ext_modules=[ 
              Extension("pyportmidi._pyportmidi", [os.path.join("pyportmidi", "_pyportmidi.pyx")],
 -                      library_dirs=["./linux"],
-+                      library_dirs=["../../portmidi*build"],
 +                      include_dirs=["../pm_common", "../porttime"],
                        libraries = ["portmidi", "asound", "pthread"]
                        )
diff --git a/media-libs/portmidi/portmidi-217-r2.ebuild b/media-libs/portmidi/portmidi-217-r2.ebuild
deleted file mode 100644
index 52f70fb9e5b0..000000000000
--- a/media-libs/portmidi/portmidi-217-r2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-inherit cmake-utils desktop distutils-r1 java-pkg-opt-2
-
-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 ~hppa ~ia64 ~mips ppc ~sparc x86"
-IUSE="debug doc java python static-libs test-programs"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	media-libs/alsa-lib
-	python? ( ${PYTHON_DEPS} )"
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.6 )"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	java? ( >=virtual/jdk-1.6 )
-	python? ( >=dev-python/cython-0.12.1[${PYTHON_USEDEP}] )
-"
-
-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}-python.patch
-)
-
-pkg_setup() {
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_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-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_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
-		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-utils_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 "${CMAKE_BUILD_DIR}"/${app}
-		done
-	fi
-}
diff --git a/media-libs/portmidi/portmidi-217-r3.ebuild b/media-libs/portmidi/portmidi-217-r3.ebuild
index 27dd06fd49d7..eb76338eb2ff 100644
--- a/media-libs/portmidi/portmidi-217-r3.ebuild
+++ b/media-libs/portmidi/portmidi-217-r3.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=7
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,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
+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/"
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/portmedia/${PN}-src-${PV}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~sparc x86"
 IUSE="debug doc java python static-libs test-programs"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -50,7 +50,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-cmake.patch
 
 	# add include directories and remove references to missing files
-	"${FILESDIR}"/${PF}-python.patch
+	"${FILESDIR}"/${P}-r4-python.patch
 )
 
 pkg_setup() {
@@ -97,6 +97,7 @@ 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