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

Package-Manager: portage-2.1.4.4

8 files changed, 34 insertions, 259 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/Manifest b/net-misc/cfengine/Manifest
index 6a168903d0ad..9d0430df5014 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -5,18 +5,13 @@ AUX cfexecd.rc6 259 RMD160 05810d7582d962903033ed85b409818dd19089ef SHA1 f95df77
 AUX cfportage.README 2294 RMD160 05c285d3b79e266ac6229985b2fdbab1b7841752 SHA1 7f7598154775bf9f180383f69294a00624a69735 SHA256 c1a5a2af3b7e41a9b1c6d5e252e7a3673ec17d12ed3fa0aa34581b5893c8f833
 AUX cfservd.rc6 259 RMD160 8390afb5b3cf7ffbe0b74766ddf3f9d05c4d5b6c SHA1 c1fc1ccf15789c8acfc3857481ed69dc7f9b6d2b SHA256 892e9537c9b75861031a0755af886b2b931e1ca4dd2589847a2bacf00862de0f
 AUX module-cfportage.tbz2 3099 RMD160 21826b2263d6aa9ad83037d465adc40bafc0222b SHA1 cbda2ba5955ffec10f30805d14c76159429ebdb8 SHA256 192692a2bc7f990b85364b37ad440a05d05b4a0cbf268da49d3fc31011359e8f
-DIST cfengine-2.1.17.tar.gz 3613861 RMD160 82a1d1003957502838c3a5b22c474f0d2dfb5ccb SHA1 80cedc21a1d22098d587c01e0330c44747d5c025 SHA256 2136d3f0bfae1055bf7000276a7c3701b3a2ca3eb7ce025ffb04f23de3ea9072
-DIST cfengine-2.1.18.tar.gz 3622774 RMD160 6f249dfbbe1e045f1c181c1d8af18ebbdc072903 SHA1 4f1350d9cb052443df105fa080a39dd07726dfec SHA256 41f0afa72a783b47fc9e756539377e26724ddab6bfceebf67d758ad5e92aaeb5
 DIST cfengine-2.1.20.tar.gz 3684594 RMD160 865524fe8f4d07d01185abeab03d7b6adfc0e608 SHA1 98bae354ee6134a3f3274095a57a40b3620a1a64 SHA256 61bdca73ab60f7a707e02490ada8a357505121759ab0c2a4e6c14afc391253a0
 DIST cfengine-2.1.21.tar.gz 3688993 RMD160 d291d5e6be33f61d6427b99fe03ceeaab110c3ab SHA1 9731a9b4582847ba5b83ff0b1ade71d4c90fec50 SHA256 3d670fdcc8dc669d3cdad9c3e951dfdb84c21415fee19202c90039aac204a8be
 DIST cfengine-2.1.22.tar.gz 3673965 RMD160 9109a5156aa24e29137ff51ad1b5a0050b62eb2f SHA1 79501a4d430bc5a955b56519e0d00f62d8353229 SHA256 fa30e5b29517370e5cea8d9935999e437709e574d103eb317eeed007c975d451
 DIST cfengine-2.2.6.tar.gz 1075766 RMD160 54fa608871e82c385550f5b01bebd75bfd6c772d SHA1 7bdb11676a36f600c426f66e8efc0e8b6e178955 SHA256 e07a82f367b185af41976611b06a64477d1a49772f1333c19a9d0694fc142657
-EBUILD cfengine-2.1.17.ebuild 2246 RMD160 81d5acee2c193ac4319d5f37f85d8121eb419598 SHA1 f933eb3507d59e5cc9b5bdf39a0dbaa1e1edbcb8 SHA256 c522a6e957f401f8eddf834a8d0fb98eec7206a7e1e058c2579166fd2b2b7a21
-EBUILD cfengine-2.1.18.ebuild 2247 RMD160 975f1d1463f761a9f32c81655b3bb6d7dd1157de SHA1 626e1fab4d6cf15c6fb4b7a2c83d5f14928e6fcb SHA256 c7b70db6415f9335f51f124a1421a57921fe4929982649891e9b50feecb7b020
-EBUILD cfengine-2.1.20.ebuild 2247 RMD160 3c864bee96b2b31c4f52a805896ee4cffa26d771 SHA1 2bf18824b47db3a160299e89795e8b5d5eace807 SHA256 8ba0428a91c3d8d726b61b08a6146fc58d522c8c43e297f0bebe97da199f6544
-EBUILD cfengine-2.1.21.ebuild 2251 RMD160 1491ef920178420c965470ccdcf85ec3489016ad SHA1 06a511895aab01f53dbc6a57d22829f4576ff15a SHA256 62864105e30ba40c31a8cfc42babb34b566224dad76af31a442852d41ab80013
-EBUILD cfengine-2.1.22-r1.ebuild 2329 RMD160 09789682f27c0cfa6308525663966f59614569c2 SHA1 5597fe7ba3a060a70d4d4eaa1686eee363f17943 SHA256 d989301711f41c5c3b24580a88f29088b77ded7c7d04512c7aa8ffc958456167
-EBUILD cfengine-2.1.22.ebuild 2251 RMD160 fea940c897ab29a952f8def82d4d40e2d7abcdea SHA1 4024dd40e84477f543f522159e65db7aa444b329 SHA256 9eaa4839d727f91a1f9ca78ed9b6387c5a5d5cced718093a5018eeb8e20a9981
+EBUILD cfengine-2.1.20.ebuild 2184 RMD160 baeb4cf531c6b04b0cafafd9ab384496e7c82195 SHA1 c2f3995e9b8460be195a3022e5b2313534ad5a91 SHA256 2a7e51976c7f1ae7edbf7af5c7b5f1abbcec1bcfbff201c91c601cac0ba5fd69
+EBUILD cfengine-2.1.21.ebuild 2187 RMD160 fb89af28d9007e0c66763ebc43fd121a4313afaf SHA1 a84f4448ef9f68f5815bb5cba94115e25df5269c SHA256 339ed25f99ca9789c608db1dbccd0cfc389198a339f36d1703dd706311701bb9
+EBUILD cfengine-2.1.22-r1.ebuild 2265 RMD160 00fa85f7d9236a32948d4885d3f288a5217bb513 SHA1 fa27c066188117c985fdafb6b87b89460ee2c5ed SHA256 68bd8f57186fc6866cbe88dc2d63910d7eb3b05ac1007b0566843a501d4ef65e
 EBUILD cfengine-2.2.6.ebuild 2374 RMD160 85079256f14469843ad6927cc8c988c360120680 SHA1 582c4a960ad80076dffd39cc877698bf079e9adb SHA256 a63856c247390c3719a1cc42a2f5ddd03f29a4c0a3806a7b3eab2904165c1394
-MISC ChangeLog 12305 RMD160 4b237538557d3189b25a8b8247d997e5e84df2c3 SHA1 1eabb2ba7c23f379ce1ac3cdf02585537b4006e0 SHA256 1a4f7c67b76eff8544891cd075c5f33c4ee50e27839769fa940fb893d16d2c86
+MISC ChangeLog 12616 RMD160 c079c4617d466f07a819946111494a07758fbec5 SHA1 95c69d67b19cad2b8abd42994f98685ed7e2eb9c SHA256 d3d225e134e38a4772f4e542f6a785927c98a43f93daf774db3a412fd9b51a71
 MISC metadata.xml 1778 RMD160 a2f0a0604ba979552761a74b22c0f5fd74d2b7b7 SHA1 88909229ff2a2773d58ff91499bd2272eca34499 SHA256 e39a880a0da5fdeb4f9a0548a99b1ff5ead65d12442c9de16db2776afdbd09a9
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
-}