version bump, ebuild cleanup

Package-Manager: portage-2.0.51.19

14 files changed, 35 insertions, 311 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index 04cafde3ec08..6e4dc64a657f 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,14 @@
 # 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.52 2005/04/25 03:48:01 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.53 2005/04/30 02:39:36 ramereth Exp $
+
+*cfengine-2.1.14 (30 Apr 2005)
+
+  30 Apr 2005; Lance Albertson <ramereth@gentoo.org> metadata.xml,
+  -cfengine-2.1.7.ebuild, -cfengine-2.1.9.ebuild,
+  -cfengine-2.1.10-r2.ebuild, -cfengine-2.1.11-r1.ebuild,
+  -cfengine-2.1.11-r2.ebuild, +cfengine-2.1.14.ebuild:
+  version bump, cleaning out old ebuilds
 
   25 Apr 2005; Jason Wever <weeve@gentoo.org> cfengine-2.1.13.ebuild:
   Stable on SPARC.
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index b64c558715bb..0727723936b4 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,19 +1,11 @@
-MD5 3e4da3ec6a0745650789e2490c099240 ChangeLog 7521
-MD5 db10de1a3668bd08203fc2c5954bc7e9 cfengine-2.1.10-r2.ebuild 1871
-MD5 0f52a5176d5dc414d5df32e206ee6d99 cfengine-2.1.11-r1.ebuild 1828
-MD5 c43d635d5a652147971486b2b09e8345 metadata.xml 873
-MD5 370814ba00689204a2a101aa715ba47c cfengine-2.1.7.ebuild 1627
-MD5 f03815875b86df4692c73a29edfc526c cfengine-2.1.11-r2.ebuild 2184
-MD5 b7f3bb63a83ad2cf5ef918dac7eca8de cfengine-2.1.9.ebuild 1625
+MD5 d5f4d56e2d2115ce37a94cb54a44c50c ChangeLog 7828
+MD5 a938205d112a00547457e61b092a84aa cfengine-2.1.14.ebuild 2069
+MD5 7b6935177932b682ae3a53cd2e6a9cc3 metadata.xml 977
 MD5 047b3a63d198f4bf3902d25b49896cef cfengine-2.1.13.ebuild 2062
+MD5 815d5e5ddde6c8fda9da1dbd529181aa files/digest-cfengine-2.1.14 68
 MD5 f4fe82c710efac73c0895ad268c54196 files/cfportage.README 2294
-MD5 f1a9344587920c108d487766f61e90cf files/cfservd.rc6 259
-MD5 13f423656685d25e1e1e3d0bf261b474 files/digest-cfengine-2.1.7 67
-MD5 24084321590f39650eaf07a073bf0582 files/digest-cfengine-2.1.10-r2 68
-MD5 bf538c6d3db7c825355a0e8d34fa6efc files/module:cfportage 10247
-MD5 1815c2c18d0905908868d2d550b9246a files/digest-cfengine-2.1.9 67
-MD5 0436f0fa78bed80815c0c8372182a174 files/digest-cfengine-2.1.11-r1 68
 MD5 ade9e66709bdb04df3f0beba72f3a008 files/module-cfportage.tbz2 3099
-MD5 a9aa786ac4c8e32d55d8469af8ddf29b files/cfengine-2.1.10-setnetgrent.patch 1037
-MD5 0436f0fa78bed80815c0c8372182a174 files/digest-cfengine-2.1.11-r2 68
 MD5 e34708413b735ba7b5402ee47b2bb62d files/digest-cfengine-2.1.13 68
+MD5 bf538c6d3db7c825355a0e8d34fa6efc files/module:cfportage 10247
+MD5 a9aa786ac4c8e32d55d8469af8ddf29b files/cfengine-2.1.10-setnetgrent.patch 1037
+MD5 f1a9344587920c108d487766f61e90cf files/cfservd.rc6 259
diff --git a/net-misc/cfengine/cfengine-2.1.10-r2.ebuild b/net-misc/cfengine/cfengine-2.1.10-r2.ebuild
deleted file mode 100644
index 7604f83aeb1d..000000000000
--- a/net-misc/cfengine/cfengine-2.1.10-r2.ebuild
+++ /dev/null
@@ -1,73 +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.10-r2.ebuild,v 1.2 2005/01/27 21:40:48 klieber 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="x86 ppc ~sparc ~arm ~amd64"
-IUSE=""
-
-DEPEND="virtual/libc
-	>=sys-libs/db-3.2
-	>=dev-libs/openssl-0.9.6k"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	gnuconfig_update ${S}
-	epatch ${FILESDIR}/${PN}-2.1.10-setnetgrent.patch
-}
-
-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 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
-	dodir /var/cfengine/modules
-	cd ${D}/var/cfengine/modules
-	tar pjxf ${FILESDIR}/module-cfportage.tbz2
-}
-
-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/cfengine-2.1.11-r1.ebuild b/net-misc/cfengine/cfengine-2.1.11-r1.ebuild
deleted file mode 100644
index b4f3cc8217b3..000000000000
--- a/net-misc/cfengine/cfengine-2.1.11-r1.ebuild
+++ /dev/null
@@ -1,72 +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.11-r1.ebuild,v 1.5 2005/03/12 19:56:56 vapier Exp $
-
-inherit gnuconfig 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="x86 ~ppc sparc arm ~amd64"
-IUSE=""
-
-DEPEND="virtual/libc
-	>=sys-libs/db-3.2
-	>=dev-libs/openssl-0.9.6k"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	gnuconfig_update ${S}
-}
-
-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 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
-	dodir /var/cfengine/modules
-	cd ${D}/var/cfengine/modules
-	tar pjxf ${FILESDIR}/module-cfportage.tbz2
-}
-
-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/cfengine-2.1.11-r2.ebuild b/net-misc/cfengine/cfengine-2.1.14.ebuild
index 2aee1ba8bbf7..0a95029e8f7e 100644
--- a/net-misc/cfengine/cfengine-2.1.11-r2.ebuild
+++ b/net-misc/cfengine/cfengine-2.1.14.ebuild
@@ -1,8 +1,8 @@
 # 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.11-r2.ebuild,v 1.2 2005/01/27 21:40:48 klieber Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.14.ebuild,v 1.1 2005/04/30 02:39:37 ramereth Exp $
 
-inherit gnuconfig eutils
+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/"
@@ -10,21 +10,13 @@ SRC_URI="ftp://ftp.iu.hio.no/pub/cfengine/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~arm ~amd64"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
 IUSE=""
 
-DEPEND="virtual/libc
-	>=sys-libs/db-3.2
+DEPEND=">=sys-libs/db-3.2
 	>=dev-libs/openssl-0.9.6k"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	gnuconfig_update ${S}
-}
-
 src_compile() {
-
 	# Enforce /var/cfengine for historical compatibility
 	econf \
 		--with-workdir=/var/cfengine \
@@ -37,11 +29,10 @@ src_compile() {
 }
 
 src_install() {
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/cfservd.rc6" cfservd
+	newinitd "${FILESDIR}"/cfservd.rc6 cfservd
 
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog COPYING README TODO
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README TODO
 
 	# Manually install doc and inputs
 	doinfo doc/*.info*
diff --git a/net-misc/cfengine/cfengine-2.1.7.ebuild b/net-misc/cfengine/cfengine-2.1.7.ebuild
deleted file mode 100644
index 77658c871216..000000000000
--- a/net-misc/cfengine/cfengine-2.1.7.ebuild
+++ /dev/null
@@ -1,61 +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.7.ebuild,v 1.6 2005/01/27 21:40:48 klieber Exp $
-
-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 ~arm"
-IUSE=""
-
-DEPEND="virtual/libc
-	>=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() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog COPYING 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/cfengine-2.1.9.ebuild b/net-misc/cfengine/cfengine-2.1.9.ebuild
deleted file mode 100644
index 5c6362404b0f..000000000000
--- a/net-misc/cfengine/cfengine-2.1.9.ebuild
+++ /dev/null
@@ -1,61 +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.9.ebuild,v 1.4 2005/01/27 21:40:48 klieber Exp $
-
-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="arm ppc sparc x86"
-IUSE=""
-
-DEPEND="virtual/libc
-	>=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() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog COPYING 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.10-r2 b/net-misc/cfengine/files/digest-cfengine-2.1.10-r2
deleted file mode 100644
index c012ef7cc95c..000000000000
--- a/net-misc/cfengine/files/digest-cfengine-2.1.10-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7a867c74ca3ad806a41b6f7339e67fa3 cfengine-2.1.10.tar.gz 3100323
diff --git a/net-misc/cfengine/files/digest-cfengine-2.1.11-r1 b/net-misc/cfengine/files/digest-cfengine-2.1.11-r1
deleted file mode 100644
index 6dd49e278549..000000000000
--- a/net-misc/cfengine/files/digest-cfengine-2.1.11-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d6bd644e4e8b4374d4eb9ed5bd154a2 cfengine-2.1.11.tar.gz 3119529
diff --git a/net-misc/cfengine/files/digest-cfengine-2.1.11-r2 b/net-misc/cfengine/files/digest-cfengine-2.1.11-r2
deleted file mode 100644
index 6dd49e278549..000000000000
--- a/net-misc/cfengine/files/digest-cfengine-2.1.11-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d6bd644e4e8b4374d4eb9ed5bd154a2 cfengine-2.1.11.tar.gz 3119529
diff --git a/net-misc/cfengine/files/digest-cfengine-2.1.14 b/net-misc/cfengine/files/digest-cfengine-2.1.14
new file mode 100644
index 000000000000..24646923eb9f
--- /dev/null
+++ b/net-misc/cfengine/files/digest-cfengine-2.1.14
@@ -0,0 +1 @@
+MD5 82967f7e5ab075628793771e18b1d689 cfengine-2.1.14.tar.gz 3517247
diff --git a/net-misc/cfengine/files/digest-cfengine-2.1.7 b/net-misc/cfengine/files/digest-cfengine-2.1.7
deleted file mode 100644
index 4437c5256545..000000000000
--- a/net-misc/cfengine/files/digest-cfengine-2.1.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 35a3cb59b0a9dd0309ad1a8ca05fab52 cfengine-2.1.7.tar.gz 3094955
diff --git a/net-misc/cfengine/files/digest-cfengine-2.1.9 b/net-misc/cfengine/files/digest-cfengine-2.1.9
deleted file mode 100644
index ba0ed4a26ef9..000000000000
--- a/net-misc/cfengine/files/digest-cfengine-2.1.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 421ac1ba0fd9cbe0384f1b0eded1afd8 cfengine-2.1.9.tar.gz 3099090
diff --git a/net-misc/cfengine/metadata.xml b/net-misc/cfengine/metadata.xml
index 9ef1d1cade39..09886805eb31 100644
--- a/net-misc/cfengine/metadata.xml
+++ b/net-misc/cfengine/metadata.xml
@@ -2,11 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sysadmin</herd>
-<maintainer>
- <email>klieber@gentoo.org</email>
- <name>Kurt Lieber</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.
-</longdescription>
+	<maintainer>
+		<email>klieber@gentoo.org</email>
+		<name>Kurt Lieber</name>
+	</maintainer>
+	<maintainer>
+		<email>ramereth@gentoo.org</email>
+		<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.
+	</longdescription>
 </pkgmetadata>