[gentoo-commits] gentoo-x86 commit in net-misc/cfengine: cfengine-2.2.10-r3.ebuild cfengine-3.2.0.ebuild ChangeLog cfengine-3.1.4.ebuild cfengine-3.1.5.ebuild

[Christian Ruppert (idl0r)]

idl0r       11/08/30 17:11:03

  Modified:             cfengine-2.2.10-r3.ebuild ChangeLog
                        cfengine-3.1.4.ebuild cfengine-3.1.5.ebuild
  Added:                cfengine-3.2.0.ebuild
  Log:
  Version bump to 3.2.0. Fix SRC_URI.
  
  (Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

Revision  Changes    Path
1.6                  net-misc/cfengine/cfengine-2.2.10-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/cfengine-2.2.10-r3.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/cfengine-2.2.10-r3.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/cfengine-2.2.10-r3.ebuild?r1=1.5&r2=1.6

Index: cfengine-2.2.10-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.2.10-r3.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cfengine-2.2.10-r3.ebuild	10 Jan 2011 21:23:21 -0000	1.5
+++ cfengine-2.2.10-r3.ebuild	30 Aug 2011 17:11:03 -0000	1.6
@@ -1,6 +1,6 @@
 # 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-2.2.10-r3.ebuild,v 1.5 2011/01/10 21:23:21 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.2.10-r3.ebuild,v 1.6 2011/08/30 17:11:03 idl0r Exp $
 
 EAPI="2"
 
@@ -9,7 +9,7 @@
 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"
+SRC_URI="http://cfengine.com/source_code/download?file=${P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"



1.137                net-misc/cfengine/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/ChangeLog?rev=1.137&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/ChangeLog?rev=1.137&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/ChangeLog?r1=1.136&r2=1.137

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- ChangeLog	3 May 2011 23:16:33 -0000	1.136
+++ ChangeLog	30 Aug 2011 17:11:03 -0000	1.137
@@ -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.136 2011/05/03 23:16:33 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.137 2011/08/30 17:11:03 idl0r Exp $
+
+*cfengine-3.2.0 (30 Aug 2011)
+
+  30 Aug 2011; Christian Ruppert <idl0r@g.o> cfengine-2.2.10-r3.ebuild,
+  cfengine-3.1.4.ebuild, cfengine-3.1.5.ebuild, +cfengine-3.2.0.ebuild:
+  Version bump to 3.2.0. Fix SRC_URI.
 
 *cfengine-3.1.5 (03 May 2011)
 



1.6                  net-misc/cfengine/cfengine-3.1.4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/cfengine-3.1.4.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/cfengine-3.1.4.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/cfengine-3.1.4.ebuild?r1=1.5&r2=1.6

Index: cfengine-3.1.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.4.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cfengine-3.1.4.ebuild	25 Apr 2011 14:30:17 -0000	1.5
+++ cfengine-3.1.4.ebuild	30 Aug 2011 17:11:03 -0000	1.6
@@ -1,6 +1,6 @@
 # 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.5 2011/04/25 14:30:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.4.ebuild,v 1.6 2011/08/30 17:11:03 idl0r Exp $
 
 EAPI="3"
 
@@ -11,7 +11,7 @@
 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"
+SRC_URI="http://cfengine.com/source_code/download?file=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="3"



1.2                  net-misc/cfengine/cfengine-3.1.5.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/cfengine-3.1.5.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/cfengine-3.1.5.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/cfengine-3.1.5.ebuild?r1=1.1&r2=1.2

Index: cfengine-3.1.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.5.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cfengine-3.1.5.ebuild	3 May 2011 23:16:33 -0000	1.1
+++ cfengine-3.1.5.ebuild	30 Aug 2011 17:11:03 -0000	1.2
@@ -1,6 +1,6 @@
 # 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.5.ebuild,v 1.1 2011/05/03 23:16:33 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.5.ebuild,v 1.2 2011/08/30 17:11:03 idl0r Exp $
 
 EAPI="3"
 
@@ -11,7 +11,7 @@
 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"
+SRC_URI="http://cfengine.com/source_code/download?file=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="3"



1.1                  net-misc/cfengine/cfengine-3.2.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/cfengine-3.2.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/cfengine-3.2.0.ebuild?rev=1.1&content-type=text/plain

Index: cfengine-3.2.0.ebuild
===================================================================
# 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.2.0.ebuild,v 1.1 2011/08/30 17:11:03 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://cfengine.com/source_code/download?file=${MY_P}.tar.gz -> ${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 html mysql postgres qdbm selinux tests tokyocabinet vim-syntax"

# libvirt? ( app-emulation/libvirt )
DEPEND=">=sys-libs/db-4
	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...
	# sqlite3 has been added but stated as experimental/broken...
	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 postgres postgresql) \
		$(use_with mysql) \
		$(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
}

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 README INSTALL

	if ! use examples; then
		rm -rf "${D}"/usr/share/doc/${PF}/example*
	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
}