Marking stable on x86 and removing older versions.

Package-Manager: portage-2.0.51.19

5 files changed, 10 insertions, 105 deletions

diff --git a/games-strategy/heroes3/ChangeLog b/games-strategy/heroes3/ChangeLog
index 3f8828964e82..7b97837ee582 100644
--- a/games-strategy/heroes3/ChangeLog
+++ b/games-strategy/heroes3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/heroes3
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/ChangeLog,v 1.4 2005/03/05 17:39:48 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/ChangeLog,v 1.5 2005/03/25 01:19:09 wolf31o2 Exp $
+
+  25 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -heroes3-1.3.1a.ebuild, heroes3-1.3.1a-r1.ebuild:
+  Marking stable on x86 and removing older versions.
 
   05 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   heroes3-1.3.1a-r1.ebuild:
diff --git a/games-strategy/heroes3/Manifest b/games-strategy/heroes3/Manifest
index c1009e2e5dde..5849652dd57f 100644
--- a/games-strategy/heroes3/Manifest
+++ b/games-strategy/heroes3/Manifest
@@ -1,6 +1,4 @@
-MD5 483633cb91bd3865cf01c12f92605924 ChangeLog 890
-MD5 6e016fcf02967a36b010aa932b9c8625 heroes3-1.3.1a.ebuild 2962
+MD5 0f358963f72a3c903c924de36043b319 heroes3-1.3.1a-r1.ebuild 3422
+MD5 d7e73b86a30c44f8cc0c48cb1abddba8 ChangeLog 1050
 MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
-MD5 59a2b743befc0c6389d67b1fbf26367b heroes3-1.3.1a-r1.ebuild 3448
-MD5 448d580609f09736aaa5f762b631e813 files/digest-heroes3-1.3.1a 142
 MD5 448d580609f09736aaa5f762b631e813 files/digest-heroes3-1.3.1a-r1 142
diff --git a/games-strategy/heroes3/files/digest-heroes3-1.3.1a b/games-strategy/heroes3/files/digest-heroes3-1.3.1a
deleted file mode 100644
index a34593c46c90..000000000000
--- a/games-strategy/heroes3/files/digest-heroes3-1.3.1a
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 be8d44e9bc808019011161f7605c9ba1 heroes3-1.3.1a-cdrom-x86.run 3012188
-MD5 32b2749e8097df6cde0a529c99e4d620 heroes3-1.3.1a-ppc.run 2643068
diff --git a/games-strategy/heroes3/heroes3-1.3.1a-r1.ebuild b/games-strategy/heroes3/heroes3-1.3.1a-r1.ebuild
index 1b37b94c0a17..5b6cbbb9bd9d 100644
--- a/games-strategy/heroes3/heroes3-1.3.1a-r1.ebuild
+++ b/games-strategy/heroes3/heroes3-1.3.1a-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.3 2005/03/05 17:39:48 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/heroes3-1.3.1a-r1.ebuild,v 1.4 2005/03/25 01:19:09 wolf31o2 Exp $
 
 # 	[x] Base Install Required (+4 MB) 
 #	[x] Scenarios (+7 MB)
@@ -14,7 +14,7 @@ inherit games
 IUSE="nocd maps music sounds videos"
 DESCRIPTION="Heroes of Might and Magic III : The Restoration of Erathia - turn-based 2-D medieval combat"
 HOMEPAGE="http://www.lokigames.com/products/heroes3/"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 # 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
@@ -80,8 +80,7 @@ src_install() {
 	# we run touch on ${D} so as to make sure portage doesnt do any such thing
 	find ${Ddir} -exec touch '{}' \;
 
-	cp ${CDROM_ROOT}/icon.xpm ${S}/heroes3.xpm
-	doicon ${S}/heroes3.xpm
+	newicon ${CDROM_ROOT}/icon.xpm heroes3.xpm
 
 	prepgamesdirs
 	make_desktop_entry heroes3 "Heroes of Might and Magic III" "heroes3.xpm"
diff --git a/games-strategy/heroes3/heroes3-1.3.1a.ebuild b/games-strategy/heroes3/heroes3-1.3.1a.ebuild
deleted file mode 100644
index d7f2b54b4aa7..000000000000
--- a/games-strategy/heroes3/heroes3-1.3.1a.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2005 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.ebuild,v 1.2 2005/02/23 02:54:50 wolf31o2 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 games
-IUSE="nocd maps music sounds videos"
-DESCRIPTION="Heroes of Might and Magic III : The Restoration of Erathia - turn-based 2-D medieval combat"
-HOMEPAGE="http://www.lokigames.com/products/${PN}/"
-KEYWORDS="x86"
-
-# 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? ( ftp://ftp.planetmirror.com/pub/lokigames/updates/${PN}/${P}-cdrom-x86.run
-		ftp://snuffleupagus.animearchive.org/loki/updates/${PN}/${P}-cdrom-x86.run )
-	ppc? ( ftp://ftp.planetmirror.com/pub/lokigames/updates/${PN}/${P}-ppc.run
-		ftp://snuffleupagus.animearchive.org/loki/updates/${PN}/${P}-ppc.run )"
-
-LICENSE="LOKI-EULA"
-SLOT="0"
-RESTRICT="nostrip"
-
-DEPEND="virtual/libc
-	games-util/loki_patch"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-pkg_setup() {
-	check_license || die "License check failed"
-	use nocd && ewarn "The full installation takes about 341 MB of space!"
-	games_pkg_setup
-}
-
-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 xf ${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}
-
-	# 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 '{}' \;
-
-	insinto /usr/share/pixmaps
-	doins ${S}/heroes3.xpm
-
-	prepgamesdirs
-	make_desktop_entry heroes3 "Heroes of Might and Magic III" "heroes3.xpm"
-}
-
-pkg_postinst() {
-	einfo "To play the game run:"
-	einfo " heroes3"
-
-	games_pkg_postinst
-}