Fixing bug #96633 and cleaning up older versions.

Package-Manager: portage-2.1_pre3-r1

10 files changed, 21 insertions, 179 deletions

diff --git a/games-roguelike/crossfire-client/ChangeLog b/games-roguelike/crossfire-client/ChangeLog
index 7604fbcd043a..eb6eb9f5876b 100644
--- a/games-roguelike/crossfire-client/ChangeLog
+++ b/games-roguelike/crossfire-client/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-roguelike/crossfire-client
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/ChangeLog,v 1.11 2005/10/19 03:31:09 mr_bones_ Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/ChangeLog,v 1.12 2006/01/24 20:09:10 wolf31o2 Exp $
+
+  24 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  -files/1.5.0-errno.patch, -files/1.6.0-errno.patch,
+  -crossfire-client-1.6.1.ebuild, -crossfire-client-1.7.0.ebuild,
+  crossfire-client-1.7.1.ebuild, crossfire-client-1.8.0.ebuild:
+  Fixing bug #96633 and cleaning up older versions.
 
 *crossfire-client-1.8.0 (19 Oct 2005)
 
diff --git a/games-roguelike/crossfire-client/Manifest b/games-roguelike/crossfire-client/Manifest
index ca408a9084b8..4dc3bddfce32 100644
--- a/games-roguelike/crossfire-client/Manifest
+++ b/games-roguelike/crossfire-client/Manifest
@@ -1,12 +1,6 @@
-MD5 558223609e46a54824114b9499d9d972 crossfire-client-1.7.0.ebuild 1376
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 09b03922764a438e1bf74ff3cb1891e8 crossfire-client-1.8.0.ebuild 1457
-MD5 5590c66a04e4a8c41eebeaabc1cf706f crossfire-client-1.6.1.ebuild 1416
-MD5 bb0aef5bf31f84bc7872f4d66d6c65c4 crossfire-client-1.7.1.ebuild 1458
-MD5 598bad611e5aa7f019ff4efc172b672a ChangeLog 2315
-MD5 ad1e49c4a56222488166b9c4f4091a55 files/1.5.0-errno.patch 682
-MD5 85c1a21c69c23d3fd2540dd54a0f0fc3 files/digest-crossfire-client-1.7.0 74
-MD5 5f6e9f388a8529fb8caec99c17126fe3 files/digest-crossfire-client-1.8.0 74
-MD5 ad1e49c4a56222488166b9c4f4091a55 files/1.6.0-errno.patch 682
-MD5 28ec33590a7f24478841e039ce87f81c files/digest-crossfire-client-1.6.1 153
+MD5 ce77882ded87ca5da30653bd27698cf7 ChangeLog 2605
+MD5 1b6f3b46d521482ea38cdb523d01a05b crossfire-client-1.7.1.ebuild 1368
+MD5 8547c218172629f6dea658ce4dda19b7 crossfire-client-1.8.0.ebuild 1381
 MD5 88be26521277f1cf1eec6dcdfb35bcf8 files/digest-crossfire-client-1.7.1 74
+MD5 5f6e9f388a8529fb8caec99c17126fe3 files/digest-crossfire-client-1.8.0 74
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
diff --git a/games-roguelike/crossfire-client/crossfire-client-1.6.1.ebuild b/games-roguelike/crossfire-client/crossfire-client-1.6.1.ebuild
deleted file mode 100644
index e05cd5c768f2..000000000000
--- a/games-roguelike/crossfire-client/crossfire-client-1.6.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.6.1.ebuild,v 1.4 2004/06/24 23:12:18 agriffis Exp $
-
-inherit eutils games
-
-DESCRIPTION="Client for the nethack-style but more in the line of UO"
-HOMEPAGE="http://crossfire.real-time.com/"
-SRC_URI="mirror://sourceforge/crossfire/${P}.tar.gz
-	mirror://gentoo/${P}.configure.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE="sdl gtk alsa"
-
-DEPEND="virtual/x11
-	sdl? ( media-libs/libsdl
-		media-libs/sdl-image )
-	gtk? ( =x11-libs/gtk+-1.2*
-		dev-libs/glib
-	)
-	alsa? ( media-libs/alsa-lib )
-	media-libs/libpng
-	sys-libs/zlib"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	unpack ${P}.configure.gz
-	mv ${P}.configure configure
-	chmod a+x configure
-}
-
-src_compile() {
-	# bugs in configure script so we cant use `use_enable`
-	local myconf=""
-	use gtk || myconf="${myconf} --disable-gtk"
-	use sdl || myconf="${myconf} --disable-sdl"
-	use alsa || myconf="${myconf} --disable-alsa"
-	has_version '>=media-libs/alsa-lib-0.9' \
-		&& myconf="${myconf} --disable-alsa --disable-sound"
-	egamesconf ${myconf} || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	egamesinstall mandir="${T}" || die
-	use gtk && newman gtk/gcfclient.man gcfclient.6
-	newman x11/cfclient.man cfclient.6
-	dodoc CHANGES NOTES README TODO
-	prepgamesdirs
-}
diff --git a/games-roguelike/crossfire-client/crossfire-client-1.7.0.ebuild b/games-roguelike/crossfire-client/crossfire-client-1.7.0.ebuild
deleted file mode 100644
index ff0719728504..000000000000
--- a/games-roguelike/crossfire-client/crossfire-client-1.7.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.7.0.ebuild,v 1.2 2004/06/24 23:12:18 agriffis Exp $
-
-inherit eutils games
-
-DESCRIPTION="Client for the nethack-style but more in the line of UO"
-HOMEPAGE="http://crossfire.real-time.com/"
-SRC_URI="mirror://sourceforge/crossfire/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE="sdl gtk alsa"
-
-DEPEND="virtual/x11
-	sdl? ( media-libs/libsdl
-		media-libs/sdl-image )
-	gtk? ( =x11-libs/gtk+-1.2*
-		dev-libs/glib
-	)
-	alsa? ( media-libs/alsa-lib )
-	media-libs/libpng
-	sys-libs/zlib"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i \
-		-e 's:man1:man6:' \
-		-e '/mandir/s:\.1:.6:' \
-		{gtk,x11}/Makefile.in
-}
-
-src_compile() {
-	# bugs in configure script so we cant use `use_enable`
-	local myconf=""
-	use gtk || myconf="${myconf} --disable-gtk"
-	use sdl || myconf="${myconf} --disable-sdl"
-	if ! use alsa ; then
-		has_version '>=media-libs/alsa-lib-0.9' \
-			&& myconf="${myconf} --disable-alsa9" \
-			|| myconf="${myconf} --disable-alsa"
-	fi
-	egamesconf ${myconf} || die
-	emake -j1 -C sound-src || die "sound building failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	egamesinstall mandir=${D}/usr/share/man/man6 || die
-	dodoc CHANGES NOTES README TODO
-	prepgamesdirs
-}
diff --git a/games-roguelike/crossfire-client/crossfire-client-1.7.1.ebuild b/games-roguelike/crossfire-client/crossfire-client-1.7.1.ebuild
index 4ae66165b4ac..e38bd702ad83 100644
--- a/games-roguelike/crossfire-client/crossfire-client-1.7.1.ebuild
+++ b/games-roguelike/crossfire-client/crossfire-client-1.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.7.1.ebuild,v 1.1 2005/03/09 07:18:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.7.1.ebuild,v 1.2 2006/01/24 20:09:10 wolf31o2 Exp $
 
 inherit games
 
@@ -13,13 +13,11 @@ SLOT="0"
 KEYWORDS="ppc x86"
 IUSE="alsa gtk sdl"
 
-DEPEND="virtual/x11
-	alsa? ( media-libs/alsa-lib )
+DEPEND="alsa? ( media-libs/alsa-lib )
 	gtk? ( =x11-libs/gtk+-1.2*
 		dev-libs/glib
 		sdl? ( media-libs/libsdl
-			media-libs/sdl-image )
-	)
+			media-libs/sdl-image ) )
 	media-libs/libpng
 	sys-libs/zlib"
 
@@ -43,9 +41,7 @@ src_compile() {
 		myconf="${myconf} --disable-gtk"
 	fi
 	if ! use alsa ; then
-		has_version '>=media-libs/alsa-lib-0.9' \
-			&& myconf="${myconf} --disable-alsa9" \
-			|| myconf="${myconf} --disable-alsa"
+		myconf="${myconf} --disable-alsa9 --disable-alsa"
 	fi
 	egamesconf ${myconf} || die
 	emake -j1 -C sound-src || die "sound building failed"
diff --git a/games-roguelike/crossfire-client/crossfire-client-1.8.0.ebuild b/games-roguelike/crossfire-client/crossfire-client-1.8.0.ebuild
index 13db788c0a59..c945a106fc46 100644
--- a/games-roguelike/crossfire-client/crossfire-client-1.8.0.ebuild
+++ b/games-roguelike/crossfire-client/crossfire-client-1.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.8.0.ebuild,v 1.1 2005/10/19 03:31:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.8.0.ebuild,v 1.2 2006/01/24 20:09:10 wolf31o2 Exp $
 
 inherit games
 
@@ -42,9 +42,7 @@ src_compile() {
 		myconf="${myconf} --disable-gtk"
 	fi
 	if ! use alsa ; then
-		has_version '>=media-libs/alsa-lib-0.9' \
-			&& myconf="${myconf} --disable-alsa9" \
-			|| myconf="${myconf} --disable-alsa"
+		myconf="${myconf} --disable-alsa9 --disable-alsa"
 	fi
 	egamesconf ${myconf} || die
 	emake -j1 -C sound-src || die "sound building failed"
diff --git a/games-roguelike/crossfire-client/files/1.5.0-errno.patch b/games-roguelike/crossfire-client/files/1.5.0-errno.patch
deleted file mode 100644
index c0c929b40bce..000000000000
--- a/games-roguelike/crossfire-client/files/1.5.0-errno.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- common/client.h.orig	2003-06-27 20:15:48.000000000 -0400
-+++ common/client.h	2003-06-27 20:16:12.000000000 -0400
-@@ -270,7 +270,7 @@
- /* We need to declare most of the structs before we can include this */
- #include <proto.h>
- 
--extern int errno;
-+#include <errno.h>
- 
- /* translation of the STAT_RES names into printable names,
-  * in matching order.
---- common/newsocket.c.orig	2003-06-27 20:15:36.000000000 -0400
-+++ common/newsocket.c	2003-06-27 20:15:41.000000000 -0400
-@@ -154,7 +154,6 @@
- int SockList_ReadPacket(int fd, SockList *sl, int len)
- {
-     int stat,toread,readsome=0;
--    extern int errno;
- 
-     /* We already have a partial packet */
-     if (sl->len<2) {
diff --git a/games-roguelike/crossfire-client/files/1.6.0-errno.patch b/games-roguelike/crossfire-client/files/1.6.0-errno.patch
deleted file mode 100644
index c0c929b40bce..000000000000
--- a/games-roguelike/crossfire-client/files/1.6.0-errno.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- common/client.h.orig	2003-06-27 20:15:48.000000000 -0400
-+++ common/client.h	2003-06-27 20:16:12.000000000 -0400
-@@ -270,7 +270,7 @@
- /* We need to declare most of the structs before we can include this */
- #include <proto.h>
- 
--extern int errno;
-+#include <errno.h>
- 
- /* translation of the STAT_RES names into printable names,
-  * in matching order.
---- common/newsocket.c.orig	2003-06-27 20:15:36.000000000 -0400
-+++ common/newsocket.c	2003-06-27 20:15:41.000000000 -0400
-@@ -154,7 +154,6 @@
- int SockList_ReadPacket(int fd, SockList *sl, int len)
- {
-     int stat,toread,readsome=0;
--    extern int errno;
- 
-     /* We already have a partial packet */
-     if (sl->len<2) {
diff --git a/games-roguelike/crossfire-client/files/digest-crossfire-client-1.6.1 b/games-roguelike/crossfire-client/files/digest-crossfire-client-1.6.1
deleted file mode 100644
index 77a766079ea5..000000000000
--- a/games-roguelike/crossfire-client/files/digest-crossfire-client-1.6.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 609a44e079803bc48c966b1766a02863 crossfire-client-1.6.1.tar.gz 512603
-MD5 eace4167725f0aeed77190e0efcd5ee0 crossfire-client-1.6.1.configure.gz 53151
diff --git a/games-roguelike/crossfire-client/files/digest-crossfire-client-1.7.0 b/games-roguelike/crossfire-client/files/digest-crossfire-client-1.7.0
deleted file mode 100644
index 5970b2328ea6..000000000000
--- a/games-roguelike/crossfire-client/files/digest-crossfire-client-1.7.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ef405f78d54be0bf22feeef6b4fc0d73 crossfire-client-1.7.0.tar.gz 458940