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.1.5.ebuild cfengine-2.2.10.ebuild cfengine-3.1.2.ebuild
Date: Tue, 03 May 2011 23:16:43
Message-Id: 20110503231633.2503E20054@flycatcher.gentoo.org
1 idl0r 11/05/03 23:16:33
2
3 Modified: ChangeLog
4 Added: cfengine-3.1.5.ebuild
5 Removed: cfengine-2.2.10.ebuild cfengine-3.1.2.ebuild
6 Log:
7 Version bump to 3.1.5. Remove old versions.
8
9 (Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.136 net-misc/cfengine/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/ChangeLog?rev=1.136&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/ChangeLog?rev=1.136&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/ChangeLog?r1=1.135&r2=1.136
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v
21 retrieving revision 1.135
22 retrieving revision 1.136
23 diff -u -r1.135 -r1.136
24 --- ChangeLog 25 Apr 2011 14:30:17 -0000 1.135
25 +++ ChangeLog 3 May 2011 23:16:33 -0000 1.136
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.135 2011/04/25 14:30:17 armin76 Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.136 2011/05/03 23:16:33 idl0r Exp $
31 +
32 +*cfengine-3.1.5 (03 May 2011)
33 +
34 + 03 May 2011; Christian Ruppert <idl0r@g.o> -cfengine-2.2.10.ebuild,
35 + -cfengine-3.1.2.ebuild, +cfengine-3.1.5.ebuild:
36 + Version bump to 3.1.5. Remove old versions.
37
38 25 Apr 2011; Raúl Porcel <armin76@g.o> cfengine-3.1.4.ebuild:
39 sparc stable wrt #352280
40
41
42
43 1.1 net-misc/cfengine/cfengine-3.1.5.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/cfengine-3.1.5.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/cfengine-3.1.5.ebuild?rev=1.1&content-type=text/plain
47
48 Index: cfengine-3.1.5.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.1.5.ebuild,v 1.1 2011/05/03 23:16:33 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://www.cfengine.org/tarballs/${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 if use mysql || use postgres ; then
91 myconf="--with-sql"
92 else
93 myconf="--without-sql"
94 fi
95
96 # BDB by default, prefer tokyocabinet above qdbm...
97 if ! use qdbm && ! use tokyocabinet; then
98 myconf="${myconf} --with-berkeleydb=/usr"
99 elif use qdbm && use tokyocabinet; then
100 elog "QDBM and Tokyo Cabinet can't be used together, using Tokyo Cabinet by default"
101 myconf="${myconf} --with-tokyocabinet"
102 elif use qdbm && ! use tokyocabinet; then
103 myconf="${myconf} --with-qdbm"
104 elif ! use qdbm && use tokyocabinet; then
105 myconf="${myconf} --with-tokyocabinet"
106 fi
107
108 # Enforce /var/cfengine for historical compatibility
109 # $(use_with libvirt) \
110 econf \
111 --docdir=/usr/share/doc/"${PF}" \
112 --with-workdir=/var/cfengine \
113 --with-pcre \
114 ${myconf} \
115 $(use_enable selinux)
116
117 # Fix Makefile to skip inputs, see below "examples"
118 sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
119
120 # We install documentation through portage
121 sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
122 }
123
124 src_install() {
125 newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die
126 newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
127 newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
128
129 emake DESTDIR="${D}" install || die
130 dodoc AUTHORS ChangeLog NEWS README TODO INSTALL
131
132 if use examples; then
133 docinto examples
134 dodoc inputs/*.cf || die
135 fi
136
137 # Create cfengine working directory
138 dodir /var/cfengine/bin
139 fperms 700 /var/cfengine
140
141 # Copy cfagent into the cfengine tree otherwise cfexecd won't
142 # find it. Most hosts cache their copy of the cfengine
143 # binaries here. This is the default search location for the
144 # binaries.
145 for bin in know promises agent monitord serverd execd runagent key report; do
146 dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
147 done
148
149 if use html; then
150 docinto html
151 dohtml -r docs/ || die
152 fi
153 }
154
155 pkg_postinst() {
156 echo
157 einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided."
158 einfo
159 einfo "To run cfengine out of cron every half hour modify your crontab:"
160 einfo "0,30 * * * * /usr/sbin/cf-execd -F"
161 echo
162
163 elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:"
164 elog "emerge --config ${CATEGORY}/${PN}"
165
166 # Fix old cf-servd, remove it after some releases.
167 local found=0
168 for fname in $(find /etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
169 found=1
170 rm $fname
171 ln -s /etc/init.d/cf-serverd $(echo $fname | sed 's:cf-servd:cf-serverd:')
172 done
173
174 if [ "${found}" -eq 1 ]; then
175 echo
176 elog "/etc/init.d/cf-servd has been renamed to /etc/init.d/cf-serverd"
177 fi
178 }
179
180 pkg_config() {
181 if [ "${ROOT}" == "/" ]; then
182 if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
183 einfo "Generating keys for localhost."
184 /usr/sbin/cf-key
185 fi
186 else
187 die "cfengine cfkey does not support any value of ROOT other than /."
188 fi
189 }