Add vim-syntax PDEPEND per #152275

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

4 files changed, 114 insertions, 8 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/Manifest b/net-misc/cfengine/Manifest
index da1d4c7f6387..f552c45917c3 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -19,16 +19,17 @@ DIST cfengine-2.2.10.tar.gz 2690333 RMD160 67fd3dc80270dc000887e3dbf26f372338e26
 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
 EBUILD cfengine-2.1.22-r2.ebuild 2544 RMD160 2c136ba13744c57d6e3735a8d6920a96ec207bae SHA1 10118a326a26378db15539b0757bcf479575a077 SHA256 b1144f77d16ce5ddb9609671694fc3e2946ccd68ac6f92be457f5bb70946c146
+EBUILD cfengine-2.2.10-r1.ebuild 2789 RMD160 854c9b7b3c9266ee96aa18ec855dd8324e8312f7 SHA1 f3fe58ce6c3da77aa5800190a19d4fc8b126840a SHA256 46c1027a79e6582689b516be00a35b73490f1ec91f6d74017f44ae137508189e
 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 2919 RMD160 19514897d84cd82133d993d9b8f288f14d8e4213 SHA1 063c8803966397c3cc3bbffd528daa9a97ab0212 SHA256 f2ae0e0bfc2e190c4f3aadb6dafc70182bef151a4c1cd4e4f51dd7db6b1583aa
-MISC ChangeLog 15613 RMD160 ba0bc85b79a9dbdefadbf6253428bce8ed6e3360 SHA1 d6a8175796ae1e34ee88c2f1cb9428a81041df09 SHA256 f09a1ff9b91f18786049482965c412b9410b58c3d1331a9d1a658d9f995db3ba
+EBUILD cfengine-3.0.4.ebuild 2980 RMD160 9a3f34ba4c6d4caca3f2d88408ed884caf4c02bc SHA1 3afa99fc4b8228ba23e3ea5ee4918146df47a847 SHA256 76374b301fa4ac5f249d75c4460cd6cbe66cc06e9987973bbc8bf4bc6a7424fa
+MISC ChangeLog 15792 RMD160 0a54e36f0d16909e980e0d4c04a3f467fa50702d SHA1 44cf2b7cb82b5e658170edee1831e7031a6704ae SHA256 883e5e0fbac419548af1d797c947040ddd2deee7d4fbbcdeec1dbafe4283ebd2
 MISC metadata.xml 1778 RMD160 a2f0a0604ba979552761a74b22c0f5fd74d2b7b7 SHA1 88909229ff2a2773d58ff91499bd2272eca34499 SHA256 e39a880a0da5fdeb4f9a0548a99b1ff5ead65d12442c9de16db2776afdbd09a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iD8DBQFLlCDlQW+hXSf0t0IRAuCBAJ0RszR3JF9XCTXorGPyBeg2IQTOXgCgkxp4
-PXgg/2gECEVKa46bgkExk6U=
-=B1dl
+iD8DBQFLlCbXQW+hXSf0t0IRAmKKAJ9zO/TrGdR3BZhYvbjQpg/Y7lj61wCdHoHx
+iWsMnGf+TkWsTtiZNpWRK/E=
+=zBfU
 -----END PGP SIGNATURE-----
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() {