Gentoo Archives: gentoo-commits

From: Devan Franchini <twitch153@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
Date: Thu, 16 Feb 2017 03:30:02
Message-Id: 1487215734.1cb9280dbf9aa945a3c28cc6d55bde68014002f4.twitch153@gentoo
1 commit: 1cb9280dbf9aa945a3c28cc6d55bde68014002f4
2 Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 16 03:28:54 2017 +0000
4 Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 16 03:28:54 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cb9280d
7
8 app-admin/webapp-config-9999.ebuild: Makes use of prefix eclass
9
10 X-Gentoo-Bug: 608018
11 X-Gentoo-Bug-URL: https://bugs.gentoo.org/608018
12
13 Package-Manager: portage-2.3.3
14
15 app-admin/webapp-config/webapp-config-9999.ebuild | 11 ++++++++---
16 1 file changed, 8 insertions(+), 3 deletions(-)
17
18 diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild
19 index 2d1d3c7ad8..a1b3ec2550 100644
20 --- a/app-admin/webapp-config/webapp-config-9999.ebuild
21 +++ b/app-admin/webapp-config/webapp-config-9999.ebuild
22 @@ -1,4 +1,4 @@
23 -# Copyright 1999-2016 Gentoo Foundation
24 +# Copyright 1999-2017 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 # $Id$
27
28 @@ -6,7 +6,7 @@ EAPI="5"
29
30 PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
31
32 -inherit distutils-r1
33 +inherit distutils-r1 prefix
34
35 if [[ ${PV} = 9999* ]]
36 then
37 @@ -30,6 +30,11 @@ DEPEND="app-text/xmlto
38 sys-apps/gentoo-functions"
39 RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
40
41 +python_prepare_all() {
42 + distutils-r1_python_prepare_all
43 + eprefixify WebappConfig/eprefix.py config/webapp-config
44 +}
45 +
46 python_compile_all() {
47 emake -C doc/
48 }
49 @@ -40,7 +45,7 @@ python_install() {
50 # distutils does not provide for specifying two different script install
51 # locations. Since we only install one script here the following should
52 # be ok
53 - distutils-r1_python_install --install-scripts="/usr/sbin"
54 + distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
55 }
56
57 python_install_all() {