Check for openmp support in pkg_pretend as well (bug #446368) and remove unnecessary file (bug #446516).

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 27 insertions, 12 deletions

diff --git a/media-gfx/darktable/ChangeLog b/media-gfx/darktable/ChangeLog
index 087bde1b258a..e1f2ec4b279a 100644
--- a/media-gfx/darktable/ChangeLog
+++ b/media-gfx/darktable/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/darktable
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.24 2012/12/07 11:21:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.25 2012/12/09 00:04:51 radhermit Exp $
+
+  09 Dec 2012; Tim Harder <radhermit@gentoo.org> darktable-1.1.ebuild:
+  Check for openmp support in pkg_pretend as well (bug #446368) and remove
+  unnecessary file (bug #446516).
 
 *darktable-1.1 (07 Dec 2012)
 
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index c94475f05bff..7bc579b46c78 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -12,17 +12,17 @@ AUX darktable-1.1-system-libraw.patch 3165 SHA256 d906cc22af8063ccf7601c6c368757
 DIST darktable-1.0.5.tar.gz 2568221 SHA256 0c18530446d2f2459fe533a1ef6fc2711300efe7466f36c23168ec2230fb5fbd SHA512 52b532a07a029355a3e689971f15bf5c1a28a587419b5fae40aa342f724d3c15b4ceb557354ad46d4ca7f6e951e9b8de5ac15ccf0c4fa41a85249d5a41972cfb WHIRLPOOL 8e189a8c1bae068a170c2c0a38fba63bbeba006a004109fc0c7e8f985f5149c09b864a569580d295dc3c03694d395b8fe87fc86eb996c0697e9677cf69478e8e
 DIST darktable-1.1.tar.gz 3423644 SHA256 8f2401422ab3e0bb038b3fedf411aaf69994d679674757ee7886b6146b9fdd4f SHA512 b0ecbaf3bf598fbe99ee58ff7e84e2d81a3f05647e1d4aaa5f4a5c2610c7c9a841cef6d20e52302edc0ab6fc4f4105d96d6070fcbb79f20a0f23a63d927ab24f WHIRLPOOL 047eed13d777a40484d53c541210e86c4369b95e84097bba5547497a81188b3317c4c51d220f7f6f572013819044221c3bd039375d0efc3c40abccc0595dc0ff
 EBUILD darktable-1.0.5.ebuild 2500 SHA256 f8db6938a8155063ec3bacd7adc14faa2d9dd3c87061ea6933b75b8944ab30c2 SHA512 7d42960cb7758e02e875306409d8f78977adcdc188134e6fc74bf3dde7e04fcf8b57a8e5c3e04c84ac98fb4dcf59a749b0fac2dc224aef344384e5e3256c9e10 WHIRLPOOL c0414f8022fcd3b6829cae6c4845f58fa53b90e3ca14fa314422e162fcc8e9fe0a00670636bb0aeaba63114e2d8593ebb1f5c4d161409c50440fd1a9cfa63f31
-EBUILD darktable-1.1.ebuild 2688 SHA256 c68f0061dff0bb25c7981be2c84dac755f6456b95b7d13cf5101e0e5170d7f28 SHA512 da9df79b2e627cfb6337c462f55700e2c307c25b3f58cf78248d4d6e5791c4da66703cd175b721f87f8cc64fc086e11258b360a656c32790d15a356015824359 WHIRLPOOL 821eb8c10c4b216c7d5afc3abec4539e233a10c88eee4129aca11b709342eb2df98b3dd985b16e11ab1115d9dd5da046e7b2a5f102703d6520525ec0968db2e0
-MISC ChangeLog 5078 SHA256 b17fab088ba205cbfdfa0feca14515d213daa5eade802e590e796a9b74f925b7 SHA512 9023406b291c8b0657f7087179a565f2920cf27042644832c0fadd5f082fbdb971f804df5c1e628a619e86659c9eb555c2da355990c333ea8fcf2d606871c9e4 WHIRLPOOL 20b43796ee6f3375c4210117ed0c515a2cb30a4244c0e4fe404b5b3bb2cdec8d5613c695f4a215958c6112b21a6ca843b58f8a4cd59a5811796605691a04272b
+EBUILD darktable-1.1.ebuild 2848 SHA256 2115c5fb2a5b6e9fe24e3d2d479eb227abc318863243c007be30a95902eed46c SHA512 b0bb7611fdea28fe919a49c1efced8c5ecc1f46abc5255b1b70b5bcfba9d84cb125619554f6e00012303fcd93facb6f91e7d69baf8650bf2fbad0f3726bdf2b1 WHIRLPOOL ff8f7a63f3658bd2f2ad3033e64ff3ce8c0ccc7ab819ff0a2371701b5cac1dc12248fdc867e89292024a54c17db7209f9a2779d4b1ea06665a371f7e697ddf8a
+MISC ChangeLog 5259 SHA256 35ebb432995dfb8a1a56c534fa085f1b1ef04a6d088c487ad3a65da609fa8d03 SHA512 8ff5db63eb65f4e3dabd5189ea0b49cfbeaebbc97b6d2203268fdde0f7dff1eb359e30b08278c7252c2dc94f34c0c60c67cfcebf21ae593f76568b42a23d32ce WHIRLPOOL 48ef2cd049ca0ca3c5dfb1440acc376951f41163e354b03d50889962b334a517541286e3ed1157247a0e6af16aa45c8f207a645a32280de382c5e44c416169be
 MISC metadata.xml 873 SHA256 3d70f493674eef60b2bc50f0dece2e41099f14187b330556a25a96ff183ef08d SHA512 507199b15db42c228de80b1a73be2121d5a4820b4ac7e88de8f7ab0e2f02b2ee707f2dc0a03e8e8b467f9cd2f039c4522efd407347ff412123fb22402399a362 WHIRLPOOL defe29623deddfb784313c6444f6f88248b22e2a7fec83cc1309a79c1a7732efa6e235235a631b25d3ebe4393d9945c1bb3d33139913c287292c40771423ede8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQwdEpAAoJEEqz6FtPBkyjE3MIAK5sJzUMYDtkHggMNNPiBbF3
-wbvhyP3XkVSRzPKNdPKNYVGAKK5Gu1xd6MqWjyjDybW1DCEd5mkfRLPp2v1v2Ogf
-yigmunBDt2Z/UsouTkylHWuEd93hP04mbBRnBD1rXjonj2dz4Qagm/z1pYQalZ/g
-/mBP0p5ZMCF/VxL2o0raiD0hCekkoZKnpR5q6fjVbY58RmbwiOjPIab1v7rn/J73
-mqQq7e4+nDtuN3OtGOYqCop+0XIHNj1v8T3G2uVveX6SLc35nYGF1FoKo9DGaWqV
-fUxIgsatIvvY7dt3BFSakS++WRd+HjmQhtYFvbktOcHr1Rr5HkMMJA5MlBetKsc=
-=Ka+n
+iQEcBAEBCAAGBQJQw9WoAAoJEEqz6FtPBkyjO9oH/0ERLa8e0QDCSbFyMZ0pKzC0
+SvTJ5Mlestg/arFUD+eWYNr7O3p0lqAr8/3x1f9bHhK0Sga+0ymY3vDoO4sMAAnr
+r/lyrITyPZWplMk0Eqs1rDB6fYesNGKMI+Z8i6PLbixtu6jAwN7VYvDuIjqdLjfA
+kLBvrtBt7QE1V9FY0t3lbPgF40s+rYHAUyK/SlACoC7ZLBstFNGSdEwmCmpy4jey
+rsYzGOuGTgX+rZGaH/hQ3bW493u+kW63ggsOCqgW2MVjsdkuSGZOOm27pZEiYLPu
+IYJAWHwqgrDqC/FYT4BdjBLiu7gXinjY2CYo2kWV8n+P9Q9FONIGjKGehljFfxw=
+=Tdyy
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/darktable/darktable-1.1.ebuild b/media-gfx/darktable/darktable-1.1.ebuild
index 2f19cb56097e..fc57ad42b1c3 100644
--- a/media-gfx/darktable/darktable-1.1.ebuild
+++ b/media-gfx/darktable/darktable-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-1.1.ebuild,v 1.1 2012/12/07 11:21:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-1.1.ebuild,v 1.2 2012/12/09 00:04:51 radhermit Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -63,12 +63,20 @@ PATCHES=(
 	"${FILESDIR}"/${P}-automagic-colord.patch
 )
 
-pkg_setup() {
+openmp_check() {
 	if use openmp ; then
 		tc-has-openmp || die "Please switch to an openmp compatible compiler"
 	fi
 }
 
+pkg_pretend() {
+	openmp_check
+}
+
+pkg_setup() {
+	openmp_check
+}
+
 src_prepare() {
 	base_src_prepare
 	sed -i -e "s:\(/share/doc/\)darktable:\1${PF}:" \
@@ -103,4 +111,7 @@ src_install() {
 	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
 	cmake-utils_src_install
 	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+
+	# remove unnecessary file (bug #446516)
+	rm "${D}"/usr/share/darktable/js/.DS_Store || die
 }