Adding metadata

17 files changed, 12 insertions, 223 deletions

diff --git a/dev-python/dulwich/dulwich-0.20.20.ebuild b/dev-python/dulwich/dulwich-0.20.20.ebuild
index 8a04d4b3e69d..7d8903aac1ad 100644
--- a/dev-python/dulwich/dulwich-0.20.20.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.20.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/h5py/metadata.xml b/dev-python/h5py/metadata.xml
index 77c76b6a9538..36692fcc1a44 100644
--- a/dev-python/h5py/metadata.xml
+++ b/dev-python/h5py/metadata.xml
@@ -19,7 +19,7 @@
   datasets and recursive iteration over entire files.
 </longdescription>
  <upstream>
-  <remote-id type="google-code">h5py</remote-id>
+  
   <remote-id type="pypi">h5py</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 1bc2debb6adf..4bb03cd2cb31 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,2 +1 @@
-DIST pillow-8.1.2.tar.gz 45217041 BLAKE2B dbc7fb5c426c6a8f0efd218db5cd404c6b6a603054b36125ea687c69cca78ddd2e58712e8fe94460978bffe6bc059e5819d7ac6371bad11ee8fc1df445495c70 SHA512 32ffedf8cc8f2c21c241f41938d0521626ea05206d1a762305ac38abedecdf9bc8a6e5e2ded7565340e54797a4395acefb3b4d939ebdde8fc9583a1998bae34d
 DIST pillow-8.2.0.tar.gz 47898485 BLAKE2B bd8421a101e0be080f2fab238c3c26a4e1e722738e1036bfbb533f420881ea638016ac56e9e66ec74a93c6dafc6e4f8807ec3d504400bb675488da00c9c3cb1c SHA512 40e97a54689ca04349d17b69b0e95bb3ef4fde0b60c6c55a2ec76034a5c2a9ebee0b310f68de1636db08786d9b2ad444bf10ac3b42a31404847cc165aa8392ac
diff --git a/dev-python/pillow/pillow-8.1.2.ebuild b/dev-python/pillow/pillow-8.1.2.ebuild
deleted file mode 100644
index 2f3c97a81dfe..000000000000
--- a/dev-python/pillow/pillow-8.1.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 toolchain-funcs virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://python-pillow.org/"
-SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
-REQUIRED_USE="test? ( jpeg jpeg2k tiff )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	imagequant? ( media-gfx/libimagequant:0 )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:0= )
-	xcb? ( x11-libs/libxcb )
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${DEPEND}
-	dev-python/olefile[${PYTHON_USEDEP}]"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		media-gfx/imagemagick[png]
-	)
-"
-
-python_configure_all() {
-	# It's important that these flags are also passed during the install phase
-	# as well. Make sure of that if you change the lines below. See bug 661308.
-	mydistutilsargs=(
-		build_ext
-		--disable-platform-guessing
-		$(use_enable truetype freetype)
-		$(use_enable jpeg)
-		$(use_enable jpeg2k jpeg2000)
-		$(use_enable lcms)
-		$(use_enable tiff)
-		$(use_enable imagequant)
-		$(use_enable webp)
-		$(use_enable webp webpmux)
-		$(use_enable xcb)
-		$(use_enable zlib)
-	)
-
-	# setup.py sucks at adding the right toolchain paths but it does
-	# accept additional ones from INCLUDE and LIB so set these. You
-	# wouldn't normally need these at all as the toolchain should look
-	# here anyway but this setup.py does stupid things.
-	export \
-		INCLUDE=${ESYSROOT}/usr/include \
-		LIB=${ESYSROOT}/usr/$(get_libdir)
-
-	# We have patched in this env var.
-	tc-export PKG_CONFIG
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
-	pytest -vv -p no:relaxed || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	python_doheader src/libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	if use examples ; then
-		docinto example
-		dodoc docs/example/*
-		docompress -x /usr/share/doc/${PF}/example
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-8.2.0.ebuild b/dev-python/pillow/pillow-8.2.0.ebuild
index a934ab8f3857..f5a080539a4f 100644
--- a/dev-python/pillow/pillow-8.2.0.ebuild
+++ b/dev-python/pillow/pillow-8.2.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k tiff )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/prettytable/metadata.xml b/dev-python/prettytable/metadata.xml
index c2ef1f2a3420..fd27a0434822 100644
--- a/dev-python/prettytable/metadata.xml
+++ b/dev-python/prettytable/metadata.xml
@@ -10,7 +10,7 @@
   <name>Python</name>
  </maintainer>
  <upstream>
-  <remote-id type="google-code">prettytable</remote-id>
+  
   <remote-id type="pypi">prettytable</remote-id>
   <remote-id type="github">jazzband/prettytable</remote-id>
  </upstream>
diff --git a/dev-python/prettytable/prettytable-0.7.2-r1.ebuild b/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
index a94dea224c5d..40b5e0bcc970 100644
--- a/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
+++ b/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Easily displaying tabular data in a visually appealing ASCII table format"
-HOMEPAGE="https://code.google.com/p/prettytable/"
+HOMEPAGE="https://github.com/jazzband/prettytable/"
 SRC_URI="mirror://pypi/P/PrettyTable/${P}.tar.bz2"
 
 LICENSE="BSD"
diff --git a/dev-python/pymetar/pymetar-1.1-r1.ebuild b/dev-python/pymetar/pymetar-1.1-r1.ebuild
index 379bffc00894..b9b511a67e02 100644
--- a/dev-python/pymetar/pymetar-1.1-r1.ebuild
+++ b/dev-python/pymetar/pymetar-1.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Downloads and decodes to the weather report for a given station ID"
-HOMEPAGE="https://www.schwarzvogel.de/software-pymetar.shtml"
+HOMEPAGE="https://www.schwarzvogel.de/software/pymetar/"
 SRC_URI="https://www.schwarzvogel.de/pkgs/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-python/pymetar/pymetar-1.2-r1.ebuild b/dev-python/pymetar/pymetar-1.2-r1.ebuild
index 2536eb12f4a5..d13a940d725f 100644
--- a/dev-python/pymetar/pymetar-1.2-r1.ebuild
+++ b/dev-python/pymetar/pymetar-1.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Downloads and decodes to the weather report for a given station ID"
-HOMEPAGE="https://www.schwarzvogel.de/software-pymetar.shtml"
+HOMEPAGE="https://www.schwarzvogel.de/software/pymetar/"
 SRC_URI="https://www.schwarzvogel.de/pkgs/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-python/pymetar/pymetar-1.2.ebuild b/dev-python/pymetar/pymetar-1.2.ebuild
index 2536eb12f4a5..d13a940d725f 100644
--- a/dev-python/pymetar/pymetar-1.2.ebuild
+++ b/dev-python/pymetar/pymetar-1.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Downloads and decodes to the weather report for a given station ID"
-HOMEPAGE="https://www.schwarzvogel.de/software-pymetar.shtml"
+HOMEPAGE="https://www.schwarzvogel.de/software/pymetar/"
 SRC_URI="https://www.schwarzvogel.de/pkgs/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index 46dcef39f4d6..37f1b3150498 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,2 +1 @@
-DIST pyproj-2.6.1.post1.tar.gz 545482 BLAKE2B ba87cbbe93dad357c1fc4f333c7d3f02b632e6f2a00821b3875e73965f36fd7ea958f24705c125c3ae43dc8edac1b53a20578c46bc55bcbf335a9457d193d493 SHA512 43a885dbbf4ba54839c3b697d2582700e2b30172ef34acf6297b5e4ddba9b3148aeab83b3a515f1ce975898828c77ad457b6f6460e91083189f66a2fde6d77b7
 DIST pyproj-3.0.1.tar.gz 168962 BLAKE2B 3271d604148c122f4dfdd68c4237e1911f30da7cc858128d644b6b6807c3e49450e0b42c385d37bbe1cfa5ab80d635e7f620d41bf5089af6b49a542eb9b3fcd0 SHA512 f5ae0ede1deaa93757cb98cc680d6e47a19b9f5c0ce5e357c2ecfe96f764ff59ec7285c606162da38573123d21f12f1df82354f1d2205149970af2d7d63c2689
diff --git a/dev-python/pyproj/files/pyproj-2.6.1_p1-tests.patch b/dev-python/pyproj/files/pyproj-2.6.1_p1-tests.patch
deleted file mode 100644
index 69eb97ea2e04..000000000000
--- a/dev-python/pyproj/files/pyproj-2.6.1_p1-tests.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 5856cdacef62746594e17f69cb802a202d3fdfaa Mon Sep 17 00:00:00 2001
-From: "Alan D. Snow" <alansnow21@gmail.com>
-Date: Fri, 29 May 2020 07:41:44 -0500
-Subject: TST: Update tests with scope & remarks (#649)
-
----
- test/crs/test_crs.py     | 16 +++++-----------
- test/test_transformer.py | 10 +++++-----
- 2 files changed, 10 insertions(+), 16 deletions(-)
-
---- a/test/crs/test_crs.py
-+++ b/test/crs/test_crs.py
-@@ -1261,17 +1261,11 @@ def test_operations():
- 
- 
- def test_operations__scope_remarks():
--
--    transformer = TransformerGroup(28356, 7856).transformers[0]
--    coord_op = CoordinateOperation.from_string(transformer.to_wkt())
--    assert coord_op.operations == transformer.operations
--    # scope does not transfer for some reason
--    # assert [op.scope for op in transformer.operations] == [
--    #     op.scope for op in coord_op.operations
--    # ]
--    assert [op.remarks for op in transformer.operations] == [
--        op.remarks for op in coord_op.operations
--    ]
-+    operation = TransformerGroup(28356, 7856).transformers[0].operations[1]
-+    coord_op = CoordinateOperation.from_string(operation.to_wkt())
-+    assert coord_op == operation
-+    assert coord_op.remarks == operation.remarks
-+    assert coord_op.scope == operation.scope
- 
- 
- def test_crs_equals():
---- a/test/test_transformer.py
-+++ b/test/test_transformer.py
-@@ -536,15 +536,15 @@ def test_transformer__operations__scope_
-     transformer = TransformerGroup(28356, 7856).transformers[0]
-     assert transformer.scope is None
-     assert [op.scope for op in transformer.operations] == [
--        None,
-+        "Large and medium scale topographic mapping and engineering survey.",
-         "Conformal transformation of GDA94 coordinates that have been derived through "
-         "GNSS CORS.",
--        None,
-+        "Large and medium scale topographic mapping and engineering survey.",
-     ]
--    assert [str(op.remarks)[:5] for op in transformer.operations] == [
--        "None",
-+    assert [str(op.remarks)[:5].strip() for op in transformer.operations] == [
-+        "Grid",
-         "Scale",
--        "None",
-+        "Grid",
-     ]
- 
- 
diff --git a/dev-python/pyproj/pyproj-2.6.1_p1.ebuild b/dev-python/pyproj/pyproj-2.6.1_p1.ebuild
deleted file mode 100644
index 495c007a88ae..000000000000
--- a/dev-python/pyproj/pyproj-2.6.1_p1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python interface to the PROJ library"
-HOMEPAGE="https://github.com/pyproj4/pyproj"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_p/.post}.tar.gz"
-
-S="${WORKDIR}/${P/_p/.post}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="doc"
-
-RDEPEND=">=sci-libs/proj-6.2.0:="
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		sci-libs/shapely[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	if has_version ">=sci-libs/proj-7.1"; then
-		eapply "${FILESDIR}"/${P}-tests.patch
-	fi
-	distutils-r1_python_prepare_all
-}
-
-distutils-r1_src_test() {
-	# workaround circular import error
-	# https://github.com/pyproj4/pyproj/issues/647
-	mkdir ../mytest || die
-	cp -r test ../mytest || die
-	cd ../mytest || die
-	_distutils-r1_run_foreach_impl python_test
-	_distutils-r1_run_foreach_impl _distutils-r1_clean_egg_info
-}
-
-python_test() {
-	PROJ_LIB="${EPREFIX}/usr/share/proj" pytest -ra || die
-}
diff --git a/dev-python/pyproj/pyproj-3.0.1.ebuild b/dev-python/pyproj/pyproj-3.0.1.ebuild
index 518c30b551b5..16f66cb7bcbb 100644
--- a/dev-python/pyproj/pyproj-3.0.1.ebuild
+++ b/dev-python/pyproj/pyproj-3.0.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P/_p/.post}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 
 RDEPEND=">=sci-libs/proj-7.2.0:="
 BDEPEND="
diff --git a/dev-python/zope-schema/zope-schema-6.0.0.ebuild b/dev-python/zope-schema/zope-schema-6.0.0.ebuild
index 9d751130b507..59cd550ab477 100644
--- a/dev-python/zope-schema/zope-schema-6.0.0.ebuild
+++ b/dev-python/zope-schema/zope-schema-6.0.0.ebuild
@@ -12,7 +12,7 @@ MY_PN=${PN/-/.}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Zope schema Architecture"
-HOMEPAGE="https://github.com/zopefoundation/zope.schema http://docs.zope.org/zope.schema/"
+HOMEPAGE="https://github.com/zopefoundation/zope.schema"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/zope-schema/zope-schema-6.0.1.ebuild b/dev-python/zope-schema/zope-schema-6.0.1.ebuild
index 25185bf30cfd..6da293143bb4 100644
--- a/dev-python/zope-schema/zope-schema-6.0.1.ebuild
+++ b/dev-python/zope-schema/zope-schema-6.0.1.ebuild
@@ -12,7 +12,7 @@ MY_PN=${PN/-/.}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Zope schema Architecture"
-HOMEPAGE="https://github.com/zopefoundation/zope.schema http://docs.zope.org/zope.schema/"
+HOMEPAGE="https://github.com/zopefoundation/zope.schema"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/zope-schema/zope-schema-6.1.0.ebuild b/dev-python/zope-schema/zope-schema-6.1.0.ebuild
index 25185bf30cfd..6da293143bb4 100644
--- a/dev-python/zope-schema/zope-schema-6.1.0.ebuild
+++ b/dev-python/zope-schema/zope-schema-6.1.0.ebuild
@@ -12,7 +12,7 @@ MY_PN=${PN/-/.}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Zope schema Architecture"
-HOMEPAGE="https://github.com/zopefoundation/zope.schema http://docs.zope.org/zope.schema/"
+HOMEPAGE="https://github.com/zopefoundation/zope.schema"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"