summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-02-21 21:25:51 +0000
committerMichał Górny <mgorny@gentoo.org>2014-02-21 21:25:51 +0000
commit62325709b869ecdc9228027c8d24b203ff0fffa5 (patch)
tree5a52d8098142420726605d0d08435dd2935def00 /dev-python/pypy-bin
parentVersion bump, also fixes CVE-2014-2029 / bug 501904 (diff)
downloadgentoo-2-62325709b869ecdc9228027c8d24b203ff0fffa5.tar.gz
gentoo-2-62325709b869ecdc9228027c8d24b203ff0fffa5.tar.bz2
gentoo-2-62325709b869ecdc9228027c8d24b203ff0fffa5.zip
Bump openssl dep since the old version was cleaned.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'dev-python/pypy-bin')
-rw-r--r--dev-python/pypy-bin/ChangeLog7
-rw-r--r--dev-python/pypy-bin/pypy-bin-2.0.2.ebuild8
2 files changed, 10 insertions, 5 deletions
diff --git a/dev-python/pypy-bin/ChangeLog b/dev-python/pypy-bin/ChangeLog
index 75597fd805fc..44c8430c0875 100644
--- a/dev-python/pypy-bin/ChangeLog
+++ b/dev-python/pypy-bin/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/pypy-bin
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/ChangeLog,v 1.7 2013/11/17 03:36:33 prometheanfire Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/ChangeLog,v 1.8 2014/02/21 21:25:51 mgorny Exp $
+
+ 21 Feb 2014; Michał Górny <mgorny@gentoo.org> pypy-bin-2.0.2.ebuild:
+ Bump openssl dep since the old version was cleaned.
17 Nov 2013; Matthew Thode <prometheanfire@gentoo.org> pypy-bin-2.0.2.ebuild:
pypy-bin fix for hardened profiles
diff --git a/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild b/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild
index 40db1e9d4320..3fdbeddbee65 100644
--- a/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.0.2.ebuild,v 1.6 2013/11/17 03:36:33 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild,v 1.7 2014/02/21 21:25:51 mgorny Exp $
EAPI=5
@@ -51,13 +51,15 @@ SLOT=$(get_version_component_range 1-2 ${PV})
KEYWORDS="~amd64 ~x86"
IUSE="doc +jit shadowstack sqlite sse2 test"
+# yep, world would be easier if people started filling subslots...
RDEPEND="
~app-arch/bzip2-1.0.6
~dev-libs/expat-2.1.0
|| ( ~dev-libs/libffi-3.0.13
~dev-libs/libffi-3.0.12
~dev-libs/libffi-3.0.11 )
- || ( ~dev-libs/openssl-1.0.1e
+ || ( ~dev-libs/openssl-1.0.1f
+ ~dev-libs/openssl-1.0.1e
~dev-libs/openssl-1.0.1d
~dev-libs/openssl-1.0.1c )
|| ( ~sys-libs/glibc-2.17