gentoo resync : 10.02.2019

5 files changed, 14 insertions, 14 deletions

diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 10b07c1a784c..a0e867e527ce 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/visitors/Manifest b/www-misc/visitors/Manifest
index c6c2ea00d654..4f884e95a15a 100644
--- a/www-misc/visitors/Manifest
+++ b/www-misc/visitors/Manifest
@@ -1,4 +1,4 @@
 DIST visitors-0.7.tar.gz 100154 BLAKE2B 4846da14b22210024696d85d3eb4048cece04ce20bcfc74dec4b3e9a794780839034b01a335fe13d8fdd71f785f49a23ccaf43ceb01878528621ad4272c0dd65 SHA512 41902a44d802b7318e0a2aec7b2947ca478cac94c97e071fefbae0ba67fe74d2985e7c27bdc64d8789d41ab46586a0478cc8f4b6ed83cb6a32139799cb328a11
 EBUILD visitors-0.7-r1.ebuild 753 BLAKE2B 9f15025147c5086315956fdb0a0655c3fc29cd29c9fdc461a5bb45c92fb53e12a9bd4b4871f8e4ac4e461899c38697301ea323d93307e478eb885fc083f67990 SHA512 fa947597bbbeccc883fc5fbfcd98cd9b41610e60a3dd3aa9db80ab3423a38ba88461c6bb0ef90b203735b577c0d0912657d5104efee6dd6cc31d02a2326da1c0
-EBUILD visitors-0.7-r2.ebuild 753 BLAKE2B 378053dd0b105c2efd69e3f4f68ce93bf9a3d6bdc982df79c404431e921aafd5499d9fe73f52f5459975f372c3578099bb752f031533d5cc958c6e35df324a34 SHA512 b1a212755246929a04b830e95c3d5e0333ed3e694d0c6d53d7bc94f018747de0cd60ea2de22d267abf8fcd652c3795d669571da4b5cf0371c475a2f955e98f1e
+EBUILD visitors-0.7-r2.ebuild 747 BLAKE2B 33ab8c4c24e33491109169f7ab80623b33490f31c9f540e7ecb9665a09236b17b02f9623e4cef53c78f3398adcbab8f021f104da53edf76a49e0d24dde8c9d22 SHA512 cf5334bf164f0edde8d4a0b1d6a7767ce9e5dfd6fef8b4f3cd87ea62adc169938212bc9bc4a56208b13f6ac20a38dfb30c654609fb57ec405379eff653b2266e
 MISC metadata.xml 415 BLAKE2B 1b3a9f75d3fa049954155ba7a7b37cc28bb809978c5244495a56940d30b43319128feca015029c6b79d0946d265791777881a192b04d574fa75e79554b099363 SHA512 4b99f5e8c2d9e6698e45047a373003b388a96ac11b99ada162a650b0f1172cd51ffb32341f300edce2329800a648ab818fa99057eaf809e22dce69b34b280388
diff --git a/www-misc/visitors/visitors-0.7-r2.ebuild b/www-misc/visitors/visitors-0.7-r2.ebuild
index 2dee93983607..19963571fecc 100644
--- a/www-misc/visitors/visitors-0.7-r2.ebuild
+++ b/www-misc/visitors/visitors-0.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.hping.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 S="${WORKDIR}/${P/-/_}"
 
diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index e0b928ef7e81..3c3571dfc670 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -9,5 +9,5 @@ AUX zoneminder-1.30.4-path_zms.patch 823 BLAKE2B 0b318fe9fb64538c7925a947f8766df
 AUX zoneminder.service 212 BLAKE2B 4a7497025b8d315c5a77a6e1f0d80000c3eb363ced1f2285c6b594b871283eba941e267a4590fba5ea89fb3e1529dcec93a63d67025b569ba0411f9e42103680 SHA512 3824076594e18ee89ca28e622f87bf9bd51156d0ef9d71fe8d20d69b682ecf8c96fb779cbaf33f1709aec0ec9fd1b5448b8524c781510718549282e68c095a90
 DIST Crud-3.1.0.tar.gz 72993 BLAKE2B d11938a0a667f6747bbe3609e51ccc5665b8d243e1787a5779319c679f1f20301afd6b0a14c5489976b9f66f57b5f18ef3ae0ee5a24e1368702cb43a5d564dd5 SHA512 7ec84afaa336b1bd582b7f39724f77081bdb3008947c4124ad96e4bc7755a03fbe31e01666d4d1939ebe17b342db37bf3766a42d88fbed0e99706807ff5b9d01
 DIST zoneminder-1.30.4.tar.gz 9937220 BLAKE2B feab8251b3f36f3fb91e1ea52a25b06e131a81c398f8c97a4ef304848bc65abaf5514bded1783c1ab6ec2287e279baa69d406e24191d59276315d7131af42104 SHA512 b55b2541bcaba08f89b95fdfb06b6cf3fc7b462b1f3fac2bb3fd6e8ee890735d4fac343c7625cf59b22fd25c19585900050cb5305b35aa8f6557421be09450b3
-EBUILD zoneminder-1.30.4.ebuild 4627 BLAKE2B 0305aa5a28b23c00ddbb4d1239182db4ce8ec29789425e276af7a80a8d5bfaa0a0051344c0e009c4ba22e6584b1bcfdf39e556f7b31d9b62d8978f74db90943c SHA512 3aaa7df5d769115f0235ba991b45cab8c8457606b35dd1521a8e1606ba7a62098431e010ec596ff96f7456637d7ae75f89fd0edf6c6253aa75486c17033df758
+EBUILD zoneminder-1.30.4-r1.ebuild 4621 BLAKE2B 46d1289e2855fcbfec735c30fbec79d8d9e817e9815525c273558fd59669f9e3cd0c22d65a78ad2528e0f7d59dd4618a9c8fef184be72930883f15e4a500ab0a SHA512 cac13375351bef2e5bdfaa263474523f04aefcdd2112ec932c0b840e92e79987ae309a0495018fc023f10a697f215b86a247b664035127ecda772f83474b46a3
 MISC metadata.xml 435 BLAKE2B fbf306b96ac38b8f234f360500284d7036f5866c7f95d684488b9b94019998f02ed4f86bfe08f477bfd2f4cde75309b729570522fd52fa57fcf6da3c7e3e32bf SHA512 7aef30cab92e0b1607f5643fa91d96e0e14b38e4d234c2cfed6f44e9ea77473b0ecce492b5104bf98f81ad98cce63eb28c16234a307b885409ce8c82b303e7c7
diff --git a/www-misc/zoneminder/zoneminder-1.30.4.ebuild b/www-misc/zoneminder/zoneminder-1.30.4-r1.ebuild
index 1d8a7f299396..046cf31ef6fb 100644
--- a/www-misc/zoneminder/zoneminder-1.30.4.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.30.4-r1.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TO DO:
 # * dependencies of unknown status:
 #	dev-perl/Device-SerialPort
-# 	dev-perl/MIME-Lite
-# 	dev-perl/MIME-tools
-# 	dev-perl/PHP-Serialization
-# 	virtual/perl-Archive-Tar
-# 	virtual/perl-libnet
-# 	virtual/perl-Module-Load
+#	dev-perl/MIME-Lite
+#	dev-perl/MIME-tools
+#	dev-perl/PHP-Serialization
+#	virtual/perl-Archive-Tar
+#	virtual/perl-libnet
+#	virtual/perl-Module-Load
 
 EAPI=6
 
-inherit versionator perl-functions readme.gentoo-r1 cmake-utils depend.apache flag-o-matic systemd
+inherit eapi7-ver perl-functions readme.gentoo-r1 cmake-utils depend.apache flag-o-matic systemd
 
 MY_PN="ZoneMinder"
 
@@ -37,6 +37,7 @@ REQUIRED_USE="
 
 DEPEND="
 	app-eselect/eselect-php[apache2]
+	dev-db/mysql-connector-c:0=
 	dev-lang/perl:=
 	dev-lang/php:*[apache2,cgi,curl,gd,inifile,pdo,mysql,mysqli,sockets]
 	dev-libs/libpcre
@@ -59,7 +60,6 @@ DEPEND="
 	virtual/ffmpeg
 	virtual/httpd-php:*
 	virtual/jpeg:0
-	virtual/mysql
 	virtual/perl-ExtUtils-MakeMaker
 	virtual/perl-Getopt-Long
 	virtual/perl-Sys-Syslog
@@ -171,7 +171,7 @@ pkg_postinst() {
 
 	local v
 	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least ${PV} ${v}; then
+		if ver_test ${PV} -gt ${v}; then
 			elog "You have upgraded zoneminder and may have to upgrade your database now using the 'zmupdate.pl' script."
 		fi
 	done