Updating liguros repo

10 files changed, 102 insertions, 37 deletions

diff --git a/dev-python/meld3/Manifest b/dev-python/meld3/Manifest
deleted file mode 100644
index 551e27875b50..000000000000
--- a/dev-python/meld3/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST meld3-2.0.0.tar.gz 36464 BLAKE2B f67bce5464dd516443414e5d40c8d7605ef891fb3a7ff3d47e0a065559148494c71174d5a537c9f00a0e6def2302b95938a5912956674aa171ed5ec2a8804a3e SHA512 97f1a892835b8f01dd82de681e684547f1e0b54b74ce63b92eb77fbd2fe436217b84a3c03400256ffca97add3d41e50ca563ec6f15f4f4b0fcda4e849a2d0bbf
diff --git a/dev-python/meld3/meld3-2.0.0.ebuild b/dev-python/meld3/meld3-2.0.0.ebuild
deleted file mode 100644
index bb6d7f2c2078..000000000000
--- a/dev-python/meld3/meld3-2.0.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="meld3 is an HTML/XML templating engine"
-HOMEPAGE="https://github.com/supervisor/meld3 https://pypi.org/project/meld3/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/meld3/metadata.xml b/dev-python/meld3/metadata.xml
deleted file mode 100644
index 00104fc762ea..000000000000
--- a/dev-python/meld3/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">meld3</remote-id>
-    <remote-id type="github">Supervisor/meld3</remote-id>
-    <bugs-to>https://github.com/Supervisor/meld3/issues</bugs-to>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 30e13a75e670..ffdad2b609c6 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,3 +1,4 @@
 DIST pygame-1.9.6.tar.gz 3223131 BLAKE2B a4d04c933fcad244d32bd512ef8717e60ec923f361e9e0296b5c7d57c5949d3434a040d028249c5b8f3c865ac3dcdbb32e6f0b223186678595a8625213ba2a17 SHA512 d923c554203a7c35e37921658cb4c5bf50215ab0ff4d2b869a1ee6b2e2ca31d66ec4bbde4287f5a777838ffe932cd15b993cb0224b86e43d684de61c35acbcd0
 DIST pygame-2.0.0.dev10.tar.gz 5567274 BLAKE2B 7d78f260318cfabeb33f1073ae210f890d2f772e3ef302f243cca67724c6012355644ba60d4cae6de72db6dd61d320177deff6ee83dd355ec4cc33e841b565f7 SHA512 4cee7599fd8a6d31ddd66bfaad3bbb67cb167c1ae339f37e83322d810fea8746e81a191c224a0eeb6cc43a64bf1730ff0886c82f1a4f642e2e656ca9a837bf9e
 DIST pygame-2.0.0.dev12.tar.gz 5598471 BLAKE2B 339e96ed7f01070c3aa4b31b587a793b43b99ac476d72a431dff09d98b95ef48c6b0d4faa20301e6db43cb2b35b13245253d86859c16d2befbd3795f8ed48b7f SHA512 f732056b3c8377326caf1d6ded6c59e8665de2ab2f6233d6d95dcc26137d67d180f8c5dc92fc22578ec5ce0ecf5a1de5080c62355d15035ab248d518cd75180f
+DIST pygame-2.0.0.dev14.tar.gz 5556790 BLAKE2B 9857a8bc14081c375d717c50b7406f74a52ae725c31905acc2528f8d361d9b1e54e2f20383f553c6f3a290d2fbdbc2342c88c7a7a0abee3f6038ed737747a7a0 SHA512 37490dbb981cc889f00036162baa450f6cc6b936cfb23b5648ed43a8c524e8782c71efcfaef2c2ddf9690c946b0f5d15c670dddcb730f18dc37b28d06c13ae3b
diff --git a/dev-python/pygame/pygame-2.0.0_pre10.ebuild b/dev-python/pygame/pygame-2.0.0_pre10.ebuild
index 3c1af5d3106c..27ddea295aa6 100644
--- a/dev-python/pygame/pygame-2.0.0_pre10.ebuild
+++ b/dev-python/pygame/pygame-2.0.0_pre10.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="doc examples midi opengl test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygame/pygame-2.0.0_pre12.ebuild b/dev-python/pygame/pygame-2.0.0_pre12.ebuild
index aaaae3b0160f..f5e1a3fd2808 100644
--- a/dev-python/pygame/pygame-2.0.0_pre12.ebuild
+++ b/dev-python/pygame/pygame-2.0.0_pre12.ebuild
@@ -63,10 +63,12 @@ python_configure() {
 }
 
 python_test() {
-	local -x PYTHONPATH=
+	local -x PYTHONPATH=${BUILD_DIR}/install/lib
 	local -x SDL_VIDEODRIVER=dummy
 	local -x SDL_AUDIODRIVER=disk
-	distutils_install_for_testing
+	esetup.py install \
+		--root="${BUILD_DIR}"/install \
+		--install-lib=lib
 	script -eqc "${EPYTHON} -m pygame.tests" || die
 }
 
diff --git a/dev-python/pygame/pygame-2.0.0_pre14.ebuild b/dev-python/pygame/pygame-2.0.0_pre14.ebuild
new file mode 100644
index 000000000000..f5e1a3fd2808
--- /dev/null
+++ b/dev-python/pygame/pygame-2.0.0_pre14.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+
+inherit distutils-r1
+
+MY_PV=${PV/_pre/.dev}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Python bindings for SDL multimedia library"
+HOMEPAGE="https://www.pygame.org/"
+SRC_URI="
+	https://github.com/pygame/pygame/releases/download/${MY_PV}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples midi opengl test X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/freetype
+	>=media-libs/sdl2-image-1.2.2
+	>=media-libs/sdl2-mixer-1.2.4
+	>=media-libs/sdl2-ttf-2.0.6
+	>=media-libs/smpeg2-0.4.4-r1
+	midi? ( media-libs/portmidi )
+	X? ( >=media-libs/libsdl2-1.2.5[opengl?,threads,video,X] )
+	!X? ( >=media-libs/libsdl2-1.2.5[threads] )"
+DEPEND="${RDEPEND}
+	test? (
+		media-libs/sdl2-image[gif,jpeg,png]
+		media-libs/sdl2-mixer[mp3,vorbis,wav]
+	)"
+# fontconfig used for fc-list
+RDEPEND+="
+	media-libs/fontconfig"
+# util-linux provides script
+BDEPEND="
+	test? (
+		media-libs/fontconfig
+		sys-apps/util-linux
+	)"
+
+src_prepare() {
+	if ! use midi; then
+		rm test/midi_test.py || die
+	fi
+	distutils-r1_src_prepare
+}
+
+python_configure() {
+	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
+		"${EPYTHON}" "${S}"/buildconfig/config.py -auto || die
+
+	# Disable automagic dependency on PortMidi.
+	if ! use midi; then
+		sed -e "s:^pypm :#&:" -i Setup || die "sed failed"
+	fi
+}
+
+python_test() {
+	local -x PYTHONPATH=${BUILD_DIR}/install/lib
+	local -x SDL_VIDEODRIVER=dummy
+	local -x SDL_AUDIODRIVER=disk
+	esetup.py install \
+		--root="${BUILD_DIR}"/install \
+		--install-lib=lib
+	script -eqc "${EPYTHON} -m pygame.tests" || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Bug #497720
+	rm -fr "${D}"$(python_get_sitedir)/pygame/{docs,examples,tests}/ || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/*
+	fi
+
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/scrapy/Manifest b/dev-python/scrapy/Manifest
index bc6283f1b8bc..16086130b31b 100644
--- a/dev-python/scrapy/Manifest
+++ b/dev-python/scrapy/Manifest
@@ -1,2 +1,2 @@
-DIST scrapy-2.2.1.tar.gz 1214959 BLAKE2B 19ecc4a7d45727330de2a426d93295b10717ee533dfcb487ffd280bf74a2c860ded33af9a6e8b20880819aa2218caa5a521c3d61b672bf57e36cba0cfe5b3c8a SHA512 4bc7ed321f6b33f0cf9f2344d59bf0ed7724abc79104e0d06c0d7d198aa5a7be6b50a5e5d1a1dcf62c6ce4ab35190ee1edf3ee0c0959180d2233a8ff0567763b
 DIST scrapy-2.3.0.tar.gz 1219150 BLAKE2B ef8e06d604a16ed7f23bf198a010eb626b7d2f84da4401051adc3eda16debbcd6a093eea188e97c5a2ca542612547a2f1c8fad096f7a767faf4aafe288714544 SHA512 be1cc2b62d08b87989a1f33132223deabebb62cc126611d5473425fca46de88f95ad049ce9fb4195eaac57dbfaeb1a49f933fd3211ae602c9c43aea68ec49999
+DIST scrapy-2.4.0.tar.gz 1246653 BLAKE2B a08d0c8c372ff21472c416bb10f31e79f5cd7d12262be3c50cc0eea4989bf3f0bc532908246b4f7fcada4285f8c865109c99d1f35be1bf929eb0e797d4bc5885 SHA512 0ee24ccae664fbe35c1f5b7589a8b24ea9bfad62315e2736a166a839769b5d953bab00f5b34a449a585a3632faee460f484b939a05b3f69a7466b914531ec21c
diff --git a/dev-python/scrapy/metadata.xml b/dev-python/scrapy/metadata.xml
index 2a4856ae2e21..2ed884a8e4aa 100644
--- a/dev-python/scrapy/metadata.xml
+++ b/dev-python/scrapy/metadata.xml
@@ -5,6 +5,10 @@
     <email>dev@liguros.net</email>
     <name>Development</name>
   </maintainer>
+	<use>
+		<flag name="boto">Build with boto3</flag>
+		<flag name="ibl">Build with numpy</flag>
+	</use>
   <upstream>
     <remote-id type="github">scrapy/scrapy</remote-id>
   </upstream>
diff --git a/dev-python/scrapy/scrapy-2.2.1.ebuild b/dev-python/scrapy/scrapy-2.4.0.ebuild
index 88e164745ecd..88e164745ecd 100644
--- a/dev-python/scrapy/scrapy-2.2.1.ebuild
+++ b/dev-python/scrapy/scrapy-2.4.0.ebuild