[gentoo-commits] repo/gentoo:master commit in: app-misc/fhem/, app-misc/fhem/files/

2018-10-10 Thread Patrice Clement
commit: c180ecf6678f1219e453923ac1b71a4ef20f70e2
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Tue Oct  9 07:35:26 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Oct 10 21:58:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c180ecf6

app-misc/fhem: bump to version 5.9.

Also bumped to EAPI=7 and added systemd unit.

Closes: https://bugs.gentoo.org/668110
Signed-off-by: Conrad Kostecki  kostecki.com>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
Closes: https://github.com/gentoo/gentoo/pull/10113
Signed-off-by: Patrice Clement  gentoo.org>

 app-misc/fhem/Manifest|   1 +
 app-misc/fhem/fhem-5.9.ebuild | 104 ++
 app-misc/fhem/files/fhem.service  |  13 +
 app-misc/fhem/files/fhem.tmpfiles |   1 +
 4 files changed, 119 insertions(+)

diff --git a/app-misc/fhem/Manifest b/app-misc/fhem/Manifest
index 2e890afbf59..36c01254018 100644
--- a/app-misc/fhem/Manifest
+++ b/app-misc/fhem/Manifest
@@ -1 +1,2 @@
 DIST fhem-5.8.tar.gz 22139481 BLAKE2B 
444b041b591d3c960036a262e6eb3fda026d4b229a21df16d7817c32a1fd57282a7fbe5559164b760bd9cfad314c2977e7d6f611320d35be090cdb9df66fb8fd
 SHA512 
6cfaa14288ce553a2418db4cb47c719f2d5edbccbde9e76f221cd47cf8a175a67125031c4971f9f9972b218fc709a267757c2abefe6a33be47eb4bb45e23be57
+DIST fhem-5.9.tar.gz 23267499 BLAKE2B 
c2c2e4ab21f82fbe67c9e99aed4d1edd6db889aedac0611b5ba2873667520c4aa63d8553e014563f6f6ee58c5792ae1735853f58c8f4ef0599583b2ed23a9efe
 SHA512 
9f75058e698fc33ec64081695db3eb2511f686dedc3107c87d4377f655c8b204892c6f61141de28970f2ed3f8cef5d24124d17ee20ee71a9eb9318bb17335bb8

diff --git a/app-misc/fhem/fhem-5.9.ebuild b/app-misc/fhem/fhem-5.9.ebuild
new file mode 100644
index 000..622c74eac40
--- /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 000..697a10179d4
--- /dev/null
+++ b/app-misc/fhem/files/fhem.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=

[gentoo-commits] repo/gentoo:master commit in: app-misc/fhem/, app-misc/fhem/files/

2018-07-11 Thread Tony Vroon
commit: 2462b28277708b3d611ea89449f15cd410de4fe1
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Sat Jul  7 22:27:18 2018 +
Commit: Tony Vroon  gentoo  org>
CommitDate: Wed Jul 11 08:20:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2462b282

app-misc/fhem: New package

Closes: https://bugs.gentoo.org/605628
Package-Manager: Portage-2.3.41, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/9110

 app-misc/fhem/Manifest |  1 +
 app-misc/fhem/fhem-5.8.ebuild  | 99 ++
 app-misc/fhem/files/fhem.cfg   | 27 
 app-misc/fhem/files/fhem.initd | 17 
 app-misc/fhem/metadata.xml | 20 +
 5 files changed, 164 insertions(+)

diff --git a/app-misc/fhem/Manifest b/app-misc/fhem/Manifest
new file mode 100644
index 000..2e890afbf59
--- /dev/null
+++ b/app-misc/fhem/Manifest
@@ -0,0 +1 @@
+DIST fhem-5.8.tar.gz 22139481 BLAKE2B 
444b041b591d3c960036a262e6eb3fda026d4b229a21df16d7817c32a1fd57282a7fbe5559164b760bd9cfad314c2977e7d6f611320d35be090cdb9df66fb8fd
 SHA512 
6cfaa14288ce553a2418db4cb47c719f2d5edbccbde9e76f221cd47cf8a175a67125031c4971f9f9972b218fc709a267757c2abefe6a33be47eb4bb45e23be57

diff --git a/app-misc/fhem/fhem-5.8.ebuild b/app-misc/fhem/fhem-5.8.ebuild
new file mode 100644
index 000..70fd300295f
--- /dev/null
+++ b/app-misc/fhem/fhem-5.8.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit 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"
+
+QA_PREBUILT="opt/fhem/contrib/lcd4linux/fritzbox_dpf/lcd4linux
+   opt/fhem/contrib/lcd4linux/rpi_dpf/lcd4linux"
+
+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 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"
+   "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"
+
+   dosym ../../var/lib/fhem /opt/fhem/data
+   dosym ../../var/log/fhem /opt/fhem/log
+
+   default
+
+   newinitd "${FILESDIR}"/fhem.initd fhem
+
+   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.cfg b/app-misc/fhem/files/fhem.cfg
new file mode 100644
index 000..04f7ae9a468
--- /dev/null
+++ b/app-misc/fhem/files/fhem.cfg
@@ -0,0 +1,27 @@
+attr global logfile ./log/fhem-%Y-%m.log
+attr global pidfilename /run/fhem/fhem.pid 
+attr global modpath .
+attr global statefile ./data/fhem.save
+attr global verbose 3
+attr global updateInBackground
+
+define telnetPort telnet 7072 global
+
+define WEB FHEMWEB 8083 global
+
+define WEBphone FHEMWEB 8084 global
+attr WEBphone stylesheetPrefix smallscreen
+
+define WEBtablet FHEMWEB 8085 global
+attr WEBtablet stylesheetPrefix touchpad
+
+# Fake FileLog entry, to access the fhem log from FHEMWEB 
+define Logfile FileLog ./log/fhem-%Y-%m.log fakelog
+
+define autocreate autocreate
+attr autocreate filelog ./dat

[gentoo-commits] repo/gentoo:master commit in: app-misc/fhem/, app-misc/fhem/files/

2021-06-25 Thread Conrad Kostecki
commit: 0cb1146fd6908f526abca2d3e3211fd116175a8e
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Fri Jun 25 23:35:57 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Fri Jun 25 23:38:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cb1146f

app-misc/fhem: update systemd init script

Type must be forking.

Closes: https://bugs.gentoo.org/798318
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki  gentoo.org>

 app-misc/fhem/fhem-6.0-r1.ebuild| 103 
 app-misc/fhem/files/fhem.service-r1 |  14 +
 2 files changed, 117 insertions(+)

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 000..9ad9768d833
--- /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/files/fhem.service-r1 
b/app-misc/fhem/files/fhem.service-r1
new file mode 100644
index 000..aaf48fc88c4
--- /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