From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- app-admin/xkcdpass/Manifest | 5 +- .../xkcdpass/files/xkcdpass-manpage-fix.patch | 89 ++++++++++++++++++++++ app-admin/xkcdpass/xkcdpass-1.17.3-r1.ebuild | 38 --------- app-admin/xkcdpass/xkcdpass-1.17.6-r1.ebuild | 40 ++++++++++ app-admin/xkcdpass/xkcdpass-1.17.6.ebuild | 38 --------- 5 files changed, 131 insertions(+), 79 deletions(-) create mode 100644 app-admin/xkcdpass/files/xkcdpass-manpage-fix.patch delete mode 100644 app-admin/xkcdpass/xkcdpass-1.17.3-r1.ebuild create mode 100644 app-admin/xkcdpass/xkcdpass-1.17.6-r1.ebuild delete mode 100644 app-admin/xkcdpass/xkcdpass-1.17.6.ebuild (limited to 'app-admin/xkcdpass') diff --git a/app-admin/xkcdpass/Manifest b/app-admin/xkcdpass/Manifest index 433aeed9eb92..1df878e426d0 100644 --- a/app-admin/xkcdpass/Manifest +++ b/app-admin/xkcdpass/Manifest @@ -1,5 +1,4 @@ -DIST xkcdpass-1.17.3.tar.gz 2072127 BLAKE2B 20339e7a0fd43f86eb83d89774613fa0009a13ca190be7d36edb8244b7d2e0b48041b3f8c7156c04e4d2dbae0c4475f5f1e577701e651146acab1284aa6c032d SHA512 5359b0b4e3076c2b385773862ff03e3700888d1ae967a26c5b19add3c9d2cde179ed5ad3309c5b53ab6cdbd40c8fedae1f6b9b0483dba83858671f9d816efc6c +AUX xkcdpass-manpage-fix.patch 1806 BLAKE2B fd959982af5a44cf478ebc93196f7f341d49de754d0620707ee5fd5df9bc13d395de271298e413bb92b8df38ad66b9c2430ed1ab59159cd0372f79b20e571c9c SHA512 ade31ad878cf3d5e70ca5098a87abbfdbfdbc540f3ab2efb6f7baba2e9009aab657eddaf5a5ce67c046b4b232087a93a2e7b7d1cc3738f0441445803eceb0763 DIST xkcdpass-1.17.6.tar.gz 8216233 BLAKE2B dc6f8b1bf76eba5271bf6027baf6bfbe5a18081ac85970ba35be3d0cf4e08d98d60b8bc819c05512aab94d621cf93fe9dca74a0108cdd4d94ad6ae830c28d3c2 SHA512 db47d6f0d5711e1aa4520fa3afb78b085b2e5a7599fa7eecbc3f806f5c7edceae9c54c250923147c87a837b54b5efd0d8f34f9c08e3104341f1243de0edf87f9 -EBUILD xkcdpass-1.17.3-r1.ebuild 1009 BLAKE2B a3991895c35ff553f4056980fd67a004816d68b6f0b6d28815414ad1cc2ddcbc0839d39461ded2239c1335e5ae714ad3cd3c23afec4d7a09cd6abe2e22715b18 SHA512 6def3e8fd519f60f85bcee30e6384d76713ea75f88289535ad1988c70612d4c440983ff254c325c5b25226f23f17459043d177e27e93b0e6fc3708e31eba9535 -EBUILD xkcdpass-1.17.6.ebuild 1009 BLAKE2B a3991895c35ff553f4056980fd67a004816d68b6f0b6d28815414ad1cc2ddcbc0839d39461ded2239c1335e5ae714ad3cd3c23afec4d7a09cd6abe2e22715b18 SHA512 6def3e8fd519f60f85bcee30e6384d76713ea75f88289535ad1988c70612d4c440983ff254c325c5b25226f23f17459043d177e27e93b0e6fc3708e31eba9535 +EBUILD xkcdpass-1.17.6-r1.ebuild 1068 BLAKE2B 4c77abcd9bc8a29dc14362c5cd7d5f6493ccd1c7adf2f062013532bd55c269e6340ab047bbabfb3d39a82b4267979bc1026253fa8e72a7cd72acacd7a1e90741 SHA512 7f1716b5bd67c36a945c0b82f868dd723ecbc171b0ac06314e89cff923ae071b6120321c5b2f18b1433e91240061f23fe68e73ea7f15efb3fc1334d7ccda72c9 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784 diff --git a/app-admin/xkcdpass/files/xkcdpass-manpage-fix.patch b/app-admin/xkcdpass/files/xkcdpass-manpage-fix.patch new file mode 100644 index 000000000000..a4d9e3464ce8 --- /dev/null +++ b/app-admin/xkcdpass/files/xkcdpass-manpage-fix.patch @@ -0,0 +1,89 @@ +diff -ur xkcdpass-1.17.6/xkcdpass.1 xkcdpass-1.17.6.new/xkcdpass.1 +--- xkcdpass-1.17.6/xkcdpass.1 2021-02-26 12:58:59.441739487 -0600 ++++ xkcdpass-1.17.6.new/xkcdpass.1 2021-02-26 13:11:21.195161091 -0600 +@@ -1,40 +1,14 @@ +-.SH xkcdpass +-.SS generate memorable, secure multiword passphrases +-.TP +-.B Author +-|authorname| |authoremail| +-.RS +-.RE +-.TP +-.B Date +-2015\-01\-17 +-.RS +-.RE +-.TP +-.B Copyright +-BSD license, attribution and disclaimer required, no endorsement +-allowed. +-.RS +-.RE +-.TP +-.B Manual section +-1 +-.RS +-.RE +-.TP +-.B Manual group +-Admin +-.RS +-.RE +-.SS SYNOPSIS +-.PP +-\f[B]xkcdpass\f[] [ option ... +-] +-.PD 0 +-.P +-.PD +-\f[B]xkcdpass\f[] \f[B]\-\-help\f[] +-.SS DESCRIPTION ++.TH xkcdpass 1 ++.SH NAME ++xkcdpass - generate memorable, secure multiword passphrases ++.SH SYNOPSIS ++.PP ++.B xkcdpass ++[ options ] ++.br ++.B xkcdpass ++--help ++.SH DESCRIPTION + .PP + A flexible and scriptable password generator which generates strong + passphrases, inspired by XKCD 936: +@@ -45,7 +19,7 @@ + >\ correct\ horse\ battery\ staple + \f[] + .fi +-.SS OPTIONS ++.SH OPTIONS + .PP + \f[B]\-\-help\f[] + .RS +@@ -156,22 +130,14 @@ + \f[] + .fi + .RE +-.SS HISTORY ++.SH HISTORY + .PP + The \f[B]xkcdpass\f[] command invokes the Python program + \f[C]xkcd_password.py\f[]. + .PP +-The inspiration for the program\[aq]s purpose is the XKCD 936_ “Password ++The inspiration for the program\[aq]s purpose is the XKCD 936 “Password + Strength” cartoon. + .PP + The application is maintained by Steven Tobin <>. + .PP + This manual page was written by |authorname| |authoremail|. +-.SS +-.RS +-.PP +-Local variables: mode: rst coding: utf\-8 time\-stamp\-format: +-"%:y\-%02m\-%02d" time\-stamp\-start: "^:Date:[ ]+" time\-stamp\-end: +-"$" time\-stamp\-line\-limit: 20 End: vim: filetype=rst +-fileencoding=utf\-8 : +-.RE diff --git a/app-admin/xkcdpass/xkcdpass-1.17.3-r1.ebuild b/app-admin/xkcdpass/xkcdpass-1.17.3-r1.ebuild deleted file mode 100644 index 172601c94032..000000000000 --- a/app-admin/xkcdpass/xkcdpass-1.17.3-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 - -DESCRIPTION="Password generator inspired by XKCD 936" -HOMEPAGE="https://github.com/redacted/XKCD-password-generator" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD CC-BY-3.0 - l10n_de? ( GPL-3 ) - l10n_it? ( CC-BY-SA-3.0 ) - l10n_no? ( CC-BY-4.0 )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="l10n_de l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt" - -src_prepare() { - default - - use l10n_de || rm ${PN}/static/ger-anlx - use l10n_en || rm ${PN}/static/{eff-short,eff-special,legacy} - use l10n_es || rm ${PN}/static/spa-mich - use l10n_fi || rm ${PN}/static/fin-kotus - use l10n_fr || rm ${PN}/static/fr-* - use l10n_it || rm ${PN}/static/ita-wiki - use l10n_no || rm ${PN}/static/nor-nb - use l10n_pt || rm ${PN}/static/pt-* -} - -python_install_all() { - distutils-r1_python_install_all - doman ${PN}.1 -} diff --git a/app-admin/xkcdpass/xkcdpass-1.17.6-r1.ebuild b/app-admin/xkcdpass/xkcdpass-1.17.6-r1.ebuild new file mode 100644 index 000000000000..ee512ef60329 --- /dev/null +++ b/app-admin/xkcdpass/xkcdpass-1.17.6-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend +inherit distutils-r1 + +DESCRIPTION="Password generator inspired by XKCD 936" +HOMEPAGE="https://github.com/redacted/XKCD-password-generator" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD CC-BY-3.0 + l10n_de? ( GPL-3 ) + l10n_it? ( CC-BY-SA-3.0 ) + l10n_no? ( CC-BY-4.0 )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="l10n_de l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt" + +PATCHES=( "${FILESDIR}"/xkcdpass-manpage-fix.patch ) + +src_prepare() { + default + + use l10n_de || rm ${PN}/static/ger-anlx + use l10n_en || rm ${PN}/static/{eff-short,eff-special,legacy} + use l10n_es || rm ${PN}/static/spa-mich + use l10n_fi || rm ${PN}/static/fin-kotus + use l10n_fr || rm ${PN}/static/fr-* + use l10n_it || rm ${PN}/static/ita-wiki + use l10n_no || rm ${PN}/static/nor-nb + use l10n_pt || rm ${PN}/static/pt-* +} + +python_install_all() { + distutils-r1_python_install_all + doman ${PN}.1 +} diff --git a/app-admin/xkcdpass/xkcdpass-1.17.6.ebuild b/app-admin/xkcdpass/xkcdpass-1.17.6.ebuild deleted file mode 100644 index 172601c94032..000000000000 --- a/app-admin/xkcdpass/xkcdpass-1.17.6.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 - -DESCRIPTION="Password generator inspired by XKCD 936" -HOMEPAGE="https://github.com/redacted/XKCD-password-generator" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD CC-BY-3.0 - l10n_de? ( GPL-3 ) - l10n_it? ( CC-BY-SA-3.0 ) - l10n_no? ( CC-BY-4.0 )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="l10n_de l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt" - -src_prepare() { - default - - use l10n_de || rm ${PN}/static/ger-anlx - use l10n_en || rm ${PN}/static/{eff-short,eff-special,legacy} - use l10n_es || rm ${PN}/static/spa-mich - use l10n_fi || rm ${PN}/static/fin-kotus - use l10n_fr || rm ${PN}/static/fr-* - use l10n_it || rm ${PN}/static/ita-wiki - use l10n_no || rm ${PN}/static/nor-nb - use l10n_pt || rm ${PN}/static/pt-* -} - -python_install_all() { - distutils-r1_python_install_all - doman ${PN}.1 -} -- cgit v1.2.3