commit: 777b8eccb294ecae84fe00016b329265c8dace8a
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 3 14:31:32 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Dec 3 14:31:45 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=777b8ecc
x11-terms/mrxvt: bumpt to EAPI=7
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
.../mrxvt/files/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch | 4 ++--
x11-terms/mrxvt/files/mrxvt-0.5.4-libpng14.patch | 8 ++++----
x11-terms/mrxvt/mrxvt-0.5.4.ebuild | 9 +++++----
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git
a/x11-terms/mrxvt/files/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch
b/x11-terms/mrxvt/files/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch
index a52a10269bc..bf5362b3ee3 100644
--- a/x11-terms/mrxvt/files/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch
+++ b/x11-terms/mrxvt/files/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch
@@ -1,7 +1,7 @@
Index: src/tabbar.c
===================================================================
---- src/tabbar.c (revision 337)
-+++ src/tabbar.c (working copy)
+--- ./src/tabbar.c (revision 337)
++++ ./src/tabbar.c (working copy)
@@ -1327,7 +1327,7 @@
if( p.we_wordc > 1)
rxvt_msg( DBG_ERROR, DBG_TABBAR,
diff --git a/x11-terms/mrxvt/files/mrxvt-0.5.4-libpng14.patch
b/x11-terms/mrxvt/files/mrxvt-0.5.4-libpng14.patch
index a475b70685d..1c221593709 100644
--- a/x11-terms/mrxvt/files/mrxvt-0.5.4-libpng14.patch
+++ b/x11-terms/mrxvt/files/mrxvt-0.5.4-libpng14.patch
@@ -1,7 +1,7 @@
http://repos.archlinux.org/wsvn/packages/mrxvt/trunk/libpng14.patch
---- configure.ac
-+++ configure.ac
+--- ./configure.ac
++++ ./configure.ac
@@ -952,7 +952,7 @@
if test "x$support_png" = "xyes"; then
AC_CHECK_LIB(
@@ -11,8 +11,8 @@
http://repos.archlinux.org/wsvn/packages/mrxvt/trunk/libpng14.patch
[],
[support_png=no],
[-lz -lm]
---- src/mpng.c
-+++ src/mpng.c
+--- ./src/mpng.c
++++ ./src/mpng.c
@@ -83,7 +83,7 @@
display_depth = XDefaultDepth(display,XDefaultScreen(display));
diff --git a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
index 3355069ef63..5d841cb7c68 100644
--- a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
+++ b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
inherit autotools eutils
DESCRIPTION="Multi-tabbed rxvt clone with XFT, transparent background and CJK
support"
@@ -31,8 +31,9 @@ DEPEND="${RDEPEND}
x11-base/xorg-proto"
src_prepare() {
- epatch "${FILESDIR}"/${P}-001-fix-segfault-when-wd-empty.patch \
- "${FILESDIR}"/${P}-libpng14.patch
+ eapply "${FILESDIR}"/${P}-001-fix-segfault-when-wd-empty.patch
+ eapply "${FILESDIR}"/${P}-libpng14.patch
+ eapply_user
eautoreconf
