Require fixed acgmake, and fix compiler flags for debug and non-debug cases

(Portage version: 2.1.2-r9)

3 files changed, 19 insertions, 13 deletions

diff --git a/media-gfx/openmesh/ChangeLog b/media-gfx/openmesh/ChangeLog
index c7efa2b0725e..d13c0c084d5c 100644
--- a/media-gfx/openmesh/ChangeLog
+++ b/media-gfx/openmesh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/openmesh
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/ChangeLog,v 1.3 2006/12/14 21:19:35 dsd Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/ChangeLog,v 1.4 2007/02/08 15:02:57 dsd Exp $
+
+*openmesh-1.9.4-r1 (08 Feb 2007)
+
+  08 Feb 2007; Daniel Drake <dsd@gentoo.org> -openmesh-1.9.4.ebuild,
+  +openmesh-1.9.4-r1.ebuild:
+  Require fixed acgmake, and fix compiler flags for debug and non-debug cases
 
 *openmesh-1.9.4 (14 Dec 2006)
 
diff --git a/media-gfx/openmesh/files/digest-openmesh-1.9.4 b/media-gfx/openmesh/files/digest-openmesh-1.9.4-r1
index ebd48ebe58a8..ebd48ebe58a8 100644
--- a/media-gfx/openmesh/files/digest-openmesh-1.9.4
+++ b/media-gfx/openmesh/files/digest-openmesh-1.9.4-r1
diff --git a/media-gfx/openmesh/openmesh-1.9.4.ebuild b/media-gfx/openmesh/openmesh-1.9.4-r1.ebuild
index 862962583907..54a8497c2258 100644
--- a/media-gfx/openmesh/openmesh-1.9.4.ebuild
+++ b/media-gfx/openmesh/openmesh-1.9.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-1.9.4.ebuild,v 1.1 2006/12/14 21:19:35 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-1.9.4-r1.ebuild,v 1.1 2007/02/08 15:02:57 dsd Exp $
 
 inherit eutils
 
@@ -17,24 +17,25 @@ KEYWORDS="~amd64 ~x86"
 IUSE="qt4 debug"
 
 RDEPEND="qt4? ( x11-libs/qt )"
-DEPEND="dev-util/acgmake
+DEPEND=">=dev-util/acgmake-1.2-r2
+	>=sys-apps/findutils-4.3.0
 	${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	if ! use qt4
-	then
-		sed -i "s:Apps::" ACGMakefile
-	fi
-
+	use qt4 || sed -i "s:Apps::" ACGMakefile
 	find . -name 'CVS' -type d -print0 | xargs -0 rm -rf
 }
 
 src_compile() {
-	use debug && myconf="-dbg"
-	acgmake ${myconf} || die
+	if use debug; then
+		export CXXDEFS="-UNDEBUG -DDEBUG"
+	else
+		export CXXDEFS="-DNDEBUG -UDEBUG"
+	fi
+	acgmake -env || die
 
 	# fix insecure runpaths
 	TMPDIR=${S} scanelf -BXRr ${S} -o /dev/null || die
@@ -55,6 +56,5 @@ src_install() {
 
 	cp -a Core ${D}/usr/include/${MY_PN}
 	cp -a Tools ${D}/usr/include/${MY_PN}
-
 }