| 1 |
floppym 12/02/02 22:04:21 |
| 2 |
|
| 3 |
Modified: pypy-1.7-r2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Add sqlite USE flag, patch by Arfrever. Make several variables local. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-python/pypy/pypy-1.7-r2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-1.7-r2.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-1.7-r2.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-1.7-r2.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: pypy-1.7-r2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.7-r2.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- pypy-1.7-r2.ebuild 1 Feb 2012 20:46:19 -0000 1.1 |
| 23 |
+++ pypy-1.7-r2.ebuild 2 Feb 2012 22:04:21 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.7-r2.ebuild,v 1.1 2012/02/01 20:46:19 floppym Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.7-r2.ebuild,v 1.2 2012/02/02 22:04:21 floppym Exp $ |
| 29 |
|
| 30 |
EAPI="4" |
| 31 |
|
| 32 |
@@ -15,15 +15,16 @@ |
| 33 |
SLOT="${SLOTVER}" |
| 34 |
PYTHON_ABI="2.7-pypy-${SLOTVER}" |
| 35 |
KEYWORDS="~amd64 ~x86" |
| 36 |
-IUSE="doc examples +jit sandbox test bzip2 ncurses xml ssl" |
| 37 |
+IUSE="bzip2 doc examples +jit ncurses sandbox sqlite ssl xml" |
| 38 |
|
| 39 |
RDEPEND=">=sys-libs/zlib-1.1.3 |
| 40 |
virtual/libffi |
| 41 |
virtual/libintl |
| 42 |
bzip2? ( app-arch/bzip2 ) |
| 43 |
ncurses? ( sys-libs/ncurses ) |
| 44 |
- xml? ( dev-libs/expat ) |
| 45 |
- ssl? ( dev-libs/openssl )" |
| 46 |
+ sqlite? ( dev-db/sqlite:3 ) |
| 47 |
+ ssl? ( dev-libs/openssl ) |
| 48 |
+ xml? ( dev-libs/expat )" |
| 49 |
DEPEND="${RDEPEND}" |
| 50 |
PDEPEND="app-admin/python-updater" |
| 51 |
|
| 52 |
@@ -45,7 +46,7 @@ |
| 53 |
} |
| 54 |
|
| 55 |
src_compile() { |
| 56 |
- |
| 57 |
+ local conf |
| 58 |
if use jit; then |
| 59 |
conf="-Ojit" |
| 60 |
else |
| 61 |
@@ -57,8 +58,8 @@ |
| 62 |
|
| 63 |
conf+=" ./pypy/translator/goal/targetpypystandalone.py" |
| 64 |
# Avoid linking against libraries disabled by use flags |
| 65 |
- optional_use=("bzip2" "ncurses" "xml" "ssl") |
| 66 |
- optional_mod=("bz2" "_minimal_curses" "pyexpat" "_ssl") |
| 67 |
+ local optional_use=("bzip2" "ncurses" "xml" "ssl") |
| 68 |
+ local optional_mod=("bz2" "_minimal_curses" "pyexpat" "_ssl") |
| 69 |
for ((i = 0; i < ${#optional_use[*]}; i++)); do |
| 70 |
if use ${optional_use[$i]}; then |
| 71 |
conf+=" --withmod-${optional_mod[$i]}" |
| 72 |
@@ -67,17 +68,23 @@ |
| 73 |
fi |
| 74 |
done |
| 75 |
|
| 76 |
- translate_cmd="$(PYTHON -2) ./pypy/translator/goal/translate.py $conf" |
| 77 |
+ local translate_cmd="$(PYTHON -2) ./pypy/translator/goal/translate.py $conf" |
| 78 |
echo ${_BOLD}"${translate_cmd}"${_NORMAL} |
| 79 |
${translate_cmd} || die "compile error" |
| 80 |
} |
| 81 |
|
| 82 |
src_install() { |
| 83 |
- INSPATH="/usr/$(get_libdir)/pypy${SLOT}" |
| 84 |
+ local INSPATH="/usr/$(get_libdir)/pypy${SLOT}" |
| 85 |
insinto ${INSPATH} |
| 86 |
doins -r include lib_pypy lib-python pypy-c |
| 87 |
fperms a+x ${INSPATH}/pypy-c |
| 88 |
dosym ../$(get_libdir)/pypy${SLOT}/pypy-c /usr/bin/pypy-c${SLOT} |
| 89 |
+ |
| 90 |
+ if ! use sqlite; then |
| 91 |
+ rm -fr "${ED}${INSPATH}/lib-python/2.7/sqlite3" |
| 92 |
+ rm -fr "${ED}${INSPATH}/lib-python/modified-2.7/sqlite3" |
| 93 |
+ rm -f "${ED}${INSPATH}/lib_pypy/_sqlite3.py" |
| 94 |
+ fi |
| 95 |
} |
| 96 |
|
| 97 |
src_test() { |
| 98 |
|
| 99 |
|
| 100 |
|
| 101 |
1.10 dev-python/pypy/ChangeLog |
| 102 |
|
| 103 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/ChangeLog?rev=1.10&view=markup |
| 104 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/ChangeLog?rev=1.10&content-type=text/plain |
| 105 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/ChangeLog?r1=1.9&r2=1.10 |
| 106 |
|
| 107 |
Index: ChangeLog |
| 108 |
=================================================================== |
| 109 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v |
| 110 |
retrieving revision 1.9 |
| 111 |
retrieving revision 1.10 |
| 112 |
diff -u -r1.9 -r1.10 |
| 113 |
--- ChangeLog 1 Feb 2012 20:46:19 -0000 1.9 |
| 114 |
+++ ChangeLog 2 Feb 2012 22:04:21 -0000 1.10 |
| 115 |
@@ -1,6 +1,9 @@ |
| 116 |
# ChangeLog for dev-python/pypy |
| 117 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 118 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.9 2012/02/01 20:46:19 floppym Exp $ |
| 119 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.10 2012/02/02 22:04:21 floppym Exp $ |
| 120 |
+ |
| 121 |
+ 02 Feb 2012; Mike Gilbert <floppym@g.o> pypy-1.7-r2.ebuild: |
| 122 |
+ Add sqlite USE flag, patch by Arfrever. Make several variables local. |
| 123 |
|
| 124 |
*pypy-1.7-r2 (01 Feb 2012) |
Archives