Don't use egamesinstall

Package-Manager: portage-2.1.2.9

3 files changed, 46 insertions, 25 deletions

diff --git a/games-strategy/xconq/ChangeLog b/games-strategy/xconq/ChangeLog
index 61d0fc50a6b9..8b1be226c632 100644
--- a/games-strategy/xconq/ChangeLog
+++ b/games-strategy/xconq/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/xconq
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/xconq/ChangeLog,v 1.9 2007/02/22 00:07:09 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xconq/ChangeLog,v 1.10 2007/06/11 16:42:06 nyhm Exp $
+
+  11 Jun 2007; Tristan Heaven <nyhm@gentoo.org> xconq-7.4.1.ebuild:
+  Don't use egamesinstall
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/games-strategy/xconq/Manifest b/games-strategy/xconq/Manifest
index 969d85e597b5..b6dfbf23fccb 100644
--- a/games-strategy/xconq/Manifest
+++ b/games-strategy/xconq/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xconq-gcc-3.4.patch 223 RMD160 286b8a0f3604eff1030234d35ca4c14a835e96fc SHA1 77545a35c1c84ee05a50c796efa27e6b26863769 SHA256 59e72407bef819ccabd9b1b0c175b8105a40521c3a8e33f370a63002074e695b
 MD5 678926da0bc080c8b9c755516e553ddb files/xconq-gcc-3.4.patch 223
 RMD160 286b8a0f3604eff1030234d35ca4c14a835e96fc files/xconq-gcc-3.4.patch 223
@@ -7,14 +10,14 @@ MD5 547f68c11af8a17bed0e26e6c08e385b files/xconq-tkconq.patch 3725
 RMD160 713a18e99c886f100a39cad1b9cb499e1a264ee4 files/xconq-tkconq.patch 3725
 SHA256 134dc49f74db073a5c0529450cd8094ccf890c6b9e096fa9d5d34d3dfda10397 files/xconq-tkconq.patch 3725
 DIST xconq-7.4.1.tar.gz 3402832 RMD160 e596eaccb6a48709e9ceb58fc59e715e36dbf43a SHA1 b7d03d17806500f05c23889a00b7608843a27ce7 SHA256 50d0d11887374a9351ec1235f6b93b1e9060fd852ca99a6700c76098e585f3ce
-EBUILD xconq-7.4.1.ebuild 1053 RMD160 ebf7d5d0b7ff486933e8250e0d9a7f95b1904a68 SHA1 a3036dec1e7a1e989069e592f738c304e17a0118 SHA256 fe941994a6b4ca9bb44f4cc6176842df83d8f7a95602c5c552376beda5204627
-MD5 a1669d013f2790ba65dc6da210a10bda xconq-7.4.1.ebuild 1053
-RMD160 ebf7d5d0b7ff486933e8250e0d9a7f95b1904a68 xconq-7.4.1.ebuild 1053
-SHA256 fe941994a6b4ca9bb44f4cc6176842df83d8f7a95602c5c552376beda5204627 xconq-7.4.1.ebuild 1053
-MISC ChangeLog 1123 RMD160 d7b04313058533cb0dfbe4bd6cc7e63082cd64ff SHA1 01822f33a9351239add9a8dbb617ecda905062c2 SHA256 f420af0b22067556f53b76ea3413e047174677e5fac44d00ecd47b74606d1656
-MD5 40aaaa81fa59a7bf0a6480e3b37dd92a ChangeLog 1123
-RMD160 d7b04313058533cb0dfbe4bd6cc7e63082cd64ff ChangeLog 1123
-SHA256 f420af0b22067556f53b76ea3413e047174677e5fac44d00ecd47b74606d1656 ChangeLog 1123
+EBUILD xconq-7.4.1.ebuild 1290 RMD160 5562341be251e008888e6fcc5f2b49655e532340 SHA1 731c7ea671a780984ea95ba3a44ff6c7554926a2 SHA256 6107d575e7f8076bc734dee845069a170d7e352113302e6c11031c6d57caeadc
+MD5 eaeb60545e8248378341828ed524e2e6 xconq-7.4.1.ebuild 1290
+RMD160 5562341be251e008888e6fcc5f2b49655e532340 xconq-7.4.1.ebuild 1290
+SHA256 6107d575e7f8076bc734dee845069a170d7e352113302e6c11031c6d57caeadc xconq-7.4.1.ebuild 1290
+MISC ChangeLog 1218 RMD160 e97b8a6e113a00c4baea618119474dccafee7bc4 SHA1 68102d9c1455fa8f0cae39ddc11f4c64aa2f2634 SHA256 c81ce4246853f0ef741bef0cf48e677277fb4d06e95247c81756af51ebc9c806
+MD5 6a8be8cfec7b3598df31b64ea17892a9 ChangeLog 1218
+RMD160 e97b8a6e113a00c4baea618119474dccafee7bc4 ChangeLog 1218
+SHA256 c81ce4246853f0ef741bef0cf48e677277fb4d06e95247c81756af51ebc9c806 ChangeLog 1218
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -22,3 +25,10 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 028c52409e7a9e083023f419f65a76f6 files/digest-xconq-7.4.1 238
 RMD160 21997ae1f3f6e282e82ee04912546332a40f0a6e files/digest-xconq-7.4.1 238
 SHA256 1b7c045dc114e710dd70938c1d4a4b85a169538297cd267878b98f2a4da96916 files/digest-xconq-7.4.1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGbXtkdz7hIScOURERAlzbAJ0dgphWMkaQ4IG/n+jKWfsXoq6/ewCfalYw
+oZBHzIQEifxXKG6Zf12hAOs=
+=icXg
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/xconq/xconq-7.4.1.ebuild b/games-strategy/xconq/xconq-7.4.1.ebuild
index 6f142c508880..573831ea8ac2 100644
--- a/games-strategy/xconq/xconq-7.4.1.ebuild
+++ b/games-strategy/xconq/xconq-7.4.1.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-strategy/xconq/xconq-7.4.1.ebuild,v 1.10 2006/12/06 21:12:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xconq/xconq-7.4.1.ebuild,v 1.11 2007/06/11 16:42:06 nyhm Exp $
 
 inherit eutils games
 
@@ -10,37 +10,45 @@ SRC_URI="ftp://sources.redhat.com/pub/xconq/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="ppc x86"
 IUSE=""
+RESTRICT="test"
 
-RDEPEND="x11-libs/libXmu
+DEPEND="x11-libs/libXmu
+	x11-libs/libXaw
 	dev-lang/tk
 	dev-lang/tcl"
-DEPEND="${RDEPEND}
-	x11-libs/libXaw"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-gcc-3.4.patch \
-		${FILESDIR}/${PN}-tkconq.patch
+	cd "${S}"
+	epatch \
+		"${FILESDIR}"/${PN}-gcc-3.4.patch \
+		"${FILESDIR}"/${PN}-tkconq.patch
 }
 
 src_compile() {
 	egamesconf \
-		--enable-alternate-scoresdir=${GAMES_STATEDIR}/${PN}/scores \
+		--enable-alternate-scoresdir="${GAMES_STATEDIR}"/${PN} \
 		|| die
 	emake \
 		CFLAGS="${CFLAGS}" \
-		datadir=${GAMES_DATADIR}/${PN} \
+		datadir="${GAMES_DATADIR}"/${PN} \
 		|| die "emake failed"
 }
 
 src_install() {
-	dodir ${GAMES_STATEDIR}/${PN} ${GAMES_DATADIR}/${PN}
-	egamesinstall \
-		scoresdir=${D}/${GAMES_STATEDIR}/${PN}/scores \
-		datadir=${D}/${GAMES_DATADIR}/${PN} \
-		|| die
+	dogamesbin x11/{imf2x,x2imf,xconq,ximfapp} || die "dogamesbin failed"
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r images lib tcltk/*.tcl || die "doins failed"
+	rm -f "${D}/${GAMES_DATADIR}"/${PN}/{images,lib}/{m,M}ake*
+
+	dodir "${GAMES_STATEDIR}"/${PN}
+	touch "${D}/${GAMES_STATEDIR}"/${PN}/scores.xcq
+	fperms 660 "${GAMES_STATEDIR}"/${PN}/scores.xcq || die
+
+	doman x11/${PN}.6
+	dodoc ChangeLog NEWS README
 	prepgamesdirs
 }