summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2003-10-02 21:50:25 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2003-10-02 21:50:25 +0000
commit964cc7ef422cd15a26bab4a3c45f9504a66c45d5 (patch)
tree76d5df19a68e3c5d8410b848d315eda2fa8778db /dev-games/ogre
parentmore error messages; use sed >= 4 (diff)
downloadgentoo-2-964cc7ef422cd15a26bab4a3c45f9504a66c45d5.tar.gz
gentoo-2-964cc7ef422cd15a26bab4a3c45f9504a66c45d5.tar.bz2
gentoo-2-964cc7ef422cd15a26bab4a3c45f9504a66c45d5.zip
more error messages; use sed >= 4
Diffstat (limited to 'dev-games/ogre')
-rw-r--r--dev-games/ogre/ChangeLog5
-rw-r--r--dev-games/ogre/Manifest6
-rw-r--r--dev-games/ogre/ogre-0.12.0.ebuild53
3 files changed, 35 insertions, 29 deletions
diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index 1d0163d1b519..cd195c2022c1 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-games/ogre
# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.3 2003/10/02 20:04:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.4 2003/10/02 21:50:23 mr_bones_ Exp $
+
+ 02 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> ogre-0.12.0.ebuild:
+ more error messages; use sed >= 4
*ogre-0.12.0 (02 Oct 2003)
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 80f08bae6adb..1fe405aeec5f 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,7 +1,5 @@
-MD5 2f2d4c3edaccd3509fe04599dd3f9623 ChangeLog 691
+MD5 3a66af87ee3f3c6dc4664a6cfc22f467 ChangeLog 694
MD5 b12442ee31210fbb72a3a26518ef3652 ogre-0.11.0-r1.ebuild 1176
-MD5 b10aea4fb50aa80d7b716e9a22f8dbc8 ogre-0.12.0.ebuild 1388
-MD5 b10aea4fb50aa80d7b716e9a22f8dbc8 ogre-0.12.0-r1.ebuild 1388
+MD5 73fe6cbd7ff2ba0053e6f3577a2b7c05 ogre-0.12.0.ebuild 1388
MD5 8669da2a4820f158058d1b6547a236ff files/digest-ogre-0.11.0-r1 67
MD5 56300249a1df394688f1cb504be76152 files/digest-ogre-0.12.0 67
-MD5 56300249a1df394688f1cb504be76152 files/digest-ogre-0.12.0-r1 67
diff --git a/dev-games/ogre/ogre-0.12.0.ebuild b/dev-games/ogre/ogre-0.12.0.ebuild
index f3c21c9c12bf..d0e3916ba01a 100644
--- a/dev-games/ogre/ogre-0.12.0.ebuild
+++ b/dev-games/ogre/ogre-0.12.0.ebuild
@@ -1,51 +1,56 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-0.12.0.ebuild,v 1.1 2003/10/02 20:04:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-0.12.0.ebuild,v 1.2 2003/10/02 21:50:23 mr_bones_ Exp $
+S=${WORKDIR}/ogrenew
DESCRIPTION="Object-oriented Graphics Rendering Engine"
HOMEPAGE="http://ogre.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ogre/ogre-v${PV//./-}.tar.bz2"
+SRC_URI="mirror://sourceforge/ogre/${PN}-v${PV//./-}.tar.bz2"
LICENSE="LGPL-2.1"
-SLOT="0"
KEYWORDS="x86"
+SLOT="0"
+
IUSE="doc gtk2"
-DEPEND="media-libs/libsdl
- || ( dev-libs/STLport >=sys-devel/gcc-3 )
- virtual/opengl
+RDEPEND="virtual/opengl
+ media-libs/libsdl
=media-libs/freetype-2*
media-libs/devil
- sys-libs/zlib
gtk2? (
=dev-cpp/libglademm-2*
=dev-cpp/gtkmm-2*
- )"
-
-S=${WORKDIR}/ogrenew
+ )
+ sys-libs/zlib"
+DEPEND="${RDEPEND}
+ >=sys-apps/sed-4
+ || ( dev-libs/STLport >=sys-devel/gcc-3.0 )"
src_unpack() {
unpack ${A}
cd ${S}
- sed -i 's:noinst_HEADERS:pkginclude_HEADERS:' \
- `find PlugIns/ -name 'Makefile.am'` \
- || die "installing plugin headers"
+ sed -i \
+ -e 's:noinst_HEADERS:pkginclude_HEADERS:' \
+ `find PlugIns/ -name 'Makefile.am'` || \
+ die "sed Makefile.am failed"
}
src_compile() {
- local mycfgtk
- [ `use gtk2` ] \
- && mycfgtk=gtk \
- || mycfgtk=cli
- econf --with-cfgtk=${mycfgtk} || die
- emake || die
+ local myconf="cli"
+
+ [ `use gtk2` ] && myconf="gtk"
+
+ econf --with-cfgtk=${myconf} || die
+ emake || die "emake failed"
}
src_install() {
- make install DESTDIR=${D} || die
- [ `use doc` ] && dohtml -r Docs/Docs/* Docs/Tutorials/*
+ make DESTDIR=${D} install || die "make install failed"
+ if [ `use doc` ] ; then
+ dohtml -r Docs/* Docs/Tutorials/* || die "dohtml failed (doc)"
+ fi
insinto /usr/share/OGRE/Media
- doins Samples/Media/*
- dodoc AUTHORS BUGS LINUX.DEV README Docs/README.linux
- dohtml Docs/*.html
+ doins Samples/Media/* || die "doins failed"
+ dodoc AUTHORS BUGS LINUX.DEV README Docs/README.linux || die "dodoc failed"
+ dohtml Docs/*.html || die "dohtml failed"
}