Remove optional dependency on pinentry-qt in preparation of lastriting of this package

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xFED5002857C1ABFA!

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index e8c531189f8646fd0ad6a693cb915b33d32de6e7..addaecbb57de63e418803164244bda8249545fa5 100644 (file)
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.571 2015/01/25 11:21:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.572 2015/02/09 20:49:42 k_f Exp $
+
+  09 Feb 2015; Kristian Fiskerstrand <k_f@gentoo.org> gnupg-2.0.25.ebuild,
+  gnupg-2.0.26-r2.ebuild, gnupg-2.0.26-r3.ebuild, gnupg-2.1.1-r1.ebuild:
+  Remove optional dependency on pinentry-qt in preparation of lastriting of this
+  package
 
   25 Jan 2015; Agostino Sarubbo <ago@gentoo.org> gnupg-2.0.26-r3.ebuild:
   Stable for alpha, wrt bug #534110

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index cd1d79091fb46b461c38a2d06318df71ec0e3cdc..b13b34a667d625ddc30fca3c17f7e1b24ff32f3d 100644 (file)
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -10,27 +10,20 @@ DIST gnupg-2.0.25.tar.bz2 4301689 SHA256 b3abe97df096cf53d6a422ac922f3c48e688bc8
 DIST gnupg-2.0.26.tar.bz2 4303384 SHA256 7758e30dc382ae7a7167ed41b7f936aa50af5ea2d6fccdef663b5b750b65b8e0 SHA512 5dd23baaac764fd48abd235ed52a85a2c7fd68b98fcde45c0f294ddb3b5629e8b1bd894585fbed4e6a6cb2bc4a5552c098c3cf1a849fffa469424fd0a4fee726 WHIRLPOOL 8d9b30337957f6bfeddea29116d862ef0c0ddd06d59bc2799db236b91b2c6767aad6f37f2166fc431c5d9454eb41f49f3e261bc38d0e89361f0c467f4591cd5a
 DIST gnupg-2.1.1.tar.bz2 4801472 SHA256 70ecd01d2875db62624c911c2fd815742f50aef5492698eb3bfc09a08690ce49 SHA512 00aea535f18d66fa8053c25633f89acbdfc43c91db568d6b7de0db6b40331edafacd04bf2da0aeef3201642e63baf242504d58f05286cfab4014c062432d7885 WHIRLPOOL d49b164d52188f5a9b47a0892aa81918c21ee71bd85b2b1c27979edf1f303afa5bd94d77ff491d33d6f991057cce1faf347419a784cb64f25ebfe5c1fff78d16
 EBUILD gnupg-1.4.18.ebuild 3763 SHA256 37cedb3946b555e83111f5096b3dd73f9506175976be10d648f8eb76b0b5fd3a SHA512 3dd165eb15a4946a9e2157549f0da6864e84c054a6369d7053730a899b50c5f05a703c1ce8e208b9de21b135bc8888f0f13835fce50f0e9eec467140e7e63355 WHIRLPOOL 9c64d59b7c444dde1fb601a6ab8d1085525153174b5995009ff7758866e56b88028056b42154fa0e28b3328978e15df515e4c65e65cb667fc17b75fb340e8e15
-EBUILD gnupg-2.0.25.ebuild 4747 SHA256 6c57559a986cb9271891d041a6f1e7903ccce835c00d7ea16818078f56f11d78 SHA512 f3d81564eb1c708d188d357521f3c6c43f15a8ac8f2758d14328cc3d7cc40306af50a8269f09dd2f80ec6469dc5f31dd2864008d7526dd9f108b1972ce1a7000 WHIRLPOOL f41c54bef5b0b4b7a7cba514c4c39d2cc938eae5e56c8a225755435393f4e483e5c1bd02d02dd0c86c9d6a945ccfe40090523b7f35228a899043dfa79eff9ba1
-EBUILD gnupg-2.0.26-r2.ebuild 4886 SHA256 7f49e6631f28793979c32481138669548e2308df2532e355b21cddf9a44e1c4b SHA512 76ed7eee2a8ebd34a733e4b1484ce2b46226e35da5a1b4e911176d3209dd39dcf25b410808c3f08ebc060b351cd2266dec96dd0374bd3a828394c7efc3aa27a9 WHIRLPOOL 6d9d5eaa5367fad5b0e668138dc1485c50604885458e8958ddfda329222f663eef342ddf64e46eb9c871f41c96a9858f26acadab1a3d3b95f12eb0d0f07ed0c8
-EBUILD gnupg-2.0.26-r3.ebuild 4917 SHA256 c07b161024e5e8a07bf14bb1a2a62ddfa4526333fa0be8247152c99110215015 SHA512 a85001ea4874e61ffd291d960ee7f7c91f8d41a509577690401cca1dd8a8211c421d7245f1481263c9b5fb0e47b6b16f52b8e5e9c261d05c85143d6474689c1b WHIRLPOOL 234e93664046661b23fd86ba871ccdf55ada64e5bd57b2b3844308ca4236daf149f37d493eb2b93ba2ddf28906686f3560e6c363f739203b24c4706fc26c292e
+EBUILD gnupg-2.0.25.ebuild 4716 SHA256 5b0139d96798f1da97dba5074de1ef97b0e778c7b8f3486c3410156d80b16589 SHA512 813f897f335b10b9ca0bbc747251f800531f4725905048d9ad1117a2d1bfccd6d913ae00403bef8aa29a9e3f43cff142ac310e841044bf7052fedc2885f0168e WHIRLPOOL fe7fbc891d1bd49a6bfd8c43e634ddd989482b36a991dc50df910635e66f91b37a5482ca70d71485c360f0d2042eefbba3be46f7129e4425f10aeedf74855796
+EBUILD gnupg-2.0.26-r2.ebuild 4854 SHA256 a71843091396ca9e4beeb8feb0cfa36bdf6347c4576ad89535cf4bbf3492a98d SHA512 fdc8d8525f0673bb59fc3e1f6aec19beadf602e15ed14d00da3ccf99926d3e8bf052753eb706c07817035c4ad6294d7c601bedb5afce9dd42154041367eff0cf WHIRLPOOL 41ef8787be1cda4da2321c4eb972619425f8eb6e9a0c9d002b56a9c49f4c3097a1e048bf1e5afd98ceff5d7772bb0aca572c0de4f6126ee862a5c99ea2493d21
+EBUILD gnupg-2.0.26-r3.ebuild 4889 SHA256 48c2e76ad50604d0771c4feb68b1cbc79889ff79b494076dcd840baffa3c0bbb SHA512 d6e57d4003247c6ed163ff40c8e924807d7b67a5dc80a67dade78bbb50ccac1df5cee0c8cc7fad3461ccf298a9c08b4118325027d5684ddf06649403d90524bd WHIRLPOOL 8f68c021757b0240ddc0d33532c4cddea74abc34851885d62e78f75e84f5e4d1d8bd23127e5a8541ee1c48ba781aeea5e1ab452e128c4941326c5de7328ea922
 EBUILD gnupg-2.0.26.ebuild 4815 SHA256 c1dad0a216f9af5605619bfd4ccc6d02caf49051d3532ecc039966284a807dc4 SHA512 7bd67cd37735a92b45ec167f30b038a830c7da1834d6e7500768bae2a4c89e9c9994012d78f4d52f4ad520cf7a7e1e1b42125dcecc5f408da0e4dbfa40afbf45 WHIRLPOOL 3d4d532f357d949cb02d4e61f86a9d724c10212a9329abf600e1adf5be6430c24992e076b4674b5c66e332928530a6fec166c5838a2eaa9fe4845a6f80eeb02c
-EBUILD gnupg-2.1.1-r1.ebuild 4680 SHA256 0f77890747056f758c449ae0bd9a0d5698d8b8c2e3d7fcad8f23fae7829749f5 SHA512 413a7f072d8a6b7bb4a7c943e5ac4ec2475a915a767e168dc96e766b31e35055d77c8b8a66f88c83a3992a10dda1e6be6c18f42689525629695d9e78b98515f8 WHIRLPOOL b8dbbd2fafe07b1b079c3f03c2a257a3202c480bcff8966269d6edc95e0e7ec231e30865f0cb53f0821cfecc911358cface6867f99f4db3d4f5a458de9a20700
-MISC ChangeLog 83724 SHA256 fbadb08cbde30f07423c1f83beb486cdda97a28ae4ceda55b63f56394e090846 SHA512 904df72f2728e09f600d09a51753301af82964d29aa64942f2237191e27a7c57e6981862604d2ff40a2f258a55e40427d1acde063f9cb12ab9be0a1aa5e33c70 WHIRLPOOL fcd2eccac7c72a135de2924e48969eecb8a9016b142adcfd7247d4cb415f1db1d1075f2886123e2af72c20e9abbc9f529edc27172f71ca03c1a91ea4a86dc8b6
+EBUILD gnupg-2.1.1-r1.ebuild 4651 SHA256 3415ee14db62dca13fde95a14685fb49f90c395edab34f665c17ac730a83f261 SHA512 6538b2ec536934b8b1edcdc393dbdbdc69284ea0d2ee9ce355d3bdd85b304fbb89addb81bcb1ab38130b69611f3474a60d92412c4e3fdd0e67c7274468c30cb8 WHIRLPOOL 7851f46481863c72facb109bac2a566d42650d7e4df2c6b828fab9d149c45cd37a7d34b4c6b1b548bcd98561da8bc321c624c241475d88c1bcb650b2ec0c5ff6
+MISC ChangeLog 83964 SHA256 060526129c5d7adf553e75e40838367df695cd0efbe50525edaf847dac3994b7 SHA512 4cdd3302d6be97d267a3b1ab7afe145fdfb264d7f59f297677edc58a4c18077c502cfb6ccae7453fd9695837282263cac5ad45a6bedd3dd836e6dd80ef0fda83 WHIRLPOOL a921999f74634ba88017db17aa03487bfbf84337c6d95c29f516839c063e1a6eeff31d4b9bde3e8d8325a6c5986d0ea6276d06f4e7857f3cae61983ed87004bc
 MISC metadata.xml 1032 SHA256 cbef1621eb1364c8d12ac18e71cf4aabfced9ecd3c990a3f3cdf066902dc97bb SHA512 5e2ef4380effe027a0b0b8a11a29ed1996b3b5256ee333909d4a7cfcb18ea1e9dead9b8303c7dffc1ad10014dea79e827b1d84caa92294f4d3dfc29ff23a6af5 WHIRLPOOL a24c7f71ed140f34dd59b10314869d0c5482063be20faefa1591595feb856c79bc57a6b344dd467875cf3389d8cd14e2d41f2312f51d3b77dcbe27af97b7f129
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUxNG7AAoJELp701BxlEWf3UUQAJ6PUtl7guEZlvOlucQFdx3U
-1Nq6RUK+K/KJaxKQEKdjtC7bJ4YcxIE5camF4dxm4OxV7AB2te1n3K3ymSbeUp/B
-eJfUzyG01bQ61i22vRCw5I50Ad+EHSGeyHiqMG7nslNIpXPXqAoo2OwcxxzeUs0j
-clM5IEfVubzB8ZTzIcrsAwF40SGz/rd3Vi9ud53FQo/b5WrWAlsD5/u7f45czT/V
-F8AY+KrmTMNoWZdOJm+TtfrzNNCGQwDZ0Nomkf62aQbqMFra2RnMQ5+GBXWsPRzh
-wrdj82aJ0eFdoZ8LPkMrDrRQy2aLsh9xYhKtY1MfIFZf/FpGwpQS/boim+C95nQR
-PJElej631c9Z0rfnMO925pe/1vxx5C484KK1H2ja+Rm9HGM27QqdaTQmfMe0TSSP
-nIXYUxbR32MlRQoAWNPl/t/Dbwlb5taLjEBaE4CVL2WucEGAlKoldaPet4x8t+nP
-OEZeV5ddON/29W5Na3a53r8ljpwXqJRpuG24xQqN+vUWZP3a3zs83Ld+/1fNFJu0
-Z9pkW5X4/GrmJYmWwAMExNupIFKYRDw9w4+011pTxBQ0HiLjgpIYdSJmjslUI10b
-z3H7oYTecDAHyXUam1qt+9r3dqNvtysPDaf4FjU6gH/ixXg1XAKgXwvf5bjY+65e
-fsC7QgsGYt1Sey6nNl4/
-=aT/O
+iQEcBAEBCAAGBQJU2R1nAAoJEP7VAChXwav6ltgIAK2SZvxSPFf71QE/FZcRAx7Y
+atquHHXUKVKU9oLGkX11u7MtyEUaWVQ4Gt5FIytB8cDh0yUniuz8mSHMVt/tishY
+cYfPSsepK+8r/riE2aq0C0n6fV86ZqZt5uR5pW/7IMgMcuNIcVV+1KfVJlEQSAS9
+zzCito2A4IKe31mrLaIWk6PY0e4reI1Ts255NNSxTyRKOO+lQTiZqs4fdGGRb8z5
+LxhhTWv84V22Kssn1OLlYoDE0eJNLUEktG5IoG8OzVFKckP1vW+ud4lMQ1WGNXQk
+Q9FOmlTinJiGY9U64BFnOf0nanC7uUo1C3BNvt1alLIstG0+0UcEr3WtZhvYBms=
+=gvIF
 -----END PGP SIGNATURE-----

diff --git a/app-crypt/gnupg/gnupg-2.0.25.ebuild b/app-crypt/gnupg/gnupg-2.0.25.ebuild
index 5b7079bdba57f9af7865a078bbdeb0130b2ae57f..a3b300c2aae7d5df87818f166e763b1c06b5b79b 100644 (file)
--- a/app-crypt/gnupg/gnupg-2.0.25.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.25.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.25.ebuild,v 1.11 2014/07/12 18:57:31 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.25.ebuild,v 1.12 2015/02/09 20:49:42 k_f Exp $
 
 EAPI="5"
 
@@ -29,7 +29,7 @@ COMMON_DEPEND_LIBS="
        readline? ( sys-libs/readline )
        smartcard? ( usb? ( virtual/libusb:0 ) )
        ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
+COMMON_DEPEND_BINS="app-crypt/pinentry"
 
 # Existence of executables is checked during configuration.
 DEPEND="${COMMON_DEPEND_LIBS}

diff --git a/app-crypt/gnupg/gnupg-2.0.26-r2.ebuild b/app-crypt/gnupg/gnupg-2.0.26-r2.ebuild
index 4cd679e341504c80eceb5bc1709abdf3cc12b88e..b7848ee3380c3f2dfca0e97a4ddb001af7acf58e 100644 (file)
--- a/app-crypt/gnupg/gnupg-2.0.26-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.26-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.26-r2.ebuild,v 1.2 2014/09/17 18:11:19 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.26-r2.ebuild,v 1.3 2015/02/09 20:49:42 k_f Exp $
 
 EAPI="5"
 
@@ -28,7 +28,7 @@ COMMON_DEPEND_LIBS="
        readline? ( sys-libs/readline )
        smartcard? ( usb? ( virtual/libusb:0 ) )
        ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
+COMMON_DEPEND_BINS="app-crypt/pinentry"
 
 # Existence of executables is checked during configuration.
 DEPEND="${COMMON_DEPEND_LIBS}

diff --git a/app-crypt/gnupg/gnupg-2.0.26-r3.ebuild b/app-crypt/gnupg/gnupg-2.0.26-r3.ebuild
index e6e63c864b1930d0738e5eb316e902a9d4de644b..31315f47e1bb4b45c9e8bfc30a5cc5821bba0da8 100644 (file)
--- a/app-crypt/gnupg/gnupg-2.0.26-r3.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.26-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.26-r3.ebuild,v 1.9 2015/01/25 11:21:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.26-r3.ebuild,v 1.10 2015/02/09 20:49:42 k_f Exp $
 
 EAPI="5"
 
@@ -28,7 +28,7 @@ COMMON_DEPEND_LIBS="
        readline? ( sys-libs/readline )
        smartcard? ( usb? ( virtual/libusb:0 ) )
        ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
+COMMON_DEPEND_BINS="app-crypt/pinentry"
 
 # Existence of executables is checked during configuration.
 DEPEND="${COMMON_DEPEND_LIBS}

diff --git a/app-crypt/gnupg/gnupg-2.1.1-r1.ebuild b/app-crypt/gnupg/gnupg-2.1.1-r1.ebuild
index 86b3d16481f7ffa58b5c16b5001ece0eea8d3ff7..d28aed98da2ff3baaeb0cb67d727e6424f0db8e1 100644 (file)
--- a/app-crypt/gnupg/gnupg-2.1.1-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.1.1-r1.ebuild,v 1.2 2015/01/06 17:54:26 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.1.1-r1.ebuild,v 1.3 2015/02/09 20:49:42 k_f Exp $
 
 EAPI="5"
 
@@ -30,7 +30,7 @@ COMMON_DEPEND_LIBS="
        readline? ( sys-libs/readline )
        smartcard? ( usb? ( virtual/libusb:0 ) )
        "
-COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )
+COMMON_DEPEND_BINS="app-crypt/pinentry
                   !app-crypt/dirmngr"
 
 # Existence of executables is checked during configuration.