mgorny 14/05/09 06:12:21 Modified: pypy-2.2.1.ebuild ChangeLog Log: Add USE=tk for tkinter modules. Update the list of cffi-compiled modules. Bug #509794. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.5 dev-python/pypy/pypy-2.2.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-2.2.1.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-2.2.1.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-2.2.1.ebuild?r1=1.4&r2=1.5 Index: pypy-2.2.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.2.1.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pypy-2.2.1.ebuild 11 Apr 2014 08:20:55 -0000 1.4 +++ pypy-2.2.1.ebuild 9 May 2014 06:12:21 -0000 1.5 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.2.1.ebuild,v 1.4 2014/04/11 08:20:55 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.2.1.ebuild,v 1.5 2014/05/09 06:12:21 mgorny Exp $ EAPI=5 @@ -15,7 +15,7 @@ LICENSE="MIT" SLOT="0/$(get_version_component_range 1-2 ${PV})" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 doc +jit ncurses sandbox shadowstack sqlite sse2" +IUSE="bzip2 doc +jit ncurses sandbox shadowstack sqlite sse2 tk" RDEPEND=">=sys-libs/zlib-1.1.3 virtual/libffi @@ -25,6 +25,7 @@ bzip2? ( app-arch/bzip2 ) ncurses? ( sys-libs/ncurses ) sqlite? ( dev-db/sqlite:3 ) + tk? ( dev-lang/tk:0 ) !dev-python/pypy-bin:0" DEPEND="${RDEPEND} doc? ( dev-python/sphinx ) @@ -127,8 +128,14 @@ dodoc README.rst if ! use sqlite; then - rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 || die - rm "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py || die + rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \ + "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \ + "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die + fi + if ! use tk; then + rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \ + "${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \ + "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die fi # Install docs @@ -152,9 +159,13 @@ || die "Generation of Grammar and PatternGrammar pickles failed" # Generate cffi cache - "${PYTHON}" -c "import _curses" || die "Failed to import _curses" + "${PYTHON}" -c "import _curses" || die "Failed to import _curses (cffi)" + "${PYTHON}" -c "import syslog" || die "Failed to import syslog (cffi)" if use sqlite; then - "${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3" + "${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3 (cffi)" + fi + if use tk; then + "${PYTHON}" -c "import _tkinter" || die "Failed to import _tkinter (cffi)" fi # compile the installed modules 1.61 dev-python/pypy/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/ChangeLog?rev=1.61&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/ChangeLog?rev=1.61&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/ChangeLog?r1=1.60&r2=1.61 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- ChangeLog 11 Apr 2014 08:20:55 -0000 1.60 +++ ChangeLog 9 May 2014 06:12:21 -0000 1.61 @@ -1,6 +1,10 @@ # ChangeLog for dev-python/pypy # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.60 2014/04/11 08:20:55 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.61 2014/05/09 06:12:21 mgorny Exp $ + + 09 May 2014; Michał Górny <mgo...@gentoo.org> pypy-2.2.1.ebuild: + Add USE=tk for tkinter modules. Update the list of cffi-compiled modules. Bug + #509794. 11 Apr 2014; Michał Górny <mgo...@gentoo.org> pypy-2.0.2-r1.ebuild, pypy-2.2.1.ebuild:
