Fix gcc-4.3 compile error when including VectorT.hh

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

2 files changed, 70 insertions, 2 deletions

diff --git a/media-gfx/openmesh/ChangeLog b/media-gfx/openmesh/ChangeLog
index 2ed69ff9873a..ebb86a50e88a 100644
--- a/media-gfx/openmesh/ChangeLog
+++ b/media-gfx/openmesh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/openmesh
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/ChangeLog,v 1.11 2008/12/18 03:14:08 jsbronder Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/ChangeLog,v 1.12 2009/02/26 17:39:18 jsbronder Exp $
+
+*openmesh-1.9.6-r2 (26 Feb 2009)
+
+  26 Feb 2009; Justin Bronder <jsbronder@gentoo.org>
+  +openmesh-1.9.6-r2.ebuild:
+  Fix gcc-4.3 compile error when including VectorT.hh
 
   18 Dec 2008; Justin Bronder <jsbronder@gentoo.org> openmesh-1.0.0.ebuild,
   openmesh-1.9.5.ebuild, -openmesh-1.9.6.ebuild, openmesh-1.9.6-r1.ebuild:
diff --git a/media-gfx/openmesh/openmesh-1.9.6-r2.ebuild b/media-gfx/openmesh/openmesh-1.9.6-r2.ebuild
new file mode 100644
index 000000000000..1aa2a47b7478
--- /dev/null
+++ b/media-gfx/openmesh/openmesh-1.9.6-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-1.9.6-r2.ebuild,v 1.1 2009/02/26 17:39:18 jsbronder Exp $
+
+EAPI="2"
+inherit eutils
+
+MY_PN="OpenMesh"
+S=${WORKDIR}/${MY_PN}
+DESCRIPTION="A generic and efficient data structure for representing and manipulating polygonal meshes"
+HOMEPAGE="http://www.openmesh.org/"
+SRC_URI="http://www-i8.informatik.rwth-aachen.de/${MY_PN}/downloads/${MY_PN}-${PV}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt4 debug"
+
+RDEPEND="qt4? (
+		|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3*[opengl] )
+		virtual/glut )"
+DEPEND=">=dev-util/acgmake-1.4
+	>=sys-apps/findutils-4.3.0
+	${RDEPEND}"
+
+src_prepare() {
+	use qt4 || sed -i "s:Apps::" ACGMakefile
+	# gcc-4.3 fix.  Need string.h for memcpy
+	sed -i \
+		'N;s,\(OPENMESH_VECTOR_HH )\n\),\1#include <string.h>\n,' \
+		Core/Geometry/VectorT_inc.hh || die
+}
+
+src_compile() {
+	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
+}
+
+src_install() {
+	local l
+
+	for l in $(find "${S}"/{Core,Tools} -name '*.so'); do
+		dolib ${l} || die
+	done
+
+	# Clean up manually as acgmake doesn't do a decent job.
+	find . -name 'ACGMakefile' -delete || die
+	find . -name '*.vcproj' -delete || die
+	rm -rf $(find "${S}" -type d -name 'Linux_gcc*_env') || die
+
+	dodir /usr/include/${MY_PN}
+
+	cp -a Core "${D}"/usr/include/${MY_PN}
+	cp -a Tools "${D}"/usr/include/${MY_PN}
+}