[patch] slang-2.24.ebuild.patch, v2

slang-2.24.ebuild.patch (text/plain), 1.99 KB, created by Michael Mair-Keimberger (iamnr3) on 2014-01-08 17:55:44 UTC

--- /usr/portage/sys-libs/slang/slang-2.2.4.ebuild	2013-11-19 14:01:34.000000000 +0100
+++ sys-libs/slang/slang-2.2.4.ebuild	2014-01-08 18:51:33.698974940 +0100
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-2.2.4.ebuild,v 1.14 2013/11/19 12:41:59 slyfox Exp $
 
 EAPI=4
-inherit eutils
+inherit eutils multilib-minimal
 
 DESCRIPTION="A multi-platform programmer's library designed to allow a developer to create robust software"
 HOMEPAGE="http://www.jedsoft.org/slang/"
@@ -16,11 +16,15 @@
 
 # ncurses for ncurses5-config to get terminfo directory
 RDEPEND="sys-libs/ncurses
-	pcre? ( dev-libs/libpcre )
-	png? ( >=media-libs/libpng-1.2:0 )
-	cjk? ( dev-libs/oniguruma )
-	readline? ( sys-libs/readline )
-	zlib? ( sys-libs/zlib )"
+	pcre? ( dev-libs/libpcre[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.2:0[${MULTILIB_USEDEP}] )
+	cjk? ( dev-libs/oniguruma[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r8
+	)"
 DEPEND="${RDEPEND}"
 
 MAKEOPTS="${MAKEOPTS} -j1"
@@ -34,9 +38,12 @@
 	# we use the GNU linker also on Solaris
 	sed -i -e 's/-G -fPIC/-shared -fPIC/g' \
 		-e 's/-Wl,-h,/-Wl,-soname,/g' configure || die
+
+	# slang does not support configuration from another dir
+	multilib_copy_sources 
 }
 
-src_configure() {
+multilib_src_configure() {
 	local myconf=slang
 	use readline && myconf=gnu
 
@@ -48,7 +55,7 @@
 		$(use_with zlib z)
 }
 
-src_compile() {
+multilib_src_compile() {
 	emake elf $(use static-libs && echo static)
 
 	pushd slsh >/dev/null
@@ -56,11 +63,12 @@
 	popd
 }
 
-src_install() {
+multilib_src_install() {
 	emake DESTDIR="${D}" install $(use static-libs && echo install-static)
+}
 
+multilib_src_install_all() {
 	rm -rf "${ED}"/usr/share/doc/{slang,slsh}
-
 	dodoc NEWS README *.txt doc/{,internal,text}/*.txt
 	dohtml doc/slangdoc.html slsh/doc/html/*.html
 }