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