gentoo resync : 29.06.2020

6 files changed, 24 insertions, 95 deletions

diff --git a/app-backup/rsnapshot/Manifest b/app-backup/rsnapshot/Manifest
index c95e74112db7..b9e965936ddc 100644
--- a/app-backup/rsnapshot/Manifest
+++ b/app-backup/rsnapshot/Manifest
@@ -1,9 +1,5 @@
-AUX rsnapshot-1.3.1-cp_al.patch 535 BLAKE2B fa29c724ff56fdb6ca2c9c966784fe36d2fd93e6f589ac885d449a14ceac01b4027f3f7e286ac61c10469d9d8cab43e53cadb98b603ab6d32462be58feff5b58 SHA512 511b447d914f01c757b85f098846a91d8585a40297a2ae8b7d07101cbbfd3e99a46168a583a64eaf66e236c4716a69fefcce40fd2e0666fd6f3d9aafdb0c783d
-AUX rsnapshot-1.3.1-perl518.patch 349 BLAKE2B 1a19da5968db79ea95aab0da43f4a73d77459bbb3b9924353b147149da0a12731ca6741fb21f63aaba78b52606977f8e75aa6748c9b2e5582a3777e9cf6c52ef SHA512 5e4d43b814b0ade9743a08da0c580b6bb98673aa39127d2dd6fa0993d4b7a6ac163deff5f1ebd9fbf4c95434ef10f4c48d8f55967e1f78866563bcbaaa9d45a0
-DIST rsnapshot-1.3.1.tar.gz 215806 BLAKE2B fe2d31a5bc62577b187e33bf644600fdd2ade845572a3b0ee6ee9ff146dcdab3277cb5494e84ae144c46adda8391304de83ba3cadda8b5e451b63efd9bfd517e SHA512 a74ad0a21d213dd2e05cb577a47c491af90d8994df8f5a154195515345da438ac9c0d72b563aa02314883a0b3bb86e3c23f8b530a7078c2b55a9547a2d666c10
-DIST rsnapshot-1.4.1.tar.gz 489481 BLAKE2B d8170d6b47d15a45b1d14f67cfcb62e854ef49eb071ff0bb5dd5f640a053e6791e8684e38e7a1bf1e14ab459cb850b5a1c840569732a36acf3dd392331af20d5 SHA512 a99e639bd706aafac82d2a4a40fc6c7fa026321c527ad5826a4fc7917cadea5962c4c7988c98efbe06833ef70db081605aa47a6d77c04dcf6077cc232c078cbf
 DIST rsnapshot-1.4.2.tar.gz 487959 BLAKE2B 90a52af1b2b3de5eae7e98f87b87dae4564a7fa5d240d9e844180d6a57bb4e14b4cf762aa0ed6bbdba8deda0436d77e6c5d281ca8b62eba1c3b6caf948ae9432 SHA512 621be52715a6c1f70ddb251d7f6103ba3487cd0c6c607411d744866547d3ced571862a8f6b5e40a1d050696703f3a15821bd6e829a3fca057848f04566d0e4a0
-EBUILD rsnapshot-1.3.1-r2.ebuild 1256 BLAKE2B 64cae24e77bb53767b76c1fc6102c11a8deae431c13fa13c9af58e048f010bb4366c6dbc71964e732ce0b491a18b00063d53ef8b69b743da3091aec4b447e9ce SHA512 54d6eda226edddd7b347201429dfd5248cc4aed6ddf331aaa1d977eaf6cb668668a68ce7f3c9b6b0064955c873edaa946820d2fadcba93406e56b68869c5d8dd
-EBUILD rsnapshot-1.4.1.ebuild 1109 BLAKE2B 0f39a928a464b99d32efa552bfde1a5c6550d6ad4f397748f7611d203cbe6d3f1f6547aa5d8e91df469b9da9543e6d9f7bae30b224f8c28ddcd8aa969cec87d5 SHA512 1d0bfd24db3a4e851e1c2592784f6c4974894bc5e20e11e11bf5f4077a416203ce4c07a3563028ecc1459a48b6c6bdbe5e3dbbff9250c6213abe5a4f261923a0
+DIST rsnapshot-1.4.3.tar.gz 370840 BLAKE2B 6a3acde4afd8d1f999cfb00f07a0547b6d877aa483e2548b5ecb933c3f6e742046730a78b95fd83bfa6496a71f61dbce2a8bedc42562503bef753b0c72c40eba SHA512 606b5c195e609197ae6711a9764c07a0f0822fe228aba07014155636bd5caa7ad7dbf8f42316275a71490b5c9dd33bf04c42580b92f4910c38ef871694ae09e3
 EBUILD rsnapshot-1.4.2.ebuild 1336 BLAKE2B 8ee3cbd073f40287f5b6a7c9e3e6d05a6d4003a22d5c74460f0dec473a8cbf96abf07417cee854d7a7a35b405f2e281d36c3959f26fdcfdcaa8b1737bafc1c6c SHA512 f6bbd4d2d6a89acb6a80ddd916b1b3d8c91a59e2865586dc0b9dbeb842da1f31b1819fdd2d7ec6d8103cb9d2c20f42db11d3589d61dae5652ab0b273413f3a97
-MISC metadata.xml 166 BLAKE2B df899de61ee57cf9c2d5822a8ca4cb62c697c6da7142003688afbdd1261a8623d48058189ebe005c053ffddcb9f7275f19a0e48fc47ce1890341e276400f1d8f SHA512 12bfcd38af9dc9fe67b866a4ae090e26873d363409efc5949cca4b4a59ba0d770b09ebec8a108482b29b94c922bcdb8ce3f5ccbb578137b44e35bd783b4c9472
+EBUILD rsnapshot-1.4.3.ebuild 1343 BLAKE2B 200b42933ba7a66db8d28697774b5a3933faf08d14affe15b328fbfd646184342848f474b1d3c026aa9ca417b9046939c345f31568c83532373038adf8852fa5 SHA512 7d04b38e75b35fae2d9ed427e05dc439358e6fbdce79f5c7e2fb98123f00efc186590a398f061e7c23d6ba6112275dd83239b0c4754c3a2a4e18e411abef48a1
+MISC metadata.xml 385 BLAKE2B 663d1a8524cad5c1ff25711d7f63808109958f264a18c40195b59d2ce03c3ac92dd4812097863fc36b95f6da92c47f7fae820446323b1c4c9973facabbfb8e34 SHA512 1dcdf81afbd2de28c4039e74e12111b7f334717c68ba161951fdea9e327a97f1cbed3e1b50e3dab5e938cd5e022d5399e0c0f1b19f3a8acefc5523eb57804d54
diff --git a/app-backup/rsnapshot/files/rsnapshot-1.3.1-cp_al.patch b/app-backup/rsnapshot/files/rsnapshot-1.3.1-cp_al.patch
deleted file mode 100644
index 7241d6c8c07e..000000000000
--- a/app-backup/rsnapshot/files/rsnapshot-1.3.1-cp_al.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur rsnapshot-1.3.1.original/rsnapshot-program.pl rsnapshot-1.3.1/rsnapshot-program.pl
---- rsnapshot-1.3.1.original/rsnapshot-program.pl	2006-10-21 08:12:30.000000000 +0200
-+++ rsnapshot-1.3.1/rsnapshot-program.pl	2006-11-22 21:37:39.133222510 +0100
-@@ -3269,7 +3269,7 @@
- 				if (0 == $test) {
- 					$result = cp_al(
- 						"$config_vars{'snapshot_root'}/$interval.0/",
--						"$config_vars{'snapshot_root'}/$interval.1/"
-+						"$config_vars{'snapshot_root'}/$interval.1"
- 					);
- 					if (! $result) {
- 						my $errstr = '';
diff --git a/app-backup/rsnapshot/files/rsnapshot-1.3.1-perl518.patch b/app-backup/rsnapshot/files/rsnapshot-1.3.1-perl518.patch
deleted file mode 100644
index 367055d5cc96..000000000000
--- a/app-backup/rsnapshot/files/rsnapshot-1.3.1-perl518.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fixed man-page creation with pod2man from >=perl-5.18
-
-https://bugs.gentoo.org/490486
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
-
---- rsnapshot-1.3.1/rsnapshot-program.pl
-+++ rsnapshot-1.3.1/rsnapshot-program.pl
-@@ -6716,6 +6716,8 @@
- 
- =back
- 
-+=back
-+
- =head1 USAGE
- 
- B<rsnapshot> can be used by any user, but for system-wide backups
diff --git a/app-backup/rsnapshot/metadata.xml b/app-backup/rsnapshot/metadata.xml
index c1744fe7fc5b..41d4a20db9c6 100644
--- a/app-backup/rsnapshot/metadata.xml
+++ b/app-backup/rsnapshot/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!--maintainer-needed-->
+  <maintainer type="person">
+    <email>Sergiy.Borodych@gmail.com</email>
+    <name>Sergiy Borodych</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-backup/rsnapshot/rsnapshot-1.3.1-r2.ebuild b/app-backup/rsnapshot/rsnapshot-1.3.1-r2.ebuild
deleted file mode 100644
index 5c6f53daed82..000000000000
--- a/app-backup/rsnapshot/rsnapshot-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A filesystem backup utility based on rsync"
-HOMEPAGE="http://www.rsnapshot.org"
-SRC_URI="http://www.rsnapshot.org/downloads/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.8.2
-		dev-perl/Lchown
-		>=sys-apps/util-linux-2.12-r4
-		>=sys-apps/coreutils-5.0.91-r4
-		>=net-misc/openssh-3.7.1_p2-r1
-		>=net-misc/rsync-2.6.0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cp_al.patch \
-		"${FILESDIR}"/${P}-perl518.patch
-}
-
-src_install() {
-	# Change sysconfdir to install the template file as documentation
-	# rather than in /etc.
-	emake install DESTDIR="${D}" \
-		sysconfdir="${EPREFIX}/usr/share/doc/${PF}"
-
-	dodoc README AUTHORS TODO ChangeLog \
-		docs/Upgrading_from_1.1 \
-		docs/HOWTOs/rsnapshot-{Mac,windows}-howto
-
-	docinto utils
-	dodoc utils/{README,rsnaptar,*.sh,*.pl}
-
-	docinto utils/rsnapshotdb
-	dodoc utils/rsnapshotdb/*
-}
-
-pkg_postinst() {
-	elog "The template configuration file has been installed as"
-	elog "/usr/share/doc/${PF}/rsnapshot.conf.default"
-	elog "Copy and edit the the above file as /etc/rsnapshot.conf"
-}
diff --git a/app-backup/rsnapshot/rsnapshot-1.4.1.ebuild b/app-backup/rsnapshot/rsnapshot-1.4.3.ebuild
index 739f0f8a299b..0342270d6a0b 100644
--- a/app-backup/rsnapshot/rsnapshot-1.4.1.ebuild
+++ b/app-backup/rsnapshot/rsnapshot-1.4.3.ebuild
@@ -1,17 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="A filesystem backup utility based on rsync"
-HOMEPAGE="http://www.rsnapshot.org"
-SRC_URI="http://www.rsnapshot.org/downloads/${P}.tar.gz"
+HOMEPAGE="https://www.rsnapshot.org"
+SRC_URI="https://www.rsnapshot.org/downloads/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND=">=dev-lang/perl-5.8.2
 		dev-perl/Lchown
@@ -21,7 +19,15 @@ RDEPEND=">=dev-lang/perl-5.8.2
 		>=net-misc/rsync-2.6.0"
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	default
+	# remove '/etc/' since we don't place it here, bug #461554
+	sed -i -e 's:/etc/rsnapshot.conf.default:rsnapshot.conf.default:' rsnapshot-program.pl || die
+}
+
 src_install() {
+	docompress -x "/usr/share/doc/${PF}/rsnapshot.conf.default"
+
 	# Change sysconfdir to install the template file as documentation
 	# rather than in /etc.
 	emake install DESTDIR="${D}" \
@@ -39,6 +45,6 @@ src_install() {
 
 pkg_postinst() {
 	elog "The template configuration file has been installed as"
-	elog "/usr/share/doc/${PF}/rsnapshot.conf.default"
+	elog "  /usr/share/doc/${PF}/rsnapshot.conf.default"
 	elog "Copy and edit the the above file as /etc/rsnapshot.conf"
 }