gentoo resync : 22.10.2018

4 files changed, 122 insertions, 0 deletions

diff --git a/app-misc/fhem/Manifest b/app-misc/fhem/Manifest
index 61eb71f5e033..949b8f8df229 100644
--- a/app-misc/fhem/Manifest
+++ b/app-misc/fhem/Manifest
@@ -1,5 +1,9 @@
 AUX fhem.cfg 791 BLAKE2B ba55b71711199794c38720ad724fbc9d5f05d1713c1af0d02662765e8248e845bc3c07ae619b46e450d9b3a96a993a814e0c831a51edce6129d8efe07baee0db SHA512 9ce1c1cc2d7c55a29df2e344ad6600704e68536b734997a7cc1a73a225970c26f924c902c4d4e6f318e22a000b9b4ec2ceb52edd650fe3a8d12488b5293f7ad3
 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.8.tar.gz 22139481 BLAKE2B 444b041b591d3c960036a262e6eb3fda026d4b229a21df16d7817c32a1fd57282a7fbe5559164b760bd9cfad314c2977e7d6f611320d35be090cdb9df66fb8fd SHA512 6cfaa14288ce553a2418db4cb47c719f2d5edbccbde9e76f221cd47cf8a175a67125031c4971f9f9972b218fc709a267757c2abefe6a33be47eb4bb45e23be57
+DIST fhem-5.9.tar.gz 23267499 BLAKE2B c2c2e4ab21f82fbe67c9e99aed4d1edd6db889aedac0611b5ba2873667520c4aa63d8553e014563f6f6ee58c5792ae1735853f58c8f4ef0599583b2ed23a9efe SHA512 9f75058e698fc33ec64081695db3eb2511f686dedc3107c87d4377f655c8b204892c6f61141de28970f2ed3f8cef5d24124d17ee20ee71a9eb9318bb17335bb8
 EBUILD fhem-5.8.ebuild 2226 BLAKE2B 1e938078cde599e3a2acde068ff4e9f4be16c3160ca95819d7c51f0ca8e3c32902577c3076cdef2972dc13ac5b0cf31eb5bff9afc476548a3b25b34872724836 SHA512 9e104f7626b17dd8b43bd2ef36d264a1d48219d36fff8345f1b0bde78c289b88c3c4f3ab87a0e60d3683134b486759d5c5d407357367380daeab005a2662e1c6
+EBUILD fhem-5.9.ebuild 2359 BLAKE2B 5cdbf07dc8cdfeb9ac223edc366210ea91ade46d0e959935a33c592b0cdcb2eaa33f35c3c9d534be4bc9d9cdeef951aa1e46365fce7b5882745f3e3b1eaca621 SHA512 676f0f4a8d878f61e4ec9c32b38d756c2c5a9b5902baabd0b1562e1232c8e2b0705d4ed819325b46940b6cd08aefc16089995626d09eb6b1e77c541458b58271
 MISC metadata.xml 767 BLAKE2B 16319027b755dc2d63c9176681196af9da38d9c5002ca75554f824bca03c67303cee0f1b15f9583d8264eb87c25373704569ac629258c81ed999882500f04014 SHA512 ba31d04179d2f12b1ba803a4cb589ca17b35b33013b78804fb89a716644bcad9fdb71795b36a6519e90b125164b7fe5d6744f0e1e519fc129a7197bd722c6ae4
diff --git a/app-misc/fhem/fhem-5.9.ebuild b/app-misc/fhem/fhem-5.9.ebuild
new file mode 100644
index 000000000000..622c74eac409
--- /dev/null
+++ b/app-misc/fhem/fhem-5.9.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit systemd user
+
+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="dev-perl/Crypt-CBC
+	dev-perl/Device-SerialPort
+	dev-perl/Digest-CRC
+	dev-perl/JSON"
+
+DEPEND="media-gfx/pngcrush"
+
+pkg_setup() {
+	enewgroup fhem
+	enewuser fhem -1 -1 /opt/fhem fhem
+}
+
+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/files/fhem.service b/app-misc/fhem/files/fhem.service
new file mode 100644
index 000000000000..697a10179d40
--- /dev/null
+++ b/app-misc/fhem/files/fhem.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=FHEM
+After=network-online.target
+
+[Service]
+Type=simple
+User=fhem
+Group=fhem
+WorkingDirectory=/opt/fhem
+ExecStart=/opt/fhem/fhem.pl /opt/fhem/fhem.cfg
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-misc/fhem/files/fhem.tmpfiles b/app-misc/fhem/files/fhem.tmpfiles
new file mode 100644
index 000000000000..bccf63774dee
--- /dev/null
+++ b/app-misc/fhem/files/fhem.tmpfiles
@@ -0,0 +1 @@
+d /run/fhem 0700 fhem fhem - -