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

Package-Manager: portage-2.1.2-r9

4 files changed, 30 insertions, 24 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/Manifest b/media-gfx/openmesh/Manifest
index 91433d5b99ea..fbc7786baebb 100644
--- a/media-gfx/openmesh/Manifest
+++ b/media-gfx/openmesh/Manifest
@@ -8,14 +8,14 @@ EBUILD openmesh-1.0.0.ebuild 1427 RMD160 8f3c6cbdfe333f6cc17c4d877fc870e34110062
 MD5 4470991e4a26271411a3525d368f30d7 openmesh-1.0.0.ebuild 1427
 RMD160 8f3c6cbdfe333f6cc17c4d877fc870e34110062b openmesh-1.0.0.ebuild 1427
 SHA256 fbfcbee9ecf010c9bec2aec3f71a590e72dc95436bce2479b8d45d13369f3eb4 openmesh-1.0.0.ebuild 1427
-EBUILD openmesh-1.9.4.ebuild 1384 RMD160 faf606a815b212b97cf9aaf653c4984225cb554c SHA1 5372bb32669c22f7d756b32508fdb69aef11ea83 SHA256 5e4290cc56ab89a859f7458ec2eec1da36eae0097d98eff02185a8ca9a098af4
-MD5 5d4eda268ce4679aeb9c8663508faf69 openmesh-1.9.4.ebuild 1384
-RMD160 faf606a815b212b97cf9aaf653c4984225cb554c openmesh-1.9.4.ebuild 1384
-SHA256 5e4290cc56ab89a859f7458ec2eec1da36eae0097d98eff02185a8ca9a098af4 openmesh-1.9.4.ebuild 1384
-MISC ChangeLog 641 RMD160 300cd1e4dfa080bb8333e2da5366ef278ce8278b SHA1 b86312df7b4bb645244031bf9d34dd25305e8b93 SHA256 b19055654f51dd3fa5648e03c39b61d40c5fa0a4227867bc43d12de5ef949a18
-MD5 7cecfef86e6bdaf215a4547d0f98b7b8 ChangeLog 641
-RMD160 300cd1e4dfa080bb8333e2da5366ef278ce8278b ChangeLog 641
-SHA256 b19055654f51dd3fa5648e03c39b61d40c5fa0a4227867bc43d12de5ef949a18 ChangeLog 641
+EBUILD openmesh-1.9.4-r1.ebuild 1477 RMD160 5edb5e81b54dfd38dc7af08d5f8ba0931153fd8d SHA1 08a0ff93dd8730e2e5215192f8158bf9e57614cc SHA256 d2c552f2386971e932ee84c2184204bffc8255f4992d66002fe7e3b1451b3d87
+MD5 03249795fe3ae464edecea788139665c openmesh-1.9.4-r1.ebuild 1477
+RMD160 5edb5e81b54dfd38dc7af08d5f8ba0931153fd8d openmesh-1.9.4-r1.ebuild 1477
+SHA256 d2c552f2386971e932ee84c2184204bffc8255f4992d66002fe7e3b1451b3d87 openmesh-1.9.4-r1.ebuild 1477
+MISC ChangeLog 852 RMD160 24755036935ba2ad2b644daf1b54800c82a19f32 SHA1 e6bf0edcdee657aee9b719196f13eb956934cf76 SHA256 65bd95c19a4a51d8829cb71baf20b832b83fc63cb615dc314c0c1746042c974b
+MD5 25115400404f09ade6df40a55f986f22 ChangeLog 852
+RMD160 24755036935ba2ad2b644daf1b54800c82a19f32 ChangeLog 852
+SHA256 65bd95c19a4a51d8829cb71baf20b832b83fc63cb615dc314c0c1746042c974b ChangeLog 852
 MISC metadata.xml 712 RMD160 493e2c838f0603abed423d12f33235b7213ee79a SHA1 7e14f67934c2055fbe0a45297ac4d2476c7c13a1 SHA256 423d505a0051c641d2213f31043b0bbd00549d4686a840043b3b469923c4fa00
 MD5 d3489ccc1a3278310b646719688d2620 metadata.xml 712
 RMD160 493e2c838f0603abed423d12f33235b7213ee79a metadata.xml 712
@@ -23,6 +23,6 @@ SHA256 423d505a0051c641d2213f31043b0bbd00549d4686a840043b3b469923c4fa00 metadata
 MD5 b1b825ee4b43062556a3cd0bf6cdda8f files/digest-openmesh-1.0.0 238
 RMD160 125f49e4a5f90a56e18ed13b7ae5efbc60a5e7ce files/digest-openmesh-1.0.0 238
 SHA256 58c436ccc81cf8d64afadc02da91a1f0ac150c8010d6ff3f06a99f3e53947ebc files/digest-openmesh-1.0.0 238
-MD5 b263871f3d72e2a77cca32ccb057645c files/digest-openmesh-1.9.4 244
-RMD160 9cb5a28b84e4e91b016e74a1e08edb02d676d302 files/digest-openmesh-1.9.4 244
-SHA256 6e9614d6630ac80a5137fa7c7982cdd5adca98ef6e32c10aed69256c30f36d3f files/digest-openmesh-1.9.4 244
+MD5 b263871f3d72e2a77cca32ccb057645c files/digest-openmesh-1.9.4-r1 244
+RMD160 9cb5a28b84e4e91b016e74a1e08edb02d676d302 files/digest-openmesh-1.9.4-r1 244
+SHA256 6e9614d6630ac80a5137fa7c7982cdd5adca98ef6e32c10aed69256c30f36d3f files/digest-openmesh-1.9.4-r1 244
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}
-
 }