fixed various issues (deps, file locations, manpages) -- see changelog for more detail

Package-Manager: portage-2.0.51.19

6 files changed, 175 insertions, 2 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index 8f95d39778b6..bd57bad64513 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,17 @@
 # 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.54 2005/06/25 00:54:31 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.55 2005/07/02 19:16:50 ramereth Exp $
+
+*cfengine-2.1.15-r1 (02 Jul 2005)
+*cfengine-2.1.14-r1 (02 Jul 2005)
+
+  02 Jul 2005; Lance Albertson <ramereth@gentoo.org>
+  +cfengine-2.1.14-r1.ebuild, +cfengine-2.1.15-r1.ebuild:
+  * Fixed openssl dep to match upstream's suggestion
+  * Fixed the contrib, inputs, & doc installation issue
+    (It would put it in the wrong place)
+  * Fixed a few doc locations
+  * Added manpages
 
 *cfengine-2.1.15 (25 Jun 2005)
 
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 36b8890eeccf..00f256f66a70 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,8 +1,10 @@
-MD5 740c9e202d6c454d517a15e8dfb2ad30 ChangeLog 8020
+MD5 0717489b3d2ada0ef29811f42785dbc6 ChangeLog 8400
 MD5 776612e27c8d5dfde5262c35369a0626 cfengine-2.1.14.ebuild 2068
 MD5 7b6935177932b682ae3a53cd2e6a9cc3 metadata.xml 977
 MD5 047b3a63d198f4bf3902d25b49896cef cfengine-2.1.13.ebuild 2062
 MD5 93f0794d84bdef4e1de7979e366a41b3 cfengine-2.1.15.ebuild 2069
+MD5 a163894359525be86eb7efca731c9a35 cfengine-2.1.14-r1.ebuild 2257
+MD5 65dea657f2bc459853268c4f3c925368 cfengine-2.1.15-r1.ebuild 2257
 MD5 815d5e5ddde6c8fda9da1dbd529181aa files/digest-cfengine-2.1.14 68
 MD5 f4fe82c710efac73c0895ad268c54196 files/cfportage.README 2294
 MD5 ade9e66709bdb04df3f0beba72f3a008 files/module-cfportage.tbz2 3099
@@ -11,3 +13,5 @@ MD5 bf538c6d3db7c825355a0e8d34fa6efc files/module:cfportage 10247
 MD5 a9aa786ac4c8e32d55d8469af8ddf29b files/cfengine-2.1.10-setnetgrent.patch 1037
 MD5 f1a9344587920c108d487766f61e90cf files/cfservd.rc6 259
 MD5 1781d04ce20330f0e9b266753eff4c91 files/digest-cfengine-2.1.15 68
+MD5 815d5e5ddde6c8fda9da1dbd529181aa files/digest-cfengine-2.1.14-r1 68
+MD5 1781d04ce20330f0e9b266753eff4c91 files/digest-cfengine-2.1.15-r1 68
diff --git a/net-misc/cfengine/cfengine-2.1.14-r1.ebuild b/net-misc/cfengine/cfengine-2.1.14-r1.ebuild
new file mode 100644
index 000000000000..f0142af93277
--- /dev/null
+++ b/net-misc/cfengine/cfengine-2.1.14-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.14-r1.ebuild,v 1.1 2005/07/02 19:16:50 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:root /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/cfengine-2.1.15-r1.ebuild b/net-misc/cfengine/cfengine-2.1.15-r1.ebuild
new file mode 100644
index 000000000000..a102c6f70ddc
--- /dev/null
+++ b/net-misc/cfengine/cfengine-2.1.15-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.15-r1.ebuild,v 1.1 2005/07/02 19:16:50 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:root /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.14-r1 b/net-misc/cfengine/files/digest-cfengine-2.1.14-r1
new file mode 100644
index 000000000000..24646923eb9f
--- /dev/null
+++ b/net-misc/cfengine/files/digest-cfengine-2.1.14-r1
@@ -0,0 +1 @@
+MD5 82967f7e5ab075628793771e18b1d689 cfengine-2.1.14.tar.gz 3517247
diff --git a/net-misc/cfengine/files/digest-cfengine-2.1.15-r1 b/net-misc/cfengine/files/digest-cfengine-2.1.15-r1
new file mode 100644
index 000000000000..d1c0e76b71a8
--- /dev/null
+++ b/net-misc/cfengine/files/digest-cfengine-2.1.15-r1
@@ -0,0 +1 @@
+MD5 f03de82709f84c3d6d916b6e557321f9 cfengine-2.1.15.tar.gz 3555495