A new major version of cfengine is available. Please add it to portage Reproducible: Always
Created attachment 342890 [details] cfengine-3.4.4 ebuild This ebuild need the patch of bug 444532
Comment on attachment 342890 [details] cfengine-3.4.4 ebuild --- cfengine-3.3.9.ebuild 2012-10-27 17:42:36.000000000 +0200 +++ - 2013-03-22 17:17:54.676546131 +0100 @@ -4,12 +4,13 @@ EAPI="4" +inherit autotools eutils + 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" +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" @@ -17,7 +18,7 @@ SLOT="3" KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86" -IUSE="examples html libvirt mysql postgres +qdbm selinux tests tokyocabinet vim-syntax" +IUSE="acl examples html libvirt mysql postgres +qdbm selinux tests tokyocabinet vim-syntax xml" DEPEND=">=sys-libs/db-4 mysql? ( virtual/mysql ) @@ -27,7 +28,9 @@ qdbm? ( dev-db/qdbm ) libvirt? ( app-emulation/libvirt ) >=dev-libs/openssl-0.9.7 - dev-libs/libpcre" + dev-libs/libpcre + xml? ( dev-libs/libxml2 ) + acl? ( virtual/acl )" RDEPEND="${DEPEND}" PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )" @@ -38,6 +41,12 @@ S="${WORKDIR}/${MY_P}" +src_prepare() { + epatch "${FILESDIR}"/detect_ifconfig_path.patch + epatch "${FILESDIR}"/update.cf2.patch + eautoreconf +} + src_configure() { # Enforce /var/cfengine for historical compatibility econf \ @@ -50,13 +59,9 @@ $(use_with postgres postgresql) \ $(use_with mysql) \ $(use_with libvirt) \ - $(use_enable selinux) - - # Fix Makefile to skip inputs, see below "examples" - #sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die - - # We install the documentation through portage - sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die + $(use_enable selinux) \ + $(use_with xml libxml2) \ + $(use_with acl libacl) } src_install() { @@ -67,12 +72,12 @@ emake DESTDIR="${D}" install || die KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86" -IUSE="examples html libvirt mysql postgres +qdbm selinux tests tokyocabinet vim-syntax" +IUSE="acl examples html libvirt mysql postgres +qdbm selinux tests tokyocabinet vim-syntax xml" DEPEND=">=sys-libs/db-4 mysql? ( virtual/mysql ) @@ -27,7 +28,9 @@ qdbm? ( dev-db/qdbm ) libvirt? ( app-emulation/libvirt ) >=dev-libs/openssl-0.9.7 - dev-libs/libpcre" + dev-libs/libpcre + xml? ( dev-libs/libxml2 ) + acl? ( virtual/acl )" RDEPEND="${DEPEND}" PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )" @@ -38,6 +41,12 @@ S="${WORKDIR}/${MY_P}" +src_prepare() { + epatch "${FILESDIR}"/detect_ifconfig_path.patch + epatch "${FILESDIR}"/update.cf2.patch + eautoreconf +} + src_configure() { # Enforce /var/cfengine for historical compatibility econf \ @@ -50,13 +59,9 @@ $(use_with postgres postgresql) \ $(use_with mysql) \ $(use_with libvirt) \ - $(use_enable selinux) - - # Fix Makefile to skip inputs, see below "examples" - #sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die - - # We install the documentation through portage - sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die + $(use_enable selinux) \ + $(use_with xml libxml2) \ + $(use_with acl libacl) } src_install() { @@ -67,12 +72,12 @@ emake DESTDIR="${D}" install || die # Evil workaround for now.. - mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF} + mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF} || die dodoc AUTHORS if ! use examples; then - rm -rf "${D}"/usr/share/doc/${PF}/example* + rm -rf "${D}"/usr/share/doc/${PF}/example* || die fi # Create cfengine working directory @@ -83,10 +88,13 @@ # 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 + for bin in promises agent monitord serverd execd runagent key report; do dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die done + #No need for that + rm "${D}"/usr/sbin/rpmvercmp || die + if use html; then docinto html dohtml -r docs/ || die @@ -105,19 +113,6 @@ 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() {
Added to the tree.
