Version bump. Removed old version. Bug # 88510.

(Portage version: 2.0.51.21-r1)

8 files changed, 19 insertions, 84 deletions

diff --git a/sys-fs/convertfs/ChangeLog b/sys-fs/convertfs/ChangeLog
index c4e7ea34024a..5de052dcac8e 100644
--- a/sys-fs/convertfs/ChangeLog
+++ b/sys-fs/convertfs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/convertfs
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/convertfs/ChangeLog,v 1.6 2004/09/03 19:16:58 pvdabeel Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/convertfs/ChangeLog,v 1.7 2005/05/13 18:46:53 twp Exp $
+
+*convertfs-20050113 (13 May 2005)
+
+  13 May 2005; Tom Payne <twp@gentoo.org>
+  -files/convertfs-20020318-convertfs-paths.patch,
+  -convertfs-20020318.ebuild, -convertfs-20020318-r1.ebuild,
+  +convertfs-20050113.ebuild:
+  Version bump. Removed old version. Bug # 88510.
 
   03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   convertfs-20020318-r1.ebuild:
diff --git a/sys-fs/convertfs/Manifest b/sys-fs/convertfs/Manifest
index bb256c1acc82..7a61994fb57e 100644
--- a/sys-fs/convertfs/Manifest
+++ b/sys-fs/convertfs/Manifest
@@ -1,7 +1,4 @@
-MD5 2340b18efca88bf3f1ae9a5d4a37a2c4 ChangeLog 854
-MD5 d3288d96b37961c67b0efefdd18c9dc3 convertfs-20020318-r1.ebuild 984
-MD5 bbf341cb71cef1b9f9573f80305066ee convertfs-20020318.ebuild 898
+MD5 19e1d4cbc179c097f71dae16e497fdb2 convertfs-20050113.ebuild 794
+MD5 283dea7b51c549d28ef7c5bff0c755b8 ChangeLog 1124
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
-MD5 942615f95e7c6cae8c4c0005c9113727 files/convertfs-20020318-convertfs-paths.patch 993
-MD5 616e1ef3c8db68325318527d3a30b260 files/digest-convertfs-20020318 69
-MD5 616e1ef3c8db68325318527d3a30b260 files/digest-convertfs-20020318-r1 69
+MD5 8e1b16995e1954e586f2dd11d4bf7d82 files/digest-convertfs-20050113 69
diff --git a/sys-fs/convertfs/convertfs-20020318-r1.ebuild b/sys-fs/convertfs/convertfs-20020318-r1.ebuild
deleted file mode 100644
index d278f5986da5..000000000000
--- a/sys-fs/convertfs/convertfs-20020318-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/convertfs/convertfs-20020318-r1.ebuild,v 1.5 2004/09/03 19:16:58 pvdabeel Exp $
-
-inherit eutils
-
-DESCRIPTION="A tool to convert filesystems in-place"
-HOMEPAGE="http://tzukanov.narod.ru/convertfs/"
-SRC_URI="http://tzukanov.narod.ru/convertfs/convertfs-18mar2002.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/convertfs-20020318-convertfs-paths.patch
-	cd ${S}
-	sed -i Makefile -e "s/^\(CFLAGS=\).*\$/\1${CFLAGS}/"
-}
-
-src_compile() {
-	emake devclone devremap prepindex || die
-}
-
-src_install() {
-	into /
-	dosbin convertfs_dumb devclone devremap prepindex contrib/convertfs || die
-}
-
-pkg_postinst() {
-	ewarn "This tool is HIGHLY DANGEROUS. Read the homepage before using it!"
-	ewarn "    ${HOMEPAGE}"
-	ewarn "You have been warned!"
-}
diff --git a/sys-fs/convertfs/convertfs-20020318.ebuild b/sys-fs/convertfs/convertfs-20050113.ebuild
index 27e3b1569327..4b0b18e409e0 100644
--- a/sys-fs/convertfs/convertfs-20020318.ebuild
+++ b/sys-fs/convertfs/convertfs-20050113.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/convertfs/convertfs-20020318.ebuild,v 1.4 2004/06/30 16:34:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/convertfs/convertfs-20050113.ebuild,v 1.1 2005/05/13 18:46:53 twp Exp $
 
 DESCRIPTION="A tool to convert filesystems in-place"
 HOMEPAGE="http://tzukanov.narod.ru/convertfs/"
-SRC_URI="http://tzukanov.narod.ru/convertfs/convertfs-18mar2002.tar.gz"
+SRC_URI="http://tzukanov.narod.ru/convertfs/convertfs-13jan2005.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ppc"
 IUSE=""
 
 DEPEND="virtual/libc"
@@ -17,8 +17,7 @@ S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	sed -i Makefile -e "s/^\(CFLAGS=\).*\$/\1${CFLAGS}/"
+	sed -i ${S}/Makefile -e "s/^\(CFLAGS=\).*\$/\1${CFLAGS}/"
 }
 
 src_compile() {
diff --git a/sys-fs/convertfs/files/convertfs-20020318-convertfs-paths.patch b/sys-fs/convertfs/files/convertfs-20020318-convertfs-paths.patch
deleted file mode 100644
index c02fdb2b51dc..000000000000
--- a/sys-fs/convertfs/files/convertfs-20020318-convertfs-paths.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur convertfs-20020318/contrib/convertfs convertfs/contrib/convertfs
---- convertfs-20020318/contrib/convertfs	2002-03-18 17:15:15.000000000 +0100
-+++ convertfs/contrib/convertfs	2004-06-27 11:41:49.265225592 +0200
-@@ -192,7 +192,7 @@
- echo "== Creating clone of \`$from_fs_type' filesystem that's on \`$dev'. =="
- umount $dev 2>/dev/null
- mount -t $from_fs_type $dev $fs1root || error
--./devclone $dev $fsimage || error
-+devclone $dev $fsimage || error
- 
- echo "===== Creating destination \`$to_fs_type' filesystem. ====="
- umount $loopdev 2>/dev/null
-@@ -216,13 +216,13 @@
- losetup -d $loopdev 2>/dev/null
- 
- echo "=== Preparing info for block relocation ==="
--./prepindex $fsimage $fsindex $fssuper || error
-+prepindex $fsimage $fsindex $fssuper || error
- umount $dev || error
- dd if=$fssuper of=$dev || exit
- sync
- 
- echo "============ Relocating blocks ============"
--./devremap $dev || exit
-+devremap $dev || exit
- 
- echo "=== Filesystem conversion accomplished! ==="
- rm -rf $tmp
diff --git a/sys-fs/convertfs/files/digest-convertfs-20020318 b/sys-fs/convertfs/files/digest-convertfs-20020318
deleted file mode 100644
index 1c2d75003ed0..000000000000
--- a/sys-fs/convertfs/files/digest-convertfs-20020318
+++ /dev/null
@@ -1 +0,0 @@
-MD5 10fcab200d3722f008274ed11fe643af convertfs-18mar2002.tar.gz 7451
diff --git a/sys-fs/convertfs/files/digest-convertfs-20020318-r1 b/sys-fs/convertfs/files/digest-convertfs-20020318-r1
deleted file mode 100644
index 1c2d75003ed0..000000000000
--- a/sys-fs/convertfs/files/digest-convertfs-20020318-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 10fcab200d3722f008274ed11fe643af convertfs-18mar2002.tar.gz 7451
diff --git a/sys-fs/convertfs/files/digest-convertfs-20050113 b/sys-fs/convertfs/files/digest-convertfs-20050113
new file mode 100644
index 000000000000..6646333cea97
--- /dev/null
+++ b/sys-fs/convertfs/files/digest-convertfs-20050113
@@ -0,0 +1 @@
+MD5 71e8065e321898e259a55c8cefdfd75d convertfs-13jan2005.tar.gz 7444