app-crypt/openssl-af-alg: Refresh patchset to get CC etc from env

Package-Manager: portage-2.1.12.4

7 files changed, 58 insertions, 81 deletions

diff --git a/app-crypt/openssl-af-alg/ChangeLog b/app-crypt/openssl-af-alg/ChangeLog
index 7c7dc934..e98e0818 100644
--- a/app-crypt/openssl-af-alg/ChangeLog
+++ b/app-crypt/openssl-af-alg/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Jun 2013; Bertrand Jacquin <beber@meleeweb.net>
+  files/0001-Add-a-Makefile-to-build-easily-OpenSSL-engine-AF_ALG.patch,
+  files/0002-Add-a-.gitignore-to-ignore-builded-files.patch,
+  files/0003-Fix-warnings-on-Wunused-parameter.patch,
+  files/0004-Strip-whitespaces.patch, openssl-af-alg-9999.ebuild:
+  app-crypt/openssl-af-alg: Refresh patchset to get CC etc from env
+
   10 Jun 2013; Bertrand Jacquin <beber@meleeweb.net> metadata.xml:
   Fix manifest
 
diff --git a/app-crypt/openssl-af-alg/Manifest b/app-crypt/openssl-af-alg/Manifest
index deaae5b7..41ee4412 100644
--- a/app-crypt/openssl-af-alg/Manifest
+++ b/app-crypt/openssl-af-alg/Manifest
@@ -1,8 +1,8 @@
 AUX 0000-cover-letter.patch 765 SHA256 a067362841c7a0072eec21c0bf3c1ee8ff820f807fc1d55f76a5580763294f67 WHIRLPOOL 4863cd3558a40bcec7bf0d2f70b1e98a19087e536bb7640ecb83d0bd0b6ecaafe3561f36804faf987eb2626f551d4a84628029bd446507752d090205fdc5ddd2
-AUX 0001-Add-a-Makefile-to-build-easily-OpenSSL-engine-AF_ALG.patch 3491 SHA256 b114f2e3b198e800a3bbe962d44db41b8f4104b063448d7e8124f1eaf8f067bc WHIRLPOOL b8aff75bfb626e3b8cce605102c6e0d3acb58c73b0d88cc7950f8aa2a4bdf07cceb852e9d280e2c89cd7388f3333e0bd442437a0493449bdc87fe134c86410b4
-AUX 0002-Add-a-.gitignore-to-ignore-builded-files.patch 785 SHA256 0f3135398d75a9969c787dc9b6e1f7c13a4f729a5ca2ef23b0ca2774fa836e65 WHIRLPOOL f0c827fae1758dfe6f9e9fe9feaebc4d28d6be840a85d819a3364a139a914ca984373187ac98aa57b6378d2f8bb3b5c6b4c45f30c035093d51d0f78e09ebb798
-AUX 0003-Fix-warnings-on-Wunused-parameter.patch 3068 SHA256 385d3666594bc708155d904f1831542de76c1074e195b8b8b8ceb1d92cc573cd WHIRLPOOL a7db891ab5350835becde351fd5d8c1238de7fbc3f57201bb9f996ddfb5c6d76e8964cec50ab8cab75512831ba3cdd04d2d314d35c66278cfbf6b9534f2d2dc3
-AUX 0004-Strip-whitespaces.patch 2302 SHA256 b12f73834b1c3f3d4b8c1adc414d17bd1f709c3ec15949662e345a15a39bc146 WHIRLPOOL d518b927464b36d42d872b92493853b48ec1915867dc0b661d947c4f8e49e6fdc2d55216e42fd3917e43fb427cec2c1610ca2046becb140e8317745f10c6d930
-EBUILD openssl-af-alg-9999.ebuild 925 SHA256 aa23658dcfa3f5381460288fa82faf914ea109b4ffe74cfc0b6c622cbd61bebf WHIRLPOOL 22db999a77c15e3896ca0027a65fc75384763b5b8332671586848adc1e5e6c27cf0d30bd119a57e8ed0ace90a2e278cca29720a6304116f1912530414120a1b9
-MISC ChangeLog 926 SHA256 7a11029c3ffc220c26936aaf01cba47184a51f232c0a09e6fc2af17722463fcf WHIRLPOOL fd132aec4656e0bee521c35b6e2937bfec2b946e59610dc89496e3d6bc907a78adaabf4b0dae261e78daf8e4ae033af2bc70f92901c6047841ebc9f07e85212d
+AUX 0001-Add-a-Makefile-to-build-easily-OpenSSL-engine-AF_ALG.patch 3117 SHA256 875f46c31eab2d268b742c1dc28728dc0f5a2013fa2d2ce492706f73f0614991 WHIRLPOOL e945b8bcd74d05cceacf3fa82fd1a831c24e87520f719b4a31baafc8190039728ad52e711d0fd27b8c6b989db49f705603fbe2f16b38422514fcf028e8c4e377
+AUX 0002-Add-a-.gitignore-to-ignore-builded-files.patch 489 SHA256 431de08a3d3f5227f1e8337c60f3d808bf258c521ab701fc95c38ed22b6d8c5f WHIRLPOOL 64bdc0eee40be075e8efc96301552854a25d6a6f40183e1f10b6e5e035a690cb2c13325b4d3235a70ff11760a9ecae7856000df541c31fed51ce0e1441e3f59d
+AUX 0003-Fix-warnings-on-Wunused-parameter.patch 2814 SHA256 da6f91059f3a4a814fde57439c03e022136e63b89fdf319cdb71248f27af0b8f WHIRLPOOL 77eaa85f817935ccb207bc083921d6d1c4a4807101ca11ff50d379601a0bc26bae99357e48e08c58261ffa8df30f2784c1b7066b20a16a5cdff8e7c1b02e831b
+AUX 0004-Strip-whitespaces.patch 2048 SHA256 9b33ebd40a6418b797e3fbcd92cd11f2570503bfe3c64b1c77b968e9bf802a8d WHIRLPOOL b20e8219fff231bc8720cc4729e6a666c2ef6caabe7d151cf07e42e0471035cf7c7d75940f129ca3b5992459f2955f3802e60c80059445ba5e4afc11cac1789d
+EBUILD openssl-af-alg-9999.ebuild 830 SHA256 858724109e4539161a91af54ed3c567f7ebda515f713e94016f0f7ec4ca0f555 WHIRLPOOL 5d279ccef90b5c674df501b220a904e8f2ba0448780a382f17d4bfd79192f382732a9a98c23b69a92fdfb9f1a7e34552aae7de8d1bf42c3993cc14d472271179
+MISC ChangeLog 1302 SHA256 d2c589076dcdc681e55717dc30703359b78541e0194d4c49dcec5e6e26212545 WHIRLPOOL c9726288d882aef55e0b34b66127f0b309efb2b80831d305971e9b4d42a6a37fe9c504e4a32d734926804e38a58d0743638e4b934572e9c0ef147905ec3bbe07
 MISC metadata.xml 254 SHA256 c56bc3d6780712c960298c70bb86867aeb6661e97a317cc624516b0e16b72fcc WHIRLPOOL 2ebbfaa14ef0c1847284fe64a79f052cd7e73b25a724fba728c084aaaf2dd0692e068eedcf42ccef7e205077f00c35780ded7ec69118dc01ddb988b4802e46ae
diff --git a/app-crypt/openssl-af-alg/files/0001-Add-a-Makefile-to-build-easily-OpenSSL-engine-AF_ALG.patch b/app-crypt/openssl-af-alg/files/0001-Add-a-Makefile-to-build-easily-OpenSSL-engine-AF_ALG.patch
index 425561bf..3b23db7e 100644
--- a/app-crypt/openssl-af-alg/files/0001-Add-a-Makefile-to-build-easily-OpenSSL-engine-AF_ALG.patch
+++ b/app-crypt/openssl-af-alg/files/0001-Add-a-Makefile-to-build-easily-OpenSSL-engine-AF_ALG.patch
@@ -1,12 +1,7 @@
-From cfc3cbae5c1c7b084925759add091e997a8e49f7 Mon Sep 17 00:00:00 2001
-Message-Id: <cfc3cbae5c1c7b084925759add091e997a8e49f7.1359665471.git.beber@meleeweb.net>
-In-Reply-To: <cover.1359665471.git.beber@meleeweb.net>
-References: <cover.1359665471.git.beber@meleeweb.net>
+From bcab3687be2cac90ac94b02d2d6a5aa4465b9559 Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <beber@meleeweb.net>
 Date: Thu, 31 Jan 2013 18:27:17 +0100
 Subject: [PATCH 1/4] Add a Makefile to build easily OpenSSL engine AF_ALG.
-To: common@carnivore.it
-Cc: nepenthesdev@gmail.com
 
 Build the project (one of) :
  $ make
@@ -39,23 +34,22 @@ the git description.
 
 Signed-off-by: Bertrand Jacquin <beber@meleeweb.net>
 ---
- Makefile | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 102 insertions(+)
- create mode 100644 Makefile
+ Makefile | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 99 insertions(+)
 
-diff --git a/Makefile b/Makefile
+diff --git Makefile Makefile
 new file mode 100644
-index 0000000..8753910
+index 0000000..1b03e30
 --- /dev/null
 +++ Makefile
-@@ -0,0 +1,102 @@
+@@ -0,0 +1,99 @@
 +#!/usr/bin/make -f <
 +#
 +# (c) 2013 - Bertrand Jacquin <beber@meleeweb.net>
 +#
 +
 +NAME	= libaf_alg
-+VERSION	= $(shell sh -c 'git describe --tags --dirty=-dev 2> /dev/null || echo 0')
++VERSION	= $(shell git describe --tags --dirty=-dev 2> /dev/null)
 +
 +SRC	= \
 +	e_af_alg.c
@@ -63,35 +57,33 @@ index 0000000..8753910
 +DOC_FILES	= \
 +	README
 +
-+CFLAGS	= \
-+	-O3 \
++CFLAGS	?= \
 +	-W -Wall
 +
 +SPEC_CFLAGS	= \
 +	-fPIC
 +
-+LDFLAGS	=
++LDFLAGS	?=
 +
 +SPEC_LDFLAGS	= \
 +	-lcrypto
 +
-+CC	= cc
-+LD	= $(CC)
++CC	?= cc
 +
-+STRIP	= strip
-+STRIP_FLAGS	= --strip-unneeded -R .comment -R .GCC.command.line -R .note.gnu.build-id
++STRIP	?= strip
++STRIP_FLAGS	?= --strip-unneeded -R .comment -R .GCC.command.line -R .note.gnu.build-id
 +
-+INSTALL	= install
++INSTALL	?= install
 +
 +TAR	= tar
 +XZ	= xz
 +
-+RM	= rm -f
++RM	?= rm -f
 +
-+DESTDIR	=
-+PREFIX	= /usr/local
-+LIBDIR	= $(PREFIX)/lib/engines
-+DOCDIR	= $(PREFIX)/share/doc/$(NAME)
++DESTDIR	?=
++PREFIX	?= /usr/local
++LIBDIR	?= $(PREFIX)/lib/engines
++DOCDIR	?= $(PREFIX)/share/doc/$(NAME)
 +
 +ifeq ($(V),)
 + Q	= @
@@ -102,7 +94,6 @@ index 0000000..8753910
 +all:	shared
 +
 +shared:	$(NAME).so
-+strip:	$(NAME).so.strip
 +dist:	$(NAME)-$(VERSION).txz
 +
 +%.o:    %.c
@@ -110,12 +101,12 @@ index 0000000..8753910
 +	$(Q)$(CC) -c $(SPEC_CFLAGS) $(CFLAGS) -o $@ $<
 +
 +$(NAME).so:	$(SRC:c=o)
-+	$(call qcmd,LD,$@)
-+	$(Q)$(LD) -shared -o $@ $^ $(SPEC_LDFLAGS) $(LDFLAGS)
++	$(call qcmd,CC,$@)
++	$(Q)$(CC) -shared -o $@ $^ $(SPEC_LDFLAGS) $(LDFLAGS)
 +
-+$(NAME).so.strip:       $(NAME).so
++strip:	$(NAME).so
 +	$(call qcmd,STRIP,$@)
-+	$(Q)$(STRIP) $(STRIP_FLAGS) -o $@ $<
++	$(Q)$(STRIP) $(STRIP_FLAGS) $<
 +
 +install:	install-lib
 +install-lib:	$(DESTDIR)$(LIBDIR)/$(NAME).so
@@ -144,7 +135,7 @@ index 0000000..8753910
 +	$(call qcmd,RM,$(SRC:c=o))
 +	$(Q)$(RM) $(SRC:c=o)
 +	$(call qcmd,RM,$(NAME).so)
-+	$(Q)$(RM) $(NAME).so $(NAME).so.strip
++	$(Q)$(RM) $(NAME).so
 +
 +dist-clean: clean
 +	$(call qcmd,RM,$(NAME)-$(VERSION).tar)
@@ -152,5 +143,5 @@ index 0000000..8753910
 +	$(call qcmd,RM,$(NAME)-$(VERSION).txz)
 +	$(Q)$(RM) $(NAME)-$(VERSION).txz
 -- 
-1.8.0
+1.8.1.5
 
diff --git a/app-crypt/openssl-af-alg/files/0002-Add-a-.gitignore-to-ignore-builded-files.patch b/app-crypt/openssl-af-alg/files/0002-Add-a-.gitignore-to-ignore-builded-files.patch
index a94924f3..7ea7d8f1 100644
--- a/app-crypt/openssl-af-alg/files/0002-Add-a-.gitignore-to-ignore-builded-files.patch
+++ b/app-crypt/openssl-af-alg/files/0002-Add-a-.gitignore-to-ignore-builded-files.patch
@@ -1,30 +1,24 @@
-From d01632cb785bbc9524cac3ad96f8c9148c333919 Mon Sep 17 00:00:00 2001
-Message-Id: <d01632cb785bbc9524cac3ad96f8c9148c333919.1359665471.git.beber@meleeweb.net>
-In-Reply-To: <cover.1359665471.git.beber@meleeweb.net>
-References: <cover.1359665471.git.beber@meleeweb.net>
+From 5c07c01760b09f4edaed576fa75f4bcb859c969d Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <beber@meleeweb.net>
 Date: Thu, 31 Jan 2013 18:33:01 +0100
 Subject: [PATCH 2/4] Add a .gitignore to ignore builded files
-To: common@carnivore.it
-Cc: nepenthesdev@gmail.com
+
 
 Signed-off-by: Bertrand Jacquin <beber@meleeweb.net>
 ---
- .gitignore | 5 +++++
- 1 file changed, 5 insertions(+)
- create mode 100644 .gitignore
+ .gitignore | 4 ++++
+ 1 file changed, 4 insertions(+)
 
-diff --git a/.gitignore b/.gitignore
+diff --git .gitignore .gitignore
 new file mode 100644
-index 0000000..b7143fc
+index 0000000..f4b275f
 --- /dev/null
-+++ b/.gitignore
-@@ -0,0 +1,5 @@
++++ .gitignore
+@@ -0,0 +1,4 @@
 +*.o
 +*.so
-+*.so.strip
 +*.tar
 +*.txz
 -- 
-1.8.0
+1.8.1.5
 
diff --git a/app-crypt/openssl-af-alg/files/0003-Fix-warnings-on-Wunused-parameter.patch b/app-crypt/openssl-af-alg/files/0003-Fix-warnings-on-Wunused-parameter.patch
index b8898075..f45aac22 100644
--- a/app-crypt/openssl-af-alg/files/0003-Fix-warnings-on-Wunused-parameter.patch
+++ b/app-crypt/openssl-af-alg/files/0003-Fix-warnings-on-Wunused-parameter.patch
@@ -1,22 +1,18 @@
-From c0d836343b3ef303e6048df45845dfebc4cdc854 Mon Sep 17 00:00:00 2001
-Message-Id: <c0d836343b3ef303e6048df45845dfebc4cdc854.1359665471.git.beber@meleeweb.net>
-In-Reply-To: <cover.1359665471.git.beber@meleeweb.net>
-References: <cover.1359665471.git.beber@meleeweb.net>
+From 9f348b6fa80b154099a94a7efbfc58014a04033e Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <beber@meleeweb.net>
 Date: Thu, 31 Jan 2013 18:37:03 +0100
 Subject: [PATCH 3/4] Fix warnings on -Wunused-parameter
-To: common@carnivore.it
-Cc: nepenthesdev@gmail.com
+
 
 Signed-off-by: Bertrand Jacquin <beber@meleeweb.net>
 ---
  e_af_alg.c | 22 ++++++++++++++++------
  1 file changed, 16 insertions(+), 6 deletions(-)
 
-diff --git a/e_af_alg.c b/e_af_alg.c
+diff --git e_af_alg.c e_af_alg.c
 index e253e07..8864523 100644
---- a/e_af_alg.c
-+++ b/e_af_alg.c
+--- e_af_alg.c
++++ e_af_alg.c
 @@ -96,6 +96,16 @@ static int af_alg_digests(ENGINE *e, const EVP_MD **digest, const int **nids, in
  
  #define EVP_CIPHER_block_size_CBC	AES_BLOCK_SIZE
@@ -89,5 +85,5 @@ index e253e07..8864523 100644
  	if( !digest )
  	{
 -- 
-1.8.0
+1.8.1.5
 
diff --git a/app-crypt/openssl-af-alg/files/0004-Strip-whitespaces.patch b/app-crypt/openssl-af-alg/files/0004-Strip-whitespaces.patch
index c2a3bee5..5f5a71d6 100644
--- a/app-crypt/openssl-af-alg/files/0004-Strip-whitespaces.patch
+++ b/app-crypt/openssl-af-alg/files/0004-Strip-whitespaces.patch
@@ -1,22 +1,18 @@
-From e8c6a9066666f174f3f66894464350bb1bc1518e Mon Sep 17 00:00:00 2001
-Message-Id: <e8c6a9066666f174f3f66894464350bb1bc1518e.1359665471.git.beber@meleeweb.net>
-In-Reply-To: <cover.1359665471.git.beber@meleeweb.net>
-References: <cover.1359665471.git.beber@meleeweb.net>
+From fda2b0dd7bc65e5ec7556fbf59a8d447de8ef7aa Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <beber@meleeweb.net>
 Date: Thu, 31 Jan 2013 18:38:55 +0100
 Subject: [PATCH 4/4] Strip whitespaces
-To: common@carnivore.it
-Cc: nepenthesdev@gmail.com
+
 
 Signed-off-by: Bertrand Jacquin <beber@meleeweb.net>
 ---
  e_af_alg.c | 10 ++++------
  1 file changed, 4 insertions(+), 6 deletions(-)
 
-diff --git a/e_af_alg.c b/e_af_alg.c
+diff --git e_af_alg.c e_af_alg.c
 index 8864523..03a0dca 100644
---- a/e_af_alg.c
-+++ b/e_af_alg.c
+--- e_af_alg.c
++++ e_af_alg.c
 @@ -9,7 +9,7 @@
   * are met:
   *
@@ -67,5 +63,5 @@ index 8864523..03a0dca 100644
  }
 -
 -- 
-1.8.0
+1.8.1.5
 
diff --git a/app-crypt/openssl-af-alg/openssl-af-alg-9999.ebuild b/app-crypt/openssl-af-alg/openssl-af-alg-9999.ebuild
index 96108887..f7a0c3cf 100644
--- a/app-crypt/openssl-af-alg/openssl-af-alg-9999.ebuild
+++ b/app-crypt/openssl-af-alg/openssl-af-alg-9999.ebuild
@@ -26,13 +26,6 @@ src_prepare() {
 	epatch "${FILESDIR}/0004-Strip-whitespaces.patch"
 }
 
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
 src_install() {
 	emake install DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)/engines"