Revert "gentoo resync : 13.09.2019"

This reverts commit a1392efe64137262023d92492396ca9156d22396.

10 files changed, 79 insertions, 11 deletions

diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 233c011b36e4..72ed296e2dc6 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/fcgiwrap/Manifest b/www-misc/fcgiwrap/Manifest
index 1a61dc6d63ba..f0a1db29b0c6 100644
--- a/www-misc/fcgiwrap/Manifest
+++ b/www-misc/fcgiwrap/Manifest
@@ -1,4 +1,6 @@
 DIST fcgiwrap-1.1.0.tar.gz 9924 BLAKE2B a96a87bfd1e4845be3a5018e5574edd40a800926ac531a041fae07f6810da509eecf97a19b2debe0ea318f2968f30184f4f6c1c02495777492d32826a0f759a1 SHA512 b8d35762d1d3c94a67602290b0092f0c38cffbbcd3dbc16597abf8b92172909b04450c238de2e430e841a17dd47fdd48d6a001f77539966980ef1af61e447ddc
+DIST fcgiwrap-1.1.0_pre20150419.tar.gz 10834 BLAKE2B 174a832b8d2996de38203244ecece55ca1bd808b1e6724894c9ef99a7236ad40fbe4031450797f14931008305d50b4d2dfcc1abe97586fda9f45194c8b16bf4e SHA512 48df3f0b5ad15d172b7ee883d53c59ecbd78c0c401ef1452df8fc03af1a7aed153464b2515ca18881af70f6baf6c80e0b405d1dde4888a20397b9db272ea6ba4
 EBUILD fcgiwrap-1.1.0-r1.ebuild 1313 BLAKE2B b87272e5158a3ea56b573e34c31eebb75a900ac3f799a5533be65685260b4c02955fc58aa78e29b8e48f64512358646c99faffd8bb8ce3377254d9b132792dea SHA512 82c1d923eaf31578f7bd53beb1e342773dcb0d6d151f892c1e0281944c4bb91b5a9f65075b23045844f7374ac8ceb4948dfc92577060e0645355f1a7f520ae31
+EBUILD fcgiwrap-1.1.0_pre20150419.ebuild 1471 BLAKE2B b75461a9cbbcce40ccdfc2ff347a7ab84ac6c2292a80b92001860aa7497fea0b79b7131762c84789041f8f4f41b6a711faa6ebf8ff9b8c1bb0641ab7d65ef641 SHA512 abbcfea26e21a59350035aec6c6ea3d109a56735bc8a00de81226d7e73afe39f5951ce9b3537118f9c2e678e518fa5af5caad4b9af05a12070bd74d02109c211
 EBUILD fcgiwrap-9999.ebuild 1361 BLAKE2B eee47215eb02c0b034ce4648244bfc71b8fb9a83b6e90690a8318ea4a7891cfa889129b07464cd2f7b2450e3c9307c83627c77b0167091cb356fa8b2c010a246 SHA512 0271ad94f88ec1c158f6c1e52e7037ada92f5c29f872eb8941b42d215c4465642e8ca7c8a905f4dc65fa02559f2995d42225fb048dc0a9ec0833b36d60d87e32
 MISC metadata.xml 458 BLAKE2B 5170c572ca69ce1f1b03748af228cc788021c6f92dd2cc77584a852d6d03112a7ce3c36c4e6a41c952e55c180d8c750004f372565bf2c283b7f15f34aa806ff2 SHA512 d668390a3f179b243abeed455b9fe85eaef426848c1484572a564d1d631835ddd069046bbd84f5841ce60eadf81866ed69b60ce0b4bb301a91f5695441c3a1c9
diff --git a/www-misc/fcgiwrap/fcgiwrap-1.1.0_pre20150419.ebuild b/www-misc/fcgiwrap/fcgiwrap-1.1.0_pre20150419.ebuild
new file mode 100644
index 000000000000..b6310e79a9d5
--- /dev/null
+++ b/www-misc/fcgiwrap/fcgiwrap-1.1.0_pre20150419.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+[[ ${PV} = *9999* ]] && VCS_ECLASS="git-r3" || VCS_ECLASS=""
+inherit autotools systemd toolchain-funcs ${VCS_ECLASS}
+
+DESCRIPTION="Simple FastCGI wrapper for CGI scripts (CGI support for nginx)"
+HOMEPAGE="https://github.com/gnosek/fcgiwrap"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="systemd"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/gnosek/${PN}.git"
+else
+	MY_REV="99c942c90063c73734e56bacaa65f947772d9186"
+	MY_P="gnosek-fcgiwrap-${MY_REV:0:7}"
+	SRC_URI="https://github.com/gnosek/${PN}/tarball/${MY_REV} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+RDEPEND="
+	dev-libs/fcgi
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( README.rst )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -e "s/-Werror//" \
+		-i configure.ac || die "sed failed"
+
+	sed -e '/man8dir = $(DESTDIR)/s/@prefix@//' \
+		-i Makefile.in || die "sed failed"
+
+	sed -e "s/libsystemd-daemon/libsystemd/" \
+		-i configure.ac || die "sed failed"
+	tc-export CC
+
+	# Fix systemd units for Gentoo
+	sed -i -e '/User/d' systemd/fcgiwrap.service || die
+	sed -i -e '/Group/d' systemd/fcgiwrap.service || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with systemd) \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+}
+
+pkg_postinst() {
+	einfo 'You may want to install www-servers/spawn-fcgi to use with fcgiwrap.'
+}
diff --git a/www-misc/monitorix/Manifest b/www-misc/monitorix/Manifest
index 60bd1308eb1c..9d80cbff43f8 100644
--- a/www-misc/monitorix/Manifest
+++ b/www-misc/monitorix/Manifest
@@ -3,8 +3,8 @@ DIST monitorix-3.10.0.tar.gz 309688 BLAKE2B 58345fbe02e24be48baecb1b91b4c24de8be
 DIST monitorix-3.10.1.tar.gz 313587 BLAKE2B 2dfc63499966346cf7e862a44d904f2599a6eb40544c511c9d64f1fa32684bccbecccbbfaff8d46cdb1c4af8b5904c2622ede8d3d8f955bd9bacc32848c2ef02 SHA512 b1e2a5c6a2992c6280129ec7fcdd72783902f475c3c98f09aab86b56305efacce7222732669639dc59b29da2fdf5cda49999ee159f4a95b12e4ee3a491d55c55
 DIST monitorix-3.11.0.tar.gz 318741 BLAKE2B af190e716acea9dfa56ebf3976e387abc19d0254fbebf6b6b18deff98b989266bff7e7c59e57832ad8b29dff8abb220e19da079c004ec185b63845cf70fb2727 SHA512 81832ef569416cc2e587beff8dbd485a6d361c0b5f11611522bde58c06d3156888e8c7b49cb3205adafbf737cd2d2b22e6041cd8b94e6d8c78cb5a4c3b1587de
 DIST monitorix-3.9.0.tar.gz 288443 BLAKE2B 6203f2950e0061d1ff268a2c42c31e7e14b5103e09ec82411f3ee3b957212c8799ba00710b269e0097ed0a3c060eb2d6972dd7b2c1af820bb09de2281113238c SHA512 599f3fa004c2e9657f255ca0ef0ae69ca63623976d17ebf8883a8c19b8a76193916634844f794da508439336edc37e424263aa6ccd8e06bb3584b6cf3cda783b
-EBUILD monitorix-3.10.0-r1.ebuild 2829 BLAKE2B 57e92a739ac167d873144bcaad9d91ec3f8c3b7ba0937dabc73efd7fbbaf2d745a7fda3cc61fc3d5c87e783a772b45ad0e78fc27d26b637d5fb2769c47e955f3 SHA512 20b8d8899e9cffafb41db15f16683edd19bd807cef91c3cd9dab5b619ba37e8fed08bb18080e1dc8eca5c3f99933a744b7a830f2296f6cae0a5b739186dc6d3e
-EBUILD monitorix-3.10.1.ebuild 2758 BLAKE2B f72f6baf4b8b5d75cbee89ab5e816446833c988b6940ee31f33cf48704fe50f65b888580fe68a0567f45112e7a2d467000154afdbe36642add26d17da3f39d69 SHA512 242f0d3d65f3589d7047683c52486cabd0a5893e650055e8e082aa03994e912a43f6137bea2a8f4bd4e8364c68e19dd7d185deff1b9ebfba19d5d090c5c32fbc
-EBUILD monitorix-3.11.0.ebuild 2853 BLAKE2B 4603137b6b25007f72d773d07e5206f70d61aba17b1eb65818629e2a271755bac6de02099c164d41a70e4532115ec335c0d8147b595961dec6709940b173247c SHA512 ab1a4ebd76bd10489fc5dcc8d426c1276bfe3d4ed6faae0b74e79bcf1c420b7f441a5adbf635e30d0996cd01b2aa3eef1f8b85ac29410be56a4bfcd64d47255d
-EBUILD monitorix-3.9.0.ebuild 2653 BLAKE2B eb2aa0539329608e83032342a16324f0224cfc10bc562ab52cf1a45b09c946316ed722aa00995d2c272db14e03c38371f23e9562293a9791c692e33b6348cefe SHA512 2fdb051ff113c569b9123f69af31b39de83472710684dde0fc25925a59bd38801baaa5a10835507fab3456590cf5c22b61512b2cf8db24c1ec055eba5367e237
+EBUILD monitorix-3.10.0-r1.ebuild 2829 BLAKE2B 35b2cab57552086a6afc6e4709895be971504862e54bc7471272667eb02e70419148223a55557e6544538bc98ac1cbef032d0302e58eb49ad8cdd81e700c155b SHA512 d62c3705ac13ced472111d12cf5538bfed90e48613e254b07a6d374c62a8c0bc54eb6a8ca9364900016c32c63c739a3617242f04f2f18593e55ead51ab3e4a70
+EBUILD monitorix-3.10.1.ebuild 2758 BLAKE2B da5f92b0af54a146ad093fb2674b0aa332300835949d0a95bdbe6ae7eb9cbe4acdef5d7e316c4cbe2dcd49feaf3c22c25968a93ecca548d224031359d3717b9f SHA512 3a86040d73c2fa23ffaf2f5d43bb10a97b4cd1476bb6cac091e99814915adcb002e9bb7dec56a4cb09bf3500b08d1cb9f608c4ec5384f3406b5ba9e489ede6cd
+EBUILD monitorix-3.11.0.ebuild 2853 BLAKE2B 2f68d7a79ce9ef90aef5dbecfd6ef966b49a8ccc4115b5e005658b1632ed38537e9fecdd310fb0ed9808b330f2fd101a1cdb6d8fc2d59442ea105b85db6fece2 SHA512 0b5829d46b0b13d071649a2270b4bdb41ba3f9bddbdafac6a092fe89dd55ddf80c052d44073bd984e4881135af38500390ee9e91c48d1a7645c033d0c32b3a9a
+EBUILD monitorix-3.9.0.ebuild 2653 BLAKE2B 1231d79709465b94d2208a8497c993e1fa365b58433241d05dc0103b68bdf1385c41e5e37420663f4828390387e7b4fe0322c04407e273083f79226141bb1b65 SHA512 57f7b6aa48943f9f17c9f060dcc29dc505ad57b42378bfa108a9a8a44da6188049f9dd79d98f2e3adff12ec5f84dc16638d8511a6432a68c10e7d64df8290735
 MISC metadata.xml 857 BLAKE2B 952d7eaa095fed062ac2662bf4750ecf002e0015642cc928e56964774aa354b445576aa9d04f8d9368c3454e2f41fa8746df9edcdc84ee2d53d5ee66e0af5c08 SHA512 c44c6e3357b95f174bd886a9373b7259d182a254af2d4ad3495c3d081279f76d5e682db8ae1d28f768d493bd2d85965303f9561b602abcb42248c264342c63b3
diff --git a/www-misc/monitorix/monitorix-3.10.0-r1.ebuild b/www-misc/monitorix/monitorix-3.10.0-r1.ebuild
index 7181ae3d0cc1..65bcc53b45f2 100644
--- a/www-misc/monitorix/monitorix-3.10.0-r1.ebuild
+++ b/www-misc/monitorix/monitorix-3.10.0-r1.ebuild
@@ -93,7 +93,7 @@ pkg_postinst() {
 	elog "  app-admin/hddtemp   (disk drive temperatures and health)"
 	elog "  mail-mta/postfix    (email reports/statics)"
 	elog "  mail-mta/sendmail   (email reports/statics)"
-	elog "  sys-apps/lm-sensors (lm-sensors and GPU temperatures)"
+	elog "  sys-apps/lm_sensors (lm_sensors and GPU temperatures)"
 	elog "  sys-power/apcupsd   (APC UPS statistics)"
 	elog "  sys-power/nut       (Network UPS Tools statistics)"
 	elog
diff --git a/www-misc/monitorix/monitorix-3.10.1.ebuild b/www-misc/monitorix/monitorix-3.10.1.ebuild
index 6cfe49a36664..3e6b4c2569d7 100644
--- a/www-misc/monitorix/monitorix-3.10.1.ebuild
+++ b/www-misc/monitorix/monitorix-3.10.1.ebuild
@@ -92,7 +92,7 @@ pkg_postinst() {
 	elog "  app-admin/hddtemp   (disk drive temperatures and health)"
 	elog "  mail-mta/postfix    (email reports/statics)"
 	elog "  mail-mta/sendmail   (email reports/statics)"
-	elog "  sys-apps/lm-sensors (lm-sensors and GPU temperatures)"
+	elog "  sys-apps/lm_sensors (lm_sensors and GPU temperatures)"
 	elog "  sys-power/apcupsd   (APC UPS statistics)"
 	elog "  sys-power/nut       (Network UPS Tools statistics)"
 	elog
diff --git a/www-misc/monitorix/monitorix-3.11.0.ebuild b/www-misc/monitorix/monitorix-3.11.0.ebuild
index 7b47c6db0dce..efb99c9012a7 100644
--- a/www-misc/monitorix/monitorix-3.11.0.ebuild
+++ b/www-misc/monitorix/monitorix-3.11.0.ebuild
@@ -94,7 +94,7 @@ pkg_postinst() {
 	elog "  app-admin/hddtemp   (disk drive temperatures and health)"
 	elog "  mail-mta/postfix    (email reports/statics)"
 	elog "  mail-mta/sendmail   (email reports/statics)"
-	elog "  sys-apps/lm-sensors (lm-sensors and GPU temperatures)"
+	elog "  sys-apps/lm_sensors (lm_sensors and GPU temperatures)"
 	elog "  sys-power/apcupsd   (APC UPS statistics)"
 	elog "  sys-power/nut       (Network UPS Tools statistics)"
 	elog
diff --git a/www-misc/monitorix/monitorix-3.9.0.ebuild b/www-misc/monitorix/monitorix-3.9.0.ebuild
index 75df0a787d66..d56a7fd63984 100644
--- a/www-misc/monitorix/monitorix-3.9.0.ebuild
+++ b/www-misc/monitorix/monitorix-3.9.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mikaku/Monitorix/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="apcupsd hddtemp httpd lm-sensors postfix"
+IUSE="apcupsd hddtemp httpd lm_sensors postfix"
 S="${WORKDIR}/Monitorix-${PV}"
 
 RDEPEND="dev-perl/Config-General
@@ -27,7 +27,7 @@ RDEPEND="dev-perl/Config-General
 	apcupsd? ( sys-power/apcupsd )
 	hddtemp? ( app-admin/hddtemp )
 	httpd? ( virtual/httpd-cgi )
-	lm-sensors? ( sys-apps/lm-sensors )
+	lm_sensors? ( sys-apps/lm_sensors )
 	postfix? ( net-mail/pflogsumm dev-perl/MailTools )"
 
 pkg_setup() {
diff --git a/www-misc/xxv/Manifest b/www-misc/xxv/Manifest
index 3c4d52595ef4..7a44718dc1d7 100644
--- a/www-misc/xxv/Manifest
+++ b/www-misc/xxv/Manifest
@@ -3,4 +3,4 @@ AUX xxvd-1.0.cfg 2257 BLAKE2B 16e83bc63415f658c1dca638b8ab8d7d62a3f5b64fa0d9d260
 AUX xxvd-logrotate 367 BLAKE2B ede5967e1868dbd53eb81b6216598b7d15a890ed5914f4581b654bd5c0cd965475fe2837fb7640d68917c6c42de188e47cb840779995157e043b36f7fa63ba3e SHA512 b10918d478a42f90a9f24e3b358fc8af7fd8366146a42291ea6c5bed258414d834348dd58688f260aecc69c4f76af362c881ebd5a4abef52c1244310a8751c0e
 DIST xxv-1.6.1.tgz 992065 BLAKE2B 9c0b9d2575f412a677a84b1fe0417042f74c4ee4225181a14447e996a8fad46d0fdb4f5ada57fc02ff875be3a7602cf2e8976416b0fd5596b3adb1061ddc8f4a SHA512 e5171ea02d00d7c07d0faf5361a5261bf882d3c5a996b864593216a941c35f823b09431579341f43cf75f87dd42a1635275e8a24b393d407c83c7eb299095566
 EBUILD xxv-1.6.1-r1.ebuild 4665 BLAKE2B ce14eafcb6e0064c601376c045479103bcf934758da1f6724d3a975e9d7bc4dcc3a44da63d801ea7f719f90afab8b0c87f2ab38db786e1353c6896bc72eddd7e SHA512 41dcf75b7ffffaab12dc49a94fdacf44ec8ca52dd16b8d122725ac1a96f4eab3bf7c2362722ad8501bf49b93397e76f1f1da5e4721a5542ae84be322cb34a5f6
-MISC metadata.xml 514 BLAKE2B 0c6981980fd49f6ea9b7beeb835a354c77103dabcd23901357885a2e20c176b6872fc175d776aa73a6a608591121bce51ffaab979c778cd51bd64c57b47fa741 SHA512 f4c3d21321956e2efa2eb1898463127b42223aa41a40547ae17887db614b78fbfd03123e74074bc3b7502df91e1fbcf58b1c26bd8ffe4f0a00b94470851814b5
+MISC metadata.xml 599 BLAKE2B 3c2fd89512d72e023d781d0856c613e3fe6dd2a2b5fad739fe649f80f7158e9e1c33019b91d0a93034edbd950bdc78f081c164996da4618947dc528e0b06f743 SHA512 840993092f3f752b59ec9c2a8401c3befad44463116b6febc0692e06a8e781238f19e84a0112c15b9e96e3c4c1a75344c34697c6c8590f657f50a6deeb9e7e8c
diff --git a/www-misc/xxv/metadata.xml b/www-misc/xxv/metadata.xml
index 103ae1ef3d00..974f0802cc90 100644
--- a/www-misc/xxv/metadata.xml
+++ b/www-misc/xxv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>hd_brummy@gentoo.org</email>
+		<name>Joerg Bornkessel</name>
+	</maintainer>
 	<longdescription lang="en">
 		To program and steer central service over a Browser the VDR 
 	</longdescription>