commit:     21ffb6946b7e778ddbbe6b7ef4cf74cfc3159bb3
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 27 18:50:13 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Oct 27 18:50:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21ffb694

app-text/multitail: drop 6.4.2-r1

Bug: https://bugs.gentoo.org/874102
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 app-text/multitail/Manifest                        |  1 -
 .../multitail/files/multitail-6.4.1-gentoo.patch   | 31 -----------
 app-text/multitail/multitail-6.4.2-r1.ebuild       | 65 ----------------------
 3 files changed, 97 deletions(-)

diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
index a4fca6b2b477..c919a3bd1dc8 100644
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@@ -1,3 +1,2 @@
-DIST multitail-6.4.2.tgz 155757 BLAKE2B 
aba6fea993e0d91071bddcf6d06767773ad6ea6054436dbd8a7163553b1cdfc03040362b87e9b2d31f8fe2165f213c718904f9295d3ab2076707cabf423ae681
 SHA512 
668c453372ba1e4013aa5191c697bdcaad82c84732841c120a506bee063d2134941e93aed63f96e5aeeb6045829a13aba012f9514dbd9520ab4f1b9b75b42dbd
 DIST multitail-7.0.0.tar.gz 152425 BLAKE2B 
1afbee9501926b860bd063768e6d20b7e6fe97b7ca8eaeb279639f3ef4f32d3c694650e2471abab067add04fbd1ce7b94dfc2f709baca460e9a36a34cb0746d2
 SHA512 
325abc2ec3e55f274b8f080c54e878ee301af1df5761def95b5fee0abe65cc999a2db0184e1d7a7378c048b1766e03f9553262d3bba88c8fad87c4952d1d59ae
 DIST multitail-7.1.2.tar.gz 153409 BLAKE2B 
852f7a0f22581b043c65f24bc1a19ffb0e7fa8c91d8152b58a1127a51b1833cded0b22c5430f96417af277927daefeb73d5acef38bdbc54898cc48ec0a4e9436
 SHA512 
6f006d68a6c0fcfec9f6aada4a1ad0a031b61ea46c60231faa6fd7ea934f6f74ca30f12f8983658c9ae6ae2e08bade9159e3426ed47cd9171d0b190ec9f3e5b5

diff --git a/app-text/multitail/files/multitail-6.4.1-gentoo.patch 
b/app-text/multitail/files/multitail-6.4.1-gentoo.patch
deleted file mode 100644
index 080417b6b302..000000000000
--- a/app-text/multitail/files/multitail-6.4.1-gentoo.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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.2-r1.ebuild 
b/app-text/multitail/multitail-6.4.2-r1.ebuild
deleted file mode 100644
index 0bc665f54803..000000000000
--- a/app-text/multitail/multitail-6.4.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic optfeature 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 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug examples unicode"
-RESTRICT="test" # bug 492270
-
-RDEPEND="sys-libs/ncurses:=[unicode(+)?]"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-6.4.1-gentoo.patch )
-
-src_prepare() {
-       default
-
-       sed \
-               -e "/^DESTDIR/s:=.*$:=${EPREFIX}:g" \
-               -i Makefile || die
-
-       sed \
-               -e "s:/usr/bin/xclip:${EPREFIX}/usr/bin/xclip:g" \
-               -i xclip.c ${PN}.conf || die
-}
-
-src_configure() {
-       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
-}

Reply via email to