Move libassuan to DEPEND per bug#179663, cleanup

Package-Manager: portage-2.1.2.9

5 files changed, 15 insertions, 46 deletions

diff --git a/app-crypt/gnupg-pkcs11-scd/ChangeLog b/app-crypt/gnupg-pkcs11-scd/ChangeLog
index 7d8817f95c60..7a0359193a5a 100644
--- a/app-crypt/gnupg-pkcs11-scd/ChangeLog
+++ b/app-crypt/gnupg-pkcs11-scd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/gnupg-pkcs11-scd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg-pkcs11-scd/ChangeLog,v 1.2 2007/01/05 15:03:27 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg-pkcs11-scd/ChangeLog,v 1.3 2007/06/13 07:41:47 alonbl Exp $
+
+  13 Jun 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  -gnupg-pkcs11-scd-0.02.ebuild, gnupg-pkcs11-scd-0.03.ebuild:
+  Move libassuan to DEPEND per bug#179663, cleanup
 
 *gnupg-pkcs11-scd-0.03 (05 Jan 2007)
 
diff --git a/app-crypt/gnupg-pkcs11-scd/Manifest b/app-crypt/gnupg-pkcs11-scd/Manifest
index cdf1d26da2aa..c2b57183a5ea 100644
--- a/app-crypt/gnupg-pkcs11-scd/Manifest
+++ b/app-crypt/gnupg-pkcs11-scd/Manifest
@@ -1,24 +1,16 @@
-DIST gnupg-pkcs11-scd-0.02.tar.bz2 148173 RMD160 971628ec58ec76ba277054df29a65fbdda97a675 SHA1 1e5e5263c9824389d29a9d52844a4e3ecde97420 SHA256 cac50e7e4ae7df1af221b9fa984993613233e4c433c18f03583c38fa4f89c831
 DIST gnupg-pkcs11-scd-0.03.tar.bz2 105436 RMD160 806c99397ec0fe3ffe3fe5cb1356d453580dbfbe SHA1 9084d10ca955bd922104df4d9a11310a729cdb45 SHA256 f85e2c8574f066cfbd5ea15f86779ee33b97781ca8a971e7596960dcdbd9e651
-EBUILD gnupg-pkcs11-scd-0.02.ebuild 653 RMD160 bf87e0a0ec3c0e93b822a0ed9659851f2d54c5a3 SHA1 3d5e0ebdd884eeffb3f184d4466126f6ba9f2f98 SHA256 b20f4c80f210bb7401fe996cde981ac96b43cd28501ef313c9f7c03a532fb890
-MD5 1cf6a348bf1257f0766570bffca31bba gnupg-pkcs11-scd-0.02.ebuild 653
-RMD160 bf87e0a0ec3c0e93b822a0ed9659851f2d54c5a3 gnupg-pkcs11-scd-0.02.ebuild 653
-SHA256 b20f4c80f210bb7401fe996cde981ac96b43cd28501ef313c9f7c03a532fb890 gnupg-pkcs11-scd-0.02.ebuild 653
-EBUILD gnupg-pkcs11-scd-0.03.ebuild 684 RMD160 b95b9ba60e1ac5caaf4270d6e6e36c9c40329f20 SHA1 97aea05e928d1e26cc0efb11ec3ef38d09cd0d1a SHA256 75446ecbf142d905bbf3c409eefae0ad1f27e3fbd50b48c1e1c8e0a6fcfb7154
-MD5 cd6a1c19198ccd6bc95e43b59cae94fc gnupg-pkcs11-scd-0.03.ebuild 684
-RMD160 b95b9ba60e1ac5caaf4270d6e6e36c9c40329f20 gnupg-pkcs11-scd-0.03.ebuild 684
-SHA256 75446ecbf142d905bbf3c409eefae0ad1f27e3fbd50b48c1e1c8e0a6fcfb7154 gnupg-pkcs11-scd-0.03.ebuild 684
-MISC ChangeLog 512 RMD160 a489999871910bfc8c3ca9c275376fd0706c5bc0 SHA1 fe9d548be62f4a79dd99bba040a382662c36a4e7 SHA256 4e980894df9eff0011416ed55b6d3977bfce599a04852e62d2b511a90b66c817
-MD5 1c4089b7d06e9677333d1e7007e956fd ChangeLog 512
-RMD160 a489999871910bfc8c3ca9c275376fd0706c5bc0 ChangeLog 512
-SHA256 4e980894df9eff0011416ed55b6d3977bfce599a04852e62d2b511a90b66c817 ChangeLog 512
+EBUILD gnupg-pkcs11-scd-0.03.ebuild 684 RMD160 4a229e885c2186e2c081a10e009d6330dd2cce5e SHA1 f0d5af5f54cb81cbe343f7a1ba6ac7204af612db SHA256 760ef74b8b663aa077a6fc70a852d0f66a186ef1ca1779ddbadb55b923574114
+MD5 536fa0272edc19fbef713f4edd9fda67 gnupg-pkcs11-scd-0.03.ebuild 684
+RMD160 4a229e885c2186e2c081a10e009d6330dd2cce5e gnupg-pkcs11-scd-0.03.ebuild 684
+SHA256 760ef74b8b663aa077a6fc70a852d0f66a186ef1ca1779ddbadb55b923574114 gnupg-pkcs11-scd-0.03.ebuild 684
+MISC ChangeLog 675 RMD160 fa46336d260457707a2fd9c664f475b495c8cbd8 SHA1 6a958c549b27c28fd273aca250f0bb081f1ccdf6 SHA256 7bdfa81eaabd5767095f66a16ae25cdf11c8c8847c5aff698fd16714760aca22
+MD5 5c010220906cdc2c9790f3a1c3eeb61b ChangeLog 675
+RMD160 fa46336d260457707a2fd9c664f475b495c8cbd8 ChangeLog 675
+SHA256 7bdfa81eaabd5767095f66a16ae25cdf11c8c8847c5aff698fd16714760aca22 ChangeLog 675
 MISC metadata.xml 355 RMD160 6ccb1cda999081e9b47c42be75b752462ebe3a56 SHA1 b02185351fb715f2e3921fb05e7ab9cb7e878a9f SHA256 714f82ec7b9de1e47249240b07096e9e0b2cd583476c2eeac7d9d073109fddd7
 MD5 1de351a8a6482e33fb2347d3a1c2dc49 metadata.xml 355
 RMD160 6ccb1cda999081e9b47c42be75b752462ebe3a56 metadata.xml 355
 SHA256 714f82ec7b9de1e47249240b07096e9e0b2cd583476c2eeac7d9d073109fddd7 metadata.xml 355
-MD5 02ccd1b2eefb7f2b2077d9495d0ec48f files/digest-gnupg-pkcs11-scd-0.02 268
-RMD160 e57e3fec538580c0e033b775c6a1865e7545897c files/digest-gnupg-pkcs11-scd-0.02 268
-SHA256 02c680349a6f902da76c7e1a8c875936d496b74a46cddceaf332ce310b2d7ade files/digest-gnupg-pkcs11-scd-0.02 268
 MD5 da1bcb41728b2bc563dcda7bd4ee3a0c files/digest-gnupg-pkcs11-scd-0.03 268
 RMD160 ba42f2db11b7660ca3b8e397ade5f5fe171fb779 files/digest-gnupg-pkcs11-scd-0.03 268
 SHA256 d8941b314da2d696f71fd2567552e132f78ad21b3a3601896cb2d00212b00f32 files/digest-gnupg-pkcs11-scd-0.03 268
diff --git a/app-crypt/gnupg-pkcs11-scd/files/digest-gnupg-pkcs11-scd-0.02 b/app-crypt/gnupg-pkcs11-scd/files/digest-gnupg-pkcs11-scd-0.02
deleted file mode 100644
index 9963b2888ffe..000000000000
--- a/app-crypt/gnupg-pkcs11-scd/files/digest-gnupg-pkcs11-scd-0.02
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d10b4262365e59fc1c4c41871f91df67 gnupg-pkcs11-scd-0.02.tar.bz2 148173
-RMD160 971628ec58ec76ba277054df29a65fbdda97a675 gnupg-pkcs11-scd-0.02.tar.bz2 148173
-SHA256 cac50e7e4ae7df1af221b9fa984993613233e4c433c18f03583c38fa4f89c831 gnupg-pkcs11-scd-0.02.tar.bz2 148173
diff --git a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.02.ebuild b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.02.ebuild
deleted file mode 100644
index f5f6a8775086..000000000000
--- a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.02.ebuild
+++ /dev/null
@@ -1,24 +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-pkcs11-scd/gnupg-pkcs11-scd-0.02.ebuild,v 1.1 2006/10/20 22:10:47 alonbl Exp $
-
-DESCRIPTION="PKCS#11 support for GnuPG"
-HOMEPAGE="http://gnupg-pkcs11.sourceforge.net"
-SRC_URI="mirror://sourceforge/gnupg-pkcs11/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libgpg-error-1.3
-	>=dev-libs/libassuan-0.9.2
-	>=dev-libs/libgcrypt-1.2.2
-	>=dev-libs/openssl-0.9.7"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_install() {
-	emake install DESTDIR="${D}"
-	prepalldocs
-}
diff --git a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.03.ebuild b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.03.ebuild
index cb9f53af89da..0fa1cfc46f1b 100644
--- a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.03.ebuild
+++ b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.03.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.03.ebuild,v 1.1 2007/01/05 15:03:27 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.03.ebuild,v 1.2 2007/06/13 07:41:47 alonbl Exp $
 
 DESCRIPTION="PKCS#11 support for GnuPG"
 HOMEPAGE="http://gnupg-pkcs11.sourceforge.net"
@@ -12,11 +12,11 @@ KEYWORDS="~x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libgpg-error-1.3
-	>=dev-libs/libassuan-0.9.2
 	>=dev-libs/libgcrypt-1.2.2
 	>=dev-libs/openssl-0.9.7
 	>=dev-libs/pkcs11-helper-1.02"
 DEPEND="${RDEPEND}
+	>=dev-libs/libassuan-0.9.2
 	dev-util/pkgconfig"
 
 src_install() {