diff options
| author |   Christian Ruppert <idl0r@gentoo.org> | 2011-01-23 15:35:35 +0000 |
|---|---|---|
| committer | Christian Ruppert <idl0r@gentoo.org> | 2011-01-23 15:35:35 +0000 |
| commit | cccd0a94887e003593f50aafb673f38ee120d3e9 (patch) | |
| tree | 9d83f4a4cf799032ff387e6b25f5f40c9d9bfabe /net-misc/cfengine | |
| parent | Version bump (diff) | |
| download | gentoo-2-cccd0a94887e003593f50aafb673f38ee120d3e9.tar.gz gentoo-2-cccd0a94887e003593f50aafb673f38ee120d3e9.tar.bz2 gentoo-2-cccd0a94887e003593f50aafb673f38ee120d3e9.zip | |
Always depend on libpcre, upstream forces it from now on.
(Portage version: 2.1.9.25/cvs/Linux i686)
Diffstat (limited to 'net-misc/cfengine')
| -rw-r--r-- | net-misc/cfengine/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/cfengine/cfengine-3.1.2.ebuild | 10 | ||||
| -rw-r--r-- | net-misc/cfengine/cfengine-3.1.3.ebuild | 10 |
3 files changed, 15 insertions, 11 deletions
diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog index a9575c1ccee1..ffa06f78abd3 100644 --- a/net-misc/cfengine/ChangeLog +++ b/net-misc/cfengine/ChangeLog @@ -1,6 +1,10 @@ # 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.124 2011/01/21 10:15:54 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.125 2011/01/23 15:35:35 idl0r Exp $ + + 23 Jan 2011; Christian Ruppert <idl0r@gentoo.org> cfengine-3.1.2.ebuild, + cfengine-3.1.3.ebuild: + Always depend on libpcre, upstream forces it from now on. 21 Jan 2011; Markos Chandras <hwoarang@gentoo.org> cfengine-3.1.2.ebuild: Stable on amd64 wrt bug #352280 diff --git a/net-misc/cfengine/cfengine-3.1.2.ebuild b/net-misc/cfengine/cfengine-3.1.2.ebuild index fd99496df939..0fa14d2772fd 100644 --- a/net-misc/cfengine/cfengine-3.1.2.ebuild +++ b/net-misc/cfengine/cfengine-3.1.2.ebuild @@ -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.2.ebuild,v 1.4 2011/01/21 10:15:54 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.2.ebuild,v 1.5 2011/01/23 15:35:35 idl0r Exp $ EAPI="3" @@ -18,7 +18,7 @@ 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 pcre postgres qdbm selinux tests tokyocabinet vim-syntax" +IUSE="examples gd graphviz html ldap mysql postgres qdbm selinux tests tokyocabinet vim-syntax" # libvirt? ( app-emulation/libvirt ) DEPEND=">=sys-libs/db-4 @@ -26,13 +26,13 @@ DEPEND=">=sys-libs/db-4 graphviz? ( media-gfx/graphviz ) ldap? ( net-nds/openldap ) 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" + >=dev-libs/openssl-0.9.7 + dev-libs/libpcre" RDEPEND="${DEPEND}" PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )" @@ -56,11 +56,11 @@ src_configure() { econf \ --docdir=/usr/share/doc/"${PF}" \ --with-workdir=/var/cfengine \ + --with-pcre \ ${myconf} \ $(use_with gd) \ $(use_with graphviz) \ $(use_with ldap) \ - $(use_with pcre) \ $(use_with qdbm) \ $(use_enable selinux) \ $(use_with tokyocabinet) diff --git a/net-misc/cfengine/cfengine-3.1.3.ebuild b/net-misc/cfengine/cfengine-3.1.3.ebuild index c7dfca469b16..4561f9b60509 100644 --- a/net-misc/cfengine/cfengine-3.1.3.ebuild +++ b/net-misc/cfengine/cfengine-3.1.3.ebuild @@ -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.3.ebuild,v 1.3 2011/01/20 20:33:32 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.3.ebuild,v 1.4 2011/01/23 15:35:35 idl0r Exp $ EAPI="3" @@ -18,7 +18,7 @@ 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 pcre postgres qdbm selinux tests tokyocabinet vim-syntax" +IUSE="examples gd graphviz html ldap mysql postgres qdbm selinux tests tokyocabinet vim-syntax" # libvirt? ( app-emulation/libvirt ) DEPEND=">=sys-libs/db-4 @@ -26,13 +26,13 @@ DEPEND=">=sys-libs/db-4 graphviz? ( media-gfx/graphviz ) ldap? ( net-nds/openldap ) 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" + >=dev-libs/openssl-0.9.7 + dev-libs/libpcre" RDEPEND="${DEPEND}" PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )" @@ -56,11 +56,11 @@ src_configure() { econf \ --docdir=/usr/share/doc/"${PF}" \ --with-workdir=/var/cfengine \ + --with-pcre \ ${myconf} \ $(use_with gd) \ $(use_with graphviz) \ $(use_with ldap) \ - $(use_with pcre) \ $(use_with qdbm) \ $(use_enable selinux) \ $(use_with tokyocabinet) |