diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
| commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
| tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /dev-python/python-ldap | |
| parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) | |
gentoo resync : 29.12.2022
Diffstat (limited to 'dev-python/python-ldap')
| -rw-r--r-- | dev-python/python-ldap/Manifest | 6 | ||||
| -rw-r--r-- | dev-python/python-ldap/python-ldap-3.4.0_p20220420.ebuild (renamed from dev-python/python-ldap/python-ldap-3.4.0.ebuild) | 18 | ||||
| -rw-r--r-- | dev-python/python-ldap/python-ldap-9999.ebuild | 8 |
3 files changed, 20 insertions, 12 deletions
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest index d8d36f97cdab..e6d64c2a4684 100644 --- a/dev-python/python-ldap/Manifest +++ b/dev-python/python-ldap/Manifest @@ -1,4 +1,4 @@ -DIST python-ldap-3.4.0.tar.gz 376169 BLAKE2B f514ddb6267fd8c21a1c4595669921a1256a8087a3a272b3751636313e7d79de9d34f4213aa57128679dc5a93db4ef7a71f7f92894a1802deb8c2ca9dfd92fe2 SHA512 d10c10f1d416a0f67e7669c6c0b5460a3484bc31f4af471d581a9207689e5687c08d1ad78ba8d47e0ce0c35d24d79e4b848b4c503534f211a36c1b882bee3605 -EBUILD python-ldap-3.4.0.ebuild 2033 BLAKE2B 56f792253b2b02f694f0ed917a80b07e6d83df03da2b5f80da04a5a376a3af618889c02a32b319c67c5be0107dcd66a52d2fcea11ceab8bd351f321f0c66ca6c SHA512 5d0bbeeb940ce633aa11215c56c1648c66041bcda37c4ca996031185f92f1266659b961d18da8f546a7c347a1a11f4a97b77a11cc0f4b5a966e23593c44f9a82 -EBUILD python-ldap-9999.ebuild 2030 BLAKE2B 32a24852de09d6b86c045942bbbf194513b4bb5c314fc8d3d17d333bc0467261bfed6fe43bc9187247d59e55ed89e87e9d29d1f2d74264e4274ac4a0234e4089 SHA512 6cdffdf419e5167a658e950552a78d50b4217e43c7cf1c8f90e2c47a32ecf5860d377d65c79703816b6b139468744dd9350449d1cfb632167ed3ebc5c6c142a8 +DIST python-ldap-3.4.0_p20220420.tar.gz 377780 BLAKE2B 433178138587dc09bfe1e6a8e894c001baf6e07c76266ca9d7c56b279f9e9ca5a642528a5869a837a9ee5576a2cf17afdeea313b4a8bc930926397738d6a5daf SHA512 0dfe8ff4737a630a08c7cd4d94f30c78fd1e0558ffc0609439d95ef064b72aef9d4ec4cdc0d40aaf1fc46396bdc0cbbdf0bf3cf6bb5e94bf8a9e3083b9ba1bf4 +EBUILD python-ldap-3.4.0_p20220420.ebuild 2339 BLAKE2B 643b27187a5fc5892a6c7301bacb58fbf57a31f6de6a704e7871e6a9dfc693d9c6c3980137cfc41cf745d6fe52ebf94f0e98fa33094237e9dc0ee5407c0ae2d8 SHA512 2dcf1c028bd92213eedf22b099b9f4518b7a5add89d73b3aaec0958b20276ea18311145ac0ceb902f8ed9ea72eb1dfb5367e7404933acc309a0e5cf400d5aae3 +EBUILD python-ldap-9999.ebuild 2000 BLAKE2B 1340f010714318a6a8e90ffa228a3c0799909ee1f70af5ec5cbd73449d6982a18df35353a3d356d559a89c43be1c44f097698236a6118ad66fac5630a75d57c8 SHA512 c58a4c82d5e18bb29b62024a826b063f0f47ee3f9e4a798251175b4115a31f5a5803962ec597c12d8855faba83c259f559083a6499524f41197d2ecfd0d3a9fb MISC metadata.xml 449 BLAKE2B 14ffa18ca09eb663d3ef4ff5bd0ebc8511fa408a4e96c93885ba2beaccdf3bb82a9733a01149e088c8b66d6cb938f94fc3940c0c0cca5685599191e772443cb6 SHA512 2f5c014e55f838b84abf6ba630b000620a01e2fca6d1f1bd1b30db309f820df50c2ef7feddc17c69ee0188c3cbc91a388933b4bccfc8d2ea0cb18c6dae85cda6 diff --git a/dev-python/python-ldap/python-ldap-3.4.0.ebuild b/dev-python/python-ldap/python-ldap-3.4.0_p20220420.ebuild index 382194ce39e0..93023b5578a9 100644 --- a/dev-python/python-ldap/python-ldap-3.4.0.ebuild +++ b/dev-python/python-ldap/python-ldap-3.4.0_p20220420.ebuild @@ -2,8 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( pypy3 python3_{7..10} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( pypy3 python3_{8..11} ) inherit distutils-r1 DESCRIPTION="Various LDAP-related Python modules" @@ -14,7 +15,15 @@ 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" + # Snapshot for various new OpenLDAP fixes, bug #835637 + # (There were a bunch of followup commits and general other + # serious bugfixes we want.) + MY_COMMIT="7f30c4721ea2ca4373ed7860e6467781f0afa758" + + #SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + SRC_URI="https://github.com/python-ldap/python-ldap/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}"/${PN}-${MY_COMMIT} + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~x86-solaris" fi @@ -22,16 +31,15 @@ LICENSE="MIT PSF-2" SLOT="0" IUSE="examples sasl ssl" -# < dep on openldap for bug #835637, ldap_r is gone RDEPEND=" >=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}] >=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}] - <net-nds/openldap-2.6:=[sasl?,ssl?] + net-nds/openldap:=[sasl?,ssl?] " # We do not link against cyrus-sasl but we use some # of its headers during the build. DEPEND=" - <net-nds/openldap-2.6:=[sasl?,ssl?] + net-nds/openldap:=[sasl?,ssl?] sasl? ( >=dev-libs/cyrus-sasl-2.1 ) " diff --git a/dev-python/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-9999.ebuild index a01b853838d7..6bcb8bc92611 100644 --- a/dev-python/python-ldap/python-ldap-9999.ebuild +++ b/dev-python/python-ldap/python-ldap-9999.ebuild @@ -2,8 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( pypy3 python3_{7..10} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( pypy3 python3_{8..11} ) inherit distutils-r1 DESCRIPTION="Various LDAP-related Python modules" @@ -22,16 +23,15 @@ LICENSE="MIT PSF-2" SLOT="0" IUSE="examples sasl ssl" -# < dep on openldap for bug #835637, ldap_r is gone RDEPEND=" >=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}] >=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}] - <net-nds/openldap-2.6:=[sasl?,ssl?] + net-nds/openldap:=[sasl?,ssl?] " # We do not link against cyrus-sasl but we use some # of its headers during the build. DEPEND=" - <net-nds/openldap-2.6:=[sasl?,ssl?] + net-nds/openldap:=[sasl?,ssl?] sasl? ( >=dev-libs/cyrus-sasl-2.1 ) " |