gentoo resync : 23.06.2018

4 files changed, 33 insertions, 22 deletions

diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest
index d8f4c9dc96de..374f2e0d99b8 100644
--- a/app-backup/rdiff-backup/Manifest
+++ b/app-backup/rdiff-backup/Manifest
@@ -1,5 +1,6 @@
 AUX rdiff-backup-1.3.3-librsync-1.0.0.patch 498 BLAKE2B b9af390ffa1f6061301f923f21fcb047c213c442f211570602f7cb3dbc8bc30d29a877bcb99a95c500257fd838ea3514b5cd985ab8d94e2ebc4b453adb8587d9 SHA512 2749fc3f5e187d8bc7874ddb7e185ebb17a0ad77e44e12d3f02a10de7ca5acea568321ce7262e45433732a0b532702e674564cc83d8987b0e339e28f7468395f
+AUX rdiff-backup-1.3.3-no-docs.patch 573 BLAKE2B 0463ddf18f4e626879a7b2f4c330219c93305305c1dd6106586aa7b309221680515ad70c4e14cc1ee038c450c5292ea4f6459bd2cde347910898fa18197af822 SHA512 94d19500e09496322fdb1a5188321283da7e31d315ef860abdcf19a086c50c7d866cc4cbb525e456a9cdf2563d052f3d5466c5f482910d23ac07841a24e23f7f
 DIST rdiff-backup-1.3.3.tar.gz 198412 BLAKE2B 95141b64ecb3442b2a420e3e2f4325a80bc4e3949e920f3fb04d8d7e69cd20b2809d230a5f9f6af6958f47689d73cf9fdc2d95134d41a5a9d0d6037ee87cf96e SHA512 e2731464a6ff146cdecac49d2d99275dc5e6b4a3ff5b8209fe6dc71fd80cdbf573d029531325a879e9a169c12b31568f75fdcb812f53df33896784c5bc550280
 EBUILD rdiff-backup-1.3.3-r1.ebuild 798 BLAKE2B e2f661540bc9195ca1f2d0000739214c9b5428199fa8a3371767f9b649b2d670a142611182d752e16a706cb69dce840e4b03a39a06b61a2fe8c6d9203c3573ee SHA512 b2e214fc6d2df981dd5f8b2d37c1fa13433062bc6ea5c94c861e1a78f64f1af025ccae4c3c19b36236606e2dd102e41697b278fcdb485e83bafa041e4b47b27a
-EBUILD rdiff-backup-1.3.3-r2.ebuild 858 BLAKE2B c412db383a8797c6e2b0deeaec5e3d4037740e6fdfa280478a99de1d6b00f7461e6b6baf64fbe0ad96ecc4784b1aecc3eb3086a4cb4d753cb7876df0c6ec661e SHA512 cbbed1c08742fb50d4c1bb8a3655e1820b2ae4b3d31b58f9b8d784eb2761f3ea40fbb36c11e7eee1aee8e8621c9d6b60a1ebc5e96369125145462daa1b262525
-MISC metadata.xml 452 BLAKE2B e368a60b239f71d97c29eb1dcafc9c9ee808891db74ebe3e0085acd7c3b1703b632957830435b752cfbdbe67b08bbcf2393943df3123ef596186d20f0a8cb0fd SHA512 32b323687411893ae8fc70e02f429c76e2791847ed8474e31f166ce8d20be76ea6d3ffa1e39ec14073ef543df118c9525c2185c0141dccba8717139aa50fc486
+EBUILD rdiff-backup-1.3.3-r3.ebuild 890 BLAKE2B b19f25a7596796197d001f905fb0c64026b27db299324806d565bddc203bf9a36b34a6fd78a067529d766d68f3141b3f0a21578c55d16256c6554889e218e80c SHA512 5ecab3748d43c91090551017783bcf6beec786615e951f6405917d164b1440f8f6521c4afd1490a0d7bb525e87313a718d4fa60115a1a192a9c40487a5e848a0
+MISC metadata.xml 250 BLAKE2B 3813fd5dc62e10efe97bff6a5f989f0039c2b06aa7ce6364017511735de0adfd399f40feffd89261994e9b4b024e29b4843d1e9b0fa54671fbb288c8ae7bc420 SHA512 8dc3fc665216b9db1d291cf40bfef1137cd24adc884fe39ca794a39d50f94ece9aebbb912879a02eb1546ebcd8d5eec633736984e51196e027a7f95a7ad008b2
diff --git a/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-no-docs.patch b/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-no-docs.patch
new file mode 100644
index 000000000000..9d69bba9ea2e
--- /dev/null
+++ b/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-no-docs.patch
@@ -0,0 +1,13 @@
+--- a/setup.py	2009-03-16 15:45:54.000000000 +0100
++++ b/setup.py	2018-06-16 18:23:29.689677175 +0200
+@@ -73,9 +73,6 @@
+ 							   libraries=libname,
+ 							   extra_link_args=lflags_arg)],
+ 	  scripts = ['rdiff-backup', 'rdiff-backup-statistics'],
+-	  data_files = [('share/man/man1', ['rdiff-backup.1',
+-										'rdiff-backup-statistics.1']),
+-					('share/doc/rdiff-backup-%s' % (version_string,),
+-					 ['CHANGELOG', 'COPYING', 'README', 'FAQ.html'])],
++	  data_files = [('share/man/man1', ['rdiff-backup.1','rdiff-backup-statistics.1'])],
+ 					**extra_options)
+ 
diff --git a/app-backup/rdiff-backup/metadata.xml b/app-backup/rdiff-backup/metadata.xml
index 9bcbf6a5ed1f..6bdb30e62277 100644
--- a/app-backup/rdiff-backup/metadata.xml
+++ b/app-backup/rdiff-backup/metadata.xml
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>axelgenus@gmail.com</email>
-		<name>Alessandro Calorì</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">sol1/rdiff-backup</remote-id>
 	</upstream>
 </pkgmetadata>
+
diff --git a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r2.ebuild b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild
index 3f992096f971..ce161ddf95a6 100644
--- a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r2.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
 
-inherit distutils-r1 versionator
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
 
-UPSTREAM_PV=$(replace_all_version_separators '-')
+UPSTREAM_PV=$(ver_rs 0 '-')
 
 DESCRIPTION="Local/remote mirroring+incremental backup"
 HOMEPAGE="https://github.com/sol1/rdiff-backup"
@@ -14,21 +14,24 @@ SRC_URI="https://github.com/sol1/${PN}/archive/r${UPSTREAM_PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples"
 
 DEPEND="
-	net-libs/librsync:0/2
+	net-libs/librsync:0=
 "
-RDEPEND="
-	dev-python/pyxattr[${PYTHON_USEDEP}]
+RDEPEND="${DEPEND}
 	dev-python/pylibacl[${PYTHON_USEDEP}]
+	dev-python/pyxattr[${PYTHON_USEDEP}]
 "
 
-PATCHES=( "${FILESDIR}/${P}-librsync-1.0.0.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-librsync-1.0.0.patch"
+	"${FILESDIR}/${P}-no-docs.patch"
+)
 
 python_install_all() {
-	use examples && local EXAMPLES=( examples.html )
-
+	local HTML_DOCS=( FAQ.html )
+	use examples && HTML_DOCS+=( examples.html )
 	distutils-r1_python_install_all
 }