Gentoo Archives: gentoo-commits

From: Michael Orlitzky <mjo@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/pypolicyd-spf/
Date: Tue, 26 May 2020 13:40:38
Message-Id: 1590499876.4b66dd8777f8181257441d8c3f33ac3b8aeb3e43.mjo@gentoo
1 commit: 4b66dd8777f8181257441d8c3f33ac3b8aeb3e43
2 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 26 01:11:10 2020 +0000
4 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
5 CommitDate: Tue May 26 13:31:16 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b66dd87
7
8 mail-filter/pypolicyd-spf: hard-code PN before a pkgmove.
9
10 This package was renamed to spf-engine. This commit hard-codes the
11 package name "pypolicyd-spf" in the existing stable ebuild so that it
12 survives the rename.
13
14 Bug: https://bugs.gentoo.org/724526
15 Package-Manager: Portage-2.3.99, Repoman-2.3.22
16 Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
17
18 mail-filter/pypolicyd-spf/pypolicyd-spf-2.0.2-r1.ebuild | 9 +++++++--
19 1 file changed, 7 insertions(+), 2 deletions(-)
20
21 diff --git a/mail-filter/pypolicyd-spf/pypolicyd-spf-2.0.2-r1.ebuild b/mail-filter/pypolicyd-spf/pypolicyd-spf-2.0.2-r1.ebuild
22 index aa46887f9be..da8cc8d6ff5 100644
23 --- a/mail-filter/pypolicyd-spf/pypolicyd-spf-2.0.2-r1.ebuild
24 +++ b/mail-filter/pypolicyd-spf/pypolicyd-spf-2.0.2-r1.ebuild
25 @@ -14,9 +14,12 @@ PYTHON_REQ_USE="ipv6"
26 DISTUTILS_USE_SETUPTOOLS=no
27 inherit distutils-r1
28
29 +OLD_PN="pypolicyd-spf"
30 +OLD_P="${OLD_PN}-${PV}"
31 +OLD_PF="${PN}-${PVR}"
32 DESCRIPTION="Python-based policy daemon for Postfix SPF verification"
33 HOMEPAGE="https://launchpad.net/pypolicyd-spf"
34 -SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
35 +SRC_URI="mirror://pypi/p/${OLD_PN}/${OLD_P}.tar.gz"
36
37 LICENSE="Apache-2.0"
38 SLOT="0"
39 @@ -28,13 +31,15 @@ DEPEND="dev-python/pyspf[${PYTHON_USEDEP}]"
40 RDEPEND="${DEPEND}
41 dev-python/authres[${PYTHON_USEDEP}]"
42
43 +S="${WORKDIR}/${OLD_P}"
44 +
45 DOCS=( CHANGES policyd-spf.conf.commented README README.per_user_whitelisting )
46
47 python_prepare_all() {
48 # The "real" config file mentions the commented one, so we point
49 # users in the right direction.
50 local oldconf="policyd-spf.conf.commented"
51 - local newconf="/usr/share/doc/${PF}/${oldconf}"
52 + local newconf="/usr/share/doc/${OLD_PF}/${oldconf}"
53
54 sed -i "1 s~ ${oldconf}~,\n# ${newconf}~" policyd-spf.conf \
55 || die 'failed to update commented config file path'