Adding as-needed patch, fixing 274700, thanks idl0r and Gef Lebster for

providing patches
Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 95 insertions, 3 deletions

diff --git a/app-text/multitail/ChangeLog b/app-text/multitail/ChangeLog
index 03be9ca8f44e..e8470fe00876 100644
--- a/app-text/multitail/ChangeLog
+++ b/app-text/multitail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/multitail
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/ChangeLog,v 1.70 2009/08/01 17:49:09 darkside Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/ChangeLog,v 1.71 2010/02/03 21:47:59 jlec Exp $
+
+*multitail-5.2.2-r1 (03 Feb 2010)
+
+  03 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  +files/5.2.2-as-needed.patch, +multitail-5.2.2-r1.ebuild:
+  Adding as-needed patch, fixing 274700, thanks idl0r and Gef Lebster for
+  providing patches
 
   01 Aug 2009; Jeremy Olexa <darkside@gentoo.org> -multitail-4.2.0.ebuild,
   -multitail-5.2.0.ebuild, -multitail-5.2.1.ebuild:
diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
index 7de294577795..5539c222c3a9 100644
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 5.2.2-as-needed.patch 1193 RMD160 1b26d19c7ee3f1a8c25feb7a9bbdf6b4e81b4e5f SHA1 c06b68a4a57f584d2a6fe09aae8801cfaa3431ba SHA256 79e19c630837acf6d6b1e1c8fc0528584d4f52b88cda5ddd93835ecc960e82b2
 DIST multitail-5.2.2.tgz 164676 RMD160 876e828e9dda2d8017e28831cb243dbd533d0a3f SHA1 9ecc9d27f2b79fc7dfa071bde2612711867cb8b9 SHA256 f2a57b289e64b388f6353c78a4ca101ce499d9fa494564a835dc350bb9206bee
+EBUILD multitail-5.2.2-r1.ebuild 1037 RMD160 65c3a0e449ff659ff62806fd9fab970e4b85ea9c SHA1 37c72138aaf77716a65bc0e3027b4b953d9d00dc SHA256 4c0bc0852fd1cec7128f04178e0c7987b472bd5eabeff86e1752a75a1ffb7014
 EBUILD multitail-5.2.2.ebuild 894 RMD160 d1207a61973f110d63e4342d9f04079e383d2e0f SHA1 829244745f3c086b5d72f5dc6f411c45a355a6fb SHA256 e338e5bca2971da093e96a731674af2cd4f6658eb61054a5a2af4cb33e7248b0
-MISC ChangeLog 8390 RMD160 82d5ec0d04e5f397bfe28486807c1285177d48dc SHA1 fba801d5ea63fe323d877e9afce7498413349096 SHA256 5b16d828d762c90ae415b47f1f1dc7138f4c9e4761d52a2ee0ced33747f5016a
+MISC ChangeLog 8630 RMD160 890e5bc73fb3f7ab1bd882486ac3752862f94144 SHA1 8ebd4da6cf519a9947c9fd5740e3c671232ca0cc SHA256 6b52abf01a4c94b9fad3b9dc6c89c467f132ec4c2a5b32f3b2c4bca42c03abe2
 MISC metadata.xml 310 RMD160 d2cbd20071237679215482df8f5d75e631543301 SHA1 11b73fa4f7df3ef2016048e5f30824f58e444587 SHA256 b4ead20e58116c223ab0fc0a668ec07a78bde29f259fdc629f7a01913fafa1fa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktp7xQACgkQgAnW8HDreRautACfZcmpR05Hr9jhXlHMBtcGBsl4
+zysAoLRAWQGwR4PYSrw7/34xLgFt43HC
+=eK/C
+-----END PGP SIGNATURE-----
diff --git a/app-text/multitail/files/5.2.2-as-needed.patch b/app-text/multitail/files/5.2.2-as-needed.patch
new file mode 100644
index 000000000000..d9ad7660aed9
--- /dev/null
+++ b/app-text/multitail/files/5.2.2-as-needed.patch
@@ -0,0 +1,26 @@
+--- Makefile.old	2009-07-02 20:16:52.561919791 +0200
++++ Makefile	2009-07-02 20:17:21.947666469 +0200
+@@ -4,19 +4,19 @@ DESTDIR=/
+ CONFIG_FILE=$(DESTDIR)/etc/multitail.conf
+ 
+ DEBUG=-g # -D_DEBUG # -pg #  -D_DEBUG  #-pg -W -pedantic # -pg #-fprofile-arcs
+-LDFLAGS+=-lpanel -lncurses -lutil -lm $(DEBUG) -rdynamic
++LIBS+=-lpanel -lncurses -lutil -lm
+ # LDFLAGS+=-lc_p -lpanel_g -lncurses_g -lutil -lm -pg -g -rdynamic
+-CFLAGS+=-funsigned-char -D`uname` -O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG) -DCONFIG_FILE=\"$(CONFIG_FILE)\"
++CFLAGS+=-funsigned-char -D`uname` -Wall -DVERSION=\"$(VERSION)\" -DCONFIG_FILE=\"$(CONFIG_FILE)\" -rdynamic
+ 
+ OBJS=utils.o mt.o error.o my_pty.o term.o scrollback.o help.o mem.o cv.o selbox.o stripstring.o color.o misc.o ui.o exec.o diff.o config.o cmdline.o globals.o history.o
+ 
+ all: multitail
+ 
+ multitail: $(OBJS)
+-	$(CC) -Wall -W $(OBJS) $(LDFLAGS) -o multitail
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ multitail_ccmalloc: $(OBJS)
+-	ccmalloc --no-wrapper $(CC) -Wall -W $(OBJS) $(LDFLAGS) -o ccmultitail
++	ccmalloc --no-wrapper $(CC) $(CFLAGS) $(LDFLAGS)  $(OBJS) -o ccmultitail $(LIBS)
+ 
+ install: multitail
+ 	cp multitail $(DESTDIR)/usr/bin
diff --git a/app-text/multitail/multitail-5.2.2-r1.ebuild b/app-text/multitail/multitail-5.2.2-r1.ebuild
new file mode 100644
index 000000000000..9d7c8350d150
--- /dev/null
+++ b/app-text/multitail/multitail-5.2.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/multitail-5.2.2-r1.ebuild,v 1.1 2010/02/03 21:47:59 jlec Exp $
+
+EAPI="2"
+
+inherit flag-o-matic toolchain-funcs eutils
+
+DESCRIPTION="Tail with multiple windows"
+HOMEPAGE="http://www.vanheusden.com/multitail/index.html"
+SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="debug doc examples"
+
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-as-needed.patch"
+}
+
+src_configure() {
+	tc-export CC
+	use debug && append-flags "-D_DEBUG"
+}
+
+src_install () {
+	dobin multitail || die
+
+	insinto /etc
+	doins multitail.conf || die
+
+	dodoc Changes readme.txt thanks.txt || die
+	doman multitail.1 || die
+
+	if use examples; then
+		docinto examples
+		dodoc colors-example.{pl,sh} convert-{geoip,simple}.pl || die
+	fi
+
+	if use doc; then
+		dohtml manual.html || die
+	fi
+}