Install menu entry, bug #159849

Package-Manager: portage-2.1.2.2

diff --git a/games-simulation/cannonsmash/ChangeLog b/games-simulation/cannonsmash/ChangeLog
index df305fae0013865792180c6fd7fed9f7e97c7f0b..d34ca45a297e466f5e252b5eceb3c3e3e6d40e75 100644 (file)
--- a/games-simulation/cannonsmash/ChangeLog
+++ b/games-simulation/cannonsmash/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-simulation/cannonsmash
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/cannonsmash/ChangeLog,v 1.16 2006/11/03 03:03:09 nyhm Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/cannonsmash/ChangeLog,v 1.17 2007/03/12 16:48:07 nyhm Exp $
+
+  12 Mar 2007; Tristan Heaven <nyhm@gentoo.org> cannonsmash-0.6.6.ebuild:
+  Install menu entry, bug #159849
 
   03 Nov 2006; Tristan Heaven <nyhm@gentoo.org> cannonsmash-0.6.6.ebuild:
   Add nls dependencies

diff --git a/games-simulation/cannonsmash/Manifest b/games-simulation/cannonsmash/Manifest
index bba2fbbff02ac4ed44659da5534689cd3cdb3ccb..5fb86f80e1da0d88da2ba8e0fb028547136f41db 100644 (file)
--- a/games-simulation/cannonsmash/Manifest
+++ b/games-simulation/cannonsmash/Manifest
@@ -15,14 +15,14 @@ RMD160 41d3ba81a7b74ddd493b1c0a7ca78931ac9ff897 files/cannonsmash-0.6.6-x-inc.pa
 SHA256 29a261f5a92764061870fcafc84d4517f6d80249453a4daa2cfdb898833a2b7b files/cannonsmash-0.6.6-x-inc.patch 305
 DIST csmash-0.6.6.tar.gz 1989943 RMD160 8378b7e95ab179f67ebb90423a7c2b45144e226b SHA1 1e6bc2bf6f01b9c1d6dbbd40b17a2d95dff3a3e5 SHA256 1be0b27dac46ba891b955bf8f122151baea6ee05b3c29616a09423250cfd9d3d
 DIST danslatristesse2-48.ogg 1070787 RMD160 77782fd73b575f0b25b575c0f9c6baa4c9c21872 SHA1 79e25e6999f3dccc90871330f1d992f84d6127a1 SHA256 aab5b276bc55ecad65c4b2e17f11daa6d173fc077e982e42997f10695f070bfe
-EBUILD cannonsmash-0.6.6.ebuild 1561 RMD160 4203c3ec28288373562252a3a442171713681b9f SHA1 e57e034af15a3283c2bc984530b7a3704f96a928 SHA256 ac152b0a358d68c60200834363bfeea59ac7550929922c0b46bdb0c5df51c704
-MD5 dfaf57062e035e44237a3e93b4640204 cannonsmash-0.6.6.ebuild 1561
-RMD160 4203c3ec28288373562252a3a442171713681b9f cannonsmash-0.6.6.ebuild 1561
-SHA256 ac152b0a358d68c60200834363bfeea59ac7550929922c0b46bdb0c5df51c704 cannonsmash-0.6.6.ebuild 1561
-MISC ChangeLog 2624 RMD160 923576f8ab294cdd42bc9d0d0d2c4cf9202f470d SHA1 4c738730de3de93632f2f1491bfc6b6e3a93cb75 SHA256 291b510b31ba50f8303cf606220dd952270e8ba57a6e2aa38e79d3eba081c803
-MD5 5920a645572abf2ec40eea25549d0c48 ChangeLog 2624
-RMD160 923576f8ab294cdd42bc9d0d0d2c4cf9202f470d ChangeLog 2624
-SHA256 291b510b31ba50f8303cf606220dd952270e8ba57a6e2aa38e79d3eba081c803 ChangeLog 2624
+EBUILD cannonsmash-0.6.6.ebuild 1574 RMD160 f5a9197a468021225489ce41c7d0f8f6cf75637a SHA1 45d9eb7a76e692a0f4abde3a72a2bab8373174c5 SHA256 8192e85c48217bcb7c9f9e8e53a0fa3edf5ab261e846b1cbc4c89dc1cd8f770e
+MD5 4533ed20f4c7be98714959393e611e1e cannonsmash-0.6.6.ebuild 1574
+RMD160 f5a9197a468021225489ce41c7d0f8f6cf75637a cannonsmash-0.6.6.ebuild 1574
+SHA256 8192e85c48217bcb7c9f9e8e53a0fa3edf5ab261e846b1cbc4c89dc1cd8f770e cannonsmash-0.6.6.ebuild 1574
+MISC ChangeLog 2733 RMD160 2e6beeb1e3705017b1b76febbbec48f3b8334cf6 SHA1 4374dcfd3f5feb82c65ce5b5b5fc7b145d932e4e SHA256 5098ccc04606906a897669289e3cba641aa7305d686351c18fc18364e662ab3a
+MD5 e813562caf0ce684ca92c53aa87e562b ChangeLog 2733
+RMD160 2e6beeb1e3705017b1b76febbbec48f3b8334cf6 ChangeLog 2733
+SHA256 5098ccc04606906a897669289e3cba641aa7305d686351c18fc18364e662ab3a ChangeLog 2733
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -31,9 +31,9 @@ MD5 ca7bcea7a8d39ab6a5aedaee2825d1f8 files/digest-cannonsmash-0.6.6 494
 RMD160 e4b91f3943a1136c5f54a4b3e9c76c37c972cc59 files/digest-cannonsmash-0.6.6 494
 SHA256 010f829451411cbb57808533c5e54a598601bb8274c84d572625a62b70962aa0 files/digest-cannonsmash-0.6.6 494
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFSrFzdz7hIScOURERApI6AJ0QyBTjzFxTsi2k2xG0Xh87oc4ZoQCfXLJn
-IKEIyTvXho9QAst3pCzMlmo=
-=JE7A
+iD8DBQFF9YROdz7hIScOURERAmPiAKCFb8XqdmfmUxQcu5xt4NSR3IrzUACfWe3y
+Sfjpi+jxCfKTSxI9L4Td7Bc=
+=b2ly
 -----END PGP SIGNATURE-----

diff --git a/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild b/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild
index ae9e0358d07dde43c3696129fcece85531d940ee..c976d1120caeddd41b5dce37e91888ee21265988 100644 (file)
--- a/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild
+++ b/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild
@@ -1,13 +1,13 @@
-# 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-simulation/cannonsmash/cannonsmash-0.6.6.ebuild,v 1.12 2006/11/03 03:03:09 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild,v 1.13 2007/03/12 16:48:07 nyhm Exp $
 
 inherit eutils games
 
 MY_OGG=danslatristesse2-48.ogg
 DESCRIPTION="3D tabletennis game"
 HOMEPAGE="http://cannonsmash.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cannonsmash/csmash-${PV}.tar.gz
+SRC_URI="mirror://sourceforge/${PN}/csmash-${PV}.tar.gz
        vorbis? ( http://nan.p.utmc.or.jp/${MY_OGG} )"
 
 LICENSE="GPL-2"
@@ -15,12 +15,11 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="vorbis nls"
 
-RDEPEND="x11-libs/libXmu
-       virtual/opengl
+RDEPEND="virtual/opengl
        virtual/glu
-       >=media-libs/libsdl-1.2.4
-       >=media-libs/sdl-mixer-1.2.3
-       >=media-libs/sdl-image-1.2.2
+       media-libs/libsdl
+       media-libs/sdl-mixer
+       media-libs/sdl-image
        =x11-libs/gtk+-2*
        nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
@@ -36,10 +35,9 @@ src_unpack() {
                "${FILESDIR}"/${P}-sizeof-cast.patch \
                "${FILESDIR}"/${P}-gcc41.patch
        if use vorbis ; then
-               cp "${DISTDIR}"/${MY_OGG} "${S}"/ || die "cp failed"
                sed -i \
                        -e "s:${MY_OGG}:${GAMES_DATADIR}/csmash/${MY_OGG}:" ttinc.h \
-                       || die "setting ogg loc"
+                       || die "sed failed"
        fi
 }
 
@@ -57,8 +55,10 @@ src_install() {
        emake DESTDIR="${D}" install || die "emake install failed"
        if use vorbis ; then
                insinto "${GAMES_DATADIR}"/csmash
-               doins ${MY_OGG} || die "doins failed"
+               doins "${DISTDIR}"/${MY_OGG} || die "doins failed"
        fi
+       newicon win32/orange.ico ${PN}.ico
+       make_desktop_entry csmash "Cannon Smash" /usr/share/pixmaps/${PN}.ico
        dodoc AUTHORS CREDITS README*
        prepgamesdirs
 }