mgorny 14/05/09 06:10:04 Modified: pypy-bin-2.2.1-r1.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.2 dev-python/pypy-bin/pypy-bin-2.2.1-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.2.1-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.2.1-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.2.1-r1.ebuild?r1=1.1&r2=1.2 Index: pypy-bin-2.2.1-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.2.1-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pypy-bin-2.2.1-r1.ebuild 3 May 2014 18:00:20 -0000 1.1 +++ pypy-bin-2.2.1-r1.ebuild 9 May 2014 06:10:04 -0000 1.2 @@ -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-bin/pypy-bin-2.2.1-r1.ebuild,v 1.1 2014/05/03 18:00:20 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.2.1-r1.ebuild,v 1.2 2014/05/09 06:10:04 mgorny Exp $ EAPI=5 @@ -56,7 +56,7 @@ LICENSE="MIT" SLOT="0/$(get_version_component_range 1-2 ${PV})" KEYWORDS="~amd64 ~x86" -IUSE="doc +jit shadowstack sqlite sse2 test" +IUSE="doc +jit shadowstack sqlite sse2 test tk" # yep, world would be easier if people started filling subslots... RDEPEND=" @@ -72,6 +72,7 @@ ( <sys-libs/zlib-1.2.9:0 >=sys-libs/zlib-1.2.7:0 ) sqlite? ( dev-db/sqlite:3 ) + tk? ( dev-lang/tk:0 ) !dev-python/pypy:0" DEPEND="app-arch/xz-utils doc? ( dev-python/sphinx ) @@ -121,8 +122,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 @@ -146,9 +153,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.17 dev-python/pypy-bin/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy-bin/ChangeLog?rev=1.17&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy-bin/ChangeLog?rev=1.17&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy-bin/ChangeLog?r1=1.16&r2=1.17 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/ChangeLog,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ChangeLog 3 May 2014 18:00:20 -0000 1.16 +++ ChangeLog 9 May 2014 06:10:04 -0000 1.17 @@ -1,6 +1,10 @@ # ChangeLog for dev-python/pypy-bin # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/ChangeLog,v 1.16 2014/05/03 18:00:20 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/ChangeLog,v 1.17 2014/05/09 06:10:04 mgorny Exp $ + + 09 May 2014; Michał Górny <[email protected]> pypy-bin-2.2.1-r1.ebuild: + Add USE=tk for tkinter modules. Update the list of cffi-compiled modules. Bug + #509794. *pypy-bin-2.2.1-r1 (03 May 2014)
