gentoo resync : 15.12.2019

7 files changed, 22 insertions, 30 deletions

diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 65fc5a89a443..77cee550d80d 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -29,10 +29,10 @@ DIST zabbix-3.4.15.tar.gz 17489570 BLAKE2B 8b820e29334fa7814ab54baef75374955340c
 DIST zabbix-4.0.13.tar.gz 17150333 BLAKE2B fe4eaf999c0fbe4c87ca2bb621ce229480840f3e86de5e7b02d3668d5705046e62bf04f4f4ad75e814c1fa795642df3c0a9d1bfb07ef25c33003b12e0fe44c7b SHA512 150d28b1be88821be30ef1a9d74ac62e6939f556ef13e6acc6c99b915d36d1655d776aeb2399009285404724dfa41acf249b9047797890a954941831c8b5ecba
 DIST zabbix-4.2.7.tar.gz 18286402 BLAKE2B 36fbd5938d6d188b29fb2e284a8b2ddec1e3cfda08517094e06fae6ccad9dea8027368f4a1a98cb49957caf0aee580df01a17f4aa19a98e746e2c1164db4b590 SHA512 92341e4efe721f043b66bdd382fc69bc408c4e0435a594fadf51989c37d8ecbd72ae0092517929b521527b41331f933310e9c14da42f18902ca54460170dddf9
 DIST zabbix-4.4.0.tar.gz 20689807 BLAKE2B 7be62a7b124a016a9f3ab5022b349452b1a99c9ef8cff8ba4b8278f7c48a7632d7f3e6677764fd778c44c05fdb86bbe2b066eb6a51f076274fffcbbd94202db4 SHA512 021e7454decb885065417f6f6a0ecc8a9d4f184f68da6ab4efea68280b3a0c0641eab05620ce14016b6e57ce32c44075e53b45f03e764e8726c00bfdd6039406
-EBUILD zabbix-2.2.16-r1.ebuild 9422 BLAKE2B 66f0a9ce2aff2c7d34beacf835cccacb4c35b94d25bc36bc78cc175dac974800b84fe63f989defab49d188051bb9591a026f517a87e73971575bb1fc759cab9a SHA512 19f91b0eb3a26ef92f223f29c40e0edfa0a26657b3d2d5c5edb24dc16d3a04f6786f6a0a6414417d7bd60135dc2a2d534711bd5a0876301c15fbc84d9df4acb3
-EBUILD zabbix-3.0.28.ebuild 9260 BLAKE2B f914d67e72fa9c65bb852b3bdc710c162f1b3689432d0e62a46b315cb692cc114d006a29ed8d8078ad036f3fdd9ea548d06cbe96a8cce27df465fe0df6976faa SHA512 f3cd17ef30f681aee2a86a743fee8bcc6140b6cf2330b65653ba81b02b7476e019b33f31c70645a48e07d564ac8bbebc096eea4c27b358091912418f2fa51623
-EBUILD zabbix-3.4.15.ebuild 9238 BLAKE2B c45583e3147ecf8db898697aa4fb1ea31617c7e3bdab693de043d5504005efb3d6033cb8e1f1370dc5d8e64dfb182c7b671f38b302e71c93d258dea998f2a062 SHA512 e9da0542219528829ac44bec5e93631a2b0cd4e2d4275b2ee1a442136c45b787fe6babab30a02ef7cecb7fa1ebd69ab7631555d4a6c9faaf32d02f179da43c79
-EBUILD zabbix-4.0.13.ebuild 9426 BLAKE2B 1f85e07ce0f90019d4d5c5d6e02e1f930afedf4b6ebc8086c70dd3f3eee85150580c4a251a2facc41cae5516b881b95926ba27bcc76066b5f255aa41088bc092 SHA512 6dacbd9fa2428de7009ca59bd956c1412448006919b5a3fdd6e5b5c48b43551766b5429575c0eeaabb7bcc7addc8c774ab6074f1f5939f9f3c5b5130a069727f
-EBUILD zabbix-4.2.7.ebuild 9565 BLAKE2B 3c7f954dc470cf4b612e9d787390c3893f9620bef0e55ff787e78edd2b09e1c5d7e9c27ea0b5d2df2b4238aee128a198d22e8f63dd50043839f963bd242172ee SHA512 b5380a0f992d00d30950ff25fb5459c5a9f872c6256fcb8bb6b4166e48c5fd52492631a895eaefb950d56a6ee442311ad68d49212171bfe320bfce84cc3d7490
-EBUILD zabbix-4.4.0.ebuild 9565 BLAKE2B 3c7f954dc470cf4b612e9d787390c3893f9620bef0e55ff787e78edd2b09e1c5d7e9c27ea0b5d2df2b4238aee128a198d22e8f63dd50043839f963bd242172ee SHA512 b5380a0f992d00d30950ff25fb5459c5a9f872c6256fcb8bb6b4166e48c5fd52492631a895eaefb950d56a6ee442311ad68d49212171bfe320bfce84cc3d7490
+EBUILD zabbix-2.2.16-r1.ebuild 9374 BLAKE2B 51863c24bd87b2227e5e6ef2ea6dfd82a4ed7c5724984b05f6a3f65fc7a698a4e4f28348342a28392113cf741691ccc2bb2c3fae3494ed4d43cd49e6736fe2aa SHA512 c6dc8f51a438e0254442c06005daca4788b3b37f2695aa4a43c545f56aa415069c53f1d399fb14f648f9710b716143c44627932401a4f7bb1cef7a4929582041
+EBUILD zabbix-3.0.28.ebuild 9212 BLAKE2B 01d604dbdcbdbb6494382aab59a5d7ab10142c035ee023ce377a21ce17077585b048cec5cb18e844ddb8f83ca0b41b5396826d274ad70eaea1f4cf315fb19c68 SHA512 e64d401cf73217c3845baf23d4f869ba96474a98ea76a00dcd486349e83e5a7a07e2c65ed58e03772f72fc1fe187db682c5f5d16735827a3f8c9e5b9605d356c
+EBUILD zabbix-3.4.15.ebuild 9190 BLAKE2B 34f7fdb2eabc1b821c0480d3e5d6b3faa6038799d980fb4167c1ef606bc4208ba976b4a556a25ef6e9150413b8eb6618d75100feaeb82e2d35b5d93aaed78491 SHA512 1d7d17f1dbe723459776da9ff2b5d0fbe11e9c8a02cb4bd472147614d2e3e8e81b1988a46957108dda65b7f81177ab5c45cbc6208b504b3facdf16c0817fb986
+EBUILD zabbix-4.0.13.ebuild 9378 BLAKE2B a9561575c6a3f270b92026fa7f6568eb4e6b3233adf33304d262a59f16385073b44bb8689828460c0ef1d5625fb98525add993f462ea3222af48fd1dd09adafd SHA512 2ee7c7bebb9cc5c22b1042fdd40bb7b3173a97da818d8b52c600b708f98b56a8ccaf5025efa47c7a5658daf0861de874ee6e319709490907327442a35bf384e2
+EBUILD zabbix-4.2.7.ebuild 9517 BLAKE2B 596a6172a49b60a8fe225cc3827917f759875fe2f40b58487cd6b2dcb9139950a16ead08af86283ca2e87b99df6d9a5f75de439add860c9da179f16cf2cb8a7c SHA512 7001461570d7d7022742b3e49d894f8d8be125b0a644bcbeeb5ce29f2df8572b3fedcca0e4daf9854a85576f0353d867c9ef654289d6991b2c7a2b31a640ddb2
+EBUILD zabbix-4.4.0-r1.ebuild 9462 BLAKE2B c2e612abec395560c4ca7e1d081c78045ebbfbd17be9b4d7ce39b44b3c32ee7e8e2a16974675e10a666239a8a0feecc7e3b527a20e71630680dbe00c5b5c92ea SHA512 4c020e6d1287cccaf7c70c567a347aec0b476c60cb0907ac925c0280a6b56a0ffb050f3a53130910d1e1c7fe07b36e7e18f20736afd4c4776cefe2b4ea5e4b38
 MISC metadata.xml 1402 BLAKE2B 02819796719872a78ba4f7f534344bcde607fd95d10ae0087d62b65490289946f81a70b6ae5341ed6579f4855e998fc46bcff6cc463aa7feb4e768736509128a SHA512 8d3ad204e8cfb4d2aa76f0af90c77d7b6e4cc13da54772d95fe43d68bf85eb96e9d96bc2b11b08421e4684b03ad53042a4f4c0a44817f0e4ea804b81996cda5a
diff --git a/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild b/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild
index cd75b8d90b24..26b70005d753 100644
--- a/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild
@@ -135,13 +135,12 @@ src_configure() {
 		$(use_with openipmi openipmi) \
 		$(use_with ssh ssh2) \
 		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		|| die "econf failed"
+		$(use_with odbc unixodbc)
 }
 
 src_compile() {
 	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
 	fi
 }
 
diff --git a/net-analyzer/zabbix/zabbix-3.0.28.ebuild b/net-analyzer/zabbix/zabbix-3.0.28.ebuild
index 64dc6af6ad83..09ba412f2f86 100644
--- a/net-analyzer/zabbix/zabbix-3.0.28.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.0.28.ebuild
@@ -137,13 +137,12 @@ src_configure() {
 		$(use_with ssh ssh2) \
 		$(use_with libxml2) \
 		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
+		$(use_with ssl openssl)
 }
 
 src_compile() {
 	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
 	fi
 }
 
diff --git a/net-analyzer/zabbix/zabbix-3.4.15.ebuild b/net-analyzer/zabbix/zabbix-3.4.15.ebuild
index 4d9f2799daa6..0169c3ac73bf 100644
--- a/net-analyzer/zabbix/zabbix-3.4.15.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.4.15.ebuild
@@ -138,13 +138,12 @@ src_configure() {
 		$(use_with ssh ssh2) \
 		$(use_with libxml2) \
 		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
+		$(use_with ssl openssl)
 }
 
 src_compile() {
 	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
 	fi
 }
 
diff --git a/net-analyzer/zabbix/zabbix-4.0.13.ebuild b/net-analyzer/zabbix/zabbix-4.0.13.ebuild
index 7b8602240625..2e1f7d320991 100644
--- a/net-analyzer/zabbix/zabbix-4.0.13.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.13.ebuild
@@ -142,13 +142,12 @@ src_configure() {
 		$(use_with ssh ssh2) \
 		$(use_with libxml2) \
 		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
+		$(use_with ssl openssl)
 }
 
 src_compile() {
 	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
 	fi
 }
 
diff --git a/net-analyzer/zabbix/zabbix-4.2.7.ebuild b/net-analyzer/zabbix/zabbix-4.2.7.ebuild
index ce4694480bfa..190162272899 100644
--- a/net-analyzer/zabbix/zabbix-4.2.7.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.2.7.ebuild
@@ -142,13 +142,12 @@ src_configure() {
 		$(use_with ssh ssh2) \
 		$(use_with libxml2) \
 		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
+		$(use_with ssl openssl)
 }
 
 src_compile() {
 	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
 	fi
 }
 
diff --git a/net-analyzer/zabbix/zabbix-4.4.0.ebuild b/net-analyzer/zabbix/zabbix-4.4.0-r1.ebuild
index ce4694480bfa..e5ef1c2c0b80 100644
--- a/net-analyzer/zabbix/zabbix-4.4.0.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.4.0-r1.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
 KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
 	server? ( ^^ ( mysql oracle postgres odbc ) )
@@ -32,7 +32,6 @@ COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
 	sqlite? ( >=dev-db/sqlite-3.3.5 )
 	postgres? ( >=dev-db/postgresql-8.1:* )
 	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
 	libxml2? ( dev-libs/libxml2 )
 	curl? ( net-misc/curl )
 	openipmi? ( sys-libs/openipmi )
@@ -41,14 +40,14 @@ COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
 	odbc? ( dev-db/unixODBC )
 	server? ( sys-libs/zlib )
 	proxy?  ( sys-libs/zlib )
+	server? ( dev-libs/libevent )
 	ssl? ( dev-libs/openssl:=[-bindist] )"
 
 RDEPEND="${COMMON_DEPEND}
 	proxy? ( net-analyzer/fping[suid] )
 	server? ( net-analyzer/fping[suid]
 		app-admin/webapp-config
-		dev-libs/libpcre
-		dev-libs/libevent )
+		dev-libs/libpcre )
 	java?	(
 		>=virtual/jre-1.4
 		dev-java/slf4j-api
@@ -70,7 +69,7 @@ DEPEND="${COMMON_DEPEND}
 			=dev-libs/cyrus-sasl-2*[static-libs]
 			net-libs/gnutls[static-libs]
 		)
-	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	mysql? ( >=virtual/mysql-5.0.3[static] )
 	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
 	postgres? ( >=dev-db/postgresql-8.1:*[static-libs] )
 	libxml2? ( dev-libs/libxml2[static-libs] )
@@ -136,19 +135,17 @@ src_configure() {
 		$(use_with postgres postgresql) \
 		$(use_with oracle) \
 		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
 		$(use_with curl libcurl) \
 		$(use_with openipmi openipmi) \
 		$(use_with ssh ssh2) \
 		$(use_with libxml2) \
 		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
+		$(use_with ssl openssl)
 }
 
 src_compile() {
 	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
 	fi
 }