Version bump, for bug 487170, bug 483784 and bug 483792

Package-Manager: portage-2.2.6-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x35899067

4 files changed, 99 insertions, 8 deletions

diff --git a/net-libs/polarssl/ChangeLog b/net-libs/polarssl/ChangeLog
index 3d9b0127a2eb..3bd811ddd1e8 100644
--- a/net-libs/polarssl/ChangeLog
+++ b/net-libs/polarssl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/polarssl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/polarssl/ChangeLog,v 1.55 2013/08/29 19:43:44 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/polarssl/ChangeLog,v 1.56 2013/10/07 18:14:45 tommy Exp $
+
+*polarssl-1.3.0 (07 Oct 2013)
+
+  07 Oct 2013; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  +polarssl-1.3.0.ebuild, metadata.xml:
+  Version bump, for bug 487170, bug 483784 and bug 483792
 
   29 Aug 2013; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   -polarssl-1.2.5.ebuild, -files/polarssl-0.14.0-ldflags.patch,
diff --git a/net-libs/polarssl/Manifest b/net-libs/polarssl/Manifest
index fb556440e017..0856f817a398 100644
--- a/net-libs/polarssl/Manifest
+++ b/net-libs/polarssl/Manifest
@@ -3,15 +3,17 @@ Hash: SHA256
 
 AUX polarssl-1.2.0-makefile.patch 680 SHA256 6f93f0c55ddb77645ad4868409fc87655af802d64b3a603b8b3b442809fa9e16 SHA512 c8f533481ff1a0c4f9f2c03ff78eeab303dd4064f9d4621ae84b84313d100b4cbfec8dcbada30c5ba30a189db508027cbec114fe70315b106f649c5a5f5dc80a WHIRLPOOL 3629c20a7bfb2f0f0456999d572d4401f7fa24ddb4754aef1c4592d9bf9f32d258a128d9f952a7eb2bae28e61a68d596f252c6778864506281f4fa2518aa1be5
 DIST polarssl-1.2.8-gpl.tgz 998609 SHA256 23cf931e322ab397d26c89b7e805cf2229df46c5196f4f67ebfc0e285848637b SHA512 d6317573faa1bdab7b7bac41484c90607b887dc2da44348355f40c6153877a30714ce9b4eb085efaa37404a5c814d89755ac4328f6b54791586415ed54222d48 WHIRLPOOL 3dc0ea9562bc574b8b62638854e64bc900dc524a50d45e1941fb73da7b6a918825a8b8fcf79bed07bfff4a2e10bdea02029a03672322f215bcfbc9783dae43b2
+DIST polarssl-1.3.0-gpl.tgz 1161700 SHA256 ab4dd4099e77e3432f0d18af32c4a7fd7ea9b7c4bdfa57852dc6cf5d2262f836 SHA512 a3819c72ad99d274222ab5ac5f85ad4db26fd83d640b118a258d3332f0b74e3081d4b2bf934e0768c61f65f8a3af0e11173a2e618c0b8f6e44456a414d3169cf WHIRLPOOL 0b05fc7587844fc848aa26c98da48aec1096e3bee7012f65d9bc362410283452a49c0e299afc89ffd508fa17bd4be3974ddbc9adda4ea6e675d5ce4c4ceda5fa
 EBUILD polarssl-1.2.8.ebuild 1779 SHA256 cac46926d593dbd0f6f5bb4e4466a45eda33ee0b714b61014a4313704bcc8a9a SHA512 d542a21741aaab694a97296dd83eaa3f7af08c839439eb662264a2e0d40ad80e1b8d29a7c2bc47c1c528d3529b1d2f3d9ba238df79c5c412c3ef250087b7f583 WHIRLPOOL b9526749bbcaf74bae4f14c8d31c66b8d8e788037a17a3b293c341cf8f0db3acc924e773f4bca37aca54b5bdf529fc815665a140f650a408b5dd571b2b8901fb
-MISC ChangeLog 7010 SHA256 b5d5755f9362197a3bc4d58a7cbf8f924416296472fc6dd78fd91b91a8704239 SHA512 88aa02b657574b475908b153d3911330841e9c0964bf9cf2b761a6a14549f5a3a6c7ed35172fc67fd5be7e94bc29b132a584a1ebc5a2a496da887b083941993a WHIRLPOOL 85c9ae3d4242259f5a08fd73835831453d0e8595d87fb7a69e7a5887344f940b866cbaa1b2de62934d6f3422a215ff12daa50440a6f8cb6fb630c76d080a74a7
-MISC metadata.xml 393 SHA256 a86b7706f2a0ef916a4731ed2469bd289ad995de975cd07c42490c9718b542e2 SHA512 b7681093c8db749b9da7b7052611a703514bd432c68b7320058ccdabfb07292ef95497e2a53912ec26fd3d37f9a93de287f037570a1db0e7d665ce095fdb25f9 WHIRLPOOL feb3af6936e4495b7e73d7d0d60395638d0d3d81b516f049dbb66e9bbbd7d6fb426dd122cf3b5e33edef3299d6ace8320da454abdbc9e02ec08dda009c406a0d
+EBUILD polarssl-1.3.0.ebuild 2128 SHA256 f466a49f69e0fcaa3e4f31632f2a162ea1c04966a5b59a8ca7cea4110f7ff5e6 SHA512 a1795900c28e38c97e085b9fae699bf58a7f3af95e5209f5be0af6c99c7603a3f62ba8c6683e582828c2894cd550461b18817776b9f23b902a2c974aa4d059cc WHIRLPOOL 8903b6a47e247af540a377102bcb8cdf754010d84dc8d4b56b519b030acb1a26c53ba6a7a2bd5c0d65e6a90d665c91d59bd3ff98d0f9bb404f889af064f6f481
+MISC ChangeLog 7199 SHA256 5216f0a71b78fc64ae6d889940ea8ba73b5f6141c3c4800aba83213d990ad674 SHA512 b25a45a43b944f71305ad67678233899de1bfc51cbbdd131a48c659bf892722c06d924858ac369d857d6cde4ea387c283909facdd42cdf033c98e1c7f0c3454d WHIRLPOOL 96b6909f545f4499f75cd9c16708457d7db21c10fc7355b79377525b976abff9a51fac7c532000cce095133d8fe8357c000c524fcfaf3b62d123892002910a82
+MISC metadata.xml 565 SHA256 526f0de48eb148111e86a66b364ce8e0b8b60a2a5f0906b296837b040ddccb2b SHA512 1a78114f07178ce7edc21645a29f0a87ee18e195f3c19e3f6179c1e0df7380b2f425b7a426211f7c60bcd20e130a3ba4dd5a8bf3504e0d1ba319330d64ddab10 WHIRLPOOL adf3ea52357887d78266e4200360ed685ba562e8dca599a2931bed3cf0972584da264e5aa5afd5dd201f06ba3e58e13c16e5a275dbde9a266dbff94ac136e279
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iJwEAQEIAAYFAlIfpHkACgkQG7kqcTWJkGfT9gP+JoAGUSekJVzXzWtrgYG6s1/+
-yrfGNEvtTOKYaIXLH+5+HauvG+ZdnCVtc3To+KBeklrHFbbSJn504jZtnbo1da7P
-0i01m1Y/UwM76j+azlKuzuPPZL6UB5MZKFjyC3fjVt+VJJPO/zF2cJYRAu6PtcKD
-Z/yoVrlWtIwlCilXH0Y=
-=PbmA
+iJwEAQEIAAYFAlJS+hsACgkQG7kqcTWJkGe7zgP/VxrTeA+VGiXoWmcc1vWhw+pF
+ouOmY8cfTWOS7FFUsUtC9zT3wvldQojX5lXXaqv0nacnSnTCPUAqiPCoCQgE8bdq
+x39d7ey55PxzTWSMmcJwfNq3Ml7e6JSC1BczxnGRSK+j4fWKH9LI71AIuG44dF1d
+yzqxwC7brBqyl99xCzI=
+=UHjX
 -----END PGP SIGNATURE-----
diff --git a/net-libs/polarssl/metadata.xml b/net-libs/polarssl/metadata.xml
index 295203d3b611..1946720beeb7 100644
--- a/net-libs/polarssl/metadata.xml
+++ b/net-libs/polarssl/metadata.xml
@@ -8,4 +8,10 @@
 		The aim of the PolarSSL project is to provide a quality, open-source
 		cryptographic library written in C and targeted at embedded systems.
 	</longdescription>
+	<use>
+		<flag name="havege">Enable the HAVEGE random generator. 
+			Warning: the HAVEGE random generator is not suitable for virtualized
+			environments
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-libs/polarssl/polarssl-1.3.0.ebuild b/net-libs/polarssl/polarssl-1.3.0.ebuild
new file mode 100644
index 000000000000..bf6e24bb6bb2
--- /dev/null
+++ b/net-libs/polarssl/polarssl-1.3.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/polarssl/polarssl-1.3.0.ebuild,v 1.1 2013/10/07 18:14:45 tommy Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="http://polarssl.org/"
+SRC_URI="http://polarssl.org/download/${P}-gpl.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="examples havege sse2 static-libs zlib"
+
+RDEPEND="zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+
+enable_polarssl_option() {
+	local myopt="$@"
+	# check that config.h syntax is the same at version bump
+	sed -i \
+		-e "/define ${myopt}/{n; s/$/\n#define ${myopt}/}" \
+		include/polarssl/config.h || die
+}
+
+src_prepare() {
+	sed -i '/.SILENT:/d' Makefile */Makefile || die
+	epatch "${FILESDIR}"/${PN}-cflags.patch
+
+	use sse2 && enable_polarssl_option POLARSSL_HAVE_SSE2
+	use zlib && enable_polarssl_option POLARSSL_ZLIB_SUPPORT
+	use havege && enable_polarssl_option POLARSSL_HAVEGE_C
+}
+
+src_compile() {
+	tc-export CC AR
+	emake -C library OFLAGS="-fPIC" libpolarssl.so
+
+	if use examples ; then
+		emake -C programs OFLAGS="" $(usex zlib "ZLIB=1" "") all
+	fi
+	ln -s libpolarssl.so library/libpolarssl.so.0 || die
+}
+
+src_test() {
+	cd programs || die
+	emake test/selftest || die "emake selftest failed"
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:../library" ./test/selftest || die "selftest failed"
+	cd "${S}" || die
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:../library" emake check
+}
+
+src_install() {
+	insinto /usr/include/polarssl
+	doins include/polarssl/*.h
+	dolib.so library/libpolarssl.so
+	ln -s libpolarssl.so "${D%/}"/usr/$(get_libdir)/libpolarssl.so.0 || die
+	use static-libs && dolib.a library/libpolarssl.a
+
+	local p e
+	if use examples ; then
+		for p in programs/*/* ; do
+			if [[ -x "${p}" && ! -d "${p}" ]] ; then
+				f=polarssl_`basename "${p}"`
+				newbin "${p}" "${f}"
+			fi
+		done
+		for e in aes hash pkey ssl test ; do
+			docinto "${e}"
+			dodoc programs/"${e}"/*.c
+			dodoc programs/"${e}"/*.txt
+		done
+	fi
+}