diff options
author | Fabian Groffen <grobian@gentoo.org> | 2009-10-10 18:08:02 +0000 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2009-10-10 18:08:02 +0000 |
commit | e9a05f37f424ed35f0f26309e5db0f583cf40785 (patch) | |
tree | f407a0170169b193182ff0c3be183bac64b9d110 | |
parent | sparc stable wrt #283028 (diff) | |
download | gentoo-2-e9a05f37f424ed35f0f26309e5db0f583cf40785.tar.gz gentoo-2-e9a05f37f424ed35f0f26309e5db0f583cf40785.tar.bz2 gentoo-2-e9a05f37f424ed35f0f26309e5db0f583cf40785.zip |
Merge from Prefix
(Portage version: 2.2.00.14552-prefix/cvs/Darwin powerpc, RepoMan options: --force)
-rw-r--r-- | dev-python/nose/ChangeLog | 5 | ||||
-rw-r--r-- | dev-python/nose/nose-0.11.1.ebuild | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/dev-python/nose/ChangeLog b/dev-python/nose/ChangeLog index 4ba877fe02bf..be936dcbe2d0 100644 --- a/dev-python/nose/ChangeLog +++ b/dev-python/nose/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-python/nose # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/ChangeLog,v 1.40 2009/10/05 16:39:17 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/ChangeLog,v 1.41 2009/10/10 18:08:02 grobian Exp $ + + 10 Oct 2009; Fabian Groffen <grobian@gentoo.org> nose-0.11.1.ebuild: + Merge from Prefix 05 Oct 2009; Raúl Porcel <armin76@gentoo.org> nose-0.11.1.ebuild: ia64/s390/sh/sparc stable wrt #284978 diff --git a/dev-python/nose/nose-0.11.1.ebuild b/dev-python/nose/nose-0.11.1.ebuild index 149b1179f5cf..08a311ffbcf9 100644 --- a/dev-python/nose/nose-0.11.1.ebuild +++ b/dev-python/nose/nose-0.11.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-0.11.1.ebuild,v 1.6 2009/10/05 16:39:17 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-0.11.1.ebuild,v 1.7 2009/10/10 18:08:02 grobian Exp $ EAPI="2" SUPPORT_PYTHON_ABIS="1" @@ -12,7 +12,7 @@ HOMEPAGE="http://somethingaboutorange.com/mrl/projects/nose/" SRC_URI="http://somethingaboutorange.com/mrl/projects/nose/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="doc examples test" # dev-python/setuptools is used at run time @@ -55,7 +55,7 @@ src_test() { src_install() { DOCS="AUTHORS" - distutils_src_install --install-data /usr/share + distutils_src_install --install-data "${EPREFIX}"/usr/share use doc && dohtml -r -A txt doc/html/* |