gentoo resync : 24.02.2018

18 files changed, 166 insertions, 460 deletions

diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 98ef8f195a90..73e1fb62aeae 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/buku/Manifest b/www-misc/buku/Manifest
new file mode 100644
index 000000000000..1591b44ce673
--- /dev/null
+++ b/www-misc/buku/Manifest
@@ -0,0 +1,3 @@
+DIST buku-3.5.tar.gz 93634 BLAKE2B 55c4b50b3bf8121c116554613768cd836080b363d702469eb2f76349c26d8d6246f73746248123030c5657006e09a9f72242354ce3af20d93b845f1870929bbc SHA512 b9f70665c83033ca030302e805ee051a524b2f0decae6c99ad54749b4a4bc91ae8261976018741361489525f359ea71c01ddb3e2d827ab9a052fb0acc98be8ed
+EBUILD buku-3.5.ebuild 1055 BLAKE2B 056c83eef151c876f6cd0c21f7b5e4e864158dea22caf028cc98cf9c80f4c64794ac2363cc426e6e111197c808b39d5d59563b985c15276e065736a8de0da79d SHA512 80cf1ee215c3f7259f33fe903cb19a3786719d9b24943669e5a6384b30a381ef573c59ebc4812f096982f2afbe190710bd6346731b251ca6a21cfc0fc1e1bf4a
+MISC metadata.xml 441 BLAKE2B 93ab0c34611cf0762ce76f03634d649ab3a7c0d9c3bdbcdcbd3dad1f228f72b522df12eae7731689d7848a7ad647330bfc26202fd8099ac57e98ce73bf1bf6cc SHA512 5f00313957370e1b01d486b6712b232b33bc408884a627df3ba337197208c08cdb8c334699993b65afb2ff598ca7c7c857622442dd46bcd8e3411493b6599f7b
diff --git a/www-misc/buku/buku-3.5.ebuild b/www-misc/buku/buku-3.5.ebuild
new file mode 100644
index 000000000000..ec2ba66f777d
--- /dev/null
+++ b/www-misc/buku/buku-3.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Powerful command-line bookmark manager"
+HOMEPAGE="https://github.com/jarun/Buku"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.13.1[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/py[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
+	)
+"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/zsh/site-functions
+	doins auto-completion/zsh/_*
+
+	newbashcomp auto-completion/bash/buku-completion.bash "${PN}"
+
+	doman buku.1
+}
+
+python_test() {
+	py.test -v tests/test_* || die
+}
diff --git a/www-misc/buku/metadata.xml b/www-misc/buku/metadata.xml
new file mode 100644
index 000000000000..e3171793d0f6
--- /dev/null
+++ b/www-misc/buku/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>davidroman96@gmail.com</email>
+		<name>David Roman</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jarun/Buku</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-misc/monitorix/Manifest b/www-misc/monitorix/Manifest
index 0b04f362d9d8..4de686da9689 100644
--- a/www-misc/monitorix/Manifest
+++ b/www-misc/monitorix/Manifest
@@ -6,5 +6,5 @@ DIST monitorix-3.9.0.tar.gz 288443 BLAKE2B 6203f2950e0061d1ff268a2c42c31e7e14b51
 EBUILD monitorix-3.10.0-r1.ebuild 2830 BLAKE2B 8333778ed32910fc047d5d33b7ad0fad3beb8f78fdc31eecc5478c68782bdeaa971fdd412855e2adee81cea30234d6a6df40fbd453f13392fb27fa1d3371b037 SHA512 6f13fdca50255078b67460b41c6ef1da2f2f27be62717971392fd8a2bcdd647c5f8c49262d9b3557b1fb32e9965b33ff1e2cd9e7cb68cbc2e3c8c844adb74d33
 EBUILD monitorix-3.5.1.ebuild 2446 BLAKE2B d92d145d1e008bf1e2e1762339e11f5b282fd0c20a87dee0ee0b5bbab3299862757e5a19bdf80bd75d17bea146ff14faa396fa09061558b7cd59808efab27367 SHA512 1465b39ed3cadd34d347bf6297b53de7f71598144b7bbde4e688f6023e011beebfceb7c5156b34abe4ba66751ea743875faca45c8ae3bd3f9c44e36c29b6923e
 EBUILD monitorix-3.8.1-r1.ebuild 2614 BLAKE2B 10cdc025e0bf1cec51620a8bddd8b0f5a40cd2431f9fc942bb639eed692a3df385aadf8cbdb2247c74b1106b87f23a5a6b253dfc4387c451fd875c75877b4801 SHA512 0b5681b3328bd6802bf8439409dfa02a14dd299b16d49440a75f5f9b927823548d6b6f8d46df971eb9c56a9cd696bddfd54da5fd09b80e9ec7c42b6881b63808
-EBUILD monitorix-3.9.0.ebuild 2653 BLAKE2B 0333725ec895ef351f0f316efa7542fa8d1269c469f6f6c71e1b00d6e184d53c9f15cfc5f9a96382e7420f79024c79c141b36be6b4eeda9e6f6562db07daa118 SHA512 0a565126cd321511fa7097ee0c5167ebce903ed39f095b25bdeedb2d6601919967fbdb7266f605ea300ac058d3659977c583086806570c7ccccd6b7bd490d18b
+EBUILD monitorix-3.9.0.ebuild 2652 BLAKE2B 373e2f159e31c3f82d6c30eacaedf2853101affee1c1801de79e2949a844fb374cea9f051412015a6f129d8c99a0de86e6e330bdb8b78bf0ec8c093ed226aefb SHA512 44c20675d742100bbdda16839f21715a59326cc081b711c1d3c93c627aa3251511a0cab39fc59fc845c2b99b15c9b5abad2ad6ba1f30b981b0e358613baf99a6
 MISC metadata.xml 862 BLAKE2B 77622e2ef067b1373897ba9e4129e1601a59d6762cac90b0e051f0b3f41736b671042950836abf1fef7ebd6b352e4bbc517fc59e91cc9c3fb499ff145cee2e40 SHA512 5f0403cf7c35368441e39b075f0768c9ffd15d4d160b42f4b6ee510c98a8f5a0264abfc02a5fc2e2ee05d3b828b25b7a99a83679cc4b3286aab696faf69ff470
diff --git a/www-misc/monitorix/monitorix-3.9.0.ebuild b/www-misc/monitorix/monitorix-3.9.0.ebuild
index 345bc40d06c4..5418de135392 100644
--- a/www-misc/monitorix/monitorix-3.9.0.ebuild
+++ b/www-misc/monitorix/monitorix-3.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mikaku/Monitorix/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="apcupsd hddtemp httpd lm_sensors postfix"
 S="${WORKDIR}/Monitorix-${PV}"
 
diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index e660c323fbd4..1ac83ffea373 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -1,17 +1,13 @@
-AUX 10_zoneminder.conf 444 BLAKE2B a338243bc2263b34d2c9956f8cc31717c2101de5d2fa127f303814486334fc59a44dcf01cf152b693091e6be9e53a63cd257f319aa5afe4145f1882e82ba813f SHA512 e8e13da2c6c9262fe52eb4de59c0f0b56ee51d7ef21596c36215b237f8379cb9a365afc19913b231262082b0792f8e9673626b95c3927e6e56f3d54b22ffa635
-AUX 10_zoneminder.conf-r1 370 BLAKE2B cea45936bf6ab710885c0e5c8a11fa2396c9a020a3b14be9618a305fc98794789154c37b199ba295cd06eaca93cd016f9a5d6d27872f4a51e869d5d6c0d58d09 SHA512 8e0117a2d3f7b5b2266850d5965280fec3787c8769e278c65e5d34edcdc81b1e7fe0ad34b2315f23e3dd8cdec03c4555e594e184efcac0ed2028b8f62c346b25
-AUX README.gentoo 1140 BLAKE2B 3c7f10e52052dac5a25686d80f9b4735bfc24e07f502b27648a163f6637c45d2f516f63d5af4b9a9609ccd49c5544b521594edf9a2388b6189d97b3c0620db29 SHA512 302973faebe204fcd75910b8f03eed3d13f5ff733be376849487af1e6f39e834e4d6646c0750c3b9f182fdf098560de9780518aee46e524aaecbf1d950268dd2
+AUX 10_zoneminder.conf 335 BLAKE2B 51d9672c948283c04e9c085828ca29fa962b6353d420b095fccb7b799f10ce22674a9b337e60ca2bfed9a477e9221ebca50cfe5778c35c386cd32eba39aab9e0 SHA512 3dbf37ee7423d208be5464d47ddbca0868fbe142b1e4cac82dc31e40375ffd32953f57911d3b6a74e59a54d6687c8d06e760a5dacfa8688f054b714242d7573f
+AUX README.gentoo 1103 BLAKE2B 264bf5cfff7c61a7ccac32260bad7aabf5e33e165560297e344f264df09d2f56a2cf9c317b6ae2d708c8a8dbc1202127cb8e587055bb0f43e1ac9af2a7202d1c SHA512 e6e4f8d1dad5f6d0f00f8f9d77086aa39f08f673d8d17babc59eb98eadff0f94a83fcea25321d64c941061ae80f7e563eb82ef28cf05bcb8d0a2d1fe4705ac7e
 AUX conf.d 138 BLAKE2B 41ccdedf00277d98a011ac56015c0e46b641df13bf1ad9828a0d62fc2459c43237918a7b4b59d2594de2f3ef01ee8cc89cf63aa79f56bdb368d837d0a9203819 SHA512 66a3447869a5c7ed613a90a81ae3b0464836a8d1804b195770dd4832e61e89f826998f58dba1ce42d7d411c543d485290e670b0bf929646ad99f48a996bc609a
 AUX init.d 415 BLAKE2B 1d72ddbabe6e39b771e18ca5605fdfebc975dd8998561c4a7fd59a40491448489d42ff58fa507143a4feb8b16c7ca1a926ee8ee62bac2a7687a3e624cef54772 SHA512 97ab5d9ddf450241513be6a778bcb346e449b3dab4d6b3d55be41dfe7bb48233a08a598f4306e2f9b35336ab14021b2a2b0e68ddef83bb121f720e11cfcd0bb5
-AUX zoneminder-1.26.5-automagic.patch 1064 BLAKE2B 1c271f14e169db1be1242dcbaf7e9202a8e6ffc05be9003b13c19949acd6e27d809e8f272ccab68693250f8638280447c1cb88812dead487211c8a41f40e2096 SHA512 3bd257233d7b5a376418fed1285bd82aa69e83461251bd941a756acbf87189e23fe3b82c56105d12b90fd5d294ce9708dc8895440fc0f154f4590385fa42e657
-AUX zoneminder-1.28.1-mysql_include_path.patch 774 BLAKE2B c5816bd86d4cbd1a5a74daa6b48d9242ef582031b9ef19791ac44816bfe5a6c7298a51dd9b54a808af5c6d8b6891a5290c0eaf6def48232170622aa14edb4fde SHA512 98088b9578bee1343621231c4f4142d5c82a559177ba359911ff1919328ba1032f52bf820acf5a15e8d7f331187d7d62e3efd578e62b83a465b26a3c7d4d5a28
 AUX zoneminder-1.30.2-diskspace.patch 709 BLAKE2B 64f622e171479d876a8d8f9afffdfd1b1c46f16eb8f5e543c50360f0a131a9bbaa5e0981a244893e6e98eaaf314ad9d0e9268db9c0dd0bd1669291fe5b59049e SHA512 e6fee1a1c1319fe55f271abf729f06d75bcdb97abe2fab3e426b51698b79384f894d48501b1f47c274425bc09e56ad59fb780ab5e51bc8b8f31cd9c8f152392a
+AUX zoneminder-1.30.4-gcc7.patch 1005 BLAKE2B 28462985a07575c18c5595aeeafe68f3c618a57795b78e0434183f99ae44d31a0769149330ee867297ce5fb8a3c3fa6a397049d0cffb0527f0c9cffb8bf28f14 SHA512 f7e43eed5d69cb2f750d280586fdf34e22031ae156b6287f16a73a97d8b2244da95fa47b22655c94f458c5032fae90d49beebea54723aed10569a824317b0fab
+AUX zoneminder-1.30.4-glibc226.patch 613 BLAKE2B 9569d50c9544b77fa69eefb95cdc5ee90b5cee4fd4d5309560114e94d27720c2771fd29d21991842df31a78537328835bd8971bcd47f52f2cc2574d0fc120e4c SHA512 93e4de15fd37c9f6eac33e8bf838bf1479a8d56edc53dc2b977ecb39d8884f5d797acb570a7124ad813bb44de8ad9869885f2e2d5cf6a8e7eeac90daf785d973
+AUX zoneminder-1.30.4-path_zms.patch 823 BLAKE2B 0b318fe9fb64538c7925a947f8766df6d8a2cea88289cc0a301f6f207c0beb046233d54d18d9d080767d41e76e7ac9632cd2c46ad2ede264daba08d81fe53244 SHA512 069fc4e9ff9c33a0d9004cf3f05f77200558dee86178a05618f3afcd39307488fb691a5c6c1adc66da640e768b1c36d28e705acc310e67ecdc8b47c973d28abc
 AUX zoneminder.service 212 BLAKE2B 4a7497025b8d315c5a77a6e1f0d80000c3eb363ced1f2285c6b594b871283eba941e267a4590fba5ea89fb3e1529dcec93a63d67025b569ba0411f9e42103680 SHA512 3824076594e18ee89ca28e622f87bf9bd51156d0ef9d71fe8d20d69b682ecf8c96fb779cbaf33f1709aec0ec9fd1b5448b8524c781510718549282e68c095a90
-DIST Crud-3.0.10.tar.gz 72960 BLAKE2B d7dd9d7f7d465dab910708ce34f1348983d14e80ac06d43273ce53d70fbe540dc3fcae66ffeb54501e6b897e59b660fd1268c4baea95b912059dfabb12031816 SHA512 2f60557f2c783bb448e06c1ca40b536a1d7d5f3caf0626fa6716a28f808492d4799e238f16c022571be96921105b074b6763920fd7b9cc77b76d17ceadae2040
 DIST Crud-3.1.0.tar.gz 72993 BLAKE2B d11938a0a667f6747bbe3609e51ccc5665b8d243e1787a5779319c679f1f20301afd6b0a14c5489976b9f66f57b5f18ef3ae0ee5a24e1368702cb43a5d564dd5 SHA512 7ec84afaa336b1bd582b7f39724f77081bdb3008947c4124ad96e4bc7755a03fbe31e01666d4d1939ebe17b342db37bf3766a42d88fbed0e99706807ff5b9d01
-DIST zoneminder-1.30.0.tar.gz 9757409 BLAKE2B b67340b9cf8f0875a5ea5c4aef2c4a2770532987e8482952a3e81036006efe6f84dc142309ca2926c33d72fca9b157739daf15d9f6716e31b56a00fd704921e7 SHA512 cbff14447a568648a0475e878be5cd19cb694c65814fe33c20774752410e31f3f4ff9e5695667d4d50634b3193dc50aaca2d950efc151bbb968d3f9609d35db4
-DIST zoneminder-1.30.2.tar.gz 9931753 BLAKE2B 3c48d5886053ed72788028b0c7a1f483ca2f659b6614bf0cbc1a5de7c9a7ed21aa730b614ba7400b96b057e076724364d24958e3ee5ff8e1134aeb9f142c38fd SHA512 98bd6d42ecc19bcd317a30e1a9c57bd6bd295593bcc6c12e2fbe1beddfe43fb0301e042323a88969fd5f7da1dc45a1c01324878837633e5a5ed4fa54bed8690a
-EBUILD zoneminder-1.30.0.ebuild 4523 BLAKE2B b3c52ba243dcfecd80c414f428e54266162d57ad99be6bd53d57c3582ec7bbfb50957f2ea30858b5dbf00be15c3fe497852609b6ec44cf2456d327d75bd3b2a4 SHA512 9724891d672b12f7c216f767d882ff102940b21159612d0589b2e100a55977633a59a3f5970ca718d4ba8f536588641bd1caa410df42c0de37b0e80877d5cf8b
-EBUILD zoneminder-1.30.2-r1.ebuild 4576 BLAKE2B acf887a7e01de6e79a65ee6b9d57d871418dcf64d24b034bf5bdbe1eb3b859306c4fe613370ec066ae413ec92bf020fec7699dcab0b45373e1deabc6b2dd901b SHA512 4e7ec33807f651d3d26a6ea6fb302d0b3ec82d070f80c2931ccfdb16653c86a7d6830d9492b89a50b2452ced89c71985afb1ab6912d4b087db26ee5882e9dfb5
-EBUILD zoneminder-1.30.2.ebuild 4521 BLAKE2B 975509d5a27f86a3f73a3d327347f0a3de393f8a83d31a4661e42a78c09c13e94dbef80e626238949fd5b10b6ea7072f78bb9c52f3955563b33ed3c67ec6f16c SHA512 5ae0532f791ca26688714a6d6831a8c9b6af1411a95656ec8300c67121db563e173a752cdca6e8de94b3bd6228e80434f60f799e2a2ec76d5f4875d4e308b5d0
+DIST zoneminder-1.30.4.tar.gz 9937220 BLAKE2B feab8251b3f36f3fb91e1ea52a25b06e131a81c398f8c97a4ef304848bc65abaf5514bded1783c1ab6ec2287e279baa69d406e24191d59276315d7131af42104 SHA512 b55b2541bcaba08f89b95fdfb06b6cf3fc7b462b1f3fac2bb3fd6e8ee890735d4fac343c7625cf59b22fd25c19585900050cb5305b35aa8f6557421be09450b3
+EBUILD zoneminder-1.30.4.ebuild 4600 BLAKE2B 828b2baef7778f501173f60a0cba5128134ff09cc904bc241c11eee723bfcee5db0d99f98324162fc78d0b88cb789ea04241a2c548b2cf9acc1bf622f8f8166e SHA512 8432967287064c3e0db17a55f3bea7ffeba0616f16e4829fef84415562ed0d7df17433f1f904065946c1d42a0263699a6ba273b983bc6c46503d9d7219f2206e
 MISC metadata.xml 550 BLAKE2B cb4ae8b007a894c3cdc5eb931206223df5730740c4c0ee1f384e96a30d9c1cc1acba29efd76a986870a558773d9e0052494582e968330b3af270966f6fd9f744 SHA512 4b284af6cef7a77e824517e45fabcadabb7162e37c5fb39daeff99656697b340c421949e8508483c3fb209fa1db723383e751da79ddc3b7bfbea1af1de0310b1
diff --git a/www-misc/zoneminder/files/10_zoneminder.conf b/www-misc/zoneminder/files/10_zoneminder.conf
index 277d680d24b4..eb9961d13224 100644
--- a/www-misc/zoneminder/files/10_zoneminder.conf
+++ b/www-misc/zoneminder/files/10_zoneminder.conf
@@ -1,18 +1,16 @@
-ScriptAlias /cgi-bin/zms "/usr/libexec/zoneminder/cgi-bin/zms"
-ScriptAlias /cgi-bin/nph-zms "/usr/libexec/zoneminder/cgi-bin/nph-zms"
+ScriptAlias /zm/cgi-bin "/usr/libexec/zoneminder/cgi-bin/"
 
 <Directory "/usr/libexec/zoneminder/cgi-bin">
   AllowOverride All
-  Options ExecCGI
-  Order allow,deny
-  Allow from all
-</Directory> 
+  Options +ExecCGI
+  Require all granted
+</Directory>
 
-Alias /zoneminder "%ZM_WEBDIR%"
+Alias /zm "%ZM_WEBDIR%"
 
 <Directory "%ZM_WEBDIR%">
-  Options -Indexes MultiViews FollowSymLinks
+  Options -Indexes +MultiViews +FollowSymLinks
   AllowOverride All
-  Order allow,deny
-  Allow from all
-</Directory> 
+  Require all granted
+</Directory>
+
diff --git a/www-misc/zoneminder/files/10_zoneminder.conf-r1 b/www-misc/zoneminder/files/10_zoneminder.conf-r1
deleted file mode 100644
index 441c793d1890..000000000000
--- a/www-misc/zoneminder/files/10_zoneminder.conf-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-ScriptAlias /zm/cgi-bin/ "/usr/libexec/zoneminder/cgi-bin/"
-
-<Directory "/usr/libexec/zoneminder/cgi-bin">
-  AllowOverride All
-  Options ExecCGI
-  Order allow,deny
-  Allow from all
-</Directory> 
-
-Alias /zoneminder "%ZM_WEBDIR%"
-
-<Directory "%ZM_WEBDIR%">
-  Options -Indexes MultiViews FollowSymLinks
-  AllowOverride All
-  Order allow,deny
-  Allow from all
-</Directory> 
diff --git a/www-misc/zoneminder/files/README.gentoo b/www-misc/zoneminder/files/README.gentoo
index 07995214d1cf..8713fda6f78a 100644
--- a/www-misc/zoneminder/files/README.gentoo
+++ b/www-misc/zoneminder/files/README.gentoo
@@ -3,12 +3,12 @@
    (see https://wiki.gentoo.org/wiki/MySQL/Startup_Guide).
    E.g., when logged into mysql as root,
      mysql> CREATE DATABASE \`zm\`;
-     mysql> GRANT ALL ON zm.* TO 'zmuser'@'localhost' IDENTIFIED BY 'topsecretpassword';
+     mysql> grant select,insert,alter,update,lock tables,delete on zm.* to 'zmuser'@localhost identified by 'zmpass';
+     mysql> flush privileges;
    Once you completed that you should execute the following:
-     cd /usr/share/zoneminder
-     mysql -u zmuser -p < db/zm_create.sql
+     mysql -p < /usr/share/zoneminder/db/zm_create.sql
 
-2. Set your database settings in /etc/zm.conf, including above topsecretpassword
+2. Set your database settings in /etc/zm.conf, including above zmpass
 
 3. Configure apache to use zoneminder, see /usr/share/doc/zoneminder*/10_zoneminder.conf
    for an example configuration snippet.
@@ -23,5 +23,5 @@
 
 6. Finally point your browser to http://your.webserver/zm
 
-If you are upgrading, you will need to run the zmupdate.pl script:
-   /usr/bin/zmupdate.pl --version=oldversionnumber [--user=zmuser --pass=topsecretpassword]
+If you are upgrading, you will need to run the zmupdate.pl script: 
+   /usr/bin/zmupdate.pl
diff --git a/www-misc/zoneminder/files/zoneminder-1.26.5-automagic.patch b/www-misc/zoneminder/files/zoneminder-1.26.5-automagic.patch
deleted file mode 100644
index 266bd649baa6..000000000000
--- a/www-misc/zoneminder/files/zoneminder-1.26.5-automagic.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 83e9d81..8619c8b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -171,6 +171,7 @@ else(PCRE_LIBRARIES)
- 	set(optlibsnotfound "${optlibsnotfound} PCRE")
- endif(PCRE_LIBRARIES)
- 
-+if(HAVE_GCRYPT)
- # gcrypt (using find_library and find_path)
- find_library(GCRYPT_LIBRARIES gcrypt)
- if(GCRYPT_LIBRARIES)
-@@ -187,7 +188,11 @@ if(GCRYPT_LIBRARIES)
- else(GCRYPT_LIBRARIES)
- 	set(optlibsnotfound "${optlibsnotfound} GCrypt")
- endif(GCRYPT_LIBRARIES)
-+else(HAVE_GCRYPT)
-+	set(optlibsnotfound "${optlibsnotfound} GCrypt")
-+endif(HAVE_GCRYPT)
- 
-+if(HAVE_GNUTLS)
- # gnutls (using find_library and find_path)
- find_library(GNUTLS_LIBRARIES gnutls)
- if(GNUTLS_LIBRARIES)
-@@ -205,6 +210,9 @@ if(GNUTLS_LIBRARIES)
- else(GNUTLS_LIBRARIES)
- 	set(optlibsnotfound "${optlibsnotfound} GnuTLS")
- endif(GNUTLS_LIBRARIES)
-+else(HAVE_GNUTLS)
-+	set(optlibsnotfound "${optlibsnotfound} GnuTLS")
-+endif(HAVE_GNUTLS)
- 
- # mysqlclient (using find_library and find_path)
- find_library(MYSQLCLIENT_LIBRARIES mysqlclient PATH_SUFFIXES mysql)
diff --git a/www-misc/zoneminder/files/zoneminder-1.28.1-mysql_include_path.patch b/www-misc/zoneminder/files/zoneminder-1.28.1-mysql_include_path.patch
deleted file mode 100644
index cb645528c051..000000000000
--- a/www-misc/zoneminder/files/zoneminder-1.28.1-mysql_include_path.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/CMakeLists.txt	2015-10-27 17:28:48.059203421 +0000
-+++ b/CMakeLists.txt	2015-10-27 17:30:11.951226715 +0000
-@@ -255,7 +255,16 @@
- if(MYSQLCLIENT_LIBRARIES)
- 	set(HAVE_LIBMYSQLCLIENT 1)
- 	list(APPEND ZM_BIN_LIBS "${MYSQLCLIENT_LIBRARIES}")
--	find_path(MYSQLCLIENT_INCLUDE_DIR mysql/mysql.h)
-+	find_file(MYSQL_CONFIG mysql_config)
-+	if(MYSQL_CONFIG)
-+		execute_process(COMMAND ${MYSQL_CONFIG}
-+			--variable=pkgincludedir OUTPUT_VARIABLE
-+			MYSQLCLIENT_INCLUDE_DIR)
-+		STRING(REGEX REPLACE "\n" "" MYSQLCLIENT_INCLUDE_DIR
-+			${MYSQLCLIENT_INCLUDE_DIR})
-+	else()
-+		find_path(MYSQLCLIENT_INCLUDE_DIR mysql/mysql.h)
-+	endif()
- 	if(MYSQLCLIENT_INCLUDE_DIR)
- 		include_directories("${MYSQLCLIENT_INCLUDE_DIR}")
- 		set(CMAKE_REQUIRED_INCLUDES "${MYSQLCLIENT_INCLUDE_DIR}")
diff --git a/www-misc/zoneminder/files/zoneminder-1.30.4-gcc7.patch b/www-misc/zoneminder/files/zoneminder-1.30.4-gcc7.patch
new file mode 100644
index 000000000000..b022fbe35e17
--- /dev/null
+++ b/www-misc/zoneminder/files/zoneminder-1.30.4-gcc7.patch
@@ -0,0 +1,28 @@
+From 97380f009b0e6a8bb6ee4ecbf0436045342cdf1e Mon Sep 17 00:00:00 2001
+From: abishai <abi@abinet.ru>
+Date: Tue, 31 Jan 2017 10:42:57 +0300
+Subject: [PATCH] implement platform-agnostic comparison without abs()
+
+---
+ src/zm_image.cpp | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/src/zm_image.cpp b/src/zm_image.cpp
+index 9c8c12fda..80a821376 100644
+--- a/src/zm_image.cpp
++++ b/src/zm_image.cpp
+@@ -1658,11 +1658,9 @@ Image *Image::Highlight( unsigned int n_images, Image *images[], const Rgb thres
+       {
+         uint8_t *psrc = images[j]->buffer+c;
+ 
+-#ifndef SOLARIS
+-        if ( (unsigned)abs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) )
+-#else
+-        if ( (unsigned)std::abs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) )
+-#endif
++	    unsigned int diff = ((*psrc)-RGB_VAL(ref_colour,c)) > 0 ? (*psrc)-RGB_VAL(ref_colour,c) : RGB_VAL(ref_colour,c) - (*psrc);
++
++	    if (diff >= RGB_VAL(threshold,c))
+         {
+           count++;
+         }
diff --git a/www-misc/zoneminder/files/zoneminder-1.30.4-glibc226.patch b/www-misc/zoneminder/files/zoneminder-1.30.4-glibc226.patch
new file mode 100644
index 000000000000..34afe0cb3b67
--- /dev/null
+++ b/www-misc/zoneminder/files/zoneminder-1.30.4-glibc226.patch
@@ -0,0 +1,24 @@
+From 417421b1d869d1b71c8ec1a1e3b082fcede6ce58 Mon Sep 17 00:00:00 2001
+From: Andrew Bauer <zonexpertconsulting@outlook.com>
+Date: Tue, 13 Jun 2017 14:39:12 -0500
+Subject: [PATCH] move include <sys/uio.h> outside defined(BSD) block (#1919)
+
+---
+ src/zm_comms.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/zm_comms.h b/src/zm_comms.h
+index cf108c1ea..ae5fd5b08 100644
+--- a/src/zm_comms.h
++++ b/src/zm_comms.h
+@@ -30,9 +30,9 @@
+ 
+ #include <set>
+ #include <vector>
++#include <sys/uio.h>
+ 
+ #if defined(BSD)
+-#include <sys/uio.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #endif
diff --git a/www-misc/zoneminder/files/zoneminder-1.30.4-path_zms.patch b/www-misc/zoneminder/files/zoneminder-1.30.4-path_zms.patch
new file mode 100644
index 000000000000..54772a147693
--- /dev/null
+++ b/www-misc/zoneminder/files/zoneminder-1.30.4-path_zms.patch
@@ -0,0 +1,16 @@
+duplicate the work of utils/zmeditconfigdata.sh
+https://github.com/ZoneMinder/ZoneMinder/commit/5a59a0375dd19f8e5af9b2acadec9f2bb16ee56c
+
+diff -ruN ZoneMinder-1.30.4.orig/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in ZoneMinder-1.30.4/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+--- ZoneMinder-1.30.4.orig/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in   2017-08-30 14:55:31.894727925 +0100
++++ ZoneMinder-1.30.4/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in        2017-08-30 14:57:05.050731752 +0100
+@@ -507,7 +507,7 @@
+   },
+   {
+     name        => "ZM_PATH_ZMS",
+-    default     => "/cgi-bin/nph-zms",
++    default     => "/zm/cgi-bin/nph-zms",
+     description => "Web path to zms streaming server",
+     help        => qqq("
+       The ZoneMinder streaming server is required to send streamed
+
diff --git a/www-misc/zoneminder/zoneminder-1.30.0.ebuild b/www-misc/zoneminder/zoneminder-1.30.0.ebuild
deleted file mode 100644
index 2698565ed30b..000000000000
--- a/www-misc/zoneminder/zoneminder-1.30.0.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# 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
-
-EAPI=6
-
-inherit versionator perl-functions readme.gentoo-r1 cmake-utils depend.apache flag-o-matic systemd
-
-MY_PN="ZoneMinder"
-
-MY_CRUD_VERSION="3.0.10"
-
-DESCRIPTION="Capture, analyse, record and monitor any cameras attached to your system"
-HOMEPAGE="http://www.zoneminder.com/"
-SRC_URI="
-	https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/FriendsOfCake/crud/archive/v${MY_CRUD_VERSION}.tar.gz -> Crud-${MY_CRUD_VERSION}.tar.gz
-"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64"
-IUSE="curl ffmpeg gcrypt gnutls +mmap +ssl libressl vlc"
-SLOT="0"
-
-REQUIRED_USE="
-	|| ( ssl gnutls )
-"
-
-DEPEND="
-	app-eselect/eselect-php[apache2]
-	dev-lang/perl:=
-	dev-lang/php:*[apache2,cgi,curl,gd,inifile,pdo,mysql,mysqli,sockets]
-	dev-libs/libpcre
-	dev-perl/Archive-Zip
-	dev-perl/Class-Std-Fast
-	dev-perl/Data-Dump
-	dev-perl/Date-Manip
-	dev-perl/Data-UUID
-	dev-perl/DBD-mysql
-	dev-perl/DBI
-	dev-perl/IO-Socket-Multicast
-	dev-perl/SOAP-WSDL
-	dev-perl/Sys-CPU
-	dev-perl/Sys-MemInfo
-	dev-perl/URI-Encode
-	dev-perl/libwww-perl
-	sys-auth/polkit
-	sys-libs/zlib
-	virtual/ffmpeg
-	virtual/httpd-php:*
-	virtual/jpeg:0
-	virtual/mysql
-	virtual/perl-ExtUtils-MakeMaker
-	virtual/perl-Getopt-Long
-	virtual/perl-Sys-Syslog
-	virtual/perl-Time-HiRes
-	www-servers/apache
-	curl? ( net-misc/curl )
-	gcrypt? ( dev-libs/libgcrypt:0= )
-	gnutls? ( net-libs/gnutls )
-	mmap? ( dev-perl/Sys-Mmap )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	vlc? ( media-video/vlc[live] )
-"
-RDEPEND="${DEPEND}"
-
-# we cannot use need_httpd_cgi here, since we need to setup permissions for the
-# webserver in global scope (/etc/zm.conf etc), so we hardcode apache here.
-need_apache
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.26.5"-automagic.patch
-	"${FILESDIR}/${PN}-1.28.1"-mysql_include_path.patch
-)
-
-MY_ZM_WEBDIR=/usr/share/zoneminder/www
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	rmdir "${S}/web/api/app/Plugin/Crud" || die
-	mv "${WORKDIR}/crud-${MY_CRUD_VERSION}" "${S}/web/api/app/Plugin/Crud" || die
-}
-
-src_configure() {
-	append-cxxflags -D__STDC_CONSTANT_MACROS
-	perl_set_version
-
-	mycmakeargs=(
-		-DZM_PERL_SUBPREFIX=${VENDOR_LIB#/usr}
-		-DZM_TMPDIR=/var/tmp/zm
-		-DZM_SOCKDIR=/var/run/zm
-		-DZM_WEB_USER=apache
-		-DZM_WEB_GROUP=apache
-		-DZM_WEBDIR=${MY_ZM_WEBDIR}
-		-DZM_NO_MMAP="$(usex mmap OFF ON)"
-		-DZM_NO_X10=OFF
-		-DZM_NO_FFMPEG="$(usex ffmpeg OFF ON)"
-		-DZM_NO_CURL="$(usex curl OFF ON)"
-		-DZM_NO_LIBVLC="$(usex vlc OFF ON)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL="$(usex ssl OFF ON)"
-		-DHAVE_GNUTLS="$(usex gnutls ON OFF)"
-		-DHAVE_GCRYPT="$(usex gcrypt ON OFF)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# the log directory
-	keepdir /var/log/zm
-	fowners apache:apache /var/log/zm
-
-	# the logrotate script
-	insinto /etc/logrotate.d
-	newins distros/ubuntu1204/zoneminder.logrotate zoneminder
-
-	# now we duplicate the work of zmlinkcontent.sh
-	keepdir /var/lib/zoneminder /var/lib/zoneminder/images /var/lib/zoneminder/events /var/lib/zoneminder/api_tmp
-	fperms -R 0775 /var/lib/zoneminder
-	fowners -R apache:apache /var/lib/zoneminder
-	dosym /var/lib/zoneminder/images ${MY_ZM_WEBDIR}/images
-	dosym /var/lib/zoneminder/events ${MY_ZM_WEBDIR}/events
-	dosym /var/lib/zoneminder/api_tmp ${MY_ZM_WEBDIR}/api/app/tmp
-
-	# bug 523058
-	keepdir ${MY_ZM_WEBDIR}/temp
-	fowners -R apache:apache ${MY_ZM_WEBDIR}/temp
-
-	# the configuration file
-	fperms 0640 /etc/zm.conf
-	fowners root:apache /etc/zm.conf
-
-	# init scripts etc
-	newinitd "${FILESDIR}"/init.d zoneminder
-	newconfd "${FILESDIR}"/conf.d zoneminder
-
-	# systemd unit file
-	systemd_dounit "${FILESDIR}"/zoneminder.service
-
-	cp "${FILESDIR}"/10_zoneminder.conf "${T}"/10_zoneminder.conf
-	sed -i "${T}"/10_zoneminder.conf -e "s:%ZM_WEBDIR%:${MY_ZM_WEBDIR}:g"
-
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README.md TODO "${T}"/10_zoneminder.conf
-
-	perl_delete_packlist
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least ${PV} ${v}; then
-			elog "You have upgraded zoneminder and may have to upgrade your database now using the 'zmupdate.pl' script."
-		fi
-	done
-}
diff --git a/www-misc/zoneminder/zoneminder-1.30.2.ebuild b/www-misc/zoneminder/zoneminder-1.30.2.ebuild
deleted file mode 100644
index 74bea7e3cbfd..000000000000
--- a/www-misc/zoneminder/zoneminder-1.30.2.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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
-
-EAPI=6
-
-inherit versionator perl-functions readme.gentoo-r1 cmake-utils depend.apache flag-o-matic systemd
-
-MY_PN="ZoneMinder"
-
-MY_CRUD_VERSION="3.1.0"
-
-DESCRIPTION="Capture, analyse, record and monitor any cameras attached to your system"
-HOMEPAGE="http://www.zoneminder.com/"
-SRC_URI="
-	https://github.com/${MY_PN}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/FriendsOfCake/crud/archive/v${MY_CRUD_VERSION}.tar.gz -> Crud-${MY_CRUD_VERSION}.tar.gz
-"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64"
-IUSE="curl ffmpeg gcrypt gnutls +mmap +ssl libressl vlc"
-SLOT="0"
-
-REQUIRED_USE="
-	|| ( ssl gnutls )
-"
-
-DEPEND="
-	app-eselect/eselect-php[apache2]
-	dev-lang/perl:=
-	dev-lang/php:*[apache2,cgi,curl,gd,inifile,pdo,mysql,mysqli,sockets]
-	dev-libs/libpcre
-	dev-perl/Archive-Zip
-	dev-perl/Class-Std-Fast
-	dev-perl/Data-Dump
-	dev-perl/Date-Manip
-	dev-perl/Data-UUID
-	dev-perl/DBD-mysql
-	dev-perl/DBI
-	dev-perl/IO-Socket-Multicast
-	dev-perl/SOAP-WSDL
-	dev-perl/Sys-CPU
-	dev-perl/Sys-MemInfo
-	dev-perl/URI-Encode
-	dev-perl/libwww-perl
-	sys-auth/polkit
-	sys-libs/zlib
-	virtual/ffmpeg
-	virtual/httpd-php:*
-	virtual/jpeg:0
-	virtual/mysql
-	virtual/perl-ExtUtils-MakeMaker
-	virtual/perl-Getopt-Long
-	virtual/perl-Sys-Syslog
-	virtual/perl-Time-HiRes
-	www-servers/apache
-	curl? ( net-misc/curl )
-	gcrypt? ( dev-libs/libgcrypt:0= )
-	gnutls? ( net-libs/gnutls )
-	mmap? ( dev-perl/Sys-Mmap )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	vlc? ( media-video/vlc[live] )
-"
-RDEPEND="${DEPEND}"
-
-# we cannot use need_httpd_cgi here, since we need to setup permissions for the
-# webserver in global scope (/etc/zm.conf etc), so we hardcode apache here.
-need_apache
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.26.5"-automagic.patch
-	"${FILESDIR}/${PN}-1.28.1"-mysql_include_path.patch
-)
-
-MY_ZM_WEBDIR=/usr/share/zoneminder/www
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	rmdir "${S}/web/api/app/Plugin/Crud" || die
-	mv "${WORKDIR}/crud-${MY_CRUD_VERSION}" "${S}/web/api/app/Plugin/Crud" || die
-}
-
-src_configure() {
-	append-cxxflags -D__STDC_CONSTANT_MACROS
-	perl_set_version
-
-	mycmakeargs=(
-		-DZM_PERL_SUBPREFIX=${VENDOR_LIB#/usr}
-		-DZM_TMPDIR=/var/tmp/zm
-		-DZM_SOCKDIR=/var/run/zm
-		-DZM_WEB_USER=apache
-		-DZM_WEB_GROUP=apache
-		-DZM_WEBDIR=${MY_ZM_WEBDIR}
-		-DZM_NO_MMAP="$(usex mmap OFF ON)"
-		-DZM_NO_X10=OFF
-		-DZM_NO_FFMPEG="$(usex ffmpeg OFF ON)"
-		-DZM_NO_CURL="$(usex curl OFF ON)"
-		-DZM_NO_LIBVLC="$(usex vlc OFF ON)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL="$(usex ssl OFF ON)"
-		-DHAVE_GNUTLS="$(usex gnutls ON OFF)"
-		-DHAVE_GCRYPT="$(usex gcrypt ON OFF)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# the log directory
-	keepdir /var/log/zm
-	fowners apache:apache /var/log/zm
-
-	# the logrotate script
-	insinto /etc/logrotate.d
-	newins distros/ubuntu1204/zoneminder.logrotate zoneminder
-
-	# now we duplicate the work of zmlinkcontent.sh
-	keepdir /var/lib/zoneminder /var/lib/zoneminder/images /var/lib/zoneminder/events /var/lib/zoneminder/api_tmp
-	fperms -R 0775 /var/lib/zoneminder
-	fowners -R apache:apache /var/lib/zoneminder
-	dosym /var/lib/zoneminder/images ${MY_ZM_WEBDIR}/images
-	dosym /var/lib/zoneminder/events ${MY_ZM_WEBDIR}/events
-	dosym /var/lib/zoneminder/api_tmp ${MY_ZM_WEBDIR}/api/app/tmp
-
-	# bug 523058
-	keepdir ${MY_ZM_WEBDIR}/temp
-	fowners -R apache:apache ${MY_ZM_WEBDIR}/temp
-
-	# the configuration file
-	fperms 0640 /etc/zm.conf
-	fowners root:apache /etc/zm.conf
-
-	# init scripts etc
-	newinitd "${FILESDIR}"/init.d zoneminder
-	newconfd "${FILESDIR}"/conf.d zoneminder
-
-	# systemd unit file
-	systemd_dounit "${FILESDIR}"/zoneminder.service
-
-	cp "${FILESDIR}"/10_zoneminder.conf "${T}"/10_zoneminder.conf
-	sed -i "${T}"/10_zoneminder.conf -e "s:%ZM_WEBDIR%:${MY_ZM_WEBDIR}:g"
-
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README.md TODO "${T}"/10_zoneminder.conf
-
-	perl_delete_packlist
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least ${PV} ${v}; then
-			elog "You have upgraded zoneminder and may have to upgrade your database now using the 'zmupdate.pl' script."
-		fi
-	done
-}
diff --git a/www-misc/zoneminder/zoneminder-1.30.2-r1.ebuild b/www-misc/zoneminder/zoneminder-1.30.4.ebuild
index d37f30cc0bf8..12ed2a18ac9e 100644
--- a/www-misc/zoneminder/zoneminder-1.30.2-r1.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.30.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # TO DO:
@@ -27,7 +27,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2"
-KEYWORDS=""
+KEYWORDS="~amd64"
 IUSE="curl ffmpeg gcrypt gnutls +mmap +ssl libressl vlc"
 SLOT="0"
 
@@ -53,6 +53,7 @@ DEPEND="
 	dev-perl/Sys-MemInfo
 	dev-perl/URI-Encode
 	dev-perl/libwww-perl
+	dev-php/pecl-apcu:*
 	sys-auth/polkit
 	sys-libs/zlib
 	virtual/ffmpeg
@@ -80,12 +81,11 @@ RDEPEND="${DEPEND}"
 # webserver in global scope (/etc/zm.conf etc), so we hardcode apache here.
 need_apache
 
-S=${WORKDIR}/${MY_PN}-${PV}
-
 PATCHES=(
-	"${FILESDIR}/${PN}-1.26.5"-automagic.patch
-	"${FILESDIR}/${PN}-1.28.1"-mysql_include_path.patch
 	"${FILESDIR}/${PN}-1.30.2"-diskspace.patch
+	"${FILESDIR}/${PN}-1.30.4"-path_zms.patch
+	"${FILESDIR}/${PN}-1.30.4"-glibc226.patch
+	"${FILESDIR}/${PN}-1.30.4"-gcc7.patch
 )
 
 MY_ZM_WEBDIR=/usr/share/zoneminder/www
@@ -119,6 +119,7 @@ src_configure() {
 	)
 
 	cmake-utils_src_configure
+
 }
 
 src_install() {
@@ -155,7 +156,7 @@ src_install() {
 	# systemd unit file
 	systemd_dounit "${FILESDIR}"/zoneminder.service
 
-	cp "${FILESDIR}"/10_zoneminder.conf-r1 "${T}"/10_zoneminder.conf || die
+	cp "${FILESDIR}"/10_zoneminder.conf "${T}"/10_zoneminder.conf || die
 	sed -i "${T}"/10_zoneminder.conf -e "s:%ZM_WEBDIR%:${MY_ZM_WEBDIR}:g" || die
 
 	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README.md TODO "${T}"/10_zoneminder.conf