Version bump for bug 358783, drop old version

Package-Manager: portage-2.2.0_alpha26-r1/cvs/Linux x86_64

3 files changed, 41 insertions, 15 deletions

diff --git a/net-libs/polarssl/ChangeLog b/net-libs/polarssl/ChangeLog
index c22fd27c209f..3744122806af 100644
--- a/net-libs/polarssl/ChangeLog
+++ b/net-libs/polarssl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/polarssl
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/polarssl/ChangeLog,v 1.13 2010/10/11 18:49:37 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/polarssl/ChangeLog,v 1.14 2011/03/16 21:10:54 tommy Exp $
+
+*polarssl-0.14.2 (16 Mar 2011)
+
+  16 Mar 2011; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -polarssl-0.12.0.ebuild, +polarssl-0.14.2.ebuild:
+  Version bump for bug 358783, drop old version
 
   11 Oct 2010; Jeroen Roovers <jer@gentoo.org> polarssl-0.14.0.ebuild:
   Stable for HPPA (bug #332361).
diff --git a/net-libs/polarssl/Manifest b/net-libs/polarssl/Manifest
index 1f2aee312dd3..bbeba956f7d2 100644
--- a/net-libs/polarssl/Manifest
+++ b/net-libs/polarssl/Manifest
@@ -1,9 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX polarssl-0.12.0-makefile.patch 551 RMD160 fd3a2d5da8a56cf4130172fbe9f484553659a6e7 SHA1 244c39f6f4ec18cb57c36a04501f9bc3c6beb879 SHA256 527d173df3e3723228b8dc1c85bffb95ae040deedf28943f36d9fbd2d2decc63
 AUX polarssl-0.14.0-ldflags.patch 1538 RMD160 e99c858bbd1977f8ee9cc2fae3b82b8e8f0807e7 SHA1 16606883c24541e0e25c01bffc8090c5a90f46c2 SHA256 d11da5bc6a5ee899098bad07dcebcd3750114643a6f561d19d5f9a09f2784eb5
 AUX polarssl-0.14.0-makefile.patch 551 RMD160 fd3a2d5da8a56cf4130172fbe9f484553659a6e7 SHA1 244c39f6f4ec18cb57c36a04501f9bc3c6beb879 SHA256 527d173df3e3723228b8dc1c85bffb95ae040deedf28943f36d9fbd2d2decc63
-DIST polarssl-0.12.0-gpl.tgz 336761 RMD160 8b5335589ef76e81b2b3dfecda96e5f4bc1f3b48 SHA1 980c245310fbd6b2f1e0bb5f9eab20f6515c723b SHA256 71e69a9071a73f501fbc08743b7b0e2fb84cfae1f2ca5c368dc0c4e33cfafb08
 DIST polarssl-0.14.0-gpl.tgz 343617 RMD160 8de9ee3ef362750e77a77a3c846746bd953cfd34 SHA1 581a90dc0e911edf87816e38fbd2e5826247b255 SHA256 0b4b4cf79cdae5254c5a7a2bbadbc84c9e3644c7bb9975a94c149682010f84c0
-EBUILD polarssl-0.12.0.ebuild 1457 RMD160 9391d1b0ec0cc03bab2893406db932a0a09d2ed3 SHA1 ba1d75d77cdbcf1ab0da758d20347841a6f03642 SHA256 96ca270a88872fc9163ad1404f59bc1724aea4ef9bb85118d32ed1e9f3bde170
+DIST polarssl-0.14.2-gpl.tgz 335243 RMD160 7627cfe36f843be7489fe34d5314b497bf2e128a SHA1 5665d3d296e24e263156530170e7d303c09de104 SHA256 6dfc9400e05eca146f3233a290061545271805f91bbb431ad213c4541f1029a6
 EBUILD polarssl-0.14.0.ebuild 1518 RMD160 90a0240e1e9504c4f907fc6954fb8f5ae77ae064 SHA1 2e22d58b0dd6c01a3d528506ba33a83573e4c68a SHA256 3e2d044ec7461ad3d78943d614bcea3ad381faeb2e6b1d6a46409c85c920ac38
-MISC ChangeLog 1882 RMD160 c2a7161cc5062ce7bf828081f56de0f954e42af3 SHA1 70857c1084f84e6e687dab43facc94300e6936e9 SHA256 83602dfa10dccc709e0bed0d11fc77d0307bbe654fca8b6849d3c155c9be1d67
+EBUILD polarssl-0.14.2.ebuild 1558 RMD160 0c38895b6545402112e5dc1d41f18b327a1f49c7 SHA1 a6ceef1225875d84116b0d643ce0a694f0874efd SHA256 381b29dceaab115d6eb9cc6d4cea7b743e1bb9ca7821b1635448f6a95444b070
+MISC ChangeLog 2076 RMD160 bc59d9a0a8f6850fb204fa03e494f05c87cd6d31 SHA1 7d1ea2facc7d422f4304b09465cd62f299b11014 SHA256 716b0a8a61954129bbb39925ca1b673aeed2f785609ef287ac54568ff6c2e5fd
 MISC metadata.xml 415 RMD160 95817166af90e00d701ca230525371cac893dc22 SHA1 3533728b17ddee286a3803d48208e13e926f6d69 SHA256 51ad0d646fd8a28ce72eded7e1eb3d3dead3a8460e219ccbb8bbe214bd49f3b5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iJwEAQECAAYFAk2BJ2cACgkQG7kqcTWJkGchqQP/aOnqErSiKr0pe4hf+0W7CzDG
+GHiABYlnKH4yslahdDxcvn+OdS1ggqdqsvpCV8yLmUAsJDK624z11CtUMo6MQQ9+
+AcXXzXX781rs2TG4iOu5j5dvB8YhGYtuVD3Gx7ngXguQyJAPfpdDkI73fSG92Qdv
+Tfcz3av9Lxs78Xd4vso=
+=DCfT
+-----END PGP SIGNATURE-----
diff --git a/net-libs/polarssl/polarssl-0.12.0.ebuild b/net-libs/polarssl/polarssl-0.14.2.ebuild
index 9ff58d1461b1..2a34974b7b6b 100644
--- a/net-libs/polarssl/polarssl-0.12.0.ebuild
+++ b/net-libs/polarssl/polarssl-0.14.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/polarssl/polarssl-0.12.0.ebuild,v 1.5 2010/07/11 15:13:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/polarssl/polarssl-0.14.2.ebuild,v 1.1 2011/03/16 21:10:54 tommy Exp $
+
+EAPI=2
 
 inherit eutils
 
@@ -10,29 +12,35 @@ SRC_URI="http://polarssl.org/code/download/${P}-gpl.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="examples sse2"
 
-src_compile() {
-	cd "${S}/library"
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.14.0-{makefile,ldflags}.patch
+	cd library
 	if use sse2 ; then
 		sed -i '15iCFLAGS += -DHAVE_SSE2 -fPIC' Makefile
 	else
 		sed -i '15iCFLAGS += -fPIC' Makefile
 	fi
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	emake libpolarssl.so || die "emake failed"
+}
+
+src_compile() {
+	#cd library
+	emake -C library libpolarssl.so || die "emake failed"
 
 	if use examples ; then
-		cd "${S}"/programs
-		emake all || die "emake failed"
+		#cd programs
+		emake -C programs all || die "emake failed"
 	fi
 }
 
 src_test() {
-	cd "${S}"/programs
+	cd programs
 	emake test/selftest || die "emake selftest failed"
 	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:../library" ./test/selftest || die "selftest failed"
+	cd "${S}"
+	emake check || die
 }
 
 src_install() {