From 2bd38cc1cd9e41439d1921478d628e60e35760bd Mon Sep 17 00:00:00 2001 From: Marc Schiffbauer Date: Sun, 4 Oct 2015 15:29:44 +0200 Subject: [PATCH 1/8] dev-libs/softhsm: remove old version --- dev-libs/softhsm/Manifest | 1 - dev-libs/softhsm/softhsm-1.3.5.ebuild | 36 --------------------------- 2 files changed, 37 deletions(-) delete mode 100644 dev-libs/softhsm/softhsm-1.3.5.ebuild diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest index 2dfa037fba7fa..cae839ddb9093 100644 --- a/dev-libs/softhsm/Manifest +++ b/dev-libs/softhsm/Manifest @@ -1,2 +1 @@ -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 diff --git a/dev-libs/softhsm/softhsm-1.3.5.ebuild b/dev-libs/softhsm/softhsm-1.3.5.ebuild deleted file mode 100644 index 84317908fa679..0000000000000 --- a/dev-libs/softhsm/softhsm-1.3.5.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -DESCRIPTION="A software PKCS#11 implementation" -HOMEPAGE="http://www.opendnssec.org/" -SRC_URI="http://www.opendnssec.org/files/source/${P}.tar.gz" - -KEYWORDS="~amd64 ~x86" -IUSE="debug" -SLOT="0" -LICENSE="BSD" - -RDEPEND=" - dev-db/sqlite:3 - >=dev-libs/botan-1.10.1[threads] -" -DEPEND="${RDEPEND}" - -DOCS=( AUTHORS NEWS README ) - -src_configure() { - econf \ - --disable-static \ - --localstatedir=/var \ - --with-botan="${EPREFIX}/usr/" \ - $(use_enable amd64 64bit) \ - $(use debug && echo "--with-loglevel=4") -} - -src_install() { - default - find "${ED}" -name '*.la' -delete -} From e784d4c83b8316d78ca46b3f3285e18c3f4aeadb Mon Sep 17 00:00:00 2001 From: Marc Schiffbauer Date: Sun, 4 Oct 2015 15:30:47 +0200 Subject: [PATCH 2/8] dev-libs/softhsm: added new version Package-Manager: portage-2.2.22 --- dev-libs/softhsm/Manifest | 1 + dev-libs/softhsm/softhsm-1.3.7.ebuild | 36 +++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 dev-libs/softhsm/softhsm-1.3.7.ebuild diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest index cae839ddb9093..d8b444198b562 100644 --- a/dev-libs/softhsm/Manifest +++ b/dev-libs/softhsm/Manifest @@ -1 +1,2 @@ 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.7.ebuild b/dev-libs/softhsm/softhsm-1.3.7.ebuild new file mode 100644 index 0000000000000..9b6e5df77abc0 --- /dev/null +++ b/dev-libs/softhsm/softhsm-1.3.7.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DESCRIPTION="A software PKCS#11 implementation" +HOMEPAGE="http://www.opendnssec.org/" +SRC_URI="http://www.opendnssec.org/files/source/${P}.tar.gz" + +KEYWORDS="~amd64 ~x86" +IUSE="debug" +SLOT="0" +LICENSE="BSD" + +RDEPEND=" + dev-db/sqlite:3 + dev-libs/botan[threads] +" +DEPEND="${RDEPEND}" + +DOCS=( AUTHORS NEWS ) + +src_configure() { + econf \ + --disable-static \ + --localstatedir=/var \ + --with-botan="${EPREFIX}/usr/" \ + $(use_enable amd64 64bit) \ + $(use debug && echo "--with-loglevel=4") +} + +src_install() { + default + find "${ED}" -name '*.la' -delete +} From 17a1770a50b8a6a69a3d7a9fc3e222124546d750 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Fri, 2 Oct 2015 14:51:10 -0400 Subject: [PATCH 3/8] profiles/desc: Add use flags for python3.5 --- profiles/desc/python_single_target.desc | 1 + profiles/desc/python_targets.desc | 1 + 2 files changed, 2 insertions(+) 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) From 430e39bd7179c2aa3ffe54f657087c1a8fe2368f Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Fri, 2 Oct 2015 14:53:18 -0400 Subject: [PATCH 4/8] profiles/base/use.stable.mask: Mask python3.5 flags --- profiles/base/use.stable.mask | 5 +++++ 1 file changed, 5 insertions(+) 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 From 0069399e509c81342c5882a86e716c87b20b58bf Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Fri, 2 Oct 2015 14:56:34 -0400 Subject: [PATCH 5/8] python-utils-r1.eclass: Add support for python3.5 --- eclass/python-utils-r1.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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]) From d7a0f8c6c6eb55e682e2b8dfc2d03b943f65d1b6 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Fri, 2 Oct 2015 14:59:46 -0400 Subject: [PATCH 6/8] dev-lang/python: Add KEYWORDS for 3.5 Package-Manager: portage-2.2.22_p5 --- dev-lang/python/python-3.5.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. From 0baafe06585ce9bdfc06b0001392c9294fd85020 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sat, 3 Oct 2015 06:59:15 -0400 Subject: [PATCH 7/8] profiles/base: Force python3.5 for python-exec --- profiles/base/package.use.force | 2 +- profiles/base/package.use.stable.mask | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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 From 325c7c3a3bdfff2cec519c4bfd790154d2772c85 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sat, 3 Oct 2015 11:56:10 -0400 Subject: [PATCH 8/8] app-portage/gpyutils: Update status for 3.5 Package-Manager: portage-2.2.22_p5 --- app-portage/gpyutils/files/implementations.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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