From 2f8db31405fac68eea6f7257d58529243815033b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 30 Apr 2018 21:33:31 +0100 Subject: gentoo resync : 30.04.2018 --- dev-python/python-ldap/Manifest | 6 ++--- .../python-ldap/python-ldap-2.4.19-r1.ebuild | 9 ++++++-- dev-python/python-ldap/python-ldap-2.4.32.ebuild | 12 +++++++--- dev-python/python-ldap/python-ldap-9999.ebuild | 26 +++++++++++++--------- 4 files changed, 35 insertions(+), 18 deletions(-) (limited to 'dev-python/python-ldap') diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest index c6f97b56003f..68776fd64195 100644 --- a/dev-python/python-ldap/Manifest +++ b/dev-python/python-ldap/Manifest @@ -1,6 +1,6 @@ DIST python-ldap-2.4.19.tar.gz 138503 BLAKE2B 54e088743ccd3fff00f66d8208122b9ebcc154b788d3511f170a3deaf9cfdc5ba813ef05e4a40f42079d2bc60cf871ffae8618cc2e41b3632e79243bbd43cc74 SHA512 bfa8b87449f03d70d78bf890d1190ef5a153e1b84db97ca4b40465bfba9faedace2a69f4ae1279ef6323c01255f52993cf0e4374bc32d9660a5286dfc7c17b85 DIST python-ldap-2.4.32.tar.gz 126025 BLAKE2B 2e16942680cc037c1251f500855c10de8d63194d400059f20449d541854c2ddc8863cfff5f84716818d0b37f331336a53e4b158e9ba55edc4becb6612d999ed3 SHA512 35a526330852ee87acd240cd285881afe498612fcedbffe93c6e41fb082300cd8b351d9100dc2b3049c658ed062d69cea90f28f9db51a80d94816ce249bbd028 -EBUILD python-ldap-2.4.19-r1.ebuild 2336 BLAKE2B 1a1b4e4ac470170a898740370a34c67bb1b308942c48a86fc69b67142d008e5eb43578a709c1af656f147dee39c48b9a8d5c7bdefe3abcaaad76ac5178952625 SHA512 7a4dc076c44c16988964bc9a41ab54611adc7353c75618798ad011b77c00de22f611f7ea54afdcf40ffafbee37c4482f844d56b0eda84f7af1b569a91aded69a -EBUILD python-ldap-2.4.32.ebuild 2123 BLAKE2B dbe05fd9d1af35af61186a322c619aa4e568931c8d0e30ad29ba513fc506671bf8a83e46e05600579ba82221e497e8aaf21d829d17432185f3eff94128ab373e SHA512 ceb4ae59d625f51ebafb9110349a735f17015f8a6340ea6025e1e26c77eca4162913a379e59a2c7eb9b3ba83a2e02a24dc1e013963604274c367c0211bb02383 -EBUILD python-ldap-9999.ebuild 2184 BLAKE2B fdf205269f50a3d151b4e977d9e0b7ef48408645112312c76af5b7d4fd3c215aedee5fdc806cd6bc6386598d15401ff91dd4aaadc7fe7a939735cf922e261295 SHA512 5d08f90f64fe0a3d000af7f47f07e79206ac43614fe0b32a2d110ad027994eadbe44d9fac87213c644ff3afb97f9e2cb8791f9f82373a8232e33aaa3a58d262a +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-9999.ebuild 2264 BLAKE2B 608284ece2bff6c0f4b4311a0450ec2e8107988e6c6c9847509e072963b05695e56a6aff98507d851d33a76211fa750f8a7042051498aef2a4413474c8839732 SHA512 cc11952ea88e2a793dc23365bd856778451483667a82718754ba074a33e4b3f53cc08cb410d2db12dfc8393fddc5316cc8f3a400e6ffc4ac18f06fa3ac1fd61a MISC metadata.xml 476 BLAKE2B 65962ecbfbae9b1be40f4f54abf4796fbe4691205aec3cf76b4a178a1d0ba435ed10e02c6c8fb031a8ff10242b9e2ab8000b76cb5b96cef783d23bffc729bc0a SHA512 29197789f521afefd0755dd02489c1ebb1dca85aa3f4b15522d64848189fc59b5c639ccd237f8d35c565147368a9d24bc079283373760c301cc1982e61d4d5e4 diff --git a/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild b/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild index f727a2ec88fc..3de4a5a0d0a3 100644 --- a/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild +++ b/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild @@ -11,11 +11,16 @@ inherit distutils-r1 multilib DESCRIPTION="Various LDAP-related Python modules" HOMEPAGE="https://www.python-ldap.org/en/latest/ https://pypi.org/project/python-ldap/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/xmw/python-ldap.git" + 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" +fi LICENSE="PSF-2" SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris" IUSE="doc examples sasl ssl" # If you need support for openldap-2.3.x, please use python-ldap-2.3.9. diff --git a/dev-python/python-ldap/python-ldap-2.4.32.ebuild b/dev-python/python-ldap/python-ldap-2.4.32.ebuild index c43b6bc092ca..623b5213fb84 100644 --- a/dev-python/python-ldap/python-ldap-2.4.32.ebuild +++ b/dev-python/python-ldap/python-ldap-2.4.32.ebuild @@ -10,11 +10,16 @@ inherit distutils-r1 multilib DESCRIPTION="Various LDAP-related Python modules" HOMEPAGE="https://www.python-ldap.org/en/latest/ https://pypi.org/project/python-ldap/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/xmw/python-ldap.git" + 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" +fi LICENSE="PSF-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris" IUSE="examples sasl ssl" # If you need support for openldap-2.3.x, please use python-ldap-2.3.9. @@ -26,7 +31,8 @@ RDEPEND=">net-nds/openldap-2.4.11 dev-python/pyasn1-modules[${PYTHON_USEDEP}] sasl? ( >=dev-libs/cyrus-sasl-2.1 )" DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" + dev-python/setuptools[${PYTHON_USEDEP}] +" RDEPEND+=" !dev-python/pyldap" python_prepare_all() { diff --git a/dev-python/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-9999.ebuild index 468171efb88c..ee6ebf08e0ea 100644 --- a/dev-python/python-ldap/python-ldap-9999.ebuild +++ b/dev-python/python-ldap/python-ldap-9999.ebuild @@ -1,33 +1,39 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -# pypy: bug #458558 (wrong linker options due to not respecting CC) -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_IN_SOURCE_BUILD=1 +PYTHON_COMPAT=( python2_7 pypy ) -inherit distutils-r1 git-2 multilib +inherit distutils-r1 DESCRIPTION="Various LDAP-related Python modules" HOMEPAGE="https://www.python-ldap.org/en/latest/ https://pypi.org/project/python-ldap/" -EGIT_REPO_URI="https://github.com/xmw/python-ldap.git" +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/xmw/python-ldap.git" + 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" +fi LICENSE="PSF-2" SLOT="0" -KEYWORDS="" IUSE="doc examples sasl ssl" # If you need support for openldap-2.3.x, please use python-ldap-2.3.9. # python team: Please do not remove python-ldap-2.3.9 from the tree. RDEPEND=">=net-nds/openldap-2.4 dev-python/pyasn1[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] sasl? ( >=dev-libs/cyrus-sasl-2.1 )" DEPEND="${RDEPEND} - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/pyasn1-modules[${PYTHON_USEDEP}] )" + dev-python/setuptools[${PYTHON_USEDEP}] + doc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/pyasn1-modules[${PYTHON_USEDEP}] + ) +" RDEPEND+=" !dev-python/pyldap" python_prepare_all() { -- cgit v1.2.3