diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2015-01-21 07:28:12 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2015-01-21 07:28:12 +0000 |
commit | 4541f2eb520cd2ed3717ab3104cbdac5d8eba832 (patch) | |
tree | b95fd5c7ad5d186a10313467aa929c8fae31cdec /games-roguelike | |
parent | Add new snapshot. (diff) | |
download | historical-4541f2eb520cd2ed3717ab3104cbdac5d8eba832.tar.gz historical-4541f2eb520cd2ed3717ab3104cbdac5d8eba832.tar.bz2 historical-4541f2eb520cd2ed3717ab3104cbdac5d8eba832.zip |
EAPI=5; tidy install; avoid bashism (bug #527202)
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Diffstat (limited to 'games-roguelike')
-rw-r--r-- | games-roguelike/zangband/ChangeLog | 10 | ||||
-rw-r--r-- | games-roguelike/zangband/Manifest | 6 | ||||
-rw-r--r-- | games-roguelike/zangband/files/zangband-2.7.4c-configure.patch | 51 | ||||
-rw-r--r-- | games-roguelike/zangband/files/zangband-2.7.4c-makefile.patch | 29 | ||||
-rw-r--r-- | games-roguelike/zangband/zangband-2.7.4c.ebuild | 24 |
5 files changed, 104 insertions, 16 deletions
diff --git a/games-roguelike/zangband/ChangeLog b/games-roguelike/zangband/ChangeLog index bcaf258393ee..ce3a80060d6f 100644 --- a/games-roguelike/zangband/ChangeLog +++ b/games-roguelike/zangband/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for games-roguelike/zangband -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/ChangeLog,v 1.20 2013/01/13 04:39:19 mr_bones_ Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/ChangeLog,v 1.21 2015/01/21 07:28:07 mr_bones_ Exp $ + + 21 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org> + +files/zangband-2.7.4c-configure.patch, +files/zangband-2.7.4c-makefile.patch, + files/zangband-2.7.4c-rng.patch, files/zangband-2.7.4c-tk85.patch, + zangband-2.7.4c.ebuild: + EAPI=5; tidy install; avoid bashism (bug #527202) 13 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org> files/zangband-2.7.4c-rng.patch, files/zangband-2.7.4c-tk85.patch: diff --git a/games-roguelike/zangband/Manifest b/games-roguelike/zangband/Manifest index a7609ffb7f55..39c26a2345c0 100644 --- a/games-roguelike/zangband/Manifest +++ b/games-roguelike/zangband/Manifest @@ -1,6 +1,8 @@ +AUX zangband-2.7.4c-configure.patch 1506 SHA256 ca32b55fbc3bff799e59cb7a11650f9d7950d74802820775121333d3349ea961 SHA512 a5f0e8265aa05da7881b0e194bd4b1cc07d1376ad14d20bb4707d08ba1042a919d57f5ec7a8c990fd1d7f13d9dd8e5f147c1816eb99f2589dfdf0d399161c3ea WHIRLPOOL bdd138212d1ae4988439511f54f25606f533dfac0e7de5e705c66a236f611722f61035e22920f18b01f5c34f4a6ebc92b35838cc3f7651724b94bb898f70bb43 +AUX zangband-2.7.4c-makefile.patch 631 SHA256 90a745022235031c0bd31f72bc8e58eab47640d0673061a775447250b08af832 SHA512 c6453d867336a7974757b1240a28715fd0e801d59f61fed23d053be86c7cdf6ea07bc874415b860076a4e5fd08537eff17793f0caa52a2bdb219514a7b8d1fd8 WHIRLPOOL 98c3312e8026071d824ff2438cfa68848dc31555fe46153b593d208596147b2e89ba565f944d107816eac1b5b7070b0f371121c8b79c5ceec0fcf5edaf68a00a AUX zangband-2.7.4c-rng.patch 285 SHA256 518c9353b4feed8e984b9aff61ad18bbcb24bdd431413b33fa5bf61f27d1ec97 SHA512 ff6e63d15c8d6243b24fc580c8e21c556edf578b5c31b6c0af62db8f096e4e47ebe50d201811d834ba32af678e5c6775b4d4426295dd3d87dbd8ce798d13528c WHIRLPOOL 65cc4596b76311090a2db1b62cbec6c3eec3d0653d8a44ba617d9121d7111f9b859309f67a7d17e837696f0a68402fda847584d03dab7d938ea9cb2425aa6fff AUX zangband-2.7.4c-tk85.patch 1405 SHA256 6b55fef0367c8780fe084b05fbdaf3360c3c809bdcbcc7609cdc25a197851015 SHA512 358edb61b0703dabbe780a2fdca284b80c1fd68dba16e1b70de42b96c7407e5eaf6d9304789c2a37098c1ed2c10690731c9ad10002995f82c6289c1657d2e2c3 WHIRLPOOL 0f62d81953b90e0a8bc895504bad230334d127259cce1959bd605aad5a513c72e3248f9eeba0b5b91e017aff19c935b93f6e9cbfa3e6444aa638054fef3542a3 DIST zangband-2.7.4c.tar.gz 2821355 SHA256 3033fc52d0daab6098394a8caaa6572ba64585d7b9deb62800328ca7ba592cdc SHA512 491dfeb72b6eb34f7feaa45d5360014da8eaeccd173dd75b3f7a1c2034e4fb634817493957b75babc0d9600077a80d88529cf2e86769948fc86d05e59958356e WHIRLPOOL 4a6cb2cdcb27449d4f1967c1e502cf111aa703b19ed77b2285a63f4cbd7ed70bb081a30a5d95ca3268c7b65bd975ef6b67179b92cd7357da59dc9e63291986f0 -EBUILD zangband-2.7.4c.ebuild 1707 SHA256 eaec8d4f3a647f99ca046bad3a2d106d988a02234bd3f076d274663877c64eb3 SHA512 ff5fbe45e3c88ca8c3dff364103d104c64d1e6c0a9f3aba8aaa860ae253b433fa07a1b7cbbb7c8218de898cdfddc428869a56a91c5211cbf19038493c539f9e0 WHIRLPOOL 5963607565ce3e95960b727d950d350a1214ca48983cfef9e103a18c6a2579a5df06cf250920e823b158cc0b676c30c90f0a2772c3c0a0a3fc2ddadba76b5d0a -MISC ChangeLog 3282 SHA256 8db90e5bb69dcfd870987133237bc2b1ee0053195ae3f34b68b230167ec3f0a3 SHA512 a1e2e007f51986453f81b0f5a7bd6e7dc0669c47bebfcdc61a3cb43c9d19887da47e34023690fbdd51db3472f46bf9aa816d7f048bf33eda564b65a39ad0d076 WHIRLPOOL 2d8ee113419474a6dfbc4d2f75e6ec56827fa5f0d1317f1416a9270bda134a81c78b969ad481efd2e9d21da2e8f9e98e75b1c6f9849b4f50b26af38a6523b8b1 +EBUILD zangband-2.7.4c.ebuild 1705 SHA256 d459f04726f6a329a7bc0b4516d0c4d5d8206bf886380f1fc544d541fa61c018 SHA512 03196e44af401953dc93949dd0ebe730a1f348e243350efc3be49e79ba0fab8b153673c5b7f03cc61a669da5abed04d63b7184ff98b67bc8ddf5fc44008d6ca4 WHIRLPOOL 12adbe71d0f280a14dd213beb446f6fe50cb14bc3eb64729055e83869504ba2bd893d64814259fca548af93008044bae97d51a8c14480a8e08eb699d5768e6d5 +MISC ChangeLog 3566 SHA256 31906b3ceae1aac690750e157c92111d4ead7cdc73cdd1daa5a89925f2e474d7 SHA512 ea84f60b6d19db60db0d25f876c7594fc4a8905d6b8e57c04a6aa1e918481d69e2d6861000d968fb64f74c31be51ccc7f193bc1d8a5cc2b423715c380d50aeb8 WHIRLPOOL 2b7d57bd05bb7726315e661c0634321d261040b0fab4093cf2c78a2b412ac2631446bebd0f42034fe251baa9d879e3a351290529c3e6eb70d8493d5c20bd933f MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada diff --git a/games-roguelike/zangband/files/zangband-2.7.4c-configure.patch b/games-roguelike/zangband/files/zangband-2.7.4c-configure.patch new file mode 100644 index 000000000000..756ea757845c --- /dev/null +++ b/games-roguelike/zangband/files/zangband-2.7.4c-configure.patch @@ -0,0 +1,51 @@ +--- configure.in.orig ++++ configure.in +@@ -236,48 +236,5 @@ + AC_CHECK_FUNCS([Tk_SetClassProcs TkpSync]) + AC_CHECK_FUNCS([mkstemp usleep getpwuid getpwnam shmget]) + +-dnl A nice function to test compiler options (like warnings) +-AC_DEFUN(AC_CHECK_CC_OPT, +-[FLAG=`echo zangband_cv_cflag_$1 | sed s/-/_/g` +-AC_CACHE_CHECK([whether ${CC-cc} accepts $1], +-[$FLAG], +-[echo 'void f(void); void f(){}' > conftest.c +-if test -z "`${CC-cc} -c ${CFLAGS} $1 conftest.c 2>&1`"; then +- eval $FLAG=yes +-else +- eval $FLAG=no +-fi]) +-if test ${!FLAG} = yes ; then +- CFLAGS="$1 $CFLAGS" +-fi +-]) +- +-dnl Check for lots of extra warning options +-AC_CHECK_CC_OPT(-pedantic) +-AC_CHECK_CC_OPT(-W) +-AC_CHECK_CC_OPT(-Wall) +-AC_CHECK_CC_OPT(-Wmissing-prototypes) +-AC_CHECK_CC_OPT(-Wmissing-declarations) +-AC_CHECK_CC_OPT(-Wno-long-long) +-AC_CHECK_CC_OPT(-Wwrite-strings) +-AC_CHECK_CC_OPT(-Wpointer-arith) +-AC_CHECK_CC_OPT(-Wbad-function-cast) +-AC_CHECK_CC_OPT(-Waggregate-return) +-AC_CHECK_CC_OPT(-Wstrict-prototypes) +-AC_CHECK_CC_OPT(-Wredundant-decls) +-dnl AC_CHECK_CC_OPT(-Wunreachable-code) +-AC_CHECK_CC_OPT(-Wchar-subscripts) +-AC_CHECK_CC_OPT(-Wimplicit) +-AC_CHECK_CC_OPT(-Wparentheses) +-AC_CHECK_CC_OPT(-Wsequence-point) +-AC_CHECK_CC_OPT(-Wreturn-type) +-AC_CHECK_CC_OPT(-Wswitch) +-AC_CHECK_CC_OPT(-Wunused) +-AC_CHECK_CC_OPT(-Wuninitialized) +-AC_CHECK_CC_OPT(-Wundef) +-AC_CHECK_CC_OPT(-Wnested-externs) +-AC_CHECK_CC_OPT(-Wdeclaration-after-statement) +-AC_CHECK_CC_OPT(-Wsign-compare) +- + AC_CONFIG_FILES([makefile]) + AC_OUTPUT diff --git a/games-roguelike/zangband/files/zangband-2.7.4c-makefile.patch b/games-roguelike/zangband/files/zangband-2.7.4c-makefile.patch new file mode 100644 index 000000000000..bae74904cf02 --- /dev/null +++ b/games-roguelike/zangband/files/zangband-2.7.4c-makefile.patch @@ -0,0 +1,29 @@ +--- makefile.in.orig ++++ makefile.in +@@ -111,17 +111,6 @@ + %.o: %.c + $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $< -c -o $@ $(DEFS) + +-## +-## Hack - make sure the build system is consistant. +-## +-makefile: configure makefile.in +- $(CONFIGURE) +- +-configure: configure.in +- aclocal +- autoheader +- autoconf +- + dirs: + -mkdir $(DESTDIR) + -mkdir $(addprefix $(DESTDIR),$(filter-out $(srcdirlist), $(dirlist))) +@@ -205,7 +194,7 @@ + @echo $(srcdirlist) $(srcfiles) + + # Hack to remake files depending on DEFAULT_PATH +-.default_path: makefile ++.default_path: + @if [ ! -r .default_path ]; then \ + echo "$(DESTDIR)" > .default_path; \ + fi diff --git a/games-roguelike/zangband/zangband-2.7.4c.ebuild b/games-roguelike/zangband/zangband-2.7.4c.ebuild index 4aa553fe2e1c..792dfa529934 100644 --- a/games-roguelike/zangband/zangband-2.7.4c.ebuild +++ b/games-roguelike/zangband/zangband-2.7.4c.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/zangband-2.7.4c.ebuild,v 1.11 2010/03/04 00:52:42 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/zangband-2.7.4c.ebuild,v 1.12 2015/01/21 07:28:07 mr_bones_ Exp $ -EAPI=2 +EAPI=5 inherit autotools eutils games DESCRIPTION="An enhanced version of the Roguelike game Angband" @@ -25,7 +25,10 @@ S=${WORKDIR}/${PN} src_prepare() { epatch "${FILESDIR}"/${P}-tk85.patch \ - "${FILESDIR}"/${P}-rng.patch + "${FILESDIR}"/${P}-rng.patch \ + "${FILESDIR}"/${P}-configure.patch \ + "${FILESDIR}"/${P}-makefile.patch + mv configure.in configure.ac || die eautoreconf } @@ -39,19 +42,16 @@ src_configure() { src_install() { # Keep some important dirs we want to chmod later - keepdir "${GAMES_DATADIR}"/${PN}/lib/apex \ - "${GAMES_DATADIR}"/${PN}/lib/user \ - "${GAMES_DATADIR}"/${PN}/lib/save + keepdir "${GAMES_DATADIR}"/${PN}/lib/{apex,user,save,bone,info,xtra/help,xtra/music} # Install the basic files but remove unneeded crap - emake DESTDIR="${D}/${GAMES_DATADIR}"/${PN}/ installbase \ - || die "emake installbase failed" + emake DESTDIR="${D}/${GAMES_DATADIR}"/${PN}/ installbase rm "${D}${GAMES_DATADIR}"/${PN}/{angdos.cfg,readme,z_faq.txt,z_update.txt} # Install everything else and fix the permissions - dogamesbin zangband || die "dogamesbin failed" - dodoc readme z_faq.txt z_update.txt || die "dodoc failed" - find "${D}${GAMES_DATADIR}/zangband/lib" -type f -exec chmod a-x \{\} \; + dogamesbin zangband + dodoc readme z_faq.txt z_update.txt + find "${D}${GAMES_DATADIR}/zangband/lib" -type f -exec chmod a-x \{\} + prepgamesdirs # All users in the games group need write permissions to |