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 D2F7513835A for ; Sun, 28 Feb 2021 23:04:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC31BE0958; Sun, 28 Feb 2021 23:04:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 83A6BE0958 for ; Sun, 28 Feb 2021 23:04:46 +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 09D8F340E1B for ; Sun, 28 Feb 2021 23:04:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 77BAB532 for ; Sun, 28 Feb 2021 23:04:43 +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: <1614553469.a18c2bdc043ce8926cf9f247189c8d42f32d0efe.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.23_alpha.ebuild games-strategy/0ad/0ad-0.0.23b_alpha.ebuild games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r1.ebuild games-strategy/0ad/Manifest X-VCS-Directories: games-strategy/0ad/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a18c2bdc043ce8926cf9f247189c8d42f32d0efe X-VCS-Branch: master Date: Sun, 28 Feb 2021 23:04:43 +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: 6609beb5-152b-47ac-b0d0-56143399ba09 X-Archives-Hash: ee82bdea3554ed35b1c1f6237dab2b7f commit: a18c2bdc043ce8926cf9f247189c8d42f32d0efe Author: Sam James gentoo org> AuthorDate: Sun Feb 28 22:27:03 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sun Feb 28 23:04:29 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18c2bdc games-strategy/0ad: remove old broken versions Keep 0.0.24_alpha_pre20210116040036-r2 temporarily just in case. Signed-off-by: Sam James gentoo.org> games-strategy/0ad/0ad-0.0.23_alpha.ebuild | 147 ------------------ games-strategy/0ad/0ad-0.0.23b_alpha.ebuild | 148 ------------------ .../0ad-0.0.24_alpha_pre20210116040036-r1.ebuild | 170 --------------------- games-strategy/0ad/Manifest | 4 +- 4 files changed, 2 insertions(+), 467 deletions(-) diff --git a/games-strategy/0ad/0ad-0.0.23_alpha.ebuild b/games-strategy/0ad/0ad-0.0.23_alpha.ebuild deleted file mode 100644 index 0e44c4e36fb..00000000000 --- a/games-strategy/0ad/0ad-0.0.23_alpha.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -WX_GTK_VER="3.0" - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads,ssl" - -inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1 - -MY_P=0ad-${PV/_/-} -DESCRIPTION="A free, real-time strategy game" -HOMEPAGE="https://play0ad.com/" -SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz" - -LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="editor +lobby nvtt pch test" -RESTRICT="test" - -RDEPEND=" - dev-libs/boost:= - dev-libs/icu:= - dev-libs/libsodium - dev-libs/libxml2 - dev-libs/nspr - ~games-strategy/0ad-data-${PV} - 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/jpeg:0 - virtual/opengl - x11-libs/libX11 - x11-libs/libXcursor - editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) - lobby? ( >=net-libs/gloox-1.0.20 ) - nvtt? ( media-gfx/nvidia-texture-tools )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig - test? ( dev-lang/perl )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - python-any-r1_pkg_setup - use editor && setup-wxwidgets -} - -PATCHES=( - "${FILESDIR}"/${PN}-0.0.21_alpha-gentoo.patch -) - -src_configure() { - local myconf=( - --with-system-nvtt - --with-system-miniupnpc - --minimal-flags - $(usex nvtt "" "--without-nvtt") - $(usex pch "" "--without-pch") - $(usex test "" "--without-tests") - $(usex editor "--atlas" "") - $(usex lobby "" "--without-lobby") - --collada - --bindir="/usr/bin" - --libdir="/usr/$(get_libdir)"/${PN} - --datadir="/usr/share/${PN}" - ) - - # stock premake4 does not work, use the shipped one - emake -C "${S}"/build/premake/premake4/build/gmake.unix - - # regenerate scripts.c so our patch applies - cd "${S}"/build/premake/premake4 || die - "${S}"/build/premake/premake4/bin/release/premake4 embed || die - - # rebuild premake again... this is the most stupid build system - emake -C "${S}"/build/premake/premake4/build/gmake.unix clean - emake -C "${S}"/build/premake/premake4/build/gmake.unix - - # run premake to create build scripts - cd "${S}"/build/premake || die - "${S}"/build/premake/premake4/bin/release/premake4 \ - --file="premake4.lua" \ - --outpath="../workspaces/gcc/" \ - --platform=$(usex amd64 "x64" "x32") \ - --os=linux \ - "${myconf[@]}" \ - gmake || die "Premake failed" -} - -src_compile() { - tc-export AR - - # build bundled and patched spidermonkey - cd libraries/source/spidermonkey || die - JOBS="${MAKEOPTS}" ./build.sh || die - cd "${S}" || die - - # build 3rd party fcollada - emake -C libraries/source/fcollada/src - - # build 0ad - emake -C build/workspaces/gcc verbose=1 -} - -src_test() { - cd binaries/system || die - ./test -libdir "${S}/binaries/system" || die "test phase failed" -} - -src_install() { - newbin binaries/system/pyrogenesis 0ad - use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor - - insinto /usr/share/${PN} - doins -r binaries/data/l10n - - exeinto /usr/$(get_libdir)/${PN} - doexe binaries/system/libCollada.so - doexe libraries/source/spidermonkey/lib/*.so - use editor && doexe binaries/system/libAtlasUI.so - - dodoc binaries/system/readme.txt - doicon -s 128 build/resources/${PN}.png - make_desktop_entry ${PN} -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild deleted file mode 100644 index 174ce6ff0cd..00000000000 --- a/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -WX_GTK_VER="3.0" - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads,ssl" - -inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1 - -MY_P=0ad-${PV/_/-} -DESCRIPTION="A free, real-time strategy game" -HOMEPAGE="https://play0ad.com/" -SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz" - -LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="editor +lobby nvtt pch test" -RESTRICT="test" - -RDEPEND=" - dev-libs/boost:= - dev-libs/icu:= - dev-libs/libsodium - dev-libs/libxml2 - dev-libs/nspr - ~games-strategy/0ad-data-${PV} - 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/jpeg:0 - virtual/opengl - x11-libs/libX11 - x11-libs/libXcursor - editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) - lobby? ( >=net-libs/gloox-1.0.20 ) - nvtt? ( media-gfx/nvidia-texture-tools )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig - test? ( dev-lang/perl )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - python-any-r1_pkg_setup - use editor && setup-wxwidgets -} - -PATCHES=( - "${FILESDIR}"/${PN}-0.0.21_alpha-gentoo.patch - "${FILESDIR}"/${PN}-0.0.23b-header_includes_fix.patch -) - -src_configure() { - local myconf=( - --with-system-nvtt - --with-system-miniupnpc - --minimal-flags - $(usex nvtt "" "--without-nvtt") - $(usex pch "" "--without-pch") - $(usex test "" "--without-tests") - $(usex editor "--atlas" "") - $(usex lobby "" "--without-lobby") - --collada - --bindir="/usr/bin" - --libdir="/usr/$(get_libdir)"/${PN} - --datadir="/usr/share/${PN}" - ) - - # stock premake4 does not work, use the shipped one - emake -C "${S}"/build/premake/premake4/build/gmake.unix - - # regenerate scripts.c so our patch applies - cd "${S}"/build/premake/premake4 || die - "${S}"/build/premake/premake4/bin/release/premake4 embed || die - - # rebuild premake again... this is the most stupid build system - emake -C "${S}"/build/premake/premake4/build/gmake.unix clean - emake -C "${S}"/build/premake/premake4/build/gmake.unix - - # run premake to create build scripts - cd "${S}"/build/premake || die - "${S}"/build/premake/premake4/bin/release/premake4 \ - --file="premake4.lua" \ - --outpath="../workspaces/gcc/" \ - --platform=$(usex amd64 "x64" "x32") \ - --os=linux \ - "${myconf[@]}" \ - gmake || die "Premake failed" -} - -src_compile() { - tc-export AR - - # build bundled and patched spidermonkey - cd libraries/source/spidermonkey || die - JOBS="${MAKEOPTS}" ./build.sh || die - cd "${S}" || die - - # build 3rd party fcollada - emake -C libraries/source/fcollada/src - - # build 0ad - emake -C build/workspaces/gcc verbose=1 -} - -src_test() { - cd binaries/system || die - ./test -libdir "${S}/binaries/system" || die "test phase failed" -} - -src_install() { - newbin binaries/system/pyrogenesis 0ad - use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor - - insinto /usr/share/${PN} - doins -r binaries/data/l10n - - exeinto /usr/$(get_libdir)/${PN} - doexe binaries/system/libCollada.so - doexe libraries/source/spidermonkey/lib/*.so - use editor && doexe binaries/system/libAtlasUI.so - - dodoc binaries/system/readme.txt - doicon -s 128 build/resources/${PN}.png - make_desktop_entry ${PN} -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r1.ebuild b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r1.ebuild deleted file mode 100644 index a138651fac2..00000000000 --- a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r1.ebuild +++ /dev/null @@ -1,170 +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" -inherit desktop toolchain-funcs wxwidgets xdg - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/0ad/0ad" - ZEROAD_GIT_REVISION="" -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 - SRC_URI="" -elif [[ ${PV} == *_pre* ]]; then - SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz -> ${P}.tar.gz" -else - SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz" -fi - -LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-2.1 MIT ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="editor +lobby nvtt pch test" -RESTRICT="test" - -BDEPEND="virtual/pkgconfig - test? ( dev-lang/perl )" -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 ) - nvtt? ( >=media-gfx/nvidia-texture-tools-2.1.0 )" - -RDEPEND="${DEPEND}" -PDEPEND="~games-strategy/0ad-data-${PV}" - -if [[ ${PV} == 9999 ]]; then - S="${WORKDIR}/${P}" -elif [[ ${PV} == *_pre* ]]; then - S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}" -else - S="${WORKDIR}/${MY_P}" -fi - -PATCHES=( - "${FILESDIR}/${PN}-0.0.24_alpha_pre20210116040036-build.patch" -) - -pkg_setup() { - use editor && setup-wxwidgets -} - -src_prepare() { - default - - sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || 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 CC CXX - - # stock premake5 does not work, use the shipped one - 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... this is the most stupid build system - 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() { - tc-export AR - - # 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)" - ./build.sh || die "Failed to build bundled nvtt" - cd "${S}" || die - fi - - # build bundled spidermonkey - # We genuinely 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" ./build.sh || die "Failed to build bundled SpiderMonkey" - cd "${S}" || die - - # build 0ad - elog "Building 0ad" - emake -C build/workspaces/gcc verbose=1 -} - -src_test() { - cd binaries/system || die - ./test -libdir "${S}/binaries/system" || die "test phase failed" -} - -src_install() { - newbin binaries/system/pyrogenesis 0ad - use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor - - insinto /usr/share/${PN} - doins -r binaries/data/l10n - - exeinto /usr/$(get_libdir)/${PN} - doexe binaries/system/libCollada.so - use editor && doexe binaries/system/libAtlasUI.so - - dodoc binaries/system/readme.txt - doicon -s 128 build/resources/${PN}.png - make_desktop_entry ${PN} -} diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest index de55f565987..5d2ea27d724 100644 --- a/games-strategy/0ad/Manifest +++ b/games-strategy/0ad/Manifest @@ -1,3 +1,3 @@ -DIST 0ad-0.0.23-alpha-unix-build.tar.xz 31907988 BLAKE2B 567b9e1b5cd653206194e042f4f0859cd4f9afe75d52d3f480a328b76fdcdd746254502fbf284f790b4932c912ff31453bbc8c986c879ad76baa3d2a5db802c9 SHA512 4a1c86b19e0d8ec7d9b8bf75428df0255f95e7f991f419734f9b6ddc288a537405a34c5d7081f1a97475155c49013af85dee5c0265c35c7dbc003b46637a03d7 -DIST 0ad-0.0.23b-alpha-unix-build.tar.xz 31922812 BLAKE2B db7d6bf1a2bb084870b914cf974bfdb19812ff6f9391e5bc5213ae215fc670b77bd4508a5432aa3e47bf327bd37d4bb14961ab3332b165b53327c3f01a935ac1 SHA512 82934313c46c4fd89e3841d5bbf901904abbd2108e9749529d7282bd24ac53b9e6878681c06e6019f4d8ec0e425c28300b0aafc9610a66a331777ffb58ed6135 DIST 0ad-0.0.24_alpha_pre20210116040036.tar.gz 2562395684 BLAKE2B 03d6655f7aa1f2f91a87536a7f2afa465585856c4209ddc05e666e1e5596416883596331118ac4257ff314b04d8a5c08821eaa6ae76e5d3095146ab04f8c79ed SHA512 e1239a56b184a87708c87fc03ca41190a16d813e495c5d81ee073df98761f1524a23902e5d03a21a1b1f657b496fce6eeee4a5ef22eee30f70fbe3b0dbd44510 +DIST 0ad-0.0.24b-alpha-unix-build.tar.xz 75546740 BLAKE2B a724abba6bed4b580670588e9dcfe0f75f6cef0fbde6ad666356e96213c685932edd0a1daafb5dd04206870c2c8222340c9c51e83076ec2911cbb5377ca00666 SHA512 8173d393eb1bc57c38bef0076ba973ef46c877c06644365189c0887cd3152adba51d26b553e42221fd14343e9830a3a275bfcd9b28f66281e282ea3f247730ea +DIST 0ad-0.0.24b-alpha-unix-data.tar.xz 828553992 BLAKE2B 2081225d88d475ed0899648994a900677bc3280bb2ba6cf92354ece82b90ddcefddb48458fa23e2de97100e58f4db8db408d4b50d0306a8c3efe47d263064bf0 SHA512 d7804d25ddf376028f230a31c6fc1201dfa366b3d5434569a1a7852bb4c400fb14e5c8934c5d6c6295320cf2e62c64be83b1e3c4c27fd116115bfe7d01106726