Always depend on libpcre, upstream forces it from now on.

Package-Manager: portage-2.1.9.25/cvs/Linux i686

4 files changed, 18 insertions, 24 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/Manifest b/net-misc/cfengine/Manifest
index c646e979fa14..ba089f932952 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 511666-segfault.patch 731 RMD160 5a1965029fcc27f95ef89aaf74ea7b5e93ff30eb SHA1 1c93030161d91bab21e46df355bbb7da77772f27 SHA256 cb38c886bf92c1ae48000a65a93a2cf610a9b9d991c44fb1b7df00c3bd9af54d
 AUX admit-noclass-520696.patch 400 RMD160 35073a17f2618c189bc3dd9b1a4264b117d6abdb SHA1 39e8a42c9ecca02d51d340fd6dabe91626c494c8 SHA256 d882a327a3788640f96ef7fa5a38953365f358722883ce105c8be973fbb6c5d2
 AUX cf-execd.rc6 318 RMD160 462f1700ca412a2ffbdc7e9f96e9d7354906a770 SHA1 0c161245a34a7562cbe37e878545ad90d551f508 SHA256 1862d1d86752b96cf92810f324f5746f0d73730cfce75e9598bea5e0b391a2e9
@@ -16,14 +13,7 @@ DIST cfengine-3.1.2.tar.gz 1588874 RMD160 5df871993ea77107bfc617ec8dc2e183d76ed7
 DIST cfengine-3.1.3.tar.gz 1593482 RMD160 2f0c289544ae70882e90c01fa4c523e0d594a3ad SHA1 9d63a4f02ce044b481d9aaa1e2db33070dbc91aa SHA256 b21cc4f6c05e492230f894b6b0622d3ada1ab508d6f09d7118521d8826e617ce
 EBUILD cfengine-2.2.10-r3.ebuild 3109 RMD160 c4dc9fe7d8026ad6ecf7fa01a4e8dc67a62ab277 SHA1 7921fd2d9434d6f9f331c1deeafd14a514353dfc SHA256 53b7fde170c753a64a5c605b23bbd6168fdc211833a2b4e5542b994831be0ce8
 EBUILD cfengine-2.2.10.ebuild 2720 RMD160 f79ad7c72b4ceac12a0323434b3797c4dbc1f3cb SHA1 cddf8f46bd13c6d1c83bddbcdff56673151f6104 SHA256 6b20bf4737274d6bfbe519dd717a4b19f689296accb431e7b0dae6b16e41a34d
-EBUILD cfengine-3.1.2.ebuild 4175 RMD160 b4b842a288c00d847973c509ca8f5cd13d06ea76 SHA1 fa3cb8f0b2530e2ad26284456dc969160b608230 SHA256 9d0cb6e17108d1610223881abe704a3df6dc9a9665094f7a904717e82e92011a
-EBUILD cfengine-3.1.3.ebuild 4173 RMD160 f6c9b3b293cfc889c77d0015957685af9ec59c55 SHA1 6516125c9770e232e62696332c2a392cf685444e SHA256 9c07aed442bb34078b5e83e6c6c59ea4e82f354fc0643c5d19a2c1933e33cf28
-MISC ChangeLog 21400 RMD160 1d256ca286aeb3326f05d1077fcf8c65f3c6e861 SHA1 65091d8c304255314252ac7941ff4082c82d13ff SHA256 f419b9e70b1c951ad2d22ffc862d6b5fa514ae1ed43a2a139484331f7658416e
+EBUILD cfengine-3.1.2.ebuild 4152 RMD160 abfff7544a51a31cf8a9e2843d00b767a8ef6799 SHA1 01e7a4f226d672fdd9b707131da033f52e23ad7c SHA256 c7fac45f3c5c1e47c9ca0958ce19bd905c50ad997fc96f687db713bf4131eb71
+EBUILD cfengine-3.1.3.ebuild 4153 RMD160 c137562a7dd63c75417579c8442baf0e4a751b28 SHA1 612622d9a3bff65944d00d99d04b15a6fc6388a8 SHA256 43a7d165aebf6507ea2c0409aaf43d6ffd700514edfbd80efa3f1773fad5ae6b
+MISC ChangeLog 21558 RMD160 cec2a557d6f04df905ce55bdf05ddc80a738d3dd SHA1 acda5a766f40ca4974dfea346207f7936b1a8f90 SHA256 f0dca18c66bab84827b781cbd299ab416e019c57fc6bca71aa67200f04b80b51
 MISC metadata.xml 2646 RMD160 2c51382fec40e084a1ef7372505399d079fcedfb SHA1 51acdf2de92d83b818d56a326511a03a5d8a1689 SHA256 f78868dec97c0018b6b59a05e85153a76e44526b65aa77820d8ce9c2cdcf857e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk05XI8ACgkQ9/cejkQaxBBfpQCffVoQr5AjTxbNpObXMu1b6tmS
-Qc0Anj1c/6HWdWvVFsDraHezg5SQjKzm
-=yJQB
------END PGP SIGNATURE-----
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)