fix missing patches wrt #444177

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

6 files changed, 51 insertions, 8 deletions

diff --git a/games-fps/warsow/ChangeLog b/games-fps/warsow/ChangeLog
index 165a03e93f9e..55bc7015c189 100644
--- a/games-fps/warsow/ChangeLog
+++ b/games-fps/warsow/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/warsow
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.45 2012/11/13 07:14:25 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.46 2012/11/22 14:30:11 hasufell Exp $
+
+  22 Nov 2012; Julian Ospald <hasufell@gentoo.org> warsow-1.0.ebuild,
+  +files/warsow-1.0-pic.patch, warsow-1.02.ebuild,
+  +files/warsow-1.02-pic.patch:
+  fix missing patches wrt #444177
 
   13 Nov 2012; Michael Sterrett <mr_bones_@gentoo.org>
   -files/warsow-0.5-build.patch, -files/warsow-0.5-openal.patch,
diff --git a/games-fps/warsow/Manifest b/games-fps/warsow/Manifest
index be65227e11a3..122932a274fe 100644
--- a/games-fps/warsow/Manifest
+++ b/games-fps/warsow/Manifest
@@ -1,11 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX warsow-1.0-build.patch 16346 SHA256 626f23dc9c99eec2d1e1760e9247eb81079569ea139c165cb3ec908235e3aee7 SHA512 50131166cbd4ea39e9d77936d47ee9ca602f78f37f4f0351c188528deaebee1312b757ec4703b20a104cd23dbb5b68a948af774d67da07d1dac671c752bee4cf WHIRLPOOL 866797b10d0513269e72d2e71cda2d4860c8ca90322a426232dbcbd00cde68350a56ac484dacf350de11263ef329c5632dab5f8d0d8b08795191d6ac671ebe51
+AUX warsow-1.0-pic.patch 377 SHA256 300c220fb833424be66da460ad4ac1ef6c61cde0dc5b76e1e8e0b75f5ece3782 SHA512 1f712dbf83c3bca6a2f0424f2250133a23903da86c9045d0917ef5a18b311f6485af6cd5afc1bbcc8b47ff0e0f880154fc17f978c2e7400b6edb4b2ba33b2e18 WHIRLPOOL 536ddb836e09c15d0a3e5645066042164a556d608022c9892a82cd56552a489d6d424909878fe89ddf035a1a604d9ba4a73eabe563c6de51f44ccec1f9b7d854
 AUX warsow-1.02-build.patch 15562 SHA256 5f85026c8ceeadc8de10797f6eaabce1f485a2846aec4a2f05e1f117234f55c1 SHA512 cf77b79142cd2ac6082781e8c6186fa3b23357703396cc65e975834877d7798600729652c7aa4ec53dbce64c40b0c2bcffa70d5455a2257b6ecadb6b985560ac WHIRLPOOL 9b32dcc602cbe49d3bad0b2523a784f6c755d8d9a744669597ce3c934f5cf21f239f43290a9b716010b1f67d0c049cb2ebc4607d92699b3911f0d6778483c398
+AUX warsow-1.02-pic.patch 377 SHA256 300c220fb833424be66da460ad4ac1ef6c61cde0dc5b76e1e8e0b75f5ece3782 SHA512 1f712dbf83c3bca6a2f0424f2250133a23903da86c9045d0917ef5a18b311f6485af6cd5afc1bbcc8b47ff0e0f880154fc17f978c2e7400b6edb4b2ba33b2e18 WHIRLPOOL 536ddb836e09c15d0a3e5645066042164a556d608022c9892a82cd56552a489d6d424909878fe89ddf035a1a604d9ba4a73eabe563c6de51f44ccec1f9b7d854
 DIST warsow.png 1692 SHA256 086968e72271b248ef32609ed1818ff9f5c355297b1eee3cbee9e41f4e18a954 SHA512 76476fd6f624b4043405fbddeaa0fa46338b96bf46a9b64434940d9a84738a20c25243ef1316048159698b6a70b3e0f26218da3332203a93944312e77ba22c8f WHIRLPOOL 94b7c77641d5a8f581de4eb0e4e91b71f25347248a6aa6c1160e8fefda92951daa3fbbf04aee4920fc9b53fb07872d3fb7d870d4207d13844e07afa51c93e85b
 DIST warsow_1.02_sdk.tar.gz 56541955 SHA256 bec1f0ec26c39defad393578b28eb955504f054599142b096773c28889cabb2c SHA512 d62399baa13341bc87863d123a9d852ec688d0aa279eb626b8c95bda28b7ac1d602c7571e02dfda7dd8ea83a231cd8c3310a0126c1235968291e9e700679fbca WHIRLPOOL 7c44fb252b95b400e829c752c58a4d715b695d56f7e9b35504be9c1e1566c513f101090f7bbe0eabba5aef11ff3f320106fe7ce1d4b7b17e7368979b0b193621
 DIST warsow_1.02_update.zip 20582996 SHA256 23efd46590be99140b836125335dc973f606625785926377b60bd1467e661ac1 SHA512 4f0985c9a17e4562d46d289bfc78bf44fa544bdc30af3b0b670572e819966a2fa8f38902cb6810b09ce38a49f7de956177f31bf2858883ad2b3f27d41e6c2276 WHIRLPOOL 978987c70aa8b82a4252505fab95717056701a599d8e52a308206aee59a4cd36520be4f6b202411733d22dcca82f64919423bbd4bcd227d71b6e59cf6859e5b2
 DIST warsow_1.0_sdk.tar.gz 56525636 SHA256 2e394b5c50ad206723a59636ab93448f69d8602e710ab334451badf746870e22 SHA512 dee6591fb5ed7150e3e18db20b18366777dbacd4a465074eb3c978a04b7df5140e8a7817a5248542af06d2a6eb972ad986690f16e57ac08f753cccb2470d7bfe WHIRLPOOL e30772b49f37dede19d54e129cc1ca05bf9f01c9a10f372c9c420ceba25514c6a928c12ba61e140efc5ea8d46cbd6db403ca03aee215964173662127b9dbfd59
 DIST warsow_1.0_unified.tar.gz 518459004 SHA256 f933d251de4c92b6107d4db1eef5326baf4873d32a6e2f1c3daae14bc92e85ec SHA512 78706093fb4b8684893d9b497fd10f1ce3ef096b68bbf7d36ed2bc775fa649738f0153a723b2788ef6a54d30826ec96bc36899d2e5c230bf09022b98cc105aad WHIRLPOOL efdffd7f358c704a6c08eb1d8c91543db3b76805edba775f88570debfa1b4a9ac64772958831fff7d0be4d72f2d29abbb7610d115e92cdb0fd897a8e31b1059c
-EBUILD warsow-1.0.ebuild 3383 SHA256 8cd92ac8f52b73fe2d10c32284ca45f24d5803aeef6899f5baf009518b5edbbf SHA512 23e0baf3b4bbfba245d8a0eacc3cdb301a4bd89427aea49d0a2b7f48f4fc32ffe90dd42530f2b97bae0426516e765e5a4d8f652a2241f1de4c3f3b5dc29515d7 WHIRLPOOL 4d23ea88a5d0d471de8950dd2407ff189d004bcb55d6b7d5d9a657fd133ab0afd33179fe3bfe9bc7d0ca1dc3e31a88f50a9e2eb65faab3b239207e753646467e
-EBUILD warsow-1.02.ebuild 3713 SHA256 973bd8128832a465530245293a9c840d9f6edf1c2c4813118e74966642d88350 SHA512 bb8f097e120662220a8e5eac4665fa607ccb1a563ff13528b9ee3e04c8586dfa01de4e04a0ae88ca24d3fc44cb68a756708afb96244eba9bf1186497075a33d9 WHIRLPOOL b0c24299c7d7c99a7642440a4b47ade9ae1e32e97ffa30617bc0c0ebb2badee3a2938b887952e619dd116561d038a48ab9df0eee43467e9e4db2931636099e8e
-MISC ChangeLog 6461 SHA256 92554bb8e74e75f0b6c8f92d1bfac2ca6bf55396ab5b68e5d555a98017273efd SHA512 b875c43ffb6c3b57290579fd19625aaec70707f1cb0f74d996c7529fec2c44600fd181ee8817fa53abbe7b5f279650d76437580bc5997e99f68e4e82a6bba1e3 WHIRLPOOL b5f80e2f59d7fb0cbe859ac62d542f1ee81afa2dd5d04522dde316c953519d55a99c3163695a84381ab764cc1ffa1f9db6a421d32eeb74144f99dbe72ce47474
+EBUILD warsow-1.0.ebuild 3376 SHA256 aa2331fdad71c190d031933e36b6e8c2f20ec9b546d56dfafce8f20449f1633f SHA512 7e06adc5c0159468726b395d3254104df630226dae37a67b3705629b874c6e934649fad096be036fee1735a9521ce891fe9bce91ba22b66f96bcf67aa31e8248 WHIRLPOOL 154a349864122c0122c0f4ea124c9a23f75d5d1e45678c704d7b8c766426de139ffce509d278e898cbff3a4b629165c89ee3f88ef91f2e0f0955b782d5fccefe
+EBUILD warsow-1.02.ebuild 3708 SHA256 8066f1623d7ace6d36b23882acdd4bb523a40a9e550f5960e15e3e87bc1d2032 SHA512 cd22ea60fb713cd600770088b906c2827dace1c4456b99a8afc24efc62b3c5df334cd5570afc885273d7c85429de410fd432a6ee505d46e2c9039f8ef5d9eb7c WHIRLPOOL ef3f524543fcb769a15e031943c990d6e5252037a6d3aac2fc9749a6c5a19f887cdd84ff670f4a42b0670bdbbecd1474b874aaa7a3b952dbefb573e29510eae3
+MISC ChangeLog 6648 SHA256 6d2d81b5562db60cde6bfb7da475ae94917d913592c2108aab536054012ec946 SHA512 72ff4a4d7a1725a75b4a7899542c207a505c74ff83571feb21990dcb339db3e3393f8531aff2808752424a7321c7963ea2b4491a32578aacb00ace03e32941e5 WHIRLPOOL c3e11da4cd74881c4b79daaf184b6970bb9e84e48eba128d5893d717d75dfccb4229ff69bea5b61b643e21f784d332d1c0f8b4113dee9991fb67fdbf6b327226
 MISC metadata.xml 347 SHA256 016dbabb997c28f241f054760d9b81b1c43f5161de6d53936a2ebeb78bccdbea SHA512 34e3d6eae3b4665eac573b096d83a2841aee4488cc1a237e54e6e12c0c7ad8caefbbde6b563d1421c9d68cf7fb2b6c2446dfeddb1390971a7630b5efa494cb77 WHIRLPOOL 9d4cbde23eacc798cb4f1ac0c504963d349619229a5c2e926d8fc1348b1fefc53e999cc21e0be0cdca58affd1bfd4a275ae633709af78ca3dc808431fa365db3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQrjb1AAoJEFpvPKfnPDWzZsgIAIuN6XK/O+9FiTHQMM8cdDXo
+Vr7ONd/g8idxDdnkgFe62VK2SrqzsOK9RRrTP7/946vOpc70ayB2+ZoLKiro1SZY
+SWKpX+7QNystGpr4JtCa9M6Wcfam559CTY+Jckk6XvTntmG6dAw2K2OdKDzckaxA
+l8ubJwkUIPC76ivdVQ3pZYnuhgYMyvk+MlBPgHJdJW1LlpLhMhm5aCCbhwTgizAc
+mosxPtztZJ3Gl7VoXZZyAyBTZPwvXyh3hb4j3pYGCbZ7dz5MQzUKDKqbfo0ZIx/f
+KG/wzLsCbtVGvMKieYa4za2At9DVH/FwKcjgJx5qGQ2OoIc07CQFMSZZ761GJC8=
+=N84q
+-----END PGP SIGNATURE-----
diff --git a/games-fps/warsow/files/warsow-1.0-pic.patch b/games-fps/warsow/files/warsow-1.0-pic.patch
new file mode 100644
index 000000000000..71c4d8eed690
--- /dev/null
+++ b/games-fps/warsow/files/warsow-1.0-pic.patch
@@ -0,0 +1,11 @@
+--- source/snd_qf/snd_mix.c
++++ source/snd_qf/snd_mix.c
+@@ -27,7 +27,7 @@
+ int *snd_p, snd_linear_count, snd_vol, music_vol;
+ short *snd_out;
+ 
+-#if !defined ( id386 ) || defined ( __MACOSX__ )
++#if defined ( PIC ) || !defined ( id386 ) || defined ( __MACOSX__ )
+ #ifdef _WIN32
+ #pragma warning( push )
+ #pragma warning( disable : 4310 )       // cast truncates constant value
diff --git a/games-fps/warsow/files/warsow-1.02-pic.patch b/games-fps/warsow/files/warsow-1.02-pic.patch
new file mode 100644
index 000000000000..71c4d8eed690
--- /dev/null
+++ b/games-fps/warsow/files/warsow-1.02-pic.patch
@@ -0,0 +1,11 @@
+--- source/snd_qf/snd_mix.c
++++ source/snd_qf/snd_mix.c
+@@ -27,7 +27,7 @@
+ int *snd_p, snd_linear_count, snd_vol, music_vol;
+ short *snd_out;
+ 
+-#if !defined ( id386 ) || defined ( __MACOSX__ )
++#if defined ( PIC ) || !defined ( id386 ) || defined ( __MACOSX__ )
+ #ifdef _WIN32
+ #pragma warning( push )
+ #pragma warning( disable : 4310 )       // cast truncates constant value
diff --git a/games-fps/warsow/warsow-1.0.ebuild b/games-fps/warsow/warsow-1.0.ebuild
index f7e055dd4a06..1e49ce71d85d 100644
--- a/games-fps/warsow/warsow-1.0.ebuild
+++ b/games-fps/warsow/warsow-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.0.ebuild,v 1.5 2012/10/17 03:07:16 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.0.ebuild,v 1.6 2012/11/22 14:30:11 hasufell Exp $
 
 EAPI=4
 inherit eutils check-reqs gnome2-utils games
@@ -63,7 +63,7 @@ src_prepare() {
 
 	cd "${WORKDIR}"/${MY_P}_sdk || die
 	epatch "${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${PN}-0.5-pic.patch
+		"${FILESDIR}"/${P}-pic.patch
 	epatch_user
 }
 
diff --git a/games-fps/warsow/warsow-1.02.ebuild b/games-fps/warsow/warsow-1.02.ebuild
index fefcc65c521a..b28038994a74 100644
--- a/games-fps/warsow/warsow-1.02.ebuild
+++ b/games-fps/warsow/warsow-1.02.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.02.ebuild,v 1.1 2012/10/21 00:37:24 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.02.ebuild,v 1.2 2012/11/22 14:30:11 hasufell Exp $
 
 EAPI=4
 inherit eutils check-reqs gnome2-utils games
@@ -73,7 +73,7 @@ src_prepare() {
 
 	cd "${WORKDIR}"/${MY_P}_sdk || die
 	epatch "${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${PN}-0.5-pic.patch
+		"${FILESDIR}"/${P}-pic.patch
 	epatch_user
 }