From: Michael Sterrett Date: Thu, 20 Jan 2005 05:47:59 +0000 (+0000) Subject: version bump; clean older versions X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d32a5b19007cb4f26df1f5c6616f49bbe2117bbb;p=gentoo.git version bump; clean older versions --- diff --git a/games-roguelike/tome/ChangeLog b/games-roguelike/tome/ChangeLog index 2bc65070628a..f6c763454554 100644 --- a/games-roguelike/tome/ChangeLog +++ b/games-roguelike/tome/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for games-roguelike/tome -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/ChangeLog,v 1.17 2004/12/28 23:15:45 ciaranm Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/ChangeLog,v 1.18 2005/01/20 05:47:59 mr_bones_ Exp $ + +*tome-2.3.1 (20 Jan 2005) + + 20 Jan 2005; Michael Sterrett + +files/2.3.1-gentoo-paths.patch, -tome-2.2.5-r1.ebuild, -tome-2.2.6.ebuild, + -tome-2.2.7.ebuild, +tome-2.3.1.ebuild: + version bump; clean older versions 28 Dec 2004; Ciaran McCreesh : Change encoding to UTF-8 for GLEP 31 compliance diff --git a/games-roguelike/tome/Manifest b/games-roguelike/tome/Manifest index 68a4555bfcb3..d4d2e786bc69 100644 --- a/games-roguelike/tome/Manifest +++ b/games-roguelike/tome/Manifest @@ -1,16 +1,13 @@ -MD5 a5903ae133b03b143b6318246bf951f7 tome-2.2.6.ebuild 1715 -MD5 f347959d81aeae451ee2f7801dce5de6 ChangeLog 3464 -MD5 a65f7f33cc35af7d4f7b3584470403b5 tome-2.3.0.ebuild 2057 -MD5 0495de3106ee540fd528b145da4d5259 tome-2.2.7.ebuild 1783 -MD5 9cdf3ba666d2e7f552a71d67dc4ce5eb tome-2.2.5-r1.ebuild 1578 +MD5 de28004b9d21d95abfa9b74a20a45809 ChangeLog 3706 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 -MD5 6a164af6c05ba56b42106cf5ff353a37 tome-2.2.7-r1.ebuild 1916 -MD5 a23d89bdd5d10666dd7030963ba64983 files/digest-tome-2.2.7-r1 66 -MD5 44a615ff66d86ba4e6b431a73ed386bc files/digest-tome-2.2.5-r1 62 +MD5 b719041e3fd6c4be815fe31ade777dd4 tome-2.2.7-r1.ebuild 1919 +MD5 fdef338c401de8078c0e85fedd68c1db tome-2.3.0.ebuild 2057 +MD5 2441dbf9d50252dd58df1c9993f16671 tome-2.3.1.ebuild 2018 MD5 23dd9f8f71868b8ab82d8bbbc79ad740 files/2.2.6-gentoo-paths.patch 1172 -MD5 a23d89bdd5d10666dd7030963ba64983 files/digest-tome-2.2.7 66 -MD5 bc7421839b9c27fba54b183115f428f9 files/digest-tome-2.3.0 66 MD5 23dd9f8f71868b8ab82d8bbbc79ad740 files/2.2.7-gentoo-paths.patch 1172 -MD5 5a001b935d01d828ea36c4f5b1c75419 files/digest-tome-2.2.6 65 +MD5 a23d89bdd5d10666dd7030963ba64983 files/digest-tome-2.2.7-r1 66 MD5 23dd9f8f71868b8ab82d8bbbc79ad740 files/2.2.5-gentoo-paths.patch 1172 MD5 23dd9f8f71868b8ab82d8bbbc79ad740 files/2.3.0-gentoo-paths.patch 1172 +MD5 bc7421839b9c27fba54b183115f428f9 files/digest-tome-2.3.0 66 +MD5 23dd9f8f71868b8ab82d8bbbc79ad740 files/2.3.1-gentoo-paths.patch 1172 +MD5 19ef7a007b17565e9e75a93add629aa8 files/digest-tome-2.3.1 66 diff --git a/games-roguelike/tome/files/2.3.1-gentoo-paths.patch b/games-roguelike/tome/files/2.3.1-gentoo-paths.patch new file mode 100644 index 000000000000..d171a1cf540f --- /dev/null +++ b/games-roguelike/tome/files/2.3.1-gentoo-paths.patch @@ -0,0 +1,31 @@ +diff -rU 1 tome-225-src.orig/src/files.c tome-225-src/src/files.c +--- tome-225-src.orig/src/files.c 2004-01-14 11:17:02.423263360 -0500 ++++ tome-225-src/src/files.c 2004-01-14 11:17:50.074019344 -0500 +@@ -5670,3 +5670,3 @@ + /* Build the filename */ +- path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw"); ++ sprintf(buf, "GENTOO_DIR/tome-scores.raw"); + +@@ -5748,3 +5748,3 @@ + /* Build the filename */ +- path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw"); ++ sprintf(buf, "GENTOO_DIR/tome-scores.raw"); + +@@ -5846,3 +5846,3 @@ + /* Build the filename */ +- path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw"); ++ sprintf(buf, "GENTOO_DIR/tome-scores.raw"); + +@@ -6296,3 +6296,3 @@ + /* Build the filename */ +- path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw"); ++ sprintf(buf, "GENTOO_DIR/tome-scores.raw"); + +diff -rU 1 tome-225-src.orig/src/init2.c tome-225-src/src/init2.c +--- tome-225-src.orig/src/init2.c 2004-01-14 11:17:02.473255760 -0500 ++++ tome-225-src/src/init2.c 2004-01-14 11:17:58.286770816 -0500 +@@ -6686,3 +6686,3 @@ + /* Build the filename */ +- path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw"); ++ sprintf(buf, "GENTOO_DIR/tome-scores.raw"); + diff --git a/games-roguelike/tome/files/digest-tome-2.2.5-r1 b/games-roguelike/tome/files/digest-tome-2.2.5-r1 deleted file mode 100644 index 72f8f65cfb47..000000000000 --- a/games-roguelike/tome/files/digest-tome-2.2.5-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 b1a340a6092fd53b07be9d107b16e16b tome-225-src.tgz 3179754 diff --git a/games-roguelike/tome/files/digest-tome-2.2.6 b/games-roguelike/tome/files/digest-tome-2.2.6 deleted file mode 100644 index 9eaf87d3dc4c..000000000000 --- a/games-roguelike/tome/files/digest-tome-2.2.6 +++ /dev/null @@ -1 +0,0 @@ -MD5 e6818a5a65e2d0005275233c304c0f71 tome-226-src.tar.gz 3182901 diff --git a/games-roguelike/tome/files/digest-tome-2.2.7 b/games-roguelike/tome/files/digest-tome-2.2.7 deleted file mode 100644 index ff83e5db02de..000000000000 --- a/games-roguelike/tome/files/digest-tome-2.2.7 +++ /dev/null @@ -1 +0,0 @@ -MD5 3b268d1252fa509ea498bc1d303f5a95 tome-227-src.tar.bz2 2600527 diff --git a/games-roguelike/tome/files/digest-tome-2.3.1 b/games-roguelike/tome/files/digest-tome-2.3.1 new file mode 100644 index 000000000000..396cab592358 --- /dev/null +++ b/games-roguelike/tome/files/digest-tome-2.3.1 @@ -0,0 +1 @@ +MD5 51067d664e34bec5cd9eb4b78f0c8f16 tome-231-src.tar.bz2 2638388 diff --git a/games-roguelike/tome/tome-2.2.5-r1.ebuild b/games-roguelike/tome/tome-2.2.5-r1.ebuild deleted file mode 100644 index e4e844854c42..000000000000 --- a/games-roguelike/tome/tome-2.2.5-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.2.5-r1.ebuild,v 1.6 2004/07/01 05:21:55 mr_bones_ Exp $ - -inherit games eutils - -MY_PV=${PV//./} -DESCRIPTION="save the world from Morgoth and battle evil (or become evil ;])" -HOMEPAGE="http://t-o-m-e.net/" -SRC_URI="http://t-o-m-e.net/dl/src/tome-${MY_PV}-src.tgz" - -LICENSE="Moria" -SLOT="0" -KEYWORDS="x86 ppc ~amd64" -IUSE="" - -RDEPEND="virtual/libc - >=sys-libs/ncurses-5 - virtual/x11" - -S="${WORKDIR}/tome-${MY_PV}-src" - -src_unpack() { - unpack ${A} - cd ${S}/src - mv makefile.std makefile - epatch ${FILESDIR}/${PV}-gentoo-paths.patch - sed -i "s:GENTOO_DIR:${GAMES_STATEDIR}:" files.c init2.c -} - -src_compile() { - cd src - emake -j1 \ - COPTS="${CFLAGS}" \ - BINDIR=${GAMES_BINDIR} \ - LIBDIR=${GAMES_DATADIR}/${PN} \ - || die "emake failed" -} - -src_install() { - cd src - emake -j1 \ - OWNER=${GAMES_USER} \ - BINDIR=${D}/${GAMES_BINDIR} \ - LIBDIR=${D}/${GAMES_DATADIR}/${PN} install \ - || die "make install failed" - cd ${S} - dodoc *.txt - - dodir ${GAMES_STATEDIR} - touch ${D}/${GAMES_STATEDIR}/${PN}-scores.raw - prepgamesdirs - fperms g+w ${GAMES_STATEDIR}/${PN}-scores.raw - fperms g+w ${GAMES_DATADIR}/${PN}/data -} - -pkg_postinst() { - games_pkg_postinst - echo - ewarn "ToME ${PV} is not save-game compatible with previous versions." - echo - einfo "If you have older save files and you wish to continue those games," - einfo "you'll need to remerge the version of ToME with which you started" - einfo "those save-games." -} diff --git a/games-roguelike/tome/tome-2.2.6.ebuild b/games-roguelike/tome/tome-2.2.6.ebuild deleted file mode 100644 index 7063ef9356cb..000000000000 --- a/games-roguelike/tome/tome-2.2.6.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.2.6.ebuild,v 1.3 2004/07/01 05:21:55 mr_bones_ Exp $ - -inherit eutils games - -MY_PV=${PV//./} -DESCRIPTION="save the world from Morgoth and battle evil (or become evil ;])" -HOMEPAGE="http://t-o-m-e.net/" -SRC_URI="http://t-o-m-e.net/dl/src/tome-${MY_PV}-src.tar.gz" - -LICENSE="Moria" -SLOT="0" -KEYWORDS="~x86 ~ppc ~amd64" -IUSE="" - -RDEPEND="virtual/libc - dev-lang/lua - >=sys-libs/ncurses-5 - virtual/x11" -DEPEND="${RDEPEND} - >=sys-apps/sed-4" - -S=${WORKDIR}/tome-${MY_PV}-src - -src_unpack() { - unpack ${A} - cd ${S}/src - mv makefile.std makefile - epatch "${FILESDIR}/${PV}-gentoo-paths.patch" - sed -i \ - -e "s:GENTOO_DIR:${GAMES_STATEDIR}:" files.c init2.c \ - || die "sed failed" -} - -src_compile() { - cd src - make depend || die "make depend failed" - emake -j1 \ - COPTS="${CFLAGS}" \ - BINDIR=${GAMES_BINDIR} \ - LIBDIR=${GAMES_DATADIR}/${PN} \ - || die "emake failed" -} - -src_install() { - cd src - emake -j1 \ - OWNER=${GAMES_USER} \ - BINDIR=${D}/${GAMES_BINDIR} \ - LIBDIR=${D}/${GAMES_DATADIR}/${PN} install \ - || die "make install failed" - cd ${S} - dodoc *.txt - - dodir "${GAMES_STATEDIR}" - touch "${D}/${GAMES_STATEDIR}/${PN}-scores.raw" - prepgamesdirs - fperms g+w "${GAMES_STATEDIR}/${PN}-scores.raw" - fperms g+w "${GAMES_DATADIR}/${PN}/data" -} - -pkg_postinst() { - games_pkg_postinst - echo - ewarn "ToME ${PV} is not save-game compatible with previous versions." - echo - einfo "If you have older save files and you wish to continue those games," - einfo "you'll need to remerge the version of ToME with which you started" - einfo "those save-games." -} diff --git a/games-roguelike/tome/tome-2.2.7-r1.ebuild b/games-roguelike/tome/tome-2.2.7-r1.ebuild index 066349a7f332..26459f24469a 100644 --- a/games-roguelike/tome/tome-2.2.7-r1.ebuild +++ b/games-roguelike/tome/tome-2.2.7-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.2.7-r1.ebuild,v 1.4 2004/12/16 15:29:43 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.2.7-r1.ebuild,v 1.5 2005/01/20 05:47:59 mr_bones_ Exp $ inherit eutils games diff --git a/games-roguelike/tome/tome-2.3.0.ebuild b/games-roguelike/tome/tome-2.3.0.ebuild index 4946b76246ac..93fca07bced8 100644 --- a/games-roguelike/tome/tome-2.3.0.ebuild +++ b/games-roguelike/tome/tome-2.3.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.3.0.ebuild,v 1.1 2004/12/11 05:40:32 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.3.0.ebuild,v 1.2 2005/01/20 05:47:59 mr_bones_ Exp $ inherit eutils games diff --git a/games-roguelike/tome/tome-2.2.7.ebuild b/games-roguelike/tome/tome-2.3.1.ebuild similarity index 75% rename from games-roguelike/tome/tome-2.2.7.ebuild rename to games-roguelike/tome/tome-2.3.1.ebuild index 04710e6dd615..3193aa606351 100644 --- a/games-roguelike/tome/tome-2.2.7.ebuild +++ b/games-roguelike/tome/tome-2.3.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.2.7.ebuild,v 1.4 2004/07/01 05:21:55 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.3.1.ebuild,v 1.1 2005/01/20 05:47:59 mr_bones_ Exp $ inherit eutils games @@ -14,12 +14,10 @@ SLOT="0" KEYWORDS="x86 ~ppc ~amd64" IUSE="" -RDEPEND="virtual/libc +DEPEND="virtual/libc dev-lang/lua >=sys-libs/ncurses-5 virtual/x11" -DEPEND="${RDEPEND} - >=sys-apps/sed-4" S="${WORKDIR}/tome-${MY_PV}-src" @@ -31,17 +29,25 @@ src_unpack() { sed -i \ -e "s:GENTOO_DIR:${GAMES_STATEDIR}:" files.c init2.c \ || die "sed failed" + #bug #53640 + sed -i \ + -e "s:-DUSE_X11:-DUSE_GCU -DUSE_X11:" \ + -e "s:-lX11:-lncurses -lX11:" \ + makefile \ + || die "sed failed" find "${S}" -name .cvsignore -exec rm -f \{\} \; + find "${S}/lib/edit" -type f -exec chmod a-x \{\} \; } src_compile() { cd src make depend || die "make depend failed" - emake -j1 \ + emake ./tolua || die "emake ./tolua failed" + emake \ COPTS="${CFLAGS}" \ BINDIR="${GAMES_BINDIR}" \ LIBDIR="${GAMES_DATADIR}/${PN}" \ - || die "emake failed" + || die "emake failed" } src_install() { @@ -59,6 +65,7 @@ src_install() { touch "${D}/${GAMES_STATEDIR}/${PN}-scores.raw" prepgamesdirs fperms g+w "${GAMES_STATEDIR}/${PN}-scores.raw" + #FIXME: something has to be done about this. fperms g+w "${GAMES_DATADIR}/${PN}/data" }