use patch instead of set for autotools fix

(Portage version: 2.1.11.62/cvs/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

3 files changed, 49 insertions, 11 deletions

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index 42a263e372f0..f6289f1cd3dc 100644
--- a/app-admin/syslog-ng/ChangeLog
+++ b/app-admin/syslog-ng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/syslog-ng
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.336 2013/05/08 02:42:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.337 2013/05/08 19:59:08 mr_bones_ Exp $
+
+  08 May 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/3.4/syslog-ng-3.4.1-autotools.patch, syslog-ng-3.4.1.ebuild:
+  use patch instead of set for autotools fix
 
   08 May 2013; Patrick Lauer <patrick@gentoo.org> syslog-ng-3.3.5-r1.ebuild,
   syslog-ng-3.4.1.ebuild:
diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-autotools.patch b/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-autotools.patch
new file mode 100644
index 000000000000..e41bd3080cc9
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-autotools.patch
@@ -0,0 +1,40 @@
+diff -ru syslog-ng-3.4.1.orig/configure.in syslog-ng-3.4.1/configure.in
+--- syslog-ng-3.4.1.orig/configure.in	2013-01-17 06:43:50.000000000 -0500
++++ syslog-ng-3.4.1/configure.in	2013-05-08 15:47:42.860150947 -0400
+@@ -68,7 +68,7 @@
+ pidfiledir='${localstatedir}'
+ moduledir='${exec_prefix}/lib/syslog-ng'
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ dnl ***************************************************************************
+ dnl Arguments
+@@ -227,7 +227,6 @@
+ dnl ***************************************************************************
+ dnl Checks for programs.
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_PROG_CC_C99
+ if test "x$ac_cv_prog_cc_c99" = "xno"; then
+ 	AC_MSG_ERROR("C99 standard compliant C compiler required. Try GCC 3.x or later.")
+diff -ru syslog-ng-3.4.1.orig/modules/afmongodb/libmongo-client/configure.ac syslog-ng-3.4.1/modules/afmongodb/libmongo-client/configure.ac
+--- syslog-ng-3.4.1.orig/modules/afmongodb/libmongo-client/configure.ac	2013-01-06 15:41:48.000000000 -0500
++++ syslog-ng-3.4.1/modules/afmongodb/libmongo-client/configure.ac	2013-05-08 15:48:09.275208195 -0400
+@@ -15,7 +15,7 @@
+ 
+ AC_CONFIG_MACRO_DIR([m4])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ AC_ARG_WITH([versioned-symbols], AC_HELP_STRING([--with-versioned-symbols],[Use versioned symbols]),[dnl
+ vsymldflags="-Wl,--version-script,\${srcdir}/libmongo-client.ver -Wl,-O1"
+@@ -24,7 +24,6 @@
+ dnl ***************************************************************************
+ dnl Checks for programs.
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_PROG_MAKE_SET
+ PKG_PROG_PKG_CONFIG
+ LT_INIT([shared])
diff --git a/app-admin/syslog-ng/syslog-ng-3.4.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.4.1.ebuild
index a7df36a13949..05bf5fe3a49e 100644
--- a/app-admin/syslog-ng/syslog-ng-3.4.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.4.1.ebuild,v 1.3 2013/05/08 02:42:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.4.1.ebuild,v 1.4 2013/05/08 19:59:08 mr_bones_ Exp $
 
 EAPI=5
 inherit autotools eutils multilib systemd
@@ -32,15 +32,9 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-${MY_PV}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PV%.*}/${P}-rollup.patch
-	sed -i \
-		-e 's/AM_PROG_CC_STDC/AC_PROG_CC/' \
-		-e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
-		configure.in || die
-	sed -i \
-		-e 's/AM_PROG_CC_STDC/AC_PROG_CC/' \
-		-e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
-		modules/afmongodb/libmongo-client/configure.ac || die
+	epatch \
+		"${FILESDIR}"/${PV%.*}/${P}-rollup.patch \
+		"${FILESDIR}"/${PV%.*}/${P}-autotools.patch
 	mv configure.in configure.ac || die
 	eautoreconf
 }