app-backup/fsarchiver: Bump to 0.6.3 and 0.6.5 . There were change in archive format between version 0.6.3 and 0.6.4 so i'll keep old version for some time

svn path=/sunrise/; revision=9830

5 files changed, 57 insertions, 99 deletions

diff --git a/app-backup/fsarchiver/ChangeLog b/app-backup/fsarchiver/ChangeLog
index 88eb7c7f8..43278766d 100644
--- a/app-backup/fsarchiver/ChangeLog
+++ b/app-backup/fsarchiver/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for app-backup/fsarchiver
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Jan 2010; Marcin Miroslaw <bug@mejor.pl> -fsarchiver-0.6.1.ebuild,
+  -files/fsarchiver-0.6.1-configure.patch, +fsarchiver-0.6.3.ebuild,
+  +fsarchiver-0.6.5.ebuild:
+  Bump to 0.6.3 and 0.6.5 . There were change in archive format between
+  version 0.6.3 and 0.6.4 so i'll keep old version for some time
+
   25 Nov 2009; Marcin Miroslaw <bug@mejor.pl> +fsarchiver-0.6.1.ebuild,
   +files/fsarchiver-0.6.1-configure.patch, +metadata.xml:
   Initial commit, bug 261106, thanks to fdupoux for proposal of ebuild and to
diff --git a/app-backup/fsarchiver/Manifest b/app-backup/fsarchiver/Manifest
index 71cceb9d8..b2335538e 100644
--- a/app-backup/fsarchiver/Manifest
+++ b/app-backup/fsarchiver/Manifest
@@ -1,5 +1,6 @@
-AUX fsarchiver-0.6.1-configure.patch 4279 RMD160 64f755ca41893b5c2a2d1c0eec6bb2874f6b00dc SHA1 43bbd723d54c460f185f4aaad79f77c98a19a8b2 SHA256 6b61e48f4ef6faad5759c3885d9563de92e19d968bf88ae554efdc93513cd1fe
-DIST fsarchiver-0.6.1.tar.gz 220811 RMD160 9ba6397c6ad7cb06e0a2552a2e8443ed1453c662 SHA1 381cac2486827743587aca6ca42b94f37cae4bcc SHA256 f1ba7b4f3f8c875ccba41c5709e59b65347163cf77c2df0e1fd5e02d406dc467
-EBUILD fsarchiver-0.6.1.ebuild 1068 RMD160 e8d2d3bf2ecc82a28f601aa0419ec73b087ad5f9 SHA1 253c6ed82e01ba501fbcbb892bdde0cd0be6f99d SHA256 26aabf4cbf864569b4b5a636b2ad73c5814d4140fd073e52ea3541f9fac2130b
-MISC ChangeLog 363 RMD160 00f77bbb1fda96e94a3ff3f75d034cde37b3f78b SHA1 c247d326ae12de355dddfd9e848407dfa2a19c18 SHA256 ac79e664779bc32a7650c1a92e6f0000d5342f012002577388c7d11dae46b5dc
+DIST fsarchiver-0.6.3.tar.gz 235035 RMD160 5ff0f4afb97c1f7fe85d8360136c66d1de213f18 SHA1 80602a83ee344754c229eb6a718b92a6b81041d2 SHA256 d4a55c9d8140647fa87f4a4004f8a5afb7cee26a081e48f0003809d513155817
+DIST fsarchiver-0.6.5.tar.gz 238891 RMD160 6897584cf7ba69e2adf4f087c02478453678e14d SHA1 e062608ee34ff7c05b20d454e273337a460f398a SHA256 34b578b1115c46f299bc80a90dec796cd78caeb4a66447b68a525b54402dff94
+EBUILD fsarchiver-0.6.3.ebuild 1025 RMD160 a4f362b85d15b6fb62268af8d7b05d1ef07c0347 SHA1 b3febe4952ba5d6eb41cc3acdad9d4408d2ffa1f SHA256 1585783ce9613142bc8efdd573d9045e1c60d06bd2f234d152cf8d3f2120b59a
+EBUILD fsarchiver-0.6.5.ebuild 1025 RMD160 a4f362b85d15b6fb62268af8d7b05d1ef07c0347 SHA1 b3febe4952ba5d6eb41cc3acdad9d4408d2ffa1f SHA256 1585783ce9613142bc8efdd573d9045e1c60d06bd2f234d152cf8d3f2120b59a
+MISC ChangeLog 670 RMD160 dbc29c45d2395d753e9358e9b6dca051e76f97d7 SHA1 fca0a7ba8830852a3573bbc88afc890dfe8a5cd3 SHA256 f6b9b1236f1353e5ac4b018e3ce2a9db63e1bb1862e6823c0cfa1609a0698aa0
 MISC metadata.xml 305 RMD160 8d6a79f0e57402bcb14efccd0e6c55e6f876fc00 SHA1 8852d2d6da36c28f97bb69b9bd2a3d30aa0c650b SHA256 34ab0b80a3080900fba0287e8f424153c327888ff5d81051c7a9078b48253699
diff --git a/app-backup/fsarchiver/files/fsarchiver-0.6.1-configure.patch b/app-backup/fsarchiver/files/fsarchiver-0.6.1-configure.patch
deleted file mode 100644
index dbc412996..000000000
--- a/app-backup/fsarchiver/files/fsarchiver-0.6.1-configure.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -u /var/tmp/portage/app-arch/fsarchiver-0.6.1/work/fsarchiver-0.6.1/configure.ac /tmp/buffer-content-5978Hkj
---- a/configure.ac	2009-10-04 04:45:19.000000000 -0400
-+++ b/configure.ac	2009-11-21 15:57:20.000000000 -0500
-@@ -48,40 +48,43 @@
- AC_CHECK_HEADERS(bzlib.h)
- 
- dnl option to disable lzma support (for people who don't have xz installed)
--AC_ARG_ENABLE(lzma,
--    [  --disable-lzma          don't compile the support for lzma compression (which requires liblzma)],
--  ,
--  [AC_DEFINE([OPTION_LZMA_SUPPORT], 1, [Define to 1 to enable the support for lzma compression])
-+AC_ARG_ENABLE([lzma],
-+    [AS_HELP_STRING([--disable-lzma], [don't compile the support for lzma compression (which requires liblzma)])],
-+    [enable_lzma=$enableval],
-+    [enable_lzma=yes])
-+if test "x$enable_lzma" = "xyes"; then
-+  AC_DEFINE([OPTION_LZMA_SUPPORT], 1, [Define to 1 to enable the support for lzma compression])
-   AC_CHECKING([for liblzma (library and header files)])
-   AC_CHECK_LIB([lzma], [lzma_easy_encoder], [LIBS="$LIBS -llzma"],
-      AC_MSG_ERROR([*** lzma library (liblzma) not found: you can either install xz-4.999.9beta.tar.gz (or newer) or disable lzma support using --disable-lzma]))
-   AC_CHECK_HEADERS(lzma.h)
--  ]
--)
-+fi
- 
- dnl option to disable lzo support (for people who don't have liblzo2 installed)
--AC_ARG_ENABLE(lzo,
--    [  --disable-lzo           don't compile the support for lzo compression (which requires liblzo2)],
--  ,
--  [AC_DEFINE([OPTION_LZO_SUPPORT], 1, [Define to 1 to enable the support for lzo compression])
-+AC_ARG_ENABLE([lzo],
-+    [AS_HELP_STRING([--disable-lzo], [don't compile the support for lzo compression (which requires liblzo2)])],
-+    [enable_lzo=$enableval],
-+    [enable_lzo=yes])
-+if test "x$enable_lzo" = "xyes"; then
-+  AC_DEFINE([OPTION_LZO_SUPPORT], 1, [Define to 1 to enable the support for lzo compression])
-   AC_CHECKING([for liblzo2 (library and header files)])
-   AC_CHECK_LIB([lzo2], [lzo1x_1_compress], [LIBS="$LIBS -llzo2"],
-      AC_MSG_ERROR([*** lzo library (liblzo2) not found: please install liblzo (you may also have to install lzo-devel) or disable lzo support using --disable-lzo]))
-   AC_CHECK_HEADERS(lzo/lzo1x.h)
--  ]
--)
-+fi
- 
- dnl option to disable crypto support (for people who don't have libgcrypt installed)
--AC_ARG_ENABLE(crypto,
--    [  --disable-crypto        don't compile the support for encryption (which requires libgcrypt)],
--  ,
--  [AC_DEFINE([OPTION_CRYPTO_SUPPORT], 1, [Define to 1 to enable the support for archive encryption using libgcrypt])
-+AC_ARG_ENABLE([crypto],
-+    [AS_HELP_STRING([--disable-crypto], [don't compile the support for encryption (which requires libgcrypt)])],
-+    [enable_crypto=$enableval],
-+    [enable_crypto=yes])
-+if test "x$enable_crypto" = "xyes"; then
-+  AC_DEFINE([OPTION_CRYPTO_SUPPORT], 1, [Define to 1 to enable the support for archive encryption using libgcrypt])
-   AC_CHECKING([for libgcrypt (library and header files)])
-   AC_CHECK_LIB([gcrypt], [gcry_cipher_encrypt], [LIBS="$LIBS -lgcrypt -lgpg-error"],
-      AC_MSG_ERROR([*** libgcrypt not found: you can either install libgcrypt (and the development libgcrypt package) or disable the support for encryption using --disable-crypto]))
-   AC_CHECK_HEADERS(gcrypt.h)
--  ]
--)
-+fi
- 
- dnl check e2fsprogs and its libs
- AC_CHECKING([for e2fsprogs-1.39 or newer])
-@@ -122,13 +125,19 @@
-     AC_SUBST(LOGDIR)
- 
- dnl options for developers
--AC_ARG_ENABLE(devel,
--    [  --enable-devel          enable options for developers (debug, ...)],
--    AC_DEFINE([OPTION_DEVEL_SUPPORT], 1, [Define to 1 to enable options for development]),)
-+AC_ARG_ENABLE([devel],
-+    [AS_HELP_STRING([--enable-devel],[enable options for developers (debug, ...)])],
-+    [enable_devel=$enableval],
-+    [enable_devel=no])
-+if test "x$enable_devel" = "xyes"; then
-+   AC_DEFINE([OPTION_DEVEL_SUPPORT], 1, [Define to 1 to enable options for development])
-+fi
- 
- dnl static executables?
--AC_ARG_ENABLE(static,
--    [  --enable-static         build static binaries], allstatic=$enableval, allstatic=no)
-+AC_ARG_ENABLE([static],
-+    [AS_HELP_STRING([--enable-static],[build static binaries])], 
-+    [allstatic=$enableval], 
-+    [allstatic=no])
- 
- if test "$allstatic" = "yes"
- then
-
-Diff finished.  Sat Nov 21 15:57:20 2009
diff --git a/app-backup/fsarchiver/fsarchiver-0.6.1.ebuild b/app-backup/fsarchiver/fsarchiver-0.6.3.ebuild
index 19eeda299..20c2c73a3 100644
--- a/app-backup/fsarchiver/fsarchiver-0.6.1.ebuild
+++ b/app-backup/fsarchiver/fsarchiver-0.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -25,7 +25,6 @@ DEPEND="sys-libs/zlib
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-configure.patch"
 	if ! use debug ; then
 		sed -i -e 's/^\([a-z]*_CFLAGS.*\)-ggdb/\1/' src/Makefile.am || die "seding failed"
 	fi
diff --git a/app-backup/fsarchiver/fsarchiver-0.6.5.ebuild b/app-backup/fsarchiver/fsarchiver-0.6.5.ebuild
new file mode 100644
index 000000000..20c2c73a3
--- /dev/null
+++ b/app-backup/fsarchiver/fsarchiver-0.6.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit autotools eutils
+
+DESCRIPTION="Flexible filesystem archiver for backup and deployment tool"
+HOMEPAGE="http://www.fsarchiver.org"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gcrypt lzma lzo static"
+
+DEPEND="sys-libs/zlib
+	app-arch/bzip2
+	>=sys-fs/e2fsprogs-1.41.4
+	lzma? ( >=app-arch/xz-utils-4.999.9_beta )
+	lzo? ( >=dev-libs/lzo-2.02 )
+	gcrypt? ( dev-libs/libgcrypt )
+	static? ( lzma? ( app-arch/xz-utils[static-libs] ) )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	if ! use debug ; then
+		sed -i -e 's/^\([a-z]*_CFLAGS.*\)-ggdb/\1/' src/Makefile.am || die "seding failed"
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable lzma) \
+	$(use_enable lzo) \
+	$(use_enable gcrypt crypto) \
+	$(use_enable static) \
+	$(use_enable debug devel)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+}