Link libxcmd against readline #432644 by David Badia.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 61 insertions, 10 deletions

diff --git a/sys-fs/xfsprogs/ChangeLog b/sys-fs/xfsprogs/ChangeLog
index bfeae37d4084..c80345a21e15 100644
--- a/sys-fs/xfsprogs/ChangeLog
+++ b/sys-fs/xfsprogs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/xfsprogs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.151 2012/08/19 17:11:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.152 2012/08/25 23:10:10 vapier Exp $
+
+  25 Aug 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/xfsprogs-3.1.8-readline.patch, xfsprogs-3.1.8.ebuild:
+  Link libxcmd against readline #432644 by David Badia.
 
   19 Aug 2012; Raúl Porcel <armin76@gentoo.org> xfsprogs-3.1.8.ebuild:
   alpha/ia64/sh/sparc stable wrt #422225
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index eb3b4124de8c..eea476085143 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,17 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX xfsprogs-3.1.1-sharedlibs.patch 3155 SHA256 4faf261ea393421297a15745fcda184aa088ec5b1456f0fdf92c2053070ebf00 SHA512 2bdd3c4944e6b43cc91d2c36923b5071a17f190efb0393ab87859f5796b5d539b00e7c1410307292a865586bc4c04e938ec85146417655932fabb6ca4f7357da WHIRLPOOL b94ddb39787b77bea19d103234ac9d2a72b593faa437c3d65bab72978237c7127ecbe94a7261447fe0d2f4d715c3016fa40724eb5fd0cb7327a7f380e8b47be8
-DIST xfsprogs-3.1.7.tar.gz 1401080 SHA256 e150914210ac5fd29c098ef0fd94bdec51d2fb231cf9faa765c16ec6d75c8eaa
+AUX xfsprogs-3.1.8-readline.patch 918 SHA256 8e2bbe1c9541893df8405ec603181f464088ef44dd7c0257dd2eb919cb8237ef SHA512 9dd9b9dcd603c095fa0da501f08fd4dc52d31e2edb100cac0c074c05508e04dd92a13ca4bc053067a0c53c661d1c433910266c9463f8999734d73d1861cb0c01 WHIRLPOOL 275c44346ff2ddbd08d1364ea5c91d51dd1c127c4583f1ad5ddae05aa8801b9496c204b24bf879cd828a7f0fef6ca4cb3cf9bb129aa95e0665a6ab3a0a3007d7
+DIST xfsprogs-3.1.7.tar.gz 1401080 SHA256 e150914210ac5fd29c098ef0fd94bdec51d2fb231cf9faa765c16ec6d75c8eaa SHA512 3e35adb72c3ce3fc2c40ad733d2e091f89430ef168e1d7c1bd705667b414777e55dd6e5f806556744c3c150efab45b4b54c91ef9847f94a84372ff8ae6b1a43c WHIRLPOOL 4a52f10970718009c6ebbf519bbead23fa9075d8bddf206e060c9f2480978b5e271939fae3486ddc52f32c3e13f8d14a7715022d9968d08147981c359e416cc0
 DIST xfsprogs-3.1.8.tar.gz 1399333 SHA256 74409e2e3748074999df25c00f722621659a0bd3607e677f0bcc4373b8c93eab SHA512 55f325e2284a88f21f05b8a836b654de16109e509315b9f443888331e7f63bdf4bbd749643d7879c8007b95b98c7ff0a6574bb1e8cf809abe481b7584466524a WHIRLPOOL d637b01c68e3673a2b70f271068c63ad83bb18cd47252ee190204fcb94b103c513612f7111346c8eb6194d4043a236cc6ab5c1b94e4d4175ed7f34231e759601
 EBUILD xfsprogs-3.1.7.ebuild 2841 SHA256 a8a04e8cb2439fc251d5db5e4df3da07c5f2c17c39177e941728fbbfafa31948 SHA512 41cc3ea7fb1522b5d6b632ea5ce07b4e37e087db52af89e96a7b09a9a2a03f77a6e13767a6e15f27159f6eb39b05405d7a29dc1ec334375359a5416f41fa485f WHIRLPOOL 180dd1419cf987a29637991812e61ec6b3d756e2e1925a3dde7510cea78f5795260d254edfe54e3fcd3b57c3180afa541404da02049d5552c5841aa46628bcba
-EBUILD xfsprogs-3.1.8.ebuild 2741 SHA256 545d39e88933b0893a8a346b28b38dadd24edea2bcbaf418429f03a716300476 SHA512 430d1129d0f9e2bb8d145de4bbe602f063bae996535af679af09ff0aaff45cb69197a7106f0704cf0aef57d3fb25e2f10cd9a15b42ccb0400cb9da4887329c6b WHIRLPOOL c16a2f97b741d592d85e9f58f33abfbfe706601dd0496ee65681d61fee0d76f421627a344c7b2d6e5dc81f54f1faccab7008c18872f323369e70caacf8c33da3
-MISC ChangeLog 23458 SHA256 8e5f5d5a053602ac6e68dedd1266561a25f1fb3c814622b8db294fbfea430df6 SHA512 4d39910fc48a7f5e6eb35b137b1c8b78ab6dbcfeab79b5f5a369ec4f87e9e2932360d69b54cee75123b4d588d4f37d7ec02554249617b28aa2665771afded630 WHIRLPOOL 8e108ec33e0144f100a2502e4500c6184e62fb4d6aaeb8d4c6af4a52920d967278db788cbe981b02d997d3dd1070bef24a20389f95ec7cb834cf9cb0cbf0ceae
+EBUILD xfsprogs-3.1.8.ebuild 2789 SHA256 d5f4275941551a6e8e21fc922b402fdf3d751558ddaf52666956974884c2757b SHA512 98ab63c01121d6cce1301a15682ccecbe3dca3e851c18deda96f780814706c21264397fef4f0a772cbf28191476f94991562efbcc06ab562d36b2420801b2978 WHIRLPOOL 8a1a71c9a43a6f5b4d28acb249b721d7e323142c97e2f7cb7b511d1883901739bcde3a288206a996a53ea1f3518be4be89c6030dcd79914cc81b4340c7c94715
+MISC ChangeLog 23627 SHA256 c3bcbe0bef18686e0175e47f9a09b1b957ac6e1f1f898b77da792ba75a91e5a8 SHA512 98eabe6ce2f4aeeada8f395a14b19ba2d1fef479a0090409fbc30bf9d5f24760af6ccff8cd140bb205a0c1ce34c398fee9e825b05419bdb85f98dbf13296071f WHIRLPOOL 35815279f15cc3c9a6983ba803e3df32c7f07c6e63afdc5cf805ffd73c3b42985c117de7f9845035db9c72b51a75c7a064f4c2a5fce212c3f54e3f1a769116ca
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlAxHkoACgkQuQc30/atMkD3zwCggz2f7p5uchvDRVKO8eT8zBwq
-QkwAnAicZzkVtEXSgEYBzlf8I+Hk5R1U
-=lcW7
+iQIcBAEBCAAGBQJQOVtpAAoJELEHsLL7fEFW2L0P/1kK+02aoDcdD+lrs9J8oj0x
+HWcw6gm3JH8KiC2pLs5oMiPWIyn4IId3j1mDQL03ukyYomhI2+BCFtuIsQdH03A6
+d7uJ3hcJNHPOUcHhEf7pUudL9yv7TzaM4UhT2nDWt2t/4RlO0zNinUtwMMU7K46o
+vyQgRB+orZmH4XCZR7+jpQAWsHxd9tw3T/Pz3ilA2337Yxs+HpFeK8X8v6HjcKYi
+eCt27ij8K566duSRGQL+TYa4SlI9tIEhcHvy1iWapuwWfsvys/pkC0wrJ8e4XRUY
+39nunQuBKdgTYtUaLGzQO2GvxQTP3WJq62g/Sgmg+E4ta9LDyRg/tKmKs5E+UyTt
+aIHIqYchbiKdWurcol3HuRtEhyL2khP/rGZtURj4FmB3Iqnvc74eWtSdEpX9KdIM
+K4XM1BG74q+pPfwxsDAC/STyR7vzesZ8wHuXj+rxn3AeiBBqSDqL9kuWzOhXVzpe
++PjHzaUf/nT+oGP23sMuB0I7VRTMCXcF/kbZj4fW2O0dlZDfGSVqF2Z6rz1kbCVf
+zxQ4GMsvLuKPo8EeJFLWs9sVxh5ZDm59RnHtwXs+c98OznT6r7e3gWaS0I+8P4h6
+1drAgETjPS5aFZ/mYOGH5NdiZak0nOw6LIs6TcTbUN04gRNwIWrmmA9fn9Tydydd
+pvjcdnnVvWoQRTZ3D030
+=l0K8
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/xfsprogs/files/xfsprogs-3.1.8-readline.patch b/sys-fs/xfsprogs/files/xfsprogs-3.1.8-readline.patch
new file mode 100644
index 000000000000..c4f794e186e2
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-3.1.8-readline.patch
@@ -0,0 +1,35 @@
+From 52548f087e9c5ff05c9f43c859114cf2066f133b Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 25 Aug 2012 19:06:28 -0400
+Subject: [PATCH] libxcmd: link against readline
+
+This library uses readline funcs (the input.c file), so we need to link
+this shared library against it.
+
+URL: https://bugs.gentoo.org/432644
+Reported-by: David Badia <dbadia@gmail.com>
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ libxcmd/Makefile |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libxcmd/Makefile b/libxcmd/Makefile
+index b3544f4..ce082a5 100644
+--- a/libxcmd/Makefile
++++ b/libxcmd/Makefile
+@@ -22,10 +22,12 @@ endif
+ 
+ ifeq ($(ENABLE_READLINE),yes)
+ LCFLAGS += -DENABLE_READLINE
++LTLIBS += $(LIBREADLINE) $(LIBTERMCAP)
+ endif
+ 
+ ifeq ($(ENABLE_EDITLINE),yes)
+ LCFLAGS += -DENABLE_EDITLINE
++LTLIBS += $(LIBEDITLINE) $(LIBTERMCAP)
+ endif
+ 
+ default: ltdepend $(LTLIBRARY)
+-- 
+1.7.9.7
+
diff --git a/sys-fs/xfsprogs/xfsprogs-3.1.8.ebuild b/sys-fs/xfsprogs/xfsprogs-3.1.8.ebuild
index 3dca993aeec0..d41a11343ee6 100644
--- a/sys-fs/xfsprogs/xfsprogs-3.1.8.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-3.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.8.ebuild,v 1.8 2012/08/19 17:11:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.8.ebuild,v 1.9 2012/08/25 23:10:10 vapier Exp $
 
 EAPI="4"
 
@@ -38,6 +38,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.1.1-sharedlibs.patch
+	epatch "${FILESDIR}"/${PN}-3.1.8-readline.patch
 
 	sed -i \
 		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \