From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EDD311382C5 for ; Thu, 17 Jun 2021 23:24:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D9EDE0824; Thu, 17 Jun 2021 23:24:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C2722E0845 for ; Thu, 17 Jun 2021 23:24:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A5D3E33FE60 for ; Thu, 17 Jun 2021 23:24:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5BA137A1 for ; Thu, 17 Jun 2021 23:24:37 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1623972217.3b9c5b501e5eba7b2de982c676891504b8aeddcd.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-strategy/0ad/0ad-0.0.24b_alpha.ebuild X-VCS-Directories: games-strategy/0ad/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3b9c5b501e5eba7b2de982c676891504b8aeddcd X-VCS-Branch: master Date: Thu, 17 Jun 2021 23:24:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 28fffc63-12ab-43ec-8a90-f3e3314205c2 X-Archives-Hash: 9d623a4ff8ffa18c1e271272005c155c commit: 3b9c5b501e5eba7b2de982c676891504b8aeddcd Author: Nils Freydank posteo de> AuthorDate: Thu Jun 17 20:11:54 2021 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jun 17 23:23:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b9c5b50 games-strategy/0ad: Remove the broken version Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Nils Freydank posteo.de> Closes: https://github.com/gentoo/gentoo/pull/21292 Signed-off-by: Sam James gentoo.org> games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 228 ---------------------------- 1 file changed, 228 deletions(-) diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild deleted file mode 100644 index e8ce2ce4f62..00000000000 --- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild +++ /dev/null @@ -1,228 +0,0 @@ -# Copyright 2014-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WX_GTK_VER="3.0-gtk3" -PYTHON_COMPAT=( python3_{7..9} ) -inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/0ad/0ad" -elif [[ ${PV} == *_pre* ]]; then - ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7" -else - MY_P="0ad-${PV/_/-}" -fi - -DESCRIPTION="A free, real-time strategy game" -HOMEPAGE="https://play0ad.com/" - -if [[ ${PV} == 9999 ]]; then - S="${WORKDIR}/${P}" -elif [[ ${PV} == *_pre* ]]; then - SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}" -else - SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz" - SRC_URI+=" https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz" - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-2.1 MIT ZLIB BitstreamVera LPPL-1.3c" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="editor +lobby nvtt pch test" -RESTRICT="test" - -# virtual/rust is for bundled SpiderMonkey -# Build-time Python dependency is for SM too -# TODO: Unbundle premake5 -# See bug #773472 which may help (bump for it) -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig - virtual/rust - test? ( dev-lang/perl ) -" -# Removed dependency on nvtt as we use the bundled one -# bug #768930 -DEPEND=" - dev-libs/boost:= - dev-libs/icu:= - dev-libs/libfmt:0= - dev-libs/libsodium - dev-libs/libxml2 - media-libs/libpng:0 - media-libs/libsdl2[X,opengl,video] - media-libs/libvorbis - media-libs/openal - net-libs/enet:1.3 - net-libs/miniupnpc:= - net-misc/curl - sys-libs/zlib - virtual/opengl - x11-libs/libX11 - editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) - lobby? ( >=net-libs/gloox-1.0.20 ) -" -RDEPEND=" - ${DEPEND} - !games-strategy/0ad-data -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.0.24_alpha_pre20210116040036-build.patch - "${FILESDIR}"/${PN}-0.0.24b_alpha-rust-1.50.patch - "${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch -) - -pkg_setup() { - use editor && setup-wxwidgets -} - -src_prepare() { - default - - # SpiderMonkey's configure no longer recognises --build for - # the build tuple - sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die - - # Originally from 0ad-data - rm binaries/data/tools/fontbuilder/fonts/*.txt || die -} - -src_configure() { - local myconf=( - --minimal-flags - $(usex nvtt "" "--without-nvtt") - $(usex pch "" "--without-pch") - $(usex test "" "--without-tests") - $(usex editor "--atlas" "") - $(usex lobby "" "--without-lobby") - --bindir="/usr/bin" - --libdir="/usr/$(get_libdir)"/${PN} - --datadir="/usr/share/${PN}" - ) - - tc-export AR CC CXX RANLIB - - # Stock premake5 does not work, use the shipped one - # TODO: revisit this, see above BDEPEND note re premake5 - emake -C "${S}"/build/premake/premake5/build/gmake2.unix - - # Regenerate scripts.c so our patch applies - cd "${S}"/build/premake/premake5 || die - "${S}"/build/premake/premake5/bin/release/premake5 embed || die - - # Rebuild premake again - emake -C "${S}"/build/premake/premake5/build/gmake2.unix clean - emake -C "${S}"/build/premake/premake5/build/gmake2.unix - - # Run premake to create build scripts - cd "${S}"/build/premake || die - "${S}"/build/premake/premake5/bin/release/premake5 \ - --file="premake5.lua" \ - --outpath="../workspaces/gcc/" \ - --os=linux \ - "${myconf[@]}" \ - gmake2 \ - || die "Premake failed" -} - -src_compile() { - # Build 3rd party fcollada - einfo "Building bundled fcollada" - emake -C libraries/source/fcollada/src - - # Build bundled NVTT - # nvtt is abandoned upstream and 0ad have forked it and added fixes. - # Use their copy. bug #768930 - if use nvtt ; then - cd libraries/source/nvtt || die - elog "Building bundled NVTT (bug #768930)" - JOBS="-j$(makeopts_jobs)" ./build.sh || die "Failed to build bundled NVTT" - cd "${S}" || die - fi - - # Build bundled SpiderMonkey - # We really can't use the system SpiderMonkey right now. - # Breakages occur even on minor bumps in upstream SM, - # e.g. bug #768840. - cd libraries/source/spidermonkey || die - elog "Building bundled SpiderMonkey (bug #768840)" - XARGS="${EPREFIX}/usr/bin/xargs" \ - JOBS="-j$(makeopts_jobs)" \ - ./build.sh \ - || die "Failed to build bundled SpiderMonkey" - - cd "${S}" || die - - # Build 0ad itself! - elog "Building 0ad" - JOBS="-j$(makeopts_jobs)" emake -C build/workspaces/gcc verbose=1 - - # Build assets - # (We only do this if we're using a snapshot/non-release) - # See bug #771147 (comment 3) and the old 0ad-data ebuild - # Warning: fragile! - if [[ ${PV} == 9999 || ${PV} == *_pre* ]]; then - # source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName() tries to open /proc/self/task/${TID}/comm for writing. - addpredict /proc/self/task - - # Based on source/tools/dist/build-archives.sh used by source/tools/dist/build.sh. - local archivebuild_input archivebuild_output mod_name - for archivebuild_input in binaries/data/mods/[A-Za-z0-9]*; do - mod_name="${archivebuild_input##*/}" - archivebuild_output="archives/${mod_name}" - - mkdir -p "${archivebuild_output}" || die - - einfo pyrogenesis -archivebuild="${archivebuild_input}" -archivebuild-output="${archivebuild_output}/${mod_name}.zip" - LD_LIBRARY_PATH="binaries/system" binaries/system/pyrogenesis \ - -archivebuild="${archivebuild_input}" \ - -archivebuild-output="${archivebuild_output}/${mod_name}.zip" \ - || die "Failed to build assets" - - if [[ -f "${archivebuild_input}/mod.json" ]]; then - cp "${archivebuild_input}/mod.json" "${archivebuild_output}" || die - fi - - rm -r "${archivebuild_input}" || die - mv "${archivebuild_output}" "${archivebuild_input}" || die - done - - # Based on source/tools/dist/build-unix-win32.sh used by source/tools/dist/build.sh. - rm binaries/data/config/dev.cfg || die - rm -r binaries/data/mods/_test.* || die - fi -} - -src_test() { - cd binaries/system || die - ./test -libdir "${S}/binaries/system" || die "Failed tests" -} - -src_install() { - newbin binaries/system/pyrogenesis 0ad - use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor - - # Merged from 0ad-data - # bug #771147 (comment 3) - insinto /usr/share/${PN} - doins -r binaries/data/{l10n,config,mods,tools} - - # Install bundled SpiderMonkey and nvtt - # bug #771147 (comment 1) - exeinto /usr/$(get_libdir)/${PN} - doexe binaries/system/{libCollada,libmozjs78-ps-release}.so - - use nvtt && doexe binaries/system/{libnvtt,libnvcore,libnvimage,libnvmath}.so - use editor && doexe binaries/system/libAtlasUI.so - - dodoc binaries/system/readme.txt - doicon -s 128 build/resources/${PN}.png - make_desktop_entry ${PN} -}