Version Bump; use src_compile to build; drop old patches

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

diff --git a/app-text/multitail/ChangeLog b/app-text/multitail/ChangeLog
index d62de49dd4077db1482d45ea7f3742943473b648..ea164cee9ce1ee19946e1f45e31a03a276a2b9f6 100644 (file)
--- a/app-text/multitail/ChangeLog
+++ b/app-text/multitail/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/multitail
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/ChangeLog,v 1.124 2014/10/29 10:00:52 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/ChangeLog,v 1.125 2015/02/10 08:19:01 jlec Exp $
+
+*multitail-6.3 (10 Feb 2015)
+
+  10 Feb 2015; Justin Lecher <jlec@gentoo.org>
+  +files/multitail-6.3-as-needed.patch, +multitail-6.3.ebuild,
+  -files/5.2.2-as-needed.patch, -files/5.2.6-buffer-overflow.patch,
+  -files/multitail-5.2.12-as-needed.patch,
+  -files/multitail-5.2.13-as-needed.patch, multitail-6.2.1.ebuild:
+  Version Bump; use src_compile to build; drop old patches
 
   29 Oct 2014; Justin Lecher <jlec@gentoo.org> -multitail-5.2.13.ebuild:
   Drop old

diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
index c31c9d524893b2d912893ce384cfa88848d66f65..2a0e92fe50fbb737802f2b002584ff3052cb7d8b 100644 (file)
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@@ -1,31 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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
+AUX multitail-6.3-as-needed.patch 1685 SHA256 b86bf633f0ab4e2bf52032162b599fe70e24f23b9c31057a9f1eec8534a8151e SHA512 29e229d4a7770ac8bb39b6cc6e6e539416760aad68ff2921f50229137d6cb668a59c771ebb87f9707d121c7f02045d8b6f0df4f7557b0ef7abd979a83e78e331 WHIRLPOOL c9fb3cc7511c086c2bc24cc4fc04e5a0dc8696af9b5f64f4a82f9aa8816f8033ca0413ca7223222c673ba5c0bd6c539a48e5e623ea46d5c9a9401b195ec7f1ba
 DIST multitail-6.2.1.tgz 166049 SHA256 1e586cd62c3cdb8089062c9670a6d8588359e2f8030b8b18dbc715ea59d92e11 SHA512 e1515c000c25be6532f590a2d030c44419866994c2744140d124c1b6ac73acf460b3a41ba6e0e8398350c180030eb69d13b537005b0744047d5c5a374b4cb123 WHIRLPOOL a14ec63145f412b21d7c769452c957fda1170daae725113991a8f4c1da19430516b7a27582f183b312a3388a6944beac0de64753684d60cc7255453254c2fd1c
-EBUILD multitail-6.2.1.ebuild 1290 SHA256 328d411d80963d6aa4bb602b579ce86623f9c71041a1330e2fbe723b2b5c6e43 SHA512 7fd3a95fcb722c84fd4a4ed9816a4d5740b9a27f899c3af784c11209c2f62e832838cd9d4027f430c1b712a00d0c87bf823163c8dd243958bc136644815e0ad9 WHIRLPOOL f9a6df4e7b8749bcc07134ac11ff72669d1c5a5577688f820da58657842624b0f1d2d544b25a6fa30ae8cd118e3631e0904b98f007c4e26ca0f4b8318030d29b
-MISC ChangeLog 14970 SHA256 10720ec5e4b4559ecb6aaa835a497051e6374d0528f6c5effab20d34c77d94cd SHA512 73a090e00640fef77b35c91ecc3e5c461ae292fd4f895221e6150bd038b0a220acff33ebe56d437afc9d11f8cc502846ef03e1f5a7c3604a68052c64bffb9ea3 WHIRLPOOL 91575cf4b8b25239c9c47b6fbc63b9ed60b6f70a908c2dd43d2baf0c16d885f9895a82e4526144e0ee5da1f60d9a8e29a011c14f228fc91ae09354580f2ca146
+DIST multitail-6.3.tgz 155410 SHA256 1ba6afc2d0322bc09024664762a2fc7b8055c1d8ceb74acc442c49ccc84b817a SHA512 e16bb8f1db97e24ac917193cfcae77a0933c1d91cbebb8ba3d2f0af3cb9fe3b801b08f5a7b70b6f46c5edb4a251c81d5a8e03ec9599d40857a64f3cfa1f6734f WHIRLPOOL a37443f3ceaaedc1e708503c9cf9df01034a03dcc682406c0d93beb2a5f1c391f1ab0df7762d94fa43af8d155932bf23cd198e8a01b45fd3c5ee5963c62da24f
+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 a05ad51d80163e5160ac9c49a5edb7e70d8f715f08145a940f6aa7ad32f56126 SHA512 4fe75e2e184080a563452c8eb88cfbcd2377daaac798e224f185baa16dab22f9f9f025f84d70b64c6712020f4409a0ffcc44acd23ada95f70e9567aef639042b WHIRLPOOL 31450f6e443293064fc7552322913b16976b87ad87e97f1d55a8ba2e37491b0b905eabcd9c4e9f3f14c1ceaa5ffe71371a95491bdd8bd7a923b23bd7172faedb
 MISC metadata.xml 319 SHA256 becb3d73a94717c596b82746022803d99fe5f8cda1244512c9faa8a7b1c74b66 SHA512 bb561b88d4a4a4e7812eebbaf842cf65d81c7c90fe475793c944ea785715323eb386ce32e8a5759e7580089728b47fe0e1e47b8e05449a781a8a6ec5da2a82bd WHIRLPOOL 12575f9318912d9e8ef1b3bbc91f7d0da0eb3ec2d1ac9126e3981991c691ffacb22b30560a4ea54249f31fb62653efdd0a0b3e6fae828304096d4b1bbca78b91
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUULrVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJU2b72XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirD+QP/3aXYyAadYF4mKlArWh7A84T
-uq2DFd+J/iO6aR+7TRXk8Ppw1xKmqzhOwzlH72wl6FzAN+Ipv3SP2I8pBPWBMLrE
-Y4LsCboBb4pNTdwMwLR+CwS4rvQj9sIBVrJqfZHnnbMmdOoZyD94dur6W7QdA/rl
-yWJgesMlo6z8ai+jDgrWUCPdkXAZC7yqyhPlrK4z5XsfJCfx4JM9I5+vcXmKsZ3q
-YKpD+TnipIOzAI2OcAyGq0vMNGMbLT+ueb0BESu7+N6jKJ3Cp6PNT2QLkrspmZBP
-gWN5nK8OHqX0s5UWCoXdXKIGE4G5kHXEavTFdyW+Y3zYqdFFlovFcYfapi1fVXk/
-FFTX0ZtfPTmD4UMGlrRPnIQArIPoZAlxB7KyEwhklUHayugKvm4DqT2NRYeOvVCU
-+mfbNEAj8wl4FynM7PgTvTLrSEPCYHadG6mNXpj7FLMHqtmGPb13FD4lBUBo7hZ1
-hy40kpmRw3pJ7SIdbgYl+eufvW9GWA0D27QEJgOPq8lQg6HJBPHxjZFaohUTmdUe
-npWvjeSAQLS0wP3CR4PfVv2GsVpIrvLQltTkHjmKUb25PoAoM0tgP00YmJzfwEXO
-A3bD63s3xnhRJ223IYplhFF8i+Yfuiw3SoTR5GdM0Gljf8m385KV7VZGYOGsazhh
-ZPYxAjdYNSth0vmlUSnH
-=CBHh
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirTpAP/24xvM79JMmqkGOrd19y4r/V
+IdJmTDSwu2kMpNm7AkOoRc69Gzrm2Bpyvl0weaPG2X/gumeYXiC+NIO5gmqRR2C3
+HwW8v7l2J0zaBa3Im1h0mS8txEbFjk0U3/lEN0mxWYV0CteNB6MwYMfmEm6dE4Nw
+jD26y5ssFLmrBw5X4Z2sombb7iM/8qZSAo1c0GU/H9VYC6kBOFd6vTJ5srrQJHQd
+NQ2p81jsCk3eTqLzAKCX/6dv+zrTRc8spItMdFu5smEs7KSzw68cU4WVx7a7CEB5
+vFxnAGuOFIm3nT2kq5YSH7/4F/JAD6/tQv+QnJ5rQSlwToqRDkaLxoqNYS2V2knJ
+Assyj2S6hXTtjfLGSbUvXmiMrQQ5psYBWPknMx1VaeRFs+i6cxk2rmMFDUqgun/r
+dQMb9MFLLa03rv49IC+y/H/ZcQP5Gnl3OcEbnOSM/WHmskcWbP/OrbsBnvXH9dDe
+N4hh6sN0SzauVED3j4v/BNAI0WlUCew0qSNufDoG0hUMm9As8VOVmes8uYpLoYSQ
+dXpe/V3WXbPLMChZ4eitVRucWYJAMUxDLwAZDnIwJdvWiz6m02TvAsKoqqcau0XV
+b/BRoMx+G+YNjdu0ApES7hbQuCDSk3b9Pl56SkV5qaieANhKwYdMRWu/jKZi2zG5
+QzEUe8BNgemyqGw0eBxf
+=tWT4
 -----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
deleted file mode 100644 (file)
index d9ad766..0000000
--- a/app-text/multitail/files/5.2.2-as-needed.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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/files/5.2.6-buffer-overflow.patch b/app-text/multitail/files/5.2.6-buffer-overflow.patch
deleted file mode 100644 (file)
index 9a2ddce..0000000
--- a/app-text/multitail/files/5.2.6-buffer-overflow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/ui.c b/ui.c
-index f74f3d3..37889fd 100644
---- a/ui.c
-+++ b/ui.c
-@@ -2465,7 +2465,7 @@ void regexp_error_popup(int rc, regex_t *pre)
-                       popup_buffer[sizeof(popup_buffer) - 1] = 0x00;
-               }
-               else
--                      strncat(popup_buffer, error, sizeof(popup_buffer));
-+                      strncat(popup_buffer, error, sizeof(popup_buffer) - sizeof(error));
- 
-               myfree(error);
-       }

diff --git a/app-text/multitail/files/multitail-5.2.12-as-needed.patch b/app-text/multitail/files/multitail-5.2.12-as-needed.patch
deleted file mode 100644 (file)
index 1ec5ba2..0000000
--- a/app-text/multitail/files/multitail-5.2.12-as-needed.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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+=`$(PKG_CONFIG) --libs ncurses panel` -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/files/multitail-5.2.13-as-needed.patch b/app-text/multitail/files/multitail-5.2.13-as-needed.patch
deleted file mode 100644 (file)
index af9e5ff..0000000
--- a/app-text/multitail/files/multitail-5.2.13-as-needed.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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_FORTIFY_SOURCE=2 # -D_DEBUG # -pg #  -D_DEBUG  #-pg -W -pedantic # -pg #-fprofile-arcs
--LDFLAGS+=-lpanel -lncurses -lutil -lm $(DEBUG) -rdynamic
-+LIBS+=`$(PKG_CONFIG) --libs ncurses panel` -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/files/multitail-6.3-as-needed.patch b/app-text/multitail/files/multitail-6.3-as-needed.patch
new file mode 100644 (file)
index 0000000..cf29623
--- /dev/null
+++ b/app-text/multitail/files/multitail-6.3-as-needed.patch
@@ -0,0 +1,36 @@
+ Makefile | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index f672e41..7dc6a6e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -8,11 +8,11 @@ CONFIG_FILE=$(DESTDIR)/etc/multitail.conf
+ CC?=gcc
+ DEBUG=-g -O2 -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
++LIBS+=`$(PKG_CONFIG) --libs ncursesw panelw` -lutil -lm
++CFLAGS+=-funsigned-char -D`uname` -DVERSION=\"$(VERSION)\" $(DEBUG) -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
++LIBS+=`$(PKG_CONFIG) --libs ncurses panel` -lutil -lm
++CFLAGS+=-funsigned-char -D`uname` -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 xclip.o
+@@ -20,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) $(OBJS) $(LDFLAGS) -o multitail
++      $(CC) $(CFLAGS) $(LDFLAGS) -Wall -W $(OBJS) -o $@ $(LIBS)
+ 
+ multitail_ccmalloc: $(OBJS)
+-      ccmalloc --no-wrapper $(CC) -Wall -W $(OBJS) $(LDFLAGS) -o ccmultitail
++      ccmalloc --no-wrapper $(CC) $(CFLAGS) $(LDFLAGS) -Wall -W $(OBJS) -o $@ $(LIBS)
+ 
+ install: multitail
+       mkdir -p $(DESTDIR)$(PREFIX)/bin

diff --git a/app-text/multitail/multitail-6.2.1.ebuild b/app-text/multitail/multitail-6.2.1.ebuild
index 9dcec51f3db4b792baa235432c46d57891b690ce..f24e891f69786648f3c3a84daa939b121667e070 100644 (file)
--- a/app-text/multitail/multitail-6.2.1.ebuild
+++ b/app-text/multitail/multitail-6.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.2.1.ebuild,v 1.7 2014/10/29 09:36:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/multitail-6.2.1.ebuild,v 1.8 2015/02/10 08:19:01 jlec Exp $
 
 EAPI=5
 
@@ -23,8 +23,6 @@ RESTRICT="test" # bug #492270
 src_prepare() {
        epatch "${FILESDIR}"/${PN}-6.0-as-needed.patch
 
-       use x86-interix && epatch "${FILESDIR}"/${PN}-5.2.6-interix.patch
-
        sed \
                -e '/gcc/d' \
                -e '/scan-build/d' \
@@ -37,7 +35,7 @@ src_prepare() {
        use debug && append-flags "-D_DEBUG"
 }
 
-src_configure() {
+src_compile() {
        emake UTF8_SUPPORT=$(usex unicode)
 }
 

diff --git a/app-text/multitail/multitail-6.3.ebuild b/app-text/multitail/multitail-6.3.ebuild
new file mode 100644 (file)
index 0000000..6835b08
--- /dev/null
+++ b/app-text/multitail/multitail-6.3.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.3.ebuild,v 1.1 2015/02/10 08:19:01 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
+
+       sed \
+               -e '/gcc/d' \
+               -e '/scan-build/d' \
+               -e 's:make clean::g' \
+               -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
+
+       use examples && \
+               docinto examples && \
+               dodoc colors-example.{pl,sh} convert-{geoip,simple}.pl
+}
+
+pkg_postinst() {
+       optfeature "send a buffer to the X clipboard" x11-misc/xclip
+}