From 26c2e0b9003344cf738851c0e5042966d5177cae Mon Sep 17 00:00:00 2001 From: "Brian Wiborg (baccenfutter)" Date: Fri, 1 Jun 2012 22:04:24 +0200 Subject: app-backup/rear: New ebuild for bug 404439 --- app-backup/rear/Manifest | 7 +-- .../rear-1.12.0-broken_lib_dir_workaround.patch | 18 ------ app-backup/rear/metadata.xml | 16 ++++-- app-backup/rear/rear-1.12.0-r1.ebuild | 57 ------------------ app-backup/rear/rear-1.13.0-r1.ebuild | 43 ++++++++++++++ app-backup/rear/rear-1.13.0.ebuild | 67 ---------------------- 6 files changed, 56 insertions(+), 152 deletions(-) delete mode 100644 app-backup/rear/files/rear-1.12.0-broken_lib_dir_workaround.patch delete mode 100644 app-backup/rear/rear-1.12.0-r1.ebuild create mode 100644 app-backup/rear/rear-1.13.0-r1.ebuild delete mode 100644 app-backup/rear/rear-1.13.0.ebuild (limited to 'app-backup') diff --git a/app-backup/rear/Manifest b/app-backup/rear/Manifest index fbaacaecb..338be73e0 100644 --- a/app-backup/rear/Manifest +++ b/app-backup/rear/Manifest @@ -1,7 +1,4 @@ -AUX rear-1.12.0-broken_lib_dir_workaround.patch 1034 RMD160 189651fc3b7b86217c1d394b62abab2074aa5e50 SHA1 67f8abcb3b6f18e5d649b8735e714d803a7f1ba9 SHA256 5df725e02dd71bbdcd7c4ebe75ac2735bd28fd389e0f3787cdd32b412f779618 -DIST rear-1.12.0.tar.gz 324641 RMD160 358906bdbf681f953b090e5f7a4fff5038a73cfc SHA1 e672d35c9531f231a7ec1b10b3bd89057dae504c SHA256 1e9e8f1ce31f60251d3382c7f6ea0d2b262282e213aadd2a119aa4dac1509519 DIST rear-1.13.0.tar.gz 322488 RMD160 6ee37313b152df0932fe137dfb729ac46a8e2d03 SHA1 dcc8d5e804fc88ef9b17b756c9c966887e75ad57 SHA256 fb034f53d406268f1ec3b4235a5cf7dc70705947ec0cc389d14e16155611bbb8 -EBUILD rear-1.12.0-r1.ebuild 1412 RMD160 9c3c9ad9ae1415e88a06b63474409bd6f0ce807d SHA1 e451d977346f591c5dc7a40404c50cd8cecadcc4 SHA256 7bb7eff4f12c779a10b6c70e589062c0ad3858b563d9289c8dd07dc5f8edbbe7 -EBUILD rear-1.13.0.ebuild 1901 RMD160 6eea8b1e8fb52cdaad5f3170fb74c1fc6fc8d228 SHA1 8a8c1cc37364139c91751f3f779a5452d4084e82 SHA256 8bd418f21db7964a05c624c8fc3001798abb4c3f745a6abe213f7477b136ebf7 +EBUILD rear-1.13.0-r1.ebuild 891 RMD160 35e09cc88a0e13fbc9a3f23cd1769f72c27de42c SHA1 825332211102e005a8ef2baf9600310a1872836e SHA256 37839fefa91c97fadacd4a0287cecd9dae56e97cd89f58bec0d6cc39b3c1d783 MISC ChangeLog 586 RMD160 b17ce8aa0e1230ca9be27f374a58c379dc8ef08a SHA1 16d7d9ae7471044dc49f6532d6ec7752443fae0e SHA256 1fb0298797fc04834fc7993987e1e309b24dab13eb42d5e10d2a8af83d6d7f29 -MISC metadata.xml 806 RMD160 383b1a014fc32529faf3414d4d7161a4bceb2ef8 SHA1 cac469b3fa1bb6134ebbbc1573c3732c15b647a1 SHA256 53ef73ce6d9eacaab3dd8dba5984c2a9e9107baac7141c82a3210074407420e0 +MISC metadata.xml 734 RMD160 4cccd0af3016ef1eb816007013af3caf76b03ee5 SHA1 5486764c4fe9bb364a02fc9b46e6ec852cfeebde SHA256 1346909761c18c6dc4771220ccaf71c749503cfa75150cd92a4b13e10408c1c8 diff --git a/app-backup/rear/files/rear-1.12.0-broken_lib_dir_workaround.patch b/app-backup/rear/files/rear-1.12.0-broken_lib_dir_workaround.patch deleted file mode 100644 index c994da45d..000000000 --- a/app-backup/rear/files/rear-1.12.0-broken_lib_dir_workaround.patch +++ /dev/null @@ -1,18 +0,0 @@ -# Many Linux distributions other than Gentoo provide symlinks /lib64 and /lib32 pointing to /lib. Gentoo rather has /lib -# pointing to either /lib32 or /lib64 (depending on your arch). ReaR wasn't aware of the fact, that Gentoo handles this -# differently than most other distributions. This patch provides a workaround for ReaR's image creation workflow by -# flipping the symlink into Gentoo compatible style. -# -# The issue has been addressed upstream in Feb. 2012 and will be fixed shortly but not released before next major -# release. - ---- usr/share/rear/build/GNU/Linux/09_create_lib_directories_and_symlinks.sh.orig 2011-11-22 10:17:57.000000000 +0100 -+++ usr/share/rear/build/GNU/Linux/09_create_lib_directories_and_symlinks.sh 2012-02-05 12:45:58.322572332 +0100 -@@ -1,4 +1,6 @@ - # Create lib directories -+[ -L /lib ] && linktarget=$(readlink /lib) -+[ -n $linktarget ] && mv $ROOTFS_DIR/lib $ROOTFS_DIR/$linktarget - for libdir in /lib* ; do - # $libdir always contains a leading / ! - if [ -L $libdir ] ; then - diff --git a/app-backup/rear/metadata.xml b/app-backup/rear/metadata.xml index b68349dc4..0f06971a5 100644 --- a/app-backup/rear/metadata.xml +++ b/app-backup/rear/metadata.xml @@ -1,12 +1,18 @@ - Relax and Recover (Rear) is the leading Open Source disaster recovery solution, and successor to mkcdrec. It comprises of a modular framework and ready-to-go workflows for many common situations to produce a bootable image and restore from backup using this image. As a benefit, it allows to restore to different hardware and can therefore be used as a migration tool as well. + + Relax and Recover (Rear) is the leading Open Source disaster recovery + solution, and successor to mkcdrec. It comprises of a modular framework + and ready-to-go workflows for many common situations to produce a + bootable image and restore from backup using this image. As a benefit, + it allows to restore to different hardware and can therefore be used as + a migration tool as well. + maintainer-wanted@gentoo.org - - Have ReaR start backup when attaching your USB backup drive - Install example configuration files - + + https://github.com/rear/rear/issues + diff --git a/app-backup/rear/rear-1.12.0-r1.ebuild b/app-backup/rear/rear-1.12.0-r1.ebuild deleted file mode 100644 index 1e757b3ad..000000000 --- a/app-backup/rear/rear-1.12.0-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -inherit eutils - -DESCRIPTION="Fully automated disaster Recovery for GNU/Linux" -HOMEPAGE="http://rear.github.com" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="app-cdr/cdrtools - net-dialup/mingetty - net-fs/nfs-utils - sys-apps/iproute2 - sys-apps/lsb-release - sys-apps/util-linux - sys-block/parted - sys-boot/syslinux - sys-fs/udev - " - -src_prepare () { - epatch "${FILESDIR}/${P}-broken_lib_dir_workaround.patch" -} - -src_install () { - insinto /usr/share/ - doins -r usr/share/rear - insinto /etc/ - doins -r etc/rear - insinto /lib/udev/rules.d - doins etc/udev/rules.d/62-rear-usb.rules - insinto /etc/rear - doins usr/share/rear/conf/default.conf - dosbin usr/sbin/rear - - doman usr/share/rear/doc/rear.8 -} - -pkg_prerm () { - if [[ -z "${REPLACED_BY_VERSION}" ]]; then - # due to the nature of rear's image creation, there is a hard-coded - # relative symlinks that leads to a recursion error upon deletion. - rm "${EROOT}usr/share/rear/skel/default/lib/tls" - # for some odd reason portage tries to delete the parent directory - # befor the 'EXTERNAL' symlink is removed, leading to empty directory - # remaining behind. we want to avoid this until it has been fixed upstream. - rm "${EROOT}usr/share/rear/verify/EXTERNAL" - fi -} diff --git a/app-backup/rear/rear-1.13.0-r1.ebuild b/app-backup/rear/rear-1.13.0-r1.ebuild new file mode 100644 index 000000000..dcb73f016 --- /dev/null +++ b/app-backup/rear/rear-1.13.0-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 + +DESCRIPTION="Fully automated disaster Recovery supporting a broad variety of backup strategies and scenarios" +HOMEPAGE="http://rear.github.com/" +SRC_URI="mirror://github/downloads/${PN}/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="udev" + +RDEPEND="net-dialup/mingetty + net-fs/nfs-utils + sys-apps/iproute2 + sys-apps/lsb-release + sys-apps/util-linux + sys-block/parted + sys-boot/syslinux + virtual/cdrtools + udev? ( sys-fs/udev ) + " + +src_install () { + if use udev; then + insinto /lib/udev/rules.d + doins etc/udev/rules.d/62-${PN}-usb.rules + fi + + insinto /etc + doins -r etc/${PN} + + # copy main script-file and docs + dosbin usr/sbin/${PN} + doman usr/share/${PN}/doc/${PN}.8 + dodoc README + + insinto /usr/share/ + doins -r usr/share/${PN} +} diff --git a/app-backup/rear/rear-1.13.0.ebuild b/app-backup/rear/rear-1.13.0.ebuild deleted file mode 100644 index c55327e61..000000000 --- a/app-backup/rear/rear-1.13.0.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -inherit multilib - -DESCRIPTION="Fully automated disaster Recovery supporting a broad variety of backup strategies and scenarios" -HOMEPAGE="http://rear.github.com/" -SRC_URI="mirror://github/downloads/${PN}/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="udev examples" - -RDEPEND="net-dialup/mingetty - net-fs/nfs-utils - sys-apps/iproute2 - sys-apps/lsb-release - sys-apps/util-linux - sys-block/parted - sys-boot/syslinux - virtual/cdrtools - udev? ( sys-fs/udev ) - " - -src_install () { - # deploy udev USB rule and udev will autostart ReaR workflows incase a USB - # drive with the label 'REAR_000' is connected, which in turn is the - # default label when running the `rear format` command. - if use udev; then - insinto $(get_libdir)/udev/rules.d - doins etc/udev/rules.d/62-${PN}-usb.rules - fi - - # copy configuration files and examples - if use examples; then - insinto /etc/ - doins -r etc/${PN} - fi - insinto /etc/${PN}/ - doins usr/share/${PN}/conf/default.conf - - # copy main script-file and docs - dosbin usr/sbin/${PN} - doman usr/share/${PN}/doc/${PN}.8 - dodoc README - - # cleanup usr/share/rear/ and install remains recursively. - rm -r usr/share/${PN}/{AUTHORS,COPYING,README} || die - insinto /usr/share/ - doins -r usr/share/${PN} -} - -pkg_prerm () { - if [[ -z "${REPLACED_BY_VERSION}" ]]; then - # due to the nature of rear's image creation, there is a hard-coded - # relative symlinks that leads to a recursion error upon deletion. - rm "${EROOT}usr/share/${PN}/skel/default/lib/tls" - # for some odd reason portage tries to delete the parent directory - # befor the 'EXTERNAL' symlink is removed, leading to empty directory - # remaining behind. we want to avoid this until it has been fixed upstream. - rm "${EROOT}usr/share/${PN}/verify/EXTERNAL" - fi -} -- cgit v1.2.3-65-gdbad