new 2.1.1 ebuild and misc. fixes

5 files changed, 72 insertions, 3 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index f2cfda0974af..db334956dc19 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/cfengine
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.20 2003/12/17 15:07:02 tigger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.21 2004/01/31 13:44:58 klieber Exp $
+
+*cfengine-2.1.1 (31 Jan 2004)
+
+  31 Jan 2004; Kurt Lieber <klieber@gentoo.org> cfengine-2.0.8_p1-r2.ebuild,
+  cfengine-2.1.1.ebuild:
+  added new 2.1.1 build
 
 *cfengine-2.0.8_p1-r3 (17 Dec 2003)
 
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index b65cbf8abb68..553c937d7502 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,4 +1,4 @@
-MD5 c216ccfc168cb99ddd2ab629679fb707 ChangeLog 3956
+MD5 9e2c894243a533c32669a9f0a34ca7b2 ChangeLog 3957
 MD5 a2be03b6731823dbd298d4f35758f9b6 cfengine-1.6.3.ebuild 723
 MD5 e35c3445cb81576250f15893c893b290 cfengine-2.1.0_p1.ebuild 1570
 MD5 6dbab18cc5b89f9c6875708f922e7f10 cfengine-2.1.1.ebuild 1549
diff --git a/net-misc/cfengine/cfengine-2.0.8_p1-r2.ebuild b/net-misc/cfengine/cfengine-2.0.8_p1-r2.ebuild
index 4133635da2fe..4ec9845e810f 100644
--- a/net-misc/cfengine/cfengine-2.0.8_p1-r2.ebuild
+++ b/net-misc/cfengine/cfengine-2.0.8_p1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # $
 
diff --git a/net-misc/cfengine/cfengine-2.1.1.ebuild b/net-misc/cfengine/cfengine-2.1.1.ebuild
new file mode 100644
index 000000000000..37de71297af3
--- /dev/null
+++ b/net-misc/cfengine/cfengine-2.1.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $
+
+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="~x86 ~ppc ~sparc"
+
+DEPEND="virtual/glibc
+	>=sys-libs/db-3.2
+	>=dev-libs/openssl-0.9.6k"
+
+S="${WORKDIR}/${P}"
+
+src_compile() {
+
+	# Enforce /var/cfengine for historical compatibility
+	econf \
+		--with-workdir=/var/cfengine \
+		--with-berkeleydb=/usr || die
+
+	# Fix Makefile to skip doc & inputs install to wrong locations
+	sed -i -e 's/\(SUBDIRS.*\) inputs doc/\1/' Makefile
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS ChangeLog COPYING DOCUMENTATION README TODO
+
+	# Manually install doc and inputs
+	doinfo doc/*.info*
+	dohtml doc/*.html
+	dodoc inputs/*.example
+
+	# Create cfengine working directory
+	mkdir -p ${D}/var/cfengine
+	fperms 700 /var/cfengine
+	keepdir /var/cfengine/bin
+	keepdir /var/cfengine/inputs
+}
+
+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/
+}
diff --git a/net-misc/cfengine/files/digest-cfengine-2.1.1 b/net-misc/cfengine/files/digest-cfengine-2.1.1
new file mode 100644
index 000000000000..5ea0de0d8c5f
--- /dev/null
+++ b/net-misc/cfengine/files/digest-cfengine-2.1.1
@@ -0,0 +1 @@
+MD5 71a91ec5283b45313b78fe00f8d1e042 cfengine-2.1.1.tar.gz 1304210