gentoo resync : 14.05.2020

25 files changed, 154 insertions, 437 deletions

diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 58441e00944f..1bf7eb3261d7 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/awstats/Manifest b/www-misc/awstats/Manifest
index a8048b3d381e..95520644a7fa 100644
--- a/www-misc/awstats/Manifest
+++ b/www-misc/awstats/Manifest
@@ -1,9 +1,9 @@
 AUX awstats-7.1-gentoo.diff 795 BLAKE2B c3c02a9086dc8067cc739ed4b180865aa1c68d5f6786b9a1d850a3c0314bdcb8abb1e3841229ae90cef3e1f6ba24a8262895c44d0b92faffb3f4c4100021e065 SHA512 09e46f32b31389cd1d98465c8b2578c37d5d4d601baf58eb8ed6811875743c3b19819d6820977a9aaace8d8f8c97be8f798fcbaa10f7ed0cb950a2f7f843754c
+AUX awstats-7.8-mime.patch 479 BLAKE2B 320b201daae7613e532123946f073107bf6096d924caa227463817308bcb6824788d683010031dc9ac5ffaaf65d4c169d49f43dd4d9d30d14697a15975835e85 SHA512 38ff55c99fa01ac52dac492e4153bcc2851e79ce3e1d1319c34a7695e66de9f4fff74739ce06e545fcc8ea3902a0325ff370471d04e136b92a6bef1dbba3095d
 AUX awstats-perl-5.22.patch 1981 BLAKE2B 7198b110b2688a989aeecd8ddeb364ab485e615ed045b9fa836f5fd050e344224564300f089cc6f53624e7f36284c0cfdf92930c3e0a82cc52c2ecfce348699b SHA512 9b0b4768583e40a55635b5c81c608798ee3036779359747d91cf12d96757d62b79fc8abbe43dbf322f9958616fafcd99d122fcd5c8234f2e6b871173da769800
-DIST awstats-7.1_p20121017.tar.gz 1258135 BLAKE2B 0a43154d044346acdf4e71e96b05f9b8914d0df8a3812c6a20edb33a0b9d8b6f0aadc065466f1ee23c0469e41eda9622c380bd35c579b887a6547fd6749e9bd4 SHA512 171ff3118955c8b73c968a23983885d967632d2c6e95a45f71e5f6fea74afe34d869c9cc901e2e739419068babc96385d7d7df1e8ca10074be7388fbe5c51f53
 DIST awstats-7.4.tar.gz 2936102 BLAKE2B 2bc7f9619e4d6b13d3909869d642c347d6b9cddbbb3b49d58494ce108c8fe25d59b27198d5a42f8b81c06fdaf1a2e135c82883ec8604e53c6c5adbac07223b66 SHA512 5bce97c71aabeab35e4ff5e5168531e4955d7c1474322c7b4a47d1d06e06ebd0e74d1def73826498e6253f24aeca99309777617b7a914685c927bb6e1c020e1a
-DIST awstats-7.5.tar.gz 2936644 BLAKE2B 666e4d50e8011315351e1aff538ec56507c5bc8e4fb4890c29aee1f73985b8466f346982a6022ae1689e30d587b21ee0f2038f46783e4f25454dfa6e5fe39771 SHA512 d69a66b5ef94d8a7378ece0453a3617f71ad030d81c45cff926fae1319eacdcdcbe2e68513153cd7444d77cbb950827964b0157ce74c04be76781c071f016a35
-EBUILD awstats-7.1_p20121017.ebuild 3328 BLAKE2B 93261899da03ea1af0f9d66ed55319bbeb40603b6e4865faca8bff641ba4c59a9e9cd5da43e3935ebc1d7aec26ed0e58a98641d2009481aa1737408f377be694 SHA512 61e61c366423e23a3bf93082dd96dd8090b055d9656a68de4fcb01526c1d50c78184b525dda4beb17d29c635e00ea4446c3c702ddbbcfa57217000a36b120d44
-EBUILD awstats-7.4.ebuild 3371 BLAKE2B 8f63483d519115fd14848035cc031cea90e41b8b2ab860b4a248b9bc5f8e20677c6bc63c24aa5e4809c47c745a6caa9e89046ec63433ac1ae8f81afcdecc9c53 SHA512 ceec39ac5af01bd18d232b38a0074366199d8b815c4543c03b4baebb25f6c707227d6688d0a4da6c3967676d7fe6eb550f79d5621f75eba30e021e40d30b5c7f
-EBUILD awstats-7.5.ebuild 3361 BLAKE2B bf1461352c0ca0a3bad65c3783de83e37c0246ae07ad3ae93ca17af6863e0e37f445a73d242bcd45c158662758a05db3841d816b5dce67963f3caee5f9b766af SHA512 3831b265c5571c538e572840c4a8486840bb6ccb336737e33b6cfa69a96e57be3be5a87000237fa66f4ebb6ef084307be6220f995499ebec5d62cf9e3bc46a9b
+DIST awstats-7.8.tar.gz 2938739 BLAKE2B 57c692aa935a4191d1cc1f3b34dd1a70a40eef880a3672dcd17472fe6bf447dd7b85a7752d94666d6f1a8dbdcc2eac4959a7f6a83a8bd538d0909ffcaedfd385 SHA512 2fd78e8c7eefb5c9ed39d8ee830ee8ad00b622b812ae40a84cb01c4fa653b9ab7822d1592313d7a8c4b8503d04dcba48b1775d33a629f1ac1278d2300eef931d
+EBUILD awstats-7.4.ebuild 3369 BLAKE2B 6866cf202650d148525c9baccf5a0a5249dfdc51bb235f4bb44f9cb67d133be9a385b61fa43d4e3a6dbfd72fd9b94414b59e5514324acff109411ff28ddeba42 SHA512 7d732c580d6facadef850bc82ca5eaa70b44bbfcfba2b9717d325d81a154f44af15a0dc2c850d1d08807d854eae4fa14da2e163271a67d2d3d6da32de2f66b2f
+EBUILD awstats-7.8-r1.ebuild 3015 BLAKE2B b7f76d10a96968b28aa8a560183d413699405eeba6bb732478e25f1af448bc0e8cba0ab6c207981b282cad1b54efb7c0292d308dac84bb6a1b9967161c6ed1d4 SHA512 4c68225a8f766e6f91053ef53b9065dcb2424a9739f93ecb256a990326472a3cebdbb2bbb683136bb47672540da7faf5f13b4fe638ca97108534516d5dd1b87d
+EBUILD awstats-7.8.ebuild 2976 BLAKE2B 29f94b688fba371e91cff84b95e50821b8fcb8d9f8b59bb00a9bb8ef720db5a698a12762ca6200caf5de26141e5a2f1052c899a3085028f34ac85464b19e5089 SHA512 cb1a8c3d0136a3e939fcf7ef6bdea0f791b135d8075fb3df82a72dfb540f4846a101b508915ac46b6534173ab208616538172a8e3b05f147aac8243c0453202e
 MISC metadata.xml 254 BLAKE2B 53495a638333fedaee2d8d838a705aaa610797eae56298aa35ad3c965af321b3d8e9b12643d1c3564f4232ca4a7ec44182ee7b35aada373750beee6b1c2a8a12 SHA512 b4674c7f9d0dc24c25846b3fe716415b648a61099b8d2f7eb099cf14f9a8f4670af4638349f953fe1b32b9d357911e533b72eaf4bbf14f54827512fd9bbb0ee8
diff --git a/www-misc/awstats/awstats-7.4.ebuild b/www-misc/awstats/awstats-7.4.ebuild
index bac4b390c7bb..30a6da43390e 100644
--- a/www-misc/awstats/awstats-7.4.ebuild
+++ b/www-misc/awstats/awstats-7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -23,7 +23,7 @@ fi
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
-KEYWORDS="~alpha amd64 hppa ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ~sparc x86"
 IUSE="geoip ipv6"
 
 SLOT="0"
diff --git a/www-misc/awstats/awstats-7.5.ebuild b/www-misc/awstats/awstats-7.8-r1.ebuild
index b53c2ad5ba11..66748aa8bf71 100644
--- a/www-misc/awstats/awstats-7.5.ebuild
+++ b/www-misc/awstats/awstats-7.8-r1.ebuild
@@ -1,42 +1,39 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit eutils
 
 MY_P=${PN}-${PV%_p*}
 
 DESCRIPTION="AWStats is short for Advanced Web Statistics"
-HOMEPAGE="http://www.awstats.org/"
-
-if [ ${MY_P} != ${P} ]; then
-	SRC_URI="https://dev.gentoo.org/~flameeyes/awstats/${P}.tar.gz"
-	# The following SRC_URI is useful only when fetching for the first time
-	# after bump; upstream does not bump the version when they change it, so
-	# we rename it to include the date and upload to our mirrors instead.
-	#SRC_URI="http://www.awstats.org/files/${MY_P}.tar.gz -> ${P}.tar.gz"
-else
-	SRC_URI="http://www.awstats.org/files/${P}.tar.gz"
-fi
-
+HOMEPAGE="https://www.awstats.org/"
+SRC_URI="https://www.awstats.org/files/${P}.tar.gz"
 S=${WORKDIR}/${MY_P}
-
 LICENSE="GPL-3"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE="geoip ipv6"
 
 SLOT="0"
 
-RDEPEND=">=dev-lang/perl-5.6.1
-	virtual/perl-Time-Local
+RDEPEND="
+	>=dev-lang/perl-5.6.1
 	dev-perl/URI
-	geoip? ( dev-perl/Geo-IP )
-	ipv6? ( dev-perl/Net-IP dev-perl/Net-DNS )"
+	virtual/perl-Time-Local
+	geoip? (
+		dev-perl/Geo-IP
+	)
+	ipv6? (
+		dev-perl/Net-DNS
+		dev-perl/Net-IP
+	)
+"
 DEPEND=""
 
 src_prepare() {
 	eapply "${FILESDIR}"/${PN}-7.1-gentoo.diff
+	eapply "${FILESDIR}"/${P}-mime.patch
 
 	# change default installation directory
 	find . -type f -exec sed \
@@ -103,7 +100,7 @@ src_install() {
 pkg_postinst() {
 	elog "The AWStats-Manual is available either inside"
 	elog "the /usr/share/doc/${PF} - folder, or at"
-	elog "http://awstats.sourceforge.net/docs/index.html ."
+	elog "https://awstats.sourceforge.net/docs/index.html ."
 	elog
 	elog "Copy the /etc/awstats/awstats.model.conf to"
 	elog "/etc/awstats/awstats.<yourdomain>.conf and edit it."
diff --git a/www-misc/awstats/awstats-7.1_p20121017.ebuild b/www-misc/awstats/awstats-7.8.ebuild
index 2257b4cdf060..4946a4565b30 100644
--- a/www-misc/awstats/awstats-7.1_p20121017.ebuild
+++ b/www-misc/awstats/awstats-7.8.ebuild
@@ -1,42 +1,38 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit eutils
 
 MY_P=${PN}-${PV%_p*}
 
 DESCRIPTION="AWStats is short for Advanced Web Statistics"
-HOMEPAGE="http://www.awstats.org/"
-
-if [ ${MY_P} != ${P} ]; then
-	SRC_URI="https://dev.gentoo.org/~flameeyes/awstats/${P}.tar.gz"
-	# The following SRC_URI is useful only when fetching for the first time
-	# after bump; upstream does not bump the version when they change it, so
-	# we rename it to include the date and upload to our mirrors instead.
-	#SRC_URI="http://www.awstats.org/files/${MY_P}.tar.gz -> ${P}.tar.gz"
-else
-	SRC_URI="http://www.awstats.org/files/${P}.tar.gz"
-fi
-
+HOMEPAGE="https://www.awstats.org/"
+SRC_URI="https://www.awstats.org/files/${P}.tar.gz"
 S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 hppa ppc ~sparc x86"
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~hppa ppc ~sparc ~x86"
 IUSE="geoip ipv6"
 
 SLOT="0"
 
-RDEPEND=">=dev-lang/perl-5.6.1
-	virtual/perl-Time-Local
+RDEPEND="
+	>=dev-lang/perl-5.6.1
 	dev-perl/URI
-	geoip? ( dev-perl/Geo-IP )
-	ipv6? ( dev-perl/Net-IP dev-perl/Net-DNS )"
+	virtual/perl-Time-Local
+	geoip? (
+		dev-perl/Geo-IP
+	)
+	ipv6? (
+		dev-perl/Net-DNS
+		dev-perl/Net-IP
+	)
+"
 DEPEND=""
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-7.1-gentoo.diff
+	eapply "${FILESDIR}"/${PN}-7.1-gentoo.diff
 
 	# change default installation directory
 	find . -type f -exec sed \
@@ -64,11 +60,16 @@ src_prepare() {
 	fi
 
 	find "${S}" '(' -type f -not -name '*.pl' ')' -exec chmod -x {} + || die
+
+	eapply_user
 }
 
+HTML_DOCS="docs/"
+DOCS="README.md"
+
 src_install() {
-	dohtml -r docs/*
-	dodoc README.TXT
+	einstalldocs
+
 	newdoc wwwroot/cgi-bin/plugins/example/example.pm example_plugin.pm
 	dodoc -r tools/xslt
 
@@ -98,7 +99,7 @@ src_install() {
 pkg_postinst() {
 	elog "The AWStats-Manual is available either inside"
 	elog "the /usr/share/doc/${PF} - folder, or at"
-	elog "http://awstats.sourceforge.net/docs/index.html ."
+	elog "https://awstats.sourceforge.net/docs/index.html ."
 	elog
 	elog "Copy the /etc/awstats/awstats.model.conf to"
 	elog "/etc/awstats/awstats.<yourdomain>.conf and edit it."
diff --git a/www-misc/awstats/files/awstats-7.8-mime.patch b/www-misc/awstats/files/awstats-7.8-mime.patch
new file mode 100644
index 000000000000..a8d7f6d122a5
--- /dev/null
+++ b/www-misc/awstats/files/awstats-7.8-mime.patch
@@ -0,0 +1,12 @@
+diff -ur awstats-7.8-old/wwwroot/cgi-bin/lib/mime.pm awstats-7.8/wwwroot/cgi-bin/lib/mime.pm
+--- awstats-7.8-old/wwwroot/cgi-bin/lib/mime.pm	2020-04-16 09:18:35.000000000 +0000
++++ awstats-7.8/wwwroot/cgi-bin/lib/mime.pm	2020-05-13 09:38:30.654537576 +0000
+@@ -56,7 +56,7 @@
+ 'diskimage', 'Disc and media file extensions',
+ 'vm',        'Virtual Machine image',
+ 'torrent',   'BitTorrent File',
+-'gis',       'GIS File'
++'gis',       'GIS File',
+ 'ebook',     'Ebook File'
+ );
+ 
diff --git a/www-misc/monitorix/Manifest b/www-misc/monitorix/Manifest
index dd5d09082613..78a49f08bbba 100644
--- a/www-misc/monitorix/Manifest
+++ b/www-misc/monitorix/Manifest
@@ -1,4 +1,4 @@
-AUX monitorix 794 BLAKE2B 59ff64344bf951cf38448acb260f8a4d30fd1ea0fbd810a8f79b3a1740cff2aeb7cb2647337ff101a5cf1ddfb3ffd44ee739d0f89bdef3175c02afb687616309 SHA512 02b1e9fef7991c226decca8fdb5a5ca3e3960e7530d60ed770ec207a4f199506edc3a20d0608de3bcfdc1c25b0027900efa5b3d1be1c89b8bb8680a79ecd4013
+AUX monitorix 794 BLAKE2B f0e4eb70ff867711b749fbdda5150ef0733f9622fceaf8499600bcae15bea3e6a987d7c5635987e0913a1bd28adc6be5e5273438c59ee434a80e2cb72d8e6bd1 SHA512 92f16de3398673046cb9aa27f70923f35d6f61a5a861bed37a61650371ad714aa6ad2be2eb9f770e4cb734db109a222182ba22eb4a6f9c5b228a8b96c1ef893c
 DIST monitorix-3.11.0.tar.gz 318741 BLAKE2B af190e716acea9dfa56ebf3976e387abc19d0254fbebf6b6b18deff98b989266bff7e7c59e57832ad8b29dff8abb220e19da079c004ec185b63845cf70fb2727 SHA512 81832ef569416cc2e587beff8dbd485a6d361c0b5f11611522bde58c06d3156888e8c7b49cb3205adafbf737cd2d2b22e6041cd8b94e6d8c78cb5a4c3b1587de
-EBUILD monitorix-3.11.0.ebuild 2847 BLAKE2B 0936d04f6338ba8e2738976cad172f3a7718b17c6524d7356b9490492e240c2b758e2f94fe745f8819e67747f6a204bfe83be9af951909ebc0b9078cdf373634 SHA512 b6070052767673ce4e018a3cfeca0c45a944d103d18c4214de29a8e197a22e26b116de33131d0dc24490cdffa5726013e27b271d795804fe904f48d4d4d7d00e
-MISC metadata.xml 529 BLAKE2B 9b1a98822a897286b468e359ad25aa357feed9f58b5214e4337c860a736fedf4b90d7f412fd7af998aa4c9c11406690c53a52c0d750af165a21de1c775ecdaa0 SHA512 cff03dcb6ab552c01a86f9ae29197f61cf6f5193053714b865398464ec3177a8d64041b30f6563c95d19c3a5a2102ec92687b24b20ea648d66cefa05ba01cc10
+EBUILD monitorix-3.11.0.ebuild 2812 BLAKE2B 27b575b23cf890858fb9e96d960efdb7fcff2a3fe8aebff42c3f6a80b897499fc5b40ad2f3b5fedd8f43b1f62b93ad0075c892ac41786da75562e862db023df9 SHA512 e30226d4b1e32245e40c02995ee0890d62fd03d4dc958cdeae7837c2fee09c82a1bd1df49d5e7620aa451bdd0d40e669eaa70503c814ad7c7ad31d857026e857
+MISC metadata.xml 456 BLAKE2B 8c25de0cdb102ae91def87ffd8722597b787de59402f14a1620649e38272d13ccba6fa1d97df4c587b0d145fef446e7b52b3200d176e30cb632c2702ef104c9e SHA512 1c6934a7ffa1f5cb38336a79dc886cbb0b193668316c4fd246dbee9a9dd071f2c30147163d0ebb97d7f4b9d52b9f048421a1babe85ba5ba7499ecd83f2f56b3c
diff --git a/www-misc/monitorix/files/monitorix b/www-misc/monitorix/files/monitorix
index 389119e2e552..6d2a00cd766e 100755..100644
--- a/www-misc/monitorix/files/monitorix
+++ b/www-misc/monitorix/files/monitorix
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 name="Monitorix"
diff --git a/www-misc/monitorix/metadata.xml b/www-misc/monitorix/metadata.xml
index b4fd693643c7..ef52832b4f06 100644
--- a/www-misc/monitorix/metadata.xml
+++ b/www-misc/monitorix/metadata.xml
@@ -9,7 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
-	<longdescription>A lightweight system monitoring tool</longdescription>
 	<upstream>
 		<remote-id type="github">mikaku/Monitorix</remote-id>
 	</upstream>
diff --git a/www-misc/monitorix/monitorix-3.11.0.ebuild b/www-misc/monitorix/monitorix-3.11.0.ebuild
index 601b94df62ba..56fc67975677 100644
--- a/www-misc/monitorix/monitorix-3.11.0.ebuild
+++ b/www-misc/monitorix/monitorix-3.11.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit systemd user
+inherit systemd
 
 DESCRIPTION="A lightweight system monitoring tool"
 HOMEPAGE="https://www.monitorix.org/"
@@ -14,7 +14,10 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="dev-perl/Config-General
+RDEPEND="
+	acct-user/monitorix
+	acct-group/monitorix
+	dev-perl/Config-General
 	dev-perl/DBI
 	dev-perl/HTTP-Server-Simple
 	dev-perl/IO-Socket-SSL
@@ -24,11 +27,6 @@ RDEPEND="dev-perl/Config-General
 	net-analyzer/rrdtool[graph,perl]
 	dev-perl/CGI"
 
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
 src_prepare() {
 	# Put better Gentoo defaults in the configuration file.
 	sed -e "s|\(base_dir.*\)/usr/share/${PN}|\1/usr/share/${PN}/htdocs|" \
@@ -45,7 +43,7 @@ src_compile() { :; }
 src_install() {
 	dosbin ${PN}
 
-	newinitd ${FILESDIR}/monitorix ${PN}
+	newinitd "${FILESDIR}/monitorix" ${PN}
 
 	insinto /etc/monitorix
 	doins ${PN}.conf
diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index 9594701e82fb..1d0759bdb46b 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -1,4 +1,7 @@
 AUX urlwatch-2.17-fix-yaml.load.patch 675 BLAKE2B 39198576b888d72ab9a21a99430cc32e22a113104e54008301f6caa4065d0c143116e46ed217fd5661489f0759c07399e9ca4ad06d27ac781da8f5a84ef93552 SHA512 300742195fdfed34a39b22b724ae53b9ccaa27857250c91fa431a8270eeeebbfa3ce81b72f0482a5fbea1636aa5ec78a202757fce45a3b71edae4129c6cb756c
+AUX urlwatch-2.18-pycodestyle-requirement.patch 766 BLAKE2B d30b074629d0547fcded426ce16cbc4cd3c829ccb817be4ea792273e5a00825e8fb6e332b9169cf7ce228ac592acf4d04f583acda75501f4d20886f9e13c6f55 SHA512 4fd8abdffa63438955ada5910b84548ab22ccba96dd63943a78ac72f17636e6a515b8a7aaef277099e575965bcf4a68fe01c7ee2226def85a2cc1e6a31bbbb8d
 DIST urlwatch-2.17.tar.gz 44178 BLAKE2B 46163b3305a50c3b5165da8f794c252aeb0a3581f16ba04cc1f0d920066accd02f7eba47718012e2ac0071f6bfa31019777a28840179a28a7fe365ae2e8f1d2c SHA512 635bca7e55641dd73447f5ec9ad429539decfaa8a1c19ab073c3bd46acfc518fa6012d855e0c37dd78654da28acf1446f580def611bcb85ae94fe13f567e3613
+DIST urlwatch-2.18.tar.gz 48268 BLAKE2B e595a6ed27637463f14f92ecafd123eb0c7cef7102cc35ebbc3334804f7e09cc5f933aa2d54e24acd74a1419d6a8683a0d5fb2456b35ae0797c3d8a12efc33de SHA512 4b44a78fe7f2be6f507487ad5de57d79aa55ee790b29b97f2a364c0f3b58828fea5eb2b08235c15cafd3839b9261a7f148ebc9bceb5bedd1ff8319f7f039bb23
 EBUILD urlwatch-2.17.ebuild 1650 BLAKE2B 01abaf115bbfb7ae572ae850505fd8b17ceb098f5ad4c11e578ec0ac554f77cb4aa689d8fb278028c6841520eb614983beb693c329cca202697e049b465df968 SHA512 b64a3a26d4a0909b85e2316b3e5d79876cb256d3f1be2ec8b820eca9f52fff2304622dc7d69d75c95e587563362fee18b06b8a15a986543893db63080ae5aab1
+EBUILD urlwatch-2.18-r1.ebuild 1811 BLAKE2B 9a42617e89c5a88cdc081b069de209455b9b382de2652493a7990c2dddf6545b8e9e58da65553c4aa64917e2797ee6f50d1e2b061a5f27e494512139d65d8446 SHA512 654098c0d31c1feffb0edf1970f59ab1cfd9b806fd1478aaebc7bfb96486c21655e1db176496de8bebbf239f4a331c31ae362258a79191ba3987f262d8fc7f3c
 MISC metadata.xml 540 BLAKE2B feb952d37175ef6a6ec17ae6ff1751d031cd14e3e8d98d5b6cdf44074c05068a1a6ce88b9447fdc0a8dec18f37f7d07232072ba81dd0ce6401a106e5e508cb92 SHA512 7c79bc952f7be46983f83c1f357f013df14d87f906df3a3e0f8690c32d296945729ebe9f95838d6a3c3c1e85b4fc8dde20b0ef12037d17967119e4cbaf652f2c
diff --git a/www-misc/urlwatch/files/urlwatch-2.18-pycodestyle-requirement.patch b/www-misc/urlwatch/files/urlwatch-2.18-pycodestyle-requirement.patch
new file mode 100644
index 000000000000..587a55ab03c8
--- /dev/null
+++ b/www-misc/urlwatch/files/urlwatch-2.18-pycodestyle-requirement.patch
@@ -0,0 +1,15 @@
+diff --git a/setup.py b/setup.py
+index 5f85aaf..7466787 100644
+--- a/setup.py
++++ b/setup.py
+@@ -17,9 +17,7 @@ if sys.version_info < (3, 3):
+ m['name'] = 'urlwatch'
+ m['author'], m['author_email'] = re.match(r'(.*) <(.*)>', m['author']).groups()
+ m['description'], m['long_description'] = docs[0].strip().split('\n\n', 1)
+-m['install_requires'] = ['minidb', 'PyYAML', 'requests', 'keyring', 'pycodestyle', 'appdirs', 'lxml', 'cssselect']
+-if sys.version_info < (3, 4):
+-    m['install_requires'].extend(['enum34'])
++m['install_requires'] = ['minidb', 'PyYAML', 'requests', 'keyring', 'appdirs', 'lxml', 'cssselect']
+ if sys.platform == 'win32':
+     m['install_requires'].extend(['colorama'])
+ m['entry_points'] = {"console_scripts": ["urlwatch=urlwatch.cli:main"]}
diff --git a/www-misc/urlwatch/urlwatch-2.18-r1.ebuild b/www-misc/urlwatch/urlwatch-2.18-r1.ebuild
new file mode 100644
index 000000000000..d8fcfd698a28
--- /dev/null
+++ b/www-misc/urlwatch/urlwatch-2.18-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+# The package uses entry points but setup.py is weird
+# so the eclass doesn't detect it
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="A tool for monitoring webpages for updates"
+HOMEPAGE="https://thp.io/2008/urlwatch/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/cssselect[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/minidb[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pycodestyle[${PYTHON_USEDEP}]
+	)
+"
+
+# This will be in the next release
+# https://github.com/thp/urlwatch/commit/44e862282d39a6e23f67c3c0240a93cccbb41a55
+PATCHES=( "${FILESDIR}/${P}-pycodestyle-requirement.patch" )
+
+DOCS=( CHANGELOG.md README.md )
+
+distutils_enable_tests nose
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		if ! has_version dev-python/chump; then
+			elog "Install 'dev-python/chump' to enable Pushover" \
+				"notifications support"
+		fi
+		if ! has_version dev-python/pushbullet-py; then
+			elog "Install 'dev-python/pushbullet-py' to enable" \
+				"Pushbullet notifications support"
+		fi
+		elog "HTML parsing can be improved by installing one of the following packages"
+		elog "and changing the html2text subfilter parameter:"
+		elog "dev-python/beautifulsoup:4"
+		elog "app-text/html2text"
+		elog "dev-python/html2text"
+		elog "www-client/lynx"
+	fi
+}
diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
deleted file mode 100644
index 3bc2746da523..000000000000
--- a/www-misc/zoneminder/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-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.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.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-r1.ebuild 4621 BLAKE2B 46d1289e2855fcbfec735c30fbec79d8d9e817e9815525c273558fd59669f9e3cd0c22d65a78ad2528e0f7d59dd4618a9c8fef184be72930883f15e4a500ab0a SHA512 cac13375351bef2e5bdfaa263474523f04aefcdd2112ec932c0b840e92e79987ae309a0495018fc023f10a697f215b86a247b664035127ecda772f83474b46a3
-MISC metadata.xml 461 BLAKE2B 1ddd88e61f5bcd0bfcf74092d91a8471b73ea6246b4ab92d0c94242f13147e91d9396ffe2ace7d801f29f5a6a42901cf0aaefaa6419b5a396a8cd5516f993051 SHA512 ae9340754117bf8a46817d4c63afb1ce79d3d34bbb8254e489fcc71fe548f3802e91f38a77d72abf7c0a7411b018a9ecbed2689880776619144557604619ca6d
diff --git a/www-misc/zoneminder/files/10_zoneminder.conf b/www-misc/zoneminder/files/10_zoneminder.conf
deleted file mode 100644
index eb9961d13224..000000000000
--- a/www-misc/zoneminder/files/10_zoneminder.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-ScriptAlias /zm/cgi-bin "/usr/libexec/zoneminder/cgi-bin/"
-
-<Directory "/usr/libexec/zoneminder/cgi-bin">
-  AllowOverride All
-  Options +ExecCGI
-  Require all granted
-</Directory>
-
-Alias /zm "%ZM_WEBDIR%"
-
-<Directory "%ZM_WEBDIR%">
-  Options -Indexes +MultiViews +FollowSymLinks
-  AllowOverride All
-  Require all granted
-</Directory>
-
diff --git a/www-misc/zoneminder/files/README.gentoo b/www-misc/zoneminder/files/README.gentoo
deleted file mode 100644
index 8713fda6f78a..000000000000
--- a/www-misc/zoneminder/files/README.gentoo
+++ /dev/null
@@ -1,27 +0,0 @@
-1. If this is a new installation, you will need to create a MySQL
-   database for zoneminder to use
-   (see https://wiki.gentoo.org/wiki/MySQL/Startup_Guide).
-   E.g., when logged into mysql as root,
-     mysql> CREATE DATABASE \`zm\`;
-     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:
-     mysql -p < /usr/share/zoneminder/db/zm_create.sql
-
-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.
-
-4. Enable PHP in your webserver configuration,
-   enable short_open_tags in php.ini (likely on by default now)
-   set the time zone in php.ini,
-   and restart/reload the webserver.
-
-5. Start the zoneminder daemon:
-     /etc/init.d/zoneminder start
-
-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
diff --git a/www-misc/zoneminder/files/conf.d b/www-misc/zoneminder/files/conf.d
deleted file mode 100644
index d2e03363867a..000000000000
--- a/www-misc/zoneminder/files/conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-ZM_SCRIPT=/usr/bin/zmpkg.pl
-
-# Commands for starting and stopping the server
-
-CMD_START="${ZM_SCRIPT} start"
-CMD_STOP="${ZM_SCRIPT} stop"
diff --git a/www-misc/zoneminder/files/init.d b/www-misc/zoneminder/files/init.d
deleted file mode 100644
index 6ee8a160155e..000000000000
--- a/www-misc/zoneminder/files/init.d
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need mysql
-	need apache2
-}
-
-start_pre() {
-	checkpath -d -m 0775 -o apache:apache /var/run/zm
-	checkpath -d -m 0775 -o apache:apache /var/tmp/zm
-}
-
-start() {
-	ebegin "Starting zoneminder"
-	${CMD_START}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping zoneminder"
-	${CMD_STOP}
-	eend $?
-}
diff --git a/www-misc/zoneminder/files/zoneminder-1.30.2-diskspace.patch b/www-misc/zoneminder/files/zoneminder-1.30.2-diskspace.patch
deleted file mode 100644
index fee5b783c356..000000000000
--- a/www-misc/zoneminder/files/zoneminder-1.30.2-diskspace.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://forums.zoneminder.com/viewtopic.php?t=24534
-& personal message by simon@rustyspoon.co_m
-
-diff -ruN ZoneMinder-1.30.2.orig/web/includes/functions.php ZoneMinder-1.30.2/web/includes/functions.php
---- ZoneMinder-1.30.2.orig/web/includes/functions.php	2017-03-30 20:43:06.000000000 +0200
-+++ ZoneMinder-1.30.2/web/includes/functions.php	2017-04-16 21:13:43.841371345 +0200
-@@ -1442,7 +1442,7 @@
-   return( $load[0] );
- }
- 
--function getDiskPercent($path = ZM_DIR_EVENTS) {
-+function getDiskPercent($path = ZM_PATH_WEB.'/'.ZM_DIR_EVENTS) {
-   $total = disk_total_space($path);
-   if ( $total === false ) {
-     Error("disk_total_space returned false. Verify the web account user has access to " . $path );
diff --git a/www-misc/zoneminder/files/zoneminder-1.30.4-gcc7.patch b/www-misc/zoneminder/files/zoneminder-1.30.4-gcc7.patch
deleted file mode 100644
index b022fbe35e17..000000000000
--- a/www-misc/zoneminder/files/zoneminder-1.30.4-gcc7.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
deleted file mode 100644
index 34afe0cb3b67..000000000000
--- a/www-misc/zoneminder/files/zoneminder-1.30.4-glibc226.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 54772a147693..000000000000
--- a/www-misc/zoneminder/files/zoneminder-1.30.4-path_zms.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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/files/zoneminder.service b/www-misc/zoneminder/files/zoneminder.service
deleted file mode 100644
index 9ef5bc6ee552..000000000000
--- a/www-misc/zoneminder/files/zoneminder.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Video Security and Survellance System
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/zmpkg.pl start
-ExecReload=/usr/bin/zmpkg.pl reload
-PIDFile=/run/zm/zm.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/www-misc/zoneminder/metadata.xml b/www-misc/zoneminder/metadata.xml
deleted file mode 100644
index c59068288ecb..000000000000
--- a/www-misc/zoneminder/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<use>
-		<flag name="curl">Enable using net-misc/curl for streaming from cameras</flag>
-		<flag name="gcrypt">...</flag>
-		<flag name="vlc">Enable using media-libs/vlc for streaming from cameras</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ZoneMinder/ZoneMinder</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-misc/zoneminder/zoneminder-1.30.4-r1.ebuild b/www-misc/zoneminder/zoneminder-1.30.4-r1.ebuild
deleted file mode 100644
index 046cf31ef6fb..000000000000
--- a/www-misc/zoneminder/zoneminder-1.30.4-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# 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
-
-EAPI=6
-
-inherit eapi7-ver 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-db/mysql-connector-c:0=
-	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
-	dev-php/pecl-apcu:*
-	sys-auth/polkit
-	sys-libs/zlib
-	virtual/ffmpeg
-	virtual/httpd-php:*
-	virtual/jpeg:0
-	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
-
-PATCHES=(
-	"${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
-
-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
-	export TZ=UTC # bug 630470
-	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 || 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
-
-	perl_delete_packlist
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		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
-}