From 9aa80713372911cec499b3adb2cd746790920916 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 29 Jun 2021 10:15:54 +0100 Subject: gentoo resync : 29.06.2021 --- app-misc/fhem/Manifest | 4 +- app-misc/fhem/fhem-6.0-r1.ebuild | 103 ++++++++++++++++++++++++++++++++++++ app-misc/fhem/fhem-6.0.ebuild | 103 ------------------------------------ app-misc/fhem/files/fhem.service | 13 ----- app-misc/fhem/files/fhem.service-r1 | 14 +++++ 5 files changed, 119 insertions(+), 118 deletions(-) create mode 100644 app-misc/fhem/fhem-6.0-r1.ebuild delete mode 100644 app-misc/fhem/fhem-6.0.ebuild delete mode 100644 app-misc/fhem/files/fhem.service create mode 100644 app-misc/fhem/files/fhem.service-r1 (limited to 'app-misc/fhem') diff --git a/app-misc/fhem/Manifest b/app-misc/fhem/Manifest index eb208cbd4f2e..eb4ef44a8ed7 100644 --- a/app-misc/fhem/Manifest +++ b/app-misc/fhem/Manifest @@ -1,7 +1,7 @@ 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.service-r1 240 BLAKE2B e52d6d324db876a1b477f09a480b8a7053af9bfc7264d3cc1fc35f7dfd9401c4a415867d7ac295f4750d6633abe9b9f24b7250c7dfeed31799597f42157a209d SHA512 87f10593f57eb5775a729005ec28fc0d5673044eea7a38ddcb32596ba6b26cd52d866fc2c1eb71985bffd3820f8574f965f42341761bb0ac95d042dca39d8320 AUX fhem.tmpfiles 31 BLAKE2B 57659fe7fe189d03cd1fdbd073421f2215b90db9d2c00b335ca3b98b7c42b23085c9ccadd85fc40c5c21e393c571bacc6804b06dc47de88bfcfe4384d7be88f8 SHA512 4e29020ae5d114c6ab3ad1935a8b4b1b4d6d521771554130304534f69a0ec6961f93b64ad45aabeeff9ab1a73dbe97187922f845c849565105801edffc1ac0ce DIST fhem-6.0.tar.gz 28562819 BLAKE2B 4bc4f232caf0adc35ded72f380c1d4c816a22304af357f9b204fb856c2053038e3db2d834b7448d3cf43e84d3f435a36d047e48606b9e1083ab4963b38a75301 SHA512 a8e9d74b1d68ad7c9aea0a4d463aa877cb607458cb6ecf76203c96ff2156fd8b8a3b9cb5687ac0a5cd1eca5f94552433de55f3696b7be54a3cfa8df9cf74fbe1 -EBUILD fhem-6.0.ebuild 2317 BLAKE2B 70e5ed672a3d19c57fc6824f982ee7cfe57624f3142e6da27e4fe00f48f00e4d9eb9f0014c9ce7e24128350cbae53c8d0f8c8fbb61b4432d74e0c294403f3584 SHA512 a86a1c857ebd4917da525631198b39f6562b6aec69bc47c32afd83adbcf42806b3693093372bc1a0b5a9f2402f6cfaddc7e831faaef6c676f43f759c647efa03 +EBUILD fhem-6.0-r1.ebuild 2334 BLAKE2B 1569c1749c5f173e735b580e99244872bca75127e129704d6cc23311277bc2f49175ed3d49ef00080fbb93e442abffc8835468d93ee15d5c6e10208b7ae54cdb SHA512 0f35daca32cc0f4448830edf08ebcac54c7e210ee686215f105f82da9483447628b73f9cc38bdc0f1e16c78fd24b30fe48febb9323c49397a5a22259f3ba22f2 MISC metadata.xml 648 BLAKE2B 7d812ebc3a0e960a7a3eb744d339820af256c558220e3bc3e041751a253890be6227f7b6a19df7ceec363318800c18838fa6923a0d5c71049fc1352416d6d9f7 SHA512 4518524695a6efbfe86db125d625bb5fe58174c74968e336a34f648bf2784832eea99f322e340c922aca9c5ab43d50f3f4d0334377eed4447ea1f3c5ea6e995a diff --git a/app-misc/fhem/fhem-6.0-r1.ebuild b/app-misc/fhem/fhem-6.0-r1.ebuild new file mode 100644 index 000000000000..9ad9768d8330 --- /dev/null +++ b/app-misc/fhem/fhem-6.0-r1.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd tmpfiles + +DESCRIPTION="A GPL'd perl server for house automation" +HOMEPAGE="https://www.fhem.de/" +SRC_URI="https://www.fhem.de/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 x86" +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_newunit "${FILESDIR}"/fhem.service-r1 fhem.service + newtmpfiles "${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 deleted file mode 100644 index 3cdba522132d..000000000000 --- a/app-misc/fhem/fhem-6.0.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd tmpfiles - -DESCRIPTION="A GPL'd perl server for house automation" -HOMEPAGE="https://www.fhem.de/" -SRC_URI="https://www.fhem.de/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -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 - newtmpfiles "${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 deleted file mode 100644 index 697a10179d40..000000000000 --- a/app-misc/fhem/files/fhem.service +++ /dev/null @@ -1,13 +0,0 @@ -[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.service-r1 b/app-misc/fhem/files/fhem.service-r1 new file mode 100644 index 000000000000..aaf48fc88c4e --- /dev/null +++ b/app-misc/fhem/files/fhem.service-r1 @@ -0,0 +1,14 @@ +[Unit] +Description=FHEM Home Automation +After=network-online.target + +[Service] +Type=forking +User=fhem +Group=fhem +WorkingDirectory=/opt/fhem +ExecStart=/opt/fhem/fhem.pl /opt/fhem/fhem.cfg +Restart=always + +[Install] +WantedBy=multi-user.target -- cgit v1.2.3