Add cfengine-3.0.5_p1. Add several new useflags. Fix configure.ac to allow the use of configure switches properly. Some QA fixes.

(Portage version: 2.2_rc72/cvs/Linux x86_64)

4 files changed, 550 insertions, 1 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index 380db40a4ca2..1fa8872c777a 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,13 @@
 # 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.104 2010/08/29 10:57:19 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.105 2010/09/01 20:23:20 idl0r Exp $
+
+*cfengine-3.0.5_p1 (01 Sep 2010)
+
+  01 Sep 2010; Christian Ruppert <idl0r@gentoo.org> +cfengine-3.0.5_p1.ebuild,
+  +files/cfengine-3.0.5_p1-configure.ac.patch, metadata.xml:
+  Add cfengine-3.0.5_p1. Add several new useflags. Fix configure.ac to allow
+  the use of configure switches properly. Some QA fixes.
 
   29 Aug 2010; Christian Ruppert <idl0r@gentoo.org> cfengine-3.0.4.ebuild,
   cfengine-3.0.5.ebuild:
diff --git a/net-misc/cfengine/cfengine-3.0.5_p1.ebuild b/net-misc/cfengine/cfengine-3.0.5_p1.ebuild
new file mode 100644
index 000000000000..19c2b871809a
--- /dev/null
+++ b/net-misc/cfengine/cfengine-3.0.5_p1.ebuild
@@ -0,0 +1,132 @@
+# 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.ebuild,v 1.1 2010/09/01 20:23:20 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 ~arm ~ppc ~s390 ~sparc ~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"
+	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-servd || die
+	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
+	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
+
+	make 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/$bin || die
+	done
+
+	if use html; then
+		docinto html
+		dohtml -r docs/ || die
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	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"
+	einfo
+
+	elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:"
+	elog "/usr/sbin/cf-key"
+}
diff --git a/net-misc/cfengine/files/cfengine-3.0.5_p1-configure.ac.patch b/net-misc/cfengine/files/cfengine-3.0.5_p1-configure.ac.patch
new file mode 100644
index 000000000000..e746f51c4e9b
--- /dev/null
+++ b/net-misc/cfengine/files/cfengine-3.0.5_p1-configure.ac.patch
@@ -0,0 +1,396 @@
+diff --git a/configure.ac b/configure.ac
+index 64b2a13..09821a5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -84,13 +84,9 @@ AC_CHECK_LIB(m,main)
+ 
+ dnl Look for ldap
+ 
+-AC_ARG_WITH(ldap,
+-	AS_HELP_STRING(--without-ldap, [support ldap functions]),with_ldap=no,
+-	with_ldap=yes)
+-
+-if test "x$with_ldap" != xno; then
+-   AC_CHECK_LIB(ldap,ldap_get_values_len)
+-fi
++AC_ARG_WITH([ldap],
++    [AS_HELP_STRING([--without-ldap], [support ldap functions])])
++AS_IF([test "x$with_ldap" = "xyes"], [AC_CHECK_LIB([ldap], [ldap_get_values_len])])
+ 
+ dnl Now check for database connectors
+ 
+@@ -99,15 +95,9 @@ dnl ######################################################################
+ dnl  Look for SQL connectors.
+ dnl ######################################################################
+ 
+-AC_ARG_WITH(sql,
+-	AS_HELP_STRING(--with-sql, [support database functions]), ,
+-	with_sql=check)
+-
+-if test "x$with_sql" != xno; then
+-   WITH_SQL=1
+-else
+-   WITH_SQL=0
+-fi
++AC_ARG_WITH([sql],
++    [AS_HELP_STRING([--with-sql], [support database functions])])
++AS_IF([test "x$with_sql" = "xyes"], [WITH_SQL=1], [WITH_SQL=0])
+ 
+ if test $WITH_SQL = 1; then
+   case "$target_os" in
+@@ -124,31 +114,17 @@ if test $WITH_SQL = 1; then
+ fi
+ 
+ 
+-AC_ARG_WITH(nova,
+-	AS_HELP_STRING(--without-nova, [support some graphic functions]),with_nova=no,
+-	with_nova=yes)
+-
+-if test "x$with_nova" != xno; then
+-   AC_CHECK_LIB(cfnova,main)
+-fi
++AC_ARG_WITH([nova],
++    [AS_HELP_STRING([--without-nova], [support some graphic functions])])
++AS_IF([test "x$with_nova" = "xyes"], [AC_CHECK_LIB([cfnova], [main])])
+ 
+-AC_ARG_WITH(constellation,
+-	AS_HELP_STRING(--without-constellation, [support some graphic functions]),with_constellation=no,
+-	with_constellation=yes)
++AC_ARG_WITH([constellation],
++    [AS_HELP_STRING([--without-constellation], [support some graphic functions])])
++AS_IF([test "x$with_constellation" == "xyes"], [AC_CHECK_LIB([cfconstellation], [main])])
+ 
+-if test "x$with_constellation" != xno; then
+-   AC_CHECK_LIB(cfconstellation,main)
+-
+-fi
+-
+-AC_ARG_WITH(galaxy,
+-	AS_HELP_STRING(--without-galaxy, [support some graphic functions]),with_galaxy=no,
+-	with_galaxy=yes)
+-
+-if test "x$with_galaxy" != xno; then
+-   AC_CHECK_LIB(cfgalaxy,main)
+-
+-fi
++AC_ARG_WITH([galaxy],
++    [AS_HELP_STRING([--without-galaxy], [support some graphic functions])])
++AS_IF([test "x$with_galaxy" = "xyes"], [AC_CHECK_LIB([cfgalaxy], [main])])
+ 
+ AC_CHECK_FUNC(door_create,door)
+ AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
+@@ -162,18 +138,12 @@ dnl
+ dnl Choose a database
+ dnl
+ 
+-AC_ARG_WITH(tokyocabinet,
+-	AS_HELP_STRING(--with-tokyocabinet, [support database functions]),with_tokyo=yes,
+-	with_tokyo=no)
+-
+-if test "x$with_tokyo" = xyes; then
+-   AC_MSG_CHECKING(for TokyoCabinet)
+-   WITH_TOKYO=1
+-else
+-   WITH_TOKYO=0
+-fi
++AC_ARG_WITH([tokyocabinet],
++    [AS_HELP_STRING([--with-tokyocabinet], [support database functions])])
++AS_IF([test "x$with_tokyocabinet" = "xyes"], [WITH_TOKYO=1], [WITH_TOKYO=0])
+ 
+ if test $WITH_TOKYO = 1; then
++  AC_MSG_CHECKING(for TokyoCabinet)
+   AC_CHECK_LIB(tokyocabinet,main, [], [AC_MSG_ERROR(Cannot find Tokyo Cabinet)])
+   AC_CHECK_HEADERS(tcutil.h)
+   AC_CHECK_HEADERS(tchdb.h)
+@@ -182,18 +152,12 @@ fi
+ 
+ dnl else qdbm?
+ 
+-AC_ARG_WITH(qdbm,
+-	AS_HELP_STRING(--with-qdbm, [support database functions qdbm]),with_qdbm=yes,
+-	with_qdbm=no)
+-
+-if test "x$with_qdbm" = xyes; then
+-   AC_MSG_CHECKING(for QDBM)
+-   WITH_QDBM=1
+-else
+-   WITH_QDBM=0
+-fi
++AC_ARG_WITH([qdbm],
++    [AS_HELP_STRING([--with-qdbm], [support database functions qdbm])])
++AS_IF([test "x$with_qdbm" = "xyes"], [WITH_QDBM=1], [WITH_QDBM=0])
+ 
+ if test $WITH_QDBM = 1; then
++  AC_MSG_CHECKING(for QDBM)
+   AC_CHECK_LIB(qdbm,main, [], [AC_MSG_ERROR(Cannot find Quick Database Manager)])
+   AC_CHECK_HEADERS(depot.h)
+   AC_DEFINE(QDB, 1, [Define if QDBM is available.])
+@@ -471,18 +435,12 @@ AC_SUBST(OPENSSL_LIB_LIB)
+ # Others
+ #
+ 
+-AC_ARG_WITH(libvirt,
+-	AS_HELP_STRING(--with-libvirt, [support virtual machine management]),with_virt=yes,
+-	with_virt=no)
+-
+-if test "x$with_virt" = xyes; then
+-   AC_MSG_CHECKING(for libvirt)
+-   WITH_VIRT=1
+-else
+-   WITH_VIRT=0
+-fi
++AC_ARG_WITH([libvirt],
++    [AS_HELP_STRING([--with-libvirt], [support virtual machine management])])
++AS_IF([test "x$with_libvirt" = "xyes"], [WITH_VIRT=1], [WITH_VIRT=0])
+ 
+ if test $WITH_VIRT = 1; then
++  AC_MSG_CHECKING(for libvirt)
+   AC_CHECK_LIB(virt,main, [], [AC_MSG_ERROR(Cannot find libvirt)])
+ fi
+ 
+@@ -491,60 +449,52 @@ dnl ######################################################################
+ dnl Checks for perl compatible regular expressions
+ dnl ######################################################################
+ 
+-AC_ARG_WITH(pcre,
+-    [  --with-pcre[[=PATH]] directory where Perl compatible regex exists (optionally in PATH)],
+-    [
+-        AC_MSG_CHECKING(pcre)
+-
+-        if test "x$withval" != "xno" ; then
+-            if test "x$withval" != "xyes" ; then
+-                if test "x$withval" = "xdefault" ; then
+-                    for d in $prefix /usr/local /usr; do
+-                        if test -f "$d/include/pcreposix.h" ; then
+-                            CPPFLAGS="$CPPFLAGS -I$d/include"
+-                            LDFLAGS="$LDFLAGS -L$d/lib"
+-                            PCRE_LIB="-lpcreposix"
+-                            AC_MSG_RESULT($d)
+-                            break
+-                        fi
+-                    done
+-                    if test x"$PCRE_LIB" = x ; then
+-                        AC_MSG_ERROR(Cannot find PCRE - specify the path)
+-                    fi
+-                else
+-                if test -f "${withval}/include/pcreposix.h" ; then
+-                    CPPFLAGS="$CPPFLAGS -I${withval}/include"
+-                    LDFLAGS="$LDFLAGS -L${withval}/lib"
+-                    AC_MSG_RESULT("${withval}")
+-                else
+-                    AC_MSG_ERROR(Cannot find PCRE - specify the path)
+-                fi
+-                fi
+-            else
+-               AC_MSG_RESULT("yes")
+-            fi
+-            LIBS="$LIBS -lpcreposix"
+-            AC_DEFINE(USE_PCRE, 1, [Define if PCRE is available.])
+-        fi
+-    ]
+-)
++AC_ARG_WITH([pcre],
++			[AS_HELP_STRING([--without-pcre[[=PATH]]], [support for Perl compatible regex (optionally search in PATH)])])
++AS_IF([test "x$with_pcre" != "xno"], [
++    AC_MSG_CHECKING([pcre])
++    if test "x$with_pcre" = "xyes" -o "x$with_pcre" = "x" ; then
++		for d in $prefix /usr/local /usr; do
++			if test -f "$d/include/pcre.h" ; then
++				CPPFLAGS="$CPPFLAGS -I$d/include"
++				LDFLAGS="$LDFLAGS -L$d/lib"
++				AC_MSG_RESULT($d)
++				FOUND_PCRE=1
++				break
++			fi
++		done
++		if test "x$FOUND_PCRE" = "x" ; then
++			AC_MSG_NOTICE([Cannot find PCRE - specify the path])
++		fi
++	else
++		if test -f "${withval}/include/pcre.h" ; then
++			CPPFLAGS="$CPPFLAGS -I${withval}/include"
++			LDFLAGS="$LDFLAGS -L${withval}/lib"
++			AC_MSG_RESULT("${withval}")
++		else
++			AC_MSG_NOTICE([Cannot find PCRE in $withval])
++		fi
++	fi
+ 
+-AC_CHECK_LIB(pcre, main, [], [AC_MSG_ERROR(Cannot find PCRE)])
++	AC_CHECK_HEADERS([pcre.h pcre/pcre.h])
++	AC_CHECK_LIB(pcre, main, [], [AC_MSG_WARN([Cannot find PCRE])])
++	AC_DEFINE(USE_PCRE, 1, [Define if PCRE is available.])
++])
+ 
+-LIBS="$LIBS $BERKELEY_DB_LDFLAGS $BERKELEY_DB_LIB $OPENSSL_LIB_LDFLAGS $OPENSSL_LIB_LIB"
++if test "x$ac_cv_lib_pcre_main" != "xyes"; then
++	AC_CHECK_HEADERS([regex.h rxposix.h])
++	AC_CHECK_FUNC([regcomp])
+ 
+-dnl ######################################################################
+-dnl Checks for regular expressions
+-dnl GNU regex lib if you have regcomp in libc you should NOT have this lib too
+-dnl ######################################################################
++	if test "x$ac_cv_header_regex_h" != "xyes" -a "x$ac_cv_header_rxposix_h" != "xyes" ; then
++		AC_MSG_ERROR([Either PCRE, rxposix or GNU regex is required])
++	fi
++fi
+ 
++LIBS="$LIBS $BERKELEY_DB_LDFLAGS $BERKELEY_DB_LIB $OPENSSL_LIB_LDFLAGS $OPENSSL_LIB_LIB"
+ 
+ dnl AC_CHECK_LIB(rx, main) deprecated
+ AC_CHECK_LIB(rt, main)
+ 
+-AC_CHECK_HEADERS(pcre.h)
+-AC_CHECK_HEADERS(pcre/pcre.h)
+-
+ dnl ######################################################################
+ dnl Checks for header files.
+ dnl ######################################################################
+@@ -564,7 +514,6 @@ AC_CHECK_HEADERS(sys/param.h)
+ AC_CHECK_HEADERS(fcntl.h)
+ AC_CHECK_HEADERS(sys/filesys.h)
+ AC_CHECK_HEADERS(dustat.h)
+-AC_CHECK_HEADERS(regex.h rxposix.h)
+ AC_CHECK_HEADERS(sys/systeminfo.h)
+ AC_CHECK_HEADERS(sys/acl.h winsock2.h)
+ 
+@@ -579,32 +528,23 @@ dnl ######################################################################
+ dnl Checks for graph support
+ dnl ######################################################################
+ 
+-AC_ARG_WITH(graphviz,
+-	AS_HELP_STRING(--with-graphviz, [support some graphic functions]),with_graphviz=yes,
+-	with_graphviz=no)
+-
+-if test "x$with_graphviz" = xyes; then
+-   AC_MSG_CHECKING(for Graphviz)
+-   WITH_GVC=1
+-else
+-   WITH_GVC=0
+-fi
++AC_ARG_WITH([graphviz],
++    [AS_HELP_STRING([--with-graphviz], [support some graphic functions])])
++AS_IF([test "x$with_graphviz" = "xyes"], [WITH_GVC=1], [WITH_GVC=0])
+ 
+ if test $WITH_GVC = 1; then
++  AC_MSG_CHECKING(for Graphviz)
+   AC_CHECK_HEADERS(graphviz/gvc.h)
+   AC_CHECK_LIB(gvc,main)
+ fi
+ 
+ 
+-AC_ARG_WITH(gd,
+-	AS_HELP_STRING(--without-gd, [support some graphic functions]),with_gd=no,
+-	with_gd=yes)
+-
+-if test "x$with_gd" != xno; then
+-   AC_CHECK_LIB(gd,main)
+-   AC_CHECK_HEADERS(gd.h)
+-fi
+-
++AC_ARG_WITH([gd],
++    [AS_HELP_STRING([--without-gd], [support some graphic functions])])
++AS_IF([test "x$with_gd" = "xyes"], [
++    AC_CHECK_LIB(gd,main)
++    AC_CHECK_HEADERS(gd.h)
++])
+ 
+ dnl ######################################################################
+ dnl Checks for data types
+@@ -627,7 +567,7 @@ dnl Check for special functions
+ dnl ######################################################################
+ 
+ AC_CHECK_FUNCS(getcwd getnetgrent waitpid seteuid setegid setreuid setregid)
+-AC_CHECK_FUNCS(uname gethostname realpath regcomp chflags)
++AC_CHECK_FUNCS(uname gethostname realpath chflags)
+ AC_CHECK_FUNCS(strstr strsep putenv drand48 srand48 getaddrinfo)
+ AC_CHECK_FUNCS(bcopy mkfifo statfs statvfs door)
+ AC_CHECK_FUNCS(sysinfo setsid strdup strrchr strerror snprintf sysconf)
+@@ -691,30 +631,27 @@ AC_CHECK_FUNC(lchown, AC_DEFINE(HAVE_LCHOWN))
+ AC_CHECK_FUNC(pthread_attr_setstacksize, AC_DEFINE(HAVE_PTHREAD_ATTR_SETSTACKSIZE), AC_CHECK_LIB(pthread, pthread_create))
+ AC_CHECK_FUNC(pthread_sigmask, AC_DEFINE(HAVE_PTHREAD_SIGMASK), AC_CHECK_LIB(pthread, pthread_create))
+ 
+-AC_ARG_ENABLE(DCE,[  --enable-DCE            support for DCE and ACLs],[
+-  case "$enableval" in
+-    no) 
+-        ;;
+-    *)
+-	AC_CHECK_LIB(thread, main) 
+-	AC_CHECK_LIB(dce, main)            dnl DFS
+-	AC_CHECK_HEADERS(dce/daclif.h)
+-	AC_CHECK_HEADERS(pthread.h)
+-	AC_CHECK_HEADERS(sched.h)
+-	;;
+-  esac
+- ])
++AC_ARG_ENABLE([DCE], [AS_HELP_STRING([--enable-DCE], [support for DCE and ACLs])])
++AS_IF([test "x$enable_DCE" = "xyes"], [
++    AC_CHECK_LIB(thread, main)
++    AC_CHECK_LIB(dce, main)            dnl DFS
++    AC_CHECK_HEADERS(dce/daclif.h)
++    AC_CHECK_HEADERS(pthread.h)
++    AC_CHECK_HEADERS(sched.h)
++])
+ 
+ dnl ######################################################################
+ dnl Give the chance to enable SELINUX
+ dnl ######################################################################
+ dnl 
+-AC_ARG_ENABLE(selinux, dnl 
+-               [  --enable-selinux              Enable use of the SELINUX libraries],
+-               [AC_DEFINE(WITH_SELINUX, 1, [Define if you want to use SELINUX])
+-               LIB_SELINUX="-lselinux"
+-               LIBS="$LIBS $LIB_SELINUX"
+-               AC_SUBST(LIB_SELINUX)])
++AC_ARG_ENABLE([selinux], dnl
++    [AS_HELP_STRING([--enable-selinux], [Enable use of the SELINUX libraries])])
++AS_IF([test "x$enable_selinux" = "xyes"], [
++    AC_DEFINE(WITH_SELINUX, 1, [Define if you want to use SELINUX])
++    LIB_SELINUX="-lselinux"
++    LIBS="$LIBS $LIB_SELINUX"
++    AC_SUBST(LIB_SELINUX)
++])
+ 
+ 
+ dnl ######################################################################
+@@ -995,7 +932,7 @@ AC_MSG_RESULT( )
+ AC_MSG_RESULT(    Summary of options...)
+ 
+ 
+-if test $ac_cv_lib_pcre_main = "yes"; then
++if test "x$ac_cv_lib_pcre_main" = "xyes"; then
+   AC_MSG_RESULT( -> Configured with PCRE libraries)
+ else
+   AC_MSG_RESULT( -> No PCRE library support - reverting to POSIX builtins)
+@@ -1003,11 +940,11 @@ fi
+ 
+ if test $WITH_SQL = 1; then
+ 
+-  if test $ac_cv_lib_mysqlclient_main = "yes"; then
++  if test "x$ac_cv_lib_mysqlclient_main" = "xyes"; then
+     AC_MSG_RESULT( -> Configured with MYSQL libraries)
+   fi
+ 
+-  if test $ac_cv_lib_pq_main = "yes"; then
++  if test "x$ac_cv_lib_pq_main" = "xyes"; then
+     AC_MSG_RESULT( -> Configured with Postgres libraries)
+   fi
+ 
+@@ -1016,14 +953,14 @@ else
+ fi
+ 
+ if test $WITH_GVC = 1; then
+- if test $ac_cv_lib_gvc_main = "yes"; then
++ if test "x$ac_cv_lib_gvc_main" = "xyes"; then
+    AC_MSG_RESULT( -> Configured with Graphviz libraries)
+  fi
+ else
+   AC_MSG_RESULT( -> No Graphviz libraries included)
+ fi
+ 
+-if test $ac_cv_lib_ldap_ldap_get_values_len = "yes"; then
++if test "x$ac_cv_lib_ldap_ldap_get_values_len" = "xyes"; then
+   AC_MSG_RESULT( -> Configured with LDAP libraries)
+ else
+   AC_MSG_RESULT( -> No LDAP libraries included)
diff --git a/net-misc/cfengine/metadata.xml b/net-misc/cfengine/metadata.xml
index f00698628d7a..989ed05c968e 100644
--- a/net-misc/cfengine/metadata.xml
+++ b/net-misc/cfengine/metadata.xml
@@ -6,6 +6,20 @@
 		<email>ramereth@gentoo.org</email>
 		<name>Lance Albertson</name>
 	</maintainer>
+	<use>
+		<flag name="html">Install HTML documentation</flag>
+		<flag name="libvirt">Enable support for virtual machine management through <pkg>app-emulation/libvirt</pkg></flag>
+		<flag name="mysql">Use <pkg>dev-db/mysql</pkg> as database backend,
+			default would be Berkeley DB (<pkg>sys-libs/db</pkg>)</flag>
+		<flag name="pcre">Use PCRE rather than GNU Regex from libc</flag>
+		<flag name="postgres">Use <pkg>dev-db/postgresql-server</pkg> as
+			database backend, default would be Berkeley DB (<pkg>sys-libs/db</pkg>)</flag>
+		<flag name="qdbm">Use <pkg>dev-db/qdbm</pkg> as database backend,
+			default would be Berkeley DB (<pkg>sys-libs/db</pkg>)</flag>
+		<flag name="tests">Install test files</flag>
+		<flag name="tokyocabinet">Use <pkg>dev-db/tokyocabinet</pkg> as database
+			backend, default would be Berkeley DB (<pkg>sys-libs/db</pkg>)</flag>
+	</use>
 	<longdescription>
 	Cfengine, or the configuration engine is an autonomous agent and a middle to
 	high level policy language for building expert systems which administrate