hasufell    14/04/18 13:21:45

  Modified:             ChangeLog
  Added:                slang-2.2.4-r1.ebuild
  Log:
  add multilib support wrt #496586, patch by Michael Mair-Keimberger
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
BDEED020)

Revision  Changes    Path
1.135                sys-libs/slang/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/slang/ChangeLog?rev=1.135&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/slang/ChangeLog?rev=1.135&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/slang/ChangeLog?r1=1.134&r2=1.135

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/slang/ChangeLog,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- ChangeLog   19 Nov 2013 12:41:59 -0000      1.134
+++ ChangeLog   18 Apr 2014 13:21:45 -0000      1.135
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/slang
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/ChangeLog,v 1.134 2013/11/19 
12:41:59 slyfox Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/ChangeLog,v 1.135 2014/04/18 
13:21:45 hasufell Exp $
+
+*slang-2.2.4-r1 (18 Apr 2014)
+
+  18 Apr 2014; Julian Ospald <[email protected]> +slang-2.2.4-r1.ebuild:
+  add multilib support wrt #496586, patch by Michael Mair-Keimberger
 
   19 Nov 2013; Sergei Trofimovich <[email protected]>
   +files/slang-2.2.4-memset.patch, slang-2.2.4.ebuild:



1.1                  sys-libs/slang/slang-2.2.4-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/slang/slang-2.2.4-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/slang/slang-2.2.4-r1.ebuild?rev=1.1&content-type=text/plain

Index: slang-2.2.4-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-2.2.4-r1.ebuild,v 1.1 
2014/04/18 13:21:45 hasufell Exp $

EAPI=5
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/";
SRC_URI="mirror://slang/v${PV%.*}/${P}.tar.bz2"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE="cjk pcre png readline static-libs zlib"

# ncurses for ncurses5-config to get terminfo directory
RDEPEND="sys-libs/ncurses
        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:0[${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-r19
        )"
DEPEND="${RDEPEND}"

MAKEOPTS="${MAKEOPTS} -j1"

src_prepare() {
        epatch "${FILESDIR}"/${PN}-2.2.3-slsh-libs.patch
        epatch "${FILESDIR}"/${PN}-2.2.4-memset.patch

        # avoid linking to -ltermcap race with some systems
        sed -i -e '/^TERMCAP=/s:=.*:=:' configure || die
        # 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
}

multilib_src_configure() {
        local myconf=slang
        use readline && myconf=gnu

        econf \
                --with-readline=${myconf} \
                $(use_with pcre) \
                $(use_with cjk onig) \
                $(use_with png) \
                $(use_with zlib z)
}

multilib_src_compile() {
        emake elf $(use static-libs && echo static)

        pushd slsh >/dev/null
        emake slsh
        popd
}

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
}




Reply via email to