Fix building against sys-libs/readline-6.3 (bug #503314 by eroen).

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

6 files changed, 41 insertions, 9 deletions

diff --git a/sys-block/parted/ChangeLog b/sys-block/parted/ChangeLog
index 2899841d8e3d..ea60aa0382a3 100644
--- a/sys-block/parted/ChangeLog
+++ b/sys-block/parted/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-block/parted
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/ChangeLog,v 1.45 2014/01/30 12:38:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/ChangeLog,v 1.46 2014/03/04 00:25:41 jer Exp $
+
+  04 Mar 2014; Jeroen Roovers <jer@gentoo.org> parted-2.4.ebuild,
+  parted-3.1-r1.ebuild, +files/parted-2.4-readline.patch,
+  +files/parted-3.1-readline.patch:
+  Fix building against sys-libs/readline-6.3 (bug #503314 by eroen).
 
   30 Jan 2014; Jeroen Roovers <jer@gentoo.org> parted-2.4.ebuild,
   parted-3.1-r1.ebuild:
diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index e2de808db061..05b5b5321cea 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -2,17 +2,19 @@
 Hash: SHA256
 
 AUX parted-2.4-no-gets.patch 343 SHA256 d9d984baa7b742e2201c34b36233dceeca5f97ce245fcfca50881a42f6479366 SHA512 9538ad4c6fcc26662395f1cc768c297db0e864b5912346819d71aa85affdede68e96e43d3d5c1249971d921c33595e8980b8298430510924b7bf6f6982dabf5c WHIRLPOOL b6f4b9e7b6a68a7a662345e56bcef560272db1e91eb328ac2f73fcadfeba084ffeab0c1576c59aa942461ee14ed17649ed708e68d9262888732afb7ebdb10e00
+AUX parted-2.4-readline.patch 340 SHA256 22ed598c1e56b0b11a8d238ca304e05d480a5eb25833098f617484909a4416bd SHA512 965a24fd7a9c21b65ce3b55618c127b102a6e0b3783b6ed020d032d3aa572d0323ff845b390e1cb6460ac089f308b7e18b875ada2aebb5e5e8726c4beb7a8da5 WHIRLPOOL 5077c7b9ef49661a4533845c66ad17295a1832cb3e7791cba8e762d592656a2614d3d794e4c89eda69e1f78810671e8c919b8af8bd85f00b3801a36608ec584c
+AUX parted-3.1-readline.patch 340 SHA256 a6ee5fd919a2a035309b70decce60514587a27d1603f361a48dbaf2757b8a8cc SHA512 a32774fb51fee399a2d2248415efc3a9ebe948c342f42704b38b23abfa1067845e8dffd606cb24ed5f971ce7ec3e18b707f72c0d00cb20a4d0dc6350dbb12c29 WHIRLPOOL bd494816afd1c0310848538233509212397d0add3b60579264a4ca2b00babcd2144b708318c26b5e2791787e439df18921e6fc521f931298ec96476f0179260c
 AUX parted-3.1-zfs.patch 4767 SHA256 86dda57387dda83ca0380264cd8536c21cb59f91e83def29194b67e3ab07770c SHA512 2970595d4d507b5fddc3506430c5fa5f4778c493733879289e1ae6314442a29930b97acf3cdf1b1b0ff26c3c5d3b5bf4b1300a3a4ba35daf2d654a8c0d75863d WHIRLPOOL 74585b9a4f5553a7c8b3b2b6eb3871f8353ec1566dafbaea2010c995a6895f89330ff9593b58ee4bc119b7bcc4ed4f155bb279a426767031cfef70e66cd723d6
 DIST parted-2.4.tar.xz 1516412 SHA256 508ff75591b9c8cc9d06f1e0b1db1a082a4b0c1b9d4efaac48b4ca46370d9073 SHA512 1f7ac11079981b176c1157bd6d858e67394bb4be9b622f91d4e78412a41c696809ed60912b8b94f3a2a924b2f43638dd5d6cb6f4c28e8dc63a2d421380cb5477 WHIRLPOOL 688a44c88ffd99523f17eb5c8722cf4ee09bd0af105ab45a7bd08050682345288182f90bbebf6fed8bdbb1a4deac965084a0f430ef6490d154671de58de50574
 DIST parted-3.1.tar.xz 1524344 SHA256 5e9cc1f91eaf016e5033d85b9b893fd6d3ffaca532a48de1082df9b94225ca15 SHA512 f29a67a16cf79f08abbfc5eeb6ad0480d834aa50e715378626dc89e3b12ce71f19202e9f38429e5521ebe877c4e74ff1e08f0b0ecbdbe79ba1c51fdcbef6e852 WHIRLPOOL 8e4c0b3f045405acbf5eab8d72d46450cb5c6adc50b9eba4ad4a9600da9ea203b412cf151d03782b045dc7f6232bd79ace85d01ce9d2faba458ee48b9df00de9
-EBUILD parted-2.4.ebuild 1994 SHA256 4b0792452268d058cdf0f268eb10e8f134175cf63aeb0cfafeae0ab4303705c3 SHA512 02c991afc9aa1ea76f3e01f395af160ecfbf4a9f642b119be287c2040a7e445aa9567cd986a1c2fdc540c658d9ced58e6f9b65ad7dc839a392599b37257cdd63 WHIRLPOOL 041e4654c6f10090281981871d7ced8343439f9520de5718b3bb9195fc53ae32fa17e17a9e40e759c304eadf6a948a8197d2694939b74d3ae538638459678430
-EBUILD parted-3.1-r1.ebuild 2159 SHA256 00449b8c06dfca60ba0efd3b8527bf64aa60e54e3d045d0f8160b452dc46838d SHA512 dd50de5e983918e107c6bfcd7547b130d7799b7d7933a13ea2634401418d585980ba99840461e1d7484ec5f150e102796ca0f3a907be87b65e431d5d9c8f5d59 WHIRLPOOL 9303b386f0d6b4eddce3bc2dc263bf648367099cb8bb3573adcee61dd931417347e977a0ff41868688dbcdfafd71f76bfd866cd7d03bb0083afc57270a82e212
-MISC ChangeLog 27763 SHA256 eea8943caecfb1278677e3eaac4e521713e6d85fa5324296398402e879f67cdc SHA512 85b7a61a17e877cb24310428e55193accee2ef4f7fb7f718120e79c7c3b671f5e32e076faa799e121e14b4d422a4cab8fd64834fb1d8f352f004c150ea070b1d WHIRLPOOL a0cec1f56ae7ba20c4fbedc8c45ce4140dfc350c0fc4a24d02b8b394f33c985bc0d7b8cc09f2bd035e06adaa9335830d898506898b7a5a16b4d3497186933da8
+EBUILD parted-2.4.ebuild 2036 SHA256 bdbe3aff61ddfde6a35a6e5d38621aaf3cb34011f659e4787b75acd9d2f9723b SHA512 fbca6311d711aa4503ad79c57b2253333a3ac2d246fed4df036e571929737490177017604ca304bdd88837a137c268cb6df6108d14df31dfb2abdc013dd54792 WHIRLPOOL a34eda0a1d5e12bbc159ae38a325c3dcfda04f7b249a3d43723cf4f75cf1d689e711ca5f1a21f4ac6b0a34c48b87fd932891fb9bbfd6fc3a24b093493a3ed7c0
+EBUILD parted-3.1-r1.ebuild 2207 SHA256 71d5c032cca8c270164b18e1b75e0503b253b7b0972844d28fcd4c4f2abc18b6 SHA512 93c42236684890341326850966031a59b15e305f99cd4852a238ca669c6800d5efee9be60ab5ce72d509ee305a6d4f75505749e38f1b8cd5c8938a661141431f WHIRLPOOL f018161c2b9a9a1cb2123f87f1997c5f8801861b79af206a37eaf198fbc091a8c88dbcd6a799929e4372a49b5cc100a79e102afb002d413b09e0297ef2b5ebc8
+MISC ChangeLog 27993 SHA256 143b36de589117fba0bcb3656b5e7df800f188d5e840e1eecf0b8f2324d11bae SHA512 3d25f8713ada65083f616666e7691c20bcd72681af6af4badec990c2b506a23e7cda0f55af45687eeed5973da5601848719bb96c1d3efab7c2cc4cf56b025403 WHIRLPOOL 714fbc2b9987e2c7728ba809df6eda45358d159c616b74f2ee9b32a69b2f41a62d3a14f43eed97faf906248670997a387bb62987c8900a7226bcf5e9720a2cee
 MISC metadata.xml 654 SHA256 6e27cdd8e0c516256079e3ad9606e7b660a3fe223e3d769c3a5fc265f5d13bd2 SHA512 4e99dbb6bacc84d5dfccf4f56cd474aa5cd9368f23989b71d38101913702f5670af44f41947158b07662fcbee3ddfc36eb8cdf8c3899387a8cf4efd4c24c6ccf WHIRLPOOL 49366ca8e059614582ec750bd215ef79b2090cb615e85d1d5e5d4093c135ff9a4513862ecf9827318163a622df035855b0795ab6405427c4d48712fe2080e0fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLqR7QACgkQVWmRsqeSphN+kgCeKISJl1lH3OM57OdTZ524aNFr
-to4An3Di3Udy/OHBn3Ii8DaG9MaaDK6k
-=xgXb
+iEYEAREIAAYFAlMVHYYACgkQVWmRsqeSphOfXACdGiBEFW7PRnOs9zjxLjfGRi0s
+HNAAn1TP9CbHRKUGZV/OBo6d3aNt6yW9
+=qaks
 -----END PGP SIGNATURE-----
diff --git a/sys-block/parted/files/parted-2.4-readline.patch b/sys-block/parted/files/parted-2.4-readline.patch
new file mode 100644
index 000000000000..5873ed1e5d43
--- /dev/null
+++ b/sys-block/parted/files/parted-2.4-readline.patch
@@ -0,0 +1,11 @@
+--- a/parted/ui.c
++++ b/parted/ui.c
+@@ -1440,7 +1440,7 @@
+ #ifdef HAVE_LIBREADLINE
+   if (!opt_script_mode) {
+     rl_initialize ();
+-    rl_attempted_completion_function = (CPPFunction*) complete_function;
++    rl_attempted_completion_function = (rl_completion_func_t*) complete_function;
+     readline_state.in_readline = 0;
+   }
+ #endif
diff --git a/sys-block/parted/files/parted-3.1-readline.patch b/sys-block/parted/files/parted-3.1-readline.patch
new file mode 100644
index 000000000000..936ec00cbefc
--- /dev/null
+++ b/sys-block/parted/files/parted-3.1-readline.patch
@@ -0,0 +1,11 @@
+--- a/parted/ui.c
++++ b/parted/ui.c
+@@ -1474,7 +1474,7 @@
+ #ifdef HAVE_LIBREADLINE
+   if (!opt_script_mode) {
+     rl_initialize ();
+-    rl_attempted_completion_function = (CPPFunction*) complete_function;
++    rl_attempted_completion_function = (rl_completion_func_t*) complete_function;
+     readline_state.in_readline = 0;
+   }
+ #endif
diff --git a/sys-block/parted/parted-2.4.ebuild b/sys-block/parted/parted-2.4.ebuild
index 3f9e9ddc7e7e..8cbc4c0acc1c 100644
--- a/sys-block/parted/parted-2.4.ebuild
+++ b/sys-block/parted/parted-2.4.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-block/parted/parted-2.4.ebuild,v 1.17 2014/01/30 12:38:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-2.4.ebuild,v 1.18 2014/03/04 00:25:40 jer Exp $
 
 EAPI="3"
 
@@ -32,6 +32,7 @@ DEPEND="
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-no-gets.patch
+	epatch "${FILESDIR}"/${P}-readline.patch
 
 	# Remove tests known to FAIL instead of SKIP without OS/userland support
 	sed -i libparted/tests/Makefile.am \
diff --git a/sys-block/parted/parted-3.1-r1.ebuild b/sys-block/parted/parted-3.1-r1.ebuild
index 092544a78b9b..478b5401ce16 100644
--- a/sys-block/parted/parted-3.1-r1.ebuild
+++ b/sys-block/parted/parted-3.1-r1.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-block/parted/parted-3.1-r1.ebuild,v 1.17 2014/01/30 12:38:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-3.1-r1.ebuild,v 1.18 2014/03/04 00:25:41 jer Exp $
 
 EAPI="4"
 
@@ -47,6 +47,8 @@ src_prepare() {
 		-e "s:have_check=[a-z]*:have_check=$(usex test):g" || die
 
 	epatch "${FILESDIR}"/${PN}-3.1-zfs.patch
+	epatch "${FILESDIR}"/${PN}-3.1-readline.patch
+
 	eautoreconf
 }