Clean up patch and do not cd before patching as the path is already set in the patch. Replace cd;make with emake -C. Set RDEPEND. Respect LDFLAGS (bug #336959), CC, more CFLAGS.

(Portage version: 2.2_rc86/cvs/Linux i686)

3 files changed, 28 insertions, 18 deletions

diff --git a/app-admin/ulog-acctd/ChangeLog b/app-admin/ulog-acctd/ChangeLog
index 5bb213dca85a..842271217ffe 100644
--- a/app-admin/ulog-acctd/ChangeLog
+++ b/app-admin/ulog-acctd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/ulog-acctd
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulog-acctd/ChangeLog,v 1.13 2009/10/12 00:01:00 halcy0n Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulog-acctd/ChangeLog,v 1.14 2010/09/28 19:09:54 jer Exp $
+
+*ulog-acctd-0.4.3-r1 (28 Sep 2010)
+
+  28 Sep 2010; Jeroen Roovers <jer@gentoo.org> -ulog-acctd-0.4.2.ebuild,
+  files/ulog-acctd-0.4.2-gcc2.patch, +ulog-acctd-0.4.3-r1.ebuild:
+  Clean up patch and do not cd before patching as the path is already set in
+  the patch. Replace cd;make with emake -C. Set RDEPEND. Respect LDFLAGS
+  (bug #336959), CC, more CFLAGS.
 
   12 Oct 2009; Mark Loeser <halcy0n@gentoo.org> ulog-acctd-0.4.2.ebuild,
   ulog-acctd-0.4.3.ebuild:
diff --git a/app-admin/ulog-acctd/files/ulog-acctd-0.4.2-gcc2.patch b/app-admin/ulog-acctd/files/ulog-acctd-0.4.2-gcc2.patch
index eb99c6a4a7b0..b62480c9e96f 100644
--- a/app-admin/ulog-acctd/files/ulog-acctd-0.4.2-gcc2.patch
+++ b/app-admin/ulog-acctd/files/ulog-acctd-0.4.2-gcc2.patch
@@ -1,6 +1,5 @@
-diff -ru ulog-acctd-0.4.1.orig/src/process.c ulog-acctd-0.4.1.new/src/process.c
---- ulog-acctd-0.4.1.orig/src/process.c	2003-08-26 15:30:07.000000000 +0200
-+++ ulog-acctd-0.4.1.new/src/process.c	2003-11-08 16:12:40.000000000 +0100
+--- a/src/process.c
++++ b/src/process.c
 @@ -627,6 +627,7 @@
  
  void wait_children(void)
diff --git a/app-admin/ulog-acctd/ulog-acctd-0.4.2.ebuild b/app-admin/ulog-acctd/ulog-acctd-0.4.3-r1.ebuild
index 885c1bed25ff..ec72e879bdb7 100644
--- a/app-admin/ulog-acctd/ulog-acctd-0.4.2.ebuild
+++ b/app-admin/ulog-acctd/ulog-acctd-0.4.3-r1.ebuild
@@ -1,33 +1,36 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulog-acctd/ulog-acctd-0.4.2.ebuild,v 1.9 2009/10/12 00:01:00 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulog-acctd/ulog-acctd-0.4.3-r1.ebuild,v 1.1 2010/09/28 19:09:54 jer Exp $
 
-inherit eutils
+EAPI="2"
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="ULOG-based accounting daemon with flexible log-format"
-SRC_URI="http://alioth.debian.org/download.php/604/${PN}_${PV}.orig.tar.gz"
+SRC_URI="http://alioth.debian.org/download.php/949/${PN}_${PV}.orig.tar.gz"
 HOMEPAGE="http://savannah.nongnu.org/projects/ulog-acctd/ http://alioth.debian.org/projects/pkg-ulog-acctd"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="net-firewall/iptables"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${P}.orig
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/src
-	epatch "${FILESDIR}"/${P}-gcc2.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.4.2-gcc2.patch
+	sed -i src/Makefile \
+		-e 's| -o | $(LDFLAGS)&|g' \
+		-e '/^DEBUG/d' \
+		|| die "sed src/Makefile"
 }
 
 src_compile() {
-	cd "${S}"/src || die "cannot change to src-directory"
-	make || die "compile of pgm failed"
-	cd "${S}"/doc || die "cannot change to doc-directory"
-	make || die "compile of docu failed"
+	emake CC=$(tc-getCC) -C src || die "emake src"
+	emake -C doc || die "emake doc"
 }
 
 src_install() {