Revision bump, support Gentoo kernels; proxied commit for Timo Eissler (morlix), fixes bug #489456.

(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

3 files changed, 84 insertions, 1 deletions

diff --git a/app-backup/rear/ChangeLog b/app-backup/rear/ChangeLog
index 732610b33a0f..088dafc1b567 100644
--- a/app-backup/rear/ChangeLog
+++ b/app-backup/rear/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-backup/rear
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/rear/ChangeLog,v 1.1 2013/10/17 18:48:39 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/rear/ChangeLog,v 1.2 2013/10/26 13:37:26 tomwij Exp $
+
+*rear-1.15-r1 (26 Oct 2013)
+
+  26 Oct 2013; Tom Wijsman <TomWij@gentoo.org>
+  +files/rear-1.15-add-support-for-gentoo-kernels.patch, +rear-1.15-r1.ebuild:
+  Revision bump, support Gentoo kernels; proxied commit for Timo Eissler
+  (morlix), fixes bug #489456.
 
 *rear-1.15 (17 Oct 2013)
 
diff --git a/app-backup/rear/files/rear-1.15-add-support-for-gentoo-kernels.patch b/app-backup/rear/files/rear-1.15-add-support-for-gentoo-kernels.patch
new file mode 100644
index 000000000000..608685418676
--- /dev/null
+++ b/app-backup/rear/files/rear-1.15-add-support-for-gentoo-kernels.patch
@@ -0,0 +1,19 @@
+diff --git a/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh b/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh
+index 6816f37..ec437e4 100644
+--- a/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh
++++ b/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh
+@@ -50,6 +50,14 @@ if [ ! -s "$KERNEL_FILE" ]; then
+ 		else
+ 			Error "Could not find Arch kernel /boot/vmlinuz[-linux|26]"
+ 		fi
++	elif [ -f /etc/gentoo-release ]; then
++		if [ -f "/boot/kernel-genkernel-${REAL_MACHINE}-${KERNEL_VERSION}" ]; then
++     		KERNEL_FILE="/boot/kernel-genkernel-${REAL_MACHINE}-${KERNEL_VERSION}"
++     	elif [ -f "/boot/kernel-${KERNEL_VERSION}" ]; then
++     		KERNEL_FILE="/boot/kernel-${KERNEL_VERSION}"
++		else
++     		Error "Could not find Gentoo kernel"
++		fi
+ 	else
+ 		Error "Could not find a matching kernel in /boot !"
+ 	fi
diff --git a/app-backup/rear/rear-1.15-r1.ebuild b/app-backup/rear/rear-1.15-r1.ebuild
new file mode 100644
index 000000000000..86a8c84a43ee
--- /dev/null
+++ b/app-backup/rear/rear-1.15-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/rear/rear-1.15-r1.ebuild,v 1.1 2013/10/26 13:37:26 tomwij Exp $
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Fully automated disaster recovery supporting a broad variety of backup strategies and scenarios."
+HOMEPAGE="http://relax-and-recover.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="udev"
+
+RDEPEND="dev-libs/openssl
+	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? ( virtual/udev )
+"
+
+src_prepare () {
+	epatch "${FILESDIR}/${P}-add-support-for-gentoo-kernels.patch"
+}
+
+src_compile () { :; }
+
+src_install () {
+	# Deploy udev USB rule and udev will autostart ReaR workflows in case 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 /lib/udev/rules.d
+		doins etc/udev/rules.d/62-${PN}-usb.rules
+	fi
+
+	# Copy main script-file and documentation.
+	dosbin usr/sbin/${PN}
+	doman doc/${PN}.8
+	dodoc README
+
+	# Copy configurations files.
+	insinto /etc
+	doins -r etc/${PN}/
+
+	insinto /usr/share/
+	doins -r usr/share/${PN}/
+}