net-mail/davmail: version bump, dev-games/crystalspace: Some fixes and removal of obsolet patches.

13 files changed, 24 insertions, 807 deletions

diff --git a/dev-games/crystalspace/ChangeLog b/dev-games/crystalspace/ChangeLog
index 20aa632..ac32f6a 100644
--- a/dev-games/crystalspace/ChangeLog
+++ b/dev-games/crystalspace/ChangeLog
@@ -2,6 +2,24 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*crystalspace-2.0-r1 (18 Jul 2012)
+
+  18 Jul 2012; Sven Eden <sven.eden@gmx.de>
+  +crystalspace-2.0-r1.ebuild,
+  -crystalspace-2.0.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:
+  Removed build system patches, as the discussion with upstream about user
+  decidable build flags is an ongoing process.
+
 *crystalspace-2.0 (13 Jul 2012)
 
   13 Jul 2012; Sven Eden <sven.eden@gmx.de>
diff --git a/dev-games/crystalspace/Manifest b/dev-games/crystalspace/Manifest
index 125517d..4ee4576 100644
--- a/dev-games/crystalspace/Manifest
+++ b/dev-games/crystalspace/Manifest
@@ -1,13 +1,3 @@
-AUX crystalspace-2.0-01-remove_hardcoded_libpath.patch 2347 SHA256 62e3d9d868c188a1b5a9828cb877bf55d031fc0475c268adb62eb96e746368bb SHA512 6ea28c1d80125212e0c57302c0347b18b936a012b1c591e84acba3b5fc5b01131d5101d86411d376f22c6701b2ef6d2193990c248c8b784958c3aba8eb328a23 WHIRLPOOL 138e1afff1424d576dfd15401de2953c2a1bf2930bedd27099c4d826e64339cf3223ddc277244335298fe55505ff4b14c8c0a0ef215481d7bc4852e438475a3f
-AUX crystalspace-2.0-02-add_custom_mode.patch 5224 SHA256 ea64ba09c0c53670c847b606ce4649de0c7ee92acb89b7377e05a4f7323c7814 SHA512 d2f72d419a200934f302b3a73b33243535b8f3e35aa44e2874c7b2a4eeb6d4e909f16a9ec7cdc7a5e0fe57452c17a26c4088c199244b3e64bc89bcbd3a13939c WHIRLPOOL b3c3607fcc5865e82300025409f7feccba4bb8ee9bf7826561d6157f33af27a647928bdf81159d569d01b46065c22a1ba22bafaf7bab223ab95940cfb537864b
-AUX crystalspace-2.0-03-add_custom_variant.patch 555 SHA256 04d9b216e716ce3a84ad0f78e255b055de2d979defaa3dca44f6c72c428b7434 SHA512 96305981fb69c40824c98c258870615ac17648b1ac958141d6bfbf2a1252348ef526f66dae1b291f1f9f9c54c34c12562ea1ed4d620756118e2f99bc24df1206 WHIRLPOOL dcb596b15be69bf3092a7c18a8d474206dbfde8e3d0c569b5802e0ed0e628a101db1c1885a8d1f75365c3f95022e5bc140a3147535bf36bd1ff5dc8359a76af1
-AUX crystalspace-2.0-04-add_var_trimmer.patch 2459 SHA256 24f6ce73a8678c28ffc78d580b6d7fde7c24e0fbba24d47ad0cf945fea573297 SHA512 a239ebec189b72461f4156fbd9804964e436891e085d2489909e34ccf6490087d2927b479e4721d534bcfc30259cc9e329b631b5e2c175bf04129fd445cce1cf WHIRLPOOL 3ba5e0185cdafead42a02f0d6a89f4a9b4dca5492da36ad215a466e89eb719d697204e59e248be5af5f9ff18edd3403970818025ddfa920774e3a5a7d37c90e4
-AUX crystalspace-2.0-05-remove_emit_from_configure_ac_01.patch 11511 SHA256 d2f48c2817210cfc221e2eeafab8975047898352040775e119175b6d88ce2f92 SHA512 1853912d4877cd5644f3216b485c8dabc95c7f5ee77a8392737ad6c2900b8a4260f74c0347ad614d800f6f10b13aa24886c1d40434cb5fc26914e22862432927 WHIRLPOOL a1f3b7713bfbbbe7c12f48a9a94231f72533db16f443b65c0ccbe543e09620e84b91904857359dca3a4b2b2ad74f4b43dc52a4f375b80a47fa1d8960792c9ad3
-AUX crystalspace-2.0-06-remove_emit_from_configure_ac_02.patch 3038 SHA256 a996bf68e6d803fc286a80ce0fb60f3734b2c68d698d0e033b7ea5ada17a0db7 SHA512 667c2d8bb9e7fcd0a234f3b06fe6fdbf0d6b24cb16c8a0ad2e3f69d0e46ef78335dce977915022218d7babb84b71ee774a3034aa6274afbc1b2f84efe96aeff4 WHIRLPOOL 4e77ab9d8b025a30e8038e7c2c8111d0b9536473974c41116b853e42c856be1045604c714acca46d6659003d768cc7c92101df125590d9ff3fe6416d0b7b2cad
-AUX crystalspace-2.0-07-remove_emit_from_configure_ac_03.patch 1708 SHA256 7e1b8e19c1dd58886d63ac73e87e0500df5bafb13bfab57e2ed20496db3de56a SHA512 784d2804de5fcbc25b52128768ab38a3f74561e555c9680bc207dff5ae67d858f8b0fb18cde10cd4f2750f7b919317303a1781c9ddc77c6d33a72700d20c5ec6 WHIRLPOOL 66e4f0f9ee6c653169efc7dc6da02b4283f10dcf8dc8f2cb2c7dab6ebe3e4f4f737ee1e7afe4f282f9b6f74abfc2afb081afb4c74bb0f57256a47e011cd7d65e
-AUX crystalspace-2.0-08-remove_emit_from_configure_ac_04.patch 3620 SHA256 84e6762c5b0c42751f8c5cf92a5b01cc5a6f0e4a68a5edbffb4bc6180d4820f9 SHA512 4fa130c111afdcbc7b41416383ea9de9e87d5aa478ac769208f53f61f2c7c017b7ac85514ecd97d359ccd0014a672da2f557b5fc30d04b1456229d10e08703e4 WHIRLPOOL bbd0d82ea5f9038a7a45a73eebf79865a74859650e96c9182f8462f2d63461f3e5a4508e605ed22f3e767f9f10973bcd7920a627c85a1226b3760355efc72122
-AUX crystalspace-2.0-09-remove_emit_from_configure_ac_05.patch 2472 SHA256 400b7f9270da4b321471bebba194a92cfce75fce53c101e79265896b75f73016 SHA512 bf19ce2f06b16adf50cbc155a5e1bf0a33e64f77378161c9f3c714a917ca27a0905cc6c726a185919af38e9434df6a01212dd683f61dad6f25b32a5e87209a65 WHIRLPOOL eb355e8423a46e5cae78c73069683d0f75bfcbed9a6ef81baa1bfffb737a98c3ba8d711263c771e9b2eb312b5cb5f6d8f1714c168ae71f13aff02ec9dbbffb0c
-AUX crystalspace-2.0-10-remove_emit_from_compiler_funcs.patch 2203 SHA256 fdca74c5d3789901806412d952d7616afcdf0eadb56b6f40be0d22095f256ffe SHA512 f0e9a4dae2d7255a957166115fa525c22da7b44d5cb1012cd6d6efd82f1d1e276cf50f18baf4d8d615e3811372db3e0ec02596519a2e6cae3ec2f44e0f98fef0 WHIRLPOOL a50ef1a7904f7c2c30d79db324e6c57629b814f38e5309f713b0796e4c6a17f694e1fb4eb4d27a4e97efac36ba7c0c093ff32177f375d45abc9738f7f68bfe75
 AUX crystalspace-2.0-fix_ode_update_01.patch 683 SHA256 a6bcde1c687b53d7325edd3b60cc62bc078565702264cda2b2c235d2e3d6b7fc SHA512 43597469808195d096b3babb286d104dae44a37cd34549482076c84882f7665d6b6ef10931d07bb93201d174aca9830eb57f9e6439534a3f876e9ee2f50a0f16 WHIRLPOOL cdbd132c78a08b5d667d7c853300a3a3e533905f30b917d426257b96b3cbf6422a9fe17cebcc1a8b5df1548d66ac255043ac764b57c875eb093abfafb1d69ad7
 AUX crystalspace-2.0-fix_ode_update_02.patch 2126 SHA256 f7def2666181dd4e872993220905e4986e4943f427c3b88a14be96068685edd0 SHA512 a5d0e3e6a0ee03dbcf589e8375491eeffb1d0ee75f6e8811447283934f610b7c33a4ebec75a07ed4311588c347f5f370f2dbe304f115e5d7cb576776390c3297 WHIRLPOOL bbb51882547f3ea7156e6ce6826d91d882e0e7a221a97bc49cb489ff47338142d6b8bb9bebef260dfc08b93b69cd43e2a7085b77b9e7d2202b214361174cb845
 AUX crystalspace-2.0-fix_ode_update_03.patch 378 SHA256 a314def6c6b6c44e3f251c97b161e8251e7cd90c72a9715fa9c6bd399125cbf7 SHA512 60f983f963527497088095009a0470a959884d4ea31a68e606efe10d9b8872a7a8d1caeb5e9276a335ad2a8982585788711ab20e10b934e0960650b08855f795 WHIRLPOOL 45d563bc94364113c4fc9773c9883aaef9e80a6bf848a34462cd53e93c12b826d3baf0005b65d7f8566fe1e7d62b9fd3b8bec60663f570001515b927c8a9ef1d
@@ -22,6 +12,6 @@ AUX crystalspace-2.0-fix_ode_update_11.patch 4583 SHA256 d1c2f7ebf40aa9ed821cb65
 AUX crystalspace-2.0-fix_ode_update_12.patch 2496 SHA256 e98092ca53a28fdd02d15fcb54d305378ed21af1ea4d8c57bca5fc5231916e78 SHA512 ed5d7f2b7a23336864f598d51f34403afbd9fb2d615e9f35fd7fe44464f68e169aadb9f39e83aaf7dd47bb3e62f1c6df0b104ca7ec8762ecda4d4dde7bc92703 WHIRLPOOL 291e26b58c8c8f787814fab98be42d9ad862176b5e6cbaf06208535a8ec45d9188841a3703bbdc7c436c011e0278b2ba11b7bda8ca04d2dc0b54e49cabe1cc2d
 AUX crystalspace-2.0-fix_ode_update_13.patch 1988 SHA256 e865e1616bc4ac4728066bc58686f8ef7aad3764db0867b6aaf31aec52ad6aa7 SHA512 cd88a5a479944b7969ff738208b720a4f283dbeecee7573bcc2d767a0a91c7d8085e0ba806c819c4afb6fce2ecbe0b1839d5e6207466950b3eaa42034c4655de WHIRLPOOL 27cd936d02942d278ca62e7f6e8d85480f079c2d50e1c4d48950311632771383e78ff10cc11dea8587fcc2d8c12646124e702195827287a79c3581806e3a946a
 DIST crystalspace-src-2.0.tar.bz2 185925180 SHA256 f1cda74fd998e44088746803209b1ea6625e80e3d4fb72023d8bed6b677b7b6a SHA512 f09d40669268e26542a2854560ac5033e7f89d0bd5def870e5062e08611c36a0875666abe0c705bb5f9f37dafa619f33f900e358d5fe255746a86127a3899f97 WHIRLPOOL a1705cb88b64eb0e8f6a146c2a75baab01aa598d07b8d36ab0671a47d4092b5c9b53c13f46bb1e56663b2b228c4b95cee3a355554c1de92c3d931187e97c4ca1
-EBUILD crystalspace-2.0.ebuild 6213 SHA256 6d641e6610fb32d4a6117429481d18dea0b6542099182068529e2ab146d36090 SHA512 2bcaa6f7ffdb4b6b2bce00dc0cfd356673a3663b4adacc70366b01b488cf0274a9ce69cc92396fbf4b2e7614a82a48ee8b0e08c507ae2cd60a9253b8f8373090 WHIRLPOOL 3bb7a7ecd35fa565e59a3028f047f8410f5d8d7fabf63ddaf14bf874c4ff629f8d019ac1e7beae7b7a51e2525815ef45912635ef7d2d554d64f9d661e652fd8c
-MISC ChangeLog 4715 SHA256 330c99043452696034ac54eb6a2c3f302fc0129b0013a342f096a825cae5912b SHA512 ca55dc7a001a51f7f270bd8ae41fd96258db3391870df3863609f27d1cda0d8720c7ba43b025061e84d3fce8b1675115b902d04096ff3b1e52dfa101de6ba4b4 WHIRLPOOL cfcfaf73b9e5b6aa5eb7af8fc7be090b20fc60ca732225bcfc10596afebfc85a2454a923d8ef2eae79f4556ed1313519ee4ea81ec441f549852ff59fdcf3648f
+EBUILD crystalspace-2.0-r1.ebuild 4727 SHA256 1a516d9419a8368f41134738eddf123072ab0c4b29950598b52c8f087bf544f5 SHA512 97dcde93046ce246d0c8760f8f0ef460dc560a536e621d4cdbe85184b2dfcebf9b47feffd6339a9cafd76934d4b7bf7ef926e4dc400c33a55712d81a85891fbe WHIRLPOOL ffe20d13d83fe9947ce7d7472dc42686cb1508032b130845fc3077037b96c70eccccc008efd385e764e561fe4961d3f460ce702ff76121c6aa7f253136829107
+MISC ChangeLog 5610 SHA256 b6958a175e60e1adc419d9b04fb191ab0c9339dce05b928e8d1c92020b1c3a12 SHA512 a962feead51a39f2511b25232cabb0f612dc90eb6348044acd0e9bf8386e344533d7221cf789cc9305565684272770ea7fb4d0b49c99d03ef97d80e322fb370e WHIRLPOOL 105d288f9d512848cb9f3c9f06f0af5fb632d293c156e98563f7afaffb732fd2712f15e7a244ebfd2ee80a04b68a64f05020e5272d5a8321f173c50be0b3c736
 MISC metadata.xml 897 SHA256 82b3c21f6c5fb6b66310dc663f6bdd3ad3ca2b0e1d70ee056ce48eb92ef747ed SHA512 e7ad7264a6badd9b6cd0d5e3ac5fcb12da19c8668a51528dc9b445b51fff31323dd66f29e3c702acbe6901a9316cd627340fdb4b0d8a6be9bf8549b1fabaa6a2 WHIRLPOOL e14f2ef8b54c1066f73ed92089fc4fb62e7151056c1cf468a87ebc6a188cb26343b24f5fd881695a6bba14c62ac68f6ebe52ff5a5e7a6083b559a1ddce64eff4
diff --git a/dev-games/crystalspace/crystalspace-2.0.ebuild b/dev-games/crystalspace/crystalspace-2.0-r1.ebuild
index d896d37..3b87ff8 100644
--- a/dev-games/crystalspace/crystalspace-2.0.ebuild
+++ b/dev-games/crystalspace/crystalspace-2.0-r1.ebuild
@@ -54,35 +54,6 @@ DEPEND="${COMMON_DEP}
 S=${WORKDIR}/${PN}-src-${MY_PV}
 
 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}-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}-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:
-	# A) Add two functions to add only content to shell variables that is not present
-	#    yet (used on all tries to modify C[XX]/LFLAGS.*), and
-	# 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}-04-add_var_trimmer.patch
-	# B:
-	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}-10-remove_emit_from_compiler_funcs.patch
-
 	# The new ode version no longer has the StepFast API, so patch this
 	# code (experimental anyway) out:
 	epatch "${FILESDIR}"/${MY_P}-fix_ode_update_01.patch
@@ -123,10 +94,10 @@ src_configure() {
 	if use debug ; then
 		myconf="--enable-debug"
 	else
-		myconf="--enable-custom"
+		myconf="--enable-optimize --enable-cpu-specific-optimizations=native"
 	fi
 
-	myconf="${myconf} --without-jackasyn \
+	myconf="${myconf} --without-jackasyn --disable-make-emulation \
 		$(use_with truetype freetype2) \
 		$(use_with wxwidgets wx) \
 		$(use_with wxwidgets GTK) \
@@ -176,8 +147,8 @@ src_install() {
 	dodoc README docs/history*
 	PF=${oldPF}
 
-	echo "CRYSTAL=/usr/share/${MY_P}" >> 90crystalspace
-	echo "CRYSTAL_PLUGIN=/usr/$(get_libdir)/${MY_P}" > 90crystalspace
+	echo "CRYSTAL=/usr/share/${MY_P}" > 90crystalspace
+	echo "CRYSTAL_PLUGIN=/usr/$(get_libdir)/${MY_P}" >> 90crystalspace
 	echo "CRYSTAL_CONFIG=/etc/${MY_P}" >> 90crystalspace
 	doenvd 90crystalspace
 
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-01-remove_hardcoded_libpath.patch b/dev-games/crystalspace/files/crystalspace-2.0-01-remove_hardcoded_libpath.patch
deleted file mode 100644
index 9a968b4..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-01-remove_hardcoded_libpath.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- configure.ac	2012-04-24 08:32:35.536552189 +0200
-+++ configure.ac	2012-04-24 08:51:56.386613019 +0200
-@@ -874,23 +874,34 @@
- # attempts to run a test program. Without augmenting LD_LIBRARY_PATH, the test
- # program would fail to run, citing inability to locate libstdc++.so.
- #------------------------------------------------------------------------------
--AS_IF([test -d /usr/local/include],
--    [CS_CHECK_BUILD_FLAGS([if -I/usr/local/include is usable],
--	[cs_cv_prog_cpp_local_include],
--	[CS_CREATE_TUPLE([-I/usr/local/include])], [C++], [], [],
--	[$cs_cv_prog_cxx_enable_warnings $cs_cv_prog_cxx_enable_errors])],
-+# Update, 2012-04-24, Sven Eden:
-+# If the user adds a specific includedir or libdir or those directories are
-+# changed by the --prefix option, it is a nuisance to have /usr/local/foo added
-+# all over the place. Thus do not do anything unless the configure options say
-+# so. Furthermore the user is allowed to use any --prefix they like, so do not
-+# Hardcode the default path here.
-+#------------------------------------------------------------------------------
-+AS_IF([test "x$includedir" != "x/usr/include"],
-+    AS_IF([test -d $includedir],
-+        [CS_CHECK_BUILD_FLAGS([if -I$includedir is usable],
-+            [cs_cv_prog_cpp_local_include],
-+            [CS_CREATE_TUPLE([-I$includedir])], [C++], [], [],
-+            [$cs_cv_prog_cxx_enable_warnings $cs_cv_prog_cxx_enable_errors])],
-+        [cs_cv_prog_cpp_local_include='']),
-     [cs_cv_prog_cpp_local_include=''])
- 
-+
- AS_IF([test -n "$cs_cv_prog_cpp_local_include"],
-     [CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS],
--	[$cs_cv_prog_cpp_local_include], [+])
-+        [$cs_cv_prog_cpp_local_include], [+])
-     CPPFLAGS="$CPPFLAGS $cs_cv_prog_cpp_local_include"])
- 
--AS_IF([test -d /usr/local/lib],
--    [CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS], [-L/usr/local/lib], [+])
--    LDFLAGS="$LDFLAGS -L/usr/local/lib"
--    LD_LIBRARY_PATH="$LD_LIBRARY_PATH$PATH_SEPARATOR/usr/local/lib"
--    export LD_LIBRARY_PATH])
-+AS_IF([test -d $libdir],
-+    [CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS], [-L$libdir], [+])
-+    LDFLAGS="$LDFLAGS -L$libdir"
-+    AS_IF([test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib32" -a "x$libdir" != "x/usr/lib64"],
-+        [LD_LIBRARY_PATH="$LD_LIBRARY_PATH$PATH_SEPARATOR$libdir"
-+        export LD_LIBRARY_PATH])])
- 
- 
- 
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-02-add_custom_mode.patch b/dev-games/crystalspace/files/crystalspace-2.0-02-add_custom_mode.patch
deleted file mode 100644
index 921ca63..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-02-add_custom_mode.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- configure.ac	2012-04-26 07:05:20.069141755 +0200
-+++ configure.ac	2012-04-26 07:17:10.785820884 +0200
-@@ -647,15 +647,15 @@
- AC_MSG_CHECKING([whether to use CPU-specific optimizations])
- AC_ARG_ENABLE([cpu-specific-optimizations],
-     [AC_HELP_STRING([--enable-cpu-specific-optimizations=level],
--	[enable CPU-specific optimizations; recognized levels are `no',
--	`minimum' or `min', `maximum' or `max', `native' (default MINIMUM);
--	the `minimum' option selects optimizations which are likely to be 
--	supported by reasonably modern hardware, thus making the resulting 
--	executables fairly portable; use the `maximum' option with caution 
--	since code for one processor will not work with earlier processors
--	(for example, Intel 686-specific code will not work with a 586). The
--	`native' option select optimizations specific for the compiling machine
--	(thus giving a fairly unportable executable).])],
-+	[enable CPU-specific optimizations; this option is ignored in `custom'
-+	build mode. Recognized levels are `no', `minimum' or `min', `maximum'
-+	or `max', `native' (default MINIMUM); the `minimum' option selects
-+	optimizations which are likely to be supported by reasonably modern
-+	hardware, thus making the resulting	executables fairly portable; use
-+	the `maximum' option with caution since code for one processor will not
-+	work with earlier processors	(for example, Intel 686-specific code will
-+	not work with a 586). The	`native' option select optimizations specific
-+	for the compiling machine	(thus giving a fairly unportable executable).])],
-     [case $enable_cpu_specific_optimizations in
- 	yes|min) enable_cpu_specific_optimizations=minimum ;;
- 	max) enable_cpu_specific_optimizations=maximum ;;
-@@ -668,8 +668,7 @@
-     *) CS_MSG_ERROR([unrecognized option; use `no', `minimum', `maximum' or `native'])
-        ;;
- esac
--
--AS_IF([test $enable_cpu_specific_optimizations != no],
-+AS_IF([test $enable_cpu_specific_optimizations != no -a "$cs_build_mode$" = !"custom"],
-     [AC_CACHE_CHECK([for code generation flags], [cs_cv_prog_cxx_code_gen],
- 	[cs_cv_prog_cxx_code_gen=no
- 	AS_IF([test $enable_cpu_specific_optimizations = native],
-@@ -779,6 +778,14 @@
- #------------------------------------------------------------------------------
- # Determine build mode; either "optimize", "debug", or "profile".
- #------------------------------------------------------------------------------
-+# Update, 2012-04-24, Sven Eden:
-+# On source based distributions like Gentoo Linux, CFLAGS, CXXFLAGS and LDFLAGS
-+# are handled globally. Extending them with presets is a bad idea, as those
-+# flags can become very lengthy, eventually crashing Jam.
-+# Solution: Add a "custom" mode, that only sets what is absolutely necessary
-+# and thus relies on user input. "optimize", however, should stay being the
-+# default.
-+#------------------------------------------------------------------------------
- AC_ARG_ENABLE([optimize], [AC_HELP_STRING([--enable-optimize],
-     [build with optimizations enabled (default YES);
- 	same as --enable-mode=optimize])],
-@@ -794,14 +801,19 @@
- 	same as --enable-mode=profile])],
-     [test "$enableval" = "yes" && cs_build_mode=profile])
- 
-+AC_ARG_ENABLE([custom], [AC_HELP_STRING([--enable-custom],
-+    [build without special C[XX]FLAGS (default NO);
-+	same as --enable-mode=custom])],
-+    [test "$enableval" = "yes" && cs_build_mode=custom])
-+
- AC_ARG_ENABLE([mode], [AC_HELP_STRING([--enable-mode=mode],
--    [set build mode; recognized modes are `optimize', `debug', `profile'
-+    [set build mode; recognized modes are `optimize', `debug', `profile', `custom'
- 	(default OPTIMIZE)])],
-     [case $enableval in
--	optimize|debug|profile) cs_build_mode=$enableval ;;
-+	optimize|debug|profile|custom) cs_build_mode=$enableval ;;
- 	*) CS_MSG_ERROR([m4_text_wrap(
- 	    [unrecognized mode --enable-mode=$enableval;
--	    use `optimize', `debug', or `profile'], [    ], [[]], [60])]) ;;
-+	    use `optimize', `debug', `profile' or `custom'], [    ], [[]], [60])]) ;;
-     esac])
- 
- AC_MSG_CHECKING([build mode])
-@@ -820,10 +832,10 @@
- AC_ARG_ENABLE([separate-debug-info], 
-     [AC_HELP_STRING([--enable-separate-debug-info],
-         [split debug information into separate files. (default YES if 
--        binutils >= 2.17 and build mode not 'profile', 
-+        binutils >= 2.17 and build mode not 'profile' or 'custom', 
- 	otherwise default NO)])])
- AS_IF([test -z "$enable_separate_debug_info"], 
--    [AS_IF([test "$cs_build_mode$" = "profile"],
-+    [AS_IF([test "$cs_build_mode$" = "profile" -o "$cs_build_mode$" = "custom"],
- 	[enable_separate_debug_info=no],
- 	[AS_IF([test -z `uname | grep -i CYGWIN`],
- 	    [enable_separate_debug_info=$cs_cv_binutils_2_17],
-@@ -850,7 +862,7 @@
- AS_IF([test -z "$enable_optimize_mode_debug_info"], 
-     [enable_optimize_mode_debug_info=$enable_separate_debug_info])
- AC_MSG_RESULT([$enable_optimize_mode_debug_info])
--AS_IF([test "$enable_optimize_mode_debug_info" != "no"],
-+AS_IF([test "$enable_optimize_mode_debug_info" != "no" -a "$cs_build_mode$" != "custom"],
-     [CS_EMIT_BUILD_FLAGS([how to enable optimize mode debugging symbols],
- 	[cs_cv_prog_cxx_debug_symbols_normal],
- 	[CS_CREATE_TUPLE([-g2]) CS_CREATE_TUPLE([-g])],
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-03-add_custom_variant.patch b/dev-games/crystalspace/files/crystalspace-2.0-03-add_custom_variant.patch
deleted file mode 100644
index 9d83e22..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-03-add_custom_variant.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- mk/jam/variant.jam	2012-04-27 20:49:21.256202254 +0200
-+++ mk/jam/variant.jam	2012-04-27 20:50:56.272873856 +0200
-@@ -23,9 +23,9 @@
-   VARIANT = $(MODE) ;
- }
- 
--if $(VARIANT) != "debug" && $(VARIANT) != "optimize" && $(VARIANT) != "profile"
-+if $(VARIANT) != "debug" && $(VARIANT) != "optimize" && $(VARIANT) != "profile" && $(VARIANT) != "custom"
- {
--  exit "Invalid modus set, please set VARIANT to debug, profile or optimize" ;
-+  exit "Invalid modus set, please set VARIANT to debug, profile, optimize or custom" ;
- }
- 
- # Set modus related flags
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-04-add_var_trimmer.patch b/dev-games/crystalspace/files/crystalspace-2.0-04-add_var_trimmer.patch
deleted file mode 100644
index 5702ae6..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-04-add_var_trimmer.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- mk/autoconf/trim.m4	2012-04-26 07:21:42.859168666 +0200
-+++ mk/autoconf/trim.m4	2012-04-26 07:39:40.795891383 +0200
-@@ -25,3 +25,53 @@
- #	runs of multiple spaces to a single space.
- #------------------------------------------------------------------------------
- AC_DEFUN([CS_TRIM], [`echo x$1 | sed 's/^x//;s/   */ /g;s/^ //;s/ $//'`])
-+
-+#------------------------------------------------------------------------------
-+# CS_TRIM_OPT(shell var)
-+# Remove leading dashes
-+#------------------------------------------------------------------------------
-+AC_DEFUN([CS_TRIM_OPT], [`echo x$1 | sed 's/^x//;s/^-*//g'`])
-+
-+#------------------------------------------------------------------------------
-+# CS_APPEND_TRIMMED(named shell var, STRING)
-+# Go through all entries in STRING and append those that are not present in the
-+# given named shell variable.
-+#------------------------------------------------------------------------------
-+AC_DEFUN([CS_APPEND_TRIMMED],
-+  [AS_IF([test -n "$2"],
-+    [append_text="$$1"
-+    append_values="CS_TRIM([$2])"
-+    for value in $append_values ; do
-+      append_found=''
-+      AS_IF([test -n "$append_text"],
-+      [chkVal="CS_TRIM_OPT([$value])"
-+      append_found="`echo -n "$append_text" | grep -o "$chkVal"`"])
-+      AS_IF([test -z "$append_found"],
-+        [$1="${$1} ${value}"
-+        append_text="$$1"])
-+    done])])
-+
-+#------------------------------------------------------------------------------
-+# CS_PREPEND_TRIMMED(named shell var, STRING)
-+# Go through all entries in STRING and prepend those that are not present in
-+# the given named shell variable.
-+#------------------------------------------------------------------------------
-+AC_DEFUN([CS_PREPEND_TRIMMED],
-+  [AS_IF([test -n "$2"],
-+    [prepend_text="$$1"
-+    prepend_values="CS_TRIM([$2])"
-+    for value in $prepend_values ; do
-+      prepend_found=''
-+      AS_IF([test -n "$prepend_text"],
-+      [chkVal="CS_TRIM_OPT([$value])"
-+      prepend_found="`echo -n "$prepend_text" | grep -o "$chkVal"`"])
-+      AS_IF([test -z "$prepend_found"],
-+        [$1="${value} ${$1}"
-+        prepend_text="$$1"])
-+    done])])
-+
-+#------------------------------------------------------------------------------
-+# CS_ERASE_VAR(named shell var)
-+# Simply set the named shell var to an empty string
-+#------------------------------------------------------------------------------
-+AC_DEFUN([CS_ERASE_VAR], [AS_IF([test -n "$1"], [$1=''])])
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-05-remove_emit_from_configure_ac_01.patch b/dev-games/crystalspace/files/crystalspace-2.0-05-remove_emit_from_configure_ac_01.patch
deleted file mode 100644
index 436f4f1..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-05-remove_emit_from_configure_ac_01.patch
+++ /dev/null
@@ -1,249 +0,0 @@
---- configure.ac	2012-04-27 19:14:14.745903867 +0200
-+++ configure.ac	2012-04-27 19:17:01.585912459 +0200
-@@ -134,6 +134,18 @@
- 
- 
- #------------------------------------------------------------------------------
-+# Save current CFLAGS, CXXFLAGS, CPPFLAGS and LDFLAGS for th custom mode
-+#------------------------------------------------------------------------------
-+CS_APPEND_TRIMMED([cs_cflags_custom], [$CPPFLAGS $CFLAGS])
-+CS_APPEND_TRIMMED([cs_cxxflags_custom], [$CPPFLAGS $CXXFLAGS])
-+CS_APPEND_TRIMMED([cs_ldflags_custom], [$LDFLAGS])
-+CS_ERASE_VAR(CFLAGS)
-+CS_ERASE_VAR(CPPFLAGS)
-+CS_ERASE_VAR(CXXFLAGS)
-+CS_ERASE_VAR(LDFLAGS)
-+
-+
-+#------------------------------------------------------------------------------
- # The cs-win32libs package is a convenience archive made available to Windows
- # users of Crystal Space.  It contains common libraries, headers, and tools
- # (such as zlib, libjpeg, cal3d, etc.) usable by MSVC, Mingw/MSYS, and Cygwin
-@@ -145,12 +157,11 @@
- 
- 
- #------------------------------------------------------------------------------
--# Use the CPPFLAGS, CXXFLAGS, CFLAGS, and LDFLAGS passed to configure, as well
--# as any additional flags provided by cs-win32libs.
-+# Use the CPPFLAGS, CXXFLAGS, CFLAGS, and LDFLAGS provided by cs-win32libs.
- #------------------------------------------------------------------------------
--CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS], [$CPPFLAGS $CFLAGS], [+])
--CS_EMIT_BUILD_PROPERTY([COMPILER.C++FLAGS], [$CPPFLAGS $CXXFLAGS], [+])
--CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS], [$LDFLAGS], [+])
-+CS_APPEND_TRIMMED([cs_cflags], [$CPPFLAGS $CFLAGS])
-+CS_APPEND_TRIMMED([cs_cxxflags], [$CPPFLAGS $CXXFLAGS])
-+CS_APPEND_TRIMMED([cs_ldflags], [$LDFLAGS])
- 
- 
- 
-@@ -175,7 +186,7 @@
- 
- #------------------------------------------------------------------------------
- # Check for pthread.  Also check if pthread implementation supports the
--# recursive mutex extension and `atfork' functionality.
-+# recursive mutex extension and 'atfork' functionality.
- #------------------------------------------------------------------------------
- CS_CHECK_PTHREAD([cygwin*])
- CS_EMIT_BUILD_RESULT([cs_cv_sys_pthread], [PTHREAD])
-@@ -201,10 +212,11 @@
-     [], [enable_static_baselibs=no])
- AC_MSG_RESULT([$enable_static_baselibs])
- AS_IF([test $enable_static_baselibs = yes],
--    [CS_EMIT_BUILD_FLAGS([for -static-libgcc],
-+    [CS_CHECK_BUILD_FLAGS([for -static-libgcc],
-         [cs_cv_prog_link_static_libgcc], [CS_CREATE_TUPLE([-static-libgcc])],
--        [C], [COMPILER.LFLAGS], [+])
--    libstdcxx=`$CXX -print-file-name=libstdc++.a`
-+        [C],
-+	[CS_APPEND_TRIMMED([cs_ldflags], [$cs_cv_prog_link_static_libgcc])])
-+    libstdcxx='$CXX -print-file-name=libstdc++.a'
-     CS_EMIT_BUILD_FLAGS([for static libstdc++],
-         [cs_cv_prog_link_static_libstdcxx],
-         CS_CREATE_TUPLE([$libstdcxx]),
-@@ -375,8 +387,7 @@
- # diagnostics from warning to error status.
- #------------------------------------------------------------------------------
- CS_COMPILER_WARNINGS([C++], [cs_cv_prog_cxx_enable_warnings],
--    [CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS],
--	[$cs_cv_prog_cxx_enable_warnings], [+])])
-+    [CS_APPEND_TRIMMED([cs_cflags], [$cs_cv_prog_cxx_enable_warnings])])
- 
- CS_COMPILER_ERRORS([C++], [cs_cv_prog_cxx_enable_errors])
- 
-@@ -389,13 +400,12 @@
- 	[$cs_cv_prog_cxx_ignore_uninitialized])])
- 
- CS_COMPILER_IGNORE_PRAGMAS([C++], [cs_cv_prog_cxx_ignore_unknown_pragmas],
--    [CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS],
--	[$cs_cv_prog_cxx_ignore_unknown_pragmas], [+])])
-+        [CS_APPEND_TRIMMED([cs_cflags], [$cs_cv_prog_cxx_ignore_unknown_pragmas])])
- 
--# On MacOS/X, use of `long double' in csutil/formatter.h causes complaints.
-+# On MacOS/X, use of 'long double' in csutil/formatter.h causes complaints.
- CS_COMPILER_IGNORE_LONG_DOUBLE([C++], [cs_cv_prog_cxx_ignore_long_double],
--    [CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS.MANDATORY],
--	[$cs_cv_prog_cxx_ignore_long_double], [+])])
-+    [CS_APPEND_TRIMMED([cs_cflags_mandatory],
-+      [$cs_cv_prog_cxx_ignore_long_double])])
- 
- CS_COMPILER_IGNORE_NON_VIRTUAL_DTOR([C++],
-     [cs_cv_prog_cxx_ignore_non_virtual_dtor],
-@@ -429,15 +439,14 @@
- CS_EMIT_BUILD_FLAGS([how to disable C++ exceptions],
-     [cs_cv_prog_cxx_disable_exceptions], [CS_CREATE_TUPLE([-fno-exceptions])],
-     [C++], [COMPILER.C++FLAGS.EXCEPTIONS.DISABLE], [],
--    [CS_EMIT_BUILD_PROPERTY([COMPILER.C++FLAGS],
--	[$cs_cv_prog_cxx_disable_exceptions], [+])])
-+    [CS_APPEND_TRIMMED([cs_cppflags], [$cs_cv_prog_cxx_disable_exceptions])])
- 
- 
- 
- #------------------------------------------------------------------------------
- # Check how to make compiler comply strongly with the official C++ language
- # specification. Crystal Space itself can not abide 100% by the standard (for
--# instance, we employ `long long', which is not part of the present
-+# instance, we employ 'long long', which is not part of the present
- # specification), however, some external projects do so (by using gcc's -ansi
- # and -pedantic options, for instance). Because such projects may utilize
- # Crystal Space, we must ensure that our public headers likewise comply with
-@@ -452,7 +461,7 @@
- #------------------------------------------------------------------------------
- # Check if the linker recognizes "-force_cpusubtype_ALL".  This is required on
- # MacOS/X since the Crystal Space's PowerPC implementation of csQsqrt() uses
--# the `frsqrte' instruction which is only valid when the -force_cpusubtype_ALL
-+# the 'frsqrte' instruction which is only valid when the -force_cpusubtype_ALL
- # flag is present.  This flag is marked "mandatory" because it is required even
- # for external projects if they use csQsqrt().
- #------------------------------------------------------------------------------
-@@ -462,8 +471,8 @@
- 	[CS_CREATE_TUPLE([], [-force_cpusubtype_ALL])])])
-     
- CS_CHECK_FORCE_CPUSUBTYPE_ALL
--CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS.MANDATORY],
--    [$cs_cv_prog_cxx_force_cpusubtype_all], [+])
-+CS_APPEND_TRIMMED([cs_cflags_mandatory],
-+    [$cs_cv_prog_cxx_force_cpusubtype_all])
- 
- 
- 
-@@ -478,10 +487,11 @@
-     [AC_REQUIRE([AC_CANONICAL_HOST])
-     case $host_os in
- 	darwin*)
--	    CS_EMIT_BUILD_FLAGS([if -fno-common is needed],
-+	    CS_CHECK_BUILD_FLAGS([if -fno-common is needed],
- 		[cs_cv_prog_cxx_no_common],
- 		[CS_CREATE_TUPLE([], [-fno-common])], [C++],
--		[COMPILER.CFLAGS.MANDATORY], [+])
-+		[CS_APPEND_TRIMMED([cs_cflags_mandatory],
-+			[$cs_cv_prog_cxx_no_common])])
- 	    ;;
-     esac])
- 
-@@ -592,12 +602,12 @@
- # Check how to declare symbol visibility.
- #------------------------------------------------------------------------------
- CS_VISIBILITY_FLAG_INLINES_HIDDEN(
--    [CS_EMIT_BUILD_PROPERTY([COMPILER.C++FLAGS],
--	[$cs_prog_cxx_visibility_inlines_hidden], [+])])
-+    [CS_APPEND_TRIMMED([cs_cxxflags],
-+	[$cs_prog_cxx_visibility_inlines_hidden])])
- 
- CS_VISIBILITY_FLAG_HIDDEN([C], [],
--    [CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS], 
--	[$cs_cv_prog_c_visibility_hidden], [+])])
-+    [CS_APPEND_TRIMMED([cs_cflags], 
-+	[$cs_cv_prog_c_visibility_hidden])])
- 
- CS_VISIBILITY_FLAG_DEFAULT([C], [],
-     [CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS.VISIBILITY_DEFAULT], 
-@@ -647,14 +657,14 @@
- AC_MSG_CHECKING([whether to use CPU-specific optimizations])
- AC_ARG_ENABLE([cpu-specific-optimizations],
-     [AC_HELP_STRING([--enable-cpu-specific-optimizations=level],
--	[enable CPU-specific optimizations; this option is ignored in `custom'
--	build mode. Recognized levels are `no', `minimum' or `min', `maximum'
--	or `max', `native' (default MINIMUM); the `minimum' option selects
-+	[enable CPU-specific optimizations; this option is ignored in 'custom'
-+	build mode. Recognized levels are 'no', 'minimum' or 'min', 'maximum'
-+	or 'max', 'native' (default MINIMUM); the 'minimum' option selects
- 	optimizations which are likely to be supported by reasonably modern
- 	hardware, thus making the resulting	executables fairly portable; use
--	the `maximum' option with caution since code for one processor will not
-+	the 'maximum' option with caution since code for one processor will not
- 	work with earlier processors	(for example, Intel 686-specific code will
--	not work with a 586). The	`native' option select optimizations specific
-+	not work with a 586). The	'native' option select optimizations specific
- 	for the compiling machine	(thus giving a fairly unportable executable).])],
-     [case $enable_cpu_specific_optimizations in
- 	yes|min) enable_cpu_specific_optimizations=minimum ;;
-@@ -665,7 +675,7 @@
- 
- case $enable_cpu_specific_optimizations in
-     no|minimum|maximum|native) ;;
--    *) CS_MSG_ERROR([unrecognized option; use `no', `minimum', `maximum' or `native'])
-+    *) CS_MSG_ERROR([unrecognized option; use 'no', 'minimum', 'maximum' or 'native'])
-        ;;
- esac
- AS_IF([test $enable_cpu_specific_optimizations != no -a "$cs_build_mode$" = !"custom"],
-@@ -709,8 +719,7 @@
- 	CS_CHECK_CODE_GEN_FLAG([alpha], [-mieee])])
- 
-     AS_IF([test "$cs_cv_prog_cxx_code_gen" != no],
--	[CS_EMIT_BUILD_PROPERTY(
--	    [COMPILER.CFLAGS], [$cs_cv_prog_cxx_code_gen], [+])])])
-+	[CS_APPEND_TRIMMED([cs_cflags], [$cs_cv_prog_cxx_code_gen])])])
- 
- 
- 
-@@ -728,8 +737,7 @@
-         [append])], [],	[$cs_cv_prog_cxx_code_gen])
- CS_CHECK_BUILD_FLAGS([for -mfpmath=sse flag], [cs_cv_prog_cc_mfpmath_sse],
-     [CS_CREATE_TUPLE([-mfpmath=sse])], [],
--    [CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS], [$cs_cv_prog_cc_mfpmath_sse],
--        [append])], [],
-+    [CS_APPEND_TRIMMED([cs_cflags], [$cs_cv_prog_cc_mfpmath_sse])], [],
- 	[$cs_cv_prog_cxx_code_gen $cs_cv_prog_cxx_enable_errors])
- 
- AS_IF([test -n "$cs_cv_prog_cc_mmmx"],
-@@ -807,13 +815,13 @@
-     [test "$enableval" = "yes" && cs_build_mode=custom])
- 
- AC_ARG_ENABLE([mode], [AC_HELP_STRING([--enable-mode=mode],
--    [set build mode; recognized modes are `optimize', `debug', `profile', `custom'
-+    [set build mode; recognized modes are 'optimize', 'debug', 'profile', 'custom'
- 	(default OPTIMIZE)])],
-     [case $enableval in
- 	optimize|debug|profile|custom) cs_build_mode=$enableval ;;
- 	*) CS_MSG_ERROR([m4_text_wrap(
- 	    [unrecognized mode --enable-mode=$enableval;
--	    use `optimize', `debug', `profile' or `custom'], [    ], [[]], [60])]) ;;
-+	    use 'optimize', 'debug', 'profile' or 'custom'], [    ], [[]], [60])]) ;;
-     esac])
- 
- AC_MSG_CHECKING([build mode])
-@@ -837,7 +845,7 @@
- AS_IF([test -z "$enable_separate_debug_info"], 
-     [AS_IF([test "$cs_build_mode$" = "profile" -o "$cs_build_mode$" = "custom"],
- 	[enable_separate_debug_info=no],
--	[AS_IF([test -z `uname | grep -i CYGWIN`],
-+	[AS_IF([test -z 'uname | grep -i CYGWIN'],
- 	    [enable_separate_debug_info=$cs_cv_binutils_2_17],
- 	    [enable_separate_debug_info=$cs_cv_binutils_true_2_17])])])
- AC_MSG_RESULT([$enable_separate_debug_info])
-@@ -904,12 +912,12 @@
- 
- 
- AS_IF([test -n "$cs_cv_prog_cpp_local_include"],
--    [CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS],
--        [$cs_cv_prog_cpp_local_include], [+])
-+    [CS_APPEND_TRIMMED([cs_cflags], [$cs_cv_prog_cpp_local_include])
-+		CS_APPEND_TRIMMED([cs_cxxflags], [$cs_cv_prog_cpp_local_include])
-     CPPFLAGS="$CPPFLAGS $cs_cv_prog_cpp_local_include"])
- 
- AS_IF([test -d $libdir],
--    [CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS], [-L$libdir], [+])
-+    [CS_APPEND_TRIMMED([cs_ldflags], [-L$libdir])
-     LDFLAGS="$LDFLAGS -L$libdir"
-     AS_IF([test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib32" -a "x$libdir" != "x/usr/lib64"],
-         [LD_LIBRARY_PATH="$LD_LIBRARY_PATH$PATH_SEPARATOR$libdir"
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-06-remove_emit_from_configure_ac_02.patch b/dev-games/crystalspace/files/crystalspace-2.0-06-remove_emit_from_configure_ac_02.patch
deleted file mode 100644
index 3a09faf..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-06-remove_emit_from_configure_ac_02.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- configure.ac	2012-04-27 19:37:08.235975562 +0200
-+++ configure.ac	2012-04-27 19:42:06.112657828 +0200
-@@ -1624,7 +1624,7 @@
- 
- CS_CHECK_LIBMINGWX
- AS_IF([test $cs_cv_libmingwex = yes],
--    [CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS], [-lmingwex], [+])])
-+    [CS_APPEND_TRIMMED([cs_ldflags], [-lmingwex])])
- 
- 
- 
-@@ -2656,7 +2656,7 @@
-     [AC_MSG_CHECKING([whether to use checking allocations])
-     AC_ARG_ENABLE([checking-allocations],
- 	[AC_HELP_STRING([--enable-checking-allocations],
--	    [make allocations by default `checking' if the extensive memory
-+	    [make allocations by default 'checking' if the extensive memory
- 	    debugger is enabled (default NO)])],
- 	[], [enable_checking_allocations=no])
-     AC_MSG_RESULT([$enable_checking_allocations])
-@@ -2729,8 +2729,8 @@
-     [], [enable_valgrind=$enable_valgrind_default])
- AC_MSG_RESULT([$enable_valgrind])
- AS_IF([test $enable_valgrind = no],
--    [CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS], [-DNVALGRIND], [+])
--    CS_EMIT_BUILD_PROPERTY([COMPILER.C++FLAGS], [-DNVALGRIND], [+])])
-+    [CS_APPEND_TRIMMED([cs_cflags], [-DNVALGRIND])
-+    CS_APPEND_TRIMMED([cs_cxxflags], [-DNVALGRIND])])
- AC_CHECK_HEADERS([valgrind/valgrind.h],
-     [CS_HEADER_PROPERTY([CS_HAVE_VALGRIND_VALGRIND_H])])
- AC_CHECK_HEADERS([valgrind/memcheck.h],
-@@ -2763,14 +2763,27 @@
- AC_MSG_CHECKING([whether to emulate makefiles])
- AC_ARG_ENABLE([make-emulation],
-     [AC_HELP_STRING([--enable-make-emulation],
--	[enable emulation layer allowing project to be built with `make', in
--	addition to `jam' (default YES)])],
-+	[enable emulation layer allowing project to be built with 'make', in
-+	addition to 'jam' (default YES)])],
-     [], [enable_make_emulation=yes])
- AC_MSG_RESULT([$enable_make_emulation])
- 
- 
- 
- #------------------------------------------------------------------------------
-+# Put FLAGS together
-+#------------------------------------------------------------------------------
-+CS_APPEND_TRIMMED([CFLAGS], [$cs_cflags])
-+CS_APPEND_TRIMMED([CPPFLAGS], [$cs_cppflags])
-+CS_APPEND_TRIMMED([CXXFLAGS], [$cs_cxxflags])
-+CS_APPEND_TRIMMED([LDFLAGS], [$cs_ldflags])
-+CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS], [$CFLAGS], [+])
-+CS_EMIT_BUILD_PROPERTY([COMPILER.CPPFLAGS], [$CPPFLAGS], [+])
-+CS_EMIT_BUILD_PROPERTY([COMPILER.C++FLAGS], [$CXXFLAGS], [+])
-+CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS], [$LDFLAGS], [+])
-+
-+
-+#------------------------------------------------------------------------------
- # Boilerplate: csconfig.h
- #------------------------------------------------------------------------------
- CS_HEADER_PREPEND(
-@@ -2792,10 +2805,6 @@
- #------------------------------------------------------------------------------
- # Boilerplate: Jamconfig
- #------------------------------------------------------------------------------
--CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS],
--    [AS_ESCAPE([$(COMPILER.CFLAGS.MANDATORY)])], [+])
--CS_EMIT_BUILD_PROPERTY([COMPILER.C++FLAGS],
--    [AS_ESCAPE([$(COMPILER.C++FLAGS.MANDATORY)])], [+])
- CS_EMIT_PACKAGEINFO
- CS_OUTPUT_INSTALLDIRS
- 
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-07-remove_emit_from_configure_ac_03.patch b/dev-games/crystalspace/files/crystalspace-2.0-07-remove_emit_from_configure_ac_03.patch
deleted file mode 100644
index 5e3f91f..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-07-remove_emit_from_configure_ac_03.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- configure.ac	2012-04-27 20:52:34.876212336 +0200
-+++ configure.ac	2012-04-27 21:10:11.002934257 +0200
-@@ -33,6 +33,18 @@
- 
- 
- #------------------------------------------------------------------------------
-+# Save current CFLAGS, CXXFLAGS, CPPFLAGS and LDFLAGS for the custom mode.
-+#------------------------------------------------------------------------------
-+CS_APPEND_TRIMMED([cs_cflags_custom], [$CPPFLAGS $CFLAGS])
-+CS_APPEND_TRIMMED([cs_cxxflags_custom], [$CPPFLAGS $CXXFLAGS])
-+CS_APPEND_TRIMMED([cs_ldflags_custom], [$LDFLAGS])
-+CS_ERASE_VAR(CFLAGS)
-+CS_ERASE_VAR(CPPFLAGS)
-+CS_ERASE_VAR(CXXFLAGS)
-+CS_ERASE_VAR(LDFLAGS)
-+
-+
-+#------------------------------------------------------------------------------
- # Check for compilers and linker.
- #------------------------------------------------------------------------------
- CS_CHECK_MNO_CYGWIN
-@@ -134,18 +146,6 @@
- 
- 
- #------------------------------------------------------------------------------
--# Save current CFLAGS, CXXFLAGS, CPPFLAGS and LDFLAGS for th custom mode
--#------------------------------------------------------------------------------
--CS_APPEND_TRIMMED([cs_cflags_custom], [$CPPFLAGS $CFLAGS])
--CS_APPEND_TRIMMED([cs_cxxflags_custom], [$CPPFLAGS $CXXFLAGS])
--CS_APPEND_TRIMMED([cs_ldflags_custom], [$LDFLAGS])
--CS_ERASE_VAR(CFLAGS)
--CS_ERASE_VAR(CPPFLAGS)
--CS_ERASE_VAR(CXXFLAGS)
--CS_ERASE_VAR(LDFLAGS)
--
--
--#------------------------------------------------------------------------------
- # The cs-win32libs package is a convenience archive made available to Windows
- # users of Crystal Space.  It contains common libraries, headers, and tools
- # (such as zlib, libjpeg, cal3d, etc.) usable by MSVC, Mingw/MSYS, and Cygwin
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-08-remove_emit_from_configure_ac_04.patch b/dev-games/crystalspace/files/crystalspace-2.0-08-remove_emit_from_configure_ac_04.patch
deleted file mode 100644
index 793c09d..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-08-remove_emit_from_configure_ac_04.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- configure.ac	2012-04-27 21:15:01.336282799 +0200
-+++ configure.ac	2012-04-27 21:26:45.032986227 +0200
-@@ -552,8 +552,8 @@
- #------------------------------------------------------------------------------
- CS_CHECK_BUILD_FLAGS([how to export all dynamic symbols],
-     [cs_cv_prog_link_export_dynamic], [CS_CREATE_TUPLE([-Wl,-E])],
--    [C++], [CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS.debug],
--        [$cs_cv_prog_link_export_dynamic], [+])],
-+    [C++], [CS_APPEND_TRIMMED([cs_ldflags_debug],
-+        [$cs_cv_prog_link_export_dynamic])],
-     [], [], [$cs_cv_prog_link_enable_errors])
- 
- 
-@@ -760,24 +760,25 @@
- 
-     cs_optimize_flags=''
- 
--    CS_EMIT_BUILD_FLAGS([how to enable optimizations],
-+    CS_CHECK_BUILD_FLAGS([how to enable optimizations],
- 	[cs_cv_prog_cxx_optimize],
- 	[CS_CREATE_TUPLE([-O3]) CS_CREATE_TUPLE([-O2]) CS_CREATE_TUPLE([-O])],
--	[C++], [COMPILER.CFLAGS.optimize], [+],
--	[cs_optimize_flags="$cs_optimize_flags $cs_cv_prog_cxx_optimize"])
-+	[C++], [CS_APPEND_TRIMMED([cs_cflags_optimize], [$cs_cv_prog_cxx_optimize])
-+	cs_optimize_flags="$cs_optimize_flags $cs_cv_prog_cxx_optimize"])
- 
--    CS_EMIT_BUILD_FLAGS([if -fomit-frame-pointer is accepted],
-+    CS_CHECK_BUILD_FLAGS([if -fomit-frame-pointer is accepted],
- 	[cs_cv_prog_cxx_omit_frame_pointer],
- 	[CS_CREATE_TUPLE([-fomit-frame-pointer])],
--	[C++], [COMPILER.CFLAGS.optimize], [+],
--	[cs_optimize_flags="$cs_optimize_flags \
-+	[C++],
-+	[CS_APPEND_TRIMMED([cs_cflags_optimize], [$cs_cv_prog_cxx_omit_frame_pointer])
-+	cs_optimize_flags="$cs_optimize_flags \
- 	    $cs_cv_prog_cxx_omit_frame_pointer"])
- 
-     CS_EMIT_BUILD_FLAGS([if -ffast-math is accepted],
- 	[cs_cv_prog_cxx_fast_math],
- 	[CS_CREATE_TUPLE([-ffast-math])], [C++],
--	[COMPILER.CFLAGS.optimize], [+],
--	[cs_optimize_flags="$cs_optimize_flags $cs_cv_prog_cxx_fast_math"])])
-+	[CS_APPEND_TRIMMED([cs_cflags_optimize], [$cs_cv_prog_cxx_fast_math])
-+	cs_optimize_flags="$cs_optimize_flags $cs_cv_prog_cxx_fast_math"])])
- 
- CS_CHECK_OPTIMIZE_FLAGS
- 
-@@ -853,12 +854,12 @@
- CS_EMIT_BUILD_PROPERTY([LINK.DEBUG.INFO.SEPARATE],
-     [$enable_separate_debug_info])
- 
--CS_EMIT_BUILD_FLAGS([how to enable debug mode debugging symbols],
-+CS_CHECK_BUILD_FLAGS([how to enable debug mode debugging symbols],
-     [cs_cv_prog_cxx_debug_symbols_extra],
-     [CS_CREATE_TUPLE([-g3]) CS_CREATE_TUPLE([-g2]) CS_CREATE_TUPLE([-g])],
--    [C++], [COMPILER.CFLAGS.debug], [+],
--    [CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS.debug],
--	[$cs_cv_prog_cxx_debug_symbols_extra], [+])])
-+    [C++],
-+    [CS_APPEND_TRIMMED([cs_cflags_debug], [$cs_cv_prog_cxx_debug_symbols_extra])
-+    CS_APPEND_TRIMMED([cs_ldflags_debug], [$cs_cv_prog_cxx_debug_symbols_extra])])
- 	
- AC_MSG_CHECKING([whether to enable debug information in optimize mode])
- AC_ARG_ENABLE([optimize-mode-debug-info], 
-@@ -871,12 +872,12 @@
-     [enable_optimize_mode_debug_info=$enable_separate_debug_info])
- AC_MSG_RESULT([$enable_optimize_mode_debug_info])
- AS_IF([test "$enable_optimize_mode_debug_info" != "no" -a "$cs_build_mode$" != "custom"],
--    [CS_EMIT_BUILD_FLAGS([how to enable optimize mode debugging symbols],
-+    [CS_CHECK_BUILD_FLAGS([how to enable optimize mode debugging symbols],
- 	[cs_cv_prog_cxx_debug_symbols_normal],
- 	[CS_CREATE_TUPLE([-g2]) CS_CREATE_TUPLE([-g])],
--	[C++], [COMPILER.CFLAGS.optimize], [+],
--	[CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS.optimize],
--	    [$cs_cv_prog_cxx_debug_symbols_normal], [+])])])
-+	[C++],
-+	[CS_APPEND_TRIMMED([cs_cflags_optimize], [$cs_cv_prog_cxx_debug_symbols_normal])
-+	CS_APPEND_TRIMMED([cs_cflags_optimize], [$cs_cv_prog_cxx_debug_symbols_normal])])])
- 
- 
- 
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-09-remove_emit_from_configure_ac_05.patch b/dev-games/crystalspace/files/crystalspace-2.0-09-remove_emit_from_configure_ac_05.patch
deleted file mode 100644
index 6f9bf97..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-09-remove_emit_from_configure_ac_05.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- configure.ac	2012-04-27 21:27:38.556322395 +0200
-+++ configure.ac	2012-04-27 21:36:42.666350846 +0200
-@@ -2773,7 +2773,19 @@
- 
- #------------------------------------------------------------------------------
- # Put FLAGS together
-+# To remove cruft we first move everything now set in the ENV vars to shell
-+# vars and then move them back.
- #------------------------------------------------------------------------------
-+CS_APPEND_TRIMMED([cs_cflags], [$CFLAGS])
-+CS_APPEND_TRIMMED([cs_cxxflags], [$CXXFLAGS])
-+CS_APPEND_TRIMMED([cs_cppflags], [$CPPFLAGS])
-+CS_APPEND_TRIMMED([cs_ldflags], [$LDFLAGS])
-+CS_ERASE_VAR(CFLAGS)
-+CS_ERASE_VAR(CPPFLAGS)
-+CS_ERASE_VAR(CXXFLAGS)
-+CS_ERASE_VAR(LDFLAGS)
-+
-+# Set ENV FLAGS
- CS_APPEND_TRIMMED([CFLAGS], [$cs_cflags])
- CS_APPEND_TRIMMED([CPPFLAGS], [$cs_cppflags])
- CS_APPEND_TRIMMED([CXXFLAGS], [$cs_cxxflags])
-@@ -2783,6 +2795,30 @@
- CS_EMIT_BUILD_PROPERTY([COMPILER.C++FLAGS], [$CXXFLAGS], [+])
- CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS], [$LDFLAGS], [+])
- 
-+# Set debug flags
-+CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS.debug], [$cs_cflags_debug], [+])
-+CS_EMIT_BUILD_PROPERTY([COMPILER.CPPFLAGS.debug], [$cs_cppflags_debug], [+])
-+CS_EMIT_BUILD_PROPERTY([COMPILER.C++FLAGS.debug], [$cs_cxxflags_debug], [+])
-+CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS.debug], [$cs_ldflags_debug], [+])
-+
-+# Set optimize flags
-+CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS.optimize], [$cs_cflags_optimize], [+])
-+CS_EMIT_BUILD_PROPERTY([COMPILER.CPPFLAGS.optimize], [$cs_cppflags_optimize], [+])
-+CS_EMIT_BUILD_PROPERTY([COMPILER.C++FLAGS.optimize], [$cs_cxxflags_optimize], [+])
-+CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS.optimize], [$cs_ldflags_optimize], [+])
-+
-+# Set profile flags
-+CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS.profile], [$cs_cflags_profile], [+])
-+CS_EMIT_BUILD_PROPERTY([COMPILER.CPPFLAGS.profile], [$cs_cppflags_profile], [+])
-+CS_EMIT_BUILD_PROPERTY([COMPILER.C++FLAGS.profile], [$cs_cxxflags_profile], [+])
-+CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS.profile], [$cs_ldflags_profile], [+])
-+
-+# Set custom flags
-+CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS.custom], [$cs_cflags_custom], [+])
-+CS_EMIT_BUILD_PROPERTY([COMPILER.CPPFLAGS.custom], [$cs_cppflags_custom], [+])
-+CS_EMIT_BUILD_PROPERTY([COMPILER.C++FLAGS.custom], [$cs_cxxflags_custom], [+])
-+CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS.custom], [$cs_ldflags_custom], [+])
-+
- 
- #------------------------------------------------------------------------------
- # Boilerplate: csconfig.h
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-10-remove_emit_from_compiler_funcs.patch b/dev-games/crystalspace/files/crystalspace-2.0-10-remove_emit_from_compiler_funcs.patch
deleted file mode 100644
index 7300169..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-10-remove_emit_from_compiler_funcs.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- mk/autoconf/compiler.m4	2012-04-27 20:54:23.302884670 +0200
-+++ mk/autoconf/compiler.m4	2012-04-27 21:05:29.549586201 +0200
-@@ -104,7 +104,6 @@
-     AC_REQUIRE([AC_CANONICAL_HOST])
-     AS_IF([test -n "$CC"],[
- 	CS_EMIT_BUILD_PROPERTY([CMD.CC], [$CC])
--	CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS], [$CPPFLAGS $CFLAGS], [+])
- 	_CS_COMPILER_NAME([$CC], [C], [$ac_compiler_gnu])
- 	AC_MSG_CHECKING([for C compiler version])
- 	_CS_COMPILER_VERSION([$CC], [C])
-@@ -113,8 +112,9 @@
- 	    [AC_MSG_RESULT([$_CS_COMPILER_VERSION_SH([C])])])
- 	
- 	# Check if compiler recognizes -pipe directive.
--	CS_EMIT_BUILD_FLAGS([if $CC accepts -pipe], [cs_cv_prog_cc_pipe],
--	    [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])])
- 
-         # Check if compiler recognizes Sparc v9 CPU. Ugly to pollute
-         # project-agnostic C compiler check, but it is needed by assembly code
-@@ -122,10 +122,10 @@
-         # hurt if the option is not recognized.
- 	case $host_cpu in
- 	    sparc*)
--		CS_EMIT_BUILD_FLAGS([if $CC handles Sparc v9],
-+		CS_CHECK_BUILD_FLAGS([if $CC handles Sparc v9],
-             	    [cs_cv_prog_cc_sparc_v9],
--            	    [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])])
- 		;;
- 	esac
- 
-@@ -161,7 +161,6 @@
-     AC_REQUIRE([AC_PROG_CXX])
-     AS_IF([test -n "$CXX"],[
- 	CS_EMIT_BUILD_PROPERTY([CMD.C++], [$CXX])
--	CS_EMIT_BUILD_PROPERTY([COMPILER.C++FLAGS], [$CPPFLAGS $CXXFLAGS], [+])
- 	_CS_COMPILER_NAME([$CXX], [C++], [$ac_compiler_gnu])
- 	AC_MSG_CHECKING([for C++ compiler version])
- 	_CS_COMPILER_VERSION([$CXX], [C++])
-@@ -273,7 +272,6 @@
-     CS_CHECK_TOOLS([LD], [ld])
-     CS_EMIT_BUILD_PROPERTY([CMD.LD], [$LD])
-     
--    CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS], [$LDFLAGS], [+])
- 
-     # Check if compiler/linker recognizes -shared directive which is needed for
-     # linking plugin modules.  Unfortunately, the Apple compiler (and possibly