From 69f0a7377b5d146231b04d2d09a9ac58aa9a16f3 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Wed, 14 Jul 2010 21:44:57 +0000 Subject: Set SUPPORT_PYTHON_ABIS. Restrict tests (bug #313363). Fix src_test() (bug #324931). Package-Manager: portage-HEAD/cvs/Linux x86_64 --- dev-vcs/bzrtools/ChangeLog | 6 +++- dev-vcs/bzrtools/Manifest | 4 +-- dev-vcs/bzrtools/bzrtools-2.1.0.ebuild | 53 ++++++++++++++++++++-------------- 3 files changed, 38 insertions(+), 25 deletions(-) (limited to 'dev-vcs') diff --git a/dev-vcs/bzrtools/ChangeLog b/dev-vcs/bzrtools/ChangeLog index fd9ead6e2210..ba09d1af3f3f 100644 --- a/dev-vcs/bzrtools/ChangeLog +++ b/dev-vcs/bzrtools/ChangeLog @@ -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). 10 Jul 2010; Arfrever Frehtes Taifersar Arahesis bzrtools-2.0.1.ebuild, bzrtools-2.1.0.ebuild: diff --git a/dev-vcs/bzrtools/Manifest b/dev-vcs/bzrtools/Manifest index f314c62f2710..e68cf1e70023 100644 --- a/dev-vcs/bzrtools/Manifest +++ b/dev-vcs/bzrtools/Manifest @@ -1,6 +1,6 @@ DIST bzrtools-2.0.1.tar.gz 71371 RMD160 9350f23f6d8ab3ed0d38e30499b4574b9af004c8 SHA1 3f980e50bc8d458e26cbad23ae8c979a56bc4893 SHA256 0dffad46808490b0825c201719f61c77d91a360853abaf229c4ca5c05ab24d54 DIST bzrtools-2.1.0.tar.gz 72548 RMD160 bde304caa76c224aaaf8e8ef51889eb43c486c67 SHA1 36c4ca7b4461b4e8bd6ca217f527154d183c6342 SHA256 62a0a902a4e95b0611b7437ea9c66c3856b6867af478bece8ffa4acb79f6b7ad EBUILD bzrtools-2.0.1.ebuild 1469 RMD160 34f6cc4c216746d15aa260986c533b04e039ad8a SHA1 aff298cc191d491c30aef7e8a978c34e3f86e30a SHA256 594f58da91af01cb37e7f896e224d1e23b77c65d8ca459dc4243bca6654e2371 -EBUILD bzrtools-2.1.0.ebuild 1453 RMD160 d4a7e5e4afe6fd42eb4385d7a7892236ce419f1a SHA1 26b676b0c732204d7a8494549355485dd928b67e SHA256 0fb748b49e9fe73fe75e86e753138df5769e1c24aae144a3abe7994c9e8e7d7c -MISC ChangeLog 10697 RMD160 91d10d62d2d0f204b29feda09eadb11014b050f9 SHA1 05d1aa409526d52db31ca7ab2e54eed74ec193fa SHA256 aec693db3e47388b7e7621554034119cbed4d254f3e0a2698a794c570e113d23 +EBUILD bzrtools-2.1.0.ebuild 1738 RMD160 6463fe24b50e9e76cc28212c64f8520cfa1f30fc SHA1 a2f8e6f9e2ddbd832f553a0735b12583dd409100 SHA256 3779419cb20067d86109c1c5ed2bb427eba58d9e1cd2c2e8051d76d4c7a7a3a6 +MISC ChangeLog 10883 RMD160 44d5d556dd4edc7be6a4dcfaf9b58ac12d777265 SHA1 8e469be190a3c0046fda7ec91056e9503b904bbe SHA256 e192f230e7359fe0e366f351f3c66e74ba269d341537abb17311675cbf90bc18 MISC metadata.xml 183 RMD160 62b7786d4dde2a2a00c6196a5b10a4631a2595f8 SHA1 8aac1c9c0259c70b0cba59a498d56e1c9f8ed189 SHA256 b261c326eb6ea17d183bf69b26de5128b4e8f5fd6503025a6697c966774f5f57 diff --git a/dev-vcs/bzrtools/bzrtools-2.1.0.ebuild b/dev-vcs/bzrtools/bzrtools-2.1.0.ebuild index 7bb5cc255960..d80f367dd6fd 100644 --- a/dev-vcs/bzrtools/bzrtools-2.1.0.ebuild +++ b/dev-vcs/bzrtools/bzrtools-2.1.0.ebuild @@ -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.ebuild,v 1.4 2010/07/10 19:12:32 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzrtools/bzrtools-2.1.0.ebuild,v 1.5 2010/07/14 21:44:57 arfrever Exp $ EAPI="3" PYTHON_DEPEND="2" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.*" -inherit eutils distutils versionator +inherit distutils eutils versionator DESCRIPTION="bzrtools is a useful collection of utilities for bzr." HOMEPAGE="http://bazaar-vcs.org/BzrTools" -SRC_URI=""https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"" +SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos" IUSE="" +#IUSE="test" -DEPEND="=dev-vcs/bzr-$(get_version_component_range 1-2)*" -RDEPEND="${DEPEND}" +RDEPEND="=dev-vcs/bzr-$(get_version_component_range 1-2)*" +DEPEND="${RDEPEND}" +# test? ( dev-python/testtools ) -#RESTRICT="test" +RESTRICT="test" -DOCS="AUTHORS CREDITS NEWS NEWS.Shelf README README.Shelf TODO TODO.heads TODO.Shelf" - -S=${WORKDIR}/${PN} +S="${WORKDIR}/${PN}" -PYTHON_MODNAME=bzrlib +DOCS="AUTHORS CREDITS NEWS NEWS.Shelf README README.Shelf TODO TODO.heads TODO.Shelf" +PYTHON_MODNAME="bzrlib/plugins/bzrtools" src_test() { - einfo "Running testsuite..." - # put a linked copy of the bzr core into the build directory to properly - # 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="0" + + # put a linked copy of the bzr core into the build directory to properly + # 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="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 -type l -exec rm '{}' \; + + return "${return_status}" + } + python_execute_function testing } -- cgit v1.2.3-65-gdbad