[gentoo-commits] gentoo-x86 commit in media-gfx/darktable: darktable-1.1.ebuild ChangeLog

[gentoo-commits] gentoo-x86 commit in media-gfx/darktable: darktable-1.1.ebuild ChangeLog

[Tim Harder (radhermit)]

radhermit    12/12/09 00:04:51

  Modified:             darktable-1.1.ebuild ChangeLog
  Log:
  Check for openmp support in pkg_pretend as well (bug #446368) and remove unnecessary file (bug #446516).
  
  (Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

Revision  Changes    Path
1.2                  media-gfx/darktable/darktable-1.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/darktable/darktable-1.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/darktable/darktable-1.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/darktable/darktable-1.1.ebuild?r1=1.1&r2=1.2

Index: darktable-1.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-1.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- darktable-1.1.ebuild	7 Dec 2012 11:21:07 -0000	1.1
+++ darktable-1.1.ebuild	9 Dec 2012 00:04:51 -0000	1.2
@@ -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 @@
 	"${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 @@
 	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
 }



1.25                 media-gfx/darktable/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/darktable/ChangeLog?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/darktable/ChangeLog?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/darktable/ChangeLog?r1=1.24&r2=1.25

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ChangeLog	7 Dec 2012 11:21:07 -0000	1.24
+++ ChangeLog	9 Dec 2012 00:04:51 -0000	1.25
@@ -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)