From 8eaa8d14f1d7c721a20c8e939040df4d22e07213 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Thu, 29 Jun 2017 00:12:09 +0200
Subject: [PATCH] readline, fix recipe for x86 (#1481) (#1482)

---
 sys-libs/readline/patches/readline-7.0.patch  | 24 --------
 .../readline/patches/readline-7.0.patchset    | 57 +++++++++++++++++++
 sys-libs/readline/readline-7.0.recipe         |  2 +-
 3 files changed, 58 insertions(+), 25 deletions(-)
 delete mode 100644 sys-libs/readline/patches/readline-7.0.patch
 create mode 100644 sys-libs/readline/patches/readline-7.0.patchset

diff --git a/sys-libs/readline/patches/readline-7.0.patch b/sys-libs/readline/patches/readline-7.0.patch
deleted file mode 100644
index b384cd956..000000000
--- a/sys-libs/readline/patches/readline-7.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur orig/readline-6.3/support/shlib-install readline-6.3/support/shlib-install
---- orig/readline-6.3/support/shlib-install	2009-10-28 14:30:18.057409536 +0100
-+++ readline-6.3/support/shlib-install	2013-05-03 01:12:28.695468032 +0200
-@@ -117,7 +117,7 @@
- # Create symlinks to the installed library.  This section is incomplete.
- #
- case "$host_os-$host_vendor" in
--*linux*|freebsd*-gentoo)
-+*linux*|freebsd*-gentoo|haiku*)
- 	# libname.so.M -> libname.so.M.N
- 	${echo} ${RM} ${INSTALLDIR}/$LINK2
- 	if [ -z "$uninstall" ]; then
-diff -ur orig/readline-6.3/support/shobj-conf readline-6.3/support/shobj-conf
---- orig/readline-6.3/support/shobj-conf	2009-10-28 14:20:21.057147392 +0100
-+++ readline-6.3/support/shobj-conf	2013-05-03 01:12:38.631242752 +0200
-@@ -109,7 +109,7 @@
- 	;;
- 
- # All versions of Linux (including Gentoo/FreeBSD) or the semi-mythical GNU Hurd.
--linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo)
-+linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo|haiku*)
- 	SHOBJ_CFLAGS=-fPIC
- 	SHOBJ_LD='${CC}'
- 	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
diff --git a/sys-libs/readline/patches/readline-7.0.patchset b/sys-libs/readline/patches/readline-7.0.patchset
new file mode 100644
index 000000000..1603f2379
--- /dev/null
+++ b/sys-libs/readline/patches/readline-7.0.patchset
@@ -0,0 +1,57 @@
+From 9332d4a9ebdc68e524de21d9696b2f01a351142f Mon Sep 17 00:00:00 2001
+From: Begasus <begasus@gmail.com>
+Date: Wed, 28 Jun 2017 23:33:35 +0200
+Subject: applying patch readline-7.0.patch
+
+
+diff --git a/support/shlib-install b/support/shlib-install
+index cfec3bd..33a6612 100755
+--- a/support/shlib-install
++++ b/support/shlib-install
+@@ -118,7 +118,7 @@ INSTALL_LINK2='${echo} cd $INSTALLDIR && ${echo} ${LN} $LIBNAME $LINK2'
+ # Create symlinks to the installed library.  This section is incomplete.
+ #
+ case "$host_os-$host_vendor" in
+-*linux*|freebsd*-gentoo)
++*linux*|freebsd*-gentoo|haiku*)
+ 	# libname.so.M -> libname.so.M.N
+ 	${echo} ${RM} ${INSTALLDIR}/$LINK2
+ 	if [ -z "$uninstall" ]; then
+diff --git a/support/shobj-conf b/support/shobj-conf
+index 1f64433..69f0693 100644
+--- a/support/shobj-conf
++++ b/support/shobj-conf
+@@ -123,7 +123,7 @@ sunos5*|solaris2*)
+ 	;;
+ 
+ # All versions of Linux (including Gentoo/FreeBSD) or the semi-mythical GNU Hurd.
+-linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo)
++linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo|haiku*)
+ 	SHOBJ_CFLAGS=-fPIC
+ 	SHOBJ_LD='${CC}'
+ 	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
+-- 
+2.7.0
+
+
+From 04f549414f3a1b44a9cf8adb80276a5ede2d2578 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Wed, 28 Jun 2017 23:44:47 +0200
+Subject: fix requires = tinfo -> ncurses
+
+
+diff --git a/readline.pc.in b/readline.pc.in
+index fbfca8a..7584d83 100644
+--- a/readline.pc.in
++++ b/readline.pc.in
+@@ -7,6 +7,6 @@ Name: Readline
+ Description: Gnu Readline library for command line editing
+ URL: http://tiswww.cwru.edu/php/chet/readline/rltop.html
+ Version: @LIBVERSION@
+-Requires.private: tinfo
++Requires.private: ncurses
+ Libs: -L${libdir} -lreadline
+ Cflags: -I${includedir}/readline
+-- 
+2.7.0
+
diff --git a/sys-libs/readline/readline-7.0.recipe b/sys-libs/readline/readline-7.0.recipe
index a24fc5e39..25c182b6f 100644
--- a/sys-libs/readline/readline-7.0.recipe
+++ b/sys-libs/readline/readline-7.0.recipe
@@ -15,7 +15,7 @@ LICENSE="GNU GPL v3"
 REVISION="3"
 SOURCE_URI="ftp://ftp.gnu.org/gnu/readline/readline-$portVersion.tar.gz"
 CHECKSUM_SHA256="750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334"
-PATCHES="readline-$portVersion.patch"
+PATCHES="readline-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"