6 files changed, 8 insertions, 64 deletions
diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index 8ff8b72cdc0b..fade21eed59e 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,10 @@
 # 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.15 2003/10/11 23:14:49 klieber Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.16 2003/10/12 15:08:46 klieber Exp $
+
+  12 Oct 2003; Kurt Lieber,,, <klieber@gentoo.org> cfengine-2.0.8_p1-r1.ebuild,
+  cfengine-2.0.8_p1-r2.ebuild:
+  removing -r1, marking -r2 as stable.  minor cleanups.  no major changes
 
 *cfengine-2.1.0_beta5 (11 Oct 2003)
 
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 8b5f0102da52..012c8e4c5a2a 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,17 +1,14 @@
-MD5 c6b01cf616c95f8af2bfa26c1ad51c0a ChangeLog 2865
+MD5 b7e4ad8a557809bce9805b45a7db61d3 ChangeLog 3051
 MD5 a2be03b6731823dbd298d4f35758f9b6 cfengine-1.6.3.ebuild 723
 MD5 36e77baa893f49bfd0c662fecc417af4 cfengine-2.0.3.ebuild 909
 MD5 e97f5f512d0ece4b0dd0100dc9f70d6c cfengine-2.0.6-r1.ebuild 991
 MD5 62a95c94d7136aa0edd4c4e32fe14434 metadata.xml 846
 MD5 0e7a0991afcf232cc7e2cc2fdb8f70f9 cfengine-2.0.8_p1.ebuild 1238
-MD5 5073253c84cfffeff716c74941d2d969 cfengine-2.0.8_p1-r1.ebuild 1462
-MD5 77615dc40e353d45525a0e4a55e82a57 cfengine-2.0.8_p1-r2.ebuild 1571
+MD5 e35c3445cb81576250f15893c893b290 cfengine-2.0.8_p1-r2.ebuild 1570
 MD5 062385a131f06d892f12367e9e7df136 cfengine-2.1.0_beta5.ebuild 1576
 MD5 a1c3e8d4352d939660ecc6de54436e45 files/cfengine-2.0.6-db4.diff 567
 MD5 6453e4309a80963dde2df05003dfaf8a files/digest-cfengine-1.6.3 66
 MD5 eefdc9f408515115eec8c01f50a36b71 files/digest-cfengine-2.0.3 67
-MD5 c8ffce770e77f013fb284e2ea3ecbb68 files/digest-cfengine-2.0.8_p1 69
 MD5 454239897bc3708a917d4f47bc8a79b9 files/digest-cfengine-2.0.6-r1 67
-MD5 c8ffce770e77f013fb284e2ea3ecbb68 files/digest-cfengine-2.0.8_p1-r1 69
 MD5 c8ffce770e77f013fb284e2ea3ecbb68 files/digest-cfengine-2.0.8_p1-r2 69
 MD5 2a3f21fe85b79e07d128fe7029794225 files/digest-cfengine-2.1.0_beta5 69
diff --git a/net-misc/cfengine/cfengine-2.0.8_p1-r1.ebuild b/net-misc/cfengine/cfengine-2.0.8_p1-r1.ebuild
deleted file mode 100644
index a35b0ea6f420..000000000000
--- a/net-misc/cfengine/cfengine-2.0.8_p1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.0.8_p1-r1.ebuild,v 1.2 2003/10/04 23:24:47 klieber Exp $ 
-
-PARCH=${P/_/}
-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/${PARCH}.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}/${PARCH}"
-
-src_compile() {
-	econf \
-		--sysconfdir=/etc/cfengine \
-		--localstatedir=/var/lib/cfengine \
-		--with-workdir=/var/cfengine \
-		--with-berkeleydb=/usr || die
-
-	# Fix Makefile to skip docs install to wrong locations
-	cp Makefile Makefile.orig
-	sed 's/\(SUBDIRS.*\) inputs doc/\1/' Makefile.orig > Makefile
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog COPYING DOCUMENTATION README TODO
-	doinfo doc/*.info*
-	dohtml doc/*.html
-	dodoc inputs/*.example
-
-	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
-
-	ln -sf /usr/sbin/cfagent /var/cfengine/bin/cfagent
-}
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 d139a1c00199..4133635da2fe 100644
--- a/net-misc/cfengine/cfengine-2.0.8_p1-r2.ebuild
+++ b/net-misc/cfengine/cfengine-2.0.8_p1-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.iu.hio.no/pub/cfengine/${PARCH}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc"
 
 DEPEND="virtual/glibc
 	>=sys-libs/db-3.2
diff --git a/net-misc/cfengine/files/digest-cfengine-2.0.8_p1 b/net-misc/cfengine/files/digest-cfengine-2.0.8_p1
deleted file mode 100644
index 58b0b328abcd..000000000000
--- a/net-misc/cfengine/files/digest-cfengine-2.0.8_p1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 17f9647edcc955e5c07489a6ac6126b1 cfengine-2.0.8p1.tar.gz 1240535
diff --git a/net-misc/cfengine/files/digest-cfengine-2.0.8_p1-r1 b/net-misc/cfengine/files/digest-cfengine-2.0.8_p1-r1
deleted file mode 100644
index 58b0b328abcd..000000000000
--- a/net-misc/cfengine/files/digest-cfengine-2.0.8_p1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 17f9647edcc955e5c07489a6ac6126b1 cfengine-2.0.8p1.tar.gz 1240535