Prevent duplicate menu entry, bug #159848

Package-Manager: portage-2.1.2-r9

diff --git a/games-arcade/blobwars/ChangeLog b/games-arcade/blobwars/ChangeLog
index 95758eb97965d06455499889befe894054aebbcc..ecf043f4ffb3a6cc2899cb23bce44c2ade5a5ab1 100644 (file)
--- 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/Manifest b/games-arcade/blobwars/Manifest
index 71743c900241eb0704092b822dcca3b0543c0a51..ba5b39d372b372e3a35325da7425026a4ba5313b 100644 (file)
--- a/games-arcade/blobwars/Manifest
+++ b/games-arcade/blobwars/Manifest
@@ -10,14 +10,14 @@ MD5 e57d7d2e6f2272f668ec87abe594d951 files/blobwars-1.04-gcc41.patch 607
 RMD160 0ad237091ed4badada1b6c0ad6cd14be7d6cf893 files/blobwars-1.04-gcc41.patch 607
 SHA256 a2d547c3dfa826daf7d89b3e0f85b3aea818eb047ce107eb062d9a89587057e2 files/blobwars-1.04-gcc41.patch 607
 DIST blobwars-1.04-1.tar.gz 7682669 RMD160 d211649d6946cdf2db3170947f5ef9816ffcb653 SHA1 c351a8e4a507e0636b8856cdd174b7b131b2772d SHA256 84f62f364e5dc5dad138ee73a200827da987a840a092ead0a0e6d9cde551050f
-EBUILD blobwars-1.04.ebuild 2128 RMD160 51058067e1da1044a3aa6b24491b780fb74f0c04 SHA1 103486696de7398467dfe7ccc4309e2196e64342 SHA256 8bffb9bdd1bdf392a7896d020c57b96529daaef565e423168933c00cd6bfb304
-MD5 8a59d144cc2ae9d237c20dcaeebbcff7 blobwars-1.04.ebuild 2128
-RMD160 51058067e1da1044a3aa6b24491b780fb74f0c04 blobwars-1.04.ebuild 2128
-SHA256 8bffb9bdd1bdf392a7896d020c57b96529daaef565e423168933c00cd6bfb304 blobwars-1.04.ebuild 2128
-MISC ChangeLog 3490 RMD160 db87699c36ae83770d3de57515eb56726dbec7f9 SHA1 780b3df9a58146ee2a0c96779d13fcab909773cd SHA256 ed82b6bede96a712da1793a46dc85c0661942408e6b1b079100a7c2c8b0f024f
-MD5 23810fe6dabbfa50d1f802096b871337 ChangeLog 3490
-RMD160 db87699c36ae83770d3de57515eb56726dbec7f9 ChangeLog 3490
-SHA256 ed82b6bede96a712da1793a46dc85c0661942408e6b1b079100a7c2c8b0f024f ChangeLog 3490
+EBUILD blobwars-1.04.ebuild 1563 RMD160 516668034b932f26a30f3df150e85f46fe91a46a SHA1 1a4b27ea4d2eb9a29804a466da52a7c728d9657e SHA256 bea56b55f077eb57b2efa195080bd8df10849e426d37aff6ed46b412f1b33fd5
+MD5 72e1eedaaca25ea16605ba3100391414 blobwars-1.04.ebuild 1563
+RMD160 516668034b932f26a30f3df150e85f46fe91a46a blobwars-1.04.ebuild 1563
+SHA256 bea56b55f077eb57b2efa195080bd8df10849e426d37aff6ed46b412f1b33fd5 blobwars-1.04.ebuild 1563
+MISC ChangeLog 3600 RMD160 96d3c97120b4eccf8b56393dc813b705b2d69439 SHA1 c288486ac58d78e7959e2cf3da6a0b47ccd4877c SHA256 6d2943815f6bd3d6a3fbc8b815f13c0140a5666ed7053e24de5babe62e2fe555
+MD5 d6100ddf0e62ccf7f3aa25ddee506d86 ChangeLog 3600
+RMD160 96d3c97120b4eccf8b56393dc813b705b2d69439 ChangeLog 3600
+SHA256 6d2943815f6bd3d6a3fbc8b815f13c0140a5666ed7053e24de5babe62e2fe555 ChangeLog 3600
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -26,9 +26,9 @@ MD5 8104f636d0c55734848de669847d3bdb files/digest-blobwars-1.04 250
 RMD160 fd72b9000f958488a5e1ae64a4faa02028c20196 files/digest-blobwars-1.04 250
 SHA256 bc486eac49d01b5afb29ae159b2e03069bba4e4816db6f4c270e87104df9b284 files/digest-blobwars-1.04 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFZfrDdz7hIScOURERAknAAJwNXeYKBfHmU9plX5G5uhJBTc2SJgCfZJdW
-hRwdp1D4/i/89lOYl8ZppUM=
-=2F4l
+iD8DBQFF0n1Gdz7hIScOURERAvo8AJwLxx4vwqdzd1MzHkpX6NGVTCP3jgCg2sGC
+cuwhvk82P7P/eTny28zzHMU=
+=dW/0
 -----END PGP SIGNATURE-----

diff --git a/games-arcade/blobwars/blobwars-1.04.ebuild b/games-arcade/blobwars/blobwars-1.04.ebuild
index 65735d6b373d3ae95dfb55240ae98e0e1da415b1..d92fed678777ad565dbbe5f3e80623b60e4581f7 100644 (file)
--- 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
-}