gentoo resync : 15.01.2020

7 files changed, 6 insertions, 344 deletions

diff --git a/dev-python/Kivy/Kivy-1.10.0.ebuild b/dev-python/Kivy/Kivy-1.10.0.ebuild
deleted file mode 100644
index ccdd94cab72c..000000000000
--- a/dev-python/Kivy/Kivy-1.10.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DESCRIPTION="Library for rapid development of hardware-accelerated multitouch applications"
-HOMEPAGE="https://kivy.org/"
-SRC_URI="https://github.com/kivy/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cairo camera doc examples garden gstreamer +sdl spell test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
-	camera? ( media-libs/opencv:0/2.4[$(python_gen_usedep 'python2_7')] )
-	garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
-	gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
-	sdl? ( media-libs/libsdl2
-		media-libs/sdl2-ttf
-		media-libs/sdl2-image
-		media-libs/sdl2-mixer )
-	!sdl? ( dev-python/pygame[${PYTHON_USEDEP}] )
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${P,,}"
-
-PATCHES=(
-	"${FILESDIR}/modplug-fix.patch"
-)
-
-python_prepare_all() {
-# 	sed -e '/data_files=/d' -i "${S}/setup.py" || die
-# 	sed -e 's/PYTHON = python/PYTHON ?= python/' -i Makefile || die
-
-	export USE_SDL2=$(usex sdl 1 0)
-	export USE_GSTREAMER=$(usex gstreamer 1 0)
-	export KIVY_USE_SETUPTOOLS=1
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	esetup.py build_ext --inplace
-	esetup.py build
-}
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	emake test PYTHON="${PYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/build/html/. )
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples/${f}/"
-		doins "${S}/examples"/* "${S}/examples"/*/*
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/Kivy/Kivy-1.10.1.ebuild b/dev-python/Kivy/Kivy-1.10.1.ebuild
index 95dabb5f0e85..fef777e0c348 100644
--- a/dev-python/Kivy/Kivy-1.10.1.ebuild
+++ b/dev-python/Kivy/Kivy-1.10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
@@ -16,14 +16,13 @@ SRC_URI="https://github.com/kivy/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE="cairo camera doc examples garden gstreamer +sdl spell test"
+IUSE="cairo doc examples garden gstreamer +sdl spell test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	media-libs/mesa[gles2]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
-	camera? ( media-libs/opencv:0/2.4[$(python_gen_usedep 'python2_7')] )
 	garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
 	gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
 	sdl? ( media-libs/libsdl2
diff --git a/dev-python/Kivy/Kivy-1.9.1-r1.ebuild b/dev-python/Kivy/Kivy-1.9.1-r1.ebuild
deleted file mode 100644
index de15acb2050e..000000000000
--- a/dev-python/Kivy/Kivy-1.9.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DESCRIPTION="Library for rapid development of hardware-accelerated multitouch applications"
-HOMEPAGE="https://kivy.org/"
-SRC_URI="https://pypi.io/packages/source/${PN:0:1}/${PN}/${P,,}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cairo camera doc examples garden gstreamer +sdl spell test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
-	camera? ( media-libs/opencv:0/2.4[$(python_gen_usedep 'python2_7')] )
-	garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
-	gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
-	sdl? ( media-libs/libsdl2
-		media-libs/sdl2-ttf
-		media-libs/sdl2-image
-		media-libs/sdl2-mixer )
-	!sdl? ( dev-python/pygame[${PYTHON_USEDEP}] )
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${P,,}"
-
-python_prepare_all() {
-	sed -e '/data_files=/d' -i "${S}/setup.py" || die
-	sed -e 's/PYTHON = python/PYTHON ?= python/' -i Makefile || die
-
-	export USE_SDL2=$(usex sdl 1 0)
-	export USE_GSTREAMER=$(usex gstreamer 1 0)
-	export KIVY_USE_SETUPTOOLS=1
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	esetup.py build_ext --inplace
-	esetup.py build
-}
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	emake test PYTHON="${PYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/build/html/. )
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples/${f}/"
-		doins "${S}/examples"/* "${S}/examples"/*/*
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/Kivy/Kivy-1.9.1.ebuild b/dev-python/Kivy/Kivy-1.9.1.ebuild
deleted file mode 100644
index 76675221370e..000000000000
--- a/dev-python/Kivy/Kivy-1.9.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DESCRIPTION="Library for rapid development of hardware-accelerated multitouch applications"
-HOMEPAGE="https://kivy.org/"
-SRC_URI="https://pypi.io/packages/source/${PN:0:1}/${PN}/${P,,}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cairo camera doc examples garden gstreamer +sdl spell test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
-	camera? ( media-libs/opencv:0/2.4[$(python_gen_usedep 'python2_7')] )
-	garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
-	gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
-	sdl? ( media-libs/libsdl2
-		media-libs/sdl2-ttf
-		media-libs/sdl2-image
-		media-libs/sdl2-mixer )
-	!sdl? ( dev-python/pygame[${PYTHON_USEDEP}] )
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${P,,}"
-
-python_prepare_all() {
-	sed -e '/data_files=/d' -i "${S}/setup.py" || die
-	sed -e 's/PYTHON = python/PYTHON ?= python/' -i Makefile || die
-
-	export USE_SDL2=$(usex sdl 1 0)
-	export USE_GSTREAMER=$(usex gstreamer 1 0)
-	export KIVY_USE_SETUPTOOLS=1
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	esetup.py build_ext --inplace
-	esetup.py build
-}
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	emake test PYTHON="${PYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/build/html/. )
-	use examples && EXAMPLES=( examples )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/Kivy/Manifest b/dev-python/Kivy/Manifest
index 5c885acb16cd..f3b4e9ced79d 100644
--- a/dev-python/Kivy/Manifest
+++ b/dev-python/Kivy/Manifest
@@ -1,9 +1,3 @@
-AUX modplug-fix.patch 4854 BLAKE2B 7552e40f790de3385c7916820a6b6429917d7a6353da48a283239129fc45f7e6540a01b3178f7e70becb8f342107ad3f16b78a363d8e67247f67cbe6491d65de SHA512 07db881b817b951e20be355e926375b34a2e0b43942322d83550ff99b07e434871a0a15c1a0e9ac9eba76fff96ca8221f9f02ec1ba31b1ddbd10b567ac237fa7
-DIST Kivy-1.10.0.tar.gz 24266702 BLAKE2B 3f1dab7c69e322d5856d1772d0902eaf5d4598957df1573e0c617ca872afa446797266f1ecd4a99da81bc7dcc40a051294d96c11e51a7fe2c505224bf0edaa42 SHA512 8049c92407e464558ecff913ff076c1b8f125b85a35b9eba64af49b35df545402ec2bac907ee545265a368b8cdbb33e02d74429dce13c53dd6feac735ace9cb4
 DIST Kivy-1.10.1.tar.gz 24318169 BLAKE2B 3032034717ad580af437eb280ad8474f057e1ab9f797edf3358db1073eda6e65ee8765862e39e77818debdf0a2a972ce3701b305ddfba307d9a8bfe2ce8edbc5 SHA512 2208e1a148dd1a7c507336419e7388de87d2ab340db055e09fce99837d50639e2e38f275e383503e5bdfc4b9d3def8176d758a80bf3455467604a4219c19d642
-DIST kivy-1.9.1.tar.gz 16363833 BLAKE2B 1f81ab0688e9ddc617da5e7d56523568e396f010587c971285996ca5544367a4f63bb6493f279ea66f6606b2808394614c25a96e97018ef0ae1e70d74eb9cd7e SHA512 1ae3ff3979a89e41c0af6493b7523835c1d01ee36fcd524f15d329b8fa875c6ca9bd25db3a844597fbc5370ff86b55ce177d3e66cc169223b02eb114c88c9989
-EBUILD Kivy-1.10.0.ebuild 1953 BLAKE2B ce9c5f5f1b163a1461061b0d69aff461b4179d6506ac52558cc9cb2df769cc91f43cfdf3500b9f53d33b5f85eb560507bb96d9a04177f5d5d4d5f7d95bb1ef9d SHA512 c746348e0fb4c93a5839df04ad3fb55cbb50ad7b3a11259b78ecb3b8d417071e08b0d9689f872c0f730b15c897fff8dc22387fb2a807590076070db86253edbf
-EBUILD Kivy-1.10.1.ebuild 1934 BLAKE2B 3223d0895d55b99a44163ea06befee59ae863af0a15890af8c181109a67a9aceafdfcfea04ca7255b4b9a014c70dce4e4100345c5d235ace15034361324536a7 SHA512 fae9c3695955bc8ff74a8925384906acb49b6374485ddfdf62f16de68e4443337c29fc4440ba81d3f0614fdee97c5e03a51f81ebf97d9dd02f53219b960c7695
-EBUILD Kivy-1.9.1-r1.ebuild 1899 BLAKE2B 43302efb26ead7238cb2d05e7fb9beacd8d320bec015c5d6707e19a3293a22489ea3b7e4cb030773c92aa242fad2e5058f43fda35e630696aa354d746e9a6812 SHA512 de9d3b7b5dae134472d683d382ee1d8f501cabeb2f1ac3380314ba10a0a9485c32217c7c4f9aea6dd4a688b65ecadddf2a5eb8063ac591165e711565fc2381d2
-EBUILD Kivy-1.9.1.ebuild 1815 BLAKE2B 4f5905dd0b30c452036f5eb902d53be111014a23a61f3696a1cdb19c00c84eb8c6cec8a791615c6400d0e01935144b19d0a9ddc72a15026105ee91792bbad0a8 SHA512 8a2aca2d69927164e347444d1d61381e40c01829d0d17addc0896446c57920565437d6769b8708118cc21a09a85cf24c6b75ede21133df2462cae50754b88c84
-MISC metadata.xml 490 BLAKE2B fca6a6372250ac811cf7520b98a2d26d5951030b56fa7d62ef85c3554025bb57a55371def39747d7597b42bd9dea44104892c75a2ecb58904de423ac4260c40e SHA512 a29aa0e59c1d02423643bf9bcccca5860c981a81f45b2aec030355f566b9690b8e7e8f6339acfbb5c51436e9298b99d4b53b5e3bdb410fa4f030177f9abe2ccb
+EBUILD Kivy-1.10.1.ebuild 1846 BLAKE2B bdefdc33d2e3fc6118a6a470e1b54031ec038cab2f8b257e2e517691fee800aba80128940adab4264064497c5e5046a392544532bf0380ebe7da6027566af073 SHA512 08e42b684987758beee7c73d191dd11ff003becffb93dc12ecf3d8620fdd375cfa93886f09c016b4d4a967966fca6d9dfe01380b884f7d926911eed19a661288
+MISC metadata.xml 353 BLAKE2B ca3791f85d35fcfffe02d8dfdeae68f502ab5ede54de7efecfe726d8647126a53ed1212877e7df5ef83692d49f8c6dbdbb4bd83cfcea9f69aeb38cc7a6a67897 SHA512 7a3e5b36f87b72e55d78fdcf5508e2baa3c311c097de4db1ac006f3fd25bba1a34f14a98a2ea5a3b5f147f02c781623321f5b9bc110c72ac2b1f6cc9850961b6
diff --git a/dev-python/Kivy/files/modplug-fix.patch b/dev-python/Kivy/files/modplug-fix.patch
deleted file mode 100644
index 18abe6e8f807..000000000000
--- a/dev-python/Kivy/files/modplug-fix.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 3b85f3e1c292b3f6c3f226490f52a2ab78251730 Mon Sep 17 00:00:00 2001
-From: Terje Skjaeveland <terje.skjaeveland@gmail.com>
-Date: Sun, 29 Oct 2017 12:35:46 +0100
-Subject: [PATCH] audio_sdl2: Update for mixer v2.0.2 support
-
-Flags MIX_INIT_MODPLUG was removed, and MIX_INIT_FLUIDSYNTH was
-renamed to MIX_INIT_MID.
----
- kivy/core/audio/audio_sdl2.pyx | 45 +++++++++++++++++++++++++++++-------------
- kivy/lib/sdl2.pxi              |  4 ++--
- 2 files changed, 33 insertions(+), 16 deletions(-)
-
-diff --git a/kivy/core/audio/audio_sdl2.pyx b/kivy/core/audio/audio_sdl2.pyx
-index 2ab569fe60..c6f26be5c8 100644
---- a/kivy/core/audio/audio_sdl2.pyx
-+++ b/kivy/core/audio/audio_sdl2.pyx
-@@ -15,9 +15,23 @@ Depending the compilation of SDL2 mixer and/or installed libraries:
- * ogg since 1.9.1 (mixer needs libvorbis/libogg)
- * flac since 1.9.1 (mixer needs libflac)
- * mp3 since 1.9.1 (mixer needs libsmpeg/libmad; only use mad for GPL apps)
-+  * Since 1.10.1 + mixer 2.0.2, mpg123 can also be used
- * sequenced formats since 1.9.1 (midi, mod, s3m, etc. Mixer needs
-   libmodplug or libmikmod)
- 
-+.. Note::
-+
-+    Sequenced format support changed with mixer v2.0.2. If mixer is
-+    linked with one of libmodplug or libmikmod, format support for
-+    both libraries is assumed. This will work perfectly with formats
-+    upported by both libraries, but if you were to try to load an
-+    obscure format (like `apun` file with mikmod only), it will fail.
-+
-+    * Kivy <= 1.10.0: will fail to build with mixer >= 2.0.2
-+      will report correct format support with < 2.0.2
-+    * Kivy >= 1.10.1: will build with old and new mixer, and
-+      will "guesstimate" sequenced format support
-+
- .. Warning::
- 
-     Sequenced formats use the SDL2 Mixer music channel, you can only play
-@@ -57,8 +71,13 @@ cdef mix_init():
-         mix_is_init = -1
-         return 0
- 
-+    # In mixer 2.0.2, MIX_INIT_MODPLUG is now implied by MIX_INIT_MOD,
-+    # and MIX_INIT_FLUIDSYNTH was renamed to MIX_INIT_MID. In previous
-+    # versions, we requested both _MODPLUG and _MOD + _FLUIDSYNTH.
-+    # 0x20 used to be MIX_INIT_FLUIDSYNTH, now MIX_INIT_MID
-+    # 0x4  used to be MIX_INIT_MODPLUG before 2.0.2
-     want_flags = MIX_INIT_FLAC | MIX_INIT_OGG | MIX_INIT_MP3
--    want_flags |= MIX_INIT_MOD | MIX_INIT_MODPLUG | MIX_INIT_FLUIDSYNTH
-+    want_flags |= MIX_INIT_MOD | 0x20 | 0x4
- 
-     mix_flags = Mix_Init(want_flags)
- 
-@@ -244,25 +263,23 @@ class MusicSDL2(Sound):
-     @staticmethod
-     def extensions():
-         mix_init()
-+        # FIXME: this should probably evolve to use the new has_music()
-+        #        interface to determine format support
- 
-         # Assume native midi support (defaults to enabled), but may use
-         # modplug, fluidsynth or timidity in reality. It may also be
-         # disabled completely, in which case loading it will fail
-         extensions = set(['mid', 'midi'])
- 
--        # libmodplug, may be incomplete
--        if mix_flags & MIX_INIT_MODPLUG:
--            extensions.update(['669', 'abc', 'amf', 'ams', 'dbm', 'dmf',
--                               'dsm', 'far', 'it', 'j2b', 'mdl', 'med',
--                               'mod', 'mt2', 'mtm', 'okt', 'pat', 'psm',
--                               'ptm', 's3m', 'stm', 'ult', 'umx', 'xm'])
--
--        # libmikmod, may be incomplete
--        if mix_flags & MIX_INIT_MOD:
--            extensions.update(['669', 'amf', 'apun', 'dsm', 'far', 'gdm',
--                               'gt2', 'it',  'med', 'mod', 'mtm', 'okt',
--                               's3m', 'stm', 'stx', 'ult', 'umx', 'uni',
--                               'xm'])
-+        # libmodplug and libmikmod, may be incomplete.
-+        # 0x4 is for mixer < 2.0.2, MIX_INIT_MODPLUG
-+        if mix_flags & (MIX_INIT_MOD | 0x4):
-+            extensions.update(['669', 'abc', 'amf', 'ams', 'apun', 'dbm',
-+                               'dmf', 'dsm', 'far', 'gdm', 'it',   'j2b',
-+                               'mdl', 'med', 'mod', 'mt2', 'mtm',  'okt',
-+                               'pat', 'psm', 'ptm', 's3m', 'stm',  'stx',
-+                               'ult', 'umx', 'uni', 'xm'])
-+
-         return list(extensions)
- 
-     def __init__(self, **kwargs):
-diff --git a/kivy/lib/sdl2.pxi b/kivy/lib/sdl2.pxi
-index 07d055c903..ad62ce8023 100644
---- a/kivy/lib/sdl2.pxi
-+++ b/kivy/lib/sdl2.pxi
-@@ -881,10 +881,10 @@ cdef extern from "SDL_mixer.h":
-     ctypedef enum MIX_InitFlags:
-         MIX_INIT_FLAC        = 0x00000001
-         MIX_INIT_MOD         = 0x00000002
--        MIX_INIT_MODPLUG     = 0x00000004
-+        MIX_INIT_MODPLUG     = 0x00000004 # Removed in mixer 2.0.2
-         MIX_INIT_MP3         = 0x00000008
-         MIX_INIT_OGG         = 0x00000010
--        MIX_INIT_FLUIDSYNTH  = 0x00000020
-+        MIX_INIT_MID         = 0x00000020 # Previously _FLUIDSYNTH
- 
-     cdef int MIX_MAX_VOLUME
- 
diff --git a/dev-python/Kivy/metadata.xml b/dev-python/Kivy/metadata.xml
index c0c869933573..91807a2b42c3 100644
--- a/dev-python/Kivy/metadata.xml
+++ b/dev-python/Kivy/metadata.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
-    <flag name="camera">
-      Install libraries needed to support camera
-    </flag>
     <flag name="garden">
       Install garden tool to manage user maintained widgets
     </flag>