version bump, add SUBSLOT

Package-Manager: portage-2.2.9-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

4 files changed, 113 insertions, 17 deletions

diff --git a/net-libs/polarssl/ChangeLog b/net-libs/polarssl/ChangeLog
index a08421e70a78..000496d95679 100644
--- a/net-libs/polarssl/ChangeLog
+++ b/net-libs/polarssl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/polarssl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/polarssl/ChangeLog,v 1.69 2014/03/15 20:06:18 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/polarssl/ChangeLog,v 1.70 2014/03/27 19:56:59 hasufell Exp $
+
+*polarssl-1.3.5 (27 Mar 2014)
+
+  27 Mar 2014; Julian Ospald <hasufell@gentoo.org> +polarssl-1.3.5.ebuild,
+  metadata.xml:
+  version bump, add SUBSLOT
 
   15 Mar 2014; Julian Ospald <hasufell@gentoo.org> polarssl-1.3.4.ebuild:
   install docs
diff --git a/net-libs/polarssl/Manifest b/net-libs/polarssl/Manifest
index 7f619048249b..63d99cea7db7 100644
--- a/net-libs/polarssl/Manifest
+++ b/net-libs/polarssl/Manifest
@@ -9,26 +9,28 @@ AUX polarssl-1.3.4-zlib.patch 350 SHA256 8eb271667727d170a4bb040ef01681708f436f6
 AUX polarssl-cflags.patch 456 SHA256 ec774481fd2aad2ea437ef3828248a3ceb89def0e0c8c50dfa14e2d88e9a9dc1 SHA512 0dd592a937460c7257bcd4d3da524b0616908c2cd7767d53e8eff4a5f47d2943f1379605fc80ebcda23dafb37e93a98a0577bc949664895622f733cde932fe59 WHIRLPOOL 9aa0480faaa44dcc330362775f5b022cc6ff0a04fb189b061632638081223d762c1c1d22e2384a82e7bbc71bc37a7e55a3cde62c0ac9724d144e5b763b6dd879
 DIST polarssl-1.3.0-gpl.tgz 1161700 SHA256 ab4dd4099e77e3432f0d18af32c4a7fd7ea9b7c4bdfa57852dc6cf5d2262f836 SHA512 a3819c72ad99d274222ab5ac5f85ad4db26fd83d640b118a258d3332f0b74e3081d4b2bf934e0768c61f65f8a3af0e11173a2e618c0b8f6e44456a414d3169cf WHIRLPOOL 0b05fc7587844fc848aa26c98da48aec1096e3bee7012f65d9bc362410283452a49c0e299afc89ffd508fa17bd4be3974ddbc9adda4ea6e675d5ce4c4ceda5fa
 DIST polarssl-1.3.4-gpl.tgz 1242488 SHA256 faed0c813ea4e6abeaffe9a56e65db3d3b191b5aa76b86d5bf1e09e1a1a9ea7e SHA512 5e4e0f06bea38d9384eb897c405e68d12bf810b1308194e7589db2e77d0532305fabfdf65d33c201a9d7ee6abaaef6c49b144aa5e23f7f64ffef46dd86e4b7a1 WHIRLPOOL 54de1d3399b5d8ee4f0d832706328f8e3ddea39d47d0fcfa0d451a1a5414e7c30184fcaf8eed6bb1eb3597813663969d2610187992191285c9812c126dc6360d
+DIST polarssl-1.3.5-gpl.tgz 1569674 SHA256 158e8e9d0f7c1297296f78e913c6634aa221a4fbab684e7441828c8d5f58c07a SHA512 92238b92266100b300783d6e36e0b8baa312f8ad5d46e582c3bed6edf5ad7f92bdfaf1362d0955118f5b6873ae2133b53da3c9ba039b9a7c5ea76344203dd87a WHIRLPOOL 14568508359b6f43fe80b968ffe75bbde16645d02c4b22b5a7f44bb8ed4e63c7350ae519aae22016211c61e3a8697d70c97b2e439a789378cb7f1dcb76a017e6
 EBUILD polarssl-1.3.0.ebuild 2181 SHA256 21c7ec905384916a675077796842c873a9104e52ef49cffe9601e0f00df05694 SHA512 b3729bbebce7e32254e62785ba120bc1964aeb33066c20e7391297a2f9ce05a27f97536085a26a35eb1544ea40ad36d0e444e731a6a7d47ce23e33f3d679c4e9 WHIRLPOOL ff3b1dc61f84f6ea1874e5a4707872468bd6125f7ef4275bb49b21e90b46a8d94bf4fb6337d0f7dddc764cefd5b530fc0d055872a18456c7d93f92cf921aec95
 EBUILD polarssl-1.3.4.ebuild 2361 SHA256 fc2c9e5052f6465020f883af05d2525a299e18b7a3b6cba206c1cf9aede21019 SHA512 2a6e42a99fab43563504e962d5bc2f17cc58ca818f654ef154911b3ca910d3aa44d96729e7f6cf032f095d34f9278c5575d98c0a8a2435864f29d3b4a36468fc WHIRLPOOL 9381a6eaa6c4fb33cacbfe40ac8ed0537a5e0bc6b6a88dd744bc0a31fd3c2119a194e8c5a0d65b001b20dd4b4c6d02027dbf7f8f01611dc4a59abb4e8b0b9e90
-MISC ChangeLog 8798 SHA256 35e05b3d42cb4a02ec96d9b866976925e9a29d703ca94564e085285065d6612d SHA512 dfe1551123558367cc0d1d9a02a5b3ae814683420d06d0d735351520bf1f721bd16ad6bbbd287eb2d43e1c5f5b34754bc7fee8d75f20c9edaabc04be79720852 WHIRLPOOL a317cc47e5dcf3829f6eac0cb4b671f67cc1d09f0c2ca1de5365bf954b005728e66ebfcd245947f6602f123dd5767941eb335af146b24dc45c04a486546a9543
-MISC metadata.xml 630 SHA256 6cfe58e0203433af2319436acda3a82a7f0936d450e241b8831bdec73d386402 SHA512 6d7593740df7c6fa65354db1cba841d9c65e9534426c45c60fa729d3ac26006935b9da765414473803225ad20958ea3dc9da66dcd6ede7462f8d62fcb1be48f2 WHIRLPOOL 294a712c87f79144a7b8cff6ac86de8e485804c2d7d91251bcbd708b932eeb0883785914ef9c7410f07453250b1057f583fc3bb805bc53982eb645492894065a
+EBUILD polarssl-1.3.5.ebuild 2199 SHA256 5abd4959d641df70ba3625c0e8dd4f6922e5c1283938b27be2dffdc6ff9de368 SHA512 d92e897ac468b77ac7e18e2d89f067a68b01ada60154c8cc51728c2d92db4462459d01db608c26cb2c83eb42348ca22cb28bab302b6fb239ef8e2e196d8dbe7b WHIRLPOOL ee6e04efc3a439136397dd4255f02f1fd1770130cc9e09a15be3d042420bd1349f4189c002c73e0230246a0c9811cb6def2ad267b24d68e4c15444609f25c6bd
+MISC ChangeLog 8949 SHA256 b57f735c6246e1d08c5b73525290d54e55368655938dd7045cb9353986595d5f SHA512 81bcf2c29533095c844ddae257cb66f801674f0e656dddbaac979f9071dcd954ed8095660c0b8dcf4a5f82b22743c8fdc1ca60afff280984ae40e072a9b9e209 WHIRLPOOL 041e003d15be8cefeb15005c74082185393a732c755a17e16697ab4939cec27197fa9f7dde961afff963dead6af9aa64e4e330a624b13ff650cc728e3c220a98
+MISC metadata.xml 685 SHA256 0105b478e4b38b5acabf7452fe926df41ef48967f04b26cf9c7aacab38ae1f9c SHA512 4f8bfd590668543b57ad54358e37ce1fda2186f38fea31caa85bdc67e4911f29ba473292cb91ddca2d0342c52caf1b68861483168b31c0617fcc4ecc090b107a WHIRLPOOL e687881ad644fb52492cc4ec6649be93cf61bee444b85cb97a18faeedc12cf43a5d5de209b94aebbc6476e6eb2b7d8dabf462f0ac1f2b176bcff01d756581225
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTJLK+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTNIKPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgsvcP+gOBVAeQmQZjVLBP16qBq3qE
-/JUWP9v4Hto/xkfk/sbjll3VjMwSBQe9YR2689A3q2aqO3dCoG6Hu/h6vjbDf0ly
-NTfqXyIk07HpHSf8Y3FCyiUYSWGSy5WHH5X0PI6Dac1RGW/onTtO580Cpgv9CiTy
-i9VzdNXQdI+vt8Z/0uqvdwdlumvT9JK32w1upk2885YS5qCPln9Cf2IpiiOUunuk
-gtG8Rrlcv/oCTNuSRHSiY9HEHjGm5X8hbMzMt7cwaq/Y5S4ybxSWZ7X6ZUUXeZGA
-5fIWn1IgUqALUyNAB/VDGyce96y9trO481WlP7mbw3KBreVolMKUwvBdH6INfy/h
-NM2niKPOcJXwtCQIl2N4EvfEQbG24Sl1tv8uyuwWVIhB8jGIVDNXiuvbBZLXeCSE
-z9k2M7VM94cbwtglud145PoW2klvuYOyviXHQx1zfKblyzM+GGwNgME96WJWmE/q
-8xdP3HUCeBVrH1YMhGnJDj1QTdgmYoOiXpv9Ma/2xiZ91CYUCt3hSdOb3eGbNain
-nuQ5s/2vWI/v3+5ySd5ucvoo/iy28enUlyDtLfBC4z0HOAXYrCHItPhxgKou4sVi
-C2y5RBcVFd8Cpasf40VMvTdG9gVU9W8R3VxsSch3z/oiHSfPl6Qz7QigJ8ZDtwsH
-/Mu9t1ehJGyyosGeqb42
-=alx5
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgqDgQAPRab1PfRX5NLa9GW4iApcVa
+TvF6GQVvb+OSlwCrjiFrpej8W6EvQmCOm5AEuJbW+3eLFvylU8I9xqO9jT0YPVxL
+rpopNqrEvVzkublDHf2k4lkMk6KyVlnzqqs7fV75M0RTtVTMweNLh6fx7dYOkvIV
+DT+5oLnbV2tCN6M3FVdctslYe22zJgyz+v/Ps4UJKIQkkqW4J8UzcYIGq98up0Tv
+by4JXarQmIU2cm2MqjmS0eKkUkFdQDNv4WmCM1ledt4BVhdsa4oED2MCFfcepqh8
+VcXOki1D6ILLQDbz9y4eppuMvlEZutvrpEq8JJiNcwrOH45LPaJN+Yr7hg9UOMkx
+Fg5vKtHXPQtx1a6EaHLhBsU29NFvwOba884lxq/6P+/MMsAaDtN1ijh5G5m9MmwZ
+ojUqPZRFK2dSNS2ZyU2kmzKZDizO3NS94U9qdgiSxk/jqg1+MqspdSBn6hRjHn9a
+URbFeugPm3CePQJkM3xP3bpRsfwnKZnvI/Ay5HWtXDvYCJ1QPwPsVCLyQfgwQrMo
+lE49dXqiIcDiZQ6r568OVSYO1ybjJPyOYsKyILFo+SBd8eh8rh1xsVahC+jXaVvN
+BwEgUb+9qp2R0ru6iJENb74Bnwpn04/tJvScdHxUq7VKrJpqdG7C8pZEj9fhXQ0i
+Zso882Rv7DlglwHqRSsL
+=OgOj
 -----END PGP SIGNATURE-----
diff --git a/net-libs/polarssl/metadata.xml b/net-libs/polarssl/metadata.xml
index 1e313082357d..925bb3e9754e 100644
--- a/net-libs/polarssl/metadata.xml
+++ b/net-libs/polarssl/metadata.xml
@@ -16,5 +16,6 @@
 			Warning: the HAVEGE random generator is not suitable for
 			virtualized environments
 		</flag>
+		<flag name='programs'>Build PolarSSL programs</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-libs/polarssl/polarssl-1.3.5.ebuild b/net-libs/polarssl/polarssl-1.3.5.ebuild
new file mode 100644
index 000000000000..5faa111ba253
--- /dev/null
+++ b/net-libs/polarssl/polarssl-1.3.5.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/polarssl/polarssl-1.3.5.ebuild,v 1.1 2014/03/27 19:57:00 hasufell Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs cmake-utils multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="http://polarssl.org/"
+SRC_URI="http://polarssl.org/download/${P}-gpl.tgz"
+
+LICENSE="GPL-2"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="havege programs sse2 static-libs zlib"
+
+RDEPEND="
+	programs? (
+		dev-libs/openssl:0
+		amd64? ( abi_x86_32? (
+			|| (
+				dev-libs/openssl:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs
+			)
+		) )
+	)
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+enable_polarssl_option() {
+	local myopt="$@"
+	# check that config.h syntax is the same at version bump
+	sed -i \
+		-e "s://#define ${myopt}:#define ${myopt}:" \
+		include/polarssl/config.h || die
+}
+
+src_prepare() {
+	use sse2 && enable_polarssl_option POLARSSL_HAVE_SSE2
+	use zlib && enable_polarssl_option POLARSSL_ZLIB_SUPPORT
+	use havege && enable_polarssl_option POLARSSL_HAVEGE_C
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_enable programs PROGRAMS)
+		$(cmake-utils_use_enable zlib ZLIB_SUPPORT)
+		$(cmake-utils_use_use static-libs STATIC_POLARSSL_LIBRARY)
+		-DUSE_SHARED_POLARSSL_LIBRARY=ON
+		-DINSTALL_POLARSSL_HEADERS=ON
+		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" cmake-utils_src_test
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use programs ; then
+		# avoid file collisions with sys-apps/coreutils
+		local p e
+		for p in "${ED%/}"/usr/bin/* ; do
+			if [[ -x "${p}" && ! -d "${p}" ]] ; then
+				mv "${p}" "${ED%/}"/usr/bin/polarssl_`basename "${p}"` || die
+			fi
+		done
+		for e in aes hash pkey ssl test ; do
+			docinto "${e}"
+			dodoc programs/"${e}"/*.c
+			dodoc programs/"${e}"/*.txt
+		done
+	fi
+}