3 files changed, 84 insertions, 16 deletions
diff --git a/dev-libs/matrixssl/ChangeLog b/dev-libs/matrixssl/ChangeLog
index 6f96f7f11f0f..346e1621427d 100644
--- a/dev-libs/matrixssl/ChangeLog
+++ b/dev-libs/matrixssl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/matrixssl
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/matrixssl/ChangeLog,v 1.11 2013/12/09 05:07:45 vapier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/matrixssl/ChangeLog,v 1.12 2014/04/13 11:02:29 ssuominen Exp $
+
+*matrixssl-3.6.1 (13 Apr 2014)
+
+  13 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> +matrixssl-3.6.1.ebuild:
+  Version bump wrt #507552 by "slash"
 
 *matrixssl-3.4.2 (09 Dec 2013)
 
diff --git a/dev-libs/matrixssl/Manifest b/dev-libs/matrixssl/Manifest
index d840a25b5e24..db04a7d51b92 100644
--- a/dev-libs/matrixssl/Manifest
+++ b/dev-libs/matrixssl/Manifest
@@ -3,24 +3,20 @@ Hash: SHA256
 
 DIST matrixssl-3-2-2-open.tgz 1743910 SHA256 ca0b715b9181f00ebb08ab673e4fea5e0f348b506f9f15acd830b51c4f6abf3e SHA512 bb7956c84eecf1b455612f67b9779ed799c673ee72c74a5f04e23b8d646119cfb6765a8e0c308a904608f1818fe04a73b44cd40d21e12d4ce0d475d38def5103 WHIRLPOOL a3931284f17583e25e7a0c1b702bde1b5b12c24c6241aae7ccc7d3039eec7700259b454c95722c8255d0371477ad47233192cb51f6e86b46dd568cfdadc422a7
 DIST matrixssl-3-4-2-open.tgz 2650999 SHA256 e43f68d53ffd53c736cf16b5b2bd20406ddaa4c0a98dcc11e21dbaef4ac459df SHA512 40427b6e7120e90452404a9dcafe284677e2f4f85477ad765f2328f6fb96781bc7049340665f43a5d26a55b0b2c91fee51fdd3ffc54fcc190de769377c234862 WHIRLPOOL 18d095d47c09ed40ba885dfed54002856046d4378c369a9d6b0704bedce2abe3f4c2265af0b0bc16d4a8a329c83a4a41863cc204a0f8d32fa4b1e2326ea010f2
+DIST matrixssl-3-6-1-open.tgz 4342141 SHA256 22f1426c61a9d1b699e7ebbb6c14b00c949613f224429702723fd762642985ee SHA512 762c280d1d1b3a729d95a5b6aa3bab31dd7c725c76a47521709f00d2294693c266690e106d2619f2d4c8ece1757eaf0e45fff84a5c1763938317f09fa2ea2907 WHIRLPOOL 2225846e74eb14b76900fd0124039cd594c1887b83dea36d4fdc6737d17c87de85a19f780887d874e2c846e3edf9e4dede56aa081387a7706f20d4d5c6b7c4b9
 EBUILD matrixssl-3.2.2.ebuild 1360 SHA256 b5f0df9d06708267ece8fc783e7d00f1c3f9b1bb43f38a80fb53fda9f337a0c1 SHA512 83244bd769b9e8f05128bf12a48048dc812bed76e38248329467235e4b6148025334e5c88dedbedda26ddc5d9b94c5e71d2588e31a13b8d1a747f1d97e9ae020 WHIRLPOOL 301551b781bf06b9cb7a6b255a0f5e20bd4a1222bd22017013b419d952764dfd61c2d055cc8f3a0f3879e21202e7fb9cad7b1c0aa88462452c619ea1ea8953b9
 EBUILD matrixssl-3.4.2.ebuild 1410 SHA256 7192aba535f08f68269d6a6c6ede5d960e3e4200e6db3f0521b298e40d1012bc SHA512 a40a390e6bff6dee3a3a0ec2bb4edb47eabd1b5d2a441e011965b88ee89d4a56342bc4a5f568a2cd512c4814c66d7e361cb1a3a76bf603289b1a420830b3768a WHIRLPOOL 96288755e8d5ad2e092a226b874f4c1de87672ebf6dac1436e3bd03a1ce912de3ec9967902b3a3d1cbe53e456da57bba9657391ec41ec861a2e96d225f7d9847
-MISC ChangeLog 1602 SHA256 96eb77112f4472d6239f4cfe168e537c43f42da4f9e658b496c97eabbb9b8088 SHA512 6c4f5e9e8a178a3a38016a0fda0c6f9bffe0431e2a7bff898dd77e2df09a9f5f57645ae52025b27486245becd1b5d61bc1a672f6b81f74fd13a5d2e9d33afe7c WHIRLPOOL 2b31be4dff54a548957fae8c9cb23db588561651812abf7f6ae688ba7d09860af7d3ebac8f45f71e85cc530f1cde174e43d95f4d408ace1da0aff3ee4b339711
+EBUILD matrixssl-3.6.1.ebuild 1423 SHA256 a541c5a3fe48ff97b52b343267a88e04a9c22a9de0cea83c20ea98de67e3b0a1 SHA512 d8ef10bceb85e8e39a1cdfbad718e6165bc3fee14fbffebff75cfc2ebbb28851c3a636ee47a9c3459fe4b8e18da19aa44e0ae3fb1c17239b78031070852e856c WHIRLPOOL 3bcd9cde676561937309036bde781cc3d7850908b2ba6195ba862420e098a9d51604e30b6ed1199ded9d8869dd4322cf45352469ebe4b20d7f15b9974a03e724
+MISC ChangeLog 1755 SHA256 afa7edf55461c06387c0d78a08018f55e0844184bb3638bfb1b9ac323eba1180 SHA512 2366a4a701dd6ce64f32bfbedd7d72740bc9aef74d244a5f3cd11cf05fee49120d3e4fa78da0c1fa1e98a7d5546c851b32fbb21b069653c64bc6ccf943884103 WHIRLPOOL 567230974cb154f99381a251c1ddd707edcbda27e4f3e1d5effadabc5e7173384437bf94477b54532d0a622d76130fd9fe04c61b7704dbb17ff27bd7b2e352f7
 MISC metadata.xml 161 SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e SHA512 4190220cd1cb5f6413a85fab4eb59eebf03d2a63f066f811b76bb8afeb37eeadbab8ee7143970c5ca186e983a46b7e1aa158f5e4b2a3c723fce3112f69969e5c WHIRLPOOL 0f82255faae8b5dfb524458c156619f17938ac8f5166339e4a3ce9d3312e7466847bd5cb7e0554d6ba810dda68fe414e5cda7095eb5629ec2aeeb774b432da30
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSpVAoAAoJELEHsLL7fEFW0YwQAKwQ4T7qCcxB2ac65kCMc6sV
-RfTCbAY6KuQfWUUADjFbuCoPyz57J9TUfLuxKAEW6pwuUQC9O5NAjdKEi6vdCP7O
-u9yzF39wq5Pd0xrJLONdU2Wop8bvn38LgsPJHYze0K4us2hupOfbjfJOHAt9SR+y
-xwr94jZEW2JFwmFFwkQWAUvA/yra/cggUrf9+ndR0+SUI+wE3d4F6mdi/vZvt01G
-7eiOlR2vLWd6Q4VF38KmmF2o8XJU+KKiy5iguxQ46flr8KEkji492RT3Gi7a+iso
-T0URON5oyH224BX8ty33fPKulfLgy8nglH78tEEd9JayiWIIu3ggNHWX2haEB5Dl
-l92dR2ytEeIjUDmE9jl5HmUxB0ITQcmELg9C961m/bK/6ooFNLZhh0D4562xHykV
-d0XZRNvr2G4gJCbAXc3Eww0PEGRxeedb6V08TvFC3e7ReureJNmTUXurhsoM6iGQ
-39NxnOuzsdXbByfDhUoUmOHpKH3JsF+m3Buy1Ch78W2jLuzayxF3wNazxKQ0B6UA
-NpxsL22Tti6Ti1mtx654DCsWe+WEed4Pvy8Mz2Ng9SRyBYTQDLqN7JEWdmqtDBf3
-y0u9hPhWP/9MxtxW6Ds6VRKm/DwWBxlE7pEg6Ft1eP6yOGHu1GrezwYySo+169CU
-1qRQrQxFlZoL2uk3Tqd4
-=NBHg
+iQEcBAEBCAAGBQJTSm67AAoJEEdUh39IaPFNtRIH/1yUWymwlSSKAr+MXwBxQX/2
+Z2eT7x13dEYOHJsziWzzudBqYZkhxpLKrFP+zIpQkbBdfeGgQr25hFiZGD/VWo2o
+hmQsU4icygVMmtA2E5RjsigibuoNv7LoFwXpH9qWfjWT3iP7lqUGhpYA/i+OT0WF
+nXdCbgCgHj/i+0Suc+bypoQTIwbU58MXnqCaTz1pUdeTpIsWSrunypPlX34oV7H2
+sUHH1d+QAIRu/rujrtAcu5IjeIVIX6nnQHGEKzTGrD55eyZ80PYnjeR3TWAzMtlb
+4MzpiqYhm4V0CMb1Q1ysREkHfTxlX2S27HOmH08wWglpAHa2V2kNkp3a6w3HTkE=
+=0idF
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/matrixssl/matrixssl-3.6.1.ebuild b/dev-libs/matrixssl/matrixssl-3.6.1.ebuild
new file mode 100644
index 000000000000..bfe6149eb346
--- /dev/null
+++ b/dev-libs/matrixssl/matrixssl-3.6.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/matrixssl/matrixssl-3.6.1.ebuild,v 1.1 2014/04/13 11:02:29 ssuominen Exp $
+
+EAPI=5
+inherit toolchain-funcs
+
+MY_P=${P//./-}-open
+
+DESCRIPTION="embedded SSL implementation"
+HOMEPAGE="http://www.matrixssl.org/"
+SRC_URI="http://www.matrixssl.org/cgi-bin/dl.pl?agree=1&.submit=DOWNLOAD -> ${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples static-libs"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	local myconf=(
+		CC="$(tc-getCC)"
+		STRIP=true
+		AR="$(tc-getAR)"
+		DFLAGS="${CFLAGS} -Wall"
+	)
+
+	if use static-libs; then
+		emake "${myconf[@]}"
+	else
+		emake lib${PN}.so "${myconf[@]}"
+	fi
+}
+
+src_install() {
+	dolib.so libmatrixssl.so
+	use static-libs && dolib.a libmatrixssl.a
+
+	# API is exposed from matrixsslApi.h and rest is included recursively
+	insinto /usr/include/matrixssl
+	doins matrixssl/*.h
+
+	local h1
+	for h1 in core crypto; do
+		insinto /usr/include/matrixssl/${h1}
+		doins ${h1}/*.h
+	done
+
+	local h2
+	for h2 in digest hardware keyformat math prng pubkey symmetric; do
+		insinto /usr/include/matrixssl/crypto/${h2}
+		doins crypto/${h2}/*.h
+	done
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}/pdf
+		doins doc/*.pdf
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r apps sampleCerts
+	fi
+
+	dodoc readme.txt
+}