Version bump.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 114 insertions, 19 deletions

diff --git a/app-text/multitail/ChangeLog b/app-text/multitail/ChangeLog
index 07a8c3270ced..a56bdb8c2341 100644
--- a/app-text/multitail/ChangeLog
+++ b/app-text/multitail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/multitail
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/ChangeLog,v 1.126 2015/04/07 14:08:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/ChangeLog,v 1.127 2015/05/09 09:01:18 jer Exp $
+
+*multitail-6.4.1 (09 May 2015)
+
+  09 May 2015; Jeroen Roovers <jer@gentoo.org> +multitail-6.4.1.ebuild,
+  +files/multitail-6.4.1-gentoo.patch:
+  Version bump.
 
 *multitail-6.3 (10 Feb 2015)
 
diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
index 1a529d55ca47..260be6761660 100644
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@@ -1,30 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX multitail-6.0-as-needed.patch 1825 SHA256 19cbcf61fc9e6cfcce4b8f8cbaebd079586f267063b8332cba14318bb67619c5 SHA512 a6380660523196e6c0339ac46f7ad8aa10ba3bf8d10be1dd65028fba3103df74653d3d9e7277353069d1cfcfc94194bd4ee06751cddf04757d2a54f60c6db58d WHIRLPOOL 42a171e19d3c9d94e6b08e135203a5e3cabdb654a4ac787f9d1d5972afe4cc0c2e94d485e74f606de76fa774d9ba2f0e15179e690416be055c5abca0762bab9c
 AUX multitail-6.3-as-needed.patch 1685 SHA256 b86bf633f0ab4e2bf52032162b599fe70e24f23b9c31057a9f1eec8534a8151e SHA512 29e229d4a7770ac8bb39b6cc6e6e539416760aad68ff2921f50229137d6cb668a59c771ebb87f9707d121c7f02045d8b6f0df4f7557b0ef7abd979a83e78e331 WHIRLPOOL c9fb3cc7511c086c2bc24cc4fc04e5a0dc8696af9b5f64f4a82f9aa8816f8033ca0413ca7223222c673ba5c0bd6c539a48e5e623ea46d5c9a9401b195ec7f1ba
+AUX multitail-6.4.1-gentoo.patch 1440 SHA256 18f0b158eafaf838dac957cfb21ac9db9ecbcc4e1d45cf42d35079346698adc1 SHA512 eb53834c68dc46c22a2d900cf5e8835a98ff9c9b001ae15eb778bb6348bd48b17dea8a1605bfcc9ddad4324300a81013a0a3710e559c00e369ae42cdfb38b6a7 WHIRLPOOL d898950a532daf38f554a7ab111621ae39de898c28e25b7d8854bc96784734eeed24c232afc86456ec464341aaf28ca38e9c32bacd7af4d88beab3c180881ea3
 DIST multitail-6.2.1.tgz 166049 SHA256 1e586cd62c3cdb8089062c9670a6d8588359e2f8030b8b18dbc715ea59d92e11 SHA512 e1515c000c25be6532f590a2d030c44419866994c2744140d124c1b6ac73acf460b3a41ba6e0e8398350c180030eb69d13b537005b0744047d5c5a374b4cb123 WHIRLPOOL a14ec63145f412b21d7c769452c957fda1170daae725113991a8f4c1da19430516b7a27582f183b312a3388a6944beac0de64753684d60cc7255453254c2fd1c
 DIST multitail-6.3.tgz 155410 SHA256 1ba6afc2d0322bc09024664762a2fc7b8055c1d8ceb74acc442c49ccc84b817a SHA512 e16bb8f1db97e24ac917193cfcae77a0933c1d91cbebb8ba3d2f0af3cb9fe3b801b08f5a7b70b6f46c5edb4a251c81d5a8e03ec9599d40857a64f3cfa1f6734f WHIRLPOOL a37443f3ceaaedc1e708503c9cf9df01034a03dcc682406c0d93beb2a5f1c391f1ab0df7762d94fa43af8d155932bf23cd198e8a01b45fd3c5ee5963c62da24f
+DIST multitail-6.4.1.tgz 155717 SHA256 8a6baecf3537c791f70645f3613bfea0c91a22040f2531bfe03b6d0cdd112134 SHA512 14d4785df257aaac8b3c1a5de8aa48a0b6c3e7829867e1fbc8d458636ecafcf506e09b12581cf562e1f503218b1729e47e9197f541bede90dc0a4d5e916b1c8b WHIRLPOOL 467d9fd6d089aebe597475d07217baadcb280ea952ae731310365a55046009c808b16657485c037f54dd746e2103f318c3555de04d4e14f2ab2ef19bbc408543
 EBUILD multitail-6.2.1.ebuild 1221 SHA256 e7a367f9d9022dd7f88fd795c8f674ec03b5556bd65881ff10017f5d5a41ae6c SHA512 fcd240225f91c433573b7c408dd2ba656ad3f3eba3115f1b26e53a0f7a99fd4e933cc6bcad19e83410ef16ccf5a91d6dd1a2471d6c901f3fe2263096510c9db2 WHIRLPOOL 466908636c2075466f041efab6cf49ca7a6dca8f274485725871cd7c410aea111acdd42b9ef1fe877bc3c5e25d7cc0823d43590d94cbf4fbc7e2afd8b54f2a8b
 EBUILD multitail-6.3.ebuild 1424 SHA256 b3419fd3e9df1fca47e9f78f2796a97c424b48ab638ac76688990d79e324599a SHA512 c1c657229e0ab4dd6a99bb0965aa2935356fa8ebadd588fe9fc8182a00827f77673e0a6f8a219684462957bd56e3130123c1bc19f58db1f8300bbf5809ff86ce WHIRLPOOL 4579bc950224af0e5036d4840ee8906bbbb5d1ed5daef5d8cfa88f5d218282de067176164dedd1ef29eca9fa7d78fcac77b6265dfcc67315c15f3934d678a56f
-MISC ChangeLog 15348 SHA256 5d6b5fe453bbd3147793791463bde808406061fa7013a2b9890aca2e63e79a26 SHA512 9391cbb31bf19ed7736601b1a2783965d88bcb458a805606a27145e8260df10903517bd948670891d92aa63d34286e01d9cef5d051665749e0655557af972ed4 WHIRLPOOL 6b191d29fdb3f0abc3a3aa5c2ec7265a0b948617b10ab8e4b8a193de0145e79710fbeecba2e1e28356db5861b7272cc56dcb27e2f8f9cdea0127f2d31c480ef6
+EBUILD multitail-6.4.1.ebuild 1411 SHA256 7596d0302fa2a805748174893cf46a62a577e873a0e17b683c7981e6a8db2bcc SHA512 d40bcde342825bedeeb424af0655fcd32bfe4b8739104522ea972d79f8feb41b91f7a1eb47bda2c5de21f35ac5f32f0490976c1e0504551558e02fbbda137357 WHIRLPOOL 33dd6f028765f2e7049961752bd2abbdb709bd7cd44594308cc6df0b50bff769327d85b9302e864dac411d1e2ea5dc14b767a1b0bb93533312d5f0e24f80b454
+MISC ChangeLog 15507 SHA256 30612139458570bd56ae809aa543190458c542768e279ccbba94e85c5dae932e SHA512 183066dc5196396c89379add975284dd654b891bfd01068481a55429cf883cb354aba7dd4d8fa583e5ac8495675dfc5c359c123a00b8187c51246a5baf07faa8 WHIRLPOOL 1e1ef72ab6b1d07892440570965f46285b29691e59ddab5d2ac486681c98482851d2b0dcb8724248d0c8f43d4ead9827393c8aac48784e80a59be599e36a5afe
 MISC metadata.xml 319 SHA256 becb3d73a94717c596b82746022803d99fe5f8cda1244512c9faa8a7b1c74b66 SHA512 bb561b88d4a4a4e7812eebbaf842cf65d81c7c90fe475793c944ea785715323eb386ce32e8a5759e7580089728b47fe0e1e47b8e05449a781a8a6ec5da2a82bd WHIRLPOOL 12575f9318912d9e8ef1b3bbc91f7d0da0eb3ec2d1ac9126e3981991c691ffacb22b30560a4ea54249f31fb62653efdd0a0b3e6fae828304096d4b1bbca78b91
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVI+TEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViryfIP/0g920V3DPOPil+TThkR/4+d
-/u8zG2OKi0l2gw/xssDp3JtanjeGGg09rFn23/aA/T5pDxN3Xkvteq2CPZoLv1rV
-qye8D28oA7jCP1pG5kjd8zBWFpjFTLa49bqxJR4+gcq5Y5Q2kmXLmvmpoO470qAE
-VcUYDD9xTUQHBN/xSIPwCpox1RE+YePT0NP8+XMLQG4H1rY4SBpWNtKu3S/KPGfx
-jsVQtzFUEU04uy4xWlQPcTJN68Bwg1yWCfUurKVPftHRLcwt6cFrwTWYoy1DRitW
-xWctHHj9yM/iJCFktFPiOGnIRRAHI2cyU4RBp51JCa4LXO4fbSGMrffubiBcBY9l
-FXBYpTQnfefYucoRmEI5Q1tUbPHPr46my1fCUZ/f7OrtDtAPC6nrqtAzKN3V5DB2
-9laa7hi8iLeCIH5hdLAUiSVsuclUEzbFV3fSHHjB8ue+ET18cH35S7fR7qPE0Rrj
-Qk3Zd/JM7EYzxaB+90DRNOBYvZkZu34DN2FiW81kd//BFdscw3lTKy+upYT1tn28
-NqkdUrG322jh5nlXbtqwgPyEad8C7Qfo9x92rpOPI+3RVrY3wx3sEbCV86GwDV6U
-ce4JVsPdbx3t+t8WLYRZLg0Ypifn4TTxjeWy3Cdg/O0DUH3hkTbZrF3/l08kNeaU
-ptrCiJ0aiqCjbTNxSf3h
-=NPdt
+iEYEAREIAAYFAlVNzN8ACgkQVWmRsqeSphPhMACcC2OXHmAABzHlqgshsfoRrNck
+fqkAnApk5a86TepIXd8AJ1iZ1046LCTV
+=5BAK
 -----END PGP SIGNATURE-----
diff --git a/app-text/multitail/files/multitail-6.4.1-gentoo.patch b/app-text/multitail/files/multitail-6.4.1-gentoo.patch
new file mode 100644
index 000000000000..080417b6b302
--- /dev/null
+++ b/app-text/multitail/files/multitail-6.4.1-gentoo.patch
@@ -0,0 +1,31 @@
+--- a/Makefile
++++ b/Makefile
+@@ -8,11 +8,11 @@
+ CC?=gcc
+ DEBUG+=-g -Wall # -D_DEBUG # -pg #  -D_DEBUG  #-pg -W -pedantic # -pg #-fprofile-arcs
+ ifeq ($(UTF8_SUPPORT),yes)
+-LDFLAGS+=-lpanelw -lncursesw -lutil -lm
+-CFLAGS+=-funsigned-char -D`uname` -DVERSION=\"$(VERSION)\" -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DUTF8_SUPPORT -D_FORTIFY_SOURCE=2 -O3
++LIBS+=$(shell $(PKG_CONFIG) --libs ncursesw panelw) -lutil -lm
++CFLAGS+=-funsigned-char -D`uname` -DVERSION=\"$(VERSION)\" -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DUTF8_SUPPORT
+ else
+-LDFLAGS+=-lpanel -lncurses -lutil -lm
+-CFLAGS+=-funsigned-char -D`uname` -DVERSION=\"$(VERSION)\" -DCONFIG_FILE=\"$(CONFIG_FILE)\" -D_FORTIFY_SOURCE=2 -O3
++LIBS+=$(shell $(PKG_CONFIG) --libs ncurses panel) -lutil -lm
++CFLAGS+=-funsigned-char -D`uname` -DVERSION=\"$(VERSION)\" -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 xclip.o
+@@ -20,10 +20,10 @@
+ all: multitail
+ 
+ multitail: $(OBJS)
+-	$(CC) $(OBJS) $(LDFLAGS) -o multitail
++	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -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) $(LDFLAGS) -o ccmultitail $(LIBS)
+ 
+ install: multitail
+ 	mkdir -p $(DESTDIR)$(PREFIX)/bin
diff --git a/app-text/multitail/multitail-6.4.1.ebuild b/app-text/multitail/multitail-6.4.1.ebuild
new file mode 100644
index 000000000000..b8a5c9220b2a
--- /dev/null
+++ b/app-text/multitail/multitail-6.4.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/multitail-6.4.1.ebuild,v 1.1 2015/05/09 09:01:18 jer 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}"/${PN}-6.4.1-gentoo.patch
+
+	sed \
+		-e "/^DESTDIR/s:=.*$:=${EROOT}:g" \
+		-i Makefile || die
+
+	sed \
+		-e "s:/usr/bin/xclip:${EPREFIX}/usr/bin/xclip:g" \
+		-i xclip.c ${PN}.conf || die
+
+	tc-export CC PKG_CONFIG
+
+	use debug && append-flags "-D_DEBUG"
+}
+
+src_compile() {
+	emake UTF8_SUPPORT=$(usex unicode)
+}
+
+src_install () {
+	dobin multitail
+
+	insinto /etc
+	doins multitail.conf
+
+	DOCS=( readme.txt thanks.txt )
+	HTML_DOCS=( manual.html )
+	einstalldocs
+
+	doman multitail.1
+
+	if use examples; then
+		docinto examples
+		dodoc conversion-scripts/colors-example.{pl,sh} conversion-scripts/convert-{geoip,simple}.pl
+	fi
+}
+
+pkg_postinst() {
+	optfeature "send a buffer to the X clipboard" x11-misc/xclip
+}