From 33f766adac48ce12e6b371852c6f1612ab1224d0 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 2 Jul 2006 05:29:48 +0000
Subject: Fix building with autoconf-2.60 #138360 by Petr Kocmid.
 Package-Manager: portage-2.1.1_pre1-r5

---
 dev-games/ogre/ChangeLog                       |  6 +++++-
 dev-games/ogre/files/ogre-1.2.1-autoconf.patch | 13 +++++++++++++
 dev-games/ogre/ogre-1.2.1.ebuild               |  6 +++---
 3 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 dev-games/ogre/files/ogre-1.2.1-autoconf.patch

(limited to 'dev-games')

diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index 54ca89256767..067ea7f4232e 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/ogre
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.27 2006/06/27 20:50:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.28 2006/07/02 05:29:48 vapier Exp $
+
+  02 Jul 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/ogre-1.2.1-autoconf.patch, ogre-1.2.1.ebuild:
+  Fix building with autoconf-2.60 #138360 by Petr Kocmid.
 
   27 Jun 2006; Michael Sterrett <mr_bones_@gentoo.org> -ogre-1.0.1.ebuild,
   -ogre-1.0.2.ebuild, -ogre-1.0.3_p1.ebuild, -ogre-1.0.4.ebuild,
diff --git a/dev-games/ogre/files/ogre-1.2.1-autoconf.patch b/dev-games/ogre/files/ogre-1.2.1-autoconf.patch
new file mode 100644
index 000000000000..f91b37ef24cb
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.2.1-autoconf.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/138360
+
+--- bootstrap
++++ bootstrap
+@@ -12,7 +12,7 @@
+ 
+ ## Using prereq in autoconf rather than here, mostly for the debian systems at
+ ## this point
+-if test -z "`autoconf --version 2>&1|head -n 1|egrep '2.5'`"; then
++if test -z "`autoconf --version 2>&1|head -n 1|egrep '2.[56]'`"; then
+ 	echo "Autoconf 2.50 or above is required. Aborting build...";
+     exit 1;
+ fi
diff --git a/dev-games/ogre/ogre-1.2.1.ebuild b/dev-games/ogre/ogre-1.2.1.ebuild
index f4c1c62e11c5..7056a968f654 100644
--- a/dev-games/ogre/ogre-1.2.1.ebuild
+++ b/dev-games/ogre/ogre-1.2.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.2.1.ebuild,v 1.1 2006/06/26 17:08:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.2.1.ebuild,v 1.2 2006/07/02 05:29:48 vapier Exp $
 
 inherit eutils
 
 MY_PV=${PV//./-}
-
+MY_PV=${MY_PV/_/}
 DESCRIPTION="Object-oriented Graphics Rendering Engine"
 HOMEPAGE="http://www.ogre3d.org/"
 SRC_URI="mirror://sourceforge/ogre/${PN}-linux_osx-v${MY_PV}.tar.bz2"
@@ -24,7 +24,6 @@ RDEPEND=">=dev-libs/zziplib-0.13.36
 	sdl? ( >=media-libs/libsdl-1.2.8 )
 	virtual/opengl
 	sys-libs/zlib"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-devel/flex
@@ -35,6 +34,7 @@ S=${WORKDIR}/ogrenew
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-autoconf.patch
 	./bootstrap || die "bootstrap failed"
 }
 
-- 
cgit v1.2.3-65-gdbad