From: "Ronny Gutbrod" <gentoo@tastytea.de>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: games-engines/fs2_open/
Date: Sat, 26 Mar 2022 00:31:52 +0000 (UTC) [thread overview]
Message-ID: <1648248561.bcc15cbd166d73ab594330bfe64b9523d0b430a8.tastytea@gentoo> (raw)
commit: bcc15cbd166d73ab594330bfe64b9523d0b430a8
Author: Jonas Frei <freijon <AT> pm <DOT> me>
AuthorDate: Fri Mar 25 22:49:21 2022 +0000
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Fri Mar 25 22:49:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bcc15cbd
games-engines/fs2_open: Optimized ebuild, removed src_prepare
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jonas Frei <freijon <AT> pm.me>
games-engines/fs2_open/Manifest | 4 ++--
games-engines/fs2_open/fs2_open-21.4.1.ebuild | 32 +++++++++------------------
2 files changed, 12 insertions(+), 24 deletions(-)
diff --git a/games-engines/fs2_open/Manifest b/games-engines/fs2_open/Manifest
index 9a924eb22..fae041c48 100644
--- a/games-engines/fs2_open/Manifest
+++ b/games-engines/fs2_open/Manifest
@@ -1,3 +1,3 @@
-DIST fs2_open-21.4.1-cmake_external_rpavlik-cmake-modules.tar.gz 267464 BLAKE2B d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9 SHA512 0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f
-DIST fs2_open-21.4.1-lib_libRocket.tar.gz 2417905 BLAKE2B 0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2 SHA512 700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346
+DIST fs2_open-21.4.1-ext_libRocket.tar.gz 2417905 BLAKE2B 0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2 SHA512 700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346
+DIST fs2_open-21.4.1-ext_rpavlik-cmake-modules.tar.gz 267464 BLAKE2B d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9 SHA512 0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f
DIST fs2_open-21.4.1.tar.gz 10441595 BLAKE2B ae59cea98420cbdd6f18832fa0b8ba332993db03a53cbea43a96827dc4c7da375b14694ce60b1633d8275daa88ac32029be7b8211b7efd427baaffdd784720d9 SHA512 a4e6821ee2513cabf8b521f672c36c45aca8fc83fd6901ba19f2c0c0c27b3516c60dabfec1bfae43d82da94c628b9160c447ce853c9927dbb5901c7298986226
diff --git a/games-engines/fs2_open/fs2_open-21.4.1.ebuild b/games-engines/fs2_open/fs2_open-21.4.1.ebuild
index 7a2ae2cd9..daeb7d704 100644
--- a/games-engines/fs2_open/fs2_open-21.4.1.ebuild
+++ b/games-engines/fs2_open/fs2_open-21.4.1.ebuild
@@ -16,8 +16,8 @@ DESCRIPTION="FreeSpace2 Source Code Project game engine"
HOMEPAGE="https://github.com/scp-fs2open/fs2open.github.com/"
SRC_URI="
https://github.com/scp-fs2open/fs2open.github.com/archive/refs/tags/release_${_PV}.tar.gz -> ${P}.tar.gz
- https://github.com/asarium/libRocket/archive/${HASH_LIBROCKET}.tar.gz -> ${P}-lib_libRocket.tar.gz
- https://github.com/asarium/cmake-modules/archive/${HASH_CMAKE_MODULES}.tar.gz -> ${P}-cmake_external_rpavlik-cmake-modules.tar.gz
+ https://github.com/asarium/libRocket/archive/${HASH_LIBROCKET}.tar.gz -> ${P}-ext_libRocket.tar.gz
+ https://github.com/asarium/cmake-modules/archive/${HASH_CMAKE_MODULES}.tar.gz -> ${P}-ext_rpavlik-cmake-modules.tar.gz
"
LICENSE="Unlicense MIT Boost-1.0"
@@ -39,31 +39,19 @@ DEPEND="
"
RDEPEND="${DEPEND}"
BDEPEND=""
+PATCHES="
+ ${FILESDIR}/${P}-make-arch-independent.patch
+ ${FILESDIR}/${P}-version-fix.patch
+"
CMAKE_BUILD_TYPE=Release
+
S="${WORKDIR}/fs2open.github.com-release_${_PV}"
src_unpack() {
- unpack ${P}.tar.gz
-
- cd "${S}" || die
- local list=(
- lib_libRocket
- cmake_external_rpavlik-cmake-modules
- )
-
- local i
- for i in "${list[@]}"; do
- tar xf "${DISTDIR}/${P}-${i}.tar.gz" --strip-components 1 -C "${i//_//}" ||
- die "Failed to unpack ${P}-${i}.tar.gz"
- done
-}
-
-src_prepare() {
- eapply "${FILESDIR}/${P}-make-arch-independent.patch"
- eapply "${FILESDIR}/${P}-version-fix.patch"
- eapply_user
- cmake_src_prepare
+ unpack ${A}
+ mv libRocket-${HASH_LIBROCKET}/* "${S}/lib/libRocket/" || die
+ mv cmake-modules-${HASH_CMAKE_MODULES}/* "${S}/cmake/external/rpavlik-cmake-modules/" || die
}
src_install() {
next reply other threads:[~2022-03-26 0:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-26 0:31 Ronny Gutbrod [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-02-13 11:28 [gentoo-commits] repo/proj/guru:master commit in: games-engines/fs2_open/ Andrew Ammerlaan
2021-05-24 7:31 Andrew Ammerlaan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1648248561.bcc15cbd166d73ab594330bfe64b9523d0b430a8.tastytea@gentoo \
--to=gentoo@tastytea.de \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox