public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-python/python-ldap: python-ldap-2.4.15.ebuild python-ldap-9999.ebuild python-ldap-2.4.18.ebuild ChangeLog python-ldap-2.4.12.ebuild python-ldap-2.4.14.ebuild python-ldap-2.3.13.ebuild python-ldap-2.4.13.ebuild
@ 2014-10-17  7:31 Ian Delaney (idella4)
  0 siblings, 0 replies; only message in thread
From: Ian Delaney (idella4) @ 2014-10-17  7:31 UTC (permalink / raw
  To: gentoo-commits

idella4     14/10/17 07:31:18

  Modified:             python-ldap-2.4.15.ebuild python-ldap-9999.ebuild
                        ChangeLog
  Added:                python-ldap-2.4.18.ebuild
  Removed:              python-ldap-2.4.12.ebuild python-ldap-2.4.14.ebuild
                        python-ldap-2.3.13.ebuild python-ldap-2.4.13.ebuild
  Log:
  bump; update deps, re-add IUSE doc, doc build, fix to failing test, rm old
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

Revision  Changes    Path
1.3                  dev-python/python-ldap/python-ldap-2.4.15.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.15.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.15.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.15.ebuild?r1=1.2&r2=1.3

Index: python-ldap-2.4.15.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.15.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-ldap-2.4.15.ebuild	26 Jun 2014 15:18:18 -0000	1.2
+++ python-ldap-2.4.15.ebuild	17 Oct 2014 07:31:18 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.15.ebuild,v 1.2 2014/06/26 15:18:18 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.15.ebuild,v 1.3 2014/10/17 07:31:18 idella4 Exp $
 
 EAPI=5
 
@@ -16,6 +16,7 @@
 LICENSE="PSF-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
+# doc flag dropped due to absence of the docs
 IUSE="examples sasl ssl"
 
 # If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
@@ -23,9 +24,9 @@
 # OpenSSL is an optional runtime dep.
 RDEPEND=">net-nds/openldap-2.4.11
 	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
 
 python_prepare_all() {
 	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
@@ -45,6 +46,10 @@
 	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
 }
 



1.6                  dev-python/python-ldap/python-ldap-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/python-ldap/python-ldap-9999.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/python-ldap/python-ldap-9999.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/python-ldap/python-ldap-9999.ebuild?r1=1.5&r2=1.6

Index: python-ldap-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-9999.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-ldap-9999.ebuild	9 Apr 2014 21:32:50 -0000	1.5
+++ python-ldap-9999.ebuild	17 Oct 2014 07:31:18 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-9999.ebuild,v 1.5 2014/04/09 21:32:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-9999.ebuild,v 1.6 2014/10/17 07:31:18 idella4 Exp $
 
 EAPI=5
 
@@ -24,13 +24,11 @@
 # 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}]
-	sasl? ( dev-libs/cyrus-sasl )"
-DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-#bug 458566
-RESTRICT=test
+	sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}] )"
 
 python_prepare_all() {
 	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
@@ -50,14 +48,15 @@
 	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() {
-	if use doc; then
-		cd Doc || die
-		sphinx-build -b html -d _build/doctrees . _build/html || die
-	fi
+	use doc && emake -C Doc html
 }
 
 python_test() {
@@ -68,12 +67,8 @@
 }
 
 python_install_all() {
-	use doc && local HTML_DOCS=( Doc/_build/html/. )
+	use examples && local EXAMPLES=( Demo/. )
+	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/${FP}/Demo
-	fi
 }



1.136                dev-python/python-ldap/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/python-ldap/ChangeLog?rev=1.136&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/python-ldap/ChangeLog?rev=1.136&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/python-ldap/ChangeLog?r1=1.135&r2=1.136

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- ChangeLog	10 Oct 2014 15:21:06 -0000	1.135
+++ ChangeLog	17 Oct 2014 07:31:18 -0000	1.136
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/python-ldap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.135 2014/10/10 15:21:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.136 2014/10/17 07:31:18 idella4 Exp $
+
+*python-ldap-2.4.18 (17 Oct 2014)
+
+  17 Oct 2014; Ian Delaney <idella4@gentoo.org> +python-ldap-2.4.18.ebuild,
+  -python-ldap-2.3.13.ebuild, -python-ldap-2.4.12.ebuild,
+  -python-ldap-2.4.13.ebuild, -python-ldap-2.4.14.ebuild,
+  python-ldap-2.4.15.ebuild, python-ldap-9999.ebuild:
+  bump; update deps, re-add IUSE doc, doc build, fix to failing test, rm old
 
   10 Oct 2014; Agostino Sarubbo <ago@gentoo.org> python-ldap-2.4.10-r1.ebuild:
   Stable for amd64, wrt bug #506258



1.1                  dev-python/python-ldap/python-ldap-2.4.18.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.18.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.18.ebuild?rev=1.1&content-type=text/plain

Index: python-ldap-2.4.18.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.18.ebuild,v 1.1 2014/10/17 07:31:18 idella4 Exp $

EAPI=5

# setup.py is written only for py2, which suits pypy
PYTHON_COMPAT=( python2_7 pypy )

inherit distutils-r1 multilib

DESCRIPTION="Various LDAP-related Python modules"
HOMEPAGE="http://www.python-ldap.org http://pypi.python.org/pypi/python-ldap"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

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.
# python team: Please do not remove python-ldap-2.3.9 from the tree.
# OpenSSL is an optional runtime dep.
RDEPEND=">net-nds/openldap-2.4.11
	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}] )"

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 examples && local EXAMPLES=( Demo/. )
	use doc && local HTML_DOCS=( Doc/.build/html/. )

	distutils-r1_python_install_all
}





^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2014-10-17  7:31 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-17  7:31 [gentoo-commits] gentoo-x86 commit in dev-python/python-ldap: python-ldap-2.4.15.ebuild python-ldap-9999.ebuild python-ldap-2.4.18.ebuild ChangeLog python-ldap-2.4.12.ebuild python-ldap-2.4.14.ebuild python-ldap-2.3.13.ebuild python-ldap-2.4.13.ebuild Ian Delaney (idella4)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox