diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2014-07-04 06:51:05 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2014-07-04 06:51:05 +0000 |
| commit | 876621202049a8d0536faf9bc6cbe150081fafa5 (patch) | |
| tree | 9f7c20b513938c331eb8d792ab733b816f7c0c87 /games-roguelike | |
| parent | Cleanup. (diff) | |
| download | historical-876621202049a8d0536faf9bc6cbe150081fafa5.tar.gz historical-876621202049a8d0536faf9bc6cbe150081fafa5.tar.bz2 historical-876621202049a8d0536faf9bc6cbe150081fafa5.zip | |
fix underlinking (bug #516264); EAPI=5
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Diffstat (limited to 'games-roguelike')
| -rw-r--r-- | games-roguelike/tome/ChangeLog | 7 | ||||
| -rw-r--r-- | games-roguelike/tome/Manifest | 12 | ||||
| -rw-r--r-- | games-roguelike/tome/tome-2.3.5.ebuild | 35 |
3 files changed, 26 insertions, 28 deletions
diff --git a/games-roguelike/tome/ChangeLog b/games-roguelike/tome/ChangeLog index da61e205eb11..5ac0e08f9a40 100644 --- a/games-roguelike/tome/ChangeLog +++ b/games-roguelike/tome/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-roguelike/tome -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/ChangeLog,v 1.35 2012/05/28 12:23:39 tupone Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/ChangeLog,v 1.36 2014/07/04 06:51:01 mr_bones_ Exp $ + + 04 Jul 2014; Michael Sterrett <mr_bones_@gentoo.org> tome-2.3.5.ebuild: + fix underlinking (bug #516264); EAPI=5 28 May 2012; Tupone Alfredo <tupone@gentoo.org> tome-2.3.5.ebuild, +files/tome-2.3.5-noX.patch, -files/tome-2.3.5-overflow.patch: diff --git a/games-roguelike/tome/Manifest b/games-roguelike/tome/Manifest index 26f0fb1443ab..15a0b29b3ece 100644 --- a/games-roguelike/tome/Manifest +++ b/games-roguelike/tome/Manifest @@ -1,6 +1,6 @@ -AUX 2.3.5-gentoo-paths.patch 1172 RMD160 284efaf1eb85ee17f9d08719179f835cf4777100 SHA1 c6c2203e504cd0b09f91c2ed8e3eec9fd6f84280 SHA256 e1978ac45c002a7b40a1f7123430a8aa1a4c45c48468b8d0bd6c670041a538e1 -AUX tome-2.3.5-noX.patch 453 RMD160 862c5920eaceaac47becd69d8194151316b071c6 SHA1 9a276831fc0a989ae0c8d020c9e8dc76f2ae0424 SHA256 131953319eb1d2c213a881f6e7d0cfe0839d787f298e15e3396aab04d05b56e0 -DIST tome-235-src.tar.bz2 2951227 RMD160 c13bf80cee65287c0d4280a1fa6aeb885eb7f21b SHA1 30e39f5b4464ef42abb9fa9e1b43f2cf7f0f3203 SHA256 8844b0b889bac3943ea2f4d4d43b38e2d91d242a93028e9e07403aaab46d691b -EBUILD tome-2.3.5.ebuild 3761 RMD160 9c21c821f491a20cbc187d5bda45d41b4740291a SHA1 2f8ae6b41083ff9c71fc9c7dd0a1774e9d0c2f93 SHA256 256fb3d3f90d2c2f3f517437f908a91872384059d5cce639eadef5640efbe54b -MISC ChangeLog 6430 RMD160 9c1b0f3b82a0f62243a16abf634617ed42160e99 SHA1 d6862a2e82a4f6925a9e61a7bc37c9d7cc55224d SHA256 c5f6c2c99f01fdd505bb096bc396185f70435b1399df0c25bd553cadbcf0e626 -MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 +AUX 2.3.5-gentoo-paths.patch 1172 SHA256 e1978ac45c002a7b40a1f7123430a8aa1a4c45c48468b8d0bd6c670041a538e1 SHA512 1d3f053abcbfee4f2fb1acc2911927b4a51881b0ce50da72d4d617207411b9cdba42cf70324c47535e9e560ee8878f3d0f51d4471dcc2bcfaffb136700c6fd0f WHIRLPOOL c39ef97fe887d16df8ef51aecdca5a1e05668830f6bd0f29c48dad311f98e4cd9c9fac23e8f1701736c2e6776c7ec5d2fabcf6739c0f33025f646dd355c5b8b2 +AUX tome-2.3.5-noX.patch 453 SHA256 131953319eb1d2c213a881f6e7d0cfe0839d787f298e15e3396aab04d05b56e0 SHA512 9c3fe5a8a9fa0e1e1b0e1ffb4ca8a089eda401a04bc6fe14aba8866090cd96ad13f5fac501ae18ce937f13a94439c8c1ebaa80c7fc07d1c4da9c3c8fa80f67c2 WHIRLPOOL 7e392e223933f471aaaadfe8cd983f69e153f50cc6cddc843ad064c2ff399c6cef84fdbcdfbf39e58f180ee705146742f81609f41021a6ca6ff8b5e13af067b0 +DIST tome-235-src.tar.bz2 2951227 SHA256 8844b0b889bac3943ea2f4d4d43b38e2d91d242a93028e9e07403aaab46d691b SHA512 f456aa91d18397297c213fa67dd14a4d29e024525be99f83b22cbe42f4d426b57fe6115a7124e3ec34de8f351117de525eab996ba7a2a230119e43639c4c9205 WHIRLPOOL 87628c68051ef2a063dc03f261110a010cf48a9fe0ef0e6feb1622b87263a8b9fa5a7d580201faf9e923196a2015d636659835cf2686a774332352cd233b66cb +EBUILD tome-2.3.5.ebuild 3675 SHA256 e2d5d67077f2a94ba5e8b59e1de8223bd652c8b882285b6de2e27000f487b3fe SHA512 fcbe2787f7a600301c7d39a9d6062df382fb09c86d2dd9db176868e0135c7d8aee10577d0eb828f17b8ece48b924f94e30c4c2238ce9331736fb1831e93a480d WHIRLPOOL 4891e3d8c5c98adaf1dbcfa483ec863caec3da079e1e2ac9f19764042eec6e82cd90fdfac2f44137faef3d1e4fb1dd249bc1da86809e22bd6f458a61ad8ee1cb +MISC ChangeLog 6549 SHA256 97d53b835ef1e90b3273973946e291ec70328a9f435e0d5bf2589ee17664bf7d SHA512 c7cea2916c1db2bdccbd98a7db7c98f4b120d9fedcb6859535637ab87fdcf30a34f3dd46abf10b8b4ea8ea1371605e5f4cadc93a153d63f8ac1c84c7b0427b24 WHIRLPOOL 26ce8e62c44b3f81e1def0d261fca037ee03e10952cabee67994d92edb5c8ef401a6a2e23dcde3a825c680de28c3b9e1b559f8047ec06cfe6ffeb586686d9d25 +MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada diff --git a/games-roguelike/tome/tome-2.3.5.ebuild b/games-roguelike/tome/tome-2.3.5.ebuild index ec84d1f648ff..517cd94dbdef 100644 --- a/games-roguelike/tome/tome-2.3.5.ebuild +++ b/games-roguelike/tome/tome-2.3.5.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.3.5.ebuild,v 1.7 2012/05/28 12:23:39 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.3.5.ebuild,v 1.8 2014/07/04 06:51:01 mr_bones_ Exp $ -EAPI=2 +EAPI=5 inherit eutils games MY_PV=${PV//./} @@ -32,15 +32,12 @@ src_prepare() { mv makefile.std makefile epatch "${FILESDIR}/${PV}-gentoo-paths.patch" \ "${FILESDIR}"/${P}-noX.patch - sed -i \ - -e "s:xx:x:" \ - ../lib/edit/p_info.txt - sed -i \ - -e "s:GENTOO_DIR:${GAMES_STATEDIR}:" files.c init2.c \ - || die "sed failed" + sed -i -e '/^CC =/d' makefile || die + sed -i -e "s:xx:x:" ../lib/edit/p_info.txt || die + sed -i -e "s:GENTOO_DIR:${GAMES_STATEDIR}:" files.c init2.c || die - find .. -name .cvsignore -exec rm -f \{\} \; - find ../lib/edit -type f -exec chmod a-x \{\} \; + find .. -name .cvsignore -exec rm -f \{\} + + find ../lib/edit -type f -exec chmod a-x \{\} + } src_compile() { @@ -82,30 +79,28 @@ src_compile() { fi GENTOO_INCLUDES="${GENTOO_INCLUDES} -Ilua -I." GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_LUA" - make \ + emake -j1 \ INCLUDES="${GENTOO_INCLUDES}" \ DEFINES="${GENTOO_DEFINES}" \ - depend || die "make depend failed" - emake ./tolua || die "emake ./tolua failed" + depend + emake ./tolua emake \ COPTS="${CFLAGS}" \ INCLUDES="${GENTOO_INCLUDES}" \ DEFINES="${GENTOO_DEFINES}" \ - LIBS="${GENTOO_LIBS}" \ + LIBS="${GENTOO_LIBS} -lm" \ BINDIR="${GAMES_BINDIR}" \ LIBDIR="${GAMES_DATADIR}/${PN}" \ GTK_SRC_FILE="${GTK_SRC_FILE}" \ - GTK_OBJ_FILE="${GTK_OBJ_FILE}" \ - || die "emake failed" + GTK_OBJ_FILE="${GTK_OBJ_FILE}" } src_install() { - make \ + emake -j1 \ DESTDIR="${D}" \ OWNER="${GAMES_USER}" \ BINDIR="${GAMES_BINDIR}" \ - LIBDIR="${GAMES_DATADIR}/${PN}" install \ - || die "make install failed" + LIBDIR="${GAMES_DATADIR}/${PN}" install cd .. dodoc *.txt |