Version bumps.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

5 files changed, 603 insertions, 2 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 3a2a9a73310f..40335745ebcc 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.452 2012/05/10 19:37:03 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.453 2012/05/10 22:33:47 vapier Exp $
+
+*openssl-1.0.1c (10 May 2012)
+*openssl-1.0.0j (10 May 2012)
+*openssl-0.9.8x (10 May 2012)
+
+  10 May 2012; Mike Frysinger <vapier@gentoo.org> +openssl-0.9.8x.ebuild,
+  +openssl-1.0.0j.ebuild, +openssl-1.0.1c.ebuild:
+  Version bumps.
 
   10 May 2012; Brent Baude <ranger@gentoo.org> openssl-0.9.8v.ebuild,
   openssl-1.0.0i.ebuild:
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 3ee0420f002d..cb885f9b2160 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gentoo.config-0.9.8 4249 RMD160 a63c08a30dd294429c562b8e24bf2b13ba220f63 SHA1 737dbd27e39726c49e44f5e92e46bdf8a8ff9b4d SHA256 c14ff861759f4ebaeb57f37ae7df63af4dea1767eae07ef0eb42abd43cebc4a1
 AUX gentoo.config-1.0.0 4750 RMD160 2a6cf1e6be4b118ae27f2e6e24876e00a739c21a SHA1 cc79b4c1bb53d0fe9d30999d4f2c102f9d9b25e8 SHA256 de30cfb4034e4b4f4cdb7ff04ec67e3a604210a9818d2e31a1ce403be90b7b7c
 AUX openssl-0.9.8e-bsd-sparc64.patch 1484 RMD160 dd3d18caccd8167673a438cc83fa44f2e993949b SHA1 d07542663f934d5dc2f8f8b8985bde9b033aafdb SHA256 8a79f022a17a7fadb4eb708538b41a7a034e21ad84162beb1f7fa7cff5eb487e
@@ -22,15 +25,18 @@ DIST openssl-0.9.8t.tar.gz 3778943 RMD160 8d5a32ebc94c578021bce519f92b5d31743d3e
 DIST openssl-0.9.8u.tar.gz 3781776 RMD160 e0a7fa3950ca290d0a931a130f8651e54ad2a400 SHA1 09b4f2d9c4588d8010eac6f4ab0c96ad0e9d66ac SHA256 0548e4b9171a62dcbbe85e63d9b897a35de718e0fe19b3fe56002c8f5a3ba587
 DIST openssl-0.9.8v.tar.gz 3782207 RMD160 a59dd24ac07be9118a4b23b6d1874fd46d2b797a SHA1 ceacc6750b1e912d10ad1da964c90fcffbd6566e SHA256 701ac4dbd27b9237919b214b53bc0d08e5e1448f2d0fbe1c80479293d2379a65
 DIST openssl-0.9.8w.tar.gz 3782900 RMD160 6904c2b85a199b8ec0262ba7d52adbbe7e8df351 SHA1 6dd276534f87aaca4bee679537fef3aaa6b43069 SHA256 537411fe2cfe249a8a5b98b3f809a07ed5f913b94a216b3c510fd353318e4593
+DIST openssl-0.9.8x.tar.gz 3782486 RMD160 18a805c177af1667a05104e87acbff97a420864c SHA1 8c3be5160513c0af1e558d3f932390ecb16f59e9 SHA256 7ce0c7f2c451070b4497ea7ca6f23eba6cef1a56db2e86e433f65926a7bc7497
 DIST openssl-1.0.0d.tar.gz 4025484 RMD160 0c6cdf0659d88bf4dbc6d0394059a47a01fe6846 SHA1 32ca934f380a547061ddab7221b1a34e4e07e8d5 SHA256 92511d1f0caaa298dba250426f8e7d5d00b271847886d1adc62422778d6320db
 DIST openssl-1.0.0e.tar.gz 4040229 RMD160 f7b7c8146592bb0924f145b1e3382b5a1d9283e4 SHA1 235eb68e5a31b0f7a23bc05f52d7a39c596e2e69 SHA256 e361dc2775733fb84de7b5bf7b504778b772869e8f7bfac0b28b935cbf7380f7
 DIST openssl-1.0.0f.tar.gz 4043367 RMD160 4eb32bc51a86b28f6c0c159e421786d51bf441bd SHA1 f087190fc7702f328324aaa89c297cab6e236564 SHA256 faf1eab0ef85fd6c3beca271c356b31b5cc831e2c6b7f23cf672e7ab4680fde1
 DIST openssl-1.0.0g.tar.gz 4046513 RMD160 142ac92dee03b964462321ad60655a374ee36380 SHA1 2b517baada2338663c27314cb922f9755e73e07f SHA256 905106a1505e7d9f7c36ee81408d3aa3d41aac291a9603d0c290c9530c92fc2c
 DIST openssl-1.0.0h.tar.gz 4048067 RMD160 8f048effa40a2ddc6a5b037043e8be9df2c0d732 SHA1 6d4587a96817147021e93ca266441daf4bcbf485 SHA256 7e3dfc21aa57ed33ea673170053d1921322803b8a6a624a4f0d2e4c308bd418d
 DIST openssl-1.0.0i.tar.gz 4047721 RMD160 97a012c4ce1c76bd0742d049e60c1b7d101fa59c SHA1 b7aa11cbd7d264c2b1f44e3d55b334fb33f7b674 SHA256 548262d15777c504be1ab9bb8fabef1e14a3de54837a6593c8f403dd843d5e57
+DIST openssl-1.0.0j.tar.gz 4047852 RMD160 aa5ade81df27afdee83732636babb4a26e59aaf7 SHA1 31e6e8bbf1de2f59fbd53382c34214887ccc1318 SHA256 626fb8fcb3eb7e966edbe71553ff993d137f6e8a87b05051a3695e621098b8af
 DIST openssl-1.0.1.tar.gz 4453920 RMD160 cdbcef61fb31eac52093b8bdaeee7b61ba9644e7 SHA1 a6476d33fd38c2e7dfb438d1e3be178cc242c907 SHA256 4d9f0a594a9a89b28e1a04a9504c04104f6508ee27ad1e0efdd17a7a6dbbeeee
 DIST openssl-1.0.1a.tar.gz 4456456 RMD160 9b55ecfd5c804eda4d0f475263937fb1d5d77195 SHA1 b7c4608c36fa84bfcce39baba5afacd65184be5b SHA256 d3487e09d891c772cf946273a3bb0ca47479e7941be6d822274320e7cfcc361b
 DIST openssl-1.0.1b.tar.gz 4456651 RMD160 cfdedff06b46866500a2ba72b2dd0d8f3300b4f4 SHA1 b6222cbbf835c27d9ad6db22262da6e4a2aca8b8 SHA256 1187bf2d5cdf0b286b951bf5c777aa97855cd7db24fdb9604cb557c8b1d7364b
+DIST openssl-1.0.1c.tar.gz 4457113 RMD160 96d35c3f507d85ad14fc67770bb4464ac8496830 SHA1 91b684de947cb021ac61b8c51027cc4b63d894ce SHA256 2a9eb3cd4e8b114eb9179c0d3884d61658e7d8e8bf4984798a5f5bd48e325ebe
 DIST openssl-c_rehash.sh.1.7 4167 RMD160 c87f12c5421593d160f0cc650921c2e3412869ab SHA1 54493c80be245f2da9b7d303e49d613d376d9609 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0
 EBUILD openssl-0.9.8r.ebuild 4333 RMD160 d5e1a4a4faedf3e68e20761cb2468ddcf8121f5d SHA1 cc345cc8e8bd9e9ed814d507fe4e28293bf13aa5 SHA256 a0dcfa504c84f50b4f6dfa23516050ff5b6f2d021e1ec1235fb351d7ff8089b0
 EBUILD openssl-0.9.8s-r1.ebuild 4327 RMD160 73f578fe1f2eeed738e6333613fe0c723c2ffd38 SHA1 850427996b25c823e8d72279fde9fafb5da5785c SHA256 b34856ccf61a3b4ee382c9e76d03ee2659f5232e7a14fef86da286a6bed39f6f
@@ -39,6 +45,7 @@ EBUILD openssl-0.9.8t.ebuild 4318 RMD160 5d4cc479fbc83670d735e03b9764c56698053c8
 EBUILD openssl-0.9.8u.ebuild 4322 RMD160 873f3d352d6ec012849a3dbab17b02609c3df4f9 SHA1 23bba67f89b5ebf988c38f9082103875bc2c9625 SHA256 42227c1bf60ea56045ddbb94f323c4c89eeb04c941e2f9269be461c336ebd1ff
 EBUILD openssl-0.9.8v.ebuild 4319 RMD160 58234da9d1415f26a96b9ab7def1993ef3d1058e SHA1 6098e87bf437964d35cb0fbb740b99aef4d0ad5a SHA256 0c20d9186d6861bf57b46e8b78ddbce3ec86a9b0a8f65d067a08b7cb9219e85c
 EBUILD openssl-0.9.8w.ebuild 4320 RMD160 c3aaf5ec000f6cf474fefd7a85f0c72f4b26e82b SHA1 4ce2c3acb426ecdcd98e03885f6337525bea0ea0 SHA256 01e1aaa5b7999797256c628ca8a32a60958ed3e6a4fcba67fc4b94078c0ca5a0
+EBUILD openssl-0.9.8x.ebuild 4322 RMD160 aac90e9d5bdb54258b920048739354983b3b9585 SHA1 b74f935e13478d4f74ea727c475bb7867cd7238b SHA256 3c1e844d4ec553aabb69bd74f22825684e02b74922fa5bafd0870ccb2d668970
 EBUILD openssl-1.0.0d.ebuild 6003 RMD160 4cb7181c77cdc21ddbfb3a60d77e68b7d8f8124a SHA1 526d04deaf20e0996b8631ace4d2a31a3d0ada46 SHA256 fbba52f0436c9ec4d30d878a7be80a58e9a52adea2de309632643e38c392c4bc
 EBUILD openssl-1.0.0e-r1.ebuild 6925 RMD160 5d251388f5983672c41129a2bbe731aa67e91b69 SHA1 0892e7b7339149d6ad71f39b1c1491fca9ad3633 SHA256 cd2abb82067530d26ac77511b9e18fcb0e0e4374e60e5ae56f6e17c176c5e643
 EBUILD openssl-1.0.0e.ebuild 5921 RMD160 f211cdbd3cd7ce275abfe77453c514a968a6cc82 SHA1 e7a8dfb4a6e273eddc492a89017ab0120d34694f SHA256 99cd020f77ab655b566faf79271411aa8400717dca6bdf4fd5bd6e5c3727e642
@@ -47,8 +54,27 @@ EBUILD openssl-1.0.0f.ebuild 6922 RMD160 a91e88a91c36ee689442d15b779d7f9b3b31a63
 EBUILD openssl-1.0.0g.ebuild 6906 RMD160 05987220a871354539969e5723a69140990f3973 SHA1 a2e582e1dbbecbef7c4451520444b4b1035cd48e SHA256 5fcbd75cee413c53da5fd711c0703be1d2a12756a34239f17f03d1c4c6f767a8
 EBUILD openssl-1.0.0h.ebuild 6907 RMD160 6dbe34e42c68b3592ac1fc7b1937e69bb6e18515 SHA1 25fd7a22466924c34f66ce76aa4d1cb6b18a759c SHA256 fb159b50fcf3646c3e0e79765fa3ea80c27479692bec6e22e2696daaa22169d8
 EBUILD openssl-1.0.0i.ebuild 6906 RMD160 a01b90410fec41b9eb358b42a09d325875188da9 SHA1 ce86e76f378a20540df29e5f722401686c6690af SHA256 213055cd92fa02cb037799bdcd816e97834ef946d771b656fc0cc90033fc3507
+EBUILD openssl-1.0.0j.ebuild 6918 RMD160 871326dde1fbc1a7d02d507678589f2e0a35ded8 SHA1 0803935e2aafc46c8cf77b2abb11434edef431c1 SHA256 4ae72402e7195d2bbe17e83d401a278419a3d014728abc713e58002a2c8f1cad
 EBUILD openssl-1.0.1.ebuild 7022 RMD160 1217d1c829815de85d9f7e926ca3b0e2b3e04db5 SHA1 b018000513cccacb5ce6410fa37acb406c9e0ab6 SHA256 b1ee9b6bd2963a061ace1085ae4b4b0ca0abf84c624bebf4b34f0e5e717ab361
 EBUILD openssl-1.0.1a.ebuild 7227 RMD160 1602bb31c1e4504fde253054006f90ec98562f5b SHA1 60cee2440597348f8fc27b5a70924237f29b6962 SHA256 6b2163f21b208b91669d140fa69353e5145688396f3c1fb8dcbeded1492ce7c9
 EBUILD openssl-1.0.1b.ebuild 7178 RMD160 cfa0a1d5355d07dc62b3197ea8c90fba4869a1e9 SHA1 5af8ad70ecf0409465eafcb5fed16540c64b16fa SHA256 069fccb18b0c692f90c19c12f94d03a637ab34474f396bb60d7fae2f4bb07d8d
-MISC ChangeLog 67746 RMD160 10b96fb474041a66c662afd27471802b94e9f2c0 SHA1 9fe74a186d58a1d589f4bf858fe23c66a200f0c5 SHA256 ca855b771d7e9e814877a4037c8fedabc7361ac4d7b2dbe5c690921136007f8f
+EBUILD openssl-1.0.1c.ebuild 7178 RMD160 03373749f8d69b6bcd7cb185e159a5e2b635f5ae SHA1 10b9d9f68d09d09dfd6c08bfe3dd0fd1379c4a54 SHA256 7b8bca4746e87df25ec0a7337c442e3304a3a8860d149c0db79a0d582793b4d3
+MISC ChangeLog 67979 RMD160 b4686d80fe06ac3afdf4f4a04a616fdb50ed2475 SHA1 66164d922275404e5d08768d5815de7d599cf8b3 SHA256 d9e322534b3a9d2b24a2d9ed92eb929b3d04412024acf5c2688d9daf0d5ede38
 MISC metadata.xml 374 RMD160 9aeb5b3f983a6274f0aa03bd395b7d12b937ca62 SHA1 bc9aa89e74d572266aef36b2f17101098d11997d SHA256 ce29618473c02511695f6767087277e246b2d252ef6e662dbc65e9df44722f5b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPrEJYAAoJELEHsLL7fEFWIBIQAKDRlTNIrx88Cg9CysrmXkbs
+e4fVqe/awgVEzdYT5PJD2Bkz5hkmez8oSnAyxvVcilOpvALxsEXdaGZHPf+RJBLi
+awD49o1aVM36hdlP9qYlnR+J3zt3XVf5TRYW8+y/TIZGMv6w50wTyRmnvctw81lW
+uF3uliXKFpOMr7DBUimasP3pKuLoe+wUqNT1iRMp4Q25oU2lF9WTN59Ju9037ykK
+y5G3m6Y9mEbqct3bv+/leSaMZTybQmhFqXhiIJfGnyD7ImNDAkfVO/brCUFg9Bit
+U8Scv3fVgmHb6f6TlJeW1DZAFZB4lphiU9BrLcYlNPccmP87JlF97HaXfLUDE/pm
+Q2dcP9OtowSDEk6IZ+BriDXvl2k8JOPCSq1JUhHbsdfsHb9wiunebw0VPpDlQdpn
+oJq0Sdv/RiG/tSnGBgACN4BY6r1Vz7MEDy3irR2EzGB5pR9m1E92qKdsQO4CgkV2
+E0fG/ZWBvHNAbYi0onkn7iXIIuM/iuhxnIcrCcfOJ6YOMVHe7I2bY9eoQeIASWg/
+8nfxbEOpcQ2drheTBIHX/1So5b9ZUJnsaACQiQWBRa910fRQUjGKl8gmatE4FKxA
+IYNiSr1B4TWvoe9tV9UPFbbO0O7ZhHd6yRoxdaxwMb82IbAod1PcazXahvXNUhpY
+i5v63+BSA7b8z3drlI6F
+=lz19
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/openssl-0.9.8x.ebuild b/dev-libs/openssl/openssl-0.9.8x.ebuild
new file mode 100644
index 000000000000..7e134792e39f
--- /dev/null
+++ b/dev-libs/openssl/openssl-0.9.8x.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8x.ebuild,v 1.1 2012/05/10 22:33:47 vapier Exp $
+
+# this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat
+
+EAPI="2"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
+HOMEPAGE="http://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0.9.8"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="bindist gmp kerberos sse2 test zlib"
+
+RDEPEND="gmp? ( dev-libs/gmp )
+	zlib? ( sys-libs/zlib )
+	kerberos? ( app-crypt/mit-krb5 )
+	!=dev-libs/openssl-0.9.8*:0"
+DEPEND="${RDEPEND}
+	sys-apps/diffutils
+	>=dev-lang/perl-5
+	test? ( sys-devel/bc )"
+
+pkg_setup() {
+	# avoid collisions with openssl-1 (preserve lib)
+	if ! has_version dev-libs/openssl:${SLOT} ; then
+		ewarn "Removing lib{crypto,ssl}.so.0.9.8 to avoid collision with openssl-1"
+		rm -f "${ROOT}"/usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.9.8e-bsd-sparc64.patch
+	epatch "${FILESDIR}"/${PN}-0.9.8h-ldflags.patch #181438
+	epatch "${FILESDIR}"/${PN}-0.9.8m-binutils.patch #289130
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:=/usr/share/man:') \
+		Makefile{,.org} \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+	# update the enginedir path
+	sed -i \
+		-e "/foo.*engines/s|/lib/engines|/$(get_libdir)/engines|" \
+		Configure || die
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-0.9.8 gentoo.config || die "cp cross-compile failed"
+	chmod a+rx gentoo.config
+
+	append-flags -fno-strict-aliasing
+	append-flags -Wa,--noexecstack
+
+	sed -i '1s,^:$,#!/usr/bin/perl,' Configure #141906
+	sed -i '/^"debug-steve/d' Configure # 0.9.8k shipped broken
+	./config --test-sanity || die "I AM NOT SANE"
+}
+
+src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+
+	tc-export CC AR RANLIB
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
+	# RC5:      5,724,428 03/03/2015    http://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { use $1 && echo "enable-${2:-$1} ${*:3}" || echo "no-${2:-$1}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+	echoit \
+	./${config} \
+		${sslout} \
+		$(use sse2 || echo "no-sse2") \
+		enable-camellia \
+		$(use_ssl !bindist ec) \
+		enable-idea \
+		enable-mdc2 \
+		$(use_ssl !bindist rc5) \
+		enable-tlsext \
+		$(use_ssl gmp gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(use_ssl zlib) \
+		--prefix=/usr \
+		--openssldir=/etc/ssl \
+		shared threads \
+		|| die "Configure failed"
+
+	# Clean out hardcoded flags that openssl uses
+	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAG=::' \
+		-e 's:-fomit-frame-pointer ::g' \
+		-e 's:-O[0-9] ::g' \
+		-e 's:-march=[-a-z0-9]* ::g' \
+		-e 's:-mcpu=[-a-z0-9]* ::g' \
+		-e 's:-m[a-z0-9]* ::g' \
+	)
+	sed -i \
+		-e "/^LIBDIR=/s|=.*|=$(get_libdir)|" \
+		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
+		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
+		Makefile || die
+}
+
+src_compile() {
+	# depend is needed to use $confopts
+	emake -j1 depend || die "depend failed"
+	emake -j1 build_libs || die "make build_libs failed"
+}
+
+src_test() {
+	emake -j1 test || die "make test failed"
+}
+
+src_install() {
+	dolib.so lib{crypto,ssl}.so.0.9.8 || die
+}
diff --git a/dev-libs/openssl/openssl-1.0.0j.ebuild b/dev-libs/openssl/openssl-1.0.0j.ebuild
new file mode 100644
index 000000000000..b368315a5963
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.0.0j.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0j.ebuild,v 1.1 2012/05/10 22:33:47 vapier Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+REV="1.7"
+DESCRIPTION="full-strength general purpose cryptography library (including SSL v2/v3 and TLS v1)"
+HOMEPAGE="http://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${P}.tar.gz
+	http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/~checkout~/packages/${PN}/${PN}-c_rehash.sh?rev=${REV} -> ${PN}-c_rehash.sh.${REV}"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test zlib"
+
+# Have the sub-libs in RDEPEND with [static-libs] since, logically,
+# our libssl.a depends on libz.a/etc... at runtime.
+LIB_DEPEND="gmp? ( dev-libs/gmp[static-libs(+)] )
+	zlib? ( sys-libs/zlib[static-libs(+)] )
+	kerberos? ( app-crypt/mit-krb5 )"
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	sys-apps/diffutils
+	>=dev-lang/perl-5
+	test? ( sys-devel/bc )"
+PDEPEND="app-misc/ca-certificates"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cp "${DISTDIR}"/${PN}-c_rehash.sh.${REV} "${WORKDIR}"/c_rehash || die
+}
+
+src_prepare() {
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
+	epatch "${FILESDIR}"/${PN}-1.0.0d-fbsd-amd64.patch #363089
+	epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743
+	epatch "${FILESDIR}"/${PN}-1.0.0h-pkg-config.patch
+	epatch "${FILESDIR}"/${PN}-1.0.0e-parallel-build.patch
+	epatch "${FILESDIR}"/${PN}-1.0.0e-x32.patch
+	epatch_user #332661
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:=/usr/share/man:') \
+		Makefile.org \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.0 gentoo.config || die
+	chmod a+rx gentoo.config
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	sed -i '1s,^:$,#!/usr/bin/perl,' Configure #141906
+	./config --test-sanity || die "I AM NOT SANE"
+}
+
+src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
+	# RC5:      5,724,428 03/03/2015    http://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+	echoit \
+	./${config} \
+		${sslout} \
+		$(use sse2 || echo "no-sse2") \
+		enable-camellia \
+		$(use_ssl !bindist ec) \
+		enable-idea \
+		enable-mdc2 \
+		$(use_ssl !bindist rc5) \
+		enable-tlsext \
+		$(use_ssl gmp gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(use_ssl rfc3779) \
+		$(use_ssl zlib) \
+		--prefix=/usr \
+		--openssldir=/etc/ssl \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAG=::' \
+		-e 's:-fomit-frame-pointer ::g' \
+		-e 's:-O[0-9] ::g' \
+		-e 's:-march=[-a-z0-9]* ::g' \
+		-e 's:-mcpu=[-a-z0-9]* ::g' \
+		-e 's:-m[a-z0-9]* ::g' \
+	)
+	sed -i \
+		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
+		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
+		Makefile || die
+}
+
+src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend || die
+	emake all || die
+	# rehash is needed to prep the certs/ dir; do this
+	# separately to avoid parallel build issues.
+	emake rehash || die
+}
+
+src_test() {
+	emake -j1 test || die
+}
+
+src_install() {
+	emake INSTALL_PREFIX="${D}" install || die
+	dobin "${WORKDIR}"/c_rehash || die #333117
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
+	dohtml -r doc/*
+	use rfc3779 && dodoc engines/ccgost/README.gost
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${D}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	dodir /etc/ssl/certs
+	cp -RP certs/* "${D}"/etc/ssl/certs/ || die
+	rm -r "${D}"/etc/ssl/certs/{demo,expired}
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${D}"/usr/share/man
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${D}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir /etc/ssl/private
+}
+
+pkg_preinst() {
+	has_version ${CATEGORY}/${PN}:0.9.8 && return 0
+	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${ROOT}etc/ssl/certs/' to rebuild hashes #333069"
+	c_rehash "${ROOT}etc/ssl/certs" >/dev/null
+	eend $?
+
+	has_version ${CATEGORY}/${PN}:0.9.8 && return 0
+	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
+}
diff --git a/dev-libs/openssl/openssl-1.0.1c.ebuild b/dev-libs/openssl/openssl-1.0.1c.ebuild
new file mode 100644
index 000000000000..46fab07be2d1
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.0.1c.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1c.ebuild,v 1.1 2012/05/10 22:33:47 vapier Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+REV="1.7"
+DESCRIPTION="full-strength general purpose cryptography library (including SSL v2/v3 and TLS v1)"
+HOMEPAGE="http://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${P}.tar.gz
+	http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/~checkout~/packages/${PN}/${PN}-c_rehash.sh?rev=${REV} -> ${PN}-c_rehash.sh.${REV}"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test vanilla zlib"
+
+# Have the sub-libs in RDEPEND with [static-libs] since, logically,
+# our libssl.a depends on libz.a/etc... at runtime.
+LIB_DEPEND="gmp? ( dev-libs/gmp[static-libs(+)] )
+	zlib? ( sys-libs/zlib[static-libs(+)] )
+	kerberos? ( app-crypt/mit-krb5 )"
+# The blocks are temporary just to make sure people upgrade to a
+# version that lack runtime version checking.  We'll drop them in
+# the future.
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	!<net-misc/openssh-5.9_p1-r4
+	!<net-libs/neon-0.29.6-r1"
+DEPEND="${RDEPEND}
+	sys-apps/diffutils
+	>=dev-lang/perl-5
+	test? ( sys-devel/bc )"
+PDEPEND="app-misc/ca-certificates"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cp "${DISTDIR}"/${PN}-c_rehash.sh.${REV} "${WORKDIR}"/c_rehash || die
+}
+
+src_prepare() {
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
+		epatch "${FILESDIR}"/${PN}-1.0.0d-fbsd-amd64.patch #363089
+		epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743
+		epatch "${FILESDIR}"/${PN}-1.0.0h-pkg-config.patch
+		epatch "${FILESDIR}"/${PN}-1.0.1-parallel-build.patch
+		epatch "${FILESDIR}"/${PN}-1.0.1-x32.patch
+		epatch "${FILESDIR}"/${PN}-1.0.1-ipv6.patch
+		epatch_user #332661
+	fi
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:=/usr/share/man:') \
+		Makefile.org \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.0 gentoo.config || die
+	chmod a+rx gentoo.config
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	sed -i '1s,^:$,#!/usr/bin/perl,' Configure #141906
+	./config --test-sanity || die "I AM NOT SANE"
+}
+
+src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
+	# RC5:      5,724,428 03/03/2015    http://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+	echoit \
+	./${config} \
+		${sslout} \
+		$(use sse2 || echo "no-sse2") \
+		enable-camellia \
+		$(use_ssl !bindist ec) \
+		enable-idea \
+		enable-mdc2 \
+		$(use_ssl !bindist rc5) \
+		enable-tlsext \
+		$(use_ssl gmp gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(use_ssl rfc3779) \
+		$(use_ssl zlib) \
+		--prefix=/usr \
+		--openssldir=/etc/ssl \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAG=::' \
+		-e 's:-fomit-frame-pointer ::g' \
+		-e 's:-O[0-9] ::g' \
+		-e 's:-march=[-a-z0-9]* ::g' \
+		-e 's:-mcpu=[-a-z0-9]* ::g' \
+		-e 's:-m[a-z0-9]* ::g' \
+	)
+	sed -i \
+		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
+		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
+		Makefile || die
+}
+
+src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+	# rehash is needed to prep the certs/ dir; do this
+	# separately to avoid parallel build issues.
+	emake rehash
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	emake INSTALL_PREFIX="${D}" install
+	dobin "${WORKDIR}"/c_rehash #333117
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
+	dohtml -r doc/*
+	use rfc3779 && dodoc engines/ccgost/README.gost
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${D}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	dodir /etc/ssl/certs
+	cp -RP certs/* "${D}"/etc/ssl/certs/ || die
+	rm -r "${D}"/etc/ssl/certs/{demo,expired}
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${D}"/usr/share/man
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${D}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir /etc/ssl/private
+}
+
+pkg_preinst() {
+	has_version ${CATEGORY}/${PN}:0.9.8 && return 0
+	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${ROOT}etc/ssl/certs/' to rebuild hashes #333069"
+	c_rehash "${ROOT}etc/ssl/certs" >/dev/null
+	eend $?
+
+	has_version ${CATEGORY}/${PN}:0.9.8 && return 0
+	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
+}