public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:master commit in: games-engines/fs2_open/
@ 2021-05-24  7:31 Andrew Ammerlaan
  2021-05-24  7:26 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
  0 siblings, 1 reply; 4+ messages in thread
From: Andrew Ammerlaan @ 2021-05-24  7:31 UTC (permalink / raw
  To: gentoo-commits

commit:     aae6bbc611cf93eea40caf4f6ae9b7e740f74861
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon May 24 07:25:57 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon May 24 07:25:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=aae6bbc6

games-engines/fs2_open: fix PkgMetadataXmlIndentation and VisibleVcsPkg

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 games-engines/fs2_open/fs2_open-21.2.0.ebuild |  2 +-
 games-engines/fs2_open/metadata.xml           | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/games-engines/fs2_open/fs2_open-21.2.0.ebuild b/games-engines/fs2_open/fs2_open-21.2.0.ebuild
index 11720db3a..efd95c55d 100644
--- a/games-engines/fs2_open/fs2_open-21.2.0.ebuild
+++ b/games-engines/fs2_open/fs2_open-21.2.0.ebuild
@@ -16,7 +16,7 @@ EGIT_COMMIT="release_${_PV}"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 
 DEPEND="
 	media-libs/libjpeg-turbo

diff --git a/games-engines/fs2_open/metadata.xml b/games-engines/fs2_open/metadata.xml
index ae3fd23ea..b9e9e9bf5 100644
--- a/games-engines/fs2_open/metadata.xml
+++ b/games-engines/fs2_open/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <maintainer type="person">
-                <name>Jonas Frei</name>
-                <email>freijon@pm.me</email>
-        </maintainer>
-        <longdescription>
-                fs2_open is the game enginge of the FreeSpace2 Source Code Project.
+	<maintainer type="person">
+		<name>Jonas Frei</name>
+		<email>freijon@pm.me</email>
+	</maintainer>
+	<longdescription>
+		fs2_open is the game enginge of the FreeSpace2 Source Code Project.
 		This package is not the complete game, but rather the game engine
 		that runs the game. The game data files have to be installed
 		manually.
-        </longdescription>
-        <upstream>
-                <remote-id type="github">scp-fs2open/fs2open.github.com</remote-id>
-                <bugs-to>https://github.com/scp-fs2open/fs2open.github.com/issues</bugs-to>
-        </upstream>
+	</longdescription>
+	<upstream>
+		<remote-id type="github">scp-fs2open/fs2open.github.com</remote-id>
+		<bugs-to>https://github.com/scp-fs2open/fs2open.github.com/issues</bugs-to>
+	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-engines/fs2_open/
@ 2022-03-26  0:31 Ronny Gutbrod
  0 siblings, 0 replies; 4+ messages in thread
From: Ronny Gutbrod @ 2022-03-26  0:31 UTC (permalink / raw
  To: gentoo-commits

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() {


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-engines/fs2_open/
@ 2023-02-13 11:28 Andrew Ammerlaan
  0 siblings, 0 replies; 4+ messages in thread
From: Andrew Ammerlaan @ 2023-02-13 11:28 UTC (permalink / raw
  To: gentoo-commits

commit:     593f4b4ece99c48299a3a1b9acd4de63e72d914c
Author:     Jonas Frei <freijon <AT> pm <DOT> me>
AuthorDate: Sat Feb 11 13:17:42 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 13:17:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=593f4b4e

games-engines/fs2_open: drop 22.0.0

Signed-off-by: Jonas Frei <freijon <AT> pm.me>

 games-engines/fs2_open/Manifest               |   3 -
 games-engines/fs2_open/fs2_open-22.0.0.ebuild | 103 --------------------------
 2 files changed, 106 deletions(-)

diff --git a/games-engines/fs2_open/Manifest b/games-engines/fs2_open/Manifest
index 2535f772c..7003d611c 100644
--- a/games-engines/fs2_open/Manifest
+++ b/games-engines/fs2_open/Manifest
@@ -1,6 +1,3 @@
-DIST fs2_open-22.0.0-ext_libRocket.tar.gz 2417905 BLAKE2B 0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2 SHA512 700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346
-DIST fs2_open-22.0.0-ext_rpavlik-cmake-modules.tar.gz 267464 BLAKE2B d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9 SHA512 0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f
-DIST fs2_open-22.0.0.tar.gz 10573800 BLAKE2B b75bd9e44679bf2ad441178b7f8175f4429e321d2feeddf2cf5b4391e51f82c15250c36b73f3750326b1cd3ce71ae319042f57432d48a41b5abab9e30a4a76ba SHA512 e57972348073571947ff88e5a392ae0b4eec9d81cbcfe3d0ff3c2b844dd676cb33f727ddb32a0544e9cd3f1ae9b614429ea137b8921ef625fad27a53f1875081
 DIST fs2_open-22.2.0-ext_libRocket.tar.gz 2417905 BLAKE2B 0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2 SHA512 700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346
 DIST fs2_open-22.2.0-ext_rpavlik-cmake-modules.tar.gz 267464 BLAKE2B d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9 SHA512 0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f
 DIST fs2_open-22.2.0.tar.gz 10690003 BLAKE2B 9d751407ee06877e27e18a9295370ed2c97a48ac65c65757ea57ee1f1d7ba36e07cddb9812a62a763eefb842d5df71151243a81e97aa664a8c3123b7b7913255 SHA512 e72ad40f8f52430549f76330f8b34255ae68fff53ced76f56b04ef19d7ce510026c3bb38fcebdb6f3bfaf7db59ca89df5686e8480e883e01b6408d21cb08cc77

diff --git a/games-engines/fs2_open/fs2_open-22.0.0.ebuild b/games-engines/fs2_open/fs2_open-22.0.0.ebuild
deleted file mode 100644
index 8c63d4680..000000000
--- a/games-engines/fs2_open/fs2_open-22.0.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="FreeSpace2 Source Code Project game engine"
-HOMEPAGE="https://github.com/scp-fs2open/fs2open.github.com/"
-
-# Replace "." with "_" in version
-_PV=${PV//./_}
-
-# Current hashes of external repositories:
-HASH_LIBROCKET="ecd648a43aff8a9f3daf064d75ca5725237d5b38"
-HASH_CMAKE_MODULES="7cef9577d6fc35057ea57f46b4986a8a28aeff50"
-
-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}-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"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="clang debug discord"
-
-DEPEND="
-	app-arch/lz4
-	<dev-lang/lua-5.1.6:5.1
-	dev-libs/jansson
-	media-libs/freetype:2
-	media-libs/glu
-	media-libs/libjpeg-turbo
-	media-libs/libpng
-	media-libs/libsdl2
-	media-libs/libtheora
-	media-libs/libvorbis
-	media-libs/mesa
-	media-libs/openal
-	media-video/ffmpeg
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-util/cmake
-	clang? ( sys-devel/clang:= )
-"
-PATCHES=(
-	"${FILESDIR}/${P}-dont-build-lz4.patch"
-	"${FILESDIR}/${P}-make-arch-independent.patch"
-)
-
-CMAKE_BUILD_TYPE=Release
-
-S="${WORKDIR}/fs2open.github.com-release_${_PV}"
-
-src_unpack() {
-	unpack ${A}
-	mv libRocket-${HASH_LIBROCKET}/* "${S}/lib/libRocket/" || die
-	mv cmake-modules-${HASH_CMAKE_MODULES}/* "${S}/cmake/external/rpavlik-cmake-modules/" || die
-}
-
-src_configure() {
-	if use clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		LDFLAGS+=" -fuse-ld=lld"
-	fi
-	cmake_src_configure
-}
-
-src_prepare() {
-	use discord || eapply "${FILESDIR}/${P}-disable-discord.patch"
-	eapply_user
-	cmake_src_prepare
-	use debug && CMAKE_BUILD_TYPE=Debug
-}
-
-src_install() {
-	exeinto "/opt/${PN}"
-	if use debug ; then
-		doexe "${BUILD_DIR}/bin/${PN}_${_PV}-DEBUG"
-	else
-		doexe "${BUILD_DIR}/bin/${PN}_${_PV}"
-	fi
-	insinto "/opt/${PN}"
-	doins "${BUILD_DIR}/bin/libRocketControls.so"
-	doins "${BUILD_DIR}/bin/libRocketControlsLua.so"
-	doins "${BUILD_DIR}/bin/libRocketCore.so"
-	doins "${BUILD_DIR}/bin/libRocketCoreLua.so"
-	doins "${BUILD_DIR}/bin/libRocketDebugger.so"
-	use discord && doins "${BUILD_DIR}/bin/libdiscord-rpc.so"
-}
-
-pkg_postinst() {
-	einfo "This package only generates the engine binary."
-	einfo "The retail Freespace 2 data is required to play the"
-	einfo "original game and most mods."
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-02-13 11:28 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-24  7:31 [gentoo-commits] repo/proj/guru:master commit in: games-engines/fs2_open/ Andrew Ammerlaan
2021-05-24  7:26 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2022-03-26  0:31 [gentoo-commits] repo/proj/guru:master " Ronny Gutbrod
2023-02-13 11:28 Andrew Ammerlaan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox