jlec 14/05/10 17:09:55 Modified: ChangeLog p7zip-9.20.1-r5.ebuild Log: app-arch/p7zip: Add support for x32, #506602, patch by Luke-Jr (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path 1.162 app-arch/p7zip/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/ChangeLog?rev=1.162&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/ChangeLog?rev=1.162&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/ChangeLog?r1=1.161&r2=1.162 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- ChangeLog 24 Dec 2013 01:33:06 -0000 1.161 +++ ChangeLog 10 May 2014 17:09:55 -0000 1.162 @@ -1,6 +1,9 @@ # ChangeLog for app-arch/p7zip -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.161 2013/12/24 01:33:06 tomwij Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.162 2014/05/10 17:09:55 jlec Exp $ + + 10 May 2014; Justin Lecher <j...@gentoo.org> p7zip-9.20.1-r5.ebuild: + Add support for x32, #506602, patch by Luke-Jr 24 Dec 2013; Tom Wijsman <tom...@gentoo.org> -files/9.04-kde4.patch, -files/p7zip-9.13-QA.patch: 1.4 app-arch/p7zip/p7zip-9.20.1-r5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r5.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r5.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r5.ebuild?r1=1.3&r2=1.4 Index: p7zip-9.20.1-r5.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r5.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- p7zip-9.20.1-r5.ebuild 16 Nov 2013 07:49:40 -0000 1.3 +++ p7zip-9.20.1-r5.ebuild 10 May 2014 17:09:55 -0000 1.4 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r5.ebuild,v 1.3 2013/11/16 07:49:40 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r5.ebuild,v 1.4 2014/05/10 17:09:55 jlec Exp $ EAPI=5 @@ -15,7 +15,7 @@ LICENSE="LGPL-2.1 rar? ( unRAR )" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris" -IUSE="doc kde rar +pch static wxwidgets" +IUSE="doc kde rar +pch static wxwidgets abi_x86_x32" REQUIRED_USE="kde? ( wxwidgets )" @@ -24,6 +24,7 @@ wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )" DEPEND="${RDEPEND} amd64? ( dev-lang/yasm ) + abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 ) x86? ( dev-lang/nasm )" S=${WORKDIR}/${PN}_${PV} @@ -62,7 +63,10 @@ -e '/ALLFLAGS/s:-s ::' \ makefile* || die "changing makefiles" - if use amd64; then + if use abi_x86_x32; then + sed -i -e "/^ASM=/s:amd64:x32:" makefile* + cp -f makefile.linux_amd64_asm makefile.machine || die + elif use amd64; then cp -f makefile.linux_amd64_asm makefile.machine || die elif use x86; then cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
