gentoo resync : 29.06.2021

6 files changed, 9 insertions, 8 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 67735dc16946..d7db83cf23fb 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
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.ebuild b/app-misc/fhem/fhem-6.0-r1.ebuild
index 3cdba522132d..9ad9768d8330 100644
--- a/app-misc/fhem/fhem-6.0.ebuild
+++ b/app-misc/fhem/fhem-6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -91,7 +91,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/fhem.initd fhem
 
-	systemd_dounit "${FILESDIR}"/fhem.service
+	systemd_newunit "${FILESDIR}"/fhem.service-r1 fhem.service
 	newtmpfiles "${FILESDIR}"/fhem.tmpfiles fhem.conf
 
 	newman docs/fhem.man fhem.pl.1
diff --git a/app-misc/fhem/files/fhem.service b/app-misc/fhem/files/fhem.service-r1
index 697a10179d40..aaf48fc88c4e 100644
--- a/app-misc/fhem/files/fhem.service
+++ b/app-misc/fhem/files/fhem.service-r1
@@ -1,13 +1,14 @@
 [Unit]
-Description=FHEM
+Description=FHEM Home Automation
 After=network-online.target
 
 [Service]
-Type=simple
+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
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index 3b9b892204be..ad855e8e952f 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -2,5 +2,5 @@ AUX gnote-3.38.1-cstddef.patch 988 BLAKE2B 8281bd3b515d642b57e49e365b76b134a3ccc
 DIST gnote-40.1.tar.xz 3420216 BLAKE2B a84604b25301fb0332da161a7f1f258542f1dfa16a02f34e700280e87393a3eb6d9005a5ed18204b91d0fccea2f6e44738789ab57dae543707650bfce55165c8 SHA512 6f4286fef18b060bb46c1c9f43772df7d9d913d6d1e3e3801e38e277fa660aa213e46f4a825788795f153821f705bbea22df7d1ff90ee949752497274455ad37
 DIST gnote-40.2.tar.xz 3422560 BLAKE2B d7d7fa862e02c1d889c736ae733db503a06db93cfc79c12bd1efa89acbe4a5825d0cf0cab00cfa916566002c1b838d118b37f5b0204f20ac9fcab2f892cccf52 SHA512 e1dc3ed4fb7b7c4f346a4a1e63a2e357b197375caf5d1d2026c159cfda012ace76ad598ecaf8e7d7649fb80abedc0cd4febd369160ddaf4510cfcc6b41185aed
 EBUILD gnote-40.1.ebuild 1561 BLAKE2B d408ae3b6729f5b9bf8e780898224abfbbe4057caa5c50d739c9fbff644f4071ccffa8017a83ced5cd2ef6dbb8aa82ec9fa2116e84b41a1fad30626f0ae772ea SHA512 11d3a079ee001ab75c7df3c382e5dc58de58db141eb5010f694f86c203f6ce4eb2ae96001738a497bc36572d83e04cf4e03e11c58a0cc07efbcc4694c694831b
-EBUILD gnote-40.2.ebuild 1563 BLAKE2B e9112a82cb20c0bfa6cb0d19c2cbc811fbc42251e76f84026cb5e849d728f7042315e4d7d3cafca19dd948b043d5054da938ff87312ed3ae20e09965a991d139 SHA512 070dee31791766de946e674387c3a65e57c5385d58571b07a45d86caa4b251d892064a38d20e94aaa1ebb03c828fe363b66f562af4deb7b7dd31eba5a237ed04
+EBUILD gnote-40.2.ebuild 1570 BLAKE2B dd6ea67038343f856cf83a0703d48258bc6663d976c9c3bf8340700d96b9e5ce2fb6da643c26f2832f6b8f231359650087b21e42752aa3cf4d2f8ac0e27da064 SHA512 e45dcb0f2fb161700ff2fc4b6dd7c7a2fa7d1003c1262623ea79f750d43af6cb30c6c29ea0861afa242afbe28fe30b80caec34fd346db5ccfa92a4513fa317f7
 MISC metadata.xml 342 BLAKE2B 51d98560833845aa6d1f2b9f4c85021fd317434efcd81ba31d106c7b4945acd23cfefc2de2a601ffef3d330adcf93ec0377f69107fa37771d80f7dff056d32ff SHA512 c68c058e279222cc9293a5b97fbf450f95a940a70a32b1adcac3e6276783d2bcc545f39895e92e7bd62c9ac5dc98139dc9800513c2a828895ba1fcf023227d21
diff --git a/app-misc/gnote/gnote-40.2.ebuild b/app-misc/gnote/gnote-40.2.ebuild
index d59f76c84cde..3ad729fd57d2 100644
--- a/app-misc/gnote/gnote-40.2.ebuild
+++ b/app-misc/gnote/gnote-40.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
 
 LICENSE="GPL-3+ FDL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="debug"
 
 # Automagic: