Gentoo Logo
Gentoo Spaceship




Note: Due to technical difficulties, the Archives are currently not up to date. GMANE provides an alternative service for most mailing lists.
c.f. bug 424647
List Archive: gentoo-test
Navigation:
Lists: gentoo-test: < Prev By Thread Next > < Prev By Date Next >
Headers:
To: gentoo-test@g.o
From: idl0r@g.o
Subject: proj/gitolite-gentoo commit in <fillme>:
Date: Sun, 31 Oct 2010 10:48:00 +0000 (UTC)
Commit:        8e8290602d9f454b5faf6026fc23c3b11c0dfcdb

Author:        Christian Ruppert <idl0r at gentoo dot org>
AuthorDate:    Sun Oct 31 10:39:37 2010 +0000
Committer:     Christian Ruppert <idl0r at gentoo dot org>
CommitterDate: Sun Oct 31 10:39:37 2010 +0000

Revert "Revert "Just a test""

This reverts commit 536ab22db52c20ecdeebc54357fef1ed348f9ca5.
---
 net-misc/cfengine/Manifest                    |   18 +---
 net-misc/cfengine/cfengine-2.2.10-r3.ebuild   |   17 +---
 net-misc/cfengine/cfengine-3.0.5_p1-r2.ebuild |  158 -------------------------
 net-misc/cfengine/cfengine-3.0.5_p1-r3.ebuild |  158 +++++++++++++++++++++++++
 4 files changed, 161 insertions(+), 190 deletions(-)

diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 2227fcb..488b66f 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,6 +1,3 @@
------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 c19d8ff89a9f4e5ad7f68a9139599ea0325a3dfb SHA1 8eaf29efdf3a3cc128622a4b38e2a3f79d1de232 SHA256 633465d58396b55029810ac208eec5f3a4f724fd2841391bf1feed5307196141
@@ -16,19 +13,8 @@ AUX cfportage.README 2294 RMD160 05c285d3b79e266ac6229985b2fdbab1b7841752 SHA1 7
 AUX cfservd.rc6 259 RMD160 8390afb5b3cf7ffbe0b74766ddf3f9d05c4d5b6c SHA1 c1fc1ccf15789c8acfc3857481ed69dc7f9b6d2b SHA256 892e9537c9b75861031a0755af886b2b931e1ca4dd2589847a2bacf00862de0f
 DIST cfengine-2.2.10.tar.gz 2690333 RMD160 67fd3dc80270dc000887e3dbf26f372338e2600f SHA1 032bec0bc59ffee7179422e96dfd902afbf94340 SHA256 f34697cc52e1342c5ec4b45a4adf9fbffdfa05a68bdc7c53382f72d03e106783
 DIST cfengine-3.0.5p1.tar.gz 1517992 RMD160 909ee306cdbd0e674fbdb54ddcbca66b0cc5213b SHA1 bc7cc5fbc6c9a973f2f74c45e6835934230b6d63 SHA256 38a389969ff095775e206df24b0fbc66ae30fa404d92dcb26b94a568e790610b
-EBUILD cfengine-2.2.10-r3.ebuild 3113 RMD160 2f9c3d613e0b47d92084702e870bf22e7b9430a6 SHA1 fd7066de09810f8659834d790eb1953c98e48b47 SHA256 bc5c3bb658ff03441ecc378542026203f3ac0b4d028c071fa7af7de64efbe320
+EBUILD cfengine-2.2.10-r3.ebuild 2650 RMD160 0e76b604929241f7ba0d0beadc54a11ee8a32d1d SHA1 1019205a7b0442c9cdb18aa4c5d5d183f2ee4594 SHA256 443194f25a9e0106abf3efd49cb6418cd267dd55daf1abf3d8fa0a3ad2d1a95d
 EBUILD cfengine-2.2.10.ebuild 2720 RMD160 f79ad7c72b4ceac12a0323434b3797c4dbc1f3cb SHA1 cddf8f46bd13c6d1c83bddbcdff56673151f6104 SHA256 6b20bf4737274d6bfbe519dd717a4b19f689296accb431e7b0dae6b16e41a34d
-EBUILD cfengine-3.0.5_p1-r2.ebuild 4294 RMD160 03dd1ef6331e5fd6e45d3b013367bccfe28f665f SHA1 c1862b48d5014eb658f66a057835dbc0db674ade SHA256 24585d554ef4334417f3517d3578dcd036f469c5f508a88c9fa0b02777e783f8
+EBUILD cfengine-3.0.5_p1-r3.ebuild 4294 RMD160 03dd1ef6331e5fd6e45d3b013367bccfe28f665f SHA1 c1862b48d5014eb658f66a057835dbc0db674ade SHA256 24585d554ef4334417f3517d3578dcd036f469c5f508a88c9fa0b02777e783f8
 MISC ChangeLog 18764 RMD160 a9ac39530dba1a65eeb2fe2f77661a2e3f4c41d3 SHA1 3d52b36ac967a34dae0a496f7322e027d90e6447 SHA256 b53dbd0f403b3ec5af38caa4fdf2d9fe1e0978008a3eba67ec5a6d0d271a0335
 MISC metadata.xml 2646 RMD160 2c51382fec40e084a1ef7372505399d079fcedfb SHA1 51acdf2de92d83b818d56a326511a03a5d8a1689 SHA256 f78868dec97c0018b6b59a05e85153a76e44526b65aa77820d8ce9c2cdcf857e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQEcBAEBAgAGBQJMydP8AAoJEMOx0zmdw4Z1/50H/1gnCzDK/NvC4nsQlKF2wqrF
-sDyLqeJVvx1ivwvTT+QiRWiNjZu4jb56WdTTFEFg0trOnn6w3M50H0qzdchk6Tmg
-PSRFfDzJElZh9usxhFvix5+Yux8FxiKNwTvTU0NnFKDFcQGXpXf1Re7caV6+/2Mr
-x/tCeNY105k5B6NNujaRTMpo6SpEBx19r7q0X+OkXKlvqjK905OHx3TmwnZMYP6W
-QmnyuFWB+bBjzbGSRZ3zGAGsKAhYfIDyunfSloQiePNQ5ZQxvbbz4xRpd4QY/fpH
-N3fQ9cpigpIk9U6Sk1yaKf6ISAO2tKSjd+F+VlgWQ8dzinT9jJnVlfGeF0xblBA=
-=NHIM
------END PGP SIGNATURE-----
diff --git a/net-misc/cfengine/cfengine-2.2.10-r3.ebuild b/net-misc/cfengine/cfengine-2.2.10-r3.ebuild
index d2bd383..1fefc4f 100644
--- a/net-misc/cfengine/cfengine-2.2.10-r3.ebuild
+++ b/net-misc/cfengine/cfengine-2.2.10-r3.ebuild
@@ -31,25 +31,10 @@ src_prepare() {
 		"${FILESDIR}/${P}-snprintf_buffer_overflow.patch"
 }
 
-src_configure() {
-	# Enforce /var/cfengine for historical compatibility
-	econf \
-		--with-workdir=/var/cfengine \
-		--with-berkeleydb=/usr
-
-	# 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
-}
-
 src_install() {
 	newinitd "${FILESDIR}"/cfservd.rc6 cfservd || die
 	newinitd "${FILESDIR}"/cfenvd.rc6 cfenvd || die
-	newinitd "${FILESDIR}"/cfexecd.rc6 cfexecd || die
+	test123nitd "${FILESDIR}"/cfexecd.rc6 cfexecd || die
 
 	make DESTDIR="${D}" install || die
 
diff --git a/net-misc/cfengine/cfengine-3.0.5_p1-r2.ebuild b/net-misc/cfengine/cfengine-3.0.5_p1-r2.ebuild
deleted file mode 100644
index f214c92..0000000
--- a/net-misc/cfengine/cfengine-3.0.5_p1-r2.ebuild
+++ /dev/null
@@ -1,158 +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-3.0.5_p1-r2.ebuild,v 1.1 2010/10/28 19:39:02 idl0r Exp $
-
-EAPI="3"
-
-inherit eutils autotools
-
-MY_PV="${PV//_beta/b}"
-MY_PV="${MY_PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-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/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="3"
-KEYWORDS="~amd64 ~s390 ~x86"
-
-IUSE="examples gd graphviz html ldap libvirt mysql pcre postgres qdbm selinux tests tokyocabinet vim-syntax"
-
-DEPEND=">=sys-libs/db-4
-	gd? ( media-libs/gd )
-	graphviz? ( media-gfx/graphviz )
-	ldap? ( net-nds/openldap )
-	libvirt? ( app-emulation/libvirt )
-	mysql? ( virtual/mysql )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql-base )
-	selinux? ( sys-libs/libselinux )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	qdbm? ( dev-db/qdbm )
-	!tokyocabinet? ( !qdbm? ( >=sys-libs/db-4 ) )
-	>=dev-libs/openssl-0.9.7"
-RDEPEND="${DEPEND}"
-PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-configure.ac.patch"
-	epatch "${FILESDIR}/${P}-Makefile.am.patch"
-	epatch "${FILESDIR}/${P}-regex.c.patch"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use mysql || use postgres ; then
-		myconf="--with-sql"
-	else
-		myconf="--without-sql"
-	fi
-
-	if ! use qdbm && ! use tokyocabinet; then
-		myconf="${myconf} --with-berkeleydb=/usr"
-	fi
-
-	# Enforce /var/cfengine for historical compatibility
-	econf \
-		--docdir=/usr/share/doc/"${PF}" \
-		--with-workdir=/var/cfengine \
-		${myconf} \
-		$(use_with gd) \
-		$(use_with graphviz) \
-		$(use_with ldap) \
-		$(use_with libvirt) \
-		$(use_with pcre) \
-		$(use_with qdbm) \
-		$(use_enable selinux) \
-		$(use_with tokyocabinet)
-
-	# Fix Makefile to skip inputs, see below "examples"
-	sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
-
-	# We install documentation through portage
-	sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
-
-	if use tests; then
-		# Fix Makefiles to install tests in correct directory
-		for i in file_masters file_operands units ; do
-			sed -i -e "s/\(docdir.*\) =.*/\1 = \/usr\/share\/doc\/${PF}\/tests\/${i}/" \
-				tests/${i}/Makefile || die
-		done
-	else
-		sed -i -e 's/\(SUBDIRS =\).*/\1/' tests/Makefile || die
-	fi
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die
-	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
-	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
-
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO INSTALL
-
-	if use examples; then
-		docinto examples
-		dodoc inputs/*.cf || die
-	fi
-
-	# Create cfengine working directory
-	dodir /var/cfengine/bin
-	fperms 700 /var/cfengine
-
-	# 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.
-	for bin in know promises agent monitord serverd execd runagent key report; do
-		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
-	done
-
-	if use html; then
-		docinto html
-		dohtml -r docs/ || die
-	fi
-}
-
-pkg_postinst() {
-	echo
-	einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided."
-	einfo
-	einfo "To run cfengine out of cron every half hour modify your crontab:"
-	einfo "0,30 * * * *    /usr/sbin/cf-execd -F"
-	echo
-
-	elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:"
-	elog "emerge --config ${CATEGORY}/${PN}"
-
-	# Fix old cf-servd, remove it after some releases.
-	local found=0
-	for fname in $(find /etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
-		found=1
-		rm $fname
-		ln -s /etc/init.d/cf-serverd $(echo $fname | sed 's:cf-servd:cf-serverd:')
-	done
-
-	if [ "${found}" -eq 1 ]; then
-		echo
-		elog "/etc/init.d/cf-servd has been renamed to /etc/init.d/cf-serverd"
-	fi
-}
-
-pkg_config() {
-	if [ "${ROOT}" == "/" ]; then
-		if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
-			einfo "Generating keys for localhost."
-			/usr/sbin/cf-key
-		fi
-	else
-		die "cfengine cfkey does not support any value of ROOT other than /."
-	fi
-}
diff --git a/net-misc/cfengine/cfengine-3.0.5_p1-r3.ebuild b/net-misc/cfengine/cfengine-3.0.5_p1-r3.ebuild
new file mode 100644
index 0000000..f214c92
--- /dev/null
+++ b/net-misc/cfengine/cfengine-3.0.5_p1-r3.ebuild
@@ -0,0 +1,158 @@
+# 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-3.0.5_p1-r2.ebuild,v 1.1 2010/10/28 19:39:02 idl0r Exp $
+
+EAPI="3"
+
+inherit eutils autotools
+
+MY_PV="${PV//_beta/b}"
+MY_PV="${MY_PV/_p/p}"
+MY_P="${PN}-${MY_PV}"
+
+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/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="3"
+KEYWORDS="~amd64 ~s390 ~x86"
+
+IUSE="examples gd graphviz html ldap libvirt mysql pcre postgres qdbm selinux tests tokyocabinet vim-syntax"
+
+DEPEND=">=sys-libs/db-4
+	gd? ( media-libs/gd )
+	graphviz? ( media-gfx/graphviz )
+	ldap? ( net-nds/openldap )
+	libvirt? ( app-emulation/libvirt )
+	mysql? ( virtual/mysql )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql-base )
+	selinux? ( sys-libs/libselinux )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	qdbm? ( dev-db/qdbm )
+	!tokyocabinet? ( !qdbm? ( >=sys-libs/db-4 ) )
+	>=dev-libs/openssl-0.9.7"
+RDEPEND="${DEPEND}"
+PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-configure.ac.patch"
+	epatch "${FILESDIR}/${P}-Makefile.am.patch"
+	epatch "${FILESDIR}/${P}-regex.c.patch"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use mysql || use postgres ; then
+		myconf="--with-sql"
+	else
+		myconf="--without-sql"
+	fi
+
+	if ! use qdbm && ! use tokyocabinet; then
+		myconf="${myconf} --with-berkeleydb=/usr"
+	fi
+
+	# Enforce /var/cfengine for historical compatibility
+	econf \
+		--docdir=/usr/share/doc/"${PF}" \
+		--with-workdir=/var/cfengine \
+		${myconf} \
+		$(use_with gd) \
+		$(use_with graphviz) \
+		$(use_with ldap) \
+		$(use_with libvirt) \
+		$(use_with pcre) \
+		$(use_with qdbm) \
+		$(use_enable selinux) \
+		$(use_with tokyocabinet)
+
+	# Fix Makefile to skip inputs, see below "examples"
+	sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
+
+	# We install documentation through portage
+	sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
+
+	if use tests; then
+		# Fix Makefiles to install tests in correct directory
+		for i in file_masters file_operands units ; do
+			sed -i -e "s/\(docdir.*\) =.*/\1 = \/usr\/share\/doc\/${PF}\/tests\/${i}/" \
+				tests/${i}/Makefile || die
+		done
+	else
+		sed -i -e 's/\(SUBDIRS =\).*/\1/' tests/Makefile || die
+	fi
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die
+	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
+	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
+
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO INSTALL
+
+	if use examples; then
+		docinto examples
+		dodoc inputs/*.cf || die
+	fi
+
+	# Create cfengine working directory
+	dodir /var/cfengine/bin
+	fperms 700 /var/cfengine
+
+	# 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.
+	for bin in know promises agent monitord serverd execd runagent key report; do
+		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
+	done
+
+	if use html; then
+		docinto html
+		dohtml -r docs/ || die
+	fi
+}
+
+pkg_postinst() {
+	echo
+	einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided."
+	einfo
+	einfo "To run cfengine out of cron every half hour modify your crontab:"
+	einfo "0,30 * * * *    /usr/sbin/cf-execd -F"
+	echo
+
+	elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:"
+	elog "emerge --config ${CATEGORY}/${PN}"
+
+	# Fix old cf-servd, remove it after some releases.
+	local found=0
+	for fname in $(find /etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
+		found=1
+		rm $fname
+		ln -s /etc/init.d/cf-serverd $(echo $fname | sed 's:cf-servd:cf-serverd:')
+	done
+
+	if [ "${found}" -eq 1 ]; then
+		echo
+		elog "/etc/init.d/cf-servd has been renamed to /etc/init.d/cf-serverd"
+	fi
+}
+
+pkg_config() {
+	if [ "${ROOT}" == "/" ]; then
+		if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
+			einfo "Generating keys for localhost."
+			/usr/sbin/cf-key
+		fi
+	else
+		die "cfengine cfkey does not support any value of ROOT other than /."
+	fi
+}

diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 2227fcb..488b66f 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,6 +1,3 @@
------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 c19d8ff89a9f4e5ad7f68a9139599ea0325a3dfb SHA1 8eaf29efdf3a3cc128622a4b38e2a3f79d1de232 SHA256 633465d58396b55029810ac208eec5f3a4f724fd2841391bf1feed5307196141
@@ -16,19 +13,8 @@ AUX cfportage.README 2294 RMD160 05c285d3b79e266ac6229985b2fdbab1b7841752 SHA1 7
 AUX cfservd.rc6 259 RMD160 8390afb5b3cf7ffbe0b74766ddf3f9d05c4d5b6c SHA1 c1fc1ccf15789c8acfc3857481ed69dc7f9b6d2b SHA256 892e9537c9b75861031a0755af886b2b931e1ca4dd2589847a2bacf00862de0f
 DIST cfengine-2.2.10.tar.gz 2690333 RMD160 67fd3dc80270dc000887e3dbf26f372338e2600f SHA1 032bec0bc59ffee7179422e96dfd902afbf94340 SHA256 f34697cc52e1342c5ec4b45a4adf9fbffdfa05a68bdc7c53382f72d03e106783
 DIST cfengine-3.0.5p1.tar.gz 1517992 RMD160 909ee306cdbd0e674fbdb54ddcbca66b0cc5213b SHA1 bc7cc5fbc6c9a973f2f74c45e6835934230b6d63 SHA256 38a389969ff095775e206df24b0fbc66ae30fa404d92dcb26b94a568e790610b
-EBUILD cfengine-2.2.10-r3.ebuild 3113 RMD160 2f9c3d613e0b47d92084702e870bf22e7b9430a6 SHA1 fd7066de09810f8659834d790eb1953c98e48b47 SHA256 bc5c3bb658ff03441ecc378542026203f3ac0b4d028c071fa7af7de64efbe320
+EBUILD cfengine-2.2.10-r3.ebuild 2650 RMD160 0e76b604929241f7ba0d0beadc54a11ee8a32d1d SHA1 1019205a7b0442c9cdb18aa4c5d5d183f2ee4594 SHA256 443194f25a9e0106abf3efd49cb6418cd267dd55daf1abf3d8fa0a3ad2d1a95d
 EBUILD cfengine-2.2.10.ebuild 2720 RMD160 f79ad7c72b4ceac12a0323434b3797c4dbc1f3cb SHA1 cddf8f46bd13c6d1c83bddbcdff56673151f6104 SHA256 6b20bf4737274d6bfbe519dd717a4b19f689296accb431e7b0dae6b16e41a34d
-EBUILD cfengine-3.0.5_p1-r2.ebuild 4294 RMD160 03dd1ef6331e5fd6e45d3b013367bccfe28f665f SHA1 c1862b48d5014eb658f66a057835dbc0db674ade SHA256 24585d554ef4334417f3517d3578dcd036f469c5f508a88c9fa0b02777e783f8
+EBUILD cfengine-3.0.5_p1-r3.ebuild 4294 RMD160 03dd1ef6331e5fd6e45d3b013367bccfe28f665f SHA1 c1862b48d5014eb658f66a057835dbc0db674ade SHA256 24585d554ef4334417f3517d3578dcd036f469c5f508a88c9fa0b02777e783f8
 MISC ChangeLog 18764 RMD160 a9ac39530dba1a65eeb2fe2f77661a2e3f4c41d3 SHA1 3d52b36ac967a34dae0a496f7322e027d90e6447 SHA256 b53dbd0f403b3ec5af38caa4fdf2d9fe1e0978008a3eba67ec5a6d0d271a0335
 MISC metadata.xml 2646 RMD160 2c51382fec40e084a1ef7372505399d079fcedfb SHA1 51acdf2de92d83b818d56a326511a03a5d8a1689 SHA256 f78868dec97c0018b6b59a05e85153a76e44526b65aa77820d8ce9c2cdcf857e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQEcBAEBAgAGBQJMydP8AAoJEMOx0zmdw4Z1/50H/1gnCzDK/NvC4nsQlKF2wqrF
-sDyLqeJVvx1ivwvTT+QiRWiNjZu4jb56WdTTFEFg0trOnn6w3M50H0qzdchk6Tmg
-PSRFfDzJElZh9usxhFvix5+Yux8FxiKNwTvTU0NnFKDFcQGXpXf1Re7caV6+/2Mr
-x/tCeNY105k5B6NNujaRTMpo6SpEBx19r7q0X+OkXKlvqjK905OHx3TmwnZMYP6W
-QmnyuFWB+bBjzbGSRZ3zGAGsKAhYfIDyunfSloQiePNQ5ZQxvbbz4xRpd4QY/fpH
-N3fQ9cpigpIk9U6Sk1yaKf6ISAO2tKSjd+F+VlgWQ8dzinT9jJnVlfGeF0xblBA=
-=NHIM
------END PGP SIGNATURE-----
diff --git a/net-misc/cfengine/cfengine-2.2.10-r3.ebuild b/net-misc/cfengine/cfengine-2.2.10-r3.ebuild
index d2bd383..1fefc4f 100644
--- a/net-misc/cfengine/cfengine-2.2.10-r3.ebuild
+++ b/net-misc/cfengine/cfengine-2.2.10-r3.ebuild
@@ -31,25 +31,10 @@ src_prepare() {
 		"${FILESDIR}/${P}-snprintf_buffer_overflow.patch"
 }
 
-src_configure() {
-	# Enforce /var/cfengine for historical compatibility
-	econf \
-		--with-workdir=/var/cfengine \
-		--with-berkeleydb=/usr
-
-	# 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
-}
-
 src_install() {
 	newinitd "${FILESDIR}"/cfservd.rc6 cfservd || die
 	newinitd "${FILESDIR}"/cfenvd.rc6 cfenvd || die
-	newinitd "${FILESDIR}"/cfexecd.rc6 cfexecd || die
+	test123nitd "${FILESDIR}"/cfexecd.rc6 cfexecd || die
 
 	make DESTDIR="${D}" install || die
 
diff --git a/net-misc/cfengine/cfengine-3.0.5_p1-r2.ebuild b/net-misc/cfengine/cfengine-3.0.5_p1-r2.ebuild
deleted file mode 100644
index f214c92..0000000
--- a/net-misc/cfengine/cfengine-3.0.5_p1-r2.ebuild
+++ /dev/null
@@ -1,158 +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-3.0.5_p1-r2.ebuild,v 1.1 2010/10/28 19:39:02 idl0r Exp $
-
-EAPI="3"
-
-inherit eutils autotools
-
-MY_PV="${PV//_beta/b}"
-MY_PV="${MY_PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-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/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="3"
-KEYWORDS="~amd64 ~s390 ~x86"
-
-IUSE="examples gd graphviz html ldap libvirt mysql pcre postgres qdbm selinux tests tokyocabinet vim-syntax"
-
-DEPEND=">=sys-libs/db-4
-	gd? ( media-libs/gd )
-	graphviz? ( media-gfx/graphviz )
-	ldap? ( net-nds/openldap )
-	libvirt? ( app-emulation/libvirt )
-	mysql? ( virtual/mysql )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql-base )
-	selinux? ( sys-libs/libselinux )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	qdbm? ( dev-db/qdbm )
-	!tokyocabinet? ( !qdbm? ( >=sys-libs/db-4 ) )
-	>=dev-libs/openssl-0.9.7"
-RDEPEND="${DEPEND}"
-PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-configure.ac.patch"
-	epatch "${FILESDIR}/${P}-Makefile.am.patch"
-	epatch "${FILESDIR}/${P}-regex.c.patch"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use mysql || use postgres ; then
-		myconf="--with-sql"
-	else
-		myconf="--without-sql"
-	fi
-
-	if ! use qdbm && ! use tokyocabinet; then
-		myconf="${myconf} --with-berkeleydb=/usr"
-	fi
-
-	# Enforce /var/cfengine for historical compatibility
-	econf \
-		--docdir=/usr/share/doc/"${PF}" \
-		--with-workdir=/var/cfengine \
-		${myconf} \
-		$(use_with gd) \
-		$(use_with graphviz) \
-		$(use_with ldap) \
-		$(use_with libvirt) \
-		$(use_with pcre) \
-		$(use_with qdbm) \
-		$(use_enable selinux) \
-		$(use_with tokyocabinet)
-
-	# Fix Makefile to skip inputs, see below "examples"
-	sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
-
-	# We install documentation through portage
-	sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
-
-	if use tests; then
-		# Fix Makefiles to install tests in correct directory
-		for i in file_masters file_operands units ; do
-			sed -i -e "s/\(docdir.*\) =.*/\1 = \/usr\/share\/doc\/${PF}\/tests\/${i}/" \
-				tests/${i}/Makefile || die
-		done
-	else
-		sed -i -e 's/\(SUBDIRS =\).*/\1/' tests/Makefile || die
-	fi
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die
-	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
-	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
-
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO INSTALL
-
-	if use examples; then
-		docinto examples
-		dodoc inputs/*.cf || die
-	fi
-
-	# Create cfengine working directory
-	dodir /var/cfengine/bin
-	fperms 700 /var/cfengine
-
-	# 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.
-	for bin in know promises agent monitord serverd execd runagent key report; do
-		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
-	done
-
-	if use html; then
-		docinto html
-		dohtml -r docs/ || die
-	fi
-}
-
-pkg_postinst() {
-	echo
-	einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided."
-	einfo
-	einfo "To run cfengine out of cron every half hour modify your crontab:"
-	einfo "0,30 * * * *    /usr/sbin/cf-execd -F"
-	echo
-
-	elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:"
-	elog "emerge --config ${CATEGORY}/${PN}"
-
-	# Fix old cf-servd, remove it after some releases.
-	local found=0
-	for fname in $(find /etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
-		found=1
-		rm $fname
-		ln -s /etc/init.d/cf-serverd $(echo $fname | sed 's:cf-servd:cf-serverd:')
-	done
-
-	if [ "${found}" -eq 1 ]; then
-		echo
-		elog "/etc/init.d/cf-servd has been renamed to /etc/init.d/cf-serverd"
-	fi
-}
-
-pkg_config() {
-	if [ "${ROOT}" == "/" ]; then
-		if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
-			einfo "Generating keys for localhost."
-			/usr/sbin/cf-key
-		fi
-	else
-		die "cfengine cfkey does not support any value of ROOT other than /."
-	fi
-}
diff --git a/net-misc/cfengine/cfengine-3.0.5_p1-r3.ebuild b/net-misc/cfengine/cfengine-3.0.5_p1-r3.ebuild
new file mode 100644
index 0000000..f214c92
--- /dev/null
+++ b/net-misc/cfengine/cfengine-3.0.5_p1-r3.ebuild
@@ -0,0 +1,158 @@
+# 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-3.0.5_p1-r2.ebuild,v 1.1 2010/10/28 19:39:02 idl0r Exp $
+
+EAPI="3"
+
+inherit eutils autotools
+
+MY_PV="${PV//_beta/b}"
+MY_PV="${MY_PV/_p/p}"
+MY_P="${PN}-${MY_PV}"
+
+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/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="3"
+KEYWORDS="~amd64 ~s390 ~x86"
+
+IUSE="examples gd graphviz html ldap libvirt mysql pcre postgres qdbm selinux tests tokyocabinet vim-syntax"
+
+DEPEND=">=sys-libs/db-4
+	gd? ( media-libs/gd )
+	graphviz? ( media-gfx/graphviz )
+	ldap? ( net-nds/openldap )
+	libvirt? ( app-emulation/libvirt )
+	mysql? ( virtual/mysql )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql-base )
+	selinux? ( sys-libs/libselinux )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	qdbm? ( dev-db/qdbm )
+	!tokyocabinet? ( !qdbm? ( >=sys-libs/db-4 ) )
+	>=dev-libs/openssl-0.9.7"
+RDEPEND="${DEPEND}"
+PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-configure.ac.patch"
+	epatch "${FILESDIR}/${P}-Makefile.am.patch"
+	epatch "${FILESDIR}/${P}-regex.c.patch"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use mysql || use postgres ; then
+		myconf="--with-sql"
+	else
+		myconf="--without-sql"
+	fi
+
+	if ! use qdbm && ! use tokyocabinet; then
+		myconf="${myconf} --with-berkeleydb=/usr"
+	fi
+
+	# Enforce /var/cfengine for historical compatibility
+	econf \
+		--docdir=/usr/share/doc/"${PF}" \
+		--with-workdir=/var/cfengine \
+		${myconf} \
+		$(use_with gd) \
+		$(use_with graphviz) \
+		$(use_with ldap) \
+		$(use_with libvirt) \
+		$(use_with pcre) \
+		$(use_with qdbm) \
+		$(use_enable selinux) \
+		$(use_with tokyocabinet)
+
+	# Fix Makefile to skip inputs, see below "examples"
+	sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
+
+	# We install documentation through portage
+	sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
+
+	if use tests; then
+		# Fix Makefiles to install tests in correct directory
+		for i in file_masters file_operands units ; do
+			sed -i -e "s/\(docdir.*\) =.*/\1 = \/usr\/share\/doc\/${PF}\/tests\/${i}/" \
+				tests/${i}/Makefile || die
+		done
+	else
+		sed -i -e 's/\(SUBDIRS =\).*/\1/' tests/Makefile || die
+	fi
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die
+	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
+	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
+
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO INSTALL
+
+	if use examples; then
+		docinto examples
+		dodoc inputs/*.cf || die
+	fi
+
+	# Create cfengine working directory
+	dodir /var/cfengine/bin
+	fperms 700 /var/cfengine
+
+	# 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.
+	for bin in know promises agent monitord serverd execd runagent key report; do
+		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
+	done
+
+	if use html; then
+		docinto html
+		dohtml -r docs/ || die
+	fi
+}
+
+pkg_postinst() {
+	echo
+	einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided."
+	einfo
+	einfo "To run cfengine out of cron every half hour modify your crontab:"
+	einfo "0,30 * * * *    /usr/sbin/cf-execd -F"
+	echo
+
+	elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:"
+	elog "emerge --config ${CATEGORY}/${PN}"
+
+	# Fix old cf-servd, remove it after some releases.
+	local found=0
+	for fname in $(find /etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
+		found=1
+		rm $fname
+		ln -s /etc/init.d/cf-serverd $(echo $fname | sed 's:cf-servd:cf-serverd:')
+	done
+
+	if [ "${found}" -eq 1 ]; then
+		echo
+		elog "/etc/init.d/cf-servd has been renamed to /etc/init.d/cf-serverd"
+	fi
+}
+
+pkg_config() {
+	if [ "${ROOT}" == "/" ]; then
+		if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
+			einfo "Generating keys for localhost."
+			/usr/sbin/cf-key
+		fi
+	else
+		die "cfengine cfkey does not support any value of ROOT other than /."
+	fi
+}

diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 2227fcb..488b66f 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,6 +1,3 @@
------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 c19d8ff89a9f4e5ad7f68a9139599ea0325a3dfb SHA1 8eaf29efdf3a3cc128622a4b38e2a3f79d1de232 SHA256 633465d58396b55029810ac208eec5f3a4f724fd2841391bf1feed5307196141
@@ -16,19 +13,8 @@ AUX cfportage.README 2294 RMD160 05c285d3b79e266ac6229985b2fdbab1b7841752 SHA1 7
 AUX cfservd.rc6 259 RMD160 8390afb5b3cf7ffbe0b74766ddf3f9d05c4d5b6c SHA1 c1fc1ccf15789c8acfc3857481ed69dc7f9b6d2b SHA256 892e9537c9b75861031a0755af886b2b931e1ca4dd2589847a2bacf00862de0f
 DIST cfengine-2.2.10.tar.gz 2690333 RMD160 67fd3dc80270dc000887e3dbf26f372338e2600f SHA1 032bec0bc59ffee7179422e96dfd902afbf94340 SHA256 f34697cc52e1342c5ec4b45a4adf9fbffdfa05a68bdc7c53382f72d03e106783
 DIST cfengine-3.0.5p1.tar.gz 1517992 RMD160 909ee306cdbd0e674fbdb54ddcbca66b0cc5213b SHA1 bc7cc5fbc6c9a973f2f74c45e6835934230b6d63 SHA256 38a389969ff095775e206df24b0fbc66ae30fa404d92dcb26b94a568e790610b
-EBUILD cfengine-2.2.10-r3.ebuild 3113 RMD160 2f9c3d613e0b47d92084702e870bf22e7b9430a6 SHA1 fd7066de09810f8659834d790eb1953c98e48b47 SHA256 bc5c3bb658ff03441ecc378542026203f3ac0b4d028c071fa7af7de64efbe320
+EBUILD cfengine-2.2.10-r3.ebuild 2650 RMD160 0e76b604929241f7ba0d0beadc54a11ee8a32d1d SHA1 1019205a7b0442c9cdb18aa4c5d5d183f2ee4594 SHA256 443194f25a9e0106abf3efd49cb6418cd267dd55daf1abf3d8fa0a3ad2d1a95d
 EBUILD cfengine-2.2.10.ebuild 2720 RMD160 f79ad7c72b4ceac12a0323434b3797c4dbc1f3cb SHA1 cddf8f46bd13c6d1c83bddbcdff56673151f6104 SHA256 6b20bf4737274d6bfbe519dd717a4b19f689296accb431e7b0dae6b16e41a34d
-EBUILD cfengine-3.0.5_p1-r2.ebuild 4294 RMD160 03dd1ef6331e5fd6e45d3b013367bccfe28f665f SHA1 c1862b48d5014eb658f66a057835dbc0db674ade SHA256 24585d554ef4334417f3517d3578dcd036f469c5f508a88c9fa0b02777e783f8
+EBUILD cfengine-3.0.5_p1-r3.ebuild 4294 RMD160 03dd1ef6331e5fd6e45d3b013367bccfe28f665f SHA1 c1862b48d5014eb658f66a057835dbc0db674ade SHA256 24585d554ef4334417f3517d3578dcd036f469c5f508a88c9fa0b02777e783f8
 MISC ChangeLog 18764 RMD160 a9ac39530dba1a65eeb2fe2f77661a2e3f4c41d3 SHA1 3d52b36ac967a34dae0a496f7322e027d90e6447 SHA256 b53dbd0f403b3ec5af38caa4fdf2d9fe1e0978008a3eba67ec5a6d0d271a0335
 MISC metadata.xml 2646 RMD160 2c51382fec40e084a1ef7372505399d079fcedfb SHA1 51acdf2de92d83b818d56a326511a03a5d8a1689 SHA256 f78868dec97c0018b6b59a05e85153a76e44526b65aa77820d8ce9c2cdcf857e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQEcBAEBAgAGBQJMydP8AAoJEMOx0zmdw4Z1/50H/1gnCzDK/NvC4nsQlKF2wqrF
-sDyLqeJVvx1ivwvTT+QiRWiNjZu4jb56WdTTFEFg0trOnn6w3M50H0qzdchk6Tmg
-PSRFfDzJElZh9usxhFvix5+Yux8FxiKNwTvTU0NnFKDFcQGXpXf1Re7caV6+/2Mr
-x/tCeNY105k5B6NNujaRTMpo6SpEBx19r7q0X+OkXKlvqjK905OHx3TmwnZMYP6W
-QmnyuFWB+bBjzbGSRZ3zGAGsKAhYfIDyunfSloQiePNQ5ZQxvbbz4xRpd4QY/fpH
-N3fQ9cpigpIk9U6Sk1yaKf6ISAO2tKSjd+F+VlgWQ8dzinT9jJnVlfGeF0xblBA=
-=NHIM
------END PGP SIGNATURE-----
diff --git a/net-misc/cfengine/cfengine-2.2.10-r3.ebuild b/net-misc/cfengine/cfengine-2.2.10-r3.ebuild
index d2bd383..1fefc4f 100644
--- a/net-misc/cfengine/cfengine-2.2.10-r3.ebuild
+++ b/net-misc/cfengine/cfengine-2.2.10-r3.ebuild
@@ -31,25 +31,10 @@ src_prepare() {
 		"${FILESDIR}/${P}-snprintf_buffer_overflow.patch"
 }
 
-src_configure() {
-	# Enforce /var/cfengine for historical compatibility
-	econf \
-		--with-workdir=/var/cfengine \
-		--with-berkeleydb=/usr
-
-	# 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
-}
-
 src_install() {
 	newinitd "${FILESDIR}"/cfservd.rc6 cfservd || die
 	newinitd "${FILESDIR}"/cfenvd.rc6 cfenvd || die
-	newinitd "${FILESDIR}"/cfexecd.rc6 cfexecd || die
+	test123nitd "${FILESDIR}"/cfexecd.rc6 cfexecd || die
 
 	make DESTDIR="${D}" install || die
 
diff --git a/net-misc/cfengine/cfengine-3.0.5_p1-r2.ebuild b/net-misc/cfengine/cfengine-3.0.5_p1-r2.ebuild
deleted file mode 100644
index f214c92..0000000
--- a/net-misc/cfengine/cfengine-3.0.5_p1-r2.ebuild
+++ /dev/null
@@ -1,158 +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-3.0.5_p1-r2.ebuild,v 1.1 2010/10/28 19:39:02 idl0r Exp $
-
-EAPI="3"
-
-inherit eutils autotools
-
-MY_PV="${PV//_beta/b}"
-MY_PV="${MY_PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-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/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="3"
-KEYWORDS="~amd64 ~s390 ~x86"
-
-IUSE="examples gd graphviz html ldap libvirt mysql pcre postgres qdbm selinux tests tokyocabinet vim-syntax"
-
-DEPEND=">=sys-libs/db-4
-	gd? ( media-libs/gd )
-	graphviz? ( media-gfx/graphviz )
-	ldap? ( net-nds/openldap )
-	libvirt? ( app-emulation/libvirt )
-	mysql? ( virtual/mysql )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql-base )
-	selinux? ( sys-libs/libselinux )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	qdbm? ( dev-db/qdbm )
-	!tokyocabinet? ( !qdbm? ( >=sys-libs/db-4 ) )
-	>=dev-libs/openssl-0.9.7"
-RDEPEND="${DEPEND}"
-PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-configure.ac.patch"
-	epatch "${FILESDIR}/${P}-Makefile.am.patch"
-	epatch "${FILESDIR}/${P}-regex.c.patch"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use mysql || use postgres ; then
-		myconf="--with-sql"
-	else
-		myconf="--without-sql"
-	fi
-
-	if ! use qdbm && ! use tokyocabinet; then
-		myconf="${myconf} --with-berkeleydb=/usr"
-	fi
-
-	# Enforce /var/cfengine for historical compatibility
-	econf \
-		--docdir=/usr/share/doc/"${PF}" \
-		--with-workdir=/var/cfengine \
-		${myconf} \
-		$(use_with gd) \
-		$(use_with graphviz) \
-		$(use_with ldap) \
-		$(use_with libvirt) \
-		$(use_with pcre) \
-		$(use_with qdbm) \
-		$(use_enable selinux) \
-		$(use_with tokyocabinet)
-
-	# Fix Makefile to skip inputs, see below "examples"
-	sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
-
-	# We install documentation through portage
-	sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
-
-	if use tests; then
-		# Fix Makefiles to install tests in correct directory
-		for i in file_masters file_operands units ; do
-			sed -i -e "s/\(docdir.*\) =.*/\1 = \/usr\/share\/doc\/${PF}\/tests\/${i}/" \
-				tests/${i}/Makefile || die
-		done
-	else
-		sed -i -e 's/\(SUBDIRS =\).*/\1/' tests/Makefile || die
-	fi
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die
-	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
-	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
-
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO INSTALL
-
-	if use examples; then
-		docinto examples
-		dodoc inputs/*.cf || die
-	fi
-
-	# Create cfengine working directory
-	dodir /var/cfengine/bin
-	fperms 700 /var/cfengine
-
-	# 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.
-	for bin in know promises agent monitord serverd execd runagent key report; do
-		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
-	done
-
-	if use html; then
-		docinto html
-		dohtml -r docs/ || die
-	fi
-}
-
-pkg_postinst() {
-	echo
-	einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided."
-	einfo
-	einfo "To run cfengine out of cron every half hour modify your crontab:"
-	einfo "0,30 * * * *    /usr/sbin/cf-execd -F"
-	echo
-
-	elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:"
-	elog "emerge --config ${CATEGORY}/${PN}"
-
-	# Fix old cf-servd, remove it after some releases.
-	local found=0
-	for fname in $(find /etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
-		found=1
-		rm $fname
-		ln -s /etc/init.d/cf-serverd $(echo $fname | sed 's:cf-servd:cf-serverd:')
-	done
-
-	if [ "${found}" -eq 1 ]; then
-		echo
-		elog "/etc/init.d/cf-servd has been renamed to /etc/init.d/cf-serverd"
-	fi
-}
-
-pkg_config() {
-	if [ "${ROOT}" == "/" ]; then
-		if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
-			einfo "Generating keys for localhost."
-			/usr/sbin/cf-key
-		fi
-	else
-		die "cfengine cfkey does not support any value of ROOT other than /."
-	fi
-}
diff --git a/net-misc/cfengine/cfengine-3.0.5_p1-r3.ebuild b/net-misc/cfengine/cfengine-3.0.5_p1-r3.ebuild
new file mode 100644
index 0000000..f214c92
--- /dev/null
+++ b/net-misc/cfengine/cfengine-3.0.5_p1-r3.ebuild
@@ -0,0 +1,158 @@
+# 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-3.0.5_p1-r2.ebuild,v 1.1 2010/10/28 19:39:02 idl0r Exp $
+
+EAPI="3"
+
+inherit eutils autotools
+
+MY_PV="${PV//_beta/b}"
+MY_PV="${MY_PV/_p/p}"
+MY_P="${PN}-${MY_PV}"
+
+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/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="3"
+KEYWORDS="~amd64 ~s390 ~x86"
+
+IUSE="examples gd graphviz html ldap libvirt mysql pcre postgres qdbm selinux tests tokyocabinet vim-syntax"
+
+DEPEND=">=sys-libs/db-4
+	gd? ( media-libs/gd )
+	graphviz? ( media-gfx/graphviz )
+	ldap? ( net-nds/openldap )
+	libvirt? ( app-emulation/libvirt )
+	mysql? ( virtual/mysql )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql-base )
+	selinux? ( sys-libs/libselinux )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	qdbm? ( dev-db/qdbm )
+	!tokyocabinet? ( !qdbm? ( >=sys-libs/db-4 ) )
+	>=dev-libs/openssl-0.9.7"
+RDEPEND="${DEPEND}"
+PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-configure.ac.patch"
+	epatch "${FILESDIR}/${P}-Makefile.am.patch"
+	epatch "${FILESDIR}/${P}-regex.c.patch"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use mysql || use postgres ; then
+		myconf="--with-sql"
+	else
+		myconf="--without-sql"
+	fi
+
+	if ! use qdbm && ! use tokyocabinet; then
+		myconf="${myconf} --with-berkeleydb=/usr"
+	fi
+
+	# Enforce /var/cfengine for historical compatibility
+	econf \
+		--docdir=/usr/share/doc/"${PF}" \
+		--with-workdir=/var/cfengine \
+		${myconf} \
+		$(use_with gd) \
+		$(use_with graphviz) \
+		$(use_with ldap) \
+		$(use_with libvirt) \
+		$(use_with pcre) \
+		$(use_with qdbm) \
+		$(use_enable selinux) \
+		$(use_with tokyocabinet)
+
+	# Fix Makefile to skip inputs, see below "examples"
+	sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
+
+	# We install documentation through portage
+	sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
+
+	if use tests; then
+		# Fix Makefiles to install tests in correct directory
+		for i in file_masters file_operands units ; do
+			sed -i -e "s/\(docdir.*\) =.*/\1 = \/usr\/share\/doc\/${PF}\/tests\/${i}/" \
+				tests/${i}/Makefile || die
+		done
+	else
+		sed -i -e 's/\(SUBDIRS =\).*/\1/' tests/Makefile || die
+	fi
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die
+	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
+	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
+
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO INSTALL
+
+	if use examples; then
+		docinto examples
+		dodoc inputs/*.cf || die
+	fi
+
+	# Create cfengine working directory
+	dodir /var/cfengine/bin
+	fperms 700 /var/cfengine
+
+	# 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.
+	for bin in know promises agent monitord serverd execd runagent key report; do
+		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
+	done
+
+	if use html; then
+		docinto html
+		dohtml -r docs/ || die
+	fi
+}
+
+pkg_postinst() {
+	echo
+	einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided."
+	einfo
+	einfo "To run cfengine out of cron every half hour modify your crontab:"
+	einfo "0,30 * * * *    /usr/sbin/cf-execd -F"
+	echo
+
+	elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:"
+	elog "emerge --config ${CATEGORY}/${PN}"
+
+	# Fix old cf-servd, remove it after some releases.
+	local found=0
+	for fname in $(find /etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
+		found=1
+		rm $fname
+		ln -s /etc/init.d/cf-serverd $(echo $fname | sed 's:cf-servd:cf-serverd:')
+	done
+
+	if [ "${found}" -eq 1 ]; then
+		echo
+		elog "/etc/init.d/cf-servd has been renamed to /etc/init.d/cf-serverd"
+	fi
+}
+
+pkg_config() {
+	if [ "${ROOT}" == "/" ]; then
+		if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
+			einfo "Generating keys for localhost."
+			/usr/sbin/cf-key
+		fi
+	else
+		die "cfengine cfkey does not support any value of ROOT other than /."
+	fi
+}



Navigation:
Lists: gentoo-test: < Prev By Thread Next > < Prev By Date Next >
Previous by thread:
proj/gitolite-gentoo commit in <fillme>: net-misc/cfengine/Manifest net-misc/cfengine/cfengine-2.2.10-r3.ebuild net-misc/cfengine/cfengine-3.0.5_p1-r2.ebuild net-misc/cfengine/cfengine-3.0.5_p1-r3.ebuild
Next by thread:
proj/gitolite-gentoo commit in <fillme>: cfengine-2.2.10-r3.ebuild cfengine-3.0.5_p1-r2.ebuild cfengine-3.0.5_p1-r3.ebuild
Previous by date:
proj/gitolite-gentoo commit in <fillme>: net-misc/cfengine/Manifest net-misc/cfengine/cfengine-2.2.10-r3.ebuild net-misc/cfengine/cfengine-3.0.5_p1-r2.ebuild net-misc/cfengine/cfengine-3.0.5_p1-r3.ebuild
Next by date:
proj/gitolite-gentoo commit in <fillme>: cfengine-2.2.10-r3.ebuild cfengine-3.0.5_p1-r2.ebuild cfengine-3.0.5_p1-r3.ebuild


Updated Feb 03, 2011

Summary: Archive of the gentoo-test mailing list.

Donate to support our development efforts.

Copyright 2001-2013 Gentoo Foundation, Inc. Questions, Comments? Contact us.