From: Chris Gianelloni Date: Tue, 11 Mar 2008 06:05:25 +0000 (+0000) Subject: Removed the older ebuild and marked the newer one stable as it's been in the tree... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=abd64afa41892b2c47230f578f72804533cb59eb;p=gentoo.git Removed the older ebuild and marked the newer one stable as it's been in the tree for over a year and doing some minor quoting cleanups. Package-Manager: portage-2.1.4.4 --- diff --git a/games-strategy/heroes3/ChangeLog b/games-strategy/heroes3/ChangeLog index f9d89081d74e..a01fd15cf7a5 100644 --- a/games-strategy/heroes3/ChangeLog +++ b/games-strategy/heroes3/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-strategy/heroes3 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/ChangeLog,v 1.17 2008/02/29 19:47:53 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/ChangeLog,v 1.18 2008/03/11 06:05:25 wolf31o2 Exp $ + + 11 Mar 2008; Chris Gianelloni + -heroes3-1.3.1a-r1.ebuild, heroes3-1.3.1a-r2.ebuild: + Removed the older ebuild and marked the newer one stable as it's been in the + tree for over a year and doing some minor quoting cleanups. 29 Feb 2008; Carsten Lohrke heroes3-1.3.1a-r1.ebuild, heroes3-1.3.1a-r2.ebuild: diff --git a/games-strategy/heroes3/Manifest b/games-strategy/heroes3/Manifest index 8e53a441523f..b1a9791d837a 100644 --- a/games-strategy/heroes3/Manifest +++ b/games-strategy/heroes3/Manifest @@ -1,7 +1,6 @@ AUX heroes3-wrapper.sh 195 RMD160 5ceb0c89041b1640fc38a0aff9833ee3d8b2726b SHA1 f1d84dcee1addb16edc05ea42bf0f3dc770007f8 SHA256 982b2c36a167dd99a6bddc14d13122cf73e306e2711147aa059b1dabb4ae1ae5 DIST heroes3-1.3.1a-cdrom-x86.run 3012188 RMD160 dafa394c5f63bb3cac5bb65e244fdeaa626b6e70 SHA1 72c23f6eab8505dc561337ce06e49b690a4a6627 SHA256 f87d78e09278e2f05cb15e2f79dfeaae2cef8fb147b83185dd4f818c0ab7759e DIST heroes3-1.3.1a-ppc.run 2643068 RMD160 741ba7c3a9005a38895dd84e02595be75678d7da SHA1 e52fd2f487edfa5650c93f85782654f10513f016 SHA256 b14eeb8eef705b20dbf54eb308b2232d6110f4ec568cb82d9ea9fb7f9cca3137 -EBUILD heroes3-1.3.1a-r1.ebuild 3200 RMD160 68b25d33cb135cfee361aaa3d9c4ec45f0b0d48f SHA1 9e11841b0bc63562f5ae5b1263f6eb6f6f7c43b0 SHA256 1bf7cc0be5c532602cb81114d10e10f5f8778a5af623280dc46cb89d6f2487ad -EBUILD heroes3-1.3.1a-r2.ebuild 5754 RMD160 2bb88477feb9b85b1486b2c4674d10c368c472b4 SHA1 605693d087db3502c2d03b0001ee9fe354ea0daf SHA256 3a9e190fbbc3acc36e6266fa643cea54402548f6103063eabaf1efa796e13665 -MISC ChangeLog 2924 RMD160 161309168a3ee988758e4c266bf652dfc9557a7b SHA1 491b3c2d30de8e0b0189ff89187e8ead66961fbb SHA256 10c79a6ac99ff0ff4231e2d7b09b6a23d54bd186a7b61cde4e346957b70de9ad +EBUILD heroes3-1.3.1a-r2.ebuild 5762 RMD160 54323e12fbd25b1f9d99ad2eefd67d44c8702bd3 SHA1 f230f7ea26e25c1a2aa00db84d697c066a272a6a SHA256 fb23661552b8fd61d8bf26f3f054473f9ec46b315d4e04fbcafad47474067efd +MISC ChangeLog 3178 RMD160 85f74dc7627e582266d1a45d8a1e8aa97223d13e SHA1 92052bf7a91dd159001435139b7ae26f2be4de19 SHA256 12c8c0187487659a83d750fbab1c0c301c178e93733c4e0deb5d223eaaef9a9a MISC metadata.xml 254 RMD160 877a1dc36df2be58926bc51041093feafdefe429 SHA1 45f0334cd127c4a1b4ece41f7098ab70046e378a SHA256 2916aab684ec3908fffb515065eeb2c481cde563380b682646add582bed5f535 diff --git a/games-strategy/heroes3/heroes3-1.3.1a-r1.ebuild b/games-strategy/heroes3/heroes3-1.3.1a-r1.ebuild deleted file mode 100644 index 38166a111850..000000000000 --- a/games-strategy/heroes3/heroes3-1.3.1a-r1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/heroes3-1.3.1a-r1.ebuild,v 1.15 2008/02/29 19:47:53 carlo Exp $ - -# [x] Base Install Required (+4 MB) -# [x] Scenarios (+7 MB) -# [x] Sounds and Graphics (+118 MB) -# [x] Music (+65 MB) -# [x] Videos (+147 MB) -# -------------------- -# Total 341 MB - -inherit eutils games - -DESCRIPTION="Heroes of Might and Magic III : The Restoration of Erathia - turn-based 2-D medieval combat" -HOMEPAGE="http://www.lokigames.com/products/heroes3/" - -# Since I do not have a PPC machine to test with, I will leave the PPC stuff in -# here so someone else can stabilize loki_setupdb and loki_patch for PPC and -# then KEYWORD this appropriately. -SRC_URI="x86? ( mirror://lokigames/${PN}/${P}-cdrom-x86.run ) - ppc? ( mirror://lokigames/${PN}/${P}-ppc.run )" - -LICENSE="LOKI-EULA" -SLOT="0" -IUSE="nocd maps music sounds videos" -KEYWORDS="x86" -RESTRICT="strip" - -DEPEND="virtual/libc - games-util/loki_patch" -RDEPEND="sys-libs/lib-compat-loki" - -S=${WORKDIR} - -GAMES_CHECK_LICENSE="yes" -dir=${GAMES_PREFIX_OPT}/${PN} -Ddir=${D}/${dir} - -pkg_setup() { - games_pkg_setup - use nocd && ewarn "The full installation takes about 341 MB of space!" -} - -src_unpack() { - unpack_makeself -} - -src_install() { - cdrom_get_cds hiscore.tar.gz - einfo "Copying files... this may take a while..." - exeinto ${dir} - doexe ${CDROM_ROOT}/bin/x86/${PN} - insinto ${dir} - doins ${CDROM_ROOT}/{Heroes_III_Tutorial.pdf,README,icon.{bmp,xpm}} - - if use nocd; then - dodir ${dir}/{maps,mp3,data} ${dir}/data/video - cp -r ${CDROM_ROOT}/{data,maps,mp3} ${Ddir} || die "copying data" - else - dodir ${dir}/data - use maps && insinto ${dir}/maps && dodir ${dir}/maps && doins ${CDROM_ROOT}/maps/* - use music && insinto ${dir}/mp3 && dodir ${dir}/mp3 && doins ${CDROM_ROOT}/mp3/* - use sounds && insinto ${dir}/data && doins ${CDROM_ROOT}/data/{*.lod,*.snd} - use videos && insinto ${dir}/data/video && dodir ${dir}/data/video && doins ${CDROM_ROOT}/data/video/* - fi - - cd ${Ddir} - tar -zxf ${CDROM_ROOT}/hiscore.tar.gz || die "unpacking hiscore" - - cd ${S} - loki_patch --verify patch.dat - loki_patch patch.dat ${Ddir} >& /dev/null || die "patching" - - games_make_wrapper heroes3 ./heroes3 "${dir}" "${dir}" - - # now, since these files are coming off a cd, the times/sizes/md5sums wont - # be different ... that means portage will try to unmerge some files (!) - # we run touch on ${D} so as to make sure portage doesnt do any such thing - find ${Ddir} -exec touch '{}' \; - - newicon ${CDROM_ROOT}/icon.xpm heroes3.xpm - - prepgamesdirs - make_desktop_entry heroes3 "Heroes of Might and Magic III" "heroes3" - - if use x86; then - einfo "Linking libs provided by 'sys-libs/lib-compat-loki' to '${dir}'." - dosym /lib/loki_ld-linux.so.2 ${dir}/ld-linux.so.2 && \ - dosym /usr/lib/loki_libc.so.6 ${dir}/libc.so.6 && \ - dosym /usr/lib/loki_libnss_files.so.2 ${dir}/libnss_files.so.2 || die "dosym failed" - fi - - elog "Changing 'hiscore.dat' to be writeable for group 'games'." - fperms g+w "${dir}/data/hiscore.dat" || die "fperms failed" -} - -pkg_postinst() { - games_pkg_postinst - elog "To play the game run:" - elog " heroes3" -} diff --git a/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild b/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild index 7b3f2a387797..9c2ee875ac65 100644 --- a/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild +++ b/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild,v 1.8 2008/02/29 19:47:53 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild,v 1.9 2008/03/11 06:05:25 wolf31o2 Exp $ # [x] Base Install Required (+4 MB) # [x] Scenarios (+7 MB) @@ -37,7 +37,7 @@ LICENSE="LOKI-EULA" SLOT="0" IUSE="nocd maps music sounds videos" #linguas_en linguas_es linguas_pl linguas_de" -KEYWORDS="~ppc ~x86" +KEYWORDS="~ppc x86" RESTRICT="strip" DEPEND="virtual/libc @@ -185,9 +185,9 @@ src_install() { if ! use ppc then einfo "Linking libs provided by 'sys-libs/lib-compat-loki' to '${dir}'." - dosym /lib/loki_ld-linux.so.2 ${dir}/ld-linux.so.2 || die "dosym" - dosym /usr/lib/loki_libc.so.6 ${dir}/libc.so.6 || die "dosym" - dosym /usr/lib/loki_libnss_files.so.2 ${dir}/libnss_files.so.2 \ + dosym /lib/loki_ld-linux.so.2 "${dir}"/ld-linux.so.2 || die "dosym" + dosym /usr/lib/loki_libc.so.6 "${dir}"/libc.so.6 || die "dosym" + dosym /usr/lib/loki_libnss_files.so.2 "${dir}"/libnss_files.so.2 \ || die "dosym failed" fi