openssl: sync up with upstream

Just minor stuff like keywords.
This commit is contained in:
Michael Marineau 2016-02-22 19:40:40 -08:00
parent 1ac340aa1d
commit 1f0ce56f2a
3 changed files with 9 additions and 9 deletions

View File

@ -108,8 +108,13 @@ linux)
# sh64*) machine=elf;; # sh64*) machine=elf;;
sh*b*) machine="generic32 -DB_ENDIAN";; sh*b*) machine="generic32 -DB_ENDIAN";;
sh*) machine="generic32 -DL_ENDIAN";; sh*) machine="generic32 -DL_ENDIAN";;
# TODO: Might want to do -mcpu probing like glibc to determine a
# better default for sparc-linux-gnu targets. This logic will
# break v7 and older systems when they use it.
sparc*v7*) machine="generic32 -DB_ENDIAN";; sparc*v7*) machine="generic32 -DB_ENDIAN";;
sparc64*) machine=sparcv9;; sparc64*) machine=sparcv9 system=linux64;;
sparc*v9*) machine=sparcv9;;
sparc*v8*) machine=sparcv8;;
sparc*) machine=sparcv8;; sparc*) machine=sparcv8;;
s390x*) machine=s390x system=linux64;; s390x*) machine=s390x system=linux64;;
s390*) machine="generic32 -DB_ENDIAN";; s390*) machine="generic32 -DB_ENDIAN";;

View File

@ -1,8 +1,8 @@
# Copyright 1999-2015 Gentoo Foundation # Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="4" EAPI=5
inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
@ -13,7 +13,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
LICENSE="openssl" LICENSE="openssl"
SLOT="0" SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib" IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib"
RESTRICT="!bindist? ( bindist )" RESTRICT="!bindist? ( bindist )"

View File

@ -80,11 +80,6 @@ dev-util/checkbashisms
# https://github.com/golang/go/issues?q=milestone%3AGo1.4.3 # https://github.com/golang/go/issues?q=milestone%3AGo1.4.3
=dev-lang/go-1.4.3 ~amd64 =dev-lang/go-1.4.3 ~amd64
# 1.0.2e contains some security fixes.
# https://bugs.gentoo.org/show_bug.cgi?id=567476
=app-misc/c_rehash-1.7-r1 ~amd64 ~arm64
=dev-libs/openssl-1.0.2f ~amd64 ~arm64
# newer btrfs-progs improve things like preserving capabilities in send/receive # newer btrfs-progs improve things like preserving capabilities in send/receive
# https://github.com/coreos/bugs/issues/923 # https://github.com/coreos/bugs/issues/923
=sys-fs/btrfs-progs-4.2.2 ~amd64 ~arm64 =sys-fs/btrfs-progs-4.2.2 ~amd64 ~arm64