ecc bump

Package-Manager: portage-2.1.4_rc14

5 files changed, 27 insertions, 146 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index e377b2a50760..046b3e2b4e58 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.312 2008/01/10 14:36:43 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.313 2008/01/10 16:34:51 alonbl Exp $
+
+*gnupg-1.4.8-r1 (10 Jan 2008)
+
+  10 Jan 2008; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/gnupg-1.4.8-ecc-glue.patch, -gnupg-1.4.8.ebuild,
+  +gnupg-1.4.8-r1.ebuild:
+  ecc bump
 
   10 Jan 2008; Alon Bar-Lev <alonbl@gentoo.org>
   -files/gnupg-1.9.20-fbsd.patch, -files/gnupg-1.9.20-fbsd-gcc41.patch,
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 6c9c1c0daf0f..04727ccc2551 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -10,17 +10,13 @@ AUX gnupg-1.4.6-badruman.patch 534 RMD160 7789da4ceafcc9f1bec778b9b7986359f15131
 MD5 0e2449e22416d4ef22158a2baa72a494 files/gnupg-1.4.6-badruman.patch 534
 RMD160 7789da4ceafcc9f1bec778b9b7986359f1513178 files/gnupg-1.4.6-badruman.patch 534
 SHA256 3fef6d7306823db7a8912f4454b05aef8cff035e36065097d9406f57098018e5 files/gnupg-1.4.6-badruman.patch 534
-AUX gnupg-1.4.8-ecc-glue.patch 6275 RMD160 fbef6cb4689c027db3f21deccde86e1ee9633672 SHA1 e7d7cb1de89d5cb522980fcf37c6ad06abfa417f SHA256 9265d7d25a56ac8f213d4c6d2ef0d1c79b3722c55059b9566de2261bbd28417b
-MD5 a76a21bcb5dec88153c9555b429b3abe files/gnupg-1.4.8-ecc-glue.patch 6275
-RMD160 fbef6cb4689c027db3f21deccde86e1ee9633672 files/gnupg-1.4.8-ecc-glue.patch 6275
-SHA256 9265d7d25a56ac8f213d4c6d2ef0d1c79b3722c55059b9566de2261bbd28417b files/gnupg-1.4.8-ecc-glue.patch 6275
 AUX gnupg-2.0.4-idea.patch 906 RMD160 df2f628ee03880ff5b0916185cffe0b28316d08b SHA1 0f56a3d656d8ec3227c1b597bee010b8dbe1d7cd SHA256 89e5af25bf7ae5b1147acb3da41520e2dcad975cda93ab625107626c85651976
 MD5 55421c980c3f87eb781b2a0d57e1b5b9 files/gnupg-2.0.4-idea.patch 906
 RMD160 df2f628ee03880ff5b0916185cffe0b28316d08b files/gnupg-2.0.4-idea.patch 906
 SHA256 89e5af25bf7ae5b1147acb3da41520e2dcad975cda93ab625107626c85651976 files/gnupg-2.0.4-idea.patch 906
 DIST gnupg-1.4.7-ecc0.1.6.diff.bz2 17083 RMD160 df89fc93d5a9836bb12311d66f0ebdab31799fd5 SHA1 ab9e902539a1be746d3c25d969a4ae044a74f44c SHA256 568c1eb297942157250dd11c9a8171566535c49361ade00ab1c95191821ae1fe
-DIST gnupg-1.4.7-ecc0.1.8.diff.bz2 17772 RMD160 83bbdb3d226716acaf749659374579ca023ca0cd SHA1 7f272e45d9b10dd52dc01543dc9165ff21e86893 SHA256 71e67ac4196a8911b4cec4e052c418ce4bec23c70111a879d5e4303fcd19af29
 DIST gnupg-1.4.7.tar.bz2 3200642 RMD160 630344c99834cf9adcf806d55e6f609a1e50bd8b SHA1 22149105845c79068771837c8deb7d5ba0854927 SHA256 69d18b7d193f62ca27ed4febcb4c9044aa0c95305d3258fe902e2fae5fc6468d
+DIST gnupg-1.4.8-ecc0.2.0.diff.bz2 17878 RMD160 532e43cfea00187c72d7d2784decee31b105a5a5 SHA1 822602c76c69160463d7ae3378e8da1b42e6efb2 SHA256 e03a180a95bb3c4c72f4ca97d1038c390b59da1f4d12d97f91ef7932dd01a5c1
 DIST gnupg-1.4.8.tar.bz2 3320100 RMD160 75228c02ea1999494232cb2eb2107951d1602c4d SHA1 4b63267358e5c70f05b48e27d6877bad2636cabd SHA256 119d2574deafe8c2d4444e53051ebad215d375f94f29c520ff891275f14e006c
 DIST gnupg-2.0.7.tar.bz2 3609953 RMD160 70bd8dbf52fe2ccc9d89791c374a5507f6a61ee8 SHA1 f7d9ae7695bd9b849475b482bb7b027ec6fadbae SHA256 3117ce4a477747138431fb2ddf2572cce9e4824bae359a6007e60e6d293c376b
 DIST gnupg-2.0.8.tar.bz2 3654523 RMD160 bfd8cfb48ff74834c80d09d040921e005af9550c SHA1 baeb7962f9d3d4628ada78036d1f5d4480aaa2d9 SHA256 16f310afe4740a26475c7273f585861a4bdefecbde27c214cc30c0db45d26913
@@ -29,10 +25,10 @@ EBUILD gnupg-1.4.7-r1.ebuild 6112 RMD160 33bb947e21195a8e9656fb7ea56b83baaeb5f52
 MD5 6e48455ec8a4e7a5a1ae031d0961a29e gnupg-1.4.7-r1.ebuild 6112
 RMD160 33bb947e21195a8e9656fb7ea56b83baaeb5f52e gnupg-1.4.7-r1.ebuild 6112
 SHA256 14f8e95c76e183343dcfdfd2c75c65fcaa2084ed804fb81ef3e06f4ba6f82556 gnupg-1.4.7-r1.ebuild 6112
-EBUILD gnupg-1.4.8.ebuild 6000 RMD160 200af34479a6fb142d974c47b159a9cac117fc2b SHA1 9451027a7b5605e0d08ba9d0f7acc33214dbf52c SHA256 7e019f22f285df7add6d2673243da1850d9d4a702b0c4281e7501f315d66e947
-MD5 3e9aa715d90ebb63df4e7108021e3a2f gnupg-1.4.8.ebuild 6000
-RMD160 200af34479a6fb142d974c47b159a9cac117fc2b gnupg-1.4.8.ebuild 6000
-SHA256 7e019f22f285df7add6d2673243da1850d9d4a702b0c4281e7501f315d66e947 gnupg-1.4.8.ebuild 6000
+EBUILD gnupg-1.4.8-r1.ebuild 5927 RMD160 69d907d32bcca95f08966e9fe94cc6c73ce4d173 SHA1 ef9a802bcb1e1d6f98029e03585a247321d2a814 SHA256 ad6ad0733e020bb4beb3a7e4bc19b336e2a52719f04b39bc2605659caff908f8
+MD5 cf71c0f40feb78dc61a703bbb2880930 gnupg-1.4.8-r1.ebuild 5927
+RMD160 69d907d32bcca95f08966e9fe94cc6c73ce4d173 gnupg-1.4.8-r1.ebuild 5927
+SHA256 ad6ad0733e020bb4beb3a7e4bc19b336e2a52719f04b39bc2605659caff908f8 gnupg-1.4.8-r1.ebuild 5927
 EBUILD gnupg-2.0.7.ebuild 2125 RMD160 446354e43bb1ce001ee3cd87545cff72af0b2685 SHA1 a18f6efd76e3f80ba4475954dae6e7e18f01567d SHA256 06ddca99f39634fe966d9288023296f51d08e3ae0ea1cb2488b7be0d4a58153f
 MD5 92d7ff90131cc1bfce2fb5bcfe037220 gnupg-2.0.7.ebuild 2125
 RMD160 446354e43bb1ce001ee3cd87545cff72af0b2685 gnupg-2.0.7.ebuild 2125
@@ -41,10 +37,10 @@ EBUILD gnupg-2.0.8.ebuild 2136 RMD160 22533292d4dda4f5482e74c659fb64a9ff8728ad S
 MD5 bc39ffac44866e029ae5a8d1b6ea095a gnupg-2.0.8.ebuild 2136
 RMD160 22533292d4dda4f5482e74c659fb64a9ff8728ad gnupg-2.0.8.ebuild 2136
 SHA256 089701bbe84aa0b96a0b693ff9948daed5973b8c6319d465366e032fe209db85 gnupg-2.0.8.ebuild 2136
-MISC ChangeLog 48210 RMD160 ecb707a0511136a2868ce5d337d943e08ab08efe SHA1 a5163e4b79a7aae286443821e2485d9491da1ff3 SHA256 1e43dd2e133362573878825443cc8823ad91678521d9d2b72cb38134325d3dcc
-MD5 0328e2cd42636348f1f8055a38d18d7d ChangeLog 48210
-RMD160 ecb707a0511136a2868ce5d337d943e08ab08efe ChangeLog 48210
-SHA256 1e43dd2e133362573878825443cc8823ad91678521d9d2b72cb38134325d3dcc ChangeLog 48210
+MISC ChangeLog 48385 RMD160 c58e5d69e2e5da1dc6b0f3b44600f001107703f4 SHA1 521c74b94fb06186d09fd6f61d5e373f569ded6c SHA256 7aabf0cbf5a960cc5d297a85f631ad7d044a9cf37845904db97f0af0a4592387
+MD5 c88c6b039edc0c44f3b26ad41ff78248 ChangeLog 48385
+RMD160 c58e5d69e2e5da1dc6b0f3b44600f001107703f4 ChangeLog 48385
+SHA256 7aabf0cbf5a960cc5d297a85f631ad7d044a9cf37845904db97f0af0a4592387 ChangeLog 48385
 MISC metadata.xml 481 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 SHA1 13cb529b83ba9feaad91f1d033d6c33d1eafbd25 SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 metadata.xml 481
@@ -52,9 +48,9 @@ SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672 metadata
 MD5 86dd165d088b67a019b76b7da0cf4a48 files/digest-gnupg-1.4.7-r1 708
 RMD160 dada10775841b227a433d3c2c0f7a9556bca5772 files/digest-gnupg-1.4.7-r1 708
 SHA256 59ec1edd1c0bac754b898f777d4b32a2ff7272aea738413ac7b356335a199b63 files/digest-gnupg-1.4.7-r1 708
-MD5 ec5e75e74e07659edb197cb81d74ea3d files/digest-gnupg-1.4.8 708
-RMD160 8a07eb5d1ab62ac70a27c2dae553d9e4ae4562bc files/digest-gnupg-1.4.8 708
-SHA256 8c2b7a25d66b646b307b2fa0594066e707adc27e7a3f711775ee9af4200447af files/digest-gnupg-1.4.8 708
+MD5 3daae98d1fe892da9f00725425f5619e files/digest-gnupg-1.4.8-r1 708
+RMD160 7cf2614db5339a5cd9c48b323af7e3cd5d9ed715 files/digest-gnupg-1.4.8-r1 708
+SHA256 72e7f8aa0dae1cf941801ebc5b13f9a7c04eb5fe67bec7a460953c21e87079d5 files/digest-gnupg-1.4.8-r1 708
 MD5 b859fd902e340b13f7e5882ba9a7d2d7 files/digest-gnupg-2.0.7 241
 RMD160 580bbe23a2c13d185790a5b030e5f0fc399d3c0a files/digest-gnupg-2.0.7 241
 SHA256 f11361f64a678c762239f3f6c1dcd1a93ddbbff5cb0819251e87e3022cd9113f files/digest-gnupg-2.0.7 241
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.8 b/app-crypt/gnupg/files/digest-gnupg-1.4.8-r1
index 095177b611e0..2328a92ee2ac 100644
--- a/app-crypt/gnupg/files/digest-gnupg-1.4.8
+++ b/app-crypt/gnupg/files/digest-gnupg-1.4.8-r1
@@ -1,6 +1,6 @@
-MD5 6169eb1d9f562b9c7ced37bb7d1ca4f0 gnupg-1.4.7-ecc0.1.8.diff.bz2 17772
-RMD160 83bbdb3d226716acaf749659374579ca023ca0cd gnupg-1.4.7-ecc0.1.8.diff.bz2 17772
-SHA256 71e67ac4196a8911b4cec4e052c418ce4bec23c70111a879d5e4303fcd19af29 gnupg-1.4.7-ecc0.1.8.diff.bz2 17772
+MD5 11de32d6d85424770df52b9037232c4c gnupg-1.4.8-ecc0.2.0.diff.bz2 17878
+RMD160 532e43cfea00187c72d7d2784decee31b105a5a5 gnupg-1.4.8-ecc0.2.0.diff.bz2 17878
+SHA256 e03a180a95bb3c4c72f4ca97d1038c390b59da1f4d12d97f91ef7932dd01a5c1 gnupg-1.4.8-ecc0.2.0.diff.bz2 17878
 MD5 e5be39ea81bb07de006e7dd44439cb76 gnupg-1.4.8.tar.bz2 3320100
 RMD160 75228c02ea1999494232cb2eb2107951d1602c4d gnupg-1.4.8.tar.bz2 3320100
 SHA256 119d2574deafe8c2d4444e53051ebad215d375f94f29c520ff891275f14e006c gnupg-1.4.8.tar.bz2 3320100
diff --git a/app-crypt/gnupg/files/gnupg-1.4.8-ecc-glue.patch b/app-crypt/gnupg/files/gnupg-1.4.8-ecc-glue.patch
deleted file mode 100644
index 40385a48e1f9..000000000000
--- a/app-crypt/gnupg/files/gnupg-1.4.8-ecc-glue.patch
+++ /dev/null
@@ -1,121 +0,0 @@
---- gnupg-1.4.7-ecc0.1.8.diff	2007-12-20 21:24:04.000000000 +0200
-+++ gnupg-1.4.8-ecc0.1.8.diff	2007-12-20 21:23:30.000000000 +0200
-@@ -1914,48 +1914,48 @@ diff -Nru gnupg-1.4.7/cipher/Makefile.am
-  
-  if USE_RNDLINUX
-  libcipher_a_SOURCES+=rndlinux.c
--diff -Nru gnupg-1.4.7/cipher/Makefile.in gnupg-1.4.7-ecc/cipher/Makefile.in
----- gnupg-1.4.7/cipher/Makefile.in	2007-03-05 10:44:42.000000000 +0100
--+++ gnupg-1.4.7-ecc/cipher/Makefile.in	2007-11-08 22:24:55.000000000 +0100
--@@ -96,7 +96,7 @@
-- 	elgamal.c elgamal.h rsa.c rsa.h primegen.c random.h random.c \
-- 	rand-internal.h rmd.h dsa.h dsa.c smallprime.c algorithms.h \
-- 	md5.c rmd160.c sha1.c sha256.c rndlinux.c rndunix.c rndegd.c \
---	rndw32.c sha512.c
--+	rndw32.c sha512.c ecc.c
-+diff -urNp gnupg-1.4.8/cipher/Makefile.in gnupg-1.4.8.ecc/cipher/Makefile.in
-+--- gnupg-1.4.8/cipher/Makefile.in	2007-12-20 09:54:08.000000000 +0200
-++++ gnupg-1.4.8.ecc/cipher/Makefile.in	2007-12-20 21:16:08.000000000 +0200
-+@@ -93,7 +93,7 @@ am__libcipher_a_SOURCES_DIST = cipher.c 
-+ 	camellia.c camellia.h camellia-glue.c elgamal.c elgamal.h \
-+ 	rsa.c rsa.h primegen.c random.h random.c rand-internal.h rmd.h \
-+ 	dsa.h dsa.c smallprime.c algorithms.h md5.c rmd160.c sha1.c \
-+-	sha256.c rndlinux.c rndunix.c rndegd.c rndw32.c sha512.c
-++	sha256.c rndlinux.c rndunix.c rndegd.c rndw32.c sha512.c ecc.c
-  @USE_RNDLINUX_TRUE@am__objects_1 = rndlinux.$(OBJEXT)
-  @USE_RNDUNIX_TRUE@am__objects_2 = rndunix.$(OBJEXT)
-  @USE_RNDEGD_TRUE@am__objects_3 = rndegd.$(OBJEXT)
--@@ -107,7 +107,7 @@
-- 	blowfish.$(OBJEXT) cast5.$(OBJEXT) rijndael.$(OBJEXT) \
-- 	elgamal.$(OBJEXT) rsa.$(OBJEXT) primegen.$(OBJEXT) \
-- 	random.$(OBJEXT) dsa.$(OBJEXT) smallprime.$(OBJEXT) \
---	md5.$(OBJEXT) rmd160.$(OBJEXT) sha1.$(OBJEXT) sha256.$(OBJEXT) \
--+	md5.$(OBJEXT) rmd160.$(OBJEXT) sha1.$(OBJEXT) sha256.$(OBJEXT) ecc.$(OBJEXT) \
-+@@ -105,7 +105,7 @@ am_libcipher_a_OBJECTS = cipher.$(OBJEXT
-+ 	camellia.$(OBJEXT) camellia-glue.$(OBJEXT) elgamal.$(OBJEXT) \
-+ 	rsa.$(OBJEXT) primegen.$(OBJEXT) random.$(OBJEXT) \
-+ 	dsa.$(OBJEXT) smallprime.$(OBJEXT) md5.$(OBJEXT) \
-+-	rmd160.$(OBJEXT) sha1.$(OBJEXT) sha256.$(OBJEXT) \
-++	rmd160.$(OBJEXT) sha1.$(OBJEXT) sha256.$(OBJEXT) ecc.$(OBJEXT) \
-  	$(am__objects_1) $(am__objects_2) $(am__objects_3) \
-  	$(am__objects_4) $(am__objects_5)
-  libcipher_a_OBJECTS = $(am_libcipher_a_OBJECTS)
--@@ -325,7 +325,7 @@
-- 	twofish.c blowfish.c cast5.c rijndael.c elgamal.c elgamal.h \
-- 	rsa.c rsa.h primegen.c random.h random.c rand-internal.h rmd.h \
-- 	dsa.h dsa.c smallprime.c algorithms.h md5.c rmd160.c sha1.c \
---	sha256.c $(am__append_2) $(am__append_3) $(am__append_4) \
--+	sha256.c ecc.c $(am__append_2) $(am__append_3) $(am__append_4) \
-+@@ -302,7 +302,7 @@ libcipher_a_SOURCES = cipher.c pubkey.c 
-+ 	twofish.c blowfish.c cast5.c rijndael.c camellia.c camellia.h \
-+ 	camellia-glue.c elgamal.c elgamal.h rsa.c rsa.h primegen.c \
-+ 	random.h random.c rand-internal.h rmd.h dsa.h dsa.c \
-+-	smallprime.c algorithms.h md5.c rmd160.c sha1.c sha256.c \
-++	smallprime.c algorithms.h md5.c rmd160.c sha1.c sha256.c ecc.c \
-+ 	$(am__append_2) $(am__append_3) $(am__append_4) \
-  	$(am__append_5) $(am__append_6)
-  EXTRA_libcipher_a_SOURCES = idea-stub.c
-- libcipher_a_DEPENDENCIES = @IDEA_O@
--@@ -402,6 +402,7 @@
-+@@ -382,6 +382,7 @@ distclean-compile:
-  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha512.Po@am__quote@
-  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smallprime.Po@am__quote@
-  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/twofish.Po@am__quote@
- +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ecc.Po@am__quote@
-  
-  .c.o:
-- @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
--diff -Nru gnupg-1.4.7/cipher/pubkey.c gnupg-1.4.7-ecc/cipher/pubkey.c
----- gnupg-1.4.7/cipher/pubkey.c	2005-07-27 19:02:55.000000000 +0200
--+++ gnupg-1.4.7-ecc/cipher/pubkey.c	2007-11-08 22:24:55.000000000 +0100
--@@ -33,6 +33,9 @@
-+ @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+diff -urNp gnupg-1.4.8/cipher/pubkey.c gnupg-1.4.8.ecc/cipher/pubkey.c
-+--- gnupg-1.4.8/cipher/pubkey.c	2007-12-12 20:06:55.000000000 +0200
-++++ gnupg-1.4.8.ecc/cipher/pubkey.c	2007-12-20 21:13:31.000000000 +0200
-+@@ -31,6 +31,9 @@
-  #include "elgamal.h"
-  #include "dsa.h"
-  #include "rsa.h"
-@@ -2311,25 +2311,23 @@ diff -Nru gnupg-1.4.7/g10/keyid.c gnupg-
-        default: return '?';
-      }
-  }
--diff -Nru gnupg-1.4.7/g10/mainproc.c gnupg-1.4.7-ecc/g10/mainproc.c
----- gnupg-1.4.7/g10/mainproc.c	2007-03-05 10:08:41.000000000 +0100
--+++ gnupg-1.4.7-ecc/g10/mainproc.c	2007-11-08 22:24:55.000000000 +0100
--@@ -399,7 +399,10 @@
--     }
-+diff -urNp gnupg-1.4.8/g10/mainproc.c gnupg-1.4.8.ecc/g10/mainproc.c
-+--- gnupg-1.4.8/g10/mainproc.c	2007-12-12 19:44:49.000000000 +0200
-++++ gnupg-1.4.8.ecc/g10/mainproc.c	2007-12-20 21:17:33.000000000 +0200
-+@@ -404,6 +404,9 @@ proc_pubkey_enc( CTX c, PACKET *pkt )
-      else if( is_ELGAMAL(enc->pubkey_algo)
-- 	|| enc->pubkey_algo == PUBKEY_ALGO_DSA
---	|| is_RSA(enc->pubkey_algo)  ) {
--+	|| is_RSA(enc->pubkey_algo)
--+/*begin ECC mod*/
--+        || is_ECC(enc->pubkey_algo) ) {
--+/*end ECC mod*/
--       /* FIXME:  strore this all in a list and process it later */
-- 
-- 	if ( !c->dek && ((!enc->keyid[0] && !enc->keyid[1])
--diff -Nru gnupg-1.4.7/g10/misc.c gnupg-1.4.7-ecc/g10/misc.c
----- gnupg-1.4.7/g10/misc.c	2006-06-30 11:01:49.000000000 +0200
--+++ gnupg-1.4.7-ecc/g10/misc.c	2007-11-08 22:24:55.000000000 +0100
--@@ -421,6 +421,11 @@
-+              || enc->pubkey_algo == PUBKEY_ALGO_DSA
-+              || is_RSA(enc->pubkey_algo)  
-++/*begin ECC mod*/
-++             || is_ECC(enc->pubkey_algo)
-++/*end ECC mod*/
-+              || (RFC2440 && enc->pubkey_algo == PUBKEY_ALGO_ELGAMAL)) {
-+       /* Note that we also allow type 20 Elgamal keys for decryption.
-+          There are still a couple of those keys in active use as a
-+diff -urNp gnupg-1.4.8/g10/misc.c gnupg-1.4.8.ecc/g10/misc.c
-+--- gnupg-1.4.8/g10/misc.c	2007-12-12 19:35:18.000000000 +0200
-++++ gnupg-1.4.8.ecc/g10/misc.c	2007-12-20 21:13:31.000000000 +0200
-+@@ -433,6 +433,11 @@ openpgp_pk_algo_usage ( int algo )
-        case PUBKEY_ALGO_DSA:  
-            use = PUBKEY_USAGE_CERT | PUBKEY_USAGE_SIG | PUBKEY_USAGE_AUTH;
-            break;
diff --git a/app-crypt/gnupg/gnupg-1.4.8.ebuild b/app-crypt/gnupg/gnupg-1.4.8-r1.ebuild
index da3c31bef1eb..3115caadd783 100644
--- a/app-crypt/gnupg/gnupg-1.4.8.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.8-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.8.ebuild,v 1.1 2007/12/20 19:43:36 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.8-r1.ebuild,v 1.1 2008/01/10 16:34:51 alonbl Exp $
 
 inherit eutils flag-o-matic
 
-ECCVER="0.1.8"
-ECCVER_GNUPG="1.4.7"
+ECCVER="0.2.0"
+ECCVER_GNUPG="1.4.8"
 ECC_PATCH="${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff"
 MY_P=${P/_/}
 
@@ -67,7 +67,6 @@ src_unpack() {
 				"s/+ VERSION='${ECCVER_GNUPG}-ecc${ECCVER}'/+ VERSION='${PV}-ecc${ECCVER}'/" \
 				"${WORKDIR}/${ECC_PATCH}"
 
-			EPATCH_OPTS="-p0 -d ${WORKDIR}" epatch "${FILESDIR}/${P}-ecc-glue.patch"
 			epatch "${WORKDIR}/${ECC_PATCH}"
 		fi
 	fi