summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2014-07-11 22:25:59 +0000
committerAnthony G. Basile <blueness@gentoo.org>2014-07-11 22:25:59 +0000
commit79680ab14d8e9c6372319a5b948c32577f20bfe5 (patch)
treef43d6b0eca91fd742405e2238410dd8b6bbb423d /x11-terms/mrxvt
parentNot much to take care of here, but I'll adopt it (diff)
downloadhistorical-79680ab14d8e9c6372319a5b948c32577f20bfe5.tar.gz
historical-79680ab14d8e9c6372319a5b948c32577f20bfe5.tar.bz2
historical-79680ab14d8e9c6372319a5b948c32577f20bfe5.zip
Fix on uclibc, bug #497742
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0xF52D4BBA
Diffstat (limited to 'x11-terms/mrxvt')
-rw-r--r--x11-terms/mrxvt/ChangeLog5
-rw-r--r--x11-terms/mrxvt/Manifest30
-rw-r--r--x11-terms/mrxvt/mrxvt-0.5.4.ebuild12
3 files changed, 28 insertions, 19 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/Manifest b/x11-terms/mrxvt/Manifest
index 822822d302dc..34957a0fe947 100644
--- a/x11-terms/mrxvt/Manifest
+++ b/x11-terms/mrxvt/Manifest
@@ -4,23 +4,23 @@ Hash: SHA256
AUX mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch 380 SHA256 1b4e5c18d5c2ed6c9e1f198a97e058016b8e6589e1690d494c01bc899c010f30 SHA512 703d32e803d73e21ba5c746bcea94331c43e53e6f1b84a86271e94ae4cc59e6c4e8d4e86cbc3e29d594aec04881db57f587b1e94c42249b2beef08e718b69a36 WHIRLPOOL debf23f883f87477f770659763100e655520c67941552900826aefcbbaf665e5e73098c7c902dbd0890b12583327c17d04f5d2e02a30eaca481088871ee9f51d
AUX mrxvt-0.5.4-libpng14.patch 841 SHA256 3d37317e91085a8e0ae080590f41bbfbc8159a6b932fc6bc0b9fb6351ef28ba7 SHA512 469f2f40b5f09e645be2f59166787b01eb76215e2810b9804d088ed271f743f8d1850e4ed60795674e5d041364e465da8e1f2159131a5b48cab015a106b383c6 WHIRLPOOL 89f50ebfed2760ff395d403edda2616ed26504f028f04d14a15d27ac54645d47c8510dd5abfca6937fef954bb6588bfb0c9cd5520e8da599b487bc403775ca50
DIST mrxvt-0.5.4.tar.gz 603978 SHA256 f403ad5a908fcd38a55ed0a7e1b85584cb77be8781199653a39b8af1a9ad10d7 SHA512 572bb4dda9f9b9dcb597f3185922646523bce34003f536acca82992f68f8f7c1a5f2778d626f805ea2cd061e8451fbbf12010e5d655221f76b83440825c80992 WHIRLPOOL 770acc0b03e13e113bfe01f56e9ec58ddba6ae2ee989236836f4dd557dfa89334af8404e3fb5a08e1ffea989852f89871004eb6bd46a2d0b2b9830aaf1dc0455
-EBUILD mrxvt-0.5.4.ebuild 3337 SHA256 7f5ba56009b85da456b0f6f8fc214fa9ec148c9cb73bcbea098093bf536c6568 SHA512 9067b0761bfc60591674840c898327de1f8ace2ee19604038cfe41b2cac9e56a64930e61125120f3d3ce44c6351ce35142d53009fefa936bd6f9ac5536e1461b WHIRLPOOL 242d248dcb603a05a5e1e2e3232c8583a984786234ca2680d86f4c9c3ec8156a845f7d1df62bd44652c9361d90fdb3cca62370b5a7932efc7b3ecbf435115584
-MISC ChangeLog 11197 SHA256 63756d12a8c2e3f8e96bea83545ac4720e418f9ba84fad478bf5e3ca0d1f05ba SHA512 dce1778818c8348933e98e53a54f6f0aa88c2e647d8be106e1073f2cb36ee72cd1607fde964e167b5961b18178e74edc6642a41071d08fb9e01f644c4dc30b62 WHIRLPOOL 1d5f48cff24b22103cf2782b81acdd57fdad4681f78aed315a313e26a4aebab81cca1e7235c7a2f7b87ae5871c8766537e095d8d11aacc3b7176454ceeb2abc7
+EBUILD mrxvt-0.5.4.ebuild 3582 SHA256 ceece615544ab9a59c039dfa9aab66cd7cc03f064c14921fd8c1b863f3ef507c SHA512 d63f26a65341a2147f33dad957471e0ba8c0b8f71a61384ddbdda90ce2c51686b3dec7e1fba053bb41d2956876619be07b4829f1cd84aa06b8daf9aee1ee022c WHIRLPOOL d5dbc962f6e81f24c9f64ef8dbff89c03c0ac47da7a036a9665db5a7da1e1eb94785afa18bdd59a864b26ad072e9a45fd5fe79e5aad54c95031892d9e41aca9a
+MISC ChangeLog 11302 SHA256 218e53716e2fa783ac471cd3fa520d77694e22b6464f9685f8fe36160f7da41b SHA512 a726c23ce34d629d1bc7d134da10d07cdec430812058d4f73ac0e9d83131b20bea57103248658e08a2766ab84b848252c3b6d031265fa86258970075700e2623 WHIRLPOOL c75c3c3a69f582c2c7f106c5416d99748f0af285b4e60b8304a3e3ae3f2a0e5cc75679e1d5aea67061672473b9f8ba64a69d9d79e707cd7d8745b857d1d0aade
MISC metadata.xml 388 SHA256 0551ba584948704b099788b77761b8c885ff8915f2822e381804fc647f432710 SHA512 da16d60974fbc8bcf31f580d6b4db8773756306742dafcae1d73a7b3a8e6344e0faa69aee38ca264f6ab6e9e9bb87da103f5a38ea547f2fb5f9d501e84355134 WHIRLPOOL 84f324c215030c40e8fd7f978c6e39a68e03f714ee9a6a17fb71502da2057023df7813c5b4af6c349fdc19d2473bf749eb86ef87434659352210c3ca78efed6f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJTwGH1AAoJEJOE+m71LUu6Y/IP/jmSCB50lRFa1q14CeMiY8GS
-JX3jxC+w2glvIbYTFFgSJwm1U01/8JjUPUyMqJUfGM5hiBnbeyceJlYqVQZfU9Ky
-ncSJ/Qx0cNXH0/JICbFX39F6dmej3xxLqMirxy0qEkM/PcRxJc1sY7Wh9BgMGW1+
-P4b4vj7s3esuAu2xe/QMLaDXy+ypE5Mob1B0odzvDeBgb4svy4Ink5CSqS7JzfZp
-aUmQd+P20zbVjyweK1CbWYTutZmxzZ+72btk8K5hQO3kydAtnzEooSERtlx/f+tB
-8QwsXWLtZRXqEQdEYM+X16jrBZ0Xs1Zaah5EPeATvT/V+KzODg6AT7CmvVBOuaN7
-Tc6/v8agv2fuDwTJbTjkhzDskoCJyRmW0nr37GY1w4LYLZjLGz6cLyQIOHbH/CXL
-XzlFi7VMWr0CdcJ6mOSI49yFhvK11HPcKv/PTuOl3GZUVuoQ2ErFB1XrItLnWkk0
-ghzrANm4JfkKHrnW/oUuzZq61h7mmjLQ2xGuaZM9SEo9bsW98Mjp7HkhLkgrHQhu
-T35Fj97PQoi9CCpwoNTykO5jMldvucnWGzzOAHFCpnu38sfvcv8rSgau+uHLVloq
-UvAA+cbJPpRjGXG1P8vmdoi80IaP/f++3AD8WmBm6fzNb7+gLM1XVJEZPumZ2D6S
-z50x9Hspt+xFZSV8o9Oq
-=V1cX
+iQIcBAEBCAAGBQJTwGS3AAoJEJOE+m71LUu6vj8P/0xrJ0I/EuFRBxe6iTY+D0gx
+OypY3TbJjtkzfa4KoctIe+EpHs3GpEEHXpy0pZzqya45F677E2Fu5IC1cNgDEtHm
+unzHEWDiFAZAHXMcsK+CF7OOcqVGYvJ5T4lXWXHW9vr+3VLqCnpYTSSPVHpC8m54
++GG1nwf0FFqkYToC2KzW8GDgnykdpVz7vQY7LayI1M6Nk+5bnZhfpKPKKYK1OsBB
+utC+W/kD0AYSFnvGjy8X5aOnZBDCb2EWeor/59jCiuQ+ASvqw7k42Aq7Ykrlk2wK
+GT+JmkT1CJZcrRfVlXdz1VZOUHr/DIbElDW+Wk1ZGR1+Ry1tI9aQY+HVIocIlZg3
+6GThM2mD5DAoP0CGBNUvtMXdClNDtG07dJ1IhmYnSj9Br6bc2nYM3RA0tVRtbvTV
+HEpY5NYwc8uP6Os6DMWI2VYXNUAMn35J0ni5ARFt6nos8ZAhTjoRl2gykAu4WPfI
+Ep1U5lX3GLh3fjcUwMi+kbTxWz+ry69qxbYYv2THck2UKPd38nGNxohkGSiHPyCJ
+kN4zzzfaU/oLg7wlv/Gfj+NYyeHXlTKh8c00z83cQI4t6l/jr7RnF+wKtSqW/q/t
+y0EHdKFzZU19Ry0hCwX+yAxBn7fwcAQzJENM8PJHa7FtmxqrQhenCrfDbf1pP8R5
+QJyD7FFf3YzslfkrUfYq
+=yMnW
-----END PGP SIGNATURE-----
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() {