EAPI bump and fix POD syntax (for perl 5.18), patch from Fedora. Spotted by patrick in bug #513402

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key C74525F2)

3 files changed, 57 insertions, 11 deletions

diff --git a/app-backup/backup-manager/ChangeLog b/app-backup/backup-manager/ChangeLog
index 536d091d7286..2afa5be65211 100644
--- a/app-backup/backup-manager/ChangeLog
+++ b/app-backup/backup-manager/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-backup/backup-manager
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/backup-manager/ChangeLog,v 1.21 2012/06/07 23:54:52 voyageur Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/backup-manager/ChangeLog,v 1.22 2014/06/24 12:42:49 voyageur Exp $
+
+*backup-manager-0.7.10.1-r2 (24 Jun 2014)
+
+  24 Jun 2014; Bernard Cafarelli <voyageur@gentoo.org>
+  -backup-manager-0.7.9.ebuild, +backup-manager-0.7.10.1-r2.ebuild,
+  +files/backup-manager-0.7.10-Fix-POD-syntax.patch:
+  EAPI bump and fix POD syntax (for perl 5.18), patch from Fedora. Spotted by
+  patrick in bug #513402
 
   07 Jun 2012; Bernard Cafarelli <voyageur@gentoo.org>
   backup-manager-0.7.10.1-r1.ebuild:
diff --git a/app-backup/backup-manager/backup-manager-0.7.9.ebuild b/app-backup/backup-manager/backup-manager-0.7.10.1-r2.ebuild
index de2a72c34d5b..4d68505753b4 100644
--- a/app-backup/backup-manager/backup-manager-0.7.9.ebuild
+++ b/app-backup/backup-manager/backup-manager-0.7.10.1-r2.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2010 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/backup-manager/backup-manager-0.7.9.ebuild,v 1.1 2010/09/14 15:32:40 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/backup-manager/backup-manager-0.7.10.1-r2.ebuild,v 1.1 2014/06/24 12:42:49 voyageur Exp $
 
-EAPI=2
+EAPI=5
 
 inherit eutils
 
+MY_P=Backup-Manager-${PV}
 DESCRIPTION="Backup Manager is a command line backup tool for GNU/Linux."
 HOMEPAGE="http://www.backup-manager.org/"
-SRC_URI="http://www.backup-manager.org/download/${P}.tar.gz"
+SRC_URI="http://www.backup-manager.org/download/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,13 +24,19 @@ RDEPEND="${DEPEND}
 	s3? ( dev-perl/Net-Amazon-S3
 		dev-perl/File-Slurp )"
 
+S=${WORKDIR}/${MY_P}
+
 src_prepare() {
-	sed -i "/^PERL5DIR/s/sitelib/vendorlib/" "${S}"/Makefile || die
-	epatch "${FILESDIR}"/${P}-parallel_install.patch
+	sed -i "/^PERL5DIR/s/sitelib/vendorlib/" Makefile \
+		|| die "Makefile sed failed"
+	sed -i '/^prefix=/s/$(PREFIX)/usr/' po/Makefile \
+		|| die "po Makefile sed failed"
+	epatch "${FILESDIR}"/${PN}-0.7.9-parallel_install.patch
+	epatch "${FILESDIR}"/${PN}-0.7.10-Fix-POD-syntax.patch
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install
 	use doc && dodoc doc/user-guide.txt
 }
 
@@ -38,6 +45,7 @@ pkg_postinst() {
 	elog "copy ${ROOT%/}/usr/share/backup-manager/backup-manager.conf.tpl to"
 	elog "/etc/backup-manager.conf and customize it for your environment."
 	elog "You could also set-up your cron for daily or weekly backup."
-	ebeep 3
-	ewarn "New configuration keys have been defined. Please check the docs for info"
+
+	ewarn "New configuration keys may have been defined."
+	ewarn "Please check the docs for info"
 }
diff --git a/app-backup/backup-manager/files/backup-manager-0.7.10-Fix-POD-syntax.patch b/app-backup/backup-manager/files/backup-manager-0.7.10-Fix-POD-syntax.patch
new file mode 100644
index 000000000000..61ac590241e2
--- /dev/null
+++ b/app-backup/backup-manager/files/backup-manager-0.7.10-Fix-POD-syntax.patch
@@ -0,0 +1,30 @@
+From 808f397dbc76d61e6e29c661585afeb6ba9c41a2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Sat, 20 Jul 2013 13:41:25 +0200
+Subject: [PATCH] Fix POD syntax
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ backup-manager-purge | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/backup-manager-purge b/backup-manager-purge
+index ce7a67f..c9a5f1c 100755
+--- a/backup-manager-purge
++++ b/backup-manager-purge
+@@ -53,6 +53,8 @@ than I<ttl> days will be outdated.
+ 
+ =head1 OPTIONAL ARGS
+ 
++=over 4
++
+ =item B<--files-from=>file
+ 
+ A file containing a list of archives to parse, one archive per line.
+-- 
+1.8.1.4
+