revbump; add patches by proxy maintainer fixing tests and modern versions of ruby, rm broken ebuild, fixes bug #509960

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

4 files changed, 74 insertions, 5 deletions

diff --git a/app-backup/pdumpfs/ChangeLog b/app-backup/pdumpfs/ChangeLog
index b7b4ff6b2171..cb2055fb1844 100644
--- a/app-backup/pdumpfs/ChangeLog
+++ b/app-backup/pdumpfs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-backup/pdumpfs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/pdumpfs/ChangeLog,v 1.15 2015/04/18 10:06:46 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/pdumpfs/ChangeLog,v 1.16 2015/04/19 12:49:08 idella4 Exp $
+
+*pdumpfs-1.3-r2 (19 Apr 2015)
+
+  19 Apr 2015; Ian Delaney <idella4@gentoo.org> +files/pdumpfs-in.patch,
+  +files/pdumpfs-test.patch, +pdumpfs-1.3-r2.ebuild, -pdumpfs-1.3-r1.ebuild:
+  revbump; add patches by proxy maintainer fixing tests and modern versions of
+  ruby, rm broken ebuild, fixes bug #509960
 
   18 Apr 2015; Ian Delaney <idella4@gentoo.org> metadata.xml:
   Paul Healy set as new proxy maintainer, endorsed by pacho in Bug #509960
diff --git a/app-backup/pdumpfs/files/pdumpfs-in.patch b/app-backup/pdumpfs/files/pdumpfs-in.patch
new file mode 100644
index 000000000000..cddfb995918a
--- /dev/null
+++ b/app-backup/pdumpfs/files/pdumpfs-in.patch
@@ -0,0 +1,40 @@
+patch by proxy maintainer, P. Healy, April 2015
+# Bug 509960
+--- pdumpfs.in_orig	2004-12-21 02:43:12.000000000 +0000
++++ pdumpfs.in	2015-04-01 10:58:22.671131947 +0100
+@@ -48,7 +48,7 @@
+ #
+ 
+ require 'find'
+-require 'ftools'
++require 'fileutils'
+ require 'getoptlong'
+ require 'date'
+ 
+@@ -868,7 +868,7 @@
+       today  = File.join(dest, datedir(start_time), base)
+ 
+       File.umask(0077)
+-      File.mkpath(today) unless @dry_run
++      FileUtils.mkpath(today) unless @dry_run
+       if latest
+         update_snapshot(src, latest, today)
+       else
+@@ -1018,7 +1018,7 @@
+ 
+       case type
+       when "directory"
+-        File.mkpath(today)
++        FileUtils.mkpath(today)
+       when "unchanged"
+         File.force_link(latest, today)
+       when "updated"
+@@ -1089,7 +1089,7 @@
+ 
+           case type
+           when "directory"
+-            File.mkpath(t)
++            FileUtils.mkpath(t)
+           when "new_file"
+             copy(s, t)
+           when "symlink"
diff --git a/app-backup/pdumpfs/files/pdumpfs-test.patch b/app-backup/pdumpfs/files/pdumpfs-test.patch
new file mode 100644
index 000000000000..e81e8b0f2d8a
--- /dev/null
+++ b/app-backup/pdumpfs/files/pdumpfs-test.patch
@@ -0,0 +1,12 @@
+patch by proxy maintainer, P. Healy, April 2015
+# Bug 509960
+--- tests/pdumpfs-test_orig	2004-08-10 07:54:28.000000000 +0100
++++ tests/pdumpfs-test	2015-04-01 11:24:35.948633870 +0100
+@@ -17,6 +17,7 @@
+ 
+ ../pdumpfs src dest > tmp.log || exit 1
+ diff -r src dest/$today/src || exit 1
++mkdir -p dest/$yesterday && rmdir dest/$yesterday
+ mv dest/$today dest/$yesterday
+ 
+ echo update > src/foo
diff --git a/app-backup/pdumpfs/pdumpfs-1.3-r1.ebuild b/app-backup/pdumpfs/pdumpfs-1.3-r2.ebuild
index 88bee6939713..933216c39e64 100644
--- a/app-backup/pdumpfs/pdumpfs-1.3-r1.ebuild
+++ b/app-backup/pdumpfs/pdumpfs-1.3-r2.ebuild
@@ -1,6 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/pdumpfs/pdumpfs-1.3-r1.ebuild,v 1.7 2010/04/03 04:36:58 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/pdumpfs/pdumpfs-1.3-r2.ebuild,v 1.1 2015/04/19 12:49:08 idella4 Exp $
+
+EAPI=5
+
+inherit eutils
 
 DESCRIPTION="a daily backup system similar to Plan9's dumpfs"
 HOMEPAGE="http://0xcc.net/pdumpfs/"
@@ -8,10 +12,16 @@ SRC_URI="http://0xcc.net/pdumpfs/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="linguas_ja"
 
-DEPEND=">=dev-lang/ruby-1.8.1"
+DEPEND=">=dev-lang/ruby-2.0.0_p598"
+
+src_prepare() {
+	# Bug #509960
+	epatch "${FILESDIR}/${PN}-in.patch" \
+		"${FILESDIR}/${PN}-test.patch"
+}
 
 src_compile() {
 	emake pdumpfs || die "make pdumpfs failed"