gentoo resync : 14.12.2020

3 files changed, 46 insertions, 18 deletions

diff --git a/x11-terms/mrxvt/Manifest b/x11-terms/mrxvt/Manifest
index 28194bf3f858..e143cdb8408e 100644
--- a/x11-terms/mrxvt/Manifest
+++ b/x11-terms/mrxvt/Manifest
@@ -1,5 +1,6 @@
 AUX mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch 384 BLAKE2B ce0573ff1da58ce35c887d3ccc7291231acd0cd57232e0af95404b7ca2100d05db780a1a85878f2b082ef33582b6c202d99a72cafef2e9b247397eb0358e3bd9 SHA512 f2fc886135eb2267d3cdf45d34d151146e473b5b46697e10b44649dde3a05d9ddebbe469d2d7c0b042a26c3986e7a0f88caef049d908517c9cbcf7115688c9b4
+AUX mrxvt-0.5.4-fno-common.patch 430 BLAKE2B b5fa23b21524ab486a9c95863af1f858727778a2cdec363e800666bf3518bd1dcb85fbc9e2cb5e90def93ac4243e89f1aea7c73b9c1bca225f4a88ada9415450 SHA512 1def1813c0db009534259d9319cac827d1dfb0aed3751cba9e1a56fe53ab5819a208f54f7eeef25da26302bf81ab4a43ffc7d9b47a0d60871baed6552bd505a8
 AUX mrxvt-0.5.4-libpng14.patch 849 BLAKE2B d12e4a2e14d0073b28c0fb3c8a834fc4f1f3684a1d98fd432f058dce2bd2b0e0b86b47d5b1b41c612ea7983596709dda1e180665913d760c587bc1ed1d4f4fa2 SHA512 a5f4c3c2c80e1ffbf55d98b5dc563616e924c5286610308041649c21b883354061eca58e058d000ad6e1ad0e845e86bba5a7327fd96def28cf823f1c80f01495
 DIST mrxvt-0.5.4.tar.gz 603978 BLAKE2B 7abea6035620f4d93208458cdf994ad57ae47376364c65fe8e62542f013a65a4760df24c0a2c9d5fdecb76f20b895417792f773a32a7624836cda458b948dd3f SHA512 572bb4dda9f9b9dcb597f3185922646523bce34003f536acca82992f68f8f7c1a5f2778d626f805ea2cd061e8451fbbf12010e5d655221f76b83440825c80992
-EBUILD mrxvt-0.5.4.ebuild 3453 BLAKE2B 0c797c8533a38dda2a98844a9046ec7cc625e5ed8f261118f881258be5991bddd3a69fe3eb82fc675a9b44333cec32fbe6fb5567640dd7672c5da489f58833e5 SHA512 0729c682c6f20a749aec36ed30a811d57ffff38c66bf254910e314a67e772afd87a1b93a1468c31927bf2395050fedfe84c12c50fe69eb94d0aab969da56869e
+EBUILD mrxvt-0.5.4.ebuild 3488 BLAKE2B f20e2fc6fdce8a128948d036425a331fee3de9ec5081fb103a15fa589062ab4de72400f6ae6793e4fb3b9c79b1df78c4c2a0c6d10e66179883dbc665143efc2c SHA512 92d01241b1874cb8ae6fb2ddc8cb000b28c927e0079ebf2179321b0ad5736230bf4e2c291ca74a1dd8581955582904ff19710433fd0edcfdbe0146041e7eaf59
 MISC metadata.xml 478 BLAKE2B a0f3413f95c5926e2fa4294967283d32f94081447f5d37d0f57b81a54cd50f3bd1ba8790eaf23fcbf7e5bdeeff21da5e392030f5869100dffa6478201bf2954b SHA512 fb26a82c0a26b3e23e9307ab811cc05fc6affce3bdf705d9417d8f10de7c8448b506414da9134888f4fc3c6fbf4d261646b77916730df711a0e86952a352ce72
diff --git a/x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch b/x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch
new file mode 100644
index 000000000000..2bb39a423aed
--- /dev/null
+++ b/x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch
@@ -0,0 +1,20 @@
+--- a/src/rxvtlib.h
++++ b/src/rxvtlib.h
+@@ -790,7 +790,7 @@ typedef struct {
+ } action_t;
+ 
+ /* Values for macro_t.type. Must sync this with macroNames from macros.c */
+-enum {
++enum macroFnNames {
+     MacroFnDummy=0,
+     MacroFnEsc,
+     MacroFnStr,
+@@ -820,7 +820,7 @@ enum {
+     MacroFnSaveConfig,
+     MacroFnToggleMacros,
+     NMACRO_FUNCS
+-} macroFnNames;
++};
+ 
+ typedef unsigned char macro_priority_t;
+ typedef struct {
diff --git a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
index 2090e188130d..dbbfd4f073da 100644
--- a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
+++ b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools eutils
+
+inherit autotools
 
 DESCRIPTION="Multi-tabbed rxvt clone with XFT, transparent background and CJK support"
 HOMEPAGE="http://materm.sourceforge.net/"
@@ -15,31 +16,37 @@ KEYWORDS="~alpha amd64 ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 L10N_IUSE="l10n_el l10n_ja l10n_ko l10n_th l10n_zh-CN l10n_zh-TW"
 IUSE="debug png jpeg session truetype menubar utempter xpm ${L10N_IUSE}"
 
-RDEPEND="png? ( media-libs/libpng )
-	utempter? ( sys-libs/libutempter )
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXt
 	jpeg? ( virtual/jpeg )
-	truetype? ( x11-libs/libXft
+	png? ( media-libs/libpng:= )
+	truetype? (
 		media-libs/fontconfig
 		media-libs/freetype
-		elibc_uclibc? ( dev-libs/libiconv ) )
-	x11-libs/libX11
-	x11-libs/libXt
-	xpm? ( x11-libs/libXpm )
-	x11-libs/libXrender"
-
-DEPEND="${RDEPEND}
+		x11-libs/libXft
+		elibc_uclibc? ( dev-libs/libiconv )
+	)
+	utempter? ( sys-libs/libutempter )
+	xpm? ( x11-libs/libXpm )"
+DEPEND="
+	${RDEPEND}
 	x11-base/xorg-proto"
 
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-001-fix-segfault-when-wd-empty.patch
-	eapply "${FILESDIR}"/${P}-libpng14.patch
-	eapply_user
+PATCHES=(
+	"${FILESDIR}"/${P}-001-fix-segfault-when-wd-empty.patch
+	"${FILESDIR}"/${P}-libpng14.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
+src_prepare() {
+	default
 	eautoreconf
 
 	if use elibc_uclibc && use truetype; then
 		# It is stated in the README "Multichar support under XFT requires GNU iconv"
-		sed -i -e 's/LIBS = @LIBS@/LIBS = @LIBS@ -liconv/' "${S}/src/Makefile.in"
+		sed -i -e 's/LIBS = @LIBS@/LIBS = @LIBS@ -liconv/' src/Makefile.in || die
 	fi
 }
 
@@ -102,7 +109,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ -z $RXVT_TERM ]]; then
+	if [[ -z ${RXVT_TERM} ]]; then
 		einfo
 		einfo "If you experience problems with curses programs, then this is"
 		einfo "most likely because of incorrectly set termcap / terminfo"