Version bump for 2.2.10, stablize 2.2.x series for amd64/x86, other misc fixes

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

10 files changed, 71 insertions, 377 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index 40e2f288d342..d4af35e77ef9 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,25 @@
 # 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.90 2008/12/05 20:26:04 robbat2 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.91 2009/08/23 23:22:18 ramereth Exp $
+
+*cfengine-2.2.10 (23 Aug 2009)
+
+  23 Aug 2009; Lance Albertson <ramereth@gentoo.org>
+  -cfengine-2.1.20.ebuild, -cfengine-2.1.21.ebuild,
+  -cfengine-2.1.22-r1.ebuild, cfengine-2.1.22-r2.ebuild,
+  -cfengine-2.2.6.ebuild, -cfengine-2.2.7.ebuild, cfengine-2.2.8.ebuild,
+  cfengine-2.2.8-r1.ebuild, +cfengine-2.2.10.ebuild:
+  Version bump to 2.2.10, mark 2.2.x series stable
+
+    * Old version clean up
+    * Finally stablize the 2.2.x series (minus 2.2.10)
+    * Fix QA issues with ebuilds
+    * Update SRC_URI as it changed
+    * 2.2.10
+      - Include info files
+      - Remove libcfengine.la/.a files as they aren't needed
+      - Update ebuild to EAPI 2
+      - package locking patch no longer needed
 
   05 Dec 2008; Robin H. Johnson <robbat2@gentoo.org>
   files/cfengine-2.1-package-locking-fixup.patch,
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 76117c1a45e4..63e6bd5eda3a 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cfengine-2.1-package-locking-fixup.patch 2194 RMD160 572ee1ac251de0102ed256545cc1f0deb6ebdf40 SHA1 af3972d0c19a902c588d1486e3c22c6fe3352068 SHA256 296236fba653b041f396d4b19387a29a3c39e9c6c3be4d319a97b2a33d3a10d5
 AUX cfengine-2.1.22-package-fix.patch 431 RMD160 c92f6b497e1d03aeefb5fb7cb6fd64ce2ac5aa15 SHA1 a587359f0d180d776065546112c0623e91016dd8 SHA256 3fff21b705fb84d7e1efc3c7891f466182b977bd88855f55c85aa283b2ccd584
 AUX cfengine-2.2-package-locking-fixup.patch 2200 RMD160 b68bd05683de8def1e5c8b570965c73e0919e6f7 SHA1 a881bde8191b1362b296bce20af68d247b69ecf1 SHA256 b3829d2e8999d7ec38771f28ed329dce964a02ff665cb5bdc3cac5d2cb0f9db8
@@ -10,26 +7,12 @@ 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.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
-DIST cfengine-2.2.7.tar.gz 1077903 RMD160 42eaee0bfa3fb6bace20e944b45c6bfad304e38f SHA1 c96fd0c824a1b25fc1fd4720663cb1da89ad6025 SHA256 36f672957bbfd639a591cf77549865130c19b691deeb29fbcca207ee145016bd
+DIST cfengine-2.2.10.tar.gz 2690333 RMD160 67fd3dc80270dc000887e3dbf26f372338e2600f SHA1 032bec0bc59ffee7179422e96dfd902afbf94340 SHA256 f34697cc52e1342c5ec4b45a4adf9fbffdfa05a68bdc7c53382f72d03e106783
 DIST cfengine-2.2.8.tar.gz 2715678 RMD160 a35ac5d87a345f38a779719314d3978ee9e3045c SHA1 670b5fc15a4dd5c80b301adf1e1bf7979161a049 SHA256 6423ad330057b28524bf4a91b064d459af2be01d5cddb5064c15d8cb1130e7b8
-EBUILD cfengine-2.1.20.ebuild 2184 RMD160 baeb4cf531c6b04b0cafafd9ab384496e7c82195 SHA1 c2f3995e9b8460be195a3022e5b2313534ad5a91 SHA256 2a7e51976c7f1ae7edbf7af5c7b5f1abbcec1bcfbff201c91c601cac0ba5fd69
-EBUILD cfengine-2.1.21.ebuild 2184 RMD160 32dfda672dd1d90e50a6e3c6753f1a9812e1787b SHA1 f8991b125a4a4e26e565c3d87ac526e7c99227e6 SHA256 597923d1c4d4f8a3cd4b48049098c46781f572214f116e870bc8e81b6807a083
-EBUILD cfengine-2.1.22-r1.ebuild 2261 RMD160 ebcbc006b38000ed42335be8c03bc3b2bb015a4f SHA1 7e195888957f6348006651ea2fa1626e4a9e2d5e SHA256 8a00e0dfb1a1e099e116ae779d1d95f141cc09f46214822a841197147d9a8272
-EBUILD cfengine-2.1.22-r2.ebuild 2347 RMD160 33fddb61bf0a58ae54946c698ec9ad2e6cabfac5 SHA1 d6bbda85d72e8daba3fa2e27d77bda7c331f4314 SHA256 62868b2855ee9333ca98ad959b1581ce87add766540e079348ba167fe06e60eb
-EBUILD cfengine-2.2.6.ebuild 2374 RMD160 85079256f14469843ad6927cc8c988c360120680 SHA1 582c4a960ad80076dffd39cc877698bf079e9adb SHA256 a63856c247390c3719a1cc42a2f5ddd03f29a4c0a3806a7b3eab2904165c1394
-EBUILD cfengine-2.2.7.ebuild 2301 RMD160 c00ab6df0fa917b5882083cb3786463cd3ea298e SHA1 0d0a4bf02b32986fd0217550e21cf2b854408aaf SHA256 e4e5a6e6f32025778b27a515eac8f4a81126488d02a4bba2c5cc5888bf752712
-EBUILD cfengine-2.2.8-r1.ebuild 2659 RMD160 cee6e0a545d608e1c660eca025de0c4cfb5d6d9b SHA1 7b022de6bad8c55779223e917de732341310bf90 SHA256 ba4644e2bc4b153afe3efab1a259de0d0a48369562800848f55eb8a4b9e6f311
-EBUILD cfengine-2.2.8.ebuild 2305 RMD160 61ee5a5865bf1dcc617c4ac9886245ff402ab0a6 SHA1 588f0d116119c436f6d6e9913ae19c9440feafda SHA256 d6074877567eebbdfa72f584d4a0376f14c10bd1b929e49384cfc7123f5efcb1
-MISC ChangeLog 14082 RMD160 8902b43ca843aec6a7555c7ed63c2c6851263226 SHA1 0d1accacc26156806382587effeb5077ec38acda SHA256 069eb0b7eefcd61d6b4c8bdb2733062d2a6e100fd35f6e1e0e7ed8cda7303517
+EBUILD cfengine-2.1.22-r2.ebuild 2362 RMD160 9959294df8e49f146dde55a0feea02a43c9dfa53 SHA1 046af5ed45906366bf3a8ae424d7cf09d522b8c4 SHA256 a390b6a46316062b1f193638905d74630eef6682a073403321a3111c28c89001
+EBUILD cfengine-2.2.10.ebuild 2727 RMD160 d1d5cc8d236197eb7b68f64c2b9ecad17a01c1b6 SHA1 c16847285c079dde287bc6ec6e512cc968607ff0 SHA256 621fd2027b4a18733cf2eccc3f27cf0098c36ea1a03142cf4ef4bd0cfd7f4e0e
+EBUILD cfengine-2.2.8-r1.ebuild 2677 RMD160 555ec1ab9cc2a84dba02cc5dcfd7c62532196c51 SHA1 706b55a68fba41158a30f1b773a3b92f1ae50034 SHA256 6d265c2ae8a63c20ab3553a92d6489a4b747bc64618fb5c0687e89f8ee594081
+EBUILD cfengine-2.2.8.ebuild 2324 RMD160 ef2b1d60c3723fb596bcadd4bfff1292b4a0e7cd SHA1 66ade9c3000a5d2c4a870b1932b5ecd0e055b9d8 SHA256 eca8411b2605956b66b32010ffa63dbbbc793e68d7640c5fb84b485afe0aa03a
+MISC ChangeLog 14786 RMD160 e0644a02914d2b4941a1c0246f4390dd799e4f26 SHA1 009ab94ba7897897ab633636dc563d4da27d297e SHA256 ad483409567f2bb19cb80394d12fe48c69c3c6e618870df4d1ba9862673f2934
 MISC metadata.xml 1778 RMD160 a2f0a0604ba979552761a74b22c0f5fd74d2b7b7 SHA1 88909229ff2a2773d58ff91499bd2272eca34499 SHA256 e39a880a0da5fdeb4f9a0548a99b1ff5ead65d12442c9de16db2776afdbd09a9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkk7rmkACgkQ67wieSYcaxdPyACg3956JnXTyQKqeWBUb/S1NTOv
-gncAoOW5lpy0cD5iafeWqoUwrpPAfykd
-=uHch
------END PGP SIGNATURE-----
diff --git a/net-misc/cfengine/cfengine-2.1.20.ebuild b/net-misc/cfengine/cfengine-2.1.20.ebuild
deleted file mode 100644
index 6a494824c633..000000000000
--- a/net-misc/cfengine/cfengine-2.1.20.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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.7 2008/04/28 19:38:56 ramereth Exp $
-
-inherit eutils
-
-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"
-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.21.ebuild b/net-misc/cfengine/cfengine-2.1.21.ebuild
deleted file mode 100644
index 79cb5b30bd39..000000000000
--- a/net-misc/cfengine/cfengine-2.1.21.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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.4 2008/12/07 11:07:06 vapier Exp $
-
-inherit eutils
-
-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"
-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.22-r1.ebuild b/net-misc/cfengine/cfengine-2.1.22-r1.ebuild
deleted file mode 100644
index abc576d2eeb0..000000000000
--- a/net-misc/cfengine/cfengine-2.1.22-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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.6 2008/09/27 16:17:37 armin76 Exp $
-
-inherit eutils
-
-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"
-IUSE=""
-
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/openssl-0.9.7"
-
-src_unpack() {
-	unpack ${A}
-
-	epatch ${FILESDIR}/${P}-package-fix.patch
-}
-
-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.22-r2.ebuild b/net-misc/cfengine/cfengine-2.1.22-r2.ebuild
index 5d713b935c2f..52b078657073 100644
--- a/net-misc/cfengine/cfengine-2.1.22-r2.ebuild
+++ b/net-misc/cfengine/cfengine-2.1.22-r2.ebuild
@@ -1,21 +1,22 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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-r2.ebuild,v 1.1 2008/12/05 08:17:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.22-r2.ebuild,v 1.2 2009/08/23 23:22:18 ramereth Exp $
 
 inherit eutils
 
 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"
+SRC_URI="http://www.cfengine.org/tarballs/${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
 	>=dev-libs/openssl-0.9.7"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-misc/cfengine/cfengine-2.2.6.ebuild b/net-misc/cfengine/cfengine-2.2.10.ebuild
index f8edd5f9f95f..59409d5a3510 100644
--- a/net-misc/cfengine/cfengine-2.2.6.ebuild
+++ b/net-misc/cfengine/cfengine-2.2.10.ebuild
@@ -1,29 +1,28 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.2.6.ebuild,v 1.1 2008/04/28 19:27:29 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.2.10.ebuild,v 1.1 2009/08/23 23:22:18 ramereth Exp $
+
+EAPI="2"
 
 inherit eutils
 
 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"
+SRC_URI="http://www.cfengine.org/tarballs/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86"
 IUSE=""
 
 DEPEND=">=sys-libs/db-4
 	>=dev-libs/openssl-0.9.7
 	app-portage/portage-utils"
 
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${P}"-typo-fix.patch
-}
+RDEPEND="${DEPEND}"
 
-src_compile() {
+src_configure() {
 	# Enforce /var/cfengine for historical compatibility
 	econf \
 		--with-workdir=/var/cfengine \
@@ -36,8 +35,6 @@ src_compile() {
 
 	# Fix man pages
 	sed -i -e 's/\/usr\/local/\/usr/' doc/*.8
-
-	emake || die
 }
 
 src_install() {
@@ -46,11 +43,17 @@ src_install() {
 	newinitd "${FILESDIR}"/cfexecd.rc6 cfexecd
 
 	make DESTDIR="${D}" install || die
+
+	# Remove static library and libtool file as they are not needed
+	rm "${D}"/usr/$(get_libdir)/*.la
+	rm "${D}"/usr/$(get_libdir)/*.a
+
 	dodoc AUTHORS ChangeLog README TODO INSTALL
 
 	# Manually install doc and inputs
 	doman doc/*.8
 	docinto examples
+	doinfo doc/*.info*
 	dodoc inputs/*.example
 
 	# Create cfengine working directory
@@ -62,18 +65,12 @@ src_install() {
 }
 
 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/
+	cp -f /usr/sbin/cf{agent,servd,execd} "${ROOT}"/var/cfengine/bin/
 
 	einfo
 	einfo "NOTE: The cfportage module has been deprecated in favor of the"
@@ -84,4 +81,18 @@ pkg_postinst() {
 	einfo "To run cfengine out of cron every half hour modify your crontab:"
 	einfo "0,30 * * * *    /usr/sbin/cfexecd -F"
 	einfo
+
+	elog "You MUST generate the keys for cfengine by running:"
+	elog "emerge --config ${CATEGORY}/${PN}"
+}
+
+pkg_config() {
+	if [ "${ROOT}" == "/" ]; then
+		if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
+			einfo "Generating keys for localhost."
+			/usr/sbin/cfkey
+		fi
+	else
+		die "cfengine cfkey does not support any value of ROOT other than /."
+	fi
 }
diff --git a/net-misc/cfengine/cfengine-2.2.7.ebuild b/net-misc/cfengine/cfengine-2.2.7.ebuild
deleted file mode 100644
index 7f2d5e0fd563..000000000000
--- a/net-misc/cfengine/cfengine-2.2.7.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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.2.7.ebuild,v 1.1 2008/06/16 16:37:11 ramereth Exp $
-
-inherit eutils
-
-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"
-IUSE=""
-
-DEPEND=">=sys-libs/db-4
-	>=dev-libs/openssl-0.9.7
-	app-portage/portage-utils"
-
-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
-
-	# Fix man pages
-	sed -i -e 's/\/usr\/local/\/usr/' doc/*.8
-
-	emake || die
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/cfservd.rc6 cfservd
-	newinitd "${FILESDIR}"/cfenvd.rc6 cfenvd
-	newinitd "${FILESDIR}"/cfexecd.rc6 cfexecd
-
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README TODO INSTALL
-
-	# Manually install doc and inputs
-	doman doc/*.8
-	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
-}
-
-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 "NOTE: The cfportage module has been deprecated in favor of the"
-	einfo "      upstream 'packages' action."
-	einfo
-	einfo "Init scripts for cfservd, cfenvd, and cfexecd are now 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.2.8-r1.ebuild b/net-misc/cfengine/cfengine-2.2.8-r1.ebuild
index 75ccd35d1335..0516ab51087a 100644
--- a/net-misc/cfengine/cfengine-2.2.8-r1.ebuild
+++ b/net-misc/cfengine/cfengine-2.2.8-r1.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.2.8-r1.ebuild,v 1.3 2008/12/05 08:26:12 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.2.8-r1.ebuild,v 1.4 2009/08/23 23:22:18 ramereth Exp $
 
 inherit eutils
 
 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"
+SRC_URI="http://www.cfengine.org/tarballs/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~s390 ~sparc x86"
 IUSE=""
 
 DEPEND=">=sys-libs/db-4
 	>=dev-libs/openssl-0.9.7
 	app-portage/portage-utils"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-misc/cfengine/cfengine-2.2.8.ebuild b/net-misc/cfengine/cfengine-2.2.8.ebuild
index b5fb85d5cf06..f880f3baa208 100644
--- a/net-misc/cfengine/cfengine-2.2.8.ebuild
+++ b/net-misc/cfengine/cfengine-2.2.8.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.2.8.ebuild,v 1.2 2008/11/06 02:59:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.2.8.ebuild,v 1.3 2009/08/23 23:22:18 ramereth Exp $
 
 inherit eutils
 
 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"
+SRC_URI="http://www.cfengine.org/tarballs/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~s390 ~sparc x86"
 IUSE=""
 
 DEPEND=">=sys-libs/db-4
 	>=dev-libs/openssl-0.9.7
 	app-portage/portage-utils"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	# Enforce /var/cfengine for historical compatibility