gentoo resync : 22.05.2021

3 files changed, 94 insertions, 1 deletions

diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index 72c766d3a5d7..14c3a7ca4a7c 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,5 +1,7 @@
 DIST dar-2.6.13.tar.gz 2148732 BLAKE2B 51de01793dead832209671569f8054b1de3b5fa810c786ae675207b6dc3e639a5c036896e1688e017b222fbaa6c011494a9d43b3bb2b16570a38e291f893b73f SHA512 f0f853db6e15f5abfabf87be06a1c374662c7fa7e1140eaaeef3e8c8c4d0049a00a8e74409d6805ea3ae5b2f3171f2eba27459e8acb4438c467c4f0bd0825c0c
 DIST dar-2.6.14.tar.gz 2148023 BLAKE2B 36653d798d1da9cd87e84d2301b9f1fd657e92d1eee91ec1efadb54e94638860103c5e509479a2da846d432328e0a93ae92e1a4d23b6956ca55341ef767fe9a8 SHA512 2b116929fcc192ffee0c266959902b45dc9982ba77e017b3217715e0c63d1574d64083ca55a63e0bb6390e8955c41ca8b09da63934826fe4f0471a63ea739550
+DIST dar-2.7.0.tar.gz 2285856 BLAKE2B 194e9fe2345bdccdb053996b109fe4efb886e23b69d440f7ac2b545c1ce2f241c7f24c56d7b68bde904b8e1a85df20716b63068a6c471c71a7569921eb06aa1f SHA512 0e207c244f6700860a84217069774162b7b56c95e5c0955813fbd96d37a3fe1fa126cab05bab0a21b3e9eab335c10961daf243024fdc35f6276468bd549d49cb
 EBUILD dar-2.6.13.ebuild 2421 BLAKE2B a16560b5fa34dafd05fcfe917b6739ffd8910d5284cba9dc28c343ba6e92f43704d2ac4e290f03be7426cd0896d371cd2ab7c648a85a5e05327800cb5f8edf99 SHA512 76dff2090770e07c49171176d149b42e5cd331e729fc054e4509598f5b5d26745de3a727d65af103cc72ed94abf103fe7be61b1c60ebab58f94688371588f525
 EBUILD dar-2.6.14.ebuild 2146 BLAKE2B 5095a9a2518b778578cd188db5dbd7ec3aa721da28742241e7b1688bd241ab63aead52082492ae4c6a60999f8f6235245204c66c3ac1dfbd6e8bca60528a09d1 SHA512 ae419297e74e0e5580905c6466e0506086c6b32c571c1b8541e5c894dc1aa3dd637308a00c859f8877ce5d04d0084410b6932370c9bc480175d3a6d72e2293cd
-MISC metadata.xml 1187 BLAKE2B 63ef76c44a9792d83529247af4afb722f9d5de63ab29344ecf55c827dd4e4c20b4dbcc02a6e2e71b6aa33c14cd03f2b14d9cb90000ae47dbde89479b67c1e8a0 SHA512 39eb6ec5774043f23c68916cfeed74d0c2dcf4a6471b70610e5896687a866624dcebd2b0e2050d9850057d2844eae687b7c30338bd82c9acf63ab297e7473c5e
+EBUILD dar-2.7.0.ebuild 2231 BLAKE2B 6b82ed3c1965219f6ef8cdb9db16358f218c584558116be2a5fbf09d62acf8b66340fd56ec44d3a29fb6b5f55324a81fdac14cb6fea54c85448164fac9d9e07f SHA512 84345f585a602e3b4c6db67a8862df0b2a709be4ca2fe5341c55687e009b61d13c1efb99dc8ff92aa7692c29656fea96a58e987740bedce245278fc02fae3f03
+MISC metadata.xml 1283 BLAKE2B c8686b55e5aab51bc28ace7dbc34af0e40b3b593d2fa8a5a27b746b4e14382b9762593cc9094c8e44bd98fac91eeff1bdce611210991230da6b5ec896e66626c SHA512 592dd28dfbb3dedfb2a7f731893f50e64d08aed3d8cc7aeb15a5d7e382c777d94e8c6b984e4aeeb7c73705a473bd5ae0d885d08b19bcc9370458e0891741d942
diff --git a/app-backup/dar/dar-2.7.0.ebuild b/app-backup/dar/dar-2.7.0.ebuild
new file mode 100644
index 000000000000..0b4d6b7ae696
--- /dev/null
+++ b/app-backup/dar/dar-2.7.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="A full featured backup tool, aimed for disks"
+HOMEPAGE="http://dar.linux.free.fr/"
+SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
+IUSE="argon2 curl dar32 dar64 doc gcrypt gpg lzo nls rsync threads xattr"
+
+RESTRICT="test" # need to be run as root
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	sys-libs/libcap
+	>=sys-libs/zlib-1.2.3:=
+	argon2? ( app-crypt/argon2 )
+	curl? ( net-misc/curl )
+	gcrypt? ( dev-libs/libgcrypt:0= )
+	gpg? ( app-crypt/gpgme )
+	lzo? ( dev-libs/lzo:= )
+	rsync? ( net-libs/librsync:= )
+	threads? ( dev-libs/libthreadar:= )
+	xattr? ( sys-apps/attr:= )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	nls? (
+		sys-devel/gettext
+		virtual/libintl
+	)
+"
+
+REQUIRED_USE="?? ( dar32 dar64 )
+		gpg? ( gcrypt )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_configure() {
+	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
+	# logic.
+	# For example "--enable-dar-static" causes configure to DISABLE
+	# static builds of dar.
+	# Do _not_ use $(use_enable) until you have verified that the
+	# logic has been fixed by upstream.
+	local myconf=(
+		--disable-dar-static
+		--disable-python-binding
+		--disable-static
+		--disable-upx
+		$(usex argon2 '' --disable-libargon2-linking)
+		$(usex curl '' --disable-libcurl-linking)
+		$(usex dar32 --enable-mode=32 '')
+		$(usex dar64 --enable-mode=64 '')
+		$(usex doc '' --disable-build-html)
+		$(usex gcrypt '' --disable-libgcrypt-linking)
+		$(usex gpg '' --disable-gpgme-linking)
+		$(usex lzo '' --disable-liblzo2-linking)
+		$(usex nls '' --disable-nls)
+		$(usex rsync '' --disable-librsync-linking)
+		$(usex threads '' --disable-threadar)
+		$(usex xattr '' --disable-ea-support)
+	)
+
+	# Bug 103741
+	filter-flags -fomit-frame-pointer
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
+
+	einstalldocs
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
+	# Bug 729150
+	rm "${ED}/usr/share/doc/${PF}/html/samples/MyBackup.sh.tar.gz" || die
+}
diff --git a/app-backup/dar/metadata.xml b/app-backup/dar/metadata.xml
index b601da091bec..2715a3d89764 100644
--- a/app-backup/dar/metadata.xml
+++ b/app-backup/dar/metadata.xml
@@ -16,6 +16,7 @@ compression, ATTR/ACL support. DAR also supports Pipes for remote
 operations, including with ssh.
 	</longdescription>
 	<use>
+		<flag name="argon2">Enable password hashing algorithm from <pkg>app-crypt/argon2</pkg></flag>
 		<flag name="dar32">Enables --enable-mode=32 option, which replace infinite
 		by 32 bit integers</flag>
 		<flag name="dar64">Enables --enable-mode=64 option, which replace infinite