Version bump.

Package-Manager: portage-2.1.10.44/cvs/Linux i686

3 files changed, 28 insertions, 26 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index 44fffc314146..6a0f3e104d1c 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/cfengine
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.140 2011/11/01 22:27:01 idl0r Exp $
+# 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 $
+
+*cfengine-3.2.4 (12 Feb 2012)
+
+  12 Feb 2012; Christian Ruppert <idl0r@gentoo.org> -cfengine-3.1.5.ebuild,
+  +cfengine-3.2.4.ebuild:
+  Version bump.
 
 *cfengine-3.2.3 (01 Nov 2011)
 
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index f14d2f112133..33b71048bd8d 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -12,23 +12,23 @@ AUX cfexecd.rc6 259 RMD160 05810d7582d962903033ed85b409818dd19089ef SHA1 f95df77
 AUX cfservd.rc6 259 RMD160 8390afb5b3cf7ffbe0b74766ddf3f9d05c4d5b6c SHA1 c1fc1ccf15789c8acfc3857481ed69dc7f9b6d2b SHA256 892e9537c9b75861031a0755af886b2b931e1ca4dd2589847a2bacf00862de0f
 DIST cfengine-2.2.10.tar.gz 2690333 RMD160 67fd3dc80270dc000887e3dbf26f372338e2600f SHA1 032bec0bc59ffee7179422e96dfd902afbf94340 SHA256 f34697cc52e1342c5ec4b45a4adf9fbffdfa05a68bdc7c53382f72d03e106783
 DIST cfengine-3.1.4.tar.gz 1599876 RMD160 75be7bed44718dd4f45ddccd235a46563391eecf SHA1 8879f375e0c0208620660d0d49f52bb814934fd9 SHA256 b4f2e1f7c1d39d37a78c63cab33899b0e829648283be507d78ffa873ccbe3466
-DIST cfengine-3.1.5.tar.gz 1141253 RMD160 d2605a74ce30bbb06e9d92a57dd102524419d496 SHA1 e362742ed3d1d605be222cc901820ac0811ff177 SHA256 7c9742dfae84893bedb74b9c40f1604567c20cafbda188cf289442de350cd826
 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
 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.1.5.ebuild 4056 RMD160 576424e59d3f2aaeeb380644c0460eadf2a6c4f5 SHA1 d366c993095e25efa2b82b7968b34120c4088f13 SHA256 147eaec6ed168702ac0cc4ea146e63aff51b042179beb44d6617f0110870ff81
 EBUILD cfengine-3.2.3.ebuild 4074 RMD160 c6208f098c288e665d587279c31bfb95a78e72d0 SHA1 e0987313d47fd3d714a1f55bcd106ba5737d7f1d SHA256 eb0f66c7c57622e936e587115085e546381d17e990609e969a1832b9ccbd3269
-MISC ChangeLog 23618 RMD160 888c68cf0f2ac37d3513212cf45f115dfa492ad2 SHA1 fd16322d4a1c99c621ec188073bf9d527bcf3a05 SHA256 7fb49cb1e44e3b4e3d0ae6bc3b9376d8edeef15b97e714c9de828494ea88b63c
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJOsHI/AAoJEMOx0zmdw4Z1ZjEH+wc8bjHH8U02ei0q4aRhDWBd
-03D4SldNWBfZNVgUHQT6N/zw9HSeyNUQT/OzoC8xmV7pxhQiX6qJGz4fxXr4mF60
-olIYFgkB9F+huJGa0QwVCgHKI6Gu6ufMbN+EsE5xQNNa1j7E4JLTVSuxNQns+PMk
-9B6P8WVla9PuxK7/cws2bObupsCAW6ZhJqc06x3YTQ2hnn7VJ0p8vtDPwXtkF3uu
-f3Fp1fCju83FsFAU8/+5+Wk2U4sMLmhanSMj/2UcD8KZ8sBm8Mb+QBnMlPwbtVzv
-iQh4H1e7KUynI+GbRvN31D8vkSjtCt92AZI2gGnmFoo7IO4NdxpGUR1LBb+M17A=
-=LPsz
+iQEcBAEBCAAGBQJPOAkzAAoJEMOx0zmdw4Z1yeUH/0RiHiKSiWGVgLam2MHZPNbJ
+gvL0NKVJtLynPmHRNjqD3SZyOiKYCycK/XAjdROllru+PvqqSIOT9bLKchpw/Cmo
+3XsZst8Z/t/wz5rJnXZtuet6IUM54bXUi+CJfIzYX1z8PahBrxo81krYlBP2nenA
+VyLWZ7iGxlS5QUF8jsKhUVIf2e9TYfMyiyRtMYL3rRkoUgteMY277B8QIo1Lv0qB
+zt08vGToRzAHhwBwdC3F8MAa5DT8ApUBpdjVRFPmKUhg30ZRQ74fWUxk4yN/rFr8
+i3zj1GbM7vr9RSk7DKbdyymz2R/Pp+wAGBJlQUXjkX/3zitzku1Lkr9zY5CWYjg=
+=Bx4m
 -----END PGP SIGNATURE-----
diff --git a/net-misc/cfengine/cfengine-3.1.5.ebuild b/net-misc/cfengine/cfengine-3.2.4.ebuild
index e24b2a2f2811..d9de35c169d8 100644
--- a/net-misc/cfengine/cfengine-3.1.5.ebuild
+++ b/net-misc/cfengine/cfengine-3.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1.5.ebuild,v 1.2 2011/08/30 17:11:03 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.2.4.ebuild,v 1.1 2012/02/12 18:47:10 idl0r Exp $
 
 EAPI="3"
 
@@ -11,7 +11,7 @@ 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"
+SRC_URI="http://cfengine.com/source-code/download?file=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="3"
@@ -38,13 +38,8 @@ S="${WORKDIR}/${MY_P}"
 src_configure() {
 	local myconf
 
-	if use mysql || use postgres ; then
-		myconf="--with-sql"
-	else
-		myconf="--without-sql"
-	fi
-
 	# BDB by default, prefer tokyocabinet above qdbm...
+	# sqlite3 has been added but stated as experimental/broken...
 	if ! use qdbm && ! use tokyocabinet; then
 		myconf="${myconf} --with-berkeleydb=/usr"
 	elif use qdbm && use tokyocabinet; then
@@ -63,10 +58,12 @@ src_configure() {
 		--with-workdir=/var/cfengine \
 		--with-pcre \
 		${myconf} \
+		$(use_with postgres postgresql) \
+		$(use_with mysql) \
 		$(use_enable selinux)
 
 	# Fix Makefile to skip inputs, see below "examples"
-	sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
+	#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
@@ -78,11 +75,10 @@ src_install() {
 	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
 
 	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO INSTALL
+	dodoc AUTHORS ChangeLog README INSTALL
 
-	if use examples; then
-		docinto examples
-		dodoc inputs/*.cf || die
+	if ! use examples; then
+		rm -rf "${D}"/usr/share/doc/${PF}/example*
 	fi
 
 	# Create cfengine working directory