From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1OZ9lH-0006hL-HF for garchives@archives.gentoo.org; Wed, 14 Jul 2010 21:45:03 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5727DE0B6C; Wed, 14 Jul 2010 21:44:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 215DFE0B6C for ; Wed, 14 Jul 2010 21:44:59 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B3E431B4090 for ; Wed, 14 Jul 2010 21:44:58 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 2244) id F0B132CE14; Wed, 14 Jul 2010 21:44:57 +0000 (UTC) From: "Arfrever Frehtes Taifersar Arahesis (arfrever)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, arfrever@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-vcs/bzrtools: ChangeLog bzrtools-2.1.0.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog bzrtools-2.1.0.ebuild X-VCS-Directories: dev-vcs/bzrtools X-VCS-Committer: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis Content-Type: text/plain; charset=utf8 Message-Id: <20100714214457.F0B132CE14@corvid.gentoo.org> Date: Wed, 14 Jul 2010 21:44:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 9a82dc0e-71d1-4cf9-a791-21d43edeef3e X-Archives-Hash: 21c84c9b5facf10ca445f875601c1aa9 arfrever 10/07/14 21:44:57 Modified: ChangeLog bzrtools-2.1.0.ebuild Log: Set SUPPORT_PYTHON_ABIS. Restrict tests (bug #313363). Fix src_test() (= bug #324931). =20 (Portage version: HEAD/cvs/Linux x86_64) Revision Changes Path 1.6 dev-vcs/bzrtools/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/bzrtools/C= hangeLog?rev=3D1.6&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/bzrtools/C= hangeLog?rev=3D1.6&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/bzrtools/C= hangeLog?r1=3D1.5&r2=3D1.6 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/dev-vcs/bzrtools/ChangeLog,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ChangeLog 10 Jul 2010 19:12:32 -0000 1.5 +++ ChangeLog 14 Jul 2010 21:44:57 -0000 1.6 @@ -1,6 +1,10 @@ # ChangeLog for dev-vcs/bzrtools # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzrtools/ChangeLog,v 1.5 2010= /07/10 19:12:32 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzrtools/ChangeLog,v 1.6 2010= /07/14 21:44:57 arfrever Exp $ + + 14 Jul 2010; Arfrever Frehtes Taifersar Arahesis + bzrtools-2.1.0.ebuild: + Set SUPPORT_PYTHON_ABIS. Restrict tests (bug #313363). Fix src_test() = (bug #324931). =20 10 Jul 2010; Arfrever Frehtes Taifersar Arahesis bzrtools-2.0.1.ebuild, bzrtools-2.1.0.ebuild: 1.5 dev-vcs/bzrtools/bzrtools-2.1.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/bzrtools/b= zrtools-2.1.0.ebuild?rev=3D1.5&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/bzrtools/b= zrtools-2.1.0.ebuild?rev=3D1.5&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/bzrtools/b= zrtools-2.1.0.ebuild?r1=3D1.4&r2=3D1.5 Index: bzrtools-2.1.0.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/dev-vcs/bzrtools/bzrtools-2.1.0.ebuild,= v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bzrtools-2.1.0.ebuild 10 Jul 2010 19:12:32 -0000 1.4 +++ bzrtools-2.1.0.ebuild 14 Jul 2010 21:44:57 -0000 1.5 @@ -1,43 +1,52 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzrtools/bzrtools-2.1.0.ebuil= d,v 1.4 2010/07/10 19:12:32 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzrtools/bzrtools-2.1.0.ebuil= d,v 1.5 2010/07/14 21:44:57 arfrever Exp $ =20 EAPI=3D"3" PYTHON_DEPEND=3D"2" +SUPPORT_PYTHON_ABIS=3D"1" +RESTRICT_PYTHON_ABIS=3D"3.*" =20 -inherit eutils distutils versionator +inherit distutils eutils versionator =20 DESCRIPTION=3D"bzrtools is a useful collection of utilities for bzr." HOMEPAGE=3D"http://bazaar-vcs.org/BzrTools" -SRC_URI=3D""https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.g= z"" +SRC_URI=3D"https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz= " =20 LICENSE=3D"GPL-2" SLOT=3D"0" KEYWORDS=3D"~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86= -linux ~x86-macos" IUSE=3D"" +#IUSE=3D"test" =20 -DEPEND=3D"=3Ddev-vcs/bzr-$(get_version_component_range 1-2)*" -RDEPEND=3D"${DEPEND}" +RDEPEND=3D"=3Ddev-vcs/bzr-$(get_version_component_range 1-2)*" +DEPEND=3D"${RDEPEND}" +# test? ( dev-python/testtools ) =20 -#RESTRICT=3D"test" +RESTRICT=3D"test" =20 -DOCS=3D"AUTHORS CREDITS NEWS NEWS.Shelf README README.Shelf TODO TODO.he= ads TODO.Shelf" - -S=3D${WORKDIR}/${PN} +S=3D"${WORKDIR}/${PN}" =20 -PYTHON_MODNAME=3Dbzrlib +DOCS=3D"AUTHORS CREDITS NEWS NEWS.Shelf README README.Shelf TODO TODO.he= ads TODO.Shelf" +PYTHON_MODNAME=3D"bzrlib/plugins/bzrtools" =20 src_test() { - einfo "Running testsuite..." - # put a linked copy of the bzr core into the build directory to properl= y - # test the "built" version of bzrtools - find "$(python_get_libdir)/site-packages/bzrlib/" \ - -mindepth 1 -maxdepth 1 \ - \( \( -type d -and -not -name "plugins" \) -or -name "*.py" \) \ - -exec ln -s '{}' "${S}/build/lib/bzrlib/" \; - touch "${S}/build/lib/bzrlib/plugins/__init__.py" - "${S}/test.py" "${S}/build/lib" || die - # remove the "shadow" copy so it doesn't get installed - rm "${S}/build/lib/bzrlib/plugins/__init__.py" - find "${S}/build/lib/bzrlib/" -mindepth 1 -maxdepth 1 -type l -exec rm = '{}' \; + testing() { + local return_status=3D"0" + + # put a linked copy of the bzr core into the build directory to proper= ly + # test the "built" version of bzrtools + find "$(python_get_libdir)/site-packages/bzrlib/" \ + -mindepth 1 -maxdepth 1 \ + \( \( -type d -and -not -name "plugins" \) -or -name "*.py" \) \ + -exec ln -s '{}' "${S}/build-${PYTHON_ABI}/lib/bzrlib/" \; + touch "${S}/build-${PYTHON_ABI}/lib/bzrlib/plugins/__init__.py" + "${S}/test.py" "${S}/build-${PYTHON_ABI}/lib" || return_status=3D"1" + # remove the "shadow" copy so it doesn't get installed + rm "${S}/build-${PYTHON_ABI}/lib/bzrlib/plugins/__init__.py" + find "${S}/build-${PYTHON_ABI}/lib/bzrlib/" -mindepth 1 -maxdepth 1 -t= ype l -exec rm '{}' \; + + return "${return_status}" + } + python_execute_function testing }