ssuominen 14/06/24 13:20:50 Modified: coldsync-3.0_pre4.ebuild ChangeLog Log: Fix building against >=sys-apps/texinfo-5.0 wrt #514772 by Patrick Lauer (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path 1.8 app-pda/coldsync/coldsync-3.0_pre4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/coldsync/coldsync-3.0_pre4.ebuild?rev=1.8&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/coldsync/coldsync-3.0_pre4.ebuild?rev=1.8&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/coldsync/coldsync-3.0_pre4.ebuild?r1=1.7&r2=1.8 Index: coldsync-3.0_pre4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-pda/coldsync/coldsync-3.0_pre4.ebuild,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- coldsync-3.0_pre4.ebuild 9 Apr 2011 13:52:11 -0000 1.7 +++ coldsync-3.0_pre4.ebuild 24 Jun 2014 13:20:49 -0000 1.8 @@ -1,9 +1,9 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/coldsync/coldsync-3.0_pre4.ebuild,v 1.7 2011/04/09 13:52:11 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-pda/coldsync/coldsync-3.0_pre4.ebuild,v 1.8 2014/06/24 13:20:49 ssuominen Exp $ -EAPI=2 -inherit flag-o-matic perl-module toolchain-funcs +EAPI=5 +inherit flag-o-matic eutils perl-module toolchain-funcs MY_P=${PN}-${PV/_/-} @@ -20,11 +20,14 @@ perl? ( dev-lang/perl ) usb? ( virtual/libusb:0 )" DEPEND="${RDEPEND} + sys-apps/texinfo nls? ( sys-devel/gettext )" S=${WORKDIR}/${MY_P} src_prepare() { + epatch "${FILESDIR}"/${P}-texinfo-5.patch + if use perl; then pushd perl/ColdSync perl-module_src_prepare @@ -52,7 +55,7 @@ } src_compile() { - emake -j1 || die #279292 + emake -j1 #279292 if use perl; then pushd perl/ColdSync @@ -72,7 +75,7 @@ INSTALLSITEMAN3DIR="${D}"/usr/share/man/man3 \ INSTALLVENDORMAN3DIR="${D}"/usr/share/man/man3 \ EXTRA_INFOFILES="" \ - install || die + install if use perl; then pushd perl/ColdSync 1.14 app-pda/coldsync/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/coldsync/ChangeLog?rev=1.14&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/coldsync/ChangeLog?rev=1.14&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/coldsync/ChangeLog?r1=1.13&r2=1.14 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-pda/coldsync/ChangeLog,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ChangeLog 9 Apr 2011 13:45:06 -0000 1.13 +++ ChangeLog 24 Jun 2014 13:20:49 -0000 1.14 @@ -1,6 +1,10 @@ # ChangeLog for app-pda/coldsync -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/coldsync/ChangeLog,v 1.13 2011/04/09 13:45:06 ssuominen Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-pda/coldsync/ChangeLog,v 1.14 2014/06/24 13:20:49 ssuominen Exp $ + + 24 Jun 2014; Samuli Suominen <ssuomi...@gentoo.org> + +files/coldsync-3.0_pre4-texinfo-5.patch, coldsync-3.0_pre4.ebuild: + Fix building against >=sys-apps/texinfo-5.0 wrt #514772 by Patrick Lauer 09 Apr 2011; Samuli Suominen <ssuomi...@gentoo.org> coldsync-3.0_pre4.ebuild: Synchronize with 2.2.5-r1 ebuild. Install to perl vendor-dir instead of perl
