Version bump, drop unused patch

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

diff --git a/net-libs/polarssl/ChangeLog b/net-libs/polarssl/ChangeLog
index b603aae63d4a7710fe8ff09603f459d7dea8df7a..d9f6bf27957e3a12e421f1b450b51773108388bc 100644 (file)
--- a/net-libs/polarssl/ChangeLog
+++ b/net-libs/polarssl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/polarssl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/polarssl/ChangeLog,v 1.22 2011/10/09 18:12:13 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/polarssl/ChangeLog,v 1.23 2011/11/19 14:45:31 tommy Exp $
+
+*polarssl-1.0.0 (19 Nov 2011)
+
+  19 Nov 2011; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -files/polarssl-0.12.0-makefile.patch, +polarssl-1.0.0.ebuild,
+  +files/polarssl-1.0.0-makefile.patch:
+  Version bump, drop unused patch
 
   09 Oct 2011; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   -polarssl-0.14.0.ebuild:

diff --git a/net-libs/polarssl/Manifest b/net-libs/polarssl/Manifest
index c48eede9ba480a92f65d68ec446d01c996ba7326..47fed8b3e7aa3f3b69a77627b0aff626737765e1 100644 (file)
--- a/net-libs/polarssl/Manifest
+++ b/net-libs/polarssl/Manifest
@@ -1,19 +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
+AUX polarssl-1.0.0-makefile.patch 1723 RMD160 0c922d77f81e86aa33164e93c21b374384031fa9 SHA1 763ea49e93fda80b48cce1c560c567a543df2e59 SHA256 2e963ee772abd2594f3fca7b71ade99d2d20f42b9088feaa6b414f88b375034b
 DIST polarssl-0.14.2-gpl.tgz 335243 RMD160 7627cfe36f843be7489fe34d5314b497bf2e128a SHA1 5665d3d296e24e263156530170e7d303c09de104 SHA256 6dfc9400e05eca146f3233a290061545271805f91bbb431ad213c4541f1029a6
+DIST polarssl-1.0.0-gpl.tgz 540204 RMD160 9da07a73bad934f3e057e70c3bc0af6109d32584 SHA1 029aa736c8941080e043c554906ee991cf09fe45 SHA256 db42482e8b2121c1bac74cb8520ac941a1fad286c44a99d98189d94c317c6fa9
 EBUILD polarssl-0.14.2.ebuild 1571 RMD160 8f0eb3ef3f36ea44c32eeeb59e182d15dc0e3044 SHA1 5507674d117ff00982174051ac428f22a41271e0 SHA256 129f0eb5ee3d5d5008123372bf26a1762c7a963de6d96d1631a45c928ea85392
-MISC ChangeLog 2916 RMD160 acdbb4c2c2d3c6fa8e0e75a4b438c498809f4ce8 SHA1 292e8d90548476d7a7483695f8dcdb726642d776 SHA256 98feb7c024dd0f809465cc1b1016a93421a75501f77781a082becec0c8a467fe
+EBUILD polarssl-1.0.0.ebuild 1526 RMD160 78167c30a754c1085b379e8fbe611cf639ee3ab3 SHA1 a88620fa69a459aaa04b465ff96a2dc5aff3be98 SHA256 08c0b41e67c81bf46fa6f606f69f8225d4bda6251b425b34975d3e02e4d74d71
+MISC ChangeLog 3146 RMD160 788e171f749c924eb55d1d7814c19238d5c65d71 SHA1 cf507c1713b6d44fd7563258c5bf4091a74aec0c SHA256 39864624428b517804ea85158271c5433074eb4ec269e24d6a22fbfbf61acbb5
 MISC metadata.xml 393 RMD160 fb81b081e51c093d95511acf67272bb16aee8339 SHA1 2f42c6e94945a004258ec502bc401467926e6675 SHA256 a86b7706f2a0ef916a4731ed2469bd289ad995de975cd07c42490c9718b542e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk6R5AcACgkQG7kqcTWJkGdf8QQAkoJ+ACgQqA/TfTBk2ll0N3sm
-vteRU8GqFQpFIACXyoWBYWQfOhtstmHcYckBgR5A6PVoGg+dwpMU3KpCbICXM9ce
-76XU+f6KBJzE7wL0VxXV3s9c0/EqYT6/dlmsK725r+rNkpcsTmQqLmzB3ktH8nj9
-n+CxxD2Af4FHiuzr2VA=
-=MHmR
+iJwEAQECAAYFAk7HwRgACgkQG7kqcTWJkGf9xgP+MbVDadHXwZFHaP+F9s7HEf/q
+oMMxXb43hD/sHPxNTq9hGyM7EHgx6vQsDLGlatMPMj0ZpuChKjmZ2tlPr5tF39C5
+6rUvG9duya90M9ok/Xu6SHClwquJWP8qFT47q3PDbBVMn4BgnSCXZSvVsYIqVGg0
+7QuEwFDwa2qgv0pI7yY=
+=k07m
 -----END PGP SIGNATURE-----

diff --git a/net-libs/polarssl/files/polarssl-0.12.0-makefile.patch b/net-libs/polarssl/files/polarssl-0.12.0-makefile.patch
deleted file mode 100644 (file)
index 807a27d..0000000
--- a/net-libs/polarssl/files/polarssl-0.12.0-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur polarssl-0.12.0.old/library/Makefile polarssl-0.12.0/library/Makefile
---- polarssl-0.12.0.old/library/Makefile       2009-03-28 18:53:03.000000000 +0100
-+++ polarssl-0.12.0/library/Makefile   2010-01-23 10:12:03.000000000 +0100
-@@ -1,8 +1,7 @@
- 
- # Also see "include/polarssl/config.h"
- 
--CFLAGS        = -I../include -D_FILE_OFFSET_BITS=64 -Wall -Wdeclaration-after-statement
--OFLAGS        = -O
-+CFLAGS        += -I../include -D_FILE_OFFSET_BITS=64 -Wall -Wdeclaration-after-statement
- 
- # MicroBlaze specific options:
- # CFLAGS += -mno-xl-soft-mul -mxl-barrel-shift

diff --git a/net-libs/polarssl/files/polarssl-1.0.0-makefile.patch b/net-libs/polarssl/files/polarssl-1.0.0-makefile.patch
new file mode 100644 (file)
index 0000000..691fe36
--- /dev/null
+++ b/net-libs/polarssl/files/polarssl-1.0.0-makefile.patch
@@ -0,0 +1,57 @@
+--- old/library/Makefile       2011-11-16 17:41:41.000000000 -0500
++++ old/library/Makefile       2011-11-16 18:00:12.000000000 -0500
+@@ -2,7 +2,7 @@ 
+ # Also see "include/polarssl/config.h"
+ 
+ CFLAGS        += -I../include -D_FILE_OFFSET_BITS=64 -Wall -W -Wdeclaration-after-statement
+-OFLAGS        = -O
++# OFLAGS      = -O
+ 
+ # MicroBlaze specific options:
+ # CFLAGS += -mno-xl-soft-mul -mxl-barrel-shift
+@@ -32,7 +32,7 @@ 
+               sha4.o          ssl_cli.o       ssl_srv.o       \
+               ssl_tls.o       timing.o        version.o       \
+               x509parse.o     xtea.o
+-      
++
+ 
+ .SILENT:
+ 
+--- old/Makefile       2011-11-16 17:41:41.000000000 -0500
++++ old/Makefile       2011-11-16 18:01:56.000000000 -0500
+@@ -12,10 +12,10 @@ 
+ install:
+       mkdir -p $(DESTDIR)/include/polarssl
+       cp -r include/polarssl $(DESTDIR)/include
+-      
++
+       mkdir -p $(DESTDIR)/lib
+       cp library/libpolarssl.* $(DESTDIR)/lib
+-      
++
+       mkdir -p $(DESTDIR)/bin
+       for p in programs/*/* ; do              \
+           if [ -x $$p ] && [ ! -d $$p ] ;     \
+--- old/programs/Makefile      2011-11-16 17:41:41.000000000 -0500
++++ old/programs/Makefile      2011-11-16 18:05:31.000000000 -0500
+@@ -4,7 +4,7 @@ 
+ # To compile with PKCS11: add "-lpkcs11-helper" to LDFLAGS
+ 
+ CFLAGS        += -I../include -D_FILE_OFFSET_BITS=64 -Wall -W -Wdeclaration-after-statement
+-OFLAGS        = -O
++# OFLAGS      = -O
+ LDFLAGS       += -L../library -lpolarssl $(SYS_LDFLAGS)
+ 
+ APPS =        aes/aescrypt2   aes/crypt_and_hash      \
+--- old/tests/Makefile 2011-11-16 17:41:41.000000000 -0500
++++ old/tests/Makefile 2011-11-16 17:59:27.000000000 -0500
+@@ -6,7 +6,7 @@ 
+ CFLAGS        += -I../include -D_FILE_OFFSET_BITS=64 -Wall -W -Wdeclaration-after-statement \
+                       -Wno-unused-function -Wno-unused-value
+ 
+-OFLAGS        = -O
++# OFLAGS      = -O
+ LDFLAGS       += -L../library -lpolarssl $(SYS_LDFLAGS)
+ 
+ APPS =        test_suite_aes                  test_suite_arc4                 \

diff --git a/net-libs/polarssl/polarssl-1.0.0.ebuild b/net-libs/polarssl/polarssl-1.0.0.ebuild
new file mode 100644 (file)
index 0000000..f4914cc
--- /dev/null
+++ b/net-libs/polarssl/polarssl-1.0.0.ebuild
@@ -0,0 +1,63 @@
+# 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-1.0.0.ebuild,v 1.1 2011/11/19 14:45:31 tommy Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="http://polarssl.org/"
+SRC_URI="http://polarssl.org/code/download/${P}-gpl.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="examples sse2"
+
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-makefile.patch
+       cd library
+       if use sse2 ; then
+               sed -i '15iCFLAGS += -DHAVE_SSE2 -fPIC' Makefile
+       else
+               sed -i '15iCFLAGS += -fPIC' Makefile
+       fi
+}
+
+src_compile() {
+       emake -C library libpolarssl.so || die "emake failed"
+
+       if use examples ; then
+               emake -C programs all || die "emake failed"
+       fi
+}
+
+src_test() {
+       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() {
+       insinto /usr/include/polarssl
+       doins include/polarssl/*.h || die
+       dolib.so library/libpolarssl.so || die
+       dolib.a library/libpolarssl.a || die
+
+       if use examples ; then
+               for p in programs/*/* ; do
+                       if [[ -x "${p}" && ! -d "${p}" ]] ; then
+                               f=polarssl_`basename "${p}"`
+                               newbin "${p}" "${f}" || die
+                       fi
+               done
+               for e in aes hash pkey ssl test ; do
+                       docinto "${e}"
+                       dodoc programs/"${e}"/*.c || die
+                       dodoc programs/"${e}"/*.txt || die
+               done
+       fi
+}