Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/rear/files/, app-backup/rear/
Date: Mon, 05 Oct 2020 05:47:03
Message-Id: 1601876808.6eacc715e06b282225caf3d50e0f5269d8e425e3.juippis@gentoo
1 commit: 6eacc715e06b282225caf3d50e0f5269d8e425e3
2 Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net>
3 AuthorDate: Sun Aug 2 21:14:26 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 5 05:46:48 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eacc715
7
8 app-backup/rear: version bump to 2.6
9
10 re-introduce udev rule for backup start on backup disc connect
11 add proxy-maintainership
12
13 Closes: https://bugs.gentoo.org/696678
14 Package-Manager: Portage-3.0.4, Repoman-3.0.1
15 Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net>
16 Closes: https://github.com/gentoo/gentoo/pull/17487
17 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
18
19 app-backup/rear/Manifest | 1 +
20 app-backup/rear/files/rear-2.6-Makefile.patch | 34 +++++++++++++++
21 app-backup/rear/metadata.xml | 10 ++++-
22 app-backup/rear/rear-2.6.ebuild | 60 +++++++++++++++++++++++++++
23 4 files changed, 104 insertions(+), 1 deletion(-)
24
25 diff --git a/app-backup/rear/Manifest b/app-backup/rear/Manifest
26 index 8ae2cae8ecf..07cafa56e62 100644
27 --- a/app-backup/rear/Manifest
28 +++ b/app-backup/rear/Manifest
29 @@ -1 +1,2 @@
30 DIST rear-2.4.tar.gz 611731 BLAKE2B f7cb6955302e0be6178393a678f050729b827f822df91d28245655d414892f225e25125f7e3bfad080e139ddc9c728121894b4ebde48c4dff2a8071fb4a5d46e SHA512 8a20c0ffd913b1b4c27f6125c1ca31404daaceccb2bfff7932f1ea402806657252afc3f6719c75dcab2de18b7975f83544dac92f43a742654f90494454d7c088
31 +DIST rear-2.6.tar.gz 750866 BLAKE2B de803951c040bb85d4659fc81ffb9264b2771a45675aca4eb0a6318201802475014c2b760415ac61ab734286f5e1e84b0c858df166b9be356384a243a7badb78 SHA512 0b6deac8f1b4adc3bcfcd19e82b5e5719df1c1c2347e3dde9bb47b6086856ebf5d08e485b876633190bb6f92a0e1c567bb65a30554205a32eec4b929e5815a6c
32
33 diff --git a/app-backup/rear/files/rear-2.6-Makefile.patch b/app-backup/rear/files/rear-2.6-Makefile.patch
34 new file mode 100644
35 index 00000000000..800dcf69cee
36 --- /dev/null
37 +++ b/app-backup/rear/files/rear-2.6-Makefile.patch
38 @@ -0,0 +1,34 @@
39 +--- rear-2.6/Makefile.orig 2020-09-09 20:04:39.357666685 +0200
40 ++++ rear-2.6/Makefile 2020-09-09 20:06:12.537313922 +0200
41 +@@ -84,7 +84,7 @@
42 + clean:
43 + rm -Rf dist build
44 + rm -f build-stamp
45 +- make -C doc clean
46 ++ $(MAKE) -C doc clean
47 +
48 + ### You can call 'make validate' directly from your .git/hooks/pre-commit script
49 + validate:
50 +@@ -107,11 +107,11 @@
51 +
52 + man:
53 + @echo -e "\033[1m== Prepare manual ==\033[0;0m"
54 +- make -C doc man
55 ++ $(MAKE) -C doc man
56 +
57 + doc:
58 + @echo -e "\033[1m== Prepare documentation ==\033[0;0m"
59 +- make -C doc docs
60 ++ $(MAKE) -C doc docs
61 +
62 + install-config:
63 + @echo -e "\033[1m== Installing configuration ==\033[0;0m"
64 +@@ -144,7 +144,7 @@
65 +
66 + install-doc:
67 + @echo -e "\033[1m== Installing documentation ==\033[0;0m"
68 +- make -C doc install
69 ++ $(MAKE) -C doc install
70 + sed -i -e 's,/etc,$(sysconfdir),' \
71 + -e 's,/usr/sbin,$(sbindir),' \
72 + -e 's,/usr/share,$(datadir),' \
73
74 diff --git a/app-backup/rear/metadata.xml b/app-backup/rear/metadata.xml
75 index 5d24f38283d..ccfd9c81bce 100644
76 --- a/app-backup/rear/metadata.xml
77 +++ b/app-backup/rear/metadata.xml
78 @@ -1,7 +1,14 @@
79 <?xml version="1.0" encoding="UTF-8"?>
80 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
81 <pkgmetadata>
82 - <!-- maintainer-needed -->
83 + <maintainer type="person">
84 + <email>martin.dummer@×××.net</email>
85 + <name>Martin Dummer</name>
86 + </maintainer>
87 + <maintainer type="project">
88 + <email>proxy-maint@g.o</email>
89 + <name>Proxy Maintainers</name>
90 + </maintainer>
91 <longdescription lang="en">
92 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.
93 </longdescription>
94 @@ -10,5 +17,6 @@
95 </use>
96 <upstream>
97 <remote-id type="sourceforge">rear</remote-id>
98 + <remote-id type="github">rear/rear</remote-id>
99 </upstream>
100 </pkgmetadata>
101
102 diff --git a/app-backup/rear/rear-2.6.ebuild b/app-backup/rear/rear-2.6.ebuild
103 new file mode 100644
104 index 00000000000..5c7e1c9a80f
105 --- /dev/null
106 +++ b/app-backup/rear/rear-2.6.ebuild
107 @@ -0,0 +1,60 @@
108 +# Copyright 2020 Gentoo Authors
109 +# Distributed under the terms of the GNU General Public License v2
110 +
111 +EAPI=7
112 +
113 +inherit optfeature udev
114 +
115 +DESCRIPTION="Relax-and-Recover is a setup-and-forget bare metal disaster recovery solution"
116 +HOMEPAGE="http://relax-and-recover.org/ https://github.com/rear/rear/"
117 +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
118 +
119 +LICENSE="GPL-3+"
120 +SLOT="0"
121 +KEYWORDS="~amd64 ~x86"
122 +IUSE="libressl udev samba"
123 +
124 +RDEPEND="
125 + app-shells/bash
126 + net-dialup/mingetty
127 + net-fs/nfs-utils
128 + sys-apps/gawk
129 + sys-apps/iproute2
130 + sys-apps/lsb-release
131 + sys-apps/sed
132 + sys-apps/util-linux
133 + sys-block/parted
134 + sys-boot/syslinux
135 + virtual/cdrtools
136 + udev? ( virtual/udev )
137 +"
138 +
139 +PATCHES=(
140 + "${FILESDIR}/${P}-Makefile.patch"
141 +)
142 +
143 +src_compile() { :; }
144 +
145 +src_install() {
146 + emake DESTDIR="${D}" install
147 +
148 + if use udev ; then
149 + einfo "Deploy udev USB rule and udev will autostart ReaR workflows in case a USB"
150 + einfo "drive with the label 'REAR_000' is connected, which in turn is the"
151 + einfo "default label when running the \`rear format\` command."
152 + udev_dorules etc/udev/rules.d/62-${PN}-usb.rules
153 + fi
154 +
155 + keepdir /etc/rear
156 + keepdir /var/lib/rear
157 + keepdir /var/log/rear
158 +}
159 +
160 +pkg_postinst() {
161 + if use udev ; then
162 + udev_reload
163 + fi
164 +
165 + optfeature "if you want to save backups on smb/cifs servers" net-fs/cifs-utils
166 + optfeature "if you want to encrypt your backups" dev-libs/openssl dev-libs/libressl
167 +}