Version bumpage.

6 files changed, 29 insertions, 68 deletions

diff --git a/games-roguelike/crossfire-client/ChangeLog b/games-roguelike/crossfire-client/ChangeLog
index c055170be3ea..5bbf91ebc8f7 100644
--- a/games-roguelike/crossfire-client/ChangeLog
+++ b/games-roguelike/crossfire-client/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-roguelike/crossfire-client
 # Copyright 1999-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
 
+*crossfire-client-1.7.0 (30 May 2004)
+
+  30 May 2004; Mike Frysinger <vapier@gentoo.org>
+  -crossfire-client-1.5.0.ebuild, -crossfire-client-1.6.0.ebuild,
+  +crossfire-client-1.7.0.ebuild:
+  Version bumpage.
+
   20 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
   crossfire-client-1.6.1.ebuild:
   add cvs version of configure which doesn't check for gnome since that isn't
diff --git a/games-roguelike/crossfire-client/crossfire-client-1.6.0.ebuild b/games-roguelike/crossfire-client/crossfire-client-1.6.0.ebuild
deleted file mode 100644
index 282a3468a5e2..000000000000
--- a/games-roguelike/crossfire-client/crossfire-client-1.6.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.6.0.ebuild,v 1.2 2004/02/20 06:55:42 mr_bones_ Exp $
-
-inherit games eutils
-
-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 gnome gtk alsa"
-
-DEPEND="virtual/x11
-	sdl? ( media-libs/libsdl
-		media-libs/sdl-image )
-	gnome? ( gnome-base/gnome-libs
-		media-libs/gdk-pixbuf )
-	gtk? ( =x11-libs/gtk+-1* )
-	alsa? ( media-libs/alsa-lib )
-	media-libs/libpng"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-errno.patch
-}
-
-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"
-	use gnome || myconf="${myconf} --disable-gnome"
-	egamesconf ${myconf} || die
-	make || die
-}
-
-src_install() {
-	egamesinstall mandir=${T} || die
-	use gtk && newman gtk/gcfclient.man gcfclient.6
-	use gnome && newman gnome/gnome-cfclient.man gnome-cfclient.6
-	newman x11/cfclient.man cfclient.6
-	dodoc CHANGES NOTES README TODO
-	prepgamesdirs
-}
diff --git a/games-roguelike/crossfire-client/crossfire-client-1.5.0.ebuild b/games-roguelike/crossfire-client/crossfire-client-1.7.0.ebuild
index d26dd18b45c2..7a0b03033a6d 100644
--- a/games-roguelike/crossfire-client/crossfire-client-1.5.0.ebuild
+++ b/games-roguelike/crossfire-client/crossfire-client-1.7.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.5.0.ebuild,v 1.2 2004/02/20 06:55:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.7.0.ebuild,v 1.1 2004/05/30 08:18:17 vapier Exp $
 
-inherit games eutils
+inherit eutils games
 
 DESCRIPTION="Client for the nethack-style but more in the line of UO"
 HOMEPAGE="http://crossfire.real-time.com/"
@@ -11,21 +11,25 @@ SRC_URI="mirror://sourceforge/crossfire/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc"
-IUSE="sdl gnome gtk alsa"
+IUSE="sdl gtk alsa"
 
 DEPEND="virtual/x11
 	sdl? ( media-libs/libsdl
 		media-libs/sdl-image )
-	gnome? ( gnome-base/gnome-libs
-		media-libs/gdk-pixbuf )
-	gtk? ( =x11-libs/gtk+-1* )
+	gtk? ( =x11-libs/gtk+-1.2*
+		dev-libs/glib
+	)
 	alsa? ( media-libs/alsa-lib )
-	media-libs/libpng"
+	media-libs/libpng
+	sys-libs/zlib"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PV}-errno.patch
+	sed -i \
+		-e 's:man1:man6:' \
+		-e '/mandir/s:\.1:.6:' \
+		{gtk,x11}/Makefile.in
 }
 
 src_compile() {
@@ -33,18 +37,18 @@ src_compile() {
 	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"
-	use gnome || myconf="${myconf} --disable-gnome"
+	if ! use alsa ; then
+		has_version '>=media-libs/alsa-lib-0.9' \
+			&& myconf="${myconf} --disable-alsa9" \
+			|| myconf="${myconf} --disable-alsa"
+	fi
 	egamesconf ${myconf} || die
-	make || die
+	emake -j1 -C sound-src || die "sound building failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	egamesinstall mandir=${T} || die
-	use gtk && newman gtk/gcfclient.man gcfclient.6
-	use gnome && newman gnome/gnome-cfclient.man gnome-cfclient.6
-	newman x11/cfclient.man cfclient.6
+	egamesinstall mandir=${D}/usr/share/man/man6 || die
 	dodoc CHANGES NOTES README TODO
 	prepgamesdirs
 }
diff --git a/games-roguelike/crossfire-client/files/digest-crossfire-client-1.5.0 b/games-roguelike/crossfire-client/files/digest-crossfire-client-1.5.0
deleted file mode 100644
index adaab6c435c3..000000000000
--- a/games-roguelike/crossfire-client/files/digest-crossfire-client-1.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8f7e09f18cdbfbf45aea2fc06a6472cb crossfire-client-1.5.0.tar.gz 405044
diff --git a/games-roguelike/crossfire-client/files/digest-crossfire-client-1.6.0 b/games-roguelike/crossfire-client/files/digest-crossfire-client-1.6.0
deleted file mode 100644
index 9b29f8652162..000000000000
--- a/games-roguelike/crossfire-client/files/digest-crossfire-client-1.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 90f46a9f74ab0d2b82ccfb2812e5d6cf crossfire-client-1.6.0.tar.gz 421159
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
new file mode 100644
index 000000000000..a838314b86f0
--- /dev/null
+++ b/games-roguelike/crossfire-client/files/digest-crossfire-client-1.7.0
@@ -0,0 +1,2 @@
+MD5 ef405f78d54be0bf22feeef6b4fc0d73 crossfire-client-1.7.0.tar.gz 458940
+MD5 eace4167725f0aeed77190e0efcd5ee0 crossfire-client-1.6.1.configure.gz 53151