Stable bumps for amd64/x86, ebuild cleanup, misc fixes

(Portage version: 2.1.4.4)

7 files changed, 30 insertions, 250 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index 32bdfa8fcafb..105b8816d39b 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/cfengine
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.81 2008/04/28 19:27:29 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.82 2008/04/28 19:38:56 ramereth Exp $
+
+  28 Apr 2008; Lance Albertson <ramereth@gentoo.org>
+  -cfengine-2.1.17.ebuild, -cfengine-2.1.18.ebuild, cfengine-2.1.20.ebuild,
+  cfengine-2.1.21.ebuild, -cfengine-2.1.22.ebuild,
+  cfengine-2.1.22-r1.ebuild:
+  * Stable bumps for x86/amd64
+  * Clean old ebuilds out
+  * Fix DESCRIPTION,HOMEPAGE,SRC_URI fields
 
 *cfengine-2.2.6 (28 Apr 2008)
 
diff --git a/net-misc/cfengine/cfengine-2.1.17.ebuild b/net-misc/cfengine/cfengine-2.1.17.ebuild
deleted file mode 100644
index b945d910271c..000000000000
--- a/net-misc/cfengine/cfengine-2.1.17.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.17.ebuild,v 1.8 2007/07/12 02:52:15 mr_bones_ 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:0 /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.18.ebuild b/net-misc/cfengine/cfengine-2.1.18.ebuild
deleted file mode 100644
index 912874e810e5..000000000000
--- a/net-misc/cfengine/cfengine-2.1.18.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.18.ebuild,v 1.6 2007/07/12 02:52:15 mr_bones_ 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:0 /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.20.ebuild b/net-misc/cfengine/cfengine-2.1.20.ebuild
index 649bfd694d8d..6a494824c633 100644
--- a/net-misc/cfengine/cfengine-2.1.20.ebuild
+++ b/net-misc/cfengine/cfengine-2.1.20.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.20.ebuild,v 1.6 2007/07/12 02:52:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.20.ebuild,v 1.7 2008/04/28 19:38:56 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"
+DESCRIPTION="An automated suite of programs for configuring and maintaining
+Unix-like computers"
+HOMEPAGE="http://www.cfengine.org/"
+SRC_URI="http://www.cfengine.org/downloads/${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.21.ebuild b/net-misc/cfengine/cfengine-2.1.21.ebuild
index a1dc75a6d673..cdcef8335336 100644
--- a/net-misc/cfengine/cfengine-2.1.21.ebuild
+++ b/net-misc/cfengine/cfengine-2.1.21.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.21.ebuild,v 1.2 2007/07/12 02:52:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.21.ebuild,v 1.3 2008/04/28 19:38:56 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"
+DESCRIPTION="An automated suite of programs for configuring and maintaining
+Unix-like computers"
+HOMEPAGE="http://www.cfengine.org/"
+SRC_URI="http://www.cfengine.org/downloads/${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.22-r1.ebuild b/net-misc/cfengine/cfengine-2.1.22-r1.ebuild
index 1c8769eac4b7..b83797c91089 100644
--- a/net-misc/cfengine/cfengine-2.1.22-r1.ebuild
+++ b/net-misc/cfengine/cfengine-2.1.22-r1.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.22-r1.ebuild,v 1.2 2007/07/12 02:52:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.22-r1.ebuild,v 1.3 2008/04/28 19:38:56 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"
+DESCRIPTION="An automated suite of programs for configuring and maintaining
+Unix-like computers"
+HOMEPAGE="http://www.cfengine.org/"
+SRC_URI="http://www.cfengine.org/downloads/${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.22.ebuild b/net-misc/cfengine/cfengine-2.1.22.ebuild
deleted file mode 100644
index 3a965c947dcd..000000000000
--- a/net-misc/cfengine/cfengine-2.1.22.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.22.ebuild,v 1.2 2007/07/12 02:52:15 mr_bones_ 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:0 /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
-}