diff options
author | Kristian Fiskerstrand <k_f@gentoo.org> | 2014-11-06 16:50:05 +0000 |
---|---|---|
committer | Kristian Fiskerstrand <k_f@gentoo.org> | 2014-11-06 16:50:05 +0000 |
commit | 74fbb0918a13af47b49fa27a049318695a03963e (patch) | |
tree | 748e0905087e6036dc79f396fa47fac95941d15c | |
parent | Bump GnuPG 2.1 branch to final release. Fix bug #525154 (diff) | |
download | historical-74fbb0918a13af47b49fa27a049318695a03963e.tar.gz historical-74fbb0918a13af47b49fa27a049318695a03963e.tar.bz2 historical-74fbb0918a13af47b49fa27a049318695a03963e.zip |
Bump version to 2.0.0, fixes bug #521822
Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0xFC3B17DE05E136A0!
-rw-r--r-- | app-crypt/monkeysign/ChangeLog | 9 | ||||
-rw-r--r-- | app-crypt/monkeysign/Manifest | 32 | ||||
-rw-r--r-- | app-crypt/monkeysign/files/monkeysign-1.2-test-no-emit-version.patch | 20 | ||||
-rw-r--r-- | app-crypt/monkeysign/files/monkeysign-2.0.0-rst2s5.patch | 17 | ||||
-rw-r--r-- | app-crypt/monkeysign/monkeysign-2.0.0.ebuild | 48 |
5 files changed, 111 insertions, 15 deletions
diff --git a/app-crypt/monkeysign/ChangeLog b/app-crypt/monkeysign/ChangeLog index 27aee2a45587..6703aaaf389f 100644 --- a/app-crypt/monkeysign/ChangeLog +++ b/app-crypt/monkeysign/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-crypt/monkeysign # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/monkeysign/ChangeLog,v 1.4 2014/07/29 11:07:53 k_f Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/monkeysign/ChangeLog,v 1.5 2014/11/06 16:50:01 k_f Exp $ + +*monkeysign-2.0.0 (06 Nov 2014) + + 06 Nov 2014; Kristian Fiskerstrand <k_f@gentoo.org> + +files/monkeysign-1.2-test-no-emit-version.patch, + +files/monkeysign-2.0.0-rst2s5.patch, +monkeysign-2.0.0.ebuild: + Bump version to 2.0.0, fixes bug #521822 *monkeysign-1.1-r2 (29 Jul 2014) diff --git a/app-crypt/monkeysign/Manifest b/app-crypt/monkeysign/Manifest index 9023a47caeee..455389b2085e 100644 --- a/app-crypt/monkeysign/Manifest +++ b/app-crypt/monkeysign/Manifest @@ -3,24 +3,28 @@ Hash: SHA256 AUX monkeysign-1.1-basename.patch 393 SHA256 68fd68a6c2aad7780a6e940c12d55f65cbcf06e2574b5537e066fcd300b5066c SHA512 ae9e01a6aff91231c700f1e46ef7f4dabed8ba6d3d3a275bb6405b767bcb6f40c96ff7563fe693a17d76e26b63b2ccb0e66e834e910cef5bb94d2a9f9cd366d3 WHIRLPOOL 05f6ed59a288d8868e0ec4faf8e7f5a0c2a14cfee860d3562cb50035544d4130ab95c9d1e2f1ccb0e1c4af70ef1a4b2cac88c29751148af00dc94bc5a680ffc6 AUX monkeysign-1.1-rst2s5.patch 707 SHA256 2f33fb58d6e556f9b36680d87e962e361bc5f326f3e5b12a8ffa2de77d3080aa SHA512 21d6248a8e116899337aa20c48fc42233a4b9e4974a664e59e2a4211d503d7194ece0e4ae637e7a64c40d015845ab0c9617e30cd9baea9866445952840be8ebb WHIRLPOOL b8b5e7cf5af843bbc077a32c8a941f65c717703966e480405e40c4094d4f1eac6eb89f61a88702571ffed7f46532805a47ee403d600aeee9e40254a722857af2 +AUX monkeysign-1.2-test-no-emit-version.patch 976 SHA256 90f07300b39ef19856713d2fdc7c67290cc72f8e8eefc428c441db0384d6e6cd SHA512 54d346472c3eb87933ff776689e7fdaf601f6dbaf1f1491e9f56bf0095f39093a37caef8f83e410888584f33f93f6a942daa0b58e92f132896e38c2a49898696 WHIRLPOOL bd96c12dd93becd93f38c3a0d181003480a7b5cab5c8935c85ccb44f95b6aba3637b57ccf6bc963e0c3bc05ede8acf6fdea674741e2ba6330b58888334bdd102 +AUX monkeysign-2.0.0-rst2s5.patch 963 SHA256 ba648d952f4175fa12beb346442dfcb58702ed0ee6d1100b18238c305e68368c SHA512 c738d3a29dd272fe7bbc1108371b302d3b551bb61c8a2725c39ae57804f67539fd9fc2222fe9a53d2b2a213280b6c1707dc9f8fdc541264216f92799d7930d58 WHIRLPOOL 9840e2deee4fd8c5b3baf77a4ade21be4520e124b6cfa36b011d4f1410ccef45c9312096a01391f361220358656242884dc0b325db362fac7a4c80566c5760df AUX monkeysign.desktop 188 SHA256 c1bcfa18ddddedf08c90f790ffd598248f580aca362f56f134fe4238b5de2a15 SHA512 e2418323721dd5eb8859558be5693c0ee5d970edb967a3fefb58876802f431cddeccd87708936141d0d691563a1321930fbe28cf753d069441e33de7666c5d99 WHIRLPOOL dc41569388dd9bfa2861519a795c8f62021c8a44ba4211c660c300542e7bf23f66641677079ba13ece520fbee1d9da621ba31114dcdeab777ba509edfbe777d5 DIST monkeysign_1.1.tar.gz 54807 SHA256 1229c63c9b649b35a156ab69c7e8ef47ff03817c94ce8138107832117ee5fa6d SHA512 8d1e719633291a3ba9efda8057e8b27b41b8e767db68dc02ca07d18579123b0704f0424ae982f047948620027581589d21ae44470137d1f2ff85f1f360bfd512 WHIRLPOOL 907c65d8ec3a5bbc391dfaa91625a215456989d000e1334687cae3ebcec419b10f34bd65c04d170a6130b21b761ac1b7e9db9f9a1b3fa9ba6ec72d893f7464b9 +DIST monkeysign_2.0.0.tar.xz 1002672 SHA256 819c76725ff25e211feabaaea301f5b3d2d475a9cade1ae778bad5c058263e9a SHA512 e4e7094ac3fd4351d7c36c79645fdcf46b344deb95ce46fdc079dadfce227ede178241ba3d15f5b6b2941fd0d199d61854942bc455b40f0b65653c3764445309 WHIRLPOOL 4d9902a388216c7a00392474284cce8f93deed339d5ee453bff6f21b5e145854910f40556a44fe79c9dcf573b00cb9535b575908a34bd4234866c91261140458 EBUILD monkeysign-1.1-r2.ebuild 1046 SHA256 a114cdc84d711c9e3508c0b4c504f7c08985b9ec5c07b7c85dfa0c7c039f6b0d SHA512 00433bd0e313276718f5d1f477a6f65e413399b60a932e90ec523c6497733787d6f1ee56710b97c300ea0d164ce326ce5f12bff669f8a0374bdbbd03b708b1ff WHIRLPOOL a5b8e430f4f09734df69d322290958f18e7442ef2162862b66d3c7681829de0fb1e51f3b68a0850bbf83953a73cb22f64bcb25873075a2ffa63a045ea038e035 -MISC ChangeLog 998 SHA256 4fa6fc2b2f9ab419a5b67266539c99f712b4d510ace7e2f7614aca267ca9501c SHA512 7212a6a1cd02ebefd59774b81f1b142f23dcbf95cee56a443dd0f40232796ee875a370009b51a0e039252ad58a4c44a1d4a6ef1857bcf459274211c2120b38a0 WHIRLPOOL 6d7746abce9919fa2833fc678904da54db2c5804d58437d81bf9a9f236ad03c83e0997ad2298d1fd55bd10b35e591b733e5ce0ce0b0d01a9cd11ec38d915e79d +EBUILD monkeysign-2.0.0.ebuild 1184 SHA256 c07b0812a8a57a96d41d61782d9d0756edf3718cb453f6476a0afe301326116e SHA512 5297f132ce97ac775d7792992313b5eb0f7dbfb98e9b679298aa9475a056a37c59ec61583ae30ff1f0a201d8b1b03069a4c0d70755a0419051c80a96afd4d21e WHIRLPOOL 2901aea75e5946032eff572e5b9ad822f346d84c536dbfd5360e1c00ab8041a867eadaba499e4e5af59a1c7a32dd678971d7f6af505db3094c624585cb9771d7 +MISC ChangeLog 1247 SHA256 f8d55ac90eecb03f8d08acff259ce5e2fb38f0ab83acd5e0c61635915528047f SHA512 cb56d7906b09bc7563219492e335ef8e7f20779475bb8b8c116ea250c12e3329b2b50035ba539a45e54d526a0b7be3bbb31018399bfbe14e90585329afba7418 WHIRLPOOL 78c655f343113692227b40c8242d886c49d3eb3f2a57402dbd758e9cced92b73cc26317cb985bbeb17d5fade469ef8985570677d76a524ba404d19559af1c9f6 MISC metadata.xml 237 SHA256 5c58f0c8f9a9d5f50383f6cb306cf688924be830a0be08ede1ae7866c3566c2c SHA512 cd2f27119bff3427ab44b55caf2fc21ed3f56ab1251747a8213ad9914aa284e23e922c73018307a22ccd359906e4b82222a4dab35ef9469129dbc79b4b403b4f WHIRLPOOL 3f039cb8a9e18e11bf4dbd398f81a1b47f4e0a17bf53cb8f642f6cdeeaa13731307111e2f6d34689046a545de8c988a5bf0121473aac548affcb7352ebb1f590 -----BEGIN PGP SIGNATURE----- -iQIcBAEBCAAGBQJT14A7AAoJEPw7F94F4Tagdi0P/3d1V1pMKq1qs6eJDcxRDZY4 -UXj5j9N3N1X9TXuTsplL4SO1BYRy7tpthKLNBGfngs2GOoSNtgttdRNnf/BJreYe -Qq8zWbjYxpA0635/fX/KMhYHeWA4MrSBMtEt9WpfTdN5KX5eIv7FWQuP9Rr6yivW -9xcZ78r3RQ5t/HnjaYmin7tmiXipx22a2LZjD17E9fL2C336EgA+R/wrWUvBBPhZ -0cvrizF4HBU5NkiLIRJBsjYbaWaVyF/cOcXpZh6Cf0SW0+I/Bsv6XFl8xuaxPiZ6 -UwTLoH5BKhZSBCtGb+ZDhdch/7pwz1h7srOVVqRvr/wPv/XNccrLsgjT0DfeFB1u -mA0xbV4dyhM0+zx+tjhF0qlBQ+IbhhzSJ45Gity7i5uJ92LHVUKw5fKok4FneG7q -AWQMK8kX+2EysNvvz+qi6gs6fKZvFxulOgGO7HoF0ffGrdgF99LJMX4xhHHyotCm -/mCzbJr9l0zMu4GfqNAuRjZjdfVTNz+vIhee6ejMk/aKMdAvp72TpW3dDBV5LB3E -Xw5T8AbhbIwnqLkLubB8meQ6DRPuJ+7wxy9YY03m/0biBQxsM1KlYiVNluZhDKFW -GMBdwgNBrv9WkWMNiPXzayLGOh70Zh3rAXjtHOTekUIY3VzoQduNIX8pqwGscIU6 -6FkA2BWwz3SSQNf7O4+y -=GHj8 +iQIcBAEBCAAGBQJUW6a5AAoJEPw7F94F4TagyMkQAKCkW2/S+q2XJxn2t5W2E1zz +frPr5I1PiY0I7llxqgcgRWVJnMDX3FTYbETogDy2lyww+ksVeraJi7R06HNMf8RA +PAQDJCzlTCl2GHRMssTZ17eaT+J45++5lgaUL7wFWVFL4Cjud+ucHHMuDZjQFeM4 +5sl9r9G7Vc/k8heaGa5zyy20AHTO0PraBV5GDktxsR/+9bcEoVz+xQvqN4GiXnK1 +sc8Al5MY1gpg59Wc462/DNFNpkI+m2NeCmsnLk+pV0w0zW4b9DFu5FLMWUWEPIs6 +fiZYyH0y17yah8p2F+MGsBMXotBl7XR8j+/6xwA8XDYtNEQBuJTEFCtWTsbMecvn +a3IrfHoxWJbeBPMRNtnkGYpPofJydn/UqHwY2C1z0a81vKxIRfxTNXlmJ07zqdVk +vE0PioTo3aCBzodGtWDZ/H0LPxYWuNVsa3PwckAal1wMQMp8lBgEvNF9ghmsmxIr +b8ARG+OLducuTHy8ueKvqQ2mjmD9MBG3R+/9WP9yX33oXC1eS6DfvRgGnbqBrC5D +oYm/0KdUIe7OjAy51gB5RwXOftuqY/jjG/e7fn0vySZ9YE7LiXJrlEK1guJjJR9i +b4cyRUcHOmtU/JFVnWIGQ0JyITAll1bf6mTKMB+CnJZXiTQaPfOY4mcwh3retohy +2IomEed6tRhv2kFVXQXL +=/VFt -----END PGP SIGNATURE----- diff --git a/app-crypt/monkeysign/files/monkeysign-1.2-test-no-emit-version.patch b/app-crypt/monkeysign/files/monkeysign-1.2-test-no-emit-version.patch new file mode 100644 index 000000000000..4162c357f44b --- /dev/null +++ b/app-crypt/monkeysign/files/monkeysign-1.2-test-no-emit-version.patch @@ -0,0 +1,20 @@ +diff -r cd828dc1ffd9 tests/96F47C6A.asc +--- a/tests/96F47C6A.asc Tue Sep 02 17:54:40 2014 +0200 ++++ b/tests/96F47C6A.asc Tue Sep 02 17:55:56 2014 +0200 +@@ -1,5 +1,4 @@ + -----BEGIN PGP PUBLIC KEY BLOCK----- +-Version: GnuPG v1.4.12 (GNU/Linux) + + mI0EUAlt9AEEAMVygQA7sGE7xS5lGk8bPK7vtBuNAb9ETjXmC8jPLZ35KTviRq1c + NfFl0J66ObgcLEQjl84GMQ6Du6qLDAAgwi/2TqzmoGljXEiOd+lePBOhEV7WgkTx +diff -r cd828dc1ffd9 tests/test_gpg.py +--- a/tests/test_gpg.py Tue Sep 02 17:54:40 2014 +0200 ++++ b/tests/test_gpg.py Tue Sep 02 17:55:56 2014 +0200 +@@ -150,6 +150,7 @@ + self.assertTrue(self.gpg.import_data(open(os.path.dirname(__file__) + '/96F47C6A.asc').read())) + k1 = open(os.path.dirname(__file__) + '/96F47C6A.asc').read() + self.gpg.context.set_option('armor') ++ self.gpg.context.set_option('no-emit-version') + self.gpg.context.set_option('export-options', 'export-minimal') + k2 = self.gpg.export_data('96F47C6A') + self.assertEqual(k1,k2) diff --git a/app-crypt/monkeysign/files/monkeysign-2.0.0-rst2s5.patch b/app-crypt/monkeysign/files/monkeysign-2.0.0-rst2s5.patch new file mode 100644 index 000000000000..2c3c66c884ed --- /dev/null +++ b/app-crypt/monkeysign/files/monkeysign-2.0.0-rst2s5.patch @@ -0,0 +1,17 @@ +diff -r 9cf95971dd10 monkeysign/documentation.py +--- a/monkeysign/documentation.py Sun Oct 19 12:34:21 2014 -0400 ++++ b/monkeysign/documentation.py Sun Oct 19 12:35:30 2014 -0400 +@@ -161,11 +161,11 @@ + def run(self): + html = os.path.join(os.path.dirname(self.file), os.path.splitext(os.path.basename(self.file))[0] + '.html') + self.announce('processing slides from %s to %s' % (self.file, html), 2) +- os.system('rst2s5 --theme default "%s" "%s"' % (self.file, html)) ++ os.system('rst2s5.py --theme default "%s" "%s"' % (self.file, html)) + + def has_rst2s5(build): + """predicate for this class: do not fail if rst2s5 is missing""" +- return (os.system('rst2s5 < /dev/null > /dev/null') == 0) ++ return (os.system('rst2s5.py < /dev/null > /dev/null') == 0) + + # (function, predicate), see http://docs.python.org/2/distutils/apiref.html#distutils.cmd.Command.sub_commands + build.sub_commands.append(('build_manpage', None)) diff --git a/app-crypt/monkeysign/monkeysign-2.0.0.ebuild b/app-crypt/monkeysign/monkeysign-2.0.0.ebuild new file mode 100644 index 000000000000..7f99eb708da7 --- /dev/null +++ b/app-crypt/monkeysign/monkeysign-2.0.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-crypt/monkeysign/monkeysign-2.0.0.ebuild,v 1.1 2014/11/06 16:50:01 k_f Exp $ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 + +DESCRIPTION="A user-friendly commandline tool to sign OpenGPG keys" +HOMEPAGE="http://web.monkeysphere.info/monkeysign/" + +SRC_URI="mirror://debian/pool/main/m/monkeysign/monkeysign_${PV}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +CDEPEND="dev-python/pygtk:2[${PYTHON_USEDEP}] + media-gfx/zbar:0[python,gtk,imagemagick] + media-gfx/qrencode-python[${PYTHON_USEDEP}] + virtual/python-imaging[${PYTHON_USEDEP}]" + +DEPEND="dev-python/docutils[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + app-arch/xz-utils + ${CDEPEND}" + +RDEPEND="app-crypt/gnupg + virtual/mta + ${CDEPEND}" + +PATCHES=("${FILESDIR}/${PN}-1.1-basename.patch" + "${FILESDIR}/${P}-rst2s5.patch" + "${FILESDIR}/${PN}-1.2-test-no-emit-version.patch" + ) + +python_test() +{ + "${PYTHON}" ./test.py || die "Tests fails" +} + +python_install_all() +{ + distutils-r1_python_install_all + domenu "${FILESDIR}/monkeysign.desktop" +} |