Cleanup
authorAlon Bar-Lev <alonbl@gentoo.org>
Thu, 8 Mar 2007 17:25:28 +0000 (17:25 +0000)
committerAlon Bar-Lev <alonbl@gentoo.org>
Thu, 8 Mar 2007 17:25:28 +0000 (17:25 +0000)
Package-Manager: portage-2.1.2.1-r1

14 files changed:
app-crypt/gnupg/ChangeLog
app-crypt/gnupg/Manifest
app-crypt/gnupg/files/digest-gnupg-2.0.0 [deleted file]
app-crypt/gnupg/files/digest-gnupg-2.0.1 [deleted file]
app-crypt/gnupg/files/digest-gnupg-2.0.1-r1 [deleted file]
app-crypt/gnupg/files/digest-gnupg-2.0.1-r2 [deleted file]
app-crypt/gnupg/files/digest-gnupg-2.0.1-r3 [deleted file]
app-crypt/gnupg/files/gnupg-2.0.1-agent.patch [deleted file]
app-crypt/gnupg/files/gnupg-2.0.1-bsd-make.patch [deleted file]
app-crypt/gnupg/gnupg-2.0.0.ebuild [deleted file]
app-crypt/gnupg/gnupg-2.0.1-r1.ebuild [deleted file]
app-crypt/gnupg/gnupg-2.0.1-r2.ebuild [deleted file]
app-crypt/gnupg/gnupg-2.0.1-r3.ebuild [deleted file]
app-crypt/gnupg/gnupg-2.0.1.ebuild [deleted file]

index b760199a1462cc8233a8bfdd4b7e2004d1e537ba..87d969667f58c6486a106426618c183fd26227d6 100644 (file)
@@ -1,6 +1,9 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.280 2007/03/08 17:17:17 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.281 2007/03/08 17:25:28 alonbl Exp $
+
+  08 Mar 2007; Alon Bar-Lev <alonbl@gentoo.org> Manifest:
+  Cleanup
 
 *gnupg-2.0.3 (08 Mar 2007)
 
index 5caa9aa9b9d9e7e067e8f0e100c57270fff8ad10..9bf8232b5d6a8bee57a92e171670bba902af81f4 100644 (file)
@@ -30,22 +30,12 @@ AUX gnupg-1.9.94-make.patch 526 RMD160 2baeb8cdde34e9cb5b9fde85dabde59cc2b07b7b
 MD5 2f2c134892f2a35adc9124b819cccb8a files/gnupg-1.9.94-make.patch 526
 RMD160 2baeb8cdde34e9cb5b9fde85dabde59cc2b07b7b files/gnupg-1.9.94-make.patch 526
 SHA256 43b68e5a4c77083a4c1a2a68b8b6d0e8ef895d8682e4aa4244a71732c286ab33 files/gnupg-1.9.94-make.patch 526
-AUX gnupg-2.0.1-agent.patch 650 RMD160 cb33eaabb9d60a04c63963e46f18cfd38d09de13 SHA1 91e20bbbaaf11f1befebe71e2cb49646d3fe7e84 SHA256 94c4c2793d0f696672dba87825faf94fa0203ba917569ac2725d657f176e1a1c
-MD5 76cbdae82b05274e55d27bd975086504 files/gnupg-2.0.1-agent.patch 650
-RMD160 cb33eaabb9d60a04c63963e46f18cfd38d09de13 files/gnupg-2.0.1-agent.patch 650
-SHA256 94c4c2793d0f696672dba87825faf94fa0203ba917569ac2725d657f176e1a1c files/gnupg-2.0.1-agent.patch 650
-AUX gnupg-2.0.1-bsd-make.patch 6960 RMD160 694eaf6b2b12eb6aa5e425ca48fd37064ce371f2 SHA1 a6ce2d94be3b305918143da06cc8cf4564c41f64 SHA256 cfac92c65ed1b8efa1927b8194eea62f7e45fadded559028a7072cc0685d29a3
-MD5 30c96069403e772fc6bd777d0622dd9f files/gnupg-2.0.1-bsd-make.patch 6960
-RMD160 694eaf6b2b12eb6aa5e425ca48fd37064ce371f2 files/gnupg-2.0.1-bsd-make.patch 6960
-SHA256 cfac92c65ed1b8efa1927b8194eea62f7e45fadded559028a7072cc0685d29a3 files/gnupg-2.0.1-bsd-make.patch 6960
 DIST gnupg-1.4.5-ecc0.1.6.diff.bz2 16926 RMD160 1f80d5137f47e48bda96dd59506c452a3833e4e4 SHA1 be330df0b9907a151cd2b97659b93e4fa21fe491 SHA256 3263d8bd2bea6807445f9592b705ae4fca6bb89e8483613a53d553947424c51a
 DIST gnupg-1.4.6-ecc0.1.6.diff.bz2 17005 RMD160 6a30606386ad9848362f696e5f42c0614d2e5731 SHA1 cc18a613adc3ab382bda93e9a9b474606fd171ad SHA256 cbe2e1a987f7ef2339eb1cd0380708718027fc81da242c7a7c83d32287a83d35
 DIST gnupg-1.4.6.tar.bz2 3149454 RMD160 c7e7409358aaaaf7f3bb202aa86f6121749b97e3 SHA1 9cbbef5c94f793867ff3ae4941816962311a0563 SHA256 fd5a72418e55669b88076c2a6f11c3a59bf92a2071008567e65ae12b7372008e
 DIST gnupg-1.9.21.tar.bz2 1901908 RMD160 f522125f30a29fd2bcacca5894958242946de430 SHA1 f7c9dea1049dfd3da6d66838005def26898d06e2 SHA256 7dfaa7867427dd44ac3277026dec3602626b657d95952b7a5bdeb9e567b5d34c
 DIST gnupg-1.9.22.tar.bz2 1908546 RMD160 43b3e8a17d5e116f5fa0c34bc3beaf68250ec3c3 SHA1 10b2a5c256598d9ed25c84d55ea111710b3f8906 SHA256 2e4472e00c14c881ee1f93deddbe91d3c520311839f30d336ca48a51939e45cf
 DIST gnupg-1.9.94.tar.bz2 3870728 RMD160 eee1af2d2c5fea01010979a81e426cac2d288192 SHA1 3dae940f596690a047620685ee3148ad4320e666 SHA256 0647fe9599a43019b4afbd0c63dc6f44546b8475890cc36012f353288693d487
-DIST gnupg-2.0.0.tar.bz2 3904270 RMD160 739e303f1380ec9cb5c3a248179001700efe6f2e SHA1 c335957368ea88bcb658922e7d3aae7e3ac6896d SHA256 aae6d4ca81787f05ee98ef6b0c27d54e209b06c62553b1ce10a1b4e84b18897f
-DIST gnupg-2.0.1.tar.bz2 3923924 RMD160 3b9252b9b8b1ff5c242a3e541adc0a9700e55df1 SHA1 ec84ffb1d2ac013dc0afb5bdf8b9df2c838673e9 SHA256 49949762a4e080379dcca23948442d50488f0d74e04bcba87fc49e19a899b01d
 DIST gnupg-2.0.2.tar.bz2 3969476 RMD160 6cc52da761927e17842842c00598c4974208affa SHA1 1a3165c5b601f3244b8885143d02bea4210495e3 SHA256 10da9a7adadedaa4a9bba8ed936e0421526eea3ea7b63081273d7aa740b3bef9
 DIST gnupg-2.0.3.tar.bz2 3965529 RMD160 bedd74d6c3a93cf6fbe719a2749ba658fa102cca SHA1 4680bcb96873191b331252ae40b35e39589c58ca SHA256 d6c45386458d04cd56ceedad998f5aaf67e46e18d408a8e3658160aaf7751a86
 DIST idea.c.gz 5216 RMD160 e35be5a031d10d52341ac5f029d28f811edd908d SHA1 82fded4ec31b97b3b2dd22741880b67cfee40f84 SHA256 309928da34941dff1d6f6687542ff3d58306d85be9e1a9906bc4f9f8e6011844
@@ -73,26 +63,6 @@ EBUILD gnupg-1.9.94.ebuild 2455 RMD160 4cde7c78456646351bf4d9e4b6277cbb44544f9e
 MD5 dcda6e33247b696c414898d69f7661fe gnupg-1.9.94.ebuild 2455
 RMD160 4cde7c78456646351bf4d9e4b6277cbb44544f9e gnupg-1.9.94.ebuild 2455
 SHA256 e797b8ac42e846e2f78c4dc6e004bb71cd48cdbbae78c0c9d2ac5bad312548df gnupg-1.9.94.ebuild 2455
-EBUILD gnupg-2.0.0.ebuild 2372 RMD160 51cd20345b3973e561b0723abf9c8f65c606316a SHA1 2590b73f1fe8ae63801488899c300f8b344d0b52 SHA256 17e8ff44f4c27c0b7b015c954b3315a72a844405f590adabd98a6caefff8a4df
-MD5 865e50439a3283364542d7e5d7994e05 gnupg-2.0.0.ebuild 2372
-RMD160 51cd20345b3973e561b0723abf9c8f65c606316a gnupg-2.0.0.ebuild 2372
-SHA256 17e8ff44f4c27c0b7b015c954b3315a72a844405f590adabd98a6caefff8a4df gnupg-2.0.0.ebuild 2372
-EBUILD gnupg-2.0.1-r1.ebuild 2192 RMD160 f8dbe4b96e31e6b4f58563b1c501694852d94637 SHA1 8da7095ee55dcb34a35acde02a3a0b42b7ee390d SHA256 a5332e970ac7a77daa158745eab75da14896d8f14568783cfd6374d1c7b37ccc
-MD5 909344ea1c8f804865fde67d5f16e116 gnupg-2.0.1-r1.ebuild 2192
-RMD160 f8dbe4b96e31e6b4f58563b1c501694852d94637 gnupg-2.0.1-r1.ebuild 2192
-SHA256 a5332e970ac7a77daa158745eab75da14896d8f14568783cfd6374d1c7b37ccc gnupg-2.0.1-r1.ebuild 2192
-EBUILD gnupg-2.0.1-r2.ebuild 2148 RMD160 cf716592e930f16f84932a43bb20bc8134cbaee6 SHA1 3937d42aeef9185a30f37ff812dc1942e12544c6 SHA256 8e2c2c5948a4d8c0689e09c736c81fffd7b7a78ef36ee105b6dbaeafc905224e
-MD5 7aaf0b60f2ec1093ece1d5584e64bba1 gnupg-2.0.1-r2.ebuild 2148
-RMD160 cf716592e930f16f84932a43bb20bc8134cbaee6 gnupg-2.0.1-r2.ebuild 2148
-SHA256 8e2c2c5948a4d8c0689e09c736c81fffd7b7a78ef36ee105b6dbaeafc905224e gnupg-2.0.1-r2.ebuild 2148
-EBUILD gnupg-2.0.1-r3.ebuild 2189 RMD160 2b78a6d0414158781e6af61594edc1c1b23e8d0c SHA1 ed19e0fa6ecdc7268fd10cf356016d7ecfd6a6c2 SHA256 40925a1aa96b1093789feb39cf7009d6c0a55d435c7b87001dcddd7429132ea1
-MD5 e3a6063cc33cb9a6b00b7367ae58c6ac gnupg-2.0.1-r3.ebuild 2189
-RMD160 2b78a6d0414158781e6af61594edc1c1b23e8d0c gnupg-2.0.1-r3.ebuild 2189
-SHA256 40925a1aa96b1093789feb39cf7009d6c0a55d435c7b87001dcddd7429132ea1 gnupg-2.0.1-r3.ebuild 2189
-EBUILD gnupg-2.0.1.ebuild 2372 RMD160 59454bf9fbd791580892ae03dbd7bffa8cc5c9fa SHA1 b42971cd29c1cd0064cc4255c536870e94736893 SHA256 c17f8c88a028ae39ee153406ac5ec78fcddfffbcce2d56d372e41c0489ec9eb0
-MD5 3a9806610a9a92067b4cc68f56bcb09c gnupg-2.0.1.ebuild 2372
-RMD160 59454bf9fbd791580892ae03dbd7bffa8cc5c9fa gnupg-2.0.1.ebuild 2372
-SHA256 c17f8c88a028ae39ee153406ac5ec78fcddfffbcce2d56d372e41c0489ec9eb0 gnupg-2.0.1.ebuild 2372
 EBUILD gnupg-2.0.2.ebuild 2163 RMD160 66c9a377942a247ff2fb5b4c46e09c62c3de6fd7 SHA1 1b1f425fc1ecbd1f4783998d146e384e04ad83e4 SHA256 1b7f1cc606275e0569d7fd61dd167109cb6a42b587b078cc109ff3e488484dd1
 MD5 920aabb2fa6a43449bf3593e5b4fc2ca gnupg-2.0.2.ebuild 2163
 RMD160 66c9a377942a247ff2fb5b4c46e09c62c3de6fd7 gnupg-2.0.2.ebuild 2163
@@ -101,10 +71,10 @@ EBUILD gnupg-2.0.3.ebuild 2146 RMD160 30b7575d24cd4a2ea9a9e32500916aae3016ba4b S
 MD5 2f09aafaeb973a7446d3444f2bf47bbe gnupg-2.0.3.ebuild 2146
 RMD160 30b7575d24cd4a2ea9a9e32500916aae3016ba4b gnupg-2.0.3.ebuild 2146
 SHA256 5409ea7562b9d21fa85b0f6326521e34ea5c434ee5ce4479cb3de29ee9671866 gnupg-2.0.3.ebuild 2146
-MISC ChangeLog 43691 RMD160 0cccce91a789435eb65eca5812e602a08a96b050 SHA1 e67d7f4d804b900bfb7ffd0d6a06afa300f6287e SHA256 64b2e0a9913a1edc421f377f11e7a3a5f1c78847d5681a020cef9856f4c38d84
-MD5 b4c760490db615217b868077addc1d2b ChangeLog 43691
-RMD160 0cccce91a789435eb65eca5812e602a08a96b050 ChangeLog 43691
-SHA256 64b2e0a9913a1edc421f377f11e7a3a5f1c78847d5681a020cef9856f4c38d84 ChangeLog 43691
+MISC ChangeLog 43760 RMD160 642276ce0d934b707b72626a1a2af89b9ba89aa9 SHA1 3d10961309a33132ef553edb9f72739730b2e027 SHA256 60839a5d43764940e42f44885d959cd3115581e4798ecda1abcf96c7988afed1
+MD5 397aa3376f4a498aaa449c2dee18cd82 ChangeLog 43760
+RMD160 642276ce0d934b707b72626a1a2af89b9ba89aa9 ChangeLog 43760
+SHA256 60839a5d43764940e42f44885d959cd3115581e4798ecda1abcf96c7988afed1 ChangeLog 43760
 MISC metadata.xml 481 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 SHA1 13cb529b83ba9feaad91f1d033d6c33d1eafbd25 SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 metadata.xml 481
@@ -127,21 +97,6 @@ SHA256 e8c7e316349c08cb0016be462482519b309a38f3bc92d0d88de752795005beda files/di
 MD5 484202a1d02759840bf80a57a2b2d79e files/digest-gnupg-1.9.94 244
 RMD160 87f4dca9729422331d55c113b08c98fcf7d641c0 files/digest-gnupg-1.9.94 244
 SHA256 8648c6ff6070284e92d5ab95911132a7f84a89ad2afdd32e09e972708d576b17 files/digest-gnupg-1.9.94 244
-MD5 3e85b89430e9fed3b98ceadc85ab5bec files/digest-gnupg-2.0.0 241
-RMD160 07101b2bd267a5794ef26066db0bbdb44acde784 files/digest-gnupg-2.0.0 241
-SHA256 45ceb4d5680badac8223e1c32c90f53fe7407c53fa521d15521ee789467026a4 files/digest-gnupg-2.0.0 241
-MD5 973de8c9666fa149d0e9ea04d8490f2d files/digest-gnupg-2.0.1 241
-RMD160 24b2ba2a4d33e0f2b910169e8b093caca64d1256 files/digest-gnupg-2.0.1 241
-SHA256 bd68ceadd1c0dcb85124b859d63408bcf8f9676d4b95ba345e5f41550614ec53 files/digest-gnupg-2.0.1 241
-MD5 973de8c9666fa149d0e9ea04d8490f2d files/digest-gnupg-2.0.1-r1 241
-RMD160 24b2ba2a4d33e0f2b910169e8b093caca64d1256 files/digest-gnupg-2.0.1-r1 241
-SHA256 bd68ceadd1c0dcb85124b859d63408bcf8f9676d4b95ba345e5f41550614ec53 files/digest-gnupg-2.0.1-r1 241
-MD5 973de8c9666fa149d0e9ea04d8490f2d files/digest-gnupg-2.0.1-r2 241
-RMD160 24b2ba2a4d33e0f2b910169e8b093caca64d1256 files/digest-gnupg-2.0.1-r2 241
-SHA256 bd68ceadd1c0dcb85124b859d63408bcf8f9676d4b95ba345e5f41550614ec53 files/digest-gnupg-2.0.1-r2 241
-MD5 973de8c9666fa149d0e9ea04d8490f2d files/digest-gnupg-2.0.1-r3 241
-RMD160 24b2ba2a4d33e0f2b910169e8b093caca64d1256 files/digest-gnupg-2.0.1-r3 241
-SHA256 bd68ceadd1c0dcb85124b859d63408bcf8f9676d4b95ba345e5f41550614ec53 files/digest-gnupg-2.0.1-r3 241
 MD5 8dd7795cd36c3bff26a4d635297c5f45 files/digest-gnupg-2.0.2 241
 RMD160 b938fa8c34590900d0b7e1efe151e2a7d18eac88 files/digest-gnupg-2.0.2 241
 SHA256 d8968e441b1b712ddafaa0a1c0cb0f6d91eeae76a6a5f2d7adb6ada1a128c23a files/digest-gnupg-2.0.2 241
diff --git a/app-crypt/gnupg/files/digest-gnupg-2.0.0 b/app-crypt/gnupg/files/digest-gnupg-2.0.0
deleted file mode 100644 (file)
index 2ff805d..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 13c0d43bd1f4a129de470dda20192284 gnupg-2.0.0.tar.bz2 3904270
-RMD160 739e303f1380ec9cb5c3a248179001700efe6f2e gnupg-2.0.0.tar.bz2 3904270
-SHA256 aae6d4ca81787f05ee98ef6b0c27d54e209b06c62553b1ce10a1b4e84b18897f gnupg-2.0.0.tar.bz2 3904270
diff --git a/app-crypt/gnupg/files/digest-gnupg-2.0.1 b/app-crypt/gnupg/files/digest-gnupg-2.0.1
deleted file mode 100644 (file)
index 8adb116..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eb24e258db73f4cb53a3ce18375efa21 gnupg-2.0.1.tar.bz2 3923924
-RMD160 3b9252b9b8b1ff5c242a3e541adc0a9700e55df1 gnupg-2.0.1.tar.bz2 3923924
-SHA256 49949762a4e080379dcca23948442d50488f0d74e04bcba87fc49e19a899b01d gnupg-2.0.1.tar.bz2 3923924
diff --git a/app-crypt/gnupg/files/digest-gnupg-2.0.1-r1 b/app-crypt/gnupg/files/digest-gnupg-2.0.1-r1
deleted file mode 100644 (file)
index 8adb116..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eb24e258db73f4cb53a3ce18375efa21 gnupg-2.0.1.tar.bz2 3923924
-RMD160 3b9252b9b8b1ff5c242a3e541adc0a9700e55df1 gnupg-2.0.1.tar.bz2 3923924
-SHA256 49949762a4e080379dcca23948442d50488f0d74e04bcba87fc49e19a899b01d gnupg-2.0.1.tar.bz2 3923924
diff --git a/app-crypt/gnupg/files/digest-gnupg-2.0.1-r2 b/app-crypt/gnupg/files/digest-gnupg-2.0.1-r2
deleted file mode 100644 (file)
index 8adb116..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eb24e258db73f4cb53a3ce18375efa21 gnupg-2.0.1.tar.bz2 3923924
-RMD160 3b9252b9b8b1ff5c242a3e541adc0a9700e55df1 gnupg-2.0.1.tar.bz2 3923924
-SHA256 49949762a4e080379dcca23948442d50488f0d74e04bcba87fc49e19a899b01d gnupg-2.0.1.tar.bz2 3923924
diff --git a/app-crypt/gnupg/files/digest-gnupg-2.0.1-r3 b/app-crypt/gnupg/files/digest-gnupg-2.0.1-r3
deleted file mode 100644 (file)
index 8adb116..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eb24e258db73f4cb53a3ce18375efa21 gnupg-2.0.1.tar.bz2 3923924
-RMD160 3b9252b9b8b1ff5c242a3e541adc0a9700e55df1 gnupg-2.0.1.tar.bz2 3923924
-SHA256 49949762a4e080379dcca23948442d50488f0d74e04bcba87fc49e19a899b01d gnupg-2.0.1.tar.bz2 3923924
diff --git a/app-crypt/gnupg/files/gnupg-2.0.1-agent.patch b/app-crypt/gnupg/files/gnupg-2.0.1-agent.patch
deleted file mode 100644 (file)
index 8639ae2..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urNp gnupg-2.0.1.org/g10/call-agent.c gnupg-2.0.1/g10/call-agent.c
---- gnupg-2.0.1.org/g10/call-agent.c   2006-10-04 16:49:27.000000000 +0200
-+++ gnupg-2.0.1/g10/call-agent.c       2007-01-29 21:46:57.000000000 +0200
-@@ -87,7 +87,10 @@ start_agent (void)
-     return 0; /* fixme: We need a context for each thread or serialize
-                  the access to the agent. */
--  infostr = force_pipe_server? NULL : getenv ("GPG_AGENT_INFO");
-+  if (opt.gpg_agent_info != NULL)
-+    infostr = opt.gpg_agent_info;
-+  else
-+    infostr = force_pipe_server? NULL : getenv ("GPG_AGENT_INFO");
-   if (!infostr || !*infostr)
-     {
-       const char *pgmname;
diff --git a/app-crypt/gnupg/files/gnupg-2.0.1-bsd-make.patch b/app-crypt/gnupg/files/gnupg-2.0.1-bsd-make.patch
deleted file mode 100644 (file)
index 2e6395f..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-Date: Fri Jan  5 11:30:30 PST 2007
-
-This patch adds LIBICONV wherever LIBINTL is used. This is needed for compiles
-on Gentoo/OSX and Gentoo/BSD.
-
-There are two cases (t-convert, gpgsplit) where neither LIBINTL nor LIBICONV
-were brought in before, and I added them as well. It might be overkill.
-
-diff -Nuar --exclude '*~' gnupg-2.0.1.orig/agent/Makefile.am gnupg-2.0.1/agent/Makefile.am
---- gnupg-2.0.1.orig/agent/Makefile.am 2006-10-20 07:07:09.000000000 -0700
-+++ gnupg-2.0.1/agent/Makefile.am      2007-01-05 11:28:29.000000000 -0800
-@@ -53,7 +53,7 @@
- gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS)
- gpg_agent_LDADD = $(commonpth_libs) \
-                 $(LIBGCRYPT_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
--              $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS)
-+              $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL) $(NETLIBS)
- gpg_protect_tool_SOURCES = \
-       protect-tool.c \
-@@ -62,14 +62,14 @@
- # Needs $(NETLIBS) for libsimple-pwquery.la.
- gpg_protect_tool_LDADD =  $(pwquery_libs) $(common_libs) \
--         $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS)
-+         $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL) $(NETLIBS)
- gpg_preset_passphrase_SOURCES = \
-       preset-passphrase.c
- # Needs $(NETLIBS) for libsimple-pwquery.la.
- gpg_preset_passphrase_LDADD =  $(pwquery_libs) $(common_libs) \
--       $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS)
-+       $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL) $(NETLIBS)
- # Make sure that all libs are build before we use them.  This is
-@@ -83,7 +83,7 @@
- TESTS = t-protect
- t_common_ldadd = $(common_libs) \
--                 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL)
-+                 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL)
- t_protect_SOURCES = t-protect.c protect.c 
- t_protect_LDADD = $(t_common_ldadd)
-diff -Nuar --exclude '*~' gnupg-2.0.1.orig/common/Makefile.am gnupg-2.0.1/common/Makefile.am
---- gnupg-2.0.1.orig/common/Makefile.am        2006-11-05 06:32:09.000000000 -0800
-+++ gnupg-2.0.1/common/Makefile.am     2007-01-05 11:29:09.000000000 -0800
-@@ -79,7 +79,7 @@
- module_tests = t-convert
- t_common_ldadd = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \
--                 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS)
-+                 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL)
- t_convert_DEPENDENCIES = convert.c libcommon.a
- t_convert_LDADD = $(t_common_ldadd)
-diff -Nuar --exclude '*~' gnupg-2.0.1.orig/g10/Makefile.am gnupg-2.0.1/g10/Makefile.am
---- gnupg-2.0.1.orig/g10/Makefile.am   2006-11-21 06:49:41.000000000 -0800
-+++ gnupg-2.0.1/g10/Makefile.am        2007-01-05 11:27:06.000000000 -0800
-@@ -117,7 +117,7 @@
- LDADD =  $(needed_libs) ../common/libgpgrl.a \
-          $(ZLIBS) $(DNSLIBS) $(LIBREADLINE) \
--         $(LIBINTL) $(CAPLIBS) $(NETLIBS)
-+         $(LIBICONV) $(LIBINTL) $(CAPLIBS) $(NETLIBS)
- gpg2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS)
- gpgv2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS)
-diff -Nuar --exclude '*~' gnupg-2.0.1.orig/kbx/Makefile.am gnupg-2.0.1/kbx/Makefile.am
---- gnupg-2.0.1.orig/kbx/Makefile.am   2006-09-20 02:35:52.000000000 -0700
-+++ gnupg-2.0.1/kbx/Makefile.am        2007-01-05 11:24:46.000000000 -0800
-@@ -48,6 +48,6 @@
- kbxutil_SOURCES = kbxutil.c $(common_sources)
- kbxutil_LDADD   = ../jnlib/libjnlib.a ../gl/libgnu.a \
-                 $(KSBA_LIBS) $(LIBGCRYPT_LIBS) \
--                  -lgpg-error $(LIBINTL) ../common/libcommon.a
-+                  -lgpg-error $(LIBICONV) $(LIBINTL) ../common/libcommon.a
- $(PROGRAMS) : ../jnlib/libjnlib.a ../gl/libgnu.a ../common/libcommon.a
-diff -Nuar --exclude '*~' gnupg-2.0.1.orig/scd/Makefile.am gnupg-2.0.1/scd/Makefile.am
---- gnupg-2.0.1.orig/scd/Makefile.am   2006-11-21 01:38:26.000000000 -0800
-+++ gnupg-2.0.1/scd/Makefile.am        2007-01-05 11:27:24.000000000 -0800
-@@ -46,7 +46,7 @@
- scdaemon_LDADD = ../jnlib/libjnlib.a ../common/libcommonpth.a ../gl/libgnu.a \
-       $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
--      $(LIBUSB_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(DL_LIBS) $(NETLIBS)
-+      $(LIBUSB_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL) $(DL_LIBS) $(NETLIBS)
- # Removed for now: We need to decide whether it makes sense to
- # continue it at all, given that gpg has now all required
-diff -Nuar --exclude '*~' gnupg-2.0.1.orig/sm/Makefile.am gnupg-2.0.1/sm/Makefile.am
---- gnupg-2.0.1.orig/sm/Makefile.am    2006-11-05 06:32:08.000000000 -0800
-+++ gnupg-2.0.1/sm/Makefile.am 2007-01-05 11:26:33.000000000 -0800
-@@ -58,7 +58,7 @@
- gpgsm_LDADD = $(common_libs) \
-               $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \
--              $(GPG_ERROR_LIBS) $(LIBINTL) $(ZLIBS)
-+              $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL) $(ZLIBS)
- # Make sure that all libs are build before we use them.  This is
- # important for things like make -j2.
-diff -Nuar --exclude '*~' gnupg-2.0.1.orig/tools/Makefile.am gnupg-2.0.1/tools/Makefile.am
---- gnupg-2.0.1.orig/tools/Makefile.am 2006-11-23 06:48:46.000000000 -0800
-+++ gnupg-2.0.1/tools/Makefile.am      2007-01-05 11:28:45.000000000 -0800
-@@ -54,34 +54,34 @@
- common_libs = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a
- pwquery_libs = ../common/libsimple-pwquery.a
--gpgsplit_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(ZLIBS)
-+gpgsplit_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(ZLIBS) $(LIBICONV) $(LIBINTL)
- gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c no-libgcrypt.c
- # jnlib/common sucks in gpg-error, will they, nil they (some compilers
- # do not eliminate the supposed-to-be-unused-inline-functions).
--gpgconf_LDADD = $(common_libs) $(LIBINTL) $(GPG_ERROR_LIBS)
-+gpgconf_LDADD = $(common_libs) $(LIBICONV) $(LIBINTL) $(GPG_ERROR_LIBS)
- gpgparsemail_SOURCES = gpgparsemail.c rfc822parse.c rfc822parse.h
- gpgparsemail_LDADD = 
- symcryptrun_SOURCES = symcryptrun.c
- symcryptrun_LDADD = $(LIBUTIL_LIBS) $(common_libs) $(pwquery_libs) \
--                    $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL)
-+                    $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL)
- watchgnupg_SOURCES = watchgnupg.c 
- watchgnupg_LDADD = $(NETLIBS)
- gpg_connect_agent_SOURCES = gpg-connect-agent.c no-libgcrypt.c
- gpg_connect_agent_LDADD = $(common_libs) $(LIBASSUAN_LIBS) \
--                        $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS)
-+                        $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL) $(NETLIBS)
- gpgkey2ssh_SOURCES = gpgkey2ssh.c
- gpgkey2ssh_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
- # common sucks in jnlib, via use of BUG() in an inline function, which
- # some compilers do not eliminate.
- gpgkey2ssh_LDADD = $(common_libs) \
--                   $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL)
-+                   $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL)
- # Make sure that all libs are build before we use them.  This is
diff --git a/app-crypt/gnupg/gnupg-2.0.0.ebuild b/app-crypt/gnupg/gnupg-2.0.0.ebuild
deleted file mode 100644 (file)
index cf4b94d..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.0.ebuild,v 1.2 2007/01/24 17:05:34 genone Exp $
-
-WANT_AUTOMAKE='latest'
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1.9"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="X gpg2-experimental doc ldap nls openct pcsc-lite smartcard selinux"
-
-COMMON_DEPEND="
-       virtual/libc
-       >=dev-libs/pth-1.3.7
-       >=dev-libs/libgcrypt-1.2.0
-       >=dev-libs/libksba-1.0.0
-       >=dev-libs/libgpg-error-1.4
-       >=dev-libs/libassuan-0.9.3
-       pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
-       openct? ( >=dev-libs/openct-0.5.0 )
-       ldap? ( net-nds/openldap )"
-# Needs sh and arm to be keyworded on pinentry
-#      X? ( app-crypt/pinentry )
-
-DEPEND="${COMMON_DEPEND}
-       nls? ( sys-devel/gettext )
-       doc? ( sys-apps/texinfo )"
-
-RDEPEND="${COMMON_DEPEND}
-       !app-crypt/gpg-agent
-       =app-crypt/gnupg-1.4*
-       X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-       virtual/mta
-       selinux? ( sec-policy/selinux-gnupg )
-       nls? ( virtual/libintl )"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       AT_M4DIR="m4 gl/m4" eautoreconf
-}
-
-src_compile() {
-       local myconf=""
-
-       if use X; then
-               local viewer
-               if has_version 'media-gfx/xloadimage'; then
-                       viewer=/usr/bin/xloadimage
-               else
-                       viewer=/usr/bin/xli
-               fi
-               myconf="${myconf} --with-photo-viewer=${viewer}"
-       else
-               myconf="${myconf} --disable-photo-viewers"
-       fi
-
-       append-ldflags $(bindnow-flags)
-
-       econf \
-               --enable-agent \
-               --enable-symcryptrun \
-               $(use_enable gpg2-experimental gpg) \
-               --enable-gpgsm \
-               $(use_enable smartcard scdaemon) \
-               $(use_enable nls) \
-               $(use_enable ldap) \
-               --disable-capabilities \
-               ${myconf} \
-               || die
-       emake || die
-       if use doc; then
-               cd doc
-               emake html || die
-       fi
-}
-
-src_install() {
-       make DESTDIR="${D}" install || die
-       dodoc ChangeLog NEWS README THANKS TODO VERSION
-
-       # neither of these should really be needed, please check
-       use gpg2-experimental && fperms u+s,go-r /usr/bin/gpg2
-       fperms u+s,go-r /usr/bin/gpg-agent
-
-       use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png
-}
-
-pkg_postinst() {
-       elog
-       elog "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
-       elog
-}
diff --git a/app-crypt/gnupg/gnupg-2.0.1-r1.ebuild b/app-crypt/gnupg/gnupg-2.0.1-r1.ebuild
deleted file mode 100644 (file)
index e5ead2b..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.1-r1.ebuild,v 1.1 2006/12/09 16:57:59 alonbl Exp $
-
-WANT_AUTOMAKE='latest'
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 caps X doc ldap nls openct pcsc-lite smartcard selinux"
-
-COMMON_DEPEND="
-       virtual/libc
-       >=dev-libs/pth-1.3.7
-       >=dev-libs/libgcrypt-1.2.0
-       >=dev-libs/libksba-1.0.0
-       >=dev-libs/libgpg-error-1.4
-       >=dev-libs/libassuan-1.0.1
-       bzip2? ( app-arch/bzip2 )
-       pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
-       openct? ( >=dev-libs/openct-0.5.0 )
-       ldap? ( net-nds/openldap )"
-# Needs sh and arm to be keyworded on pinentry
-#      X? ( app-crypt/pinentry )
-
-DEPEND="${COMMON_DEPEND}
-       nls? ( sys-devel/gettext )
-       doc? ( sys-apps/texinfo )"
-
-RDEPEND="${COMMON_DEPEND}
-       !app-crypt/gpg-agent
-       !<=app-crypt/gnupg-2.0.1
-       X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-       virtual/mta
-       selinux? ( sec-policy/selinux-gnupg )
-       nls? ( virtual/libintl )"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       AT_M4DIR="m4 gl/m4" eautoreconf
-}
-
-src_compile() {
-       local myconf=""
-
-       if use X; then
-               local viewer
-               if has_version 'media-gfx/xloadimage'; then
-                       viewer=/usr/bin/xloadimage
-               else
-                       viewer=/usr/bin/xli
-               fi
-               myconf="${myconf} --with-photo-viewer=${viewer}"
-       else
-               myconf="${myconf} --disable-photo-viewers"
-       fi
-
-       append-ldflags $(bindnow-flags)
-
-       econf \
-               --enable-symcryptrun \
-               --enable-gpg \
-               --enable-gpgsm \
-               --enable-agent \
-               $(use_enable bzip2) \
-               $(use_enable smartcard scdaemon) \
-               $(use_enable nls) \
-               $(use_enable ldap) \
-               $(use_with caps capabilities) \
-               ${myconf} \
-               || die
-       emake || die
-       if use doc; then
-               cd doc
-               emake html || die
-       fi
-}
-
-src_install() {
-       make DESTDIR="${D}" install || die
-       dodoc ChangeLog NEWS README THANKS TODO VERSION
-
-       dosym gpg2 /usr/bin/gpg
-       dosym gpgv2 /usr/bin/gpgv
-
-       use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png
-}
-
diff --git a/app-crypt/gnupg/gnupg-2.0.1-r2.ebuild b/app-crypt/gnupg/gnupg-2.0.1-r2.ebuild
deleted file mode 100644 (file)
index da9ed16..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.1-r2.ebuild,v 1.5 2007/01/12 20:33:19 alonbl Exp $
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 X doc ldap nls openct pcsc-lite smartcard selinux"
-
-COMMON_DEPEND="
-       virtual/libc
-       >=dev-libs/pth-1.3.7
-       >=dev-libs/libgcrypt-1.2.0
-       >=dev-libs/libksba-1.0.0
-       >=dev-libs/libgpg-error-1.4
-       >=dev-libs/libassuan-1.0.1
-       bzip2? ( app-arch/bzip2 )
-       pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
-       openct? ( >=dev-libs/openct-0.5.0 )
-       ldap? ( net-nds/openldap )
-       app-crypt/pinentry"
-
-DEPEND="${COMMON_DEPEND}
-       nls? ( sys-devel/gettext )
-       doc? ( sys-apps/texinfo )"
-
-RDEPEND="${COMMON_DEPEND}
-       !app-crypt/gpg-agent
-       !<=app-crypt/gnupg-2.0.1
-       X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-       virtual/mta
-       selinux? ( sec-policy/selinux-gnupg )
-       nls? ( virtual/libintl )"
-
-src_unpack() {
-       unpack ${A}
-       epatch ${FILESDIR}/${PN}-2.0.1-bsd-make.patch
-       cd "${S}"
-
-       AT_M4DIR="m4 gl/m4" eautoreconf
-}
-
-src_compile() {
-       local myconf=""
-
-       if use X; then
-               local viewer
-               if has_version 'media-gfx/xloadimage'; then
-                       viewer=/usr/bin/xloadimage
-               else
-                       viewer=/usr/bin/xli
-               fi
-               myconf="${myconf} --with-photo-viewer=${viewer}"
-       else
-               myconf="${myconf} --disable-photo-viewers"
-       fi
-
-       append-ldflags $(bindnow-flags)
-
-       econf \
-               --enable-symcryptrun \
-               --enable-gpg \
-               --enable-gpgsm \
-               --enable-agent \
-               $(use_enable bzip2) \
-               $(use_enable smartcard scdaemon) \
-               $(use_enable nls) \
-               $(use_enable ldap) \
-               --disable-capabilities \
-               ${myconf} \
-               || die
-       emake || die
-       if use doc; then
-               cd doc
-               emake html || die
-       fi
-}
-
-src_install() {
-       make DESTDIR="${D}" install || die
-       dodoc ChangeLog NEWS README THANKS TODO VERSION
-
-       dosym gpg2 /usr/bin/gpg
-       dosym gpgv2 /usr/bin/gpgv
-
-       use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png
-}
-
diff --git a/app-crypt/gnupg/gnupg-2.0.1-r3.ebuild b/app-crypt/gnupg/gnupg-2.0.1-r3.ebuild
deleted file mode 100644 (file)
index 25ef910..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.1-r3.ebuild,v 1.1 2007/01/29 20:01:35 alonbl Exp $
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 X doc ldap nls openct pcsc-lite smartcard selinux"
-
-COMMON_DEPEND="
-       virtual/libc
-       >=dev-libs/pth-1.3.7
-       >=dev-libs/libgcrypt-1.2.0
-       >=dev-libs/libksba-1.0.0
-       >=dev-libs/libgpg-error-1.4
-       >=dev-libs/libassuan-1.0.1
-       bzip2? ( app-arch/bzip2 )
-       pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
-       openct? ( >=dev-libs/openct-0.5.0 )
-       ldap? ( net-nds/openldap )
-       app-crypt/pinentry"
-
-DEPEND="${COMMON_DEPEND}
-       nls? ( sys-devel/gettext )
-       doc? ( sys-apps/texinfo )"
-
-RDEPEND="${COMMON_DEPEND}
-       !app-crypt/gpg-agent
-       !<=app-crypt/gnupg-2.0.1
-       X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-       virtual/mta
-       selinux? ( sec-policy/selinux-gnupg )
-       nls? ( virtual/libintl )"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       epatch "${FILESDIR}/${PN}-2.0.1-bsd-make.patch"
-       epatch "${FILESDIR}/${P}-agent.patch"
-
-       AT_M4DIR="m4 gl/m4" eautoreconf
-}
-
-src_compile() {
-       local myconf=""
-
-       if use X; then
-               local viewer
-               if has_version 'media-gfx/xloadimage'; then
-                       viewer=/usr/bin/xloadimage
-               else
-                       viewer=/usr/bin/xli
-               fi
-               myconf="${myconf} --with-photo-viewer=${viewer}"
-       else
-               myconf="${myconf} --disable-photo-viewers"
-       fi
-
-       append-ldflags $(bindnow-flags)
-
-       econf \
-               --enable-symcryptrun \
-               --enable-gpg \
-               --enable-gpgsm \
-               --enable-agent \
-               $(use_enable bzip2) \
-               $(use_enable smartcard scdaemon) \
-               $(use_enable nls) \
-               $(use_enable ldap) \
-               --disable-capabilities \
-               ${myconf} \
-               || die
-       emake || die
-       if use doc; then
-               cd doc
-               emake html || die
-       fi
-}
-
-src_install() {
-       make DESTDIR="${D}" install || die
-       dodoc ChangeLog NEWS README THANKS TODO VERSION
-
-       dosym gpg2 /usr/bin/gpg
-       dosym gpgv2 /usr/bin/gpgv
-
-       use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png
-}
-
diff --git a/app-crypt/gnupg/gnupg-2.0.1.ebuild b/app-crypt/gnupg/gnupg-2.0.1.ebuild
deleted file mode 100644 (file)
index d81a10b..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.1.ebuild,v 1.2 2007/01/24 17:05:34 genone Exp $
-
-WANT_AUTOMAKE='latest'
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1.9"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="X gpg2-experimental doc ldap nls openct pcsc-lite smartcard selinux"
-
-COMMON_DEPEND="
-       virtual/libc
-       >=dev-libs/pth-1.3.7
-       >=dev-libs/libgcrypt-1.2.0
-       >=dev-libs/libksba-1.0.0
-       >=dev-libs/libgpg-error-1.4
-       >=dev-libs/libassuan-1.0.1
-       pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
-       openct? ( >=dev-libs/openct-0.5.0 )
-       ldap? ( net-nds/openldap )"
-# Needs sh and arm to be keyworded on pinentry
-#      X? ( app-crypt/pinentry )
-
-DEPEND="${COMMON_DEPEND}
-       nls? ( sys-devel/gettext )
-       doc? ( sys-apps/texinfo )"
-
-RDEPEND="${COMMON_DEPEND}
-       !app-crypt/gpg-agent
-       =app-crypt/gnupg-1.4*
-       X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-       virtual/mta
-       selinux? ( sec-policy/selinux-gnupg )
-       nls? ( virtual/libintl )"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       AT_M4DIR="m4 gl/m4" eautoreconf
-}
-
-src_compile() {
-       local myconf=""
-
-       if use X; then
-               local viewer
-               if has_version 'media-gfx/xloadimage'; then
-                       viewer=/usr/bin/xloadimage
-               else
-                       viewer=/usr/bin/xli
-               fi
-               myconf="${myconf} --with-photo-viewer=${viewer}"
-       else
-               myconf="${myconf} --disable-photo-viewers"
-       fi
-
-       append-ldflags $(bindnow-flags)
-
-       econf \
-               --enable-agent \
-               --enable-symcryptrun \
-               $(use_enable gpg2-experimental gpg) \
-               --enable-gpgsm \
-               $(use_enable smartcard scdaemon) \
-               $(use_enable nls) \
-               $(use_enable ldap) \
-               --disable-capabilities \
-               ${myconf} \
-               || die
-       emake || die
-       if use doc; then
-               cd doc
-               emake html || die
-       fi
-}
-
-src_install() {
-       make DESTDIR="${D}" install || die
-       dodoc ChangeLog NEWS README THANKS TODO VERSION
-
-       # neither of these should really be needed, please check
-       use gpg2-experimental && fperms u+s,go-r /usr/bin/gpg2
-       fperms u+s,go-r /usr/bin/gpg-agent
-
-       use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png
-}
-
-pkg_postinst() {
-       elog
-       elog "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
-       elog
-}