Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/
Date: Mon, 04 Dec 2017 22:51:59
Message-Id: 1512427908.ff602efd2aaf20763713fa4aecc69481f6f21f8e.monsieurp@gentoo
1 commit: ff602efd2aaf20763713fa4aecc69481f6f21f8e
2 Author: Chris Rorvick <chris <AT> rorvick <DOT> com>
3 AuthorDate: Wed May 24 14:09:43 2017 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 4 22:51:48 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff602efd
7
8 net-misc/cfengine: add masterfiles.
9
10 The masterfiles were moved into a separate tarball in CFEngine 3.6. Add
11 a new local `masterfiles' USE flag for optionally installing them.
12
13 Closes: https://github.com/gentoo/gentoo/pull/4752
14
15 net-misc/cfengine/Manifest | 1 +
16 net-misc/cfengine/cfengine-3.6.2.ebuild | 17 +++++++++++++++--
17 net-misc/cfengine/metadata.xml | 1 +
18 3 files changed, 17 insertions(+), 2 deletions(-)
19
20 diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
21 index 1f35884a626..8a571ace5eb 100644
22 --- a/net-misc/cfengine/Manifest
23 +++ b/net-misc/cfengine/Manifest
24 @@ -3,3 +3,4 @@ DIST cfengine-3.3.9.tar.gz 1256138 SHA256 54b44dd1c7a77a7ec4e4dea9542ac4d79cb689
25 DIST cfengine-3.4.5.tar.gz 4671628 SHA256 542808b9f532e77d66dca19e83bdc1f995d7d0066b940a39bdd5db9a71680011 SHA512 3de95b511c03b4e4f83b13b605d4cc8185419fb7ee6b42e34faf300e5af2a755713b2f8f61305a1cd3dea02f89c09076b164469549cfc96fec09a813c7069f0f WHIRLPOOL 9e7516bfeffc1fae87eeb67f51207f056b0644a6d51e7b1da8d4f1eb27e581781af3f5f56bb98ed405909b2497eea3668df5bb78ece447dac528d7b18fdcd90f
26 DIST cfengine-3.5.3.tar.gz 1542468 SHA256 0e2d13ba1d75f826bf15411912ce21075734796a35e8fb8ecf545d70d60f41e1 SHA512 20ead13d5290905dc51567887807a0c2c5d9d753cb48ffe2859041b75239698ad0f4bee1ad0eac4eee96122b3a5a475d516566c1571c4fcbc460be757583da18 WHIRLPOOL 2434abd1b6228e87fb848ea013dafca7d1e62dfeaa3ddafd534d663f69eb8b84221f452f8d288571352b641efbde0d1e65f6377d74f7cfa7678267f548036c7b
27 DIST cfengine-3.6.2.tar.gz 1966966 SHA256 0e0195c1998fc261d4ef2e47e9cc50b273d204bc8b221d469bb83071933c4a09 SHA512 b1bf6010d4309980846524ca94bb39f624f4ed0df3af220df91f7210b4441456840dfeeee4d62d6d6260b417ea7cf959509ca96c1a26c6da67bda7b3c1e5dbbc WHIRLPOOL 989a7853b74848a69d4323f0e10ab05a7522132b6b52362b02d40e95a361ef85b74bef3e3263942376c3f6f4a29c3174967a3ca00fc5acef774537af14ce6352
28 +DIST cfengine-masterfiles-3.6.2.tar.gz 119594 SHA256 0c98e5099dc0358517d25c51173940afbeb4861bf5789a00e8068ceb23f4354d SHA512 ec942dbfbc848455bbdaa157d6665d3e830cb967bbc07303aa4ee577cf2774d01bc602c57893372538b72d70b8b62b7e2a90ca9f8e59d7420d5b2f94fcd809e9 WHIRLPOOL 6cd57198d4437104add7135e251a7fcfc10132420bff2cc040817e3d5bd782f26a0a3109aef8fd4758d632cc6288f0d49d403a1be83292b51aedd2e9e47335e2
29
30 diff --git a/net-misc/cfengine/cfengine-3.6.2.ebuild b/net-misc/cfengine/cfengine-3.6.2.ebuild
31 index 025728ee43e..eb302d86ac2 100644
32 --- a/net-misc/cfengine/cfengine-3.6.2.ebuild
33 +++ b/net-misc/cfengine/cfengine-3.6.2.ebuild
34 @@ -12,13 +12,14 @@ MY_P="${PN}-${MY_PV}"
35 DESCRIPTION="An automated suite of programs for configuring and maintaining
36 Unix-like computers"
37 HOMEPAGE="http://www.cfengine.org/"
38 -SRC_URI="http://cfengine.package-repos.s3.amazonaws.com/tarballs/${MY_P}.tar.gz -> ${MY_P}.tar.gz"
39 +SRC_URI="http://cfengine.package-repos.s3.amazonaws.com/tarballs/${MY_P}.tar.gz -> ${MY_P}.tar.gz
40 + masterfiles? ( http://cfengine.package-repos.s3.amazonaws.com/tarballs/masterfiles-${MY_PV}.tar.gz -> ${PN}-masterfiles-${MY_PV}.tar.gz )"
41
42 LICENSE="GPL-3"
43 SLOT="3"
44 KEYWORDS="~amd64 ~x86"
45
46 -IUSE="acl examples libvirt mysql postgres +qdbm selinux tokyocabinet vim-syntax xml"
47 +IUSE="acl examples libvirt mysql masterfiles postgres +qdbm selinux tokyocabinet vim-syntax xml"
48
49 DEPEND="acl? ( virtual/acl )
50 mysql? ( virtual/mysql )
51 @@ -44,6 +45,13 @@ src_prepare() {
52 eautoreconf
53 }
54
55 +src_unpack() {
56 + unpack ${MY_P}.tar.gz
57 + if use masterfiles; then
58 + unpack ${PN}-masterfiles-${MY_PV}.tar.gz
59 + fi
60 +}
61 +
62 src_configure() {
63 # Enforce /var/cfengine for historical compatibility
64
65 @@ -97,6 +105,11 @@ src_install() {
66 for bin in promises agent monitord serverd execd runagent key; do
67 dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
68 done
69 +
70 + if use masterfiles; then
71 + insinto /var/cfengine
72 + doins -r "${WORKDIR}/masterfiles"
73 + fi
74 }
75
76 pkg_postinst() {
77
78 diff --git a/net-misc/cfengine/metadata.xml b/net-misc/cfengine/metadata.xml
79 index fb9078d2d2d..86fa96098b0 100644
80 --- a/net-misc/cfengine/metadata.xml
81 +++ b/net-misc/cfengine/metadata.xml
82 @@ -13,6 +13,7 @@
83 <use>
84 <flag name="html">Install HTML documentation</flag>
85 <flag name="libvirt">Enable support for virtual machine management through <pkg>app-emulation/libvirt</pkg></flag>
86 + <flag name="masterfiles">Install the Masterfiles Policy Framework</flag>
87 <flag name="qdbm">Use <pkg>dev-db/qdbm</pkg> as database backend</flag>
88 <flag name="tests">Install test files</flag>
89 <flag name="tokyocabinet">Use <pkg>dev-db/tokyocabinet</pkg> as database backend</flag>