Clean up. Fixes bug 328655 as well.

Package-Manager: portage-2.2_rc69/cvs/Linux x86_64

11 files changed, 23 insertions, 512 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index 4bfe336f0b80..3d0701698c01 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/cfengine
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.102 2010/06/17 20:57:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.103 2010/08/25 18:26:51 idl0r Exp $
+
+  25 Aug 2010; Christian Ruppert <idl0r@gentoo.org>
+  -cfengine-2.1.22-r2.ebuild,
+  -files/cfengine-2.1.22-db48-namespace-fix.patch,
+  -files/cfengine-2.1.22-package-fix.patch,
+  -files/cfengine-2.1-package-locking-fixup.patch,
+  -files/cfengine-2.2.6-typo-fix.patch, -cfengine-2.2.8.ebuild,
+  -cfengine-2.2.8-r1.ebuild,
+  -files/cfengine-2.2-package-locking-fixup.patch,
+  -files/module-cfportage.tbz2:
+  Clean up. Fixes bug 328655 as well.
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org> cfengine-3.0.4.ebuild,
   cfengine-3.0.5.ebuild:
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index f827d869ebc2..b431745e5cae 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,29 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 511666-segfault.patch 731 RMD160 5a1965029fcc27f95ef89aaf74ea7b5e93ff30eb SHA1 1c93030161d91bab21e46df355bbb7da77772f27 SHA256 cb38c886bf92c1ae48000a65a93a2cf610a9b9d991c44fb1b7df00c3bd9af54d
 AUX admit-noclass-520696.patch 400 RMD160 35073a17f2618c189bc3dd9b1a4264b117d6abdb SHA1 39e8a42c9ecca02d51d340fd6dabe91626c494c8 SHA256 d882a327a3788640f96ef7fa5a38953365f358722883ce105c8be973fbb6c5d2
 AUX cf-execd.rc6 263 RMD160 bec43d07a575100aba0e845b70d2296ec1936417 SHA1 313fd7150e56cb62241863f9ae27edc1ba86b1b5 SHA256 a5fc7f9994c48fc18885d07ddef7e3a69abd500e6a0e2eff2f688f54e886d1b9
 AUX cf-monitord.rc6 275 RMD160 75fe87edaaeac30a40abf0dbf3bf41b6d1a73ba7 SHA1 b6b35fae103c593aee295da36fb5cc3389492205 SHA256 3e78f87709c8abd69bcc4a2c25787f986655c8c7d1221784600c59af23535bed
 AUX cf-serverd.rc6 271 RMD160 55ef90418fb1f6ca943c0807ba520644d6b2c20d SHA1 91e0b17009e80be23f6886e71b3584dc9533a3d6 SHA256 6829f3cd53334a657bf808ec96b995f2510baf2a16f2712b4609e09d5eaaff7d
-AUX cfengine-2.1-package-locking-fixup.patch 2194 RMD160 572ee1ac251de0102ed256545cc1f0deb6ebdf40 SHA1 af3972d0c19a902c588d1486e3c22c6fe3352068 SHA256 296236fba653b041f396d4b19387a29a3c39e9c6c3be4d319a97b2a33d3a10d5
-AUX cfengine-2.1.22-db48-namespace-fix.patch 3058 RMD160 5967a3697acdd3460b2a1b24fb7e9193f9f9356b SHA1 659d2047b33b4f7c3d78beada6c34f4243c02632 SHA256 cc3590d63bb84a92d76155b8fb1d61fbcda94c9ddaa55f549f02023c53af55fd
-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
-AUX cfengine-2.2.6-typo-fix.patch 400 RMD160 6e23769b84335ae2433912af2709b11669c0fd08 SHA1 141b9d74ceb0ca947ef717461b002c2a84fb927e SHA256 4047ab39c1bc2029c32c57eb796cc8c6bb2822fb9bd7f8b3186172ef0e745da7
 AUX cfenvd.rc6 254 RMD160 cbbb932dfee81318437f27b0e644b3201d6e4664 SHA1 d27f693a0744cbbd8f06ec85779935fc1a3181f2 SHA256 de0877e26bbb5cd8eb5da1827308b8fa00c9ce487e61263306c4b57e3ba9e150
 AUX cfexecd.rc6 259 RMD160 05810d7582d962903033ed85b409818dd19089ef SHA1 f95df7747bded2a2d9c5bdcfb1bebc3e3c9ef463 SHA256 98735d665038e372be29ac8b173861491dde1d71fad7d0cefddab0fbf99a157c
 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.22.tar.gz 3673965 RMD160 9109a5156aa24e29137ff51ad1b5a0050b62eb2f SHA1 79501a4d430bc5a955b56519e0d00f62d8353229 SHA256 fa30e5b29517370e5cea8d9935999e437709e574d103eb317eeed007c975d451
 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
 DIST cfengine-3.0.4.tar.gz 2217103 RMD160 6c7507d72b646b055b82513c943cecd237430072 SHA1 71c6c41bc717a03df6db8585e11a673415f1f94c SHA256 7e0aa7807e68ca7a9ccda9ed0b57fd20c91020bd2810c2140b2802e8ca461a21
 DIST cfengine-3.0.5.tar.gz 1512755 RMD160 a8ad67570dd382c13dcecd3b80e6d029c2efd1e3 SHA1 3d014c410ad0479040b33f82d85fd737a28372bd SHA256 4aea3c7a6b38a211b85d76d0b30f525684d741062897d47d19c88334f4cf79d5
-EBUILD cfengine-2.1.22-r2.ebuild 2544 RMD160 2c136ba13744c57d6e3735a8d6920a96ec207bae SHA1 10118a326a26378db15539b0757bcf479575a077 SHA256 b1144f77d16ce5ddb9609671694fc3e2946ccd68ac6f92be457f5bb70946c146
 EBUILD cfengine-2.2.10-r2.ebuild 3026 RMD160 207e3472692821d04ac70539038abf895c9bd163 SHA1 7911f0e5fa96e152b0658c232621b75b1bf30232 SHA256 61cc0e5cc7ba710c94c828f19abcda7523d26dd9e75553ab5898c310433cbb06
 EBUILD cfengine-2.2.10.ebuild 2720 RMD160 f79ad7c72b4ceac12a0323434b3797c4dbc1f3cb SHA1 cddf8f46bd13c6d1c83bddbcdff56673151f6104 SHA256 6b20bf4737274d6bfbe519dd717a4b19f689296accb431e7b0dae6b16e41a34d
-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
 EBUILD cfengine-3.0.4.ebuild 2978 RMD160 06ef3607c0913efdbe6105d0e13a457e56cfcbdd SHA1 4de009194715df3c241f7bc73bb0618ccea8d6f6 SHA256 e3a07400a80b9d110ac9bf5bc56f8c84dba6a6932eb0cd057fb2da2088848571
 EBUILD cfengine-3.0.5.ebuild 2978 RMD160 97873064d2910a02fd9b7eb892c74852e5a32193 SHA1 2f7fe61bb779dfe071243ec195c819d5fe573d83 SHA256 a4068252c560259c9ee5122a38cc3730f43ecb2289fd7f3c1fc1332be9cd5de4
-MISC ChangeLog 16548 RMD160 f83532cb6171be56bc3c000aafd6862a504a8f04 SHA1 c5e120499a56835060c672897d5f8530bf003ae1 SHA256 c0d057f226e18a88d885d3a328784aeefea9d9b86decf381367fea5e01ad9e5d
+MISC ChangeLog 16989 RMD160 49494a910e08cb6c0e8b1580d877dcf5222bcedd SHA1 e7f469ac1c84d5f6562c47b5cc7261da4e087f20 SHA256 15a13ee7be7a552ee8e6a6b9651865e1bceaa012a03f8383618128161428a0bf
 MISC metadata.xml 1686 RMD160 feb731593309de9818306910dd6dedd9832314dd SHA1 2ffff9e8bea63927ebf137685329b64fcb01287b SHA256 dddd8010e4647feebbe2ffb445bae1f720ce4bb87a26439144e57ecbb475b339
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkx1YHQACgkQixe2jn+ufTjP2ACeK20Nd3EH2jqMTq5mmPKEUAOu
+btsAn2QU0hU1Cnvx2G8x8Vw+CwgySLY1
+=kv2S
+-----END PGP SIGNATURE-----
diff --git a/net-misc/cfengine/cfengine-2.1.22-r2.ebuild b/net-misc/cfengine/cfengine-2.1.22-r2.ebuild
deleted file mode 100644
index 36547bd3db51..000000000000
--- a/net-misc/cfengine/cfengine-2.1.22-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2010 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.3 2010/01/26 11:00:16 robbat2 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/tarballs/${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"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-package-fix.patch
-	epatch "${FILESDIR}"/${PN}-2.1-package-locking-fixup.patch
-	# DB4.8 uses 'ENV' as a typedef, and it conflicts with symbols in cfengine
-	# on the same name. Change the cfengine ones.
-	epatch "${FILESDIR}"/${PN}-2.1.22-db48-namespace-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.2.8-r1.ebuild b/net-misc/cfengine/cfengine-2.2.8-r1.ebuild
deleted file mode 100644
index 0516ab51087a..000000000000
--- a/net-misc/cfengine/cfengine-2.2.8-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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.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/tarballs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.2-package-locking-fixup.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
-
-	# 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() {
-	# 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 -f /usr/sbin/cf{agent,servd,execd} "${ROOT}"/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
-
-	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.8.ebuild b/net-misc/cfengine/cfengine-2.2.8.ebuild
deleted file mode 100644
index f880f3baa208..000000000000
--- a/net-misc/cfengine/cfengine-2.2.8.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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.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/tarballs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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
-	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/files/cfengine-2.1-package-locking-fixup.patch b/net-misc/cfengine/files/cfengine-2.1-package-locking-fixup.patch
deleted file mode 100644
index 0c1531cdc91a..000000000000
--- a/net-misc/cfengine/files/cfengine-2.1-package-locking-fixup.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit d0dd5a50066ecb9e4857a7795ceed67832a37dc5
-Author: Robin H. Johnson <robbat2@gentoo.org>
-Date:   Thu Dec 4 23:21:51 2008 -0800
-
-    Fix up locking for packages to avoid collision when the package name, cmp, action are the same, but defines and version are different.
-
-    There's a serious bug with the locking inside the packages method, that causes
-    lock names to collide when they shouldn't.
-    
-    Triggered with this code:
-    =====
-    packages:
-    any::
-    mail-mta/postfix cmp=lt version=2.3 action=none define=has_lt_postfix23
-    mail-mta/postfix cmp=lt version=2.4 action=none define=has_lt_postfix24
-    mail-mta/postfix cmp=lt version=2.5 action=none define=has_lt_postfix25
-    mail-mta/postfix cmp=lt version=2.6 action=none define=has_lt_postfix26
-    mail-mta/postfix cmp=ge version=2.3 action=none define=has_ge_postfix23
-    mail-mta/postfix cmp=ge version=2.4 action=none define=has_ge_postfix24
-    mail-mta/postfix cmp=ge version=2.5 action=none define=has_ge_postfix25
-    =====
-    
-    The lock is normally created in src/do.c as follows:
-    snprintf(lock,CF_BUFSIZE-1,"%s_%d_%d",name,ptr->cmp,ptr->action);
-    
-    Where name is based only on the first token.
-    The above comes down to only two locks:
-    packages.mail_mta_postfix_2_2
-    packages.mail_mta_postfix_3_2
-    
-    This means the other classes are never defined, and unless you look at the
-    debug output, the locking errors are not seen either.
-    
-    Attached are patches for the 2.1.x and 2.2.x series that alter the lock name to
-    include the version AND define/elsedefine blocks.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff --git a/src/do.c b/src/do.c
-index 55fc552..58454f2 100644
---- a/src/do.c
-+++ b/src/do.c
-@@ -2710,7 +2710,7 @@ for (ptr = VPKG; ptr != NULL; ptr=ptr->next)
-       ptr->done = 'y';
-       }
- 
--   snprintf(lock,CF_BUFSIZE-1,"%s_%d_%d",ptr->name,ptr->cmp,ptr->action);
-+   snprintf(lock,CF_BUFSIZE-1,"%s_%d_%s_%d_%s_%s", ptr->name, ptr->cmp, ptr->ver ?: "" ,ptr->action, ptr->defines ?: "", ptr->elsedef ?: "");
-    
-    if (!GetLock(ASUniqueName("packages"),CanonifyName(lock),ptr->ifelapsed,ptr->expireafter,VUQNAME,CFSTARTTIME))
-       {
diff --git a/net-misc/cfengine/files/cfengine-2.1.22-db48-namespace-fix.patch b/net-misc/cfengine/files/cfengine-2.1.22-db48-namespace-fix.patch
deleted file mode 100644
index 5f27e46f5a84..000000000000
--- a/net-misc/cfengine/files/cfengine-2.1.22-db48-namespace-fix.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -Nuar cfengine-2.1.22.orig/src/cfenvd.c cfengine-2.1.22/src/cfenvd.c
---- cfengine-2.1.22.orig/src/cfenvd.c	2007-01-07 14:15:42.000000000 +0000
-+++ cfengine-2.1.22/src/cfenvd.c	2010-01-26 10:58:20.328601944 +0000
-@@ -69,8 +69,8 @@
- 
- char BATCHFILE[CF_BUFSIZE];
- char STATELOG[CF_BUFSIZE];
--char ENV_NEW[CF_BUFSIZE];
--char ENV[CF_BUFSIZE];
-+char CF_ENV_NEW[CF_BUFSIZE];
-+char CF_ENV[CF_BUFSIZE];
- 
- short TCPDUMP = false;
- short TCPPAUSE = false;
-@@ -284,8 +284,8 @@
-  
- snprintf(AVDB,CF_MAXVARSIZE,"%s/state/%s",CFWORKDIR,CF_AVDB_FILE);
- snprintf(STATELOG,CF_BUFSIZE,"%s/state/%s",CFWORKDIR,CF_STATELOG_FILE);
--snprintf(ENV_NEW,CF_BUFSIZE,"%s/state/%s",CFWORKDIR,CF_ENVNEW_FILE);
--snprintf(ENV,CF_BUFSIZE,"%s/state/%s",CFWORKDIR,CF_ENV_FILE);
-+snprintf(CF_ENV_NEW,CF_BUFSIZE,"%s/state/%s",CFWORKDIR,CF_ENVNEW_FILE);
-+snprintf(CF_ENV,CF_BUFSIZE,"%s/state/%s",CFWORKDIR,CF_ENV_FILE);
- 
- if (!BATCH_MODE)
-    {
-@@ -1070,9 +1070,9 @@
- 
- /* Publish class list */
- 
--unlink(ENV_NEW);
-+unlink(CF_ENV_NEW);
-  
--if ((fp = fopen(ENV_NEW,"a")) == NULL)
-+if ((fp = fopen(CF_ENV_NEW,"a")) == NULL)
-    {
-    DeleteItemList(PREVIOUS_STATE);
-    PREVIOUS_STATE = classlist;
-@@ -1095,7 +1095,7 @@
- DeleteItemList(ENTROPIES); 
- fclose(fp);
- 
--rename(ENV_NEW,ENV);
-+rename(CF_ENV_NEW,CF_ENV);
- }
- 
- /*********************************************************************/
-diff -Nuar cfengine-2.1.22.orig/src/cfetool.c cfengine-2.1.22/src/cfetool.c
---- cfengine-2.1.22.orig/src/cfetool.c	2006-01-29 15:34:23.000000000 +0000
-+++ cfengine-2.1.22/src/cfetool.c	2010-01-26 10:58:13.145262988 +0000
-@@ -157,8 +157,8 @@
- int time_to_update = false;
- int DEBUGGING = false;
- int DEBUGGING2 = false;
--char ENV_NEW[CF_BUFSIZE];
--char ENV[CF_BUFSIZE];
-+char CF_ENV_NEW[CF_BUFSIZE];
-+char CF_ENV[CF_BUFSIZE];
- 
- #define Debugging if(DEBUGGING) printf
- #define Debugging2 if(DEBUGGING2) printf
-@@ -267,8 +267,8 @@
-   }
-   strncpy(VLOCKDIR,WORKDIR,CF_BUFSIZE-1);
-   strncpy(VLOGDIR,WORKDIR,CF_BUFSIZE-1);
--  snprintf(ENV_NEW,CF_BUFSIZE,"%s/state/%s",WORKDIR,CF_ENVNEW_FILE);
--  snprintf(ENV,CF_BUFSIZE,"%s/state/%s",WORKDIR,CF_ENV_FILE);
-+  snprintf(CF_ENV_NEW,CF_BUFSIZE,"%s/state/%s",WORKDIR,CF_ENVNEW_FILE);
-+  snprintf(CF_ENV,CF_BUFSIZE,"%s/state/%s",WORKDIR,CF_ENV_FILE);
-   argv += 2;
-   argc -= 2;
-   if (strcmp(command, "create") == 0)
-@@ -2437,7 +2437,7 @@
- 
-   if(cfenvd_compatible)
-   {
--    unlink(ENV_NEW);
-+    unlink(CF_ENV_NEW);
-     strcpy(temp1, NAME);
-     strcat(temp1, "_");
-     temp2[0] = '_';
-@@ -2452,12 +2452,12 @@
-       lock.l_whence = SEEK_SET;
-       lock.l_len = 0;
-  
--      if ((newfp = fopen(ENV_NEW,"a")) == NULL)
-+      if ((newfp = fopen(CF_ENV_NEW,"a")) == NULL)
-       {
-         DeleteItemList(classlist);
-         return code; 
-       }
--      if ((oldfp = fopen(ENV, "r")) != NULL)
-+      if ((oldfp = fopen(CF_ENV, "r")) != NULL)
-       {
-         if(fcntl(fileno(oldfp), F_SETLK, &lock) == -1)
-         {
-@@ -2481,7 +2481,7 @@
-  
-       fclose(newfp);
- 
--      rename(ENV_NEW,ENV);
-+      rename(CF_ENV_NEW,CF_ENV);
-       break;
-     }
-   }
diff --git a/net-misc/cfengine/files/cfengine-2.1.22-package-fix.patch b/net-misc/cfengine/files/cfengine-2.1.22-package-fix.patch
deleted file mode 100644
index b4b40823bf17..000000000000
--- a/net-misc/cfengine/files/cfengine-2.1.22-package-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru 2.1.22-orig/src/package.c 2.1.22-r1/src/package.c
---- 2.1.22-orig/src/package.c   2007-03-09 11:48:31.000000000 -0800
-+++ cfengine-2.1.22/src/package.c     2007-03-09 11:50:26.000000000 -0800
-@@ -446,6 +446,7 @@
-          {
-          ReadLine(line,CF_BUFSIZE-1,pp);
-          snprintf(OUTPUT,CF_BUFSIZE,"Package install: %s\n",line);
-+         CfLog(cfinform,OUTPUT,""); 
-          }
-       
-       if (cfpclose(pp) != 0)
diff --git a/net-misc/cfengine/files/cfengine-2.2-package-locking-fixup.patch b/net-misc/cfengine/files/cfengine-2.2-package-locking-fixup.patch
deleted file mode 100644
index 1a523df09dd5..000000000000
--- a/net-misc/cfengine/files/cfengine-2.2-package-locking-fixup.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit bdd26de22a3e4e18d63709d61a788785d212aa45
-Author: Robin H. Johnson <robbat2@gentoo.org>
-Date:   Thu Dec 4 23:20:32 2008 -0800
-
-    Fix up locking for packages to avoid collision when the package name, cmp, action are the same, but defines and version are different.
-    
-    There's a serious bug with the locking inside the packages method, that causes
-    lock names to collide when they shouldn't.
-    
-    Triggered with this code:
-    =====
-    packages:
-    any::
-    mail-mta/postfix cmp=lt version=2.3 action=none define=has_lt_postfix23
-    mail-mta/postfix cmp=lt version=2.4 action=none define=has_lt_postfix24
-    mail-mta/postfix cmp=lt version=2.5 action=none define=has_lt_postfix25
-    mail-mta/postfix cmp=lt version=2.6 action=none define=has_lt_postfix26
-    mail-mta/postfix cmp=ge version=2.3 action=none define=has_ge_postfix23
-    mail-mta/postfix cmp=ge version=2.4 action=none define=has_ge_postfix24
-    mail-mta/postfix cmp=ge version=2.5 action=none define=has_ge_postfix25
-    =====
-    
-    The lock is normally created in src/do.c as follows:
-    snprintf(lock,CF_BUFSIZE-1,"%s_%d_%d",name,ptr->cmp,ptr->action);
-    
-    Where name is based only on the first token.
-    The above comes down to only two locks:
-    packages.mail_mta_postfix_2_2
-    packages.mail_mta_postfix_3_2
-    
-    This means the other classes are never defined, and unless you look at the
-    debug output, the locking errors are not seen either.
-    
-    Attached are patches for the 2.1.x and 2.2.x series that alter the lock name to
-    include the version AND define/elsedefine blocks.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff --git a/src/do.c b/src/do.c
-index a01b177..9800cd6 100644
---- a/src/do.c
-+++ b/src/do.c
-@@ -2844,7 +2844,7 @@ for (ptr = VPKG; ptr != NULL; ptr=ptr->next)
- 
-    ExpandVarstring(ptr->name,name,"");
-    
--   snprintf(lock,CF_BUFSIZE-1,"%s_%d_%d",name,ptr->cmp,ptr->action);
-+   snprintf(lock,CF_BUFSIZE-1,"%s_%d_%s_%d_%s_%s", name, ptr->cmp, ptr->ver ?: "" ,ptr->action, ptr->defines ?: "", ptr->elsedef ?: "");
-    
-    if (!GetLock(ASUniqueName("packages"),CanonifyName(lock),ptr->ifelapsed,ptr->expireafter,VUQNAME,CFSTARTTIME))
-       {
diff --git a/net-misc/cfengine/files/cfengine-2.2.6-typo-fix.patch b/net-misc/cfengine/files/cfengine-2.2.6-typo-fix.patch
deleted file mode 100644
index db53583f6fe9..000000000000
--- a/net-misc/cfengine/files/cfengine-2.2.6-typo-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur cfengine-2.2.6-orig/src/cfenvd.c cfengine-2.2.6/src/cfenvd.c
---- cfengine-2.2.6-orig/src/cfenvd.c	2008-04-21 23:26:19.000000000 -0700
-+++ cfengine-2.2.6/src/cfenvd.c	2008-04-28 12:08:46.000000000 -0700
-@@ -36,7 +36,7 @@
- #include "cf.defs.h"
- #include "cf.extern.h"
- #ifdef HAVE_SYS_LOADAVG_H
--v# include <sys/loadavg.h>
-+# include <sys/loadavg.h>
- #else
- # define LOADAVG_5MIN    1
- #endif
diff --git a/net-misc/cfengine/files/module-cfportage.tbz2 b/net-misc/cfengine/files/module-cfportage.tbz2
deleted file mode 100644
index df25be27d293..000000000000
--- a/net-misc/cfengine/files/module-cfportage.tbz2
+++ /dev/null