inherit multilib for get_libdir; remove virtual/x11 depends

Package-Manager: portage-2.1.2_pre1-r4

2 files changed, 25 insertions, 31 deletions

diff --git a/games-action/xpilot-ng/Manifest b/games-action/xpilot-ng/Manifest
index d8830ccb91e8..fe426bcded9e 100644
--- a/games-action/xpilot-ng/Manifest
+++ b/games-action/xpilot-ng/Manifest
@@ -1,26 +1,26 @@
-AUX xpilot-ng-4.7.2-xpngcc.patch 648 RMD160 f5bae034c80cb972ee6235ca2bf8d23c1b5df3bb SHA1 76dcaeed120b7f95daa6ac50806fbd250922ba49 SHA256 12973a163663e6a5f560737742dc51b0f0ba258ac01ea255184a8c70eda3d870 size 648
+AUX xpilot-ng-4.7.2-xpngcc.patch 648 RMD160 f5bae034c80cb972ee6235ca2bf8d23c1b5df3bb SHA1 76dcaeed120b7f95daa6ac50806fbd250922ba49 SHA256 12973a163663e6a5f560737742dc51b0f0ba258ac01ea255184a8c70eda3d870
 MD5 9b7788e28f812c96e29eee9b08512064 files/xpilot-ng-4.7.2-xpngcc.patch 648
 RMD160 f5bae034c80cb972ee6235ca2bf8d23c1b5df3bb files/xpilot-ng-4.7.2-xpngcc.patch 648
 SHA256 12973a163663e6a5f560737742dc51b0f0ba258ac01ea255184a8c70eda3d870 files/xpilot-ng-4.7.2-xpngcc.patch 648
-AUX xpilot-ng.png 3898 RMD160 a68fe7ffb0b2d4225b95233be950d65dc527c3ad SHA1 3461e7cccd99d006542bfa97d8f1dd63abd8967d SHA256 6c9ba1bb1d0bf20428df32453cc66b2fa93b28bebcb75237ccb3052e8e8c8dde size 3898
+AUX xpilot-ng.png 3898 RMD160 a68fe7ffb0b2d4225b95233be950d65dc527c3ad SHA1 3461e7cccd99d006542bfa97d8f1dd63abd8967d SHA256 6c9ba1bb1d0bf20428df32453cc66b2fa93b28bebcb75237ccb3052e8e8c8dde
 MD5 6a59beecfb391ade05576a309d463e89 files/xpilot-ng.png 3898
 RMD160 a68fe7ffb0b2d4225b95233be950d65dc527c3ad files/xpilot-ng.png 3898
 SHA256 6c9ba1bb1d0bf20428df32453cc66b2fa93b28bebcb75237ccb3052e8e8c8dde files/xpilot-ng.png 3898
-DIST xpilot-ng-4.6.6.tar.gz 2231395 RMD160 f9465cbdc190f12f16e9eaa91c7d36ef7f04a7ed SHA256 7c46776aa6a84639959fb15b8be79e42989bb8a8bb8988ce861d892a2665ef93 size 2231395
-DIST xpilot-ng-4.7.2.tar.gz 2807988 RMD160 acc4266fd14467168cf3412ed747c5377b34ed41 SHA256 31ef0f6b40779dd0ac5eb1bd17dd0908174e52991413fe25d623b6336d480fc0 size 2807988
-EBUILD xpilot-ng-4.6.6.ebuild 1152 RMD160 86f1f2fd5750f69a53d0e22d58b8a2f461c835c1 SHA1 67392cc883425f3dd42ffe781e2361fccea03bbb SHA256 9d9877e9c1fefe047350ca928dd24022b92ffb3b514efcb40e9d88d3fe6eea6c size 1152
+DIST xpilot-ng-4.6.6.tar.gz 2231395 RMD160 f9465cbdc190f12f16e9eaa91c7d36ef7f04a7ed SHA256 7c46776aa6a84639959fb15b8be79e42989bb8a8bb8988ce861d892a2665ef93
+DIST xpilot-ng-4.7.2.tar.gz 2807988 RMD160 acc4266fd14467168cf3412ed747c5377b34ed41 SHA256 31ef0f6b40779dd0ac5eb1bd17dd0908174e52991413fe25d623b6336d480fc0
+EBUILD xpilot-ng-4.6.6.ebuild 1152 RMD160 86f1f2fd5750f69a53d0e22d58b8a2f461c835c1 SHA1 67392cc883425f3dd42ffe781e2361fccea03bbb SHA256 9d9877e9c1fefe047350ca928dd24022b92ffb3b514efcb40e9d88d3fe6eea6c
 MD5 74d0f996e5c1da2c66f3d27ebf950eb3 xpilot-ng-4.6.6.ebuild 1152
 RMD160 86f1f2fd5750f69a53d0e22d58b8a2f461c835c1 xpilot-ng-4.6.6.ebuild 1152
 SHA256 9d9877e9c1fefe047350ca928dd24022b92ffb3b514efcb40e9d88d3fe6eea6c xpilot-ng-4.6.6.ebuild 1152
-EBUILD xpilot-ng-4.7.2-r1.ebuild 1863 RMD160 bd51117a9f7a4f2239fc1426bfdead915a1db8cc SHA1 19f068dd4718fa0e195170605090d02eec4f0a48 SHA256 6d21ca7212aec1cacb5a2a54921888628582f51e11f6e4152b77c0528e0dbffe size 1863
-MD5 221a6159ae1b1e0f72de74a962963ed3 xpilot-ng-4.7.2-r1.ebuild 1863
-RMD160 bd51117a9f7a4f2239fc1426bfdead915a1db8cc xpilot-ng-4.7.2-r1.ebuild 1863
-SHA256 6d21ca7212aec1cacb5a2a54921888628582f51e11f6e4152b77c0528e0dbffe xpilot-ng-4.7.2-r1.ebuild 1863
-MISC ChangeLog 1284 RMD160 81b66962ed4a9fb2fe904d40c6e868a381128857 SHA1 46101f84cdd98e7c9f0c5296799ffaa0bc407d4e SHA256 fc9af6edc0aab483a7e741b95bf0b287b4485e1e6a677e6a743bd1b3a71db4ab size 1284
+EBUILD xpilot-ng-4.7.2-r1.ebuild 1824 RMD160 5cb28b87b357ba1bb35a43f7ce246304408af872 SHA1 b169bf97c8caf16ba83cff752331255b5c96e53a SHA256 e4ba79fac60257d9b49d9fccfcc60879dde9a214bbfdc6687712d818db44e0b9
+MD5 b5c968b37057f345e65b287425a6bfb3 xpilot-ng-4.7.2-r1.ebuild 1824
+RMD160 5cb28b87b357ba1bb35a43f7ce246304408af872 xpilot-ng-4.7.2-r1.ebuild 1824
+SHA256 e4ba79fac60257d9b49d9fccfcc60879dde9a214bbfdc6687712d818db44e0b9 xpilot-ng-4.7.2-r1.ebuild 1824
+MISC ChangeLog 1284 RMD160 81b66962ed4a9fb2fe904d40c6e868a381128857 SHA1 46101f84cdd98e7c9f0c5296799ffaa0bc407d4e SHA256 fc9af6edc0aab483a7e741b95bf0b287b4485e1e6a677e6a743bd1b3a71db4ab
 MD5 64fd094f6f43618a5715bbbdf0a5690a ChangeLog 1284
 RMD160 81b66962ed4a9fb2fe904d40c6e868a381128857 ChangeLog 1284
 SHA256 fc9af6edc0aab483a7e741b95bf0b287b4485e1e6a677e6a743bd1b3a71db4ab ChangeLog 1284
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
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 1822066997e5..0656da616697 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,8 +1,8 @@
 # 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.7.2-r1.ebuild,v 1.2 2006/05/06 07:26:54 mr_bones_ Exp $
+# $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 $
 
-inherit python eutils games
+inherit python eutils multilib games
 
 DESCRIPTION="Improvement of the multiplayer space game XPilot"
 HOMEPAGE="http://xpilot.sourceforge.net/"
@@ -13,12 +13,9 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="openal sdl"
 
-RDEPEND="|| (
-	(
-		x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libSM )
-	virtual/x11 )
+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 )
@@ -29,12 +26,8 @@ RDEPEND="|| (
 		>=media-libs/sdl-image-1.0
 		>=media-libs/sdl-ttf-2.0 )"
 DEPEND="${RDEPEND}
-	|| (
-		(
-			x11-proto/xextproto
-			x11-proto/xproto
-			x11-libs/libXt )
-		virtual/x11 )"
+	x11-proto/xextproto
+	x11-proto/xproto"
 
 src_unpack() {
 	unpack ${A}
@@ -43,7 +36,8 @@ src_unpack() {
 
 	sed -i \
 		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \
-		contrib/xpngcc/config.py
+		contrib/xpngcc/config.py \
+		|| die "sed failed"
 }
 
 src_compile() {
@@ -61,14 +55,14 @@ src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog README
 	python_version
-	insinto ${GAMES_DATADIR}/${PN}/xpngcc
+	insinto "${GAMES_DATADIR}"/${PN}/xpngcc
 	doins contrib/xpngcc/*.py contrib/xpngcc/*.png
-	exeinto ${GAMES_DATADIR}/${PN}/xpngcc
+	exeinto "${GAMES_DATADIR}"/${PN}/xpngcc
 	doexe contrib/xpngcc/xpngcc.py
 	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
+	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
 	prepgamesdirs
 }