From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- games-action/0verkill/0verkill-0.16-r4.ebuild | 17 +-- games-action/0verkill/Manifest | 3 +- .../0verkill/files/0verkill-0.16-fno-common.patch | 87 ++++++++++++ games-action/Manifest.gz | Bin 13479 -> 13311 bytes games-action/btanks/Manifest | 7 - games-action/btanks/btanks-0.9.8083.ebuild | 54 -------- .../btanks/files/btanks-0.9.8083-gcc46.patch | 10 -- .../btanks/files/btanks-0.9.8083-gcc47.patch | 103 --------------- .../btanks/files/btanks-0.9.8083-gcc6.patch | 34 ----- .../btanks/files/btanks-0.9.8083-scons-blows.patch | 93 ------------- games-action/btanks/metadata.xml | 19 --- games-action/luola/Manifest | 3 +- .../luola/files/luola-1.3.2-fno-common.patch | 33 +++++ games-action/luola/luola-1.3.2-r1.ebuild | 32 ++--- games-action/minetest/Manifest | 1 + games-action/minetest/minetest-5.3.0-r100.ebuild | 146 +++++++++++++++++++++ games-action/trine-enchanted-edition/Manifest | 2 +- .../trine-enchanted-edition-2.12.508-r2.ebuild | 87 ------------ .../trine-enchanted-edition-2.12.508-r3.ebuild | 84 ++++++++++++ games-action/trine2/Manifest | 2 +- games-action/trine2/trine2-2.01.425-r1.ebuild | 99 -------------- games-action/trine2/trine2-2.01.425-r2.ebuild | 95 ++++++++++++++ 22 files changed, 473 insertions(+), 538 deletions(-) create mode 100644 games-action/0verkill/files/0verkill-0.16-fno-common.patch delete mode 100644 games-action/btanks/Manifest delete mode 100644 games-action/btanks/btanks-0.9.8083.ebuild delete mode 100644 games-action/btanks/files/btanks-0.9.8083-gcc46.patch delete mode 100644 games-action/btanks/files/btanks-0.9.8083-gcc47.patch delete mode 100644 games-action/btanks/files/btanks-0.9.8083-gcc6.patch delete mode 100644 games-action/btanks/files/btanks-0.9.8083-scons-blows.patch delete mode 100644 games-action/btanks/metadata.xml create mode 100644 games-action/luola/files/luola-1.3.2-fno-common.patch create mode 100644 games-action/minetest/minetest-5.3.0-r100.ebuild delete mode 100644 games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r2.ebuild create mode 100644 games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r3.ebuild delete mode 100644 games-action/trine2/trine2-2.01.425-r1.ebuild create mode 100644 games-action/trine2/trine2-2.01.425-r2.ebuild (limited to 'games-action') diff --git a/games-action/0verkill/0verkill-0.16-r4.ebuild b/games-action/0verkill/0verkill-0.16-r4.ebuild index e1b5419bf8c6..39ebed3ca4cb 100644 --- a/games-action/0verkill/0verkill-0.16-r4.ebuild +++ b/games-action/0verkill/0verkill-0.16-r4.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools @@ -18,13 +18,14 @@ DEPEND="X? ( x11-libs/libXpm )" RDEPEND=${DEPEND} PATCHES=( - "${FILESDIR}"/${P}-docs.patch - "${FILESDIR}"/${P}-home-overflow.patch - "${FILESDIR}"/${P}-segv.patch - "${FILESDIR}"/${P}-gentoo-paths.patch - "${FILESDIR}"/${P}-ovflfix.patch - "${FILESDIR}"/${P}-CC.patch - "${FILESDIR}"/${P}-underflow-check.patch #136222 + "${FILESDIR}"/${P}-docs.patch + "${FILESDIR}"/${P}-home-overflow.patch + "${FILESDIR}"/${P}-segv.patch + "${FILESDIR}"/${P}-gentoo-paths.patch + "${FILESDIR}"/${P}-ovflfix.patch + "${FILESDIR}"/${P}-CC.patch + "${FILESDIR}"/${P}-underflow-check.patch #136222 + "${FILESDIR}"/${P}-fno-common.patch ) src_prepare() { diff --git a/games-action/0verkill/Manifest b/games-action/0verkill/Manifest index f5900b7dd5d5..87dc92a63a58 100644 --- a/games-action/0verkill/Manifest +++ b/games-action/0verkill/Manifest @@ -1,10 +1,11 @@ AUX 0verkill-0.16-CC.patch 3795 BLAKE2B b780eaaecad8d93e7b2bdba5b54038408b1b1fabe9eb1580524965110387400a8af42bac0ae07dbfddd39a63f6584316a2373f66bbcde8fa920291c540af0af1 SHA512 ea3c848d20e4a3ce197104dac2ff26948c7bdd77eb03a7492f6d62cf6cb316c12a38f3d4555bdac87582692ce4ff15794c2996a6015a2ea18398cb84b8dee022 AUX 0verkill-0.16-docs.patch 1477 BLAKE2B 814d3974a5017bb3568f6ef9ea28aae51e8915d3028c4b5dc01e126853f46585ced6eb7624320510169b02cc18525f73657791b174fc2613a74e2985760466fb SHA512 a1ce9ca8083855b77747f0ea32587651d9e7bdf3f41406bed6e8f76debd7fe475681a1a59571b3244a65864700db18bc5fe48858113ea22ee00cd7feff13438d +AUX 0verkill-0.16-fno-common.patch 1719 BLAKE2B d81444dd770ce16de4b0dd52c936ca1a23f9f067568eac0983bbd2e7d0caa91779a58c7217c1ecb5eef8b00a717664ca64df1c03a1d0fa23e42eb5336c750f19 SHA512 29b048a532062d3abf338eb15bf328ae4093c40eb6310c597ffe139e295946e25062a84b99e94a6271ff8cebc53228e7d358c8cc4b4cee85b82d2995368db8f8 AUX 0verkill-0.16-gentoo-paths.patch 530 BLAKE2B a3d00af6fdf1cdefedc3c673e9defa8b2eae6756a42a11600f2a508d1f7d01190d228c1c7f34442dafd68f4ee4a1bee3476cdfe81b71913494fd718f02200981 SHA512 9419b990df205c93baf4d2e2391269f2543bc2b6ba9a3d0219983be518cce01d4a1384ce9cc0dfd8ffba743e8879658b70859e6f7a4df0b97a47186dd90b3337 AUX 0verkill-0.16-home-overflow.patch 724 BLAKE2B 186df84d2fdfacfd576eb20db8f61228fd2bfe6e48c9e4e8674584376efe5bec22468c43f4b94e974e5ba2995f1784a0400495286599b1f1a0ddb77989fc14f4 SHA512 379edf4f8f9bd31d38bd39812bd0602429afb4254e040cb9f5677764bfe4e34fede5f6e0d07c27e691c9682e205c78fa53109b8c1e4ca6be509d06e752eb08b5 AUX 0verkill-0.16-ovflfix.patch 805 BLAKE2B 206ca5dc584e09bdaab577e559bc45cd9f9be2c6256dc27b37eba6db5ad3edf3ac4c9c9778c0691cc812b839045b3c865635ff39cfbcf3716f74d98b72173c4e SHA512 ad4f57d6d44c663af4d7a2b75c680ad287f582a5c7b4038e392bdc6425c5819de719e0dadd38e45d784d077f22eb5d098fd0e65c7ecb8bd29824b4fb81032220 AUX 0verkill-0.16-segv.patch 1560 BLAKE2B c7ab421261b7168d53c77b7baf800cdc4b4e3bb1c5756078729a17f82c391ce9276ab846b65428eae5f0513facc995b90f182ce810c81dee70eb23ded69d0f19 SHA512 05ce966d80cf199a9602cb7143a2d7e8479ccb4b03da2275dc8a93a9065d387fe15426c48559279acb73eb3c371306a02706de899d5c6a97c123319426b3f6bc AUX 0verkill-0.16-underflow-check.patch 675 BLAKE2B 12ebde16b9eb4e825a34259103fec200d174e9b9b3ee3d9b689a47f53406abb7c36e8c5cc9d444cd53d84553cc18658bdc7346c02bced87ed4279189af33dd87 SHA512 3b5bff2c18c1862fadbb3d932be23f35559ed9eb3ffb979cf11c50bbac9fff8928b5ead8349ddfc78c84d07a5d1afe4431af56263568b3b82fd7cb015f442e42 DIST 0verkill-0.16.tgz 276579 BLAKE2B 125a441bfce8433f750180653323059409495c41ff318cec58c31840102739d7a911cd73c07e64ea459c8dd4062fd8bbdbd4a26b6b280b359fe7f61d52ef5ae2 SHA512 6ab273085f2be3a6d0a2b785a51a9bfd52add0212b3c8522b22255c4e3e48a9470f20d9d678158233da9c9465563279079c29ca5526d322247f2ef1d74107144 -EBUILD 0verkill-0.16-r4.ebuild 1381 BLAKE2B af13b0674049c56dac5832ce656971c4473cd178b719695b283ad5b750a641ecbd0fad55c07466872c7e8abbe7d1f0bc0303c72b7e76b086a3ec6cac1dec9cb0 SHA512 c241a1d91dfb8753c6a55fd19029fe4bdcd0097867e7bc48de73160d568930055fdd6c2944a1654381ca667aaccf35af0d6d42eb555b0246c5733a8decec897c +EBUILD 0verkill-0.16-r4.ebuild 1411 BLAKE2B 5fd1b57a0d88aaff8f0234638c2783d677c79a2f61bc173bd47e4297b030ecc9ebb0214eb949d8c8b6a44f8f921157f98c05465fb1aff91550c3299342e421ca SHA512 852d2ef98319fadc755311fe27784f13406fc1f05121c86fd54343acfc866589414166b9b1ac360899256796bb6617d0db76776bb3289add9b0e24fab8ddda36 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-action/0verkill/files/0verkill-0.16-fno-common.patch b/games-action/0verkill/files/0verkill-0.16-fno-common.patch new file mode 100644 index 000000000000..bf03ff424e2f --- /dev/null +++ b/games-action/0verkill/files/0verkill-0.16-fno-common.patch @@ -0,0 +1,87 @@ +--- a/bot.c ++++ b/bot.c +@@ -104,7 +104,7 @@ + + /* objects */ + struct object_list objects; +-struct object_list *last_obj; ++extern struct object_list *last_obj; + struct it* hero; + + unsigned long_long game_start_offset; /* time difference between game start on this machine and on server */ +--- a/client.c ++++ b/client.c +@@ -97,7 +97,7 @@ + + /* objects */ + struct object_list objects; +-struct object_list *last_obj; ++extern struct object_list *last_obj; + struct it* hero; + + /* important sprites */ +--- a/data.c ++++ b/data.c +@@ -13,6 +13,9 @@ + #include "md5.h" + #include "error.h" + ++unsigned char *weapon_name[ARMS]; ++struct obj_attr_type obj_attr[N_TYPES]; ++struct weapon_type weapon[ARMS]; + + #ifdef TRI_D + int tri_d=0; +--- a/data.h ++++ b/data.h +@@ -62,7 +62,7 @@ + + #define ARMS 5 + +-unsigned char *weapon_name[ARMS]; ++extern unsigned char *weapon_name[ARMS]; + + /* STATUS + 0: walk +@@ -91,7 +91,8 @@ + bit 1=server updates + bit 2=server sends updates to clients + */ +-}obj_attr[N_TYPES]; ++}; ++extern struct obj_attr_type obj_attr[N_TYPES]; + + + /* weapon attribut table */ +@@ -107,7 +108,8 @@ + unsigned char add_ammo; + unsigned char max_ammo; + my_double shell_xspeed,shell_yspeed; +-}weapon[ARMS]; ++}; ++extern struct weapon_type weapon[ARMS]; + + + /* object in the game */ +--- a/editor.c ++++ b/editor.c +@@ -26,7 +26,7 @@ + int oldx=0,oldy=0; /* old cursor position */ + + struct object_list objects; +-struct object_list *last_obj; ++extern struct object_list *last_obj; + int level_number; + + +--- a/server.c ++++ b/server.c +@@ -100,7 +100,7 @@ + struct object_list objects; + + struct player_list *last_player; +-struct object_list *last_obj; ++extern struct object_list *last_obj; + + + #ifdef WIN32 diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz index aa71b6b08569..15369fc5f958 100644 Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ diff --git a/games-action/btanks/Manifest b/games-action/btanks/Manifest deleted file mode 100644 index c437f173ab2c..000000000000 --- a/games-action/btanks/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX btanks-0.9.8083-gcc46.patch 284 BLAKE2B 140b21a6ab7147e4ca2906324268270c9ce84421e76a42c27795965807d2023a91d358fabab4cdb7fde6bcc2bc8dbd8a048db3e7f966522ff14615b65ebe8399 SHA512 114ddc0b5bbe0125389dee88ed3eef27b3ec260edc6d50eb04a86f93157f3b2f613cd1ba58f915ca7f8255d2cdc5d341a0a70bf22d5210160dba7604fd90c83d -AUX btanks-0.9.8083-gcc47.patch 5679 BLAKE2B 01b241dc102d17cffdc64e0967e4d072ecee814e3af2d8b8e12d52d1f4dbbf70fd2fb11858680a472c43336d5ea94a4029d8ddf6645543216755d9b9f5e89b76 SHA512 226869ef3031ddd4629bdd98880c85a4c0ff9f1619fd45372e60ccb2ebb50f0cd7b0ad60befa1859e475705d236144b1fd6e2286513cfbafaa0eba8c02918c9a -AUX btanks-0.9.8083-gcc6.patch 712 BLAKE2B 4dabb62b61a5fdcde6c2c7e697e96561fb244d3330a38c2a989800869a309e38322ab0f54af1d33350b579181949465e2b78f51be6cd6490f9b57c8bdb8faf83 SHA512 1efbac6ed17aa9d3cfc1c6e85a94eb4f83b6d37ce81d2f6db8190ee8d70e09ba156e50861bbeb4a8a3867db33e6b2427e996e2d1421a2f2ef2216946a42fda8a -AUX btanks-0.9.8083-scons-blows.patch 3146 BLAKE2B 37ec6f2304344bd4cc0bf8d116c0a960cc487bd44848ab651b192918da8220b93f60627c920d714b1cb322b37b8fcc5b883d806e7de8df5d9cef0919657227ec SHA512 de42054c599d808ca1fb3491346602b4055157973f8138a2c258e64fb596d87d67b24ffe30edffbab30fec4b0e71bc541cbd2fb7d7866d079595b54af763a856 -DIST btanks-0.9.8083.tar.bz2 28754069 BLAKE2B c187fe1deca9cdb5efcbb279215c369542e1e5e1ce93b0cecac077733a1b56359caa9dd49629305c566d8c86da1f05a6f4f61d1e41888c6c8076c9494fe5df03 SHA512 beef8f480e4c20c4f3d29aaa63fd52b370b89cceb8a7dda92f0d0fa5517969abf1fce6b0109782300f1b5bb92cf3c599677b168cd66f3b44c2d2dd1742ce0241 -EBUILD btanks-0.9.8083.ebuild 1313 BLAKE2B a4dfec8f35233ac4b0fde95e5179bb58856276945b4235be34c98b9e36bd4450fefd986e3b8897736b815a46bb9eff5a07baefc6900a8a4d1d28b698009f6cdb SHA512 c6bf4810dcea4dc9e8aeca58a3e8465576e00ca053d42b0213370241cd13f1a11390ffb2099e9dc0b1b08a38ccdb605f4504e7f5614dcdfc046af8ff589cbc94 -MISC metadata.xml 774 BLAKE2B a7c262e86fba1b67ed19dd1050885e8bf5b0dd9f9502a086d0e702e59317d34133a303f33dbfdd4fb41dd72d52a508393b6f3d0a798df51721d8b859e5e87b76 SHA512 f5b571ea902f863958151df0746dcbe2bd59f4c286e81ae6d4b3c2a298b1288379ec8e88e0ba59e06fdc4188e1dbd5fccb158e37707065556db241588420bcc2 diff --git a/games-action/btanks/btanks-0.9.8083.ebuild b/games-action/btanks/btanks-0.9.8083.ebuild deleted file mode 100644 index 6036ed703dea..000000000000 --- a/games-action/btanks/btanks-0.9.8083.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils scons-utils games - -DESCRIPTION="Fast 2D tank arcade game with multiplayer and split-screen modes" -HOMEPAGE="http://btanks.sourceforge.net/" -SRC_URI="mirror://sourceforge/btanks/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-lang/lua-5.1:0 - media-libs/libsdl[joystick,video] - media-libs/libvorbis - virtual/opengl - dev-libs/expat - media-libs/smpeg - media-libs/sdl-image[jpeg,png] - media-libs/sdl-gfx" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - rm -rf sdlx/gfx - epatch "${FILESDIR}"/${P}-scons-blows.patch \ - "${FILESDIR}"/${P}-gcc46.patch \ - "${FILESDIR}"/${P}-gcc47.patch \ - "${FILESDIR}"/${P}-gcc6.patch -} - -src_compile() { - escons \ - prefix="${GAMES_PREFIX}" \ - lib_dir="$(games_get_libdir)"/${PN} \ - plugins_dir="$(games_get_libdir)"/${PN} \ - resources_dir="${GAMES_DATADIR}"/${PN} -} - -src_install() { - dogamesbin build/release/engine/btanks - newgamesbin build/release/editor/bted btanksed - exeinto "$(games_get_libdir)"/${PN} - doexe build/release/*/*.so - insinto "${GAMES_DATADIR}"/${PN} - doins -r data - newicon engine/src/bt.xpm ${PN}.xpm - make_desktop_entry ${PN} "Battle Tanks" - dodoc ChangeLog *.txt - prepgamesdirs -} diff --git a/games-action/btanks/files/btanks-0.9.8083-gcc46.patch b/games-action/btanks/files/btanks-0.9.8083-gcc46.patch deleted file mode 100644 index 367c33cc6f24..000000000000 --- a/games-action/btanks/files/btanks-0.9.8083-gcc46.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- engine/sl08/sl08.h.old 2011-04-19 17:20:34.055776870 +0200 -+++ engine/sl08/sl08.h 2011-04-19 17:20:59.471398921 +0200 -@@ -22,6 +22,7 @@ - /* DO NOT MODIFY THIS FILE: IT'S AUTOGENERATED */ - - #include -+#include - - #ifndef NULL - #define NULL ((void*) 0) diff --git a/games-action/btanks/files/btanks-0.9.8083-gcc47.patch b/games-action/btanks/files/btanks-0.9.8083-gcc47.patch deleted file mode 100644 index 13a4cf3723ae..000000000000 --- a/games-action/btanks/files/btanks-0.9.8083-gcc47.patch +++ /dev/null @@ -1,103 +0,0 @@ ---- mrt/base_file.h.old 2012-10-08 10:16:43.941487723 +0200 -+++ mrt/base_file.h 2012-10-08 10:18:55.788771445 +0200 -@@ -20,6 +20,7 @@ - */ - - #include -+#include - #include "export_mrt.h" - - namespace mrt { ---- math/range_list.h.old 2012-10-08 09:49:34.283887937 +0200 -+++ math/range_list.h 2012-10-08 09:50:36.258212096 +0200 -@@ -53,14 +53,14 @@ - return; - } - -- typename parent_type::iterator i = lower_bound(value); -+ typename parent_type::iterator i = this->lower_bound(value); - if (i != parent_type::end()) { - if (i->first == value) - return; - - if (value + 1 == i->first) { - T e = i->second; -- erase(i); -+ this->erase(i); - i = parent_type::insert(typename parent_type::value_type(value, e)).first; //expand beginning - i = pack_left(i); - } ---- engine/sl08/sl08.h.old 2012-10-04 09:50:37.845681514 +0200 -+++ engine/sl08/sl08.h 2012-10-08 09:58:32.873166723 +0200 -@@ -272,7 +272,7 @@ - inline slot1(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {} - - inline void assign(object_type *o, func_t f) { object = o; func = f; } -- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); } -+ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); } - - inline return_type operator() (arg1_type a1) const { - return (object->*func) (a1) ; -@@ -293,7 +293,7 @@ - inline slot1 () : object(NULL), func(NULL) {} - inline slot1 (object_type *object, func_t func) : object(object), func(func) {} - inline void assign(object_type *o, func_t f) { object = o; func = f; } -- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); } -+ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); } - - inline void operator() (arg1_type a1) const { - (object->*func) (a1); -@@ -447,7 +447,7 @@ - inline slot2(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {} - - inline void assign(object_type *o, func_t f) { object = o; func = f; } -- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); } -+ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); } - - inline return_type operator() (arg1_type a1, arg2_type a2) const { - return (object->*func) (a1, a2) ; -@@ -468,7 +468,7 @@ - inline slot2 () : object(NULL), func(NULL) {} - inline slot2 (object_type *object, func_t func) : object(object), func(func) {} - inline void assign(object_type *o, func_t f) { object = o; func = f; } -- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); } -+ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); } - - inline void operator() (arg1_type a1, arg2_type a2) const { - (object->*func) (a1, a2); -@@ -643,7 +643,7 @@ - inline slot3 () : object(NULL), func(NULL) {} - inline slot3 (object_type *object, func_t func) : object(object), func(func) {} - inline void assign(object_type *o, func_t f) { object = o; func = f; } -- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); } -+ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); } - - inline void operator() (arg1_type a1, arg2_type a2, arg3_type a3) const { - (object->*func) (a1, a2, a3); -@@ -797,7 +797,7 @@ - inline slot4(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {} - - inline void assign(object_type *o, func_t f) { object = o; func = f; } -- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); } -+ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); } - - inline return_type operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4) const { - return (object->*func) (a1, a2, a3, a4) ; -@@ -818,7 +818,7 @@ - inline slot4 () : object(NULL), func(NULL) {} - inline slot4 (object_type *object, func_t func) : object(object), func(func) {} - inline void assign(object_type *o, func_t f) { object = o; func = f; } -- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); } -+ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); } - - inline void operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4) const { - (object->*func) (a1, a2, a3, a4); -@@ -972,7 +972,7 @@ - inline slot5(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {} - - inline void assign(object_type *o, func_t f) { object = o; func = f; } -- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); } -+ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); } - - inline return_type operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4, arg5_type a5) const { - return (object->*func) (a1, a2, a3, a4, a5) ; diff --git a/games-action/btanks/files/btanks-0.9.8083-gcc6.patch b/games-action/btanks/files/btanks-0.9.8083-gcc6.patch deleted file mode 100644 index 5f11379d8056..000000000000 --- a/games-action/btanks/files/btanks-0.9.8083-gcc6.patch +++ /dev/null @@ -1,34 +0,0 @@ -Bug: https://bugs.gentoo.org/609692 - ---- a/mrt/timespy.cpp -+++ b/mrt/timespy.cpp -@@ -43,7 +43,7 @@ - throw_io(("gettimeofday")); - } - --TimeSpy::~TimeSpy() { -+TimeSpy::~TimeSpy() DTOR_NOEXCEPT { - struct timeval now; - if (gettimeofday(&now, NULL) == -1) - throw_io(("gettimeofday")); ---- a/mrt/timespy.h -+++ b/mrt/timespy.h -@@ -37,11 +37,17 @@ - #include "fmt.h" - #include "export_mrt.h" - -+#if __cplusplus >= 201103L -+#define DTOR_NOEXCEPT noexcept(false) -+#else -+#define DTOR_NOEXCEPT -+#endif -+ - namespace mrt { - class MRTAPI TimeSpy { - public: - TimeSpy(const std::string &message); -- ~TimeSpy(); -+ ~TimeSpy() DTOR_NOEXCEPT; - private: - TimeSpy(const TimeSpy&); - const TimeSpy& operator=(const TimeSpy&); diff --git a/games-action/btanks/files/btanks-0.9.8083-scons-blows.patch b/games-action/btanks/files/btanks-0.9.8083-scons-blows.patch deleted file mode 100644 index 47ce410f0bf8..000000000000 --- a/games-action/btanks/files/btanks-0.9.8083-scons-blows.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- mrt/export_base.h.old 2010-01-09 17:38:47.000000000 +0100 -+++ mrt/export_base.h 2010-01-09 17:39:23.000000000 +0100 -@@ -1,7 +1,7 @@ - #ifndef MRT_EXPORT_MACRO_H__ - #define MRT_EXPORT_MACRO_H__ - --// Shared library support -+/* Shared library support */ - #ifdef _WINDOWS - - # pragma warning(disable:4251) /* needs to have dll-interface used by client */ ---- SConstruct.old 2010-01-09 17:43:36.000000000 +0100 -+++ SConstruct 2010-01-09 17:45:25.000000000 +0100 -@@ -50,7 +50,7 @@ - if os.environ.has_key('CC'): - env['CC'] = os.environ['CC'] - if os.environ.has_key('CFLAGS'): -- env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) -+ env['CFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) - if os.environ.has_key('CXX'): - env['CXX'] = os.environ['CXX'] - if os.environ.has_key('CXXFLAGS'): -@@ -91,19 +91,9 @@ - #env.Append(CPPDEFINES = ['NDEBUG']) - - else: -- if env['gcc_visibility']: -- env.Append(CCFLAGS=['-fvisibility=hidden']); -- env.Append(CXXFLAGS=['-fvisibility-inlines-hidden', '-fvisibility=hidden']); -- -- if debug: -- env.Append(CCFLAGS=['-ggdb', '-D_FORTIFY_SOURCE=2']) -- env.Append(CPPFLAGS=['-ggdb', '-D_FORTIFY_SOURCE=2']) -- else: -- env.Append(CCFLAGS=['-O3']) -- env.Append(CPPFLAGS=['-O3']) - -- env.Append(CPPFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pipe', '-pthread']) -- env.Append(CCFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pipe', '-pthread']) -+ env.Append(CPPFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pthread']) -+ env.Append(CCFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pthread']) - - - conf_env = env.Clone() ---- sdlx/SConscript.old 2010-01-09 17:46:05.000000000 +0100 -+++ sdlx/SConscript 2010-01-09 17:46:55.000000000 +0100 -@@ -12,7 +12,7 @@ - - env.MergeFlags(sdl_cflags, sdl_libs) - --libs = ['mrt', 'SDL', 'SDL_image'] -+libs = ['mrt', 'SDL', 'SDL_image', 'SDL_gfx'] - - if sys.platform != "win32": - c_map_env= env.Clone() -@@ -35,7 +35,6 @@ - sdlx_sources = ['cursor.cpp', 'sdl_ex.cpp', 'surface.cpp', 'system.cpp', 'joystick.cpp', - 'thread.cpp', 'mutex.cpp', 'semaphore.cpp', 'color.cpp', - c_map, 'font.cpp', 'timer.cpp', 'module.cpp', 'file_rw.cpp', -- 'gfx/SDL_rotozoom.c', - ] # 'ttf.cpp', - - if sys.platform == 'win32': ---- sdlx/surface.cpp.old 2010-01-09 17:47:33.000000000 +0100 -+++ sdlx/surface.cpp 2010-01-09 17:48:19.000000000 +0100 -@@ -425,7 +425,7 @@ - throw_sdl(("SDL_SetColorKey")); - } - --#include "gfx/SDL_rotozoom.h" -+#include - - void Surface::rotozoom(const sdlx::Surface &src, double angle, double zoom, bool smooth) { - if (src.isNull()) ---- sdlx/wrappers/glSDL.c.old 2010-01-09 17:48:50.000000000 +0100 -+++ sdlx/wrappers/glSDL.c 2010-01-09 17:49:23.000000000 +0100 -@@ -11,8 +11,6 @@ - - #ifdef HAVE_OPENGL - --//#define LEAK_TRACKING -- - #define DBG(x) /*error messages, warnings*/ - #define DBG2(x) /*texture allocation*/ - #define DBG3(x) /*chopping/tiling*/ -@@ -951,7 +949,6 @@ - } - gl_doublebuf = flags & SDL_DOUBLEBUF; - SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, gl_doublebuf); -- //SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, gl_doublebuf ? 1: 0); - - scale = 1; - diff --git a/games-action/btanks/metadata.xml b/games-action/btanks/metadata.xml deleted file mode 100644 index 3574b919826a..000000000000 --- a/games-action/btanks/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - games@gentoo.org - Gentoo Games Project - - -"Battle Tanks" is a funny battle on your desk, where you can choose one of three -vehicles and eliminate your enemy using the whole arsenal of weapons. It has -original cartoon-like graphics and cool music, it's fun and dynamic, it has -several network modes for deathmatch and cooperative --- what else is needed to -have fun with your friends? And all is packed and ready for you in "Battle -Tanks". - - - btanks - - diff --git a/games-action/luola/Manifest b/games-action/luola/Manifest index 771c90d8e6e2..29f76e701c1e 100644 --- a/games-action/luola/Manifest +++ b/games-action/luola/Manifest @@ -1,6 +1,7 @@ +AUX luola-1.3.2-fno-common.patch 873 BLAKE2B b0fef29165ed35c692d1ff898796b294d38c335c494771ab288df2de093276a7feca2196f82eb36525638da5ad69316b7c82737ac61a18362072f9cd9d2f3e3f SHA512 5a0b97eb340c0cc8446e2da57841987950a94d5a7cc48df87a0ff30e4e23e435d3ff975a3405ab96b08cc66bca327a64b08a8d3f6f2eecc5f36fe3eb4fc34ccd AUX luola-1.3.2-underlink.patch 249 BLAKE2B b6cc9e7d9b3acc7b2772c8596357a38bfd318de008e60da3186aff7a4b52a6618dfdda5e0e90a8e9bf751cf6111153e5277d16792728529f195a9cb4c82d6018 SHA512 99a842abc48193ec92ac9005653b70ba0ea07abffe99c598413400cad68ce72b0d10d38e0ee827e49f0c91cd8c85b7f6e0313e369403118d527e8a92b7adf46d DIST luola-1.3.2.tar.gz 1774711 BLAKE2B 017327e47066a4ba5d4e1a8f1a7f923f74dc0b3770b43237ba8bfc9f91835d1c8ef18728be5cb85b42a66cc99185942ddd059206fa155d5fa95a897b0176aa5b SHA512 4e8b2f5e813dbb4d951632ded20f013aae6837d525d0068b430ae41319503f206ec27f2873cff241af8ba4cd1728ec89dcf8279a94dbb3094330de1ca531712f DIST nostalgia-1.2.tar.gz 1475672 BLAKE2B fda721e35b9afcb50d96309c0fe693d81cee43ae2410299ad026c8a36727870331008e866a0725f88977292fec85d01f4da9618c6070c8ea7265a2a316a9acb2 SHA512 06a03b3398204c04f88fccbbf6a59f11da043c73dc203fe258e09e036364ee73cae337b9828bd27b52ebee6ff456c317143444c3b6c395addcdedf720988731f DIST stdlevels-6.0.tar.gz 1850148 BLAKE2B cd621d2e42cf10950fd7c81b6753bd6f8f8df178a8009de9219a40141de4bd73ee7e410e107b7ba99e3e1e7af978291604995cf1f2e52975a3de5ecaeb776837 SHA512 d1823ca8340dea8766310962507bc5aad06c0f737c16c3ce32afaafc0e83a8b7b4d301d5cf65a0466fdaee9ec2a7ce718d03be61b383ac6fe030101466eff11a -EBUILD luola-1.3.2-r1.ebuild 1181 BLAKE2B b71f327e9ad80ae0522f12d0d2b9686d160f9b965dcba2990167d30f8f4b688129f33799ee0b07665bdcd2e11cf7630f97b1939eb82f7aad0e144bee602ecfe0 SHA512 816539b2276bcc5e5b01f78c978ef57e51b7462aa00c417cb6dc8f95a7be3ec0e52cd142832022b66759bb87fb427174c81fd6a3770e6d6fbdcaa1137b74b66f +EBUILD luola-1.3.2-r1.ebuild 1018 BLAKE2B 0b7620037832a8a6e1539ea622f527588a1025bf1c81e1a79971ec510a118dffb4af817a7fb5cd601b7f2b1c331810a3bc89ade4305ff8b3a02a6742d5123bde SHA512 848cd1d3fba247fd280f8b9c26b02153c5bae3cb3c88050c4b4f87fb25ba0bbf48ab37bc70d10e9857d2e24ce4ea8e29400a58bdb008f0f5cfb5085178e46d4f MISC metadata.xml 325 BLAKE2B 2c5d6a18895f3af0049678aa6eb707808345a81f2d96ce5faa254dba43fe54ab2dac6e1997b44ea3a4dff2bb4d65233864158f5b211b6ef85e234f51b59d9159 SHA512 5e693021a9b1e4a0cff7c4b953648d3e8d9c0acb40d910288f8ed16a558117455e52841ebb32b78909f850b9f5a3b00165aafb343ab15a3e86e7d45a4e00f8c1 diff --git a/games-action/luola/files/luola-1.3.2-fno-common.patch b/games-action/luola/files/luola-1.3.2-fno-common.patch new file mode 100644 index 000000000000..e0b191df831f --- /dev/null +++ b/games-action/luola/files/luola-1.3.2-fno-common.patch @@ -0,0 +1,33 @@ +--- a/src/pilot.c ++++ b/src/pilot.c +@@ -43,6 +43,8 @@ + #define PILOT_STD_RADIUS 4.1 /* Normal radius for pilot */ + #define PILOT_PAR_RADIUS 8.0 /* Parachuting radius for pilot */ + ++struct Pilot Pilot; ++ + /* List of active pilots */ + struct dllist *pilot_list; + +--- a/src/pilot.h ++++ b/src/pilot.h +@@ -45,7 +45,8 @@ + int toofast; /* How long has the pilot been falling too fast */ + struct Spring *rope; /* The ninjarope */ + int ropectrl; /* -1 retracts rope, 1 extends it */ +-} Pilot; ++}; ++extern struct Pilot Pilot; + + /* Rope length limits. Actual rope length is nodelen*nodecount */ + static const double pilot_rope_minlen = 0.1; +--- a/tools/im_vwing.c ++++ b/tools/im_vwing.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include + + #include "im_vwing.h" diff --git a/games-action/luola/luola-1.3.2-r1.ebuild b/games-action/luola/luola-1.3.2-r1.ebuild index ff2ec53aa188..0a2f70c623da 100644 --- a/games-action/luola/luola-1.3.2-r1.ebuild +++ b/games-action/luola/luola-1.3.2-r1.ebuild @@ -1,22 +1,23 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit autotools desktop gnome2-utils +inherit autotools desktop xdg DESCRIPTION="A 2D multiplayer arcade game resembling V-Wing" HOMEPAGE="http://freshmeat.sourceforge.net/projects/luola" -SRC_URI="mirror://gentoo/${P}.tar.gz +SRC_URI=" + mirror://gentoo/${P}.tar.gz mirror://gentoo/stdlevels-6.0.tar.gz mirror://gentoo/nostalgia-1.2.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="media-libs/libsdl[X,sound,joystick,video] +RDEPEND=" + media-libs/libsdl[X,sound,joystick,video] media-libs/sdl-gfx media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer @@ -25,6 +26,7 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${P}-underlink.patch + "${FILESDIR}"/${P}-fno-common.patch ) src_prepare() { @@ -37,24 +39,14 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install + default + insinto /usr/share/${PN}/levels doins "${WORKDIR}"/*.{lev,png} - dodoc AUTHORS ChangeLog DATAFILE FAQ LEVELFILE README TODO \ - RELEASENOTES.txt ../README.Nostalgia + + dodoc DATAFILE LEVELFILE RELEASENOTES.txt ../README.Nostalgia newdoc ../README README.stdlevels + doicon -s 64 luola.png make_desktop_entry luola Luola } - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest index d65dbf417fbb..9b8cd65822e1 100644 --- a/games-action/minetest/Manifest +++ b/games-action/minetest/Manifest @@ -2,5 +2,6 @@ AUX minetestserver.confd 313 BLAKE2B 51af7c8d6c23461028774e459d3ff24a867102ac56c AUX minetestserver.initd 555 BLAKE2B 307f310338ded815dc8a6f8ba29d51ae77ef94a1530125ad82ab3b7dc6d9a1b8a40a48b6dfb53d17230418bc8e5e05ffe5493c897150a853338fb01c8ef21b5b SHA512 b9103841e18586e9877b1a1b7fc9510545d02b947d5558cfee79de09a8c770767aeeb1b29b35bd47bf3670d739996a782f347f2274a94f3b3a9435d37ba566f1 AUX minetestserver.logrotate 85 BLAKE2B 72ca62554a0146305cbafd9050378252bc4214c23a71d1f43041bd78ad332f25e834de3ae382f383ef8aef40fccb4849343fe23223ad2032efd16a12c10022f8 SHA512 19fe1e9264f195ea178cade577cea5cd93f7de1ceaab14ee00cafc051e1ec8f2e2ceac89557a00a3dd7838002e30da622f90a313776de2ad35aab10c68b6ec14 DIST minetest-5.3.0.tar.gz 10828893 BLAKE2B 0847c040d2874962be79af6fce89b19354f6763cb37dd61d7e5e91bcacb9a76a115e295976056ae761db257612277ceef0d7e8bfc55790b1bc59a9c4961af41b SHA512 7bb34a80107861539a9ac2417812625ef11d145bf9401afdb8e0a1b9f619adcce24e2becf5bf361b805f4610097cf9d44c76d497ab08d489a43655852ce44777 +EBUILD minetest-5.3.0-r100.ebuild 3467 BLAKE2B dacd79ca8822a134ced28dabff64603310181794a0e2a1169caac46b3f02edb3e6bc8ba533ae2d98e86aa0c8f6a6a586401d62d34b034c27865cb5dd85fb9cd1 SHA512 c3b6773467185fe478869ea14160cd65cf9079e053ad706958f06e5702751e9d2597f0469c1af832e881ada37cc0c10e578dd736e1e42eeacab5c27ce3e493b5 EBUILD minetest-5.3.0.ebuild 3416 BLAKE2B 2eb08d10b89b9c10c559b7ed8995c1c1775c920b49707151bd2a38d0b75c9ac68485c4e919789a7462408332751b113c05f0b34af4d18f372e58b43e4bf9eb72 SHA512 0da88b6f8f648b6e36dc6a33d1813c771dcf09f17b0eb4e413feab879206cb887abf8a50c9681cbb084a2ff68709d8e9b5d155597a771f649d0a6b9aba1db1f8 MISC metadata.xml 2304 BLAKE2B 174aa3ecba34e78284cc6b58a622f2aaa3312950b9c52428ea999fea12df4817348b8f0ac85259566d3c131d735be305f86e3bdb27993fb92bdc98bd4d6a6495 SHA512 b84fa111e428ab16114081b56469259f1bc3b4dae74ce530d9fc0512db7bfa500c6920e4913accabade89dcf25fb4463b116a79be969cc91e5d45e3e67aaa4d0 diff --git a/games-action/minetest/minetest-5.3.0-r100.ebuild b/games-action/minetest/minetest-5.3.0-r100.ebuild new file mode 100644 index 000000000000..de4641d9e6a5 --- /dev/null +++ b/games-action/minetest/minetest-5.3.0-r100.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( luajit ) + +inherit cmake lua-single xdg + +DESCRIPTION="A free open-source voxel game engine with easy modding and game creation" +HOMEPAGE="https://www.minetest.net" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+client +curl doc +leveldb ncurses nls postgres prometheus redis +server +sound spatial test +truetype" +REQUIRED_USE=" + ${LUA_REQUIRED_USE} + || ( client server )" +RESTRICT="!test? ( test )" + +RDEPEND=" + ${LUA_DEPS} + dev-db/sqlite:3 + dev-libs/gmp:0= + dev-libs/jsoncpp:= + sys-libs/zlib + client? ( + app-arch/bzip2 + dev-games/irrlicht + media-libs/libpng:0= + virtual/jpeg:0 + virtual/opengl + x11-libs/libX11 + x11-libs/libXxf86vm + sound? ( + media-libs/libogg + media-libs/libvorbis + media-libs/openal + ) + truetype? ( media-libs/freetype:2 ) + ) + curl? ( net-misc/curl ) + leveldb? ( dev-libs/leveldb:= ) + ncurses? ( sys-libs/ncurses:0= ) + nls? ( virtual/libintl ) + postgres? ( >=dev-db/postgresql-9.5:= ) + prometheus? ( dev-cpp/prometheus-cpp ) + redis? ( dev-libs/hiredis:= ) + server? ( + acct-group/minetest + acct-user/minetest + dev-games/irrlicht-headers + ) + spatial? ( sci-libs/libspatialindex:= )" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + app-doc/doxygen + media-gfx/graphviz + ) + nls? ( sys-devel/gettext )" + +src_prepare() { + cmake_src_prepare + # set paths + sed \ + -e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \ + -e "s#@GROUP@#${PN}#g" \ + "${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die + + # remove bundled libraries + rm -rf lib || die +} + +src_configure() { + local mycmakeargs=( + -DBUILD_CLIENT=$(usex client) + -DBUILD_SERVER=$(usex server) + -DBUILD_UNITTESTS=$(usex test) + -DCUSTOM_BINDIR="${EPREFIX}/usr/bin" + -DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" + -DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}" + -DCUSTOM_LOCALEDIR="${EPREFIX}/usr/share/${PN}/locale" + -DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}" + -DENABLE_CURL=$(usex curl) + -DENABLE_CURSES=$(usex ncurses) + -DENABLE_FREETYPE=$(usex truetype) + -DENABLE_GETTEXT=$(usex nls) + -DENABLE_GLES=0 + -DENABLE_LEVELDB=$(usex leveldb) + -DENABLE_LUAJIT=1 + -DENABLE_POSTGRESQL=$(usex postgres) + -DENABLE_PROMETHEUS=$(usex prometheus) + -DENABLE_REDIS=$(usex redis) + -DENABLE_SPATIAL=$(usex spatial) + -DENABLE_SOUND=$(usex sound) + -DENABLE_SYSTEM_GMP=1 + -DENABLE_SYSTEM_JSONCPP=1 + -DRUN_IN_PLACE=0 + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use doc ; then + cmake_src_compile doc + HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) + fi +} + +src_install() { + cmake_src_install + + if use server ; then + keepdir /var/log/minetest + fowners minetest:minetest /var/log/minetest + + newconfd "${T}"/minetestserver.confd minetest-server + newinitd "${FILESDIR}"/minetestserver.initd minetest-server + + insinto /etc/logrotate.d + newins "${FILESDIR}"/minetestserver.logrotate minetest-server + fi +} + +pkg_postinst() { + xdg_pkg_postinst + + if use server ; then + elog + elog "Configure your server via /etc/conf.d/minetest-server" + elog + fi + + elog + elog "The version 5.x series is not compatible to the version 0.4 series." + elog "This applies to clients and servers, other content such as mods," + elog "texture packs and worlds is unaffected and backwards-compatible" + elog "as usual." + elog +} diff --git a/games-action/trine-enchanted-edition/Manifest b/games-action/trine-enchanted-edition/Manifest index f983b6714cb6..6ae9f2be83b1 100644 --- a/games-action/trine-enchanted-edition/Manifest +++ b/games-action/trine-enchanted-edition/Manifest @@ -1,3 +1,3 @@ DIST trine_enchanted_edition_v2_12_build_508_humble_linux_full.zip 1226749814 BLAKE2B 9803f78279bcf83a2a54f25e2498664b73ba1c0ae5c540bb4479345ae05495cc11527937876fb7c9dbb34d05dbbdb4575cc6c1899923c782ff67ea23bd2cfac9 SHA512 e883763efe89f09a84c2896bfd0a9a13319dd14bb840e67f1812a0bab45bcab7a144f4c9399194e5aabad0435e350c6a903a542c9101a37c602855ebd0884d9d -EBUILD trine-enchanted-edition-2.12.508-r2.ebuild 2477 BLAKE2B 513ad24999ddc8c4657bbecc8354e2bf787360a692c59c4d05a8af49812d539fcddb7b0a6cb8a937802270e052d532aae91ee02ab24654af636afe9bd96df50b SHA512 1f9f0e00ad25b1ef13c355951eb55e563606cd80c99302aaf98f8e1431774c3bb7968a6c87e49f464707170400243b5514d483d60085ec736a684e727b5775fb +EBUILD trine-enchanted-edition-2.12.508-r3.ebuild 2378 BLAKE2B e73169a8d2a794ba6c3864f57b669476107ec0648daa718a291ece426ca3289893b730789c9259012a6c201108618ba150acd40abc17e3776a021170346444ce SHA512 033e87ca5be50ba4e354d7157979c7d574a1fd614504e075e0ce1c660b6f59186a412d92a24dd06e906484739c63d76388fda7b049064cde377b30c1052eef4b MISC metadata.xml 321 BLAKE2B 5aca052a154cd0d9a43b96774253a2999ad36aa01c956961ad0021fa7cc6cbc8b89b7f93c6318308f6310a877ac9cb2b70bf622f25b882cf0c13261a7fae9b9c SHA512 ab5d27c4f1f5760f902abe8829db8732a19206739001dd349ac170bc64e5edb9b10ec4d16ec3d8f52569a05bc90ac08af6724f11206fce2b3506d99555712747 diff --git a/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r2.ebuild b/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r2.ebuild deleted file mode 100644 index 661020e5bccc..000000000000 --- a/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r2.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop eutils gnome2-utils - -MY_P="${PV//./_}" -MY_P="${PN//-/_}_v${MY_P%_*}_build_${MY_P##*_}" -MY_PN="Trine Enchanted Edition" - -DESCRIPTION="The original sidescrolling action platformer under the Trine 2 engine" -HOMEPAGE="https://www.frozenbyte.com/games/trine-enchanted-edition" -SRC_URI="${MY_P}_humble_linux_full.zip" -LICENSE="all-rights-reserved" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="+launcher" -RESTRICT="bindist fetch splitdebug" - -QA_PREBUILT="opt/${PN}/${PN}*" - -DEPEND="app-arch/unzip" - -# SDL 1.3 is bundled but the game appears to be statically linked -# against SDL 2.0.3. We can bypass this and use our own SDL 2 by setting -# the SDL_DYNAMIC_API environment variable. - -RDEPEND=" - media-gfx/nvidia-cg-toolkit[abi_x86_32] - media-libs/alsa-lib[abi_x86_32] - media-libs/freetype:2[abi_x86_32] - media-libs/libogg[abi_x86_32] - >=media-libs/libsdl2-2.0.3[abi_x86_32,joystick,opengl,sound,threads,video] - >=media-libs/libvorbis-1.3[abi_x86_32] - >=media-libs/openal-1.15[abi_x86_32] - >=sys-devel/gcc-4.6[cxx] - >=sys-libs/glibc-2.15 - sys-libs/zlib[abi_x86_32] - virtual/glu[abi_x86_32] - virtual/opengl[abi_x86_32] - launcher? ( - dev-libs/glib:2[abi_x86_32] - media-libs/libpng-compat:1.2[abi_x86_32] - x11-libs/gdk-pixbuf:2[abi_x86_32,X] - x11-libs/gtk+:2[abi_x86_32] - x11-libs/libX11[abi_x86_32] - x11-libs/pango[abi_x86_32,X] - )" - -S="${WORKDIR}/linux/_enchanted_edition_" - -pkg_nofetch() { - einfo "Please buy and download ${SRC_URI} from:" - einfo " https://www.humblebundle.com/store/${PN}" - einfo "and move it to your distfiles directory." -} - -src_install() { - local dir=/opt/${PN} SDL=${EPREFIX}/usr/$(ABI=x86 get_libdir)/libSDL2-2.0.so.0 - - insinto "${dir}" - doins -r *.fbq data - - exeinto "${dir}" - newexe bin/trine1_linux_32bit ${PN} - - make_wrapper ${PN} "env SDL_DYNAMIC_API=\"${SDL}\" ./${PN}" "${dir}" - make_desktop_entry ${PN} "${MY_PN}" - - if use launcher ; then - exeinto "${dir}" - newexe bin/trine1_linux_launcher_32bit ${PN}-launcher - - make_wrapper ${PN}-launcher "env SDL_DYNAMIC_API=\"${SDL}\" ./${PN}-launcher" "${dir}" - make_desktop_entry ${PN}-launcher "${MY_PN} (launcher)" - - # Launcher binary has hardcoded the game path. - dosym ../${PN} "${dir}"/bin/trine1_bin_starter.sh - fi - - newicon -s 64 trine1.png ${PN}.png - dodoc readme_changelog.txt -} - -pkg_postinst() { gnome2_icon_cache_update; } -pkg_postrm() { gnome2_icon_cache_update; } diff --git a/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r3.ebuild b/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r3.ebuild new file mode 100644 index 000000000000..f33d1cb8946f --- /dev/null +++ b/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r3.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop wrapper xdg + +MY_P="${PV//./_}" +MY_P="${PN//-/_}_v${MY_P%_*}_build_${MY_P##*_}" +MY_PN="Trine Enchanted Edition" + +DESCRIPTION="The original sidescrolling action platformer under the Trine 2 engine" +HOMEPAGE="https://www.frozenbyte.com/games/trine-enchanted-edition" +SRC_URI="${MY_P}_humble_linux_full.zip" +LICENSE="all-rights-reserved" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="+launcher" +RESTRICT="bindist fetch splitdebug" + +QA_PREBUILT="opt/${PN}/${PN}*" + +DEPEND="app-arch/unzip" + +# SDL 1.3 is bundled but the game appears to be statically linked +# against SDL 2.0.3. We can bypass this and use our own SDL 2 by setting +# the SDL_DYNAMIC_API environment variable. + +RDEPEND=" + media-gfx/nvidia-cg-toolkit[abi_x86_32] + media-libs/alsa-lib[abi_x86_32] + media-libs/freetype:2[abi_x86_32] + media-libs/libogg[abi_x86_32] + >=media-libs/libsdl2-2.0.3[abi_x86_32,joystick,opengl,sound,threads,video] + >=media-libs/libvorbis-1.3[abi_x86_32] + >=media-libs/openal-1.15[abi_x86_32] + >=sys-devel/gcc-4.6[cxx] + >=sys-libs/glibc-2.15 + sys-libs/zlib[abi_x86_32] + virtual/glu[abi_x86_32] + virtual/opengl[abi_x86_32] + launcher? ( + dev-libs/glib:2[abi_x86_32] + media-libs/libpng-compat:1.2[abi_x86_32] + x11-libs/gdk-pixbuf:2[abi_x86_32] + x11-libs/gtk+:2[abi_x86_32] + x11-libs/libX11[abi_x86_32] + x11-libs/pango[abi_x86_32,X] + )" + +S="${WORKDIR}/linux/_enchanted_edition_" + +pkg_nofetch() { + einfo "Please buy and download ${SRC_URI} from:" + einfo " https://www.humblebundle.com/store/${PN}" + einfo "and move it to your distfiles directory." +} + +src_install() { + local dir=/opt/${PN} SDL=${EPREFIX}/usr/$(ABI=x86 get_libdir)/libSDL2-2.0.so.0 + + insinto "${dir}" + doins -r *.fbq data + + exeinto "${dir}" + newexe bin/trine1_linux_32bit ${PN} + + make_wrapper ${PN} "env SDL_DYNAMIC_API=\"${SDL}\" ./${PN}" "${dir}" + make_desktop_entry ${PN} "${MY_PN}" + + if use launcher ; then + exeinto "${dir}" + newexe bin/trine1_linux_launcher_32bit ${PN}-launcher + + make_wrapper ${PN}-launcher "env SDL_DYNAMIC_API=\"${SDL}\" ./${PN}-launcher" "${dir}" + make_desktop_entry ${PN}-launcher "${MY_PN} (launcher)" + + # Launcher binary has hardcoded the game path. + dosym ../${PN} "${dir}"/bin/trine1_bin_starter.sh + fi + + newicon -s 64 trine1.png ${PN}.png + dodoc readme_changelog.txt +} diff --git a/games-action/trine2/Manifest b/games-action/trine2/Manifest index e4776fc0d941..3b675d1cff0c 100644 --- a/games-action/trine2/Manifest +++ b/games-action/trine2/Manifest @@ -1,3 +1,3 @@ DIST trine2_complete_story_v2_01_build_425_humble_linux_full.zip 3243286878 BLAKE2B a9032d6043ac9623a254c1ebe69c30e5f173de91e3cc0552c4ff60275c11601c7708c37d2d7b9eb789290e24569967fc82b56f143110306642b28d5e21cb62ee SHA512 e59aaa6da7d4cae96d361f7f80d857e4102b23fe9584b88af9163407d4f1a34b9e0e79a9337c133e9d60e31ac8ead3a7f9b02b47f9797df05f998666c9219c15 -EBUILD trine2-2.01.425-r1.ebuild 2624 BLAKE2B 7ec564fa5c6c154ef2a79f9b9067ef44eef1a617b9604e34f45f196b9f247108ce37d362197c438cf83fed235106e2f0f9fd27868e1914344544666a8b5da18b SHA512 43027d2919ce4f2e5c81022483f7af532a9d4f67084664b61588800c224eb6f9698f6f36ea7135af8c4af3223ffe4f56bdf45370ab82591bb130186f8c55605c +EBUILD trine2-2.01.425-r2.ebuild 2485 BLAKE2B 06eb3e4e1bbcb8001e43aa110c7b7a93778b5a13a05df67a54ac3139ef7546000c1a6f72492a8e381b77260da45b73c7caf2f4bc9d8373018d53a5afe83a9eac SHA512 ef76f2d148a10f5ec907eba908f3b21ea8d5eb0a3062bdb06e2e83fb6091f0a17bbe1a6126b8a982a966b84fdb2bfef494950ddcf442294d77c2ee7cffe3233c MISC metadata.xml 321 BLAKE2B 5aca052a154cd0d9a43b96774253a2999ad36aa01c956961ad0021fa7cc6cbc8b89b7f93c6318308f6310a877ac9cb2b70bf622f25b882cf0c13261a7fae9b9c SHA512 ab5d27c4f1f5760f902abe8829db8732a19206739001dd349ac170bc64e5edb9b10ec4d16ec3d8f52569a05bc90ac08af6724f11206fce2b3506d99555712747 diff --git a/games-action/trine2/trine2-2.01.425-r1.ebuild b/games-action/trine2/trine2-2.01.425-r1.ebuild deleted file mode 100644 index fe7c14c21279..000000000000 --- a/games-action/trine2/trine2-2.01.425-r1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop eutils gnome2-utils - -MY_P="${PV//./_}" -MY_P="${PN}_complete_story_v${MY_P%_*}_build_${MY_P##*_}" -MY_PN="Trine 2" - -DESCRIPTION="Sidescrolling game of action, puzzles and platforming, Complete Story edition" -HOMEPAGE="http://www.trine2.com/" -SRC_URI="${MY_P}_humble_linux_full.zip" -LICENSE="all-rights-reserved" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="+launcher" -RESTRICT="bindist fetch splitdebug" - -QA_PREBUILT="opt/${PN}/${PN}* - opt/${PN}/lib/*" - -DEPEND="app-arch/unzip" - -RDEPEND=" - media-gfx/nvidia-cg-toolkit[abi_x86_32] - media-libs/alsa-lib[abi_x86_32] - media-libs/freetype:2[abi_x86_32] - media-libs/libogg[abi_x86_32] - >=media-libs/libvorbis-1.3[abi_x86_32] - >=media-libs/openal-1.15[abi_x86_32] - >=sys-devel/gcc-4.6[cxx] - >=sys-libs/glibc-2.15 - sys-libs/zlib[abi_x86_32] - virtual/glu[abi_x86_32] - virtual/opengl[abi_x86_32] - launcher? ( - dev-libs/expat[abi_x86_32] - dev-libs/glib:2[abi_x86_32] - media-libs/libpng-compat:1.2[abi_x86_32] - sys-apps/dbus[abi_x86_32] - sys-apps/util-linux[abi_x86_32] - x11-libs/gdk-pixbuf:2[abi_x86_32,X] - x11-libs/gtk+:2[abi_x86_32] - x11-libs/libX11[abi_x86_32] - x11-libs/pango[abi_x86_32,X] - )" - -S="${WORKDIR}" - -pkg_nofetch() { - einfo "Please buy and download ${SRC_URI} from:" - einfo " https://www.humblebundle.com/store/trine-2-complete-story" - einfo "and move it to your distfiles directory." -} - -src_prepare() { - default - - # SDL 1.3 is very special and crashes when fullscreen if - # /usr/bin/gnome-screensaver-command is missing. XD - sed -i 's:/usr/bin/gnome-screensaver-command:/bin/true\x0 :g' \ - lib/lib32/libSDL-1.3.so.0 || die -} - -src_install() { - local dir=/opt/${PN} - - insinto "${dir}" - doins -r *.fbq data - - exeinto "${dir}" - newexe bin/${PN}_linux_32bit ${PN} - - exeinto "${dir}"/lib - doexe lib/lib32/lib{{SDL-1.3,PhysXLoader}.so.*,PhysX{Cooking,Core}.so} # Avoid duplicates. - - make_wrapper ${PN} ./${PN} "${dir}" "${dir}"/lib - make_desktop_entry ${PN} "${MY_PN}" - - if use launcher ; then - exeinto "${dir}" - newexe bin/${PN}_linux_launcher_32bit ${PN}-launcher - - make_wrapper ${PN}-launcher ./${PN}-launcher "${dir}" "${dir}"/lib - make_desktop_entry ${PN}-launcher "${MY_PN} (launcher)" - - # Launcher binary has hardcoded the game path. - dosym ../${PN} "${dir}"/bin/${PN}_bin_starter.sh - fi - - doicon -s 64 ${PN}.png - dodoc readme_changelog.txt readme/{KNOWN_LINUX_ISSUES,README} -} - -pkg_preinst() { gnome2_icon_savelist; } -pkg_postinst() { gnome2_icon_cache_update; } -pkg_postrm() { gnome2_icon_cache_update; } diff --git a/games-action/trine2/trine2-2.01.425-r2.ebuild b/games-action/trine2/trine2-2.01.425-r2.ebuild new file mode 100644 index 000000000000..c293a1c40c5e --- /dev/null +++ b/games-action/trine2/trine2-2.01.425-r2.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop wrapper xdg + +MY_P="${PV//./_}" +MY_P="${PN}_complete_story_v${MY_P%_*}_build_${MY_P##*_}" +MY_PN="Trine 2" + +DESCRIPTION="Sidescrolling game of action, puzzles and platforming, Complete Story edition" +HOMEPAGE="http://www.trine2.com/" +SRC_URI="${MY_P}_humble_linux_full.zip" +LICENSE="all-rights-reserved" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="+launcher" +RESTRICT="bindist fetch splitdebug" + +QA_PREBUILT="opt/${PN}/${PN}* + opt/${PN}/lib/*" + +DEPEND="app-arch/unzip" + +RDEPEND=" + media-gfx/nvidia-cg-toolkit[abi_x86_32] + media-libs/alsa-lib[abi_x86_32] + media-libs/freetype:2[abi_x86_32] + media-libs/libogg[abi_x86_32] + >=media-libs/libvorbis-1.3[abi_x86_32] + >=media-libs/openal-1.15[abi_x86_32] + >=sys-devel/gcc-4.6[cxx] + >=sys-libs/glibc-2.15 + sys-libs/zlib[abi_x86_32] + virtual/glu[abi_x86_32] + virtual/opengl[abi_x86_32] + launcher? ( + dev-libs/expat[abi_x86_32] + dev-libs/glib:2[abi_x86_32] + media-libs/libpng-compat:1.2[abi_x86_32] + sys-apps/dbus[abi_x86_32] + sys-apps/util-linux[abi_x86_32] + x11-libs/gdk-pixbuf:2[abi_x86_32] + x11-libs/gtk+:2[abi_x86_32] + x11-libs/libX11[abi_x86_32] + x11-libs/pango[abi_x86_32,X] + )" + +S="${WORKDIR}" + +pkg_nofetch() { + einfo "Please buy and download ${SRC_URI} from:" + einfo " https://www.humblebundle.com/store/trine-2-complete-story" + einfo "and move it to your distfiles directory." +} + +src_prepare() { + default + + # SDL 1.3 is very special and crashes when fullscreen if + # /usr/bin/gnome-screensaver-command is missing. XD + sed -i 's:/usr/bin/gnome-screensaver-command:/bin/true\x0 :g' \ + lib/lib32/libSDL-1.3.so.0 || die +} + +src_install() { + local dir=/opt/${PN} + + insinto "${dir}" + doins -r *.fbq data + + exeinto "${dir}" + newexe bin/${PN}_linux_32bit ${PN} + + exeinto "${dir}"/lib + doexe lib/lib32/lib{{SDL-1.3,PhysXLoader}.so.*,PhysX{Cooking,Core}.so} # Avoid duplicates. + + make_wrapper ${PN} ./${PN} "${dir}" "${dir}"/lib + make_desktop_entry ${PN} "${MY_PN}" + + if use launcher ; then + exeinto "${dir}" + newexe bin/${PN}_linux_launcher_32bit ${PN}-launcher + + make_wrapper ${PN}-launcher ./${PN}-launcher "${dir}" "${dir}"/lib + make_desktop_entry ${PN}-launcher "${MY_PN} (launcher)" + + # Launcher binary has hardcoded the game path. + dosym ../${PN} "${dir}"/bin/${PN}_bin_starter.sh + fi + + doicon -s 64 ${PN}.png + dodoc readme_changelog.txt readme/{KNOWN_LINUX_ISSUES,README} +} -- cgit v1.2.3