[gentoo-commits] repo/gentoo:master commit in: games-strategy/uqm/, games-strategy/uqm/files/

2021-06-22 Thread Ionen Wolkens 
commit: 2484bfe40619649111cc3b90c6fe62fd02fc40c1
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jun 22 23:43:57 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jun 23 02:22:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2484bfe4

games-strategy/uqm: drop 0.7.0.1

Signed-off-by: Ionen Wolkens  gentoo.org>

 games-strategy/uqm/Manifest  |   5 -
 games-strategy/uqm/files/uqm-0.7.0-tempdir.patch |  14 ---
 games-strategy/uqm/files/uqm-0.7.0-warning.patch |  29 --
 games-strategy/uqm/uqm-0.7.0.1.ebuild| 119 ---
 4 files changed, 167 deletions(-)

diff --git a/games-strategy/uqm/Manifest b/games-strategy/uqm/Manifest
index 4d1d520099b..0de656b099a 100644
--- a/games-strategy/uqm/Manifest
+++ b/games-strategy/uqm/Manifest
@@ -1,7 +1,3 @@
-DIST uqm-0.7.0-1-source.tgz 1591613 BLAKE2B 
400309aced671a23bf325b95bb471db2e5b9aa59a0c868bc1cf971e71ad22a7a555c68fc15be1c574e4b4a8f58b0c18c4a5f85c188b494e20b36bd09ba6de02b
 SHA512 
77255e7e4cc195d4db7f02bb95e76d41c0d72cb179b30a8cd944c4c78560485d76ad89b0bbd03102e5718d66f3b16050ef73a30b6bc8d31e1c0bfa46758badaa
-DIST uqm-0.7.0-3domusic.uqm 18980671 BLAKE2B 
e86828b8a4a2ae7aee7469a9792c3ba7f472208fe33de46f2797024331a290c1092fcae4a1d599fa002d9cd9ef0248df6cb6cda673d3c0ef90c55ae4a38afd56
 SHA512 
e7d723194685388813d72e1add9a710ecd3de9b33381dfe66acee6c31a31634ee9031ecc83c2003a5222b9381efe150a2f2a9289f8505d842182ca03b012183b
-DIST uqm-0.7.0-content.uqm 11538533 BLAKE2B 
8b654f47d8d2e66dac197b10b96fdfc62907cafc6b5b9046a84588d539349263012c5cb235a428e2cb9a8840b1ff7565035f810a8445892b3c272bb629769348
 SHA512 
c80aa9f1158d07534abc1ef625662dfcd5021cb5e8091d46b3e9a2d96a0fffbe7e9e6cc88680b43d810c8e68a580f7a0d4b62c08e9f7b948ae7f017e4ad20dd2
-DIST uqm-0.7.0-voice.uqm 115143439 BLAKE2B 
397bf018e128fc3ac95f40e087b809af58d935549489a1f317495d13be166317f2108eee9d1d5dc2283ef486df70d90aeb1808c29fd78d016fae504189a78625
 SHA512 
693a4869f8567637b112138f8a074b65919776175addbd353e3601085ee4e4bb4758daca64921c902463f5dc38baa6f7fda4ad32f3cf1786646ef48f15cdeb80
 DIST uqm-0.8.0-3domusic.uqm 18980671 BLAKE2B 
56e2eb59026fb039e068206d0490e2449e95500c78b7aad6bf2f0e639332bbc207eea6942d89b841f5cd96b506936fbd9070fb52f00bc7034a5eeddac07da235
 SHA512 
23704a1f2ee5818aed2fa6e7e69252d0f101b2e9ce03ce1f2904d3d3bd28397287e983baebffacec34d149b7e0427294c9e42fc003f3e32d2e760de67b557ab7
 DIST uqm-0.8.0-content.uqm 11547353 BLAKE2B 
f68f880e194390770dcec230c00053422cd9968486cd8918012c348e49ef925dca1cd4487fb426003d4be8e30966467603e8d57bf7e0c2269e1400e909e7e1c5
 SHA512 
52219d00cae79f0184119f6c1ec66c1e41539b40540b7e59baf225d42708a8b54b56368497129e5dbf20a77379fd36aa7d4f019cace90b40f3029e98b03eccd3
 DIST uqm-0.8.0-src.tgz 1611401 BLAKE2B 
aa7363e42c0d4cf0d3ed09e1fdb47b417dc440e22bffbb208d815f096975c95c7284aa222b3f55464b35df90894d59d5c571bbb4d3b9258c68b6043dbac22305
 SHA512 
7e964aaccd69e2d775f9e5f42a01b40b2b6d9188741330e56ecaf3888a664b33aa4271418081b7a9193a093e9fa466c947e08a6931c6b91797005a0093f19217
@@ -10,4 +6,3 @@ DIST uqm-remix-disc1.uqm 50188876 BLAKE2B 
02bf183aa9ef5460831d4bbcfa90ce4745814d
 DIST uqm-remix-disc2.uqm 60282662 BLAKE2B 
c556a99adfb11c8b90cf1de272ce5d42aaf7ec16d246572286646328ddd24b0928f013c8de7806e6545b436c2fa152e0cfd7f4851769992848d6aecb0379a433
 SHA512 
3053693417facef6d01cdb366a15c1bd2a6272961df5870c4151a928845dd76e4ac5fc59f232da5034d56fd9476d3074840a2e9f16d63dba341aeffd92827c4e
 DIST uqm-remix-disc3.uqm 39924875 BLAKE2B 
f5f495f2c3aca9d6a9a95df51379398a823cb795d85d0ccaa719676d54d7b1dbe9d1b41724eb13fabf62359d6aa72d90615de1f437e2ffde7066436fdebeb13b
 SHA512 
2337752e3a2447ab048cc6782153bbb120d2d6b890c5bfae9cbef60a46d12abf716917863286b0196bf6f5e8ef301b5f84338237520880b10cbf75e450076951
 DIST uqm-remix-disc4-1.uqm 87927958 BLAKE2B 
e1a603b07bb4d0535ff69fd7ef5f85f71cacf4fe4c95d559228ecac0a925ff4fa5f2117955e3477fd14facbfd0881994929a3f3cfdd8f62eb70d9e4314728fa6
 SHA512 
93030505d7dfc0f9de1f5d8c2a26c07b67540d67202ccfb71f6223730fbe92285011bd76dba8ff751d3e28025489a51d4804947164f9118a8e0bb742fd7803e3
-DIST uqm-remix-disc4.uqm 86545760 BLAKE2B 
d644e537ccf234ff846525d70ebe9bd910f68db78f9c7e8dc72b768f24acd98e8db587592352d575bb919561ef5c7dcf09a7e414d31d519475915c65cf65f9b7
 SHA512 
07f0fbe0b9889602eab43f376577c8e0a19c6db50bbb3f01f57836c7caab1eb18813e94d8d9f2d3098a6b6c9dc336290b7f5262c586f2fb41ffab0e2b0ba7f65

diff --git a/games-strategy/uqm/files/uqm-0.7.0-tempdir.patch 
b/games-strategy/uqm/files/uqm-0.7.0-tempdir.patch
deleted file mode 100644
index dbb693c660a..000
--- a/games-strategy/uqm/files/uqm-0.7.0-tempdir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# leaves files lying around bug #576098
-
-diff -ru uqm-0.7.0.orig/build/unix/config_functions 
uqm-0.7.0/build/unix/config_functions
 uqm-0.7.0.orig/build/unix/config_functions 2011-05-20 15:25:22.0 
-0400
-+++ uqm-0.7.0/build/unix/config_functions  2016-03-09 02:46:41.512465876 
-0500
-@@ -16,7 +16,7 @@
- #  Foundation, Inc.,

[gentoo-commits] repo/gentoo:master commit in: games-strategy/uqm/

2021-06-17 Thread Ionen Wolkens 
commit: 912a10cd32090d189fd4ebd571aa9dcbef1668ee
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Jun 18 03:44:22 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Jun 18 03:44:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=912a10cd

games-strategy/uqm: restore plainc for portability

Signed-off-by: Ionen Wolkens  gentoo.org>

 games-strategy/uqm/uqm-0.8.0.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-strategy/uqm/uqm-0.8.0.ebuild 
b/games-strategy/uqm/uqm-0.8.0.ebuild
index 2a4d9852e97..084f28188da 100644
--- a/games-strategy/uqm/uqm-0.8.0.ebuild
+++ b/games-strategy/uqm/uqm-0.8.0.ebuild
@@ -37,6 +37,7 @@ src_prepare() {
default
 
cat > config.state <<-EOF || die
+   CHOICE_accel_VALUE='plainc'
CHOICE_debug_VALUE='nodebug'
CHOICE_mikmod_VALUE='external'
INPUT_install_prefix_VALUE='${EPREFIX}/usr'

[gentoo-commits] repo/gentoo:master commit in: games-strategy/uqm/

2021-06-17 Thread Ionen Wolkens 
commit: 1004397402340ede70ee07ee102372f044ddb008
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Jun 18 03:25:58 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Jun 18 03:37:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10043974

games-strategy/uqm: tidy metadata and use descriptions

Original music is notably not (large) at all.

Signed-off-by: Ionen Wolkens  gentoo.org>

 games-strategy/uqm/metadata.xml | 24 
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/games-strategy/uqm/metadata.xml b/games-strategy/uqm/metadata.xml
index 0a1a6fc92ac..9695c0c1152 100644
--- a/games-strategy/uqm/metadata.xml
+++ b/games-strategy/uqm/metadata.xml
@@ -1,16 +1,16 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-ga...@gentoo.org
-Gentoo Games Project
-  
-  
-download and install music files (large)
-download and install music remix files (large)
-download and install voice files (large)
-  
-  
-sc2
-  
+   
+   ga...@gentoo.org
+   Gentoo Games Project
+   
+   
+   download and install original 3DO music 
files
+   download and install remixed music files 
(large)
+   download and install voice files 
(large)
+   
+   
+   sc2
+

[gentoo-commits] repo/gentoo:master commit in: games-strategy/uqm/

2021-06-17 Thread Ionen Wolkens 
commit: 02d7c65f978c4093fb32f43c3c28891d3f16cffa
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Jun 18 03:27:53 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Jun 18 03:37:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02d7c65f

games-strategy/uqm: add 0.8.0 with reworked ebuild

Compared to previous notably removes the wrapper script, install man page,
install svg icon, respects MAKEOPTS jobs, add missing licenses, and removes
upstreamed warning patch on top of other cleanups.

Now using SDL2.

Closes: https://bugs.gentoo.org/784617
Signed-off-by: Ionen Wolkens  gentoo.org>

 games-strategy/uqm/Manifest |  5 +++
 games-strategy/uqm/uqm-0.8.0.ebuild | 77 +
 2 files changed, 82 insertions(+)

diff --git a/games-strategy/uqm/Manifest b/games-strategy/uqm/Manifest
index 75488825594..4d1d520099b 100644
--- a/games-strategy/uqm/Manifest
+++ b/games-strategy/uqm/Manifest
@@ -2,7 +2,12 @@ DIST uqm-0.7.0-1-source.tgz 1591613 BLAKE2B 
400309aced671a23bf325b95bb471db2e5b9
 DIST uqm-0.7.0-3domusic.uqm 18980671 BLAKE2B 
e86828b8a4a2ae7aee7469a9792c3ba7f472208fe33de46f2797024331a290c1092fcae4a1d599fa002d9cd9ef0248df6cb6cda673d3c0ef90c55ae4a38afd56
 SHA512 
e7d723194685388813d72e1add9a710ecd3de9b33381dfe66acee6c31a31634ee9031ecc83c2003a5222b9381efe150a2f2a9289f8505d842182ca03b012183b
 DIST uqm-0.7.0-content.uqm 11538533 BLAKE2B 
8b654f47d8d2e66dac197b10b96fdfc62907cafc6b5b9046a84588d539349263012c5cb235a428e2cb9a8840b1ff7565035f810a8445892b3c272bb629769348
 SHA512 
c80aa9f1158d07534abc1ef625662dfcd5021cb5e8091d46b3e9a2d96a0fffbe7e9e6cc88680b43d810c8e68a580f7a0d4b62c08e9f7b948ae7f017e4ad20dd2
 DIST uqm-0.7.0-voice.uqm 115143439 BLAKE2B 
397bf018e128fc3ac95f40e087b809af58d935549489a1f317495d13be166317f2108eee9d1d5dc2283ef486df70d90aeb1808c29fd78d016fae504189a78625
 SHA512 
693a4869f8567637b112138f8a074b65919776175addbd353e3601085ee4e4bb4758daca64921c902463f5dc38baa6f7fda4ad32f3cf1786646ef48f15cdeb80
+DIST uqm-0.8.0-3domusic.uqm 18980671 BLAKE2B 
56e2eb59026fb039e068206d0490e2449e95500c78b7aad6bf2f0e639332bbc207eea6942d89b841f5cd96b506936fbd9070fb52f00bc7034a5eeddac07da235
 SHA512 
23704a1f2ee5818aed2fa6e7e69252d0f101b2e9ce03ce1f2904d3d3bd28397287e983baebffacec34d149b7e0427294c9e42fc003f3e32d2e760de67b557ab7
+DIST uqm-0.8.0-content.uqm 11547353 BLAKE2B 
f68f880e194390770dcec230c00053422cd9968486cd8918012c348e49ef925dca1cd4487fb426003d4be8e30966467603e8d57bf7e0c2269e1400e909e7e1c5
 SHA512 
52219d00cae79f0184119f6c1ec66c1e41539b40540b7e59baf225d42708a8b54b56368497129e5dbf20a77379fd36aa7d4f019cace90b40f3029e98b03eccd3
+DIST uqm-0.8.0-src.tgz 1611401 BLAKE2B 
aa7363e42c0d4cf0d3ed09e1fdb47b417dc440e22bffbb208d815f096975c95c7284aa222b3f55464b35df90894d59d5c571bbb4d3b9258c68b6043dbac22305
 SHA512 
7e964aaccd69e2d775f9e5f42a01b40b2b6d9188741330e56ecaf3888a664b33aa4271418081b7a9193a093e9fa466c947e08a6931c6b91797005a0093f19217
+DIST uqm-0.8.0-voice.uqm 115164704 BLAKE2B 
957ea3bd0c4ab2b0d59af249faece5641dd763c219c56e73baf825f36cc09a5d72c9da1707ae3b43553577f3051527da013a494a580e73d2f673896e64936467
 SHA512 
5735087284931d593e76ef7429f0dd1da792f51d0c623574284795199c2a1ff3f2664ad931149a49bfdb756457e704dc6fefa08fcc6b9ffdc63f3916627abd10
 DIST uqm-remix-disc1.uqm 50188876 BLAKE2B 
02bf183aa9ef5460831d4bbcfa90ce4745814de017700d7e6dcb1a065dff2a37d47239fdacbb2ba7639a788d795ac45579952aa7f78b760aa9dc8e3aa9d2ccde
 SHA512 
fed2a6e260ee96802898ad9b6c968acaac3613187fe38370fb557d6d220b499b922447ea04edd15763d0161f5c156ce03bc9d55a86ed3b4e2e0140a4fb17e99b
 DIST uqm-remix-disc2.uqm 60282662 BLAKE2B 
c556a99adfb11c8b90cf1de272ce5d42aaf7ec16d246572286646328ddd24b0928f013c8de7806e6545b436c2fa152e0cfd7f4851769992848d6aecb0379a433
 SHA512 
3053693417facef6d01cdb366a15c1bd2a6272961df5870c4151a928845dd76e4ac5fc59f232da5034d56fd9476d3074840a2e9f16d63dba341aeffd92827c4e
 DIST uqm-remix-disc3.uqm 39924875 BLAKE2B 
f5f495f2c3aca9d6a9a95df51379398a823cb795d85d0ccaa719676d54d7b1dbe9d1b41724eb13fabf62359d6aa72d90615de1f437e2ffde7066436fdebeb13b
 SHA512 
2337752e3a2447ab048cc6782153bbb120d2d6b890c5bfae9cbef60a46d12abf716917863286b0196bf6f5e8ef301b5f84338237520880b10cbf75e450076951
+DIST uqm-remix-disc4-1.uqm 87927958 BLAKE2B 
e1a603b07bb4d0535ff69fd7ef5f85f71cacf4fe4c95d559228ecac0a925ff4fa5f2117955e3477fd14facbfd0881994929a3f3cfdd8f62eb70d9e4314728fa6
 SHA512 
93030505d7dfc0f9de1f5d8c2a26c07b67540d67202ccfb71f6223730fbe92285011bd76dba8ff751d3e28025489a51d4804947164f9118a8e0bb742fd7803e3
 DIST uqm-remix-disc4.uqm 86545760 BLAKE2B 
d644e537ccf234ff846525d70ebe9bd910f68db78f9c7e8dc72b768f24acd98e8db587592352d575bb919561ef5c7dcf09a7e414d31d519475915c65cf65f9b7
 SHA512 
07f0fbe0b9889602eab43f376577c8e0a19c6db50bbb3f01f57836c7caab1eb18813e94d8d9f2d3098a6b6c9dc336290b7f5262c586f2fb41ffab0e2b0ba7f65

diff --git a/games-strategy/uqm/uqm-0.8.0.ebuild 
b/games-strategy/uqm/uqm-0.8.0.ebuild
new file mode 100644
index 000..2a4d9852e97
--- /dev/null
+++

[gentoo-commits] repo/gentoo:master commit in: games-strategy/uqm/

2018-07-15 Thread James Le Cuirot 
commit: b4fb84082fed670697efdb2c245d3671c2799b2d
Author: Jimi Huotari  gentoo  org>
AuthorDate: Fri Jul 13 12:30:07 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jul 15 19:01:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4fb8408

games-strategy/uqm: version bump to 0.7.0.1

Also bump to EAPI 7.

Thanks to: Joshua Clayton  gmail.com>

Closes: https://bugs.gentoo.org/638086
Package-Manager: Portage-2.3.42, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/9215

 games-strategy/uqm/Manifest   |   1 +
 games-strategy/uqm/uqm-0.7.0.1.ebuild | 119 ++
 2 files changed, 120 insertions(+)

diff --git a/games-strategy/uqm/Manifest b/games-strategy/uqm/Manifest
index bb6549fff5d..403a17b29b4 100644
--- a/games-strategy/uqm/Manifest
+++ b/games-strategy/uqm/Manifest
@@ -1,3 +1,4 @@
+DIST uqm-0.7.0-1-source.tgz 1591613 BLAKE2B 
400309aced671a23bf325b95bb471db2e5b9aa59a0c868bc1cf971e71ad22a7a555c68fc15be1c574e4b4a8f58b0c18c4a5f85c188b494e20b36bd09ba6de02b
 SHA512 
77255e7e4cc195d4db7f02bb95e76d41c0d72cb179b30a8cd944c4c78560485d76ad89b0bbd03102e5718d66f3b16050ef73a30b6bc8d31e1c0bfa46758badaa
 DIST uqm-0.7.0-3domusic.uqm 18980671 BLAKE2B 
e86828b8a4a2ae7aee7469a9792c3ba7f472208fe33de46f2797024331a290c1092fcae4a1d599fa002d9cd9ef0248df6cb6cda673d3c0ef90c55ae4a38afd56
 SHA512 
e7d723194685388813d72e1add9a710ecd3de9b33381dfe66acee6c31a31634ee9031ecc83c2003a5222b9381efe150a2f2a9289f8505d842182ca03b012183b
 DIST uqm-0.7.0-content.uqm 11538533 BLAKE2B 
8b654f47d8d2e66dac197b10b96fdfc62907cafc6b5b9046a84588d539349263012c5cb235a428e2cb9a8840b1ff7565035f810a8445892b3c272bb629769348
 SHA512 
c80aa9f1158d07534abc1ef625662dfcd5021cb5e8091d46b3e9a2d96a0fffbe7e9e6cc88680b43d810c8e68a580f7a0d4b62c08e9f7b948ae7f017e4ad20dd2
 DIST uqm-0.7.0-source.tgz 1562003 BLAKE2B 
682f87b4967b1aef298dd576dd37cef838f2eaf42f2212fc3af70bf7319e5284cc9bff616d8db3a36a7f2760d2f47f714bcaa2f4f3d35993892a78cdadc85e54
 SHA512 
443ac13da401d45743f913755647b3309834c57f371fb673c3ea2cacb81184bf30430db10af9001de854363520d1f792f47faffd690c8c2b2f3d12d63b217815

diff --git a/games-strategy/uqm/uqm-0.7.0.1.ebuild 
b/games-strategy/uqm/uqm-0.7.0.1.ebuild
new file mode 100644
index 000..562c43b26a8
--- /dev/null
+++ b/games-strategy/uqm/uqm-0.7.0.1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop toolchain-funcs
+
+MY_PV=$(ver_rs 3 '-')
+MY_P="${PN}-${MY_PV}"
+BASE_PV=$(ver_cut 1-3)
+BASE_P="${PN}-${BASE_PV}"
+
+DESCRIPTION="The Ur-Quan Masters: Port of Star Control 2"
+HOMEPAGE="http://sc2.sourceforge.net/;
+SRC_URI="mirror://sourceforge/sc2/${MY_P}-source.tgz
+   mirror://sourceforge/sc2/${BASE_P}-content.uqm
+   music? ( mirror://sourceforge/sc2/${BASE_P}-3domusic.uqm )
+   voice? ( mirror://sourceforge/sc2/${BASE_P}-voice.uqm )
+   remix? ( mirror://sourceforge/sc2/${PN}-remix-disc1.uqm \
+   mirror://sourceforge/sc2/${PN}-remix-disc2.uqm \
+   mirror://sourceforge/sc2/${PN}-remix-disc3.uqm \
+   mirror://sourceforge/sc2/${PN}-remix-disc4.uqm )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="music opengl remix voice"
+
+RDEPEND="
+   media-libs/libmikmod
+   media-libs/libogg
+   >=media-libs/libpng-1.4:0=
+   media-libs/libsdl[X,sound,joystick,video]
+   media-libs/libvorbis
+   media-libs/sdl-image[png]
+   sys-libs/zlib
+   opengl? ( virtual/opengl )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}/${BASE_P}-tempdir.patch"
+   "${FILESDIR}/${BASE_P}-warning.patch"
+)
+
+src_prepare() {
+   default
+
+   local myopengl=$(usex opengl 'opengl' 'pure')
+
+   cat <<-EOF > config.state
+   CHOICE_debug_VALUE='nodebug'
+   CHOICE_graphics_VALUE='${myopengl}'
+   CHOICE_sound_VALUE='mixsdl'
+   CHOICE_accel_VALUE='plainc'
+   INPUT_install_prefix_VALUE='/usr/share'
+   INPUT_install_bindir_VALUE='\$prefix/bin'
+   INPUT_install_libdir_VALUE='\$prefix/lib'
+   INPUT_install_sharedir_VALUE='/usr/share/'
+   EOF
+
+   # Take out the read so we can be non-interactive.
+   sed -i \
+   -e '/read CHOICE/d' build/unix/menu_functions || die
+
+   # respect CFLAGS
+   sed -i \
+   -e "s/-O3//" build/unix/build.config || die
+
+   sed -i \
+   -e "s:@INSTALL_LIBDIR@:/usr/$(get_libdir)/:g" \
+   build/unix/uqm-wrapper.in || die
+
+   # respect CC
+   sed -i \
+   -e "s/PROG_gcc_FILE=\"gcc\"/PROG_gcc_FILE=\"$(tc-getCC)\"/" \
+   build/unix/config_proginfo_build || die
+}
+
+src_compile() {
+   MAKE_VERBOSE=1 ./build.sh uqm || die
+}
+
+src_install() {
+   # Using the included install scripts seems quite painful.
+   # This manual

[gentoo-commits] repo/gentoo:master commit in: games-strategy/uqm/

2018-07-15 Thread James Le Cuirot 
commit: aa9782654b6d3080e15e2be661241ce030c75c46
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Jul 15 19:00:31 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jul 15 19:01:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa978265

games-strategy/uqm: Drop old and somewhat broken 0.7.0-r4

Package-Manager: Portage-2.3.42, Repoman-2.3.9

 games-strategy/uqm/Manifest|   1 -
 games-strategy/uqm/uqm-0.7.0-r4.ebuild | 115 -
 2 files changed, 116 deletions(-)

diff --git a/games-strategy/uqm/Manifest b/games-strategy/uqm/Manifest
index 403a17b29b4..75488825594 100644
--- a/games-strategy/uqm/Manifest
+++ b/games-strategy/uqm/Manifest
@@ -1,7 +1,6 @@
 DIST uqm-0.7.0-1-source.tgz 1591613 BLAKE2B 
400309aced671a23bf325b95bb471db2e5b9aa59a0c868bc1cf971e71ad22a7a555c68fc15be1c574e4b4a8f58b0c18c4a5f85c188b494e20b36bd09ba6de02b
 SHA512 
77255e7e4cc195d4db7f02bb95e76d41c0d72cb179b30a8cd944c4c78560485d76ad89b0bbd03102e5718d66f3b16050ef73a30b6bc8d31e1c0bfa46758badaa
 DIST uqm-0.7.0-3domusic.uqm 18980671 BLAKE2B 
e86828b8a4a2ae7aee7469a9792c3ba7f472208fe33de46f2797024331a290c1092fcae4a1d599fa002d9cd9ef0248df6cb6cda673d3c0ef90c55ae4a38afd56
 SHA512 
e7d723194685388813d72e1add9a710ecd3de9b33381dfe66acee6c31a31634ee9031ecc83c2003a5222b9381efe150a2f2a9289f8505d842182ca03b012183b
 DIST uqm-0.7.0-content.uqm 11538533 BLAKE2B 
8b654f47d8d2e66dac197b10b96fdfc62907cafc6b5b9046a84588d539349263012c5cb235a428e2cb9a8840b1ff7565035f810a8445892b3c272bb629769348
 SHA512 
c80aa9f1158d07534abc1ef625662dfcd5021cb5e8091d46b3e9a2d96a0fffbe7e9e6cc88680b43d810c8e68a580f7a0d4b62c08e9f7b948ae7f017e4ad20dd2
-DIST uqm-0.7.0-source.tgz 1562003 BLAKE2B 
682f87b4967b1aef298dd576dd37cef838f2eaf42f2212fc3af70bf7319e5284cc9bff616d8db3a36a7f2760d2f47f714bcaa2f4f3d35993892a78cdadc85e54
 SHA512 
443ac13da401d45743f913755647b3309834c57f371fb673c3ea2cacb81184bf30430db10af9001de854363520d1f792f47faffd690c8c2b2f3d12d63b217815
 DIST uqm-0.7.0-voice.uqm 115143439 BLAKE2B 
397bf018e128fc3ac95f40e087b809af58d935549489a1f317495d13be166317f2108eee9d1d5dc2283ef486df70d90aeb1808c29fd78d016fae504189a78625
 SHA512 
693a4869f8567637b112138f8a074b65919776175addbd353e3601085ee4e4bb4758daca64921c902463f5dc38baa6f7fda4ad32f3cf1786646ef48f15cdeb80
 DIST uqm-remix-disc1.uqm 50188876 BLAKE2B 
02bf183aa9ef5460831d4bbcfa90ce4745814de017700d7e6dcb1a065dff2a37d47239fdacbb2ba7639a788d795ac45579952aa7f78b760aa9dc8e3aa9d2ccde
 SHA512 
fed2a6e260ee96802898ad9b6c968acaac3613187fe38370fb557d6d220b499b922447ea04edd15763d0161f5c156ce03bc9d55a86ed3b4e2e0140a4fb17e99b
 DIST uqm-remix-disc2.uqm 60282662 BLAKE2B 
c556a99adfb11c8b90cf1de272ce5d42aaf7ec16d246572286646328ddd24b0928f013c8de7806e6545b436c2fa152e0cfd7f4851769992848d6aecb0379a433
 SHA512 
3053693417facef6d01cdb366a15c1bd2a6272961df5870c4151a928845dd76e4ac5fc59f232da5034d56fd9476d3074840a2e9f16d63dba341aeffd92827c4e

diff --git a/games-strategy/uqm/uqm-0.7.0-r4.ebuild 
b/games-strategy/uqm/uqm-0.7.0-r4.ebuild
deleted file mode 100644
index f0413671633..000
--- a/games-strategy/uqm/uqm-0.7.0-r4.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop toolchain-funcs
-
-DESCRIPTION="The Ur-Quan Masters: Port of Star Control 2"
-HOMEPAGE="http://sc2.sourceforge.net/;
-SRC_URI="mirror://sourceforge/sc2/${P}-source.tgz
-   mirror://sourceforge/sc2/${P}-content.uqm
-   music? ( mirror://sourceforge/sc2/${P}-3domusic.uqm )
-   voice? ( mirror://sourceforge/sc2/${P}-voice.uqm )
-   remix? ( mirror://sourceforge/sc2/${PN}-remix-disc1.uqm \
-   mirror://sourceforge/sc2/${PN}-remix-disc2.uqm \
-   mirror://sourceforge/sc2/${PN}-remix-disc3.uqm \
-   mirror://sourceforge/sc2/${PN}-remix-disc4.uqm )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="music opengl remix voice"
-
-RDEPEND="
-   media-libs/libmikmod
-   media-libs/libogg
-   >=media-libs/libpng-1.4:0=
-   media-libs/libsdl[X,sound,joystick,video]
-   media-libs/libvorbis
-   media-libs/sdl-image[png]
-   sys-libs/zlib
-   opengl? ( virtual/opengl )
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-"
-
-src_prepare() {
-   default
-
-   local myopengl
-
-   use opengl \
-   && myopengl=opengl \
-   || myopengl=pure
-
-   eapply \
-   "${FILESDIR}"/${P}-tempdir.patch \
-   "${FILESDIR}"/${P}-warning.patch
-
-   cat <<-EOF > config.state
-   CHOICE_debug_VALUE='nodebug'
-   CHOICE_graphics_VALUE='${myopengl}'
-   CHOICE_sound_VALUE='mixsdl'
-   CHOICE_accel_VALUE='plainc'
-   INPUT_install_prefix_VALUE='/usr/share'
-   INPUT_install_bindir_VALUE='\$prefix/bin'
-   INPUT_install_libdir_VALUE='\$prefix/lib'
-   INPUT_install_sharedir_VALUE='/usr/share/'
-

[gentoo-commits] repo/gentoo:master commit in: games-strategy/uqm/

2018-05-02 Thread Pacho Ramos 
commit: 499ebd888ea5e7fed94e77167c1f517306ae4549
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed May  2 19:20:03 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed May  2 19:28:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=499ebd88

games-strategy/uqm: Stop using games.eclass

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 games-strategy/uqm/uqm-0.7.0-r4.ebuild | 115 +
 1 file changed, 115 insertions(+)

diff --git a/games-strategy/uqm/uqm-0.7.0-r4.ebuild 
b/games-strategy/uqm/uqm-0.7.0-r4.ebuild
new file mode 100644
index 000..f0413671633
--- /dev/null
+++ b/games-strategy/uqm/uqm-0.7.0-r4.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop toolchain-funcs
+
+DESCRIPTION="The Ur-Quan Masters: Port of Star Control 2"
+HOMEPAGE="http://sc2.sourceforge.net/;
+SRC_URI="mirror://sourceforge/sc2/${P}-source.tgz
+   mirror://sourceforge/sc2/${P}-content.uqm
+   music? ( mirror://sourceforge/sc2/${P}-3domusic.uqm )
+   voice? ( mirror://sourceforge/sc2/${P}-voice.uqm )
+   remix? ( mirror://sourceforge/sc2/${PN}-remix-disc1.uqm \
+   mirror://sourceforge/sc2/${PN}-remix-disc2.uqm \
+   mirror://sourceforge/sc2/${PN}-remix-disc3.uqm \
+   mirror://sourceforge/sc2/${PN}-remix-disc4.uqm )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="music opengl remix voice"
+
+RDEPEND="
+   media-libs/libmikmod
+   media-libs/libogg
+   >=media-libs/libpng-1.4:0=
+   media-libs/libsdl[X,sound,joystick,video]
+   media-libs/libvorbis
+   media-libs/sdl-image[png]
+   sys-libs/zlib
+   opengl? ( virtual/opengl )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+"
+
+src_prepare() {
+   default
+
+   local myopengl
+
+   use opengl \
+   && myopengl=opengl \
+   || myopengl=pure
+
+   eapply \
+   "${FILESDIR}"/${P}-tempdir.patch \
+   "${FILESDIR}"/${P}-warning.patch
+
+   cat <<-EOF > config.state
+   CHOICE_debug_VALUE='nodebug'
+   CHOICE_graphics_VALUE='${myopengl}'
+   CHOICE_sound_VALUE='mixsdl'
+   CHOICE_accel_VALUE='plainc'
+   INPUT_install_prefix_VALUE='/usr/share'
+   INPUT_install_bindir_VALUE='\$prefix/bin'
+   INPUT_install_libdir_VALUE='\$prefix/lib'
+   INPUT_install_sharedir_VALUE='/usr/share/'
+   EOF
+
+   # Take out the read so we can be non-interactive.
+   sed -i \
+   -e '/read CHOICE/d' build/unix/menu_functions || die
+
+   # respect CFLAGS
+   sed -i \
+   -e "s/-O3//" build/unix/build.config || die
+
+   sed -i \
+   -e "s:@INSTALL_LIBDIR@:/usr/$(get_libdir)/:g" \
+   build/unix/uqm-wrapper.in || die
+
+   # respect CC
+   sed -i \
+   -e "s/PROG_gcc_FILE=\"gcc\"/PROG_gcc_FILE=\"$(tc-getCC)\"/" \
+   build/unix/config_proginfo_build || die
+}
+
+src_compile() {
+   MAKE_VERBOSE=1 ./build.sh uqm || die
+}
+
+src_install() {
+   # Using the included install scripts seems quite painful.
+   # This manual install is totally fragile but maybe they'll
+   # use a sane build system for the next release.
+   newbin uqm-wrapper uqm
+   exeinto /usr/"$(get_libdir)"/${PN}
+   doexe uqm
+
+   insinto /usr/share/${PN}/content/packages
+   doins "${DISTDIR}"/${P}-content.uqm
+   echo ${P} > "${ED}"/usr/share/${PN}/content/version || die
+
+   insinto /usr/share/${PN}/content/addons
+   if use music; then
+   doins "${DISTDIR}"/${P}-3domusic.uqm
+   fi
+
+   if use voice; then
+   doins "${DISTDIR}"/${P}-voice.uqm
+   fi
+
+   if use remix; then
+   insinto /usr/share/${PN}/content/addons
+   doins "${DISTDIR}"/${PN}-remix-disc{1,2,3,4}.uqm
+   fi
+
+   dodoc AUTHORS ChangeLog Contributing README WhatsNew 
doc/users/manual.txt
+   docinto devel
+   dodoc doc/devel/[!n]*
+   docinto devel/netplay
+   dodoc doc/devel/netplay/*
+   make_desktop_entry uqm "The Ur-Quan Masters"
+}

[gentoo-commits] repo/gentoo:master commit in: games-strategy/uqm/

2018-05-02 Thread Pacho Ramos 
commit: e1861c4ae2a69d733cc3461c7deb64e42376d0c9
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed May  2 19:20:13 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed May  2 19:28:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1861c4a

games-strategy/uqm: Drop old

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 games-strategy/uqm/uqm-0.7.0-r3.ebuild | 111 -
 1 file changed, 111 deletions(-)

diff --git a/games-strategy/uqm/uqm-0.7.0-r3.ebuild 
b/games-strategy/uqm/uqm-0.7.0-r3.ebuild
deleted file mode 100644
index 0d0264e8f7a..000
--- a/games-strategy/uqm/uqm-0.7.0-r3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib toolchain-funcs games
-
-DESCRIPTION="The Ur-Quan Masters: Port of Star Control 2"
-HOMEPAGE="http://sc2.sourceforge.net/;
-SRC_URI="mirror://sourceforge/sc2/${P}-source.tgz
-   mirror://sourceforge/sc2/${P}-content.uqm
-   music? ( mirror://sourceforge/sc2/${P}-3domusic.uqm )
-   voice? ( mirror://sourceforge/sc2/${P}-voice.uqm )
-   remix? ( mirror://sourceforge/sc2/${PN}-remix-disc1.uqm \
-   mirror://sourceforge/sc2/${PN}-remix-disc2.uqm \
-   mirror://sourceforge/sc2/${PN}-remix-disc3.uqm \
-   mirror://sourceforge/sc2/${PN}-remix-disc4.uqm )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="music opengl remix voice"
-
-RDEPEND="media-libs/libmikmod
-   media-libs/libogg
-   >=media-libs/libpng-1.4:0
-   media-libs/libsdl[X,sound,joystick,video]
-   media-libs/libvorbis
-   media-libs/sdl-image[png]
-   sys-libs/zlib
-   opengl? ( virtual/opengl )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-src_prepare() {
-   local myopengl
-
-   use opengl \
-   && myopengl=opengl \
-   || myopengl=pure
-
-   epatch \
-   "${FILESDIR}"/${P}-tempdir.patch \
-   "${FILESDIR}"/${P}-warning.patch
-
-   cat <<-EOF > config.state
-   CHOICE_debug_VALUE='nodebug'
-   CHOICE_graphics_VALUE='${myopengl}'
-   CHOICE_sound_VALUE='mixsdl'
-   CHOICE_accel_VALUE='plainc'
-   INPUT_install_prefix_VALUE='${GAMES_PREFIX}'
-   INPUT_install_bindir_VALUE='\$prefix/bin'
-   INPUT_install_libdir_VALUE='\$prefix/lib'
-   INPUT_install_sharedir_VALUE='${GAMES_DATADIR}/'
-   EOF
-
-   # Take out the read so we can be non-interactive.
-   sed -i \
-   -e '/read CHOICE/d' build/unix/menu_functions || die
-
-   # respect CFLAGS
-   sed -i \
-   -e "s/-O3//" build/unix/build.config || die
-
-   sed -i \
-   -e "s:@INSTALL_LIBDIR@:$(games_get_libdir)/:g" \
-   build/unix/uqm-wrapper.in || die
-
-   # respect CC
-   sed -i \
-   -e "s/PROG_gcc_FILE=\"gcc\"/PROG_gcc_FILE=\"$(tc-getCC)\"/" \
-   build/unix/config_proginfo_build || die
-}
-
-src_compile() {
-   MAKE_VERBOSE=1 ./build.sh uqm || die
-}
-
-src_install() {
-   # Using the included install scripts seems quite painful.
-   # This manual install is totally fragile but maybe they'll
-   # use a sane build system for the next release.
-   newgamesbin uqm-wrapper uqm
-   exeinto "$(games_get_libdir)"/${PN}
-   doexe uqm
-
-   insinto "${GAMES_DATADIR}"/${PN}/content/packages
-   doins "${DISTDIR}"/${P}-content.uqm
-   echo ${P} > "${D}${GAMES_DATADIR}"/${PN}/content/version || die
-
-   insinto "${GAMES_DATADIR}"/${PN}/content/addons
-   if use music; then
-   doins "${DISTDIR}"/${P}-3domusic.uqm
-   fi
-
-   if use voice; then
-   doins "${DISTDIR}"/${P}-voice.uqm
-   fi
-
-   if use remix; then
-   insinto "${GAMES_DATADIR}"/${PN}/content/addons
-   doins "${DISTDIR}"/${PN}-remix-disc{1,2,3,4}.uqm
-   fi
-
-   dodoc AUTHORS ChangeLog Contributing README WhatsNew 
doc/users/manual.txt
-   docinto devel
-   dodoc doc/devel/[!n]*
-   docinto devel/netplay
-   dodoc doc/devel/netplay/*
-   make_desktop_entry uqm "The Ur-Quan Masters"
-   prepgamesdirs
-}

[gentoo-commits] repo/gentoo:master commit in: games-strategy/uqm/

2017-01-20 Thread David Seifert 
commit: 280eb1d594f3484495c742610d0d33f364694a1a
Author: David Seifert  gentoo  org>
AuthorDate: Fri Jan 20 15:53:42 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Jan 20 16:21:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=280eb1d5

games-strategy/uqm: Remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3564

 games-strategy/uqm/uqm-0.7.0-r2.ebuild | 107 -
 1 file changed, 107 deletions(-)

diff --git a/games-strategy/uqm/uqm-0.7.0-r2.ebuild 
b/games-strategy/uqm/uqm-0.7.0-r2.ebuild
deleted file mode 100644
index a6dcb4e..
--- a/games-strategy/uqm/uqm-0.7.0-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib toolchain-funcs games
-
-DESCRIPTION="The Ur-Quan Masters: Port of Star Control 2"
-HOMEPAGE="http://sc2.sourceforge.net/;
-SRC_URI="mirror://sourceforge/sc2/${P}-source.tgz
-   mirror://sourceforge/sc2/${P}-content.uqm
-   music? ( mirror://sourceforge/sc2/${P}-3domusic.uqm )
-   voice? ( mirror://sourceforge/sc2/${P}-voice.uqm )
-   remix? ( mirror://sourceforge/sc2/${PN}-remix-disc1.uqm \
-   mirror://sourceforge/sc2/${PN}-remix-disc2.uqm \
-   mirror://sourceforge/sc2/${PN}-remix-disc3.uqm )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="music opengl remix voice"
-
-RDEPEND="media-libs/libmikmod
-   media-libs/libogg
-   >=media-libs/libpng-1.4:0
-   media-libs/libsdl[X,sound,joystick,video]
-   media-libs/libvorbis
-   media-libs/sdl-image[png]
-   sys-libs/zlib
-   opengl? ( virtual/opengl )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-src_prepare() {
-   local myopengl
-
-   use opengl \
-   && myopengl=opengl \
-   || myopengl=pure
-
-   cat <<-EOF > config.state
-   CHOICE_debug_VALUE='nodebug'
-   CHOICE_graphics_VALUE='${myopengl}'
-   CHOICE_sound_VALUE='mixsdl'
-   CHOICE_accel_VALUE='plainc'
-   INPUT_install_prefix_VALUE='${GAMES_PREFIX}'
-   INPUT_install_bindir_VALUE='\$prefix/bin'
-   INPUT_install_libdir_VALUE='\$prefix/lib'
-   INPUT_install_sharedir_VALUE='${GAMES_DATADIR}/'
-   EOF
-
-   # Take out the read so we can be non-interactive.
-   sed -i \
-   -e '/read CHOICE/d' build/unix/menu_functions || die
-
-   # respect CFLAGS
-   sed -i \
-   -e "s/-O3//" build/unix/build.config || die
-
-   sed -i \
-   -e "s:@INSTALL_LIBDIR@:$(games_get_libdir)/:g" \
-   build/unix/uqm-wrapper.in || die
-
-   # respect CC
-   sed -i \
-   -e "s/PROG_gcc_FILE=\"gcc\"/PROG_gcc_FILE=\"$(tc-getCC)\"/" \
-   build/unix/config_proginfo_build || die
-}
-
-src_compile() {
-   MAKE_VERBOSE=1 ./build.sh uqm || die
-}
-
-src_install() {
-   # Using the included install scripts seems quite painful.
-   # This manual install is totally fragile but maybe they'll
-   # use a sane build system for the next release.
-   newgamesbin uqm-wrapper uqm
-   exeinto "$(games_get_libdir)"/${PN}
-   doexe uqm
-
-   insinto "${GAMES_DATADIR}"/${PN}/content/packages
-   doins "${DISTDIR}"/${P}-content.uqm
-   echo ${P} > "${D}${GAMES_DATADIR}"/${PN}/content/version || die
-
-   insinto "${GAMES_DATADIR}"/${PN}/content/addons
-   if use music; then
-   doins "${DISTDIR}"/${P}-3domusic.uqm
-   fi
-
-   if use voice; then
-   doins "${DISTDIR}"/${P}-voice.uqm
-   fi
-
-   if use remix; then
-   insinto "${GAMES_DATADIR}"/${PN}/content/addons
-   doins "${DISTDIR}"/${PN}-remix-disc{1,2,3}.uqm
-   fi
-
-   dodoc AUTHORS ChangeLog Contributing README WhatsNew 
doc/users/manual.txt
-   docinto devel
-   dodoc doc/devel/[!n]*
-   docinto devel/netplay
-   dodoc doc/devel/netplay/*
-   make_desktop_entry uqm "The Ur-Quan Masters"
-   prepgamesdirs
-}

[gentoo-commits] repo/gentoo:master commit in: games-strategy/uqm/

2016-04-14 Thread José María Alonso 
commit: b672e00279470f3ff44bbc74c718d23c000ef194
Author: José María Alonso Josa  gentoo  org>
AuthorDate: Thu Apr 14 12:26:55 2016 +
Commit: José María Alonso  gentoo  org>
CommitDate: Thu Apr 14 12:26:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b672e002

games-strategy/uqm: amd64 wrt bug #579476

 games-strategy/uqm/uqm-0.7.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/uqm/uqm-0.7.0-r3.ebuild 
b/games-strategy/uqm/uqm-0.7.0-r3.ebuild
index 61167b7..a2836af 100644
--- a/games-strategy/uqm/uqm-0.7.0-r3.ebuild
+++ b/games-strategy/uqm/uqm-0.7.0-r3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/sc2/${P}-source.tgz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="music opengl remix voice"
 
 RDEPEND="media-libs/libmikmod

[gentoo-commits] repo/gentoo:master commit in: games-strategy/uqm/, games-strategy/uqm/files/

2016-03-10 Thread Michael Sterrett 
commit: 4a262cede946862078b67fc0595aab5c31437465
Author: Michael Sterrett  gentoo  org>
AuthorDate: Thu Mar 10 17:19:42 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Thu Mar 10 17:20:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a262ced

games-strategy/uqm: avoid leaving temp files lying around in /tmp (bug 
#576098); silence compile warning

Package-Manager: portage-2.2.26

 games-strategy/uqm/files/uqm-0.7.0-tempdir.patch | 14 
 games-strategy/uqm/files/uqm-0.7.0-warning.patch | 29 
 games-strategy/uqm/uqm-0.7.0-r3.ebuild   |  4 
 3 files changed, 47 insertions(+)

diff --git a/games-strategy/uqm/files/uqm-0.7.0-tempdir.patch 
b/games-strategy/uqm/files/uqm-0.7.0-tempdir.patch
new file mode 100644
index 000..dbb693c
--- /dev/null
+++ b/games-strategy/uqm/files/uqm-0.7.0-tempdir.patch
@@ -0,0 +1,14 @@
+# leaves files lying around bug #576098
+
+diff -ru uqm-0.7.0.orig/build/unix/config_functions 
uqm-0.7.0/build/unix/config_functions
+--- uqm-0.7.0.orig/build/unix/config_functions 2011-05-20 15:25:22.0 
-0400
 uqm-0.7.0/build/unix/config_functions  2016-03-09 02:46:41.512465876 
-0500
+@@ -16,7 +16,7 @@
+ #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+ BUILDLOG=/dev/null
+-TEMPFILE="/tmp/build.$$.tmp"
++TEMPFILE="${T:-/tmp}/build.$$.tmp"
+ #KEEPTEMPFILES=keeptempfiles
+ 
+ 

diff --git a/games-strategy/uqm/files/uqm-0.7.0-warning.patch 
b/games-strategy/uqm/files/uqm-0.7.0-warning.patch
new file mode 100644
index 000..7f05ee5
--- /dev/null
+++ b/games-strategy/uqm/files/uqm-0.7.0-warning.patch
@@ -0,0 +1,29 @@
+--- ./src/libs/sound/decoders/aiffaud.c.orig   2011-05-20 15:24:44.0 
-0400
 ./src/libs/sound/decoders/aiffaud.c2016-03-10 00:53:37.336198208 
-0500
+@@ -307,7 +307,7 @@
+ {
+   int bytes;
+ 
+-  memset(fmt, sizeof(*fmt), 0);
++  memset(fmt, 0, sizeof(*fmt));
+   if (size < AIFF_COMM_SIZE)
+   {
+   aifa->last_error = aifae_BadFile;
+@@ -369,7 +369,7 @@
+   aifa->max_pcm = 0;
+   aifa->data_ofs = 0;
+   memset(>fmtHdr, 0, sizeof(aifa->fmtHdr));
+-  memset(aifa->prev_val, sizeof(aifa->prev_val), 0);
++  memset(aifa->prev_val, 0, sizeof(aifa->prev_val));
+ 
+   // read wave header
+   if (!aifa_readFileHeader (aifa, ))
+@@ -635,7 +635,7 @@
+ 
+   // reset previous values for SDX2 on seek ops
+   // the delta will recover faster with reset
+-  memset(aifa->prev_val, sizeof(aifa->prev_val), 0);
++  memset(aifa->prev_val, 0, sizeof(aifa->prev_val));
+ 
+   return pcm_pos;
+ }

diff --git a/games-strategy/uqm/uqm-0.7.0-r3.ebuild 
b/games-strategy/uqm/uqm-0.7.0-r3.ebuild
index 41d994a..61167b7 100644
--- a/games-strategy/uqm/uqm-0.7.0-r3.ebuild
+++ b/games-strategy/uqm/uqm-0.7.0-r3.ebuild
@@ -39,6 +39,10 @@ src_prepare() {
&& myopengl=opengl \
|| myopengl=pure
 
+   epatch \
+   "${FILESDIR}"/${P}-tempdir.patch \
+   "${FILESDIR}"/${P}-warning.patch
+
cat <<-EOF > config.state
CHOICE_debug_VALUE='nodebug'
CHOICE_graphics_VALUE='${myopengl}'

[gentoo-commits] repo/gentoo:master commit in: games-strategy/uqm/

2016-02-16 Thread Michael Sterrett 
commit: 5fba591264a7db8ec981271df7a7bc9c040424e6
Author: Michael Sterrett  gentoo  org>
AuthorDate: Wed Feb 17 07:54:42 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Wed Feb 17 07:55:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fba5912

games-strategy/uqm: rev bump to add remix disc 4 as reported by Ryan Hill via 
bug #574930

Package-Manager: portage-2.2.26

 games-strategy/uqm/Manifest|   1 +
 games-strategy/uqm/uqm-0.7.0-r3.ebuild | 108 +
 2 files changed, 109 insertions(+)

diff --git a/games-strategy/uqm/Manifest b/games-strategy/uqm/Manifest
index f9f349b..76b7425 100644
--- a/games-strategy/uqm/Manifest
+++ b/games-strategy/uqm/Manifest
@@ -5,3 +5,4 @@ DIST uqm-0.7.0-voice.uqm 115143439 SHA256 
bcccf801b4ba37594ff6217b292744ea586ee2
 DIST uqm-remix-disc1.uqm 50188876 SHA256 
b697694745d939311e8ebffdd5edf692e010c25d7966e1481074940a4d0487e8 SHA512 
fed2a6e260ee96802898ad9b6c968acaac3613187fe38370fb557d6d220b499b922447ea04edd15763d0161f5c156ce03bc9d55a86ed3b4e2e0140a4fb17e99b
 WHIRLPOOL 
fee79171e43fb203dcc2b8cbca7d3e2edfa4c6334a1f0996fa8951dc67ef94e67f06edbe250810e1385f5887834a7a0755e1e40a9aa3cdae0cdfb937e238fe46
 DIST uqm-remix-disc2.uqm 60282662 SHA256 
7fbb4744102e31273e4459b01a156da052ec537c128fe91793643e348bc1bade SHA512 
3053693417facef6d01cdb366a15c1bd2a6272961df5870c4151a928845dd76e4ac5fc59f232da5034d56fd9476d3074840a2e9f16d63dba341aeffd92827c4e
 WHIRLPOOL 
e52f1eb1c8cd0007eb77d80719f8feeb044c61bb2d72c14fae92ba62ea8ad1225ffa427db39dadd864304818839c4df0e1e0fe9c0d8a2b265ceead14f70df56e
 DIST uqm-remix-disc3.uqm 39924875 SHA256 
e6d89f8f66cf1df1cb278fca1e92261b1776ee670dff26132e33f14dbd31e91d SHA512 
2337752e3a2447ab048cc6782153bbb120d2d6b890c5bfae9cbef60a46d12abf716917863286b0196bf6f5e8ef301b5f84338237520880b10cbf75e450076951
 WHIRLPOOL 
ba1ed49bb6761d9955fe9beced1987dd4458cd0203a9c8e712bb55034fd8d278f489c995969866cb7096bea75e88b330031f070b7aeb7e09f48fda0ece862e36
+DIST uqm-remix-disc4.uqm 86545760 SHA256 
a4c8197712a5b72a81c7ef7a2a33ea7d3ac90ab063c929dd68e7328a559a86d0 SHA512 
07f0fbe0b9889602eab43f376577c8e0a19c6db50bbb3f01f57836c7caab1eb18813e94d8d9f2d3098a6b6c9dc336290b7f5262c586f2fb41ffab0e2b0ba7f65
 WHIRLPOOL 
011859d9c7566c369c086925548fd4340e34d4f3657c6d4ff242451e7665acbac8c18ec2d6818856011e930a01406d947164ec0b8ed454b422424ec3fa78972c

diff --git a/games-strategy/uqm/uqm-0.7.0-r3.ebuild 
b/games-strategy/uqm/uqm-0.7.0-r3.ebuild
new file mode 100644
index 000..41d994a
--- /dev/null
+++ b/games-strategy/uqm/uqm-0.7.0-r3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib toolchain-funcs games
+
+DESCRIPTION="The Ur-Quan Masters: Port of Star Control 2"
+HOMEPAGE="http://sc2.sourceforge.net/;
+SRC_URI="mirror://sourceforge/sc2/${P}-source.tgz
+   mirror://sourceforge/sc2/${P}-content.uqm
+   music? ( mirror://sourceforge/sc2/${P}-3domusic.uqm )
+   voice? ( mirror://sourceforge/sc2/${P}-voice.uqm )
+   remix? ( mirror://sourceforge/sc2/${PN}-remix-disc1.uqm \
+   mirror://sourceforge/sc2/${PN}-remix-disc2.uqm \
+   mirror://sourceforge/sc2/${PN}-remix-disc3.uqm \
+   mirror://sourceforge/sc2/${PN}-remix-disc4.uqm )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="music opengl remix voice"
+
+RDEPEND="media-libs/libmikmod
+   media-libs/libogg
+   >=media-libs/libpng-1.4:0
+   media-libs/libsdl[X,sound,joystick,video]
+   media-libs/libvorbis
+   media-libs/sdl-image[png]
+   sys-libs/zlib
+   opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+src_prepare() {
+   local myopengl
+
+   use opengl \
+   && myopengl=opengl \
+   || myopengl=pure
+
+   cat <<-EOF > config.state
+   CHOICE_debug_VALUE='nodebug'
+   CHOICE_graphics_VALUE='${myopengl}'
+   CHOICE_sound_VALUE='mixsdl'
+   CHOICE_accel_VALUE='plainc'
+   INPUT_install_prefix_VALUE='${GAMES_PREFIX}'
+   INPUT_install_bindir_VALUE='\$prefix/bin'
+   INPUT_install_libdir_VALUE='\$prefix/lib'
+   INPUT_install_sharedir_VALUE='${GAMES_DATADIR}/'
+   EOF
+
+   # Take out the read so we can be non-interactive.
+   sed -i \
+   -e '/read CHOICE/d' build/unix/menu_functions || die
+
+   # respect CFLAGS
+   sed -i \
+   -e "s/-O3//" build/unix/build.config || die
+
+   sed -i \
+   -e "s:@INSTALL_LIBDIR@:$(games_get_libdir)/:g" \
+   build/unix/uqm-wrapper.in || die
+
+   # respect CC
+   sed -i \
+   -e "s/PROG_gcc_FILE=\"gcc\"/PROG_gcc_FILE=\"$(tc-getCC)\"/" \
+   build/unix/config_proginfo_build || die
+}
+
+src_compile() {
+   MAKE_VERBOSE=1 ./build.sh uqm || die
+}
+
+src_install() {
+   # Using the

[gentoo-commits] repo/gentoo:master commit in: games-strategy/uqm/

2016-01-05 Thread Michael Sterrett 
commit: 9606d21608c36dca121061204daeb6bb51de5d41
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue Jan  5 05:47:17 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue Jan  5 08:26:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9606d216

games-strategy/uqm: add slot dep for media-libs/libpng

Package-Manager: portage-2.2.26

 games-strategy/uqm/uqm-0.7.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/uqm/uqm-0.7.0-r2.ebuild 
b/games-strategy/uqm/uqm-0.7.0-r2.ebuild
index 250d9fc..a6dcb4e 100644
--- a/games-strategy/uqm/uqm-0.7.0-r2.ebuild
+++ b/games-strategy/uqm/uqm-0.7.0-r2.ebuild
@@ -22,7 +22,7 @@ IUSE="music opengl remix voice"
 
 RDEPEND="media-libs/libmikmod
media-libs/libogg
-   >=media-libs/libpng-1.4
+   >=media-libs/libpng-1.4:0
media-libs/libsdl[X,sound,joystick,video]
media-libs/libvorbis
media-libs/sdl-image[png]