From b7ebc951da8800f711142f69d9d958bde67a112d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 28 Apr 2019 09:54:45 +0100 Subject: gentoo resync : 28.04.2019 --- dev-python/python-ldap/Manifest | 4 +- dev-python/python-ldap/python-ldap-3.1.0-r1.ebuild | 94 +++++++++++++++++++++ dev-python/python-ldap/python-ldap-3.1.0.ebuild | 95 ---------------------- dev-python/python-ldap/python-ldap-9999.ebuild | 6 +- 4 files changed, 99 insertions(+), 100 deletions(-) create mode 100644 dev-python/python-ldap/python-ldap-3.1.0-r1.ebuild delete mode 100644 dev-python/python-ldap/python-ldap-3.1.0.ebuild (limited to 'dev-python/python-ldap') diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest index 4eee4639e83f..3c26c52ff300 100644 --- a/dev-python/python-ldap/Manifest +++ b/dev-python/python-ldap/Manifest @@ -3,6 +3,6 @@ DIST python-ldap-2.4.32.tar.gz 126025 BLAKE2B 2e16942680cc037c1251f500855c10de8d DIST python-ldap-3.1.0.tar.gz 366019 BLAKE2B 19e95ee096f40cc195257f82ccb5f882cc521561b14e77469be91e013d6b566102c6b426463e68353a3140fc96ebc622deed94929a3aa81cc14cb072440efe44 SHA512 71948cbae1c9a47f9e68fb8c6d65d91a2992261dd9aa535a0453f5733be1c2a25be1dda3c84abc6bdebab92150c89cc8caa757454331a0303de4fa46788b414a EBUILD python-ldap-2.4.19-r1.ebuild 2449 BLAKE2B e437b242e5305d3c29607d43f19fa757636bc317aac8e84c890b4c270d7596bc6996690afd0313e6e58629168821993ac58db3714bd54c5c8ba04be425491e30 SHA512 55c4ac061238dbe84adf20306ce43a67f88095d3c74fd3ab8c0c0ffe8a556b31c8f530b2806aa0f031accff334f68e8333ce213fbc2de7749389de2d27622615 EBUILD python-ldap-2.4.32.ebuild 2237 BLAKE2B 3e1c72a5d80eea98345d60800c20403ff2802011b3a5309766aab9b569ae88400d3432641f39ba0a33cb1fa51353e646c155f7789f0cfc782e57bdb74c4e2114 SHA512 3af8086172a8fb7664ea098a7b3e5e12196a37bc79ef55e209044bef44fde61c776a7e7252dde7e010972a8ad2706b5ad7b5576d0733b62b1d12a8d31fffaa40 -EBUILD python-ldap-3.1.0.ebuild 2275 BLAKE2B 6187c1bafbf0553554e26541be507ef5f46c5ee17c9bb72cc31471ef9d079a75e7916d0af5352989d3e40dfbfd25fc493cad6cc88ceab4f565b77b43c451ce23 SHA512 3cd6ef0b9a103b4f25d66cd34a9fdbbe1eed3e2cbf8f6041f0435c49c433e65730e79b34e396908f1f40b2c2cfeb8a84edc7ed52170c74d46ac5603544f60ac6 -EBUILD python-ldap-9999.ebuild 2266 BLAKE2B 274cf8adc7b776bb11fa254510540a37a36e9b6f219fbdcdc699be3fb0cda4e8b3255a9e5c49b489a90e73a16c5ef7602d8331a8b33ed406058f899e4b7bfba7 SHA512 5a936098e8772ba7cafa88f818348190b088f4ad92780cd2b2ec518ed3471faf4aabe560ee90ac1eae15e99159607e83c3aace8faa3f2db74e604ec05b469be7 +EBUILD python-ldap-3.1.0-r1.ebuild 2266 BLAKE2B 930e22ce3ca65a8b98980827fcf710f58f79607a0c8bc8c756e78017f1b5d140b90814a1e738a39528949ad302ac4dadf2c52678d15008b3057d022ea9375a67 SHA512 e63245e7b067849e87c2162e09cf701912edb9734dd6a3a4d4fd1dbf7b92467c06f22e7a62590be864a544007a3d71ec58aadf4695aaa4e38ad0177e631c264c +EBUILD python-ldap-9999.ebuild 2273 BLAKE2B dfdb9433bb1187dec06d99bae168578b4a1210e764249adccd3ccb4d68e2f4d8554e43b812252568a39e9d71e432dcf3257e4837f53e8632f79b2f338e8d92ac SHA512 dbd0c9e994d5bb13181a9762a9839d877fa06ce60073bc494c2edd072b1ae906aca51e01700409e7e93e3fd4883bf7f892b8f9fa360035dfdde8ecafa9f5071b MISC metadata.xml 448 BLAKE2B 4d845f5269cc16dc38e4516d15b3bd66e8eb793fa8d43cca45ef4e04784231757cab47386d43f9361de45889abe21557696d28936b1fd76cead93775393a60e6 SHA512 806ea3543e12f0b571212695f4d9e9e008493550b29b480fc022b55ce2ee1fe561e9eb3a81e887457b7c1cb98fb2c6d46f38890513cee9f4808351821b4f01c6 diff --git a/dev-python/python-ldap/python-ldap-3.1.0-r1.ebuild b/dev-python/python-ldap/python-ldap-3.1.0-r1.ebuild new file mode 100644 index 000000000000..fb26c984591e --- /dev/null +++ b/dev-python/python-ldap/python-ldap-3.1.0-r1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} ) + +inherit distutils-r1 + +DESCRIPTION="Various LDAP-related Python modules" +HOMEPAGE="https://www.python-ldap.org/en/latest/ + https://pypi.org/project/python-ldap/" +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/python-ldap/python-ldap.git" + inherit git-r3 +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris" +fi + +LICENSE="PSF-2" +SLOT="0" +IUSE="doc examples sasl ssl test" + +# We do not need OpenSSL, it is never directly used: +# https://github.com/python-ldap/python-ldap/issues/224 +RDEPEND=" + !dev-python/pyldap + >=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}] + >=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}] + >net-nds/openldap-2.4.11:=[sasl?,ssl?] +" +# We do not link against cyrus-sasl but we use some +# of its headers during the build. +DEPEND=" + >net-nds/openldap-2.4.11:=[sasl?,ssl?] + dev-python/setuptools[${PYTHON_USEDEP}] + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + sasl? ( >=dev-libs/cyrus-sasl-2.1 ) + test? ( + ${RDEPEND} + dev-python/pytest[${PYTHON_USEDEP}] + ) +" + +python_prepare_all() { + # The live ebuild won't compile if setuptools_scm < 1.16.2 is installed + # https://github.com/pypa/setuptools_scm/issues/228 + if [[ ${PV} == *9999* ]]; then + rm -r .git || die + fi + + if ! use sasl; then + sed -i 's/HAVE_SASL//g' setup.cfg || die + fi + if ! use ssl; then + sed -i 's/HAVE_TLS//g' setup.cfg || die + fi + + distutils-r1_python_prepare_all +} + +python_compile_all() { + if use doc; then + sphinx-build Doc Doc/_build/html || die + HTML_DOCS=( Doc/_build/html/. ) + fi +} + +python_test() { + # Run all tests which don't require slapd + local ignored_tests=( + t_bind.py + t_cext.py + t_edit.py + t_ldapobject.py + t_ldap_options.py + t_ldap_sasl.py + t_ldap_schema_subentry.py + t_ldap_syncrepl.py + t_slapdobject.py + ) + cd Tests || die + py.test ${ignored_tests[@]/#/--ignore } \ + || die "tests failed with ${EPYTHON}" +} + +python_install_all() { + if use examples; then + docinto examples + dodoc -r Demo/. + docompress -x /usr/share/doc/${PF}/examples + fi + distutils-r1_python_install_all +} diff --git a/dev-python/python-ldap/python-ldap-3.1.0.ebuild b/dev-python/python-ldap/python-ldap-3.1.0.ebuild deleted file mode 100644 index e6fc54dfaf90..000000000000 --- a/dev-python/python-ldap/python-ldap-3.1.0.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} ) - -inherit distutils-r1 - -DESCRIPTION="Various LDAP-related Python modules" -HOMEPAGE="https://www.python-ldap.org/en/latest/ - https://pypi.org/project/python-ldap/" -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/python-ldap/python-ldap.git" - inherit git-r3 -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris" -fi - -LICENSE="PSF-2" -SLOT="0" -IUSE="doc examples sasl ssl test" - -# We do not need OpenSSL, it is never directly used: -# https://github.com/python-ldap/python-ldap/issues/224 -RDEPEND=" - !dev-python/pyldap - >=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}] - >=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}] - >net-nds/openldap-2.4.11:=[sasl?,ssl?] -" -# We do not link against cyrus-sasl but we use some -# of its headers during the build. -DEPEND=" - >net-nds/openldap-2.4.11:=[sasl?,ssl?] - dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - sasl? ( >=dev-libs/cyrus-sasl-2.1 ) - test? ( - ${RDEPEND} - dev-python/pytest[${PYTHON_USEDEP}] - ) -" - -python_prepare_all() { - # The live ebuild won't compile if setuptools_scm < 1.16.2 is installed - # https://github.com/pypa/setuptools_scm/issues/228 - if [[ ${PV} == *9999* ]]; then - rm -r .git || die - fi - - if ! use sasl; then - sed -i 's/HAVE_SASL//g' setup.cfg || die - fi - if ! use ssl; then - sed -i 's/HAVE_TLS//g' setup.cfg || die - fi - - distutils-r1_python_prepare_all -} - -python_compile_all() { - if use doc; then - sphinx-build Doc Doc/_build/html || die - HTML_DOCS=( Doc/_build/html/. ) - fi -} - -python_test() { - # Run all tests which don't require slapd - local ignored_tests=( - t_bind.py - t_cext.py - t_edit.py - t_ldapobject.py - t_ldap_options.py - t_ldap_sasl.py - t_ldap_schema_subentry.py - t_ldap_syncrepl.py - t_slapdobject.py - ) - cd Tests || die - py.test ${ignored_tests[@]/#/--ignore } \ - || die "tests failed with ${EPYTHON}" -} - -python_install_all() { - if use examples; then - docinto examples - dodoc -r Demo/. - docompress -x /usr/share/doc/${PF}/examples - fi - distutils-r1_python_install_all -} diff --git a/dev-python/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-9999.ebuild index 6fda62951210..c9fabc657093 100644 --- a/dev-python/python-ldap/python-ldap-9999.ebuild +++ b/dev-python/python-ldap/python-ldap-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} ) +PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6}} ) inherit distutils-r1 @@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris" fi LICENSE="PSF-2" -- cgit v1.2.3