Gentoo Archives: gentoo-commits

From: Adam Feldman <np-hardass@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
Date: Tue, 06 Oct 2020 18:12:28
Message-Id: 1602007924.ccd85b73ed903bd8696a15ca83a70b6b114dc96d.np-hardass@gentoo
1 commit: ccd85b73ed903bd8696a15ca83a70b6b114dc96d
2 Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 6 17:58:06 2020 +0000
4 Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 6 18:12:04 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccd85b73
7
8 games-strategy/freeorion: Bump to 0.4.10.1
9
10 Closes: https://bugs.gentoo.org/show_bug.cgi?id=735768
11 Package-Manager: Portage-2.3.103, Repoman-2.3.23
12 Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>
13
14 games-strategy/freeorion/Manifest | 2 +-
15 ...n-0.4.9_p20200409-r1.ebuild => freeorion-0.4.10.1.ebuild} | 12 ++++++------
16 games-strategy/freeorion/freeorion-9999.ebuild | 12 ++++++------
17 3 files changed, 13 insertions(+), 13 deletions(-)
18
19 diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
20 index a13368d9c41..4f0f36b38b3 100644
21 --- a/games-strategy/freeorion/Manifest
22 +++ b/games-strategy/freeorion/Manifest
23 @@ -1 +1 @@
24 -DIST freeorion-0.4.9_p20200409.tar.gz 124663848 BLAKE2B 7468a386829498c9ca971e686bda216002b6f263fbc0f3784e7898854ad91278441579c1a3e0d1ef2d92b46747d14a17463e46d7ba16f06633e9a5d474ce3b9c SHA512 09fe8db818c3f22bac94577461d9ada082a2c8365cb524948bf13650ea368fcc55043f4df2f9701075011c890a08197e7f7bb13d8884cb41cc8e1346b8538345
25 +DIST freeorion-0.4.10.1.tar.gz 124693099 BLAKE2B d24c481e7be6f718897bb095209673f24cb7d43842f148cf1e8665254970d22449bf7a4ee4ba7a8cb3b5b515d6bed38a24e2862810959a63b29ba9d3c054e6c4 SHA512 b28a8bdc2428778480ff8404ad7d84153939f4f8b4a75f51775354e3e563f7f309d479e499ea1be8b57822d725cc57ece8dd14f2e40360ab6c07d70c917bc256
26
27 diff --git a/games-strategy/freeorion/freeorion-0.4.9_p20200409-r1.ebuild b/games-strategy/freeorion/freeorion-0.4.10.1.ebuild
28 similarity index 85%
29 rename from games-strategy/freeorion/freeorion-0.4.9_p20200409-r1.ebuild
30 rename to games-strategy/freeorion/freeorion-0.4.10.1.ebuild
31 index c1efcaa3e7c..eaf03461b48 100644
32 --- a/games-strategy/freeorion/freeorion-0.4.9_p20200409-r1.ebuild
33 +++ b/games-strategy/freeorion/freeorion-0.4.10.1.ebuild
34 @@ -4,7 +4,7 @@
35 EAPI=7
36
37 PYTHON_COMPAT=( python{3_6,3_7,3_8} )
38 -inherit cmake-utils python-single-r1 xdg
39 +inherit cmake python-single-r1 xdg
40
41 DESCRIPTION="A free turn-based space empire and galactic conquest game"
42 HOMEPAGE="https://www.freeorion.org"
43 @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
44 else
45 KEYWORDS="~amd64"
46 if [[ ${PV} = *_p* ]]; then
47 - COMMIT="1570afb475763b13f5d2f434037ec907da812bb4"
48 + COMMIT=""
49 SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
50 S="${WORKDIR}/${PN}-${COMMIT}"
51 else
52 @@ -35,7 +35,7 @@ BDEPEND="
53 "
54 RDEPEND="
55 $(python_gen_cond_dep '
56 - >=dev-libs/boost-1.67:=[nls,python,threads,${PYTHON_MULTI_USEDEP}]
57 + >=dev-libs/boost-1.58:=[nls,python,threads,${PYTHON_MULTI_USEDEP}]
58 ')
59 !dedicated? (
60 media-libs/freealut
61 @@ -57,7 +57,7 @@ DEPEND="${RDEPEND}"
62 src_prepare() {
63 sed -e "s/-O3//" -i CMakeLists.txt || die
64
65 - cmake-utils_src_prepare
66 + cmake-src_prepare
67 }
68
69 src_configure() {
70 @@ -67,11 +67,11 @@ src_configure() {
71 -DBUILD_HEADLESS="$(usex dedicated)"
72 )
73
74 - cmake-utils_src_configure
75 + cmake-src_configure
76 }
77
78 src_install() {
79 - cmake-utils_src_install
80 + cmake_src_install
81
82 newenvd "${FILESDIR}/${PN}.envd" 99${PN}
83 }
84
85 diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
86 index 048d1b8bf69..0b5fba26ee5 100644
87 --- a/games-strategy/freeorion/freeorion-9999.ebuild
88 +++ b/games-strategy/freeorion/freeorion-9999.ebuild
89 @@ -4,7 +4,7 @@
90 EAPI=7
91
92 PYTHON_COMPAT=( python{3_6,3_7,3_8} )
93 -inherit cmake-utils python-single-r1 xdg
94 +inherit cmake python-single-r1 xdg
95
96 DESCRIPTION="A free turn-based space empire and galactic conquest game"
97 HOMEPAGE="https://www.freeorion.org"
98 @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
99 else
100 KEYWORDS="~amd64"
101 if [[ ${PV} = *_p* ]]; then
102 - COMMIT="1570afb475763b13f5d2f434037ec907da812bb4"
103 + COMMIT=""
104 SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
105 S="${WORKDIR}/${PN}-${COMMIT}"
106 else
107 @@ -35,7 +35,7 @@ BDEPEND="
108 "
109 RDEPEND="
110 $(python_gen_cond_dep '
111 - >=dev-libs/boost-1.67:=[python,threads,${PYTHON_MULTI_USEDEP}]
112 + >=dev-libs/boost-1.60:=[nls,python,threads,${PYTHON_MULTI_USEDEP}]
113 ')
114 !dedicated? (
115 media-libs/freealut
116 @@ -57,7 +57,7 @@ DEPEND="${RDEPEND}"
117 src_prepare() {
118 sed -e "s/-O3//" -i CMakeLists.txt || die
119
120 - cmake-utils_src_prepare
121 + cmake_src_prepare
122 }
123
124 src_configure() {
125 @@ -67,11 +67,11 @@ src_configure() {
126 -DBUILD_HEADLESS="$(usex dedicated)"
127 )
128
129 - cmake-utils_src_configure
130 + cmake_src_configure
131 }
132
133 src_install() {
134 - cmake-utils_src_install
135 + cmake_src_install
136
137 newenvd "${FILESDIR}/${PN}.envd" 99${PN}
138 }