[patch] readline-6.2_p4.patch

readline-6.2_p4.patch (text/plain), 2.35 KB, created by Michael Mair-Keimberger (iamnr3) on 2013-12-25 16:31:02 UTC

--- /usr/portage/sys-libs/readline/readline-6.2_p4.ebuild	2013-02-18 01:01:33.000000000 +0100
+++ sys-libs/readline/readline-6.2_p4.ebuild	2013-12-25 17:17:50.343313915 +0100
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.2_p4.ebuild,v 1.2 2013/02/17 23:40:35 zmedico Exp $
 
-inherit eutils multilib toolchain-funcs flag-o-matic
+EAPI=5
+
+inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal
 
 # Official patches
 # See ftp://ftp.cwru.edu/pub/bash/readline-6.0-patches/
@@ -35,7 +37,11 @@
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static-libs"
 
-RDEPEND=">=sys-libs/ncurses-5.2-r2"
+RDEPEND=">=sys-libs/ncurses-5.2-r2[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r6
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		)"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
@@ -56,9 +62,11 @@
 	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
 
 	ln -s ../.. examples/rlfe/readline # for local readline headers
+
+	multilib_copy_sources
 }
 
-src_compile() {
+multilib_src_compile() {
 	# fix implicit decls with widechar funcs
 	append-cppflags -D_GNU_SOURCE
 	# http://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
@@ -68,10 +76,10 @@
 	# so we can re-use the config cache file between the two.
 	append-ldflags -L.
 	econf \
-		--cache-file="${S}"/config.cache \
+		--cache-file=config.cache \
 		--with-curses \
 		$(use_enable static-libs static)
-	emake || die
+	emake
 
 	if ! tc-is-cross-compiler ; then
 		# code is full of AC_TRY_RUN()
@@ -81,19 +89,21 @@
 			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname)
 			ln -sf ../../lib${l}.a lib${l}.a
 		done
-		econf --cache-file="${S}"/config.cache
-		emake || die
+		econf --cache-file=../../config.cache
+		emake
 	fi
 }
 
-src_install() {
-	emake DESTDIR="${D}" install || die
+multilib_src_install() {
+	emake DESTDIR="${D}" install
 	gen_usr_ldscript -a readline history #4411
 
 	if ! tc-is-cross-compiler; then
-		dobin examples/rlfe/rlfe || die
+		dobin examples/rlfe/rlfe
 	fi
+}
 
+multilib_src_install_all() {
 	dodoc CHANGELOG CHANGES README USAGE NEWS
 	docinto ps
 	dodoc doc/*.ps