Stable on x86/amd64, minor cleanup

Package-Manager: portage-2.0.51.22-r2

6 files changed, 17 insertions, 89 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index be6b7765994a..737701fd2afb 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,11 @@
 # 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.57 2005/08/13 23:25:48 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.58 2005/08/17 04:45:02 ramereth Exp $
+
+  17 Aug 2005; Lance Albertson <ramereth@gentoo.org>
+  cfengine-2.1.14-r1.ebuild, -cfengine-2.1.15.ebuild,
+  cfengine-2.1.15-r1.ebuild:
+  * Stable on x86/amd64
 
   13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
   cfengine-2.1.14.ebuild:
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index dc450dc4cad5..57247ca21d54 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,16 +1,14 @@
-MD5 93f0794d84bdef4e1de7979e366a41b3 cfengine-2.1.15.ebuild 2069
+MD5 2573e169ad8f569759bb73e18327eec8 ChangeLog 8749
 MD5 0fc2e52b014b73ecd1ecf09bac0aba53 cfengine-2.1.14.ebuild 2063
 MD5 7b6935177932b682ae3a53cd2e6a9cc3 metadata.xml 977
-MD5 aa04c52fb16fb3bd03643f2651952ade ChangeLog 8586
-MD5 65dea657f2bc459853268c4f3c925368 cfengine-2.1.15-r1.ebuild 2257
-MD5 a163894359525be86eb7efca731c9a35 cfengine-2.1.14-r1.ebuild 2257
 MD5 047b3a63d198f4bf3902d25b49896cef cfengine-2.1.13.ebuild 2062
-MD5 f4fe82c710efac73c0895ad268c54196 files/cfportage.README 2294
+MD5 c116a9798a497778b145ee38980692a1 cfengine-2.1.14-r1.ebuild 2256
+MD5 09694bb35e7ca4abbdfdf2bc0cd5710b cfengine-2.1.15-r1.ebuild 2255
 MD5 815d5e5ddde6c8fda9da1dbd529181aa files/digest-cfengine-2.1.14 68
+MD5 f4fe82c710efac73c0895ad268c54196 files/cfportage.README 2294
 MD5 ade9e66709bdb04df3f0beba72f3a008 files/module-cfportage.tbz2 3099
-MD5 815d5e5ddde6c8fda9da1dbd529181aa files/digest-cfengine-2.1.14-r1 68
 MD5 e34708413b735ba7b5402ee47b2bb62d files/digest-cfengine-2.1.13 68
-MD5 1781d04ce20330f0e9b266753eff4c91 files/digest-cfengine-2.1.15-r1 68
-MD5 f1a9344587920c108d487766f61e90cf files/cfservd.rc6 259
-MD5 1781d04ce20330f0e9b266753eff4c91 files/digest-cfengine-2.1.15 68
 MD5 a9aa786ac4c8e32d55d8469af8ddf29b files/cfengine-2.1.10-setnetgrent.patch 1037
+MD5 f1a9344587920c108d487766f61e90cf files/cfservd.rc6 259
+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
index f0142af93277..0dfd6215d14b 100644
--- a/net-misc/cfengine/cfengine-2.1.14-r1.ebuild
+++ b/net-misc/cfengine/cfengine-2.1.14-r1.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.14-r1.ebuild,v 1.1 2005/07/02 19:16:50 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.14-r1.ebuild,v 1.2 2005/08/17 04:45:02 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.15-r1.ebuild b/net-misc/cfengine/cfengine-2.1.15-r1.ebuild
index a102c6f70ddc..e5898a149b6e 100644
--- a/net-misc/cfengine/cfengine-2.1.15-r1.ebuild
+++ b/net-misc/cfengine/cfengine-2.1.15-r1.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.15-r1.ebuild,v 1.1 2005/07/02 19:16:50 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.15-r1.ebuild,v 1.2 2005/08/17 04:45:02 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.15.ebuild b/net-misc/cfengine/cfengine-2.1.15.ebuild
deleted file mode 100644
index 253b528b68a0..000000000000
--- a/net-misc/cfengine/cfengine-2.1.15.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.15.ebuild,v 1.1 2005/06/25 00:54:31 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.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/files/digest-cfengine-2.1.15 b/net-misc/cfengine/files/digest-cfengine-2.1.15
deleted file mode 100644
index d1c0e76b71a8..000000000000
--- a/net-misc/cfengine/files/digest-cfengine-2.1.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f03de82709f84c3d6d916b6e557321f9 cfengine-2.1.15.tar.gz 3555495