app-crypt/gnupg: Update live ebuild
authorKristian Fiskerstrand <kf@sumptuouscapital.com>
Sun, 8 Nov 2015 17:33:17 +0000 (18:33 +0100)
committerKristian Fiskerstrand <kf@sumptuouscapital.com>
Sun, 8 Nov 2015 17:33:17 +0000 (18:33 +0100)
app-crypt/gnupg/Manifest
app-crypt/gnupg/files/gnupg-2.0.17-gpgsm-gencert.patch [deleted file]
app-crypt/gnupg/gnupg-9999.ebuild

index ef040f1..699a233 100644 (file)
@@ -1,2 +1 @@
-AUX gnupg-2.0.17-gpgsm-gencert.patch 1121 SHA256 fa8369a4466b3cce54215a348940422f46f4d359f9e9b3c7029a1138870888df SHA512 ecde032b205cc16c33ff21ded55b93e74058cd804d68e4a0738ac70d54b5b388b6f709d21719a5e418c662b7ee74bc4aef7a0c59de106e2d4bd06b7bc1a11138 WHIRLPOOL 5dc4d3de29290e8e274a0f4fef871cea7f49553846254d819ca776000978a72c694212559d9ad03312f94f71f406de4641c0575188d340017a7937b01753b8a0
-EBUILD gnupg-9999.ebuild 4811 SHA256 6faf1b6ec2ee7bf8864967d26cfefbf1d4529040e7e0a1311c14b8301d5e7f3e SHA512 9ee8193f3c53c3c5b35418401199cf71c7076994c618506677f275acf453f4778d8a8348c2cc8a0a7c879538544f8e8ed5f14fddef0611c325cbc27046a9f509 WHIRLPOOL f04d375fa6aa293bf650a183d6cc1a6d65e0213209e6fcd81669cab857549ca9b0e6cfa3642158766205e094f040cd33031fb0393e5f4b9743c2955ca2c102ca
+EBUILD gnupg-9999.ebuild 4737 SHA256 ecdd533e7fbede7b7f5208b4e667257579a4389b01105b48cd87e8c9575ef175 SHA512 5121b4a1671a0c0c885937f00f2a78ffabe37814823f5a6ac29237ad76981661f2b280e89b4792ce70491511d5da4004dd2da68a3b0da16ae81bbbb49925cc34 WHIRLPOOL 6a5c081d0b1780e22c640d2f3495b5076aa45cb17b5779daeeebc6cf95743ab12c1bcf4fd8353aa51940c397faa37d8c8ca70be9e8fe285a48a9bc25eab35f9b
diff --git a/app-crypt/gnupg/files/gnupg-2.0.17-gpgsm-gencert.patch b/app-crypt/gnupg/files/gnupg-2.0.17-gpgsm-gencert.patch
deleted file mode 100644 (file)
index 9506f81..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From c34486a64c223bcbfbb57d9abcf107d684b815b6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gmail.com>
-Date: Sun, 17 Apr 2011 01:34:39 +0200
-Subject: [PATCH] gpgsm-gencert.sh: make sure not to abort after creating temp
- file.
-
-https://bugs.g10code.com/gnupg/issue1466
-
----
- tools/gpgsm-gencert.sh |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tools/gpgsm-gencert.sh b/tools/gpgsm-gencert.sh
-index b209c8e..e7c812f 100755
---- a/tools/gpgsm-gencert.sh
-+++ b/tools/gpgsm-gencert.sh
-@@ -178,10 +178,10 @@ Key-Length: $KEY_LENGTH
- Key-Usage: $KEY_USAGE
- Name-DN: $NAME
- EOF
--[ -n "$KEY_GRIP" ] && echo "Key-Grip: $KEY_GRIP"
--[ -n "$EMAIL_ADDRESSES" ] && echo "$EMAIL_ADDRESSES"
--[ -n "$DNS_ADDRESSES" ] && echo "$DNS_ADDRESSES"
--[ -n "$URI_ADDRESSES" ] && echo "$URI_ADDRESSES"
-+[ -n "$KEY_GRIP" ] && echo "Key-Grip: $KEY_GRIP" || true
-+[ -n "$EMAIL_ADDRESSES" ] && echo "$EMAIL_ADDRESSES" || true
-+[ -n "$DNS_ADDRESSES" ] && echo "$DNS_ADDRESSES" || true
-+[ -n "$URI_ADDRESSES" ] && echo "$URI_ADDRESSES" || true
- ) > "$file_parameter"
--- 
-1.7.5.rc1
-
index 58ff5f4..4630c05 100644 (file)
@@ -63,7 +63,6 @@ REQUIRED_USE="smartcard? ( !static )"
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-       epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
        epatch_user
        autoreconf || die "Autoreconf fail"
        ./autogen.sh || die "Autgen script failed"
@@ -97,7 +96,6 @@ src_configure() {
                --docdir="${EPREFIX}/usr/share/doc/${PF}" \
                --enable-gpg \
                --enable-gpgsm \
-               --enable-agent \
                --without-adns \
                "${myconf[@]}" \
                $(use_enable bzip2) \