Move icon to mirror://gentoo

(Portage version: 2.1.2-r9)

6 files changed, 22 insertions, 64 deletions

diff --git a/games-action/xpilot-ng/ChangeLog b/games-action/xpilot-ng/ChangeLog
index c573be7621ba..a9749d8326c3 100644
--- a/games-action/xpilot-ng/ChangeLog
+++ b/games-action/xpilot-ng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/xpilot-ng
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot-ng/ChangeLog,v 1.8 2006/12/01 20:01:36 wolf31o2 Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot-ng/ChangeLog,v 1.9 2007/02/14 00:39:46 nyhm Exp $
+
+  14 Feb 2007; Tristan Heaven <nyhm@gentoo.org> -files/xpilot-ng.png,
+  xpilot-ng-4.7.2-r1.ebuild:
+  Move icon to mirror://gentoo
 
   01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   xpilot-ng-4.6.6.ebuild:
diff --git a/games-action/xpilot-ng/files/digest-xpilot-ng-4.6.6 b/games-action/xpilot-ng/files/digest-xpilot-ng-4.6.6
deleted file mode 100644
index 16f46eca16f0..000000000000
--- a/games-action/xpilot-ng/files/digest-xpilot-ng-4.6.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 785278551aa85356b44f907be1052bc3 xpilot-ng-4.6.6.tar.gz 2231395
-RMD160 f9465cbdc190f12f16e9eaa91c7d36ef7f04a7ed xpilot-ng-4.6.6.tar.gz 2231395
-SHA256 7c46776aa6a84639959fb15b8be79e42989bb8a8bb8988ce861d892a2665ef93 xpilot-ng-4.6.6.tar.gz 2231395
diff --git a/games-action/xpilot-ng/files/digest-xpilot-ng-4.7.2-r1 b/games-action/xpilot-ng/files/digest-xpilot-ng-4.7.2-r1
index 05c4083bd2b7..1fe286d9dc7c 100644
--- a/games-action/xpilot-ng/files/digest-xpilot-ng-4.7.2-r1
+++ b/games-action/xpilot-ng/files/digest-xpilot-ng-4.7.2-r1
@@ -1,3 +1,6 @@
 MD5 b922251ab9c69f87567c9606304ee589 xpilot-ng-4.7.2.tar.gz 2807988
 RMD160 acc4266fd14467168cf3412ed747c5377b34ed41 xpilot-ng-4.7.2.tar.gz 2807988
 SHA256 31ef0f6b40779dd0ac5eb1bd17dd0908174e52991413fe25d623b6336d480fc0 xpilot-ng-4.7.2.tar.gz 2807988
+MD5 6a59beecfb391ade05576a309d463e89 xpilot-ng.png 3898
+RMD160 a68fe7ffb0b2d4225b95233be950d65dc527c3ad xpilot-ng.png 3898
+SHA256 6c9ba1bb1d0bf20428df32453cc66b2fa93b28bebcb75237ccb3052e8e8c8dde xpilot-ng.png 3898
diff --git a/games-action/xpilot-ng/files/xpilot-ng.png b/games-action/xpilot-ng/files/xpilot-ng.png
deleted file mode 100644
index 339c23b4f54f..000000000000
--- a/games-action/xpilot-ng/files/xpilot-ng.png
+++ /dev/null
diff --git a/games-action/xpilot-ng/xpilot-ng-4.6.6.ebuild b/games-action/xpilot-ng/xpilot-ng-4.6.6.ebuild
deleted file mode 100644
index 54f2088f8b0b..000000000000
--- a/games-action/xpilot-ng/xpilot-ng-4.6.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot-ng/xpilot-ng-4.6.6.ebuild,v 1.4 2006/12/01 20:01:36 wolf31o2 Exp $
-
-inherit games
-
-DESCRIPTION="Improvement of the multiplayer space game XPilot"
-HOMEPAGE="http://xpilot.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xpilot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="openal sdl"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libICE
-	x11-libs/libSM 
-	>=dev-libs/expat-1.1
-	>=sys-libs/zlib-1.1.3
-	openal? ( media-libs/openal )
-	sdl? (
-		virtual/opengl
-		>=media-libs/libsdl-1.2.0
-		>=media-libs/sdl-image-1.0
-		>=media-libs/sdl-ttf-2.0 )"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-libs/libXt"
-
-src_compile() {
-	egamesconf \
-		--disable-dependency-tracking \
-		$(use_enable sdl sdl-client) \
-		$(use_enable openal sound) \
-		|| die
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README
-	prepgamesdirs
-}
-
diff --git a/games-action/xpilot-ng/xpilot-ng-4.7.2-r1.ebuild b/games-action/xpilot-ng/xpilot-ng-4.7.2-r1.ebuild
index 0656da616697..6979d90726ee 100644
--- a/games-action/xpilot-ng/xpilot-ng-4.7.2-r1.ebuild
+++ b/games-action/xpilot-ng/xpilot-ng-4.7.2-r1.ebuild
@@ -1,12 +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-action/xpilot-ng/xpilot-ng-4.7.2-r1.ebuild,v 1.3 2006/09/28 17:07:16 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot-ng/xpilot-ng-4.7.2-r1.ebuild,v 1.4 2007/02/14 00:39:46 nyhm Exp $
 
 inherit python eutils multilib games
 
 DESCRIPTION="Improvement of the multiplayer space game XPilot"
 HOMEPAGE="http://xpilot.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xpilot/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/xpilot/${P}.tar.gz
+	mirror://gentoo/${PN}.png"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,15 +17,15 @@ IUSE="openal sdl"
 RDEPEND="x11-libs/libX11
 	x11-libs/libICE
 	x11-libs/libSM
-	>=dev-libs/expat-1.1
-	>=sys-libs/zlib-1.1.3
+	dev-libs/expat
 	openal? ( media-libs/openal )
-	dev-python/wxpython
+	>=dev-python/wxpython-2.6
 	sdl? (
 		virtual/opengl
-		>=media-libs/libsdl-1.2.0
-		>=media-libs/sdl-image-1.0
-		>=media-libs/sdl-ttf-2.0 )"
+		media-libs/libsdl
+		media-libs/sdl-image
+		media-libs/sdl-ttf
+	)"
 DEPEND="${RDEPEND}
 	x11-proto/xextproto
 	x11-proto/xproto"
@@ -52,7 +53,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog README
 	python_version
 	insinto "${GAMES_DATADIR}"/${PN}/xpngcc
@@ -62,7 +63,7 @@ src_install() {
 	dodir /usr/$(get_libdir)/python${PYVER}/site-packages
 	dosym "${GAMES_DATADIR}"/${PN}/xpngcc /usr/$(get_libdir)/python${PYVER}/site-packages/xpngcc
 	dosym "${GAMES_DATADIR}"/${PN}/xpngcc/xpngcc.py "${GAMES_BINDIR}"/xpilot-ng
-	doicon "${FILESDIR}"/${PN}.png
-	make_desktop_entry ${PN} "XPilot NG" ${PN}.png
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} "XPilot NG"
 	prepgamesdirs
 }