Patch from Tristan Heaven to avoid broken test and tidy (bug #137892)

Package-Manager: portage-2.1.1_pre1-r2

3 files changed, 28 insertions, 20 deletions

diff --git a/games-misc/yadex/ChangeLog b/games-misc/yadex/ChangeLog
index d34bc9a35042..114e7f662215 100644
--- a/games-misc/yadex/ChangeLog
+++ b/games-misc/yadex/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-misc/yadex
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/yadex/ChangeLog,v 1.5 2006/04/03 17:34:09 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/yadex/ChangeLog,v 1.6 2006/06/25 00:12:34 mr_bones_ Exp $
+
+  25 Jun 2006; Michael Sterrett <mr_bones_@gentoo.org> yadex-1.7.0.ebuild:
+  Patch from Tristan Heaven to avoid broken test and tidy (bug #137892)
 
   03 Apr 2006; <Tupone@gentoo.org>
   +files/yadex-1.7.0-NULL-is-not-zero.patch, yadex-1.7.0.ebuild:
diff --git a/games-misc/yadex/Manifest b/games-misc/yadex/Manifest
index 35c08357a682..70a31c36fc19 100644
--- a/games-misc/yadex/Manifest
+++ b/games-misc/yadex/Manifest
@@ -1,25 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9cf9a89fa097b6a6dee07a7a090a5369 ChangeLog 747
-RMD160 0a397d8fe04f1051b0ccf17815cde0c203f00b86 ChangeLog 747
-SHA256 d0ad2b690b95909aa2d05e28eccecd61a4a080fb6314c09860de5cc258d2d8cc ChangeLog 747
-MD5 899065e4e0b2e62903d1a79cd1936325 files/digest-yadex-1.7.0 235
-RMD160 02d97f37de8d722133404768671d202b9208f966 files/digest-yadex-1.7.0 235
-SHA256 abc3ef125fe30d0ae08575cd4cd2eaf4944ea1fd74f881f67ca82aaa14b773c0 files/digest-yadex-1.7.0 235
+AUX yadex-1.7.0-NULL-is-not-zero.patch 406 RMD160 9ee842efd8b00fb1c8170b050da0aff4a8030339 SHA1 d6580b6ddd2c8baf37898ee74a2f23c3d3df93c3 SHA256 08d881eef844a7a7417feffdab473b557b43c6c240905cf05ea917504213c2dc
 MD5 37d61c81a7658a393a3eec9537b7a376 files/yadex-1.7.0-NULL-is-not-zero.patch 406
 RMD160 9ee842efd8b00fb1c8170b050da0aff4a8030339 files/yadex-1.7.0-NULL-is-not-zero.patch 406
 SHA256 08d881eef844a7a7417feffdab473b557b43c6c240905cf05ea917504213c2dc files/yadex-1.7.0-NULL-is-not-zero.patch 406
+DIST yadex-1.7.0.tar.gz 551318 RMD160 6f86e6aa1fd9c9241a883f03fd9567eac8d83887 SHA256 316aca295b647b45d6d0d359fd7bba0448e7e114d295347add7ac0e87aa0f446
+EBUILD yadex-1.7.0.ebuild 1261 RMD160 ca5d1f2b65d85952c7bc9dcace7f68a75bec60b1 SHA1 44470d50e1e3510059ccb07f5cf158e2bbfaf0b8 SHA256 7356e2a3eb63c47bcccf45e452ebe6cef5cd881a2ad7bcd7e79c02bb4cf9b658
+MD5 9df17b52c854df3fe32964d74b27f5dc yadex-1.7.0.ebuild 1261
+RMD160 ca5d1f2b65d85952c7bc9dcace7f68a75bec60b1 yadex-1.7.0.ebuild 1261
+SHA256 7356e2a3eb63c47bcccf45e452ebe6cef5cd881a2ad7bcd7e79c02bb4cf9b658 yadex-1.7.0.ebuild 1261
+MISC ChangeLog 898 RMD160 103713f78f9deb0498f246995930a7de60be5856 SHA1 49a8a19cc7fc2424040c8c29b5014f602b43d470 SHA256 50fdb71ac396f4778531fca07d4fad44531212d69eaa21c6959431b99f70e913
+MD5 0c38add9d706d330e999798b4f32ee6f ChangeLog 898
+RMD160 103713f78f9deb0498f246995930a7de60be5856 ChangeLog 898
+SHA256 50fdb71ac396f4778531fca07d4fad44531212d69eaa21c6959431b99f70e913 ChangeLog 898
+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
-MD5 71d2217d1043e63b69eed1bc02236d2c yadex-1.7.0.ebuild 1263
-RMD160 71c6ab19466ce9ce8047b9033492bc63a907d510 yadex-1.7.0.ebuild 1263
-SHA256 bf41d138a08e8cf0bfdc2b5de4afa4574a2c51c8851f450c1a467a080daebace yadex-1.7.0.ebuild 1263
+MD5 899065e4e0b2e62903d1a79cd1936325 files/digest-yadex-1.7.0 235
+RMD160 02d97f37de8d722133404768671d202b9208f966 files/digest-yadex-1.7.0 235
+SHA256 abc3ef125fe30d0ae08575cd4cd2eaf4944ea1fd74f881f67ca82aaa14b773c0 files/digest-yadex-1.7.0 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEMVyy2CTtIKiFlQIRArRNAKCamzWRjkWoE5lKyHDwih2FSq+jswCeO452
-grOIWYGwEAdzSzrsLlYOwCY=
-=HkHM
+iD8DBQFEndWZ9AbAhSK0CiwRAhyVAKCGHk0/SutRRIknhD7/vP0WZpWV6gCfeUZZ
+PiYBFHVJ5rD+z0Kte+lfdlg=
+=UvGS
 -----END PGP SIGNATURE-----
diff --git a/games-misc/yadex/yadex-1.7.0.ebuild b/games-misc/yadex/yadex-1.7.0.ebuild
index d011450de037..483eadf80d6f 100644
--- a/games-misc/yadex/yadex-1.7.0.ebuild
+++ b/games-misc/yadex/yadex-1.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/yadex/yadex-1.7.0.ebuild,v 1.6 2006/04/03 17:34:09 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/yadex/yadex-1.7.0.ebuild,v 1.7 2006/06/25 00:12:34 mr_bones_ Exp $
 
 inherit games
 
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc x86"
 IUSE=""
+RESTRICT="test"
 
 DEPEND="|| ( x11-libs/libX11 virtual/x11 )"
 
@@ -19,11 +20,11 @@ src_unpack() {
 	unpack ${A}
 	sed -i \
 		-e '/iwad/s/local\///' \
-		${S}/yadex.cfg \
+		"${S}"/yadex.cfg \
 		|| die "sed yadex.cfg failed"
 	epatch "${FILESDIR}/${P}"-NULL-is-not-zero.patch
 	# Force the patched file to be old, otherwise the compile fails
-	touch -t 196910101010 ${S}/src/wadlist.cc
+	touch -t 196910101010 "${S}"/src/wadlist.cc
 }
 
 src_compile() {
@@ -34,13 +35,12 @@ src_compile() {
 
 src_install() {
 	dogamesbin obj/0/yadex || die "dogamesbin failed"
-	insinto "${GAMES_DATADIR}/${PN}/${PV}/"
+	insinto "${GAMES_DATADIR}/${PN}/${PV}"
 	doins ygd/* || die "doins failed (data)"
 	doman doc/yadex.6
 	dodoc CHANGES FAQ README TODO VERSION
 	dohtml doc/*
-	insinto /etc/yadex/${PV}/
-	doins yadex.cfg                       || die "doins failed (cfg)"
-
+	insinto /etc/yadex/${PV}
+	doins yadex.cfg || die "doins failed (cfg)"
 	prepgamesdirs
 }