Version bump. closes #78412.

(Portage version: 2.0.51-r15)

7 files changed, 112 insertions, 9 deletions

diff --git a/games-strategy/glob2/ChangeLog b/games-strategy/glob2/ChangeLog
index 644848d586b9..d7e6d6851799 100644
--- a/games-strategy/glob2/ChangeLog
+++ b/games-strategy/glob2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/glob2
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/ChangeLog,v 1.18 2004/12/30 18:51:39 mr_bones_ Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/ChangeLog,v 1.19 2005/01/30 03:08:13 jnc Exp $
+
+*glob2-0.8.11 (29 Jan 2005)
+
+  29 Jan 2005; Eric Shattow <jnc@gentoo.org>
+  +files/glob2-0.8.11-configure_speex.patch, +glob2-0.8.11.ebuild:
+  Version bump. closes #78412.
 
   30 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> glob2-0.8.10.ebuild:
   David Philippi claims filter-flags isn't needed (bug #76145)
diff --git a/games-strategy/glob2/Manifest b/games-strategy/glob2/Manifest
index 22cc8acd8737..e4c058252f92 100644
--- a/games-strategy/glob2/Manifest
+++ b/games-strategy/glob2/Manifest
@@ -1,6 +1,9 @@
-MD5 a7afa5aa9bab1f341784e496e21db49a ChangeLog 2116
+MD5 0f65767441e06af4f5a5cc35656d4b07 ChangeLog 2289
+MD5 a78246a3e5f5ca5756ea769b9688d60c glob2-0.8.11.ebuild 1174
+MD5 902f859e1b4b406bc5c5233acb7964d0 glob2-0.8.9.ebuild 1277
 MD5 be3faa436a456146cab34d1a7ba5e534 metadata.xml 546
-MD5 3319f2271dcffbca630f080601bfc2f2 glob2-0.8.10.ebuild 937
-MD5 91b861e606812a2c5b70caa6df209ac7 glob2-0.8.9.ebuild 1277
+MD5 bbab78869acb1b7e3c5b9e4a71146318 glob2-0.8.10.ebuild 937
+MD5 da2177e9535fd8deab07d52e847b30a4 files/glob2-0.8.11-configure_speex.patch 2173
+MD5 00b6b6b01afb0aa92162ea1485efcc86 files/digest-glob2-0.8.11 65
 MD5 de4d5ea54b6291db91857fb227244587 files/digest-glob2-0.8.9 64
 MD5 de372c45a3d3c17421e28b07dbf1f49d files/digest-glob2-0.8.10 65
diff --git a/games-strategy/glob2/files/digest-glob2-0.8.11 b/games-strategy/glob2/files/digest-glob2-0.8.11
new file mode 100644
index 000000000000..7606326c2091
--- /dev/null
+++ b/games-strategy/glob2/files/digest-glob2-0.8.11
@@ -0,0 +1 @@
+MD5 36baa5c67f77b29d421cc178006c07f0 glob2-0.8.11.tar.gz 8962068
diff --git a/games-strategy/glob2/files/glob2-0.8.11-configure_speex.patch b/games-strategy/glob2/files/glob2-0.8.11-configure_speex.patch
new file mode 100644
index 000000000000..1a0e0c7ce8f7
--- /dev/null
+++ b/games-strategy/glob2/files/glob2-0.8.11-configure_speex.patch
@@ -0,0 +1,38 @@
+diff -burN /var/tmp/portage/glob2-0.8.11/work/glob2-0.8.11/configure.in glob2-0.8.11/configure.in
+--- /var/tmp/portage/glob2-0.8.11/work/glob2-0.8.11/configure.in	2005-01-15 17:07:26.000000000 -0600
++++ glob2-0.8.11/configure.in	2005-01-23 00:51:59.134676000 -0600
+@@ -26,8 +26,7 @@
+ dnl Libraries
+ 
+ dnl Check for Speex
+-AC_CHECK_HEADER(speex.h,,AC_MSG_ERROR([*** Speex header not found. Please install Speex (http://www.speex.org).]))
+-AC_CHECK_LIB(speex,speex_encoder_init,,AC_MSG_ERROR([*** Speex library not found. Please install Speex (http://www.speex.org).]))
++XIPH_PATH_SPEEX
+ 
+ dnl Check for SDL
+ SDL_VERSION=1.2.0
+diff -burN /var/tmp/portage/glob2-0.8.11/work/glob2-0.8.11/src/Makefile.am glob2-0.8.11/src/Makefile.am
+--- /var/tmp/portage/glob2-0.8.11/work/glob2-0.8.11/src/Makefile.am	2005-01-06 10:24:22.000000000 -0600
++++ glob2-0.8.11/src/Makefile.am	2005-01-23 00:51:59.137676000 -0600
+@@ -151,5 +151,5 @@
+ VoiceRecorder.h \
+ VoiceRecorder.cpp
+ 
+-glob2_LDADD = @LIBS@ @FT2_LIBS@ @SDL_LIBS@ @VORBISFILE_LIBS@ @VORBIS_LIBS@ ../libgag/src/libgag.a
+-INCLUDES = @FT2_CFLAGS@ @SDL_CFLAGS@ @VORBIS_CFLAGS@ -I@srcdir@/../libgag/include
++glob2_LDADD = @LIBS@ @FT2_LIBS@ @SDL_LIBS@ @VORBISFILE_LIBS@ @VORBIS_LIBS@ @SPEEX_LIBS@ ../libgag/src/libgag.a
++INCLUDES = @FT2_CFLAGS@ @SDL_CFLAGS@ @VORBIS_CFLAGS@ @SPEEX_CFLAGS@ -I@srcdir@/../libgag/include
+diff -burN /var/tmp/portage/glob2-0.8.11/work/glob2-0.8.11/src/Makefile.in glob2-0.8.11/src/Makefile.in
+--- /var/tmp/portage/glob2-0.8.11/work/glob2-0.8.11/src/Makefile.in	2005-01-15 17:09:31.000000000 -0600
++++ glob2-0.8.11/src/Makefile.in	2005-01-23 00:52:40.901327072 -0600
+@@ -290,8 +290,8 @@
+ VoiceRecorder.cpp
+ 
+ 
+-glob2_LDADD = @LIBS@ @FT2_LIBS@ @SDL_LIBS@ @VORBISFILE_LIBS@ @VORBIS_LIBS@ ../libgag/src/libgag.a
+-INCLUDES = @FT2_CFLAGS@ @SDL_CFLAGS@ @VORBIS_CFLAGS@ -I@srcdir@/../libgag/include
++glob2_LDADD = @LIBS@ @FT2_LIBS@ @SDL_LIBS@ @VORBISFILE_LIBS@ @VORBIS_LIBS@ @SPEEX_LIBS@ ../libgag/src/libgag.a
++INCLUDES = @FT2_CFLAGS@ @SDL_CFLAGS@ @VORBIS_CFLAGS@ @SPEEX_CFLAGS@ -I@srcdir@/../libgag/include
+ subdir = src
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/games-strategy/glob2/glob2-0.8.10.ebuild b/games-strategy/glob2/glob2-0.8.10.ebuild
index 31dfe56dbca1..19c6790de0f2 100644
--- a/games-strategy/glob2/glob2-0.8.10.ebuild
+++ b/games-strategy/glob2/glob2-0.8.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/glob2-0.8.10.ebuild,v 1.2 2004/12/30 18:51:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/glob2-0.8.10.ebuild,v 1.3 2005/01/30 03:08:13 jnc Exp $
 
 inherit games
 
diff --git a/games-strategy/glob2/glob2-0.8.11.ebuild b/games-strategy/glob2/glob2-0.8.11.ebuild
new file mode 100644
index 000000000000..d3d0a0ac73fa
--- /dev/null
+++ b/games-strategy/glob2/glob2-0.8.11.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/glob2-0.8.11.ebuild,v 1.1 2005/01/30 03:08:13 jnc Exp $
+
+inherit games
+
+DESCRIPTION="Real Time Strategy (RTS) game involving a brave army of globs"
+HOMEPAGE="http://www.ysagoon.com/glob2/"
+SRC_URI="http://epfl.ysagoon.com/~glob2/data/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE=""
+
+DEPEND="virtual/libc
+	virtual/opengl
+	>=media-libs/libsdl-1.2.0
+	media-libs/libpng
+	media-libs/sdl-net
+	media-libs/sdl-image
+	media-libs/libvorbis
+	>=media-libs/speex-1.1
+	=media-libs/freetype-2*
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	>=sys-devel/automake-1.7
+	>=sys-devel/autoconf-2.5"
+
+src_unpack() {
+	unpack ${P}.tar.gz || die
+	epatch ${FILESDIR}/${P}-*.patch
+}
+
+src_compile() {
+	export WANT_AUTOCONF=2.5
+	export WANT_AUTOMAKE=1.7
+	aclocal
+	automake
+	autoconf
+
+	#./configure assumes that vorbis will be installed under PREFIX bug #46352
+	egamesconf \
+		--with-vorbis=/usr \
+		--with-speex=/usr \
+		--with-speex-includes=/usr/include/speex \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS README TODO
+	prepgamesdirs
+}
diff --git a/games-strategy/glob2/glob2-0.8.9.ebuild b/games-strategy/glob2/glob2-0.8.9.ebuild
index 6b123bb8de23..96e8c7e50ba3 100644
--- a/games-strategy/glob2/glob2-0.8.9.ebuild
+++ b/games-strategy/glob2/glob2-0.8.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/glob2-0.8.9.ebuild,v 1.3 2004/11/24 21:30:15 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/glob2-0.8.9.ebuild,v 1.4 2005/01/30 03:08:13 jnc Exp $
 
 inherit flag-o-matic games