summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2014-07-11 22:25:43 +0000
committerAnthony G. Basile <blueness@gentoo.org>2014-07-11 22:25:43 +0000
commiteb40461ddffeec6f5c0fbf31ba3f41be975de65b (patch)
treefb61d7354b2f1d7a10dd209df1c9ea25c750d29e /x11-terms
parentNot much to take care of here, but I'll adopt it (diff)
downloadgentoo-2-eb40461ddffeec6f5c0fbf31ba3f41be975de65b.tar.gz
gentoo-2-eb40461ddffeec6f5c0fbf31ba3f41be975de65b.tar.bz2
gentoo-2-eb40461ddffeec6f5c0fbf31ba3f41be975de65b.zip
Fix on uclibc, bug #497742
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'x11-terms')
-rw-r--r--x11-terms/mrxvt/ChangeLog5
-rw-r--r--x11-terms/mrxvt/mrxvt-0.5.4.ebuild12
2 files changed, 13 insertions, 4 deletions
diff --git a/x11-terms/mrxvt/ChangeLog b/x11-terms/mrxvt/ChangeLog
index 0e03b6d8d8ec..967b260e61d7 100644
--- a/x11-terms/mrxvt/ChangeLog
+++ b/x11-terms/mrxvt/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-terms/mrxvt
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/ChangeLog,v 1.80 2014/07/11 22:14:02 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/ChangeLog,v 1.81 2014/07/11 22:25:43 blueness Exp $
+
+ 11 Jul 2014; Anthony G. Basile <blueness@gentoo.org> mrxvt-0.5.4.ebuild:
+ Fix on uclibc, bug #497742
11 Jul 2014; Anthony G. Basile <blueness@gentoo.org> metadata.xml:
Not much to take care of here, but I'll adopt it
diff --git a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
index 2a80af5426f5..03c5e906c876 100644
--- a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
+++ b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/mrxvt-0.5.4.ebuild,v 1.9 2012/09/17 03:41:04 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/mrxvt-0.5.4.ebuild,v 1.10 2014/07/11 22:25:43 blueness Exp $
EAPI=4
inherit autotools eutils
@@ -21,7 +21,8 @@ RDEPEND="png? ( media-libs/libpng )
jpeg? ( virtual/jpeg )
truetype? ( x11-libs/libXft
media-libs/fontconfig
- media-libs/freetype )
+ media-libs/freetype
+ elibc_uclibc? ( dev-libs/libiconv ) )
x11-libs/libX11
x11-libs/libXt
xpm? ( x11-libs/libXpm )
@@ -35,6 +36,11 @@ src_prepare() {
"${FILESDIR}"/${P}-libpng14.patch
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"
+ fi
}
src_configure() {