summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLisa M. Seelye <lisa@gentoo.org>2006-06-06 15:55:08 +0000
committerLisa M. Seelye <lisa@gentoo.org>2006-06-06 15:55:08 +0000
commit56c075b63e11ac91ce64b3e241215b7a1688f1c1 (patch)
tree3129f5e1bc676243b051c1ff02aa2eb68ef6c94b /app-backup/backup-manager
parentVersion bump wrt bug #135112 (diff)
downloadgentoo-2-56c075b63e11ac91ce64b3e241215b7a1688f1c1.tar.gz
gentoo-2-56c075b63e11ac91ce64b3e241215b7a1688f1c1.tar.bz2
gentoo-2-56c075b63e11ac91ce64b3e241215b7a1688f1c1.zip
Perl installation fix, bug 135686. remove from /usr/share and put to /usr/lib. piggyback on Makefile-fix.diff
(Portage version: 2.1_rc3-r2)
Diffstat (limited to 'app-backup/backup-manager')
-rw-r--r--app-backup/backup-manager/ChangeLog7
-rw-r--r--app-backup/backup-manager/backup-manager-0.7.2.ebuild3
-rw-r--r--app-backup/backup-manager/files/Makefile-fix.diff11
3 files changed, 19 insertions, 2 deletions
diff --git a/app-backup/backup-manager/ChangeLog b/app-backup/backup-manager/ChangeLog
index 23e3345ee8e5..18075582f736 100644
--- a/app-backup/backup-manager/ChangeLog
+++ b/app-backup/backup-manager/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-backup/backup-manager
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/backup-manager/ChangeLog,v 1.1 2006/06/05 13:36:09 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/backup-manager/ChangeLog,v 1.2 2006/06/06 15:55:08 lisa Exp $
+
+ 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)
diff --git a/app-backup/backup-manager/backup-manager-0.7.2.ebuild b/app-backup/backup-manager/backup-manager-0.7.2.ebuild
index a46d583c3d87..519c223058b1 100644
--- a/app-backup/backup-manager/backup-manager-0.7.2.ebuild
+++ b/app-backup/backup-manager/backup-manager-0.7.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 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.2.ebuild,v 1.1 2006/06/05 13:36:09 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/backup-manager/backup-manager-0.7.2.ebuild,v 1.2 2006/06/06 15:55:08 lisa Exp $
inherit eutils
@@ -20,6 +20,7 @@ src_unpack() {
unpack ${A}
cd ${S}
epatch ${FILESDIR}/Makefile-fix.diff
+ #epatch ${FILESDIR}/Makefile-perl-path-fix.diff
epatch ${FILESDIR}/bzip2-path-fix.diff
epatch ${FILESDIR}/backup-manager-upload-execution-fix.diff
}
diff --git a/app-backup/backup-manager/files/Makefile-fix.diff b/app-backup/backup-manager/files/Makefile-fix.diff
index 2e2f345baa4e..86ebee845d4f 100644
--- a/app-backup/backup-manager/files/Makefile-fix.diff
+++ b/app-backup/backup-manager/files/Makefile-fix.diff
@@ -12,3 +12,14 @@ diff -urN backup-manager-0.7.2/Makefile backup-manager-0.7.2-modified/Makefile
docs:
make -C doc all
+--- backup-manager-0.7.2/Makefile.orig 2006-06-06 15:25:05.000000000 +0100
++++ backup-manager-0.7.2/Makefile 2006-06-06 15:25:25.000000000 +0100
+@@ -1,7 +1,7 @@
+ DESTDIR?=
+
+ # For the backup-manager package
+-PERL5DIR=$(DESTDIR)/usr/share/perl5
++PERL5DIR=$(DESTDIR)/usr/lib/perl5/vendor_perl
+ LIBDIR=$(DESTDIR)/usr/share/backup-manager
+ CONTRIB=$(LIBDIR)/contrib
+ SHAREDIR=$(DESTDIR)/usr/share/backup-manager