From: Michael Sterrett Date: Thu, 19 Feb 2015 01:30:53 +0000 (+0000) Subject: old X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c463ad3afe48091b89091c8d718a655acfb353a1;p=gentoo.git old Package-Manager: portage-2.2.14/cvs/Linux x86_64 --- diff --git a/games-strategy/asc/ChangeLog b/games-strategy/asc/ChangeLog index 831bccdf5c5f..e7e9aae5158c 100644 --- a/games-strategy/asc/ChangeLog +++ b/games-strategy/asc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/asc # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/asc/ChangeLog,v 1.47 2015/02/10 10:10:57 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/asc/ChangeLog,v 1.48 2015/02/19 01:29:40 mr_bones_ Exp $ + + 19 Feb 2015; Michael Sterrett -asc-2.5.0.0.ebuild, + -files/asc-2.5.0.0-gcc47.patch: + old 10 Feb 2015; Agostino Sarubbo asc-2.6.0.0.ebuild: Stable for x86, wrt bug #539184 diff --git a/games-strategy/asc/Manifest b/games-strategy/asc/Manifest index 7761cd41e404..e9e0eb1e45bb 100644 --- a/games-strategy/asc/Manifest +++ b/games-strategy/asc/Manifest @@ -1,30 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX asc-2.5.0.0-gcc47.patch 1088 SHA256 b31b849f843877ff7be8aef227f7fd6e812b9c23f13bfb50c69ac1e395042390 SHA512 2f8f79e231b20ce8d7d5ab1da20ad592b3a0b5b85365e01b0a74077bcf76e1e3f01ff16d276a98291ffb8a21b6badd688680a9ab692238f91e35a9b7e9678510 WHIRLPOOL 0017e8a73bd5288372543be1f11b392d3654091f6bc819d70c60a1eb24326d8837509e283bc6db42ee756ed462b2bd20ddf97e76c6893fda1465854c95b5040d -DIST asc-2.5.0.0.tar.bz2 42084514 SHA256 ad6edb629049bda615b7c9b3046ab33d35dbc25de39a5ed15b9279fe48f779c6 SHA512 ee1ed1e8fdd0050b016f8cf51d6e3a00a5c3c4d6e5da25fb8ccf136a15ba03ab97a9734e634028cc12330eabd63a275afc825317e2adbe260df23101b4f49881 WHIRLPOOL 48680ddbad7609a460bd083992476b5c4c52d2140c456b9aa567387b7f4431dacdbf619886c1b1ea9ac1f350ce6e248c6a0024e0d9987c6f67b60590a5929380 DIST asc-2.6.0.0.tar.bz2 42280527 SHA256 e59caa549dc8d8a321211f60652cc809cbbf37d000ee85af790e676d9656cbbb SHA512 e1dea48bf87424fd65772e6d9bad96cf63e4062df5717bbc925562683782afc2d9788ea28e7147d905c3c0f6db3ef7c102a59022988c9fcf8aa6adba91dc5540 WHIRLPOOL 1662259bb1ab1c6f31b8ba227a7ac757f2a89ba4caacd9f2f5f3f737f60c31096f247cbc72eca61e572edce9ba4baeae6d5320e748a1415acc4ee0663f9db3b5 DIST frontiers.ogg 4691844 SHA256 eabc9b07d1db07626fa817a30dad23b11aada059e32c08914d2d0cf1d58c7fff SHA512 8c2ce497519b3842fba2d39b5c6de6194584d64c0375d404535628898cb2e7a82433fc6008781381a80a6cbb24ff49162de3634ebcf28b17b0631c30668fd8af WHIRLPOOL a48a6596421a7a5b2d663af14e12c04db2a47c3bde8f1cc54dfe72c69b095613e6479eb408483679979f264d848911b34ee7edb56757734229d1990046bcdd5b DIST machine_wars.ogg 3138308 SHA256 bd7f330c06090d98e5ba0dac5a691af1804ba383b783b7b2f960bc2e53400a77 SHA512 2c1bab89b9397f52dcf7eedfc0dbc88d49a586ac0474c76a09a87a880712bf0fa408c03a65a5f5d322dee86e3b12cbc66d53cd6728e8fa34fa8f2ee2bbc06cd8 WHIRLPOOL 7a83910d48414ffe3687374efb661dd169801f244857a4f154d400b76477917bfa2db63dfddfc57544be95e413cf23e810b346f3a39d4f140454237b235a2eee DIST time_to_strike.ogg 3830679 SHA256 0334a027b8a45a5df88e1e3e7db9cace2def02396fbcc794d157289e41c9ad05 SHA512 2ed946116cac2ea63d401eb7415d5b3e4e548bc5a5b00b01a6f1c4db6a242895810dfefdf1ace9652f01dc934a70b756aa74d01630cfac97b19ce84a93b772ee WHIRLPOOL d7a280bc4041e449a96e4f79483110c4f86d099be4550fe70edd1882df81d8242fe6bf687079b6b2f608f879462c1a5ca84dae7e11e68ea97d93d0651d48ef4f -EBUILD asc-2.5.0.0.ebuild 1702 SHA256 73bad31b1207c32cf52a0ab5efb3ff34d4a3c002e76c8deb41e5e582e3f25b26 SHA512 445fa218f427e1e2c9f8429479be765fcc396d6926de89c926ccd5a8d51a477d8934037becc912fda06a4522f50e4860529e42f577d6da9b3fdc8a0c2d4e9a28 WHIRLPOOL d87754114a1ce8c7db9a5811117b9145ad3a0db74200e6961321693a29d8f1808600754bc4dca1bbee52c53e5c16bcf35c072ef47b7cac372ce6d20d0791c84c EBUILD asc-2.6.0.0.ebuild 1647 SHA256 992f285ed067eb87716e8ebdc8ceb2a573e931ef014799617ca3224aaa38601c SHA512 c30176e6ebcb0db6bac8e3c8dcca8f25d21fe9ea6fb88387bc4054caac5761a3b5f8244bcb4ffce9a70e342af412de57aa92af59afeb9cc3b22bd2d2c4941b3b WHIRLPOOL fc9f7427575cdb5c1fe979fe9d852170fefe79e77d2d138ec6bd44ce811995590e2e3331dc31dd5696354860b6e9484baa7ceb7dcf6929b575041123ba050fd7 -MISC ChangeLog 7130 SHA256 a40dcf8f34bda12e7fc8e4dfe7ab297ff9964229bbc3f61518babc091832f803 SHA512 861313833f9c6a9b9c0f85e55cae15ea34c91d2d251a5f18aef67425d009cfe3e1944e46e38960cb05032a345f8ef4fd464d490d28aae2435b997991ab9ed483 WHIRLPOOL 3bed573a4620d1d4d56308c5479958940be316597b64c2527fa97dcbe8c1219ea2435c18eca21f7b71f7ccddbea043998ebcb03fc8d9985664855ed3ffcf325e +MISC ChangeLog 7253 SHA256 740f2bb8a1ebe234a32f83a656f90516b79097db5b232a69e8f05cc648333a28 SHA512 81dff049e2b68309f94f582318f527a337bb0248a9076f5f6eae20eb377cf627dc08edefe178d38ba4a731c36319fb4bef78f45f2420ca17adf3ed1d7c682e96 WHIRLPOOL 2280e89c4aad9e5a30f75db06db064d8507667a9e99771bf41e0ac264a3f1a772a388b350096c352d7f026deec302261ba5680f148c05c238f5b8bbf1abc6849 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJU2dkyAAoJELp701BxlEWfzkkQAL+llQjMRWfqW34WFyE+uHD+ -/ll2/kP+lu4azumY598JDBay6gTVDVcvIiGChSg2BU+J/Tw5DCXumK76eXdEpyOY -U7OsJIm0NJVUV+TrrUMvezphP+egFuUsfsdswtxCOpkbvx+H8SwXYxoTgoQ87DCJ -iebStdBDGK6oQGlFXzY3mYqQ9aWwSs4NWPMS8Ps8i/ql9bds6LXwRhswbX7jPIaj -81Q6jNflfqIeySLpOnURRKpFD0DWpUVKSjM2+CnG1sPMop2pv1naXGtG6RE0f0YU -LPxke3PVeGCTiu+CEjHVWhYIQBKlQHpwIyByyrnDr/7YslsC3g/kszFflMyQKUR9 -LK0RgXJ6pznkOzpuGtHBE6qviVrHfTLLa+v4BpRzzQhNr83odCWJTuENMdgMPSM6 -sl/LJdl0FzZbHepr8pYEEHdsE9uJuyYf2Kae8TQxAZ2kxvJXZVolooygcbjoUrG/ -nJW4dpUNkHjnqtScxtNDdt3Vlc1XMfX0n8LIA4RhMEf9+Ghzoq7aRLe0woNfTh21 -TFKbheq3eYnGboOA8drd4ynl36Q1T/PAqh2W/YduTaMpIiHGBuQd33PrMHp54jAm -iVu70GHjJ0OpHvYJsy2w2B/EDmmF74aMmtslQiMK7u3sEsnYfkq1le7apuXXy0jG -uRFtNJpLUviHM+9JMIw/ -=BEyd ------END PGP SIGNATURE----- diff --git a/games-strategy/asc/asc-2.5.0.0.ebuild b/games-strategy/asc/asc-2.5.0.0.ebuild deleted file mode 100644 index 89225d37e5eb..000000000000 --- a/games-strategy/asc/asc-2.5.0.0.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/asc/asc-2.5.0.0.ebuild,v 1.4 2012/10/30 15:07:24 tupone Exp $ - -EAPI=4 -WX_GTK_VER=2.8 -inherit eutils toolchain-funcs flag-o-matic wxwidgets games - -DESCRIPTION="turn based strategy game designed in the tradition of the Battle Isle series" -HOMEPAGE="http://www.asc-hq.org/" -SRC_URI="mirror://sourceforge/asc-hq/${P}.tar.bz2 - http://www.asc-hq.org/music/frontiers.ogg - http://www.asc-hq.org/music/time_to_strike.ogg - http://www.asc-hq.org/music/machine_wars.ogg" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="app-arch/bzip2 - media-libs/libsdl - media-libs/libpng - media-libs/sdl-image[gif,jpeg,png] - media-libs/sdl-mixer[vorbis] - media-libs/sdl-sound - dev-libs/boost - dev-games/physfs - media-libs/xvid - dev-libs/expat - media-libs/freetype - dev-lang/lua - x11-libs/wxGTK:2.8[X] - dev-libs/libsigc++:1.2" - -DEPEND="${RDEPEND} - dev-lang/perl - virtual/pkgconfig - app-arch/zip" - -PATCHES=( "${FILESDIR}"/${P}-gcc47.patch ) - -src_unpack() { - local f - - unpack ${P}.tar.bz2 - for f in ${A} - do - case ${f} in - *ogg) - cp "${DISTDIR}/${f}" "${S}/data/music" || die "cp music failed" - ;; - esac - done -} - -src_configure() { - # Added --disable-paraguitest for bugs 26402 and 4488 - # Added --disable-paragui for bug 61154 since it's not really used much - # and the case is well documented at http://www.asc-hq.org/ - if [[ $(gcc-major-version) -eq 4 ]] ; then - replace-flags -O3 -O2 - fi - egamesconf \ - --disable-paraguitest \ - --disable-paragui \ - --datadir="${GAMES_DATADIR_BASE}" -} - -src_install() { - default - dohtml -r doc/* - prepgamesdirs -} diff --git a/games-strategy/asc/files/asc-2.5.0.0-gcc47.patch b/games-strategy/asc/files/asc-2.5.0.0-gcc47.patch deleted file mode 100644 index b6541075ea4b..000000000000 --- a/games-strategy/asc/files/asc-2.5.0.0-gcc47.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- source/graphics/drawing.h.old 2012-10-30 10:33:47.617844756 +0100 -+++ source/graphics/drawing.h 2012-10-30 10:46:23.444784874 +0100 -@@ -169,7 +169,7 @@ - PixelType* pix = (PixelType*)( surf.pixels() ); - pix += pos.y * surf.pitch()/pixelsize + pos.x; - -- assign ( src, pix ); -+ this->assign ( src, pix ); - }; - }; - ---- source/graphics/blitter.h.old 2012-10-30 12:21:14.767021349 +0100 -+++ source/graphics/blitter.h 2012-10-30 12:22:18.492472029 +0100 -@@ -928,6 +928,7 @@ - ; - }; - -+#include "drawing.h" - - - extern const int ColorMerger_Alpha_XLAT_Table_shadings[8]; ---- source/itemrepository.cpp.old 2012-10-30 10:32:06.771697823 +0100 -+++ source/itemrepository.cpp 2012-10-30 12:23:42.973448933 +0100 -@@ -88,7 +88,7 @@ - t->filename = fileName; - t->location = location; - t->archive = prc.getArchive(); -- add ( t ); -+ this->add ( t ); - } - - -@@ -110,7 +110,7 @@ - t->archive = stream.readString(); - dataLoaderTicker(); - -- add ( t ); -+ this->add ( t ); - // add ( T::newFromStream(stream )); - } - } diff --git a/games-strategy/lgeneral/ChangeLog b/games-strategy/lgeneral/ChangeLog index 2e42a383d8d6..ec85ecec2b94 100644 --- a/games-strategy/lgeneral/ChangeLog +++ b/games-strategy/lgeneral/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/lgeneral # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.48 2015/02/10 10:09:02 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.49 2015/02/19 01:30:48 mr_bones_ Exp $ + + 19 Feb 2015; Michael Sterrett + -files/lgeneral-1.2.3-format.patch, -lgeneral-1.2.3.ebuild: + old 10 Feb 2015; Agostino Sarubbo lgeneral-1.2.4.ebuild: Stable for x86, wrt bug #539066 diff --git a/games-strategy/lgeneral/Manifest b/games-strategy/lgeneral/Manifest index e38e9ac5171d..2cb0273e1960 100644 --- a/games-strategy/lgeneral/Manifest +++ b/games-strategy/lgeneral/Manifest @@ -1,28 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX lgeneral-1.2.3-format.patch 1956 SHA256 f42070cbf2db7583e56726136f77cec871882acf840f014227a37a1f8288bb01 SHA512 ce66984f01b78ae3b1abced5f68a1b37f26cf06c1383f04536dad8302fa424b3d3680539e3e61ed5c8d3264f8eda3955239477b2e2df6456c53521df994a81b6 WHIRLPOOL facb25d6d14d2632c3b1cb302e1b8834f8099bf2a1b50bc8e78546e4377106300493bcd1d902dee4bade0c1eb7a71edfb4f69964f5eed6f2d4969c02cbcb7262 -DIST lgeneral-1.2.3.tar.gz 1630400 SHA256 55d17bb173c956c705b94bc8a6399d5311b3ec82c9f1821a97fe9ec45da0d9a1 SHA512 f6481d39e29e112b40bf4fce0edae4ad0228a31eea14aec3f8504ebb1878212e4c82b13a77ff09939f0f41903cb8f915ebfd005ab9e3f7b821d4ca3ddef5ec15 WHIRLPOOL f58182f1327667f2254c65000f79f97e247e42d431078bd4aa0ca76c24699ef5486ba3033faf84eb0a043daafcbf882fd3ceb56427847e5ac1f7567b679cda59 DIST lgeneral-1.2.4.tar.gz 1677195 SHA256 7207cba927f518b5962a4c5b709a8aca128fd0638c47984e9da0415ad2610c00 SHA512 c85cc6454b30d0ac84a2a4e0e35b9cca8b4ab3f8816f9bac607a439dde5eb667432596c09af3e5f1382572860eab4291dcbe045af7eef59cf879a4e9db9506cd WHIRLPOOL e25e7cb0ed6fabf408773a8aedb0e79ade10390f874d7c08a3624b273166a718630587afcde88ca0a9664e8634a0656c69e7aa5f9f708125cc1f381a12add7cd DIST pg-data.tar.gz 410454 SHA256 f2f74022cf8c279451911dda0a57cffab26ebf11429d61a6596310340ed23f76 SHA512 b0df30dd9a9d0652acd8702d601c489e5d3a030854ceeb173d2daa656c00633a78a3f45814da9f4157b86544dec34eda02495742242653c7cdebba5ec9951516 WHIRLPOOL 69f22f28cf4639dab0e6cf90036c26178129d7f67decf8b95ca175bb224bb3b985cf80382e06e45db06ef21d9ab9819fc1821b3d633a67bbb06ba56a8b450022 -EBUILD lgeneral-1.2.3.ebuild 2041 SHA256 3b28cfcb8424f45705203250086e75ce388cf09bb7173dbb1311f2d4d6f6daaf SHA512 428af9f7e6cf1bdd439aa727257c03bd1f292f8e9a6ef866c79d73033a63cb3016a4e752dd170faadd3ff25c05c3406cd79e046061cf3d31684edbe10c93c9cd WHIRLPOOL f1fce1b08d3c270a3d50b0b3fa6cfb6d8a8fc5cf9a434a3502ca4c36c83b1b72b82b55583de990190c2dadc56a67537748715c396dd97d2469dda0796f0fada1 EBUILD lgeneral-1.2.4.ebuild 2151 SHA256 be72c4e4ee6393457ec69c28ccf95d0c6b4cc46b1e0146713a3d583db8f48934 SHA512 a5c4ea2afdbedb575114e074b1e874843a06140f4e0f99e3ca0804f624db7a2090d56b62e084a0078f78c6a6aff25dd342d930b52c528d4f7e03b165110be5c3 WHIRLPOOL 567371219de7169a9f91b8580937d456e0b392a1e0308e548b9b8a78d6e1888b1d4aae9504b332f9d5ea15d8a7c598dfdab8d8185a9022ee491ffb282b2cd8a3 -MISC ChangeLog 8809 SHA256 b13843b52a745f386d3474834cb26e425f04eee6022ff0c01cd70c7c9573a0ee SHA512 36f25ebb9248b3c13817396cb6732c82085935d334c05e96915c2d7ea0ec9338b96bacae2142907fc67b77024ee99f08d05dfec659547287e75ca1c1a4a6a404 WHIRLPOOL 198e676f1d9d5ebb23ebf80551d912e565050a342b0e85a4aea92190b3b794bfcbefa0d9e999d0d2512df5d239cb308844b4d22d341704f4639354735628a95f +MISC ChangeLog 8939 SHA256 af7cb354dc504c3d035a8ece89d831ad0e8fcf3af97e16ae4cca47ccab24d7e8 SHA512 6d8c1468f4aa1c7114503707e132c9b973ec2f11892f7a31e6a64bc3e78b7ba5da42d80fa136f652f40213c17b20ab8a7d7529b24946c2376e9d4f626b3c6aca WHIRLPOOL fbc2618898e910d85d4abfc232500863217bc99739b4a8525b564316069dd137b218719cbd97ac8573ee7506131f7ed774936dac827763015447776d073ab5c5 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJU2di/AAoJELp701BxlEWf6CQP/3YL6HVKtEdLc6lbnFELzCw6 -bQosdf9zr+XtCpCJVEgMlcr6OHkPkmekIuit6lfCHsIMTTkeMQyZqwc/y7u1Pnuj -s3tnGX8N0+tlFAuRq6otigUfk7dvDrjA6/OZdU0AbDNivQK1+3xHXQN+vwCHPxpJ -u9kquGRm1dNTofmTMEkk8wovrNQw44DBV7U0RHpFriUQeP4kPopiTw/AcMmQsfrq -Yq+saJlVPFvnbGHcATUEE6Hox6iiz9yMrjy8d16D/8WOWqYtrNcs5IgFzEjp6854 -oVCtlQBIgc6icpQ5Jsn6LqqbYTyn3g9loHrJYS9dsuIuBbSkioRDkDQfrlGsa8UW -UOJRUa5XGNmFHJ7qkdFtEtyuSBmf/Oxm6gzIgeFxbw5bagVE3pHvHFI7DbmT9vc9 -6tXXTOypMkMlD1ox9GFuIK6x7ILB0GsNVMz7hlMJzI8LewJ0/LLIGXKbVL9pPElT -DPwJ7hKxiOi/OtNgbBAc/VZIoRv1j92LW9Y4iIgYJu8ytvEUKhLuS1hWuB4BT2Bt -5vWMBUR1KmCKUwFtudfZaPmEFFMcghYSVLK3KtFcs2n//kSOjVdzJkgtaPSV2A8q -fz5UcWhdbNBCCGt/4ExxF3iNkQLHXraa8LzLp5XkHibFphRKwVXtsfEB6zKQ19vE -BS2RZpR1OHTdDncIyVxC -=blJR ------END PGP SIGNATURE----- diff --git a/games-strategy/lgeneral/files/lgeneral-1.2.3-format.patch b/games-strategy/lgeneral/files/lgeneral-1.2.3-format.patch deleted file mode 100644 index 364b65a7ee3c..000000000000 --- a/games-strategy/lgeneral/files/lgeneral-1.2.3-format.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- lgc-pg/units.c.old 2014-10-20 08:42:12.389153753 +0200 -+++ lgc-pg/units.c 2014-10-20 08:42:41.412883009 +0200 -@@ -552,7 +552,7 @@ - } - } - /* get flags */ -- sprintf( flags, unit_classes[entry.class * 3 + 2] ); -+ sprintf( flags, "%s", unit_classes[entry.class * 3 + 2] ); - if ( apply_unit_mods ) { - i = 0; - while ( add_flags[i*2][0] != 'X' ) { ---- src/engine.c.old 2014-10-20 08:44:21.867947804 +0200 -+++ src/engine.c 2014-10-20 08:45:19.299413602 +0200 -@@ -2311,7 +2311,7 @@ - if ( gui->module_dlg->subdir[0] != 0 ) - sprintf( path, "%s/%s", gui->module_dlg->subdir, (char*)gui->module_dlg->lbox->cur_item ); - else -- sprintf( path, (char*)gui->module_dlg->lbox->cur_item ); -+ sprintf( path, "%s", (char*)gui->module_dlg->lbox->cur_item ); - free( setup.modules[gui->setup->sel_id] ); - setup.modules[gui->setup->sel_id] = strdup( path ); - gui_handle_player_select( gui->setup->list->cur_item ); -@@ -2756,7 +2756,7 @@ - result = gui_get_message_pane_selection(camp_pane); - if (result && strcmp(result, "nextscen") == 0) { - /* start scenario */ -- sprintf( setup.fname, camp_cur_scen->scen ); -+ sprintf( setup.fname, "%s", camp_cur_scen->scen ); - setup.type = SETUP_DEFAULT_SCEN; - end_scen = 1; - *reinit = 1; -@@ -4243,7 +4243,7 @@ - } - else { - /* next scenario */ -- sprintf( setup.fname, camp_cur_scen->scen ); -+ sprintf( setup.fname, "%s", camp_cur_scen->scen ); - setup.type = SETUP_CAMP_BRIEFING; - reinit = 1; - } diff --git a/games-strategy/lgeneral/lgeneral-1.2.3.ebuild b/games-strategy/lgeneral/lgeneral-1.2.3.ebuild deleted file mode 100644 index 00bfc1c366b3..000000000000 --- a/games-strategy/lgeneral/lgeneral-1.2.3.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2.3.ebuild,v 1.6 2014/10/20 07:00:23 tupone Exp $ - -EAPI=5 -inherit eutils autotools games - -MY_P="${P/_/}" -MY_P="${MY_P/beta/beta-}" -DESCRIPTION="A Panzer General clone written in SDL" -HOMEPAGE="http://lgames.sourceforge.net/index.php?project=LGeneral" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz - mirror://sourceforge/${PN}/pg-data.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="nls" - -RDEPEND="media-libs/libsdl[sound,video] - media-libs/sdl-mixer - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - sys-devel/gettext" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${FILESDIR}"/${P}-format.patch - sed -i \ - -e '/desktop_DATA/d' \ - -e '/icon_DATA/d' \ - Makefile.am || die - - cp /usr/share/gettext/config.rpath . - rm -f missing - eautoreconf - - # Build a temporary lgc-pg that knows about ${WORKDIR}: - cp -pPR "${S}" "${WORKDIR}"/tmp-build || die "cp failed" - sed -i \ - -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \ - -e "s:@D@::" \ - {lgc-pg,src}/misc.c \ - || die "sed failed" - - cd "${WORKDIR}"/tmp-build - sed -i \ - -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \ - -e "s:@D@:${D}:" \ - {lgc-pg,src}/misc.c \ - || die "sed failed (tmp)" -} - -src_configure() { - egamesconf \ - $(use_enable nls) - - # Build the temporary lgc-pg: - cd "${WORKDIR}"/tmp-build - egamesconf \ - --disable-nls \ - --datadir="${D}/${GAMES_DATADIR}" -} - -src_compile() { - emake - - # Build the temporary lgc-pg: - cd "${WORKDIR}"/tmp-build - emake -} - -src_install() { - default - keepdir "${GAMES_DATADIR}"/${PN}/{ai_modules,music,terrain} - - # Generate scenario data: - dodir "${GAMES_DATADIR}"/${PN}/gfx/{flags,units,terrain} #413901 - SDL_VIDEODRIVER=dummy "${WORKDIR}"/tmp-build/lgc-pg/lgc-pg \ - -s "${WORKDIR}"/pg-data \ - -d "${D}/${GAMES_DATADIR}"/${PN} \ - || die "Failed to generate scenario data" - - newicon lgeneral48.png ${PN}.png - make_desktop_entry ${PN} LGeneral - prepgamesdirs -}