From d6cce2554ad8d8c5edc92dc81c708654018d3fad Mon Sep 17 00:00:00 2001 From: Christian Ruppert Date: Mon, 31 Jan 2011 21:28:30 +0000 Subject: Version bump to 3.1.4. (Portage version: 2.2.0_alpha19/cvs/Linux x86_64) --- net-misc/cfengine/ChangeLog | 8 +- net-misc/cfengine/cfengine-3.1.3.ebuild | 156 -------------------------------- net-misc/cfengine/cfengine-3.1.4.ebuild | 156 ++++++++++++++++++++++++++++++++ 3 files changed, 163 insertions(+), 157 deletions(-) delete mode 100644 net-misc/cfengine/cfengine-3.1.3.ebuild create mode 100644 net-misc/cfengine/cfengine-3.1.4.ebuild (limited to 'net-misc/cfengine') diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog index 455767078f8d..497ca83ed367 100644 --- a/net-misc/cfengine/ChangeLog +++ b/net-misc/cfengine/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/cfengine # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.126 2011/01/30 20:39:29 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.127 2011/01/31 21:28:30 idl0r Exp $ + +*cfengine-3.1.4 (31 Jan 2011) + + 31 Jan 2011; Christian Ruppert -cfengine-3.1.3.ebuild, + +cfengine-3.1.4.ebuild: + Version bump to 3.1.4. 30 Jan 2011; Christian Ruppert cfengine-3.1.2.ebuild, cfengine-3.1.3.ebuild: diff --git a/net-misc/cfengine/cfengine-3.1.3.ebuild b/net-misc/cfengine/cfengine-3.1.3.ebuild deleted file mode 100644 index 596bd76b5263..000000000000 --- a/net-misc/cfengine/cfengine-3.1.3.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.3.ebuild,v 1.5 2011/01/30 20:39:30 idl0r Exp $ - -EAPI="3" - -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 ~arm ~ppc ~s390 ~sparc ~x86" - -# libvirt disabled for now because it blocks stabilization etc. -IUSE="examples gd graphviz html ldap mysql postgres qdbm selinux tests tokyocabinet vim-syntax" - -# libvirt? ( app-emulation/libvirt ) -DEPEND=">=sys-libs/db-4 - gd? ( media-libs/gd ) - graphviz? ( media-gfx/graphviz ) - ldap? ( net-nds/openldap ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql-base ) - selinux? ( sys-libs/libselinux ) - tokyocabinet? ( dev-db/tokyocabinet ) - !tokyocabinet? ( qdbm? ( dev-db/qdbm ) ) - !tokyocabinet? ( !qdbm? ( >=sys-libs/db-4 ) ) - >=dev-libs/openssl-0.9.7 - dev-libs/libpcre" -RDEPEND="${DEPEND}" -PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - local myconf - - if use mysql || use postgres ; then - myconf="--with-sql" - else - myconf="--without-sql" - fi - - # BDB by default, prefer tokyocabinet above qdbm... - if ! use qdbm && ! use tokyocabinet; then - myconf="${myconf} --with-berkeleydb=/usr" - elif use qdbm && use tokyocabinet; then - elog "QDBM and Tokyo Cabinet can't be used together, using Tokyo Cabinet by default" - myconf="${myconf} --with-tokyocabinet" - elif use qdbm && ! use tokyocabinet; then - myconf="${myconf} --with-qdbm" - elif ! use qdbm && use tokyocabinet; then - myconf="${myconf} --with-tokyocabinet" - fi - - # Enforce /var/cfengine for historical compatibility - # $(use_with libvirt) \ - econf \ - --docdir=/usr/share/doc/"${PF}" \ - --with-workdir=/var/cfengine \ - --with-pcre \ - ${myconf} \ - $(use_with gd) \ - $(use_with graphviz) \ - $(use_with ldap) \ - $(use_enable selinux) - - # 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.1.4.ebuild b/net-misc/cfengine/cfengine-3.1.4.ebuild new file mode 100644 index 000000000000..3d2f1b759832 --- /dev/null +++ b/net-misc/cfengine/cfengine-3.1.4.ebuild @@ -0,0 +1,156 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.4.ebuild,v 1.1 2011/01/31 21:28:30 idl0r Exp $ + +EAPI="3" + +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 ~arm ~ppc ~s390 ~sparc ~x86" + +# libvirt disabled for now because it blocks stabilization etc. +IUSE="examples gd graphviz html ldap mysql postgres qdbm selinux tests tokyocabinet vim-syntax" + +# libvirt? ( app-emulation/libvirt ) +DEPEND=">=sys-libs/db-4 + gd? ( media-libs/gd ) + graphviz? ( media-gfx/graphviz ) + ldap? ( net-nds/openldap ) + mysql? ( virtual/mysql ) + postgres? ( dev-db/postgresql-base ) + selinux? ( sys-libs/libselinux ) + tokyocabinet? ( dev-db/tokyocabinet ) + !tokyocabinet? ( qdbm? ( dev-db/qdbm ) ) + !tokyocabinet? ( !qdbm? ( >=sys-libs/db-4 ) ) + >=dev-libs/openssl-0.9.7 + dev-libs/libpcre" +RDEPEND="${DEPEND}" +PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )" + +S="${WORKDIR}/${MY_P}" + +src_configure() { + local myconf + + if use mysql || use postgres ; then + myconf="--with-sql" + else + myconf="--without-sql" + fi + + # BDB by default, prefer tokyocabinet above qdbm... + if ! use qdbm && ! use tokyocabinet; then + myconf="${myconf} --with-berkeleydb=/usr" + elif use qdbm && use tokyocabinet; then + elog "QDBM and Tokyo Cabinet can't be used together, using Tokyo Cabinet by default" + myconf="${myconf} --with-tokyocabinet" + elif use qdbm && ! use tokyocabinet; then + myconf="${myconf} --with-qdbm" + elif ! use qdbm && use tokyocabinet; then + myconf="${myconf} --with-tokyocabinet" + fi + + # Enforce /var/cfengine for historical compatibility + # $(use_with libvirt) \ + econf \ + --docdir=/usr/share/doc/"${PF}" \ + --with-workdir=/var/cfengine \ + --with-pcre \ + ${myconf} \ + $(use_with gd) \ + $(use_with graphviz) \ + $(use_with ldap) \ + $(use_enable selinux) + + # 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 +} -- cgit v1.2.3-65-gdbad