Respect user CFLAGS and use epatch directly instead of the PATCHES array.

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

3 files changed, 29 insertions, 23 deletions

diff --git a/media-gfx/luminance-hdr/ChangeLog b/media-gfx/luminance-hdr/ChangeLog
index d42a93057f91..046a78a617d6 100644
--- a/media-gfx/luminance-hdr/ChangeLog
+++ b/media-gfx/luminance-hdr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/luminance-hdr
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/ChangeLog,v 1.14 2012/02/14 09:47:16 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/ChangeLog,v 1.15 2012/02/23 05:24:57 radhermit Exp $
+
+  23 Feb 2012; Tim Harder <radhermit@gentoo.org> luminance-hdr-2.2.0.ebuild:
+  Respect user CFLAGS and use epatch directly instead of the PATCHES array.
 
   14 Feb 2012; Tim Harder <radhermit@gentoo.org> -luminance-hdr-2.0.1.ebuild,
   -luminance-hdr-2.0.2.ebuild:
diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index fa4ac42564af..a49ffb1c1503 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -10,17 +10,17 @@ DIST luminance-hdr-2.2.0.tar.bz2 4024364 RMD160 05042de632163c82a14f889934a16f83
 DIST luminance-hdr_2.0.0.tar.gz 2450689 RMD160 679ada53c67c4c37853ac0153e8acb6fe0ed2df7 SHA1 7981cd1ac8b7e29343ce26288796ddc74cf23ca9 SHA256 6e6f6dadbe54d2c14e1c98c2dba928b3bc09ba4dbe5c63a071a32f5c372e16e8
 EBUILD luminance-hdr-2.0.0.ebuild 1409 RMD160 117c2999d957444a1cc53552b9098497905030dd SHA1 5c8398206899e3bbaee89bc1a005cb52b4800691 SHA256 4db5cd2ce0c0d249022f4c050fb21d36ef45fb0a0b440fba248961a5cb77f467
 EBUILD luminance-hdr-2.1.0.ebuild 1636 RMD160 e3c9ed8fc853882ce6d2e26d78954fc94a89cebb SHA1 58c8ec79d4c30af3bc4712135a4f0023357eefbf SHA256 ec2c779645abf8ac79f700e1ac6892f1fcd7a180a9d339413969f355d0f3e3b5
-EBUILD luminance-hdr-2.2.0.ebuild 1576 RMD160 2ac1aaa9a7b168f556ebe1a0ffbf0ed6cee78eff SHA1 5b76ed4c510d8251ddf6f2597546589740cd3be7 SHA256 5b5edbb2e711b77d62b5b06485aabd4d063522f620b6d455e19e9cc684a425ba
-MISC ChangeLog 5124 RMD160 ba3281ff30351759e63ed89dc66df6d875e143e4 SHA1 a3d1e59d1f2bccd7cef18b285841f79252892fa9 SHA256 da60971796b70227a2040281b840b79d7189a103687cd83cf823909a456ffe09
+EBUILD luminance-hdr-2.2.0.ebuild 1676 RMD160 f1237aefabebcd59a58518cc7c917250e8b80eab SHA1 6aecb36f7d24df878e70d6db3bb8c9777ca11226 SHA256 be917a017fcb52e52bb9e32d6b3d4122353db3ea04b55efc1e2f17cc527a9bd3
+MISC ChangeLog 5278 RMD160 f07985bb603fc629f783fd1a5c609ea3565f07bc SHA1 d715d0358f2dc77d5b3cc6a879fc8fa5855c74fc SHA256 7c965147efc0131dd034ab55fb5258c0834a9717f72752b0fa3c02a1b47a1823
 MISC metadata.xml 937 RMD160 188c7d5bcc2a1f029b36fb4644b45e0d4c42f5f7 SHA1 54bb4fd8c2ff64ddab7173aa25792d588f4977c5 SHA256 03752b3db20bdd5f73b81a4c7ac7a6173b7825c55aef76758cd48db98e778ef6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPOi2qAAoJEEqz6FtPBkyjW+MIAIKECUVAaq42hXRnUunqsG68
-mrdG+M6h+AwR4jWWm5/S+hgWpVSgM3ezlHH+1SW4mHLEmIYQFdbX57v7kh6SsAMq
-4cjXKqAVUE4Z5JWRfHg+zle0tmFrss157u6kYSkXjZVkOJWeUe5l191ShS7sJ0EJ
-yCJT62PFi9Vq1J/KFcfIYUv57k0AZM9hk5jCOuDL2b4MK1VrOmRIspM42pGPzbA0
-2Ie5O5E1eavNqWpUdDKv1sm/H1jY6g5/u8VoBpYRll41SI1BAx0O984feLMoMyA3
-1JD5D+4k0t00Q9mvNidRJ3XNrAsPHy5rTfuEkFwQaO4eLTap0BsVr/WekmaF52s=
-=vy6v
+iQEcBAEBCgAGBQJPRc25AAoJEEqz6FtPBkyjO40IALFPn1femEZ4/l2qlOWgYzFK
+lep/9lbEj5jsd/mHrICWe9lqMopI/h/9rm2MzavSP4+59Wr5KU/m6P5sTg2xiCIx
+cAQ4vx085m/h0ev+OmGuSRCYHqpXqV4fAW6R85nyL7G0/cnAwbm1O9yOaxZx7Tlo
+azJFptUJDcQgsOGfA8t+qFlqEo4dQHEyeQt2y4XyanyHX/BMXLVDAYK3O9ob2Md7
+/JuR/+RoSf4AY1qxJn8hgm0Wc6d4Fzgd/D35H8i7fRKTq+z+61WkzhUFLuJzTplV
+IsSSYLoySsuQ20ka00V3mKdNHgZYubZJZwBv6N1dL3hkOCVbm3dI6ns3QZX7bgI=
+=rIUm
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.2.0.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.2.0.ebuild
index 7080668f960d..2c497c7e945b 100644
--- a/media-gfx/luminance-hdr/luminance-hdr-2.2.0.ebuild
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.2.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/luminance-hdr-2.2.0.ebuild,v 1.2 2012/02/14 09:33:24 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/luminance-hdr-2.2.0.ebuild,v 1.3 2012/02/23 05:24:57 radhermit Exp $
 
 EAPI="4"
 
-inherit cmake-utils toolchain-funcs
+inherit cmake-utils toolchain-funcs eutils
 
 DESCRIPTION="Luminance HDR is a graphical user interface that provides a workflow for HDR imaging."
 HOMEPAGE="http://qtpfsgui.sourceforge.net"
@@ -32,17 +32,6 @@ RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS BUGS Changelog README TODO )
 
-PATCHES=(
-	# Don't try to define the git version of the release
-	"${FILESDIR}"/${P}-no-git.patch
-
-	# Don't install extra docs and fix install dir
-	"${FILESDIR}"/${P}-docs.patch
-
-	# Fix openmp automagic support
-	"${FILESDIR}"/${P}-openmp-automagic.patch
-)
-
 S=${WORKDIR}
 
 pkg_setup() {
@@ -51,6 +40,20 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	# Don't try to define the git version of the release
+	epatch "${FILESDIR}"/${P}-no-git.patch
+
+	# Don't install extra docs and fix install dir
+	epatch "${FILESDIR}"/${P}-docs.patch
+
+	# Fix openmp automagic support
+	epatch "${FILESDIR}"/${P}-openmp-automagic.patch
+
+	# Respect user CFLAGS
+	sed -i -e "/-O3/d" CMakeLists.txt || die
+}
+
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_use openmp OPENMP)