[gentoo-commits] repo/gentoo:master commit in: app-admin/xkcdpass/, app-admin/xkcdpass/files/

[gentoo-commits] repo/gentoo:master commit in: app-admin/xkcdpass/, app-admin/xkcdpass/files/

[Ben Kohler]

commit:     a0d137d123a7f3ff08db3da4e1766a38b18d1959
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 13 13:27:25 2021 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Jul 13 13:29:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0d137d1

app-admin/xkcdpass: drop old

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 app-admin/xkcdpass/Manifest                        |  1 -
 .../xkcdpass/files/xkcdpass-manpage-fix.patch      | 89 ----------------------
 app-admin/xkcdpass/xkcdpass-1.17.6-r1.ebuild       | 40 ----------
 3 files changed, 130 deletions(-)

diff --git a/app-admin/xkcdpass/Manifest b/app-admin/xkcdpass/Manifest
index 3c144143b7a..74da9d4ec77 100644
--- a/app-admin/xkcdpass/Manifest
+++ b/app-admin/xkcdpass/Manifest
@@ -1,2 +1 @@
-DIST xkcdpass-1.17.6.tar.gz 8216233 BLAKE2B dc6f8b1bf76eba5271bf6027baf6bfbe5a18081ac85970ba35be3d0cf4e08d98d60b8bc819c05512aab94d621cf93fe9dca74a0108cdd4d94ad6ae830c28d3c2 SHA512 db47d6f0d5711e1aa4520fa3afb78b085b2e5a7599fa7eecbc3f806f5c7edceae9c54c250923147c87a837b54b5efd0d8f34f9c08e3104341f1243de0edf87f9
 DIST xkcdpass-1.19.2.tar.gz 2073808 BLAKE2B 19ad3f505ab672b1a2554e534896b15c77eb9741e7da01e22efff44d069ff6a482c122ec7fa616bc3789d2ce4bd5f6050c06bcff9661476d15fbc78edc505c36 SHA512 20376fc22fb4d251e2b921d4db48fea2109a4c42832614d41e807b262130111c58e01d1ded2019fad230a458953a2f185d92cfe95f3950aaa0a97750b3b3a2b6

diff --git a/app-admin/xkcdpass/files/xkcdpass-manpage-fix.patch b/app-admin/xkcdpass/files/xkcdpass-manpage-fix.patch
deleted file mode 100644
index a4d9e3464ce..00000000000
--- a/app-admin/xkcdpass/files/xkcdpass-manpage-fix.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-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 <<steven@steventob.in>>.
- .PP
- This manual page was written by |authorname| |authoremail|.
--.SS \f
--.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.6-r1.ebuild b/app-admin/xkcdpass/xkcdpass-1.17.6-r1.ebuild
deleted file mode 100644
index 766235ec821..00000000000
--- a/app-admin/xkcdpass/xkcdpass-1.17.6-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-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
-}

[gentoo-commits] repo/gentoo:master commit in: app-admin/xkcdpass/, app-admin/xkcdpass/files/

[Ben Kohler]

commit:     29d89ea4b52a706c161279e3baf0164a3196592a
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 16:38:01 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 16:38:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29d89ea4

app-admin/xkcdpass: add 1.19.4

Closes: https://bugs.gentoo.org/833383

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 app-admin/xkcdpass/Manifest                        |  1 +
 ...dpass-1.19.4-no-examples-in-site-packages.patch | 13 +++++++
 app-admin/xkcdpass/xkcdpass-1.19.4.ebuild          | 42 ++++++++++++++++++++++
 3 files changed, 56 insertions(+)

diff --git a/app-admin/xkcdpass/Manifest b/app-admin/xkcdpass/Manifest
index 8bd3cc3efe66..e3108f3e9686 100644
--- a/app-admin/xkcdpass/Manifest
+++ b/app-admin/xkcdpass/Manifest
@@ -1 +1,2 @@
 DIST xkcdpass-1.19.3.tar.gz 2570967 BLAKE2B bd3576b707db2652e6979ea25476fcda51df7bc84a5182668ff1cf2878a57c89ab56a7272fe2030c38533bf4f75855facd7fd8aefa6e5c6335a00c8ef80b228f SHA512 5336e57edd7fbeb655573910b0c0868381a8b43d5ccbb8d388cc24ef16ba094c27517a4fe7b11dbfc7ff906b65a303f90b20cdf9bc551b844453640378b5e555
+DIST xkcdpass-1.19.4.tar.gz 2572291 BLAKE2B f36299ab66bc02f95a7811ebdf40fa62f441a0ef1eac27af8d380fca9643eb9c2444c988392900e5add8a2a22f4ef33766bc5904fb350520b0b7572e95898ecd SHA512 2a83473f6e2426f34ee89297056ca7d3949044f7e818f6d6501fd7852ac1ba9f860f8287ad6d366f13f46f580b0f3f7e9a3dfa160b262b4d00b00ed1c9f5da59

diff --git a/app-admin/xkcdpass/files/xkcdpass-1.19.4-no-examples-in-site-packages.patch b/app-admin/xkcdpass/files/xkcdpass-1.19.4-no-examples-in-site-packages.patch
new file mode 100644
index 000000000000..c2ad0fe63460
--- /dev/null
+++ b/app-admin/xkcdpass/files/xkcdpass-1.19.4-no-examples-in-site-packages.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 2f35f86..eed1e7b 100644
+--- a/setup.py
++++ b/setup.py
+@@ -11,7 +11,7 @@ setup(
+     description='Generate secure multiword passwords/passphrases, inspired by XKCD',
+     long_description=open('README.rst', encoding='utf-8').read(),
+     #packages=['xkcdpass'],
+-    packages=find_namespace_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
++    packages=find_namespace_packages(exclude=["examples", "*.tests", "*.tests.*", "tests.*", "tests"]),
+     zip_safe=False,
+     license='BSD',
+     include_package_data=True,

diff --git a/app-admin/xkcdpass/xkcdpass-1.19.4.ebuild b/app-admin/xkcdpass/xkcdpass-1.19.4.ebuild
new file mode 100644
index 000000000000..767282c1f31d
--- /dev/null
+++ b/app-admin/xkcdpass/xkcdpass-1.19.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="Password generator inspired by XKCD 936"
+HOMEPAGE="https://github.com/redacted/XKCD-password-generator"
+
+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"
+
+distutils_enable_tests pytest
+REQUIRED_USE="test? ( l10n_en )"
+
+PATCHES=( "${FILESDIR}"/xkcdpass-1.19.4-no-examples-in-site-packages.patch )
+
+src_prepare() {
+	default
+
+	use l10n_de || rm ${PN}/static/{ger-anlx,eff_large_de_sample.wordlist}
+	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
+}