rev bump, metadata fix, ebuild cleanup, removed unused patch

Package-Manager: portage-2.0.51.22-r2

8 files changed, 31 insertions, 114 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index c913c379e3a1..c3dd34cb4487 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,16 @@
 # 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.60 2005/08/20 18:21:16 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.61 2005/10/02 18:26:20 ramereth Exp $
+
+*cfengine-2.1.16 (02 Oct 2005)
+
+  02 Oct 2005; Lance Albertson <ramereth@gentoo.org>
+  -files/cfengine-2.1.10-setnetgrent.patch, metadata.xml,
+  -cfengine-2.1.13.ebuild, -cfengine-2.1.14.ebuild, +cfengine-2.1.16.ebuild:
+  * Rev bump for 2.1.16
+  * Ebuild cleanup
+  * Fix wordwrap in metadata.xml
+  * Removed unused patch
 
   20 Aug 2005; Jason Wever <weeve@gentoo.org> cfengine-2.1.15-r1.ebuild:
   Stable on SPARC.
diff --git a/net-misc/cfengine/cfengine-2.1.14.ebuild b/net-misc/cfengine/cfengine-2.1.14.ebuild
deleted file mode 100644
index 85eafce76b38..000000000000
--- a/net-misc/cfengine/cfengine-2.1.14.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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.ebuild,v 1.5 2005/08/13 23:25:48 hansmi 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.6k"
-
-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() {
-	newinitd "${FILESDIR}"/cfservd.rc6 cfservd
-
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README TODO
-
-	# Manually install doc and inputs
-	doinfo doc/*.info*
-	dohtml doc/*.html
-	dodoc inputs/*.example
-	dodoc ${FILESDIR}/cfportage.README
-
-	# 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.13.ebuild b/net-misc/cfengine/cfengine-2.1.16.ebuild
index 55659e224f72..0ebcd8b1dcf5 100644
--- a/net-misc/cfengine/cfengine-2.1.13.ebuild
+++ b/net-misc/cfengine/cfengine-2.1.16.ebuild
@@ -1,6 +1,6 @@
 # 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.13.ebuild,v 1.6 2005/04/25 03:48:01 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.16.ebuild,v 1.1 2005/10/02 18:26:20 ramereth Exp $
 
 inherit eutils
 
@@ -10,11 +10,11 @@ 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
-	>=dev-libs/openssl-0.9.6k"
+	>=dev-libs/openssl-0.9.7"
 
 src_compile() {
 	# Enforce /var/cfengine for historical compatibility
@@ -22,8 +22,10 @@ src_compile() {
 		--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
+	# 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
 }
@@ -32,13 +34,15 @@ src_install() {
 	newinitd "${FILESDIR}"/cfservd.rc6 cfservd
 
 	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README TODO
+	dodoc AUTHORS ChangeLog README TODO INSTALL
 
 	# Manually install doc and inputs
 	doinfo doc/*.info*
 	dohtml doc/*.html
-	dodoc inputs/*.example
+	doman doc/*.8
 	dodoc ${FILESDIR}/cfportage.README
+	docinto examples
+	dodoc inputs/*.example
 
 	# Create cfengine working directory
 	mkdir -p ${D}/var/cfengine
diff --git a/net-misc/cfengine/files/cfengine-2.1.10-setnetgrent.patch b/net-misc/cfengine/files/cfengine-2.1.10-setnetgrent.patch
deleted file mode 100644
index dc7090e092ae..000000000000
--- a/net-misc/cfengine/files/cfengine-2.1.10-setnetgrent.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Nrup cfengine-2.1.10.orig/src/patches.c cfengine-2.1.10/src/patches.c
---- cfengine-2.1.10.orig/src/patches.c	2004-04-17 10:11:04.000000000 -0400
-+++ cfengine-2.1.10/src/patches.c	2004-10-24 11:21:15.000000000 -0400
-@@ -85,11 +85,12 @@ return strncmp(buf1,buf2,n); 
- 
- /*********************************************************/
- 
--void setnetgrent(netgroup)
-+int setnetgrent(netgroup)
- 
- const char *netgroup;
- 
- {
-+	return 0;
- }
- 
- /**********************************************************/
-diff -Nrup cfengine-2.1.10.orig/src/prototypes.h cfengine-2.1.10/src/prototypes.h
---- cfengine-2.1.10.orig/src/prototypes.h	2004-06-25 11:12:38.000000000 -0400
-+++ cfengine-2.1.10/src/prototypes.h	2004-10-24 11:20:46.000000000 -0400
-@@ -805,7 +805,7 @@ int StrnCmp ARGLIST((char *s1,char *s2,s
- 
- #ifndef HAVE_GETNETGRENT
- 
--void setnetgrent ARGLIST((const char *netgroup));
-+int setnetgrent ARGLIST((const char *netgroup));
- int getnetgrent ARGLIST((char **host, char **user, char **domain));
- void endnetgrent ARGLIST((void));
- #endif
diff --git a/net-misc/cfengine/files/digest-cfengine-2.1.13 b/net-misc/cfengine/files/digest-cfengine-2.1.13
deleted file mode 100644
index 164bde6724dd..000000000000
--- a/net-misc/cfengine/files/digest-cfengine-2.1.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2c002fc37f2fc9f87248ad8b9e899091 cfengine-2.1.13.tar.gz 3153867
diff --git a/net-misc/cfengine/files/digest-cfengine-2.1.14 b/net-misc/cfengine/files/digest-cfengine-2.1.14
deleted file mode 100644
index 24646923eb9f..000000000000
--- a/net-misc/cfengine/files/digest-cfengine-2.1.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 82967f7e5ab075628793771e18b1d689 cfengine-2.1.14.tar.gz 3517247
diff --git a/net-misc/cfengine/files/digest-cfengine-2.1.16 b/net-misc/cfengine/files/digest-cfengine-2.1.16
new file mode 100644
index 000000000000..cb0e69d11ca0
--- /dev/null
+++ b/net-misc/cfengine/files/digest-cfengine-2.1.16
@@ -0,0 +1 @@
+MD5 1b009dcc2ab27c205e72b536c67ae173 cfengine-2.1.16.tar.gz 3606067
diff --git a/net-misc/cfengine/metadata.xml b/net-misc/cfengine/metadata.xml
index 09886805eb31..38d856591691 100644
--- a/net-misc/cfengine/metadata.xml
+++ b/net-misc/cfengine/metadata.xml
@@ -11,6 +11,13 @@
 		<name>Lance Albertson</name>
 	</maintainer>
 	<longdescription>
-	Cfengine, or the configuration engine is an autonomous agent and a middle to high level policy language for building expert systems which administrate and configure large computer networks. Cfengine uses the idea of classes and a primitive intelligence to define and automate the configuration and maintenance of system state, for small to huge configurations. Cfengine is designed to be a part of a computer immune system, and can be thought of as a gaming agent. It is ideal for cluster management and has been adopted for use all over the world in small and huge organizations alike.
+	Cfengine, or the configuration engine is an autonomous agent and a middle to
+	high level policy language for building expert systems which administrate
+	and configure large computer networks. Cfengine uses the idea of classes and
+	a primitive intelligence to define and automate the configuration and
+	maintenance of system state, for small to huge configurations. Cfengine is
+	designed to be a part of a computer immune system, and can be thought of as
+	a gaming agent. It is ideal for cluster management and has been adopted for
+	use all over the world in small and huge organizations alike.
 	</longdescription>
 </pkgmetadata>