summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2014-12-08 03:23:53 +0000
committerTim Harder <radhermit@gentoo.org>2014-12-08 03:23:53 +0000
commit9feea3daca85328398e63b2748da9f914693296b (patch)
tree5365ce287509d0eafbe1959847b4f9614ff46c2e /media-plugins/gimp-gmic
parentManifest fix (diff)
downloadhistorical-9feea3daca85328398e63b2748da9f914693296b.tar.gz
historical-9feea3daca85328398e63b2748da9f914693296b.tar.bz2
historical-9feea3daca85328398e63b2748da9f914693296b.zip
Add openmp use flag.
Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x4AB3E85B4F064CA3
Diffstat (limited to 'media-plugins/gimp-gmic')
-rw-r--r--media-plugins/gimp-gmic/ChangeLog8
-rw-r--r--media-plugins/gimp-gmic/Manifest18
-rw-r--r--media-plugins/gimp-gmic/gimp-gmic-1.6.0.2-r1.ebuild (renamed from media-plugins/gimp-gmic/gimp-gmic-1.6.0.2.ebuild)20
3 files changed, 33 insertions, 13 deletions
diff --git a/media-plugins/gimp-gmic/ChangeLog b/media-plugins/gimp-gmic/ChangeLog
index 1e3cec8eeb20..22760f51ee7e 100644
--- a/media-plugins/gimp-gmic/ChangeLog
+++ b/media-plugins/gimp-gmic/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-plugins/gimp-gmic
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/ChangeLog,v 1.47 2014/12/03 08:06:17 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/ChangeLog,v 1.48 2014/12/08 03:23:48 radhermit Exp $
+
+*gimp-gmic-1.6.0.2-r1 (08 Dec 2014)
+
+ 08 Dec 2014; Tim Harder <radhermit@gentoo.org> -gimp-gmic-1.6.0.2.ebuild,
+ +gimp-gmic-1.6.0.2-r1.ebuild:
+ Add openmp use flag.
*gimp-gmic-1.6.0.2 (03 Dec 2014)
diff --git a/media-plugins/gimp-gmic/Manifest b/media-plugins/gimp-gmic/Manifest
index 663517b19488..5380eaf32307 100644
--- a/media-plugins/gimp-gmic/Manifest
+++ b/media-plugins/gimp-gmic/Manifest
@@ -12,17 +12,17 @@ DIST gmic_1.6.0.2.tar.gz 3013936 SHA256 ec9fa41bb8c27f883b9f845258d41f8024936c80
EBUILD gimp-gmic-1.5.8.6.ebuild 1113 SHA256 c480650257f4dd49519e523658c89ac5ae83a2915601d1c41e7f1a0a528623dc SHA512 8c808e7b90a263cb54801f5dbf068efc5e95897dc22aaa72d70bc67f159f16467f0692df1bfe114575300dbea182cb1c40c4fff47c743135a5626d337be461e1 WHIRLPOOL b400bac0370313be50ce2dfd4cd5970dad68d94427d35380715f8db0bdf114f405cb8c5548581f6de817c3450e6adcc4b86e82cb4e549ba04b58fc628419ee16
EBUILD gimp-gmic-1.5.9.1.ebuild 983 SHA256 8da0414b8d231712706269fedcf920554d25a2810a6a2a91aa2a6ef936d7c7bf SHA512 7d89345b119edb94f1d026c88309f50264e1403a9c07281694e323610a432e4ed82452d8ab21d7620f599d296f5299ae981073165414f5523da9ca093d2dec4f WHIRLPOOL 3b134de3c2baa9d634fd4b1696f50aa6e3bc1c4902a6e16b31d75fe6215912925d55afd5326ab9642f5efad6914d3f9970b663c4e27d520b94e5ecbe8c751283
EBUILD gimp-gmic-1.5.9.2-r1.ebuild 986 SHA256 3c923737b802264cc8e900962f137d3d8431ec16444401939cff4cdf6debf5ca SHA512 10ccdee6e7f0f6121526f55405f8955af5ddd31f96008015ed976b06dddd7c5c6578b422e8795054ed668b2eb9431e517387ea1350c747fd8bef7e6a693ed8eb WHIRLPOOL 577e0725171115f3c44be7f2ff98a7da4522dfd310853db2407c77a70acdec8abce8035171552bcfc04d6d0969d31ae7420ec2cfab860cafde21ecc2656af7b8
-EBUILD gimp-gmic-1.6.0.2.ebuild 954 SHA256 69ee2841de1b99223a89b126d4d1deef8d7e3c7cd28a4e193eecdab59ee18446 SHA512 6fb8f8d8878a94112a87cfc9e913eef21f6b42730f34ae3ab81a7d322991ea2915c856b23b4434e88ccd3d1efd6f745bb39acad3e129e0e08ce7ed786cd82069 WHIRLPOOL e558b33e9de1847a6599f25e2d4565bfce2366e3fdf9dec996f420b5f9d6e7f23c7fe38ad56ddbc1a3e044d232f48b2bbcacbc25413287b5a8a84ee461180bc3
-MISC ChangeLog 7470 SHA256 ecf12dbed57f815446b5f62cce2c63b8ccddd427f5c9655015e157bf10400cd1 SHA512 4d7b9b7eef55506f039e75930736b431fbc0cd84a399909250b1b67802de833cf480b505c56d44331eed86eb4d873607556e5410840d085eecd08d7ca1bf6e60 WHIRLPOOL d50d21b770f473b45ee300a8267fc02eb1c5e7799883ae8eb772f152025d4f6794e614814e7ebd30036c3ad548735661bd25ef35c7587cc6b6551fce010a407d
+EBUILD gimp-gmic-1.6.0.2-r1.ebuild 1315 SHA256 8b45f6744aeb8fe54a568beecc441568143a0ccaa9f130624937f640b48bd4ad SHA512 b188d0268b261dd511e00cad9616ae16458f6c97d6ec402b2e1c7b3c09f04c41d275541332e96b9ff32476c474dfd83d061596772e4a038f331abdf38853e0e2 WHIRLPOOL 06e933bae7823c65b956d79f7e59aee7b9968c0402cfd2821dafa30d04532ae3dcd0c6d608d025b168d299c12d52fd2e2b5f5faef082b9eabf6d7737ba8251ac
+MISC ChangeLog 7639 SHA256 badfd829845982b5dff3d8193a52dc5278e0de868c7e162bb57a59ecceaef1db SHA512 856d94978b32c31cb6e8057917f1f862f3bcbcab2da4082a5ef3424e86d0d95b0174b3f9a12e43c79c801d4d8d6c88b62af3e8f8588992dfaa32186f8d00e7f5 WHIRLPOOL ec5a2271197b1290a4edef2586dd8c3cc6cdf9e5b1633d2edc1d0019dd19b5edb9f84b53a532b8a48ed1138ef1c1f966cc4361741813dd9618d4ff614418ebcf
MISC metadata.xml 232 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a SHA512 6952f63da1c92a4ed7ddb87b5eb4003d123f0b7af6ffdbc9118159c97ddf18917e8ac7727285a42c07c64e52a40335bc2ef9f17261557617beb8c2226a391873 WHIRLPOOL 0a4441f075f8af01588da2aac3e03732f93463b8bea5e46749d37e1468452735d15f45243b930b3346c93734f8aa235a492030445fee471a95d2c5998f08e7de
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQEcBAEBCAAGBQJUfsSCAAoJEEqz6FtPBkyjJpoH/2y/eOtfumiW56iricNh7+0B
-GKCLMz1vAbvVbk9vAMm6qGb99U/nGFdX5AXTZpKm1Af7Jphc/wgQRd4JzyhJgGUY
-eayVguXBMJrNoieylUulg10NbOWHTQaKi+jPfOnkYhTm8aeMlGoYuKLCvfrxT0zJ
-LFvvS1kp0fcaagnvUqlsgHkmtdnMeA+uEroUoAvhQxD1vOreu87NvcuXQBGgvHHY
-sQ8rLb0Rpou7YBw4VxqYLlRFB0wjND3DTL2Ev2C3LSUia9vaJYN+Cs5kP4pZ8Myw
-IbqyioAhpcagJp4lOvsmXL5zDFlRGI5N0pmXMSUXLmj/jnrZd0yjVkgQPStSj60=
-=7k5/
+iQEcBAEBCAAGBQJUhRnQAAoJEEqz6FtPBkyj+84H/3u8zuRQOZNoduCMYdC6q+Rg
+Gp/34wLRVtzv1UNt4G8j6ccUaFCR/SYgBudoc/kve9hLgOLU97vvNlwxy/hx3VAX
+KiVGzj3ekM+0n099HIhdQ0kI6Q/oJIMJ6dJWIwpATaObM03ZhrVFaGmXYIpZx8lA
+ytCK3ub3QgHs8igl8PG1cLk3LUTO4JSOS20mInkzW3TnnjmPKHbSbG12n9RD5Szw
+/fy+6agcYTRDyjAJfvwe91YJYQ4GXlFJ9TEn8/cXzVgJXeSzwOMILa+87Jw16E8l
+rGWl8I07qYuqHBvoIn8bKbQWiA2yOm2BbjkvJgQETGVBlsLE7dGeIEXz4NE9H7A=
+=QA3W
-----END PGP SIGNATURE-----
diff --git a/media-plugins/gimp-gmic/gimp-gmic-1.6.0.2.ebuild b/media-plugins/gimp-gmic/gimp-gmic-1.6.0.2-r1.ebuild
index 0c29744e952f..a13fb8db847e 100644
--- a/media-plugins/gimp-gmic/gimp-gmic-1.6.0.2.ebuild
+++ b/media-plugins/gimp-gmic/gimp-gmic-1.6.0.2-r1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/gimp-gmic-1.6.0.2.ebuild,v 1.1 2014/12/03 08:06:17 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/gimp-gmic-1.6.0.2-r1.ebuild,v 1.1 2014/12/08 03:23:48 radhermit Exp $
EAPI=5
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs flag-o-matic
DESCRIPTION="G'MIC GIMP plugin"
HOMEPAGE="http://gmic.sourceforge.net/gimp.shtml"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gmic/gmic_${PV}.tar.gz"
LICENSE="CeCILL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="openmp"
RDEPEND="
>=media-gfx/gimp-2.4.0
@@ -25,8 +25,22 @@ DEPEND="${RDEPEND}"
S=${WORKDIR}/gmic-${PV}/src
+pkg_pretend() {
+ if use openmp ; then
+ tc-has-openmp || die "Please switch to an openmp compatible compiler"
+ fi
+
+ if ! test-flag-CXX -std=c++11 ; then
+ die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+ fi
+}
+
src_prepare() {
epatch "${FILESDIR}"/gmic-${PV}-makefile.patch
+
+ if ! use openmp ; then
+ sed -i -r "s/^(OPENMP_(CFLAGS|LIBS) =).*/\1/" Makefile || die
+ fi
}
src_compile() {