Version bump to 3.3.0

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 152 insertions, 20 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index 6a0f3e104d1c..544098559be8 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/cfengine
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.141 2012/02/12 18:47:10 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.142 2012/04/16 20:32:07 idl0r Exp $
+
+*cfengine-3.3.0 (16 Apr 2012)
+
+  16 Apr 2012; Christian Ruppert <idl0r@gentoo.org> +cfengine-3.3.0.ebuild,
+  metadata.xml:
+  Version bump to 3.3.0
 
 *cfengine-3.2.4 (12 Feb 2012)
 
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 33b71048bd8d..a0ce4b1b3cda 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -14,21 +14,23 @@ DIST cfengine-2.2.10.tar.gz 2690333 RMD160 67fd3dc80270dc000887e3dbf26f372338e26
 DIST cfengine-3.1.4.tar.gz 1599876 RMD160 75be7bed44718dd4f45ddccd235a46563391eecf SHA1 8879f375e0c0208620660d0d49f52bb814934fd9 SHA256 b4f2e1f7c1d39d37a78c63cab33899b0e829648283be507d78ffa873ccbe3466
 DIST cfengine-3.2.3.tar.gz 1128462 RMD160 251b06c323fdbc13668e980855a799b026ab91fe SHA1 e05b1c3ff54cc7d344ddeba34ca858f7ea85e1d4 SHA256 20748f2d10ec4e3623138c2ae1cf7d78d147b8c5c15be42965c3155d0762792d
 DIST cfengine-3.2.4.tar.gz 1134299 RMD160 fb7e590e5926f980a5b6891767676c93f8dcc26c SHA1 b127dc5f5ce0e7cb1db1ac0a47c986e0d0802f3c SHA256 261cd300c0a8e22dfdb215da81633d80f3c4579e659f186f0da3d09fd2e4f272
+DIST cfengine-3.3.0.tar.gz 1236769 RMD160 1cd486bcaf373a10270b88346f3f8f5d394e1bb5 SHA1 15ac009acaebf8fb402c23f3632470555bc48ecb SHA256 170a65cce35b9b333594543b9b3480e5d9c19c28e275431e6e58a3be9372c0a7
 EBUILD cfengine-2.2.10-r3.ebuild 3136 RMD160 5a5c5da9d39b2a132724677e5b9635184a7244e6 SHA1 e6d6b692df225df50270a4e0df3dabc5d47c3eec SHA256 4bc18b1fc87207e318dca2a0ee29484405bfa080e234eba370148a61af053823
 EBUILD cfengine-2.2.10-r4.ebuild 3322 RMD160 6f78b025bfc9d61774335e9e2a6ae2f368c128ba SHA1 bfd65c0d4807585215a55c94f4c2d042aa2afb8a SHA256 46c348de33648a2e3922c1a3e25a69607c695ab057fdbf737d129d181d2b990c
 EBUILD cfengine-3.1.4.ebuild 4531 RMD160 7ead54fa2d45fed3970b67fdd4f7759bddf172d2 SHA1 20f84a8f0789508cc45a8236c680cc591c23b617 SHA256 33dd24dd8dda9c5e46941410a6177dce0421290730fbbe1a46f9a1fcb6683b87
 EBUILD cfengine-3.2.3.ebuild 4074 RMD160 c6208f098c288e665d587279c31bfb95a78e72d0 SHA1 e0987313d47fd3d714a1f55bcd106ba5737d7f1d SHA256 eb0f66c7c57622e936e587115085e546381d17e990609e969a1832b9ccbd3269
 EBUILD cfengine-3.2.4.ebuild 4074 RMD160 2592a9162ad46a65230f91b2aa9baf67def94efc SHA1 766efc4984cfe2b72d0df81a7c54adcb30d06c00 SHA256 048e99b78937923c42fe6fc39052c4ae8673f78de3bef5af82ef3333e94527f4
-MISC ChangeLog 23768 RMD160 d9e3ada104f163697f5dd83a2846a9ebdb74bc73 SHA1 a36ac3c6f9e57b8ca2697ab459e0d111e74f3e92 SHA256 ca47607a2b1643029db08224c5b455e70b4d9307c385353a29cd169956dbc91a
-MISC metadata.xml 2591 RMD160 d5907725b22a9608780c95f44e9cdf28645b4e40 SHA1 a6780f88141ed5fe46d201fe32aacabbb7e05b91 SHA256 f871e8ac89cf6f0b46aabf0409aa387307288c72cd0ac4a6bf1231ed01e4ddf0
+EBUILD cfengine-3.3.0.ebuild 3704 RMD160 c37df5f274b9813fca58d17fefe315807ce2c71d SHA1 85dedd76b262a4eed2e7e6e7f1768c016ca0cf73 SHA256 6c9716f8c0c63c4325cbf628aba0ad53ce91d4632a519c88ce4dbf8d58c71605
+MISC ChangeLog 23916 RMD160 d71c5603115334f2f8aec3e670115d810f5934b7 SHA1 2aa2911206f0c935eff6633b0ddd74f514dafe28 SHA256 ce37f4bdec00b26e2b004490c1edda0f7b47bbd441529893eab84e369459cad7
+MISC metadata.xml 2179 RMD160 4ade441caa182e885e0cc2b090f1d05840a00a44 SHA1 f98bcdc0d50755c6a06aa22d13648a3a4a81656c SHA256 04ce07ed6c831b8a693b6e57d692937ffded6decf3eaa67f5bf3212f4aa734d1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJPOAkzAAoJEMOx0zmdw4Z1yeUH/0RiHiKSiWGVgLam2MHZPNbJ
-gvL0NKVJtLynPmHRNjqD3SZyOiKYCycK/XAjdROllru+PvqqSIOT9bLKchpw/Cmo
-3XsZst8Z/t/wz5rJnXZtuet6IUM54bXUi+CJfIzYX1z8PahBrxo81krYlBP2nenA
-VyLWZ7iGxlS5QUF8jsKhUVIf2e9TYfMyiyRtMYL3rRkoUgteMY277B8QIo1Lv0qB
-zt08vGToRzAHhwBwdC3F8MAa5DT8ApUBpdjVRFPmKUhg30ZRQ74fWUxk4yN/rFr8
-i3zj1GbM7vr9RSk7DKbdyymz2R/Pp+wAGBJlQUXjkX/3zitzku1Lkr9zY5CWYjg=
-=Bx4m
+iQEcBAEBCAAGBQJPjIHQAAoJEMOx0zmdw4Z196YH/3DQYnICtEgZuR7nnOA9kxyK
+I2RfSri5EqHM16riAdI8fOKNR2W+FTkgCu7PACGyqyIDJqdUI0m3Yl4E3bWqndYS
+ZC8FSE5DvVtxYJTsadZWLlFZeerRm2eeaj2WcdSItOP84Nxpu4L1XxzoHEX1GlmJ
+w4SVFmS0jSZN3N3I7vwYjeu43bsKVx99DPvUvQ6bareJx9aRDb10gpcOAV/50qWz
+IRo0rDvRiQmin9Pdx14MqbPrFDjemjAm76rmQl1m8KrrEa42MgkrRvIqrWsTE0ob
+sLRv8smJpuWaga0v8gRunDSjq3vi1nct+S9OipL4JArPIf+TH8p6qvk06WSy8y8=
+=5i0L
 -----END PGP SIGNATURE-----
diff --git a/net-misc/cfengine/cfengine-3.3.0.ebuild b/net-misc/cfengine/cfengine-3.3.0.ebuild
new file mode 100644
index 000000000000..3fa7aedb1302
--- /dev/null
+++ b/net-misc/cfengine/cfengine-3.3.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.3.0.ebuild,v 1.1 2012/04/16 20:32:07 idl0r Exp $
+
+EAPI="4"
+
+MY_PV="${PV//_beta/b}"
+MY_PV="${MY_PV/_p/p}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="An automated suite of programs for configuring and maintaining
+Unix-like computers"
+HOMEPAGE="http://www.cfengine.org/"
+SRC_URI="http://cfengine.com/source-code/download?file=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~s390 ~sparc ~x86"
+
+IUSE="examples html libvirt mysql postgres +qdbm selinux tests tokyocabinet vim-syntax"
+
+DEPEND=">=sys-libs/db-4
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	selinux? ( sys-libs/libselinux )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	qdbm? ( dev-db/qdbm )
+	libvirt? ( app-emulation/libvirt )
+	>=dev-libs/openssl-0.9.7
+	dev-libs/libpcre"
+RDEPEND="${DEPEND}"
+PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
+
+REQUIRED_USE="qdbm? ( !tokyocabinet )
+	tokyocabinet? ( !qdbm )
+	!tokyocabinet? ( qdbm )
+	!qdbm? ( tokyocabinet )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	# Enforce /var/cfengine for historical compatibility
+	econf \
+		--enable-fhs \
+		--docdir=/usr/share/doc/${PF} \
+		--with-workdir=/var/cfengine \
+		--with-pcre \
+		$(use_with qdbm) \
+		$(use_with tokyocabinet) \
+		$(use_with postgres postgresql) \
+		$(use_with mysql) \
+		$(use_with libvirt) \
+		$(use_enable selinux)
+
+	# Fix Makefile to skip inputs, see below "examples"
+	#sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
+
+	# We install documentation through portage
+	sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die
+	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
+	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
+
+	emake DESTDIR="${D}" install || die
+
+	# Evil workaround for now..
+	mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF}
+
+	dodoc AUTHORS
+
+	if ! use examples; then
+		rm -rf "${D}"/usr/share/doc/${PF}/example*
+	fi
+
+	# Create cfengine working directory
+	dodir /var/cfengine/bin
+	fperms 700 /var/cfengine
+
+	# Copy cfagent into the cfengine tree otherwise cfexecd won't
+	# find it. Most hosts cache their copy of the cfengine
+	# binaries here. This is the default search location for the
+	# binaries.
+	for bin in know promises agent monitord serverd execd runagent key report; do
+		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
+	done
+
+	if use html; then
+		docinto html
+		dohtml -r docs/ || die
+	fi
+}
+
+pkg_postinst() {
+	echo
+	elog "NOTE: BDB (BerkelyDB) support has been removed as of ${PN}-3.3.0"
+	echo
+	einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided."
+	einfo
+	einfo "To run cfengine out of cron every half hour modify your crontab:"
+	einfo "0,30 * * * *    /usr/sbin/cf-execd -F"
+	echo
+
+	elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:"
+	elog "emerge --config ${CATEGORY}/${PN}"
+
+	# Fix old cf-servd, remove it after some releases.
+	local found=0
+	for fname in $(find /etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
+		found=1
+		rm $fname
+		ln -s /etc/init.d/cf-serverd $(echo $fname | sed 's:cf-servd:cf-serverd:')
+	done
+
+	if [ "${found}" -eq 1 ]; then
+		echo
+		elog "/etc/init.d/cf-servd has been renamed to /etc/init.d/cf-serverd"
+	fi
+}
+
+pkg_config() {
+	if [ "${ROOT}" == "/" ]; then
+		if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
+			einfo "Generating keys for localhost."
+			/usr/sbin/cf-key
+		fi
+	else
+		die "cfengine cfkey does not support any value of ROOT other than /."
+	fi
+}
diff --git a/net-misc/cfengine/metadata.xml b/net-misc/cfengine/metadata.xml
index c9ba4281c8c9..7b50f79cae0c 100644
--- a/net-misc/cfengine/metadata.xml
+++ b/net-misc/cfengine/metadata.xml
@@ -12,18 +12,10 @@
 	</maintainer>
 	<use>
 		<flag name="html">Install HTML documentation</flag>
-		<!--
 		<flag name="libvirt">Enable support for virtual machine management through <pkg>app-emulation/libvirt</pkg></flag>
-		-->
-		<flag name="mysql">Use <pkg>dev-db/mysql</pkg> as database backend,
-			default would be Berkeley DB (<pkg>sys-libs/db</pkg>)</flag>
-		<flag name="postgres">Use <pkg>dev-db/postgresql-server</pkg> as
-			database backend, default would be Berkeley DB (<pkg>sys-libs/db</pkg>)</flag>
-		<flag name="qdbm">Use <pkg>dev-db/qdbm</pkg> as database backend,
-			default would be Berkeley DB (<pkg>sys-libs/db</pkg>)</flag>
+		<flag name="qdbm">Use <pkg>dev-db/qdbm</pkg> as database backend</flag>
 		<flag name="tests">Install test files</flag>
-		<flag name="tokyocabinet">Use <pkg>dev-db/tokyocabinet</pkg> as database
-			backend, default would be Berkeley DB (<pkg>sys-libs/db</pkg>)</flag>
+		<flag name="tokyocabinet">Use <pkg>dev-db/tokyocabinet</pkg> as database backend</flag>
 	</use>
 	<longdescription>
 	Cfengine, or the configuration engine is an autonomous agent and a middle to