gentoo resync : 30.05.2020

3 files changed, 2 insertions, 107 deletions

diff --git a/app-misc/fhem/Manifest b/app-misc/fhem/Manifest
index 684713e334f8..f23155e3dc7b 100644
--- a/app-misc/fhem/Manifest
+++ b/app-misc/fhem/Manifest
@@ -2,8 +2,6 @@ AUX fhem.cfg 791 BLAKE2B ba55b71711199794c38720ad724fbc9d5f05d1713c1af0d02662765
 AUX fhem.initd 447 BLAKE2B c724aa0b16fa7c6e1018e78c6ece9d1ba6357d147d1909326a5adc580af2cad57a0c13549b3c9f4b19b6fdad279ebbf8d0b64a36f29690911b342a06c865c7da SHA512 3be01778d970f4b93e551ff3769ed7b0825508dc5216a43ed0bb12f589103350bdb400561cbada9315050d32a99f723f5291e9bf1c6318642b16b8b9dc9e8c61
 AUX fhem.service 208 BLAKE2B b577fd84a166ef87f2aaf58f2fc6758d070b4181f3254e236aa376322ad4bd4b0c7e04aa9205fbc235fc39f9e8f27d17a6ae36a732058d9a7ca97154ac61398d SHA512 3f2baf5e2238074ce65e1eacfadd8f2ffd582c26e50ab03d3ac18a03acbe6b5aa85bb1258e405dae81b51f9c5554a2ee872f72dc4e929df88f7fa5681916171b
 AUX fhem.tmpfiles 31 BLAKE2B 57659fe7fe189d03cd1fdbd073421f2215b90db9d2c00b335ca3b98b7c42b23085c9ccadd85fc40c5c21e393c571bacc6804b06dc47de88bfcfe4384d7be88f8 SHA512 4e29020ae5d114c6ab3ad1935a8b4b1b4d6d521771554130304534f69a0ec6961f93b64ad45aabeeff9ab1a73dbe97187922f845c849565105801edffc1ac0ce
-DIST fhem-5.9.tar.gz 23267499 BLAKE2B c2c2e4ab21f82fbe67c9e99aed4d1edd6db889aedac0611b5ba2873667520c4aa63d8553e014563f6f6ee58c5792ae1735853f58c8f4ef0599583b2ed23a9efe SHA512 9f75058e698fc33ec64081695db3eb2511f686dedc3107c87d4377f655c8b204892c6f61141de28970f2ed3f8cef5d24124d17ee20ee71a9eb9318bb17335bb8
 DIST fhem-6.0.tar.gz 28562819 BLAKE2B 4bc4f232caf0adc35ded72f380c1d4c816a22304af357f9b204fb856c2053038e3db2d834b7448d3cf43e84d3f435a36d047e48606b9e1083ab4963b38a75301 SHA512 a8e9d74b1d68ad7c9aea0a4d463aa877cb607458cb6ecf76203c96ff2156fd8b8a3b9cb5687ac0a5cd1eca5f94552433de55f3696b7be54a3cfa8df9cf74fbe1
-EBUILD fhem-5.9-r1.ebuild 2317 BLAKE2B e49fb1a0c0819ac6ffef3e077207a5e8710f76ddca3c8adccd1de0331a9f5502392cc89e19822ea2509cc0b772e08e1ea61aa729f544a2c4abdaeb15dae48498 SHA512 9958582935a807f7c13a2500dcc06b19c137d8cce14c19423316833731d1c861d85e1d21c885eaa9cd0528bd18341454998ffab8a8ff7644f4d5ec088d9aa0b1
-EBUILD fhem-6.0.ebuild 2319 BLAKE2B 13c6329ab170884338553f8dba66eebef9364928ec7f8913193be517034f686a4bc05b520a6977504917e09afee09d5979876bb86b614ced50a5f8f1416bd8c2 SHA512 0eb4d04610546986d17f1c430206bc9063c3e1c5cbb4b893f866bc3f43251817f24cb8d4a8b098389119a02025dfd9c595da61b560e1451e446210f57a9f7cff
+EBUILD fhem-6.0.ebuild 2317 BLAKE2B edeaf1b860b8dc15787378e3027d31ecdaa59f7f3a3c162cc033aa95a989cb0b5bda6e060759e4baf7aa0e8f2e0318961be20dbc979985d52c8159bb000fb21b SHA512 6553868c4e139ebe40ab0b9f1d2d1fed1a5277bfd76c1a3ff27ce44ca678610431dd33be379347ad84ca567a8b9098c06d981fb5540176e18caea977c2dce5fb
 MISC metadata.xml 648 BLAKE2B 7d812ebc3a0e960a7a3eb744d339820af256c558220e3bc3e041751a253890be6227f7b6a19df7ceec363318800c18838fa6923a0d5c71049fc1352416d6d9f7 SHA512 4518524695a6efbfe86db125d625bb5fe58174c74968e336a34f648bf2784832eea99f322e340c922aca9c5ab43d50f3f4d0334377eed4447ea1f3c5ea6e995a
diff --git a/app-misc/fhem/fhem-5.9-r1.ebuild b/app-misc/fhem/fhem-5.9-r1.ebuild
deleted file mode 100644
index 358a510f2496..000000000000
--- a/app-misc/fhem/fhem-5.9-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="A GPL'd perl server for house automation"
-HOMEPAGE="https://www.fhem.de/"
-SRC_URI="https://www.fhem.de/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="
-	acct-group/fhem
-	acct-user/fhem
-	dev-perl/Crypt-CBC
-	dev-perl/Device-SerialPort
-	dev-perl/Digest-CRC
-	dev-perl/JSON
-"
-
-DEPEND="media-gfx/pngcrush"
-
-src_prepare() {
-	default
-
-	# Allow install path to be set by DESTDIR in Makefile
-	sed -i -e 's,^\(BINDIR=\),\1'\$\(DESTDIR\)',' Makefile || die
-
-	# Remove docs in Makefile, as they will be installed manually
-	sed -i -e 's/docs//g' Makefile || die
-	sed -i -e '/README_DEMO.txt/d' Makefile || die
-
-	# Remove manpage in Makefile, as it will be installed manually
-	sed -i -e '/fhem.pl.1/d' Makefile || die
-
-	# Remove lcd4linux binaries, as they are provied by app-misc/lcd4linux
-	rm -r contrib/lcd4linux || die
-
-	# Remove log dir, as it will be replaced with a symlink
-	rm -r log || die
-
-	# Fix fhemicon_darksmall.png, as it reports "broken IDAT window length"
-	# Reported to Upstream: https://forum.fhem.de/index.php/topic,86238.0.html
-	pngcrush -fix -force -ow www/images/default/fhemicon_darksmall.png || die
-
-	cp "${FILESDIR}"/fhem.cfg fhem.cfg || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local DOCS=(
-		"CHANGED"
-		"HISTORY"
-		"MAINTAINER.txt"
-		"README.SVN"
-		"README_DEMO.txt"
-		"docs"/*.txt
-		"docs"/*.patch
-		"docs"/*.pdf
-		"docs/changelog"
-		"docs/copyright"
-		"docs/dotconfig"
-		"docs/fhem.odg.readme"
-		"docs/LIESMICH.update-thirdparty"
-		"docs"/README*
-		"docs/X10"
-	)
-
-	if use doc; then
-		local DOCS+=( "docs/X10" )
-		local HTML_DOCS=( "docs/"*.eps "docs/"*.html "docs"/*.jpg "docs"/*.js "docs"/*.odg "docs/"*.png "docs/km271" )
-	fi
-
-	diropts -o fhem -g fhem
-	keepdir "/var/lib/fhem"
-	keepdir "/var/log/fhem"
-	diropts
-
-	dosym ../../var/lib/fhem /opt/fhem/data
-	dosym ../../var/log/fhem /opt/fhem/log
-
-	default
-
-	newinitd "${FILESDIR}"/fhem.initd fhem
-
-	systemd_dounit "${FILESDIR}"/fhem.service
-	systemd_newtmpfilesd "${FILESDIR}"/fhem.tmpfiles fhem.conf
-
-	newman docs/fhem.man fhem.pl.1
-
-	echo 'CONFIG_PROTECT="/opt/fhem /var/lib/fhem"' > "${T}"/99fhem || die
-	doenvd "${T}"/99fhem
-
-	fowners fhem:fhem /opt/fhem/fhem.cfg
-}
diff --git a/app-misc/fhem/fhem-6.0.ebuild b/app-misc/fhem/fhem-6.0.ebuild
index 55c757a712da..5f23795bcb7d 100644
--- a/app-misc/fhem/fhem-6.0.ebuild
+++ b/app-misc/fhem/fhem-6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.fhem.de/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="