gentoo resync : 25.08.2020

5 files changed, 44 insertions, 37 deletions

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index e86b92969a1d..9202bec20c97 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -13,10 +13,11 @@ AUX bareos-sd.confd 360 BLAKE2B d965bf4cf1db59982b57ee0b848f9f7156d695a37d2a3b4c
 AUX bareos-sd.confd-16 361 BLAKE2B 3c5feb7e6615db5395f2895ed4ea3e0745c4da0ca68cbdd6c899da0be63db0a7ee561aa44404490ef227a08fe5f339c337fd4eadf43a384741d3071ef4332772 SHA512 1cd7a0a6b16d95db4ac39a4858caf0df35b3cd68e6ed87dff687c48008e4f31597e8510ac6a2e1442a80dec7e5608341832b55d3e2ae96793f203fd95700da22
 AUX bareos-sd.initd 481 BLAKE2B c14f2640be1685aaa0304dcfff2c272e37cb55cce92c7e2808eeaa94b20d4cfb4a705b53d06880f5b5c50b96162ea4d6cb23160b6e31ec34889b867c3aad09e1 SHA512 e094df3f44ed39207129bb86020b223037acc7bda408a69711b68376d1044dbe67001370395dd4442df6b4e78e92dc5125dd14dad6c4826716df2084fbd45916
 AUX bareos-sd.service 243 BLAKE2B 198c1f93f63fc015989523bae1932637c9e25d9b02719dfaa8aa1900d0a408ff686bf25f3966645d5c09d6ec6c78f3326a70c5c53cae42f1dd5fdbd88a164541 SHA512 efd8ee4abfde37cf0c9c660ba714b22cf5bd7ce895af20deb80c1d2747b985e2a61ddfa76a557374d78feeec3c68f855976bd9af5f7d61c9588b8db41287211d
-DIST bareos-17.2.9.tar.gz 4190637 BLAKE2B 266627ac023695971acc5d730765c08ddde673ba75398547687d5f2ccbfb7c440221b8c0a617bc6a3b0d2089cd22604ebe838decc65ce3c1f7ae5cdb99833118 SHA512 ac40f867d495aa64693a209dbfceb55f22425a2079dc000dabd8c6ffce79b1a2578bc0110970a6aace7c3e039c7110d1d395c31b372c0d3e5f18b43e682a70a9
-DIST bareos-18.2.8.tar.gz 10552800 BLAKE2B c13aabbb7f450c1c9c02f39b130d34057cfc4cec590c68acde5d3592d0f238c0e52bf3acbb55e697610252b3f6bd528c2e87ea09c83aba02f303d144a62b44b2 SHA512 61c9155a02ec0f3a21e06db4f5701dabb25411219d98940b50912c16ac38ec007584a7ef9728f2f12acf2823339a25eba3c9b34a6fa9e625a1d2d0778653b860
-DIST bareos-19.2.7.tar.gz 12602338 BLAKE2B 31fa9c9966b22913c2af6eaa6c6f704396d353341878817a574388925f35b437331b057b2a147a8217502f9198b39539d2fa68c4047e191dc918123c0f674a7d SHA512 cb467846a41d42a469704d48c3a1b03ebf5fdc71b9268c1e438e46b86073d55993dfd9bf26242db593db8b1814009c060fd65122d434bad2986c24613f6865c6
-EBUILD bareos-17.2.9.ebuild 10551 BLAKE2B df36eaf96f8dbec36101d7dbc736502eaaeca8faf36b0c1dbf7624d031ae0835b5eaad7968ffc94402299ed4d72ebb921e7e16c862b7dd2e67b998a537063308 SHA512 e9052e3e59405361b129e99b163820559e71987b6452fb7936620679f805ba37494bca8bd55bffe45cd7e44958b2559fce3fb50f11cd8f95ce144680ede9a486
-EBUILD bareos-18.2.8.ebuild 11438 BLAKE2B 719291b1a95fe1aa6d602f88c8d71c0a94c7d77bdd0e3313632cb7701d2cb876f072830bcb515a2ef9c39be33b7e843a867510b48b976e51599a889e118b8aea SHA512 1abe95715a635c349c92eda1b695a9e15a5965aeb6eb471591497808c9e51cfd25158b65c98f9677261a7e1c137cf86fe89203296ce6ba7132ec395f36debf7c
-EBUILD bareos-19.2.7.ebuild 10787 BLAKE2B a1672ef75bba19ef60ca8b3392a4213574d8513ce6ceadf6bf8cd0e83e775bea9250e0c2f5aef3045018c66806818ed6b545ed1fc5c8dde445db23fe0982fc4a SHA512 ea2bd88ea61a71e18283f132928445aee016812021633a94233b04a99e6e64cdc0253d3490ba2fe95b41f929f250b293d7c4479159eefee107116a04ff5bf217
+AUX tmpfiles.d-bareos.conf 35 BLAKE2B b670a9951d736618456644aacb28fbd2784c640efdc8aadd85e78d091d6d1655fc93e7dbf7df72c563f07baaf3802a4fa9d836a56766030b86b103a6b4715c4b SHA512 dbda57d059cb9e2e12e1e0c50cf8e58ab63b4ee0eff7ab6330d1dd5226483eb5be6b15b92dc996c979c4cec5586b97084f0687cb43e1f3b0edf742ff072975f4
+DIST bareos-17.2.10.tar.gz 4190783 BLAKE2B d2deb9368438b5281ea36768b80cc15840135a77a19952daa895c4e30ee6ad231d9ecf28a6d860bd372eb08c1c34f9f827843745c87f465d3a59ab048aecc001 SHA512 3e145627a08927790deb8f75e5167e6e69710733eb1866a93adb34617c274c2b51145a6b1253388784f67bc4886fec7fbb423893a36d377bb96334a2dc7768f2
+DIST bareos-18.2.9.tar.gz 10554581 BLAKE2B 1277956a87794e707050c119a0e2d6a879f47bd67bde7fa230796b6f9a8c0b6ca1cddf35f12b6e53d0841f6cfbb86c586157b9705d36c515adaf1021bb23edc1 SHA512 f40c0bc696f31ee4eb443cc7a76a5810620a2fbb5fa421afc580e047879ce86b1288de92679695e00074a3bfd5a5ac2a4cb4fb8f8acbb39e615df19ad9cf7934
+DIST bareos-19.2.8.tar.gz 12604929 BLAKE2B c3af2d0a62b861a4ad5ca5c115a2039356009b7524505e1beb9004636fd09dd2b6ca784a5aae8c1cec3db518fb047cde429c469b8298a6bb473b097012358302 SHA512 60bbbbd949a63f978cf1ed7d0cfc22c22f117d8c2700eb47531e15b2d91fc700c522519f0b816cd1040283f09b4c81f36910c66c8b6f4bf1ff22180e979bdeb5
+EBUILD bareos-17.2.10.ebuild 10373 BLAKE2B dfb04bc664c47f10a7fcaa77d61f3432f14c53c585d0ea2b46e9a997995a7c0d181870402f920179c37928384a439aa92d98df27a2ebc4d75a03fe52c39a4350 SHA512 fdfae478a86f778f26667200a8b85b3f9453cdb240b8b02c7d0a01ce8c56f86ae7f16b3923db0a3a1ff4bccb5168191cf26f147316bd356bcbbe2b025bfe43a5
+EBUILD bareos-18.2.9.ebuild 11428 BLAKE2B 0266b5f4143431436bf8fcdeea238b6c080adb1180ee8fb14f42c2f1664dafa74cefee35f8c1dac544794f49ce6463ef8c7c5aa6b7604dee1ccff1c212fb5edd SHA512 ed8964a3a79470c3c8e4d88c79afd11dcfa6f5f5b83e0ad6feff9f17179dbe9151b95f6600e4e1fbf152ede80ea751c96768dfc2e719b4bfc8e088e69e65e0dc
+EBUILD bareos-19.2.8.ebuild 11052 BLAKE2B ad851f4d0bdd768ebb4bc5ab15591103f49c216a966bd028a5bbd4895c83f9da62bdec70ae17f9b056839cf1a58e936700f7cf95ca138b4f6b21eb64b5959e5c SHA512 f5e1e0a29224b0301379bc5307654bdf3e893aeef50a3fc35b9ddbd913ccf0c924ca5cc634ee472f145b68c6147aff360d2ba9c90148442eb98b4e08747593c0
 MISC metadata.xml 1489 BLAKE2B 3ede9b0a6d7a72e455da20ee3c84e5e37afa8c935d1b7bc9c7048d469315cc73160fe4c9014563812a9bab361cad51bd31cc29d73d9e085b0e3606011b84a36b SHA512 29b3c02f4333ee70177b6e0205304fe6f7b785c2ac9684352f9e6464c6dec266fa0213ae198f146c907df0f2c3af1f7e0da2a8cd67c04299cac6df44443a8872
diff --git a/app-backup/bareos/bareos-17.2.9.ebuild b/app-backup/bareos/bareos-17.2.10.ebuild
index aa5473acd458..f4a2b487a99f 100644
--- a/app-backup/bareos/bareos-17.2.9.ebuild
+++ b/app-backup/bareos/bareos-17.2.10.ebuild
@@ -3,10 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 systemd
+inherit desktop systemd
 
 DESCRIPTION="Featureful client/server network backup suite"
 HOMEPAGE="http://www.bareos.org/"
@@ -17,7 +14,7 @@ LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl
-	logwatch mysql ndmp +postgres python rados rados-striper readline scsi-crypto
+	logwatch mysql ndmp +postgres rados rados-striper readline scsi-crypto
 	sql-pooling sqlite ssl static +storage-daemon tcpd vim-syntax"
 REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
 
@@ -70,7 +67,6 @@ DEPEND="
 		sys-libs/ncurses:=
 		sys-libs/zlib
 	)
-	python? ( ${PYTHON_DEPS} )
 	"
 RDEPEND="${DEPEND}
 	!clientonly? (
@@ -81,8 +77,7 @@ RDEPEND="${DEPEND}
 	)
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 
-REQUIRED_USE="static? ( clientonly )
-	python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="static? ( clientonly )"
 
 S=${WORKDIR}/${PN}-Release-${PV}
 
@@ -90,7 +85,6 @@ pkg_setup() {
 	use mysql && export mydbtypes+="mysql"
 	use postgres && export mydbtypes+=" postgresql"
 	use sqlite && export mydbtypes+=" sqlite"
-	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -147,7 +141,6 @@ src_configure() {
 		$(use_with fastlz) \
 		$(use_with mysql) \
 		$(use_with postgres postgresql) \
-		$(use_with python) \
 		$(use_with readline) \
 		$(use_with sqlite sqlite3) \
 		$(use sqlite || echo "--without-sqlite3") \
@@ -162,6 +155,7 @@ src_configure() {
 		"
 
 	econf \
+		--without-python \
 		--with-pid-dir=/run/bareos \
 		--with-subsys-dir=/run/lock/subsys \
 		--with-working-dir=/var/lib/bareos \
diff --git a/app-backup/bareos/bareos-18.2.8.ebuild b/app-backup/bareos/bareos-18.2.9.ebuild
index 4bf0b6c7c3b7..cf1622b6e1ad 100644
--- a/app-backup/bareos/bareos-18.2.8.ebuild
+++ b/app-backup/bareos/bareos-18.2.9.ebuild
@@ -3,12 +3,10 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
 CMAKE_WARN_UNUSED_CLI=no
 #CMAKE_REMOVE_MODULES=yes
 
-inherit python-single-r1 systemd cmake-utils
+inherit desktop systemd cmake
 
 DESCRIPTION="Featureful client/server network backup suite"
 HOMEPAGE="http://www.bareos.org/"
@@ -19,7 +17,7 @@ LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl
-	logwatch mysql ndmp +postgres python rados rados-striper readline scsi-crypto
+	logwatch mysql ndmp +postgres rados rados-striper readline scsi-crypto
 	sql-pooling sqlite ssl static +storage-daemon systemd tcpd vim-syntax"
 REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
 
@@ -72,7 +70,6 @@ DEPEND="
 		sys-libs/ncurses:=
 		sys-libs/zlib
 	)
-	python? ( ${PYTHON_DEPS} )
 	"
 RDEPEND="${DEPEND}
 	!clientonly? (
@@ -83,15 +80,10 @@ RDEPEND="${DEPEND}
 	)
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 
-REQUIRED_USE="static? ( clientonly )
-	python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="static? ( clientonly )"
 
 S=${WORKDIR}/${PN}-Release-${PV}
 
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
 src_prepare() {
 	use mysql    && export mydbtypes+=( mysql )
 	use postgres && export mydbtypes+=( postgresql )
@@ -111,10 +103,18 @@ src_prepare() {
 	# fix missing DESTDIR in symlink creation
 	eapply -p2 "${FILESDIR}/bareos-cmake-symlink-default-db-backend.patch"
 
+	# disable dird and stored plugins, because of
+	# py2 dependency
+	cd "${S}/core/src/plugins"
+	cmake_comment_add_subdirectory filed
+	cmake_comment_add_subdirectory dird
+	cmake_comment_add_subdirectory stored
+	cd -
+
 	eapply_user
 
 	CMAKE_USE_DIR="$S/core"
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -135,7 +135,7 @@ src_configure() {
 	fi
 
 	for useflag in acl ipv6 ndmp readline scsi-crypto sql-pooling \
-		systemd fastlz mysql python lmdb glusterfs rados \
+		systemd fastlz mysql lmdb glusterfs rados \
 		rados-striper cephfs jansson; do
 
 		mycmakeargs+=( -D$useflag=$(usex $useflag) )
@@ -178,7 +178,7 @@ src_configure() {
 		-Dbatch-insert=yes
 		-Dhost=${CHOST}
 		-Dcoverage=yes
-		-Dpython=yes
+		-Dpython=no
 		-Dsmartalloc=yes
 		-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
 		-Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
@@ -190,12 +190,12 @@ src_configure() {
 		-Dhostname="`hostname -s`"
 		)
 
-		cmake-utils_src_configure
+		cmake_src_configure
 }
 
 src_install() {
 	#emake DESTDIR="${D}" install
-	cmake-utils_src_install
+	cmake_src_install
 	newicon core/src/images/bareos_logo_shadow.png bareos.png
 
 	# remove some scripts we don't need at all
diff --git a/app-backup/bareos/bareos-19.2.7.ebuild b/app-backup/bareos/bareos-19.2.8.ebuild
index cb87707808ea..beb2d8324673 100644
--- a/app-backup/bareos/bareos-19.2.7.ebuild
+++ b/app-backup/bareos/bareos-19.2.8.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 CMAKE_WARN_UNUSED_CLI=no
 #CMAKE_REMOVE_MODULES=yes
 
-inherit python-any-r1 systemd cmake-utils
+inherit python-any-r1 systemd cmake
 
 DESCRIPTION="Featureful client/server network backup suite"
 HOMEPAGE="https://www.bareos.org/"
@@ -97,8 +97,15 @@ src_prepare() {
 	# fix missing DESTDIR in symlink creation
 	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
 
+	# disable dird and stored plugins, because of
+	# py2 dependency
+	cd "${S}/core/src/plugins"
+	cmake_comment_add_subdirectory dird
+	cmake_comment_add_subdirectory stored
+	cd -
+
 	CMAKE_USE_DIR="$S/core"
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -124,6 +131,7 @@ src_configure() {
 	done
 
 	mycmakeargs+=(
+		-DHAVE_PYTHON=0
 		-DDEFAULT_DB_TYPE=${mydbtypes[0]}
 		-Darchivedir=/var/lib/bareos/storage
 		-Dbackenddir=/usr/$(get_libdir)/${PN}/backend
@@ -169,11 +177,11 @@ src_configure() {
 		-Dx=$(usex X)
 		)
 
-		cmake-utils_src_configure
+		cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# remove some scripts we don't need at all
 	rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd,startmysql,stopmysql}
@@ -324,6 +332,9 @@ src_install() {
 	diropts -m0755
 	keepdir /var/log/bareos
 
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
+
 	# make sure bareos group can execute bareos libexec scripts
 	fowners -R root:bareos /usr/libexec/bareos
 }
diff --git a/app-backup/bareos/files/tmpfiles.d-bareos.conf b/app-backup/bareos/files/tmpfiles.d-bareos.conf
new file mode 100644
index 000000000000..6e2dacc41ad3
--- /dev/null
+++ b/app-backup/bareos/files/tmpfiles.d-bareos.conf
@@ -0,0 +1 @@
+d /run/bareos 0770 bareos bareos -