3 files changed, 32 insertions, 40 deletions
diff --git a/media-libs/libprojectm/ChangeLog b/media-libs/libprojectm/ChangeLog
index 282b18b16d11..dba2b1332131 100644
--- a/media-libs/libprojectm/ChangeLog
+++ b/media-libs/libprojectm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libprojectm
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/ChangeLog,v 1.34 2009/12/22 13:22:35 aballier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/ChangeLog,v 1.35 2010/07/29 22:11:16 ssuominen Exp $
+
+  29 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  libprojectm-2.0.1-r1.ebuild:
+  Check for OpenMP functionality with tc-has-openmp wrt #302741 by Paul
+  Tobias. Use VIDEO_CARDS="nvidia" for media-gfx/nvidia-cg-toolkit wrt
+  #296808 by "jms".
 
 *libprojectm-2.0.1-r1 (22 Dec 2009)
 
diff --git a/media-libs/libprojectm/libprojectm-2.0.1-r1.ebuild b/media-libs/libprojectm/libprojectm-2.0.1-r1.ebuild
index ba323bf9c629..bdd6ea47372a 100644
--- a/media-libs/libprojectm/libprojectm-2.0.1-r1.ebuild
+++ b/media-libs/libprojectm/libprojectm-2.0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/libprojectm-2.0.1-r1.ebuild,v 1.1 2009/12/22 13:22:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/libprojectm-2.0.1-r1.ebuild,v 1.2 2010/07/29 22:11:16 ssuominen Exp $
 
 EAPI=2
-inherit cmake-utils flag-o-matic eutils
+inherit cmake-utils flag-o-matic eutils toolchain-funcs
 
 MY_P=${P/m/M}-Source ; MY_P=${MY_P/lib}
 
@@ -14,23 +14,41 @@ SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug"
+IUSE="debug openmp video_cards_nvidia"
 
 RDEPEND=">=media-libs/ftgl-2.1.3_rc5
 	media-libs/freetype:2
 	media-libs/mesa
 	media-libs/glew
-	sys-libs/zlib"
+	sys-libs/zlib
+	video_cards_nvidia? ( media-gfx/nvidia-cg-toolkit )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-pcfix.patch"
+	epatch "${FILESDIR}"/${P}-pcfix.patch
 }
 
 src_configure() {
 	append-ldflags $(no-as-needed)
+
+	if use video_cards_nvidia; then
+		append-ldflags -L/opt/nvidia-cg-toolkit/lib
+		append-flags -I/opt/nvidia-cg-toolkit/include
+	fi
+
+	mycmakeargs=(
+		$(cmake-utils_use_use video_cards_nvidia CG)
+		"-DUSE_OPENMP=OFF"
+	)
+
+	if use openmp && tc-has-openmp; then
+		mycmakeargs+=(
+			$(cmake-utils_use_use openmp)
+			)
+	fi
+
 	cmake-utils_src_configure
 }
diff --git a/media-libs/libprojectm/libprojectm-2.0.1.ebuild b/media-libs/libprojectm/libprojectm-2.0.1.ebuild
deleted file mode 100644
index d36e9ca8a499..000000000000
--- a/media-libs/libprojectm/libprojectm-2.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/libprojectm-2.0.1.ebuild,v 1.2 2009/12/10 20:22:59 ssuominen Exp $
-
-EAPI=2
-inherit cmake-utils flag-o-matic
-
-MY_P=${P/m/M}-Source ; MY_P=${MY_P/lib}
-
-DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
-HOMEPAGE="http://projectm.sourceforge.net"
-SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug"
-
-RDEPEND=">=media-libs/ftgl-2.1.3_rc5
-	media-libs/freetype:2
-	media-libs/mesa
-	media-libs/glew
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	append-ldflags $(no-as-needed)
-	cmake-utils_src_configure
-}