jlec 15/04/08 12:31:38 Modified: p7zip-9.38.1.ebuild ChangeLog Log: Fix compilation problems on x86, bug #545912 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path 1.3 app-arch/p7zip/p7zip-9.38.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/p7zip-9.38.1.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/p7zip-9.38.1.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/p7zip-9.38.1.ebuild?r1=1.2&r2=1.3 Index: p7zip-9.38.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.38.1.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- p7zip-9.38.1.ebuild 7 Apr 2015 10:10:39 -0000 1.2 +++ p7zip-9.38.1.ebuild 8 Apr 2015 12:31:38 -0000 1.3 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.38.1.ebuild,v 1.2 2015/04/07 10:10:39 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.38.1.ebuild,v 1.3 2015/04/08 12:31:38 jlec Exp $ EAPI=5 @@ -30,6 +30,8 @@ S=${WORKDIR}/${PN}_${PV} src_prepare() { + epatch "${FILESDIR}"/${P}-osversion.patch + if ! use pch; then sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die fi @@ -125,9 +127,8 @@ newins GUI/p7zip_16_ok.png p7zip.png if use kde; then - - rm GUI/kde4/p7zip_compress.desktop - insinto /usr/share/kde4/services/ServiceMenus + rm GUI/kde4/p7zip_compress.desktop || die + insinto /usr/share/kde4/services/ServiceMenus doins GUI/kde4/*.desktop fi fi 1.166 app-arch/p7zip/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/ChangeLog?rev=1.166&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/ChangeLog?rev=1.166&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/ChangeLog?r1=1.165&r2=1.166 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- ChangeLog 7 Apr 2015 14:05:48 -0000 1.165 +++ ChangeLog 8 Apr 2015 12:31:38 -0000 1.166 @@ -1,6 +1,10 @@ # ChangeLog for app-arch/p7zip # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.165 2015/04/07 14:05:48 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.166 2015/04/08 12:31:38 jlec Exp $ + + 08 Apr 2015; Justin Lecher <j...@gentoo.org> + +files/p7zip-9.38.1-osversion.patch, p7zip-9.38.1.ebuild: + Fix compilation problems on x86, bug #545912 07 Apr 2015; Justin Lecher <j...@gentoo.org> p7zip-9.20.1-r4.ebuild, p7zip-9.20.1-r5.ebuild, p7zip-9.38.1.ebuild:
