Gentoo Archives: gentoo-commits

From: "Christian Ruppert (idl0r)" <idl0r@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/cfengine: cfengine-3.3.5.ebuild ChangeLog cfengine-3.3.4.ebuild cfengine-2.2.10-r3.ebuild cfengine-3.1.4.ebuild
Date: Fri, 24 Aug 2012 18:53:27
Message-Id: 20120824185316.C3089205DE@flycatcher.gentoo.org
1 idl0r 12/08/24 18:53:16
2
3 Modified: ChangeLog
4 Added: cfengine-3.3.5.ebuild
5 Removed: cfengine-3.3.4.ebuild cfengine-2.2.10-r3.ebuild
6 cfengine-3.1.4.ebuild
7 Log:
8 Version bump
9
10 (Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
11
12 Revision Changes Path
13 1.159 net-misc/cfengine/ChangeLog
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/ChangeLog?rev=1.159&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/ChangeLog?rev=1.159&content-type=text/plain
17 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/ChangeLog?r1=1.158&r2=1.159
18
19 Index: ChangeLog
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v
22 retrieving revision 1.158
23 retrieving revision 1.159
24 diff -u -r1.158 -r1.159
25 --- ChangeLog 30 Jul 2012 14:14:10 -0000 1.158
26 +++ ChangeLog 24 Aug 2012 18:53:16 -0000 1.159
27 @@ -1,6 +1,12 @@
28 # ChangeLog for net-misc/cfengine
29 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
30 -# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.158 2012/07/30 14:14:10 blueness Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.159 2012/08/24 18:53:16 idl0r Exp $
32 +
33 +*cfengine-3.3.5 (24 Aug 2012)
34 +
35 + 24 Aug 2012; Christian Ruppert <idl0r@g.o> -cfengine-2.2.10-r3.ebuild,
36 + -cfengine-3.1.4.ebuild, -cfengine-3.3.4.ebuild, +cfengine-3.3.5.ebuild:
37 + Version bump
38
39 30 Jul 2012; Anthony G. Basile <blueness@g.o>
40 cfengine-2.2.10-r4.ebuild, cfengine-3.2.4.ebuild:
41
42
43
44 1.1 net-misc/cfengine/cfengine-3.3.5.ebuild
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/cfengine-3.3.5.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/cfengine-3.3.5.ebuild?rev=1.1&content-type=text/plain
48
49 Index: cfengine-3.3.5.ebuild
50 ===================================================================
51 # Copyright 1999-2012 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.3.5.ebuild,v 1.1 2012/08/24 18:53:16 idl0r Exp $
54
55 EAPI="4"
56
57 MY_PV="${PV//_beta/b}"
58 MY_PV="${MY_PV/_p/p}"
59 MY_P="${PN}-${MY_PV}"
60
61 DESCRIPTION="An automated suite of programs for configuring and maintaining
62 Unix-like computers"
63 HOMEPAGE="http://www.cfengine.org/"
64 SRC_URI="http://cfengine.com/source-code/download?file=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
65
66 LICENSE="GPL-3"
67 SLOT="3"
68 KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86"
69
70 IUSE="examples html libvirt mysql postgres +qdbm selinux tests tokyocabinet vim-syntax"
71
72 DEPEND=">=sys-libs/db-4
73 mysql? ( virtual/mysql )
74 postgres? ( dev-db/postgresql-base )
75 selinux? ( sys-libs/libselinux )
76 tokyocabinet? ( dev-db/tokyocabinet )
77 qdbm? ( dev-db/qdbm )
78 libvirt? ( app-emulation/libvirt )
79 >=dev-libs/openssl-0.9.7
80 dev-libs/libpcre"
81 RDEPEND="${DEPEND}"
82 PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
83
84 REQUIRED_USE="qdbm? ( !tokyocabinet )
85 tokyocabinet? ( !qdbm )
86 !tokyocabinet? ( qdbm )
87 !qdbm? ( tokyocabinet )"
88
89 S="${WORKDIR}/${MY_P}"
90
91 src_configure() {
92 # Enforce /var/cfengine for historical compatibility
93 econf \
94 --enable-fhs \
95 --docdir=/usr/share/doc/${PF} \
96 --with-workdir=/var/cfengine \
97 --with-pcre \
98 $(use_with qdbm) \
99 $(use_with tokyocabinet) \
100 $(use_with postgres postgresql) \
101 $(use_with mysql) \
102 $(use_with libvirt) \
103 $(use_enable selinux)
104
105 # Fix Makefile to skip inputs, see below "examples"
106 #sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
107
108 # We install documentation through portage
109 sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
110 }
111
112 src_install() {
113 newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die
114 newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
115 newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
116
117 emake DESTDIR="${D}" install || die
118
119 # Evil workaround for now..
120 mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF}
121
122 dodoc AUTHORS
123
124 if ! use examples; then
125 rm -rf "${D}"/usr/share/doc/${PF}/example*
126 fi
127
128 # Create cfengine working directory
129 dodir /var/cfengine/bin
130 fperms 700 /var/cfengine
131
132 # Copy cfagent into the cfengine tree otherwise cfexecd won't
133 # find it. Most hosts cache their copy of the cfengine
134 # binaries here. This is the default search location for the
135 # binaries.
136 for bin in know promises agent monitord serverd execd runagent key report; do
137 dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
138 done
139
140 if use html; then
141 docinto html
142 dohtml -r docs/ || die
143 fi
144 }
145
146 pkg_postinst() {
147 echo
148 elog "NOTE: BDB (BerkelyDB) support has been removed as of ${PN}-3.3.0"
149 echo
150 einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided."
151 einfo
152 einfo "To run cfengine out of cron every half hour modify your crontab:"
153 einfo "0,30 * * * * /usr/sbin/cf-execd -F"
154 echo
155
156 elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:"
157 elog "emerge --config ${CATEGORY}/${PN}"
158
159 # Fix old cf-servd, remove it after some releases.
160 local found=0
161 for fname in $(find /etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
162 found=1
163 rm $fname
164 ln -s /etc/init.d/cf-serverd $(echo $fname | sed 's:cf-servd:cf-serverd:')
165 done
166
167 if [ "${found}" -eq 1 ]; then
168 echo
169 elog "/etc/init.d/cf-servd has been renamed to /etc/init.d/cf-serverd"
170 fi
171 }
172
173 pkg_config() {
174 if [ "${ROOT}" == "/" ]; then
175 if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
176 einfo "Generating keys for localhost."
177 /usr/sbin/cf-key
178 fi
179 else
180 die "cfengine cfkey does not support any value of ROOT other than /."
181 fi
182 }