Adding metadata

4 files changed, 14 insertions, 110 deletions

diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 3b173cda7dbf..ee105912f34c 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,2 +1 @@
 DIST pycurl-7.44.1.tar.gz 227562 BLAKE2B 7dcbde563140f28382768b89b95422f873d5396a1f050dfcd3686d87b0ca2c3f3871281ed87b1dfbe7e4268728c2ec3ba7a76e7d7ef57754af5c185bf2a6fbe8 SHA512 e251db332791de07364695b5fd59b3a290486eabbde8be9914b5edeefa8702b4dd9ab678739ad765f76ededeb7192444fefe2a076d3977f454259dfd06731059
-DIST pycurl-7.45.0.tar.gz 233784 BLAKE2B db6325c44fe8a8dd50cd29b17a55a90faebb8248ef8bdb4485a47d74e3624759ea2e1447b47e50647796a18d9dfbf3d69b8b0a5a40a9ce635edc74be132186ef SHA512 d5c6605e0da2f73139d3c3c3d88e5c8a1db26fad3f20d9d97db133830ef7aa36deb2b7f2bbaebebf68af38b0bd1f9e8d6836e6f3dc516dd4c0542f2de7be709d
diff --git a/dev-python/pycurl/metadata.xml b/dev-python/pycurl/metadata.xml
index 9dcfccca0b92..811b23cdfa29 100644
--- a/dev-python/pycurl/metadata.xml
+++ b/dev-python/pycurl/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
-  <email>dev@liguros.net</email>
-  <name>Development</name>
- </maintainer>
- <maintainer type="project">
   <email>python@gentoo.org</email>
   <name>Python</name>
  </maintainer>
@@ -21,5 +17,5 @@ PycURLはLibcurlへのパイソン・インターフェイスです。PycURLはP
  <upstream>
   <remote-id type="pypi">pycurl</remote-id>
  </upstream>
- <origin>ports</origin>
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pycurl/pycurl-7.44.1.ebuild b/dev-python/pycurl/pycurl-7.44.1.ebuild
index 7281adbe6c04..178f0ab79db3 100644
--- a/dev-python/pycurl/pycurl-7.44.1.ebuild
+++ b/dev-python/pycurl/pycurl-7.44.1.ebuild
@@ -1,11 +1,9 @@
-# Copyright 2021 Liguros Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=no
-# The selftests fail with pypy, and urlgrabber segfaults for me.
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 inherit distutils-r1 toolchain-funcs
 
 DESCRIPTION="python binding for curl/libcurl"
@@ -17,8 +15,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test"
 RESTRICT="!test? ( test )"
 
 # Depend on a curl with curl_ssl_* USE flags.
@@ -30,9 +28,8 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=net-misc/curl-7.25.0-r1:=[ssl=]
 	ssl? (
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
 		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
-		curl_ssl_libressl? ( dev-libs/libressl:= )
 		curl_ssl_openssl? ( dev-libs/openssl:= )
 	)"
 
@@ -43,22 +40,23 @@ DEPEND="${RDEPEND}
 		dev-python/bottle[${PYTHON_USEDEP}]
 		dev-python/flaky[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
 		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
 	)"
 
 python_prepare_all() {
+	# docs installed into the wrong directory
 	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
-	# disable automagic use of setuptools
-	sed -e 's:import wheel:raise ImportError:' -i setup.py || die
-	# these tests are broken with newer versions of bottle
-	sed -e 's:test.*_invalid_utf8:_&:' -i tests/getinfo_test.py || die
+	# TODO
+	sed -e 's:test_socks5_gssapi_nec_setopt:_&:' \
+		-i tests/option_constants_test.py || die
+
 	distutils-r1_python_prepare_all
 }
 
 python_configure_all() {
 	# Override faulty detection in setup.py, bug 510974.
-	export PYCURL_SSL_LIBRARY=${CURL_SSL/libressl/openssl}
+	export PYCURL_SSL_LIBRARY=${CURL_SSL}
 }
 
 src_test() {
@@ -67,11 +65,6 @@ src_test() {
 	distutils-r1_src_test
 }
 
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
 python_test() {
 	nosetests -a '!standalone,!gssapi' -v --with-flaky || die "Tests fail with ${EPYTHON}"
 	nosetests -a 'standalone' -v --with-flaky || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/pycurl/pycurl-7.45.0.ebuild b/dev-python/pycurl/pycurl-7.45.0.ebuild
deleted file mode 100644
index 0aebed23cfab..000000000000
--- a/dev-python/pycurl/pycurl-7.45.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 2021-2022 Liguros Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=no
-# The selftests fail with pypy, and urlgrabber segfaults for me.
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="python binding for curl/libcurl"
-HOMEPAGE="
-	https://github.com/pycurl/pycurl
-	https://pypi.org/project/pycurl/
-	http://pycurl.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
-RESTRICT="!test? ( test )"
-
-# Depend on a curl with curl_ssl_* USE flags.
-# libcurl must not be using an ssl backend we do not support.
-# If the libcurl ssl backend changes pycurl should be recompiled.
-# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
-# does not need to initialize gcrypt threading and we do not need to
-# explicitly link to libgcrypt.
-RDEPEND="
-	>=net-misc/curl-7.25.0-r1:=[ssl=]
-	ssl? (
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
-		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
-		curl_ssl_libressl? ( dev-libs/libressl:= )
-		curl_ssl_openssl? ( dev-libs/openssl:= )
-	)"
-
-# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
-# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
-		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
-	# disable automagic use of setuptools
-	sed -e 's:import wheel:raise ImportError:' -i setup.py || die
-	# these tests are broken with newer versions of bottle
-	sed -e 's:test.*_invalid_utf8:_&:' -i tests/getinfo_test.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	# Override faulty detection in setup.py, bug 510974.
-	export PYCURL_SSL_LIBRARY=${CURL_SSL/libressl/openssl}
-}
-
-src_test() {
-	emake -C tests/fake-curl/libcurl CC="$(tc-getCC)"
-
-	distutils-r1_src_test
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	nosetests -a '!standalone,!gssapi' -v --with-flaky || die "Tests fail with ${EPYTHON}"
-	nosetests -a 'standalone' -v --with-flaky || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local HTML_DOCS=( doc/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}