gentoo resync : 22.05.2021

10 files changed, 124 insertions, 190 deletions

diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index 21489de2e5b5..29991d8f0ca3 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1,8 +1,10 @@
-AUX minetestserver.confd 313 BLAKE2B 51af7c8d6c23461028774e459d3ff24a867102ac56c239da056e31ba800ec0904d4ad2daa26a9fd5069ecffc2fded37a8409d966403456c239e78d2a7c369345 SHA512 75442376afb031ad65880fd2b9cad034c520c7bed489543d5e1cee65fc998d0ae082d5736528dcdfaca41681b01ee895d7e0471f8581e8f0cba1a8cbbe20b3bc
+AUX minetest-5.4.1-gcc11.patch 605 BLAKE2B d067b6bf6250fa9928c01220fb0da2c8ffc093c949840767db6cf2b84fbe889fd9ed2546c953048d02116f015a279622c1ada29ce1df6e3b254b0d0e9e56083d SHA512 f42b8c3c38b40a9f22eca7947360ae4d786ff0775f46b4184c3fe014b64958c89828bae314acd8bfe99246a452c818527b5d3c5c1c0b813ed0a82c43b915125b
+AUX minetest-5.4.1-system_puc_lua.patch 1285 BLAKE2B 773466b132d1e7fdcd2108c7cae9d7538d02319140c91c87b5533c4225fe64077a4400cdddbfa0d96b256fad54ef7b92a5239036789b2af3a57365ac0a305808 SHA512 acb1ddb7e156324b3e4aea2807ba7b708b563bcf70208bad672a1777eb116dd7c812fcd420cdfb3a08b9b3fe4adf8a56b51ee2827439a058a78e8ffc4cb07ea4
+AUX minetestserver.confd 310 BLAKE2B b5af3f5e87622fc3e1739f3972b32a3f83fa720476d7398ce55657b2e4d2dc8693748720aa422724b40a1309f79158b37ba9628061db31db3e5757a73c122205 SHA512 4905fb8446d82bdd7ccffcd6f0c2f85de9843107f10d21d73814f54587aab5f6c7716a78bc32cd82c8b7d8443f0492a3a7b5e47d10f2900349047b6ba7ceb2f3
 AUX minetestserver.initd 555 BLAKE2B 307f310338ded815dc8a6f8ba29d51ae77ef94a1530125ad82ab3b7dc6d9a1b8a40a48b6dfb53d17230418bc8e5e05ffe5493c897150a853338fb01c8ef21b5b SHA512 b9103841e18586e9877b1a1b7fc9510545d02b947d5558cfee79de09a8c770767aeeb1b29b35bd47bf3670d739996a782f347f2274a94f3b3a9435d37ba566f1
-AUX minetestserver.logrotate 85 BLAKE2B 72ca62554a0146305cbafd9050378252bc4214c23a71d1f43041bd78ad332f25e834de3ae382f383ef8aef40fccb4849343fe23223ad2032efd16a12c10022f8 SHA512 19fe1e9264f195ea178cade577cea5cd93f7de1ceaab14ee00cafc051e1ec8f2e2ceac89557a00a3dd7838002e30da622f90a313776de2ad35aab10c68b6ec14
-DIST minetest-5.4.0.tar.gz 11205196 BLAKE2B 4fd03cf75c6ace4a8e3b1fc81826a43df4a6ea68c7dbdc33cda948e5c81fb49440341f148943c7300036d4063fafb0104fc42a8a29a0495df65d4c66f0d4eb46 SHA512 4cb43678c56ee2ccf9d5dd9c1fc0007119d598a4a56df43fc2a1b827efe08feba0008a30bdb1a1fcd4efe0ada88484b7be0c9e46f108d5424451adb0999b0bcb
+AUX minetestserver.logrotate 71 BLAKE2B 9189610adc6e78be5249163e3daa02ebcb73822bed9939df3a807ec47e753e9952b3ac7932327164ae5dcf1ef149f55fdb898b1818412b994572f8ef6b4615e4 SHA512 82de44aa5670113d6a244c7cc662e6f4001510c6766490375f226d2abd4d7749310e8a21d282408a711478bf8449ab15036d9a914657e2ca4699395d32d8b21b
+AUX minetestserver_default.service 371 BLAKE2B a52989d01e7df20facac1796079e38d2145e72eb43868f19ba7ea573cf025d4aea346f7ddfc5e7001d70c6d43609d877be5af95956cc344df2b5c7e318bf07f1 SHA512 dbca1a2cc4b615310ff179f4fb803e05d856e04d8316c9d30807d12788b41e8f1ef87f510ff2db0114237a8d0640c3af3d31cc77a2bd23395e247d86710606e9
+AUX minetestserver_template.service 353 BLAKE2B 8f4231481a23c1ef29523533955e373b50669d6a61a818fe5c36b29be54ec21669f6c0e17ea6675795eb2630be08dcb053ae1843789d615dddb1664ec96f6c55 SHA512 ff9584b709df5f8f6a8544954da7a6ef593ac0b8bad2352a459c6eb97c684104f47708952882bf6b7216b7636328a1ff533b97bbc08cd300f1a47d2af71ac895
 DIST minetest-5.4.1.tar.gz 11209289 BLAKE2B a8517309ee98c3991e7ce2d67bb8d14a5697a299b480835c79b1e3c7161ebc94f6245f36c09d88903c052fca1de52fe0253f055059c3d72745c724d117d9753a SHA512 8f9985c6a658c868ed8971f112eae3c71c2b1535fd433689920be6d42ac2c7eb8453d58ec2825573764ee2f56b651c5e27895b7fd58fada61fbaf4758fc69471
-EBUILD minetest-5.4.0.ebuild 3468 BLAKE2B 4f143a3891ea938afdeeadd731fd75a141c7037836a8bb2304658db063ad4b4e04a0d285e076e3358ff6221f0c50b7c5a4e1ebd4d9a62ad3a0432d811016d57b SHA512 336f739ff228875e88a3d5c2680ff395341962b102a6a5637d7e93a9f80f28014fe12d548151b1679f09b7c04fdaaa0c4c6b143066912fc5e6e660a77653d0f9
-EBUILD minetest-5.4.1.ebuild 3468 BLAKE2B 4f143a3891ea938afdeeadd731fd75a141c7037836a8bb2304658db063ad4b4e04a0d285e076e3358ff6221f0c50b7c5a4e1ebd4d9a62ad3a0432d811016d57b SHA512 336f739ff228875e88a3d5c2680ff395341962b102a6a5637d7e93a9f80f28014fe12d548151b1679f09b7c04fdaaa0c4c6b143066912fc5e6e660a77653d0f9
-MISC metadata.xml 2334 BLAKE2B 54ba41eec9bd0c5099ff5e6850cf6413c6571f2321a928a71d4bb5d01a7eb44e703c80bad4c534b7e240521661c3faca8b5c7e6edde699c3be0daf4df9bd162f SHA512 660f8c7cf899fdbff19fde69e4f5e135cdc009497a4a640f51af92579620c0d805c803c3c38b751c21ce12ed8abb93422f72f8e2a5326b2a0323384d741085b1
+EBUILD minetest-5.4.1-r1.ebuild 3368 BLAKE2B e5b5e84f77c57a313c4f5c8859e74efc340949cc0331374f4498d6b09d28ef878860344e9ae892305df45974a271039de6fa1dc038769dda8eccffa6557705d6 SHA512 e00070979c30c808ca760a40b8eb98d8a077f63b05d0aec68f010933e0c79ed9f753e67c52f0d79852ca6b55447617b1968a91a32235797c386f467a34e89c89
+MISC metadata.xml 2173 BLAKE2B acf6384d65075fd5a9ea29365777e29a450b19e7f10d0a97791c3a5b86c624987d027190b4f8d67edf458255cfd8242060829bd5cfb050e6d6f731373e20cc5c SHA512 02b71f33bc8ffecc62f8cac1e82c21bcaaf5c9369ed6dd8b7e99e5dbc9b77d613d2106677e1538789956646d7050b56cc40a2b5bde0117f66ac2319defb5f2b5
diff --git a/games-action/minetest/files/minetest-5.4.1-gcc11.patch b/games-action/minetest/files/minetest-5.4.1-gcc11.patch
new file mode 100644
index 000000000000..bb37cdf31e07
--- /dev/null
+++ b/games-action/minetest/files/minetest-5.4.1-gcc11.patch
@@ -0,0 +1,21 @@
+From 7c2826cbc0f36027d4a9781f433150d1c5d0d03f Mon Sep 17 00:00:00 2001
+From: lhofhansl <larsh@apache.org>
+Date: Thu, 6 May 2021 10:24:30 -0700
+Subject: [PATCH] Fix build for newer versions of GCC (#11246)
+
+---
+ src/clientiface.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/clientiface.h b/src/clientiface.h
+index cc5292b71bf9..dfd97674137c 100644
+--- a/src/clientiface.h
++++ b/src/clientiface.h
+@@ -31,6 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
+ #include <list>
+ #include <vector>
+ #include <set>
++#include <memory>
+ #include <mutex>
+ 
+ class MapBlock;
diff --git a/games-action/minetest/files/minetest-5.4.1-system_puc_lua.patch b/games-action/minetest/files/minetest-5.4.1-system_puc_lua.patch
new file mode 100644
index 000000000000..7f49b427e8ee
--- /dev/null
+++ b/games-action/minetest/files/minetest-5.4.1-system_puc_lua.patch
@@ -0,0 +1,39 @@
+Upstream build scripts use either system LuaJIT or bundled PUC Lua 5.1.
+Make it possible to use the system version of the latter too.
+
+--- a/cmake/Modules/FindLua.cmake
++++ b/cmake/Modules/FindLua.cmake
+@@ -2,27 +2,12 @@
+ # This selects LuaJIT by default
+ 
+ option(ENABLE_LUAJIT "Enable LuaJIT support" TRUE)
+-set(USE_LUAJIT FALSE)
+-option(REQUIRE_LUAJIT "Require LuaJIT support" FALSE)
+-if(REQUIRE_LUAJIT)
+-	set(ENABLE_LUAJIT TRUE)
+-endif()
+ if(ENABLE_LUAJIT)
+-	find_package(LuaJIT)
+-	if(LUAJIT_FOUND)
+-		set(USE_LUAJIT TRUE)
+-		message (STATUS "Using LuaJIT provided by system.")
+-	elseif(REQUIRE_LUAJIT)
+-		message(FATAL_ERROR "LuaJIT not found whereas REQUIRE_LUAJIT=\"TRUE\" is used.\n"
+-			"To continue, either install LuaJIT or do not use REQUIRE_LUAJIT=\"TRUE\".")
+-	endif()
++	find_package(LuaJIT REQUIRED)
++	set(USE_LUAJIT TRUE)
++	message (STATUS "Using LuaJIT provided by system.")
+ else()
+-	message (STATUS "LuaJIT detection disabled! (ENABLE_LUAJIT=0)")
+-endif()
+-
+-if(NOT USE_LUAJIT)
+-	message(STATUS "LuaJIT not found, using bundled Lua.")
+-	set(LUA_LIBRARY lua)
+-	set(LUA_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/lua/src)
+-	add_subdirectory(lib/lua)
++	find_package(Lua51 REQUIRED)
++	set(USE_LUAJIT FALSE)
++	message(STATUS "Using Lua5.1 provided by system.")
+ endif()
diff --git a/games-action/minetest/files/minetestserver.confd b/games-action/minetest/files/minetestserver.confd
index 7a6f9b12ff01..b383fbd3e33b 100644
--- a/games-action/minetest/files/minetestserver.confd
+++ b/games-action/minetest/files/minetestserver.confd
@@ -4,13 +4,13 @@
 USER="minetest"
 
 # group
-GROUP="@GROUP@"
+GROUP="minetest"
 
 # pidfile
-PIDFILE="/var/run/minetest.pid"
+PIDFILE="/run/minetest.pid"
 
 # executable
-MINETESTBIN="@BINDIR@/minetestserver"
+MINETESTBIN="/usr/bin/minetestserver"
 
 # additional arguments for the server
 ARGS="--logfile /var/log/minetest/minetest-server.log"
diff --git a/games-action/minetest/files/minetestserver.logrotate b/games-action/minetest/files/minetestserver.logrotate
index 0ec4823663aa..2e38adfc5f50 100644
--- a/games-action/minetest/files/minetestserver.logrotate
+++ b/games-action/minetest/files/minetestserver.logrotate
@@ -1,4 +1,4 @@
-/var/log/minetest/minetest-server.log {
+/var/log/minetest/*.log {
 	rotate 5
 	weekly
 	missingok
diff --git a/games-action/minetest/files/minetestserver_default.service b/games-action/minetest/files/minetestserver_default.service
new file mode 100644
index 000000000000..e2754abaaf12
--- /dev/null
+++ b/games-action/minetest/files/minetestserver_default.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Minetest multiplayer server (server config minetest.conf)
+Documentation=man:minetestserver(6)
+After=network.target
+
+[Service]
+Restart=on-failure
+User=minetest
+Group=minetest
+ExecStart=/usr/bin/minetestserver --config /etc/minetest/minetest.conf --logfile /var/log/minetest/minetest-server.log
+StandardOutput=null
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/games-action/minetest/files/minetestserver_template.service b/games-action/minetest/files/minetestserver_template.service
new file mode 100644
index 000000000000..a945de53e870
--- /dev/null
+++ b/games-action/minetest/files/minetestserver_template.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Minetest multiplayer server (server config %i.conf)
+Documentation=man:minetestserver(6)
+After=network.target
+
+[Service]
+Restart=on-failure
+User=minetest
+Group=minetest
+ExecStart=/usr/bin/minetestserver --config /etc/minetest/%i.conf --logfile /var/log/minetest/%i-server.log
+StandardOutput=null
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/games-action/minetest/metadata.xml b/games-action/minetest/metadata.xml
index 41104cf6b215..dae30ac4e48d 100644
--- a/games-action/minetest/metadata.xml
+++ b/games-action/minetest/metadata.xml
@@ -29,13 +29,9 @@
 		* Runs natively on Windows, Linux, OS X and FreeBSD.
 		* Supports multiple languages, translated by the community.
 	</longdescription>
-	<maintainer type="person" proxied="yes">
-		<email>vilhelm.gray@gmail.com</email>
-		<name>William Breathitt Gray</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>games@gentoo.org</email>
@@ -52,7 +48,7 @@
 	</use>
 	<upstream>
 		<bugs-to>https://github.com/minetest/minetest/issues</bugs-to>
-		<doc lang="en">http://wiki.minetest.net/Main_Page</doc>
+		<doc lang="en">https://wiki.minetest.net/Main_Page</doc>
 		<remote-id type="github">minetest/minetest</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-action/minetest/minetest-5.4.0.ebuild b/games-action/minetest/minetest-5.4.1-r1.ebuild
index 6304747349ed..401043e97758 100644
--- a/games-action/minetest/minetest-5.4.0.ebuild
+++ b/games-action/minetest/minetest-5.4.1-r1.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-LUA_COMPAT=( luajit )
+LUA_COMPAT=( lua5-1 luajit )
 
-inherit cmake lua-single xdg
+inherit cmake lua-single systemd xdg
 
 DESCRIPTION="A free open-source voxel game engine with easy modding and game creation"
 HOMEPAGE="https://www.minetest.net"
@@ -62,15 +62,14 @@ BDEPEND="
 	)
 	nls? ( sys-devel/gettext )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.1-gcc11.patch
+	"${FILESDIR}"/${PN}-5.4.1-system_puc_lua.patch
+)
+
 src_prepare() {
 	cmake_src_prepare
 
-	# set paths
-	sed \
-		-e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \
-		-e "s#@GROUP@#${PN}#g" \
-		"${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
-
 	# remove bundled libraries
 	rm -rf lib || die
 }
@@ -91,7 +90,7 @@ src_configure() {
 		-DENABLE_GETTEXT=$(usex nls)
 		-DENABLE_GLES=0
 		-DENABLE_LEVELDB=$(usex leveldb)
-		-DENABLE_LUAJIT=1
+		-DENABLE_LUAJIT=$(usex lua_single_target_luajit)
 		-DENABLE_POSTGRESQL=$(usex postgres)
 		-DENABLE_PROMETHEUS=$(usex prometheus)
 		-DENABLE_REDIS=$(usex redis)
@@ -108,7 +107,7 @@ src_configure() {
 src_compile() {
 	cmake_src_compile
 
-	if use doc ; then
+	if use doc; then
 		cmake_src_compile doc
 		HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
 	fi
@@ -117,13 +116,20 @@ src_compile() {
 src_install() {
 	cmake_src_install
 
-	if use server ; then
+	if use server; then
+		keepdir /etc/minetest
+		fowners root:minetest /etc/minetest
+		fperms 2750 /etc/minetest
+
 		keepdir /var/log/minetest
 		fowners minetest:minetest /var/log/minetest
 
-		newconfd "${T}"/minetestserver.confd minetest-server
+		newconfd "${FILESDIR}"/minetestserver.confd minetest-server
 		newinitd "${FILESDIR}"/minetestserver.initd minetest-server
 
+		systemd_newunit "${FILESDIR}"/minetestserver_default.service minetest-server.service
+		systemd_newunit "${FILESDIR}"/minetestserver_template.service minetest-server@.service
+
 		insinto /etc/logrotate.d
 		newins "${FILESDIR}"/minetestserver.logrotate minetest-server
 	fi
@@ -131,17 +137,4 @@ src_install() {
 
 pkg_postinst() {
 	xdg_pkg_postinst
-
-	if use server ; then
-		elog
-		elog "Configure your server via /etc/conf.d/minetest-server"
-		elog
-	fi
-
-	elog
-	elog "The version 5.x series is not compatible to the version 0.4 series."
-	elog "This applies to clients and servers, other content such as mods,"
-	elog "texture packs and worlds is unaffected and backwards-compatible"
-	elog "as usual."
-	elog
 }
diff --git a/games-action/minetest/minetest-5.4.1.ebuild b/games-action/minetest/minetest-5.4.1.ebuild
deleted file mode 100644
index 6304747349ed..000000000000
--- a/games-action/minetest/minetest-5.4.1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( luajit )
-
-inherit cmake lua-single xdg
-
-DESCRIPTION="A free open-source voxel game engine with easy modding and game creation"
-HOMEPAGE="https://www.minetest.net"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client +curl doc +leveldb ncurses nls postgres prometheus redis +server +sound spatial test +truetype"
-REQUIRED_USE="
-	${LUA_REQUIRED_USE}
-	|| ( client server )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${LUA_DEPS}
-	dev-db/sqlite:3
-	dev-libs/gmp:0=
-	dev-libs/jsoncpp:=
-	sys-libs/zlib
-	client? (
-		app-arch/bzip2
-		dev-games/irrlicht
-		media-libs/libpng:0=
-		virtual/jpeg:0
-		virtual/opengl
-		x11-libs/libX11
-		x11-libs/libXxf86vm
-		sound? (
-			media-libs/libogg
-			media-libs/libvorbis
-			media-libs/openal
-		)
-		truetype? ( media-libs/freetype:2 )
-	)
-	curl? ( net-misc/curl )
-	leveldb? ( dev-libs/leveldb:= )
-	ncurses? ( sys-libs/ncurses:0= )
-	nls? ( virtual/libintl )
-	postgres? ( >=dev-db/postgresql-9.5:= )
-	prometheus? ( dev-cpp/prometheus-cpp )
-	redis? ( dev-libs/hiredis:= )
-	server? (
-		acct-group/minetest
-		acct-user/minetest
-		dev-games/irrlicht-headers
-	)
-	spatial? ( sci-libs/libspatialindex:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# set paths
-	sed \
-		-e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \
-		-e "s#@GROUP@#${PN}#g" \
-		"${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
-
-	# remove bundled libraries
-	rm -rf lib || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CLIENT=$(usex client)
-		-DBUILD_SERVER=$(usex server)
-		-DBUILD_UNITTESTS=$(usex test)
-		-DCUSTOM_BINDIR="${EPREFIX}/usr/bin"
-		-DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DCUSTOM_LOCALEDIR="${EPREFIX}/usr/share/${PN}/locale"
-		-DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}"
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_CURSES=$(usex ncurses)
-		-DENABLE_FREETYPE=$(usex truetype)
-		-DENABLE_GETTEXT=$(usex nls)
-		-DENABLE_GLES=0
-		-DENABLE_LEVELDB=$(usex leveldb)
-		-DENABLE_LUAJIT=1
-		-DENABLE_POSTGRESQL=$(usex postgres)
-		-DENABLE_PROMETHEUS=$(usex prometheus)
-		-DENABLE_REDIS=$(usex redis)
-		-DENABLE_SPATIAL=$(usex spatial)
-		-DENABLE_SOUND=$(usex sound)
-		-DENABLE_SYSTEM_GMP=1
-		-DENABLE_SYSTEM_JSONCPP=1
-		-DRUN_IN_PLACE=0
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc ; then
-		cmake_src_compile doc
-		HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	if use server ; then
-		keepdir /var/log/minetest
-		fowners minetest:minetest /var/log/minetest
-
-		newconfd "${T}"/minetestserver.confd minetest-server
-		newinitd "${FILESDIR}"/minetestserver.initd minetest-server
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/minetestserver.logrotate minetest-server
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use server ; then
-		elog
-		elog "Configure your server via /etc/conf.d/minetest-server"
-		elog
-	fi
-
-	elog
-	elog "The version 5.x series is not compatible to the version 0.4 series."
-	elog "This applies to clients and servers, other content such as mods,"
-	elog "texture packs and worlds is unaffected and backwards-compatible"
-	elog "as usual."
-	elog
-}