summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-03-16 09:46:07 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-03-16 09:46:07 +0000
commitaabc1854e1c462abce25a73c1df4d8840b6078c3 (patch)
tree54ec9532854a298c548fa8e4dbb567745e4a0098 /media-libs/libprojectm
parentStable for amd64, wrt bug #407793 (diff)
downloadgentoo-2-aabc1854e1c462abce25a73c1df4d8840b6078c3.tar.gz
gentoo-2-aabc1854e1c462abce25a73c1df4d8840b6078c3.tar.bz2
gentoo-2-aabc1854e1c462abce25a73c1df4d8840b6078c3.zip
Use patches array rather than prepare phase.
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/libprojectm')
-rw-r--r--media-libs/libprojectm/ChangeLog7
-rw-r--r--media-libs/libprojectm/libprojectm-2.0.1-r1.ebuild17
2 files changed, 14 insertions, 10 deletions
diff --git a/media-libs/libprojectm/ChangeLog b/media-libs/libprojectm/ChangeLog
index dba2b1332131..85713e23175d 100644
--- a/media-libs/libprojectm/ChangeLog
+++ b/media-libs/libprojectm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/libprojectm
-# 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 $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/ChangeLog,v 1.36 2012/03/16 09:46:07 scarabeus Exp $
+
+ 16 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> libprojectm-2.0.1-r1.ebuild:
+ Use patches array rather than prepare phase.
29 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
libprojectm-2.0.1-r1.ebuild:
diff --git a/media-libs/libprojectm/libprojectm-2.0.1-r1.ebuild b/media-libs/libprojectm/libprojectm-2.0.1-r1.ebuild
index bdd6ea47372a..a368d8b3dad2 100644
--- a/media-libs/libprojectm/libprojectm-2.0.1-r1.ebuild
+++ b/media-libs/libprojectm/libprojectm-2.0.1-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 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.2 2010/07/29 22:11:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/libprojectm-2.0.1-r1.ebuild,v 1.3 2012/03/16 09:46:07 scarabeus Exp $
+
+EAPI=4
-EAPI=2
inherit cmake-utils flag-o-matic eutils toolchain-funcs
MY_P=${P/m/M}-Source ; MY_P=${MY_P/lib}
@@ -27,9 +28,9 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${MY_P}
-src_prepare() {
- epatch "${FILESDIR}"/${P}-pcfix.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-pcfix.patch
+)
src_configure() {
append-ldflags $(no-as-needed)
@@ -39,7 +40,7 @@ src_configure() {
append-flags -I/opt/nvidia-cg-toolkit/include
fi
- mycmakeargs=(
+ local mycmakeargs=(
$(cmake-utils_use_use video_cards_nvidia CG)
"-DUSE_OPENMP=OFF"
)
@@ -47,7 +48,7 @@ src_configure() {
if use openmp && tc-has-openmp; then
mycmakeargs+=(
$(cmake-utils_use_use openmp)
- )
+ )
fi
cmake-utils_src_configure