app-text/multitail: Version BUmp

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 123 insertions, 6 deletions

diff --git a/app-text/multitail/ChangeLog b/app-text/multitail/ChangeLog
index 08ab957b5297..5f37d03258ab 100644
--- a/app-text/multitail/ChangeLog
+++ b/app-text/multitail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/multitail
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/ChangeLog,v 1.106 2013/11/23 16:52:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/ChangeLog,v 1.107 2013/11/27 07:39:19 jlec Exp $
+
+*multitail-6.0 (27 Nov 2013)
+
+  27 Nov 2013; Justin Lecher <jlec@gentoo.org> +multitail-6.0.ebuild,
+  +files/multitail-6.0-as-needed.patch:
+  Version BUmp
 
   23 Nov 2013; Jeroen Roovers <jer@gentoo.org> multitail-5.2.13.ebuild:
   Set RESTRICT=test and restore KEYWORDS (bug #492270).
diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
index 4b2d32ad5ff5..e3bbcd7207a5 100644
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@@ -1,20 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 5.2.2-as-needed.patch 1193 SHA256 79e19c630837acf6d6b1e1c8fc0528584d4f52b88cda5ddd93835ecc960e82b2 SHA512 c79112c720425c062bdea0e8ba93afda46ee6671be149bffa7d4bb7eb05b3755bff12eb24263c0f83aad5ec215a7a01c4978e019b640fed5ea593750aba967f8 WHIRLPOOL b6b36f2114a8ec080554189dfac6a7097f1d927eb8cb4d9597582d9acc8616853c3c713454b396c84677023a4d26d717ccf07b704abbd21cb8303982c4337009
 AUX 5.2.6-buffer-overflow.patch 361 SHA256 6c4cec018a91fbb83176a6e38ee3f88849e168c0e2fc045e19ca51eba147b145 SHA512 f23e8ecf409568dc085dea334cf38efbc9e021553f0615ba5d484d4c63a861a1254a3bca56101b7f3ffdd47f09aed2f13f82dae34c5d11f81b254643828bcc9e WHIRLPOOL 36b9fce8b50a208b92b16f959846736f3b0452df50ef1aa4eafebb5f4850cbb125cdcf09625f4e4c085f6640c04be4e84787f38d44e0e0c92eea0481f820fc64
 AUX multitail-5.2.12-as-needed.patch 1212 SHA256 38837685cb88df11677d6d291e980da1d4d079548313147ed468a51f09b2f7bd SHA512 0ff95d0969d67ddf20f68f0bb4a1843de19c516c048be9f92c6c9ed3c6c2ff054661081ca8368fed1b7678ead4e7d9df4c28138ed20dc4307c73286bbe14a698 WHIRLPOOL 7d28bdf7d3a9b3f3387b1f075a65cebbb33cb7a8e57ba8acbd5899c3cf107bb356984faaefd971bb38c54a35462db45c14008422dd634900c4ee36df554a790c
 AUX multitail-5.2.13-as-needed.patch 1232 SHA256 c81356fb71cea0aae66bee2c3fe68d628cbad359d4ebbe621e4e791ac4e0dfca SHA512 b86f2a737d9fc0b7304e769789636e13598daa4157aca0f392da9f1eac5e97588f46745414b58fd25914828fc4ee53ee2bde59615e5d366f202ee5e250360512 WHIRLPOOL 9e77c8c7331bb3df9edf3db841e46b359c2583f400dcb572d3b26ba6d48333f9b14056ed617ee3bd5f6bd44153bccaa54354479eaaf60fefaf215875529053aa
+AUX multitail-6.0-as-needed.patch 1825 SHA256 19cbcf61fc9e6cfcce4b8f8cbaebd079586f267063b8332cba14318bb67619c5 SHA512 a6380660523196e6c0339ac46f7ad8aa10ba3bf8d10be1dd65028fba3103df74653d3d9e7277353069d1cfcfc94194bd4ee06751cddf04757d2a54f60c6db58d WHIRLPOOL 42a171e19d3c9d94e6b08e135203a5e3cabdb654a4ac787f9d1d5972afe4cc0c2e94d485e74f606de76fa774d9ba2f0e15179e690416be055c5abca0762bab9c
 DIST multitail-5.2.12.tgz 163735 SHA256 681d87cd49e11aab1d82ad7818ee639c88a3d305db8accf0859977beda6c493c SHA512 d2ce9c119b619857c22dde098f3013fe8d9c8a410f1f6cc56e97cc2bf3fc19eddeff1485019be16587791f44b0b680431087c9e9be66ecc1c999ea0507b6b99c WHIRLPOOL 73ed263561b066f871aa2193a408f5c22f99261fbf08f7c83f020fc1e2799f67884dd5519cd8adcea07d45ae7a4a98b9d49402f6d14ab54ac9bf78c403c54039
 DIST multitail-5.2.13.tgz 164018 SHA256 8692a9d8513093877e337673a8437075dcd34522a0840b2438e5cd1e6a5bafab SHA512 fa8b057e445d845544afb52c0fa314a14dec08e64789e515fe86ebe22875c9626141476ad704ed4208301546c4ac794944165dcfcd8475d79d7d03e1725e5a51 WHIRLPOOL 9bb3a05262ed19e465c59d737d3eff3d07f6a5be71bc7d3b77d9b3f365e915d568da3f9ca1fcc7dc2791767c05807716e6f7c9afd73f37f495f3a3fa748c02e1
+DIST multitail-6.0.tgz 163969 SHA256 0daeb62204491fcf76ab5706d13036e05b941a8cdbe8f9eacd1a4cae7a63eb5d SHA512 f6005d341f88e0fdd361ff7a19d77f10d58abaa44e0e0cfbcca1f21b4bc176374bccbea0327c516936310e42d7e1abb7bb84c9853d69a2206fefea306b6c8250 WHIRLPOOL 175a6f393794b0c1da0a75281b463a4151e3108fe7f9103c26087674871590313dfdd76b961fdec9f77c0ff93fe0a2a3aaa1e69fb110895d7e5c243770b56aee
 EBUILD multitail-5.2.12.ebuild 1186 SHA256 3b5136a55a04d82a1fcd65e5a885f9355fd22c32bbe80d26bfeba21908a9c45b SHA512 e42b9f5fa8f0f789cdd4dd8bbca53e2359ea6a75c2dfab73d506d423f41688adcc3903adae91b40ea609ab2d85a78e85d8ac023e27d51f6b8c20690db0823a72 WHIRLPOOL 6c160198cee9bdad0baaf9b9be51b8532a3fa22198b128e86620fd65914edb32c8b36ae588290d13c303c0ab36d63c3a5b62737c093c03a30c8c3e99d733dd64
 EBUILD multitail-5.2.13.ebuild 1271 SHA256 a290399ff2e3e5da18fda9274e7d09117d0af6c03b660b3caa66bb293ff9aaa6 SHA512 ba09fda12dadac113bb0b385e7bf9b72b36013ab61ccc54e84ac3ff4648f6964e3fc64a7ccfeeed5ea926030ad9b6801f31261267afd41bb444216c6d8c57c50 WHIRLPOOL ba7d07b3cdd3498db48a463324134080662b273032a6437a9385a62425a7afe0782be13ba2430b1d680a34a34ca91557380dd929afcf8eebf64b5b233151e30d
-MISC ChangeLog 12938 SHA256 d42e884e54f6a30a2a4b6ee7387f2a773d919fa2a7cc7e2979281241497231d9 SHA512 ac315b82b0e977b848efa8e41abd69844e4299878d156051cf01b85b6a1c42976d9de3444c4e04606eb3f3525c89386cbeb46ca14dfc324a1d88eda2265c9aa0 WHIRLPOOL 9163cddfdd9d1cff0cdb946a928cd60b3af48abab294337a6a39648c7db131290251836ca840fa445cf604eb53210e6fc883c71a35609d1cc7417793e266d4d8
+EBUILD multitail-6.0.ebuild 1290 SHA256 e6ca311db723531c4738b90f14fa1d4d36409e55cbe5c2951e459148eda4e34d SHA512 a6dfa4600e63471b3615a0fed12cba923ca2889e76b6efdafb2385522d6aa3d6ac27520948652ea54403e13408cead5e39eff18264ef9dcb7270667d78aa40ef WHIRLPOOL 724e2605f9186e51483f50f9ea01b385cb085183d0e9c95d07011e28c13e389067988160786ede91ca0f081b5cf93e9b4610c8f7cc6358b4cb020f03a592cb3d
+MISC ChangeLog 13095 SHA256 b67a79a0ed08b5e05734b62eb5ed9880d09a0674499d4927cdd774a2826d8a6e SHA512 c16e2590926d9b32215218246d4b5b15aa568e07e73d0b3c8473479ffaf1a8cf0579c618e21d0e67912a72d254ff9f4b8d93ef2a97fa52e6fbbed763589d071a WHIRLPOOL b720891b5cc04231651312382940e5e15938073f28a0cd1de4f10cddfcc433a7e6d01e8766d889d0c5dbcc558741e9fc3796ceb7f3874a476226518a9a7efbc1
 MISC metadata.xml 319 SHA256 becb3d73a94717c596b82746022803d99fe5f8cda1244512c9faa8a7b1c74b66 SHA512 bb561b88d4a4a4e7812eebbaf842cf65d81c7c90fe475793c944ea785715323eb386ce32e8a5759e7580089728b47fe0e1e47b8e05449a781a8a6ec5da2a82bd WHIRLPOOL 12575f9318912d9e8ef1b3bbc91f7d0da0eb3ec2d1ac9126e3981991c691ffacb22b30560a4ea54249f31fb62653efdd0a0b3e6fae828304096d4b1bbca78b91
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKQ3V8ACgkQVWmRsqeSphOgiwCeLpALqQYEboFm89qUiPEOi8OA
-t0gAniKX44mCyOyD8tRyM8wJYP7Hqa8y
-=QreR
+iQIcBAEBCgAGBQJSlaGoAAoJELnU8jG9FVirYNsP/1xnzp96jbyOHKaFmCJzvuMQ
+1NWojN9lKDwLiV8f0LDUwdZftYTQKw2AoWwmoFCRYWpdhWJAVc+Nmyca/XnSOakc
+B6Kkcke9oHLIQkJuiSAJPtKWiNP0V2L8YFa9DoWs+O5Cw/DDXoRNoUQbCvzbhH5g
+v7bJ/oBp/lNFBZj5HbwfGbbsdj9mi4XyyQLTM3wjN7Iu3frROLSVAisrk0t7+8GW
+WPr6dCpidoXUSgWeRlNbM4t0cpkW4aoNdNPzYDo4z/AhtFqTG8gZTR51hd5yJdTU
+Znk29i5IdIdo4TX43Wmx/z+82emlilcoBBEBN99JFeA1Dl5+Vg27uexnPy082SOE
+zHFbDftnGI8I4dTUi6h4rjsKY4eAXnxmIdmpATpH2nx2SK5KtiU6UWvXGBoyNkSa
+CAgGRxS+tjRX0jQ83hkSQcpk9yHjvoOCChCLWhs9nqE1eVm8NlpQ8qUpCkKFrWpc
+qbR395sO6GZ600Sw++SVYJsIUouqOmV9nKEPmqHzbFVuSLxlRQOmQzwgSAKCT27f
+OUPvgcP35RjMmLUI0Ej8oxjYxelyjK5mSFP50NUS08o67+BRJItdpt2nXfYoDvzE
+9DrIcwVbO3QuOl4Q1roVsF7TZW3Is+khkxzzAFlfmUxBeGJmNca3hZzMF6PUJxgm
+yWOBrtcASx/gCu1FLGaW
+=CAnG
 -----END PGP SIGNATURE-----
diff --git a/app-text/multitail/files/multitail-6.0-as-needed.patch b/app-text/multitail/files/multitail-6.0-as-needed.patch
new file mode 100644
index 000000000000..c4d6f3fea395
--- /dev/null
+++ b/app-text/multitail/files/multitail-6.0-as-needed.patch
@@ -0,0 +1,41 @@
+ Makefile | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 3bdbe33..98d2c46 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,14 +4,15 @@ UTF8_SUPPORT=yes
+ DESTDIR=/
+ CONFIG_FILE=$(DESTDIR)/etc/multitail.conf
+ 
+-CC=gcc
++CC?=gcc
++PKG_CONFIG?=pkg-config
+ DEBUG=-g -D_FORTIFY_SOURCE=2 # -D_DEBUG # -pg #  -D_DEBUG  #-pg -W -pedantic # -pg #-fprofile-arcs
+ ifeq ($(UTF8_SUPPORT),yes)
+-LDFLAGS+=-lpanelw -lncursesw -lutil -lm $(DEBUG) -rdynamic
+-CFLAGS+=-funsigned-char -D`uname` -O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG) -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DUTF8_SUPPORT
++LIBS+=`$(PKG_CONFIG) --libs ncursesw panelw` -lutil -lm
++CFLAGS+=-funsigned-char -D`uname` -Wall -DVERSION=\"$(VERSION)\" $(DEBUG) -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DUTF8_SUPPORT
+ else
+-LDFLAGS+=-lpanel -lncurses -lutil -lm $(DEBUG) -rdynamic
+-CFLAGS+=-funsigned-char -D`uname` -O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG) -DCONFIG_FILE=\"$(CONFIG_FILE)\"
++LIBS+=`$(PKG_CONFIG) --libs ncurses panel` -lutil -lm
++CFLAGS+=-funsigned-char -D`uname` -Wall -DVERSION=\"$(VERSION)\" $(DEBUG) -DCONFIG_FILE=\"$(CONFIG_FILE)\"
+ endif
+ 
+ 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
+@@ -19,10 +20,10 @@ OBJS=utils.o mt.o error.o my_pty.o term.o scrollback.o help.o mem.o cv.o selbox.
+ all: multitail
+ 
+ multitail: $(OBJS)
+-	$(CC) -Wall -W $(OBJS) $(LDFLAGS) -o multitail
++	$(CC) $(CFLAGS) $(LDFLAGS) -Wall -W $(OBJS) -o multitail $(LIBS)
+ 
+ multitail_ccmalloc: $(OBJS)
+-	ccmalloc --no-wrapper $(CC) -Wall -W $(OBJS) $(LDFLAGS) -o ccmultitail
++	ccmalloc --no-wrapper $(CC) $(CFLAGS) $(LDFLAGS) -Wall -W $(OBJS) -o ccmultitail $(LIBS)
+ 
+ install: multitail
+ 	cp multitail $(DESTDIR)/usr/bin
diff --git a/app-text/multitail/multitail-6.0.ebuild b/app-text/multitail/multitail-6.0.ebuild
new file mode 100644
index 000000000000..94c5c3d766fe
--- /dev/null
+++ b/app-text/multitail/multitail-6.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/multitail-6.0.ebuild,v 1.1 2013/11/27 07:39:19 jlec Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Tail with multiple windows"
+HOMEPAGE="http://www.vanheusden.com/multitail/"
+SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="debug examples unicode"
+
+RDEPEND="sys-libs/ncurses[unicode?]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RESTRICT="test" # bug #492270
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+
+	use x86-interix && epatch "${FILESDIR}"/${PN}-5.2.6-interix.patch
+
+	sed \
+		-e '/gcc/d' \
+		-e '/scan-build/d' \
+		-e 's:make clean::g' \
+		-e "/^DESTDIR/s:=.*$:=${EROOT}:g" \
+		-i Makefile || die
+
+	tc-export CC PKG_CONFIG
+
+	use debug && append-flags "-D_DEBUG"
+}
+
+src_configure() {
+	emake UTF8_SUPPORT=$(usex unicode)
+}
+
+src_install () {
+	dobin multitail
+
+	insinto /etc
+	doins multitail.conf
+
+	dodoc Changes readme.txt thanks.txt
+	doman multitail.1
+
+	dohtml manual.html
+
+	docinto examples
+	use examples && dodoc colors-example.{pl,sh} convert-{geoip,simple}.pl
+}