--- /usr/portage/games-misc/yadex/yadex-1.7.0.ebuild	2006-04-03 18:36:05.000000000 +0100
+++ yadex-1.7.0.ebuild	2006-06-25 00:11:55.000000000 +0100
@@ -12,6 +12,7 @@
 SLOT="0"
 KEYWORDS="~ppc x86"
 IUSE=""
+RESTRICT="test"
 
 DEPEND="|| ( x11-libs/libX11 virtual/x11 )"
 
@@ -19,11 +20,11 @@
 	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_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
 }