From: Arfrever Frehtes Taifersar Arahesis Date: Sun, 21 Feb 2010 13:51:13 +0000 (+0000) Subject: Don't install idle${SLOT} and idlelib module with USE="-tk" (bug #237788). X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e84c5a5270f677f4c24b23a339ee304d129df809;p=gentoo.git Don't install idle${SLOT} and idlelib module with USE="-tk" (bug #237788). Enable "ssl" USE flag by default via IUSE (bug #304891). Package-Manager: portage-15417-svn/cvs/Linux x86_64 --- diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index 0ef34d2a2cec..39b79fa19cb5 100644 --- a/dev-lang/python/ChangeLog +++ b/dev-lang/python/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-lang/python # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.451 2010/02/13 16:34:33 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.452 2010/02/21 13:51:12 arfrever Exp $ + + 21 Feb 2010; Arfrever Frehtes Taifersar Arahesis + python-2.4.6.ebuild, python-2.5.4-r4.ebuild, python-2.6.4-r1.ebuild, + python-3.1.1-r1.ebuild: + Don't install idle${SLOT} and idlelib module with USE="-tk" (bug #237788). + Enable "ssl" USE flag by default via IUSE (bug #304891). 13 Feb 2010; Raúl Porcel python-2.5.4-r4.ebuild: alpha/ia64/m68k/s390/sh/sparc stable wrt #303005 diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 79a14f3cf92f..b13e0b0e318a 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -10,16 +10,14 @@ DIST Python-2.5.4.tar.bz2 9821313 RMD160 3a76c83464c3b1c38a60351ab054e33ac719566 DIST Python-2.6.4.tar.bz2 11249486 RMD160 fd33853842110fa3636dd296f2f27646fd2b151a SHA1 bee572680d1966501247cb2b26e0e51f94d1cd13 SHA256 dad8d5575144a210d5cc4fdbc40b8a26386e9cdb1ef58941bec0be02c7cb9d89 DIST Python-3.1.1.tar.bz2 9757032 RMD160 d60b64e1346b2ff15d65b032ea35fb3ad8b0dc66 SHA1 42eb37bf75fae5731f6df1b195902960ae1789e0 SHA256 d87cc2578abade3ac1124b2b8e63146b1201726279d44cdde37fdd59553b51fd DIST python-gentoo-patches-2.4.6.tar.bz2 10983 RMD160 c06dc76edec86d708a0c0e37126ae50f49f61bd3 SHA1 bbc04083fe74cff8c723c5c3cab70b1b814c987f SHA256 0508a66408f218c655823303833599344d2edeec1ffc683c6ada3fc33731590d -DIST python-gentoo-patches-2.5.4-r2.tar.bz2 20722 RMD160 86c25ad3647b7a3ca44c8e781a4572187d6c1934 SHA1 a859d75092303ee445cebd7af4221beeed58b74d SHA256 54236f25147bb26e15f6f204975513515410292a343b6dfb2116806aa9123afc DIST python-gentoo-patches-2.5.4-r3.tar.bz2 19473 RMD160 c3a807693103f9e26c3cce4add5a1f3d975ef216 SHA1 c6170894865ee8aac8c813916c21a0d0458691bc SHA256 03f5bdb0a4ac8eb498a90c5cd444a5c76ed7e79bff5e8dca00efe77cf80c6391 DIST python-gentoo-patches-2.6.4-r1.tar.bz2 12570 RMD160 2a58eb651ce5adc68c4667fb0ddc42cc215ea342 SHA1 c5de0442890bc0753c445a88390d932e629c8648 SHA256 2fe6c8838df2c07d3232ebb26c128dab2787c43a76ddb0b55acec1bed657f9f2 DIST python-gentoo-patches-2.6.4.tar.bz2 11032 RMD160 83903892ef18880f876e7a140c803c1e8a67e24b SHA1 51d4174b2a4136a11c64ae0007b59e4c2f0e13f2 SHA256 19a66a0855df270c030438f21c29260e7ff69b299830409f6aa9140611b721e2 DIST python-gentoo-patches-3.1.1-r4.tar.bz2 10200 RMD160 418852c54bf7169eb7bab078e78997e22799139e SHA1 0c063cd446a22833e267710f59351cb157098b21 SHA256 c065659242df3e921290ff044aee6f543c8b5cd2290db5bf668065cf97fcbbbe -EBUILD python-2.4.6.ebuild 9054 RMD160 8c9fb25807cad20caf4eee003b9b0a3d337d0bfe SHA1 2968106956c446e8f84f167ffaa77b5e54ae39ae SHA256 b10a0b9afc93da84cccd89cec36458139e979eca69a06824d9e9d11c82401ff5 -EBUILD python-2.5.4-r3.ebuild 9478 RMD160 9bed8820cf675f418948b0094d2664f955b10c5a SHA1 5499233000f9befb7a1b0ca239348b3b3a0da76c SHA256 511e136bf9534f1f7e24d3eb7e2c2dced82baf00954589a840c11351e2971fb3 -EBUILD python-2.5.4-r4.ebuild 9414 RMD160 8c46654151b032e91cac931828998050e33dd97e SHA1 0f1ddc0fa3b418547a939ca84a471f4a0b4fd814 SHA256 0c21b1ab315ae510cdc246ff79af28e0b0bf17f195189efb64eec57465017f31 -EBUILD python-2.6.4-r1.ebuild 9680 RMD160 b999332e7d2be94143cd8871d3bd1a754c46f4cc SHA1 dab8964d4c944be05841ecba7ae882e7e068c0fe SHA256 4af4fcd28bda413d605762b2106815349c82ccd71ad8369c5a5a6b4d5c0bd20c +EBUILD python-2.4.6.ebuild 9074 RMD160 7ca8ab8cee385719c441c3104e455debd4921ad1 SHA1 90cd694a485f157ddb50162b4e0559f6899985a5 SHA256 b2a0e1bbd03ae29cd8149754f6e77e3a8616163c502ffa6a4facca90c1e61040 +EBUILD python-2.5.4-r4.ebuild 9414 RMD160 da001bb0a3a8941a7e118143244a2aa20c9786f0 SHA1 a6e0b9ff11ac1c155d8d432fa4457619f3a82a90 SHA256 e9e134652ffb2091a55e7bca64f1ae88bc25eb1ec66f422bce10938fee73f8c2 +EBUILD python-2.6.4-r1.ebuild 9679 RMD160 aeed8bd31aaf311ddfc5ae9cc188c75393dc431f SHA1 00c7f831dc93dc973028168e2d7ccdf076387b9f SHA256 5a5cf52028185d5a3315d4bb4761eba04cdbc2749b2a662b733446290e7266fa EBUILD python-2.6.4.ebuild 9666 RMD160 2183ed5be168b63df86b6b7ee2c2b218e2dd86c5 SHA1 565207199763748fa78655658279d5ea18ec63a4 SHA256 c948a73efffc29ee4a23b7f55cf68b40cf6a850359119b6260ae2674094a27fd -EBUILD python-3.1.1-r1.ebuild 9023 RMD160 0f48986000fc8644d91524a60e24d3656b59770b SHA1 27658951380b3f1208b7b895b071eb3e6c7bde21 SHA256 3dd59dec5116dc4d7bb13ed1eb9fad64a9af8f3d23298bc9bf8009ee5ac0180c -MISC ChangeLog 79086 RMD160 a8d1e8aad2621849b6e507c5c19f85ad0deb2e9e SHA1 94a7d6d1da590ad9b5e4d6e3c5fabf6435107851 SHA256 5d3d0c87402879fb22ab81d41fd3e718fb29c3725fae6e493d35b2cefcceaca5 +EBUILD python-3.1.1-r1.ebuild 9061 RMD160 20e49ec62d9d881a139fbfe45f1b244d4b94e887 SHA1 3923286353791b98c41770bddf0d9f6fc7af8ae6 SHA256 0f103325bbafc8cc754d70cfdd8a543ac3fba5f7c2fd5ecad46a6afafcfa16c1 +MISC ChangeLog 79394 RMD160 b2c36aac2158433c0389175895a5a101fbcfdec4 SHA1 e750bbd27739e01a28ae1e27d7bd5b989f22979e SHA256 fcab0b7f360aa96a0a93dc904d68fc39fcf1e28859da0dcc6f35044e4c50af28 MISC metadata.xml 661 RMD160 54831d16b8807086bfabdbb3df9d33336b5d42a0 SHA1 9867c337fe9e6f4e967004fc9409763e0fedf43b SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908 diff --git a/dev-lang/python/python-2.4.6.ebuild b/dev-lang/python/python-2.4.6.ebuild index 9c53d77deeaf..13b3247fa92a 100644 --- a/dev-lang/python/python-2.4.6.ebuild +++ b/dev-lang/python/python-2.4.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v 1.29 2010/01/16 14:34:44 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v 1.30 2010/02/21 13:51:12 arfrever Exp $ EAPI="1" @@ -20,9 +20,9 @@ LICENSE="PSF-2.2" SLOT="2.4" PYTHON_ABI="${SLOT}" KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="-berkdb bootstrap build +cxx doc elibc_uclibc examples gdbm ipv6 +ncurses +readline ssl +threads tk +wide-unicode wininst +xml" +IUSE="-berkdb bootstrap build +cxx doc elibc_uclibc examples gdbm ipv6 +ncurses +readline +ssl +threads tk +wide-unicode wininst +xml" -RDEPEND=">=app-admin/eselect-python-20090606 +RDEPEND=">=app-admin/eselect-python-20091230 >=sys-libs/zlib-1.1.3 virtual/libintl !build? ( @@ -163,9 +163,9 @@ src_configure() { $(use_enable ipv6) \ $(use_with threads) \ $(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \ - --infodir='${prefix}'/share/info \ - --mandir='${prefix}'/share/man \ - --with-libc='' \ + --infodir='${prefix}/share/info' \ + --mandir='${prefix}/share/man' \ + --with-libc="" \ ${myconf} } @@ -208,6 +208,8 @@ src_test() { elog "If you'd like to run them, you may:" elog "cd $(python_get_libdir)/test" elog "and run the tests separately." + + python_disable_pyc } src_install() { @@ -228,15 +230,15 @@ src_install() { # Fix the OPT variable so that it doesn't have any flags listed in it. # Prevents the problem with compiling things with conflicting flags later. - sed -e "s:^OPT=.*:OPT=-DNDEBUG:" -i "${D}$(python_get_libdir)/config/Makefile" + sed -e "s:^OPT=.*:OPT=\t\t-DNDEBUG:" -i "${D}$(python_get_libdir)/config/Makefile" # Python 2.4 partially doesn't respect $(get_libdir). if use build; then - rm -fr "${D}"usr/lib*/python${SLOT}/{bsddb,email,lib-tk,test} + rm -fr "${D}usr/bin/idle${SLOT}" "${D}"usr/lib*/python${SLOT}/{bsddb,email,idlelib,lib-tk,test} else use elibc_uclibc && rm -fr "${D}"usr/lib*/python${SLOT}/{bsddb/test,test} use berkdb || rm -fr "${D}"usr/lib*/python${SLOT}/{bsddb,test/test_bsddb*} - use tk || rm -fr "${D}"usr/lib*/python${SLOT}/lib-tk + use tk || rm -fr "${D}usr/bin/idle${SLOT}" "${D}"usr/lib*/python${SLOT}/{idlelib,lib-tk} fi prep_ml_includes $(python_get_includedir) @@ -257,13 +259,13 @@ pkg_preinst() { } eselect_python_update() { - local ignored_python_slots_options= - [[ "$(eselect python show)" == "python2."* ]] && ignored_python_slots_options="--ignore 3.0 --ignore 3.1 --ignore 3.2" + local eselect_python_options= + [[ "$(eselect python show)" == "python2."* ]] && eselect_python_options="--python2" # Create python2 symlink. - eselect python update --ignore 3.0 --ignore 3.1 --ignore 3.2 > /dev/null + eselect python update --python2 > /dev/null - eselect python update ${ignored_python_slots_options} + eselect python update ${eselect_python_options} } pkg_postinst() { diff --git a/dev-lang/python/python-2.5.4-r4.ebuild b/dev-lang/python/python-2.5.4-r4.ebuild index ab1deedd468b..84153224e132 100644 --- a/dev-lang/python/python-2.5.4-r4.ebuild +++ b/dev-lang/python/python-2.5.4-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild,v 1.12 2010/02/13 16:34:33 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild,v 1.13 2010/02/21 13:51:13 arfrever Exp $ EAPI="1" @@ -20,12 +20,12 @@ LICENSE="PSF-2.2" SLOT="2.5" PYTHON_ABI="${SLOT}" KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite ssl +threads tk +wide-unicode wininst +xml" +IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml" # NOTE: dev-python/{elementtree,celementtree,pysqlite,ctypes} # do not conflict with the ones in python proper. - liquidx -RDEPEND=">=app-admin/eselect-python-20090606 +RDEPEND=">=app-admin/eselect-python-20091230 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl @@ -177,9 +177,9 @@ src_configure() { $(use_enable ipv6) \ $(use_with threads) \ $(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \ - --infodir='${prefix}'/share/info \ - --mandir='${prefix}'/share/man \ - --with-libc='' \ + --infodir='${prefix}/share/info' \ + --mandir='${prefix}/share/man' \ + --with-libc="" \ --with-system-ffi } @@ -243,15 +243,15 @@ src_install() { # Fix the OPT variable so that it doesn't have any flags listed in it. # Prevents the problem with compiling things with conflicting flags later. - sed -e "s:^OPT=.*:OPT=-DNDEBUG:" -i "${D}$(python_get_libdir)/config/Makefile" + sed -e "s:^OPT=.*:OPT=\t\t-DNDEBUG:" -i "${D}$(python_get_libdir)/config/Makefile" if use build; then - rm -fr "${D}$(python_get_libdir)/"{bsddb,email,lib-tk,sqlite3,test} + rm -fr "${D}usr/bin/idle${SLOT}" "${D}$(python_get_libdir)/"{bsddb,email,idlelib,lib-tk,sqlite3,test} else use elibc_uclibc && rm -fr "${D}$(python_get_libdir)/"{bsddb/test,test} use berkdb || rm -fr "${D}$(python_get_libdir)/"{bsddb,test/test_bsddb*} use sqlite || rm -fr "${D}$(python_get_libdir)/"{sqlite3,test/test_sqlite*} - use tk || rm -fr "${D}$(python_get_libdir)/lib-tk" + use tk || rm -fr "${D}usr/bin/idle${SLOT}" "${D}$(python_get_libdir)/"{idlelib,lib-tk} fi prep_ml_includes $(python_get_includedir) @@ -272,13 +272,13 @@ pkg_preinst() { } eselect_python_update() { - local ignored_python_slots_options= - [[ "$(eselect python show)" == "python2."* ]] && ignored_python_slots_options="--ignore 3.0 --ignore 3.1 --ignore 3.2" + local eselect_python_options= + [[ "$(eselect python show)" == "python2."* ]] && eselect_python_options="--python2" # Create python2 symlink. - eselect python update --ignore 3.0 --ignore 3.1 --ignore 3.2 > /dev/null + eselect python update --python2 > /dev/null - eselect python update ${ignored_python_slots_options} + eselect python update ${eselect_python_options} } pkg_postinst() { diff --git a/dev-lang/python/python-2.6.4-r1.ebuild b/dev-lang/python/python-2.6.4-r1.ebuild index b467265e9401..10a1f951cde8 100644 --- a/dev-lang/python/python-2.6.4-r1.ebuild +++ b/dev-lang/python/python-2.6.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.4-r1.ebuild,v 1.1 2010/01/26 18:52:04 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.4-r1.ebuild,v 1.2 2010/02/21 13:51:13 arfrever Exp $ EAPI="2" @@ -20,12 +20,12 @@ LICENSE="PSF-2.2" SLOT="2.6" PYTHON_ABI="${SLOT}" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" -IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite ssl +threads tk +wide-unicode wininst +xml" +IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml" # NOTE: dev-python/{elementtree,celementtree,pysqlite,ctypes} # do not conflict with the ones in python proper. - liquidx -RDEPEND=">=app-admin/eselect-python-20090606 +RDEPEND=">=app-admin/eselect-python-20091230 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl @@ -179,9 +179,9 @@ src_configure() { $(use_enable ipv6) \ $(use_with threads) \ $(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \ - --infodir='${prefix}'/share/info \ - --mandir='${prefix}'/share/man \ - --with-libc='' \ + --infodir='${prefix}/share/info' \ + --mandir='${prefix}/share/man' \ + --with-libc="" \ --with-system-ffi } @@ -240,15 +240,15 @@ src_install() { # Fix the OPT variable so that it doesn't have any flags listed in it. # Prevents the problem with compiling things with conflicting flags later. - sed -e "s:^OPT=.*:OPT=-DNDEBUG:" -i "${D}$(python_get_libdir)/config/Makefile" + sed -e "s:^OPT=.*:OPT=\t\t-DNDEBUG:" -i "${D}$(python_get_libdir)/config/Makefile" if use build; then - rm -fr "${D}$(python_get_libdir)/"{bsddb,email,lib-tk,sqlite3,test} + rm -fr "${D}usr/bin/idle${SLOT}" "${D}$(python_get_libdir)/"{bsddb,email,idlelib,lib-tk,sqlite3,test} else use elibc_uclibc && rm -fr "${D}$(python_get_libdir)/"{bsddb/test,test} use berkdb || rm -fr "${D}$(python_get_libdir)/"{bsddb,test/test_bsddb*} use sqlite || rm -fr "${D}$(python_get_libdir)/"{sqlite3,test/test_sqlite*} - use tk || rm -fr "${D}$(python_get_libdir)/lib-tk" + use tk || rm -fr "${D}usr/bin/idle${SLOT}" "${D}$(python_get_libdir)/"{idlelib,lib-tk} fi use threads || rm -fr "${D}$(python_get_libdir)/multiprocessing" @@ -274,13 +274,13 @@ pkg_preinst() { } eselect_python_update() { - local ignored_python_slots_options= - [[ "$(eselect python show)" == "python2."* ]] && ignored_python_slots_options="--ignore 3.0 --ignore 3.1 --ignore 3.2" + local eselect_python_options= + [[ "$(eselect python show)" == "python2."* ]] && eselect_python_options="--python2" # Create python2 symlink. - eselect python update --ignore 3.0 --ignore 3.1 --ignore 3.2 > /dev/null + eselect python update --python2 > /dev/null - eselect python update ${ignored_python_slots_options} + eselect python update ${eselect_python_options} } pkg_postinst() { diff --git a/dev-lang/python/python-3.1.1-r1.ebuild b/dev-lang/python/python-3.1.1-r1.ebuild index 0dae4ef75d2a..913627aa785e 100644 --- a/dev-lang/python/python-3.1.1-r1.ebuild +++ b/dev-lang/python/python-3.1.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v 1.27 2010/01/16 14:34:44 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v 1.28 2010/02/21 13:51:12 arfrever Exp $ EAPI="2" @@ -20,7 +20,7 @@ LICENSE="PSF-2.2" SLOT="3.1" PYTHON_ABI="${SLOT}" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" -IUSE="build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite ssl +threads tk +wide-unicode wininst +xml" +IUSE="build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml" RDEPEND=">=app-admin/eselect-python-20091230 >=sys-libs/zlib-1.1.3 @@ -154,11 +154,11 @@ src_configure() { $(use_enable ipv6) \ $(use_with threads) \ $(use_with wide-unicode) \ - --infodir='${prefix}'/share/info \ - --mandir='${prefix}'/share/man \ + --infodir='${prefix}/share/info' \ + --mandir='${prefix}/share/man' \ --with-computed-gotos \ - --with-dbmliborder=${dbmliborder} \ - --with-libc='' \ + --with-dbmliborder="${dbmliborder}" \ + --with-libc="" \ --with-system-ffi } @@ -221,14 +221,14 @@ src_install() { # Fix the OPT variable so that it doesn't have any flags listed in it. # Prevents the problem with compiling things with conflicting flags later. - sed -e "s:^OPT=.*:OPT=-DNDEBUG:" -i "${D}$(python_get_libdir)/config/Makefile" + sed -e "s:^OPT=.*:OPT=\t\t-DNDEBUG:" -i "${D}$(python_get_libdir)/config/Makefile" if use build; then - rm -fr "${D}$(python_get_libdir)/"{email,sqlite3,test,tkinter} + rm -fr "${D}usr/bin/idle${SLOT}" "${D}$(python_get_libdir)/"{email,idlelib,sqlite3,test,tkinter} else use elibc_uclibc && rm -fr "${D}$(python_get_libdir)/test" use sqlite || rm -fr "${D}$(python_get_libdir)/"{sqlite3,test/test_sqlite*} - use tk || rm -fr "${D}$(python_get_libdir)/"{tkinter,test/test_tk*} + use tk || rm -fr "${D}usr/bin/idle${SLOT}" "${D}$(python_get_libdir)/"{idlelib,tkinter,test/test_tk*} fi use threads || rm -fr "${D}$(python_get_libdir)/multiprocessing" @@ -251,13 +251,13 @@ pkg_preinst() { } eselect_python_update() { - local ignored_python_slots_options= - [[ "$(eselect python show)" == "python2."* ]] && ignored_python_slots_options="--ignore 3.0 --ignore 3.1 --ignore 3.2" + local eselect_python_options= + [[ "$(eselect python show)" == "python2."* ]] && eselect_python_options="--python2" # Create python3 symlink. - eselect python update > /dev/null + eselect python update --python3 > /dev/null - eselect python update ${ignored_python_slots_options} + eselect python update ${eselect_python_options} } pkg_postinst() {