public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
Date: Sat, 11 May 2019 08:24:00 +0000 (UTC)	[thread overview]
Message-ID: <1557562034.3046156a2fb06292c3c7380d4332592c2f79ac18.asturm@gentoo> (raw)

commit:     3046156a2fb06292c3c7380d4332592c2f79ac18
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 10 20:50:41 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 11 08:07:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3046156a

games-strategy/freeorion: Sync live with 0.4.8_p20190501 changes

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 games-strategy/freeorion/freeorion-9999.ebuild | 70 ++++++++++++--------------
 1 file changed, 32 insertions(+), 38 deletions(-)

diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index 578e570e2ff..2c29c8b5c26 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -7,43 +7,51 @@ PYTHON_COMPAT=( python2_7 )
 inherit cmake-utils python-single-r1 xdg
 
 DESCRIPTION="A free turn-based space empire and galactic conquest game"
-HOMEPAGE="http://www.freeorion.org"
+HOMEPAGE="https://www.freeorion.org"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/freeorion/freeorion.git"
 else
-	MY_PV="${PV/_/-}"
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-${MY_PV}"
+	if [[ ${PV} = *_p* ]]; then
+		COMMIT="2a49c05796f1c92b96ce9b2aeaf0124fc8be7a77"
+		SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${PN}-${COMMIT}"
+	else
+		SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${PN}-${PV/_/-}"
+	fi
 fi
 
 LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
 SLOT="0"
-IUSE=""
+IUSE="dedicated"
 
-RDEPEND="
-	>=dev-libs/boost-1.56:=[python,threads,${PYTHON_USEDEP}]
-	media-libs/freealut
-	media-libs/freetype
-	media-libs/glew:=
-	media-libs/libsdl2
-	>=media-libs/libogg-1.1.3
-	media-libs/libpng:0
-	media-libs/libsdl2[X,opengl,video]
-	>=media-libs/libvorbis-1.1.2
-	media-libs/openal
-	sci-physics/bullet
-	sys-libs/zlib
-	virtual/opengl
-	!dev-games/gigi"
-	# Use bundled gigi as of freeorion-0.4.3
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="${RDEPEND}"
 BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=dev-libs/boost-1.58:=[python,threads,${PYTHON_USEDEP}]
+	!dedicated? (
+		media-libs/freealut
+		>=media-libs/freetype-2.5.5
+		media-libs/glew:=
+		>=media-libs/libogg-1.1.3
+		media-libs/libpng:0=
+		media-libs/libsdl2[X,opengl,video]
+		>=media-libs/libvorbis-1.1.2
+		media-libs/openal
+		sci-physics/bullet
+		virtual/opengl
+	)
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	virtual/pkgconfig"
+"
 
 pkg_setup() {
 	# build system is using FindPythonLibs.cmake which needs python:2
@@ -60,28 +68,14 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_BUILD_TYPE=Release
 		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_HEADLESS="$(usex dedicated)"
 	)
 
-	#append-cppflags -DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL
-
 	cmake-utils_src_configure
 }
 
 src_install() {
 	cmake-utils_src_install
-	dodoc ChangeLog.md
 
 	newenvd "${FILESDIR}/${PN}.envd" 99${PN}
 }
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}


             reply	other threads:[~2019-05-11  8:24 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-11  8:24 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-22  3:07 [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/ Ionen Wolkens
2024-06-01  5:32 Ionen Wolkens
2024-05-26 14:52 Ionen Wolkens
2024-05-05 23:44 Ionen Wolkens
2024-05-05 23:44 Ionen Wolkens
2024-05-05 23:44 Ionen Wolkens
2023-02-08 13:45 Ionen Wolkens
2023-02-08 12:32 Ionen Wolkens
2022-07-25  6:11 Ionen Wolkens
2022-07-25  6:11 Ionen Wolkens
2022-07-24 15:03 Ionen Wolkens
2022-07-24 15:03 Ionen Wolkens
2022-05-14  2:32 Sam James
2022-05-14  2:32 Sam James
2021-07-01 16:02 Adam Feldman
2021-07-01 16:02 Adam Feldman
2021-06-18 19:18 David Seifert
2020-10-12  3:19 Adam Feldman
2020-10-06 18:12 Adam Feldman
2020-05-09 15:31 Adam Feldman
2020-04-09 20:55 Adam Feldman
2020-04-09 20:55 Adam Feldman
2020-02-09 16:25 Michał Górny
2019-08-12 19:58 Michał Górny
2019-05-11  8:24 Andreas Sturmlechner
2019-04-23 10:05 Lars Wendler
2018-03-27  4:06 NP Hardass
2017-12-08  0:35 NP Hardass
2017-12-04  6:27 NP Hardass
2017-09-13 19:48 NP Hardass
2017-05-07  6:36 NP Hardass
2017-04-26 18:43 NP Hardass
2017-04-25 18:58 NP Hardass
2017-03-16  4:24 NP Hardass
2017-03-16  4:24 NP Hardass
2016-10-25  8:55 Thomas Kahle
2015-09-29 12:16 Thomas Kahle

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=1557562034.3046156a2fb06292c3c7380d4332592c2f79ac18.asturm@gentoo \
    --to=asturm@gentoo.org \
    --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