gentoo resync : 01.10.2021

7 files changed, 103 insertions, 10 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index feed07a707f0..9dccffa907a6 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 16c69faf8bb5..8214c78bbbae 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -15,7 +15,7 @@ AUX tmpfiles.d-bareos.conf 33 BLAKE2B 68feed7629dde0dad019470851cea33140be3b1718
 DIST bareos-18.2.12.tar.gz 10566403 BLAKE2B 765a5430c495b21edc0c22d6903e23d312b1dc2b94e0d2a4227c10a38be8fe638636cf32a58e8aaf83b389581bf1348b4d27be6886f61180c20496acbd0eb015 SHA512 1d308d3021e8277832ce933fbafdf514bc194a1a2a2d761e66fb26ec2af419d19ae38894a7cb56e036c5af003bf640117b5a11954d478b35e13a02007f99f4de
 DIST bareos-19.2.11.tar.gz 12890679 BLAKE2B 2872e4eed8186f024211faeefcb5b38448f38d90a2c7c73ef8fa1e51d3a917344a7acbe09a01d0205ad312ec136161eb1b0aa28dcceabbf71d78206a724602b0 SHA512 46769f6e26068669c2656ed8afc73dbd6f07a88d65cf557193684c130bdb93567f3ab06374484be499e5edb7bdd32013edecb05ff19843d3d806a38ca1892749
 DIST bareos-20.0.3.tar.gz 13335390 BLAKE2B c35ab9fd290377fc56ae8ff87f54b1cde5d1b7caa89b9c97e259da48da4e07fa85cba38c5a4d461b7ce170f9b14a69f78ad217584abb77ee15d3e85080cbe49b SHA512 3f9bf020e0d519da75221ebd200634713c791e2fdc90a13482ffb3294912d5e2ee28f8338dbef06ba6c98727bae447f6f8bb8d4a06520001f7cefa3614769082
-EBUILD bareos-18.2.12.ebuild 11166 BLAKE2B 0ea402d3feb5ee0d88d9b3743bedd1145c9a199b637f97144543ed60da5cb87a76e35be077002f323ab9dccbb79ee2978197fcba5d91bb067d2fd45eda7b1ff9 SHA512 ac89c1c9830743210c9a83fa6b7afbd67c8bfeec8a2002394fd4bd4f68695b75b21a64d96bf0ca91798b38612c339b9a4da0593c964310ea9ff5693256cd08e6
-EBUILD bareos-19.2.11.ebuild 10913 BLAKE2B 53f53486f4a38da837dc2a611468bf4cc8539b6c98bfa4c8f7de35567a0e18e3e8aae666a44e094735ff7a1d41b7ebd27df97b7004a0b2489b6ac5d0d604c038 SHA512 4deece9d0a99038ae170f9a3187cbfd660ac87d61e48b062f249cba4ea3588569d5cbe8624ffde60f2f649b395d67595e25b69b7c5e207bad418cf40862bc648
-EBUILD bareos-20.0.3.ebuild 11418 BLAKE2B 70dd2c423d7857a6836ae2ac1c12983e69a50dd3f2a5370c0190fb025a7d147ab32ebaced6639b681bbddd4472fffd89eeda903b4589c020ebe1b5600919e321 SHA512 ffa4ef23c32fcf36c2b42e541cf2916feab55022205abcd6a79bf6d1d0f6e6257577f55ee40364c95c533f5234a4364fb679850245f59c551c6a0c4b898c1ed5
+EBUILD bareos-18.2.12-r1.ebuild 11168 BLAKE2B 952379f3531292e6b20e0e81d9be6d8384b8a76b1747a340310032c1ed0cf5b38415e6b6fc4edafb46b4e836cebce2dc73532fcc7b5737b1464deecec3c1e3ca SHA512 f8878820c0eeb8fc178b65579fe55230b8534b9e37b69ccacb1818635066a8fca016dbd818394b9b1e5916b49c31cee24abb9591dcbc7ed2a094146bb18adb41
+EBUILD bareos-19.2.11-r1.ebuild 10915 BLAKE2B c0101e1fd5a33994bb42b9a460fca12ed422eb4a99a23d6e7333c29b94bf117c39efb1cde61f82b9fda9a00ccc0452187ab8a74ccf6d4e3fdcd813fc9d219908 SHA512 0880c16abaad7ad94bdb75d77e4069994872bfb74b03f496127a936c46d21bb5bf2bbc5b8c078d9a0ecdd3aca40845d72b67bd475b006edabfd57657401979b4
+EBUILD bareos-20.0.3-r2.ebuild 11407 BLAKE2B 3892f00374c4da0f3447ae12308f8147cbadfa6d5f5a3c8995eeeb2d69312317d80233ce25ad4a47bad021917b9a4aab0a29d2ea842470d9bb3737f991297243 SHA512 72441b8e5d54836691209c8e4e9de9b9371c59a8e698095e47c82341d5885ee9070e1556bbce26674da0560362790248c496c70a58d7a80a752f2b4724e86d88
 MISC metadata.xml 1552 BLAKE2B 27a6ee8fad25a63be91e5bc712ffb293174c6bfca8df772be3821932baafe510b1fa271b2e36a22a11296c7a7bd23049b86dc9cbcbe2f7f30409a1e7c7b55042 SHA512 40b549c30e36a495a434c607467efa914aec228d886ee8560e77b39e4d6d6396ebae5e4a5cbdfd01b6828011ee9922112ab0041d9a9aa944d68417114b14ef53
diff --git a/app-backup/bareos/bareos-18.2.12.ebuild b/app-backup/bareos/bareos-18.2.12-r1.ebuild
index 996c4c35ce13..c40c79602918 100644
--- a/app-backup/bareos/bareos-18.2.12.ebuild
+++ b/app-backup/bareos/bareos-18.2.12-r1.ebuild
@@ -37,7 +37,7 @@ DEPEND="
 		sqlite? ( dev-db/sqlite:3 )
 		director? (
 			virtual/mta
-			jansson? ( dev-libs/jansson )
+			jansson? ( dev-libs/jansson:= )
 		)
 	)
 	fastlz? ( dev-libs/bareos-fastlzlib )
diff --git a/app-backup/bareos/bareos-19.2.11.ebuild b/app-backup/bareos/bareos-19.2.11-r1.ebuild
index a9e76afe1016..f2b7fc690b8d 100644
--- a/app-backup/bareos/bareos-19.2.11.ebuild
+++ b/app-backup/bareos/bareos-19.2.11-r1.ebuild
@@ -38,7 +38,7 @@ DEPEND="
 		sqlite? ( dev-db/sqlite:3 )
 		director? (
 			virtual/mta
-			jansson? ( dev-libs/jansson )
+			jansson? ( dev-libs/jansson:= )
 		)
 	)
 	logwatch? ( sys-apps/logwatch )
diff --git a/app-backup/bareos/bareos-20.0.3.ebuild b/app-backup/bareos/bareos-20.0.3-r2.ebuild
index 261eb0feb129..98191f5002a8 100644
--- a/app-backup/bareos/bareos-20.0.3.ebuild
+++ b/app-backup/bareos/bareos-20.0.3-r2.ebuild
@@ -38,7 +38,7 @@ DEPEND="
 		sqlite? ( dev-db/sqlite:3 )
 		director? (
 			virtual/mta
-			jansson? ( dev-libs/jansson )
+			jansson? ( dev-libs/jansson:= )
 		)
 	)
 	logwatch? ( sys-apps/logwatch )
@@ -59,7 +59,6 @@ DEPEND="
 		sys-libs/ncurses:=
 		sys-libs/zlib
 	)
-	vmware? ( dev-lang/python:2.7 )
 	"
 RDEPEND="${DEPEND}
 	!clientonly? (
@@ -198,10 +197,11 @@ src_install() {
 	rm -f "${D}"/etc/bareos/bareos-regress.conf
 	rm -f "${D}"/etc/logrotate.d/bareos-dir
 
-	# get rid of py2 stuff if USE=-vmware
+	# get rid of py2 stuff
+	rm -rf "$D"/usr/lib64/python2.7
+	rm -f "$D"/usr/lib64/bareos/plugin/python-fd.so
 	if ! use vmware; then
-		rm -f "$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py,python-fd.so}
-		rm -rf "$D"/usr/lib64/python2.7
+		rm -f "$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py}
 	fi
 
 	# rename statically linked apps
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index b35e1c812fd5..958678e23679 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,3 +1,5 @@
 DIST dar-2.7.1.tar.gz 2290659 BLAKE2B 89fa7ac208eb3009f5151f27022a7a449bb204cb035f320e33ff642588b5ab0389c2ed33b71b7a7c6240d205877073f26a04f0164ce05bb370db3bc3faf25fda SHA512 404e3281b2c420088623e4c6ba262d2a7a44848986e43d4c71aff77104395f1178445d560849a73e0dbacce6b8014df2bb20bc33471ae2d07d897bb6ad577bcc
+DIST dar-2.7.2.tar.gz 2294187 BLAKE2B 6422f40aea9fe07195359d9e8d5a947fe20d1ec4d6bd866eb8e9240c153d069b5df75018c25b9e8ce6b7acbf4ce4259b50b0768cd391d8b9b1c7be72f03a56b6 SHA512 7e41adc0102806c07d644da41960b1e5bcb6b7872e6a5789506c1f2a001ffb4e3607cae6f76ccc2339d90cf4387b7645e9de6dbc4eed1306827a46e4b7c9d09d
 EBUILD dar-2.7.1.ebuild 2227 BLAKE2B 895d91efff0477b33aceb86ef3f007e71b6ffef85954e84c3617037863c658f3c8a810b5ceba94a5a6d896e40dc942165b6ea5a0b46dde2282a444ce986d99b0 SHA512 fb2e0d595a169d0cb7d29dbe398ef61acbc9fcb6b110d14ebf3ef7adc54e36891a1eae12dd5bf6560a115fab5b2b7004edfbbb1f5b8089c34a29e014cadca614
+EBUILD dar-2.7.2.ebuild 2231 BLAKE2B 4ae458a626feea6d2962feda19f87d150ae5782da72d0a485cdaa11936c513d082c96276ab22ff1bcad0c2fbb3c1e68965740a7e1c7aa039cf6053132f42cd58 SHA512 a696f62c67c912d81e4597828c250e30f7eda7522d4828d5b87442e00d2b0000a4081a0f92a16933a9abb6e729962a896713af6051c66c088ac3f594f5da02d5
 MISC metadata.xml 1284 BLAKE2B b70f06ea13076c3de9470fa1b65d9a17de048db8f52ade94246c62241828be74f308dcc39067b27ed99ff963c3554e371611aba0bb04ed6d57d14d4f7fd7f9dc SHA512 5cbbbff7e0652a85f717f2eb6a574d6fe52d478e049fa81e1c25b1bbe034086d433558952be1bc56ea4492c9c43f6da1e0968cc9132d18e7342890434c0a19d6
diff --git a/app-backup/dar/dar-2.7.2.ebuild b/app-backup/dar/dar-2.7.2.ebuild
new file mode 100644
index 000000000000..30d87e469279
--- /dev/null
+++ b/app-backup/dar/dar-2.7.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 lz4 lzo nls rsync threads xattr"
+
+REQUIRED_USE="?? ( dar32 dar64 )
+		gpg? ( gcrypt )"
+
+RESTRICT="test" # need to be run as root
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils
+	app-arch/zstd:=
+	sys-libs/libcap
+	>=sys-libs/zlib-1.2.3:=
+	argon2? ( app-crypt/argon2:= )
+	curl? ( net-misc/curl )
+	gcrypt? (
+		dev-libs/libgcrypt:0=
+		dev-libs/libgpg-error
+	)
+	gpg? ( app-crypt/gpgme:1= )
+	lz4? ( app-arch/lz4:= )
+	lzo? ( dev-libs/lzo:2 )
+	nls? ( virtual/libintl )
+	rsync? ( net-libs/librsync:= )
+	threads? ( dev-libs/libthreadar )
+	xattr? ( sys-apps/attr )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )
+"
+
+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-upx
+		$(usev !argon2 --disable-libargon2-linking)
+		$(usev !curl --disable-libcurl-linking)
+		$(usev dar32 --enable-mode=32)
+		$(usev dar64 --enable-mode=64)
+		$(usev !doc --disable-build-html)
+		$(usev !gcrypt --disable-libgcrypt-linking)
+		$(usev !gpg --disable-gpgme-linking)
+		$(usev !lz4 --disable-liblz4-linking)
+		$(usev !lzo --disable-liblzo2-linking)
+		$(usev !nls --disable-nls)
+		$(usev !rsync --disable-librsync-linking)
+		$(usev !threads --disable-threadar)
+		$(usev !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 "*.la" -delete || die
+
+	# Bug 729150
+	rm "${ED}/usr/share/doc/${PF}/html/samples/MyBackup.sh.tar.gz" || die
+}