diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2012-10-12 12:30:59 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2012-10-12 12:30:59 +0000 |
| commit | 9a8c53e773ed0ddef20ff153aefca43cbed8d56e (patch) | |
| tree | ff85ec779607903ff760b6cd586200a9ed37b460 /games-fps/warsow | |
| parent | stable ppc ppc64, bug #437184 (diff) | |
| download | historical-9a8c53e773ed0ddef20ff153aefca43cbed8d56e.tar.gz historical-9a8c53e773ed0ddef20ff153aefca43cbed8d56e.tar.bz2 historical-9a8c53e773ed0ddef20ff153aefca43cbed8d56e.zip | |
make patch upstream compatible
Package-Manager: portage-2.2.0_alpha137/cvs/Linux x86_64
Diffstat (limited to 'games-fps/warsow')
| -rw-r--r-- | games-fps/warsow/ChangeLog | 6 | ||||
| -rw-r--r-- | games-fps/warsow/Manifest | 20 | ||||
| -rw-r--r-- | games-fps/warsow/files/warsow-1.01-build.patch | 17 | ||||
| -rw-r--r-- | games-fps/warsow/warsow-1.01.ebuild | 6 |
4 files changed, 18 insertions, 31 deletions
diff --git a/games-fps/warsow/ChangeLog b/games-fps/warsow/ChangeLog index 2a061881f5ba..fdfa855ff695 100644 --- a/games-fps/warsow/ChangeLog +++ b/games-fps/warsow/ChangeLog @@ -1,6 +1,10 @@ # 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.40 2012/10/11 15:39:24 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.41 2012/10/12 12:30:54 hasufell Exp $ + + 12 Oct 2012; Julian Ospald <hasufell@gentoo.org> warsow-1.01.ebuild, + files/warsow-1.01-build.patch: + make patch upstream compatible *warsow-1.01 (11 Oct 2012) diff --git a/games-fps/warsow/Manifest b/games-fps/warsow/Manifest index 0c152a466ad7..8eeff299e162 100644 --- a/games-fps/warsow/Manifest +++ b/games-fps/warsow/Manifest @@ -6,7 +6,7 @@ AUX warsow-0.5-openal.patch 304 SHA256 6eb943201d4c5d6b8a902cda4efc75ea6ce6c8849 AUX warsow-0.5-pic.patch 377 SHA256 300c220fb833424be66da460ad4ac1ef6c61cde0dc5b76e1e8e0b75f5ece3782 SHA512 1f712dbf83c3bca6a2f0424f2250133a23903da86c9045d0917ef5a18b311f6485af6cd5afc1bbcc8b47ff0e0f880154fc17f978c2e7400b6edb4b2ba33b2e18 WHIRLPOOL 536ddb836e09c15d0a3e5645066042164a556d608022c9892a82cd56552a489d6d424909878fe89ddf035a1a604d9ba4a73eabe563c6de51f44ccec1f9b7d854 AUX warsow-0.62-build.patch 13349 SHA256 82ad996d1d925ffc849737c2e4bc028bf4c95e4e86a445fae3b66c59269764d5 SHA512 794defe657558386a23c63d47e86aa4fb54f7ce709f7de532519071fb3e99146d4ac36d58194692fee6febfb91eb6ebbaae036b74d40d3c17473e8e367e66c4a WHIRLPOOL d294b51a270b4f7e3ebe42e85cf8f2dff763f49363d37eff2ea703a8bf9eba5e4c6bf0ba4d620faee4ae94b113b4ebcfb7ab11a046e5fffaa695c0e9132fe41f AUX warsow-1.0-build.patch 16346 SHA256 626f23dc9c99eec2d1e1760e9247eb81079569ea139c165cb3ec908235e3aee7 SHA512 50131166cbd4ea39e9d77936d47ee9ca602f78f37f4f0351c188528deaebee1312b757ec4703b20a104cd23dbb5b68a948af774d67da07d1dac671c752bee4cf WHIRLPOOL 866797b10d0513269e72d2e71cda2d4860c8ca90322a426232dbcbd00cde68350a56ac484dacf350de11263ef329c5632dab5f8d0d8b08795191d6ac671ebe51 -AUX warsow-1.01-build.patch 16217 SHA256 cf358c1b56042f5075dc2570977f27675869832385d0a7d636ab33d1276bf783 SHA512 b36f9d95bedde6f1e7c8e12a871ebed64baad7a8e3d98cab18f4acc32bae8b02e07ef74ac3620f7d582000ec9b30b1fa1a8e58ee6302b32446361e1a29679fbc WHIRLPOOL beb08653043038e9acea217aeae2057ceb3e8e0a134f54a0faefa212b988a234284e1b4280fc2decc18364c61a02ae2dc391df969489e166fafc429d8edb5fb7 +AUX warsow-1.01-build.patch 15562 SHA256 5f85026c8ceeadc8de10797f6eaabce1f485a2846aec4a2f05e1f117234f55c1 SHA512 cf77b79142cd2ac6082781e8c6186fa3b23357703396cc65e975834877d7798600729652c7aa4ec53dbce64c40b0c2bcffa70d5455a2257b6ecadb6b985560ac WHIRLPOOL 9b32dcc602cbe49d3bad0b2523a784f6c755d8d9a744669597ce3c934f5cf21f239f43290a9b716010b1f67d0c049cb2ebc4607d92699b3911f0d6778483c398 DIST warsow.png 1692 SHA256 086968e72271b248ef32609ed1818ff9f5c355297b1eee3cbee9e41f4e18a954 SHA512 76476fd6f624b4043405fbddeaa0fa46338b96bf46a9b64434940d9a84738a20c25243ef1316048159698b6a70b3e0f26218da3332203a93944312e77ba22c8f WHIRLPOOL 94b7c77641d5a8f581de4eb0e4e91b71f25347248a6aa6c1160e8fefda92951daa3fbbf04aee4920fc9b53fb07872d3fb7d870d4207d13844e07afa51c93e85b DIST warsow_0.5_sdk.zip 34213675 SHA256 35cc937b4b38659df803d84f6b3fd6e9d5a5480ecadb4b642d991b99e3401f05 DIST warsow_0.5_unified.zip 256768515 SHA256 66ac784277def8d90a8368d44e7ca72cd1d3a50b63cee4ad7c3e102cf16f5100 @@ -20,17 +20,17 @@ DIST warsow_1.0_unified.tar.gz 518459004 SHA256 f933d251de4c92b6107d4db1eef5326b EBUILD warsow-0.5-r1.ebuild 3307 SHA256 c255ca80016a3ebed54d30ed965307b938b77a675f4ef47ab59ad5629a778302 SHA512 adf3e2a7f934a3d6d4589087f25c7db748d9bfea35f92bfff6018973354aa9c9271797565f8afd6e72c34c98928a3977dd4e72c5d726d48e824990fda180f402 WHIRLPOOL ae508adccd0eeef5e28c0147cf4d820e80058fa6192963a565ef741763994861c4ae99af6bc10ea791cc78e49926e05375ba1e701c4a9ee0fab1e3c2d1f48f57 EBUILD warsow-0.62.ebuild 3455 SHA256 e15b191b283a2c9ccd36b83d250119564ac326922f1d5700a3112223ba314a6c SHA512 9b9eb9bc00aef219722733eb249e796436c8d9c5812c4ab1591c495279086a803c452f68665149d1948d1e96194e434f856e396e72d8078006fddfd909d27755 WHIRLPOOL f3c166b4d89b28e8e9406ae8326762c1365bce779cb7574d18889d8292ee21ccc99fd737fc85be96f72196f76e348f045cbfb52ddd5b3d2e04453f15546300ff EBUILD warsow-1.0.ebuild 3377 SHA256 c6235538393baa6224306f90b1880bfe8a25d0814154d6e2ce971593c1a8ecab SHA512 9cbe8f7c67241cccb88cae192f26951d59df1714fbe445b6b99024d82ee7873d32c6b0332e65b8a7fab675d3b8d9831eed87a4c14a751e5ac0e6386773ca3531 WHIRLPOOL 9dc624d5a268970186a77535e35a31736788c8198288dc20da57cdbbfb28aaddcc71820cb2edaec7f95842c8b19ad7ec6a0911d556a978dce8f57c5f430a432f -EBUILD warsow-1.01.ebuild 3550 SHA256 6fa8cecb4cd12c908075c05a951e06ad21013c1794d23dbbc8999ed8b94b9f69 SHA512 082f16974612d47cfbadeb20d1adbf42f04916b9b60cba8046180496db0add22d584ef3245ffc0a7a60db32bc8aacd81afa5d2b398253911ad7b1c72b7f8edf3 WHIRLPOOL 1146e88422b984e64fed7b66b7b81627ff40f7eb1df49cb68e515fb093d477ffd68c6377442b61b47b00e8636d35bdc3a53573cda9bb367e080be48812e6fbe2 -MISC ChangeLog 5694 SHA256 708b1f69e1f86d1c2deb842efc52f2064639bdf8d843954c50bb2628357cebac SHA512 c5f41739f5f50b60f5a20331cdd1041f6ed5238f1518eeff7b03c1b6a8393f6d3818e2ce98f5341e684b0c7130eff9112a6c82c29a1effa4ff33476e07674727 WHIRLPOOL 7ae0ea980c772acb86cbc782c597a5e296d98c31d6c9f16df69d24b51a651cf857c41b6c6d306125df7600213778f3188087638b0475443ec7e5c50e839f89d4 +EBUILD warsow-1.01.ebuild 3550 SHA256 d0632396aa4e1d0b00b9dfd76514249614cad060838c13545d3cafb69044386e SHA512 74b6f411adfb076d2f7fee3531fd08d1305cc10d503c453c0f1f6751a4a20b7c9a4bf9224204617fc3e1348036876d206fe9947ecdfe370f5858cbe27556e9c4 WHIRLPOOL b35d00c570f341293f70dc31213ad52eb11d79c404dd34cf9aeb6713fd43852c1f5c8ce59094c095609e791d346d4a2c9f4c650e2e068839698e7d3f04ba1a52 +MISC ChangeLog 5832 SHA256 6dad11abbfd2100e6f18ab0ad462667ea62abcdb3447dbdc6cef5072ad8ba688 SHA512 b0c45039978a27b317aacd48269e220db83dec8210a4b18d7807064cb84801a7a60611bf5066dceecfa9c00ad0657f24f73767f4da0b6d15cb20949f34c143d7 WHIRLPOOL b5ff5ef66f695639090d128ead60bbd0a223209eb802d43e5b0bb2009e96f13a9906ae0ff6b6fc249c71109db183c5d44b49571fc951374cefed72fc4d9a7a1d MISC metadata.xml 347 SHA256 016dbabb997c28f241f054760d9b81b1c43f5161de6d53936a2ebeb78bccdbea SHA512 34e3d6eae3b4665eac573b096d83a2841aee4488cc1a237e54e6e12c0c7ad8caefbbde6b563d1421c9d68cf7fb2b6c2446dfeddb1390971a7630b5efa494cb77 WHIRLPOOL 9d4cbde23eacc798cb4f1ac0c504963d349619229a5c2e926d8fc1348b1fefc53e999cc21e0be0cdca58affd1bfd4a275ae633709af78ca3dc808431fa365db3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJQdugxAAoJEFpvPKfnPDWzZScH/2tW9PZtN/YQbQMzuQFs7BZN -7zY7pSHiMq99ipxZ9uqxi8QCp7LZtliivLpeDhjO1pI71yLMZBZrUtuZjKKen1Eq -mESRTC9SF65bDBSkHLDy8Ix+mgxARtQf0khJTba2kQIHhcruPzCPa/uTe9EhNmoE -hxCuZd0ZDQfvXFzssoculLDwz5O5IJbUHdoOvWamCIjbFlVuRcdRNItB2j5BkQti -wRq1xV1Yta+QY+le0Xb3tmshnuhsGBj24VKW47t2nUGkr9Vqfaag9ZVDvhXKTlMd -t9/bE9QPY12qnjxVl87RbvxAhiV5b/cBljSatJE/WJ6ZBRAPK2dDu141pmDPkbk= -=C40V +iQEcBAEBCAAGBQJQeA2BAAoJEFpvPKfnPDWzh2oIALKAAwHGwFKAJ1B36XrCJDF+ +yzAccVn3lxJVaO+2TXGoC8O7GGX2XFHSiFvEHnVB0R5mRmqCsHUqtt2cfPe+MMjM +0MQMZfvp1Fo17bgI1X0E4to8uGZLTg7JWHOXPQS81VBH67CxQ1W/HbDJ9niDy/ff +ezS6lLqgsA+jPVMwcxarI6+tlT4Sx4Que9JsPZS53w2KLsGRhS7ifQ1C73jQytuW +ZMGJWGK/MXaPFrL4766covC3kENIRF/7vsRPojlcIlF1lhTJwn+MZCIDy44D6V8i +XrmCd50rcDXsw+Y+mxOBXShyBEhh0LNA30izE4hZ7u60xej8IM28dTdBPP1H+n4= +=g4dz -----END PGP SIGNATURE----- diff --git a/games-fps/warsow/files/warsow-1.01-build.patch b/games-fps/warsow/files/warsow-1.01-build.patch index 6b5b5b5dc461..003c391f6721 100644 --- a/games-fps/warsow/files/warsow-1.01-build.patch +++ b/games-fps/warsow/files/warsow-1.01-build.patch @@ -46,23 +46,6 @@ g) address parallel make issues else BINDIR=release endif -@@ -116,14 +116,14 @@ - LIBROCKET_DIR=../libsrcs/libRocket/libRocket - LIBROCKET_MAKEFILE=Makefile.warsow - LIBROCKET_INC=$(LIBROCKET_DIR)/Include --LIBROCKET_LIB=$(LIBROCKET_DIR)/lib/libRocketWSW.a -+LIBROCKET_LIB=$(LIBROCKET_DIR)/bin/libRocketWSW.a - - CFLAGS_ROCKET=-DSTATIC_LIB -I$(LIBROCKET_INC) -I$(ANGELSCRIPT_INC) - # add the base of ui to inclusions - CFLAGS_ROCKET+=-Iui - - # static link to custombuilt lib --LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/lib -lRocketWSW -lfreetype -+LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/bin -lRocketWSW -lfreetype - # dynamic link to 'official' build - # LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/Build -lRocketCore -lRocketControls -lfreetype - @@ -196,8 +196,8 @@ X11BASE?=/usr/X11R6 diff --git a/games-fps/warsow/warsow-1.01.ebuild b/games-fps/warsow/warsow-1.01.ebuild index e2e755b93acf..aa7c9ffc871f 100644 --- a/games-fps/warsow/warsow-1.01.ebuild +++ b/games-fps/warsow/warsow-1.01.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.01.ebuild,v 1.1 2012/10/11 15:39:24 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.01.ebuild,v 1.2 2012/10/12 12:30:54 hasufell Exp $ EAPI=4 inherit eutils check-reqs gnome2-utils games @@ -107,14 +107,14 @@ src_compile() { emake \ BASE_ARCH=${arch} \ - BINDIR=bin \ + BINDIR=lib \ BUILD_ANGELWRAP=$(yesno angelscript) \ DEBUG_BUILD=$(yesno debug) \ ${myconf[@]} } src_install() { - cd bin + cd lib if ! use dedicated ; then newgamesbin ${PN}.* ${PN} |