Add fix from upstream for building w/readline-6.3 #503234 by Thomas D..

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 79 insertions, 5 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index ed919fb82bbb..c0781280331e 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.347 2014/02/08 21:17:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.348 2014/03/09 07:01:44 vapier Exp $
+
+  09 Mar 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/lvm2-2.02.105-readline-6.3.patch, lvm2-2.02.105-r2.ebuild:
+  Add fix from upstream for building w/readline-6.3 #503234 by Thomas D..
 
   08 Feb 2014; Robin H. Johnson <robbat2@gentoo.org>
   files/dmeventd.initd-2.02.67-r1, files/lvmetad.initd-2.02.105,
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index cc6e6689e5a8..9a24fd97814b 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX clvmd.confd-2.02.39 213 SHA256 68442d5c9da81bad79fa6b1beaede290f24ea6a4e4415f3d9f4e37ccca6c524a SHA512 9614c4188c9a5bcf398d1f521b52d7e2281fcdf76265fdaca4acda22be282d8468e82b54a2661d5753f4b9a442ebe93a60daf87c846db4e275a283f71c9fd8e2 WHIRLPOOL b429d06a5200d37f46e72190060bc2fe866575ba441b5f92d12d939bdc5d411ef37e895a7369bbaaf733b1a0d0305a05d499c7ae6c7360fe8767e902d2a3bfc4
 AUX clvmd.rc-2.02.39 3684 SHA256 476289b24539eeff4ff94c34c129da755d8cff11f1e950b40f9fad212ca5c05d SHA512 18879fa7925d6181b9ebfd7a6379ee4f25c9c83474ba69684e63811867754b1c52dd6568324aafd9fe391fd2fd4aadf931870cefc21b72d2f81f9e04ef123f41 WHIRLPOOL 095a313a6c66f0dec1d42233dd1853879ade6334c474ac747c2cd87c24b433381547a6fdecedf784db060549ece8dc24870d4981bcf590bf39e57dd7bad92120
 AUX device-mapper.conf-1.02.22-r3 15 SHA256 57777904f12a35617e5a4193c964ebb32396452487fd02353e71e16e7b46bc22 SHA512 1846e0ca1be7170d4c0beb694a23aea4d19b24b99a248bb0f4e034286a6beede0a8efc474b0c237e33ee72c86c93b6238f2d5ea23e224765acba99c90633261e WHIRLPOOL a0de185e849cd4d1aab9f145a6330f267ca547ba4ec7720be6f33e2c3c4c182b8674ea220b894f0fc806fe6637ba7bcabd739ca57b53b3efa5fad0cf1e57ba2e
@@ -14,6 +17,7 @@ AUX lvm.rc-2.02.105-r2 3071 SHA256 a5754ffa0a05a0c29a9f6b5acf1b21dd313581fd6156c
 AUX lvm.rc-2.02.95-r2 3001 SHA256 66844a70cedf61b2cd3373cdbd8f8c1afa817bde0764fdf5cf488857532d4553 SHA512 e5d34447db2fc050256222eff427703341b839a80c833c8ca2a814663b790bdffad967fa41bda8c182d5217dda629057a571520cb0a2e4cb06d5a8a241746ea3 WHIRLPOOL 102baf82bd5573ce90bdb19307ccf71026b6e03fd9e471a123f17072e0ac3785ecf017bb2cd81adf7a5332f33b42330e7c484c8804ed57d4ad6fb1cdd4c119f7
 AUX lvm2-2.02.100-selinux_and_udev_static.patch 3223 SHA256 15c20b1e16443932c560164ad9546ab01279601b0f0dd7fdc54f9cf3cd3ffee3 SHA512 232dc2908073254e23878098734cc65449c7be0707f7f0f7e73561e7b204bf71cf75ff5ee143b0f9f301ddabac1595c59cb0ec80c665464e8fe3f1b65a3eb0c2 WHIRLPOOL fdd908aa01cc3790be4ff8e7b2180cd526065c826657924edfccdc53f5c2266a12911c1ebface9de649b1974ff77401e94a64de507b5c72415614e5726dd4a2a
 AUX lvm2-2.02.105-pthread-pkgconfig.patch 1277 SHA256 29cbbee5b78b248eb1e92b2ad1d90ac115e449b56c50b9cc6dc5dc4e463d16d8 SHA512 8092b9e972f5a7d23666898f06041ed4ef3cf66f824df8dbe9405cbfc0f58a71953d66eb7dae91089f6a00395b8e2fd402f2a77c2d0238934ec5c8dcd0bff25b WHIRLPOOL d0c25bf4b1beeeacd9afb4716870563316321091d412ec481791d96e59b0245b8beff5c34dbfa297cb620c31cc59454a007090df0fa7aabb2653fe64eba76bd3
+AUX lvm2-2.02.105-readline-6.3.patch 1606 SHA256 0c599fc01ac3a83a0cf16ebbe110854268ad5d8d3019c8edc4fbb80267d3a364 SHA512 f55a9a311a457f4aaafdd11e0a9beda1b9a34ae8c93b313c6d53e25085093ac0755bc416baa6dcd9a4d21713bf94efc6ae1269ca6410ad8de956f6c641912d50 WHIRLPOOL c67c1a20f0abff39c7b93c21e881c97590559c391a540738aba381dee8009044d537c9ab078d2db01992b4e2fb945d9c7f159d2af9ac8cc88d4c64a3eedc38cf
 AUX lvm2-2.02.105-static-pkgconfig-libs.patch 3382 SHA256 cc3cbe1b1511eac87a4915f18206d045f6192d9815580088bacf760ffee06c4d SHA512 3b2bd8b991c380dee73f848a794fb1c53ef601fbaea85185d2494040c6e70519727211cb3adffb36bb115c0eb774d4e4c1298b7d151b21d25924b492ed51034b WHIRLPOOL d4a8d9448e80148f321d46c55daa662735c9b9d9cb758b944eea8a213e60d270676bed610e9ec22dc970b38424465c12d840aeb9c7bc585b8cc07210cc365828
 AUX lvm2-2.02.56-lvm2create_initrd.patch 2032 SHA256 b892d0544e05350e78ea400c16e6fd3657671d9bdf50bfae70505fd79bdda081 SHA512 b2a1705fa6b962027ebc5047583547489afe8ef8d8977c6284a28d0a8b0e05e20e6c48bd6c02a8bb02de9cfb40ac2d6e2a4b8ed8ef8c4ae7b6ea9a29bc4194de WHIRLPOOL cb533df528be0aae4bf50966285ef7a238f810d955ee86d5b446f43944d093732eff6ef8178d1654c4a2c075049ffc11994a99de6291bab1140cb8812be8b8a0
 AUX lvm2-2.02.63-always-make-static-libdm.patch 1420 SHA256 1c498b5efce77ed16bbbfcd9e0ec6da404a9c70c7ad0959ed7b60733adfcfc21 SHA512 67735af9e51369d5b3b400cab4f9ffa25f8dea1c1ec3d01855cb3c5aeade5c39a35eeed43f3a665204fe6bbba4ca43baecd845330bf26d023064b94ca3d1317c WHIRLPOOL f273c893acedfd658e7947abb5f4b528f15de9808ae3862ec8a9189ba7de4ea6998dc67dbc7af642ca3a27bba2ef8eabfd48337f532145f88500988f564313b1
@@ -37,8 +41,25 @@ DIST LVM2.2.02.97.tgz 1193141 SHA256 edda82012e8a9e1f0b00ba5a331468d3e0201992be1
 EBUILD lvm2-2.02.103.ebuild 7433 SHA256 3ae965eab7c06b32ea1ec3718d4e866b9a53582959957d2e6afdadceb1c68847 SHA512 13c4c12b44bb2a9f46fc12afa5978e15ef31e90be18d917c86189cf02eba3edb6f5e7390cfd38c0d1716ccacdc18582c826b8933f3ecccba1d11cbbbb536d4d8 WHIRLPOOL b88350388468f6a00924e1b0ef2d99eb1b55a763a0951c8b51de621519cffe11ad53b18cc49a02cd8122caf9e4dd97f49b9aae1ac1dbb1c925cac63e82e5927a
 EBUILD lvm2-2.02.104.ebuild 7447 SHA256 60427d917e406d2304c2dcde1023f6ee85a5582015adf8e5258548d505c3909a SHA512 9c531cf71747749a325853fc9e11ea8745e06de4b7da319d14ccf7bec754996699ad0d45df18690d9891ea75c2d8c363df50ddaac7eee463df287797a09b3622 WHIRLPOOL 4cc1f6b2e0d8e37f78e25fa6ebd6860ceba7c5631aabf280cbfd5667a12ad77112d6fb7079e7bc863224ded27ecb8a162a259a411e7c5d9b8e3e48b4d93a56a8
 EBUILD lvm2-2.02.105-r1.ebuild 8236 SHA256 8f7abc8cc9d580e8c78261f2c3e57b4cbdc30f872edbe5ef8c143a6ff8c28eeb SHA512 2d4932af73281567e3a5cb1ca686a99205a66f0c5128ce5fc1ba371a6078679b87fd13c6a47a049c89823ed6e0a5ba4ea08c1bbc9634c6e545ad494fc632056c WHIRLPOOL 34af5fdfa3916e809a7b19faaf40b68d5aae23c693cb8859a4bdbf18adba0e155871a2ae756962b8c198ef997a2afb2c4d73ab487760713be60081448551debb
-EBUILD lvm2-2.02.105-r2.ebuild 8477 SHA256 43abc4ad75b66743e7a87854a177dfe476a2ec61219be3a8ac7fa777c2fd52bc SHA512 e51543dd1c01af08087ddad76a636c137ec86231a90c687ed7320f982c08c48862687dbc942df85374fe1674c144cd37dd6f28aa67e7a601f51fd9915d340af1 WHIRLPOOL f95b0a7d2606f511be22d7974db72fd67725e3eaabc94bdd729ab0dba289fa04c3d8a395acd412244c0246cc7ff87e6158f9190ce332bd44275d78281e1add70
+EBUILD lvm2-2.02.105-r2.ebuild 8540 SHA256 c3d234e184cc6707196343a3215efa289847dd03f35933b3e580b0ab0109a6d6 SHA512 c8a60e153a7f46627c803e8a183defae047c67f66f40578e95a7fe4b5a6830e2167d7081595e5d3f3e6dd55f13c00e7e772713b0e708ec6f32da97ae8ce08337 WHIRLPOOL 16fd1fb43174259cdf7ce9c99711bf2e19d5d726af79762d37f0ce47e92489174a8d2c4519ad40d9f4f184d51bbdd353082bcfe6f93bf9ff7e1f5b1d6ff872ab
 EBUILD lvm2-2.02.105.ebuild 7735 SHA256 deb2c1d1db4f69ce1a99a495ed94fbb8a99c99f5c186936655ad79a905c28f3a SHA512 e5818de3c6334a87d0706c2db70bd41ebdc8a9208766669e1f6dab625af05bb01584d92f25ab4ce71bdbc34cb85d34afd17fc14f6509fc29201536b5a7fc21a3 WHIRLPOOL 3572a6a375da4f88867deb65936e4045a6da5bbf4a443dd4d24f3453160f906a91b62aa4425b22602096ed9d3d6a23e0df940ce37c13f4e0274266717facf71b
 EBUILD lvm2-2.02.97-r1.ebuild 9081 SHA256 643e286908d2c5a040b325776bb889f8a924065c6a8679c8eac9a185eb698652 SHA512 49cf7c78644aa964d827aaa69a20db1998c312eeae4b64e95bd191ede106d3ffb699bdcc0be6025f088a88258eef7cfda76bd0f0a821825408a98c9bd3f6b7f1 WHIRLPOOL 46550b1891a9a3d6323c176844c3057d9980121547147b5a7289cdaa31dbb361c759221e60122a504ceefac86fb6c4515139327e6934331f7df76afb1d65e6b5
-MISC ChangeLog 66488 SHA256 9b763ef24a96fba47c3ab85ab5c87c061e16aa9de79d022f793d808c0f60b07d SHA512 8a63e4aee4c8fc8ce9d60c647571dd89c1cf9d2bfd307a6dd9c7393a1a2d9f4a614582be293d3ae012d4b0eec66bfdca273a6bcb910665aac13ef8b5e903563a WHIRLPOOL e86e7a29cb7ef3b47fa6060b8143592bf2588dfd194404b049d20c52c56c1c2b11662f32484441dbb358b7e0c288b9ff206e14b20aeb30faec4a78efa6b6e25a
+MISC ChangeLog 66680 SHA256 8c12ca90eebb14bcefeb83d5e41a38e3c1af3e458c7b17cdee610d61d08ccb86 SHA512 2b0b08aba1fbfde465eae0b654bba401997001a0407747a5537f8ffd8bd70939767642d131a6da28621039d9601532acfca03ba71e243b304b580e5762d2e6d9 WHIRLPOOL a9b3ae145b649c6ea7f8050b3ecdfa8d318183542ece63722fceaa396c5e5998e5e2b555be1d14073cba6249e9c3c4221584e5dc273748b1a8bfc7db997147c5
 MISC metadata.xml 995 SHA256 a2be36b695dab8ef65772af8d808cdc7a5c5855e2c9104060e7232e21b984216 SHA512 642abe2a196ffeaf3a67530befa8dc123f1e3e1238bf55d38c0affea82ab5b2f9e56da6b303410845c625494a59323ac8570f40e0f8a406db76295059958361a WHIRLPOOL cba3a6dd12fafc4719050082ee740d03ef0ed68e074b556a0c1f15f4a7b328d9b826d2b7ab3d3f19546de92e907a3fd466792db67423cb8630d5313154d5b6f2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAEBCAAGBQJTHBHgAAoJEPGu1DbS6WIAQBcP/2OwqmpHxv3HinzQ0zfBAIxT
+zIlk6avrRAQAL7lww+yiZsybOaXoJwl1N2yK7MyejLRhXGUuYZOIype0EFrWCj/+
+UFrUvWQhiO4E47bJjo7keGF94tiOlRyIlm82x14SMy/9ULT2BHEbrLVBc9gfBPeb
+VFY76fglnKBKa+ZaYJ2nF0kMK2TKNIJbkRFCfge/WaofoVNaARYazkq88RyNeiX5
+XBpSHU79Tv4MgoIlzGtaCD4lLecc6861I/TmiUJ3m/lNrH6NWcCfCVWqOK1SonkW
+ejk8146RcbWCQzgIi86gCnmYHpezJ4dr0yE7Dz0HZISG8TuC7RsL50tO4LOtC76H
+PqKj+dM20zl18OjmEpe3gQv1GwgVcDzheDub+c22E1qHWhN6utEGjCpikdNEL0Cb
+cNxjSL7T2I5d/RY7x649lpx2WdkiahYHit0l47CJdtaMB6UJ9k8EbMx2hzSWh7ja
+kQATib1OJ/0Ut3kd2xp3e1rNfr8XrY4O4l6eclOFp6DpxlgxkeqNteBn0wRd9uLQ
+yu0FJWyTJyFpEqLlfmIL7RV/rJKGoSfAiLF4TPqqXjDNiDzahVbjdGBBleLiBdif
+InSOQfEr673oxrRnFqMt4NyOnvdn4HCUrTkDjWpYjc8xgFkv4QC0YhVhCAQSX9Hw
+wpg1W9ieo6NEGS2suDZX
+=YViP
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/lvm2/files/lvm2-2.02.105-readline-6.3.patch b/sys-fs/lvm2/files/lvm2-2.02.105-readline-6.3.patch
new file mode 100644
index 000000000000..c96b7ee67ac5
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.105-readline-6.3.patch
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/503234
+
+From 216c57eed72fee52e99bb5d014c9de535e631f58 Mon Sep 17 00:00:00 2001
+From: Zdenek Kabelac <zkabelac@redhat.com>
+Date: Thu, 6 Mar 2014 16:04:19 +0100
+Subject: [PATCH] readline: switch to new-style readline typedef
+
+Based on patch:
+https://www.redhat.com/archives/lvm-devel/2014-March/msg00015.html
+
+The CPPFunction typedef (among others) have been deprecated in favour of
+specific prototyped typedefs since readline 4.2 (circa 2001).
+It's been working since because compatibility typedefs have been in
+place until they where removed in the recent readline 6.3 release.
+Switch to the new style to avoid build breakage.
+
+But also add full backward compatibility with define.
+
+Signed-off-by: Gustavo Zacarias <gustavo zacarias com ar>
+---
+ WHATS_NEW   | 1 +
+ tools/lvm.c | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tools/lvm.c b/tools/lvm.c
+index 51e9293..f9ab438 100644
+--- a/tools/lvm.c
++++ b/tools/lvm.c
+@@ -27,6 +27,7 @@ int main(int argc, char **argv)
+ #  include <readline/history.h>
+ #  ifndef HAVE_RL_COMPLETION_MATCHES
+ #    define rl_completion_matches(a, b) completion_matches((char *)a, b)
++#    define rl_completion_func_t CPPFunction
+ #  endif
+ 
+ static struct cmdline_context *_cmdline;
+@@ -185,7 +186,7 @@ int lvm_shell(struct cmd_context *cmd, struct cmdline_context *cmdline)
+ 	char *input = NULL, *args[MAX_ARGS], **argv;
+ 
+ 	rl_readline_name = "lvm";
+-	rl_attempted_completion_function = (CPPFunction *) _completion;
++	rl_attempted_completion_function = (rl_completion_func_t *) _completion;
+ 
+ 	_read_history(cmd);
+ 
+-- 
+1.9.0
+
diff --git a/sys-fs/lvm2/lvm2-2.02.105-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.105-r2.ebuild
index 2bb2d15a6e59..db5988ca9846 100644
--- a/sys-fs/lvm2/lvm2-2.02.105-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.105-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.105-r2.ebuild,v 1.5 2014/02/04 02:46:32 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.105-r2.ebuild,v 1.6 2014/03/09 07:01:44 vapier Exp $
 
 EAPI=5
 inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic
@@ -75,7 +75,7 @@ src_prepare() {
 		-e "s:CC ?= @CC@:CC = $(tc-getCC):" \
 		make.tmpl.in || die #444082
 
-	sed -i -e '/FLAG/s:-O2::' configure{,.in} || die #480212
+	sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212
 
 	# For upstream -- review and forward:
 	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
@@ -87,6 +87,7 @@ src_prepare() {
 	#epatch "${FILESDIR}"/${PN}-2.02.100-selinux_and_udev_static.patch #370217, #439414
 	epatch "${FILESDIR}"/${PN}-2.02.105-static-pkgconfig-libs.patch #370217, #439414 + blkid
 	epatch "${FILESDIR}"/${PN}-2.02.105-pthread-pkgconfig.patch #492450
+	epatch "${FILESDIR}"/${PN}-2.02.105-readline-6.3.patch #503234
 
 	eautoreconf
 }