RESTRICT="test" and cleanup

Package-Manager: portage-2.1.3_rc6

4 files changed, 34 insertions, 55 deletions

diff --git a/games-engines/xzip/ChangeLog b/games-engines/xzip/ChangeLog
index e9ddb4597bbe..52861641bfa8 100644
--- a/games-engines/xzip/ChangeLog
+++ b/games-engines/xzip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-engines/xzip
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/xzip/ChangeLog,v 1.9 2007/02/21 23:36:14 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/xzip/ChangeLog,v 1.10 2007/07/01 23:13:59 nyhm Exp $
+
+  01 Jul 2007; Tristan Heaven <nyhm@gentoo.org>
+  -files/xzip-182-makefile.diff, xzip-1.8.2-r2.ebuild:
+  RESTRICT="test" and cleanup
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/games-engines/xzip/Manifest b/games-engines/xzip/Manifest
index 539788533f8c..77864a9d97dd 100644
--- a/games-engines/xzip/Manifest
+++ b/games-engines/xzip/Manifest
@@ -1,16 +1,15 @@
-AUX xzip-182-makefile.diff 924 RMD160 82939b4624906cb3f7e286e2ceec8ca8bc028b62 SHA1 14ceaaa47f4e5720ec87c330b3e5dbfed39f6de2 SHA256 cf3cd37c7afe12f1fb8579012933e770078b6dcdb30a8dd8d58ee4709901106b
-MD5 a10d0477fa1b6c764f14caaf7644037f files/xzip-182-makefile.diff 924
-RMD160 82939b4624906cb3f7e286e2ceec8ca8bc028b62 files/xzip-182-makefile.diff 924
-SHA256 cf3cd37c7afe12f1fb8579012933e770078b6dcdb30a8dd8d58ee4709901106b files/xzip-182-makefile.diff 924
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST xzip182.tar.Z 136032 RMD160 169d29a57ce29791b9aafd07005dfd8535fa45c0 SHA1 9e3b2b155223d9092764413d75803333da7f8a36 SHA256 46d2cee7bbabce7068034c75df49ec4a03165fcc07490d406c7e33152269ffb2
-EBUILD xzip-1.8.2-r2.ebuild 765 RMD160 1c62b974180ddbafc20f6232db7e881574db1f5d SHA1 f76c2cd3f5b2e65b8f421515d3269be72c0ba820 SHA256 39e30d0ee19301de8e1c67ba4246c765a06ba952576f2cb1ab1a6db052781c6d
-MD5 51509c21a6510f04cd99e773eb802e8c xzip-1.8.2-r2.ebuild 765
-RMD160 1c62b974180ddbafc20f6232db7e881574db1f5d xzip-1.8.2-r2.ebuild 765
-SHA256 39e30d0ee19301de8e1c67ba4246c765a06ba952576f2cb1ab1a6db052781c6d xzip-1.8.2-r2.ebuild 765
-MISC ChangeLog 1586 RMD160 e3d818e932c5b8ec203ecabfca3c56ce15b64b05 SHA1 575e6e2e04fa28841dea29decaa94300a1b21486 SHA256 a5598978ff0753dfa2c6a68cc929f559b7f0e4bf40ac9e54ecacfac02967ba15
-MD5 b134f9538ffc5ba8ac5fd96b634e4ace ChangeLog 1586
-RMD160 e3d818e932c5b8ec203ecabfca3c56ce15b64b05 ChangeLog 1586
-SHA256 a5598978ff0753dfa2c6a68cc929f559b7f0e4bf40ac9e54ecacfac02967ba15 ChangeLog 1586
+EBUILD xzip-1.8.2-r2.ebuild 734 RMD160 7724fd62a1e329e7384125ff123fd2216151771a SHA1 9c2ee849cf3608efb1351a5cbaba76aa58655eae SHA256 40272bb51b3549514f93d5771c1bcff2fdc397701b9e839106a4e2e203ce2eb2
+MD5 b7edcb6f63aabc37c3105af909b2adfd xzip-1.8.2-r2.ebuild 734
+RMD160 7724fd62a1e329e7384125ff123fd2216151771a xzip-1.8.2-r2.ebuild 734
+SHA256 40272bb51b3549514f93d5771c1bcff2fdc397701b9e839106a4e2e203ce2eb2 xzip-1.8.2-r2.ebuild 734
+MISC ChangeLog 1720 RMD160 ae37014a067bcc28e5660296cd7fb1c9b9c934c9 SHA1 632686e4b9411125c9ac7420be2d00b783ee8cc0 SHA256 59d46ac65bd08f9589f962191bec47604a0a8722b2967f3eb6fa4f9d06846e6b
+MD5 f2ff9dc448b9c340da39e6dbf47a7956 ChangeLog 1720
+RMD160 ae37014a067bcc28e5660296cd7fb1c9b9c934c9 ChangeLog 1720
+SHA256 59d46ac65bd08f9589f962191bec47604a0a8722b2967f3eb6fa4f9d06846e6b ChangeLog 1720
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -18,3 +17,10 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 aa37f1c9b170d703b6afe6824340b77a files/digest-xzip-1.8.2-r2 220
 RMD160 1c41e48877d492178e81018533b2dd3a30278782 files/digest-xzip-1.8.2-r2 220
 SHA256 25efef6e8dcb0a36244ae1efa225b6251393c0a20c526873de77a14eea6ec6b8 files/digest-xzip-1.8.2-r2 220
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGiDU8dz7hIScOURERAro4AKDizv9rzsx3SrTTjKZCJkSZr7tsfACfaKFc
+/zPny47ilxyELrfxW6VBnHo=
+=Wc0V
+-----END PGP SIGNATURE-----
diff --git a/games-engines/xzip/files/xzip-182-makefile.diff b/games-engines/xzip/files/xzip-182-makefile.diff
deleted file mode 100644
index 3112b3ece030..000000000000
--- a/games-engines/xzip/files/xzip-182-makefile.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile.orig	Tue Jul 24 08:21:17 2001
-+++ Makefile	Tue Jul 24 12:06:32 2001
-@@ -51,7 +51,7 @@
- #   BYTE_ORDER definitions installed. If AUTO_END_MODE doesn't
- #   work, use LITTLE_END_MODE on an x86, BIG_END_MODE on a
- #   680x0 or PPC machine.
--#SYSTEMFLAGS = -DAUTO_END_MODE
-+SYSTEMFLAGS = -DAUTO_END_MODE
- 
- # definitions for BSDI 4
- #SYSTEMFLAGS = -DAUTO_END_MODE
-@@ -67,8 +67,8 @@
- # definitions for where the X lib and include directories are.
- # The following are defaults that might work.
- 
--XINCLUDE = /usr/include/X11
--XLIB = /usr/lib/X11
-+XINCLUDE = /usr/X11R6/include
-+XLIB = /usr/X11R6/lib
- 
- # If your compiler can't find these things, try commenting out the
- # above, and uncommenting various versions below. Also look around
-@@ -97,7 +97,7 @@
- # --------------------
- 
- # definition for where to install xzip executable and man page
--DESTDIR = /usr/local
-+DESTDIR = /usr/X11R6
- 
- # --------------------
diff --git a/games-engines/xzip/xzip-1.8.2-r2.ebuild b/games-engines/xzip/xzip-1.8.2-r2.ebuild
index a9b88338a0d8..4ca8b18a501c 100644
--- a/games-engines/xzip/xzip-1.8.2-r2.ebuild
+++ b/games-engines/xzip/xzip-1.8.2-r2.ebuild
@@ -1,8 +1,8 @@
-# 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-engines/xzip/xzip-1.8.2-r2.ebuild,v 1.8 2006/12/04 22:30:52 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/xzip/xzip-1.8.2-r2.ebuild,v 1.9 2007/07/01 23:13:59 nyhm Exp $
 
-inherit eutils games
+inherit games
 
 DESCRIPTION="X interface to Z-code based text games"
 HOMEPAGE="http://www.eblong.com/zarf/xzip.html"
@@ -12,22 +12,21 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE=""
+RESTRICT="test"
 
-RDEPEND="x11-libs/libX11"
+DEPEND="x11-libs/libX11"
 
 S=${WORKDIR}/xzip
 
-src_unpack() {
-	unpack xzip182.tar.Z
-	cd "${S}"
-	epatch "${FILESDIR}"/xzip-182-makefile.diff
-	sed -i \
-		-e "s/-O/${CFLAGS}/" Makefile \
-		|| die "sed Makefile failed"
+src_compile() {
+	emake \
+		CFLAGS="${CFLAGS} -DAUTO_END_MODE" \
+		LDFLAGS="${LDFLAGS}" \
+		|| die "emake failed"
 }
 
 src_install() {
-	dogamesbin xzip || die
+	dogamesbin xzip || die "dogamesbin failed"
 	dodoc README
 	doman xzip.1
 	prepgamesdirs