Fix locale path installation, reported by Marcin Mirosław in bug #401105. Also clean ebuild, bump EAPI, and drop 0.7.8 versions

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

4 files changed, 16 insertions, 178 deletions

diff --git a/app-backup/backup-manager/ChangeLog b/app-backup/backup-manager/ChangeLog
index e2cd6a2f5046..768c11ffe17d 100644
--- a/app-backup/backup-manager/ChangeLog
+++ b/app-backup/backup-manager/ChangeLog
@@ -1,98 +1,12 @@
 # ChangeLog for app-backup/backup-manager
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/backup-manager/ChangeLog,v 1.18 2011/01/04 15:32:09 voyageur Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/backup-manager/ChangeLog,v 1.19 2012/01/31 14:06:05 voyageur Exp $
 
-*backup-manager-0.7.10.1 (04 Jan 2011)
+*backup-manager-0.7.10.1-r1 (31 Jan 2012)
 
-  04 Jan 2011; Bernard Cafarelli <voyageur@gentoo.org>
-  +backup-manager-0.7.10.1.ebuild:
-  Version bump, reported by David Voge <davidvoge@gmail.com> in bug #349841
-
-  11 Oct 2010; Bernard Cafarelli <voyageur@gentoo.org>
-  -files/backup-manager-upload-execution-fix-0.7.4.diff,
-  -files/backup-manager-upload-execution-fix.diff,
-  -files/bzip2-path-fix.diff:
-  Remove unused files, spotted by jalan <jalanpalmer@gmail.com> in bug
-  #340177
-
-*backup-manager-0.7.9 (14 Sep 2010)
-
-  14 Sep 2010; Bernard Cafarelli <voyageur@gentoo.org>
-  +backup-manager-0.7.9.ebuild,
-  +files/backup-manager-0.7.9-parallel_install.patch:
-  Version bump and fix parallel install, bug #336428
-
-  08 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
-  backup-manager-0.7.8-r1.ebuild:
-  Use -j1 for install, bug #336428.
-
-*backup-manager-0.7.8-r1 (07 Sep 2009)
-
-  07 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
-  +backup-manager-0.7.8-r1.ebuild:
-  Install in vendor_perl instead of site_perl, thanks to tove in bug
-  #283757. Switch to EAPI2
-
-  21 Mar 2009; Bernard Cafarelli <voyageur@gentoo.org>
-  backup-manager-0.7.8.ebuild:
-  Really remove dbus depend this time
-
-  21 Mar 2009; Bernard Cafarelli <voyageur@gentoo.org>
-  -backup-manager-0.7.2.ebuild, -backup-manager-0.7.4.ebuild,
-  backup-manager-0.7.8.ebuild:
-  Missing dbus in IUSE, clean DEPEND/RDEPEND, spotted by Mr_Bones. Also
-  remove old versions
-
-  21 Mar 2009; Jeremy Olexa <darkside@gentoo.org>
-  backup-manager-0.7.5.ebuild:
-  amd64 stable, bug 207390
-
-  21 Mar 2009; Raúl Porcel <armin76@gentoo.org>
-  backup-manager-0.7.5.ebuild:
-  x86 stable, bug #207390
-
-*backup-manager-0.7.8 (20 Mar 2009)
-
-  20 Mar 2009; Bernard Cafarelli <voyageur@gentoo.org> metadata.xml,
-  +backup-manager-0.7.8.ebuild:
-  Version bump, add myself as maintainer. Closes bug #220041
-
-  03 Jun 2008; Steve Dibb <beandog@gentoo.org> backup-manager-0.7.5.ebuild:
-  Add ~amd64, bug 194488
-
-  30 May 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
-  Removing Andrej Kacian (Ticho) from metadata.xml (as per #59986).
-
-  03 Mar 2007; Andrej Kacian <ticho@gentoo.org> backup-manager-0.7.5.ebuild:
-  Depend on sufficiently new version of findutils. Bug #169053, by Rob Terhaar
-  <rterhaar at allovermedia.com>.
-
-  24 Jan 2007; Marius Mauch <genone@gentoo.org> backup-manager-0.7.2.ebuild,
-  backup-manager-0.7.4.ebuild, backup-manager-0.7.5.ebuild:
-  Replacing einfo with elog
-
-*backup-manager-0.7.5 (14 Jan 2007)
-
-  14 Jan 2007; Andrej Kacian <ticho@gentoo.org> metadata.xml,
-  +backup-manager-0.7.5.ebuild:
-  Version bump. Set myself as maintainer.
-
-*backup-manager-0.7.4 (19 Aug 2006)
-
-  19 Aug 2006; Lisa Seelye <lisa@gentoo.org>
-  +files/backup-manager-upload-execution-fix-0.7.4.diff,
-  +backup-manager-0.7.4.ebuild:
-  Version bump for bug #143097
-
-  06 Jun 2006; Lisa Seelye <lisa@gentoo.org> files/Makefile-fix.diff,
-  backup-manager-0.7.2.ebuild:
-  Perl installation fix, bug 135686. remove from /usr/share and put to
-  /usr/lib. piggyback on Makefile-fix.diff
-
-*backup-manager-0.7.2 (05 Jun 2006)
-
-  05 Jun 2006; Lisa Seelye <lisa@gentoo.org> +files/Makefile-fix.diff,
-  +files/backup-manager-upload-execution-fix.diff,
-  +files/bzip2-path-fix.diff, +metadata.xml, +backup-manager-0.7.2.ebuild:
-  New ebuild submitted by Park Ji-in, mithrandir at electrang dot net, bug 126638
+  31 Jan 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  -backup-manager-0.7.8.ebuild, -backup-manager-0.7.8-r1.ebuild,
+  -backup-manager-0.7.10.1.ebuild, +backup-manager-0.7.10.1-r1.ebuild:
+  Fix locale path installation, reported by Marcin Mirosław in bug #401105.
+  Also clean ebuild, bump EAPI, and drop 0.7.8 versions
 
diff --git a/app-backup/backup-manager/backup-manager-0.7.10.1.ebuild b/app-backup/backup-manager/backup-manager-0.7.10.1-r1.ebuild
index ae425577a0b9..62b6cae0cf9c 100644
--- a/app-backup/backup-manager/backup-manager-0.7.10.1.ebuild
+++ b/app-backup/backup-manager/backup-manager-0.7.10.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.10.1.ebuild,v 1.1 2011/01/04 15:32:09 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/backup-manager/backup-manager-0.7.10.1-r1.ebuild,v 1.1 2012/01/31 14:06:05 voyageur Exp $
 
-EAPI=2
+EAPI=4
 
 inherit eutils
 
@@ -27,12 +27,15 @@ RDEPEND="${DEPEND}
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	sed -i "/^PERL5DIR/s/sitelib/vendorlib/" "${S}"/Makefile || die
+	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
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install
 	use doc && dodoc doc/user-guide.txt
 }
 
diff --git a/app-backup/backup-manager/backup-manager-0.7.8-r1.ebuild b/app-backup/backup-manager/backup-manager-0.7.8-r1.ebuild
deleted file mode 100644
index 5d817215dd7f..000000000000
--- a/app-backup/backup-manager/backup-manager-0.7.8-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 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.8-r1.ebuild,v 1.2 2010/09/08 10:48:06 flameeyes Exp $
-
-EAPI=2
-
-inherit eutils
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc s3"
-
-DEPEND="dev-lang/perl
-	sys-devel/gettext"
-
-RDEPEND="${DEPEND}
-	>=sys-apps/findutils-4.3.0
-	s3? ( dev-perl/Net-Amazon-S3
-		dev-perl/File-Slurp )"
-
-src_prepare() {
-	sed -i "/^PERL5DIR/s/sitelib/vendorlib/" "${S}"/Makefile || die
-}
-
-src_install() {
-	# bug #336428
-	emake -j1 DESTDIR="${D}" install || die "install failed"
-	use doc && dodoc doc/user-guide.txt
-}
-
-pkg_postinst() {
-	elog "After installing,"
-	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"
-}
diff --git a/app-backup/backup-manager/backup-manager-0.7.8.ebuild b/app-backup/backup-manager/backup-manager-0.7.8.ebuild
deleted file mode 100644
index 8000397937c1..000000000000
--- a/app-backup/backup-manager/backup-manager-0.7.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 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.8.ebuild,v 1.4 2009/03/21 18:49:52 voyageur Exp $
-
-inherit eutils
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc s3"
-
-DEPEND="dev-lang/perl
-	sys-devel/gettext"
-
-RDEPEND="${DEPEND}
-	>=sys-apps/findutils-4.3.0
-	s3? ( dev-perl/Net-Amazon-S3
-		dev-perl/File-Slurp )"
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	use doc && dodoc doc/user-guide.txt
-}
-
-pkg_postinst() {
-	elog "After installing,"
-	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"
-}