From 2451199993ca809df6c6f2f99cabf8be54d8cceb Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 20 Nov 2016 21:10:24 +0000
Subject: [PATCH] readline: rename 6.3.8 to readline6.

---
 sys-libs/readline/patches/readline-6.3.patch  | 24 +++++++++++++++++++
 ...ne-6.3.8.recipe => readline6-6.3.8.recipe} | 15 +++++++-----
 2 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 sys-libs/readline/patches/readline-6.3.patch
 rename sys-libs/readline/{readline-6.3.8.recipe => readline6-6.3.8.recipe} (90%)

diff --git a/sys-libs/readline/patches/readline-6.3.patch b/sys-libs/readline/patches/readline-6.3.patch
new file mode 100644
index 000000000..b384cd956
--- /dev/null
+++ b/sys-libs/readline/patches/readline-6.3.patch
@@ -0,0 +1,24 @@
+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/readline-6.3.8.recipe b/sys-libs/readline/readline6-6.3.8.recipe
similarity index 90%
rename from sys-libs/readline/readline-6.3.8.recipe
rename to sys-libs/readline/readline6-6.3.8.recipe
index 46d99a878..d6ce64913 100644
--- a/sys-libs/readline/readline-6.3.8.recipe
+++ b/sys-libs/readline/readline6-6.3.8.recipe
@@ -11,7 +11,7 @@ Readline in applications which desire its capabilities."
 HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
 COPYRIGHT="1989-2011 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
-REVISION="4"
+REVISION="1"
 SOURCE_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.3.tar.gz"
 CHECKSUM_SHA256="56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43"
 for i in {001..008}; do
@@ -32,7 +32,7 @@ ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	readline$secondaryArchSuffix = $portVersion compat >= 6
+	readline6$secondaryArchSuffix = $portVersion compat >= 6
 	lib:libhistory$secondaryArchSuffix = $portVersion compat >= 6
 	lib:libreadline$secondaryArchSuffix = $portVersion compat >= 6
 	"
@@ -42,12 +42,15 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
-	readline${secondaryArchSuffix}_devel = $portVersion
+	readline6${secondaryArchSuffix}_devel = $portVersion
 	devel:libhistory$secondaryArchSuffix = $portVersion compat >= 6
 	devel:libreadline$secondaryArchSuffix = $portVersion compat >= 6
 	"
 REQUIRES_devel="
-	readline$secondaryArchSuffix == $portVersion base
+	readline6$secondaryArchSuffix == $portVersion base
+	"
+CONFLICTS_devel="
+	readline${secondaryArchSuffix}_devel
 	"
 
 BUILD_REQUIRES="
@@ -59,7 +62,7 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:patch
 	"
@@ -73,7 +76,7 @@ PATCH()
 	done
 }
 
-defineDebugInfoPackage readline \
+defineDebugInfoPackage readline6 \
 	$libDir/libhistory.so.6.3 \
 	$libDir/libreadline.so.6.3