diff --git a/app-portage/gpyutils/files/implementations.txt b/app-portage/gpyutils/files/implementations.txt index e4d309b9d4270..115b0e9abe180 100644 --- a/app-portage/gpyutils/files/implementations.txt +++ b/app-portage/gpyutils/files/implementations.txt @@ -14,7 +14,7 @@ python3_1 3.1 dead 3.1 python3_2 3.2 dead 3.2 python3_3 3.3 supported 3.3 python3_4 current 3.4 -python3_5 future 3.5 +python3_5 supported 3.5 pypy1_8 2.7-pypy-1.8 dead p1.8 pypy1_9 2.7-pypy-1.9 dead p1.9 diff --git a/dev-lang/python/python-3.5.0-r1.ebuild b/dev-lang/python/python-3.5.0-r1.ebuild index 7797cebbfdc57..f3d4b419eab5b 100644 --- a/dev-lang/python/python-3.5.0-r1.ebuild +++ b/dev-lang/python/python-3.5.0-r1.ebuild @@ -17,7 +17,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz LICENSE="PSF-2" SLOT="3.5" -#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml" # Do not add a dependency on dev-lang/python to this ebuild. diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest index 2dfa037fba7fa..d8b444198b562 100644 --- a/dev-libs/softhsm/Manifest +++ b/dev-libs/softhsm/Manifest @@ -1,2 +1,2 @@ -DIST softhsm-1.3.5.tar.gz 440157 SHA256 28b5062a13450faf6099fcb82d25d21f0ac7d202ba31ec85e943246cdcf87ebd SHA512 8da873d84ce3f554ff90975f2c37750c24ee4b254b480a203bfe600d2314ae1aba4d67b96bc9c5cb6787f592e597551e850a84ee36046f408aea7d5d5d7c8787 WHIRLPOOL d01878dbf17d4e06305df23826bc07fff535c9e9734be376ef2d0a99891ddca0bdd1689285e199a6f81143d38c55334c8df9969470cc0098724fb5d24871ad92 DIST softhsm-1.3.6.tar.gz 435893 SHA256 e39ac8e851220edd2b2afbe4d9e06d956bccc20bc72752740eabf95692359486 SHA512 fa344b298da6f15a616eaaa90e9e2153cb48ee1a5d4c3089a4195080efc5d15cccf27536279206587f8e1a55ac1b3745303712797296aba560be5ca958783b70 WHIRLPOOL 6451e039d31932306627f6af23041dbd7d386d1b137eb529332f45ce523ae0c61b736876815ca614a8ec54b0dbae9d83b510bbf126dafd17cbf6d12c745ed7a8 +DIST softhsm-1.3.7.tar.gz 438437 SHA256 d12d6456a85561266d9da427565f3ee3746a35df6670d5e6be75de253c2810a4 SHA512 287400b981b7b420a300593129696e4739afe085a8106047ef429bc741d205bed214386b422572327c3bda63f0fb1b7558bb4d30d184ca3ec2ba9900153f075d WHIRLPOOL 47e66a8ae7f85b6505bdd751114a1594bc2e4b7bea71c6681bf77e8b7cc226d3515d9bdbd74ef0327899257d1844722c95446115f22724474f03cee0a99ca4f3 diff --git a/dev-libs/softhsm/softhsm-1.3.5.ebuild b/dev-libs/softhsm/softhsm-1.3.7.ebuild similarity index 85% rename from dev-libs/softhsm/softhsm-1.3.5.ebuild rename to dev-libs/softhsm/softhsm-1.3.7.ebuild index 84317908fa679..9b6e5df77abc0 100644 --- a/dev-libs/softhsm/softhsm-1.3.5.ebuild +++ b/dev-libs/softhsm/softhsm-1.3.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -15,11 +15,11 @@ LICENSE="BSD" RDEPEND=" dev-db/sqlite:3 - >=dev-libs/botan-1.10.1[threads] + dev-libs/botan[threads] " DEPEND="${RDEPEND}" -DOCS=( AUTHORS NEWS README ) +DOCS=( AUTHORS NEWS ) src_configure() { econf \ diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 974accb3fc8e3..622cb591c42d8 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -42,7 +42,7 @@ inherit eutils multilib toolchain-funcs _PYTHON_ALL_IMPLS=( jython2_5 jython2_7 pypy pypy3 - python3_3 python3_4 + python3_3 python3_4 python3_5 python2_7 ) @@ -66,7 +66,7 @@ _python_impl_supported() { # keep in sync with _PYTHON_ALL_IMPLS! # (not using that list because inline patterns shall be faster) case "${impl}" in - python2_7|python3_[34]|jython2_[57]) + python2_7|python3_[345]|jython2_[57]) return 0 ;; pypy1_[89]|pypy2_0|python2_[56]|python3_[12]) diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force index 9ecd214b54866..14abfe82eacca 100644 --- a/profiles/base/package.use.force +++ b/profiles/base/package.use.force @@ -34,7 +34,7 @@ app-shells/bash:0 readline # Michał Górny (14 Oct 2012) # Force-enable all PYTHON_TARGETS for python-exec to avoid using private # API. Please remember to keep it in sync with python_targets.desc. -dev-lang/python-exec python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_jython2_5 python_targets_jython2_7 python_targets_pypy python_targets_pypy3 +dev-lang/python-exec python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_jython2_5 python_targets_jython2_7 python_targets_pypy python_targets_pypy3 # Zac Medico (20 Oct 2010) # Force ipc USE flag since it should remain enabled unless diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask index 72a22f64b3062..159c1812431be 100644 --- a/profiles/base/package.use.stable.mask +++ b/profiles/base/package.use.stable.mask @@ -5,6 +5,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in package.use.mask +# Mike Gilbert (03 Oct 2015) +# Unmask python3.5 for python-exec +dev-lang/python-exec -python_targets_python3_5 + # Andreas Huettel (26 Sep 2015) # Not stable enough for stable (Debian and SuSE disable it completely) =app-office/libreoffice-5.0* gtk3 diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask index 955e697625660..ea8f6ebf7666d 100644 --- a/profiles/base/use.stable.mask +++ b/profiles/base/use.stable.mask @@ -5,6 +5,11 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask +# Mike Gilbert (02 Oct 2015) +# Needs dev-lang/python:3.5 stable +python_targets_python3_5 +python_single_target_python3_5 + # Justin Lecher (30 Sep 2015) # No stable libressl yet libressl diff --git a/profiles/desc/python_single_target.desc b/profiles/desc/python_single_target.desc index 13da7f054d0ba..2eb0801ea3383 100644 --- a/profiles/desc/python_single_target.desc +++ b/profiles/desc/python_single_target.desc @@ -8,6 +8,7 @@ python2_7 - Build for Python 2.7 only python3_2 - Build for Python 3.2 only (deprecated) python3_3 - Build for Python 3.3 only python3_4 - Build for Python 3.4 only +python3_5 - Build for Python 3.5 only jython2_5 - Build for Jython 2.5 only jython2_7 - Build for Jython 2.7 only pypy - Build for PyPy only diff --git a/profiles/desc/python_targets.desc b/profiles/desc/python_targets.desc index ff70e6c0c0843..3168d918a0459 100644 --- a/profiles/desc/python_targets.desc +++ b/profiles/desc/python_targets.desc @@ -9,6 +9,7 @@ python2_7 - Build with Python 2.7 python3_2 - Build with Python 3.2 (deprecated) python3_3 - Build with Python 3.3 python3_4 - Build with Python 3.4 +python3_5 - Build with Python 3.5 jython2_5 - Build with Jython 2.5 jython2_7 - Build with Jython 2.7 pypy2_0 - Build with PyPy 2.0 (removed)