From e2912f7c98fec443618e2d43f5819635b9d572ad Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Wed, 28 Nov 2012 21:31:19 +0100 Subject: [PATCH] update to new patches for fs support Package-Manager: portage-2.2.0_alpha142 RepoMan-Options: --force --- sys-block/partclone/ChangeLog | 11 ++- sys-block/partclone/Manifest | 15 ++-- sys-block/partclone/files/automake.patch | 12 ++++ ...rtclone-0.2.36-progsreiserfs-0.3.1-1.patch | 40 ----------- .../partclone-0.2.36-xfs-progs-3.1.4-1.patch | 33 --------- sys-block/partclone/partclone-0.2.37.ebuild | 69 ------------------- ...-0.2.36.ebuild => partclone-0.2.56.ebuild} | 18 +++-- 7 files changed, 35 insertions(+), 163 deletions(-) create mode 100644 sys-block/partclone/files/automake.patch delete mode 100644 sys-block/partclone/files/partclone-0.2.36-progsreiserfs-0.3.1-1.patch delete mode 100644 sys-block/partclone/files/partclone-0.2.36-xfs-progs-3.1.4-1.patch delete mode 100644 sys-block/partclone/partclone-0.2.37.ebuild rename sys-block/partclone/{partclone-0.2.36.ebuild => partclone-0.2.56.ebuild} (76%) diff --git a/sys-block/partclone/ChangeLog b/sys-block/partclone/ChangeLog index 28cb5679..5e2d52bc 100644 --- a/sys-block/partclone/ChangeLog +++ b/sys-block/partclone/ChangeLog @@ -1,7 +1,15 @@ # ChangeLog for sys-block/partclone -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*partclone-0.2.56 (28 Nov 2012) + + 28 Nov 2012; Mario Fetka +files/automake.patch, + +partclone-0.2.56.ebuild, -files/partclone-0.2.36-progsreiserfs-0.3.1-1.patch, + -files/partclone-0.2.36-xfs-progs-3.1.4-1.patch, -partclone-0.2.36.ebuild, + -partclone-0.2.37.ebuild: + update to new patches for fs support + *partclone-0.2.37 (04 Dec 2011) 04 Dec 2011; Mario Fetka +partclone-0.2.37.ebuild: @@ -16,4 +24,3 @@ 09 May 2010; Mario Fetka +partclone-0.2.8.ebuild, +metadata.xml: Initial checkin based on ebuild from systemrescuecd ebuild - diff --git a/sys-block/partclone/Manifest b/sys-block/partclone/Manifest index 9f8df3b6..63013217 100644 --- a/sys-block/partclone/Manifest +++ b/sys-block/partclone/Manifest @@ -1,9 +1,6 @@ -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 -DIST partclone_0.2.37.tar.gz 424366 RMD160 e56b6435e0df841cd26fa05dd2622d6f12c30479 SHA1 c0566ff82c2f6c8374eef8c6934fd12a76e8f9b8 SHA256 3f775a97a8fc996bd8975ae6112113bb07bf695521c6519648b0687f2c2c058d -EBUILD partclone-0.2.36.ebuild 2028 RMD160 4723e1541fd08753cdfd3e8a57634df62bc4f645 SHA1 9c3be65a19c06c9e77ec664938451951e9dde50a SHA256 2ed7bd0abecc8e07d60561f0f81eae725771ad6c7aae76abd52ee256efb705b6 -EBUILD partclone-0.2.37.ebuild 2028 RMD160 4723e1541fd08753cdfd3e8a57634df62bc4f645 SHA1 9c3be65a19c06c9e77ec664938451951e9dde50a SHA256 2ed7bd0abecc8e07d60561f0f81eae725771ad6c7aae76abd52ee256efb705b6 -MISC ChangeLog 587 RMD160 d13cb4e27ab77aaf3c7050c06e8da666cf4fe471 SHA1 25c6f1c79b248ab498239bae9173e11da1389e97 SHA256 38f18abb648f24d0d3f717c5917f45038b31c7cd00cc4ee6641f12ae88c2b633 -MISC metadata.xml 205 RMD160 f85e91d792c694cb3e45fac26295dba0e6e43786 SHA1 3f13c3b49579342e2308323aa3dda2f43dd94c23 SHA256 9fdfc9c91107d94feb8416adc2cec7734fa27084bff83ea859938b3216e028bc +AUX automake.patch 435 SHA256 7f7142cbd77469008fe8a8aa54a8a771470811a9be6a2ee3ae65855a43b62a9a SHA512 5dcb3ff62df4356f622ade738c94c89eeda54c45163bede17cc9f465898d1da1ec2a17b454177bfbde673bd271e6e449084f07af8d101f3a9d2e430c442bbd0d WHIRLPOOL c9eba980d56b430680c435e55e4e536b46230f2016a39ef254f6145c7d0dc9dc132c0434242be2296f5ff732b560c263bd3375cd3ae73ce6e92939d74b75ac87 +AUX jfsclone-no-return.patch 448 SHA256 70c58ef363b87d7771172d66a2d3862a606427620f7ca6cc8b8c99de9521f92d SHA512 4ca41efb405cafcc072f51a5bf0c43281a909c1ac215b46ab99e2e486f52a41426acb719d9bc60e0ea5b720c76e0d7a9b9f9c9f28bdfd36bc8d8bbcdc626cf96 WHIRLPOOL d62ff0b9b116f15c317116cf30a5251cb38b90d220d466ad5e6401920a8932907be80430f5d97fd4339adc7fa684438a4674dad3173632af9f45855dbfd95caf +DIST partclone-0.2.56.tar.gz 442140 SHA256 91fcee5590665a732a68cef7b911e35f58c41e2ffc6b7a50683bb0cbcc466c04 SHA512 07175e529901f4f80261b756e559d29173d893557bf74d72307c07b6d7b9495d3f895d738a8c09a26b58f0a3324004e1daa62326cb2e86f856bb8ed6262bb026 WHIRLPOOL ca16ed2a45b84d7219bc8f7042ad7f2f05be5fbaa99dd65ca890c6cdc237ee93172dd67d9a6cf59ff1515f9921fc39a633f673f5cbb96923037470f46292d686 +EBUILD partclone-0.2.56.ebuild 1924 SHA256 041a46b8ff04a19eae6a67a6a46dd52e37cb7765fee49f29e465dd5b02b0be28 SHA512 d4b332bdb67a8e6a61b1ac24f2441b71541c29de4418760dd6c8400acae67620f4f7738422cb7065bdf5b96e3baced1455504eba22418d6e13b30c1794609854 WHIRLPOOL d6db2c5dfe49de82e83b442e2aa1ffaa3465298a732e3d27f918098d18daa96d5fb298505365044fc2ee0c8c59cdf9c2e5251735ced3426cd0ca9b5226924593 +MISC ChangeLog 919 SHA256 170fed2db7e9da29dcd1fcb147e88db65e733e155397bd428f3dcbf279b2f22d SHA512 b8e4d59d49fd17c8f57f8a2455018314dad85e9938e73c9a3119444d9284fa5dc767bb9b2365007c81ff5bc1e01095bcd601ab0cffddf389c3ae2970f080457a WHIRLPOOL 608e4a3b51eca152452e4842660f0637110347be827599756968b3379c537a5beb1a8fee8f317da6c61c1477c034084f276be0089164e4aadc40fa807d13bbb8 +MISC metadata.xml 205 SHA256 9fdfc9c91107d94feb8416adc2cec7734fa27084bff83ea859938b3216e028bc SHA512 ef3a39d2cd131cd29451ec2d009484e89b60e8cbeed5fc0f5f899cebb0c5f9867682ce603982e4de32004493944c6ff99a4c797e7ef2441d6049e5a616143a8b WHIRLPOOL 779e2cb116b19389f70acc6d49694358619116f9849f3b8e46f00df4e39b4476424b20990b9dabb4ba16605d1894d6b820eaeb930401d825265bfdca27f6fb96 diff --git a/sys-block/partclone/files/automake.patch b/sys-block/partclone/files/automake.patch new file mode 100644 index 00000000..f19579c3 --- /dev/null +++ b/sys-block/partclone/files/automake.patch @@ -0,0 +1,12 @@ +--- partclone-0.2.56/configure.ac.wiget 2012-11-17 21:25:42.281686732 +0100 ++++ partclone-0.2.56/configure.ac 2012-11-17 21:26:01.388352614 +0100 +@@ -1,7 +1,7 @@ + AC_INIT([Partclone], [0.2.56], [thomas@nchc.org.tw]) + #AC_CONFIG_AUX_DIR([build-aux]) + #AC CONFIG SRCDIR([src/main.c]) +-AM_INIT_AUTOMAKE([-Wall -Werror foreign]) ++AM_INIT_AUTOMAKE([-Wall foreign]) + AM_GNU_GETTEXT_VERSION([0.16.1]) + AM_GNU_GETTEXT([external]) + AC_PROG_CC + diff --git 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 deleted file mode 100644 index fceac981..00000000 --- a/sys-block/partclone/files/partclone-0.2.36-progsreiserfs-0.3.1-1.patch +++ /dev/null @@ -1,40 +0,0 @@ -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); - - } - diff --git 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 deleted file mode 100644 index d19e84af..00000000 --- a/sys-block/partclone/files/partclone-0.2.36-xfs-progs-3.1.4-1.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 -+#include - - /* - * An on-disk allocation group header is composed of 4 structures, diff --git a/sys-block/partclone/partclone-0.2.37.ebuild b/sys-block/partclone/partclone-0.2.37.ebuild deleted file mode 100644 index a1504c94..00000000 --- a/sys-block/partclone/partclone-0.2.37.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -inherit autotools eutils - -DESCRIPTION="Partition cloning tool" -HOMEPAGE="http://partclone.org" -SRC_URI="mirror://sourceforge/partclone/partclone_${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="xfs reiserfs reiser4 hfsp fat ntfs jfs btrfs static mtrace" - -DEPEND=">=sys-fs/e2fsprogs-1.41.4 - xfs? ( sys-fs/xfsprogs ) - reiserfs? ( sys-fs/progsreiserfs ) - 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_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_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 -} - diff --git a/sys-block/partclone/partclone-0.2.36.ebuild b/sys-block/partclone/partclone-0.2.56.ebuild similarity index 76% rename from sys-block/partclone/partclone-0.2.36.ebuild rename to sys-block/partclone/partclone-0.2.56.ebuild index a1504c94..83e05cbd 100644 --- a/sys-block/partclone/partclone-0.2.36.ebuild +++ b/sys-block/partclone/partclone-0.2.56.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -8,29 +8,27 @@ inherit autotools eutils DESCRIPTION="Partition cloning tool" HOMEPAGE="http://partclone.org" -SRC_URI="mirror://sourceforge/partclone/partclone_${PV}.tar.gz" +SRC_URI="mirror://sourceforge/partclone/partclone-${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="xfs reiserfs reiser4 hfsp fat ntfs jfs btrfs static mtrace" +IUSE="+xfs +reiserfs +reiser4 +hfsp +fat +ntfs +jfs +btrfs static mtrace" DEPEND=">=sys-fs/e2fsprogs-1.41.4 xfs? ( sys-fs/xfsprogs ) - reiserfs? ( sys-fs/progsreiserfs ) - reiser4? ( >=sys-fs/reiser4progs-1.0.7-r1 ) + reiserfs? ( =sys-fs/reiser4progs-1.0.7 ) hfsp? ( sys-fs/hfsutils ) fat? ( sys-fs/dosfstools ) - ntfs? ( sys-fs/ntfs3g[-ntfsprogs] - sys-fs/ntfsprogs ) - jfs? ( >=sys-fs/jfsutils-1.1.15-r1 ) + ntfs? ( sys-fs/ntfs3g[ntfsprogs] ) + jfs? ( >=sys-fs/jfsutils-1.1.15 ) btrfs? ( sys-fs/btrfs-progs ) " RDEPEND="${DEPEND}" 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}/automake.patch" epatch "${FILESDIR}/jfsclone-no-return.patch" eautoreconf }