version bump; patched source to fix autotool mess from upstream

5 files changed, 100 insertions, 2 deletions

diff --git a/games-strategy/wesnoth/ChangeLog b/games-strategy/wesnoth/ChangeLog
index 2880d3ae9498..419881ecc5e5 100644
--- a/games-strategy/wesnoth/ChangeLog
+++ b/games-strategy/wesnoth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/wesnoth
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.36 2004/08/16 23:59:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.37 2004/09/12 01:53:56 mr_bones_ Exp $
+
+*wesnoth-0.8.4 (11 Sep 2004)
+
+  11 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/0.8.4-conf.patch, +wesnoth-0.8.4.ebuild:
+  version bump; patched source to fix autotool mess from upstream
 
   16 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-0.8.2.ebuild:
   enable lite install knob (bug #60570)
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index bb6bfd02bb3a..f4fbc47ffceb 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,8 +1,11 @@
 MD5 70af11249b648c110696363fb2ac241b wesnoth-0.8.ebuild 1115
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 5c0d3b390b6365d2c579fed714e3485d ChangeLog 4877
+MD5 1f91c1bbb7d3ed00563e71a6690f0af5 ChangeLog 5079
 MD5 a20d489d39fdf52c8303f30ee2284b84 wesnoth-0.8.1.ebuild 1117
 MD5 b28e4eb180684bc352b4835100ad800a wesnoth-0.8.2.ebuild 1156
+MD5 ad72b0551c0e823d79295fde09365410 wesnoth-0.8.4.ebuild 1310
 MD5 c62eaa95b5f21678b071c39ae5b60f0c files/digest-wesnoth-0.8 65
 MD5 2bc8f6215be5ce7f59d5e7969ad042d1 files/digest-wesnoth-0.8.1 67
 MD5 b97ec5f679625aad3505bc806419bdf7 files/digest-wesnoth-0.8.2 67
+MD5 7d789dd240ad3d907a8bda0efc0394ef files/digest-wesnoth-0.8.4 67
+MD5 69f93bd070c20b79508a17d466ae01fe files/0.8.4-conf.patch 1707
diff --git a/games-strategy/wesnoth/files/0.8.4-conf.patch b/games-strategy/wesnoth/files/0.8.4-conf.patch
new file mode 100644
index 000000000000..8f6bae00395c
--- /dev/null
+++ b/games-strategy/wesnoth/files/0.8.4-conf.patch
@@ -0,0 +1,38 @@
+--- configure.ac.orig	2004-09-11 16:40:17.000000000 -0700
++++ configure.ac	2004-09-11 16:41:54.000000000 -0700
+@@ -97,13 +97,13 @@
+ AC_ARG_ENABLE([kde],,[AC_MSG_ERROR([Please use --with-kde instead of obsolete --enable-kde])])
+ AC_ARG_WITH([kde],
+ 	      [  --with-kde              enable installation of icon and KDE menu entry],
+-	      [kde=$enableval],
++	      [kde=$withval],
+ 	      [kde=no])
+ 
+ AC_ARG_ENABLE([gnome],,[AC_MSG_ERROR([Please use --with-gnome instead of obsolete --enable-gnome])])
+ AC_ARG_WITH([gnome],
+ 	      [  --with-gnome            enable installation of icon and GNOME menu entry],
+-	      [gnome=$enableval],
++	      [gnome=$withval],
+ 	      [gnome=no])
+ 
+ AC_ARG_ENABLE([wzip],
+@@ -115,9 +115,6 @@
+ AM_CONDITIONAL([SERVER], [test x$server = xyes])
+ AM_CONDITIONAL([EDITOR], [test x$editor = xyes])
+ AM_CONDITIONAL([TOOLS], [test x$tools = xyes])
+-AM_CONDITIONAL([KDE], [test x$kde = xyes && test x$kdefound = xyes])
+-AM_CONDITIONAL([GNOME1], [test x$gnome = xyes && test x$gnome1found = xyes])
+-AM_CONDITIONAL([GNOME2], [test x$gnome = xyes && test x$gnome1found = xno])
+ AM_CONDITIONAL([GCC], [test x$GXX = xyes])
+ AM_CONDITIONAL([WZIP], [test x$wzip = xyes])
+ AM_CONDITIONAL([INCLUDEDINTL], [test x$nls_cv_use_gnu_gettext = xyes])
+@@ -303,6 +300,9 @@
+ AC_SUBST([KDE_DESKTOP])
+ AC_SUBST([KDE_ICON])
+ 
++AM_CONDITIONAL([KDE], [test x$kde = xyes && test x$kdefound = xyes])
++AM_CONDITIONAL([GNOME1], [test x$gnome = xyes && test x$gnome1found = xyes])
++AM_CONDITIONAL([GNOME2], [test x$gnome = xyes && test x$gnome1found = xno])
+ 
+ #######################################################################
+ # Checks for types.                                                   #
diff --git a/games-strategy/wesnoth/files/digest-wesnoth-0.8.4 b/games-strategy/wesnoth/files/digest-wesnoth-0.8.4
new file mode 100644
index 000000000000..3360a30ee467
--- /dev/null
+++ b/games-strategy/wesnoth/files/digest-wesnoth-0.8.4
@@ -0,0 +1 @@
+MD5 69cf64410c14e3929634131037f0436a wesnoth-0.8.4.tar.gz 29430807
diff --git a/games-strategy/wesnoth/wesnoth-0.8.4.ebuild b/games-strategy/wesnoth/wesnoth-0.8.4.ebuild
new file mode 100644
index 000000000000..1ef3af024693
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-0.8.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-0.8.4.ebuild,v 1.1 2004/09/12 01:53:56 mr_bones_ Exp $
+
+inherit eutils flag-o-matic gcc games
+
+DESCRIPTION="A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org/"
+SRC_URI="http://www.wesnoth.org/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc amd64"
+IUSE="server editor tools gnome kde nomusic"
+
+DEPEND=">=media-libs/libsdl-1.2.7
+	>=media-libs/sdl-image-1.2
+	>=media-libs/sdl-mixer-1.2
+	>=media-libs/sdl-ttf-2.0
+	media-libs/sdl-net
+	virtual/x11"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-conf.patch"
+	autoconf -o configure configure.ac
+	#sed -i -e '1s/$/ -x/' configure
+}
+
+src_compile() {
+	[ "$(gcc-fullversion)" == "3.4.0" ] && filter-flags -ftracer
+	egamesconf \
+		--disable-dependency-tracking \
+		$(use_enable nomusic lite) \
+		$(use_enable server) \
+		$(use_enable editor) \
+		$(use_enable tools) \
+		$(use_with gnome) \
+		$(use_with kde) \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	mv "${D}${GAMES_DATADIR}/icons" "${D}/usr/share/"
+	dodoc MANUAL changelog || die "dodoc failed"
+	prepgamesdirs
+}