gentoo resync : 18.11.2018

4 files changed, 49 insertions, 35 deletions

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 5504a8e317af..df77e4784ba2 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -31,9 +31,10 @@ DIST bacula-5.2.13.tar.gz 4243395 BLAKE2B 5cad5d2675f8a2dd28a76c1a4e4c649d1bf9b0
 DIST bacula-9.0.6.tar.gz 3984215 BLAKE2B 89d0c83ae1ffd2c2677f5882eebc0feac12780a78f9fcf6d30e44981a09f29dd8bd3f0e55ba963a0ed03099117f2d645cf0402cf528fe939d88210ed547ea157 SHA512 a85b8e089951eb9949c9906af45f204a69cd4a7d2e0f29439b74a29ade20c05a49a8c38665189a46c0ad07af0c97380485e10da6aa53dfc47a22934f589f265e
 DIST bacula-9.0.8.tar.gz 4475511 BLAKE2B be321a2a215cc2b127423cf8d103303957c7064ba4453f0da8b82b3c23a38d45df7ee0e434da8a010911976812b23886fcf366d0dee9f1880c0f14fa641c1937 SHA512 4041525f594e23bfb231ea182a680899020347dd26e1d7f6d05c9f97aac8000a1bbeb9acaf2f73b283616fe03caf38fbb335b0e65e6a18e0322ca64da6f98e64
 DIST bacula-9.2.1.tar.gz 4115337 BLAKE2B 17c678bee46c9788d9abf220d0c810f94864f9f1609fc25513b2cf0a11ac584fc2ca4429fa49d7af567d316b92c243900bed21511b59f8976fd230186896c70f SHA512 6b14372fb505a4c5e084b96154c764b20e173504e335813cfffd406eb1739a301a5352047696501a11fcc297381a9fbed6e0e8714ad62998f02edbd9e0ff8d1b
+DIST bacula-9.2.2.tar.gz 4115575 BLAKE2B affc6efa3543836690e3d89eb37faa2d5066344308dc29a22c491374f04a2fd00bedb57a869d0bcf8a0f58d806bc9f9b9381330c22984ddb4d5acd97b757d2c8 SHA512 390ac0ad205c3694fe02c6842740b188bde0be469d0a9b89388d3f75746c7cca6a536a2386e06a5069c84863f28dae3449250ff71e63b9ff14e8f7b074df1708
 EBUILD bacula-5.2.13-r7.ebuild 11663 BLAKE2B 77bc96341c0450302e7ede70cbffb446a9aaeeaac012663a4e69f31dcc54b99dde1a79684a4763cfb2368dff5e0f5191973ce374099bd9f8234e823f5f66e909 SHA512 8c660e98f9e45f92535a16a32723077588a922b33c8fabb513a4c36968082002a93fb8f30b24d2ca620516945e48f35954a83b185657dfaa8849ad9200031a50
-EBUILD bacula-9.0.6-r2.ebuild 12450 BLAKE2B 405b703434852e97b72a68392c19078c6f9fd93446fa81b152bc347ad6c8a1acee7fc65909179faab1352429956e3fd5f4153a6c5a9ab509b3ea58406a1447d1 SHA512 6d3f4ba7e0d2a47b52df08a726374ef0febf026b3d3e63e6ff1c22ddc0032988e187c69d0f8ed63057e5af4636935759a8debf840813eaeda9798e6b7127a171
 EBUILD bacula-9.0.6-r4.ebuild 12771 BLAKE2B 0fc64ea5973fb0b00d9c1f3526cf1e152447fd553277f244f72570564d17dccfd7a1ba4c8975f5487c09e128915c89b5da093038d1c1829b5adfecd07f576db0 SHA512 44c3ce89ec455c7e53c5e17f730898f08cda0c696c53d17ce94df8658be35aea7d6a5b4a196a213291cf9f29db306ff6a35edbfe9128835c3299c4695f7261f6
-EBUILD bacula-9.0.8-r1.ebuild 12630 BLAKE2B b178d0cfb28d1097e1ab042e9ee5053e00ffbe129ccbd4ee978d671400dfd6af69fa38bc190d53924900619889c3f9fb977bf92813b9dfae81025a6341964899 SHA512 580d20efe50042635d7ac161fd2ae5f5973ecd022ece41ae6f0a6c302c17d610440984b7a9084cd59e5f4204dbfaeaa8714adc0b3eec01c5ef6c3bfc0e85e9e7
-EBUILD bacula-9.2.1.ebuild 12706 BLAKE2B 45820bbe4312c2bd27d63cbb353e35e9e2248c5469b84c4453edb47f97c71e23306b1753ae2df02e86ffb02da21c6f94c9a3a0fb1d70a811ff7a548e63679b4b SHA512 7646a09bf6353023d6bf8d37701fa45c7a01deb5239cf2901f84f1720602df2e81d41adb0f93aa182dcf74ccd844b741ae32ea1736afcf02f5e668a2c14f82a3
+EBUILD bacula-9.0.8-r1.ebuild 12628 BLAKE2B 92cc9de59903df745fc1215366d9fae6ef07bc603d86431374439116ca661fc85f395f1f9de304a50066cdd6f0b6c6bf4f202d31aea456f40f9aefcffdee52b9 SHA512 0c6eec46f9c99e27e591e8b3a61704dc53e02a252a499d06962ca8d559317c4678f3ec5e0dad7577620fdf25c9c566f6c73e9a4980547a5fa8c350b31a43e99c
+EBUILD bacula-9.2.1.ebuild 12703 BLAKE2B 093ee271467ba45a663ebcd0d684bc89cc2c8f2d5654eaf2e027c97fb963c577b0b03fb31a9c063a75462ec2fa09af636e290a9dcf4f059cd9a3ac64ddb1dfa2 SHA512 88b3915f96a26bce945483347442e63cccdef7a16e895e627284dbfd2fdc97474f4c7d5e7520c626f9580782d2ddcaba1d1574aceaa360a4fcd085ce90f3e4b7
+EBUILD bacula-9.2.2.ebuild 12706 BLAKE2B 45820bbe4312c2bd27d63cbb353e35e9e2248c5469b84c4453edb47f97c71e23306b1753ae2df02e86ffb02da21c6f94c9a3a0fb1d70a811ff7a548e63679b4b SHA512 7646a09bf6353023d6bf8d37701fa45c7a01deb5239cf2901f84f1720602df2e81d41adb0f93aa182dcf74ccd844b741ae32ea1736afcf02f5e668a2c14f82a3
 MISC metadata.xml 626 BLAKE2B 5794ff725aacf865d2f20f402d057e6358a2c68be16f760f1446b2de5292c9582247ab86417131063e181168f003e1d6f5d200ac0dc3d47da24a3bca688dd93c SHA512 69d63f22a63a53daada5561d751f9903932c9a4596c164894a9aa6465a0f4ac90af99548439545fff1cfbcac9a1eb266a91119cbf73cb13edebd16b440613e55
diff --git a/app-backup/bacula/bacula-9.0.8-r1.ebuild b/app-backup/bacula/bacula-9.0.8-r1.ebuild
index 99cacd67cf8e..d37bd4142af2 100644
--- a/app-backup/bacula/bacula-9.0.8-r1.ebuild
+++ b/app-backup/bacula/bacula-9.0.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="
diff --git a/app-backup/bacula/bacula-9.2.1.ebuild b/app-backup/bacula/bacula-9.2.1.ebuild
index 4d4577e24ba1..d29d80133393 100644
--- a/app-backup/bacula/bacula-9.2.1.ebuild
+++ b/app-backup/bacula/bacula-9.2.1.ebuild
@@ -436,5 +436,5 @@ pkg_postinst() {
 	einfo "you have to enable 'USE=qt5'."
 	einfo
 	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
-	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
+	einfo "restores, so be sure to set it to an appropriate dir in the bacula config."
 }
diff --git a/app-backup/bacula/bacula-9.0.6-r2.ebuild b/app-backup/bacula/bacula-9.2.2.ebuild
index 879631e43da8..4d4577e24ba1 100644
--- a/app-backup/bacula/bacula-9.0.6-r2.ebuild
+++ b/app-backup/bacula/bacula-9.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
-inherit qmake-utils desktop systemd user libtool
+inherit desktop libtool qmake-utils systemd user
 
 MY_PV=${PV/_beta/-b}
 MY_P=${PN}-${MY_PV}
@@ -14,55 +14,59 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="
-	dev-libs/gmp:0
 	!bacula-clientonly? (
+		!bacula-nodir? ( virtual/mta )
 		postgres? ( dev-db/postgresql:=[threads] )
-		mysql? ( virtual/mysql )
+		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
 		sqlite? ( dev-db/sqlite:3 )
-		!bacula-nodir? ( virtual/mta )
 	)
+	dev-libs/gmp:0
 	qt5? (
 		dev-qt/qtsvg:5
 		x11-libs/qwt:6
 	)
 	logwatch? ( sys-apps/logwatch )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	readline? ( sys-libs/readline:0 )
 	static? (
-		acl? ( virtual/acl[static-libs] )
-		sys-libs/zlib[static-libs]
 		dev-libs/lzo[static-libs]
 		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+		acl? ( virtual/acl[static-libs] )
 		ssl? (
 			!libressl? ( dev-libs/openssl:0=[static-libs] )
 			libressl? ( dev-libs/libressl:0=[static-libs] )
 		)
 	)
 	!static? (
-		acl? ( virtual/acl )
-		sys-libs/zlib
 		dev-libs/lzo
 		sys-libs/ncurses:=
+		sys-libs/zlib
+		acl? ( virtual/acl )
 		ssl? (
 			!libressl? ( dev-libs/openssl:0= )
 			libressl? ( dev-libs/libressl:0= )
 		)
-	)"
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+"
 RDEPEND="${DEPEND}
 	!bacula-clientonly? (
 		!bacula-nosd? (
-			sys-block/mtx
 			app-arch/mt-st
+			sys-block/mtx
 		)
 	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
 
-REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
-				static? ( bacula-clientonly )"
+REQUIRED_USE="
+	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+	static? ( bacula-clientonly )
+"
 
 S=${WORKDIR}/${MY_P}
 
@@ -132,7 +136,7 @@ src_prepare() {
 	# bug #328701
 	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
 
-	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-fix-static.patch
+	eapply -p0 "${FILESDIR}"/9.0.8/${PN}-9.0.8-fix-static.patch
 
 	# fix soname in libbaccat.so bug #602952
 	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
@@ -144,8 +148,6 @@ src_prepare() {
 	# fix file not found error during make depend
 	eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
 
-	# fix missing QtGlobal include in src/qt-console/pages.h for Qt5
-	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-fix-pages-h-qt-includes.patch
 	eapply_user
 
 	# Fix systemd unit files:
@@ -168,6 +170,19 @@ src_prepare() {
 	touch src/qt-console/.libs/bat || die
 	chmod 755 src/qt-console/.libs/bat || die
 
+	# fix wrong handling of libressl version
+	# needs separate handling for <libressl-2.7 and >=libressl2.7
+	# (see bug #655520)
+	if has_version "<dev-libs/libressl-2.7"; then
+		eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-libressl26.patch
+	else
+		eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-libressl27.patch
+	fi
+
+	# Don't let program instal man pages directly
+	rm "${S}"/manpages/Makefile.in || die "Unable to remove man pages Makefile.in"
+	eapply -p1 "${FILESDIR}/bacula-fix-manpages.patch"
+
 	# fix bundled libtool (bug 466696)
 	# But first move directory with M4 macros out of the way.
 	# It is only needed by autoconf and gives errors during elibtoolize.
@@ -224,6 +239,7 @@ src_configure() {
 		--htmldir=/usr/share/doc/${PF}/html \
 		--with-pid-dir=/var/run \
 		--sysconfdir=/etc/bacula \
+		--with-archivedir=/var/lib/bacula/tmp \
 		--with-subsys-dir=/var/lock/subsys \
 		--with-working-dir=/var/lib/bacula \
 		--with-logdir=/var/lib/bacula \
@@ -301,10 +317,8 @@ src_install() {
 		rm -vf "${D}"/usr/share/man/man1/bat.1*
 	fi
 	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-	if use bacula-clientonly || use bacula-nodir; then
-		rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
-		rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
-		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
+
+	if use bacula-clientonly || use bacula-nodir ; then
 		rm -vf "${D}"/usr/libexec/bacula/create_*_database
 		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
 		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
@@ -314,12 +328,6 @@ src_install() {
 		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
 	fi
 	if use bacula-clientonly || use bacula-nosd; then
-		rm -vf "${D}"/usr/share/man/man8/bacula-sd.8*
-		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
-		rm -vf "${D}"/usr/share/man/man8/bextract.8*
-		rm -vf "${D}"/usr/share/man/man8/bls.8*
-		rm -vf "${D}"/usr/share/man/man8/bscan.8*
-		rm -vf "${D}"/usr/share/man/man8/btape.8*
 		rm -vf "${D}"/usr/libexec/bacula/disk-changer
 		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
 		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
@@ -328,6 +336,9 @@ src_install() {
 	# documentation
 	dodoc ChangeLog ReleaseNotes SUPPORT
 
+	# Install all man pages
+	doman "${S}"/manpages/*
+
 	# install examples (bug #457504)
 	if use examples; then
 		docinto examples/
@@ -424,4 +435,6 @@ pkg_postinst() {
 	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
 	einfo "you have to enable 'USE=qt5'."
 	einfo
+	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
+	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
 }