dev-games/crystalspace, dev-games/cel: Version bump to 2.0 stable

13 files changed, 32 insertions, 341 deletions

diff --git a/dev-games/cel/ChangeLog b/dev-games/cel/ChangeLog
index ec56590..3d8ecf3 100644
--- a/dev-games/cel/ChangeLog
+++ b/dev-games/cel/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+
+*cel-2.0 (13 Jul 2012)
+
+	13 Jul 2012; Sven Eden <sven.eden@gmx.de>
+	+cel-2.0.ebuild, -cel-1.4.0.ebuild, -cel-2.1_pre9999-r1.ebuild:
+	Version bump to Crystal Space 2.0, removed obsolete ebuilds.
+
 *cel-2.0_beta3 (16 Feb 2012)
 
   16 Feb 2012; Sven Eden <sven.eden@gmx.de>
diff --git a/dev-games/cel/Manifest b/dev-games/cel/Manifest
index 5a37e2c..f28162c 100644
--- a/dev-games/cel/Manifest
+++ b/dev-games/cel/Manifest
@@ -1,7 +1,4 @@
-DIST cel-src-1.4.0.tar.bz2 5114202 RMD160 d41f4fca69963d283a1bc52914b52b151c3f06cf SHA1 4ed93ebb70d3a2a116114e44884d2bab57597e07 SHA256 ee9eed9c7a5d660b2c2e1ef6048069ade19f6ce1c4e02b26c36bc3c286c76964
-DIST cel-src-2.0beta3.tar.bz2 8577854 RMD160 18d0657b502245dac0a9a984037a2fe499508dc7 SHA1 5f48017f167f456ee65ec418573181d4450b8a5d SHA256 22177fde8cb60e9fe9cb9b750180bb465acbd22761b87ab15a78d47fc2932b1d
-EBUILD cel-1.4.0.ebuild 1167 RMD160 226d9e93ad353a204205ab58e7743fb952ddcc38 SHA1 7ff1752c15fb241176291a66651f69c8ae7262a8 SHA256 2827e2348686fa334da6f7ae7ec6bb23ff28caeb6f6bea1020df838580200f4f
-EBUILD cel-2.0_beta3.ebuild 1791 RMD160 081f24e186d1d9e5d2204f976b0356b229fac845 SHA1 1d2af85d8ba8af71ba60d680dad12b7b12223a39 SHA256 6ebe1bf086262ed951d17ac22c1dad31dffdaf1a1c15d32c2a11c4d51ddc6c11
-EBUILD cel-2.1_pre9999-r1.ebuild 1731 RMD160 a701a5ce47d429c22750ebe0b34b484994f3ca8b SHA1 0a3c8e6da67ecfe3bb744ad5b8829cfaee9f7610 SHA256 c548362acbcc7db2332e1da3bf50e3acef53dca2bdb3c9b43f77f6c1cf01a07c
-MISC ChangeLog 1000 RMD160 c37ebd2a1b49808a2e36e92c5194eb896d154db6 SHA1 5da1be29d607bdfa912518ec931b1d0c3c732200 SHA256 cde056241fd32b0cd56dbf88dc0f8a2584c3e47f6f2b82430d08411d66b4f2eb
-MISC metadata.xml 742 RMD160 ba57eb7e3665c99178c6f4aa87295f733078f1e7 SHA1 05b96b7763e8d31c7fdf288ff5d64cac1dbdb869 SHA256 8bba1c11f1a37559c759d853e6bed13ac5a288180366d18623bdcf19bd971ef2
+DIST cel-src-2.0.tar.bz2 8157258 SHA256 dae05d69f1d95da2690e7925b002fcc764da0f1008c037f4918d02f151dfb9de SHA512 a04759ec318fe6b92a430b0aec52e78ec033df5691c54c7222d1b565cf9f8a706e129cc9e9420061b672e15f25a8472c4152ed777de6b6cf76a4c084008a7083 WHIRLPOOL e88b02a181844fce8ce06abbef1978cf8c6ecf1366359e6f0a0faacc793cabc69bb3815cdebaec7844f4c78e19da245f5b28bec920305d7bc2ff118027f54c63
+EBUILD cel-2.0.ebuild 1755 SHA256 df32878438ea742e5dfb6ede66646e8b316ebd92fd919e179a11731d1dfcc97b SHA512 8c630251ef9700e304d16d779760a442d4ee87722148114ab18f4d2ba381efb9f548bbd8dd46b50296208d630626b16f126c119ad76481ad719974223af96c23 WHIRLPOOL 9f798cc7c830bcb3809459899cf7a832f90f0cbf3abbbc6a1b0903bd1df2ae2feb59fe4b03a527a2b998ff54285199f0460496d236bb52bea464ba08b427f8f3
+MISC ChangeLog 1196 SHA256 98d8ce218932bdd58f0a9c5a0340390245f795580ec19471bdcc692ca6b60115 SHA512 f58fd13555f60b779b793e7bb8c25a2acde2e684367d3ffa1d8387690cc1b962b45ec1ab421a4f844d355d5cc4073b71cb30de51e705a67be226eb7d5016af29 WHIRLPOOL 08a17510cdb2a12643f8fa05edb9327e8cf7e01fe100cd1696e52dffe0e3356384fb3d9f3189e016bbcd80d8d131c554ab7097c582ce9b2db4942a4c7146746f
+MISC metadata.xml 742 SHA256 8bba1c11f1a37559c759d853e6bed13ac5a288180366d18623bdcf19bd971ef2 SHA512 a08778f2f30b0a5c19f2933aa6d0c61c45a05fbfdfc13b3216fef2f5b3fb8a72139e396705485bdd0f67c7da7e706a4032825b98d24f58b22556a901260d34a8 WHIRLPOOL 197aeeeb9784684c5f7f0c5f07d410e2df863d06650cabd8cb7b9c8fd4acbca08308ce3748f89f827fc77156c9cd91fcca4ffd9ad31c74a8856f4e424e4f669f
diff --git a/dev-games/cel/cel-1.4.0.ebuild b/dev-games/cel/cel-1.4.0.ebuild
deleted file mode 100644
index a34028a..0000000
--- a/dev-games/cel/cel-1.4.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit eutils versionator
-
-MY_P=${PN}-src-${PV}
-MY_PV=$(get_version_component_range 1-2)
-MY_P2=${PN}-${MY_PV}
-
-DESCRIPTION="A game entity layer based on Crystal Space"
-HOMEPAGE="http://cel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="python"
-
-SLOT="0"
-
-RDEPEND=">=dev-games/crystalspace-${PV}
-	dev-games/hawknl"
-DEPEND="${RDEPEND}
-	dev-util/ftjam"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	chmod +x configure
-	econf \
-		--disable-separate-debug-info \
-		--disable-cstest \
-		$(use_with python) \
-		|| die
-}
-
-src_compile() {
-	jam -q || die "jam failed"
-}
-
-src_install() {
-	jam -q -s DESTDIR="${D}" install || die "jam install failed"
-
-	# Fill cache directory for the examples
-	cp "${D}"/usr/share/${MY_P2}/data/{basic_,}world
-	cslight -video=null "${D}"/usr/share/${MY_P2}/data
-	cp "${D}"/usr/share/${MY_P2}/data/{walktut_,}world
-	cslight -video=null "${D}"/usr/share/${MY_P2}/data
-	rm "${D}"/usr/share/${MY_P2}/data/world
-
-	dodoc docs/history*.txt docs/todo.txt
-}
diff --git a/dev-games/cel/cel-2.0_beta3.ebuild b/dev-games/cel/cel-2.0.ebuild
index eb2f309..0c6b300 100644
--- a/dev-games/cel/cel-2.0_beta3.ebuild
+++ b/dev-games/cel/cel-2.0.ebuild
@@ -7,12 +7,11 @@ EAPI=4
 inherit autotools eutils versionator
 
 MY_PV=$(get_version_component_range 1-2)
-MY_BETA="beta3"
 MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="A game entity layer based on Crystal Space"
 HOMEPAGE="http://www.crystalspace3d.org/"
-SRC_URI="http://www.crystalspace3d.org/downloads/release/${PN}-src-${MY_PV}${MY_BETA}.tar.bz2"
+SRC_URI="http://www.crystalspace3d.org/downloads/release/${PN}-src-${MY_PV}.tar.bz2"
 RESTRICT="mirror"
 
 LICENSE="LGPL-2"
@@ -27,7 +26,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-util/ftjam"
 
-S=${WORKDIR}/${PN}-src-${MY_PV}${MY_BETA}
+S=${WORKDIR}/${PN}-src-${MY_PV}
 
 src_prepare() {
 	# InstallDoc conflicts with dodoc
diff --git a/dev-games/cel/cel-2.1_pre9999-r1.ebuild b/dev-games/cel/cel-2.1_pre9999-r1.ebuild
deleted file mode 100644
index ca2c838..0000000
--- a/dev-games/cel/cel-2.1_pre9999-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit autotools eutils subversion versionator
-
-MY_PV=$(get_version_component_range 1-2)
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="A game entity layer based on Crystal Space"
-HOMEPAGE="http://www.crystalspace3d.org/"
-ESVN_REPO_URI="https://cel.svn.sourceforge.net/svnroot/cel/cel/trunk"
-
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-SLOT="0"
-
-RDEPEND="
-  =dev-games/crystalspace-${MY_PV}*
-  dev-games/hawknl"
-DEPEND="${RDEPEND}
-	dev-util/ftjam"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# InstallDoc conflicts with dodoc
-	sed -i -e "/^InstallDoc/d" docs/Jamfile \
-		|| die "sed on docs/Jamfile failed"
-
-	AT_M4DIR=mk/autoconf
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-    --disable-separate-debug-info \
-    --disable-optimize-mode-debug-info \
-    --with-cs-prefix=/usr \
-		$(use_enable debug) \
-		|| die "configure failed"
-}
-
-src_compile() {
-	local jamopts=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[[:space:]]*[0-9]\+\).*/\1/; p }")
-	jam -q ${jamopts} || die "compile failed (jam -q ${jamopts})"
-}
-
-src_install() {
-	jam -q -s DESTDIR="${D}" install || die "jam install failed"
-
-	# Fill cache directory for the examples
-	cp "${D}"/usr/share/${MY_P}/data/{basic_,}world
-	lighter2 --simpletui "${D}"/usr/share/${MY_P}/data
-	cp "${D}"/usr/share/${MY_P}/data/{walktut_,}world
-	lighter2 --simpletui "${D}"/usr/share/${MY_P}/data
-	rm "${D}"/usr/share/${MY_P}/data/world
-
-	# As the target install_doc uses crystalspace-1.9 as target, but dodoc
-	# uses ${PF}, this said var has to be manipulated first.
-	local oldPF=${PF}
-	PF=${MY_P}
-	dodoc COPYING README docs/history*.txt docs/todo.txt
-	PF=${oldPF}
-}
diff --git a/dev-games/crystalspace/ChangeLog b/dev-games/crystalspace/ChangeLog
index 50594c0..20aa632 100644
--- a/dev-games/crystalspace/ChangeLog
+++ b/dev-games/crystalspace/ChangeLog
@@ -2,6 +2,20 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*crystalspace-2.0 (13 Jul 2012)
+
+  13 Jul 2012; Sven Eden <sven.eden@gmx.de>
+  +crystalspace-2.0.ebuild,
+  -crystalspace-2.0_beta3-r5.ebuild,
+  -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:
+	Version bump to latest stable.
+	Removed old ebuild and accepted patches.
+
+
 *crystalspace-2.0_beta3-r6 (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 57e5de2..125517d 100644
--- a/dev-games/crystalspace/Manifest
+++ b/dev-games/crystalspace/Manifest
@@ -8,11 +8,6 @@ AUX crystalspace-2.0-07-remove_emit_from_configure_ac_03.patch 1708 SHA256 7e1b8
 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-11-data_add_missing.patch 1642 SHA256 b3f5c4115b55e34e8cd4e973936375914cbebf5fa426b8423da1131b4bd20271 SHA512 72730bf99af96a2d06888251015d6d754721d9cd8f3b37de250ab42eeb1d7b5c8657384dbf8f10f53785e66f0d7331aa300287f97b3affceec3ce325d32b51e1 WHIRLPOOL d6b9986575d2af0a99c8e8b3053890e296b5760c7511cafbc0f14a94360eaa1449887c34cb2a18aa8b566274e06abc0de2a7c7c88939bc72fa7174954279a4f7
-AUX crystalspace-2.0-12-data_sky_add_missing.patch 413 SHA256 08cacf066f69378a2b4e53f716218ddcb02f16f5da07966e947b2e3fc23dd6cb SHA512 72b798d9f17d18d4b65d4b0a5688567351181210d47181e8c3ecb1f35fabb6b14246ae034b905fe9f07de0ba887c0cf1e385b27a68d42b6b7a15cae8117b7c91 WHIRLPOOL 6f86288b7e7b76a935b513f5f914d7206681a5cb65eb82954b5c5e1b6a3ab8572677ea66321322a9c0c8fb5f21d7f28450d4fac5c4b1ba2b5eee48c2d2d63cfe
-AUX crystalspace-2.0-13-maps_flarge_add_missing.patch 982 SHA256 7c09f6c6187b66fdc2c055224bd1ef37824046eb04359b13ebefc75639f5f3b0 SHA512 819f184e6c6a924a7ab36ab0195c0eda6edf53ea75bb8f66043eeadbeba5f292680dcb784f041b9953e78b3d3a44289ad0ba180cae14a2172c1f917b72bdb656 WHIRLPOOL 0134da300ba34b141c33c48d5d67c26287f746d21872860d8279ecabe29ba9cc466118a3d921f2f52a89a9097dc49115a01f0e6ba65ffb9a6deea5022b6d3ca4
-AUX crystalspace-2.0-14-fix_vfs_template.patch 967 SHA256 25f77a13160fc4a7ccfdde705597c8694144789f094154d0a7c7e78ae3b7573e SHA512 6fbc143dd56005e6b554e2941234c821a50c85b623001dcd33834c7fe8aaeb3d2714231ff0d1dac32456f5fbb5328ab8b984c3ae14a158528964a4dc07675f1b WHIRLPOOL 501bee86119b8b61b55c9035f0a4cc1960d1d92ddd1c7683d7116f8cd8fd87a3ae03468ea0347c7310e4c41ee1d911d82f9f1cfa64b9a4721aac154f0f43e3fc
-AUX crystalspace-2.0-15-add_usr_lib_to_cs-config.patch 2283 SHA256 766b4965fb2589991af8caf62d121545cd80e5116e1bc7fe8996469bfa1d9c2e SHA512 e007aaf91034ea0d6c7e5462572a3e37360949417b3a4169bd8251217eb3131f5fac348a78048028cca7440017afd61d2fbb1cb99916b5f7769d82272879a439 WHIRLPOOL 7180ef9dce04cdc5fc072f1f042ba527c5a500688985a068fd7b05c9c18363fb13131a4c50132dff230f6fab683b29ac60be70b0cd670b2e2ee639a9da6e1b70
 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
@@ -26,7 +21,7 @@ AUX crystalspace-2.0-fix_ode_update_10.patch 428 SHA256 06e52aeeca805dec8c1f1baa
 AUX crystalspace-2.0-fix_ode_update_11.patch 4583 SHA256 d1c2f7ebf40aa9ed821cb6584cd8e95397c73713ef7241ac99eab80c529503ac SHA512 eb5a6d4de3e8c7bcf8ae8f2e81528d880669aa3a78a4a6c1583b1542994fe49b3d744512720be1a02ba44df87f8141d5e07746bd318948a06a61219d6980d0ce WHIRLPOOL 127711f6a54e4ff7a4d3c088df08e8e4569efa5543554d02e81a8d43977e4b464159c1bc62ae53cd2c48b6316b88e4477483715c23a99ddf4924ec7f2265f87d
 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.0beta3.tar.bz2 189457618 SHA256 e1c97f2937f091c73c4d55276586094544f4ef32d7cc2e0a1999fe2dc3fbd9e9 SHA512 777b404776b91662f265ff6b60f02a79dcd44e1b70b4f7b888cc19d0b382ebf7c4a00e49441e2a48fb0e5db975c6fbbb9cfc810241a6913cec082425b74a8e37 WHIRLPOOL 514be5d13f70851166d6338d2857b0d126eb104fa8f5adf153feec6b442d2680a5c3666c0b6215b9c6a0b978b5449d73c169c8efcdcd58b6dca9ba40703616aa
-EBUILD crystalspace-2.0_beta3-r6.ebuild 6751 SHA256 91f7a4ab687c1758b598c547f702b7a75a907c3eead52196fb3a17a6fe707e16 SHA512 f90c27f99d905a361b0eb267e2185816426076837772345ca7b321f5dda023f7426fb9ce37b9781e63cab97056980ec1017d78fe9f652e7e620f804012e4a53c WHIRLPOOL 221597a9d9df909cee778b09befa2fa60f730eddae8c2f8d41c12d6c8a09307d92f4996a7e86e5c247eb401235de4d8a02ca80dff37d3db0075623f918a0be26
-MISC ChangeLog 4213 SHA256 b6ecb9322cb7e2f77d418dba7649608ebad622687d476fa70f8dc591619d723f SHA512 507e5101a5950c36306059f9618fd4b02bdd6f1a5e9fb586d4cecd52d0e934b4ae16f0ce5e2adb53fbbd2b2347b9ba64b45a0a33c0839d8eb857a122587aef61 WHIRLPOOL 365d554f5f8f6ed3bdc01fde3d1b6a90b39cb84a3b518c3ab6316ace4820d80f3af8aaedeb465469911a5a305ecf65765eaadc8b0d59687a80ef22f8a8910e44
+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
 MISC metadata.xml 897 SHA256 82b3c21f6c5fb6b66310dc663f6bdd3ad3ca2b0e1d70ee056ce48eb92ef747ed SHA512 e7ad7264a6badd9b6cd0d5e3ac5fcb12da19c8668a51528dc9b445b51fff31323dd66f29e3c702acbe6901a9316cd627340fdb4b0d8a6be9bf8549b1fabaa6a2 WHIRLPOOL e14f2ef8b54c1066f73ed92089fc4fb62e7151056c1cf468a87ebc6a188cb26343b24f5fd881695a6bba14c62ac68f6ebe52ff5a5e7a6083b559a1ddce64eff4
diff --git a/dev-games/crystalspace/crystalspace-2.0_beta3-r6.ebuild b/dev-games/crystalspace/crystalspace-2.0.ebuild
index dce1fbe..d896d37 100644
--- a/dev-games/crystalspace/crystalspace-2.0_beta3-r6.ebuild
+++ b/dev-games/crystalspace/crystalspace-2.0.ebuild
@@ -7,12 +7,11 @@ EAPI=4
 inherit autotools eutils flag-o-matic multilib java-pkg-opt-2 wxwidgets versionator
 
 MY_PV=$(get_version_component_range 1-2)
-MY_BETA="beta3"
 MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="Portable 3D Game Development Kit written in C++"
 HOMEPAGE="http://www.crystalspace3d.org/"
-SRC_URI="http://www.crystalspace3d.org/downloads/release/${PN}-src-${MY_PV}${MY_BETA}.tar.bz2"
+SRC_URI="http://www.crystalspace3d.org/downloads/release/${PN}-src-${MY_PV}.tar.bz2"
 RESTRICT="mirror"
 
 LICENSE="LGPL-2.1"
@@ -52,7 +51,7 @@ DEPEND="${COMMON_DEP}
 	dev-util/pkgconfig
   dev-util/ftjam"
 
-S=${WORKDIR}/${PN}-src-${MY_PV}${MY_BETA}
+S=${WORKDIR}/${PN}-src-${MY_PV}
 
 src_prepare() {
 	# configure.ac forces /usr/local/lib (and /usr/local/include if present) upon
@@ -84,17 +83,6 @@ src_prepare() {
 	# C:
 	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}-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}-14-fix_vfs_template.patch
-
-	# cs-config doesn't look into /usr/lib[32|64], yet, so patch it in:
-	epatch "${FILESDIR}"/${MY_P}-15-add_usr_lib_to_cs-config.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
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-11-data_add_missing.patch b/dev-games/crystalspace/files/crystalspace-2.0-11-data_add_missing.patch
deleted file mode 100644
index 88422fe..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-11-data_add_missing.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- data/Jamfile	2012-04-23 17:12:32.953141311 +0200
-+++ data/Jamfile	2012-04-23 17:33:29.893158458 +0200
-@@ -24,25 +24,38 @@
- FileListEntriesData $(RUNTIME_DATA) : : data-runtime ;
- 
- maps =
-+  bias
-+  colladatest
-+  island
-   isomap
-+  lodtest
-+  oceantest
-   parallaxtest
--  particles
-   partsys
-+  projectortest
-+  r3dsmtest
-   r3dtest
-+  space
-   stenciltest
-   terrain
--  terrainf ;
-+  terraina
-+  terrainf
-+  terraini ;
- for map in $(maps)
- {
-   local files =
--    [ Wildcard $(map) : *.lib *.jpg *.png *.map *.tga *.dds *.spr world ] ;
-+    [ Wildcard $(map) : *.cslib *.lib *.jpg *.png *.map *.tga *.dds *.spr *.zip world ] ;
-   local lmfiles =
-     [ Wildcard $(map) lightmaps : *.png ] ;
-+  local mffiles =
-+    [ Wildcard $(map) factories : *.cslib *.meshfact ] ;
-   InstallData $(files) : data maps $(map) ;
-   InstallData $(lmfiles) : data maps $(map) lightmaps ;
-+  InstallData $(mffiles) : data maps $(map) factories ;
- 
-   FileListEntriesData $(files) : $(map) : data-demo-maps ;
-   FileListEntriesData $(lmfiles) : $(map) lightmaps : data-demo-maps ;
-+  FileListEntriesData $(mffiles) : $(map) factories : data-demo-maps ;
- }
- 
- SubInclude TOP data castle ;
-@@ -55,12 +68,13 @@
- SubInclude TOP data flarge ;
- SubInclude TOP data frankie ;
- SubInclude TOP data hairtest ;
--SubInclude TOP data sky ;
- SubInclude TOP data krystal ;
- SubInclude TOP data posteffects ;
- SubInclude TOP data renderlayers ;
- SubInclude TOP data shader ;
- SubInclude TOP data shader-old ;
- SubInclude TOP data shader-snippets ;
-+SubInclude TOP data sky ;
-+SubInclude TOP data smoketest ;
- SubInclude TOP data varia ;
- SubInclude TOP data viewmesh ;
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-12-data_sky_add_missing.patch b/dev-games/crystalspace/files/crystalspace-2.0-12-data_sky_add_missing.patch
deleted file mode 100644
index ab63790..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-12-data_sky_add_missing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- data/sky/Jamfile	2012-04-23 21:22:04.833271060 +0200
-+++ data/sky/Jamfile	2012-04-23 21:23:55.199944160 +0200
-@@ -1,4 +1,7 @@
- SubDir TOP data sky ;
- 
--InstallData [ Wildcard *.layout *.xml ] : data sky ;
--FileListEntriesData [ Wildcard *.layout *.xml ] : sky : data-demo ;
-+{
-+local files = library [ Wildcard *.png ] ;
-+InstallData $(files) : data sky ;
-+FileListEntriesData $(files) : sky : data-demo ;
-+}
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-13-maps_flarge_add_missing.patch b/dev-games/crystalspace/files/crystalspace-2.0-13-maps_flarge_add_missing.patch
deleted file mode 100644
index 68dda4b..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-13-maps_flarge_add_missing.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- data/flarge/Jamfile	2012-04-23 17:38:46.486508351 +0200
-+++ data/flarge/Jamfile	2012-04-23 17:38:46.489841685 +0200
-@@ -1,10 +1,9 @@
- SubDir TOP data flarge ;
- 
--InstallData world [ Wildcard *.png *.dds ] : data maps flarge ;
--InstallData [ Wildcard factories : thing* ] : data maps flarge factories ;
-+InstallData world [ Wildcard *.png *.dds *.cslib ] : data maps flarge ;
-+InstallData [ Wildcard factories : *.meshfact ] : data maps flarge factories ;
- InstallData [ Wildcard lightmaps : *.png ] : data maps flarge lightmaps ;
- 
--FileListEntriesData world [ Wildcard *.png *.dds ] : flarge : data-demo-maps ;
--FileListEntriesData [ Wildcard factories : thing* ] : flarge factories : data-demo-maps ;
-+FileListEntriesData world [ Wildcard *.png *.dds *.cslib ] : flarge : data-demo-maps ;
-+FileListEntriesData [ Wildcard factories : *.meshfact ] : flarge factories : data-demo-maps ;
- FileListEntriesData [ Wildcard lightmaps : *.png ] : flarge lightmaps : data-demo-maps ;
--
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-14-fix_vfs_template.patch b/dev-games/crystalspace/files/crystalspace-2.0-14-fix_vfs_template.patch
deleted file mode 100644
index f4ee8e1..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-14-fix_vfs_template.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- plugins/filesys/vfs/vfs.cfg.template	2012-01-14 04:39:58.000000000 +0100
-+++ plugins/filesys/vfs/vfs.cfg.template	2012-04-23 21:29:26.793294787 +0200
-@@ -42,7 +42,7 @@
- VFS.Mount.lev/projectortest  = $(CS_MAPDIR)$/projectortest$/
- VFS.Mount.lev/parallaxtest = $(CS_MAPDIR)$/parallaxtest$/
- VFS.Mount.lev/stenciltest = $(CS_MAPDIR)$/stenciltest$/
--VFS.Mount.lev/isomap   = $(CS_MAPDIR)$/isomap.zip, $(CS_MAPDIR)$/isomap$/
-+VFS.Mount.lev/isomap   = $(CS_MAPDIR)$/isomap$/
- VFS.Mount.lev/partsys  = $(CS_MAPDIR)$/partsys$/
- VFS.Mount.lev/space    = $(CS_MAPDIR)$/space$/space.zip
- VFS.Mount.lev/terrain  = $(CS_MAPDIR)$/terrain$/
-@@ -71,7 +71,7 @@
- VFS.Mount.lib/sintel   = $(CS_DATADIR)$/sintel$/
- VFS.Mount.lib/startme  = $(CS_DATADIR)$/startme.zip
- VFS.Mount.lib/hairtest = $(CS_DATADIR)$/hairtest$/
--VFS.Mount.lib/sky      = $(CS_MAPDIR)$/sky$/
-+VFS.Mount.lib/sky      = $(CS_DATADIR)$/sky$/
- 
- ; General CEGUI data
- VFS.Mount.cegui  			= $(CS_DATADIR)$/cegui$/
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-15-add_usr_lib_to_cs-config.patch b/dev-games/crystalspace/files/crystalspace-2.0-15-add_usr_lib_to_cs-config.patch
deleted file mode 100644
index af7e7f5..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-15-add_usr_lib_to_cs-config.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- ./scripts/cs-config/cs-config.temppost	2012-04-24 06:53:26.269812856 +0200
-+++ ./scripts/cs-config/cs-config.temppost	2012-04-24 07:02:39.263175118 +0200
-@@ -4,36 +4,46 @@
- lflags=""
- 
- for libname in lib${libcrystalspace}.so \
--	       lib${libcrystalspace}.dylib \
--	       lib${libcrystalspace}.a \
--	       ; do
--    if test -r "$prefix/Jamfile" && \
--	test -r "$prefix/$makeout/libs/$libname"; then
--	libdir="$prefix/$makeout/libs"
--	lflags="-L$libdir"
--    elif test -z "$libdir" && test -r "${exec_prefix}/lib/$libname"; then
--	libdir="${exec_prefix}/lib"
--	lflags="-L${exec_prefix}/lib"
--    else
--	my_IFS=$IFS; IFS=$PATH_SEPARATOR
--	for p in $_CRYSTAL_ACTUAL
--	  do
--	  if test -r "$p/Jamfile" && \
--	      test -r "$p/$makeout/libs/$libname"; then
--	      libdir="$p/$makeout/libs"
--	      lflags="-L$libdir"
--	      break
--	  elif test -z "$libdir" && test -r "${p}/lib/$libname"; then
--	      libdir="${p}/lib"
--	      lflags="-L$libdir"
--	      break
--	  fi
--	done
--	IFS=$my_IFS
--    fi
--    if test -n "$lflags" ; then
-+               lib${libcrystalspace}.dylib \
-+               lib${libcrystalspace}.a \
-+               ; do
-+  if test -r "$prefix/Jamfile" && \
-+      test -r "$prefix/$makeout/libs/$libname"; then
-+    libdir="$prefix/$makeout/libs"
-+    lflags="-L$libdir"
-+  elif test -z "$libdir" && \
-+       test -r "${exec_prefix}/lib/$libname"; then
-+    libdir="${exec_prefix}/lib"
-+    lflags="-L${exec_prefix}/lib"
-+  # Test default locations for cases where CS is installed using a package manager
-+  elif test -z "$libdir"; then
-+    for p in lib lib64 lib32 ; do
-+      if test -r "/usr/${p}/$libname"; then
-+        libdir="/usr/${p}"
-+        lflags="-L$libdir"
-         break
--    fi
-+      fi
-+    done
-+  else
-+    my_IFS=$IFS; IFS=$PATH_SEPARATOR
-+    for p in $_CRYSTAL_ACTUAL ; do
-+      if test -r "$p/Jamfile" && \
-+         test -r "$p/$makeout/libs/$libname"; then
-+        libdir="$p/$makeout/libs"
-+        lflags="-L$libdir"
-+        break
-+      elif test -z "$libdir" && \
-+           test -r "${p}/lib/$libname"; then
-+        libdir="${p}/lib"
-+        lflags="-L$libdir"
-+        break
-+      fi
-+    done
-+    IFS=$my_IFS
-+  fi
-+  if test -n "$lflags" ; then
-+    break
-+  fi
- done
- 
- # Look for build tools such as relaytool