Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
Date: Sat, 20 Oct 2018 11:39:48
Message-Id: 1540035540.e9e4de31cb72614a7b767dec7f8462705928de67.pacho@gentoo
1 commit: e9e4de31cb72614a7b767dec7f8462705928de67
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 20 11:08:36 2018 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 20 11:39:00 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9e4de31
7
8 app-arch/rpm: Don't run python pkg_setup always (#634848 by kentnl)
9
10 Closes: https://bugs.gentoo.org/634848
11 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
12 Package-Manager: Portage-2.3.51, Repoman-2.3.11
13
14 app-arch/rpm/rpm-4.14.1-r1.ebuild | 6 +++++-
15 1 file changed, 5 insertions(+), 1 deletion(-)
16
17 diff --git a/app-arch/rpm/rpm-4.14.1-r1.ebuild b/app-arch/rpm/rpm-4.14.1-r1.ebuild
18 index 1afa7aeae2c..c34b6839654 100644
19 --- a/app-arch/rpm/rpm-4.14.1-r1.ebuild
20 +++ b/app-arch/rpm/rpm-4.14.1-r1.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2018 Gentoo Foundation
23 +# Copyright 1999-2018 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=6
27 @@ -50,6 +50,10 @@ RDEPEND="${CDEPEND}
28 selinux? ( sec-policy/selinux-rpm )
29 "
30
31 +pkg_setup() {
32 + use python && python-single-r1_pkg_setup
33 +}
34 +
35 src_prepare() {
36 eapply "${FILESDIR}"/${PN}-4.11.0-autotools.patch
37 eapply "${FILESDIR}"/${PN}-4.8.1-db-path.patch