From 4f49fc7caa0253a7ab164331f55bd4c70bba1bf7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 7 Sep 2022 16:36:21 +0100 Subject: gentoo auto-resync : 07:09:2022 - 16:36:21 --- games-action/minetest/Manifest | 3 +- .../minetest-5.6.0-no_upstream_optflags.patch | 15 +++ games-action/minetest/minetest-5.6.0-r1.ebuild | 144 +++++++++++++++++++++ games-action/minetest/minetest-5.6.0.ebuild | 142 -------------------- 4 files changed, 161 insertions(+), 143 deletions(-) create mode 100644 games-action/minetest/files/minetest-5.6.0-no_upstream_optflags.patch create mode 100644 games-action/minetest/minetest-5.6.0-r1.ebuild delete mode 100644 games-action/minetest/minetest-5.6.0.ebuild (limited to 'games-action/minetest') diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest index 19f0acaa2a34..15d1dde4ae44 100644 --- a/games-action/minetest/Manifest +++ b/games-action/minetest/Manifest @@ -1,9 +1,10 @@ AUX minetest-5.4.1-system_puc_lua.patch 1285 BLAKE2B 773466b132d1e7fdcd2108c7cae9d7538d02319140c91c87b5533c4225fe64077a4400cdddbfa0d96b256fad54ef7b92a5239036789b2af3a57365ac0a305808 SHA512 acb1ddb7e156324b3e4aea2807ba7b708b563bcf70208bad672a1777eb116dd7c812fcd420cdfb3a08b9b3fe4adf8a56b51ee2827439a058a78e8ffc4cb07ea4 +AUX minetest-5.6.0-no_upstream_optflags.patch 639 BLAKE2B f494610f2973fcde7c6a99b7ec8ad99eeb9ff317aeec3708ec191b600d9c8f689ba744c54dcb137a1114972ad93559d8c96f8970b3f04829516899d7b3f228c3 SHA512 45dd5236b3266f09401fb09d9bbf25668876eb83614a28fb4ba1b3c9a6317a3ef8a75388fc99b3e8495d1e36e98d177070af515b522b0002992b80264a56402f AUX minetestserver.confd 310 BLAKE2B b5af3f5e87622fc3e1739f3972b32a3f83fa720476d7398ce55657b2e4d2dc8693748720aa422724b40a1309f79158b37ba9628061db31db3e5757a73c122205 SHA512 4905fb8446d82bdd7ccffcd6f0c2f85de9843107f10d21d73814f54587aab5f6c7716a78bc32cd82c8b7d8443f0492a3a7b5e47d10f2900349047b6ba7ceb2f3 AUX minetestserver.initd 555 BLAKE2B 307f310338ded815dc8a6f8ba29d51ae77ef94a1530125ad82ab3b7dc6d9a1b8a40a48b6dfb53d17230418bc8e5e05ffe5493c897150a853338fb01c8ef21b5b SHA512 b9103841e18586e9877b1a1b7fc9510545d02b947d5558cfee79de09a8c770767aeeb1b29b35bd47bf3670d739996a782f347f2274a94f3b3a9435d37ba566f1 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.6.0.tar.gz 9922682 BLAKE2B 10787b9bbc397d3d214b22640a830fc429bd8292541e0b71b50d05d483f87469cedf03fcf7a898bd83486c55911439a9804eab2bca58cd464a69adaa76b4f820 SHA512 e87c4036f17a61d3e623b2f48e3611ba1bc0177b5d58330fe6e64a74075c78ab7cd5eb7b855097ce98819112a54857324237f7d3b81ec504a1f608444e74a630 -EBUILD minetest-5.6.0.ebuild 3466 BLAKE2B 569cddb23f602c77f69fc8f91ea38bf05ba95f8e3239f65c7e94053f1f8b49be35f7df6c711d3b13b7ddf3e1a5a4290f4f28c7844027e86afec9319f91c9ebae SHA512 2d838e044a5604316a99be5aaed1c5ece9202d6a1d8acb375f727e084c9c4d2357de6ec2aa8a23e755d1c782259be0666e9155a87504c01f4687171d1da1ebac +EBUILD minetest-5.6.0-r1.ebuild 3547 BLAKE2B f3a4685c37243f7b2c54f6f39ae2c4f3223710d95a9b6e6449e6a935b052d915f50dd12ebe9a97f04f8f895fba8c7eea2bd3424094cda9d8393408b4f1b472eb SHA512 1117cd3b90cdffccdf6e31ca0081809a672a34f083d4e8be6062135c003f3752c63eb67626a9867ea9a022f1556873e434644ff98cf1cfeb7dc9446b5f191bd2 MISC metadata.xml 2174 BLAKE2B ad72184bd3f52d94304fb316d325478b03a5751d564174deac0eec4d05dce67f55dabc0e7c0788f9221318ac453802be552a711e35c60cce7f8396afb5fc7a9c SHA512 e3d99fa37f56133a051d8369ee5c8bc60a8e7159683cf11fba95470ff2e00acd2c3987b3d261641e2508a9f8f409e2f7249167a4226f490152ac35e58b476b1b diff --git a/games-action/minetest/files/minetest-5.6.0-no_upstream_optflags.patch b/games-action/minetest/files/minetest-5.6.0-no_upstream_optflags.patch new file mode 100644 index 000000000000..68d71679924b --- /dev/null +++ b/games-action/minetest/files/minetest-5.6.0-no_upstream_optflags.patch @@ -0,0 +1,15 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -756,11 +756,10 @@ + endif() + endif() + +- set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${OTHER_FLAGS} -pipe -funroll-loops") ++ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${OTHER_FLAGS}") + if(CMAKE_SYSTEM_NAME MATCHES "(Darwin|BSD|DragonFly)") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os") + else() +- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -fomit-frame-pointer") + if(CMAKE_SYSTEM_NAME STREQUAL "Linux" + AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang" + AND CMAKE_CXX_COMPILER_VERSION MATCHES "^9\\.") diff --git a/games-action/minetest/minetest-5.6.0-r1.ebuild b/games-action/minetest/minetest-5.6.0-r1.ebuild new file mode 100644 index 000000000000..6d626a4d0046 --- /dev/null +++ b/games-action/minetest/minetest-5.6.0-r1.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_BUILD_TYPE="Release" +LUA_COMPAT=( lua5-1 luajit ) + +inherit cmake flag-o-matic lua-single systemd 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 ~riscv" +IUSE="+client +curl doc leveldb ncurses nls postgres prometheus redis +server +sound spatial test" + +REQUIRED_USE="${LUA_REQUIRED_USE} + || ( client server )" + +RESTRICT="!test? ( test )" + +RDEPEND="${LUA_DEPS} + $(lua_gen_impl_dep 'deprecated' lua5-1) + app-arch/zstd + dev-db/sqlite:3 + dev-libs/gmp:0= + dev-libs/jsoncpp:= + sys-libs/zlib + client? ( + >=dev-games/irrlicht-mt-1.9.0.7 + media-libs/freetype:2 + media-libs/libpng:0= + media-libs/libjpeg-turbo + virtual/opengl + x11-libs/libX11 + x11-libs/libXxf86vm + sound? ( + media-libs/libvorbis + media-libs/openal + ) + ) + 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-mt-headers-1.9.0.7 + ) + spatial? ( sci-libs/libspatialindex:= )" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + app-doc/doxygen + media-gfx/graphviz + ) + nls? ( sys-devel/gettext )" + +PATCHES=( + "${FILESDIR}"/${PN}-5.4.1-system_puc_lua.patch + "${FILESDIR}"/${PN}-5.6.0-no_upstream_optflags.patch +) + +src_prepare() { + cmake_src_prepare + + # remove bundled libraries other than bitop + rm -rf lib/{gmp,jsoncpp,lua} || die + + # To avoid TEXTRELs on riscv + append-flags -fPIC +} + +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_MANDIR="${EPREFIX}/usr/share/man" + -DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}" + -DENABLE_CURL=$(usex curl) + -DENABLE_CURSES=$(usex ncurses) + -DENABLE_GETTEXT=$(usex nls) + -DENABLE_GLES=no + -DENABLE_LEVELDB=$(usex leveldb) + -DENABLE_LUAJIT=$(usex lua_single_target_luajit) + -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 /etc/minetest + fowners root:minetest /etc/minetest + fperms 2750 /etc/minetest + + keepdir /var/log/minetest + fowners minetest:minetest /var/log/minetest + + 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 +} + +pkg_postinst() { + xdg_pkg_postinst +} diff --git a/games-action/minetest/minetest-5.6.0.ebuild b/games-action/minetest/minetest-5.6.0.ebuild deleted file mode 100644 index 586774932b7f..000000000000 --- a/games-action/minetest/minetest-5.6.0.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-1 luajit ) - -inherit cmake flag-o-matic lua-single systemd 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 ~riscv" -IUSE="+client +curl doc leveldb ncurses nls postgres prometheus redis +server +sound spatial test" - -REQUIRED_USE="${LUA_REQUIRED_USE} - || ( client server )" - -RESTRICT="!test? ( test )" - -RDEPEND="${LUA_DEPS} - $(lua_gen_impl_dep 'deprecated' lua5-1) - app-arch/zstd - dev-db/sqlite:3 - dev-libs/gmp:0= - dev-libs/jsoncpp:= - sys-libs/zlib - client? ( - >=dev-games/irrlicht-mt-1.9.0.7 - media-libs/freetype:2 - media-libs/libpng:0= - media-libs/libjpeg-turbo - virtual/opengl - x11-libs/libX11 - x11-libs/libXxf86vm - sound? ( - media-libs/libvorbis - media-libs/openal - ) - ) - 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-mt-headers-1.9.0.7 - ) - spatial? ( sci-libs/libspatialindex:= )" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( - app-doc/doxygen - media-gfx/graphviz - ) - nls? ( sys-devel/gettext )" - -PATCHES=( - "${FILESDIR}"/${PN}-5.4.1-system_puc_lua.patch -) - -src_prepare() { - cmake_src_prepare - - # remove bundled libraries other than bitop - rm -rf lib/{gmp,jsoncpp,lua} || die - - # To avoid TEXTRELs on riscv - append-flags -fPIC -} - -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_MANDIR="${EPREFIX}/usr/share/man" - -DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}" - -DENABLE_CURL=$(usex curl) - -DENABLE_CURSES=$(usex ncurses) - -DENABLE_GETTEXT=$(usex nls) - -DENABLE_GLES=no - -DENABLE_LEVELDB=$(usex leveldb) - -DENABLE_LUAJIT=$(usex lua_single_target_luajit) - -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 /etc/minetest - fowners root:minetest /etc/minetest - fperms 2750 /etc/minetest - - keepdir /var/log/minetest - fowners minetest:minetest /var/log/minetest - - 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 -} - -pkg_postinst() { - xdg_pkg_postinst -} -- cgit v1.2.3