Version bump to 3.1.2.

(Portage version: 2.2.0_alpha7/cvs/Linux x86_64)

3 files changed, 9 insertions, 41 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index 67b9bf64ca3a..00018c68b97e 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.118 2010/11/24 16:56:35 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.119 2010/12/10 17:50:25 idl0r Exp $
+
+*cfengine-3.1.2 (10 Dec 2010)
+
+  10 Dec 2010; Christian Ruppert <idl0r@gentoo.org>
+  -files/cfengine-3.1.0-cf-key.patch, -cfengine-3.1.1.ebuild,
+  +cfengine-3.1.2.ebuild:
+  Version bump to 3.1.2.
 
 *cfengine-3.1.1 (24 Nov 2010)
 
diff --git a/net-misc/cfengine/cfengine-3.1.1.ebuild b/net-misc/cfengine/cfengine-3.1.2.ebuild
index 1de1f7734f27..7ec081211488 100644
--- a/net-misc/cfengine/cfengine-3.1.1.ebuild
+++ b/net-misc/cfengine/cfengine-3.1.2.ebuild
@@ -1,11 +1,9 @@
 # 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.1.1.ebuild,v 1.1 2010/11/24 16:56:35 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.2.ebuild,v 1.1 2010/12/10 17:50:25 idl0r Exp $
 
 EAPI="3"
 
-inherit eutils
-
 MY_PV="${PV//_beta/b}"
 MY_PV="${MY_PV/_p/p}"
 MY_P="${PN}-${MY_PV}"
@@ -39,11 +37,6 @@ PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
 
 S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
-	# https://cfengine.com/bugtracker/view.php?id=390
-	epatch "${FILESDIR}/${PN}-3.1.0-cf-key.patch"
-}
-
 src_configure() {
 	local myconf
 
diff --git a/net-misc/cfengine/files/cfengine-3.1.0-cf-key.patch b/net-misc/cfengine/files/cfengine-3.1.0-cf-key.patch
deleted file mode 100644
index 5211cc95e58b..000000000000
--- a/net-misc/cfengine/files/cfengine-3.1.0-cf-key.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From fa27358c48772ddea52f10fc85d14dbad0ec20a8 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Fri, 19 Nov 2010 20:53:37 +0100
-Subject: [PATCH 2/2] Fix cf-key --output-file/-f option
-
-CFPRIVKEYFILE and CFPUBKEYFILE has been overriden by CheckWorkingDirectories().
-We now check if both variables are empty (which is the default, without
-		--output-file/-f).
----
- src/generic_agent.c |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/generic_agent.c b/src/generic_agent.c
-index 8287bbc..483b20f 100644
---- a/src/generic_agent.c
-+++ b/src/generic_agent.c
-@@ -1106,8 +1106,10 @@ if (cfstat(CFWORKDIR,&statbuf) != -1)
- snprintf(vbuff,CF_BUFSIZE,"%s%cstate%c.",CFWORKDIR,FILE_SEPARATOR,FILE_SEPARATOR);
- MakeParentDirectory(vbuff,false);
-
--snprintf(CFPRIVKEYFILE,CF_BUFSIZE,"%s%cppkeys%clocalhost.priv",CFWORKDIR,FILE_SEPARATOR,FILE_SEPARATOR);
--snprintf(CFPUBKEYFILE,CF_BUFSIZE,"%s%cppkeys%clocalhost.pub",CFWORKDIR,FILE_SEPARATOR,FILE_SEPARATOR);
-+if(strlen(CFPRIVKEYFILE) == 0 && strlen(CFPUBKEYFILE) == 0) {
-+	snprintf(CFPRIVKEYFILE,CF_BUFSIZE,"%s%cppkeys%clocalhost.priv",CFWORKDIR,FILE_SEPARATOR,FILE_SEPARATOR);
-+	snprintf(CFPUBKEYFILE,CF_BUFSIZE,"%s%cppkeys%clocalhost.pub",CFWORKDIR,FILE_SEPARATOR,FILE_SEPARATOR);
-+}
-
- CfOut(cf_verbose,"","Checking integrity of the state database\n");
- snprintf(vbuff,CF_BUFSIZE,"%s%cstate",CFWORKDIR,FILE_SEPARATOR,FILE_SEPARATOR);
---
-1.7.2.2
-