Version bump to 3.2.0. Fix SRC_URI.

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

6 files changed, 168 insertions, 18 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index e70041acdae3..b0a74a82b0d4 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.136 2011/05/03 23:16:33 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.137 2011/08/30 17:11:03 idl0r Exp $
+
+*cfengine-3.2.0 (30 Aug 2011)
+
+  30 Aug 2011; Christian Ruppert <idl0r@gentoo.org> cfengine-2.2.10-r3.ebuild,
+  cfengine-3.1.4.ebuild, cfengine-3.1.5.ebuild, +cfengine-3.2.0.ebuild:
+  Version bump to 3.2.0. Fix SRC_URI.
 
 *cfengine-3.1.5 (03 May 2011)
 
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index e7aa6c794b68..b8c10fe8c076 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -13,19 +13,21 @@ AUX cfservd.rc6 259 RMD160 8390afb5b3cf7ffbe0b74766ddf3f9d05c4d5b6c SHA1 c1fc1cc
 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
-EBUILD cfengine-2.2.10-r3.ebuild 3109 RMD160 c4dc9fe7d8026ad6ecf7fa01a4e8dc67a62ab277 SHA1 7921fd2d9434d6f9f331c1deeafd14a514353dfc SHA256 53b7fde170c753a64a5c605b23bbd6168fdc211833a2b4e5542b994831be0ce8
-EBUILD cfengine-3.1.4.ebuild 4502 RMD160 7694f9f53de35c4a52fac8b7de808d2305d71a24 SHA1 e83e588f785d68cbe3f08854ce9a9d99e47c4924 SHA256 7e596e304020931f2744f56999ad2d6659f0b62b78f7c8e735dc17633e6e7e65
-EBUILD cfengine-3.1.5.ebuild 4025 RMD160 49466dda83a8962c84c17cc84f59a1d79312ff1f SHA1 c8f95de7e92ea903963a55e63f5b74bc65627943 SHA256 78a238b6bae8228307a8d7ce124bda7b4e5b543636901d71f932de6abdbdd8a8
-MISC ChangeLog 22903 RMD160 9c141c4e235216fdded0c0a65b412a2f0c94e810 SHA1 f365bc286fe19060397549520031253861883bf8 SHA256 a3805d470d0d751ef27da89a7d05127d0598f5eb4f3a3ee0c6616f96f762bb7c
+DIST cfengine-3.2.0.tar.gz 1139534 RMD160 e0bc6bac44ab933b9dc0710e4c99eaf90d3d4af4 SHA1 0dd2bc74313d2460fc1ea9a7642f1cbfa66fbb37 SHA256 c6212488d9b68d585bcc27766309f646d2ca576374777752c238c0e7e5e8b6a1
+EBUILD cfengine-2.2.10-r3.ebuild 3136 RMD160 5a5c5da9d39b2a132724677e5b9635184a7244e6 SHA1 e6d6b692df225df50270a4e0df3dabc5d47c3eec SHA256 4bc18b1fc87207e318dca2a0ee29484405bfa080e234eba370148a61af053823
+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.0.ebuild 4174 RMD160 631b099ef7af411543f8c51aa1d24f186a31df64 SHA1 2dfbe1455ba914a338a6116b44ecfabd96c39325 SHA256 b61ddc68b03bb5a19f5db43509956a3bc9d9dc1d44348db1d6f27cda5e5337e9
+MISC ChangeLog 23124 RMD160 fb005b7cbcea651cdad140729285312f7cd53c5d SHA1 44173b74238cae8b6e31872308ecf624cd8c3c4a SHA256 3a44e463e8076592915bc8917083bb7f04a8177d31ef0e2b38cd4acfef61817c
 MISC metadata.xml 2591 RMD160 d5907725b22a9608780c95f44e9cdf28645b4e40 SHA1 a6780f88141ed5fe46d201fe32aacabbb7e05b91 SHA256 f871e8ac89cf6f0b46aabf0409aa387307288c72cd0ac4a6bf1231ed01e4ddf0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJNwIzWAAoJEMOx0zmdw4Z1p4oH/jLIjpZ0oXvoU4R+sH7GBH9n
-ChmnqcP7cBfQ6y+jSB9Ug4C1EFphIvPMBCmyssxXuaBBhGOyn3dPbbZlGiKzyz7m
-KVUakkwwsCpLWQIDR1+m3KPMK1HHFc1lm6udag/HyUagG1EkV3zOO4/0P8+12BYg
-PCj9vk+pEvs7iulE5C4m1ASjof/I7KYvYeSRb1kwe8QbHjD4tdqTxvyyIhwGTu3Z
-rHfiY7qNWEhGIGClifTXyWEQcJunMcII7wB5DC+E4wioYLY4L6WtQN0gpogpns0q
-s4mX6i+Vspt97dwUdoa4gOGjsUrziuFHvfn1uCbtfcX+dPyj8uE/A6S2a6BAeGI=
-=YAll
+iQEcBAEBCAAGBQJOXRmtAAoJEMOx0zmdw4Z1AbsH/i50IS0kXlDpQyj9NsASgIoc
+9dueYZNv46A991N5aVGWr8ND5LaNDPMKV044fxozHnVcW/zYDDbshXk5NERRp9Dq
+OwqIEd/FODAo4T/1R7uLWsGla6QFme/REhzhp7OoljoeQDU5KhsCbI17SBauz1bI
+AKb5K6H0PKVU9oSdz7+InCjOcYEDhipNmjxW+uU3UmDi96ROGC7mjXKBWNqS5DQO
+0Gs9MvL4OBT7MiRM+Sfh0ZNM7fQhw+WR7LbYmLeoeXAf7PBd9Wfd66lWwx7PSZ3M
+Qkol5w2c92heuDG+55TNdmmY2uQhA5mfQ1CBXH+4Kxpb+mcmBsA6O8S9l8ghQ/o=
+=fmLV
 -----END PGP SIGNATURE-----
diff --git a/net-misc/cfengine/cfengine-2.2.10-r3.ebuild b/net-misc/cfengine/cfengine-2.2.10-r3.ebuild
index 1c1170318c74..a3c6ebcafbd7 100644
--- a/net-misc/cfengine/cfengine-2.2.10-r3.ebuild
+++ b/net-misc/cfengine/cfengine-2.2.10-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.2.10-r3.ebuild,v 1.5 2011/01/10 21:23:21 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.2.10-r3.ebuild,v 1.6 2011/08/30 17:11:03 idl0r Exp $
 
 EAPI="2"
 
@@ -9,7 +9,7 @@ inherit eutils
 DESCRIPTION="An automated suite of programs for configuring and maintaining
 Unix-like computers"
 HOMEPAGE="http://www.cfengine.org/"
-SRC_URI="http://www.cfengine.org/tarballs/${P}.tar.gz"
+SRC_URI="http://cfengine.com/source_code/download?file=${P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/cfengine/cfengine-3.1.4.ebuild b/net-misc/cfengine/cfengine-3.1.4.ebuild
index c7338e73851c..fc1a0c24c1d7 100644
--- a/net-misc/cfengine/cfengine-3.1.4.ebuild
+++ b/net-misc/cfengine/cfengine-3.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.4.ebuild,v 1.5 2011/04/25 14:30:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.4.ebuild,v 1.6 2011/08/30 17:11:03 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://www.cfengine.org/tarballs/${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"
diff --git a/net-misc/cfengine/cfengine-3.1.5.ebuild b/net-misc/cfengine/cfengine-3.1.5.ebuild
index 126eb8144c85..e24b2a2f2811 100644
--- a/net-misc/cfengine/cfengine-3.1.5.ebuild
+++ b/net-misc/cfengine/cfengine-3.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.1 2011/05/03 23:16:33 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.5.ebuild,v 1.2 2011/08/30 17:11:03 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://www.cfengine.org/tarballs/${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"
diff --git a/net-misc/cfengine/cfengine-3.2.0.ebuild b/net-misc/cfengine/cfengine-3.2.0.ebuild
new file mode 100644
index 000000000000..754338e41bdf
--- /dev/null
+++ b/net-misc/cfengine/cfengine-3.2.0.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.2.0.ebuild,v 1.1 2011/08/30 17:11:03 idl0r Exp $
+
+EAPI="3"
+
+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 ~ppc ~s390 ~sparc ~x86"
+
+# libvirt disabled for now because it blocks stabilization etc.
+IUSE="examples html mysql postgres qdbm selinux tests tokyocabinet vim-syntax"
+
+# libvirt? ( app-emulation/libvirt )
+DEPEND=">=sys-libs/db-4
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	selinux? ( sys-libs/libselinux )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	!tokyocabinet? ( qdbm? ( dev-db/qdbm ) )
+	!tokyocabinet? ( !qdbm? ( >=sys-libs/db-4 ) )
+	>=dev-libs/openssl-0.9.7
+	dev-libs/libpcre"
+RDEPEND="${DEPEND}"
+PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
+
+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
+		elog "QDBM and Tokyo Cabinet can't be used together, using Tokyo Cabinet by default"
+		myconf="${myconf} --with-tokyocabinet"
+	elif use qdbm && ! use tokyocabinet; then
+		myconf="${myconf} --with-qdbm"
+	elif ! use qdbm && use tokyocabinet; then
+		myconf="${myconf} --with-tokyocabinet"
+	fi
+
+	# Enforce /var/cfengine for historical compatibility
+	# $(use_with libvirt) \
+	econf \
+		--docdir=/usr/share/doc/"${PF}" \
+		--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
+
+	# 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
+	dodoc AUTHORS ChangeLog README INSTALL
+
+	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
+	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
+}