Fixed compilation with >=perl-5.18 (bug #490486). Converted PATCHES array to src_preapre() function

(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

4 files changed, 38 insertions, 15 deletions

diff --git a/app-backup/rsnapshot/ChangeLog b/app-backup/rsnapshot/ChangeLog
index d22d76cd303f..3effe4ccb91f 100644
--- a/app-backup/rsnapshot/ChangeLog
+++ b/app-backup/rsnapshot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-backup/rsnapshot
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/rsnapshot/ChangeLog,v 1.36 2013/07/11 20:49:47 vincent Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/rsnapshot/ChangeLog,v 1.37 2014/01/16 18:18:27 polynomial-c Exp $
+
+  16 Jan 2014; Lars Wendler <polynomial-c@gentoo.org>
+  rsnapshot-1.3.1-r1.ebuild, rsnapshot-1.3.1-r2.ebuild,
+  +files/rsnapshot-1.3.1-perl518.patch:
+  Fixed compilation with >=perl-5.18. Thanks to Chris Smith who reported this
+  in bug #490486. Converted PATCHES array to src_preapre() function.
 
   11 Jul 2013; Vicente Olivert Riera <vincent@gentoo.org>
   rsnapshot-1.3.1-r2.ebuild:
diff --git a/app-backup/rsnapshot/files/rsnapshot-1.3.1-perl518.patch b/app-backup/rsnapshot/files/rsnapshot-1.3.1-perl518.patch
new file mode 100644
index 000000000000..367055d5cc96
--- /dev/null
+++ b/app-backup/rsnapshot/files/rsnapshot-1.3.1-perl518.patch
@@ -0,0 +1,17 @@
+Fixed man-page creation with pod2man from >=perl-5.18
+
+https://bugs.gentoo.org/490486
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+
+--- rsnapshot-1.3.1/rsnapshot-program.pl
++++ rsnapshot-1.3.1/rsnapshot-program.pl
+@@ -6716,6 +6716,8 @@
+ 
+ =back
+ 
++=back
++
+ =head1 USAGE
+ 
+ B<rsnapshot> can be used by any user, but for system-wide backups
diff --git a/app-backup/rsnapshot/rsnapshot-1.3.1-r1.ebuild b/app-backup/rsnapshot/rsnapshot-1.3.1-r1.ebuild
index 5c8273aa69bf..41d167d6344b 100644
--- a/app-backup/rsnapshot/rsnapshot-1.3.1-r1.ebuild
+++ b/app-backup/rsnapshot/rsnapshot-1.3.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/rsnapshot/rsnapshot-1.3.1-r1.ebuild,v 1.4 2012/04/18 02:12:29 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/rsnapshot/rsnapshot-1.3.1-r1.ebuild,v 1.5 2014/01/16 18:18:27 polynomial-c Exp $
 
 EAPI=4
 
@@ -22,9 +22,9 @@ RDEPEND=">=dev-lang/perl-5.8.2
 		>=net-misc/rsync-2.6.0"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-cp_al.patch
-)
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cp_al.patch
+}
 
 src_install() {
 	# Change sysconfdir to install the template file as documentation
diff --git a/app-backup/rsnapshot/rsnapshot-1.3.1-r2.ebuild b/app-backup/rsnapshot/rsnapshot-1.3.1-r2.ebuild
index c4d076a39089..3ac79583bd15 100644
--- a/app-backup/rsnapshot/rsnapshot-1.3.1-r2.ebuild
+++ b/app-backup/rsnapshot/rsnapshot-1.3.1-r2.ebuild
@@ -1,8 +1,8 @@
-# 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-backup/rsnapshot/rsnapshot-1.3.1-r2.ebuild,v 1.2 2013/07/11 20:49:47 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/rsnapshot/rsnapshot-1.3.1-r2.ebuild,v 1.3 2014/01/16 18:18:27 polynomial-c Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils
 
@@ -23,16 +23,16 @@ RDEPEND=">=dev-lang/perl-5.8.2
 		>=net-misc/rsync-2.6.0"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-cp_al.patch
-)
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cp_al.patch \
+		"${FILESDIR}"/${P}-perl518.patch
+}
 
 src_install() {
 	# Change sysconfdir to install the template file as documentation
 	# rather than in /etc.
 	emake install DESTDIR="${D}" \
-		sysconfdir="/usr/share/doc/${PF}" \
-		|| die
+		sysconfdir="/usr/share/doc/${PF}"
 
 	dodoc README AUTHORS TODO ChangeLog \
 		docs/Upgrading_from_1.1 \