Revision bump: EAPI 5, add enhancement patches, wrt bug #450158. Thanks to Michael Kurinnoy for providing patches

Package-Manager: portage-2.2.0_alpha151/cvs/Linux x86_64

6 files changed, 204 insertions, 2 deletions

diff --git a/games-action/openastromenace/ChangeLog b/games-action/openastromenace/ChangeLog
index bd7c666271e8..42ec8ab81550 100644
--- a/games-action/openastromenace/ChangeLog
+++ b/games-action/openastromenace/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for games-action/openastromenace
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/openastromenace/ChangeLog,v 1.12 2013/01/03 21:04:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/openastromenace/ChangeLog,v 1.13 2013/01/12 12:19:47 pinkbyte Exp $
+
+*openastromenace-1.3.1-r1 (12 Jan 2013)
+
+  12 Jan 2013; Sergey Popov <pinkbyte@gentoo.org>
+  +openastromenace-1.3.1-r1.ebuild,
+  +files/openastromenace-1.3.1-keyboard_control-fix.patch,
+  +files/openastromenace-1.3.1-rendering-blinking_triangles-fix.patch,
+  +files/openastromenace-1.3.1-textures_quality-fix.patch:
+  Revision bump: EAPI 5, add enhancement patches, wrt bug #450158. Thanks to
+  Michael Kurinnoy for providing patches
 
 *openastromenace-1.3.1 (03 Jan 2013)
 
diff --git a/games-action/openastromenace/Manifest b/games-action/openastromenace/Manifest
index d297d8a6d595..b48df70caf3c 100644
--- a/games-action/openastromenace/Manifest
+++ b/games-action/openastromenace/Manifest
@@ -1,6 +1,9 @@
 AUX openastromenace-1.2.0-cmake.patch 1018 SHA256 5d1eea84f7522fa5cd4e861c82a7c9bc41e03db35127499d0b43010a7346cbfb SHA512 ef22cbb15bc5575d4d1bc0239c48adcbf0278659381a7fb94845fe71ebe89738544a86bbe5481edeba77f5ad2a097cf57980d01b2be32891a0e39a2a93b8e76c WHIRLPOOL 1986f3e644056aeafe41934d8643e0f900ef2142e71992eae61a6d7a012dc8adb94acc5db60e818e2349b5c776e1ea446d1c8a69932f174d9ab976d99fcd9680
 AUX openastromenace-1.2.0-mesa.patch 412 SHA256 2e747c05a01b305b7a733683ea8cee4d98917bf18a8fb9224a21777953d0a0ce SHA512 afd39b640ec0a156cb25d0065ce2bed6454eb7a2ad80f4a6a543974a55cf21fa619771213f0f3de13a2a41e7a099c9b6201fc186a1baa37a2fbc32e31363d056 WHIRLPOOL 626609ad731be5f2471c04bb5ce9e1474bce380152bd31f546c43958437ef9e51dbe33e81ae85a333a31ac64851773bbecb5bf2fa8d1d55a70bdf187595fd038
+AUX openastromenace-1.3.1-keyboard_control-fix.patch 203 SHA256 aa6e93e9fa9dd0b1b1b1f6d0f75302b72931b77443a62dc38dfb13d9de5f83e4 SHA512 31251f31fabab412ac364f773b90dadcf299ef732114d68acef7c9403224ace0f73a791b8c1206128ceb451f596087bf2e9da4034c5dfdf5a08e96066458fce2 WHIRLPOOL e85b8f66baa19a3837d7c10c9be56fc519e13732b2e4fc4fbe55314a00f8578291e23d43af8dcf3160ce6d16c977dd103bdef25a1b9330e967d41fadc399dca5
 AUX openastromenace-1.3.1-overflow.patch 1002 SHA256 fcc0c9435380c9523c075567967f4bf1726c3c4597beeff99c6fefa0c01fa1c7 SHA512 67585df67a35e7bd519a60f63bbd92c1bdd933a6d699202c014710287f5236714bb818226f77cc583b07a29c971ca6908332c2c986aa6902de54094f67683f0f WHIRLPOOL b89db6abca4a686ebf76d6996a75d50812abc69c75e9ebb9594b9bb9bf1cb98964f58dee845c84f95f186110c8385798dc7cdaae201375bfbc40f60a88d856ed
+AUX openastromenace-1.3.1-rendering-blinking_triangles-fix.patch 315 SHA256 962a7c911829f6be49091ace61d1e80e461fb69cae1895f9082a7c094ccc020f SHA512 4d0e5ae1e322a8a481c7575004a2acbcba920ad806a4a5b5ccd46cb82c92489c5626f2e507bfe3391bfee37fd19149c55f94ba40d962b6db4dc1efcf084f6d51 WHIRLPOOL aefe42c50e40fc1a0b30ce7c3d081f74c017f3eb084b3731e1c2c569c9a0056a86b56e08de3865ca409c8bee46a41bd94046deae139472e5a2dedf7c442e32c8
+AUX openastromenace-1.3.1-textures_quality-fix.patch 5898 SHA256 e1568e70cbdbefad6295521e43910ab3908a716598a7a103478416ec33c2723a SHA512 d431ed604b847ca322778ed31a2208cedc6df437fee7ce847e86d48b348e53eb6e1c1857f007fc24b48051c81174b336c050a8cbdca02a4901ba91b02db4a9cb WHIRLPOOL 8b6b9ffeb040770f157fb5be964b9736b5a489909d11798d06bfd9af22de88ca3cc7f34ef9e7e4dfdc252247cd7ec184d8a8c2e907fd98852df38c02aea79cd0
 DIST astromenace-src-1.3.1.tar.bz2 54976175 SHA256 a8499d6ebf154fdf64a6707da065b78d52c1441fbc4ffbfab34e7a8df1872735 SHA512 f137a0a7572444c6b8f19bee5ee69245015539a11cbc0409d06f7764640921cf5e5ff27d63c2ab4e1cc6236033381bfd2699f4364f01c3154462b90f7d626a13 WHIRLPOOL 147bc3e904ac463e79b1a15562bcc07f5e15ade9de1cef102a906e315e7f4f65c0394770cd7b50bffe702dbfffe1c2453c5b909b2c38982920cbe4d19474eeb7
 DIST oamenace-data-1.2.0.tar.bz2 33384465 SHA256 e55fd843b7e6331e3724dd33d160565ae3f154abc790fb95e3566f5fedcb1d3f
 DIST oamenace-lang-de-1.2.0.tar.bz2 1656853 SHA256 3c7f4b580c1491c1fe6db521477e644f5139323e3e427bf99effe2da0bd3b7bd
@@ -11,6 +14,7 @@ DIST openastromenace-src-1.3.0.tar.bz2 37482245 SHA256 9a7257ea0ee0da0d802e2f546
 DIST openastromenace.png 20227 SHA256 d70e1e08558b6f8480fd45a71be13b854f37deeacd4d78841cf02e9d21662cd1 SHA512 f7bfe038d305a1b5f118f5d52ad0cd6170dc28895708066befc549f1b910395ccc62b10945ca5f7e12ac2518208d75ff2b1a5ed5bf2f40279b84ee6ed4b245cb WHIRLPOOL a206b6bdc7ec213476671542d268fc11ba8c2aae97a71ea2a34d233db524f8157ac7da4540d9a790c9659a69bbcbbc141edcb4d574388198e75fab8cafe7b556
 EBUILD openastromenace-1.2.0.ebuild 2422 SHA256 bf6c1dd67032438e3ae0bf1307f75c90fc2b33082958dbf006443634b239502b SHA512 9e838449e435bed3e376cf8c8f8e5585237cb7f1c58da482f76e8d82ca2f810783c57fe7fed430e9b668cf3168c578734bb3a00494d04905662448f924cf1a2a WHIRLPOOL f52cc177ba3a832bbc80089cd4e4984461fa49d2bb1ec0387adcb42d93c548bcfbf104f5e2debd56a5112c7fdc1fedccb140930902d921bf6cf27b8cecdd5fd4
 EBUILD openastromenace-1.3.0.ebuild 1694 SHA256 e334e18be82cb6464fcb447c23a24e9f20f4736cae5220d1ecb47fb023f7186a SHA512 4e371d97a8018665997ed9bfd250c470a72c878b5c0b865b3cad01d0a4b1cf9f8e278d966b33b8c50f78141d8bbc1916ff70b1c505b6e5d9de30960c213ebd62 WHIRLPOOL 48ed0d3bc65094e8a89c4c032c3fff0be9c38af89736c1ea8429543129fae0580feecd54f5bff7d201b2c9e678f788cc2ecf3221862c89db42e823695fbc5402
+EBUILD openastromenace-1.3.1-r1.ebuild 2008 SHA256 14af8f7611df783fe501576fc536276dc6c501d2bc6f6d8dbc361dbc941bb54d SHA512 1f6f2809810f272f7b3ef2b02fb1138b060538ce494b68089bf3f37f2f35e6e26026529bac6c4ad81253a2b04ae2edf66d4a610c8540461995641d99aee2e0ef WHIRLPOOL 56999dcb62b3cbe0eda639dad04f92a056c694a88850c1304e9b9c32c190f227bac56b9a30570e56a3f297a5e393325a2b60bc2df34b52dce6015b71e58aecbf
 EBUILD openastromenace-1.3.1.ebuild 1773 SHA256 963659d10a1111d3b26cb47e6f423e78486f06478fff3d72d215e4b103bc43d5 SHA512 8e43d53f27bcf7201e2d38a2b0b37ba614f283715c60d370ce2fb60bee040f84db8a1607b559327c2af09eda722d02cbb679bd263f06193851601373a06a436f WHIRLPOOL 2a85a8364f56106a615ddd1f7112372379e9630f9b86edbfa9bcecaa7dae365635ec22b2367278ed6266cf02895ae188fc28f062872b5839a13419c483b64dc5
-MISC ChangeLog 1979 SHA256 f6f8dcd8d574238d24219b8761780b476a6f0df352280b1d67866cc05a5748fd SHA512 8be7c4d0f18ea4289d71a32501745166e35a8fde3444abda8775972d5a30b432212e51e73f48430b0bb9610ad1ffda57d2cce5d72101f851ca565e19d5f1997e WHIRLPOOL e81f908540d39df3b36e7c5fc529c2c969c648f199aaa2dfb5a80d5b274bebb8def04ec3c0f9d8291fe5875fc44eb0b2e4ffff37ceaa5cfa6e51ef0565fbc746
+MISC ChangeLog 2413 SHA256 7bab886342f1e2bb327afa0f2e3d55d3cf3445d36c31d66fb18e44a423a8ff99 SHA512 93a1a87509fe6fa2c6f8285c2159a34b29d0d93e4a6ef232e6fa4f51602a86dbdc34c81c26771959021e1cf30b3c51a2d7c01cba4e5107887c08ed787d138e6f WHIRLPOOL 91f7abc336b136ca9aaeef53f09fdbf56019e295574539856d15035c8aa19eea0bd61fc989f7f848aa8c8364da1b4c9df417e5d2b5f79caa8cfcb3e07953f824
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-action/openastromenace/files/openastromenace-1.3.1-keyboard_control-fix.patch b/games-action/openastromenace/files/openastromenace-1.3.1-keyboard_control-fix.patch
new file mode 100644
index 000000000000..ce092ce709e7
--- /dev/null
+++ b/games-action/openastromenace/files/openastromenace-1.3.1-keyboard_control-fix.patch
@@ -0,0 +1,10 @@
+--- AstroMenaceSource/Menu/Menu_ConfControl.cpp.orig
++++ AstroMenaceSource/Menu/Menu_ConfControl.cpp
+@@ -136,6 +136,7 @@
+ 							break;
+ 				}
+ 
++				vw_SetKeys(i, false);
+ 				NeedCheck = 0;
+ 			}
+ 		}
diff --git a/games-action/openastromenace/files/openastromenace-1.3.1-rendering-blinking_triangles-fix.patch b/games-action/openastromenace/files/openastromenace-1.3.1-rendering-blinking_triangles-fix.patch
new file mode 100644
index 000000000000..8965e3a57991
--- /dev/null
+++ b/games-action/openastromenace/files/openastromenace-1.3.1-rendering-blinking_triangles-fix.patch
@@ -0,0 +1,10 @@
+--- AstroMenaceSource/Object3D/GroundObject/GroundObject.cpp.orig
++++ AstroMenaceSource/Object3D/GroundObject/GroundObject.cpp
+@@ -47,6 +47,7 @@
+ 	MaxWheelRotateAngle = 20.0f;
+ 	TrackObjectNum = -1;
+ 	TrackRotationDirection = 1;
++	WheelTrackSpeed = 0.0f;
+ 
+ 	TargetHorizObjectQuantity = 0;
+ 	TargetHorizObject = 0;
diff --git a/games-action/openastromenace/files/openastromenace-1.3.1-textures_quality-fix.patch b/games-action/openastromenace/files/openastromenace-1.3.1-textures_quality-fix.patch
new file mode 100644
index 000000000000..232deb483f17
--- /dev/null
+++ b/games-action/openastromenace/files/openastromenace-1.3.1-textures_quality-fix.patch
@@ -0,0 +1,87 @@
+--- AstroMenaceSource/Loading.cpp.orig
++++ AstroMenaceSource/Loading.cpp
+@@ -1566,51 +1566,63 @@
+ 					vw_SetTextureProp(CurrentList[i].TextFiltr, CurrentList[i].TextWrap,
+ 						CurrentList[i].Alpha, CurrentList[i].AlphaMode, CurrentList[i].MipMap);
+ 
++					// мы можем принудительно менять размер текстур через настройки, но надо учитывать их размеры
++					// базовый размер почти всех текстур моделей - 512х512 пикселей, небольшая часть текстур 256х256 (мины, турели)
++					// текстуры всех планет - 1024х512
++					// "неформатные" текстуры - track.VW2D и asteroid-01.tga, им вообще не надо менять размеры
++
+ 					if (Setup.TexturesQuality == 1)
+ 					{
++						// только для текстур в папке MODELS (скайбоксы никогда не трогаем)
+ 						if (!strncmp("DATA/MODELS/", CurrentList[i].FileName, strlen("DATA/MODELS/")) &&
++							// не меняем размеры небольших текстур вообще
+ 							strcmp("DATA/MODELS/track.VW2D", CurrentList[i].FileName) &&
+-							// не ставим низкое для текстур-подсветки файтеров землян - плохо...
++							strcmp("DATA/MODELS/SPACE/asteroid-01.tga", CurrentList[i].FileName) &&
++							// не меняем размер или ставим спец размер
++							strncmp("DATA/MODELS/SPACEBASE/", CurrentList[i].FileName, strlen("DATA/MODELS/SPACEBASE/")) &&
++							strncmp("DATA/MODELS/PLANET/", CurrentList[i].FileName, strlen("DATA/MODELS/PLANET/")) &&
++							strncmp("DATA/MODELS/NORMALMAP/", CurrentList[i].FileName, strlen("DATA/MODELS/NORMALMAP/")) &&
++							// не ставим маленький размер для текстур-подсветки файтеров землян - плохо смотрится
+ 							strcmp("DATA/MODELS/EARTHFIGHTER/sf-illum01.VW2D", CurrentList[i].FileName) &&
+ 							strcmp("DATA/MODELS/EARTHFIGHTER/sf-illum02.VW2D", CurrentList[i].FileName) &&
+ 							strcmp("DATA/MODELS/EARTHFIGHTER/sf-illum03.VW2D", CurrentList[i].FileName) &&
+-							strcmp("DATA/MODELS/EARTHFIGHTER/sf-illum04.VW2D", CurrentList[i].FileName) &&
+-							strncmp("DATA/MODELS/SPACE/", CurrentList[i].FileName, strlen("DATA/MODELS/SPACE/")) &&
+-							strncmp("DATA/MODELS/SPACEBASE/", CurrentList[i].FileName, strlen("DATA/MODELS/SPACEBASE/")) &&
+-							strncmp("DATA/MODELS/PLANET/", CurrentList[i].FileName, strlen("DATA/MODELS/PLANET/")))
++							strcmp("DATA/MODELS/EARTHFIGHTER/sf-illum04.VW2D", CurrentList[i].FileName))
+ 						{
+ 							H = W = 128;
+ 						}
+ 						else
+ 						{
+-							if (!strncmp("DATA/SKYBOX/", CurrentList[i].FileName, strlen("DATA/SKYBOX/")))
++							// для подсветки файтеров землян и частей баз (с решетками на альфа канале) - ставим больше размер
++							if (!strncmp("DATA/MODELS/SPACEBASE/", CurrentList[i].FileName, strlen("DATA/MODELS/SPACEBASE/")) ||
++								!strcmp("DATA/MODELS/EARTHFIGHTER/sf-illum01.VW2D", CurrentList[i].FileName) ||
++								!strcmp("DATA/MODELS/EARTHFIGHTER/sf-illum02.VW2D", CurrentList[i].FileName) ||
++								!strcmp("DATA/MODELS/EARTHFIGHTER/sf-illum03.VW2D", CurrentList[i].FileName) ||
++								!strcmp("DATA/MODELS/EARTHFIGHTER/sf-illum04.VW2D", CurrentList[i].FileName))
+ 							{
+-								H = W = 512;
++								H = W = 256;
+ 							}
+-							else// не ставим низкое для текстур-подсветки файтеров землян - плохо...
+-								if (!strcmp("DATA/MODELS/EARTHFIGHTER/sf-illum01.VW2D", CurrentList[i].FileName) ||
+-									!strcmp("DATA/MODELS/EARTHFIGHTER/sf-illum02.VW2D", CurrentList[i].FileName) ||
+-									!strcmp("DATA/MODELS/EARTHFIGHTER/sf-illum03.VW2D", CurrentList[i].FileName) ||
+-									!strcmp("DATA/MODELS/EARTHFIGHTER/sf-illum04.VW2D", CurrentList[i].FileName) ||
+-									!strncmp("DATA/MODELS/SPACEBASE/", CurrentList[i].FileName, strlen("DATA/MODELS/SPACEBASE/")) ||
+-									!strncmp("DATA/MODELS/PLANET/", CurrentList[i].FileName, strlen("DATA/MODELS/PLANET/")))
+-								{
+-									H = W = 256;
+-								}
+-
++							// текстуры планет не квадратные, учитываем это
++							if (!strncmp("DATA/MODELS/PLANET/", CurrentList[i].FileName, strlen("DATA/MODELS/PLANET/")) &&
++								strcmp("DATA/MODELS/PLANET/asteroid.tga", CurrentList[i].FileName))
++							{
++								W = 512; H = 256;
++							}
+ 						}
+ 					}
+ 					if (Setup.TexturesQuality == 2)
+ 					{
++						// только для текстур в папке MODELS (скайбоксы никогда не трогаем)
+ 						if (!strncmp("DATA/MODELS/", CurrentList[i].FileName, strlen("DATA/MODELS/")) &&
++							// не меняем размеры небольших текстур вообще
+ 							strcmp("DATA/MODELS/track.VW2D", CurrentList[i].FileName) &&
+-							strncmp("DATA/MODELS/SPACE/", CurrentList[i].FileName, strlen("DATA/MODELS/SPACE/")) &&
++							strcmp("DATA/MODELS/SPACE/asteroid-01.tga", CurrentList[i].FileName) &&
++							// не меняем размер
+ 							strncmp("DATA/MODELS/SPACEBASE/", CurrentList[i].FileName, strlen("DATA/MODELS/SPACEBASE/")) &&
+-							strncmp("DATA/MODELS/PLANET/", CurrentList[i].FileName, strlen("DATA/MODELS/PLANET/")))
++							strncmp("DATA/MODELS/PLANET/", CurrentList[i].FileName, strlen("DATA/MODELS/PLANET/")) &&
++							strncmp("DATA/MODELS/NORMALMAP/", CurrentList[i].FileName, strlen("DATA/MODELS/NORMALMAP/")))
+ 						{
+ 							H = W = 256;
+ 						}
+-
+ 					}
+ 
+ 					// если это карта нормалей, но у нас не включены шейдеры - пропускаем
diff --git a/games-action/openastromenace/openastromenace-1.3.1-r1.ebuild b/games-action/openastromenace/openastromenace-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..e91c515022bc
--- /dev/null
+++ b/games-action/openastromenace/openastromenace-1.3.1-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/openastromenace/openastromenace-1.3.1-r1.ebuild,v 1.1 2013/01/12 12:19:47 pinkbyte Exp $
+
+EAPI=5
+inherit gnome2-utils cmake-utils eutils games
+
+DESCRIPTION="Modern 3D space shooter with spaceship upgrade possibilities"
+HOMEPAGE="http://sourceforge.net/projects/openastromenace/"
+SRC_URI="mirror://sourceforge/openastromenace/${PV}/astromenace-src-${PV}.tar.bz2"
+
+LICENSE="GPL-3 GPL-3+ CCPL-Attribution-ShareAlike-3.0 UbuntuFontLicense-1.0 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/opengl
+	virtual/glu
+	media-libs/libsdl[joystick,video,X]
+	media-libs/openal
+	media-libs/freealut
+	media-libs/freetype:2
+	media-libs/libogg
+	media-libs/libvorbis
+	x11-libs/libXinerama"
+
+S="${WORKDIR}/AstroMenace"
+
+src_prepare() {
+	# no messing with CXXFLAGS please.
+	sed -i -e '/ADD_DEFINITIONS.*O3/d' CMakeLists.txt || die
+	epatch "${FILESDIR}"/${P}-overflow.patch
+
+	# enhancements patches(all - in upstream), bug #450158
+	epatch "${FILESDIR}"/${P}-keyboard_control-fix.patch
+	epatch "${FILESDIR}"/${P}-rendering-blinking_triangles-fix.patch
+	epatch "${FILESDIR}"/${P}-textures_quality-fix.patch
+}
+
+src_configure() {
+	local mycmakeargs="-DDATADIR=${GAMES_DATADIR}/${PN}"
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	"${CMAKE_BUILD_DIR}"/AstroMenace --pack \
+		--rawdata="${S}"/RAW_VFS_DATA \
+		--dir=$(dirname "${CMAKE_BUILD_DIR}") || die
+}
+
+src_install() {
+	newgamesbin "${CMAKE_BUILD_DIR}"/AstroMenace "${PN}"
+
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins ../*.vfs
+
+	newicon -s 128 astromenace_128.png ${PN}.png
+	newicon -s 64 astromenace_64.png ${PN}.png
+
+	dodoc ChangeLog.txt ReadMe.txt
+
+	make_desktop_entry "${PN}" OpenAstroMenace
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}