stable on x86, version bump

(Portage version: 2.0.53)

5 files changed, 95 insertions, 7 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index 855733bf8ac0..ac3f5687aaa5 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/cfengine
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.65 2005/12/24 15:36:59 hansmi Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.66 2006/01/11 05:09:58 ramereth Exp $
+
+*cfengine-2.1.18 (11 Jan 2006)
+
+  11 Jan 2006; Lance Albertson <ramereth@gentoo.org> cfengine-2.1.17.ebuild,
+  +cfengine-2.1.18.ebuild:
+  * Stable on x86
+  * Version bump
 
   24 Dec 2005; Michael Hanselmann <hansmi@gentoo.org>
   cfengine-2.1.16.ebuild:
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 95fe181d8c2b..640b0a418ba6 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,11 +1,13 @@
-MD5 075f8427422004ede45474485f478b64 ChangeLog 9809
+MD5 29c76281614d6284f980c9b3ffaab1e6 ChangeLog 9981
 MD5 55b5cd09421554e49815035eda48164c cfengine-2.1.15-r1.ebuild 2250
 MD5 1459e55142a0b39e459109cc797e8ab2 cfengine-2.1.16.ebuild 2248
-MD5 4b856140b1f32f08a484efe7c17dfe36 cfengine-2.1.17.ebuild 2252
+MD5 c2eb5fa9d0bea41b8a3697877573e3ac cfengine-2.1.17.ebuild 2251
+MD5 b198a28bb6ad660a23a0a6b9fede197d cfengine-2.1.18.ebuild 2252
 MD5 f4fe82c710efac73c0895ad268c54196 files/cfportage.README 2294
 MD5 f1a9344587920c108d487766f61e90cf files/cfservd.rc6 259
 MD5 1781d04ce20330f0e9b266753eff4c91 files/digest-cfengine-2.1.15-r1 68
 MD5 d07b5988a1635858506b57b2350b5f02 files/digest-cfengine-2.1.16 68
 MD5 e663ecd3739926ae43f89577216d85d7 files/digest-cfengine-2.1.17 68
+MD5 5968b30ead2b68a71df032bc34b04b22 files/digest-cfengine-2.1.18 68
 MD5 ade9e66709bdb04df3f0beba72f3a008 files/module-cfportage.tbz2 3099
 MD5 78ca953228396511baf3f7ccef97fe27 metadata.xml 984
diff --git a/net-misc/cfengine/cfengine-2.1.17.ebuild b/net-misc/cfengine/cfengine-2.1.17.ebuild
index c56892c728ae..17783a2633fd 100644
--- a/net-misc/cfengine/cfengine-2.1.17.ebuild
+++ b/net-misc/cfengine/cfengine-2.1.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.17.ebuild,v 1.2 2005/12/16 13:12:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.17.ebuild,v 1.3 2006/01/11 05:09:58 ramereth Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.iu.hio.no/pub/cfengine/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc x86"
 IUSE=""
 
 DEPEND=">=sys-libs/db-3.2
diff --git a/net-misc/cfengine/cfengine-2.1.18.ebuild b/net-misc/cfengine/cfengine-2.1.18.ebuild
new file mode 100644
index 000000000000..e9538f013c54
--- /dev/null
+++ b/net-misc/cfengine/cfengine-2.1.18.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.18.ebuild,v 1.1 2006/01/11 05:09:58 ramereth Exp $
+
+inherit eutils
+
+DESCRIPTION="An agent/software robot and a high level policy language for building expert systems to administrate and configure large computer networks"
+HOMEPAGE="http://www.iu.hio.no/cfengine/"
+SRC_URI="ftp://ftp.iu.hio.no/pub/cfengine/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=sys-libs/db-3.2
+	>=dev-libs/openssl-0.9.7"
+
+src_compile() {
+	# Enforce /var/cfengine for historical compatibility
+	econf \
+		--with-workdir=/var/cfengine \
+		--with-berkeleydb=/usr || die
+
+	# Fix Makefile to skip doc,inputs, & contrib install to wrong locations
+	sed -i -e 's/\(DIST_SUBDIRS.*\) contrib inputs doc/\1/' Makefile
+	sed -i -e 's/\(SUBDIRS.*\) contrib inputs/\1/' Makefile
+	sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile
+
+	emake || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/cfservd.rc6 cfservd
+
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README TODO INSTALL
+
+	# Manually install doc and inputs
+	doinfo doc/*.info*
+	dohtml doc/*.html
+	doman doc/*.8
+	dodoc ${FILESDIR}/cfportage.README
+	docinto examples
+	dodoc inputs/*.example
+
+	# Create cfengine working directory
+	mkdir -p ${D}/var/cfengine
+	fperms 700 /var/cfengine
+	keepdir /var/cfengine/bin
+	keepdir /var/cfengine/inputs
+	dodir /var/cfengine/modules
+	tar jxf ${FILESDIR}/module-cfportage.tbz2 -C ${D}/var/cfengine/modules
+	fowners root:0 /var/cfengine/modules/module\:cfportage
+}
+
+pkg_postinst() {
+	if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]
+		then
+		einfo "Generating keys for localhost."
+		/usr/sbin/cfkey
+	fi
+
+
+	# 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.
+
+	cp /usr/sbin/cf{agent,servd,execd} /var/cfengine/bin/
+
+	einfo
+	einfo "Now an init script for cfservd is provided."
+	einfo
+	einfo "To run cfengine out of cron every half hour modify your crontab:"
+	einfo "0,30 * * * *    /usr/sbin/cfexecd -F"
+	einfo
+}
diff --git a/net-misc/cfengine/files/digest-cfengine-2.1.18 b/net-misc/cfengine/files/digest-cfengine-2.1.18
new file mode 100644
index 000000000000..b2a61c6d4b4d
--- /dev/null
+++ b/net-misc/cfengine/files/digest-cfengine-2.1.18
@@ -0,0 +1 @@
+MD5 7703780f987facc537cf239b04d2b2e8 cfengine-2.1.18.tar.gz 3622774