add patch from debian for gcc-34 support (bug #84329); add icon, man page (also from debian); add desktop entry; tidy

Package-Manager: portage-2.0.51.19

4 files changed, 30 insertions, 26 deletions

diff --git a/games-sports/trophy/ChangeLog b/games-sports/trophy/ChangeLog
index 5fde8477ae8c..b4fea03bdfc4 100644
--- a/games-sports/trophy/ChangeLog
+++ b/games-sports/trophy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-sports/trophy
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/trophy/ChangeLog,v 1.3 2004/06/24 23:25:42 agriffis Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/trophy/ChangeLog,v 1.4 2005/03/25 06:33:21 mr_bones_ Exp $
+
+  25 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org> trophy-1.1.3.ebuild:
+  add patch from debian for gcc-34 support (bug #84329); add icon, man page
+  (also from debian); add desktop entry; tidy
 
 *trophy-1.1.3 (31 Aug 2003)
 
diff --git a/games-sports/trophy/Manifest b/games-sports/trophy/Manifest
index 42050e8410f1..7276a3260def 100644
--- a/games-sports/trophy/Manifest
+++ b/games-sports/trophy/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c9e28e181aa7ca2e2f1a890d2d8d952d ChangeLog 380
+MD5 a4331eac77bdfcee644ccb06fe42cd48 ChangeLog 580
+MD5 f4c10886ae82cc61f65dbc48d9f4e5d6 trophy-1.1.3.ebuild 1483
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 7e18125c6b5fcca0fe6407c9b401876c trophy-1.1.3.ebuild 1204
-MD5 151be9101f56c25215330c6d473bdb51 files/digest-trophy-1.1.3 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBHyT5HTu7gpaalycRArmWAKCMhwtAIn34rNwSeWZHl1h2gEAU7ACfcFrG
-TPzkH3R+yffEB8tgjRU0HYQ=
-=L3jw
------END PGP SIGNATURE-----
+MD5 65452e9d6da090321d5c8e4551fad3d4 files/digest-trophy-1.1.3 134
diff --git a/games-sports/trophy/files/digest-trophy-1.1.3 b/games-sports/trophy/files/digest-trophy-1.1.3
index 1374be9d805d..d9051a963c0b 100644
--- a/games-sports/trophy/files/digest-trophy-1.1.3
+++ b/games-sports/trophy/files/digest-trophy-1.1.3
@@ -1 +1,2 @@
 MD5 45a8c6eec9ab5d110660a32416d1ec8f trophy-1.1.3-src.tar.gz 9330835
+MD5 b58571da1a90f378fcf911d1555fc710 trophy_1.1.3-2.diff.gz 6507
diff --git a/games-sports/trophy/trophy-1.1.3.ebuild b/games-sports/trophy/trophy-1.1.3.ebuild
index 7c584631cd84..7b40bde3e8d8 100644
--- a/games-sports/trophy/trophy-1.1.3.ebuild
+++ b/games-sports/trophy/trophy-1.1.3.ebuild
@@ -1,32 +1,36 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/trophy/trophy-1.1.3.ebuild,v 1.6 2004/08/15 08:54:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/trophy/trophy-1.1.3.ebuild,v 1.7 2005/03/25 06:33:21 mr_bones_ Exp $
 
-inherit games flag-o-matic
+inherit eutils flag-o-matic games
 
 MY_P="${P}-src"
-S="${WORKDIR}/${MY_P}"
 DESCRIPTION="2D Racing Game"
 HOMEPAGE="http://trophy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/trophy/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/trophy/${MY_P}.tar.gz
+	mirror://debian/pool/main/t/trophy/${PN}_${PV}-2.diff.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="=dev-games/clanlib-0.6.5*
 	>=media-libs/hermes-1.3.2
 	>=sys-libs/zlib-1.1.3"
 
+S=${WORKDIR}/${MY_P}
+
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
+	epatch "${WORKDIR}/${PN}_${PV}-2.diff"
 	find -name ".cvsignore" -exec rm -f \{\} \;
 	sed -i \
 		-e '/^EXTERN_LIBS/s:= := ${LDFLAGS} :' \
 		-e 's:-O3::' \
-		trophy/Makefile.in
+		trophy/Makefile.in \
+		|| die "sed failed"
 }
 
 src_compile() {
@@ -40,9 +44,14 @@ src_compile() {
 
 src_install() {
 	dogamesbin trophy/trophy || die
-	dodir ${GAMES_DATADIR}/trophy/resources
-	cp -R trophy/resources/* ${D}${GAMES_DATADIR}/trophy/resources
-	cp trophy/resources.scr ${D}${GAMES_DATADIR}/trophy/
+	dodir "${GAMES_DATADIR}/trophy/resources"
+	cp -R trophy/resources/* "${D}${GAMES_DATADIR}/trophy/resources" \
+		|| die "cp failed"
+	cp trophy/resources.scr "${D}${GAMES_DATADIR}/trophy/" \
+		|| die "cp failed"
 	dodoc AUTHORS README TODO ChangeLog
+	doman debian/trophy.6
+	doicon debian/trophy.xpm
+	make_desktop_entry trophy Trophy trophy.xpm
 	prepgamesdirs
 }