summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2012-01-15 22:07:18 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2012-01-15 22:07:18 +0000
commit8e6d9b6225ccd9c0beaa6dcc1063676d139691c9 (patch)
treece548c9bfe2b9e67f35b0bcbc03d6b2174ff4594 /dev-python/pypy
parentUse PyPI mirrors. Patch by Arfrever (diff)
downloadgentoo-2-8e6d9b6225ccd9c0beaa6dcc1063676d139691c9.tar.gz
gentoo-2-8e6d9b6225ccd9c0beaa6dcc1063676d139691c9.tar.bz2
gentoo-2-8e6d9b6225ccd9c0beaa6dcc1063676d139691c9.zip
Don't call use() in global scope. Patch by Arfrever.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'dev-python/pypy')
-rw-r--r--dev-python/pypy/ChangeLog7
-rw-r--r--dev-python/pypy/pypy-1.7.ebuild18
2 files changed, 16 insertions, 9 deletions
diff --git a/dev-python/pypy/ChangeLog b/dev-python/pypy/ChangeLog
index deac354d21ef..3184efc910f0 100644
--- a/dev-python/pypy/ChangeLog
+++ b/dev-python/pypy/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/pypy
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.6 2011/12/13 18:50:56 nirbheek Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.7 2012/01/15 22:07:18 hwoarang Exp $
+
+ 15 Jan 2012; Markos Chandras <hwoarang@gentoo.org> pypy-1.7.ebuild:
+ Don't call use() in global scope. Patch by Arfrever.
13 Dec 2011; Nirbheek Chauhan <nirbheek@gentoo.org> pypy-1.7.ebuild,
metadata.xml:
diff --git a/dev-python/pypy/pypy-1.7.ebuild b/dev-python/pypy/pypy-1.7.ebuild
index 4fa698c17267..9c69c34b338b 100644
--- a/dev-python/pypy/pypy-1.7.ebuild
+++ b/dev-python/pypy/pypy-1.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.7.ebuild,v 1.3 2011/12/13 18:50:56 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.7.ebuild,v 1.4 2012/01/15 22:07:18 hwoarang Exp $
-EAPI="3"
+EAPI="4"
inherit eutils toolchain-funcs check-reqs python versionator
@@ -28,10 +28,14 @@ DEPEND="${RDEPEND}"
PDEPEND="app-admin/python-updater"
S="${WORKDIR}/${PN}-pypy-release-${PV}"
+
DOC="README LICENSE"
-CHECKREQS_MEMORY="1250M"
-use amd64 && CHECKREQS_MEMORY="2500M"
+pkg_pretend() {
+ CHECKREQS_MEMORY="1250M"
+ use amd64 && CHECKREQS_MEMORY="2500M"
+ check-reqs_pkg_pretend
+}
src_prepare() {
epatch "${FILESDIR}/${PV}-patches.patch"
@@ -69,8 +73,8 @@ src_compile() {
src_install() {
INSPATH="/usr/$(get_libdir)/pypy${SLOT}"
insinto ${INSPATH}
- doins -r include lib_pypy lib-python pypy-c || die "failed"
- fperms a+x ${INSPATH}/pypy-c || die "failed"
+ doins -r include lib_pypy lib-python pypy-c
+ fperms a+x ${INSPATH}/pypy-c
dosym ../$(get_libdir)/pypy${SLOT}/pypy-c /usr/bin/pypy-c${SLOT}
}