From d68b96a91558d9c57265f958e2fe1264413b6f71 Mon Sep 17 00:00:00 2001 From: Ian Delaney Date: Thu, 5 Feb 2015 02:09:40 +0000 Subject: [PATCH] bump; update HOMEPAGE & SRC_URI, rm disused patch and 0.3.6. required by bug #534534 Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xB8072B0D --- dev-python/python-gnupg/ChangeLog | 12 ++- dev-python/python-gnupg/Manifest | 16 ++-- .../python-gnupg-0.3.2-fast-random.patch | 88 ------------------- .../files/python-gnupg-0.3.7-msg-handle.patch | 31 +++++++ .../python-gnupg/python-gnupg-0.3.6.ebuild | 25 ------ .../python-gnupg/python-gnupg-0.3.7.ebuild | 26 ++++++ 6 files changed, 75 insertions(+), 123 deletions(-) delete mode 100644 dev-python/python-gnupg/files/python-gnupg-0.3.2-fast-random.patch create mode 100644 dev-python/python-gnupg/files/python-gnupg-0.3.7-msg-handle.patch delete mode 100644 dev-python/python-gnupg/python-gnupg-0.3.6.ebuild create mode 100644 dev-python/python-gnupg/python-gnupg-0.3.7.ebuild diff --git a/dev-python/python-gnupg/ChangeLog b/dev-python/python-gnupg/ChangeLog index de1ab9847ec3..4ac4a7e5c9ab 100644 --- a/dev-python/python-gnupg/ChangeLog +++ b/dev-python/python-gnupg/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-python/python-gnupg -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/python-gnupg/ChangeLog,v 1.10 2014/06/25 07:30:40 idella4 Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/python-gnupg/ChangeLog,v 1.11 2015/02/05 02:09:08 idella4 Exp $ + +*python-gnupg-0.3.7 (05 Feb 2015) + + 05 Feb 2015; Ian Delaney + +files/python-gnupg-0.3.7-msg-handle.patch, +python-gnupg-0.3.7.ebuild, + -files/python-gnupg-0.3.2-fast-random.patch, -python-gnupg-0.3.6.ebuild: + bump; update HOMEPAGE & SRC_URI, rm disused patch and 0.3.6. required by bug + #534534 25 Jun 2014; Ian Delaney python-gnupg-0.3.6.ebuild: drop py2.6 pypy2_0 add py3.4 supp. diff --git a/dev-python/python-gnupg/Manifest b/dev-python/python-gnupg/Manifest index c2d7f597db7c..d0c352c70ba8 100644 --- a/dev-python/python-gnupg/Manifest +++ b/dev-python/python-gnupg/Manifest @@ -1,16 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX python-gnupg-0.3.2-fast-random.patch 3310 SHA256 af6e0327805b10373e462f036e7e2f94de2376444497e613adfd2419659eb31f SHA512 56b0e30860d8ea9212d9b7ddf244b07dba8f580e09ed57b91bd3b7885fb9c2c14eea64d4d80a7b676806f734bc685178fd4571bed85b9467ddac0ed901ffa595 WHIRLPOOL 8b89c17dcae970ff225a60d0645e7c1b465a23969d62853f73891792ca3a5c0b2a8a503be6ce2354dd143f591bdb5a812bf7352e499550f55e81da1aada4fc27 AUX python-gnupg-0.3.6-skip-search-keys-tests.patch 731 SHA256 b7bbbbe0f043c42a2ccc3bdd33aecd9b1c368f745e2ac38783785784d11668aa SHA512 6e5ddce9865f57185713b836ec00aa479456343950d4a40edacf23ce88f155c9f73070684211bdf9cc8cb4c379ec12eea6589a0b9995ac9085ec2a7d6b8ed35f WHIRLPOOL de007a6377a8d8c75af60c5d8b689c7fc7da2fa6058e65a58475a31dc8557c126d17accb220126b96be35432521224bde76366546ce58d2afbda23bb43cfe456 -DIST python-gnupg-0.3.6.tar.gz 20855 SHA256 ffdfad1824fbde8ab94c50e08040edd6a82b4095c187994954471a38c45a094a SHA512 4444ce57190ddfdfbe8ebb39ecdf79ef2ab70f227e2f0b12ce913801b3949f444a458cc884883e8811d649537003afd722cd5c933765c045edf07867a51814f8 WHIRLPOOL 5d62cf023b0da3a0fde61f648f49b672f09bc5899a1f8c847d231dcc204c1c3192d7b7d28fe080b699e26b44d6074033d2788e142b9183c58940a1af2511a4d7 -EBUILD python-gnupg-0.3.6.ebuild 759 SHA256 0b466103d1a9053d37d2c9da3de6278060e400c31b6eeb6711a4605ea74046eb SHA512 6e2433bdd22071bd23d355accfe8e3d537dd0c38de0431c722a8a0b717e8e7e090c9b98bb11abe58c6af06171b72554a5b71107aa64b50f8e7392ced89bd9380 WHIRLPOOL 9801b556f76ce6a4c55213d330ec3b40a9af1a136c5920657aa863e9112317439cf69186d8369febcf79fcf07d8d6719235315ed4d05264074e4f196139d37e4 -MISC ChangeLog 1899 SHA256 c9b4bd0462d5efc1d9218f47bac3c22c6149800e19bd5efaaada5b2dd2f76836 SHA512 26a9cda23e330ea28135e705fe4a9a9cfdb11f03fb2ca617d417b8e552bbe7889d73c8b4ecc150461aed4dea670a24ac33b847415f43cffad8abf5a5cc412618 WHIRLPOOL 2dab13eaf577e6956c83fc2317969888b113f2d9a1482949b698d46568bbccd663393c36dbdee0ba362aa7f1b0628f4cfa7ed35f6693e0b310341d838cbfac6f +AUX python-gnupg-0.3.7-msg-handle.patch 1429 SHA256 9672d4d7d90e8dc4b7ec10386ce77eaa22a9f30770ff2aba30efa6d8012f11cd SHA512 2663a744d1a9c58b9f867a2c658f605f4f2e3bb1af37c0846df3c00dc3137fc23ec8cb87f7197ccd8cf4167a583025b619ec75fbb8bd6f0a34ca556ab486a98a WHIRLPOOL d79592ab383fe345abebd99913dd8f10d2828a0cff8e331636ee84daf161e38bcc36d9839e34a0e8bfd8d56bb652a4621865730bfa53832e1406b28e41a08de9 +DIST python-gnupg-0.3.7.tar.gz 48728 SHA256 2bf59ff55c036e49d5da12d370447679f14d242567df4c2c0fc61b4601ca0d59 SHA512 6166cef11307dd4782000ab7263778436998a816a45e4471fcbe244b123703bf9ded5bc6ef5cd47ed0c561ef42660980576edf57c62029bb0326642b7c538dd3 WHIRLPOOL 93770439486689dfcaf296d158c3978a71c72d32ba9f0e5b4ec4c97dfda16177ee5e06f0b616112cdfb9cd96c3a93700a0d4302116401c6146f3cd7437b7e29b +EBUILD python-gnupg-0.3.7.ebuild 813 SHA256 9733442426b05c15ed784c27f0f3f5231216b2a168ac3f609ec9e5b2a3dbcf58 SHA512 b41a9fbe3f789c0e3738d07358eb57b218b4d81f9f1f1667b4087e07f44aeccac60fd839b2d4abf66222c7263f68fa181e787358d21eb3bb0067c9e76726b08c WHIRLPOOL c3c7e93154dccca0d3b5d26b748ad60f75b901a27e63511ff0c6c31beaefa1b8985c81e3ffc1e6ac95a8a86ba0a32f30942354681d1f901638d6ce3bfcfeab4f +MISC ChangeLog 2221 SHA256 471f878624d3435caa4c3c654a466c3ac0ebd102590148ca6dbe6f3c91eaa691 SHA512 e8d1a6ef9fb7b1c44bd96015e7e776405c9e0342f2aa63bd1b1f39d4ffb3ccc49848321d50cb3c02c02bbfa811741eea41e3c2601ce449d3fd3be55548f02159 WHIRLPOOL d387a0c202e52e2777c751fd5e15069db379e261e4989b4f1d27fb510188eacdf53eecd5bb54554aea8d2baf3f47d156f9d4a259e04bead7806f656c70d2bd53 MISC metadata.xml 242 SHA256 7be3c0da93825240d34d52dc4a401662377a2f73effd5e68ff74683abea05319 SHA512 6c802a3ec463d34a01df8d1c03266d3dd95b2ecfc06e1ec0630428a7e1629290cc0aa0f5f475e2a01acfddda4e9a74d911eaeb3b7d46dd33aa93604aa77d4d01 WHIRLPOOL bdf635f697e9a6864b356377d4ffb931645a13b9e73c29945fc65ad127867ec6ac77f30690ff1051058c6823471fed1d7d40774a153d0e64d6469f3c0ab3c2fe -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iEYEAREIAAYFAlOqeLYACgkQso7CE7gHKw18+gCg3z+2ZJGUrNxYY/uqKEQuwUOr -01MAn0L7pOS5EMP+ce8kukayotJ3G+rt -=/GmW +iEYEAREIAAYFAlTS0NgACgkQso7CE7gHKw28PACfcw7keCdS8eaElR2oOVR7A1eA +a14AoK9OLg1pnGtn1A7hqrBjUm6FQBhm +=eHUM -----END PGP SIGNATURE----- diff --git a/dev-python/python-gnupg/files/python-gnupg-0.3.2-fast-random.patch b/dev-python/python-gnupg/files/python-gnupg-0.3.2-fast-random.patch deleted file mode 100644 index 53ad5388963c..000000000000 --- a/dev-python/python-gnupg/files/python-gnupg-0.3.2-fast-random.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 0dc9665f3aa31ff2f4dc0d7fe6838295fa27b2df Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Sun, 20 Jan 2013 14:58:30 +0100 -Subject: [PATCH] Use quick random source for tests (now with doctests). - -Pass --debug-quick-random to gpg in order to enable the fast random -source. Good random is not really useful for tests while it makes them -awfully slow. ---- - gnupg.py | 12 ++++++------ - test_gnupg.py | 3 ++- - 2 files changed, 8 insertions(+), 7 deletions(-) - -diff --git a/gnupg.py b/gnupg.py -index e279116..9366961 100644 ---- a/gnupg.py -+++ b/gnupg.py -@@ -694,7 +694,7 @@ class GPG(object): - def verify(self, data): - """Verify the signature on the contents of the string 'data' - -- >>> gpg = GPG(gnupghome="keys") -+ >>> gpg = GPG(gnupghome="keys", options=['--debug-quick-random']) - >>> input = gpg.gen_key_input(Passphrase='foo') - >>> key = gpg.gen_key(input) - >>> assert key -@@ -745,7 +745,7 @@ class GPG(object): - - >>> import shutil - >>> shutil.rmtree("keys") -- >>> gpg = GPG(gnupghome="keys") -+ >>> gpg = GPG(gnupghome="keys", options=['--debug-quick-random']) - >>> input = gpg.gen_key_input() - >>> result = gpg.gen_key(input) - >>> print1 = result.fingerprint -@@ -798,7 +798,7 @@ class GPG(object): - - >>> import shutil - >>> shutil.rmtree("keys") -- >>> gpg = GPG(gnupghome="keys") -+ >>> gpg = GPG(gnupghome="keys", options=['--debug-quick-random']) - >>> result = gpg.recv_keys('pgp.mit.edu', '3FF0DB166A7476EA') - >>> assert result - -@@ -848,7 +848,7 @@ class GPG(object): - - >>> import shutil - >>> shutil.rmtree("keys") -- >>> gpg = GPG(gnupghome="keys") -+ >>> gpg = GPG(gnupghome="keys", options=['--debug-quick-random']) - >>> input = gpg.gen_key_input() - >>> result = gpg.gen_key(input) - >>> print1 = result.fingerprint -@@ -894,7 +894,7 @@ class GPG(object): - """Generate a key; you might use gen_key_input() to create the - control input. - -- >>> gpg = GPG(gnupghome="keys") -+ >>> gpg = GPG(gnupghome="keys", options=['--debug-quick-random']) - >>> input = gpg.gen_key_input() - >>> result = gpg.gen_key(input) - >>> assert result -@@ -994,7 +994,7 @@ class GPG(object): - >>> import shutil - >>> if os.path.exists("keys"): - ... shutil.rmtree("keys") -- >>> gpg = GPG(gnupghome="keys") -+ >>> gpg = GPG(gnupghome="keys", options=['--debug-quick-random']) - >>> input = gpg.gen_key_input(passphrase='foo') - >>> result = gpg.gen_key(input) - >>> print1 = result.fingerprint -diff --git a/test_gnupg.py b/test_gnupg.py -index d5aed97..5258d97 100644 ---- a/test_gnupg.py -+++ b/test_gnupg.py -@@ -96,7 +96,8 @@ class GPGTestCase(unittest.TestCase): - "Not a directory: %s" % hd) - shutil.rmtree(hd) - self.homedir = hd -- self.gpg = gnupg.GPG(gnupghome=hd, gpgbinary='gpg') -+ self.gpg = gnupg.GPG(gnupghome=hd, gpgbinary='gpg', -+ options=['--debug-quick-random']) - - def test_environment(self): - "Test the environment by ensuring that setup worked" --- -1.8.1.1 - diff --git a/dev-python/python-gnupg/files/python-gnupg-0.3.7-msg-handle.patch b/dev-python/python-gnupg/files/python-gnupg-0.3.7-msg-handle.patch new file mode 100644 index 000000000000..9f4b6f562ce7 --- /dev/null +++ b/dev-python/python-gnupg/files/python-gnupg-0.3.7-msg-handle.patch @@ -0,0 +1,31 @@ +https://bitbucket.org/vinay.sajip/python-gnupg/commits/79c73a9ce6e33555246f9dae2ef4be9964e2704b +# HG changeset patch +# User Vinay Sajip +# Date 1419023737 0 +# Node ID 79c73a9ce6e33555246f9dae2ef4be9964e2704b +# Parent 767aa49b175738b6d0404a2fb2fca3e3c081e0a8 +Closes #22: handled PROGRESS messages during verification and signing. + +diff --git a/gnupg.py b/gnupg.py +--- a/gnupg.py ++++ b/gnupg.py +@@ -221,7 +221,8 @@ + "PLAINTEXT_LENGTH", "POLICY_URL", "DECRYPTION_INFO", + "DECRYPTION_OKAY", "INV_SGNR", "FILE_START", "FILE_ERROR", + "FILE_DONE", "PKA_TRUST_GOOD", "PKA_TRUST_BAD", "BADMDC", +- "GOODMDC", "NO_SGNR", "NOTATION_NAME", "NOTATION_DATA"): ++ "GOODMDC", "NO_SGNR", "NOTATION_NAME", "NOTATION_DATA", ++ "PROGRESS"): + pass + elif key == "BADSIG": + self.valid = False +@@ -601,7 +602,7 @@ + if key in ("USERID_HINT", "NEED_PASSPHRASE", "BAD_PASSPHRASE", + "GOOD_PASSPHRASE", "BEGIN_SIGNING", "CARDCTRL", "INV_SGNR", + "NO_SGNR", "MISSING_PASSPHRASE", "NEED_PASSPHRASE_PIN", +- "SC_OP_FAILURE", "SC_OP_SUCCESS"): ++ "SC_OP_FAILURE", "SC_OP_SUCCESS", "PROGRESS"): + pass + elif key in ("KEYEXPIRED", "SIGEXPIRED"): + self.status = 'key expired' + diff --git a/dev-python/python-gnupg/python-gnupg-0.3.6.ebuild b/dev-python/python-gnupg/python-gnupg-0.3.6.ebuild deleted file mode 100644 index b9d8a524cf8a..000000000000 --- a/dev-python/python-gnupg/python-gnupg-0.3.6.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/python-gnupg/python-gnupg-0.3.6.ebuild,v 1.3 2014/06/25 07:30:40 idella4 Exp $ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy ) - -inherit distutils-r1 - -DESCRIPTION="Python wrapper for GNU Privacy Guard" -HOMEPAGE="http://pythonhosted.org/python-gnupg/ https://bitbucket.org/vinay.sajip/python-gnupg" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND="app-crypt/gnupg" - -PATCHES=( "${FILESDIR}"/${P}-skip-search-keys-tests.patch ) - -python_test() { - cd "${BUILD_DIR}" || die - "${PYTHON}" "${S}"/test_gnupg.py || die "Tests fail with ${EPYTHON}" -} diff --git a/dev-python/python-gnupg/python-gnupg-0.3.7.ebuild b/dev-python/python-gnupg/python-gnupg-0.3.7.ebuild new file mode 100644 index 000000000000..896bcfa24c75 --- /dev/null +++ b/dev-python/python-gnupg/python-gnupg-0.3.7.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/python-gnupg/python-gnupg-0.3.7.ebuild,v 1.1 2015/02/05 02:09:08 idella4 Exp $ + +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) + +inherit distutils-r1 + +DESCRIPTION="Python wrapper for GNU Privacy Guard" +HOMEPAGE="http://pythonhosted.org/python-gnupg/ https://github.com/vsajip/python-gnupg/" +SRC_URI="https://github.com/vsajip/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="app-crypt/gnupg" + +PATCHES=( "${FILESDIR}"/${PN}-0.3.6-skip-search-keys-tests.patch + "${FILESDIR}"/${P}-msg-handle.patch ) + +python_test() { +# cd "${BUILD_DIR}" || die + "${PYTHON}" test_gnupg.py || die "Tests fail with ${EPYTHON}" +} -- 2.26.2