Prevent duplicate menu entry, bug #159848

(Portage version: 2.1.2-r9)

2 files changed, 15 insertions, 28 deletions

diff --git a/games-arcade/blobwars/ChangeLog b/games-arcade/blobwars/ChangeLog
index 95758eb97965..ecf043f4ffb3 100644
--- a/games-arcade/blobwars/ChangeLog
+++ b/games-arcade/blobwars/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-arcade/blobwars
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/blobwars/ChangeLog,v 1.26 2006/06/22 16:27:10 mr_bones_ Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/blobwars/ChangeLog,v 1.27 2007/02/14 03:08:46 nyhm Exp $
+
+  14 Feb 2007; Tristan Heaven <nyhm@gentoo.org> blobwars-1.04.ebuild:
+  Prevent duplicate menu entry, bug #159848
 
   22 Jun 2006; Michael Sterrett <mr_bones_@gentoo.org> blobwars-1.04.ebuild:
   Avoid prestripped binaries (bug #137588) - patch from Tristan Heaven
diff --git a/games-arcade/blobwars/blobwars-1.04.ebuild b/games-arcade/blobwars/blobwars-1.04.ebuild
index 65735d6b373d..d92fed678777 100644
--- a/games-arcade/blobwars/blobwars-1.04.ebuild
+++ b/games-arcade/blobwars/blobwars-1.04.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/blobwars/blobwars-1.04.ebuild,v 1.8 2006/06/22 16:27:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/blobwars/blobwars-1.04.ebuild,v 1.9 2007/02/14 03:08:46 nyhm Exp $
 
 inherit eutils games
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 ppc ~sparc x86"
 IUSE=""
 
-DEPEND=">=media-libs/libsdl-1.2.5
+DEPEND="media-libs/libsdl
 	media-libs/sdl-mixer
 	media-libs/sdl-ttf
 	media-libs/sdl-image"
@@ -22,8 +22,9 @@ DEPEND=">=media-libs/libsdl-1.2.5
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-be_pak.diff \
-		"${FILESDIR}/${P}"-gcc41.patch
+	epatch \
+		"${FILESDIR}"/${PV}-be_pak.diff \
+		"${FILESDIR}"/${P}-gcc41.patch
 	# bug #137588
 	sed -i \
 		-e '/strip/d' makefile \
@@ -32,24 +33,20 @@ src_unpack() {
 
 src_compile() {
 	emake \
-		BINDIR="${GAMES_BINDIR}/" \
 		DATADIR="${GAMES_DATADIR}/parallelrealities/" \
 		DOCDIR="/usr/share/doc/${PF}/" \
-		ICONDIR="/usr/share/icons/" \
-		KDE="/usr/share/applnk/Games/Arcade/" \
-		GNOME="/usr/share/gnome/apps/Games/" \
 		|| die "emake failed"
 }
 
 src_install() {
-	make \
+	emake \
 		BINDIR="${D}/${GAMES_BINDIR}/" \
 		DATADIR="${D}/${GAMES_DATADIR}/parallelrealities/" \
 		DOCDIR="${D}/usr/share/doc/${PF}/" \
 		ICONDIR="${D}/usr/share/icons/" \
-		KDE="${D}/usr/share/applnk/Games/Arcade/" \
-		GNOME="${D}/usr/share/gnome/apps/Games/" \
-		install || die "make install failed"
+		KDE="${D}/usr/share/applications/" \
+		GNOME="${D}/usr/share/applications/" \
+		install || die "emake install failed"
 	# now make the docs Gentoo friendly.
 	dohtml "${D}/usr/share/doc/${PF}/"*
 	dodoc "${D}/usr/share/doc/${PF}/"{CHANGES,HACKING,PORTING,README}
@@ -57,16 +54,3 @@ src_install() {
 		"${D}/usr/share/doc/${PF}/"{CHANGES,HACKING,LICENSE,PORTING,README}
 	prepgamesdirs
 }
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	echo
-	ewarn "${PN} ${PV} may not be save-game compatible with previous versions."
-	einfo "Please remove the directory ~/.parallelrealities/blobwars before playing if it exists."
-	echo
-	einfo "If you have older save files and you wish to continue those games,"
-	einfo "you'll need to remerge the version with which you started"
-	einfo "those save-games."
-	echo
-}