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)

3 files changed, 42 insertions, 8 deletions

diff --git a/app-pda/coldsync/ChangeLog b/app-pda/coldsync/ChangeLog
index d97d9e70d77a..51884f94d3ad 100644
--- a/app-pda/coldsync/ChangeLog
+++ b/app-pda/coldsync/ChangeLog
@@ -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 <ssuominen@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 <ssuominen@gentoo.org> coldsync-3.0_pre4.ebuild:
   Synchronize with 2.2.5-r1 ebuild. Install to perl vendor-dir instead of perl
diff --git a/app-pda/coldsync/coldsync-3.0_pre4.ebuild b/app-pda/coldsync/coldsync-3.0_pre4.ebuild
index 9bf1c37bd83b..3218caeace03 100644
--- a/app-pda/coldsync/coldsync-3.0_pre4.ebuild
+++ b/app-pda/coldsync/coldsync-3.0_pre4.ebuild
@@ -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 @@ RDEPEND="caps? ( sys-libs/libcap )
 	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_configure() {
 }
 
 src_compile() {
-	emake -j1 || die #279292
+	emake -j1 #279292
 
 	if use perl; then
 		pushd perl/ColdSync
@@ -72,7 +75,7 @@ src_install() {
 		INSTALLSITEMAN3DIR="${D}"/usr/share/man/man3 \
 		INSTALLVENDORMAN3DIR="${D}"/usr/share/man/man3 \
 		EXTRA_INFOFILES="" \
-		install || die
+		install
 
 	if use perl; then
 		pushd perl/ColdSync
diff --git a/app-pda/coldsync/files/coldsync-3.0_pre4-texinfo-5.patch b/app-pda/coldsync/files/coldsync-3.0_pre4-texinfo-5.patch
new file mode 100644
index 000000000000..0579a9fb854e
--- /dev/null
+++ b/app-pda/coldsync/files/coldsync-3.0_pre4-texinfo-5.patch
@@ -0,0 +1,27 @@
+Fix building against texinfo >= 5.0
+
+http://bugs.gentoo.org/514772
+http://www.gnu.org/software/texinfo/manual/texinfo/texinfo.html#g_t_0040copyright
+
+--- doc/conduits.texi
++++ doc/conduits.texi
+@@ -33,7 +33,7 @@
+ 
+ @page
+ @vskip 0pt plus 1filll
+-Copyright @copyright 2000 Andrew Arensburger.
++Copyright @copyright{} 2000 Andrew Arensburger.
+ 
+ Permission is granted to make and distribute verbatim copies of
+ this manual provided the copyright notice and this permission notice
+--- doc/libpalm.texi
++++ doc/libpalm.texi
+@@ -57,7 +57,7 @@
+ 
+ @page
+ @vskip 0pt plus 1filll
+-Copyright @copyright 1999 Andrew Arensburger.
++Copyright @copyright{} 1999 Andrew Arensburger.
+ 
+ Permission is granted to make and distribute verbatim copies of
+ this manual provided the copyright notice and this permission notice