[gentoo-commits] repo/gentoo:master commit in: dev-python/pyldap/, profiles/

[gentoo-commits] repo/gentoo:master commit in: dev-python/pyldap/, profiles/

[Michał Górny]

commit:     b09c4a892f6e12b39f31a832fbcb429112cebb2b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 20:35:56 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 15 20:41:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b09c4a89

dev-python/pyldap: Remove last-rited pkg

Closes: https://bugs.gentoo.org/668066
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pyldap/Manifest             |  1 -
 dev-python/pyldap/metadata.xml         | 12 ------
 dev-python/pyldap/pyldap-2.4.37.ebuild | 76 ----------------------------------
 profiles/package.mask                  |  6 ---
 4 files changed, 95 deletions(-)

diff --git a/dev-python/pyldap/Manifest b/dev-python/pyldap/Manifest
deleted file mode 100644
index 4cea7d11699..00000000000
--- a/dev-python/pyldap/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pyldap-2.4.37.tar.gz 303732 BLAKE2B a3b54b172701c2e52a9bd54745d442634b8df2f4aab134d37bf5dbc383498fbec876e12c1c703db6caeac0ce3b4bccd974b0680356e5996e327c8ac2ce52ac4c SHA512 da66669bf9eecebc8ba05ee313453b151a01147bc44c60da4936b80777ec3b69551f77be0e6f3c260dba771920d50fa6f54f1892eb0283761beed1ee8c6d83c2

diff --git a/dev-python/pyldap/metadata.xml b/dev-python/pyldap/metadata.xml
deleted file mode 100644
index 618e58e65d8..00000000000
--- a/dev-python/pyldap/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">python-ldap</remote-id>
-		<remote-id type="github">pyldap/pyldap</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/dev-python/pyldap/pyldap-2.4.37.ebuild b/dev-python/pyldap/pyldap-2.4.37.ebuild
deleted file mode 100644
index 1fa47b9b59e..00000000000
--- a/dev-python/pyldap/pyldap-2.4.37.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-
-inherit distutils-r1 multilib
-
-DESCRIPTION="Various LDAP-related Python modules"
-HOMEPAGE="https://pypi.org/project/pyldap/ https://github.com/pyldap/pyldap/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~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.
-# python team: Please do not remove python-ldap-2.3.9 from the tree.
-# OpenSSL is an optional runtime dep.
-# setup.py sets setuptools and misses pyasn1 and pyasn1-modules in install_requires
-RDEPEND="
-	>net-nds/openldap-2.4.11
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND+=" !dev-python/python-ldap"
-
-python_prepare_all() {
-	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
-		-e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
-		-i setup.cfg || die "error fixing setup.cfg"
-
-	local mylibs="ldap"
-	if use sasl; then
-		use ssl && mylibs="ldap_r"
-		mylibs="${mylibs} sasl2"
-	else
-		sed -e 's/HAVE_SASL//g' -i setup.cfg || die
-	fi
-	use ssl && mylibs="${mylibs} ssl crypto"
-	use elibc_glibc && mylibs="${mylibs} resolv"
-
-	sed -e "s:^libs = .*:libs = lber ${mylibs}:" \
-		-i setup.cfg || die "error setting up libs in setup.cfg"
-
-	# set test expected to fail to expectedFailure
-	sed -e "s:^    def test_bad_urls:    @unittest.expectedFailure\n    def test_bad_urls:" \
-		-i Tests/t_ldapurl.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C Doc html
-}
-
-python_test() {
-	# XXX: the tests supposedly can start local slapd
-	# but it requires some manual config, it seems.
-
-	"${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( Doc/.build/html/. )
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r Demo
-		docompress -x /usr/share/doc/${PF}/Demo
-	fi
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index e462b32c1e0..c8b2db98182 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -498,12 +498,6 @@ dev-util/cyclo
 # Removal in 30 days.  Bug #651446.
 dev-util/cccc
 
-# Michał Górny <mgorny@gentoo.org> (14 Apr 2019)
-# Integrated into dev-python/python-ldap-3.0+, and declared a deprecated
-# fork by upstream.  No reverse dependencies left.
-# Removal in 30 days.  Bug #668066.
-dev-python/pyldap
-
 # Aaron Bauman <bman@gentoo.org> (13 Apr 2019)
 # Unmaintained in Gentoo and outstanding vulnerability
 # Masked for removal in 30 days. Bug #522578