Respect LDFLAGS.

Package-Manager: portage-2.2_rc61/cvs/Linux i686

4 files changed, 71 insertions, 3 deletions

diff --git a/app-admin/ccze/ChangeLog b/app-admin/ccze/ChangeLog
index 29ca3899d0a9..fea0d361b094 100644
--- a/app-admin/ccze/ChangeLog
+++ b/app-admin/ccze/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/ccze
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ccze/ChangeLog,v 1.25 2008/10/23 16:55:07 joker Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ccze/ChangeLog,v 1.26 2010/01/22 17:04:33 jer Exp $
+
+*ccze-0.2.1-r3 (22 Jan 2010)
+
+  22 Jan 2010; Jeroen Roovers <jer@gentoo.org> +ccze-0.2.1-r3.ebuild,
+  +files/ccze-ldflags.patch:
+  Respect LDFLAGS.
 
   23 Oct 2008; Christian Birchinger <joker@gentoo.org> ccze-0.2.1-r2.ebuild:
   Added tc-export CC. See bug #243314
diff --git a/app-admin/ccze/Manifest b/app-admin/ccze/Manifest
index 7886b2420d55..1a264d871007 100644
--- a/app-admin/ccze/Manifest
+++ b/app-admin/ccze/Manifest
@@ -1,6 +1,8 @@
 AUX ccze-fbsd.patch 635 RMD160 a008d2bf9cf2c303f16c1dcb136538fea26de455 SHA1 76b62e200194efd5083401505383f25ea9c8a6dc SHA256 f80d6bea0b9a0655330e2e55e7abb4f31c9968c19f3d9e4ac06ab2e4ce8ee3b7
+AUX ccze-ldflags.patch 518 RMD160 fd3e58000867eb8a4e8a3c06e0208eb4eedf52b5 SHA1 1f12ea440d147d6d8faffe92bea8422d80654cea SHA256 61a8433565485ace98098e1da948f9e8b85bcb204b420aae0b1eb5b6f857d4af
 AUX ccze-segfault.patch 814 RMD160 e1ef1873b8a69ddbce052720a638232630ed1dbb SHA1 a7cf64aadf72ceecb90d758eb31bfc24d73f1789 SHA256 43d82cc9ecb9c3b4aeea311411ada9622094903f60861ed4bc0b2044f294dddc
 DIST ccze-0.2.1.tar.gz 139795 RMD160 22d89140ea0518c6a33c07464620a2a1fb212b94 SHA1 a265e826be8018cd2f1b13ea1e96e27cc1941d02 SHA256 8263a11183fd356a033b6572958d5a6bb56bfd2dba801ed0bff276cfae528aa3
 EBUILD ccze-0.2.1-r2.ebuild 1171 RMD160 eb734cae47f983c9968b690ddbca5d5ec4b9c8f6 SHA1 d9bd6d510401d804c3ad8a7d66fe1fa72261181d SHA256 4d666853b89416ae35dfa80e9845d1cc7561f047512babb7a6de333ae8c7a1d5
-MISC ChangeLog 3002 RMD160 729b3f215384da46a6862bc725f06493428c60e7 SHA1 26dcf0e5e809352eface5be2875cb07722ecab71 SHA256 6f2f8ad42815d50b42700f635159decfe5fb24da20123395f4fce9745a9c0759
+EBUILD ccze-0.2.1-r3.ebuild 1250 RMD160 68f703c3c2d6296b7f81a73763b2feb6b425db89 SHA1 5dd0ca1d16d4383473b532ef1286ebfdb5bb2597 SHA256 8a683bc45c76ad9959f9e43e11f3f1b41eeb5e9f1d100ee2d2c270a6b90861c6
+MISC ChangeLog 3149 RMD160 7c80eb871425e1244f4cfdc6f5254486b67301af SHA1 94629a787b9c741af2c1d78ff3e4eacf5f1b6529 SHA256 14893d913dc62ee2049c74d877350f42999b3d4eaeae572dfcc479df367b7f01
 MISC metadata.xml 644 RMD160 62a75c36180109b37c85c51c118cc566f7895365 SHA1 e90e62aba83f2679ae1ec345b735a6c368680220 SHA256 1f5ded692570e05dcbcf2b7e578b6afe49499dcce935da0991e7ca98746866f1
diff --git a/app-admin/ccze/ccze-0.2.1-r3.ebuild b/app-admin/ccze/ccze-0.2.1-r3.ebuild
new file mode 100644
index 000000000000..4d74af7b4f23
--- /dev/null
+++ b/app-admin/ccze/ccze-0.2.1-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ccze/ccze-0.2.1-r3.ebuild,v 1.1 2010/01/22 17:04:33 jer Exp $
+
+inherit fixheadtails autotools eutils toolchain-funcs
+
+DESCRIPTION="A flexible and fast logfile colorizer"
+HOMEPAGE="http://bonehunter.rulez.org/software/ccze/"
+SRC_URI="ftp://bonehunter.rulez.org/pub/ccze/stable/${P}.tar.gz"
+
+RESTRICT="test"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-libs/libpcre"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/ccze-fbsd.patch || die "epatch ccze-fbsd.patch failed"
+	epatch "${FILESDIR}"/ccze-segfault.patch || die "epatch ccze-segfault.patch"
+	epatch "${FILESDIR}"/ccze-ldflags.patch || die "epatch ccze-segfault.patch"
+
+	# GCC 4.x fixes
+	sed -e 's/-Wswitch -Wmulticharacter/-Wswitch/' \
+	    -i src/Makefile.in
+	sed -e '/AC_CHECK_TYPE(error_t, int)/d' \
+	    -i configure.ac
+
+	eautoreconf
+
+	ht_fix_file Rules.mk.in
+}
+
+src_compile() {
+	# Bug #243314
+	tc-export CC
+	econf || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog ChangeLog-0.1 NEWS THANKS README FAQ
+}
diff --git a/app-admin/ccze/files/ccze-ldflags.patch b/app-admin/ccze/files/ccze-ldflags.patch
new file mode 100644
index 000000000000..acef31a43f5c
--- /dev/null
+++ b/app-admin/ccze/files/ccze-ldflags.patch
@@ -0,0 +1,11 @@
+--- ccze-0.2.1/src/Makefile.in.org	2010-01-22 17:06:57.000000000 +0100
++++ ccze-0.2.1/src/Makefile.in	2010-01-22 18:00:28.000000000 +0100
+@@ -75,7 +75,7 @@
+ ${PROGRAM}: ${OBJECTS} ${PLUGIN_SOBJS}
+ 	${CC} -rdynamic ${ALL_CFLAGS} -o $@ $^ ${ALL_LDFLAGS}
+ ccze-dump ccze-cssdump: %: %.o ccze-compat.o ccze-color.c
+-	${CC} ${ALL_CFLAGS} -o $@ $@.o ccze-compat.o
++	${CC} ${ALL_CFLAGS} ${ALL_LDFLAGS} -o $@ $@.o ccze-compat.o
+ ccze-builtins.c: Makefile
+ 	echo '#include <ccze.h>' >$@
+ 	echo '#include "ccze-private.h"' >>$@