summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Eden <sven.eden@gmx.de>2012-04-28 15:41:20 +0200
committerSven Eden <sven.eden@gmx.de>2012-04-28 15:41:20 +0200
commita4581ec6695dac4dec427629b53080fff24e89ef (patch)
treed608ce99839001e2466e1ad2caa8784d34900135
parentCrystalspace: First set of (finished?) patches for 2.0beta3 (diff)
downloadseden-a4581ec6695dac4dec427629b53080fff24e89ef.tar.gz
seden-a4581ec6695dac4dec427629b53080fff24e89ef.tar.bz2
seden-a4581ec6695dac4dec427629b53080fff24e89ef.zip
CrystalSpace: Some fixes and reordering. CS-2.0 now builds and
installs fine, but it is untested yet, so the patches are not ready for upstream.
-rw-r--r--dev-games/crystalspace/ChangeLog33
-rw-r--r--dev-games/crystalspace/Manifest34
-rw-r--r--dev-games/crystalspace/crystalspace-2.0_beta3-r5.ebuild (renamed from dev-games/crystalspace/crystalspace-2.0_beta3-r4.ebuild)30
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-01-remove_hardcoded_libpath.patch (renamed from dev-games/crystalspace/files/crystalspace-2.0-remove_hardcoded_libpath.patch)0
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-02-add_custom_mode.patch (renamed from dev-games/crystalspace/files/crystalspace-2.0-add_custom_mode.patch)0
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-03-add_custom_variant.patch (renamed from dev-games/crystalspace/files/crystalspace-2.0-add_custom_variant.patch)0
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-04-add_var_trimmer.patch (renamed from dev-games/crystalspace/files/crystalspace-2.0-add_var_trimmer.patch)0
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-05-remove_emit_from_configure_ac_01.patch (renamed from dev-games/crystalspace/files/crystalspace-2.0-remove_emit_from_configure_ac_01.patch)0
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-06-remove_emit_from_configure_ac_02.patch (renamed from dev-games/crystalspace/files/crystalspace-2.0-remove_emit_from_configure_ac_02.patch)0
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-07-remove_emit_from_configure_ac_03.patch (renamed from dev-games/crystalspace/files/crystalspace-2.0-remove_emit_from_configure_ac_03.patch)0
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-08-remove_emit_from_configure_ac_04.patch (renamed from dev-games/crystalspace/files/crystalspace-2.0-remove_emit_from_configure_ac_04.patch)0
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-09-remove_emit_from_configure_ac_05.patch (renamed from dev-games/crystalspace/files/crystalspace-2.0-remove_emit_from_configure_ac_05.patch)0
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-10-remove_emit_from_compiler_funcs.patch (renamed from dev-games/crystalspace/files/crystalspace-2.0-remove_emit_from_compiler_funcs.patch)4
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-11-data_add_missing.patch (renamed from dev-games/crystalspace/files/crystalspace-2.0-data_add_missing.patch)0
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-12-data_sky_add_missing.patch (renamed from dev-games/crystalspace/files/crystalspace-2.0-data_sky_add_missing.patch)0
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-13-maps_flarge_add_missing.patch (renamed from dev-games/crystalspace/files/crystalspace-2.0-maps_flarge_add_missing.patch)0
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-14-fix_vfs_template.patch (renamed from dev-games/crystalspace/files/crystalspace-2.0-fix_vfs_template.patch)0
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-15-add_usr_lib_to_cs-config.patch (renamed from dev-games/crystalspace/files/crystalspace-2.0-add_usr_lib_to_cs-config.patch)0
18 files changed, 67 insertions, 34 deletions
diff --git a/dev-games/crystalspace/ChangeLog b/dev-games/crystalspace/ChangeLog
index 200ecfb..2ecb8c5 100644
--- a/dev-games/crystalspace/ChangeLog
+++ b/dev-games/crystalspace/ChangeLog
@@ -2,6 +2,39 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*crystalspace-2.0_beta3-r5 (28 Apr 2012)
+
+ 28 Apr 2012; Sven Eden <sven.eden@gmx.de>
+ +crystalspace-2.0_beta3-r5.ebuild,
+ -crystalspace-2.0_beta3-r4.ebuild,
+ +files/crystalspace-2.0-01-remove_hardcoded_libpath.patch,
+ +files/crystalspace-2.0-02-add_custom_mode.patch,
+ +files/crystalspace-2.0-03-add_custom_variant.patch,
+ +files/crystalspace-2.0-04-add_var_trimmer.patch,
+ +files/crystalspace-2.0-05-remove_emit_from_configure_ac_01.patch,
+ +files/crystalspace-2.0-06-remove_emit_from_configure_ac_02.patch,
+ +files/crystalspace-2.0-07-remove_emit_from_configure_ac_03.patch,
+ +files/crystalspace-2.0-08-remove_emit_from_configure_ac_04.patch,
+ +files/crystalspace-2.0-09-remove_emit_from_configure_ac_05.patch,
+ +files/crystalspace-2.0-10-remove_emit_from_compiler_funcs.patch,
+ +files/crystalspace-2.0-11-data_add_missing.patch,
+ +files/crystalspace-2.0-12-data_sky_add_missing.patch,
+ +files/crystalspace-2.0-13-maps_flarge_add_missing.patch,
+ +files/crystalspace-2.0-14-fix_vfs_template.patch,
+ +files/crystalspace-2.0-15-add_usr_lib_to_cs-config.patch:
+ New ebuild using 15 Patches to sort various issues with the build system out.
+ Removed old ebuild.
+
+*crystalspace-2.0_beta3-r4 (27 Apr 2012)
+
+ 27 Apr 2012; Sven Eden <sven.eden@gmx.de>
+ +crystalspace-2.0_beta3-r4.ebuild,
+ -crystalspace-2.0_beta3-r3.ebuild,
+ -crystalspace-2.1_pre9999-r1.ebuild,
+ -crystalspace-1.4.0-r2.ebuild:
+ Some minor fixes on the 2.0 ebuild, removed obsolete 1.4 ebuild and gave up
+ on the live part. Let's concentrate on the next stable release.
+
*crystalspace-2.0_beta3-r3 (20 Apr 2012)
20 Apr 2012; Sven Eden <sven.eden@gmx.de>
diff --git a/dev-games/crystalspace/Manifest b/dev-games/crystalspace/Manifest
index cdbde95..aaab0e3 100644
--- a/dev-games/crystalspace/Manifest
+++ b/dev-games/crystalspace/Manifest
@@ -1,19 +1,19 @@
-AUX crystalspace-2.0-add_custom_mode.patch 5224 RMD160 a128cea320ce6f622099fdff71256c8405740a09 SHA1 efefdf02eb8e5155f61bb69c29df783d683ffda9 SHA256 ea64ba09c0c53670c847b606ce4649de0c7ee92acb89b7377e05a4f7323c7814
-AUX crystalspace-2.0-add_custom_variant.patch 555 RMD160 a454007293a0ca40a90a5618cd4dbae56120226a SHA1 b13608447f10e4eab51057f21ea0cbcbcc24ea3e SHA256 04d9b216e716ce3a84ad0f78e255b055de2d979defaa3dca44f6c72c428b7434
-AUX crystalspace-2.0-add_usr_lib_to_cs-config.patch 2283 RMD160 0dbb74f07d490ad2cb2419471b265c6d58a41dd8 SHA1 4d6e90875ecc817fcddeb3b777919b58efe709c7 SHA256 766b4965fb2589991af8caf62d121545cd80e5116e1bc7fe8996469bfa1d9c2e
-AUX crystalspace-2.0-add_var_trimmer.patch 2459 RMD160 de6adcc4402a5b7d4de9911d473abc5bc73615ec SHA1 f0064ad4c8bd76b1473cefa1dfca257b6882f78e SHA256 24f6ce73a8678c28ffc78d580b6d7fde7c24e0fbba24d47ad0cf945fea573297
-AUX crystalspace-2.0-data_add_missing.patch 1642 RMD160 5eddbb90b861eeb48494fa9214412850b106f46e SHA1 d45160dacf97397157384d240f657deae075bab5 SHA256 b3f5c4115b55e34e8cd4e973936375914cbebf5fa426b8423da1131b4bd20271
-AUX crystalspace-2.0-data_sky_add_missing.patch 413 RMD160 8ae9916d33eea54377d5cb61b767d9ad420e2164 SHA1 b09a8b3592b1644ac58676cefd4622b31814ec50 SHA256 08cacf066f69378a2b4e53f716218ddcb02f16f5da07966e947b2e3fc23dd6cb
-AUX crystalspace-2.0-fix_vfs_template.patch 967 RMD160 f42979a3c3722056c69fbf54a0e5711a22a41e7a SHA1 c4441fcf3c0a1e0ca317b24b434318f6c4d6e5bd SHA256 25f77a13160fc4a7ccfdde705597c8694144789f094154d0a7c7e78ae3b7573e
-AUX crystalspace-2.0-maps_flarge_add_missing.patch 982 RMD160 fcb2069a2cced6c5dc73bd84590425e1cab56993 SHA1 18044e9a311c65f8d29c65ce0a9ffa885265881a SHA256 7c09f6c6187b66fdc2c055224bd1ef37824046eb04359b13ebefc75639f5f3b0
-AUX crystalspace-2.0-remove_emit_from_compiler_funcs.patch 2201 RMD160 38193c6cb00d3edb1bfdc0b2a6ad99ba571e4339 SHA1 044dfbec050a30abd1b37348eb926ecc7f26e61f SHA256 ac26c26b26d98eb28617ba126fb16780a02931a92807f0a92364425f7e98f7d6
-AUX crystalspace-2.0-remove_emit_from_configure_ac_01.patch 11511 RMD160 a851b0246168b4b8f86f0a2203d96335553cc0c2 SHA1 9ca4950a1b2a53d1556688ef799f4925c3e47799 SHA256 d2f48c2817210cfc221e2eeafab8975047898352040775e119175b6d88ce2f92
-AUX crystalspace-2.0-remove_emit_from_configure_ac_02.patch 3038 RMD160 750871037a9025b21ea1d9de10586c3109c75b3d SHA1 a909e80fe0cbf9591074ebb2f48a150e33fd6bf0 SHA256 a996bf68e6d803fc286a80ce0fb60f3734b2c68d698d0e033b7ea5ada17a0db7
-AUX crystalspace-2.0-remove_emit_from_configure_ac_03.patch 1708 RMD160 5c865bf384895e984ba4a090beb411c30f86f479 SHA1 d495ce13d41e4f241612af9b8043a4123a46e509 SHA256 7e1b8e19c1dd58886d63ac73e87e0500df5bafb13bfab57e2ed20496db3de56a
-AUX crystalspace-2.0-remove_emit_from_configure_ac_04.patch 3620 RMD160 ca6ca27947aae75e20d85dbf8c785ca084b57e2c SHA1 cdec0aebc63ec31e79fcaf4be46310650455af4a SHA256 84e6762c5b0c42751f8c5cf92a5b01cc5a6f0e4a68a5edbffb4bc6180d4820f9
-AUX crystalspace-2.0-remove_emit_from_configure_ac_05.patch 2472 RMD160 b401e51e54e2a544b889af4c45332ff99505f622 SHA1 ba8e61049ddd2204ad05a7b18a5453d696f1ed17 SHA256 400b7f9270da4b321471bebba194a92cfce75fce53c101e79265896b75f73016
-AUX crystalspace-2.0-remove_hardcoded_libpath.patch 2347 RMD160 35a4f5a09315e8ed8cbe632654feceaa9a0e4fe6 SHA1 f7727885903c890c3c5555eb790a6411cb31c387 SHA256 62e3d9d868c188a1b5a9828cb877bf55d031fc0475c268adb62eb96e746368bb
+AUX crystalspace-2.0-01-remove_hardcoded_libpath.patch 2347 RMD160 35a4f5a09315e8ed8cbe632654feceaa9a0e4fe6 SHA1 f7727885903c890c3c5555eb790a6411cb31c387 SHA256 62e3d9d868c188a1b5a9828cb877bf55d031fc0475c268adb62eb96e746368bb
+AUX crystalspace-2.0-02-add_custom_mode.patch 5224 RMD160 a128cea320ce6f622099fdff71256c8405740a09 SHA1 efefdf02eb8e5155f61bb69c29df783d683ffda9 SHA256 ea64ba09c0c53670c847b606ce4649de0c7ee92acb89b7377e05a4f7323c7814
+AUX crystalspace-2.0-03-add_custom_variant.patch 555 RMD160 a454007293a0ca40a90a5618cd4dbae56120226a SHA1 b13608447f10e4eab51057f21ea0cbcbcc24ea3e SHA256 04d9b216e716ce3a84ad0f78e255b055de2d979defaa3dca44f6c72c428b7434
+AUX crystalspace-2.0-04-add_var_trimmer.patch 2459 RMD160 de6adcc4402a5b7d4de9911d473abc5bc73615ec SHA1 f0064ad4c8bd76b1473cefa1dfca257b6882f78e SHA256 24f6ce73a8678c28ffc78d580b6d7fde7c24e0fbba24d47ad0cf945fea573297
+AUX crystalspace-2.0-05-remove_emit_from_configure_ac_01.patch 11511 RMD160 a851b0246168b4b8f86f0a2203d96335553cc0c2 SHA1 9ca4950a1b2a53d1556688ef799f4925c3e47799 SHA256 d2f48c2817210cfc221e2eeafab8975047898352040775e119175b6d88ce2f92
+AUX crystalspace-2.0-06-remove_emit_from_configure_ac_02.patch 3038 RMD160 750871037a9025b21ea1d9de10586c3109c75b3d SHA1 a909e80fe0cbf9591074ebb2f48a150e33fd6bf0 SHA256 a996bf68e6d803fc286a80ce0fb60f3734b2c68d698d0e033b7ea5ada17a0db7
+AUX crystalspace-2.0-07-remove_emit_from_configure_ac_03.patch 1708 RMD160 5c865bf384895e984ba4a090beb411c30f86f479 SHA1 d495ce13d41e4f241612af9b8043a4123a46e509 SHA256 7e1b8e19c1dd58886d63ac73e87e0500df5bafb13bfab57e2ed20496db3de56a
+AUX crystalspace-2.0-08-remove_emit_from_configure_ac_04.patch 3620 RMD160 ca6ca27947aae75e20d85dbf8c785ca084b57e2c SHA1 cdec0aebc63ec31e79fcaf4be46310650455af4a SHA256 84e6762c5b0c42751f8c5cf92a5b01cc5a6f0e4a68a5edbffb4bc6180d4820f9
+AUX crystalspace-2.0-09-remove_emit_from_configure_ac_05.patch 2472 RMD160 b401e51e54e2a544b889af4c45332ff99505f622 SHA1 ba8e61049ddd2204ad05a7b18a5453d696f1ed17 SHA256 400b7f9270da4b321471bebba194a92cfce75fce53c101e79265896b75f73016
+AUX crystalspace-2.0-10-remove_emit_from_compiler_funcs.patch 2203 RMD160 12c0ad806201670c6de8aae795162e21730e97e4 SHA1 f611821b1d2cb7a3649f98a38eb596911a945cb7 SHA256 fdca74c5d3789901806412d952d7616afcdf0eadb56b6f40be0d22095f256ffe
+AUX crystalspace-2.0-11-data_add_missing.patch 1642 RMD160 5eddbb90b861eeb48494fa9214412850b106f46e SHA1 d45160dacf97397157384d240f657deae075bab5 SHA256 b3f5c4115b55e34e8cd4e973936375914cbebf5fa426b8423da1131b4bd20271
+AUX crystalspace-2.0-12-data_sky_add_missing.patch 413 RMD160 8ae9916d33eea54377d5cb61b767d9ad420e2164 SHA1 b09a8b3592b1644ac58676cefd4622b31814ec50 SHA256 08cacf066f69378a2b4e53f716218ddcb02f16f5da07966e947b2e3fc23dd6cb
+AUX crystalspace-2.0-13-maps_flarge_add_missing.patch 982 RMD160 fcb2069a2cced6c5dc73bd84590425e1cab56993 SHA1 18044e9a311c65f8d29c65ce0a9ffa885265881a SHA256 7c09f6c6187b66fdc2c055224bd1ef37824046eb04359b13ebefc75639f5f3b0
+AUX crystalspace-2.0-14-fix_vfs_template.patch 967 RMD160 f42979a3c3722056c69fbf54a0e5711a22a41e7a SHA1 c4441fcf3c0a1e0ca317b24b434318f6c4d6e5bd SHA256 25f77a13160fc4a7ccfdde705597c8694144789f094154d0a7c7e78ae3b7573e
+AUX crystalspace-2.0-15-add_usr_lib_to_cs-config.patch 2283 RMD160 0dbb74f07d490ad2cb2419471b265c6d58a41dd8 SHA1 4d6e90875ecc817fcddeb3b777919b58efe709c7 SHA256 766b4965fb2589991af8caf62d121545cd80e5116e1bc7fe8996469bfa1d9c2e
DIST crystalspace-src-2.0beta3.tar.bz2 189457618 RMD160 826686d65651bf2b7e8cbd7a1930d9c6b71d69fe SHA1 1d594a055a39c23da2dd10ab0ba527772ee5faf7 SHA256 e1c97f2937f091c73c4d55276586094544f4ef32d7cc2e0a1999fe2dc3fbd9e9
-EBUILD crystalspace-2.0_beta3-r4.ebuild 5892 RMD160 472ab8b7f380c5f98427ba17e752c0818206fc14 SHA1 49a77f8e75664c07f369f2f08f01da7e25febb92 SHA256 e924816cb2452becbd9d43b8f28ff0e4b828b2ab9978ce5ef66e7b4e4e5a9870
-MISC ChangeLog 1820 RMD160 ba4c2380e1a1e63ab6594c0e6383a121b2d4789e SHA1 e3ca13ff06be86365970323ed4f99fac7e74c153 SHA256 defdf631218213f8bd2558423592793a1a14436f9f4ba4279e4a31f0df4d8213
+EBUILD crystalspace-2.0_beta3-r5.ebuild 5937 RMD160 52f1b47be46d50c433878c3b9f6b93846b7783a8 SHA1 c7942b946c7ad6eede230e40523ea8601f61b83c SHA256 df13a49582872ec52e8233fc97f42438640570cf1ecc8de5cddfe5be26e6f340
+MISC ChangeLog 3377 RMD160 e49ae09979b22e9c4021b67001d3141a00849039 SHA1 9332bf8f2d91829986f9f0ea0f3c382060c11108 SHA256 0efc8141fd3ced33e1bb6c5cb3aee9b618030a99d57852557330e46e2dc0a247
MISC metadata.xml 897 RMD160 59e6eddca113690915fb17277d4ed3125f7599f2 SHA1 5e114681013e6ede57ecc30814b40e91948ce3d8 SHA256 82b3c21f6c5fb6b66310dc663f6bdd3ad3ca2b0e1d70ee056ce48eb92ef747ed
diff --git a/dev-games/crystalspace/crystalspace-2.0_beta3-r4.ebuild b/dev-games/crystalspace/crystalspace-2.0_beta3-r5.ebuild
index c761838..c2e97e4 100644
--- a/dev-games/crystalspace/crystalspace-2.0_beta3-r4.ebuild
+++ b/dev-games/crystalspace/crystalspace-2.0_beta3-r5.ebuild
@@ -58,14 +58,14 @@ src_prepare() {
# configure.ac forces /usr/local/lib (and /usr/local/include if present) upon
# users, which is a bad thing to do. Patch in a check to not do this if the
# --prefix, --libdir and/or --includedir options lead to default paths.
- epatch "${FILESDIR}"/${MY_P}-remove_hardcoded_libpath.patch
+ epatch "${FILESDIR}"/${MY_P}-01-remove_hardcoded_libpath.patch
# The maintainers enforce a mode of optimize, profile or debug upon users,
# enabling all sorts of C[XX]/LDFLAGS which might clash horribly with make.conf.
# Solution: Path a new mode "custom" in which is activated unless a user sets
# the use flag "debug"
- epatch "${FILESDIR}"/${MY_P}-add_custom_mode.patch
- epatch "${FILESDIR}"/${MY_P}-add_custom_variant.patch
+ epatch "${FILESDIR}"/${MY_P}-02-add_custom_mode.patch
+ epatch "${FILESDIR}"/${MY_P}-03-add_custom_variant.patch
# Before the new custom mode can be put into action, two additional changes are
# needed:
@@ -74,26 +74,26 @@ src_prepare() {
# B) Change configure.ac to NOT dump Jam vars until everything is set.
# C) Change m4 functions to not dump Jam vars we save and use elsewhere.
# A:
- epatch "${FILESDIR}"/${MY_P}-add_var_trimmer.patch
+ epatch "${FILESDIR}"/${MY_P}-04-add_var_trimmer.patch
# B:
- epatch "${FILESDIR}"/${MY_P}-remove_emit_from_configure_ac_01.patch
- epatch "${FILESDIR}"/${MY_P}-remove_emit_from_configure_ac_02.patch
- epatch "${FILESDIR}"/${MY_P}-remove_emit_from_configure_ac_03.patch
- epatch "${FILESDIR}"/${MY_P}-remove_emit_from_configure_ac_04.patch
- epatch "${FILESDIR}"/${MY_P}-remove_emit_from_configure_ac_05.patch
+ epatch "${FILESDIR}"/${MY_P}-05-remove_emit_from_configure_ac_01.patch
+ epatch "${FILESDIR}"/${MY_P}-06-remove_emit_from_configure_ac_02.patch
+ epatch "${FILESDIR}"/${MY_P}-07-remove_emit_from_configure_ac_03.patch
+ epatch "${FILESDIR}"/${MY_P}-08-remove_emit_from_configure_ac_04.patch
+ epatch "${FILESDIR}"/${MY_P}-09-remove_emit_from_configure_ac_05.patch
# C:
- epatch "${FILESDIR}"/${MY_P}-remove_emit_from_compiler_funcs.patch
+ epatch "${FILESDIR}"/${MY_P}-10-remove_emit_from_compiler_funcs.patch
# data/[*/]Jamfile seem to miss some entries - not updated, yet?
- epatch "${FILESDIR}"/${MY_P}-data_add_missing.patch
- epatch "${FILESDIR}"/${MY_P}-data_sky_add_missing.patch
- epatch "${FILESDIR}"/${MY_P}-maps_flarge_add_missing.patch
+ epatch "${FILESDIR}"/${MY_P}-11-data_add_missing.patch
+ epatch "${FILESDIR}"/${MY_P}-12-data_sky_add_missing.patch
+ epatch "${FILESDIR}"/${MY_P}-13-maps_flarge_add_missing.patch
# vfs.cfg lists an old zip, that doesn't seem to exist any more
- epatch "${FILESDIR}"/${MY_P}-fix_vfs_template.patch
+ epatch "${FILESDIR}"/${MY_P}-14-fix_vfs_template.patch
# cs-config doesn't look into /usr/lib[32|64], yet, so patch it in:
- epatch "${FILESDIR}"/${MY_P}-add_usr_lib_to_cs-config.patch
+ epatch "${FILESDIR}"/${MY_P}-15-add_usr_lib_to_cs-config.patch
# Installing doc conflict with dodoc on src_install
# Removing conflicting target
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-remove_hardcoded_libpath.patch b/dev-games/crystalspace/files/crystalspace-2.0-01-remove_hardcoded_libpath.patch
index 9a968b4..9a968b4 100644
--- a/dev-games/crystalspace/files/crystalspace-2.0-remove_hardcoded_libpath.patch
+++ b/dev-games/crystalspace/files/crystalspace-2.0-01-remove_hardcoded_libpath.patch
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-add_custom_mode.patch b/dev-games/crystalspace/files/crystalspace-2.0-02-add_custom_mode.patch
index 921ca63..921ca63 100644
--- a/dev-games/crystalspace/files/crystalspace-2.0-add_custom_mode.patch
+++ b/dev-games/crystalspace/files/crystalspace-2.0-02-add_custom_mode.patch
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-add_custom_variant.patch b/dev-games/crystalspace/files/crystalspace-2.0-03-add_custom_variant.patch
index 9d83e22..9d83e22 100644
--- a/dev-games/crystalspace/files/crystalspace-2.0-add_custom_variant.patch
+++ b/dev-games/crystalspace/files/crystalspace-2.0-03-add_custom_variant.patch
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-add_var_trimmer.patch b/dev-games/crystalspace/files/crystalspace-2.0-04-add_var_trimmer.patch
index 5702ae6..5702ae6 100644
--- a/dev-games/crystalspace/files/crystalspace-2.0-add_var_trimmer.patch
+++ b/dev-games/crystalspace/files/crystalspace-2.0-04-add_var_trimmer.patch
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-remove_emit_from_configure_ac_01.patch b/dev-games/crystalspace/files/crystalspace-2.0-05-remove_emit_from_configure_ac_01.patch
index 436f4f1..436f4f1 100644
--- a/dev-games/crystalspace/files/crystalspace-2.0-remove_emit_from_configure_ac_01.patch
+++ b/dev-games/crystalspace/files/crystalspace-2.0-05-remove_emit_from_configure_ac_01.patch
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-remove_emit_from_configure_ac_02.patch b/dev-games/crystalspace/files/crystalspace-2.0-06-remove_emit_from_configure_ac_02.patch
index 3a09faf..3a09faf 100644
--- a/dev-games/crystalspace/files/crystalspace-2.0-remove_emit_from_configure_ac_02.patch
+++ b/dev-games/crystalspace/files/crystalspace-2.0-06-remove_emit_from_configure_ac_02.patch
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-remove_emit_from_configure_ac_03.patch b/dev-games/crystalspace/files/crystalspace-2.0-07-remove_emit_from_configure_ac_03.patch
index 5e3f91f..5e3f91f 100644
--- a/dev-games/crystalspace/files/crystalspace-2.0-remove_emit_from_configure_ac_03.patch
+++ b/dev-games/crystalspace/files/crystalspace-2.0-07-remove_emit_from_configure_ac_03.patch
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-remove_emit_from_configure_ac_04.patch b/dev-games/crystalspace/files/crystalspace-2.0-08-remove_emit_from_configure_ac_04.patch
index 793c09d..793c09d 100644
--- a/dev-games/crystalspace/files/crystalspace-2.0-remove_emit_from_configure_ac_04.patch
+++ b/dev-games/crystalspace/files/crystalspace-2.0-08-remove_emit_from_configure_ac_04.patch
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-remove_emit_from_configure_ac_05.patch b/dev-games/crystalspace/files/crystalspace-2.0-09-remove_emit_from_configure_ac_05.patch
index 6f9bf97..6f9bf97 100644
--- a/dev-games/crystalspace/files/crystalspace-2.0-remove_emit_from_configure_ac_05.patch
+++ b/dev-games/crystalspace/files/crystalspace-2.0-09-remove_emit_from_configure_ac_05.patch
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-remove_emit_from_compiler_funcs.patch b/dev-games/crystalspace/files/crystalspace-2.0-10-remove_emit_from_compiler_funcs.patch
index c5c30cf..7300169 100644
--- a/dev-games/crystalspace/files/crystalspace-2.0-remove_emit_from_compiler_funcs.patch
+++ b/dev-games/crystalspace/files/crystalspace-2.0-10-remove_emit_from_compiler_funcs.patch
@@ -16,7 +16,7 @@
- [CS_CREATE_TUPLE([-pipe])], [C], [COMPILER.CFLAGS], [append])
+ CS_CHECK_BUILD_FLAGS([if $CC accepts -pipe], [cs_cv_prog_cc_pipe],
+ [CS_CREATE_TUPLE([-pipe])], [C],
-+ [CS_APPEND_TRIMMED([cs_cflags], [cs_cv_prog_cc_pipe])])
++ [CS_APPEND_TRIMMED([cs_cflags], [$cs_cv_prog_cc_pipe])])
# Check if compiler recognizes Sparc v9 CPU. Ugly to pollute
# project-agnostic C compiler check, but it is needed by assembly code
@@ -30,7 +30,7 @@
- [CS_CREATE_TUPLE([-mcpu=v9])], [C], [COMPILER.CFLAGS],
- [append])
+ [CS_CREATE_TUPLE([-mcpu=v9])], [C],
-+ [CS_APPEND_TRIMMED([cs_cflags], [cs_cv_prog_cc_sparc_v9])])
++ [CS_APPEND_TRIMMED([cs_cflags], [$cs_cv_prog_cc_sparc_v9])])
;;
esac
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-data_add_missing.patch b/dev-games/crystalspace/files/crystalspace-2.0-11-data_add_missing.patch
index 88422fe..88422fe 100644
--- a/dev-games/crystalspace/files/crystalspace-2.0-data_add_missing.patch
+++ b/dev-games/crystalspace/files/crystalspace-2.0-11-data_add_missing.patch
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-data_sky_add_missing.patch b/dev-games/crystalspace/files/crystalspace-2.0-12-data_sky_add_missing.patch
index ab63790..ab63790 100644
--- a/dev-games/crystalspace/files/crystalspace-2.0-data_sky_add_missing.patch
+++ b/dev-games/crystalspace/files/crystalspace-2.0-12-data_sky_add_missing.patch
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-maps_flarge_add_missing.patch b/dev-games/crystalspace/files/crystalspace-2.0-13-maps_flarge_add_missing.patch
index 68dda4b..68dda4b 100644
--- a/dev-games/crystalspace/files/crystalspace-2.0-maps_flarge_add_missing.patch
+++ b/dev-games/crystalspace/files/crystalspace-2.0-13-maps_flarge_add_missing.patch
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-fix_vfs_template.patch b/dev-games/crystalspace/files/crystalspace-2.0-14-fix_vfs_template.patch
index f4ee8e1..f4ee8e1 100644
--- a/dev-games/crystalspace/files/crystalspace-2.0-fix_vfs_template.patch
+++ b/dev-games/crystalspace/files/crystalspace-2.0-14-fix_vfs_template.patch
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-add_usr_lib_to_cs-config.patch b/dev-games/crystalspace/files/crystalspace-2.0-15-add_usr_lib_to_cs-config.patch
index af7e7f5..af7e7f5 100644
--- a/dev-games/crystalspace/files/crystalspace-2.0-add_usr_lib_to_cs-config.patch
+++ b/dev-games/crystalspace/files/crystalspace-2.0-15-add_usr_lib_to_cs-config.patch