[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/, 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}'