Add vim-syntax PDEPEND per #152275

(Portage version: 2.1.7.16/cvs/Linux x86_64)

3 files changed, 108 insertions, 3 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index 7dbfb21ce64f..fcb606c6091b 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,12 @@
 # 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.97 2010/03/07 21:57:54 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.98 2010/03/07 22:23:15 ramereth Exp $
+
+*cfengine-2.2.10-r1 (07 Mar 2010)
+
+  07 Mar 2010; Lance Albertson <ramereth@gentoo.org>
+  +cfengine-2.2.10-r1.ebuild, cfengine-3.0.4.ebuild:
+  Add vim-syntax PDEPEND per #152275
 
 *cfengine-3.0.4 (07 Mar 2010)
 
diff --git a/net-misc/cfengine/cfengine-2.2.10-r1.ebuild b/net-misc/cfengine/cfengine-2.2.10-r1.ebuild
new file mode 100644
index 000000000000..45e19697e5e8
--- /dev/null
+++ b/net-misc/cfengine/cfengine-2.2.10-r1.ebuild
@@ -0,0 +1,98 @@
+# 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.2.10-r1.ebuild,v 1.1 2010/03/07 22:23:15 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/tarballs/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86"
+IUSE="vim-syntax"
+
+DEPEND=">=sys-libs/db-4
+	>=dev-libs/openssl-0.9.7
+	app-portage/portage-utils"
+RDEPEND="${DEPEND}"
+PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
+
+src_configure() {
+	# 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
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/cfservd.rc6 cfservd
+	newinitd "${FILESDIR}"/cfenvd.rc6 cfenvd
+	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
+	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-3.0.4.ebuild b/net-misc/cfengine/cfengine-3.0.4.ebuild
index ccdf3ad3552b..fe417318d2d4 100644
--- a/net-misc/cfengine/cfengine-3.0.4.ebuild
+++ b/net-misc/cfengine/cfengine-3.0.4.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.1 2010/03/07 21:57:54 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.0.4.ebuild,v 1.2 2010/03/07 22:23:15 ramereth Exp $
 
 EAPI="2"
 
@@ -17,7 +17,7 @@ SRC_URI="http://www.cfengine.org/tarballs/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86"
-IUSE="mysql postgres selinux"
+IUSE="mysql postgres selinux vim-syntax"
 
 DEPEND=">=sys-libs/db-4
 	>=dev-libs/openssl-0.9.7
@@ -26,6 +26,7 @@ DEPEND=">=sys-libs/db-4
 	postgres? ( virtual/postgresql-base )
 	app-portage/portage-utils"
 RDEPEND="${DEPEND}"
+PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
 S="${WORKDIR}/${MY_P}"
 
 src_configure() {