mass redigest and update

2011-12-03 21:16:15 +01:00
parent c3958843c9
commit f598ca3564
46 changed files with 2871 additions and 38 deletions
--- a/sys-block/partclone/Manifest
+++ b/sys-block/partclone/Manifest
@@ -1,4 +1,7 @@
+AUX jfsclone-no-return.patch 448 RMD160 b0610874e04b89f4896427285c49791c6c528920 SHA1 25eb43054c107af5e6a08e638118abe1b276b905 SHA256 70c58ef363b87d7771172d66a2d3862a606427620f7ca6cc8b8c99de9521f92d
+AUX partclone-0.2.36-progsreiserfs-0.3.1-1.patch 1608 RMD160 ae231b808f9084717724e0a9d69290fb3ad3cbed SHA1 8121905d0ad67cc2b9556796fbf1ca3cdf398f22 SHA256 d32dcf16f4df23389b0685156c2773509af2f8e05e3e4c3bb133a1a33d7f1cb1
+AUX partclone-0.2.36-xfs-progs-3.1.4-1.patch 1135 RMD160 a920e3fe5c30a3487433ffbeb8a197e5caff08db SHA1 37923d6d49f3377b834a965cacd9c55df2fa3286 SHA256 8b134dec1bdbeed95d48ac0966582baa773a2ab23ef982d7486508345c3499ad
 DIST partclone_0.2.36.tar.gz 424316 RMD160 5ab453fe618b9f9d66619763c6f5a9cf47da1e60 SHA1 105aae4be93387bdf0cb6ae29ce69e5d33226d35 SHA256 434f56ca986284a64bfee2d98862d32313d127b9c382c7b4016407ada04832a2
-EBUILD partclone-0.2.36.ebuild 1568 RMD160 e7b4f6edd2520009131b296ddf6c8149cf5656e5 SHA1 af6e77a5a4491301cb8208ae703d9497faa1b4a5 SHA256 762306e2759a3f60a03c2aa3d7c39c155f923b179b18bdc8274c75844bd117e6
+EBUILD partclone-0.2.36.ebuild 2028 RMD160 4723e1541fd08753cdfd3e8a57634df62bc4f645 SHA1 9c3be65a19c06c9e77ec664938451951e9dde50a SHA256 2ed7bd0abecc8e07d60561f0f81eae725771ad6c7aae76abd52ee256efb705b6
 MISC ChangeLog 469 RMD160 d603c14cebf64dd5adec0c35592b473e810ea1a8 SHA1 43d0ecb1c249ac37b51dc7c9484472357880bdc1 SHA256 a4dd01367c564d169e246cf6690532d415981cb63951816d82ed5f3ebfe3e680
 MISC metadata.xml 205 RMD160 f85e91d792c694cb3e45fac26295dba0e6e43786 SHA1 3f13c3b49579342e2308323aa3dda2f43dd94c23 SHA256 9fdfc9c91107d94feb8416adc2cec7734fa27084bff83ea859938b3216e028bc
--- a/sys-block/partclone/files/jfsclone-no-return.patch
+++ b/sys-block/partclone/files/jfsclone-no-return.patch
@@ -0,0 +1,11 @@
+diff -ruN partclone-0.2.15/src/jfsclone.c partclone-0.2.15.jfs/src/jfsclone.c
+--- partclone-0.2.15/src/jfsclone.c	2010-09-01 17:15:10.000000000 +0900
+++ partclone-0.2.15.jfs/src/jfsclone.c	2010-09-19 17:04:43.651380655 +0900
+@@ -348,6 +348,7 @@
+     log_mesg(2, 0, 0, fs_opt.debug, "%s: free_blocks = %lli\n", __FILE__, cntl_page.dn_nfree);
+     log_mesg(2, 0, 0, fs_opt.debug, "%s: log_blocks = %i\n", __FILE__, logsize);
+ 
+    return 0;
+ }
+ 
+ 
--- a/sys-block/partclone/files/partclone-0.2.36-progsreiserfs-0.3.1-1.patch
+++ b/sys-block/partclone/files/partclone-0.2.36-progsreiserfs-0.3.1-1.patch
@@ -0,0 +1,40 @@
+Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
+Date: 2011-11-19
+Initial Package Version: 0.2.36
+Origin: me
+Upstream Status: unknown
+Description: correct renamed function name in newer progsrieserfs libs
+ 
+diff -Naur partclone-0.2.36.orig/configure.ac partclone-0.2.36/configure.ac
+--- partclone-0.2.36.orig/configure.ac	2011-11-19 20:39:17.583443525 +0000
+++ partclone-0.2.36/configure.ac	2011-11-19 20:39:42.280335674 +0000
+@@ -136,7 +136,7 @@
+ )
+ AC_CHECK_LIB([reiserfs], [reiserfs_fs_open], true,
+     AC_MSG_ERROR([*** Reiserfs library (libreiserfs) not found]))
+-AC_CHECK_LIB([dal], [file_dal_open], true,
+AC_CHECK_LIB([dal], [file_open], true,
+     AC_MSG_ERROR([*** Reiserfs depend library (libdal) not found]))
+ AC_MSG_CHECKING(version of libreiserfs)
+ reiserfs_version=`gcc  $srcdir/src/deplib_version.c -o $srcdir/get_lib_version -lreiserfs -DREISERFS`
+diff -Naur partclone-0.2.36.orig/src/reiserfsclone.c partclone-0.2.36/src/reiserfsclone.c
+--- partclone-0.2.36.orig/src/reiserfsclone.c	2011-11-19 20:39:17.588073180 +0000
+++ partclone-0.2.36/src/reiserfsclone.c	2011-11-19 20:40:04.680919172 +0000
+@@ -38,7 +38,7 @@
+ /// open device
+ static void fs_open(char* device){
+ 
+-    if (!(dal = (dal_t*)file_dal_open(device, DEFAULT_BLOCK_SIZE, O_RDONLY))) {
+    if (!(dal = (dal_t*)file_open(device, DEFAULT_BLOCK_SIZE, O_RDONLY))) {
+         log_mesg(0, 1, 1, fs_opt.debug, "%s: Couldn't create device abstraction for %s.\n", __FILE__, device);
+     }
+ 
+@@ -59,7 +59,7 @@
+ static void fs_close(){
+ 
+     reiserfs_fs_close(fs);
+-    file_dal_close(dal);
+    file_close(dal);
+ 
+ }
+ 
--- a/sys-block/partclone/files/partclone-0.2.36-xfs-progs-3.1.4-1.patch
+++ b/sys-block/partclone/files/partclone-0.2.36-xfs-progs-3.1.4-1.patch
@@ -0,0 +1,33 @@
+Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
+Date: 2011-11-19
+Initial Package Version: 0.2.36
+Origin: me
+Upstream Status: unknown
+Description: find proper xfs header
+ 
+diff -Naur partclone-0.2.36.orig/configure.ac partclone-0.2.36/configure.ac
+--- partclone-0.2.36.orig/configure.ac	2011-11-19 19:47:09.821243182 +0000
+++ partclone-0.2.36/configure.ac	2011-11-19 19:48:09.492860562 +0000
+@@ -111,8 +111,8 @@
+ 
+ dnl Check for XFS 
+ AC_CHECKING([ for XFS Library and Header files ... ])
+-AC_CHECK_HEADERS([xfs/libxfs.h], ,
+-   AC_MSG_ERROR([*** XFS header (libxfs.h) not found])
+AC_CHECK_HEADERS([xfs/xfs.h], ,
+   AC_MSG_ERROR([*** XFS header (xfs.h) not found])
+ )
+ supported_fs=$supported_fs" xfs"
+ fi
+diff -ruN partclone-0.2.36.orig/src/xfsclone.h partclone-0.2.36/src/xfsclone.h
+--- partclone-0.2.36.orig/src/xfsclone.h	2010-09-01 17:15:10.000000000 +0900
+++ partclone-0.2.36/src/xfsclone.h	2010-09-17 00:19:11.726452075 +0900
+@@ -11,7 +11,7 @@
+  * (at your option) any later version.
+  */
+ 
+-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
+ 
+ /*
+  * An on-disk allocation group header is composed of 4 structures,
--- a/sys-block/partclone/partclone-0.2.36.ebuild
+++ b/sys-block/partclone/partclone-0.2.36.ebuild
@@ -4,7 +4,7 @@

 EAPI=4

-inherit eutils
+inherit autotools eutils

 DESCRIPTION="Partition cloning tool"
 HOMEPAGE="http://partclone.org"
@@ -12,47 +12,58 @@ SRC_URI="mirror://sourceforge/partclone/partclone_${PV}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="xfs reiserfs reiser4 hfs fat ntfs jfs"
+KEYWORDS="~amd64 ~x86"
+IUSE="xfs reiserfs reiser4 hfsp fat ntfs jfs btrfs static mtrace"

 DEPEND=">=sys-fs/e2fsprogs-1.41.4
-	fat? ( sys-fs/dosfstools )
-	ntfs? ( sys-fs/ntfsprogs )
-	hfs? ( sys-fs/hfsutils )
-	jfs? ( sys-fs/jfsutils )
+	xfs? ( sys-fs/xfsprogs )
 	reiserfs? ( sys-fs/progsreiserfs )
-	reiser4? ( sys-fs/reiser4progs )
-	xfs? ( sys-fs/xfsprogs )"
+	reiser4? ( >=sys-fs/reiser4progs-1.0.7-r1 )
+	hfsp? ( sys-fs/hfsutils )
+	fat? ( sys-fs/dosfstools )
+	ntfs? ( sys-fs/ntfs3g[-ntfsprogs]
+		sys-fs/ntfsprogs )
+	jfs? ( >=sys-fs/jfsutils-1.1.15-r1 )
+	btrfs? ( sys-fs/btrfs-progs )
+	"
 RDEPEND="${DEPEND}"

-src_configure()
-{
-	local myconf
-	myconf="${myconf} --enable-extfs --enable-ncursesw"
-	use xfs && myconf="${myconf} --enable-xfs"
-	use reiserfs && myconf="${myconf} --enable-reiserfs"
-	use reiser4 && myconf="${myconf} --enable-reiser4"
-	use hfs && myconf="${myconf} --enable-hfsp"
-	use fat && myconf="${myconf} --enable-fat"
-	use ntfs && myconf="${myconf} --enable-ntfs"
-	use xfs && myconf="${myconf} --enable-xfs"
-
-	econf ${myconf} || die "econf failed"
+src_prepare() {
+	epatch "${FILESDIR}/partclone-0.2.36-xfs-progs-3.1.4-1.patch"
+	epatch "${FILESDIR}/partclone-0.2.36-progsreiserfs-0.3.1-1.patch"
+	epatch "${FILESDIR}/jfsclone-no-return.patch"
+	eautoreconf
 }

-src_install()
-{
-	#emake install || die "make install failed"
-	#emake DIST_ROOT="${D}" install || die "make install failed"
-	cd ${S}/src
-	dosbin partclone.dd partclone.restore partclone.chkimg
-	dosbin partclone.extfs
-	use xfs && dosbin partclone.xfs
-	use reiserfs && dosbin partclone.reiserfs
-	use reiser4 && dosbin partclone.reiser4
-	use hfs && dosbin partclone.hfsp
-	use fat && dosbin partclone.fat
-	use ntfs && dosbin partclone.ntfs
-	use ntfs && dosbin partclone.ntfsfixboot
+src_configure() {
+	local myconf=""
+	use xfs && myconf="${myconf} --enable-xfs"
+		use xfs && myconf="${myconf} --enable-xfs"
+		use reiserfs && myconf="${myconf} --enable-reiserfs"
+		use reiser4 && myconf="${myconf} --enable-reiser4"
+		use hfsp && myconf="${myconf} --enable-hfsp"
+		use fat && myconf="${myconf} --enable-fat"
+		use ntfs && myconf="${myconf} --enable-ntfs"
+		use jfs && myconf="${myconf} --enable-jfs"
+		use btrfs && myconf="${myconf} --enable-btrfs"
+		use static && myconf="${myconf} --enable-static"
+		use mtrace && myconf="${myconf} --enable-mtrace"
+	econf ${myconf} \
+		--enable-extfs \
+		--enable-ncursesw
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+#	cd ${S}/src
+#	dosbin partclone.dd partclone.restore partclone.chkimg
+#	dosbin partclone.extfs
+#	use xfs && dosbin partclone.xfs
+#	use reiserfs && dosbin partclone.reiserfs
+#	use reiser4 && dosbin partclone.reiser4
+#	use hfs && dosbin partclone.hfsp
+#	use fat && dosbin partclone.fat
+#	use ntfs && dosbin partclone.ntfs
+#	use ntfs && dosbin partclone.ntfsfixboot
 }